From 4025adf4cc3bda9a9abcc9e8378a7214a9fd77c1 Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Mon, 14 Jun 2021 18:22:07 -0400 Subject: [PATCH 1/2] 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. --- packages/react-dom/npm/server.browser.js | 4 ++-- packages/react-dom/npm/server.node.js | 4 ++-- ...ReactDOMLegacyServerBrowser.classic.fb.js} | 2 +- scripts/rollup/bundles.js | 19 ++++++++++--------- scripts/shared/inlinedHostConfigs.js | 5 ++++- 5 files changed, 19 insertions(+), 15 deletions(-) rename packages/react-dom/{server.browser.classic.fb.js => src/server/ReactDOMLegacyServerBrowser.classic.fb.js} (82%) diff --git a/packages/react-dom/npm/server.browser.js b/packages/react-dom/npm/server.browser.js index 32b4953bb350..7f7d57b6c2c2 100644 --- a/packages/react-dom/npm/server.browser.js +++ b/packages/react-dom/npm/server.browser.js @@ -1,7 +1,7 @@ 'use strict'; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-dom-server.browser.production.min.js'); + module.exports = require('./cjs/react-dom-server-legacy.browser.production.min.js'); } else { - module.exports = require('./cjs/react-dom-server.browser.development.js'); + module.exports = require('./cjs/react-dom-server-legacy.browser.development.js'); } diff --git a/packages/react-dom/npm/server.node.js b/packages/react-dom/npm/server.node.js index c45c37af6f37..c3c33dab4e70 100644 --- a/packages/react-dom/npm/server.node.js +++ b/packages/react-dom/npm/server.node.js @@ -1,7 +1,7 @@ 'use strict'; if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-dom-server.node.production.min.js'); + module.exports = require('./cjs/react-dom-server-legacy.node.production.min.js'); } else { - module.exports = require('./cjs/react-dom-server.node.development.js'); + module.exports = require('./cjs/react-dom-server-legacy.node.development.js'); } diff --git a/packages/react-dom/server.browser.classic.fb.js b/packages/react-dom/src/server/ReactDOMLegacyServerBrowser.classic.fb.js similarity index 82% rename from packages/react-dom/server.browser.classic.fb.js rename to packages/react-dom/src/server/ReactDOMLegacyServerBrowser.classic.fb.js index 39d975d20e84..26ade8144113 100644 --- a/packages/react-dom/server.browser.classic.fb.js +++ b/packages/react-dom/src/server/ReactDOMLegacyServerBrowser.classic.fb.js @@ -13,4 +13,4 @@ export { renderToNodeStream, renderToStaticNodeStream, version, -} from './src/server/ReactDOMServerLegacyPartialRendererBrowser'; +} from './ReactDOMServerLegacyPartialRendererBrowser'; diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index 9823df3142f2..97b4269f70fa 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -234,7 +234,8 @@ const bundles = [ ? [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD] : [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_WWW_DEV, FB_WWW_PROD], moduleType: RENDERER, - entry: 'react-dom/server.browser', + entry: 'react-dom/src/server/ReactDOMLegacyServerBrowser', + name: 'react-dom-server-legacy.browser', global: 'ReactDOMServer', externals: ['react'], babel: opts => @@ -247,7 +248,8 @@ const bundles = [ { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, - entry: 'react-dom/server.node', + entry: 'react-dom/src/server/ReactDOMLegacyServerNode', + name: 'react-dom-server-legacy.node', externals: ['react', 'stream'], babel: opts => Object.assign({}, opts, { @@ -263,21 +265,21 @@ const bundles = [ moduleType: RENDERER, entry: 'react-dom/unstable-fizz.browser', global: 'ReactDOMFizzServer', - externals: ['react', 'react-dom/server'], + externals: ['react'], }, { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, entry: 'react-dom/unstable-fizz.node', global: 'ReactDOMFizzServer', - externals: ['react', 'react-dom/server'], + externals: ['react'], }, { bundleTypes: __EXPERIMENTAL__ ? [FB_WWW_DEV, FB_WWW_PROD] : [], moduleType: RENDERER, entry: 'react-server-dom-relay/src/ReactDOMServerFB', global: 'ReactDOMServer', - externals: ['react', 'react-dom/server'], + externals: ['react'], }, /******* React Server DOM Webpack Writer *******/ @@ -286,14 +288,14 @@ const bundles = [ moduleType: RENDERER, entry: 'react-server-dom-webpack/writer.browser.server', global: 'ReactServerDOMWriter', - externals: ['react', 'react-dom/server'], + externals: ['react'], }, { bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, entry: 'react-server-dom-webpack/writer.node.server', global: 'ReactServerDOMWriter', - externals: ['react', 'react-dom/server'], + externals: ['react'], }, /******* React Server DOM Webpack Reader *******/ @@ -340,7 +342,6 @@ const bundles = [ global: 'ReactFlightDOMRelayServer', // TODO: Rename to Writer externals: [ 'react', - 'react-dom/server', 'ReactFlightDOMRelayServerIntegration', 'JSResourceReference', ], @@ -785,7 +786,7 @@ deepFreeze(bundleTypes); deepFreeze(moduleTypes); function getOriginalFilename(bundle, bundleType) { - let name = bundle.entry; + let name = bundle.name || bundle.entry; const globalName = bundle.global; // we do this to replace / to -, for react-dom/server name = name.replace('/index.', '.').replace('/', '-'); diff --git a/scripts/shared/inlinedHostConfigs.js b/scripts/shared/inlinedHostConfigs.js index 1ec1a250fcae..ca92e08a51d2 100644 --- a/scripts/shared/inlinedHostConfigs.js +++ b/scripts/shared/inlinedHostConfigs.js @@ -55,7 +55,10 @@ module.exports = [ }, { shortName: 'dom-legacy', - entryPoints: ['react-dom/server.browser', 'react-dom/server.node'], + entryPoints: [ + 'react-dom/src/server/ReactDOMLegacyServerBrowser', // react-dom/server.browser + 'react-dom/src/server/ReactDOMLegacyServerNode', // react-dom/server.node + ], paths: [ 'react-dom', 'react-dom/server', From 3849e6ab1afdcc1d5ed53a9e952a5f810b8129d8 Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Mon, 14 Jun 2021 18:56:37 -0400 Subject: [PATCH 2/2] Same thing but with the modern entry point --- fixtures/fizz-ssr-browser/index.html | 4 ++-- fixtures/ssr/src/index.js | 2 +- packages/react-dom/npm/unstable-fizz.browser.js | 4 ++-- packages/react-dom/npm/unstable-fizz.node.js | 4 ++-- scripts/rollup/bundles.js | 10 ++++++---- scripts/shared/inlinedHostConfigs.js | 4 ++-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/fixtures/fizz-ssr-browser/index.html b/fixtures/fizz-ssr-browser/index.html index 6320c4a56bbc..82ed7bf6145d 100644 --- a/fixtures/fizz-ssr-browser/index.html +++ b/fixtures/fizz-ssr-browser/index.html @@ -17,11 +17,11 @@

Fizz Example

- +