Skip to content

Commit 917bc87

Browse files
committed
[Fix] restore older eslint compat by using object.assign instead of Object.assign
1 parent 8121f58 commit 917bc87

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

lib/rules/no-unused-prop-types.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// https://github.com/yannickcr/eslint-plugin-react/issues/7
99

1010
var has = require('has');
11+
var assign = require('object.assign');
1112
var Components = require('../util/Components');
1213
var variable = require('../util/variable');
1314
var annotations = require('../util/annotations');
@@ -51,7 +52,7 @@ module.exports = {
5152

5253
var defaults = {skipShapeProps: true};
5354
var sourceCode = context.getSourceCode();
54-
var configuration = Object.assign({}, defaults, context.options[0] || {});
55+
var configuration = assign({}, defaults, context.options[0] || {});
5556
var skipShapeProps = configuration.skipShapeProps;
5657
var customValidators = configuration.customValidators || [];
5758
// Used to track the type annotations in scope.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"doctrine": "^1.2.2",
2727
"has": "^1.0.1",
2828
"jsx-ast-utils": "^1.3.4",
29-
"array.prototype.find": "^2.0.1"
29+
"array.prototype.find": "^2.0.1",
30+
"object.assign": "^4.0.4"
3031
},
3132
"devDependencies": {
3233
"babel-eslint": "7.1.1",

tests/lib/rules/require-default-props.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
var rule = require('../../../lib/rules/require-default-props');
1212
var RuleTester = require('eslint').RuleTester;
13+
var assign = require('object.assign');
1314

1415
require('babel-eslint');
1516

@@ -409,7 +410,7 @@ ruleTester.run('require-default-props', rule, {
409410
' return <div>{foo}{bar}</div>;',
410411
'}'
411412
].join('\n'),
412-
parserOptions: Object.assign({sourceType: 'module'}, parserOptions)
413+
parserOptions: assign({sourceType: 'module'}, parserOptions)
413414
},
414415
{
415416
code: [
@@ -424,7 +425,7 @@ ruleTester.run('require-default-props', rule, {
424425
' return <div>{foo}{bar}</div>;',
425426
'}'
426427
].join('\n'),
427-
parserOptions: Object.assign({sourceType: 'module'}, parserOptions)
428+
parserOptions: assign({sourceType: 'module'}, parserOptions)
428429
},
429430
// using spread operator
430431
{

tests/lib/rules/style-prop-object.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
var rule = require('../../../lib/rules/style-prop-object');
1212
var RuleTester = require('eslint').RuleTester;
13+
var assign = require('object.assign');
1314

1415
var parserOptions = {
1516
ecmaVersion: 6,
@@ -76,7 +77,7 @@ ruleTester.run('style-prop-object', rule, {
7677
' return <div style={styles} />;',
7778
'}'
7879
].join('\n'),
79-
parserOptions: Object.assign({sourceType: 'module'}, parserOptions)
80+
parserOptions: assign({sourceType: 'module'}, parserOptions)
8081
},
8182
{
8283
code: [
@@ -86,7 +87,7 @@ ruleTester.run('style-prop-object', rule, {
8687
' return <div style={styles} />;',
8788
'}'
8889
].join('\n'),
89-
parserOptions: Object.assign({sourceType: 'module'}, parserOptions)
90+
parserOptions: assign({sourceType: 'module'}, parserOptions)
9091
},
9192
{
9293
code: [
@@ -101,7 +102,7 @@ ruleTester.run('style-prop-object', rule, {
101102
'const styles = Object.assign({ color: \'red\' }, mystyles);',
102103
'React.createElement("div", { style: styles });'
103104
].join('\n'),
104-
parserOptions: Object.assign({sourceType: 'module'}, parserOptions)
105+
parserOptions: assign({sourceType: 'module'}, parserOptions)
105106
},
106107
{
107108
code: '<div style></div>',

0 commit comments

Comments
 (0)