Skip to content

Commit 4b72d2e

Browse files
committed
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.
1 parent 4035157 commit 4b72d2e

File tree

26 files changed

+12
-140
lines changed

26 files changed

+12
-140
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
"minimist": "^1.2.3",
7878
"mkdirp": "^0.5.1",
7979
"ncp": "^2.0.0",
80-
"object-assign": "^4.1.1",
8180
"pacote": "^10.3.0",
8281
"prettier": "1.19.1",
8382
"prop-types": "^15.6.2",

packages/jest-react/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
"react": "^17.0.0",
2424
"react-test-renderer": "^17.0.0"
2525
},
26-
"dependencies": {
27-
"object-assign": "^4.1.1"
28-
},
2926
"files": [
3027
"LICENSE",
3128
"README.md",

packages/react-art/npm/Circle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
'use strict';
1919

20-
var assign = require('object-assign');
20+
var assign = Object.assign;
2121
var PropTypes = require('prop-types');
2222
var React = require('react');
2323
var ReactART = require('react-art');

packages/react-art/npm/Rectangle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
'use strict';
2626

27-
var assign = require('object-assign');
27+
var assign = Object.assign;
2828
var PropTypes = require('prop-types');
2929
var React = require('react');
3030
var ReactART = require('react-art');

packages/react-art/npm/Wedge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
'use strict';
2222

23-
var assign = require('object-assign');
23+
var assign = Object.assign;
2424
var PropTypes = require('prop-types');
2525
var React = require('react');
2626
var ReactART = require('react-art');

packages/react-art/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"art": "^0.10.1",
2626
"create-react-class": "^15.6.2",
2727
"loose-envify": "^1.1.0",
28-
"object-assign": "^4.1.1",
2928
"scheduler": "^0.20.1"
3029
},
3130
"peerDependencies": {

packages/react-client/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
"react": "^17.0.0"
2828
},
2929
"dependencies": {
30-
"loose-envify": "^1.1.0",
31-
"object-assign": "^4.1.1"
30+
"loose-envify": "^1.1.0"
3231
},
3332
"browserify": {
3433
"transform": [

packages/react-debug-tools/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"react": "^17.0.0"
2929
},
3030
"dependencies": {
31-
"error-stack-parser": "^2.0.2",
32-
"object-assign": "^4.1.1"
31+
"error-stack-parser": "^2.0.2"
3332
}
3433
}

packages/react-devtools-shared/src/backend/views/Highlighter/Overlay.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
* @flow
88
*/
99

10-
import assign from 'object-assign';
1110
import {getElementDimensions, getNestedBoundingClientRect} from '../utils';
1211

12+
const assign = Object.assign;
13+
1314
import type {DevToolsHook} from 'react-devtools-shared/src/backend/types';
1415
import type {Rect} from '../utils';
1516

