Skip to content

Commit 770e62e

Browse files
authored
Merge pull request #2 from chadhietala/refactor
[Refactor] Moves everything to an eslint-plugin
2 parents 224bc95 + 7e27b3a commit 770e62e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1250
-5163
lines changed

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.editorconfig

Lines changed: 0 additions & 20 deletions
This file was deleted.

.ember-cli

Lines changed: 0 additions & 9 deletions
This file was deleted.

.eslintrc.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module.exports = {
2+
root: true,
3+
env: {
4+
'node': true,
5+
'es6': true
6+
},
7+
extends: [
8+
'eslint:recommended',
9+
'./config/base.js'
10+
]
11+
};

.travis.yml

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,8 @@
1-
---
21
language: node_js
32
node_js:
4-
- "4"
3+
- '6'
54

6-
sudo: false
7-
8-
cache:
9-
directories:
10-
- node_modules
11-
12-
env:
13-
- EMBER_TRY_SCENARIO=default
14-
- EMBER_TRY_SCENARIO=ember-1.13
15-
- EMBER_TRY_SCENARIO=ember-release
16-
- EMBER_TRY_SCENARIO=ember-beta
17-
- EMBER_TRY_SCENARIO=ember-canary
18-
19-
matrix:
20-
fast_finish: true
21-
allow_failures:
22-
- env: EMBER_TRY_SCENARIO=ember-canary
23-
24-
before_install:
25-
- npm config set spin false
26-
- npm install -g bower
27-
- bower --version
28-
- npm install phantomjs-prebuilt
29-
- node_modules/phantomjs-prebuilt/bin/phantomjs --version
30-
31-
install:
32-
- npm install
33-
- bower install
5+
cache: yarn
346

357
script:
36-
# Usually, it's ok to finish the test scenario without reverting
37-
# to the addon's original dependency state, skipping "cleanup".
38-
- ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
8+
- yarn test

.watchmanconfig

Lines changed: 0 additions & 3 deletions
This file was deleted.

addon/.gitkeep

Whitespace-only changes.

app/.gitkeep

Whitespace-only changes.

bower.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

config/base.js

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
module.exports = {
2+
rules: {
3+
'array-bracket-spacing': ['error', 'never'],
4+
'brace-style': ['error', '1tbs', { 'allowSingleLine': false }],
5+
'camelcase': ['error', { 'properties': 'always' }],
6+
'comma-dangle': ['error', 'never'],
7+
'comma-spacing': ['error', {
8+
'before': false,
9+
'after': true
10+
}],
11+
'comma-style': ['error', 'last'],
12+
'curly': ['error', 'all'],
13+
'dot-notation': 'error',
14+
'dot-location': ['error', 'property'],
15+
'indent': ['error', 2, { 'SwitchCase': 1 }],
16+
'key-spacing': ['error', {
17+
'beforeColon': false,
18+
'afterColon': true
19+
}],
20+
'keyword-spacing': ['error', {
21+
'overrides': {
22+
'catch': {
23+
'after': false
24+
}
25+
}
26+
}],
27+
'max-statements-per-line': ['error', { 'max': 1 }],
28+
'new-cap': ['error'],
29+
'no-empty': ['error'],
30+
'no-multiple-empty-lines': ['error', { 'max': 1 }],
31+
'no-spaced-func': 'error',
32+
'no-trailing-spaces': 'error',
33+
'no-useless-concat': 'error',
34+
'object-curly-spacing': ['error', 'always'],
35+
'one-var': ['error', {
36+
'uninitialized': 'always',
37+
'initialized': 'never'
38+
}],
39+
'operator-linebreak': ['error', 'before'],
40+
'quotes': ['error', 'single', { 'avoidEscape': true }],
41+
'semi': ['error', 'always'],
42+
'semi-spacing': ['error', {
43+
'before': false,
44+
'after': true
45+
}],
46+
'space-before-blocks': ['error', 'always'],
47+
'space-before-function-paren': ['error', 'never'],
48+
'space-in-parens': ['error', 'never'],
49+
'space-infix-ops': 'error',
50+
'space-unary-ops': ['error', {
51+
'words': false,
52+
'nonwords': false
53+
}],
54+
'spaced-comment': ['error', 'always']
55+
}
56+
};

0 commit comments

Comments
 (0)