Merge pull request #7085 from Shopify/03-24-fix_restore_dist_index.wasm_bundle_path_contract_for_function_extensions

fix: restore dist/index.wasm bundle path contract for function extensions

Author: alfonso-noriega

packages/app/src/cli/models/app/loader.test.ts

@@ -2249,8 +2249,8 @@ describe('load', () => {
     // When
     const app = await loadTestingApp()
 
-    // Then
-    expect(app.allExtensions[0]!.outputPath).toMatch(/wasm32-wasi\/release\/my-function.wasm/)
+    // Then - outputPath always defaults to dist/index.wasm at load time; build.path is applied by buildFunctionExtension
+    expect(app.allExtensions[0]!.outputPath).toMatch(/dist\/index\.wasm/)
   })
 
   test(`defaults the function wasm path if not configured`, async () => {

packages/app/src/cli/models/extensions/extension-instance.test.ts

@@ -544,7 +544,7 @@ describe('draftMessages', async () => {
       expect(extensionInstance.outputPath).toBe(joinPath('test-function', 'dist', 'index.wasm'))
     })
 
-    test('uses custom path when build.path is defined', async () => {
+    test('uses default path when build.path is defined (custom path is only applied during build)', async () => {
       // Given
       const config = functionConfiguration()
       config.build = {
@@ -557,8 +557,8 @@ describe('draftMessages', async () => {
         dir: 'test-function',
       })
 
-      // Then
-      expect(extensionInstance.outputPath).toBe(joinPath('test-function', 'custom/output.wasm'))
+      // Then - outputPath always defaults to dist/index.wasm; build.path is applied by buildFunctionExtension
+      expect(extensionInstance.outputPath).toBe(joinPath('test-function', 'dist', 'index.wasm'))
     })
   })
 })

packages/app/src/cli/models/extensions/specifications/function.ts

@@ -89,8 +89,7 @@ const functionSpec = createExtensionSpecification({
   schema: FunctionExtensionSchema,
   appModuleFeatures: (_) => ['function'],
   buildConfig: {mode: 'function'},
-  getOutputRelativePath: (extension: ExtensionInstance<FunctionConfigType>) =>
-    extension.configuration.build?.path ?? joinPath('dist', 'index.wasm'),
+  getOutputRelativePath: (_extension: ExtensionInstance<FunctionConfigType>) => joinPath('dist', 'index.wasm'),
   deployConfig: async (config, directory, apiKey) => {
     let inputQuery: string | undefined
     const moduleId = randomUUID()

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

@@ -150,7 +150,8 @@ export async function buildFunctionExtension(
 
   try {
     const bundlePath = extension.outputPath
-    const relativeBuildPath = extension.specification.getOutputRelativePath?.(extension) ?? ''
+    const relativeBuildPath =
+      (extension as ExtensionInstance<FunctionConfigType>).configuration.build?.path ?? extension.outputRelativePath
 
     extension.outputPath = joinPath(extension.directory, relativeBuildPath)