Merge pull request #1 from smooth-code/node-6-compat

fix: be compatible with node 6
smooth-code · Mar 31, 2018 · ba2da43 · ba2da43
2 parents efdc76e + fbdb24c
commit ba2da43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['./index.js'],
+  extends: ['./index.js', './react.js'],
 }
diff --git a/react.js b/react.js
@@ -2,9 +2,7 @@ const baseRules = require('./index').rules
 
 module.exports = {
   extends: ['airbnb', 'prettier', 'prettier/react'],
-  rules: {
-    ...baseRules,
-
+  rules: Object.assign(baseRules, {
     'react/jsx-filename-extension': ['error', { extensions: ['.js'] }],
     'react/prop-types': 'off',
     'react/sort-comp': 'off',
@@ -15,5 +13,5 @@ module.exports = {
 
     'jsx-a11y/anchor-is-valid': 'off',
     'jsx-a11y/anchor-has-content': 'off',
-  },
+  }),
 }