Merge pull request #7502 from Shopify/cx-register-assets-without-identifier

fix(dev): Register static assets without identifier for relative src paths

Author: MitchLillie

packages/app/src/cli/services/dev/extension/payload.test.ts

@@ -412,14 +412,14 @@ describe('getUIExtensionPayload', () => {
           assets: {
             assets: {
               name: 'assets',
-              url: 'http://tunnel-url.com/extensions/devUUID/assets/CUSTOM_EXTENSION_POINT/assets/',
+              url: 'http://tunnel-url.com/extensions/devUUID/assets/CUSTOM_EXTENSION_POINT/',
               lastUpdated: expect.any(Number),
             },
           },
         },
       ])
-      expect(resolver.get('CUSTOM_EXTENSION_POINT/assets/foo.json')).toBe('foo.json')
-      expect(resolver.get('CUSTOM_EXTENSION_POINT/assets/subdir/bar.png')).toBe('subdir/bar.png')
+      expect(resolver.get('CUSTOM_EXTENSION_POINT/foo.json')).toBe('foo.json')
+      expect(resolver.get('CUSTOM_EXTENSION_POINT/subdir/bar.png')).toBe('subdir/bar.png')
     })
   })
 
@@ -465,16 +465,16 @@ describe('getUIExtensionPayload', () => {
       expect(got.extensionPoints).toMatchObject([
         {
           target: 'TARGET_A',
-          assets: {assets: {url: 'http://tunnel-url.com/extensions/devUUID/assets/TARGET_A/assets/'}},
+          assets: {assets: {url: 'http://tunnel-url.com/extensions/devUUID/assets/TARGET_A/'}},
         },
         {
           target: 'TARGET_B',
-          assets: {assets: {url: 'http://tunnel-url.com/extensions/devUUID/assets/TARGET_B/assets/'}},
+          assets: {assets: {url: 'http://tunnel-url.com/extensions/devUUID/assets/TARGET_B/'}},
         },
       ])
       // Both targets' resolver entries point at the same output-relative file.
-      expect(resolver.get('TARGET_A/assets/foo.json')).toBe('foo.json')
-      expect(resolver.get('TARGET_B/assets/foo.json')).toBe('foo.json')
+      expect(resolver.get('TARGET_A/foo.json')).toBe('foo.json')
+      expect(resolver.get('TARGET_B/foo.json')).toBe('foo.json')
     })
   })
 

packages/app/src/cli/services/dev/extension/payload.ts

@@ -250,9 +250,8 @@ async function staticAssetsMapper(
   files: string[],
 ): Promise<Partial<DevNewExtensionPointSchema>> {
   if (files.length === 0) return {}
-  const urlSubpath = `${target}/${identifier}`
   for (const file of files) {
-    resolver?.set(`${urlSubpath}/${file}`, file)
+    resolver?.set(`${target}/${file}`, file)
   }
   const updatedTimestamps = await Promise.all(
     files.map(async (file) => (await fileLastUpdatedTimestamp(joinPath(buildDirectory, file))) ?? 0),
@@ -261,7 +260,7 @@ async function staticAssetsMapper(
     assets: {
       [identifier]: {
         name: identifier,
-        url: `${url}/assets/${urlSubpath}/`,
+        url: `${url}/assets/${target}/`,
         lastUpdated: Math.max(...updatedTimestamps),
       },
     },