Skip to content

Commit af0c5a3

Browse files
sebmarkbagesebmarkbage
committed
Revert to CJS but allow dynamic imports in CJS
1 parent 8214f57 commit af0c5a3

13 files changed

+85
-76
lines changed

‎packages/react-server-dom-webpack/esm/react-server-dom-webpack-client.node.unbundled.development.js renamed to ‎packages/react-server-dom-webpack/client.node.unbundled.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
* @flow
88
*/
99

10-
export * from '../src/ReactFlightDOMClientNode.js';
10+
export * from './src/ReactFlightDOMClientNode';

‎packages/react-server-dom-webpack/esm/react-server-dom-webpack-server.node.unbundled.development.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎packages/react-server-dom-webpack/esm/react-server-dom-webpack-server.node.unbundled.production.min.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎packages/react-server-dom-webpack/npm/client.node.unbundled.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
'use strict';
2+
3+
if (process.env.NODE_ENV === 'production') {
4+
module.exports = require('./cjs/react-server-dom-webpack-client.node.unbundled.production.min.js');
5+
} else {
6+
module.exports = require('./cjs/react-server-dom-webpack-client.node.unbundled.development.js');
7+
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
'use strict';
2+
3+
if (process.env.NODE_ENV === 'production') {
4+
module.exports = require('./cjs/react-server-dom-webpack-server.node.unbundled.production.min.js');
5+
} else {
6+
module.exports = require('./cjs/react-server-dom-webpack-server.node.unbundled.development.js');
7+
}

‎packages/react-server-dom-webpack/package.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,23 @@
3838
"worker": "./client.edge.js",
3939
"node": {
4040
"webpack": "./client.node.js",
41-
"production": "./esm/react-server-dom-webpack-client.node.unbundled.production.min.js",
42-
"default": "./esm/react-server-dom-webpack-client.node.unbundled.development.js"
41+
"default": "./client.node.unbundled.js"
4342
},
4443
"browser": "./client.browser.js",
4544
"default": "./client.browser.js"
4645
},
4746
"./client.browser": "./client.browser.js",
4847
"./client.edge": "./client.edge.js",
4948
"./client.node": "./client.node.js",
50-
"./client.node.unbundled": {
51-
"production": "./esm/react-server-dom-webpack-client.node.unbundled.production.min.js",
52-
"default": "./esm/react-server-dom-webpack-client.node.unbundled.development.js"
53-
},
49+
"./client.node.unbundled": "./client.node.unbundled.js",
5450
"./server": {
5551
"react-server": {
5652
"workerd": "./server.edge.js",
5753
"edge-light": "./server.edge.js",
5854
"deno": "./server.browser.js",
5955
"node": {
6056
"webpack": "./server.node.js",
61-
"production": "./esm/react-server-dom-webpack-server.node.unbundled.production.min.js",
62-
"default": "./esm/react-server-dom-webpack-server.node.unbundled.development.js"
57+
"default": "./server.node.unbundled.js"
6358
},
6459
"browser": "./server.browser.js"
6560
},
@@ -68,10 +63,7 @@
6863
"./server.browser": "./server.browser.js",
6964
"./server.edge": "./server.edge.js",
7065
"./server.node": "./server.node.js",
71-
"./server.node.unbundled": {
72-
"production": "./esm/react-server-dom-webpack-server.node.unbundled.production.min.js",
73-
"default": "./esm/react-server-dom-webpack-server.node.unbundled.development.js"
74-
},
66+
"./server.node.unbundled": "./server.node.unbundled.js",
7567
"./node-loader": "./esm/react-server-dom-webpack-node-loader.production.min.js",
7668
"./node-register": "./node-register.js",
7769
"./src/*": "./src/*",

‎packages/react-server-dom-webpack/esm/react-server-dom-webpack-client.node.unbundled.production.min.js renamed to ‎packages/react-server-dom-webpack/server.node.unbundled.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
* @flow
88
*/
99

10-
export * from '../src/ReactFlightDOMClientNode.js';
10+
export * from './src/ReactFlightDOMServerNode';

‎scripts/rollup/build.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const Sync = require('./sync');
1919
const sizes = require('./plugins/sizes-plugin');
2020
const useForks = require('./plugins/use-forks-plugin');
2121
const stripUnusedImports = require('./plugins/strip-unused-imports');
22+
const dynamicImports = require('./plugins/dynamic-imports');
2223
const Packaging = require('./packaging');
2324
const {asyncRimRaf} = require('./utils');
2425
const codeFrame = require('@babel/code-frame');
@@ -332,6 +333,8 @@ function getPlugins(
332333
bundleType === RN_FB_PROFILING;
333334
const shouldStayReadable = isFBWWWBundle || isRNBundle || forcePrettyOutput;
334335
return [
336+
// Keep dynamic imports as externals
337+
dynamicImports(),
335338
{
336339
name: 'rollup-plugin-flow-remove-types',
337340
transform(code) {
@@ -406,6 +409,7 @@ function getPlugins(
406409
process_common_js_modules: false,
407410
rewrite_polyfills: false,
408411
inject_libraries: false,
412+
allow_dynamic_import: true,
409413

410414
// Don't let it create global variables in the browser.
411415
// https://github.com/facebook/react/issues/10909

‎scripts/rollup/bundles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ const bundles = [
360360
externals: ['react', 'util', 'async_hooks', 'react-dom'],
361361
},
362362
{
363-
bundleTypes: [ESM_DEV, ESM_PROD],
363+
bundleTypes: [NODE_DEV, NODE_PROD],
364364
moduleType: RENDERER,
365365
entry: 'react-server-dom-webpack/server.node.unbundled',
366366
global: 'ReactServerDOMServer',
@@ -398,7 +398,7 @@ const bundles = [
398398
externals: ['react', 'util'],
399399
},
400400
{
401-
bundleTypes: [ESM_DEV, ESM_PROD],
401+
bundleTypes: [NODE_DEV, NODE_PROD],
402402
moduleType: RENDERER,
403403
entry: 'react-server-dom-webpack/client.node.unbundled',
404404
global: 'ReactServerDOMClient',

‎scripts/rollup/plugins/dynamic-imports.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
'use strict';
8+
9+
module.exports = function dynamicImports() {
10+
return {
11+
name: 'scripts/rollup/plugins/dynamic-imports',
12+
renderDynamicImport({targetModuleId}) {
13+
if (targetModuleId === null) {
14+
return {left: 'import(', right: ')'};
15+
}
16+
return null;
17+
},
18+
};
19+
};

‎scripts/rollup/validate/eslintrc.cjs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ module.exports = {
5353
IS_REACT_ACT_ENVIRONMENT: 'readonly',
5454
},
5555
parserOptions: {
56-
ecmaVersion: 5,
56+
ecmaVersion: 2020,
5757
sourceType: 'script',
5858
},
5959
rules: {

‎scripts/shared/inlinedHostConfigs.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ module.exports = [
3333
'react-server-dom-webpack/client.node.unbundled',
3434
'react-server-dom-webpack/server',
3535
'react-server-dom-webpack/server.node.unbundled',
36-
'react-server-dom-webpack/esm/react-server-dom-webpack-server.node.unbundled.production.min.js',
37-
'react-server-dom-webpack/esm/react-server-dom-webpack-server.node.unbundled.development.js',
3836
'react-server-dom-webpack/src/ReactFlightDOMServerNode.js', // react-server-dom-webpack/server.node
3937
'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
4038
'react-devtools',

‎yarn.lock

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5146,7 +5146,7 @@ caw@^2.0.0, caw@^2.0.1:
51465146
tunnel-agent "^0.6.0"
51475147
url-to-options "^1.0.1"
51485148

5149-
[email protected], chalk@2.x, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
5149+
[email protected], chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
51505150
version "2.4.2"
51515151
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
51525152
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -5163,6 +5163,14 @@ [email protected], chalk@^4.0.0:
51635163
ansi-styles "^4.1.0"
51645164
supports-color "^7.1.0"
51655165

5166+
[email protected]:
5167+
version "4.1.2"
5168+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
5169+
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
5170+
dependencies:
5171+
ansi-styles "^4.1.0"
5172+
supports-color "^7.1.0"
5173+
51665174
chalk@^1.0.0, chalk@^1.1.3:
51675175
version "1.1.3"
51685176
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -8678,46 +8686,40 @@ globby@^6.1.0:
86788686
pify "^2.0.0"
86798687
pinkie-promise "^2.0.0"
86808688

8681-
google-closure-compiler-java@^20200517.0.0:
8682-
version "20200517.0.0"
8683-
resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200517.0.0.tgz#778370c22273c9085f4cf959ce063f8f112c02ac"
8684-
integrity sha512-JVZBiyyXwcYi6Yc3lO6dF2hMLJA4OzPm4/mgsem/tF1vk2HsWTnL3GTaBsPB2ENVZp0hoqsd4KgpPiG9ssNWxw==
8685-
8686-
google-closure-compiler-js@^20200517.0.0:
8687-
version "20200517.0.0"
8688-
resolved "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200517.0.0.tgz#9cb0861f764073d1c4d3b7453b74073ccb1ecfb1"
8689-
integrity sha512-dz6dOUHx5nhdIqMRXacAYS8aJfLvw4IKxGg28Hq/zeeDPHlX3P3iBK20NgFDfT8zdushThymtMqChSy7C5eyfA==
8690-
8691-
google-closure-compiler-linux@^20200517.0.0:
8692-
version "20200517.0.0"
8693-
resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200517.0.0.tgz#2b9ecb634130060174aff5c52329a694ea4be68b"
8694-
integrity sha512-S5xPh6TtP+ESzZrmQLcDDqtZAsCVTbdI4VS98wQlN6IMZTd94nAnOCg9mrxQNAgop2t4sdsv/KuH0BGPUWEZ+w==
8695-
8696-
google-closure-compiler-osx@^20200517.0.0:
8697-
version "20200517.0.0"
8698-
resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200517.0.0.tgz#9394e9a2fd97e3729fc3bd2abcffff6aab2cfcaa"
8699-
integrity sha512-FWIcsKqLllLjdOBZd7azijVaObydgRd0obVNi63eUfC5MX6T4qxKumGCyor2UCNY6by2ESz+PlGqCFzFhZ6b2g==
8700-
8701-
google-closure-compiler-windows@^20200517.0.0:
8702-
version "20200517.0.0"
8703-
resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200517.0.0.tgz#c5cdde438c29458666a83358567b12072924ed6c"
8704-
integrity sha512-UXhjRGwS8deTkRla/riyVq3psscgMuw78lepEPtq5NgbumgJzY2+IQP9q+4MVOfJW58Rv0JUWKAFOnBBSZWcAQ==
8705-
8706-
google-closure-compiler@^20200517.0.0:
8707-
version "20200517.0.0"
8708-
resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200517.0.0.tgz#6c47f99fc1be59bd4f9e23c5a8f2e66d64b54143"
8709-
integrity sha512-80W9zBS9Ajk1T5InWCfsoPohDmo5T1AAyw1rHh5+dgb/jPgwC65KhY+oJozTncf+/7tyQHJXozTARwhSlBUcMg==
8710-
dependencies:
8711-
chalk "2.x"
8712-
google-closure-compiler-java "^20200517.0.0"
8713-
google-closure-compiler-js "^20200517.0.0"
8689+
google-closure-compiler-java@^20230206.0.0:
8690+
version "20230206.0.0"
8691+
resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20230206.0.0.tgz#e615c1f17901b7f7906d891f132e2867e8a21019"
8692+
integrity sha512-OcnDf29yx4JNU13HpptADI2ckl9hEchktSHs2XSLQ/xStUAJQGQOl96to5IYh2VuFgn3Ssaw6M3c6At2pJr7wQ==
8693+
8694+
google-closure-compiler-linux@^20230206.0.0:
8695+
version "20230206.0.0"
8696+
resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20230206.0.0.tgz#085f3782e6640f38aeb10512ff8e8f226c61dbc3"
8697+
integrity sha512-06N6w2elsnZMMA4Gf/vN2A3XzWvu+gUTrBczaw0KQL48GgdLq6OgAXrcopbGdi/K8Gz1WAcG0qf2ccG8dSqYNg==
8698+
8699+
google-closure-compiler-osx@^20230206.0.0:
8700+
version "20230206.0.0"
8701+
resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20230206.0.0.tgz#62536d49652567c86efb44bbacc1c29111dd3442"
8702+
integrity sha512-lJ/Y4HTk+KdL6PhLmmalP/3DdzGK0mS0+htuFP6y4t9+QXiUKnpHWx/VDQ3Fwm2fWEzqDxfhX3R+wC9lBvFiAg==
8703+
8704+
google-closure-compiler-windows@^20230206.0.0:
8705+
version "20230206.0.0"
8706+
resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20230206.0.0.tgz#7c3458f03ea940321a7c1a008da14f20b68ef4ef"
8707+
integrity sha512-4KPr7XPiOs8g4Ao3T+70egf14avCEne26XF4Mur4Fg5511ym1uEN+NlEyjBOAmfUFfaA7BYDsA8iBzDIetKrnw==
8708+
8709+
google-closure-compiler@^20230206.0.0:
8710+
version "20230206.0.0"
8711+
resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20230206.0.0.tgz#8de9fdf36f33edb96d48473167aa18098ed49845"
8712+
integrity sha512-gGscQOcO/75AlHyw78v87u0nGKJHWqOrQ224Ks91HH1iISgF+xZ8GYosU/8s5VD66x3VD0tJKXM2rIoGOA1ycA==
8713+
dependencies:
8714+
chalk "4.x"
8715+
google-closure-compiler-java "^20230206.0.0"
87148716
minimist "1.x"
87158717
vinyl "2.x"
87168718
vinyl-sourcemaps-apply "^0.2.0"
87178719
optionalDependencies:
8718-
google-closure-compiler-linux "^20200517.0.0"
8719-
google-closure-compiler-osx "^20200517.0.0"
8720-
google-closure-compiler-windows "^20200517.0.0"
8720+
google-closure-compiler-linux "^20230206.0.0"
8721+
google-closure-compiler-osx "^20230206.0.0"
8722+
google-closure-compiler-windows "^20230206.0.0"
87218723

87228724
got@^11.1.4:
87238725
version "11.8.6"

0 commit comments

Comments
 (0)