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
130fe65b
Unverified
Commit
130fe65b
authored
May 23, 2023
by
Jiachi Liu
Committed by
GitHub
May 23, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix alias for react-dom/server (#50238)
A bad alias was introduced in #50128 Fixes #50225
parent
ec8bf539
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
16 deletions
+50
-16
webpack-config.ts
packages/next/src/build/webpack-config.ts
+1
-1
client-react.js
test/e2e/app-dir/rsc-basic/app/app-react/client-react.js
+17
-0
page.js
test/e2e/app-dir/rsc-basic/app/app-react/page.js
+3
-1
rsc-basic.test.ts
test/e2e/app-dir/rsc-basic/rsc-basic.test.ts
+29
-14
No files found.
packages/next/src/build/webpack-config.ts
View file @
130fe65b
...
@@ -401,7 +401,7 @@ function createReactAliases(
...
@@ -401,7 +401,7 @@ function createReactAliases(
'react-dom$'
:
`next/dist/compiled/react-dom
${
bundledReactChannel
}
`
,
'react-dom$'
:
`next/dist/compiled/react-dom
${
bundledReactChannel
}
`
,
'react/jsx-runtime$'
:
`next/dist/compiled/react
${
bundledReactChannel
}
/jsx-runtime`
,
'react/jsx-runtime$'
:
`next/dist/compiled/react
${
bundledReactChannel
}
/jsx-runtime`
,
'react/jsx-dev-runtime$'
:
`next/dist/compiled/react
${
bundledReactChannel
}
/jsx-dev-runtime`
,
'react/jsx-dev-runtime$'
:
`next/dist/compiled/react
${
bundledReactChannel
}
/jsx-dev-runtime`
,
'react-dom/server$'
:
`next/dist/compiled/react-dom
${
bundledReactChannel
}
/server
$
`
,
'react-dom/server$'
:
`next/dist/compiled/react-dom
${
bundledReactChannel
}
/server`
,
'react-dom/server.edge$'
:
`next/dist/compiled/react-dom
${
bundledReactChannel
}
/server.edge`
,
'react-dom/server.edge$'
:
`next/dist/compiled/react-dom
${
bundledReactChannel
}
/server.edge`
,
'react-dom/server.browser$'
:
`next/dist/compiled/react-dom
${
bundledReactChannel
}
/server.browser`
,
'react-dom/server.browser$'
:
`next/dist/compiled/react-dom
${
bundledReactChannel
}
/server.browser`
,
'react-server-dom-webpack/client$'
:
`next/dist/compiled/react-server-dom-webpack
${
bundledReactChannel
}
/client`
,
'react-server-dom-webpack/client$'
:
`next/dist/compiled/react-server-dom-webpack
${
bundledReactChannel
}
/client`
,
...
...
test/e2e/app-dir/rsc-basic/app/app-react/client-react.js
0 → 100644
View file @
130fe65b
'use client'
import
React
from
'react'
import
ReactDOM
from
'react-dom'
import
ReactDOMServer
from
'react-dom/server'
export
default
function
ClientReact
()
{
return
(
<
div
>
<
p
id
=
"client-react"
>
{
'React.version='
+
React
.
version
}
<
/p
>
<
p
id
=
"client-react-dom"
>
{
'ReactDOM.version='
+
ReactDOM
.
version
}
<
/p
>
<
p
id
=
"client-react-dom-server"
>
{
'ReactDOMServer.version='
+
ReactDOMServer
.
version
}
<
/p
>
<
/div
>
)
}
test/e2e/app-dir/rsc-basic/app/app-react/page.js
View file @
130fe65b
import
React
from
'react'
import
React
from
'react'
import
ReactDOM
from
'react-dom'
import
ReactDOM
from
'react-dom'
import
ReactDOMServer
from
'react-dom/server.browser'
import
ReactDOMServer
from
'react-dom/server.edge'
import
ClientReact
from
'./client-react'
export
default
function
Page
()
{
export
default
function
Page
()
{
return
(
return
(
...
@@ -10,6 +11,7 @@ export default function Page() {
...
@@ -10,6 +11,7 @@ export default function Page() {
<
p
id
=
"react-dom-server"
>
<
p
id
=
"react-dom-server"
>
{
'ReactDOMServer.version='
+
ReactDOMServer
.
version
}
{
'ReactDOMServer.version='
+
ReactDOMServer
.
version
}
<
/p
>
<
/p
>
<
ClientReact
/>
<
/div
>
<
/div
>
)
)
}
}
test/e2e/app-dir/rsc-basic/rsc-basic.test.ts
View file @
130fe65b
...
@@ -427,7 +427,7 @@ createNextDescribe(
...
@@ -427,7 +427,7 @@ createNextDescribe(
})
})
it
(
'should use stable react for pages'
,
async
()
=>
{
it
(
'should use stable react for pages'
,
async
()
=>
{
const
ssrPaths
=
[
'/pages-react'
,
'/pages-react-edge'
,
'/app-react'
]
const
ssrPaths
=
[
'/pages-react'
,
'/pages-react-edge'
]
const
promises
=
ssrPaths
.
map
(
async
(
pathname
)
=>
{
const
promises
=
ssrPaths
.
map
(
async
(
pathname
)
=>
{
const
resPages$
=
await
next
.
render$
(
pathname
)
const
resPages$
=
await
next
.
render$
(
pathname
)
const
ssrPagesReactVersions
=
[
const
ssrPagesReactVersions
=
[
...
@@ -437,11 +437,7 @@ createNextDescribe(
...
@@ -437,11 +437,7 @@ createNextDescribe(
]
]
ssrPagesReactVersions
.
forEach
((
version
)
=>
{
ssrPagesReactVersions
.
forEach
((
version
)
=>
{
if
(
pathname
===
'/app-react'
)
{
expect
(
version
).
not
.
toMatch
(
'-canary-'
)
expect
(
version
).
toMatch
(
'-canary-'
)
}
else
{
expect
(
version
).
not
.
toMatch
(
'-canary-'
)
}
})
})
})
})
await
Promise
.
all
(
promises
)
await
Promise
.
all
(
promises
)
...
@@ -475,21 +471,40 @@ createNextDescribe(
...
@@ -475,21 +471,40 @@ createNextDescribe(
]
]
`
)
`
)
await
browser
.
loadPage
(
next
.
url
+
'/app-react'
)
browserPagesReactVersions
.
forEach
((
version
)
=>
expect
(
version
).
not
.
toMatch
(
'-canary-'
)
)
browserEdgePagesReactVersions
.
forEach
((
version
)
=>
expect
(
version
).
not
.
toMatch
(
'-canary-'
)
)
})
it
(
'should use canary react for app'
,
async
()
=>
{
const
resPages$
=
await
next
.
render$
(
'/app-react'
)
const
ssrPagesReactVersions
=
[
await
resPages$
(
'#react'
).
text
(),
await
resPages$
(
'#react-dom'
).
text
(),
await
resPages$
(
'#react-dom-server'
).
text
(),
await
resPages$
(
'#client-react'
).
text
(),
await
resPages$
(
'#client-react-dom'
).
text
(),
await
resPages$
(
'#client-react-dom-server'
).
text
(),
]
ssrPagesReactVersions
.
forEach
((
version
)
=>
{
expect
(
version
).
toMatch
(
'-canary-'
)
})
const
browser
=
await
next
.
browser
(
'/app-react'
)
const
browserAppReactVersions
=
await
browser
.
eval
(
`
const
browserAppReactVersions
=
await
browser
.
eval
(
`
[
[
document.querySelector('#react').innerText,
document.querySelector('#react').innerText,
document.querySelector('#react-dom').innerText,
document.querySelector('#react-dom').innerText,
document.querySelector('#react-dom-server').innerText,
document.querySelector('#react-dom-server').innerText,
document.querySelector('#client-react').innerText,
document.querySelector('#client-react-dom').innerText,
document.querySelector('#client-react-dom-server').innerText,
]
]
`
)
`
)
browserPagesReactVersions
.
forEach
((
version
)
=>
expect
(
version
).
not
.
toMatch
(
'-canary-'
)
)
browserEdgePagesReactVersions
.
forEach
((
version
)
=>
expect
(
version
).
not
.
toMatch
(
'-canary-'
)
)
browserAppReactVersions
.
forEach
((
version
)
=>
browserAppReactVersions
.
forEach
((
version
)
=>
expect
(
version
).
toMatch
(
'-canary-'
)
expect
(
version
).
toMatch
(
'-canary-'
)
)
)
...
...
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