Skip to content

Commit 7f31940

Browse files
committed
Auto merge of #2158 - Turbo87:eslint, r=locks
ESLint: Use `babel-eslint` parser to allow decorators and field initialization This is needed to convert the `app/router.js` file to an ES6 class (see #2149 (comment)), and now the default in Ember.js apps (see https://github.com/ember-cli/ember-new-output/blob/v3.15.2/.eslintrc.js). r? @locks
2 parents fb15b49 + 020ba6c commit 7f31940

File tree

3 files changed

+36
-0
lines changed

3 files changed

+36
-0
lines changed

.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
module.exports = {
22
root: true,
3+
parser: 'babel-eslint',
34
parserOptions: {
45
ecmaVersion: 2018,
56
sourceType: 'module',
7+
ecmaFeatures: {
8+
legacyDecorators: true,
9+
},
610
},
711
plugins: ['ember', 'prettier'],
812
extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],

package-lock.json

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"devDependencies": {
3232
"@ember/jquery": "^1.1.0",
3333
"@ember/optional-features": "^1.3.0",
34+
"babel-eslint": "^10.0.3",
3435
"babel-plugin-transform-object-rest-spread": "^6.26.0",
3536
"broccoli-asset-rev": "^3.0.0",
3637
"ember-a11y-testing": "^2.0.0",

0 commit comments

Comments
 (0)