Skip to content

Commit 9343f87

Browse files
sebmarkbagesebmarkbage
authored
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
1 parent e601854 commit 9343f87

File tree

9 files changed

+34
-28
lines changed

9 files changed

+34
-28
lines changed

‎fixtures/fizz-ssr-browser/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ <h1>Fizz Example</h1>
1717
</p>
1818
</div>
1919
<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>
2121
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
2222
<script type="text/babel">
2323
let controller = new AbortController();
24-
let stream = ReactDOMFizzServer.renderToReadableStream(
24+
let stream = ReactDOMServer.renderToReadableStream(
2525
<html>
2626
<body>Success</body>
2727
</html>,

‎fixtures/ssr/src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import {unstable_createRoot as createRoot} from 'react-dom';
2+
import {createRoot} from 'react-dom';
33

44
import App from './components/App';
55

‎packages/react-dom/npm/server.browser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
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');
55
} else {
6-
module.exports = require('./cjs/react-dom-server.browser.development.js');
6+
module.exports = require('./cjs/react-dom-server-legacy.browser.development.js');
77
}

‎packages/react-dom/npm/server.node.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
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');
55
} else {
6-
module.exports = require('./cjs/react-dom-server.node.development.js');
6+
module.exports = require('./cjs/react-dom-server-legacy.node.development.js');
77
}

‎packages/react-dom/npm/unstable-fizz.browser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
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');
55
} else {
6-
module.exports = require('./cjs/react-dom-unstable-fizz.browser.development.js');
6+
module.exports = require('./cjs/react-dom-server.browser.development.js');
77
}

‎packages/react-dom/npm/unstable-fizz.node.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
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');
55
} else {
6-
module.exports = require('./cjs/react-dom-unstable-fizz.node.development.js');
6+
module.exports = require('./cjs/react-dom-server.node.development.js');
77
}

‎packages/react-dom/server.browser.classic.fb.js renamed to ‎packages/react-dom/src/server/ReactDOMLegacyServerBrowser.classic.fb.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ export {
1313
renderToNodeStream,
1414
renderToStaticNodeStream,
1515
version,
16-
} from './src/server/ReactDOMServerLegacyPartialRendererBrowser';
16+
} from './ReactDOMServerLegacyPartialRendererBrowser';

‎scripts/rollup/bundles.js

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ const bundles = [
234234
? [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD]
235235
: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_WWW_DEV, FB_WWW_PROD],
236236
moduleType: RENDERER,
237-
entry: 'react-dom/server.browser',
237+
entry: 'react-dom/src/server/ReactDOMLegacyServerBrowser',
238+
name: 'react-dom-server-legacy.browser',
238239
global: 'ReactDOMServer',
239240
externals: ['react'],
240241
babel: opts =>
@@ -247,7 +248,8 @@ const bundles = [
247248
{
248249
bundleTypes: [NODE_DEV, NODE_PROD],
249250
moduleType: RENDERER,
250-
entry: 'react-dom/server.node',
251+
entry: 'react-dom/src/server/ReactDOMLegacyServerNode',
252+
name: 'react-dom-server-legacy.node',
251253
externals: ['react', 'stream'],
252254
babel: opts =>
253255
Object.assign({}, opts, {
@@ -261,23 +263,25 @@ const bundles = [
261263
{
262264
bundleTypes: [NODE_DEV, NODE_PROD, UMD_DEV, UMD_PROD],
263265
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'],
267270
},
268271
{
269272
bundleTypes: [NODE_DEV, NODE_PROD],
270273
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'],
274278
},
275279
{
276280
bundleTypes: __EXPERIMENTAL__ ? [FB_WWW_DEV, FB_WWW_PROD] : [],
277281
moduleType: RENDERER,
278282
entry: 'react-server-dom-relay/src/ReactDOMServerFB',
279283
global: 'ReactDOMServer',
280-
externals: ['react', 'react-dom/server'],
284+
externals: ['react'],
281285
},
282286

283287
/******* React Server DOM Webpack Writer *******/
@@ -286,14 +290,14 @@ const bundles = [
286290
moduleType: RENDERER,
287291
entry: 'react-server-dom-webpack/writer.browser.server',
288292
global: 'ReactServerDOMWriter',
289-
externals: ['react', 'react-dom/server'],
293+
externals: ['react'],
290294
},
291295
{
292296
bundleTypes: [NODE_DEV, NODE_PROD],
293297
moduleType: RENDERER,
294298
entry: 'react-server-dom-webpack/writer.node.server',
295299
global: 'ReactServerDOMWriter',
296-
externals: ['react', 'react-dom/server'],
300+
externals: ['react'],
297301
},
298302

299303
/******* React Server DOM Webpack Reader *******/
@@ -340,7 +344,6 @@ const bundles = [
340344
global: 'ReactFlightDOMRelayServer', // TODO: Rename to Writer
341345
externals: [
342346
'react',
343-
'react-dom/server',
344347
'ReactFlightDOMRelayServerIntegration',
345348
'JSResourceReference',
346349
],
@@ -785,7 +788,7 @@ deepFreeze(bundleTypes);
785788
deepFreeze(moduleTypes);
786789

787790
function getOriginalFilename(bundle, bundleType) {
788-
let name = bundle.entry;
791+
let name = bundle.name || bundle.entry;
789792
const globalName = bundle.global;
790793
// we do this to replace / to -, for react-dom/server
791794
name = name.replace('/index.', '.').replace('/', '-');

‎scripts/shared/inlinedHostConfigs.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = [
1212
entryPoints: [
1313
'react-dom',
1414
'react-dom/testing',
15-
'react-dom/unstable-fizz.node',
15+
'react-dom/src/server/ReactDOMFizzServerNode',
1616
'react-server-dom-webpack/writer.node.server',
1717
'react-server-dom-webpack',
1818
],
@@ -36,7 +36,7 @@ module.exports = [
3636
entryPoints: [
3737
'react-dom',
3838
'react-dom/testing',
39-
'react-dom/unstable-fizz.browser',
39+
'react-dom/src/server/ReactDOMFizzServerBrowser',
4040
'react-server-dom-webpack/writer.browser.server',
4141
'react-server-dom-webpack',
4242
],
@@ -55,7 +55,10 @@ module.exports = [
5555
},
5656
{
5757
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+
],
5962
paths: [
6063
'react-dom',
6164
'react-dom/server',

0 commit comments

Comments
 (0)