Merge pull request #7068 from Shopify/an-remove-custom-oclif-loader

feat: remove custom-oclif-loader

Author: andguy95

.changeset/all-suns-read.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli-kit': patch
+---
+
+Remove `custom-oclif-loader.ts` and use oclif's `Config` directly. The development-only shim for loading a local `@shopify/cli-hydrogen` plugin is no longer needed as the Hydrogen repo now handles this via its own patch scripts.

packages/cli-kit/package.json

@@ -82,7 +82,6 @@
                 "./error-handler.js",
                 "../../public/node/context/local.js",
                 "./context/local.js",
-                "./custom-oclif-loader.js",
                 "@oclif/core",
                 "./path.js",
                 "./system.js",

packages/cli-kit/src/public/node/cli-launcher.ts

@@ -6,31 +6,29 @@ interface Options {
 }
 
 /**
- * Launches the CLI through our custom OCLIF loader.
+ * Launches the CLI.
  *
  * @param options - Options.
  * @returns A promise that resolves when the CLI has been launched.
  */
 export async function launchCLI(options: Options): Promise<void> {
   const {errorHandler} = await import('./error-handler.js')
   const {isDevelopment} = await import('./context/local.js')
-  const oclif = await import('@oclif/core')
-  const {ShopifyConfig} = await import('./custom-oclif-loader.js')
+  const {Config, run, flush, Errors, settings} = await import('@oclif/core')
 
   if (isDevelopment()) {
-    oclif.default.settings.debug = true
+    settings.debug = true
   }
 
   try {
-    // Use a custom OCLIF config to customize the behavior of the CLI
-    const config = new ShopifyConfig({root: fileURLToPath(options.moduleURL)})
+    const config = new Config({root: fileURLToPath(options.moduleURL)})
     await config.load()
 
-    await oclif.default.run(options.argv, config)
-    await oclif.default.flush()
+    await run(options.argv, config)
+    await flush()
     // eslint-disable-next-line no-catch-all/no-catch-all
   } catch (error) {
     await errorHandler(error as Error)
-    return oclif.default.Errors.handle(error as Error)
+    return Errors.handle(error as Error)
   }
 }