Skip to content

[Refactor] Simplify control flow in globalCLIVersion #8348

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
gonzaloriestra wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[Refactor] Simplify control flow in globalCLIVersion #8348

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
18 changes: 10 additions & 8 deletions packages/cli-kit/src/public/node/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,17 @@ export async function globalCLIVersion(): Promise<string | undefined> {
const env = {...process.env, SHOPIFY_CLI_NO_ANALYTICS: '1'}
// Both execa and which find the project dependency. We need to exclude it.
const shopifyBinaries = which.sync('shopify', {all: true}).filter((path) => !path.includes('node_modules'))
if (!shopifyBinaries[0]) return undefined
const output = await captureOutput(shopifyBinaries[0], [], {env})
const versionMatch = output.match(/@shopify\/cli\/([^\s]+)/)
if (versionMatch && versionMatch[1]) {
const version = versionMatch[1]
if (satisfies(version, `>=3.59.0`) || isPreReleaseVersion(version)) {
return version
}
const globalBinary = shopifyBinaries[0]
if (!globalBinary) return undefined

const output = await captureOutput(globalBinary, [], {env})
const version = output.match(/@shopify\/cli\/([^\s]+)/)?.[1]
if (!version) return undefined

if (satisfies(version, `>=3.59.0`) || isPreReleaseVersion(version)) {
return version
}

return undefined
// eslint-disable-next-line no-catch-all/no-catch-all
} catch {
Expand Down
Loading