Unverified Commit 130fe65b authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

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

A bad alias was introduced in #50128

Fixes #50225
parent ec8bf539
...@@ -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`,
......
'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>
)
}
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>
) )
} }
...@@ -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-')
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment