Merge pull request #3475 from Shopify/prepare-javy-cli-for-global-cli

Improve calls to javy-cli dependency

packages/app/package.json

@@ -59,7 +59,6 @@
     "h3": "0.7.21",
     "http-proxy": "1.18.1",
     "ink": "4.4.1",
-    "javy-cli": "0.1.8",
     "micromatch": "4.0.5",
     "react": "18.2.0",
     "react-dom": "18.2.0",

packages/app/src/cli/services/draft-extensions/push.test.ts

@@ -140,7 +140,7 @@ describe('draftExtensionsPush', () => {
     await draftExtensionsPush(draftExtensionsPushOptions(app))
 
     // Then
-    expect(vi.mocked(exec)).toHaveBeenCalledWith('npm', ['exec', '--', 'javy', '--version'], {cwd: app.directory})
+    expect(vi.mocked(exec)).toHaveBeenCalledWith('npm', ['exec', '--', 'javy-cli', '--version'], {cwd: app.directory})
     expect(updateExtensionDraft).toHaveBeenCalledOnce()
     expect(enableDeveloperPreview).not.toHaveBeenCalled()
   })

packages/app/src/cli/services/function/build.test.ts

@@ -145,7 +145,7 @@ describe('runJavy', () => {
       [
         'exec',
         '--',
-        'javy',
+        'javy-cli',
         'compile',
         '-d',
         '-o',
@@ -329,7 +329,7 @@ describe('ExportJavyBuilder', () => {
           [
             'exec',
             '--',
-            'javy',
+            'javy-cli',
             'compile',
             '-d',
             '-o',

packages/app/src/cli/services/function/build.ts

@@ -165,7 +165,7 @@ export async function runJavy(
   options: JSFunctionBuildOptions,
   extra: string[] = [],
 ) {
-  const args = ['exec', '--', 'javy', 'compile', '-d', '-o', fun.outputPath, 'dist/function.js', ...extra]
+  const args = ['exec', '--', 'javy-cli', 'compile', '-d', '-o', fun.outputPath, 'dist/function.js', ...extra]
 
   return exec('npm', args, {
     cwd: fun.directory,
@@ -178,7 +178,7 @@ export async function runJavy(
 export async function installJavy(app: AppInterface) {
   const javyRequired = app.allExtensions.some((ext) => ext.features.includes('function') && ext.isJavaScript)
   if (javyRequired) {
-    await exec('npm', ['exec', '--', 'javy', '--version'], {cwd: app.directory})
+    await exec('npm', ['exec', '--', 'javy-cli', '--version'], {cwd: app.directory})
   }
 }