Fix circular dependency loading issue

Shopify · Aug 19, 2024 · 59ca4e6 · 59ca4e6
1 parent af41708
commit 59ca4e6
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 33 deletions.
diff --git a/packages/cli-kit/src/public/node/hooks/prerun.ts b/packages/cli-kit/src/public/node/hooks/prerun.ts
@@ -1,7 +1,8 @@
 import {CLI_KIT_VERSION} from '../../common/version.js'
 import {checkForNewVersion, checkForCachedNewVersion} from '../node-package-manager.js'
 import {startAnalytics} from '../../../private/node/analytics.js'
-import {outputDebug, outputWarn, getOutputUpdateCLIReminder} from '../../../public/node/output.js'
+import {outputDebug, outputWarn} from '../../../public/node/output.js'
+import {getOutputUpdateCLIReminder} from '../../../public/node/upgrade.js'
 import Command from '../../../public/node/base-command.js'
 import {initDemoRecorder} from '../../../private/node/demo-recorder.js'
 import {runAtMinimumInterval} from '../../../private/node/conf-store.js'

diff --git a/packages/cli-kit/src/public/node/output.ts b/packages/cli-kit/src/public/node/output.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import {isUnitTest, isVerbose} from './context/local.js'
-import {PackageManager, packageManagerFromUserAgent} from './node-package-manager.js'
-import {currentProcessIsGlobal, inferPackageManagerForGlobalCLI} from './is-global.js'
+import {PackageManager} from './node-package-manager.js'
+import {currentProcessIsGlobal} from './is-global.js'
 import {AbortSignal} from './abort.js'
 import colors from './colors.js'
 import {isTruthy} from './context/utilities.js'
@@ -459,34 +459,6 @@ export function shouldDisplayColors(_process = process): boolean {
   }
 }
 
-/**
- * Utility function for generating an install command for the user to run
- * to install an updated version of Shopify CLI.
- * @returns A string with the command to run.
- */
-export function cliInstallCommand(): string {
-  const isGlobal = currentProcessIsGlobal()
-  let packageManager = packageManagerFromUserAgent() ?? inferPackageManagerForGlobalCLI()
-  if (packageManager === 'unknown') packageManager = 'npm'
-
-  if (packageManager === 'yarn') {
-    return `yarn ${isGlobal ? 'global ' : ''}add @shopify/cli@latest`
-  } else {
-    return `${packageManager} i ${isGlobal ? '-g ' : ''}@shopify/cli@latest`
-  }
-}
-
-/**
- * Generates a message to remind the user to update the CLI.
- *
- * @param version - The version to update to.
- * @returns The message to remind the user to update the CLI.
- */
-export function getOutputUpdateCLIReminder(version: string): string {
-  return outputContent`💡 Version ${version} available! Run ${outputToken.genericShellCommand(cliInstallCommand())}`
-    .value
-}
-
 /**
  * Parse title and body to be a single formatted string.
  *

diff --git a/packages/cli-kit/src/public/node/upgrade.ts b/packages/cli-kit/src/public/node/upgrade.ts
@@ -0,0 +1,31 @@
+import {currentProcessIsGlobal, inferPackageManagerForGlobalCLI} from './is-global.js'
+import {packageManagerFromUserAgent} from './node-package-manager.js'
+import {outputContent, outputToken} from './output.js'
+
+/**
+ * Utility function for generating an install command for the user to run
+ * to install an updated version of Shopify CLI.
+ * @returns A string with the command to run.
+ */
+export function cliInstallCommand(): string {
+  const isGlobal = currentProcessIsGlobal()
+  let packageManager = packageManagerFromUserAgent() ?? inferPackageManagerForGlobalCLI()
+  if (packageManager === 'unknown') packageManager = 'npm'
+
+  if (packageManager === 'yarn') {
+    return `yarn ${isGlobal ? 'global ' : ''}add @shopify/cli@latest`
+  } else {
+    return `${packageManager} i ${isGlobal ? '-g ' : ''}@shopify/cli@latest`
+  }
+}
+
+/**
+ * Generates a message to remind the user to update the CLI.
+ *
+ * @param version - The version to update to.
+ * @returns The message to remind the user to update the CLI.
+ */
+export function getOutputUpdateCLIReminder(version: string): string {
+  return outputContent`💡 Version ${version} available! Run ${outputToken.genericShellCommand(cliInstallCommand())}`
+    .value
+}
diff --git a/packages/cli/src/cli/commands/upgrade.ts b/packages/cli/src/cli/commands/upgrade.ts
@@ -1,4 +1,4 @@
-import {cliInstallCommand} from '@shopify/cli-kit/node/output'
+import {cliInstallCommand} from '@shopify/cli-kit/node/upgrade'
 import Command from '@shopify/cli-kit/node/base-command'
 import {renderInfo} from '@shopify/cli-kit/node/ui'
 

diff --git a/packages/theme/src/cli/services/info.ts b/packages/theme/src/cli/services/info.ts
@@ -8,7 +8,8 @@ import {themeEditorUrl, themePreviewUrl} from '@shopify/cli-kit/node/themes/urls
 import {Theme} from '@shopify/cli-kit/node/themes/types'
 import {AdminSession} from '@shopify/cli-kit/node/session'
 import {linesToColumns} from '@shopify/cli-kit/common/string'
-import {OutputMessage, formatSection, getOutputUpdateCLIReminder} from '@shopify/cli-kit/node/output'
+import {OutputMessage, formatSection} from '@shopify/cli-kit/node/output'
+import {getOutputUpdateCLIReminder} from '@shopify/cli-kit/node/upgrade'
 
 interface ThemeInfo {
   theme: {