Skip to content

Commit

Permalink
Merge pull request #10060 from Windvis/feat/switch-to-eslint-plugin-n…
Browse files Browse the repository at this point in the history
…-in-blueprints

[ENHANCEMENT] Replace `eslint-plugin-node` with `eslint-plugin-n` in the blueprints
  • Loading branch information
bertdeblock committed Nov 2, 2022
2 parents b075b2e + fcffe44 commit e408297
Show file tree
Hide file tree
Showing 22 changed files with 22 additions and 54 deletions.
8 changes: 1 addition & 7 deletions blueprints/app/files/.eslintrc.js
Expand Up @@ -52,13 +52,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],<% if (blueprint === 'app') {%>
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
},<% } %>
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
2 changes: 1 addition & 1 deletion blueprints/app/files/package.json
Expand Up @@ -57,7 +57,7 @@
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"loader.js": "^4.7.0",
Expand Down
3 changes: 1 addition & 2 deletions tests/fixtures/addon/.eslintrc.js
Expand Up @@ -41,8 +41,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/addon/defaults-travis/package.json
Expand Up @@ -56,7 +56,7 @@
"eslint": "^7.27.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.4.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-qunit": "^7.0.0",
"loader.js": "^4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/addon/defaults/package.json
Expand Up @@ -55,7 +55,7 @@
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"loader.js": "^4.7.0",
Expand Down
3 changes: 1 addition & 2 deletions tests/fixtures/addon/typescript/.eslintrc.js
Expand Up @@ -43,8 +43,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/addon/yarn/package.json
Expand Up @@ -56,7 +56,7 @@
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"loader.js": "^4.7.0",
Expand Down
8 changes: 1 addition & 7 deletions tests/fixtures/app/.eslintrc.js
Expand Up @@ -41,13 +41,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
},
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/app/defaults/package.json
Expand Up @@ -51,7 +51,7 @@
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"loader.js": "^4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/app/embroider-no-welcome/package.json
Expand Up @@ -53,7 +53,7 @@
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"loader.js": "^4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/app/embroider-yarn/package.json
Expand Up @@ -54,7 +54,7 @@
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"loader.js": "^4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/app/embroider/package.json
Expand Up @@ -54,7 +54,7 @@
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"loader.js": "^4.7.0",
Expand Down
Expand Up @@ -51,7 +51,7 @@
"eslint": "^7.24.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-ember": "^10.3.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-qunit": "^7.0.0",
"loader.js": "^4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/app/npm-travis/package.json
Expand Up @@ -51,7 +51,7 @@
"eslint": "^7.27.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.4.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-qunit": "^7.0.0",
"loader.js": "^4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/app/npm/package.json
Expand Up @@ -50,7 +50,7 @@
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"loader.js": "^4.7.0",
Expand Down
8 changes: 1 addition & 7 deletions tests/fixtures/app/typescript-embroider/.eslintrc.js
Expand Up @@ -43,13 +43,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
},
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
8 changes: 1 addition & 7 deletions tests/fixtures/app/typescript/.eslintrc.js
Expand Up @@ -43,13 +43,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
},
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
Expand Up @@ -41,13 +41,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
},
extends: ['plugin:n/recommended'],
},
],
};
Expand Up @@ -51,7 +51,7 @@
"eslint": "^7.20.0",
"eslint-config-prettier": "^7.2.0",
"eslint-plugin-ember": "^10.2.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^3.3.1",
"loader.js": "^4.7.0",
"prettier": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/app/yarn-travis/package.json
Expand Up @@ -52,7 +52,7 @@
"eslint": "^7.27.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.4.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-qunit": "^7.0.0",
"loader.js": "^4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/app/yarn/package.json
Expand Up @@ -51,7 +51,7 @@
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-n": "^15.4.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"loader.js": "^4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/blueprints/addon-test.js
Expand Up @@ -163,7 +163,7 @@ describe('blueprint - addon', function () {
);

let json = JSON.parse(output);
delete json.devDependencies['eslint-plugin-node'];
delete json.devDependencies['eslint-plugin-n'];
delete json.devDependencies['ember-try'];
delete json.devDependencies['ember-source-channel-url'];
delete json.devDependencies['@embroider/test-setup'];
Expand Down

0 comments on commit e408297

Please sign in to comment.