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
e21f1b5b
Unverified
Commit
e21f1b5b
authored
Aug 20, 2024
by
Sebastian "Sebbie" Silbermann
Committed by
GitHub
Aug 20, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused react-dom/server.browser references (#68988)
parent
aa90fe9b
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
4 additions
and
83 deletions
+4
-83
create-compiler-aliases.ts
packages/next/src/build/create-compiler-aliases.ts
+1
-2
react-dom-server-browser-experimental.js
...ld/webpack/alias/react-dom-server-browser-experimental.js
+0
-16
react-dom-server-browser.js
.../next/src/build/webpack/alias/react-dom-server-browser.js
+0
-16
$$compiled.internal.d.ts
packages/next/types/$$compiled.internal.d.ts
+0
-1
react-dom.d.ts
packages/next/types/react-dom.d.ts
+0
-2
webpack.config.js
packages/next/webpack.config.js
+0
-3
ssr-in-rsc.test.ts
test/development/app-dir/ssr-in-rsc/ssr-in-rsc.test.ts
+3
-43
No files found.
packages/next/src/build/create-compiler-aliases.ts
View file @
e21f1b5b
...
...
@@ -269,9 +269,8 @@ export function createRSCAliases(
'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.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.browser$'
:
`next/dist/build/webpack/alias/react-dom-server-browser
${
bundledReactChannel
}
.js`
,
// react-server-dom-webpack alias
...
createRSCRendererAliases
(
bundledReactChannel
),
}
...
...
packages/next/src/build/webpack/alias/react-dom-server-browser-experimental.js
deleted
100644 → 0
View file @
aa90fe9b
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
}
packages/next/src/build/webpack/alias/react-dom-server-browser.js
deleted
100644 → 0
View file @
aa90fe9b
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
}
packages/next/types/$$compiled.internal.d.ts
View file @
e21f1b5b
...
...
@@ -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/compiled/react-dom/server'
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
'react-server-dom-webpack/client'
...
...
packages/next/types/react-dom.d.ts
View file @
e21f1b5b
declare
module
'react-dom/server.browser'
declare
module
'react-dom/server.edge'
{
import
type
{
JSX
}
from
'react'
/**
...
...
packages/next/webpack.config.js
View file @
e21f1b5b
...
...
@@ -13,7 +13,6 @@ const pagesExternals = [
'react-dom/package.json'
,
'react-dom/client'
,
'react-dom/server'
,
'react-dom/server.browser'
,
'react-dom/server.edge'
,
'react-server-dom-webpack/client'
,
'react-server-dom-webpack/client.edge'
,
...
...
@@ -45,8 +44,6 @@ function makeAppAliases(reactChannel = '') {
'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
'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-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`
,
...
...
test/development/app-dir/ssr-in-rsc/ssr-in-rsc.test.ts
View file @
e21f1b5b
...
...
@@ -39,8 +39,8 @@ describe('react-dom/server in React Server environment', () => {
'/exports/app-code/react-dom-server-browser-explicit'
)
await
assertNoRedbox
(
browser
)
if
(
isTurbopack
)
{
await
assertNoRedbox
(
browser
)
if
(
isReactExperimental
)
{
expect
(
await
browser
.
elementByCss
(
'main'
).
text
())
.
toMatchInlineSnapshot
(
`
...
...
@@ -83,47 +83,7 @@ describe('react-dom/server in React Server environment', () => {
`
)
}
}
else
{
if
(
isReactExperimental
)
{
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"
]
}"
`
)
}
await
assertHasRedbox
(
browser
)
}
const
redbox
=
{
description
:
await
getRedboxDescription
(
browser
),
...
...
@@ -139,7 +99,7 @@ describe('react-dom/server in React Server environment', () => {
}
else
{
expect
(
redbox
).
toMatchInlineSnapshot
(
`
{
"description":
null
,
"description":
"Error: react-dom/server is not supported in React Server Components."
,
"source": null,
}
`
)
...
...
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