Use the server src files as entry points for the builds/tests (#21683)
* Use the server src files as entry points for the builds/tests We need one top level entry point to target two builds so we can't have the top level one be the entry point for the builds. * Same thing but with the modern entry point
Sebastian Markbåge committed
Jun 14, 2021 at 19:23 UTC
9343f872038746b6bd0455d8d1098f31a1674b0b
9 files changed
+34
-28
fixtures/fizz-ssr-browser/index.html
+2
-2
@@ -17,11 +17,11 @@
17
</p>
18
</div>
19
<script src="../../build/node_modules/react/umd/react.development.js"></script>
20
- <script src="../../build/node_modules/react-dom/umd/react-dom-unstable-fizz.browser.development.js"></script>
20
+ <script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
21
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
22
<script type="text/babel">
23
let controller = new AbortController();
24
- let stream = ReactDOMFizzServer.renderToReadableStream(
24
+ let stream = ReactDOMServer.renderToReadableStream(
25
<html>
26
<body>Success</body>
27
</html>,
fixtures/ssr/src/index.js
+1
-1
@@ -1,5 +1,5 @@
1
import React from 'react';
2
-import {unstable_createRoot as createRoot} from 'react-dom';
2
+import {createRoot} from 'react-dom';
3
4
import App from './components/App';
5
packages/react-dom/npm/server.browser.js
+2
-2
@@ -1,7 +1,7 @@
1
'use strict';
2
3
if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-dom-server.browser.production.min.js');
4
+ module.exports = require('./cjs/react-dom-server-legacy.browser.production.min.js');
5
} else {
6
- module.exports = require('./cjs/react-dom-server.browser.development.js');
6
+ module.exports = require('./cjs/react-dom-server-legacy.browser.development.js');
7
}
packages/react-dom/npm/server.node.js
+2
-2
@@ -1,7 +1,7 @@
1
'use strict';
2
3
if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-dom-server.node.production.min.js');
4
+ module.exports = require('./cjs/react-dom-server-legacy.node.production.min.js');
5
} else {
6
- module.exports = require('./cjs/react-dom-server.node.development.js');
6
+ module.exports = require('./cjs/react-dom-server-legacy.node.development.js');
7
}
packages/react-dom/npm/unstable-fizz.browser.js
+2
-2
@@ -1,7 +1,7 @@
1
'use strict';
2
3
if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-dom-unstable-fizz.browser.production.min.js');
4
+ module.exports = require('./cjs/react-dom-server.browser.production.min.js');
5
} else {
6
- module.exports = require('./cjs/react-dom-unstable-fizz.browser.development.js');
6
+ module.exports = require('./cjs/react-dom-server.browser.development.js');
7
}
packages/react-dom/npm/unstable-fizz.node.js
+2
-2
@@ -1,7 +1,7 @@
1
'use strict';
2
3
if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-dom-unstable-fizz.node.production.min.js');
4
+ module.exports = require('./cjs/react-dom-server.node.production.min.js');
5
} else {
6
- module.exports = require('./cjs/react-dom-unstable-fizz.node.development.js');
6
+ module.exports = require('./cjs/react-dom-server.node.development.js');
7
}
packages/react-dom/src/server/ReactDOMLegacyServerBrowser.classic.fb.js
renamed
+1
-1
@@ -13,4 +13,4 @@ export {
13
renderToNodeStream,
14
renderToStaticNodeStream,
15
version,
16
-} from './src/server/ReactDOMServerLegacyPartialRendererBrowser';
16
+} from './ReactDOMServerLegacyPartialRendererBrowser';
scripts/rollup/bundles.js
+16
-13
@@ -234,7 +234,8 @@ const bundles = [
234
? [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD]
235
: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_WWW_DEV, FB_WWW_PROD],
236
moduleType: RENDERER,
237
- entry: 'react-dom/server.browser',
237
+ entry: 'react-dom/src/server/ReactDOMLegacyServerBrowser',
238
+ name: 'react-dom-server-legacy.browser',
239
global: 'ReactDOMServer',
240
externals: ['react'],
241
babel: opts =>
@@ -247,7 +248,8 @@ const bundles = [
248
{
249
bundleTypes: [NODE_DEV, NODE_PROD],
250
moduleType: RENDERER,
250
- entry: 'react-dom/server.node',
251
+ entry: 'react-dom/src/server/ReactDOMLegacyServerNode',
252
+ name: 'react-dom-server-legacy.node',
253
externals: ['react', 'stream'],
254
babel: opts =>
255
Object.assign({}, opts, {
@@ -261,23 +263,25 @@ const bundles = [
263
{
264
bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
265
moduleType: RENDERER,
264
- entry: 'react-dom/unstable-fizz.browser',
265
- global: 'ReactDOMFizzServer',
266
- externals: ['react', 'react-dom/server'],
266
+ entry: 'react-dom/src/server/ReactDOMFizzServerBrowser',
267
+ name: 'react-dom-server.browser',
268
+ global: 'ReactDOMServer',
269
+ externals: ['react'],
270
},
271
{
272
bundleTypes: [NODE_DEV, NODE_PROD],
273
moduleType: RENDERER,
271
- entry: 'react-dom/unstable-fizz.node',
272
- global: 'ReactDOMFizzServer',
273
- externals: ['react', 'react-dom/server'],
274
+ entry: 'react-dom/src/server/ReactDOMFizzServerNode',
275
+ name: 'react-dom-server.node',
276
+ global: 'ReactDOMServer',
277
+ externals: ['react'],
278
},
279
{
280
bundleTypes: __EXPERIMENTAL__ ? [FB_WWW_DEV, FB_WWW_PROD] : [],
281
moduleType: RENDERER,
282
entry: 'react-server-dom-relay/src/ReactDOMServerFB',
283
global: 'ReactDOMServer',
280
- externals: ['react', 'react-dom/server'],
284
+ externals: ['react'],
285
},
286
287
/******* React Server DOM Webpack Writer *******/
@@ -286,14 +290,14 @@ const bundles = [
290
moduleType: RENDERER,
291
entry: 'react-server-dom-webpack/writer.browser.server',
292
global: 'ReactServerDOMWriter',
289
- externals: ['react', 'react-dom/server'],
293
+ externals: ['react'],
294
},
295
{
296
bundleTypes: [NODE_DEV, NODE_PROD],
297
moduleType: RENDERER,
298
entry: 'react-server-dom-webpack/writer.node.server',
299
global: 'ReactServerDOMWriter',
296
- externals: ['react', 'react-dom/server'],
300
+ externals: ['react'],
301
},
302
303
/******* React Server DOM Webpack Reader *******/
@@ -340,7 +344,6 @@ const bundles = [
344
global: 'ReactFlightDOMRelayServer', // TODO: Rename to Writer
345
externals: [
346
'react',
343
- 'react-dom/server',
347
'ReactFlightDOMRelayServerIntegration',
348
'JSResourceReference',
349
],
@@ -785,7 +788,7 @@ deepFreeze(bundleTypes);
788
deepFreeze(moduleTypes);
789
790
function getOriginalFilename(bundle, bundleType) {
788
- let name = bundle.entry;
791
+ let name = bundle.name || bundle.entry;
792
const globalName = bundle.global;
793
// we do this to replace / to -, for react-dom/server
794
name = name.replace('/index.', '.').replace('/', '-');
scripts/shared/inlinedHostConfigs.js
+6
-3
@@ -12,7 +12,7 @@ module.exports = [
12
entryPoints: [
13
'react-dom',
14
'react-dom/testing',
15
- 'react-dom/unstable-fizz.node',
15
+ 'react-dom/src/server/ReactDOMFizzServerNode',
16
'react-server-dom-webpack/writer.node.server',
17
'react-server-dom-webpack',
18
],
@@ -36,7 +36,7 @@ module.exports = [
36
entryPoints: [
37
'react-dom',
38
'react-dom/testing',
39
- 'react-dom/unstable-fizz.browser',
39
+ 'react-dom/src/server/ReactDOMFizzServerBrowser',
40
'react-server-dom-webpack/writer.browser.server',
41
'react-server-dom-webpack',
42
],
@@ -55,7 +55,10 @@ module.exports = [
55
},
56
{
57
shortName: 'dom-legacy',
58
- entryPoints: ['react-dom/server.browser', 'react-dom/server.node'],
58
+ entryPoints: [
59
+ 'react-dom/src/server/ReactDOMLegacyServerBrowser', // react-dom/server.browser
60
+ 'react-dom/src/server/ReactDOMLegacyServerNode', // react-dom/server.node
61
+ ],
62
paths: [
63
'react-dom',
64
'react-dom/server',