Skip to content

Commit bfa7df4

Browse files
eps1loneps1lon
authored
Remove references to removed react-dom/server APIs in Webpack shims (#68987)
1 parent 9018131 commit bfa7df4

File tree

5 files changed

+52
-92
lines changed

5 files changed

+52
-92
lines changed

‎packages/next/src/build/webpack/alias/react-dom-server-browser-experimental.js

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ if (process.env.NODE_ENV === 'production') {
1010
exports.version = l.version
1111
exports.renderToString = l.renderToString
1212
exports.renderToStaticMarkup = l.renderToStaticMarkup
13-
exports.renderToNodeStream = l.renderToNodeStream
14-
exports.renderToStaticNodeStream = l.renderToStaticNodeStream
1513
exports.renderToReadableStream = s.renderToReadableStream
1614
if (s.resume) {
1715
exports.resume = s.resume

‎packages/next/src/build/webpack/alias/react-dom-server-browser.js

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ if (process.env.NODE_ENV === 'production') {
1010
exports.version = l.version
1111
exports.renderToString = l.renderToString
1212
exports.renderToStaticMarkup = l.renderToStaticMarkup
13-
exports.renderToNodeStream = l.renderToNodeStream
14-
exports.renderToStaticNodeStream = l.renderToStaticNodeStream
1513
exports.renderToReadableStream = s.renderToReadableStream
1614
if (s.resume) {
1715
exports.resume = s.resume

‎packages/next/src/build/webpack/alias/react-dom-server-edge-experimental.js

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ if (process.env.NODE_ENV === 'production') {
1414

1515
exports.version = b.version
1616
exports.renderToReadableStream = b.renderToReadableStream
17-
exports.renderToNodeStream = b.renderToNodeStream
18-
exports.renderToStaticNodeStream = b.renderToStaticNodeStream
1917
exports.renderToString = error
2018
exports.renderToStaticMarkup = error
2119
if (b.resume) {

‎packages/next/src/build/webpack/alias/react-dom-server-edge.js

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ if (process.env.NODE_ENV === 'production') {
1414

1515
exports.version = b.version
1616
exports.renderToReadableStream = b.renderToReadableStream
17-
exports.renderToNodeStream = b.renderToNodeStream
18-
exports.renderToStaticNodeStream = b.renderToStaticNodeStream
1917
exports.renderToString = error
2018
exports.renderToStaticMarkup = error
2119
if (b.resume) {

‎test/development/app-dir/ssr-in-rsc/ssr-in-rsc.test.ts

+52-84
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,16 @@ describe('react-dom/server in React Server environment', () => {
8888
.toMatchInlineSnapshot(`
8989
"{
9090
"default": [
91-
"renderToNodeStream",
9291
"renderToReadableStream",
9392
"renderToStaticMarkup",
94-
"renderToStaticNodeStream",
9593
"renderToString",
9694
"resume",
9795
"version"
9896
],
9997
"named": [
10098
"default",
101-
"renderToNodeStream",
10299
"renderToReadableStream",
103100
"renderToStaticMarkup",
104-
"renderToStaticNodeStream",
105101
"renderToString",
106102
"resume",
107103
"version"
@@ -113,19 +109,15 @@ describe('react-dom/server in React Server environment', () => {
113109
.toMatchInlineSnapshot(`
114110
"{
115111
"default": [
116-
"renderToNodeStream",
117112
"renderToReadableStream",
118113
"renderToStaticMarkup",
119-
"renderToStaticNodeStream",
120114
"renderToString",
121115
"version"
122116
],
123117
"named": [
124118
"default",
125-
"renderToNodeStream",
126119
"renderToReadableStream",
127120
"renderToStaticMarkup",
128-
"renderToStaticNodeStream",
129121
"renderToString",
130122
"version"
131123
]
@@ -208,20 +200,16 @@ describe('react-dom/server in React Server environment', () => {
208200
.toMatchInlineSnapshot(`
209201
"{
210202
"default": [
211-
"renderToNodeStream",
212203
"renderToReadableStream",
213204
"renderToStaticMarkup",
214-
"renderToStaticNodeStream",
215205
"renderToString",
216206
"resume",
217207
"version"
218208
],
219209
"named": [
220210
"default",
221-
"renderToNodeStream",
222211
"renderToReadableStream",
223212
"renderToStaticMarkup",
224-
"renderToStaticNodeStream",
225213
"renderToString",
226214
"resume",
227215
"version"
@@ -231,26 +219,22 @@ describe('react-dom/server in React Server environment', () => {
231219
} else {
232220
expect(await browser.elementByCss('main').text())
233221
.toMatchInlineSnapshot(`
234-
"{
235-
"default": [
236-
"renderToNodeStream",
237-
"renderToReadableStream",
238-
"renderToStaticMarkup",
239-
"renderToStaticNodeStream",
240-
"renderToString",
241-
"version"
242-
],
243-
"named": [
244-
"default",
245-
"renderToNodeStream",
246-
"renderToReadableStream",
247-
"renderToStaticMarkup",
248-
"renderToStaticNodeStream",
249-
"renderToString",
250-
"version"
251-
]
252-
}"
253-
`)
222+
"{
223+
"default": [
224+
"renderToReadableStream",
225+
"renderToStaticMarkup",
226+
"renderToString",
227+
"version"
228+
],
229+
"named": [
230+
"default",
231+
"renderToReadableStream",
232+
"renderToStaticMarkup",
233+
"renderToString",
234+
"version"
235+
]
236+
}"
237+
`)
254238
}
255239
}
256240
const redbox = {
@@ -499,20 +483,16 @@ describe('react-dom/server in React Server environment', () => {
499483
"{
500484
"default": {
501485
"default": [
502-
"renderToNodeStream",
503486
"renderToReadableStream",
504487
"renderToStaticMarkup",
505-
"renderToStaticNodeStream",
506488
"renderToString",
507489
"resume",
508490
"version"
509491
],
510492
"named": [
511493
"default",
512-
"renderToNodeStream",
513494
"renderToReadableStream",
514495
"renderToStaticMarkup",
515-
"renderToStaticNodeStream",
516496
"renderToString",
517497
"resume",
518498
"version"
@@ -523,28 +503,24 @@ describe('react-dom/server in React Server environment', () => {
523503
} else {
524504
expect(await browser.elementByCss('main').text())
525505
.toMatchInlineSnapshot(`
526-
"{
527-
"default": {
528-
"default": [
529-
"renderToNodeStream",
530-
"renderToReadableStream",
531-
"renderToStaticMarkup",
532-
"renderToStaticNodeStream",
533-
"renderToString",
534-
"version"
535-
],
536-
"named": [
537-
"default",
538-
"renderToNodeStream",
539-
"renderToReadableStream",
540-
"renderToStaticMarkup",
541-
"renderToStaticNodeStream",
542-
"renderToString",
543-
"version"
544-
]
545-
}
546-
}"
547-
`)
506+
"{
507+
"default": {
508+
"default": [
509+
"renderToReadableStream",
510+
"renderToStaticMarkup",
511+
"renderToString",
512+
"version"
513+
],
514+
"named": [
515+
"default",
516+
"renderToReadableStream",
517+
"renderToStaticMarkup",
518+
"renderToString",
519+
"version"
520+
]
521+
}
522+
}"
523+
`)
548524
}
549525
}
550526
const redbox = {
@@ -627,20 +603,16 @@ describe('react-dom/server in React Server environment', () => {
627603
"{
628604
"default": {
629605
"default": [
630-
"renderToNodeStream",
631606
"renderToReadableStream",
632607
"renderToStaticMarkup",
633-
"renderToStaticNodeStream",
634608
"renderToString",
635609
"resume",
636610
"version"
637611
],
638612
"named": [
639613
"default",
640-
"renderToNodeStream",
641614
"renderToReadableStream",
642615
"renderToStaticMarkup",
643-
"renderToStaticNodeStream",
644616
"renderToString",
645617
"resume",
646618
"version"
@@ -651,28 +623,24 @@ describe('react-dom/server in React Server environment', () => {
651623
} else {
652624
expect(await browser.elementByCss('main').text())
653625
.toMatchInlineSnapshot(`
654-
"{
655-
"default": {
656-
"default": [
657-
"renderToNodeStream",
658-
"renderToReadableStream",
659-
"renderToStaticMarkup",
660-
"renderToStaticNodeStream",
661-
"renderToString",
662-
"version"
663-
],
664-
"named": [
665-
"default",
666-
"renderToNodeStream",
667-
"renderToReadableStream",
668-
"renderToStaticMarkup",
669-
"renderToStaticNodeStream",
670-
"renderToString",
671-
"version"
672-
]
673-
}
674-
}"
675-
`)
626+
"{
627+
"default": {
628+
"default": [
629+
"renderToReadableStream",
630+
"renderToStaticMarkup",
631+
"renderToString",
632+
"version"
633+
],
634+
"named": [
635+
"default",
636+
"renderToReadableStream",
637+
"renderToStaticMarkup",
638+
"renderToString",
639+
"version"
640+
]
641+
}
642+
}"
643+
`)
676644
}
677645
}
678646
const redbox = {

0 commit comments

Comments
 (0)