Skip to content

Commit 075e5ce

Browse files
pichflpichfl
authored
Merge pull request #2368 from simplabs/pichfl/upgrade-eslint
Upgrade ESLint configuration
2 parents e67348e + 492c598 commit 075e5ce

File tree

15 files changed

+568
-834
lines changed

15 files changed

+568
-834
lines changed

‎.eslintrc.js‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
module.exports = {
2+
root: true,
3+
extends: [
4+
'simplabs',
5+
'simplabs/plugins/ember',
6+
'plugin:ember/recommended',
7+
],
8+
parserOptions: {
9+
ecmaVersion: 2017,
10+
sourceType: 'module'
11+
},
12+
rules: {
13+
'ember/local-modules': 'off',
14+
'ember/no-get': 'off',
15+
'ember/avoid-leaking-state-in-components': 'off',
16+
17+
// Legacy Ember features
18+
'ember/no-actions-hash': 'off',
19+
'ember/no-classic-classes': 'off',
20+
'ember/no-classic-components': 'off',
21+
'ember/no-private-routing-service': 'off',
22+
'ember/require-tagless-components': 'off',
23+
24+
// TODO: REMOVE
25+
'no-implicit-coercion': 'off',
26+
'no-multi-spaces': 'off',
27+
'no-multi-str': 'off',
28+
'no-trailing-spaces': 'off',
29+
'no-unused-vars': 'off',
30+
'no-var': 'off',
31+
'prefer-template': 'off',
32+
'quotes': 'off',
33+
'semi': 'off'
34+
},
35+
overrides: [
36+
// node files
37+
{
38+
files: [
39+
'ember-cli-build.js',
40+
'fastboot-server.js',
41+
'testem.js',
42+
'config/**/*.js',
43+
'.eslintrc.js',
44+
],
45+
excludedFiles: [
46+
'app/**',
47+
],
48+
parserOptions: {
49+
sourceType: 'script',
50+
ecmaVersion: 2015
51+
},
52+
env: {
53+
browser: false,
54+
node: true
55+
},
56+
plugins: ['node'],
57+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
58+
"node/no-extraneous-require": "off",
59+
"node/no-unpublished-require": "off"
60+
// add your custom rules and overrides for node files here
61+
})
62+
},
63+
// Tests
64+
{
65+
files: ['tests/**/*.js'],
66+
extends: ['plugin:qunit/recommended'],
67+
parserOptions: {
68+
ecmaVersion: 2017,
69+
sourceType: 'module',
70+
},
71+
rules: {
72+
'qunit/no-assert-equal': 'off',
73+
}
74+
}
75+
]
76+
};

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ yarn-error.log
2424
.node_modules.ember-try/
2525
package.json.ember-try
2626
package-lock.json
27+
28+
.eslintcache

‎packages/classic-test-app/.eslintignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.eslintcache
1617

1718
# ember-try
1819
/.node_modules.ember-try/
1920
/bower.json.ember-try
21+
/npm-shrinkwrap.json.ember-try
2022
/package.json.ember-try
23+
/package-lock.json.ember-try
24+
/yarn.lock.ember-try

‎packages/classic-test-app/.eslintrc.js‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,6 @@
33
module.exports = {
44
root: true,
55
extends: [
6-
'simplabs',
7-
'simplabs/plugins/ember',
8-
'plugin:ember/recommended',
6+
'../../.eslintrc.js',
97
],
10-
rules: {
11-
'ember/local-modules': 'off',
12-
'ember/no-get': 'off',
13-
'ember/avoid-leaking-state-in-components': 'off',
14-
},
15-
parserOptions: {
16-
ecmaVersion: 2017,
17-
sourceType: 'module'
18-
},
19-
overrides: [
20-
// node files
21-
{
22-
files: [
23-
'ember-cli-build.js',
24-
'fastboot-server.js',
25-
'testem.js',
26-
'config/**/*.js',
27-
],
28-
excludedFiles: [
29-
'app/**',
30-
],
31-
parserOptions: {
32-
sourceType: 'script',
33-
ecmaVersion: 2015
34-
},
35-
env: {
36-
browser: false,
37-
node: true
38-
},
39-
plugins: ['node'],
40-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
41-
"node/no-extraneous-require": "off",
42-
"node/no-unpublished-require": "off"
43-
// add your custom rules and overrides for node files here
44-
})
45-
}
46-
]
478
};

