Merge pull request #4624 from Shopify/fd-fix-local-asset-serve

[Theme] Fix local asset serve for backward compatibility

.changeset/wicked-cycles-bake.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+Fix serving local assets from the root path for backward compatibility.

packages/theme/src/cli/utilities/theme-environment/local-assets.ts

@@ -80,8 +80,8 @@ function findLocalFile(event: H3Event<EventHandlerRequest>, ctx: DevServerContex
 
   // Try to match theme asset files first and fallback to theme extension asset files
   return (
-    tryGetFile(/^\/cdn\/.*?\/assets\/([^?]+)/, ctx.localThemeFileSystem) ??
-    tryGetFile(/^\/ext\/cdn\/extensions\/.*?\/assets\/([^?]+)/, ctx.localThemeExtensionFileSystem) ?? {
+    tryGetFile(/^(?:\/cdn\/.*?)?\/assets\/([^?]+)/, ctx.localThemeFileSystem) ??
+    tryGetFile(/^(?:\/ext\/cdn\/extensions\/.*?)?\/assets\/([^?]+)/, ctx.localThemeExtensionFileSystem) ?? {
       isUnsynced: false,
       fileKey: undefined,
       file: undefined,

packages/theme/src/cli/utilities/theme-environment/theme-environment.test.ts

@@ -224,6 +224,18 @@ describe('setupDevServer', () => {
       )
     })
 
+    test('serves local assets from the root in a backward compatible way', async () => {
+      // Also serves assets from the root, similar to what the old server did:
+      const eventPromise = dispatchEvent('/assets/file2.css')
+      await expect(eventPromise).resolves.not.toThrow()
+
+      expect(vi.mocked(render)).not.toHaveBeenCalled()
+
+      const {res, body} = await eventPromise
+      expect(res.getHeader('content-type')).toEqual('text/css')
+      expect(body.toString()).toMatchInlineSnapshot(`".another-class {}"`)
+    })
+
     test('gets the right content for assets with non-breaking spaces', async () => {
       const eventPromise = dispatchEvent('/cdn/somepathhere/assets/file-with-nbsp.js')
       await expect(eventPromise).resolves.not.toThrow()