Skip to content

Commit 489c8f1

Browse files
committed
Use indirect entry points for client bundles just like we do for server already
1 parent 93f1668 commit 489c8f1

File tree

6 files changed

+60
-9
lines changed

6 files changed

+60
-9
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and 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 './ReactFlightDOMClientBrowser';
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and 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 './ReactFlightDOMClientEdge';
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and 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 './ReactFlightDOMClientNode';
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and 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 './ReactFlightDOMClientNode';

scripts/rollup/bundles.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,9 @@ const bundles = [
500500
{
501501
bundleTypes: [NODE_DEV, NODE_PROD],
502502
moduleType: RENDERER,
503-
entry: 'react-server-dom-webpack/client.browser',
503+
entry:
504+
'react-server-dom-webpack/src/client/react-flight-dom-client.browser',
505+
name: 'react-server-dom-webpack-client.browser',
504506
global: 'ReactServerDOMClient',
505507
minifyWithProdErrorCodes: false,
506508
wrapWithModuleBoundaries: false,
@@ -509,7 +511,8 @@ const bundles = [
509511
{
510512
bundleTypes: [NODE_DEV, NODE_PROD],
511513
moduleType: RENDERER,
512-
entry: 'react-server-dom-webpack/client.node',
514+
entry: 'react-server-dom-webpack/src/client/react-flight-dom-client.node',
515+
name: 'react-server-dom-webpack-client.node',
513516
global: 'ReactServerDOMClient',
514517
minifyWithProdErrorCodes: false,
515518
wrapWithModuleBoundaries: false,
@@ -518,7 +521,9 @@ const bundles = [
518521
{
519522
bundleTypes: [NODE_DEV, NODE_PROD],
520523
moduleType: RENDERER,
521-
entry: 'react-server-dom-webpack/client.node.unbundled',
524+
entry:
525+
'react-server-dom-webpack/src/client/react-flight-dom-client.node.unbundled',
526+
name: 'react-server-dom-webpack-client.node.unbundled',
522527
global: 'ReactServerDOMClient',
523528
minifyWithProdErrorCodes: false,
524529
wrapWithModuleBoundaries: false,
@@ -527,7 +532,8 @@ const bundles = [
527532
{
528533
bundleTypes: [NODE_DEV, NODE_PROD],
529534
moduleType: RENDERER,
530-
entry: 'react-server-dom-webpack/client.edge',
535+
entry: 'react-server-dom-webpack/src/client/react-flight-dom-client.edge',
536+
name: 'react-server-dom-webpack-client.edge',
531537
global: 'ReactServerDOMClient',
532538
minifyWithProdErrorCodes: false,
533539
wrapWithModuleBoundaries: false,

scripts/shared/inlinedHostConfigs.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = [
1717
'react-dom/src/server/react-dom-server.browser.js',
1818
'react-dom/static.browser',
1919
'react-dom/unstable_server-external-runtime',
20-
'react-server-dom-webpack/client.browser',
20+
'react-server-dom-webpack/src/client/react-flight-dom-client.browser',
2121
'react-server-dom-webpack/src/server/react-flight-dom-server.browser',
2222
],
2323
paths: [
@@ -43,6 +43,7 @@ module.exports = [
4343
'react-server-dom-webpack/src/client/ReactFlightDOMClientBrowser.js', // react-server-dom-webpack/client.browser
4444
'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js',
4545
'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackBrowser.js',
46+
'react-server-dom-webpack/src/client/react-flight-dom-client.browser',
4647
'react-server-dom-webpack/src/server/react-flight-dom-server.browser',
4748
'react-server-dom-webpack/src/server/ReactFlightDOMServerBrowser.js', // react-server-dom-webpack/src/server/react-flight-dom-server.browser
4849
'react-devtools',
@@ -62,7 +63,7 @@ module.exports = [
6263
'react-dom/src/server/react-dom-server.node.js',
6364
'react-dom/test-utils',
6465
'react-dom/unstable_server-external-runtime',
65-
'react-server-dom-webpack/client.node.unbundled',
66+
'react-server-dom-webpack/src/client/react-flight-dom-client.node.unbundled',
6667
'react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled',
6768
],
6869
paths: [
@@ -90,6 +91,7 @@ module.exports = [
9091
'react-server-dom-webpack/static.node.unbundled',
9192
'react-server-dom-webpack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-webpack/client.node
9293
'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerNode.js',
94+
'react-server-dom-webpack/src/client/react-flight-dom-client.node.unbundled',
9395
'react-server-dom-webpack/src/server/react-flight-dom-server.node.unbundled',
9496
'react-server-dom-webpack/src/server/ReactFlightDOMServerNode.js', // react-server-dom-webpack/src/server/react-flight-dom-server.node
9597
'react-devtools',
@@ -121,7 +123,7 @@ module.exports = [
121123
'react-dom/src/server/ReactDOMFizzStaticEdge.js',
122124
'react-dom-bindings/src/server/ReactDOMFlightServerHostDispatcher.js',
123125
'react-dom-bindings/src/server/ReactFlightServerConfigDOM.js',
124-
'react-dom-bindings/src/shared/ReactFlightClientConfigDOM.js',
126+
'react-dom-bindins/src/shared/ReactFlightClientConfigDOM.js',
125127
'react-server-dom-webpack',
126128
'react-server-dom-webpack/client.node.unbundled',
127129
'react-server-dom-webpack/server',
@@ -141,7 +143,7 @@ module.exports = [
141143
{
142144
shortName: 'dom-node-webpack',
143145
entryPoints: [
144-
'react-server-dom-webpack/client.node',
146+
'react-server-dom-webpack/src/client/react-flight-dom-client.node',
145147
'react-server-dom-webpack/src/server/react-flight-dom-server.node',
146148
],
147149
paths: [
@@ -165,8 +167,10 @@ module.exports = [
165167
'react-server-dom-webpack/server.node',
166168
'react-server-dom-webpack/static',
167169
'react-server-dom-webpack/static.node',
170+
'react-server-dom-webpack/src/client/ReactFlightDOMClientNode.js', // react-server-dom-turbopack/client.node
168171
'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js',
169172
'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer.js',
173+
'react-server-dom-webpack/src/client/react-flight-dom-client.node',
170174
'react-server-dom-webpack/src/server/react-flight-dom-server.node',
171175
'react-server-dom-webpack/src/server/ReactFlightDOMServerNode.js', // react-server-dom-webpack/src/server/react-flight-dom-server.node
172176
'react-server-dom-webpack/node-register',
@@ -390,7 +394,7 @@ module.exports = [
390394
entryPoints: [
391395
'react-dom/src/server/react-dom-server.edge.js',
392396
'react-dom/static.edge',
393-
'react-server-dom-webpack/client.edge',
397+
'react-server-dom-webpack/src/client/react-flight-dom-client.edge',
394398
'react-server-dom-webpack/src/server/react-flight-dom-server.edge',
395399
],
396400
paths: [
@@ -415,6 +419,7 @@ module.exports = [
415419
'react-server-dom-webpack/src/client/ReactFlightDOMClientEdge.js', // react-server-dom-webpack/client.edge
416420
'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpack.js',
417421
'react-server-dom-webpack/src/client/ReactFlightClientConfigBundlerWebpackServer.js',
422+
'react-server-dom-webpack/src/client/react-flight-dom-client.edge',
418423
'react-server-dom-webpack/src/server/react-flight-dom-server.edge',
419424
'react-server-dom-webpack/src/server/ReactFlightDOMServerEdge.js', // react-server-dom-webpack/src/server/react-flight-dom-server.edge
420425
'react-devtools',

0 commit comments

Comments
 (0)