Skip to content

wip #6660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
EvilGenius13 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

wip #6660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/cli-kit/src/public/node/themes/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {Theme} from './types.js'
import {renderTextPrompt} from '../ui.js'
import {getRandomName} from '../../common/string.js'
import {platform} from 'os'

const GID_REGEXP = /gid:\/\/shopify\/\w*\/(\d+)/

Expand Down Expand Up @@ -33,3 +34,13 @@ export function parseGid(gid: string): number {
}
throw new Error(`Invalid GID: ${gid}`)
}

export function filePathToFileUrl(filePath: string): string {
let normalized = filePath.replace(/\\/g, '/')

if (platform() === 'win32') {
normalized = `/${normalized}`
}

return encodeURI(`file://${normalized}`)
}
16 changes: 9 additions & 7 deletions packages/theme/src/cli/services/profile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {joinPath} from '@shopify/cli-kit/node/path'
import {AdminSession} from '@shopify/cli-kit/node/session'
import {writeFile, tempDirectory} from '@shopify/cli-kit/node/fs'
import {outputResult, outputDebug} from '@shopify/cli-kit/node/output'
import {filePathToFileUrl} from '@shopify/cli-kit/node/themes/utils'

export async function profile(
adminSession: AdminSession,
Expand Down Expand Up @@ -49,8 +50,9 @@ export async function profile(

async function openProfile(profileJson: string) {
// Adapted from https://github.com/jlfwong/speedscope/blob/146477a8508a6d2da697cb0ea0a426ba81b3e8dc/bin/cli.js#L63
let urlToOpen = await resolveAssetPath('speedscope', 'index.html')
outputDebug(`[Theme Profile] Resolved URL to open: ${urlToOpen}`)
const speedscopeIndexPath = await resolveAssetPath('speedscope', 'index.html')
const speedscopeIndexUrl = filePathToFileUrl(speedscopeIndexPath)
outputDebug(`[Theme Profile] Resolved URL to open: ${speedscopeIndexUrl}`)

const filename = 'liquid-profile'
const sourceBase64 = Buffer.from(profileJson).toString('base64')
Expand All @@ -61,18 +63,18 @@ async function openProfile(profileJson: string) {
outputDebug(`[Theme Profile] writing JS file to: ${jsPath}`)
await writeFile(jsPath, jsSource)
outputDebug(`[Theme Profile] JS file created successfully: ${jsPath}`)
urlToOpen += `#localProfilePath=${jsPath}`
const redirectUrl = `${speedscopeIndexUrl}#localProfilePath=${jsPath}`

// For some silly reason, the OS X open command ignores any query parameters or hash parameters
// passed as part of the URL. To get around this weird issue, we'll create a local HTML file
// that just redirects.
const htmlPath = joinPath(tempDirectory(), `${filePrefix}.html`)
outputDebug(`[Theme Profile] writing HTML file to: ${htmlPath}`)
await writeFile(htmlPath, `<script>window.location=${JSON.stringify(urlToOpen)}</script>`)
await writeFile(htmlPath, `<script>window.location=${JSON.stringify(redirectUrl)}</script>`)
outputDebug(`[Theme Profile] HTML file created successfully: ${htmlPath}`)

urlToOpen = `file://${htmlPath}`
outputDebug(`[Theme Profile] Opening URL: ${urlToOpen}`)
const opened = await openURL(urlToOpen)
const htmlUrl = filePathToFileUrl(htmlPath)
outputDebug(`[Theme Profile] Opening URL: ${htmlUrl}`)
const opened = await openURL(htmlUrl)
outputDebug(`[Theme Profile] URL opened successfully: ${opened}`)
}