Skip to content

Commit b4a6c66

Browse files
committed
Auto merge of #1831 - kzys:es-2018, r=locks
Fix ESLINT_LEGACY_OBJECT_REST_SPREAD and upgrade eslint ES2018 supports the feature officially, and eslint deprecated `experimentalObjectRestSpread` because of that. The warning is also coming from eslint-plugin-ember. That's why the plugin is updated.
2 parents 95a4722 + 5f9bf7b commit b4a6c66

File tree

3 files changed

+198
-192
lines changed

3 files changed

+198
-192
lines changed

.eslintrc.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 2017,
4+
ecmaVersion: 2018,
55
sourceType: 'module',
6-
ecmaFeatures: {
7-
experimentalObjectRestSpread: true,
8-
},
96
},
107
plugins: ['ember', 'prettier'],
118
extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
@@ -21,6 +18,10 @@ module.exports = {
2118
'comma-dangle': 'off',
2219
'dot-notation': 'off',
2320
'operator-linebreak': 'off',
21+
22+
'ember/no-observers': 'warn',
23+
'ember/no-new-mixins': 'warn',
24+
'ember/require-return-from-computed': 'warn',
2425
},
2526
overrides: [
2627
// node files
@@ -37,7 +38,7 @@ module.exports = {
3738
],
3839
parserOptions: {
3940
sourceType: 'script',
40-
ecmaVersion: 2015,
41+
ecmaVersion: 2018,
4142
},
4243
env: {
4344
browser: false,

0 commit comments

Comments
 (0)