resolve external with module type

vercel · Sep 24, 2022 · cbb7e73 · cbb7e73
1 parent 243085c
commit cbb7e73
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -999,24 +999,25 @@ export default async function getBaseWebpackConfig(
       return `commonjs next/dist/lib/import-next-warning`
     }
 
+    const resolveWithReactServerCondition =
+      layer === WEBPACK_LAYERS.server
+        ? getResolve({
+            // 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
+              ? {
+                  react: `react-${process.env.__NEXT_REACT_CHANNEL}`,
+                  'react-dom': `react-dom-${process.env.__NEXT_REACT_CHANNEL}`,
+                }
+              : false,
+            // Prefer to resolve react-server condition first, fallback to node condition
+            conditionNames: ['react-server'],
+          })
+        : null
+
     // Special internal modules that must be bundled for Server Components.
     if (layer === WEBPACK_LAYERS.server) {
       if (!isLocal && /^react(?:$|\/)/.test(request)) {
-        const resolveWithReactServerCondition =
-          layer === WEBPACK_LAYERS.server
-            ? getResolve({
-                // 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
-                  ? {
-                      react: `react-${process.env.__NEXT_REACT_CHANNEL}`,
-                      'react-dom': `react-dom-${process.env.__NEXT_REACT_CHANNEL}`,
-                    }
-                  : false,
-                // Prefer to resolve react-server condition first, fallback to node condition
-                conditionNames: ['react-server', 'node', 'require'],
-              })
-            : null
         const [resolved] = await resolveWithReactServerCondition!(
           context,
           request
@@ -1157,10 +1158,9 @@ export default async function getBaseWebpackConfig(
             context,
             request
           )
-          return resolved
+          return `${externalType} ${resolved}`
         } catch (err) {
           // The `react-server` condition is not matched, fallback.
-          return
         }
       }