Commit a3f7e0d25ede14f2166e6b7e6babd8cc4a95e05b
Committed by
GitHub
Merge pull request #1775 from SergioCrisostomo/add-babel-stage-3
Add Object rest spread to eslint and babel configs
Showing
3 changed files
with
8 additions
and
3 deletions
Show diff stats
.babelrc
.eslintrc.json
1 | { | 1 | { |
2 | "root": true, | 2 | "root": true, |
3 | "parserOptions": { | 3 | "parserOptions": { |
4 | + "ecmaFeatures": { | ||
5 | + "experimentalObjectRestSpread": true | ||
6 | + }, | ||
4 | "ecmaVersion": 6, | 7 | "ecmaVersion": 6, |
5 | "sourceType": "module" | 8 | "sourceType": "module" |
6 | }, | 9 | }, |
@@ -8,11 +11,12 @@ | @@ -8,11 +11,12 @@ | ||
8 | "browser": true | 11 | "browser": true |
9 | }, | 12 | }, |
10 | "extends": "eslint:recommended", | 13 | "extends": "eslint:recommended", |
11 | - "plugins": [ "html" ], | 14 | + "plugins": ["vue"], |
12 | "rules": { | 15 | "rules": { |
13 | "indent": ["error", 4, { "SwitchCase": 1 }], | 16 | "indent": ["error", 4, { "SwitchCase": 1 }], |
14 | "quotes": ["error", "single"], | 17 | "quotes": ["error", "single"], |
15 | "semi": ["error", "always"], | 18 | "semi": ["error", "always"], |
19 | + "vue/jsx-uses-vars": 2, | ||
16 | "no-console": ["error"] | 20 | "no-console": ["error"] |
17 | } | 21 | } |
18 | } | 22 | } |
package.json
@@ -56,12 +56,13 @@ | @@ -56,12 +56,13 @@ | ||
56 | "babel-loader": "^6.4.1", | 56 | "babel-loader": "^6.4.1", |
57 | "babel-plugin-transform-runtime": "^6.12.0", | 57 | "babel-plugin-transform-runtime": "^6.12.0", |
58 | "babel-preset-es2015": "^6.24.1", | 58 | "babel-preset-es2015": "^6.24.1", |
59 | + "babel-preset-stage-3": "^6.24.1", | ||
59 | "babel-runtime": "^6.11.6", | 60 | "babel-runtime": "^6.11.6", |
60 | "chai": "^3.5.0", | 61 | "chai": "^3.5.0", |
61 | "cross-env": "^3.2.4", | 62 | "cross-env": "^3.2.4", |
62 | "css-loader": "^0.23.1", | 63 | "css-loader": "^0.23.1", |
63 | "eslint": "^3.19.0", | 64 | "eslint": "^3.19.0", |
64 | - "eslint-plugin-html": "^1.7.0", | 65 | + "eslint-plugin-vue": "^2.1.0", |
65 | "extract-text-webpack-plugin": "^2.1.2", | 66 | "extract-text-webpack-plugin": "^2.1.2", |
66 | "file-loader": "^0.8.5", | 67 | "file-loader": "^0.8.5", |
67 | "friendly-errors-webpack-plugin": "^1.6.1", | 68 | "friendly-errors-webpack-plugin": "^1.6.1", |