diff --git a/blueprints/app/files/.eslintrc.js b/blueprints/app/files/.eslintrc.js index 1f926e184b..b10e1b5d6d 100644 --- a/blueprints/app/files/.eslintrc.js +++ b/blueprints/app/files/.eslintrc.js @@ -2,12 +2,15 @@ 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'<% } %>], diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index a65fa1bb7a..166ff7d1c6 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -24,7 +24,9 @@ "test:ember": "ember test" }, "devDependencies": { - "@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", @@ -32,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", @@ -54,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": "^7.32.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/.eslintrc.js b/tests/fixtures/addon/.eslintrc.js index c377b2c242..8ef4af9584 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 d2444ba725..d0e7c3a85a 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", "concurrently": "^7.4.0", "ember-auto-import": "^1.11.3", @@ -53,9 +54,9 @@ "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^4.0.0", "ember-try": "^1.4.0", - "eslint": "^7.27.0", + "eslint": "^8.29.0", "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/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index a9eea40a33..2a401ebcec 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -30,12 +30,13 @@ "ember-cli-htmlbars": "^6.1.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.8.1", "@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", @@ -52,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.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 c240002ab4..1f70217601 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -30,12 +30,13 @@ "ember-cli-htmlbars": "^6.1.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.8.1", "@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", @@ -53,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.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/.eslintrc.js b/tests/fixtures/app/.eslintrc.js index 3d9b5b1d78..c2b314fccb 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 ef93b57c1e..0f13c43b60 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.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", @@ -48,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.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 25fdaa79eb..815cbba595 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.8.1", "@embroider/compat": "^1.9.0", @@ -30,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", @@ -50,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.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 37ad6c7ca0..d43f98108f 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.8.1", "@embroider/compat": "^1.9.0", @@ -30,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", @@ -51,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.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 37ad6c7ca0..d43f98108f 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.8.1", "@embroider/compat": "^1.9.0", @@ -30,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", @@ -51,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.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 758dc99163..2fbf3246ad 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", "concurrently": "^7.4.0", "ember-auto-import": "^1.11.2", @@ -48,9 +49,9 @@ "ember-source": "~3.27.0-beta.3", "ember-template-lint": "^4.0.0", "ember-welcome-page": "^5.0.0", - "eslint": "^7.24.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "eslint": "^8.29.0", + "eslint-config-prettier": "^8.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 92771d9cff..576814a6d5 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", "concurrently": "^7.4.0", "ember-auto-import": "^1.11.3", @@ -48,9 +49,9 @@ "ember-resolver": "^8.0.2", "ember-source": "~3.27.2", "ember-template-lint": "^4.0.0", - "eslint": "^7.27.0", + "eslint": "^8.29.0", "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/npm/package.json b/tests/fixtures/app/npm/package.json index 1ab7a95aea..edd217b6ac 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.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", @@ -47,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.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/.eslintrc.js b/tests/fixtures/app/with-blueprint-override-lint-fail/.eslintrc.js index fa06a4bcf7..03b87b8fb2 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 6cc607ab40..a072b4fb25 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", "concurrently": "^7.4.0", "ember-auto-import": "^1.10.1", @@ -48,11 +49,12 @@ "ember-source": "~3.26.0-beta.2", "ember-template-lint": "^4.0.0", "ember-welcome-page": "^5.0.0", - "eslint": "^7.20.0", - "eslint-config-prettier": "^7.2.0", - "eslint-plugin-ember": "^10.2.0", + "eslint": "^8.29.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0", - "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-qunit": "^7.0.0", "loader.js": "^4.7.0", "prettier": "^2.2.1", "qunit": "^2.14.1", diff --git a/tests/fixtures/app/yarn-travis/package.json b/tests/fixtures/app/yarn-travis/package.json index f8b6af6205..9e7c5e39f5 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", "concurrently": "^7.4.0", "ember-auto-import": "^1.11.3", @@ -49,9 +50,9 @@ "ember-source": "~3.27.2", "ember-template-lint": "^4.0.0", "ember-welcome-page": "^4.0.0", - "eslint": "^7.27.0", + "eslint": "^8.29.0", "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/yarn/package.json b/tests/fixtures/app/yarn/package.json index ef93b57c1e..0f13c43b60 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.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", @@ -48,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.29.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.1.0", "eslint-plugin-n": "^15.4.0",