Skip to content

Commit

Permalink
Merge pull request #99 from Turbo87/lint
Browse files Browse the repository at this point in the history
Replace `ember-cli-eslint` with regular ESLint
  • Loading branch information
Turbo87 committed Apr 28, 2019
2 parents 795d31c + bb74ce2 commit 55e2da4
Show file tree
Hide file tree
Showing 7 changed files with 209 additions and 272 deletions.
20 changes: 20 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-env node */

module.exports = {
root: true,
extends: 'simplabs',
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/bower_components

# misc
/.eslintcache
/.sass-cache
/connect.lock
/coverage/*
Expand Down
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ install:
jobs:
include:
- stage: "Tests"
name: "Unit Tests"
name: "Lint"
script: yarn lint

- name: "Unit Tests"
script: yarn test

- name: "Ember Tests"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"start": "ember server",
"test": "jest",
"test:ember": "ember test",
"lint": "eslint app addon blueprints config server test-support tests *.js"
"lint": "eslint . --cache"
},
"devDependencies": {
"@ember/optional-features": "^0.7.0",
Expand All @@ -32,7 +32,6 @@
"ember-cli-babel": "^6.11.0",
"ember-cli-chai": "0.5.0",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-eslint": "^4.2.3",
"ember-cli-htmlbars": "^3.0.1",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-inject-live-reload": "^2.0.1",
Expand All @@ -44,6 +43,7 @@
"ember-resolver": "^5.0.1",
"ember-source": "~3.9.0",
"ember-try": "^1.1.0",
"eslint": "^5.16.0",
"eslint-config-simplabs": "0.4.0",
"jest": "^24.1.0",
"loader.js": "^4.2.3"
Expand Down
2 changes: 2 additions & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-env node */

module.exports = {
extends: 'simplabs/configs/ember-qunit',
parserOptions: {
Expand Down
Loading

0 comments on commit 55e2da4

Please sign in to comment.