Skip to content

Commit

Permalink
Replace ember-cli-eslint with regular ESLint
Browse files Browse the repository at this point in the history
  • Loading branch information
Turbo87 committed Nov 26, 2018
1 parent 92f126c commit 60db5b8
Show file tree
Hide file tree
Showing 6 changed files with 242 additions and 226 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,5 @@ jobs:
- bower install

script:
- yarn lint
- yarn test
17 changes: 17 additions & 0 deletions ember/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/bin/
/bower_components/
/blueprints/**/files/
/common-tmp/
/coverage/
/public/cesium/
/tests/fixtures/
/tmp/
/vendor/

/lib/broccoli/app-*.js
/lib/broccoli/test-support-*.js
/lib/broccoli/tests-*.js
/lib/broccoli/vendor-*.js

!.*
/node_modules/
21 changes: 21 additions & 0 deletions ember/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,25 @@ module.exports = {
'ember/order-in-routes': 'off',
'prettier/prettier': 'error',
},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'testem.js',
'config/**/*.js',
'lib/*/index.js',
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015,
},
env: {
browser: false,
node: true,
},
},
],
};
1 change: 1 addition & 0 deletions ember/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/connect.lock
/coverage/*
/libpeerconnection.log
.eslintcache
npm-debug.log*
yarn-error.log
testem.log
4 changes: 2 additions & 2 deletions ember/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"repository": "",
"scripts": {
"build": "ember build",
"lint": "node_modules/eslint/bin/eslint.js app addon blueprints config lib server test-support tests *.js",
"lint": "eslint . --cache",
"start": "ember serve",
"test": "ember test"
},
Expand All @@ -38,7 +38,6 @@
"ember-cli-deploy-compress": "^0.2.0",
"ember-cli-deploy-revision-data": "^1.0.0",
"ember-cli-deploy-rsync-assets": "^0.2.1",
"ember-cli-eslint": "^4.2.3",
"ember-cli-htmlbars": "^3.0.1",
"ember-cli-htmlbars-inline-precompile": "^2.0.0",
"ember-cli-inject-live-reload": "^2.0.1",
Expand Down Expand Up @@ -69,6 +68,7 @@
"ember-test-selectors": "^2.0.0",
"ember-truth-helpers": "^2.1.0",
"ember-web-app": "^2.3.0",
"eslint": "^5.9.0",
"eslint-config-prettier": "^3.3.0",
"eslint-config-simplabs": "0.4.0",
"eslint-plugin-ember": "^6.0.1",
Expand Down
Loading

0 comments on commit 60db5b8

Please sign in to comment.