Fix bundling and module resolution in the server layer

packages/next/build/webpack-config.ts

@@ -1001,29 +1001,10 @@ 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,
-            conditionNames: ['react-server'],
-          })
-        : null
-
-    // Special internal modules that require to be bundled for Server Components.
+    // Special internal modules that must be bundled for Server Components.
     if (layer === WEBPACK_LAYERS.server) {
-      if (!isLocal && /^react(?:$|\/)/.test(request)) {
-        const [resolved] = await resolveWithReactServerCondition!(
-          context,
-          request
-        )
-        return resolved
+      if (!isLocal && /^react$/.test(request)) {
+        return
       }
       if (
         request ===
@@ -1153,25 +1134,22 @@ export default async function getBaseWebpackConfig(
     }
 
     if (/node_modules[/\\].*\.[mc]?js$/.test(res)) {
-      if (
-        layer === WEBPACK_LAYERS.server &&
-        (!config.experimental?.optoutServerComponentsBundle ||
-          !config.experimental?.optoutServerComponentsBundle.some(
-            // Check if a package is opt-out of Server Components bundling.
-            (packageName) =>
-              new RegExp(`node_modules[/\\\\]${packageName}[/\\\\]`).test(res)
-          ))
-      ) {
-        try {
-          const [resolved] = await resolveWithReactServerCondition!(
-            context,
-            request
+      if (layer === WEBPACK_LAYERS.server) {
+        // All packages should be bundled for the server layer if they're not opted out.
+        if (
+          config.experimental.optoutServerComponentsBundle?.some(
+            (p: string) => {
+              return (
+                res.includes('node_modules/' + p + '/') ||
+                res.includes('node_modules\\' + p + '\\')
+              )
+            }
           )
-          return `${externalType} ${resolved}`
-        } catch (err) {
-          return
-          // The `react-server` condition is not matched, fallback.
+        ) {
+          return `${externalType} ${request}`
         }
+
+        return
       }
 
       // Anything else that is standard JavaScript within `node_modules`
@@ -1528,6 +1506,45 @@ export default async function getBaseWebpackConfig(
     },
     module: {
       rules: [
+        ...(config.experimental.appDir && !isClient && !isEdgeServer
+          ? [
+              {
+                issuerLayer: WEBPACK_LAYERS.server,
+                test: (req: string) => {
+                  if (
+                    !/\.m?js/.test(req) ||
+                    config.experimental.optoutServerComponentsBundle?.some(
+                      (mod) => {
+                        return req.includes('/node_modules/' + mod + '/')
+                      }
+                    )
+                  ) {
+                    return false
+                  }
+                  return true
+                },
+                resolve: process.env.__NEXT_REACT_CHANNEL
+                  ? {
+                      conditionNames: ['react-server', 'node', 'require'],
+                      alias: {
+                        react: `react-${process.env.__NEXT_REACT_CHANNEL}`,
+                        'react-dom': `react-dom-${process.env.__NEXT_REACT_CHANNEL}`,
+                      },
+                    }
+                  : {
+                      conditionNames: ['react-server', 'node', 'require'],
+                      alias: {
+                        // 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
+                        // will be ignored completely.
+                        react: 'react',
+                        'react-dom': 'react-dom',
+                      },
+                    },
+              },
+            ]
+          : []),
+
         // TODO: FIXME: do NOT webpack 5 support with this
         // x-ref: https://github.com/webpack/webpack/issues/11467
         ...(!config.experimental.fullySpecified

test/e2e/app-dir/rsc-basic.test.ts

@@ -403,9 +403,14 @@ describe('app dir - react server components', () => {
     await fetchViaHTTP(next.url, '/react-server/3rd-party-package').then(
       async (response) => {
         const result = await resolveStreamResponse(response)
-        expect(result).toContain('Server: index.react-server')
+
+        // Package should be resolved based on the react-server condition,
+        // as well as package's dependencies.
+        expect(result).toContain('Server: index.react-server:react.subset')
+        expect(result).toContain('Client: index.default:react.full')
+
+        // Subpath exports should be resolved based on the condition too.
         expect(result).toContain('Server subpath: subpath.react-server')
-        expect(result).toContain('Client: index.default')
         expect(result).toContain('Client subpath: subpath.default')
       }
     )

test/e2e/app-dir/rsc-basic/node_modules_bak/conditional-exports/index.js

@@ -1 +1,4 @@
-module.exports = 'index.default'
+const react = require('react')
+
+module.exports =
+  'index.default:' + ('useState' in react ? 'react.full' : 'react.subset')

test/e2e/app-dir/rsc-basic/node_modules_bak/conditional-exports/index.server.js

@@ -1 +1,4 @@
-module.exports = 'index.react-server'
+const react = require('react')
+
+module.exports =
+  'index.react-server:' + ('useState' in react ? 'react.full' : 'react.subset')