add missing client entry matcher

vercel · Jul 15, 2022 · 6e8a166 · 6e8a166
1 parent 27eb5bb
commit 6e8a166
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/packages/next/build/webpack/config/blocks/css/index.ts b/packages/next/build/webpack/config/blocks/css/index.ts
@@ -21,6 +21,8 @@ const regexCssModules = /\.module\.css$/
 // RegExps for Syntactically Awesome Style Sheets
 const regexSassGlobal = /(?<!\.module)\.(scss|sass)$/
 const regexSassModules = /\.module\.(scss|sass)$/
+// Also match the virtual client entry which doesn't have file path
+const clientEntryMatcher = (file: string) => !file
 
 /**
  * Mark a rule as removable if built-in CSS support is disabled
@@ -213,8 +215,13 @@ export const css = curry(async function css(
           // CSS Modules are only supported in the user's application. We're
           // not yet allowing CSS imports _within_ `node_modules`.
           issuer: {
-            and: [ctx.rootDirectory],
-            not: [/node_modules/],
+            or: [
+              {
+                and: [ctx.rootDirectory],
+                not: [/node_modules/],
+              },
+              clientEntryMatcher,
+            ],
           },
           use: getCssModuleLoader(ctx, lazyPostCSSInitializer),
         }),
@@ -364,8 +371,7 @@ export const css = curry(async function css(
               issuer: {
                 or: [
                   { and: [ctx.rootDirectory, /\.(js|mjs|jsx|ts|tsx)$/] },
-                  // Also match the virtual client entry which doesn't have file path
-                  (filePath) => !filePath,
+                  clientEntryMatcher,
                 ],
               },
               use: getGlobalCssLoader(ctx, lazyPostCSSInitializer),
@@ -382,8 +388,7 @@ export const css = curry(async function css(
               issuer: {
                 or: [
                   { and: [ctx.rootDirectory, /\.(js|mjs|jsx|ts|tsx)$/] },
-                  // Also match the virtual client entry which doesn't have file path
-                  (filePath) => !filePath,
+                  clientEntryMatcher,
                 ],
               },
               use: getCssModuleLoader(ctx, lazyPostCSSInitializer),

diff --git a/packages/next/build/webpack/plugins/client-entry-plugin.ts b/packages/next/build/webpack/plugins/client-entry-plugin.ts
@@ -83,13 +83,13 @@ export class ClientEntryPlugin {
           // client js: -> relative imports
           // TODO-APP: applied loaders for css
           // *.css (with loaders applied): -> relative css imports
-
+          const rawRequest = mod.rawRequest || ''
           const { relativePath } = mod.resourceResolveData || {}
           const modRequest =
-            mod.rawRequest &&
-            !mod.rawRequest.startsWith('.') &&
-            !mod.rawRequest.startsWith('/')
-              ? mod.rawRequest
+            !rawRequest.endsWith('.css') &&
+            !rawRequest.startsWith('.') &&
+            !rawRequest.startsWith('/')
+              ? rawRequest
               : relativePath || mod.userRequest
 
           if (visited.has(modRequest)) return