Skip to content

Commit f590191

Browse files
doowbdoowb
committed
run update
1 parent b9fb054 commit f590191

File tree

8 files changed

+103
-219
lines changed

8 files changed

+103
-219
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# http://editorconfig.org
21
root = true
32

43
[*]
@@ -9,14 +8,6 @@ indent_size = 2
98
trim_trailing_whitespace = true
109
insert_final_newline = true
1110

12-
[*.md]
11+
[{**/{actual,fixtures,expected,templates}/**,*.md}]
1312
trim_trailing_whitespace = false
14-
insert_final_newline = false
15-
16-
[**/{actual,fixtures,expected}/**]
17-
trim_trailing_whitespace = false
18-
insert_final_newline = false
19-
20-
[**/templates/**]
21-
trim_trailing_whitespace = false
22-
insert_final_newline = false
13+
insert_final_newline = false

‎.eslintrc.json‎

Lines changed: 35 additions & 193 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,36 @@
11
{
2-
"ecmaFeatures": {
3-
"modules": true,
4-
"experimentalObjectRestSpread": true
5-
},
62
"env": {
73
"browser": false,
84
"es6": true,
95
"node": true,
106
"mocha": true
117
},
8+
129
"globals": {
1310
"document": false,
1411
"navigator": false,
1512
"window": false
1613
},
14+
1715
"rules": {
1816
"accessor-pairs": 2,
19-
"arrow-spacing": [
20-
2,
21-
{
22-
"before": true,
23-
"after": true
24-
}
25-
],
26-
"block-spacing": [
27-
2,
28-
"always"
29-
],
30-
"brace-style": [
31-
2,
32-
"1tbs",
33-
{
34-
"allowSingleLine": true
35-
}
36-
],
37-
"comma-dangle": [
38-
2,
39-
"never"
40-
],
41-
"comma-spacing": [
42-
2,
43-
{
44-
"before": false,
45-
"after": true
46-
}
47-
],
48-
"comma-style": [
49-
2,
50-
"last"
51-
],
17+
"arrow-spacing": [2, { "before": true, "after": true }],
18+
"block-spacing": [2, "always"],
19+
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
20+
"comma-dangle": [2, "never"],
21+
"comma-spacing": [2, { "before": false, "after": true }],
22+
"comma-style": [2, "last"],
5223
"constructor-super": 2,
53-
"curly": [
54-
2,
55-
"multi-line"
56-
],
57-
"dot-location": [
58-
2,
59-
"property"
60-
],
24+
"curly": [2, "multi-line"],
25+
"dot-location": [2, "property"],
6126
"eol-last": 2,
62-
"eqeqeq": [
63-
2,
64-
"allow-null"
65-
],
66-
"generator-star-spacing": [
67-
2,
68-
{
69-
"before": true,
70-
"after": true
71-
}
72-
],
73-
"handle-callback-err": [
74-
2,
75-
"^(err|error)$"
76-
],
77-
"indent": [
78-
2,
79-
2,
80-
{
81-
"SwitchCase": 1
82-
}
83-
],
84-
"key-spacing": [
85-
2,
86-
{
87-
"beforeColon": false,
88-
"afterColon": true
89-
}
90-
],
91-
"keyword-spacing": [
92-
2,
93-
{
94-
"before": true,
95-
"after": true
96-
}
97-
],
98-
"new-cap": [
99-
2,
100-
{
101-
"newIsCap": true,
102-
"capIsNew": false
103-
}
104-
],
27+
"eqeqeq": [2, "allow-null"],
28+
"generator-star-spacing": [2, { "before": true, "after": true }],
29+
"handle-callback-err": [2, "^(err|error)$" ],
30+
"indent": [2, 2, { "SwitchCase": 1 }],
31+
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
32+
"keyword-spacing": [2, { "before": true, "after": true }],
33+
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
10534
"new-parens": 2,
10635
"no-array-constructor": 2,
10736
"no-caller": 2,
@@ -121,18 +50,12 @@
12150
"no-extend-native": 2,
12251
"no-extra-bind": 2,
12352
"no-extra-boolean-cast": 2,
124-
"no-extra-parens": [
125-
2,
126-
"functions"
127-
],
53+
"no-extra-parens": [2, "functions"],
12854
"no-fallthrough": 2,
12955
"no-floating-decimal": 2,
13056
"no-func-assign": 2,
13157
"no-implied-eval": 2,
132-
"no-inner-declarations": [
133-
2,
134-
"functions"
135-
],
58+
"no-inner-declarations": [2, "functions"],
13659
"no-invalid-regexp": 2,
13760
"no-irregular-whitespace": 2,
13861
"no-iterator": 2,
@@ -142,12 +65,7 @@
14265
"no-mixed-spaces-and-tabs": 2,
14366
"no-multi-spaces": 2,
14467
"no-multi-str": 2,
145-
"no-multiple-empty-lines": [
146-
2,
147-
{
148-
"max": 1
149-
}
150-
],
68+
"no-multiple-empty-lines": [2, { "max": 1 }],
15169
"no-native-reassign": 0,
15270
"no-negated-in-lhs": 2,
15371
"no-new": 2,
@@ -173,103 +91,27 @@
17391
"no-undef": 2,
17492
"no-undef-init": 2,
17593
"no-unexpected-multiline": 2,
176-
"no-unneeded-ternary": [
177-
2,
178-
{
179-
"defaultAssignment": false
180-
}
181-
],
94+
"no-unneeded-ternary": [2, { "defaultAssignment": false }],
18295
"no-unreachable": 2,
183-
"no-unused-vars": [
184-
2,
185-
{
186-
"vars": "all",
187-
"args": "none"
188-
}
189-
],
96+
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
19097
"no-useless-call": 0,
19198
"no-with": 2,
192-
"one-var": [
193-
0,
194-
{
195-
"initialized": "never"
196-
}
197-
],
198-
"operator-linebreak": [
199-
0,
200-
"after",
201-
{
202-
"overrides": {
203-
"?": "before",
204-
":": "before"
205-
}
206-
}
207-
],
208-
"padded-blocks": [
209-
0,
210-
"never"
211-
],
212-
"quotes": [
213-
2,
214-
"single",
215-
"avoid-escape"
216-
],
99+
"one-var": [0, { "initialized": "never" }],
100+
"operator-linebreak": [0, "after", { "overrides": { "?": "before", ":": "before" } }],
101+
"padded-blocks": [0, "never"],
102+
"quotes": [2, "single", "avoid-escape"],
217103
"radix": 2,
218-
"semi": [
219-
2,
220-
"always"
221-
],
222-
"semi-spacing": [
223-
2,
224-
{
225-
"before": false,
226-
"after": true
227-
}
228-
],
229-
"space-before-blocks": [
230-
2,
231-
"always"
232-
],
233-
"space-before-function-paren": [
234-
2,
235-
"never"
236-
],
237-
"space-in-parens": [
238-
2,
239-
"never"
240-
],
104+
"semi": [2, "always"],
105+
"semi-spacing": [2, { "before": false, "after": true }],
106+
"space-before-blocks": [2, "always"],
107+
"space-before-function-paren": [2, "never"],
108+
"space-in-parens": [2, "never"],
241109
"space-infix-ops": 2,
242-
"space-unary-ops": [
243-
2,
244-
{
245-
"words": true,
246-
"nonwords": false
247-
}
248-
],
249-
"spaced-comment": [
250-
0,
251-
"always",
252-
{
253-
"markers": [
254-
"global",
255-
"globals",
256-
"eslint",
257-
"eslint-disable",
258-
"*package",
259-
"!",
260-
","
261-
]
262-
}
263-
],
110+
"space-unary-ops": [2, { "words": true, "nonwords": false }],
111+
"spaced-comment": [0, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
264112
"use-isnan": 2,
265113
"valid-typeof": 2,
266-
"wrap-iife": [
267-
2,
268-
"any"
269-
],
270-
"yoda": [
271-
2,
272-
"never"
273-
]
114+
"wrap-iife": [2, "any"],
115+
"yoda": [2, "never"]
274116
}
275117
}

‎.gitignore‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
1-
*.DS_store
1+
# always ignore files
2+
*.DS_Store
23
*.sublime-*
3-
_gh_pages
4-
bower_components
4+
5+
# test related, or directories generated by tests
6+
test/actual
7+
actual
8+
coverage
9+
.nyc*
10+
11+
# npm
512
node_modules
613
npm-debug.log
7-
actual
8-
test/actual
14+
15+
# yarn
16+
yarn.lock
17+
yarn-error.log
18+
19+
# misc
20+
_gh_pages
21+
_draft
22+
_drafts
23+
bower_components
24+
vendor
925
temp
1026
tmp
1127
TODO.md
12-
vendor
28+
package-lock.json

‎.travis.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
sudo: false
2+
os:
3+
- linux
4+
- osx
25
language: node_js
36
node_js:
4-
- stable
7+
- node
8+
- '8'
9+
- '7'
10+
- '6'
511
- '5'
612
- '4'
713
- '0.12'
814
- '0.10'
9-
matrix:
10-
fast_finish: true
11-
allow_failures:
12-
- node_js: '0.10'

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015-2016, Jon Schlinkert.
3+
Copyright (c) 2015-2017, Jon Schlinkert.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21-
THE SOFTWARE.
21+
THE SOFTWARE.

0 commit comments

Comments
 (0)