Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
a65e5c07
Unverified
Commit
a65e5c07
authored
Oct 23, 2023
by
Tim Neutkens
Committed by
GitHub
Oct 23, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove reactServerCondition property as it is not used (#57236)
Removes the unused properties from createRSCAliases.
parent
dc88b413
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
27 deletions
+22
-27
create-compiler-aliases.ts
packages/next/src/build/create-compiler-aliases.ts
+22
-19
webpack-config.ts
packages/next/src/build/webpack-config.ts
+0
-8
No files found.
packages/next/src/build/create-compiler-aliases.ts
View file @
a65e5c07
...
...
@@ -235,11 +235,14 @@ export function createServerOnlyClientOnlyAliases(isServer: boolean): {
export
function
createRSCAliases
(
bundledReactChannel
:
string
,
opts
:
{
{
layer
,
isEdgeServer
,
reactProductionProfiling
,
}:
{
layer
:
WebpackLayerName
isEdgeServer
:
boolean
reactProductionProfiling
:
boolean
reactServerCondition
?:
boolean
}
)
{
let
alias
:
Record
<
string
,
string
>
=
{
...
...
@@ -257,29 +260,29 @@ export function createRSCAliases(
'react-server-dom-webpack/server.node$'
:
`next/dist/compiled/react-server-dom-webpack
${
bundledReactChannel
}
/server.node`
,
}
if
(
!
opts
.
isEdgeServer
)
{
if
(
opts
.
layer
===
WEBPACK_LAYERS
.
serverSideRendering
)
{
if
(
!
isEdgeServer
)
{
if
(
layer
===
WEBPACK_LAYERS
.
serverSideRendering
)
{
alias
=
Object
.
assign
(
alias
,
{
'react/jsx-runtime$'
:
`next/dist/server/future/route-modules/app-page/vendored/
${
opts
.
layer
}
/react-jsx-runtime`
,
'react/jsx-dev-runtime$'
:
`next/dist/server/future/route-modules/app-page/vendored/
${
opts
.
layer
}
/react-jsx-dev-runtime`
,
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-server-dom-webpack/client.edge$'
:
`next/dist/server/future/route-modules/app-page/vendored/
${
opts
.
layer
}
/react-server-dom-webpack-client-edge`
,
'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`
,
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`
,
'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
,
{
'react/jsx-runtime$'
:
`next/dist/server/future/route-modules/app-page/vendored/
${
opts
.
layer
}
/react-jsx-runtime`
,
'react/jsx-dev-runtime$'
:
`next/dist/server/future/route-modules/app-page/vendored/
${
opts
.
layer
}
/react-jsx-dev-runtime`
,
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-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`
,
'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`
,
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`
,
'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`
,
})
}
}
if
(
opts
.
isEdgeServer
)
{
if
(
opts
.
layer
===
WEBPACK_LAYERS
.
reactServerComponents
)
{
if
(
isEdgeServer
)
{
if
(
layer
===
WEBPACK_LAYERS
.
reactServerComponents
)
{
alias
[
'react$'
]
=
`next/dist/compiled/react
${
bundledReactChannel
}
/react.shared-subset`
...
...
@@ -291,7 +294,7 @@ export function createRSCAliases(
]
=
`next/dist/compiled/react-dom
${
bundledReactChannel
}
/server-rendering-stub`
}
if
(
opts
.
reactProductionProfiling
)
{
if
(
reactProductionProfiling
)
{
alias
[
'react-dom$'
]
=
`next/dist/compiled/react-dom
${
bundledReactChannel
}
/profiling`
...
...
packages/next/src/build/webpack-config.ts
View file @
a65e5c07
...
...
@@ -1303,7 +1303,6 @@ export default async function getBaseWebpackConfig(
// react to the direct file path, not the package name. In that case the condition
// will be ignored completely.
alias
:
createRSCAliases
(
bundledReactChannel
,
{
reactServerCondition
:
true
,
// No server components profiling
reactProductionProfiling
,
layer
:
WEBPACK_LAYERS
.
reactServerComponents
,
...
...
@@ -1364,7 +1363,6 @@ export default async function getBaseWebpackConfig(
// It needs `conditionNames` here to require the proper asset,
// when react is acting as dependency of compiled/react-dom.
alias
:
createRSCAliases
(
bundledReactChannel
,
{
reactServerCondition
:
true
,
reactProductionProfiling
,
layer
:
WEBPACK_LAYERS
.
reactServerComponents
,
isEdgeServer
,
...
...
@@ -1376,7 +1374,6 @@ export default async function getBaseWebpackConfig(
issuerLayer
:
WEBPACK_LAYERS
.
serverSideRendering
,
resolve
:
{
alias
:
createRSCAliases
(
bundledReactChannel
,
{
reactServerCondition
:
false
,
reactProductionProfiling
,
layer
:
WEBPACK_LAYERS
.
serverSideRendering
,
isEdgeServer
,
...
...
@@ -1390,12 +1387,7 @@ export default async function getBaseWebpackConfig(
issuerLayer
:
WEBPACK_LAYERS
.
appPagesBrowser
,
resolve
:
{
alias
:
createRSCAliases
(
bundledReactChannel
,
{
// Only alias server rendering stub in client SSR layer.
// reactSharedSubset: false,
// reactDomServerRenderingStub: false,
reactServerCondition
:
false
,
reactProductionProfiling
,
// browser: isClient,
layer
:
WEBPACK_LAYERS
.
appPagesBrowser
,
isEdgeServer
,
}),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment