Merge branch 'canary' into patch-1

vercel · Feb 1, 2022 · de90dec · de90dec
2 parents 6a3ca1c + a803638
commit de90dec
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -959,11 +959,6 @@ export default async function getBaseWebpackConfig(
     },
   }
 
-  const nonUserCondition = {
-    include: /node_modules/,
-    exclude: babelIncludeRegexes,
-  }
-
   let webpackConfig: webpack.Configuration = {
     parallelism: Number(process.env.NEXT_WEBPACK_PARALLELISM) || undefined,
     externals: targetWeb
@@ -1256,13 +1251,6 @@ export default async function getBaseWebpackConfig(
             },
           ],
         },
-        {
-          ...nonUserCondition,
-          // Make all non-user modules to be compiled in a single layer
-          // This avoids compiling them mutliple times and avoids module id changes
-          issuerLayer: 'middleware',
-          layer: '',
-        },
         ...(!config.images.disableStaticImages
           ? [
               {

diff --git a/test/integration/middleware/hmr/node_modules/shared-package/index.js b/test/integration/middleware/hmr/node_modules/shared-package/index.js
diff --git a/test/integration/middleware/hmr/node_modules/shared-package/package.json b/test/integration/middleware/hmr/node_modules/shared-package/package.json
diff --git a/test/integration/middleware/hmr/pages/about/_middleware.js b/test/integration/middleware/hmr/pages/about/_middleware.js
@@ -1,5 +1,7 @@
 import { NextResponse } from 'next/server'
+import magicValue from 'shared-package'
 
 export function middleware(request) {
+  if (magicValue !== 42) throw new Error('shared-package problem')
   return NextResponse.rewrite(new URL('/about/a', request.url))
 }
diff --git a/test/integration/middleware/hmr/pages/index.js b/test/integration/middleware/hmr/pages/index.js
@@ -1,3 +1,6 @@
+import magicValue from 'shared-package'
+if (magicValue !== 42) throw new Error('shared-package problem')
+
 export default function Home() {
   return (
     <div>