Unverified Commit a65e5c07 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Remove reactServerCondition property as it is not used (#57236)

Removes the unused properties from createRSCAliases.
parent dc88b413
...@@ -235,11 +235,14 @@ export function createServerOnlyClientOnlyAliases(isServer: boolean): { ...@@ -235,11 +235,14 @@ export function createServerOnlyClientOnlyAliases(isServer: boolean): {
export function createRSCAliases( export function createRSCAliases(
bundledReactChannel: string, bundledReactChannel: string,
opts: { {
layer,
isEdgeServer,
reactProductionProfiling,
}: {
layer: WebpackLayerName layer: WebpackLayerName
isEdgeServer: boolean isEdgeServer: boolean
reactProductionProfiling: boolean reactProductionProfiling: boolean
reactServerCondition?: boolean
} }
) { ) {
let alias: Record<string, string> = { let alias: Record<string, string> = {
...@@ -257,29 +260,29 @@ export function createRSCAliases( ...@@ -257,29 +260,29 @@ export function createRSCAliases(
'react-server-dom-webpack/server.node$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/server.node`, 'react-server-dom-webpack/server.node$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/server.node`,
} }
if (!opts.isEdgeServer) { if (!isEdgeServer) {
if (opts.layer === WEBPACK_LAYERS.serverSideRendering) { if (layer === WEBPACK_LAYERS.serverSideRendering) {
alias = Object.assign(alias, { alias = Object.assign(alias, {
'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-jsx-runtime`, 'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-jsx-runtime`,
'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-jsx-dev-runtime`, 'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-jsx-dev-runtime`,
react$: `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react`, react$: `next/dist/server/future/route-modules/app-page/vendored/${layer}/react`,
'react-dom$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-dom`, 'react-dom$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-dom`,
'react-server-dom-webpack/client.edge$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-server-dom-webpack-client-edge`, 'react-server-dom-webpack/client.edge$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-client-edge`,
}) })
} else if (opts.layer === WEBPACK_LAYERS.reactServerComponents) { } else if (layer === WEBPACK_LAYERS.reactServerComponents) {
alias = Object.assign(alias, { alias = Object.assign(alias, {
'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-jsx-runtime`, 'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-jsx-runtime`,
'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-jsx-dev-runtime`, 'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-jsx-dev-runtime`,
react$: `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react`, react$: `next/dist/server/future/route-modules/app-page/vendored/${layer}/react`,
'react-dom$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-dom`, 'react-dom$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-dom`,
'react-server-dom-webpack/server.edge$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-server-dom-webpack-server-edge`, 'react-server-dom-webpack/server.edge$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-server-edge`,
'react-server-dom-webpack/server.node$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-server-dom-webpack-server-node`, 'react-server-dom-webpack/server.node$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-server-node`,
}) })
} }
} }
if (opts.isEdgeServer) { if (isEdgeServer) {
if (opts.layer === WEBPACK_LAYERS.reactServerComponents) { if (layer === WEBPACK_LAYERS.reactServerComponents) {
alias[ alias[
'react$' 'react$'
] = `next/dist/compiled/react${bundledReactChannel}/react.shared-subset` ] = `next/dist/compiled/react${bundledReactChannel}/react.shared-subset`
...@@ -291,7 +294,7 @@ export function createRSCAliases( ...@@ -291,7 +294,7 @@ export function createRSCAliases(
] = `next/dist/compiled/react-dom${bundledReactChannel}/server-rendering-stub` ] = `next/dist/compiled/react-dom${bundledReactChannel}/server-rendering-stub`
} }
if (opts.reactProductionProfiling) { if (reactProductionProfiling) {
alias[ alias[
'react-dom$' 'react-dom$'
] = `next/dist/compiled/react-dom${bundledReactChannel}/profiling` ] = `next/dist/compiled/react-dom${bundledReactChannel}/profiling`
......
...@@ -1303,7 +1303,6 @@ export default async function getBaseWebpackConfig( ...@@ -1303,7 +1303,6 @@ export default async function getBaseWebpackConfig(
// react to the direct file path, not the package name. In that case the condition // react to the direct file path, not the package name. In that case the condition
// will be ignored completely. // will be ignored completely.
alias: createRSCAliases(bundledReactChannel, { alias: createRSCAliases(bundledReactChannel, {
reactServerCondition: true,
// No server components profiling // No server components profiling
reactProductionProfiling, reactProductionProfiling,
layer: WEBPACK_LAYERS.reactServerComponents, layer: WEBPACK_LAYERS.reactServerComponents,
...@@ -1364,7 +1363,6 @@ export default async function getBaseWebpackConfig( ...@@ -1364,7 +1363,6 @@ export default async function getBaseWebpackConfig(
// It needs `conditionNames` here to require the proper asset, // It needs `conditionNames` here to require the proper asset,
// when react is acting as dependency of compiled/react-dom. // when react is acting as dependency of compiled/react-dom.
alias: createRSCAliases(bundledReactChannel, { alias: createRSCAliases(bundledReactChannel, {
reactServerCondition: true,
reactProductionProfiling, reactProductionProfiling,
layer: WEBPACK_LAYERS.reactServerComponents, layer: WEBPACK_LAYERS.reactServerComponents,
isEdgeServer, isEdgeServer,
...@@ -1376,7 +1374,6 @@ export default async function getBaseWebpackConfig( ...@@ -1376,7 +1374,6 @@ export default async function getBaseWebpackConfig(
issuerLayer: WEBPACK_LAYERS.serverSideRendering, issuerLayer: WEBPACK_LAYERS.serverSideRendering,
resolve: { resolve: {
alias: createRSCAliases(bundledReactChannel, { alias: createRSCAliases(bundledReactChannel, {
reactServerCondition: false,
reactProductionProfiling, reactProductionProfiling,
layer: WEBPACK_LAYERS.serverSideRendering, layer: WEBPACK_LAYERS.serverSideRendering,
isEdgeServer, isEdgeServer,
...@@ -1390,12 +1387,7 @@ export default async function getBaseWebpackConfig( ...@@ -1390,12 +1387,7 @@ export default async function getBaseWebpackConfig(
issuerLayer: WEBPACK_LAYERS.appPagesBrowser, issuerLayer: WEBPACK_LAYERS.appPagesBrowser,
resolve: { resolve: {
alias: createRSCAliases(bundledReactChannel, { alias: createRSCAliases(bundledReactChannel, {
// Only alias server rendering stub in client SSR layer.
// reactSharedSubset: false,
// reactDomServerRenderingStub: false,
reactServerCondition: false,
reactProductionProfiling, reactProductionProfiling,
// browser: isClient,
layer: WEBPACK_LAYERS.appPagesBrowser, layer: WEBPACK_LAYERS.appPagesBrowser,
isEdgeServer, isEdgeServer,
}), }),
......
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