From fcffe445a1f291be064dbbe05703d1fa6e425b89 Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Mon, 31 Oct 2022 15:57:34 +0100 Subject: [PATCH] Replace `eslint-plugin-node` with `eslint-plugin-n` in the blueprints `eslint-plugin-node` has been unmaintained for a long while and the ecosystem is switching to eslint-plugin-n, which is a fork of the original package that is being maintained by the community. --- blueprints/app/files/.eslintrc.js | 8 +------- blueprints/app/files/package.json | 2 +- tests/fixtures/addon/.eslintrc.js | 3 +-- tests/fixtures/addon/defaults-travis/package.json | 2 +- tests/fixtures/addon/defaults/package.json | 2 +- tests/fixtures/addon/typescript/.eslintrc.js | 3 +-- tests/fixtures/addon/yarn/package.json | 2 +- tests/fixtures/app/.eslintrc.js | 8 +------- tests/fixtures/app/defaults/package.json | 2 +- tests/fixtures/app/embroider-no-welcome/package.json | 2 +- tests/fixtures/app/embroider-yarn/package.json | 2 +- tests/fixtures/app/embroider/package.json | 2 +- .../app/nested-project/actual-project/package.json | 2 +- tests/fixtures/app/npm-travis/package.json | 2 +- tests/fixtures/app/npm/package.json | 2 +- tests/fixtures/app/typescript-embroider/.eslintrc.js | 8 +------- tests/fixtures/app/typescript/.eslintrc.js | 8 +------- .../app/with-blueprint-override-lint-fail/.eslintrc.js | 8 +------- .../app/with-blueprint-override-lint-fail/package.json | 2 +- tests/fixtures/app/yarn-travis/package.json | 2 +- tests/fixtures/app/yarn/package.json | 2 +- tests/unit/blueprints/addon-test.js | 2 +- 22 files changed, 22 insertions(+), 54 deletions(-) diff --git a/blueprints/app/files/.eslintrc.js b/blueprints/app/files/.eslintrc.js index 11b00a5dfe..1f926e184b 100644 --- a/blueprints/app/files/.eslintrc.js +++ b/blueprints/app/files/.eslintrc.js @@ -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 diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index 1dde70766a..a65fa1bb7a 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -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", diff --git a/tests/fixtures/addon/.eslintrc.js b/tests/fixtures/addon/.eslintrc.js index d025472e6d..c377b2c242 100644 --- a/tests/fixtures/addon/.eslintrc.js +++ b/tests/fixtures/addon/.eslintrc.js @@ -41,8 +41,7 @@ module.exports = { browser: false, node: true, }, - plugins: ['node'], - extends: ['plugin:node/recommended'], + extends: ['plugin:n/recommended'], }, { // test files diff --git a/tests/fixtures/addon/defaults-travis/package.json b/tests/fixtures/addon/defaults-travis/package.json index e23bff9557..d2444ba725 100644 --- a/tests/fixtures/addon/defaults-travis/package.json +++ b/tests/fixtures/addon/defaults-travis/package.json @@ -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", diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index dc00347871..a9eea40a33 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -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", diff --git a/tests/fixtures/addon/typescript/.eslintrc.js b/tests/fixtures/addon/typescript/.eslintrc.js index 5f6bf8c3e4..74c72f8da5 100644 --- a/tests/fixtures/addon/typescript/.eslintrc.js +++ b/tests/fixtures/addon/typescript/.eslintrc.js @@ -43,8 +43,7 @@ module.exports = { browser: false, node: true, }, - plugins: ['node'], - extends: ['plugin:node/recommended'], + extends: ['plugin:n/recommended'], }, { // test files diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index a34f5f7c09..c240002ab4 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -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", diff --git a/tests/fixtures/app/.eslintrc.js b/tests/fixtures/app/.eslintrc.js index 8a8a4ee83f..3d9b5b1d78 100644 --- a/tests/fixtures/app/.eslintrc.js +++ b/tests/fixtures/app/.eslintrc.js @@ -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 diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index f5abc707b6..ef93b57c1e 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -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", diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index dbeafbed60..25fdaa79eb 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -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", diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index 0d6e33ba53..37ad6c7ca0 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -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", diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 0d6e33ba53..37ad6c7ca0 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -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", diff --git a/tests/fixtures/app/nested-project/actual-project/package.json b/tests/fixtures/app/nested-project/actual-project/package.json index cf62545cc1..758dc99163 100644 --- a/tests/fixtures/app/nested-project/actual-project/package.json +++ b/tests/fixtures/app/nested-project/actual-project/package.json @@ -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", diff --git a/tests/fixtures/app/npm-travis/package.json b/tests/fixtures/app/npm-travis/package.json index 31885fa1dc..92771d9cff 100644 --- a/tests/fixtures/app/npm-travis/package.json +++ b/tests/fixtures/app/npm-travis/package.json @@ -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", diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 003a4347b2..1ab7a95aea 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -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", diff --git a/tests/fixtures/app/typescript-embroider/.eslintrc.js b/tests/fixtures/app/typescript-embroider/.eslintrc.js index 66adc0018d..77e9dfbc94 100644 --- a/tests/fixtures/app/typescript-embroider/.eslintrc.js +++ b/tests/fixtures/app/typescript-embroider/.eslintrc.js @@ -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 diff --git a/tests/fixtures/app/typescript/.eslintrc.js b/tests/fixtures/app/typescript/.eslintrc.js index 66adc0018d..77e9dfbc94 100644 --- a/tests/fixtures/app/typescript/.eslintrc.js +++ b/tests/fixtures/app/typescript/.eslintrc.js @@ -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 diff --git a/tests/fixtures/app/with-blueprint-override-lint-fail/.eslintrc.js b/tests/fixtures/app/with-blueprint-override-lint-fail/.eslintrc.js index 056424da73..fa06a4bcf7 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/.eslintrc.js +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/.eslintrc.js @@ -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'], }, ], }; diff --git a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json index b26a69165c..6cc607ab40 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json @@ -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", diff --git a/tests/fixtures/app/yarn-travis/package.json b/tests/fixtures/app/yarn-travis/package.json index 8e8b1dd0dc..f8b6af6205 100644 --- a/tests/fixtures/app/yarn-travis/package.json +++ b/tests/fixtures/app/yarn-travis/package.json @@ -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", diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index f5abc707b6..ef93b57c1e 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -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", diff --git a/tests/unit/blueprints/addon-test.js b/tests/unit/blueprints/addon-test.js index e08e54a5f4..f0a7f16a6d 100644 --- a/tests/unit/blueprints/addon-test.js +++ b/tests/unit/blueprints/addon-test.js @@ -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'];