‎packages/classic-test-app/package.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
"private": true,
55
"scripts": {
66
"build": "ember build",
7-
"lint": "eslint app config server tests *.js",
7+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
8+
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
9+
"lint:js": "eslint . --cache",
10+
"lint:js:fix": "eslint . --fix",
811
"start": "ember serve",
912
"start:fastboot": "NODE_ENV=production node fastboot-server.js",
1013
"start:demo-api": "node server/demo-api.js",
@@ -45,16 +48,17 @@
4548
"ember-source": "~3.17.0",
4649
"ember-source-channel-url": "^3.0.0",
4750
"ember-try": "^1.1.0",
48-
"eslint": "^6.8.0",
51+
"eslint": "^8.14.0",
4952
"eslint-config-simplabs": "^0.4.0",
50-
"eslint-plugin-ember": "^8.1.1",
53+
"eslint-plugin-ember": "^10.6.0",
5154
"eslint-plugin-node": "^11.0.0",
52-
"eslint-plugin-qunit": "^6.2.0",
55+
"eslint-plugin-qunit": "^7.2.0",
5356
"express": "^4.17.1",
5457
"glob": "^8.0.0",
5558
"handlebars": "~4.7.1",
5659
"loader.js": "^4.7.0",
5760
"my-engine": "./packages/classic-test-app/lib/my-engine",
61+
"npm-run-all": "^4.1.5",
5862
"qunit-dom": "^2.0.0",
5963
"torii": "^0.10.0"
6064
},

‎packages/classic-test-app/tests/.eslintrc.js‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎packages/ember-simple-auth/.eslintignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@
1515
# misc
1616
/coverage/
1717
!.*
18+
.eslintcache
1819

1920
# ember-try
2021
/.node_modules.ember-try/
2122
/bower.json.ember-try
23+
/npm-shrinkwrap.json.ember-try
2224
/package.json.ember-try
25+
/package-lock.json.ember-try
26+
/yarn.lock.ember-try
27+
28+
/docs

‎packages/ember-simple-auth/.eslintrc.js‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,8 @@
33
module.exports = {
44
root: true,
55
extends: [
6-
'simplabs',
7-
'simplabs/plugins/ember',
8-
'plugin:ember/recommended',
6+
'../../.eslintrc.js',
97
],
10-
rules: {
11-
'ember/local-modules': 'off',
12-
'ember/no-get': 'off',
13-
'ember/avoid-leaking-state-in-components': 'off',
14-
},
15-
parserOptions: {
16-
ecmaVersion: 2017,
17-
sourceType: 'module'
18-
},
198
overrides: [
209
// node files
2110
{
@@ -57,6 +46,16 @@ module.exports = {
5746
node: true,
5847
mocha: true
5948
}
49+
}, {
50+
files: ['tests/**/*.js'],
51+
extends: ['plugin:qunit/recommended'],
52+
parserOptions: {
53+
ecmaVersion: 2017,
54+
sourceType: 'module',
55+
},
56+
rules: {
57+
'qunit/no-assert-equal': 'off',
58+
}
6059
}
6160
]
6261
};

‎packages/ember-simple-auth/.npmignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717
bower.json
1818
/* ember-cli-build.js */
1919
testem.js
20+
.eslintcache

‎packages/ember-simple-auth/package.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
},
1515
"scripts": {
1616
"build": "ember build",
17-
"lint": "eslint app addon blueprints config tests *.js",
17+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
18+
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
19+
"lint:js": "eslint . --cache",
20+
"lint:js:fix": "eslint . --fix",
1821
"start": "ember serve",
1922
"test": "ember test",
2023
"test:all": "ember try:each",
@@ -61,16 +64,17 @@
6164
"ember-source-channel-url": "^3.0.0",
6265
"ember-test-selectors": "^6.0.0",
6366
"ember-try": "^1.4.0",
64-
"eslint": "^6.8.0",
67+
"eslint": "^8.14.0",
6568
"eslint-config-simplabs": "^0.4.0",
66-
"eslint-plugin-ember": "^8.4.1",
69+
"eslint-plugin-ember": "^10.6.0",
6770
"eslint-plugin-node": "^11.1.0",
68-
"eslint-plugin-qunit": "^6.2.0",
71+
"eslint-plugin-qunit": "^7.2.0",
6972
"glob": "^8.0.0",
7073
"handlebars": "~4.7.1",
7174
"loader.js": "^4.7.0",
7275
"marked": "^4.0.0",
7376
"mocha": "^7.0.1",
77+
"npm-run-all": "^4.1.5",
7478
"qunit-dom": "^2.0.0",
7579
"torii": "^0.10.0"
7680
},

0 commit comments

Comments
 (0)