archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix alias for react-dom/server (#50238)

Browse source 
A bad alias was introduced in #50128

Fixes #50225
This commit is contained in:
Jiachi Liu 2023-05-24 01:00:59 +02:00 committed by GitHub
parent ec8bf53907
commit 130fe65bde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/next/src/build/webpack-config.ts
View file

@ -401,7 +401,7 @@ function createReactAliases(
'react-dom$': `next/dist/compiled/react-dom${bundledReactChannel}`,
'react/jsx-runtime$': `next/dist/compiled/react${bundledReactChannel}/jsx-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.browser$': `next/dist/compiled/react-dom${bundledReactChannel}/server.browser`,
'react-server-dom-webpack/client$': `next/dist/compiled/react-server-dom-webpack${bundledReactChannel}/client`,

17
test/e2e/app-dir/rsc-basic/app/app-react/client-react.js Normal file
View file

@ -0,0 +1,17 @@
'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>
)
}

4
test/e2e/app-dir/rsc-basic/app/app-react/page.js
View file

@ -1,6 +1,7 @@
import React from 'react'
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() {
return (
@ -10,6 +11,7 @@ export default function Page() {
<p id="react-dom-server">
{'ReactDOMServer.version=' + ReactDOMServer.version}
</p>
<ClientReact />
</div>
)
}

45
test/e2e/app-dir/rsc-basic/rsc-basic.test.ts
View file

@ -427,7 +427,7 @@ createNextDescribe(
})
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 resPages$ = await next.render$(pathname)
const ssrPagesReactVersions = [
@ -437,11 +437,7 @@ createNextDescribe(
]
ssrPagesReactVersions.forEach((version) => {
if (pathname === '/app-react') {
expect(version).toMatch('-canary-')
} else {
expect(version).not.toMatch('-canary-')
}
expect(version).not.toMatch('-canary-')
})
})
await Promise.all(promises)
@ -475,21 +471,40 @@ createNextDescribe(
]
`)
await browser.loadPage(next.url + '/app-react')
const browserAppReactVersions = await browser.eval(`
[
document.querySelector('#react').innerText,
document.querySelector('#react-dom').innerText,
document.querySelector('#react-dom-server').innerText,
]
`)
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(`
[
document.querySelector('#react').innerText,
document.querySelector('#react-dom').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,
]
`)
browserAppReactVersions.forEach((version) =>
expect(version).toMatch('-canary-')
)