packages/react-dom/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"homepage": "https://reactjs.org/",
1919
"dependencies": {
2020
"loose-envify": "^1.1.0",
21-
"object-assign": "^4.1.1",
2221
"scheduler": "^0.20.1"
2322
},
2423
"peerDependencies": {

packages/react-native-renderer/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"directory": "packages/react-native-renderer"
99
},
1010
"dependencies": {
11-
"object-assign": "^4.1.1",
1211
"scheduler": "^0.11.0"
1312
},
1413
"peerDependencies": {

packages/react-noop-renderer/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
},
1212
"license": "MIT",
1313
"dependencies": {
14-
"object-assign": "^4.1.1",
1514
"react-reconciler": "*",
1615
"react-client": "*",
1716
"react-server": "*"

packages/react-reconciler/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
},
3131
"dependencies": {
3232
"loose-envify": "^1.1.0",
33-
"object-assign": "^4.1.1",
3433
"scheduler": "^0.20.1"
3534
},
3635
"browserify": {

packages/react-server-dom-relay/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"directory": "packages/react-server-dom-relay"
99
},
1010
"dependencies": {
11-
"object-assign": "^4.1.1",
1211
"scheduler": "^0.11.0"
1312
},
1413
"peerDependencies": {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
"dependencies": {
5555
"acorn": "^6.2.1",
5656
"neo-async": "^2.6.1",
57-
"loose-envify": "^1.1.0",
58-
"object-assign": "^4.1.1"
57+
"loose-envify": "^1.1.0"
5958
},
6059
"browserify": {
6160
"transform": [

packages/react-server-native-relay/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"directory": "packages/react-server-native-relay"
99
},
1010
"dependencies": {
11-
"object-assign": "^4.1.1",
1211
"scheduler": "^0.11.0"
1312
},
1413
"peerDependencies": {

packages/react-server/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
"react": "^17.0.0"
3030
},
3131
"dependencies": {
32-
"loose-envify": "^1.1.0",
33-
"object-assign": "^4.1.1"
32+
"loose-envify": "^1.1.0"
3433
},
3534
"browserify": {
3635
"transform": [

packages/react-test-renderer/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
},
2020
"homepage": "https://reactjs.org/",
2121
"dependencies": {
22-
"object-assign": "^4.1.1",
2322
"react-is": "^17.0.3",
2423
"react-shallow-renderer": "^16.13.1",
2524
"scheduler": "^0.20.1"

packages/react/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
"node": ">=0.10.0"
3939
},
4040
"dependencies": {
41-
"loose-envify": "^1.1.0",
42-
"object-assign": "^4.1.1"
41+
"loose-envify": "^1.1.0"
4342
},
4443
"browserify": {
4544
"transform": [

packages/react/src/ReactSharedInternals.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import assign from 'object-assign';
98
import ReactCurrentDispatcher from './ReactCurrentDispatcher';
109
import ReactCurrentBatchConfig from './ReactCurrentBatchConfig';
1110
import ReactCurrentActQueue from './ReactCurrentActQueue';
@@ -16,8 +15,6 @@ const ReactSharedInternals = {
1615
ReactCurrentDispatcher,
1716
ReactCurrentBatchConfig,
1817
ReactCurrentOwner,
19-
// Used by renderers to avoid bundling object-assign twice in UMD bundles:
20-
assign,
2118
};
2219

2320
if (__DEV__) {

packages/react/src/forks/ReactSharedInternals.umd.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import assign from 'object-assign';
98
import * as Scheduler from 'scheduler';
109
import ReactCurrentDispatcher from '../ReactCurrentDispatcher';
1110
import ReactCurrentActQueue from '../ReactCurrentActQueue';
@@ -17,8 +16,6 @@ const ReactSharedInternals = {
1716
ReactCurrentDispatcher,
1817
ReactCurrentOwner,
1918
ReactCurrentBatchConfig,
20-
// Used by renderers to avoid bundling object-assign twice in UMD bundles:
21-
assign,
2219

2320
// Re-export the schedule API(s) for UMD bundles.
2421
// This avoids introducing a dependency on a new UMD global in a minor update,

packages/scheduler/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
},
1818
"homepage": "https://reactjs.org/",
1919
"dependencies": {
20-
"loose-envify": "^1.1.0",
21-
"object-assign": "^4.1.1"
20+
"loose-envify": "^1.1.0"
2221
},
2322
"files": [
2423
"LICENSE",

packages/use-subscription/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
"cjs/"
1515
],
1616
"license": "MIT",
17-
"dependencies": {
18-
"object-assign": "^4.1.1"
19-
},
2017
"peerDependencies": {
2118
"react": "^16.8.0 || ^17.0.0"
2219
},

scripts/babel/transform-object-assign-require.js

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

scripts/rollup/build.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ const prettier = require('rollup-plugin-prettier');
88
const replace = require('rollup-plugin-replace');
99
const stripBanner = require('rollup-plugin-strip-banner');
1010
const chalk = require('chalk');
11-
const path = require('path');
1211
const resolve = require('rollup-plugin-node-resolve');
1312
const fs = require('fs');
1413
const argv = require('minimist')(process.argv.slice(2));
@@ -177,22 +176,7 @@ function getBabelConfig(
177176
options.plugins.push(require('../error-codes/transform-error-messages'));
178177
}
179178

180-
switch (bundleType) {
181-
case UMD_DEV:
182-
case UMD_PROD:
183-
case UMD_PROFILING:
184-
case NODE_DEV:
185-
case NODE_PROD:
186-
case NODE_PROFILING:
187-
return Object.assign({}, options, {
188-
plugins: options.plugins.concat([
189-
// Use object-assign polyfill in open source
190-
path.resolve('./scripts/babel/transform-object-assign-require'),
191-
]),
192-
});
193-
default:
194-
return options;
195-
}
179+
return options;
196180
}
197181

198182
function getRollupOutputOptions(

scripts/rollup/forks.js

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -36,38 +36,6 @@ const __EXPERIMENTAL__ =
3636
// algorithm because 1) require.resolve doesn't work with ESM modules, and 2)
3737
// the behavior is easier to predict.
3838
const forks = Object.freeze({
39-
// Optimization: for UMDs, use a version that we can inline into the React bundle.
40-
// Use that from all other bundles.
41-
42-
// NOTE: This is hard-coded to the main entry point of the (third-party)
43-
// object-assign package.
44-
'./node_modules/object-assign/index.js': (
45-
bundleType,
46-
entry,
47-
dependencies
48-
) => {
49-
if (
50-
bundleType !== UMD_DEV &&
51-
bundleType !== UMD_PROD &&
52-
bundleType !== UMD_PROFILING
53-
) {
54-
// It's only relevant for UMD bundles since that's where the duplication
55-
// happens. Other bundles just require('object-assign') anyway.
56-
return null;
57-
}
58-
if (entry === 'react' || entry === 'react/src/ReactSharedSubset.js') {
59-
// Use the forked version that uses ES modules instead of CommonJS.
60-
return './packages/shared/forks/object-assign.inline-umd.js';
61-
}
62-
if (dependencies.indexOf('react') === -1) {
63-
// We can only apply the optimizations to bundle that depend on React
64-
// because we read assign() from an object exposed on React internals.
65-
return null;
66-
}
67-
// We can use the fork that reads the secret export!
68-
return './packages/shared/forks/object-assign.umd.js';
69-
},
70-
7139
// NOTE: This is hard-coded to the main entry point of the (third-party)
7240
// react-shallow-renderer package.
7341
'./node_modules/react-shallow-renderer/index.js': () => {

0 commit comments

Comments
 (0)