fixes vercel#29553 (vercel#29611)

fixes vercel#29553 ## Bug - [x] Related issues linked using `fixes #number` - [x] Integration tests added - [ ] Errors have helpful link attached, see `contributing.md`
imekinox · Oct 4, 2021 · 1582251 · 1582251
1 parent 92c2dd4
commit 1582251
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -179,7 +179,6 @@ export function attachReactRefresh(
 export const NODE_RESOLVE_OPTIONS = {
   dependencyType: 'commonjs',
   modules: ['node_modules'],
-  alias: false,
   fallback: false,
   exportsFields: ['exports'],
   importsFields: ['imports'],
@@ -197,13 +196,24 @@ export const NODE_RESOLVE_OPTIONS = {
   restrictions: [],
 }
 
+export const NODE_BASE_RESOLVE_OPTIONS = {
+  ...NODE_RESOLVE_OPTIONS,
+  alias: false,
+}
+
 export const NODE_ESM_RESOLVE_OPTIONS = {
   ...NODE_RESOLVE_OPTIONS,
+  alias: false,
   dependencyType: 'esm',
   conditionNames: ['node', 'import'],
   fullySpecified: true,
 }
 
+export const NODE_BASE_ESM_RESOLVE_OPTIONS = {
+  ...NODE_ESM_RESOLVE_OPTIONS,
+  alias: false,
+}
+
 let TSCONFIG_WARNED = false
 
 export default async function getBaseWebpackConfig(
@@ -808,7 +818,7 @@ export default async function getBaseWebpackConfig(
     let baseIsEsm: boolean
     try {
       const baseResolve = getResolve(
-        isEsm ? NODE_ESM_RESOLVE_OPTIONS : NODE_RESOLVE_OPTIONS
+        isEsm ? NODE_BASE_ESM_RESOLVE_OPTIONS : NODE_BASE_RESOLVE_OPTIONS
       )
       ;[baseRes, baseIsEsm] = await baseResolve(dir, request)
     } catch (err) {

diff --git a/test/integration/externals-esm-loose/node_modules/preact/compat.js b/test/integration/externals-esm-loose/node_modules/preact/compat.js
diff --git a/test/integration/externals-esm/node_modules/preact/compat.js b/test/integration/externals-esm/node_modules/preact/compat.js
diff --git a/test/integration/externals/node_modules/preact/compat.js b/test/integration/externals/node_modules/preact/compat.js