Merge branch 'canary' into shu/a4bc

vercel · May 9, 2023 · 2f9cf00 · 2f9cf00
2 parents 0088ee2 + 881d202
commit 2f9cf00
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 1 deletion.
diff --git a/packages/next/src/server/dev/hot-reloader.ts b/packages/next/src/server/dev/hot-reloader.ts
@@ -885,6 +885,10 @@ export default class HotReloader {
     const prevEdgeServerPageHashes = new Map<string, string>()
     const prevCSSImportModuleHashes = new Map<string, string>()
 
+    const pageExtensionRegex = new RegExp(
+      `\\.(?:${this.config.pageExtensions.join('|')})$`
+    )
+
     const trackPageChanges =
       (
         pageHashMap: Map<string, string>,
@@ -912,7 +916,9 @@ export default class HotReloader {
                   modsIterable.forEach((mod: any) => {
                     if (
                       mod.resource &&
-                      mod.resource.replace(/\\/g, '/').includes(key)
+                      mod.resource.replace(/\\/g, '/').includes(key) &&
+                      // Shouldn't match CSS modules, etc.
+                      pageExtensionRegex.test(mod.resource)
                     ) {
                       // use original source to calculate hash since mod.hash
                       // includes the source map in development which changes

diff --git a/test/e2e/app-dir/app-css/app/hmr/import/actual-styles.css b/test/e2e/app-dir/app-css/app/hmr/import/actual-styles.css
@@ -0,0 +1,3 @@
+body {
+  background-color: red;
+}
diff --git a/test/e2e/app-dir/app-css/app/hmr/import/page.css b/test/e2e/app-dir/app-css/app/hmr/import/page.css
@@ -0,0 +1 @@
+@import './actual-styles.css';
diff --git a/test/e2e/app-dir/app-css/app/hmr/import/page.js b/test/e2e/app-dir/app-css/app/hmr/import/page.js
@@ -0,0 +1,5 @@
+import './page.css'
+
+export default function Page() {
+  return <div>hello!</div>
+}
diff --git a/test/e2e/app-dir/app-css/index.test.ts b/test/e2e/app-dir/app-css/index.test.ts
@@ -301,6 +301,40 @@ createNextDescribe(
           }
         })
 
+        it('should reload @import styles during HMR', async () => {
+          const filePath = 'app/hmr/import/actual-styles.css'
+          const origContent = await next.readFile(filePath)
+
+          // background should be red
+          const browser = await next.browser('/hmr/import')
+          expect(
+            await browser.eval(
+              `window.getComputedStyle(document.querySelector('body')).backgroundColor`
+            )
+          ).toBe('rgb(255, 0, 0)')
+
+          try {
+            await next.patchFile(
+              filePath,
+              origContent.replace(
+                'background-color: red;',
+                'background-color: blue;'
+              )
+            )
+
+            // Wait for HMR to trigger
+            await check(
+              () =>
+                browser.eval(
+                  `window.getComputedStyle(document.querySelector('body')).backgroundColor`
+                ),
+              'rgb(0, 0, 255)'
+            )
+          } finally {
+            await next.patchFile(filePath, origContent)
+          }
+        })
+
         describe('multiple entries', () => {
           it('should only inject the same style once if used by different layers', async () => {
             const browser = await next.browser('/css/css-duplicate-2/client')