Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use consistent import of vendored React within vendored React #64806

Draft
wants to merge 16 commits into
base: canary
Choose a base branch
from
Draft

Use consistent import of vendored React within vendored React #64806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
aec20da
Remove global `next` Webpack alias
eps1lon Apr 27, 2024
55b21d0
Fallback instead
eps1lon Apr 28, 2024
ef2a0ae
Ensure a single react-dom version
eps1lon Apr 19, 2024
aa5767c
missing html tag seems to work just fine now
eps1lon Apr 20, 2024
521c740
Ensure rendering stub is aliased everywhere
eps1lon Apr 20, 2024
46061f7
Revert "missing html tag seems to work just fine now"
eps1lon Apr 20, 2024
e114ce7
Ensure bundlers use vendored React
eps1lon Apr 20, 2024
b1c148a
Ensure react-server entrypoints are bundled
eps1lon Apr 20, 2024
10bd87f
Force resolution to use vendored React
eps1lon Apr 20, 2024
1a57528
Revert "Force resolution to use vendored React"
eps1lon Apr 21, 2024
02b82a8
Revert "Revert "Force resolution to use vendored React""
eps1lon Apr 21, 2024
31f0e8e
Another batch of wrong imports
eps1lon Apr 21, 2024
298e50c
More to alias
eps1lon Apr 21, 2024
ec46b31
Revert "Revert "Revert "Force resolution to use vendored React"""
eps1lon Apr 23, 2024
3cec311
Are these the ones responsible for it for some reason?
eps1lon Apr 23, 2024
d206021
Revert "Ensure bundlers use vendored React"
eps1lon Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions packages/next-swc/crates/next-core/src/next_import_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,27 +700,39 @@ async fn rsc_aliases(
ServerContextType::AppSSR { .. } => {
alias.extend(indexmap! {
"react/jsx-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-jsx-runtime"),
"next/dist/compiled/react/jsx-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-jsx-runtime"),
"react/jsx-dev-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-jsx-dev-runtime"),
"next/dist/compiled/react/jsx-dev-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-jsx-dev-runtime"),
"react" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react"),
"next/dist/compiled/react" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react"),
"react-dom" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-dom"),
"next/dist/compiled/react-dom" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-dom"),
"react-server-dom-webpack/client.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-server-dom-turbopack-client-edge"),
"next/dist/compiled/react-server-dom-webpack/client.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-server-dom-turbopack-client-edge"),
"react-server-dom-turbopack/client.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-server-dom-turbopack-client-edge"),
"next/dist/compiled/react-server-dom-turbopack/client.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-server-dom-turbopack-client-edge"),
})
}
ServerContextType::AppRSC { .. } | ServerContextType::AppRoute { .. } => {
alias.extend(indexmap! {
"react/jsx-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-jsx-runtime"),
"next/dist/compiled/react/jsx-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-jsx-runtime"),
"react/jsx-dev-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-jsx-dev-runtime"),
"next/dist/compiled/react/jsx-dev-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-jsx-dev-runtime"),
"react" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react"),
"next/dist/compiled/react" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react"),
"react-dom" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-dom"),
"next/dist/compiled/react-dom" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-dom"),
"react-server-dom-webpack/server.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-edge"),
"next/dist/compiled/react-server-dom-webpack/server.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-edge"),
"react-server-dom-webpack/server.node" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-node"),
"next/dist/compiled/react-server-dom-webpack/server.node" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-node"),
"react-server-dom-turbopack/server.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-edge"),
"next/dist/compiled/react-server-dom-turbopack/server.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-edge"),
"react-server-dom-turbopack/server.node" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-node"),
"next/dist/compiled/react-server-dom-turbopack/server.node" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-node"),
"next/navigation" => format!("next/dist/api/navigation.react-server"),

// Needed to make `react-dom/server` work.
"next/dist/compiled/react" => format!("next/dist/compiled/react/index.js"),
})
}
_ => {}
Expand Down
25 changes: 23 additions & 2 deletions packages/next/src/build/create-compiler-aliases.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ export function createWebpackAliases({
}
: undefined),

next: NEXT_PROJECT_ROOT,

'styled-jsx/style$': defaultOverrides['styled-jsx/style'],
'styled-jsx$': defaultOverrides['styled-jsx'],

