fix compiler type

vercel · Oct 6, 2023 · 17df1b3 · 17df1b3
1 parent d3fe59d
commit 17df1b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/next/src/build/handle-externals.ts b/packages/next/src/build/handle-externals.ts
@@ -65,11 +65,7 @@ export async function resolveExternal(
 
   let preferEsmOptions =
     esmExternals && isEsmRequested ? [true, false] : [false]
-  // Disable esm resolving for app/ and pages/ so for esm package using under pages/
-  // won't load react through esm loader
-  if (hasAppDir) {
-    preferEsmOptions = [false]
-  }
+
   for (const preferEsm of preferEsmOptions) {
     const resolve = getResolve(
       preferEsm ? esmResolveOptions : nodeResolveOptions

diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
@@ -1604,7 +1604,7 @@ export default async function getBaseWebpackConfig(
                   ],
                 },
                 resolve: {
-                  mainFields: getMainField('app', 'server'),
+                  mainFields: getMainField('app', compilerType),
                   conditionNames: reactServerCondition,
                   // If missing the alias override here, the default alias will be used which aliases
                   // react to the direct file path, not the package name. In that case the condition
@@ -1750,7 +1750,7 @@ export default async function getBaseWebpackConfig(
                     exclude: [codeCondition.exclude],
                     use: swcLoaderForClientLayer,
                     resolve: {
-                      mainFields: getMainField('app', 'server'),
+                      mainFields: getMainField('app', compilerType),
                     },
                   },
                 ]