Unverified Commit e21f1b5b authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

Remove unused react-dom/server.browser references (#68988)

parent aa90fe9b
...@@ -269,9 +269,8 @@ export function createRSCAliases( ...@@ -269,9 +269,8 @@ export function createRSCAliases(
'react-dom/static$': `next/dist/compiled/react-dom${bundledReactChannel}/static`, 'react-dom/static$': `next/dist/compiled/react-dom${bundledReactChannel}/static`,
'react-dom/static.edge$': `next/dist/compiled/react-dom${bundledReactChannel}/static.edge`, 'react-dom/static.edge$': `next/dist/compiled/react-dom${bundledReactChannel}/static.edge`,
'react-dom/static.browser$': `next/dist/compiled/react-dom${bundledReactChannel}/static.browser`, 'react-dom/static.browser$': `next/dist/compiled/react-dom${bundledReactChannel}/static.browser`,
// optimizations to ignore the legacy build of react-dom/server in `server.browser` build // 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-dom/server.edge$': `next/dist/build/webpack/alias/react-dom-server-edge${bundledReactChannel}.js`,
'react-dom/server.browser$': `next/dist/build/webpack/alias/react-dom-server-browser${bundledReactChannel}.js`,
// react-server-dom-webpack alias // react-server-dom-webpack alias
...createRSCRendererAliases(bundledReactChannel), ...createRSCRendererAliases(bundledReactChannel),
} }
......
var l, s
if (process.env.NODE_ENV === 'production') {
l = require('next/dist/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js')
s = require('next/dist/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js')
} else {
l = require('next/dist/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js')
s = require('next/dist/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js')
}
exports.version = l.version
exports.renderToString = l.renderToString
exports.renderToStaticMarkup = l.renderToStaticMarkup
exports.renderToReadableStream = s.renderToReadableStream
if (s.resume) {
exports.resume = s.resume
}
var l, s
if (process.env.NODE_ENV === 'production') {
l = require('next/dist/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js')
s = require('next/dist/compiled/react-dom/cjs/react-dom-server.browser.production.js')
} else {
l = require('next/dist/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js')
s = require('next/dist/compiled/react-dom/cjs/react-dom-server.browser.development.js')
}
exports.version = l.version
exports.renderToString = l.renderToString
exports.renderToStaticMarkup = l.renderToStaticMarkup
exports.renderToReadableStream = s.renderToReadableStream
if (s.resume) {
exports.resume = s.resume
}
...@@ -23,7 +23,6 @@ declare module 'next/dist/compiled/react-server-dom-turbopack/server.edge' ...@@ -23,7 +23,6 @@ declare module 'next/dist/compiled/react-server-dom-turbopack/server.edge'
declare module 'next/dist/client/app-call-server' declare module 'next/dist/client/app-call-server'
declare module 'next/dist/compiled/react-dom/server' declare module 'next/dist/compiled/react-dom/server'
declare module 'next/dist/compiled/react-dom/server.edge' declare module 'next/dist/compiled/react-dom/server.edge'
declare module 'next/dist/compiled/react-dom/server.browser'
declare module 'next/dist/compiled/browserslist' declare module 'next/dist/compiled/browserslist'
declare module 'react-server-dom-webpack/client' declare module 'react-server-dom-webpack/client'
......
declare module 'react-dom/server.browser'
declare module 'react-dom/server.edge' { declare module 'react-dom/server.edge' {
import type { JSX } from 'react' import type { JSX } from 'react'
/** /**
......
...@@ -13,7 +13,6 @@ const pagesExternals = [ ...@@ -13,7 +13,6 @@ const pagesExternals = [
'react-dom/package.json', 'react-dom/package.json',
'react-dom/client', 'react-dom/client',
'react-dom/server', 'react-dom/server',
'react-dom/server.browser',
'react-dom/server.edge', 'react-dom/server.edge',
'react-server-dom-webpack/client', 'react-server-dom-webpack/client',
'react-server-dom-webpack/client.edge', 'react-server-dom-webpack/client.edge',
...@@ -45,8 +44,6 @@ function makeAppAliases(reactChannel = '') { ...@@ -45,8 +44,6 @@ function makeAppAliases(reactChannel = '') {
'react-dom/static.browser$': `next/dist/compiled/react-dom${reactChannel}/static.browser`, 'react-dom/static.browser$': `next/dist/compiled/react-dom${reactChannel}/static.browser`,
// optimizations to ignore the legacy build of react-dom/server in `server.browser` build // optimizations to ignore the legacy build of react-dom/server in `server.browser` build
'react-dom/server.edge$': `next/dist/build/webpack/alias/react-dom-server-edge${reactChannel}.js`, 'react-dom/server.edge$': `next/dist/build/webpack/alias/react-dom-server-edge${reactChannel}.js`,
// In Next.js runtime only use react-dom/server.edge
'react-dom/server.browser$': 'react-dom/server.edge',
// react-server-dom-webpack alias // react-server-dom-webpack alias
'react-server-dom-turbopack/client$': `next/dist/compiled/react-server-dom-turbopack${reactChannel}/client`, 'react-server-dom-turbopack/client$': `next/dist/compiled/react-server-dom-turbopack${reactChannel}/client`,
'react-server-dom-turbopack/client.edge$': `next/dist/compiled/react-server-dom-turbopack${reactChannel}/client.edge`, 'react-server-dom-turbopack/client.edge$': `next/dist/compiled/react-server-dom-turbopack${reactChannel}/client.edge`,
......
...@@ -39,8 +39,8 @@ describe('react-dom/server in React Server environment', () => { ...@@ -39,8 +39,8 @@ describe('react-dom/server in React Server environment', () => {
'/exports/app-code/react-dom-server-browser-explicit' '/exports/app-code/react-dom-server-browser-explicit'
) )
await assertNoRedbox(browser)
if (isTurbopack) { if (isTurbopack) {
await assertNoRedbox(browser)
if (isReactExperimental) { if (isReactExperimental) {
expect(await browser.elementByCss('main').text()) expect(await browser.elementByCss('main').text())
.toMatchInlineSnapshot(` .toMatchInlineSnapshot(`
...@@ -83,47 +83,7 @@ describe('react-dom/server in React Server environment', () => { ...@@ -83,47 +83,7 @@ describe('react-dom/server in React Server environment', () => {
`) `)
} }
} else { } else {
if (isReactExperimental) { await assertHasRedbox(browser)
expect(await browser.elementByCss('main').text())
.toMatchInlineSnapshot(`
"{
"default": [
"renderToReadableStream",
"renderToStaticMarkup",
"renderToString",
"resume",
"version"
],
"named": [
"default",
"renderToReadableStream",
"renderToStaticMarkup",
"renderToString",
"resume",
"version"
]
}"
`)
} else {
expect(await browser.elementByCss('main').text())
.toMatchInlineSnapshot(`
"{
"default": [
"renderToReadableStream",
"renderToStaticMarkup",
"renderToString",
"version"
],
"named": [
"default",
"renderToReadableStream",
"renderToStaticMarkup",
"renderToString",
"version"
]
}"
`)
}
} }
const redbox = { const redbox = {
description: await getRedboxDescription(browser), description: await getRedboxDescription(browser),
...@@ -139,7 +99,7 @@ describe('react-dom/server in React Server environment', () => { ...@@ -139,7 +99,7 @@ describe('react-dom/server in React Server environment', () => {
} else { } else {
expect(redbox).toMatchInlineSnapshot(` expect(redbox).toMatchInlineSnapshot(`
{ {
"description": null, "description": "Error: react-dom/server is not supported in React Server Components.",
"source": null, "source": null,
} }
`) `)
......
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