Merge /unstable-fizz entry point into /server (#21684)
Sebastian Markbåge committed
Jun 14, 2021 at 21:37 UTC
9212d994ba939f20a04220a61e9776b488381596
19 files changed
+111
-95
fixtures/ssr/server/render.js
+1
-1
@@ -1,5 +1,5 @@
1
import React from 'react';
2
-import {pipeToNodeWritable} from 'react-dom/unstable-fizz';
2
+import {pipeToNodeWritable} from 'react-dom/server';
3
4
import App from '../src/components/App';
5
packages/react-dom/npm/server.browser.js
+12
-2
@@ -1,7 +1,17 @@
1
'use strict';
2
3
+var l, s;
4
if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-dom-server-legacy.browser.production.min.js');
5
+ l = require('./cjs/react-dom-server-legacy.browser.production.min.js');
6
+ s = require('./cjs/react-dom-server.browser.production.min.js');
7
} else {
6
- module.exports = require('./cjs/react-dom-server-legacy.browser.development.js');
8
+ l = require('./cjs/react-dom-server-legacy.browser.development.js');
9
+ s = require('./cjs/react-dom-server.browser.development.js');
10
}
11
+
12
+exports.version = l.version;
13
+exports.renderToString = l.renderToString;
14
+exports.renderToStaticMarkup = l.renderToStaticMarkup;
15
+exports.renderToNodeStream = l.renderToNodeStream;
16
+exports.renderToStaticNodeStream = l.renderToStaticNodeStream;
17
+exports.renderToReadableStream = s.renderToReadableStream;
packages/react-dom/npm/server.node.js
+12
-2
@@ -1,7 +1,17 @@
1
'use strict';
2
3
+var l, s;
4
if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-dom-server-legacy.node.production.min.js');
5
+ l = require('./cjs/react-dom-server-legacy.node.production.min.js');
6
+ s = require('./cjs/react-dom-server.node.production.min.js');
7
} else {
6
- module.exports = require('./cjs/react-dom-server-legacy.node.development.js');
8
+ l = require('./cjs/react-dom-server-legacy.node.development.js');
9
+ s = require('./cjs/react-dom-server.node.development.js');
10
}
11
+
12
+exports.version = l.version;
13
+exports.renderToString = l.renderToString;
14
+exports.renderToStaticMarkup = l.renderToStaticMarkup;
15
+exports.renderToNodeStream = l.renderToNodeStream;
16
+exports.renderToStaticNodeStream = l.renderToStaticNodeStream;
17
+exports.pipeToNodeWritable = s.pipeToNodeWritable;
packages/react-dom/npm/unstable-fizz.browser.js
deleted
-7
@@ -1,7 +0,0 @@
1
-'use strict';
2
-
3
-if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-dom-server.browser.production.min.js');
5
-} else {
6
- module.exports = require('./cjs/react-dom-server.browser.development.js');
7
-}
packages/react-dom/npm/unstable-fizz.js
deleted
-3
@@ -1,3 +0,0 @@
1
-'use strict';
2
-
3
-module.exports = require('./unstable-fizz.node');
packages/react-dom/npm/unstable-fizz.node.js
deleted
-7
@@ -1,7 +0,0 @@
1
-'use strict';
2
-
3
-if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-dom-server.node.production.min.js');
5
-} else {
6
- module.exports = require('./cjs/react-dom-server.node.development.js');
7
-}
packages/react-dom/package.json
+1
-5
@@ -34,15 +34,11 @@
34
"server.browser.js",
35
"server.node.js",
36
"test-utils.js",
37
- "unstable-fizz.js",
38
- "unstable-fizz.browser.js",
39
- "unstable-fizz.node.js",
37
"cjs/",
38
"umd/"
39
],
40
"browser": {
44
- "./server.js": "./server.browser.js",
45
- "./unstable-fizz.js": "./unstable-fizz.browser.js"
41
+ "./server.js": "./server.browser.js"
42
},
43
"browserify": {
44
"transform": [
packages/react-dom/server.browser.js
+37
-9
@@ -3,14 +3,42 @@
3
*
4
* This source code is licensed under the MIT license found in the
5
* LICENSE file in the root directory of this source tree.
6
- *
7
- * @flow
6
*/
7
10
-export {
11
- renderToString,
12
- renderToStaticMarkup,
13
- renderToNodeStream,
14
- renderToStaticNodeStream,
15
- version,
16
-} from './src/server/ReactDOMLegacyServerBrowser';
8
+// This file is only used for tests.
9
+// It lazily loads the implementation so that we get the correct set of host configs.
10
+
11
+import ReactVersion from 'shared/ReactVersion';
12
+export {ReactVersion as version};
13
+
14
+export function renderToString() {
15
+ return require('./src/server/ReactDOMLegacyServerBrowser').renderToString.apply(
16
+ this,
17
+ arguments,
18
+ );
19
+}
20
+export function renderToStaticMarkup() {
21
+ return require('./src/server/ReactDOMLegacyServerBrowser').renderToStaticMarkup.apply(
22
+ this,
23
+ arguments,
24
+ );
25
+}
26
+export function renderToNodeStream() {
27
+ return require('./src/server/ReactDOMLegacyServerBrowser').renderToNodeStream.apply(
28
+ this,
29
+ arguments,
30
+ );
31
+}
32
+export function renderToStaticNodeStream() {
33
+ return require('./src/server/ReactDOMLegacyServerBrowser').renderToStaticNodeStream.apply(
34
+ this,
35
+ arguments,
36
+ );
37
+}
38
+
39
+export function renderToReadableStream() {
40
+ return require('./src/server/ReactDOMFizzServerBrowser').renderToReadableStream.apply(
41
+ this,
42
+ arguments,
43
+ );
44
+}
packages/react-dom/server.node.js
+37
-10
@@ -3,15 +3,42 @@
3
*
4
* This source code is licensed under the MIT license found in the
5
* LICENSE file in the root directory of this source tree.
6
- *
7
- * @flow
6
*/
7
10
-// For some reason Flow doesn't like export * in this file. I don't know why.
11
-export {
12
- renderToString,
13
- renderToStaticMarkup,
14
- renderToNodeStream,
15
- renderToStaticNodeStream,
16
- version,
17
-} from './src/server/ReactDOMLegacyServerNode';
8
+// This file is only used for tests.
9
+// It lazily loads the implementation so that we get the correct set of host configs.
10
+
11
+import ReactVersion from 'shared/ReactVersion';
12
+export {ReactVersion as version};
13
+
14
+export function renderToString() {
15
+ return require('./src/server/ReactDOMLegacyServerNode').renderToString.apply(
16
+ this,
17
+ arguments,
18
+ );
19
+}
20
+export function renderToStaticMarkup() {
21
+ return require('./src/server/ReactDOMLegacyServerNode').renderToStaticMarkup.apply(
22
+ this,
23
+ arguments,
24
+ );
25
+}
26
+export function renderToNodeStream() {
27
+ return require('./src/server/ReactDOMLegacyServerNode').renderToNodeStream.apply(
28
+ this,
29
+ arguments,
30
+ );
31
+}
32
+export function renderToStaticNodeStream() {
33
+ return require('./src/server/ReactDOMLegacyServerNode').renderToStaticNodeStream.apply(
34
+ this,
35
+ arguments,
36
+ );
37
+}
38
+
39
+export function pipeToNodeWritable() {
40
+ return require('./src/server/ReactDOMFizzServerNode').pipeToNodeWritable.apply(
41
+ this,
42
+ arguments,
43
+ );
44
+}
packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js
+1
-1
@@ -34,7 +34,7 @@ describe('ReactDOMFizzServer', () => {
34
React = require('react');
35
ReactDOM = require('react-dom');
36
if (__EXPERIMENTAL__) {
37
- ReactDOMFizzServer = require('react-dom/unstable-fizz');
37
+ ReactDOMFizzServer = require('react-dom/server');
38
}
39
Stream = require('stream');
40
Suspense = React.Suspense;
packages/react-dom/src/__tests__/ReactDOMFizzServerBrowser-test.js
+1
-1
@@ -23,7 +23,7 @@ describe('ReactDOMFizzServer', () => {
23
jest.resetModules();
24
React = require('react');
25
if (__EXPERIMENTAL__) {
26
- ReactDOMFizzServer = require('react-dom/unstable-fizz.browser');
26
+ ReactDOMFizzServer = require('react-dom/server.browser');
27
}
28
Suspense = React.Suspense;
29
});
packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js
+1
-1
@@ -20,7 +20,7 @@ describe('ReactDOMFizzServer', () => {
20
jest.resetModules();
21
React = require('react');
22
if (__EXPERIMENTAL__) {
23
- ReactDOMFizzServer = require('react-dom/unstable-fizz');
23
+ ReactDOMFizzServer = require('react-dom/server');
24
}
25
Stream = require('stream');
26
Suspense = React.Suspense;
packages/react-dom/src/__tests__/ReactServerRenderingBrowser-test.js
-6
@@ -24,12 +24,6 @@ describe('ReactServerRenderingBrowser', () => {
24
ReactDOMServerBrowser = require('react-dom/server.browser');
25
});
26
27
- it('provides the same top-level API as react-dom/server', () => {
28
- expect(Object.keys(ReactDOMServerBrowser)).toEqual(
29
- Object.keys(ReactDOMServer),
30
- );
31
- });
32
-
27
it('returns the same results as react-dom/server', () => {
28
class Nice extends React.Component {
29
render() {
packages/react-dom/src/server/ReactDOMFizzServerBrowser.js
+3
-1
@@ -9,6 +9,8 @@
9
10
import type {ReactNodeList} from 'shared/ReactTypes';
11
12
+import ReactVersion from 'shared/ReactVersion';
13
+
14
import {
15
createRequest,
16
startWork,
@@ -72,4 +74,4 @@ function renderToReadableStream(
74
return stream;
75
}
76
75
-export {renderToReadableStream};
77
+export {renderToReadableStream, ReactVersion as version};
packages/react-dom/src/server/ReactDOMFizzServerNode.js
+3
-1
@@ -10,6 +10,8 @@
10
import type {ReactNodeList} from 'shared/ReactTypes';
11
import type {Writable} from 'stream';
12
13
+import ReactVersion from 'shared/ReactVersion';
14
+
15
import {
16
createRequest,
17
startWork,
@@ -82,4 +84,4 @@ function pipeToNodeWritable(
84
};
85
}
86
85
-export {pipeToNodeWritable};
87
+export {pipeToNodeWritable, ReactVersion as version};
packages/react-dom/unstable-fizz.browser.js
deleted
-10
@@ -1,10 +0,0 @@
1
-/**
2
- * Copyright (c) Facebook, Inc. and its affiliates.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE file in the root directory of this source tree.
6
- *
7
- * @flow
8
- */
9
-
10
-export * from './src/server/ReactDOMFizzServerBrowser';
packages/react-dom/unstable-fizz.js
deleted
-10
@@ -1,10 +0,0 @@
1
-/**
2
- * Copyright (c) Facebook, Inc. and its affiliates.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE file in the root directory of this source tree.
6
- *
7
- * @flow
8
- */
9
-
10
-export * from './unstable-fizz.node';
packages/react-dom/unstable-fizz.node.js
deleted
-10
@@ -1,10 +0,0 @@
1
-/**
2
- * Copyright (c) Facebook, Inc. and its affiliates.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE file in the root directory of this source tree.
6
- *
7
- * @flow
8
- */
9
-
10
-export * from './src/server/ReactDOMFizzServerNode';
scripts/shared/inlinedHostConfigs.js
+2
-8
@@ -18,9 +18,7 @@ module.exports = [
18
],
19
paths: [
20
'react-dom',
21
- 'react-dom/unstable-fizz',
22
- 'react-dom/unstable-fizz.node',
23
- 'react-dom/src/server/ReactDOMFizzServerNode.js', // react-dom/unstable-fizz.node
21
+ 'react-dom/src/server/ReactDOMFizzServerNode.js', // react-dom/server.node
22
'react-server-dom-webpack',
23
'react-server-dom-webpack/writer',
24
'react-server-dom-webpack/writer.node.server',
@@ -43,8 +41,7 @@ module.exports = [
41
paths: [
42
'react-dom',
43
'react-dom/testing',
46
- 'react-dom/unstable-fizz.browser',
47
- 'react-dom/src/server/ReactDOMFizzServerBrowser.js', // react-dom/unstable-fizz.browser
44
+ 'react-dom/src/server/ReactDOMFizzServerBrowser.js', // react-dom/server.browser
45
'react-server-dom-webpack',
46
'react-server-dom-webpack/writer.browser.server',
47
'react-server-dom-webpack/src/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/writer.browser.server
@@ -61,9 +58,6 @@ module.exports = [
58
],
59
paths: [
60
'react-dom',
64
- 'react-dom/server',
65
- 'react-dom/server.browser',
66
- 'react-dom/server.node',
61
'react-server-dom-webpack',
62
'react-dom/src/server/ReactDOMLegacyServerBrowser.js', // react-dom/server.browser
63
'react-dom/src/server/ReactDOMLegacyServerNode.js', // react-dom/server.node