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
2595a276
Unverified
Commit
2595a276
authored
Sep 05, 2024
by
Sebastian "Sebbie" Silbermann
Committed by
GitHub
Sep 05, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use vendored React version in Middleware and Instrumentation (#69619)
Co-authored-by:
Jiachi Liu
<
inbox@huozhi.im
>
parent
b8173544
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
17 deletions
+24
-17
create-compiler-aliases.ts
packages/next/src/build/create-compiler-aliases.ts
+14
-12
webpack-config.ts
packages/next/src/build/webpack-config.ts
+10
-5
No files found.
packages/next/src/build/create-compiler-aliases.ts
View file @
2595a276
...
...
@@ -14,6 +14,7 @@ import type { NextConfigComplete } from '../server/config-shared'
import
{
defaultOverrides
}
from
'../server/require-hook'
import
{
NEXT_PROJECT_ROOT
,
hasExternalOtelApiPackage
}
from
'./webpack-config'
import
{
WEBPACK_LAYERS
}
from
'../lib/constants'
import
{
isWebpackServerOnlyLayer
}
from
'./utils'
interface
CompilerAliases
{
[
alias
:
string
]:
string
|
string
[]
...
...
@@ -236,17 +237,6 @@ export function createAppRouterApiAliases(isServerOnlyLayer: boolean) {
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
(
bundledReactChannel
:
string
,
{
...
...
@@ -259,6 +249,14 @@ export function createRSCAliases(
reactProductionProfiling
:
boolean
}
):
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
>
=
{
react
$
:
`next/dist/compiled/react
${
bundledReactChannel
}
`
,
'react-dom$'
:
`next/dist/compiled/react-dom
${
bundledReactChannel
}
`
,
...
...
@@ -274,7 +272,11 @@ export function createRSCAliases(
// 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-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
)
{
...
...
packages/next/src/build/webpack-config.ts
View file @
2595a276
...
...
@@ -81,7 +81,6 @@ import {
createRSCAliases
,
createNextApiEsmAliases
,
createAppRouterApiAliases
,
createRSCRendererAliases
,
}
from
'./create-compiler-aliases'
import
{
hasCustomExportOutput
}
from
'../export/utils'
import
{
CssChunkingPlugin
}
from
'./webpack/plugins/css-chunking-plugin'
...
...
@@ -1475,8 +1474,11 @@ export default async function getBaseWebpackConfig(
resolve
:
{
mainFields
:
getMainField
(
compilerType
,
true
),
conditionNames
:
reactServerCondition
,
// Always use default channels when use installed react
alias
:
createRSCRendererAliases
(
''
),
alias
:
createRSCAliases
(
bundledReactChannel
,
{
reactProductionProfiling
,
layer
:
WEBPACK_LAYERS
.
middleware
,
isEdgeServer
,
}),
},
},
{
...
...
@@ -1486,8 +1488,11 @@ export default async function getBaseWebpackConfig(
resolve
:
{
mainFields
:
getMainField
(
compilerType
,
true
),
conditionNames
:
reactServerCondition
,
// Always use default channels when use installed react
alias
:
createRSCRendererAliases
(
''
),
alias
:
createRSCAliases
(
bundledReactChannel
,
{
reactProductionProfiling
,
layer
:
WEBPACK_LAYERS
.
instrument
,
isEdgeServer
,
}),
},
},
...(
hasAppDir
...
...
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