Unverified Commit 2595a276 authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

Use vendored React version in Middleware and Instrumentation (#69619)

Co-authored-by: 's avatarJiachi Liu <inbox@huozhi.im>
parent b8173544
...@@ -14,6 +14,7 @@ import type { NextConfigComplete } from '../server/config-shared' ...@@ -14,6 +14,7 @@ import type { NextConfigComplete } from '../server/config-shared'
import { defaultOverrides } from '../server/require-hook' import { defaultOverrides } from '../server/require-hook'
import { NEXT_PROJECT_ROOT, hasExternalOtelApiPackage } from './webpack-config' import { NEXT_PROJECT_ROOT, hasExternalOtelApiPackage } from './webpack-config'
import { WEBPACK_LAYERS } from '../lib/constants' import { WEBPACK_LAYERS } from '../lib/constants'
import { isWebpackServerOnlyLayer } from './utils'
interface CompilerAliases { interface CompilerAliases {
[alias: string]: string | string[] [alias: string]: string | string[]
...@@ -236,17 +237,6 @@ export function createAppRouterApiAliases(isServerOnlyLayer: boolean) { ...@@ -236,17 +237,6 @@ export function createAppRouterApiAliases(isServerOnlyLayer: boolean) {
return aliasMap return aliasMap
} }
export function createRSCRendererAliases(bundledReactChannel: string) {
return {
// react-server-dom-webpack alias
'react-server-dom-webpack/client$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/client`,
'react-server-dom-webpack/client.edge$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/client.edge`,
'react-server-dom-webpack/server.edge$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/server.edge`,
'react-server-dom-webpack/server.node$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/server.node`,
'react-server-dom-webpack/static.edge$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/static.edge`,
}
}
export function createRSCAliases( export function createRSCAliases(
bundledReactChannel: string, bundledReactChannel: string,
{ {
...@@ -259,6 +249,14 @@ export function createRSCAliases( ...@@ -259,6 +249,14 @@ export function createRSCAliases(
reactProductionProfiling: boolean reactProductionProfiling: boolean
} }
): CompilerAliases { ): CompilerAliases {
const isServerOnlyLayer = isWebpackServerOnlyLayer(layer)
// For middleware, instrumentation layers, treat them as rsc layer.
// Since we only built the runtime package for rsc, convert everything to rsc
// to ensure the runtime modules path existed.
if (isServerOnlyLayer) {
layer = WEBPACK_LAYERS.reactServerComponents
}
let alias: Record<string, string> = { let alias: Record<string, string> = {
react$: `next/dist/compiled/react${bundledReactChannel}`, react$: `next/dist/compiled/react${bundledReactChannel}`,
'react-dom$': `next/dist/compiled/react-dom${bundledReactChannel}`, 'react-dom$': `next/dist/compiled/react-dom${bundledReactChannel}`,
...@@ -274,7 +272,11 @@ export function createRSCAliases( ...@@ -274,7 +272,11 @@ export function createRSCAliases(
// optimizations to ignore the legacy build of react-dom/server in `server.edge` build // optimizations to ignore the legacy build of react-dom/server in `server.edge` build
'react-dom/server.edge$': `next/dist/build/webpack/alias/react-dom-server-edge${bundledReactChannel}.js`, 'react-dom/server.edge$': `next/dist/build/webpack/alias/react-dom-server-edge${bundledReactChannel}.js`,
// react-server-dom-webpack alias // react-server-dom-webpack alias
...createRSCRendererAliases(bundledReactChannel), 'react-server-dom-webpack/client$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/client`,
'react-server-dom-webpack/client.edge$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/client.edge`,
'react-server-dom-webpack/server.edge$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/server.edge`,
'react-server-dom-webpack/server.node$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/server.node`,
'react-server-dom-webpack/static.edge$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/static.edge`,
} }
if (!isEdgeServer) { if (!isEdgeServer) {
......
...@@ -81,7 +81,6 @@ import { ...@@ -81,7 +81,6 @@ import {
createRSCAliases, createRSCAliases,
createNextApiEsmAliases, createNextApiEsmAliases,
createAppRouterApiAliases, createAppRouterApiAliases,
createRSCRendererAliases,
} from './create-compiler-aliases' } from './create-compiler-aliases'
import { hasCustomExportOutput } from '../export/utils' import { hasCustomExportOutput } from '../export/utils'
import { CssChunkingPlugin } from './webpack/plugins/css-chunking-plugin' import { CssChunkingPlugin } from './webpack/plugins/css-chunking-plugin'
...@@ -1475,8 +1474,11 @@ export default async function getBaseWebpackConfig( ...@@ -1475,8 +1474,11 @@ export default async function getBaseWebpackConfig(
resolve: { resolve: {
mainFields: getMainField(compilerType, true), mainFields: getMainField(compilerType, true),
conditionNames: reactServerCondition, conditionNames: reactServerCondition,
// Always use default channels when use installed react alias: createRSCAliases(bundledReactChannel, {
alias: createRSCRendererAliases(''), reactProductionProfiling,
layer: WEBPACK_LAYERS.middleware,
isEdgeServer,
}),
}, },
}, },
{ {
...@@ -1486,8 +1488,11 @@ export default async function getBaseWebpackConfig( ...@@ -1486,8 +1488,11 @@ export default async function getBaseWebpackConfig(
resolve: { resolve: {
mainFields: getMainField(compilerType, true), mainFields: getMainField(compilerType, true),
conditionNames: reactServerCondition, conditionNames: reactServerCondition,
// Always use default channels when use installed react alias: createRSCAliases(bundledReactChannel, {
alias: createRSCRendererAliases(''), reactProductionProfiling,
layer: WEBPACK_LAYERS.instrument,
isEdgeServer,
}),
}, },
}, },
...(hasAppDir ...(hasAppDir
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment