From e97c6aded1ee8fba5d8e3894bdf0c0526d05a38b Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Mon, 18 Oct 2021 18:56:03 +0800 Subject: [PATCH 01/12] upgrade eslint to v8 in blueprints --- blueprints/app/files/.eslintrc.js | 9 ++++++--- blueprints/app/files/package.json | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/blueprints/app/files/.eslintrc.js b/blueprints/app/files/.eslintrc.js index d5e5cfc75b..642fdfc7ef 100644 --- a/blueprints/app/files/.eslintrc.js +++ b/blueprints/app/files/.eslintrc.js @@ -2,12 +2,15 @@ module.exports = { root: true, - parser: 'babel-eslint', + parser: '@babel/eslint-parser', parserOptions: { ecmaVersion: 2018, sourceType: 'module', - ecmaFeatures: { - legacyDecorators: true, + requireConfigFile: false, + babelOptions: { + plugins: [ + ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], + ], }, }, plugins: ['ember'], diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index 546efb46de..4a9b92c4ce 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -23,6 +23,8 @@ "test:ember": "ember test" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2<% if (embroider) { %>", "@embroider/compat": "^0.44.1", @@ -30,7 +32,6 @@ "@embroider/webpack": "^0.44.1<% } %>", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", "ember-cli": "~<%= emberCLIVersion %>", @@ -51,7 +52,7 @@ "ember-source": "~4.0.0-beta.4", "ember-template-lint": "^3.7.0<% if (welcome) { %>", "ember-welcome-page": "^5.0.0<% } %>", - "eslint": "^7.32.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", From b5cbf22007f1740a37bc5791fbc3663f6554d323 Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Mon, 18 Oct 2021 18:56:21 +0800 Subject: [PATCH 02/12] update test fixtures for eslint v8 --- tests/fixtures/addon/.eslintrc.js | 9 ++++++--- tests/fixtures/addon/defaults-travis/package.json | 11 ++++++----- tests/fixtures/addon/defaults/package.json | 5 +++-- tests/fixtures/addon/yarn/package.json | 5 +++-- tests/fixtures/app/.eslintrc.js | 9 ++++++--- tests/fixtures/app/defaults/package.json | 5 +++-- tests/fixtures/app/embroider-no-welcome/package.json | 5 +++-- tests/fixtures/app/embroider-yarn/package.json | 5 +++-- tests/fixtures/app/embroider/package.json | 5 +++-- .../app/nested-project/actual-project/package.json | 11 ++++++----- tests/fixtures/app/npm-travis/package.json | 11 ++++++----- tests/fixtures/app/npm/package.json | 5 +++-- .../with-blueprint-override-lint-fail/.eslintrc.js | 9 ++++++--- .../with-blueprint-override-lint-fail/package.json | 12 +++++++----- tests/fixtures/app/yarn-travis/package.json | 11 ++++++----- tests/fixtures/app/yarn/package.json | 5 +++-- 16 files changed, 73 insertions(+), 50 deletions(-) diff --git a/tests/fixtures/addon/.eslintrc.js b/tests/fixtures/addon/.eslintrc.js index d025472e6d..f740a6e325 100644 --- a/tests/fixtures/addon/.eslintrc.js +++ b/tests/fixtures/addon/.eslintrc.js @@ -2,12 +2,15 @@ module.exports = { root: true, - parser: 'babel-eslint', + parser: '@babel/eslint-parser', parserOptions: { ecmaVersion: 2018, sourceType: 'module', - ecmaFeatures: { - legacyDecorators: true, + requireConfigFile: false, + babelOptions: { + plugins: [ + ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }] + ], }, }, plugins: ['ember'], diff --git a/tests/fixtures/addon/defaults-travis/package.json b/tests/fixtures/addon/defaults-travis/package.json index 8260e33ee2..d7d003b2f8 100644 --- a/tests/fixtures/addon/defaults-travis/package.json +++ b/tests/fixtures/addon/defaults-travis/package.json @@ -30,12 +30,13 @@ "ember-cli-htmlbars": "^5.7.1" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@embroider/test-setup": "^0.41.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", @@ -54,12 +55,12 @@ "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^3.4.2", "ember-try": "^1.4.0", - "eslint": "^7.27.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-ember": "^10.4.2", + "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.4.0", - "eslint-plugin-qunit": "^6.1.1", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-qunit": "^6.2.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", "prettier": "^2.3.0", diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index 15584a0e38..1a7d77c5fe 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -30,12 +30,13 @@ "ember-cli-htmlbars": "^5.7.1" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/test-setup": "^0.44.1", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", "ember-cli": "~<%= emberCLIVersion %>", @@ -53,7 +54,7 @@ "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^3.7.0", "ember-try": "^1.4.0", - "eslint": "^7.32.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index 3e30a17361..b7bf9dc5b5 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -30,12 +30,13 @@ "ember-cli-htmlbars": "^5.7.1" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/test-setup": "^0.44.1", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", "ember-cli": "~<%= emberCLIVersion %>", @@ -54,7 +55,7 @@ "ember-template-lint": "^3.7.0", "ember-try": "^1.4.0", "ember-welcome-page": "^5.0.0", - "eslint": "^7.32.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", diff --git a/tests/fixtures/app/.eslintrc.js b/tests/fixtures/app/.eslintrc.js index 8a8a4ee83f..80ac588f29 100644 --- a/tests/fixtures/app/.eslintrc.js +++ b/tests/fixtures/app/.eslintrc.js @@ -2,12 +2,15 @@ module.exports = { root: true, - parser: 'babel-eslint', + parser: '@babel/eslint-parser', parserOptions: { ecmaVersion: 2018, sourceType: 'module', - ecmaFeatures: { - legacyDecorators: true, + requireConfigFile: false, + babelOptions: { + plugins: [ + ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], + ], }, }, plugins: ['ember'], diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index aeb45cc6da..2fbe590975 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -23,11 +23,12 @@ "test:ember": "ember test" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", "ember-cli": "~<%= emberCLIVersion %>", @@ -48,7 +49,7 @@ "ember-source": "~4.0.0-beta.4", "ember-template-lint": "^3.7.0", "ember-welcome-page": "^5.0.0", - "eslint": "^7.32.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index 0ea36ed8a0..58a0bc9444 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -23,6 +23,8 @@ "test:ember": "ember test" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/compat": "^0.44.1", @@ -30,7 +32,6 @@ "@embroider/webpack": "^0.44.1", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", "ember-cli": "~<%= emberCLIVersion %>", @@ -50,7 +51,7 @@ "ember-resolver": "^8.0.3", "ember-source": "~4.0.0-beta.4", "ember-template-lint": "^3.7.0", - "eslint": "^7.32.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index 759ccbfa64..1e05f659d5 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -23,6 +23,8 @@ "test:ember": "ember test" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/compat": "^0.44.1", @@ -30,7 +32,6 @@ "@embroider/webpack": "^0.44.1", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", "ember-cli": "~<%= emberCLIVersion %>", @@ -51,7 +52,7 @@ "ember-source": "~4.0.0-beta.4", "ember-template-lint": "^3.7.0", "ember-welcome-page": "^5.0.0", - "eslint": "^7.32.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 759ccbfa64..1e05f659d5 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -23,6 +23,8 @@ "test:ember": "ember test" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/compat": "^0.44.1", @@ -30,7 +32,6 @@ "@embroider/webpack": "^0.44.1", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", "ember-cli": "~<%= emberCLIVersion %>", @@ -51,7 +52,7 @@ "ember-source": "~4.0.0-beta.4", "ember-template-lint": "^3.7.0", "ember-welcome-page": "^5.0.0", - "eslint": "^7.32.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", diff --git a/tests/fixtures/app/nested-project/actual-project/package.json b/tests/fixtures/app/nested-project/actual-project/package.json index 6ffba94006..f38e155c9e 100644 --- a/tests/fixtures/app/nested-project/actual-project/package.json +++ b/tests/fixtures/app/nested-project/actual-project/package.json @@ -23,11 +23,12 @@ "test:ember": "ember test" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.11.2", "ember-cli": "~<%= emberCLIVersion %>", @@ -48,12 +49,12 @@ "ember-source": "~3.27.0-beta.3", "ember-template-lint": "^3.2.0", "ember-welcome-page": "^5.0.0", - "eslint": "^7.24.0", - "eslint-config-prettier": "^8.1.0", + "eslint": "^8.0.1", + "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.3.0", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-qunit": "^6.0.0", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-qunit": "^6.2.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", "prettier": "^2.2.1", diff --git a/tests/fixtures/app/npm-travis/package.json b/tests/fixtures/app/npm-travis/package.json index 420dbdca86..a27c85d666 100644 --- a/tests/fixtures/app/npm-travis/package.json +++ b/tests/fixtures/app/npm-travis/package.json @@ -23,11 +23,12 @@ "test:ember": "ember test" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", @@ -48,12 +49,12 @@ "ember-resolver": "^8.0.2", "ember-source": "~3.27.2", "ember-template-lint": "^3.4.2", - "eslint": "^7.27.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-ember": "^10.4.2", + "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.4.0", - "eslint-plugin-qunit": "^6.1.1", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-qunit": "^6.2.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", "prettier": "^2.3.0", diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 98e78768d5..4b7164e3d9 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -23,11 +23,12 @@ "test:ember": "ember test" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", "ember-cli": "~<%= emberCLIVersion %>", @@ -47,7 +48,7 @@ "ember-resolver": "^8.0.3", "ember-source": "~4.0.0-beta.4", "ember-template-lint": "^3.7.0", - "eslint": "^7.32.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", 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..2b5f65ef4a 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/.eslintrc.js +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/.eslintrc.js @@ -2,12 +2,15 @@ module.exports = { root: true, - parser: 'babel-eslint', + parser: '@babel/eslint-parser', parserOptions: { ecmaVersion: 2018, sourceType: 'module', - ecmaFeatures: { - legacyDecorators: true, + requireConfigFile: false, + babelOptions: { + plugins: [ + ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], + ], }, }, plugins: ['ember'], 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 831a4e7798..0eea15b117 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json @@ -23,11 +23,12 @@ "test:ember": "ember test" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.0", "@glimmer/component": "^1.0.3", "@glimmer/tracking": "^1.0.3", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.10.1", "ember-cli": "~<%= emberCLIVersion %>", @@ -48,11 +49,12 @@ "ember-source": "~3.26.0-beta.2", "ember-template-lint": "^2.18.1", "ember-welcome-page": "^5.0.0", - "eslint": "^7.20.0", - "eslint-config-prettier": "^7.2.0", - "eslint-plugin-ember": "^10.2.0", + "eslint": "^8.0.1", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-qunit": "^6.2.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", "prettier": "^2.2.1", diff --git a/tests/fixtures/app/yarn-travis/package.json b/tests/fixtures/app/yarn-travis/package.json index 679e500cdf..b71c8d7550 100644 --- a/tests/fixtures/app/yarn-travis/package.json +++ b/tests/fixtures/app/yarn-travis/package.json @@ -23,11 +23,12 @@ "test:ember": "ember test" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.11.3", "ember-cli": "~<%= emberCLIVersion %>", @@ -49,12 +50,12 @@ "ember-source": "~3.27.2", "ember-template-lint": "^3.4.2", "ember-welcome-page": "^4.0.0", - "eslint": "^7.27.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-ember": "^10.4.2", + "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.4.0", - "eslint-plugin-qunit": "^6.1.1", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-qunit": "^6.2.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", "prettier": "^2.3.0", diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index aeb45cc6da..2fbe590975 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -23,11 +23,12 @@ "test:ember": "ember test" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", "ember-cli": "~<%= emberCLIVersion %>", @@ -48,7 +49,7 @@ "ember-source": "~4.0.0-beta.4", "ember-template-lint": "^3.7.0", "ember-welcome-page": "^5.0.0", - "eslint": "^7.32.0", + "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^10.5.4", "eslint-plugin-node": "^11.1.0", From 8ae8d5fb6c6724eaf0f809c17748397d0bd366dc Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Mon, 18 Oct 2021 19:49:41 +0800 Subject: [PATCH 03/12] remove @babel/plugin-proposal-decorators --- blueprints/app/files/.eslintrc.js | 6 ++---- blueprints/app/files/package.json | 1 - tests/fixtures/addon/.eslintrc.js | 6 ++---- tests/fixtures/addon/defaults-travis/package.json | 1 - tests/fixtures/addon/defaults/package.json | 1 - tests/fixtures/addon/yarn/package.json | 1 - tests/fixtures/app/.eslintrc.js | 6 ++---- tests/fixtures/app/defaults/package.json | 1 - tests/fixtures/app/embroider-no-welcome/package.json | 1 - tests/fixtures/app/embroider-yarn/package.json | 1 - tests/fixtures/app/embroider/package.json | 1 - .../fixtures/app/nested-project/actual-project/package.json | 1 - tests/fixtures/app/npm-travis/package.json | 1 - tests/fixtures/app/npm/package.json | 1 - .../app/with-blueprint-override-lint-fail/.eslintrc.js | 6 ++---- .../app/with-blueprint-override-lint-fail/package.json | 1 - tests/fixtures/app/yarn-travis/package.json | 1 - tests/fixtures/app/yarn/package.json | 1 - 18 files changed, 8 insertions(+), 30 deletions(-) diff --git a/blueprints/app/files/.eslintrc.js b/blueprints/app/files/.eslintrc.js index 642fdfc7ef..906df00e30 100644 --- a/blueprints/app/files/.eslintrc.js +++ b/blueprints/app/files/.eslintrc.js @@ -7,10 +7,8 @@ module.exports = { ecmaVersion: 2018, sourceType: 'module', requireConfigFile: false, - babelOptions: { - plugins: [ - ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], - ], + ecmaFeatures: { + legacyDecorators: true, }, }, plugins: ['ember'], diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index 4a9b92c4ce..0ac78d1acb 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -24,7 +24,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2<% if (embroider) { %>", "@embroider/compat": "^0.44.1", diff --git a/tests/fixtures/addon/.eslintrc.js b/tests/fixtures/addon/.eslintrc.js index f740a6e325..51c499746c 100644 --- a/tests/fixtures/addon/.eslintrc.js +++ b/tests/fixtures/addon/.eslintrc.js @@ -7,10 +7,8 @@ module.exports = { ecmaVersion: 2018, sourceType: 'module', requireConfigFile: false, - babelOptions: { - plugins: [ - ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }] - ], + ecmaFeatures: { + legacyDecorators: true, }, }, plugins: ['ember'], diff --git a/tests/fixtures/addon/defaults-travis/package.json b/tests/fixtures/addon/defaults-travis/package.json index d7d003b2f8..20ae3a3f55 100644 --- a/tests/fixtures/addon/defaults-travis/package.json +++ b/tests/fixtures/addon/defaults-travis/package.json @@ -31,7 +31,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@embroider/test-setup": "^0.41.0", diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index 1a7d77c5fe..a83cd4f038 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -31,7 +31,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/test-setup": "^0.44.1", diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index b7bf9dc5b5..4ef5817f0f 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -31,7 +31,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/test-setup": "^0.44.1", diff --git a/tests/fixtures/app/.eslintrc.js b/tests/fixtures/app/.eslintrc.js index 80ac588f29..884e8f7806 100644 --- a/tests/fixtures/app/.eslintrc.js +++ b/tests/fixtures/app/.eslintrc.js @@ -7,10 +7,8 @@ module.exports = { ecmaVersion: 2018, sourceType: 'module', requireConfigFile: false, - babelOptions: { - plugins: [ - ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], - ], + ecmaFeatures: { + legacyDecorators: true, }, }, plugins: ['ember'], diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index 2fbe590975..aa1c01f912 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -24,7 +24,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index 58a0bc9444..1d4a4ac544 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -24,7 +24,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/compat": "^0.44.1", diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index 1e05f659d5..9a539f57f0 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -24,7 +24,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/compat": "^0.44.1", diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 1e05f659d5..9a539f57f0 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -24,7 +24,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/compat": "^0.44.1", diff --git a/tests/fixtures/app/nested-project/actual-project/package.json b/tests/fixtures/app/nested-project/actual-project/package.json index f38e155c9e..52aac65875 100644 --- a/tests/fixtures/app/nested-project/actual-project/package.json +++ b/tests/fixtures/app/nested-project/actual-project/package.json @@ -24,7 +24,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@glimmer/component": "^1.0.4", diff --git a/tests/fixtures/app/npm-travis/package.json b/tests/fixtures/app/npm-travis/package.json index a27c85d666..67efc99544 100644 --- a/tests/fixtures/app/npm-travis/package.json +++ b/tests/fixtures/app/npm-travis/package.json @@ -24,7 +24,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@glimmer/component": "^1.0.4", diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 4b7164e3d9..2bff906ab8 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -24,7 +24,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", 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 2b5f65ef4a..9a2a0861a7 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/.eslintrc.js +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/.eslintrc.js @@ -7,10 +7,8 @@ module.exports = { ecmaVersion: 2018, sourceType: 'module', requireConfigFile: false, - babelOptions: { - plugins: [ - ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], - ], + ecmaFeatures: { + legacyDecorators: true, }, }, plugins: ['ember'], 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 0eea15b117..053aff0b64 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json @@ -24,7 +24,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.0", "@glimmer/component": "^1.0.3", diff --git a/tests/fixtures/app/yarn-travis/package.json b/tests/fixtures/app/yarn-travis/package.json index b71c8d7550..66f90ff7e0 100644 --- a/tests/fixtures/app/yarn-travis/package.json +++ b/tests/fixtures/app/yarn-travis/package.json @@ -24,7 +24,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@glimmer/component": "^1.0.4", diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index 2fbe590975..aa1c01f912 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -24,7 +24,6 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", From 452de3e0436bda610769273818e74c6483d42e4e Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Tue, 19 Oct 2021 01:30:32 +0800 Subject: [PATCH 04/12] Revert "remove @babel/plugin-proposal-decorators" It's required to use `@babel/plugin-proposal-decorators` plugin with `@babel/eslint-parser` if we want to support decorators in JavaScript. This reverts commit 8ae8d5fb6c6724eaf0f809c17748397d0bd366dc. --- blueprints/app/files/.eslintrc.js | 6 ++++-- blueprints/app/files/package.json | 1 + tests/fixtures/addon/.eslintrc.js | 6 ++++-- tests/fixtures/addon/defaults-travis/package.json | 1 + tests/fixtures/addon/defaults/package.json | 1 + tests/fixtures/addon/yarn/package.json | 1 + tests/fixtures/app/.eslintrc.js | 6 ++++-- tests/fixtures/app/defaults/package.json | 1 + tests/fixtures/app/embroider-no-welcome/package.json | 1 + tests/fixtures/app/embroider-yarn/package.json | 1 + tests/fixtures/app/embroider/package.json | 1 + .../fixtures/app/nested-project/actual-project/package.json | 1 + tests/fixtures/app/npm-travis/package.json | 1 + tests/fixtures/app/npm/package.json | 1 + .../app/with-blueprint-override-lint-fail/.eslintrc.js | 6 ++++-- .../app/with-blueprint-override-lint-fail/package.json | 1 + tests/fixtures/app/yarn-travis/package.json | 1 + tests/fixtures/app/yarn/package.json | 1 + 18 files changed, 30 insertions(+), 8 deletions(-) diff --git a/blueprints/app/files/.eslintrc.js b/blueprints/app/files/.eslintrc.js index 906df00e30..642fdfc7ef 100644 --- a/blueprints/app/files/.eslintrc.js +++ b/blueprints/app/files/.eslintrc.js @@ -7,8 +7,10 @@ module.exports = { ecmaVersion: 2018, sourceType: 'module', requireConfigFile: false, - ecmaFeatures: { - legacyDecorators: true, + babelOptions: { + plugins: [ + ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], + ], }, }, plugins: ['ember'], diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index 0ac78d1acb..4a9b92c4ce 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2<% if (embroider) { %>", "@embroider/compat": "^0.44.1", diff --git a/tests/fixtures/addon/.eslintrc.js b/tests/fixtures/addon/.eslintrc.js index 51c499746c..f740a6e325 100644 --- a/tests/fixtures/addon/.eslintrc.js +++ b/tests/fixtures/addon/.eslintrc.js @@ -7,8 +7,10 @@ module.exports = { ecmaVersion: 2018, sourceType: 'module', requireConfigFile: false, - ecmaFeatures: { - legacyDecorators: true, + babelOptions: { + plugins: [ + ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }] + ], }, }, plugins: ['ember'], diff --git a/tests/fixtures/addon/defaults-travis/package.json b/tests/fixtures/addon/defaults-travis/package.json index 20ae3a3f55..d7d003b2f8 100644 --- a/tests/fixtures/addon/defaults-travis/package.json +++ b/tests/fixtures/addon/defaults-travis/package.json @@ -31,6 +31,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@embroider/test-setup": "^0.41.0", diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index a83cd4f038..1a7d77c5fe 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -31,6 +31,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/test-setup": "^0.44.1", diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index 4ef5817f0f..b7bf9dc5b5 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -31,6 +31,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/test-setup": "^0.44.1", diff --git a/tests/fixtures/app/.eslintrc.js b/tests/fixtures/app/.eslintrc.js index 884e8f7806..80ac588f29 100644 --- a/tests/fixtures/app/.eslintrc.js +++ b/tests/fixtures/app/.eslintrc.js @@ -7,8 +7,10 @@ module.exports = { ecmaVersion: 2018, sourceType: 'module', requireConfigFile: false, - ecmaFeatures: { - legacyDecorators: true, + babelOptions: { + plugins: [ + ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], + ], }, }, plugins: ['ember'], diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index aa1c01f912..2fbe590975 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index 1d4a4ac544..58a0bc9444 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/compat": "^0.44.1", diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index 9a539f57f0..1e05f659d5 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/compat": "^0.44.1", diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 9a539f57f0..1e05f659d5 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@embroider/compat": "^0.44.1", diff --git a/tests/fixtures/app/nested-project/actual-project/package.json b/tests/fixtures/app/nested-project/actual-project/package.json index 52aac65875..f38e155c9e 100644 --- a/tests/fixtures/app/nested-project/actual-project/package.json +++ b/tests/fixtures/app/nested-project/actual-project/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@glimmer/component": "^1.0.4", diff --git a/tests/fixtures/app/npm-travis/package.json b/tests/fixtures/app/npm-travis/package.json index 67efc99544..a27c85d666 100644 --- a/tests/fixtures/app/npm-travis/package.json +++ b/tests/fixtures/app/npm-travis/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@glimmer/component": "^1.0.4", diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 2bff906ab8..4b7164e3d9 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", 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 9a2a0861a7..2b5f65ef4a 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/.eslintrc.js +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/.eslintrc.js @@ -7,8 +7,10 @@ module.exports = { ecmaVersion: 2018, sourceType: 'module', requireConfigFile: false, - ecmaFeatures: { - legacyDecorators: true, + babelOptions: { + plugins: [ + ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], + ], }, }, plugins: ['ember'], 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 053aff0b64..0eea15b117 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.0", "@glimmer/component": "^1.0.3", diff --git a/tests/fixtures/app/yarn-travis/package.json b/tests/fixtures/app/yarn-travis/package.json index 66f90ff7e0..b71c8d7550 100644 --- a/tests/fixtures/app/yarn-travis/package.json +++ b/tests/fixtures/app/yarn-travis/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.2.5", "@glimmer/component": "^1.0.4", diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index aa1c01f912..2fbe590975 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", + "@babel/plugin-proposal-decorators": "^7.15.8", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.4.2", "@glimmer/component": "^1.0.4", From dd6e1f8532da19cac64aa4c454b6d19f1237d712 Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Wed, 5 Oct 2022 06:05:24 +0800 Subject: [PATCH 05/12] Do not touch irrelevant dependencies --- tests/fixtures/addon/defaults-travis/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fixtures/addon/defaults-travis/package.json b/tests/fixtures/addon/defaults-travis/package.json index 67af6069c1..c3fb00aa12 100644 --- a/tests/fixtures/addon/defaults-travis/package.json +++ b/tests/fixtures/addon/defaults-travis/package.json @@ -56,7 +56,7 @@ "ember-try": "^1.4.0", "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-ember": "^10.5.4", + "eslint-plugin-ember": "^10.4.2", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-qunit": "^7.0.0", From 799e8cd5ac265cb3bdbd8942e893ebbc9365defd Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Wed, 5 Oct 2022 06:05:50 +0800 Subject: [PATCH 06/12] Bump up eslint & remove babel-eslint --- blueprints/app/files/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index 4040618ebc..6ca809d785 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -32,7 +32,6 @@ "@embroider/webpack": "^1.8.3<% } %>", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "concurrently": "^7.4.0", "ember-auto-import": "^2.4.2", @@ -53,7 +52,7 @@ "ember-source": "~4.8.0-beta.1", "ember-template-lint": "^4.14.0<% if (welcome) { %>", "ember-welcome-page": "^6.2.0<% } %>", - "eslint": "^7.32.0", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.0.6", "eslint-plugin-node": "^11.1.0", From 577f0dc1ec63853f69d36d62215a4374cb4d909d Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Sat, 3 Dec 2022 15:29:08 +0800 Subject: [PATCH 07/12] Bump up eslint-plugin-ember to v11.1.0 --- tests/fixtures/addon/defaults-travis/package.json | 2 +- tests/fixtures/app/nested-project/actual-project/package.json | 2 +- tests/fixtures/app/npm-travis/package.json | 2 +- .../fixtures/app/with-blueprint-override-lint-fail/package.json | 2 +- tests/fixtures/app/yarn-travis/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/fixtures/addon/defaults-travis/package.json b/tests/fixtures/addon/defaults-travis/package.json index daf89202d0..3df6109786 100644 --- a/tests/fixtures/addon/defaults-travis/package.json +++ b/tests/fixtures/addon/defaults-travis/package.json @@ -56,7 +56,7 @@ "ember-try": "^1.4.0", "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-ember": "^10.4.2", + "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-qunit": "^7.0.0", diff --git a/tests/fixtures/app/nested-project/actual-project/package.json b/tests/fixtures/app/nested-project/actual-project/package.json index f60b70355a..012fcbc46f 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 @@ "ember-welcome-page": "^5.0.0", "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-ember": "^10.3.0", + "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-qunit": "^7.0.0", diff --git a/tests/fixtures/app/npm-travis/package.json b/tests/fixtures/app/npm-travis/package.json index 86f167a197..04651b2522 100644 --- a/tests/fixtures/app/npm-travis/package.json +++ b/tests/fixtures/app/npm-travis/package.json @@ -51,7 +51,7 @@ "ember-template-lint": "^4.0.0", "eslint": "^7.27.0", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-ember": "^10.5.4", + "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-qunit": "^7.0.0", 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 60c3366fe1..0219627c49 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 @@ "ember-welcome-page": "^5.0.0", "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-ember": "^10.5.4", + "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-qunit": "^7.0.0", diff --git a/tests/fixtures/app/yarn-travis/package.json b/tests/fixtures/app/yarn-travis/package.json index 8d8bbf29bc..bb0af6726f 100644 --- a/tests/fixtures/app/yarn-travis/package.json +++ b/tests/fixtures/app/yarn-travis/package.json @@ -52,7 +52,7 @@ "ember-welcome-page": "^4.0.0", "eslint": "^8.0.1", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-ember": "^10.5.4", + "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-qunit": "^7.0.0", From ff2cd30234dcca65fe26843f520f40f59dff8c70 Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Sun, 4 Dec 2022 18:27:22 +0800 Subject: [PATCH 08/12] Remove all babel-eslint deps --- blueprints/app/files/.eslintrc.js | 7 +++---- blueprints/app/files/package.json | 3 +-- tests/fixtures/addon/defaults-travis/package.json | 2 +- tests/fixtures/addon/defaults/package.json | 3 +-- tests/fixtures/addon/yarn/package.json | 3 +-- tests/fixtures/app/defaults/package.json | 3 +-- tests/fixtures/app/embroider-no-welcome/package.json | 3 +-- tests/fixtures/app/embroider-yarn/package.json | 3 +-- tests/fixtures/app/embroider/package.json | 3 +-- .../app/nested-project/actual-project/package.json | 2 +- tests/fixtures/app/npm-travis/package.json | 2 +- tests/fixtures/app/npm/package.json | 3 +-- .../app/with-blueprint-override-lint-fail/package.json | 2 +- tests/fixtures/app/yarn-travis/package.json | 2 +- tests/fixtures/app/yarn/package.json | 3 +-- 15 files changed, 17 insertions(+), 27 deletions(-) diff --git a/blueprints/app/files/.eslintrc.js b/blueprints/app/files/.eslintrc.js index dc70542bf1..ab71db7a5a 100644 --- a/blueprints/app/files/.eslintrc.js +++ b/blueprints/app/files/.eslintrc.js @@ -2,20 +2,19 @@ module.exports = { root: true, - parser: '<%= typescript ? '@typescript-eslint/parser' : 'babel-eslint' %>', + parser: '<%= typescript ? '@typescript-eslint/parser' : '@babel/eslint-parser' %>', parserOptions: { ecmaVersion: 2018,<% if (!typescript) { %> sourceType: 'module', ecmaFeatures: { legacyDecorators: true, - },<% } %> + }, requireConfigFile: false, babelOptions: { plugins: [ ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], ], - }, - + },<% } %> }, plugins: ['ember'<% if (typescript) { %>, '@typescript-eslint'<% } %>], extends: [ diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index c71bdefcb0..f993fccb4d 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -34,8 +34,7 @@ "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2<% if (typescript) { %>", "@typescript-eslint/eslint-plugin": "^5.40.1", - "@typescript-eslint/parser": "^5.40.1<% } else { %>", - "babel-eslint": "^10.1.0<% } %>", + "@typescript-eslint/parser": "^5.40.1<% } %>", "broccoli-asset-rev": "^3.0.0", "concurrently": "^7.4.0", "ember-auto-import": "^2.4.3", diff --git a/tests/fixtures/addon/defaults-travis/package.json b/tests/fixtures/addon/defaults-travis/package.json index 3df6109786..3e5820c40d 100644 --- a/tests/fixtures/addon/defaults-travis/package.json +++ b/tests/fixtures/addon/defaults-travis/package.json @@ -54,7 +54,7 @@ "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^4.0.0", "ember-try": "^1.4.0", - "eslint": "^8.0.1", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index 82d6b68c13..88940eee94 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -37,7 +37,6 @@ "@embroider/test-setup": "^1.8.3", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "concurrently": "^7.4.0", "ember-auto-import": "^2.4.3", @@ -54,7 +53,7 @@ "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^4.16.1", "ember-try": "^2.0.0", - "eslint": "^7.32.0", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index 4d71ca0aa0..d618a5c79f 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -37,7 +37,6 @@ "@embroider/test-setup": "^1.8.3", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "concurrently": "^7.4.0", "ember-auto-import": "^2.4.3", @@ -55,7 +54,7 @@ "ember-template-lint": "^4.16.1", "ember-try": "^2.0.0", "ember-welcome-page": "^6.2.0", - "eslint": "^7.32.0", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index d4682016a2..2ea2d64177 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -29,7 +29,6 @@ "@ember/test-helpers": "^2.8.1", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "concurrently": "^7.4.0", "ember-auto-import": "^2.4.3", @@ -50,7 +49,7 @@ "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", "ember-welcome-page": "^6.2.0", - "eslint": "^7.32.0", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index ee2b9440c0..79ff0ffe92 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -32,7 +32,6 @@ "@embroider/webpack": "^1.9.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "concurrently": "^7.4.0", "ember-auto-import": "^2.4.3", @@ -52,7 +51,7 @@ "ember-resolver": "^8.0.3", "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", - "eslint": "^7.32.0", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index f5f42e30fd..243ee6d288 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -32,7 +32,6 @@ "@embroider/webpack": "^1.9.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "concurrently": "^7.4.0", "ember-auto-import": "^2.4.3", @@ -53,7 +52,7 @@ "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", "ember-welcome-page": "^6.2.0", - "eslint": "^7.32.0", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index f5f42e30fd..243ee6d288 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -32,7 +32,6 @@ "@embroider/webpack": "^1.9.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "concurrently": "^7.4.0", "ember-auto-import": "^2.4.3", @@ -53,7 +52,7 @@ "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", "ember-welcome-page": "^6.2.0", - "eslint": "^7.32.0", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/nested-project/actual-project/package.json b/tests/fixtures/app/nested-project/actual-project/package.json index 012fcbc46f..ba487db8e2 100644 --- a/tests/fixtures/app/nested-project/actual-project/package.json +++ b/tests/fixtures/app/nested-project/actual-project/package.json @@ -49,7 +49,7 @@ "ember-source": "~3.27.0-beta.3", "ember-template-lint": "^4.0.0", "ember-welcome-page": "^5.0.0", - "eslint": "^8.0.1", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/npm-travis/package.json b/tests/fixtures/app/npm-travis/package.json index 04651b2522..75bab797b3 100644 --- a/tests/fixtures/app/npm-travis/package.json +++ b/tests/fixtures/app/npm-travis/package.json @@ -49,7 +49,7 @@ "ember-resolver": "^8.0.2", "ember-source": "~3.27.2", "ember-template-lint": "^4.0.0", - "eslint": "^7.27.0", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 8609a05f6c..b5429a65e5 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -29,7 +29,6 @@ "@ember/test-helpers": "^2.8.1", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "concurrently": "^7.4.0", "ember-auto-import": "^2.4.3", @@ -49,7 +48,7 @@ "ember-resolver": "^8.0.3", "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", - "eslint": "^7.32.0", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", 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 0219627c49..814fb5c866 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json @@ -49,7 +49,7 @@ "ember-source": "~3.26.0-beta.2", "ember-template-lint": "^4.0.0", "ember-welcome-page": "^5.0.0", - "eslint": "^8.0.1", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/yarn-travis/package.json b/tests/fixtures/app/yarn-travis/package.json index bb0af6726f..4a872cdaef 100644 --- a/tests/fixtures/app/yarn-travis/package.json +++ b/tests/fixtures/app/yarn-travis/package.json @@ -50,7 +50,7 @@ "ember-source": "~3.27.2", "ember-template-lint": "^4.0.0", "ember-welcome-page": "^4.0.0", - "eslint": "^8.0.1", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index d4682016a2..2ea2d64177 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -29,7 +29,6 @@ "@ember/test-helpers": "^2.8.1", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", - "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "concurrently": "^7.4.0", "ember-auto-import": "^2.4.3", @@ -50,7 +49,7 @@ "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", "ember-welcome-page": "^6.2.0", - "eslint": "^7.32.0", + "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", From 71e85f5ce940093f2512ad52fa602f8bae7c6cd6 Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Mon, 5 Dec 2022 15:23:22 +0800 Subject: [PATCH 09/12] Update all eslint to v8.29.0 --- blueprints/app/files/package.json | 2 +- package.json | 2 +- tests/fixtures/addon/defaults-travis/package.json | 2 +- tests/fixtures/addon/defaults/package.json | 2 +- tests/fixtures/addon/yarn/package.json | 2 +- 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 +- tests/fixtures/app/nested-project/actual-project/package.json | 2 +- tests/fixtures/app/npm-travis/package.json | 2 +- tests/fixtures/app/npm/package.json | 2 +- .../fixtures/app/with-blueprint-override-lint-fail/package.json | 2 +- tests/fixtures/app/yarn-travis/package.json | 2 +- tests/fixtures/app/yarn/package.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index f993fccb4d..3ff668b968 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -55,7 +55,7 @@ "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1<% if (welcome) { %>", "ember-welcome-page": "^6.2.0<% } %>", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/package.json b/package.json index 1e57f7eb50..f66431e9cd 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "chai-jest-snapshot": "^2.0.0", "ember-cli-blueprint-test-helpers": "^0.19.2", "ember-cli-internal-test-helpers": "^0.9.1", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-chai-expect": "^3.0.0", "eslint-plugin-mocha": "^10.1.0", diff --git a/tests/fixtures/addon/defaults-travis/package.json b/tests/fixtures/addon/defaults-travis/package.json index 3e5820c40d..d0e7c3a85a 100644 --- a/tests/fixtures/addon/defaults-travis/package.json +++ b/tests/fixtures/addon/defaults-travis/package.json @@ -54,7 +54,7 @@ "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^4.0.0", "ember-try": "^1.4.0", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index 88940eee94..2a401ebcec 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -53,7 +53,7 @@ "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^4.16.1", "ember-try": "^2.0.0", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index d618a5c79f..1f70217601 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -54,7 +54,7 @@ "ember-template-lint": "^4.16.1", "ember-try": "^2.0.0", "ember-welcome-page": "^6.2.0", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index 2ea2d64177..0f13c43b60 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -49,7 +49,7 @@ "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", "ember-welcome-page": "^6.2.0", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index 79ff0ffe92..815cbba595 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -51,7 +51,7 @@ "ember-resolver": "^8.0.3", "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index 243ee6d288..d43f98108f 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -52,7 +52,7 @@ "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", "ember-welcome-page": "^6.2.0", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 243ee6d288..d43f98108f 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -52,7 +52,7 @@ "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", "ember-welcome-page": "^6.2.0", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/nested-project/actual-project/package.json b/tests/fixtures/app/nested-project/actual-project/package.json index ba487db8e2..2fbf3246ad 100644 --- a/tests/fixtures/app/nested-project/actual-project/package.json +++ b/tests/fixtures/app/nested-project/actual-project/package.json @@ -49,7 +49,7 @@ "ember-source": "~3.27.0-beta.3", "ember-template-lint": "^4.0.0", "ember-welcome-page": "^5.0.0", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/npm-travis/package.json b/tests/fixtures/app/npm-travis/package.json index 75bab797b3..576814a6d5 100644 --- a/tests/fixtures/app/npm-travis/package.json +++ b/tests/fixtures/app/npm-travis/package.json @@ -49,7 +49,7 @@ "ember-resolver": "^8.0.2", "ember-source": "~3.27.2", "ember-template-lint": "^4.0.0", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index b5429a65e5..edd217b6ac 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -48,7 +48,7 @@ "ember-resolver": "^8.0.3", "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", 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 814fb5c866..a072b4fb25 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json @@ -49,7 +49,7 @@ "ember-source": "~3.26.0-beta.2", "ember-template-lint": "^4.0.0", "ember-welcome-page": "^5.0.0", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/yarn-travis/package.json b/tests/fixtures/app/yarn-travis/package.json index 4a872cdaef..9e7c5e39f5 100644 --- a/tests/fixtures/app/yarn-travis/package.json +++ b/tests/fixtures/app/yarn-travis/package.json @@ -50,7 +50,7 @@ "ember-source": "~3.27.2", "ember-template-lint": "^4.0.0", "ember-welcome-page": "^4.0.0", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index 2ea2d64177..0f13c43b60 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -49,7 +49,7 @@ "ember-source": "~4.9.0-beta.1", "ember-template-lint": "^4.16.1", "ember-welcome-page": "^6.2.0", - "eslint": "^8.24.0", + "eslint": "^8.29.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", From 2e93783ab66d468661e42b65f283af916ace1a6b Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Mon, 5 Dec 2022 15:23:40 +0800 Subject: [PATCH 10/12] Remove unused ecmaFeatures --- blueprints/app/files/.eslintrc.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/blueprints/app/files/.eslintrc.js b/blueprints/app/files/.eslintrc.js index ab71db7a5a..b10e1b5d6d 100644 --- a/blueprints/app/files/.eslintrc.js +++ b/blueprints/app/files/.eslintrc.js @@ -6,9 +6,6 @@ module.exports = { parserOptions: { ecmaVersion: 2018,<% if (!typescript) { %> sourceType: 'module', - ecmaFeatures: { - legacyDecorators: true, - }, requireConfigFile: false, babelOptions: { plugins: [ From 11d6dd1d56ab540586bb61aab68c07db403ce348 Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Mon, 5 Dec 2022 15:24:05 +0800 Subject: [PATCH 11/12] Install babel eslint parser conditionally --- blueprints/app/files/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index 3ff668b968..93c9f88d54 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -24,8 +24,8 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/eslint-parser": "^7.15.8", - "@babel/plugin-proposal-decorators": "^7.15.8", + <% if (!typescript) { %>"@babel/eslint-parser": "^7.19.1", + "@babel/plugin-proposal-decorators": "^7.20.5",<% } %> "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.8.1<% if (embroider) { %>", "@embroider/compat": "^1.9.0", From ad4ae4caaa9e956cc2c4e1966c530664c86f852e Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Mon, 5 Dec 2022 20:47:36 +0800 Subject: [PATCH 12/12] Ensure json still be valid when using condition clause --- blueprints/app/files/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index 93c9f88d54..166ff7d1c6 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -24,9 +24,9 @@ "test:ember": "ember test" }, "devDependencies": { - <% if (!typescript) { %>"@babel/eslint-parser": "^7.19.1", - "@babel/plugin-proposal-decorators": "^7.20.5",<% } %> - "@ember/optional-features": "^2.0.0", + "<% if (!typescript) { %>@babel/eslint-parser": "^7.19.1", + "@babel/plugin-proposal-decorators": "^7.20.5", + "<% } %>@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.8.1<% if (embroider) { %>", "@embroider/compat": "^1.9.0", "@embroider/core": "^1.9.0",