Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Make ESLint config more standard #410

Merged
merged 4 commits into from
Nov 16, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,9 @@ module.exports = {
'processNode': true
},
rules: {
'ember/no-const-outside-module-scope': 'off',
'ember/no-direct-property-access': 'off',
'ember/avoid-leaking-state-in-ember-objects': 'warn', // TODO: Remove after upgrading eslint >= 4.2.0
'ember/no-jquery': 'error',
'ember/require-access-in-comments': 'off',
'newline-before-return': 'error',
'no-console': 'off',
'one-var': 'off',
'no-prototype-builtins': 'off'
RobbieTheWagner marked this conversation as resolved.
Show resolved Hide resolved
},
overrides: [
// node files
Expand All @@ -46,6 +41,7 @@ module.exports = {
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/commands/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
Expand All @@ -65,6 +61,7 @@ module.exports = {
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
'ember/avoid-leaking-state-in-ember-objects': 'off',
'node/no-unpublished-require': 'off'
RobbieTheWagner marked this conversation as resolved.
Show resolved Hide resolved
})
}
]
Expand Down
1 change: 0 additions & 1 deletion lib/models/assembler.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable ember-suave/prefer-destructuring, newline-before-return, arrow-parens */
'use strict';
const exit = require('capture-exit');
exit.captureExit();
Expand Down
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,8 @@
"ember-source": "~3.14.1",
"ember-source-channel-url": "^2.0.1",
"ember-try": "^1.2.1",
"eslint": "^4.18.2",
"eslint-config-ember": "^0.3.0",
"eslint-plugin-ember": "^7.1.0",
"eslint-plugin-ember-suave": "^1.0.0",
"eslint": "^6.6.0",
RobbieTheWagner marked this conversation as resolved.
Show resolved Hide resolved
"eslint-plugin-ember": "^7.5.0",
"eslint-plugin-node": "^10.0.0",
"loader.js": "^4.7.0",
"mocha": "^3.5.3",
Expand Down
Loading