Expand Down Expand Up @@ -273,19 +271,30 @@ export function createRSCAliases(
if (layer === WEBPACK_LAYERS.serverSideRendering) {
alias = Object.assign(alias, {
'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-jsx-runtime`,
'next/dist/compiled/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/${layer}/react-jsx-dev-runtime`,
'next/dist/compiled/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/${layer}/react`,
'next/dist/compiled/react$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react`,
'react-dom$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-dom`,
'next/dist/compiled/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/${layer}/react-server-dom-webpack-client-edge`,
'next/dist/compiled/react-server-dom-webpack/client.edge$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-client-edge`,
})
} else if (layer === WEBPACK_LAYERS.reactServerComponents) {
alias = Object.assign(alias, {
'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-jsx-runtime`,
'next/dist/compiled/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/${layer}/react-jsx-dev-runtime`,
'next/dist/compiled/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/${layer}/react`,
'next/dist/compiled/react$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react`,
'react-dom$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-dom`,
'next/dist/compiled/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/${layer}/react-server-dom-webpack-server-edge`,
'next/dist/compiled/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/${layer}/react-server-dom-webpack-server-node`,
'next/dist/compiled/react-server-dom-webpack/server.node$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-server-node`,
})
}
}
Expand All @@ -295,21 +304,33 @@ export function createRSCAliases(
alias[
'react$'
] = `next/dist/compiled/react${bundledReactChannel}/react.react-server`
alias[
'next/dist/compiled/react$'
] = `next/dist/compiled/react${bundledReactChannel}/react.react-server`
alias[
'react-dom$'
] = `next/dist/compiled/react-dom${bundledReactChannel}/react-dom.react-server`
alias[
'next/dist/compiled/react-dom$'
] = `next/dist/compiled/react-dom${bundledReactChannel}/react-dom.react-server`
} else {
// x-ref: https://github.com/facebook/react/pull/25436
alias[
'react-dom$'
] = `next/dist/compiled/react-dom${bundledReactChannel}/server-rendering-stub`
alias[
'next/dist/compiled/react-dom$'
] = `next/dist/compiled/react-dom${bundledReactChannel}/server-rendering-stub`
}
}

if (reactProductionProfiling) {
alias[
'react-dom$'
] = `next/dist/compiled/react-dom${bundledReactChannel}/profiling`
alias[
'next/dist/compiled/react-dom$'
] = `next/dist/compiled/react-dom${bundledReactChannel}/profiling`
}

alias[
Expand Down
7 changes: 7 additions & 0 deletions packages/next/src/build/webpack-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1682,6 +1682,13 @@ export default async function getBaseWebpackConfig(
]
},
},
{
resolve: {
alias: {
next: NEXT_PROJECT_ROOT,
},
},
},
],
},
plugins: [
Expand Down
2 changes: 1 addition & 1 deletion ...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if (process.env.NODE_ENV !== "production") {
'use strict';

var React = require("next/dist/compiled/react-experimental");
var ReactDOM = require('react-dom');
var ReactDOM = require("next/dist/compiled/react-dom-experimental");

var ReactVersion = '18.3.0-experimental-c3048aab4-20240326';

Expand Down
2 changes: 1 addition & 1 deletion ...ext/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'use strict';

var React = require("next/dist/compiled/react-experimental");
var ReactDOM = require('react-dom');
var ReactDOM = require("next/dist/compiled/react-dom-experimental");

// Do not require this module directly! Use normal `invariant` calls with
// template literal strings. The messages will be replaced with error codes
Expand Down
2 changes: 1 addition & 1 deletion ...src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .../next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if (process.env.NODE_ENV !== "production") {
'use strict';

var React = require("next/dist/compiled/react-experimental");
var ReactDOM = require('react-dom');
var ReactDOM = require("next/dist/compiled/react-dom-experimental");
var stream = require('stream');

var ReactVersion = '18.3.0-experimental-c3048aab4-20240326';
Expand Down
2 changes: 1 addition & 1 deletion ...s/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'use strict';

var React = require("next/dist/compiled/react-experimental");
var ReactDOM = require('react-dom');
var ReactDOM = require("next/dist/compiled/react-dom-experimental");
var stream = require('stream');

var ReactVersion = '18.3.0-experimental-c3048aab4-20240326';
Expand Down
2 changes: 1 addition & 1 deletion ...xt/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if (process.env.NODE_ENV !== "production") {
'use strict';

var React = require("next/dist/compiled/react-experimental");
var ReactDOM = require('react-dom');
var ReactDOM = require("next/dist/compiled/react-dom-experimental");

var ReactVersion = '18.3.0-experimental-c3048aab4-20240326';

Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'use strict';

var React = require("next/dist/compiled/react-experimental");
var ReactDOM = require('react-dom');
var ReactDOM = require("next/dist/compiled/react-dom-experimental");

var ReactVersion = '18.3.0-experimental-c3048aab4-20240326';

Expand Down
2 changes: 1 addition & 1 deletion ...s/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'use strict';

var React = require("next/dist/compiled/react-experimental");
var ReactDOM = require('react-dom');
var ReactDOM = require("next/dist/compiled/react-dom-experimental");

var ReactVersion = '18.3.0-experimental-c3048aab4-20240326';

Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if (process.env.NODE_ENV !== "production") {
'use strict';

var React = require("next/dist/compiled/react-experimental");
var ReactDOM = require('react-dom');
var ReactDOM = require("next/dist/compiled/react-dom-experimental");

var ReactVersion = '18.3.0-experimental-c3048aab4-20240326';

Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'use strict';

var React = require("next/dist/compiled/react-experimental");
var ReactDOM = require('react-dom');
var ReactDOM = require("next/dist/compiled/react-dom-experimental");

var ReactVersion = '18.3.0-experimental-c3048aab4-20240326';

Expand Down
Loading
Loading