Merge pull request #6146 from Shopify/07-22-fix_validation_error_when_theme_extension_deployed_with_no-build

fix validation error when theme extension deployed with no-build

Author: isaacroldan

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

@@ -17,7 +17,7 @@ import {FunctionConfigType} from '../extensions/specifications/function.js'
 import {ExtensionBuildOptions} from '../../services/build/extension.js'
 import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js'
 import {joinPath} from '@shopify/cli-kit/node/path'
-import {describe, expect, test} from 'vitest'
+import {describe, expect, test, vi} from 'vitest'
 import {inTemporaryDirectory, readFile, mkdir, writeFile, fileExistsSync} from '@shopify/cli-kit/node/fs'
 import {slugify} from '@shopify/cli-kit/common/string'
 import {hashString, nonRandomUUID} from '@shopify/cli-kit/node/crypto'
@@ -232,6 +232,39 @@ describe('build', async () => {
       expect(outputFileContent).toEqual('(()=>{})();')
     })
   })
+
+  test('does not copy shopify.extension.toml file when bundling theme extensions', async () => {
+    await inTemporaryDirectory(async (tmpDir) => {
+      // Given
+      const extension = await testThemeExtensions(tmpDir)
+
+      const blocksDir = joinPath(tmpDir, 'blocks')
+      await mkdir(blocksDir)
+
+      await writeFile(joinPath(blocksDir, 'product.liquid'), '<div>Product block</div>')
+      await writeFile(joinPath(tmpDir, 'shopify.extension.toml'), '[extensions]')
+
+      const bundleDirectory = joinPath(tmpDir, 'bundle')
+      await mkdir(bundleDirectory)
+
+      const options: ExtensionBuildOptions = {
+        stdout: new Writable({write: vi.fn()}),
+        stderr: new Writable({write: vi.fn()}),
+        app: testApp(),
+        environment: 'production',
+      }
+
+      // When
+      await extension.copyIntoBundle(options, bundleDirectory)
+
+      // Then
+      const outputTomlPath = joinPath(extension.outputPath, 'shopify.extension.toml')
+      expect(fileExistsSync(outputTomlPath)).toBe(false)
+
+      const outputProductPath = joinPath(extension.outputPath, 'blocks', 'product.liquid')
+      expect(fileExistsSync(outputProductPath)).toBe(true)
+    })
+  })
 })
 
 describe('deployConfig', async () => {

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

@@ -385,7 +385,9 @@ export class ExtensionInstance<TConfiguration extends BaseConfigType = BaseConfi
 
     const buildMode = this.buildMode(options)
 
-    if (buildMode !== 'none') {
+    if (this.isThemeExtension) {
+      await bundleThemeExtension(this, options)
+    } else if (buildMode !== 'none') {
       outputDebug(`Will copy pre-built file from ${defaultOutputPath} to ${this.outputPath}`)
       if (await fileExists(defaultOutputPath)) {
         await copyFile(defaultOutputPath, this.outputPath)
@@ -394,10 +396,6 @@ export class ExtensionInstance<TConfiguration extends BaseConfigType = BaseConfi
           await bundleFunctionExtension(this.outputPath, this.outputPath)
         }
       }
-
-      if (this.isThemeExtension) {
-        await bundleThemeExtension(this, options)
-      }
     }
   }