Skip to content

Commit

Permalink
chore: Fix build issues due to ember-cli-eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
offirgolan committed Jul 27, 2018
1 parent 3eb069e commit 1916201
Show file tree
Hide file tree
Showing 5 changed files with 227 additions and 252 deletions.
17 changes: 17 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# unconventional js
/blueprints/*/files/
/blueprints/**/*files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/coverage/

# ember-try
/.node_modules.ember-try/
13 changes: 6 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,34 @@ module.exports = {
sourceType: 'module'
},
plugins: [
'prettier',
'ember'
],
extends: [
'prettier',
'eslint:recommended',
'plugin:prettier/recommended',
'plugin:ember/recommended'
],
env: {
browser: true
},
rules: {
'prettier/prettier': ['error', {
singleQuote: true
}],
'prettier/prettier': ['error', { singleQuote: true }],
},
overrides: [
// node files
{
files: [
'ember-cli-build.js',
'index.js',
'testem.js',
'ember-cli-build.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'app/**',
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
],
parserOptions: {
Expand Down
2 changes: 0 additions & 2 deletions app/styles/app.scss

This file was deleted.

19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"test": "tests"
},
"scripts": {
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
"lint:js": "eslint .",
"start": "ember serve",
"test": "ember try:each",
"build": "ember build"
Expand Down Expand Up @@ -37,17 +37,16 @@
"license": "MIT",
"devDependencies": {
"@ember-decorators/babel-transforms": "^2.0.1",
"babel-eslint": "^8.2.3",
"babel-eslint": "^8.2.6",
"bootstrap-sass": "^3.3.7",
"broccoli-asset-rev": "^2.4.6",
"ember-bootstrap": "^1.2.2",
"ember-cli": "~3.1",
"ember-cli": "~3.1.0",
"ember-cli-app-version": "^3.1.3",
"ember-cli-autoprefixer": "^0.7.0",
"ember-cli-changelog": "0.3.4",
"ember-cli-code-coverage": "0.4.1",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.2.1",
"ember-cli-github-pages": "^0.2.0",
"ember-cli-htmlbars": "^2.0.3",
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
Expand All @@ -61,7 +60,7 @@
"ember-cli-uglify": "^2.0.0",
"ember-cli-yuidoc": "^0.8.8",
"ember-code-snippet": "^2.0.1",
"ember-data": "~3.1",
"ember-data": "~3.1.0",
"ember-decorators": "^1.3.4",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-export-application-global": "^2.0.0",
Expand All @@ -70,18 +69,18 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit-nice-errors": "^1.2.0",
"ember-resolver": "^4.5.0",
"ember-source": "~3.1",
"ember-source": "~3.1.0",
"ember-source-channel-url": "^1.0.1",
"ember-test-selectors": "^0.3.8",
"ember-truth-helpers": "2.0.0",
"ember-try": "^0.2.23",
"eslint": "^4.17.0",
"eslint": "^4.19.1",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-ember": "^5.0.0",
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-prettier": "^2.6.0",
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-prettier": "^2.6.2",
"loader.js": "^4.6.0",
"prettier": "^1.10.2",
"prettier": "^1.13.7",
"qunit-dom": "^0.5.0",
"yuidoc-ember-theme": "^2.0.1"
},
Expand Down
Loading

0 comments on commit 1916201

Please sign in to comment.