Share Object.assign polyfill between UMD builds

facebook · Sep 11, 2017 · 3df1ffe · 3df1ffe
1 parent 6552519
commit 3df1ffe
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
@@ -87,15 +87,19 @@ function createModuleMap(paths, extractErrors, bundleType) {
   return moduleMap;
 }
 
-function getNodeModules(bundleType) {
+function getNodeModules(bundleType, isRenderer) {
   // rather than adding the rollup node resolve plugin,
   // we can instead deal with the only node module that is used
   // for UMD bundles - object-assign
   switch (bundleType) {
     case UMD_DEV:
     case UMD_PROD:
       return {
-        'object-assign': resolve('./node_modules/object-assign/index.js'),
+        // Bundle object-assign once in the isomorphic React, and then use
+        // that from the renderer UMD. Avoids bundling it in both UMDs.
+        'object-assign': isRenderer
+          ? resolve('./scripts/rollup/shims/rollup/assign.js')
+          : resolve('./node_modules/object-assign/index.js'),
         // include the ART package modules directly by aliasing them from node_modules
         'art/modes/current': resolve('./node_modules/art/modes/current.js'),
         'art/modes/fast-noSideEffects': resolve(
@@ -286,7 +290,7 @@ function getAliases(paths, bundleType, isRenderer, extractErrors) {
       bundleType
     ),
     getInternalModules(),
-    getNodeModules(bundleType),
+    getNodeModules(bundleType, isRenderer),
     getFbjsModuleAliases(bundleType)
   );
 }

diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
@@ -1,12 +1,12 @@
 {
   "bundleSizes": {
     "react.development.js (UMD_DEV)": {
-      "size": 66238,
-      "gzip": 16739
+      "size": 66336,
+      "gzip": 16788
     },
     "react.production.min.js (UMD_PROD)": {
-      "size": 6707,
-      "gzip": 2801
+      "size": 6716,
+      "gzip": 2804
     },
     "react.development.js (NODE_DEV)": {
       "size": 56692,
@@ -25,12 +25,12 @@
       "gzip": 6707
     },
     "react-dom.development.js (UMD_DEV)": {
-      "size": 649654,
-      "gzip": 149173
+      "size": 647720,
+      "gzip": 148505
     },
     "react-dom.production.min.js (UMD_PROD)": {
-      "size": 103686,
-      "gzip": 32364
+      "size": 102839,
+      "gzip": 32049
     },
     "react-dom.development.js (NODE_DEV)": {
       "size": 608523,
@@ -81,12 +81,12 @@
       "gzip": 15742
     },
     "react-dom-server.browser.development.js (UMD_DEV)": {
-      "size": 136901,
-      "gzip": 34895
+      "size": 134937,
+      "gzip": 34221
     },
     "react-dom-server.browser.production.min.js (UMD_PROD)": {
-      "size": 15917,
-      "gzip": 6199
+      "size": 15077,
+      "gzip": 5914
     },
     "react-dom-server.browser.development.js (NODE_DEV)": {
       "size": 105249,

diff --git a/scripts/rollup/shims/rollup/assign.js b/scripts/rollup/shims/rollup/assign.js
@@ -0,0 +1,4 @@
+var ReactInternals = require('react')
+  .__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+module.exports = ReactInternals.assign;
diff --git a/src/isomorphic/ReactEntry.js b/src/isomorphic/ReactEntry.js
@@ -52,6 +52,8 @@ var React = {
 
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
     ReactCurrentOwner: require('ReactCurrentOwner'),
+    // Used by renderers to avoid bundling object-assign twice in UMD bundles:
+    assign: require('object-assign'),
   },
 };