Skip to content

Commit da8e309

Browse files
authored
Merge pull request #1311 from CvX/eslint-upgrade
Replace eslint-plugin-ember-suave with eslint-plugin-ember.
2 parents 5e58f4d + 7a377f4 commit da8e309

File tree

3 files changed

+58
-17
lines changed

3 files changed

+58
-17
lines changed

.eslintrc.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ module.exports = {
77
'experimentalObjectRestSpread': true,
88
},
99
},
10+
plugins: [
11+
'ember',
12+
],
1013
extends: [
1114
'eslint:recommended',
12-
'plugin:ember-suave/recommended',
15+
'plugin:ember/recommended',
1316
],
1417
env: {
1518
browser: true,
@@ -26,9 +29,10 @@ module.exports = {
2629
'allowTemplateLiterals': true,
2730
'avoidEscape': true,
2831
}],
29-
30-
'ember-suave/no-const-outside-module-scope': 'off',
31-
'ember-suave/no-direct-property-access': 'off',
32-
'ember-suave/require-access-in-comments': 'off',
32+
'ember/use-brace-expansion': 'off',
33+
'ember/no-on-calls-in-components': 'off',
34+
'ember/avoid-leaking-state-in-ember-objects': 'off',
35+
'ember/no-capital-letters-in-routes': 'off',
36+
'ember/new-module-imports': 'off',
3337
},
3438
};

package-lock.json

Lines changed: 48 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"ember-test-selectors": "^0.3.7",
6969
"ember-web-app": "^2.2.0",
7070
"emberx-select": "^3.1.1",
71-
"eslint-plugin-ember-suave": "^1.0.0",
71+
"eslint-plugin-ember": "^5.1.0",
7272
"loader.js": "^4.5.1",
7373
"normalize.css": "^7.0.0",
7474
"qunit-dom": "^0.5.0",

0 commit comments

Comments
 (0)