Unverified Commit aa4efc11 authored by Jimmy Lai's avatar Jimmy Lai Committed by GitHub

build: add aliases for react-dom/server usage in server bundles (#55536)

Some people are using `ReactDOM/server` in some contexts like App Routes and Server Actions. The changes in #55362 made it so that there were no more aliases if they wanted to use it so it would fallback to their versions of React, which might not include the APIs you would expect from canary.

Also reverting the decision to proxy `ReactDOM/server` to `ReactDOM/server.edge` in the SSR layer as the APIs are not the same.
parent c628076e
...@@ -535,16 +535,7 @@ async fn insert_next_server_special_aliases( ...@@ -535,16 +535,7 @@ async fn insert_next_server_special_aliases(
// layer TODO: add the rests // layer TODO: add the rests
import_map.insert_exact_alias( import_map.insert_exact_alias(
"react-dom/server", "react-dom/server",
request_to_import_mapping( request_to_import_mapping(app_dir, "next/dist/compiled/react-dom/server"),
app_dir,
match runtime {
NextRuntime::Edge => "next/dist/compiled/react-dom/server.edge",
NextRuntime::NodeJs => {
"next/dist/server/future/route-modules/app-page/vendored/ssr/\
react-dom-server-edge"
}
},
),
); );
import_map.insert_exact_alias( import_map.insert_exact_alias(
"react-dom/server.edge", "react-dom/server.edge",
...@@ -656,16 +647,11 @@ async fn insert_next_server_special_aliases( ...@@ -656,16 +647,11 @@ async fn insert_next_server_special_aliases(
// layer TODO: add the rests // layer TODO: add the rests
import_map.insert_exact_alias( import_map.insert_exact_alias(
"react-dom/server.edge", "react-dom/server.edge",
request_to_import_mapping( request_to_import_mapping(app_dir, "next/dist/compiled/react-dom/server.edge"),
app_dir, );
match runtime { import_map.insert_exact_alias(
NextRuntime::Edge => "next/dist/compiled/react-dom/server.edge", "react-dom/server",
NextRuntime::NodeJs => { request_to_import_mapping(app_dir, "next/dist/compiled/react-dom/server"),
"next/dist/server/future/route-modules/app-page/vendored/ssr/\
react-dom-server-edge"
}
},
),
); );
} }
(_, ServerContextType::Middleware) => {} (_, ServerContextType::Middleware) => {}
......
...@@ -396,48 +396,41 @@ function createRSCAliases( ...@@ -396,48 +396,41 @@ function createRSCAliases(
reactServerCondition?: boolean reactServerCondition?: boolean
} }
) { ) {
let alias: Record<string, string> = {} let alias: Record<string, string> = {
if (opts.layer === 'app-pages-browser' || opts.isEdgeServer) { react$: `next/dist/compiled/react${bundledReactChannel}`,
alias = { 'react-dom$': `next/dist/compiled/react-dom${bundledReactChannel}`,
react$: `next/dist/compiled/react${bundledReactChannel}`, 'react/jsx-runtime$': `next/dist/compiled/react${bundledReactChannel}/jsx-runtime`,
'react-dom$': `next/dist/compiled/react-dom${bundledReactChannel}`, 'react/jsx-dev-runtime$': `next/dist/compiled/react${bundledReactChannel}/jsx-dev-runtime`,
'react/jsx-runtime$': `next/dist/compiled/react${bundledReactChannel}/jsx-runtime`, 'react-dom/client$': `next/dist/compiled/react-dom${bundledReactChannel}/client`,
'react/jsx-dev-runtime$': `next/dist/compiled/react${bundledReactChannel}/jsx-dev-runtime`, 'react-dom/server$': `next/dist/compiled/react-dom${bundledReactChannel}/server`,
'react-dom/client$': `next/dist/compiled/react-dom${bundledReactChannel}/client`, 'react-dom/server.edge$': `next/dist/compiled/react-dom${bundledReactChannel}/server.edge`,
'react-dom/server$': `next/dist/compiled/react-dom${bundledReactChannel}/server`, 'react-dom/server.browser$': `next/dist/compiled/react-dom${bundledReactChannel}/server.browser`,
'react-dom/server.edge$': `next/dist/compiled/react-dom${bundledReactChannel}/server.edge`, 'react-server-dom-webpack/client$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/client`,
'react-dom/server.browser$': `next/dist/compiled/react-dom${bundledReactChannel}/server.browser`, 'react-server-dom-webpack/client.edge$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/client.edge`,
'react-server-dom-webpack/client$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/client`, 'react-server-dom-webpack/server.edge$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/server.edge`,
'react-server-dom-webpack/client.edge$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/client.edge`, 'react-server-dom-webpack/server.node$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/server.node`,
'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`,
} if (!opts.isEdgeServer) {
} else if (opts.layer === 'ssr') { if (opts.layer === 'ssr') {
alias = { alias = Object.assign(alias, {
'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-runtime`, 'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-runtime`,
'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-dev-runtime`, 'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/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/${opts.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/${opts.layer}/react-dom`,
'react-dom/server.edge$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-dom-server-edge`, 'react-dom/server.edge$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-dom-server-edge`,
'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/${opts.layer}/react-server-dom-webpack-client-edge`,
// not essential but we're providing this alias for people who might use it })
'react-dom/server$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-dom-server-edge`, } else if (opts.layer === 'rsc') {
} alias = Object.assign(alias, {
} else if (opts.layer === 'rsc') { 'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-runtime`,
alias = { 'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-dev-runtime`,
'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-runtime`, react$: `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react`,
'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/shared/react-jsx-dev-runtime`, 'react-dom$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-dom`,
react$: `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react`, 'react-server-dom-webpack/server.edge$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-server-dom-webpack-server-edge`,
'react-dom$': `next/dist/server/future/route-modules/app-page/vendored/${opts.layer}/react-dom`, '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.edge$': `next/dist/server/future/route-modules/app-page/vendored/${opts.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`,
// not essential but we're providing this alias for people who might use it.
// A note here is that this will point toward the ReactDOMServer on the SSR layer
// TODO: add the rests
'react-dom/server.edge$': `next/dist/server/future/route-modules/app-page/vendored/ssr/react-dom-server-edge`,
} }
} else {
throw new Error(`Unexpected layer: ${opts.layer}`)
} }
if (opts.isEdgeServer) { if (opts.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