Remove object-assign polyfill

We really rely on a more modern environment where this is typically polyfilled anyway and we don't officially support IE with more extensive polyfilling anyway. So all environments should have the native version by now.
facebook · Feb 23, 2022 · 4cbe301 · 4cbe301
1 parent 587e759
commit 4cbe301
Show file tree

Hide file tree

Showing 26 changed files with 12 additions and 140 deletions.
diff --git a/package.json b/package.json
@@ -77,7 +77,6 @@
     "minimist": "^1.2.3",
     "mkdirp": "^0.5.1",
     "ncp": "^2.0.0",
-    "object-assign": "^4.1.1",
     "pacote": "^10.3.0",
     "prettier": "1.19.1",
     "prop-types": "^15.6.2",

diff --git a/packages/jest-react/package.json b/packages/jest-react/package.json
@@ -23,9 +23,6 @@
     "react": "^17.0.0",
     "react-test-renderer": "^17.0.0"
   },
-  "dependencies": {
-    "object-assign": "^4.1.1"
-  },
   "files": [
     "LICENSE",
     "README.md",

diff --git a/packages/react-art/npm/Circle.js b/packages/react-art/npm/Circle.js
@@ -17,7 +17,7 @@
 
 'use strict';
 
-var assign = require('object-assign');
+var assign = Object.assign;
 var PropTypes = require('prop-types');
 var React = require('react');
 var ReactART = require('react-art');

diff --git a/packages/react-art/npm/Rectangle.js b/packages/react-art/npm/Rectangle.js
@@ -24,7 +24,7 @@
 
 'use strict';
 
-var assign = require('object-assign');
+var assign = Object.assign;
 var PropTypes = require('prop-types');
 var React = require('react');
 var ReactART = require('react-art');

diff --git a/packages/react-art/npm/Wedge.js b/packages/react-art/npm/Wedge.js
@@ -20,7 +20,7 @@
 
 'use strict';
 
-var assign = require('object-assign');
+var assign = Object.assign;
 var PropTypes = require('prop-types');
 var React = require('react');
 var ReactART = require('react-art');

diff --git a/packages/react-art/package.json b/packages/react-art/package.json
@@ -25,7 +25,6 @@
     "art": "^0.10.1",
     "create-react-class": "^15.6.2",
     "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.1",
     "scheduler": "^0.20.1"
   },
   "peerDependencies": {

diff --git a/packages/react-client/package.json b/packages/react-client/package.json
@@ -27,8 +27,7 @@
     "react": "^17.0.0"
   },
   "dependencies": {
-    "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.1"
+    "loose-envify": "^1.1.0"
   },
   "browserify": {
     "transform": [

diff --git a/packages/react-debug-tools/package.json b/packages/react-debug-tools/package.json
@@ -28,7 +28,6 @@
     "react": "^17.0.0"
   },
   "dependencies": {
-    "error-stack-parser": "^2.0.2",
-    "object-assign": "^4.1.1"
+    "error-stack-parser": "^2.0.2"
   }
 }
diff --git a/packages/react-devtools-shared/src/backend/views/Highlighter/Overlay.js b/packages/react-devtools-shared/src/backend/views/Highlighter/Overlay.js
@@ -7,9 +7,10 @@
  * @flow
  */
 
-import assign from 'object-assign';
 import {getElementDimensions, getNestedBoundingClientRect} from '../utils';
 
+const assign = Object.assign;
+
 import type {DevToolsHook} from 'react-devtools-shared/src/backend/types';
 import type {Rect} from '../utils';
 

diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
@@ -18,7 +18,6 @@
   "homepage": "https://reactjs.org/",
   "dependencies": {
     "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.1",
     "scheduler": "^0.20.1"
   },
   "peerDependencies": {

diff --git a/packages/react-native-renderer/package.json b/packages/react-native-renderer/package.json
@@ -8,7 +8,6 @@
     "directory": "packages/react-native-renderer"
   },
   "dependencies": {
-    "object-assign": "^4.1.1",
     "scheduler": "^0.11.0"
   },
   "peerDependencies": {

diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
@@ -11,7 +11,6 @@
   },
   "license": "MIT",
   "dependencies": {
-    "object-assign": "^4.1.1",
     "react-reconciler": "*",
     "react-client": "*",
     "react-server": "*"

diff --git a/packages/react-reconciler/package.json b/packages/react-reconciler/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.1",
     "scheduler": "^0.20.1"
   },
   "browserify": {

diff --git a/packages/react-server-dom-relay/package.json b/packages/react-server-dom-relay/package.json
@@ -8,7 +8,6 @@
     "directory": "packages/react-server-dom-relay"
   },
   "dependencies": {
-    "object-assign": "^4.1.1",
     "scheduler": "^0.11.0"
   },
   "peerDependencies": {

diff --git a/packages/react-server-dom-webpack/package.json b/packages/react-server-dom-webpack/package.json
@@ -54,8 +54,7 @@
   "dependencies": {
     "acorn": "^6.2.1",
     "neo-async": "^2.6.1",
-    "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.1"
+    "loose-envify": "^1.1.0"
   },
   "browserify": {
     "transform": [

diff --git a/packages/react-server-native-relay/package.json b/packages/react-server-native-relay/package.json
@@ -8,7 +8,6 @@
     "directory": "packages/react-server-native-relay"
   },
   "dependencies": {
-    "object-assign": "^4.1.1",
     "scheduler": "^0.11.0"
   },
   "peerDependencies": {

diff --git a/packages/react-server/package.json b/packages/react-server/package.json
@@ -29,8 +29,7 @@
     "react": "^17.0.0"
   },
   "dependencies": {
-    "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.1"
+    "loose-envify": "^1.1.0"
   },
   "browserify": {
     "transform": [

diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
@@ -19,7 +19,6 @@
   },
   "homepage": "https://reactjs.org/",
   "dependencies": {
-    "object-assign": "^4.1.1",
     "react-is": "^17.0.3",
     "react-shallow-renderer": "^16.13.1",
     "scheduler": "^0.20.1"

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -38,8 +38,7 @@
     "node": ">=0.10.0"
   },
   "dependencies": {
-    "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.1"
+    "loose-envify": "^1.1.0"
   },
   "browserify": {
     "transform": [

diff --git a/packages/react/src/ReactSharedInternals.js b/packages/react/src/ReactSharedInternals.js
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import assign from 'object-assign';
 import ReactCurrentDispatcher from './ReactCurrentDispatcher';
 import ReactCurrentBatchConfig from './ReactCurrentBatchConfig';
 import ReactCurrentActQueue from './ReactCurrentActQueue';
@@ -16,8 +15,6 @@ const ReactSharedInternals = {
   ReactCurrentDispatcher,
   ReactCurrentBatchConfig,
   ReactCurrentOwner,
-  // Used by renderers to avoid bundling object-assign twice in UMD bundles:
-  assign,
 };
 
 if (__DEV__) {

diff --git a/packages/react/src/forks/ReactSharedInternals.umd.js b/packages/react/src/forks/ReactSharedInternals.umd.js
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import assign from 'object-assign';
 import * as Scheduler from 'scheduler';
 import ReactCurrentDispatcher from '../ReactCurrentDispatcher';
 import ReactCurrentActQueue from '../ReactCurrentActQueue';
@@ -17,8 +16,6 @@ const ReactSharedInternals = {
   ReactCurrentDispatcher,
   ReactCurrentOwner,
   ReactCurrentBatchConfig,
-  // Used by renderers to avoid bundling object-assign twice in UMD bundles:
-  assign,
 
   // Re-export the schedule API(s) for UMD bundles.
   // This avoids introducing a dependency on a new UMD global in a minor update,

diff --git a/packages/scheduler/package.json b/packages/scheduler/package.json
@@ -17,8 +17,7 @@
   },
   "homepage": "https://reactjs.org/",
   "dependencies": {
-    "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.1"
+    "loose-envify": "^1.1.0"
   },
   "files": [
     "LICENSE",

diff --git a/packages/use-subscription/package.json b/packages/use-subscription/package.json
@@ -14,9 +14,6 @@
     "cjs/"
   ],
   "license": "MIT",
-  "dependencies": {
-    "object-assign": "^4.1.1"
-  },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0"
   },

diff --git a/scripts/babel/transform-object-assign-require.js b/scripts/babel/transform-object-assign-require.js
diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
@@ -8,7 +8,6 @@ const prettier = require('rollup-plugin-prettier');
 const replace = require('rollup-plugin-replace');
 const stripBanner = require('rollup-plugin-strip-banner');
 const chalk = require('chalk');
-const path = require('path');
 const resolve = require('rollup-plugin-node-resolve');
 const fs = require('fs');
 const argv = require('minimist')(process.argv.slice(2));
@@ -177,22 +176,7 @@ function getBabelConfig(
     options.plugins.push(require('../error-codes/transform-error-messages'));
   }
 
-  switch (bundleType) {
-    case UMD_DEV:
-    case UMD_PROD:
-    case UMD_PROFILING:
-    case NODE_DEV:
-    case NODE_PROD:
-    case NODE_PROFILING:
-      return Object.assign({}, options, {
-        plugins: options.plugins.concat([
-          // Use object-assign polyfill in open source
-          path.resolve('./scripts/babel/transform-object-assign-require'),
-        ]),
-      });
-    default:
-      return options;
-  }
+  return options;
 }
 
 function getRollupOutputOptions(

diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
@@ -36,38 +36,6 @@ const __EXPERIMENTAL__ =
 // algorithm because 1) require.resolve doesn't work with ESM modules, and 2)
 // the behavior is easier to predict.
 const forks = Object.freeze({
-  // Optimization: for UMDs, use a version that we can inline into the React bundle.
-  // Use that from all other bundles.
-
-  // NOTE: This is hard-coded to the main entry point of the (third-party)
-  // object-assign package.
-  './node_modules/object-assign/index.js': (
-    bundleType,
-    entry,
-    dependencies
-  ) => {
-    if (
-      bundleType !== UMD_DEV &&
-      bundleType !== UMD_PROD &&
-      bundleType !== UMD_PROFILING
-    ) {
-      // It's only relevant for UMD bundles since that's where the duplication
-      // happens. Other bundles just require('object-assign') anyway.
-      return null;
-    }
-    if (entry === 'react' || entry === 'react/src/ReactSharedSubset.js') {
-      // Use the forked version that uses ES modules instead of CommonJS.
-      return './packages/shared/forks/object-assign.inline-umd.js';
-    }
-    if (dependencies.indexOf('react') === -1) {
-      // We can only apply the optimizations to bundle that depend on React
-      // because we read assign() from an object exposed on React internals.
-      return null;
-    }
-    // We can use the fork that reads the secret export!
-    return './packages/shared/forks/object-assign.umd.js';
-  },
-
   // NOTE: This is hard-coded to the main entry point of the (third-party)
   // react-shallow-renderer package.
   './node_modules/react-shallow-renderer/index.js': () => {