fix alias logic

vercel · Sep 21, 2022 · a096b89 · a096b89
1 parent 72a1996
commit a096b89
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -1010,13 +1010,17 @@ export default async function getBaseWebpackConfig(
     const resolveWithReactServerCondition =
       layer === WEBPACK_LAYERS.server
         ? getResolve({
-            alias: {
-              ...reactAliases,
-              'react/package.json': `${reactDir}/package.json`,
-              'react/jsx-runtime': `${reactDir}/jsx-runtime`,
-              'react/jsx-dev-runtime': `${reactDir}/jsx-dev-runtime`,
-              'react-dom/package.json': `${reactDomDir}/package.json`,
-            },
+            // If React is aliased to another channel during Next.js' local development,
+            // we need to provide that alias to webpack's resolver.
+            alias: process.env.__NEXT_REACT_CHANNEL
+              ? {
+                  ...reactAliases,
+                  'react/package.json': `${reactDir}/package.json`,
+                  'react/jsx-runtime': `${reactDir}/jsx-runtime`,
+                  'react/jsx-dev-runtime': `${reactDir}/jsx-dev-runtime`,
+                  'react-dom/package.json': `${reactDomDir}/package.json`,
+                }
+              : false,
             conditionNames: ['react-server'],
           })
         : null