Skip to content

Commit 1ad8d81

Browse files
authored
Remove object-assign polyfill (#23351)
* 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. * Use shared/assign instead of Object.assign in code This is so that we have one cached local instance in the bundle. Ideally we should have a compile do this for us but we already follow this pattern with hasOwnProperty, isArray, Object.is etc. * Transform Object.assign to now use shared/assign We need this to use the shared instance when Object.spread is used.
1 parent b3f3da2 commit 1ad8d81

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+73
-156
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-debug-tools/src/ReactDebugHooks.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import type {
2020
} from 'react-reconciler/src/ReactInternalTypes';
2121

2222
import ErrorStackParser from 'error-stack-parser';
23+
import assign from 'shared/assign';
2324
import ReactSharedInternals from 'shared/ReactSharedInternals';
2425
import {
2526
FunctionComponent,
@@ -720,7 +721,7 @@ function inspectHooksOfForwardRef<Props, Ref>(
720721
function resolveDefaultProps(Component, baseProps) {
721722
if (Component && Component.defaultProps) {
722723
// Resolve default props. Taken from ReactElement
723-
const props = Object.assign({}, baseProps);
724+
const props = assign({}, baseProps);
724725
const defaultProps = Component.defaultProps;
725726
for (const propName in defaultProps) {
726727
if (props[propName] === undefined) {

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

0 commit comments

Comments
 (0)