Move /static build into /server builds

This joins the static (prerender) builds with the server builds.
facebook · Sep 1, 2023 · cec23f3 · cec23f3
1 parent 7022e8d
commit cec23f3
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 39 deletions.
diff --git a/packages/react-dom/npm/static.browser.js b/packages/react-dom/npm/static.browser.js
@@ -1,7 +1,11 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-dom-static.browser.production.min.js');
+  s = require('./cjs/react-dom-server.browser.production.min.js');
 } else {
-  module.exports = require('./cjs/react-dom-static.browser.development.js');
+  s = require('./cjs/react-dom-server.browser.development.js');
 }
+
+exports.version = s.version;
+exports.prerender = s.prerender;
diff --git a/packages/react-dom/npm/static.edge.js b/packages/react-dom/npm/static.edge.js
@@ -1,7 +1,11 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-dom-static.edge.production.min.js');
+  s = require('./cjs/react-dom-server.edge.production.min.js');
 } else {
-  module.exports = require('./cjs/react-dom-static.edge.development.js');
+  s = require('./cjs/react-dom-server.edge.development.js');
 }
+
+exports.version = s.version;
+exports.prerender = s.prerender;
diff --git a/packages/react-dom/npm/static.node.js b/packages/react-dom/npm/static.node.js
@@ -1,7 +1,11 @@
 'use strict';
 
+var s;
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-dom-static.node.production.min.js');
+  s = require('./cjs/react-dom-server.node.production.min.js');
 } else {
-  module.exports = require('./cjs/react-dom-static.node.development.js');
+  s = require('./cjs/react-dom-server.node.development.js');
 }
+
+exports.version = s.version;
+exports.prerenderToNodeStream = s.prerenderToNodeStream;
diff --git a/packages/react-dom/src/server/react-dom-server.browser.js b/packages/react-dom/src/server/react-dom-server.browser.js
@@ -8,3 +8,4 @@
  */
 
 export * from './ReactDOMFizzServerBrowser.js';
+export {prerender} from './ReactDOMFizzStaticBrowser.js';
diff --git a/packages/react-dom/src/server/react-dom-server.edge.js b/packages/react-dom/src/server/react-dom-server.edge.js
@@ -8,3 +8,4 @@
  */
 
 export * from './ReactDOMFizzServerEdge.js';
+export {prerender} from './ReactDOMFizzStaticEdge.js';
diff --git a/packages/react-dom/src/server/react-dom-server.node.js b/packages/react-dom/src/server/react-dom-server.node.js
@@ -8,3 +8,4 @@
  */
 
 export * from './ReactDOMFizzServerNode.js';
+export {prerenderToNodeStream} from './ReactDOMFizzStaticNode.js';
diff --git a/packages/react-dom/static.browser.js b/packages/react-dom/static.browser.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export {prerender, version} from './src/server/ReactDOMFizzStaticBrowser';
+export {prerender, version} from './src/server/react-dom-server.browser';
diff --git a/packages/react-dom/static.edge.js b/packages/react-dom/static.edge.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export {prerender, version} from './src/server/ReactDOMFizzStaticEdge';
+export {prerender, version} from './src/server/react-dom-server.edge';
diff --git a/packages/react-dom/static.node.js b/packages/react-dom/static.node.js
@@ -10,4 +10,4 @@
 export {
   prerenderToNodeStream,
   version,
-} from './src/server/ReactDOMFizzStaticNode';
+} from './src/server/react-dom-server.node';
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
@@ -286,36 +286,6 @@ const bundles = [
     externals: ['react', 'react-dom'],
   },
 
-  /******* React DOM Fizz Static *******/
-  {
-    bundleTypes: __EXPERIMENTAL__ ? [NODE_DEV, NODE_PROD] : [],
-    moduleType: RENDERER,
-    entry: 'react-dom/static.browser',
-    global: 'ReactDOMStatic',
-    minifyWithProdErrorCodes: true,
-    wrapWithModuleBoundaries: false,
-    externals: ['react', 'react-dom'],
-  },
-  {
-    bundleTypes: __EXPERIMENTAL__ ? [NODE_DEV, NODE_PROD] : [],
-    moduleType: RENDERER,
-    entry: 'react-dom/static.node',
-    name: 'react-dom-static.node',
-    global: 'ReactDOMStatic',
-    minifyWithProdErrorCodes: false,
-    wrapWithModuleBoundaries: false,
-    externals: ['react', 'util', 'async_hooks', 'stream', 'react-dom'],
-  },
-  {
-    bundleTypes: __EXPERIMENTAL__ ? [NODE_DEV, NODE_PROD] : [],
-    moduleType: RENDERER,
-    entry: 'react-dom/static.edge',
-    global: 'ReactDOMStatic',
-    minifyWithProdErrorCodes: true,
-    wrapWithModuleBoundaries: false,
-    externals: ['react', 'react-dom'],
-  },
-
   /******* React DOM Fizz Server External Runtime *******/
   {
     bundleTypes: [BROWSER_SCRIPT],