Merge pull request #5024 from Shopify/fix-function-drafts-stable

[stable] Fix function drafts during `dev`
Shopify · Dec 4, 2024 · 1312153 · 1312153
2 parents 38dc70c + 998ba06
commit 1312153
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.changeset/wicked-singers-explode.md b/.changeset/wicked-singers-explode.md
@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Fix function drafts not working during dev
diff --git a/packages/app/src/cli/services/dev/update-extension.test.ts b/packages/app/src/cli/services/dev/update-extension.test.ts
@@ -206,7 +206,7 @@ describe('updateExtensionDraft()', () => {
       const content = 'test content'
       const base64Content = Buffer.from(content).toString('base64')
       await mkdir(joinPath(mockExtension.directory, 'dist'))
-      const outputPath = mockExtension.getOutputPathForDirectory(tmpDir)
+      const outputPath = mockExtension.outputPath
       await mkdir(dirname(outputPath))
       await writeFile(outputPath, content)
 

diff --git a/packages/app/src/cli/services/dev/update-extension.ts b/packages/app/src/cli/services/dev/update-extension.ts
@@ -50,15 +50,17 @@ export async function updateExtensionDraft({
     // When updating just the theme extension draft, upload the files as part of the config.
     config = await themeExtensionConfig(extension)
   } else {
-    config = (await extension.deployConfig({apiKey, appConfiguration})) || {}
+    config = (await extension.deployConfig({apiKey, appConfiguration})) ?? {}
   }
 
   const draftableConfig: {[key: string]: unknown} = {
     ...config,
     serialized_script: encodedFile,
   }
   if (extension.isFunctionExtension) {
-    const compiledFiles = await readFile(outputPath, {encoding: 'base64'})
+    // For function drafts we need to use the `extension.outputPath` instead of `bundlePath`
+    // The wasm in the bundle path is encoded in base64.
+    const compiledFiles = await readFile(extension.outputPath, {encoding: 'base64'})
     draftableConfig.uploaded_files = {'dist/index.wasm': compiledFiles}
   }
   const extensionInput: ExtensionUpdateDraftMutationVariables = {