Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Replace ember-suave with the Ember ESLint config
Browse files Browse the repository at this point in the history
  • Loading branch information
alexlafroscia committed Nov 27, 2017
1 parent 967c976 commit 59a60e1
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 25 deletions.
47 changes: 39 additions & 8 deletions .eslintrc.js
@@ -1,21 +1,52 @@
module.exports = {
extends: [
'eslint:recommended',
'plugin:ember-suave/recommended'
],
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
},
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
'browser': true
},
rules: {
// Built-in Rule Config
'prefer-const': 'error',
'prefer-const': 'error'
},
overrides: [
// node files
{
files: [
'./index.js',
'testem.js',
'ember-cli-build.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
},
env: {
browser: false,
node: true
}
},

// Ember Suave Rule Config
'ember-suave/no-const-outside-module-scope': 'off'
}
// test files
{
files: ['tests/**/*.js'],
excludedFiles: ['tests/dummy/**/*.js'],
env: {
embertest: true
},
rules: {
// Useful for testing; not worried about leaking state
'ember/avoid-leaking-state-in-ember-objects': 'off'
}
}
]
};
4 changes: 3 additions & 1 deletion package.json
Expand Up @@ -16,6 +16,8 @@
},
"scripts": {
"build": "ember build",
"lint": "eslint addon app config tests",
"lint:fix": "eslint --fix addon app config tests",
"start": "ember server",
"test": "ember try:each"
},
Expand Down Expand Up @@ -46,7 +48,7 @@
"ember-resolver": "4.5.0",
"ember-source": "~2.16.0",
"eslint": "^4.1.0",
"eslint-plugin-ember-suave": "^1.0.0",
"eslint-plugin-ember": "^5.0.1",
"loader.js": "^4.4.0",
"testdouble": "3.2.6",
"testdouble-chai": "^0.5.0"
Expand Down
5 changes: 0 additions & 5 deletions tests/.eslintrc.js

This file was deleted.

4 changes: 2 additions & 2 deletions tests/test-helper.js
@@ -1,9 +1,9 @@
import $ from 'jquery';
import jq from 'jquery';
import resolver from './helpers/resolver';
import { setResolver } from 'ember-mocha';

setResolver(resolver);

if (window.location.search.indexOf('nocontainer') > -1) {
$('#ember-testing-container').css({ visibility: 'hidden' });
jq('#ember-testing-container').css({ visibility: 'hidden' });
}
42 changes: 33 additions & 9 deletions yarn.lock
Expand Up @@ -2736,7 +2736,7 @@ ember-resolver@4.5.0:
ember-cli-version-checker "^2.0.0"
resolve "^1.3.3"

ember-rfc176-data@^0.2.0:
ember-rfc176-data@^0.2.0, ember-rfc176-data@^0.2.7:
version "0.2.7"
resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz#bd355bc9b473e08096b518784170a23388bc973b"

Expand Down Expand Up @@ -2926,11 +2926,13 @@ escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"

eslint-plugin-ember-suave@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-ember-suave/-/eslint-plugin-ember-suave-1.0.0.tgz#ea7d232a126562dcd8b1ee3aa2700ac3b626e514"
eslint-plugin-ember@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-5.0.1.tgz#bd4b20e137b01530b709d87feb8428bbd68eb096"
dependencies:
requireindex "~1.1.0"
ember-rfc176-data "^0.2.7"
require-folder-tree "^1.4.5"
snake-case "^2.1.0"

eslint-scope@^3.7.1:
version "3.7.1"
Expand Down Expand Up @@ -4830,6 +4832,10 @@ lodash.without@~3.2.1:
lodash._basedifference "^3.0.0"
lodash.restparam "^3.0.0"

lodash@3.8.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.8.0.tgz#376eb98bdcd9382a9365c33c4cb8250de1325b91"

lodash@^3.10.0, lodash@^3.10.1, lodash@^3.9.3:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
Expand All @@ -4854,6 +4860,10 @@ loose-envify@^1.0.0:
dependencies:
js-tokens "^3.0.0"

lower-case@^1.1.1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"

lru-cache@2:
version "2.7.3"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
Expand Down Expand Up @@ -5150,6 +5160,12 @@ negotiator@0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"

no-case@^2.2.0:
version "2.3.2"
resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
dependencies:
lower-case "^1.1.1"

node-dir@0.1.8:
version "0.1.8"
resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.8.tgz#55fb8deb699070707fb67f91a460f0448294c77d"
Expand Down Expand Up @@ -6072,6 +6088,12 @@ require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"

require-folder-tree@^1.4.5:
version "1.4.5"
resolved "https://registry.yarnpkg.com/require-folder-tree/-/require-folder-tree-1.4.5.tgz#dfe553cbab98cc88e1c56a3f2f358f06ef85bcb0"
dependencies:
lodash "3.8.0"

require-main-filename@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
Expand All @@ -6083,10 +6105,6 @@ require-uncached@^1.0.3:
caller-path "^0.1.0"
resolve-from "^1.0.0"

requireindex@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162"

requires-port@1.x.x:
version "1.0.0"
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
Expand Down Expand Up @@ -6379,6 +6397,12 @@ slide@^1.1.3, slide@^1.1.5, slide@~1.1.3, slide@~1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"

snake-case@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
dependencies:
no-case "^2.2.0"

sntp@1.x.x:
version "1.0.9"
resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
Expand Down

0 comments on commit 59a60e1

Please sign in to comment.