Skip to content

Commit bbfd1d2

Browse files
doowbdoowb
committed
run update
1 parent 6888d3a commit bbfd1d2

File tree

7 files changed

+79
-235
lines changed

7 files changed

+79
-235
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-
[test/**]
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: 37 additions & 193 deletions
Original file line numberDiff line numberDiff line change
@@ -3,98 +3,39 @@
33
"modules": true,
44
"experimentalObjectRestSpread": true
55
},
6+
67
"env": {
78
"browser": false,
89
"es6": true,
910
"node": true,
1011
"mocha": true
1112
},
13+
1214
"globals": {
1315
"document": false,
1416
"navigator": false,
1517
"window": false
1618
},
19+
1720
"rules": {
1821
"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-
],
22+
"arrow-spacing": [2, { "before": true, "after": true }],
23+
"block-spacing": [2, "always"],
24+
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
25+
"comma-dangle": [2, "never"],
26+
"comma-spacing": [2, { "before": false, "after": true }],
27+
"comma-style": [2, "last"],
5228
"constructor-super": 2,
53-
"curly": [
54-
2,
55-
"multi-line"
56-
],
57-
"dot-location": [
58-
2,
59-
"property"
60-
],
29+
"curly": [2, "multi-line"],
30+
"dot-location": [2, "property"],
6131
"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-
"new-cap": [
92-
2,
93-
{
94-
"newIsCap": true,
95-
"capIsNew": false
96-
}
97-
],
32+
"eqeqeq": [2, "allow-null"],
33+
"generator-star-spacing": [2, { "before": true, "after": true }],
34+
"handle-callback-err": [2, "^(err|error)$" ],
35+
"indent": [2, 2, { "SwitchCase": 1 }],
36+
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
37+
"keyword-spacing": [2, { "before": true, "after": true }],
38+
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
9839
"new-parens": 2,
9940
"no-array-constructor": 2,
10041
"no-caller": 2,
@@ -109,24 +50,17 @@
10950
"no-dupe-keys": 2,
11051
"no-duplicate-case": 2,
11152
"no-empty-character-class": 2,
112-
"no-empty-label": 2,
11353
"no-eval": 2,
11454
"no-ex-assign": 2,
11555
"no-extend-native": 2,
11656
"no-extra-bind": 2,
11757
"no-extra-boolean-cast": 2,
118-
"no-extra-parens": [
119-
2,
120-
"functions"
121-
],
58+
"no-extra-parens": [2, "functions"],
12259
"no-fallthrough": 2,
12360
"no-floating-decimal": 2,
12461
"no-func-assign": 2,
12562
"no-implied-eval": 2,
126-
"no-inner-declarations": [
127-
2,
128-
"functions"
129-
],
63+
"no-inner-declarations": [2, "functions"],
13064
"no-invalid-regexp": 2,
13165
"no-irregular-whitespace": 2,
13266
"no-iterator": 2,
@@ -136,13 +70,8 @@
13670
"no-mixed-spaces-and-tabs": 2,
13771
"no-multi-spaces": 2,
13872
"no-multi-str": 2,
139-
"no-multiple-empty-lines": [
140-
2,
141-
{
142-
"max": 1
143-
}
144-
],
145-
"no-native-reassign": 2,
73+
"no-multiple-empty-lines": [2, { "max": 1 }],
74+
"no-native-reassign": 0,
14675
"no-negated-in-lhs": 2,
14776
"no-new": 2,
14877
"no-new-func": 2,
@@ -167,112 +96,27 @@
16796
"no-undef": 2,
16897
"no-undef-init": 2,
16998
"no-unexpected-multiline": 2,
170-
"no-unneeded-ternary": [
171-
2,
172-
{
173-
"defaultAssignment": false
174-
}
175-
],
99+
"no-unneeded-ternary": [2, { "defaultAssignment": false }],
176100
"no-unreachable": 2,
177-
"no-unused-vars": [
178-
2,
179-
{
180-
"vars": "all",
181-
"args": "none"
182-
}
183-
],
101+
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
184102
"no-useless-call": 0,
185103
"no-with": 2,
186-
"one-var": [
187-
0,
188-
{
189-
"initialized": "never"
190-
}
191-
],
192-
"operator-linebreak": [
193-
0,
194-
"after",
195-
{
196-
"overrides": {
197-
"?": "before",
198-
":": "before"
199-
}
200-
}
201-
],
202-
"padded-blocks": [
203-
0,
204-
"never"
205-
],
206-
"quotes": [
207-
2,
208-
"single",
209-
"avoid-escape"
210-
],
104+
"one-var": [0, { "initialized": "never" }],
105+
"operator-linebreak": [0, "after", { "overrides": { "?": "before", ":": "before" } }],
106+
"padded-blocks": [0, "never"],
107+
"quotes": [2, "single", "avoid-escape"],
211108
"radix": 2,
212-
"semi": [
213-
2,
214-
"always"
215-
],
216-
"semi-spacing": [
217-
2,
218-
{
219-
"before": false,
220-
"after": true
221-
}
222-
],
223-
"space-after-keywords": [
224-
2,
225-
"always"
226-
],
227-
"space-before-blocks": [
228-
2,
229-
"always"
230-
],
231-
"space-before-function-paren": [
232-
2,
233-
"never"
234-
],
235-
"space-before-keywords": [
236-
2,
237-
"always"
238-
],
239-
"space-in-parens": [
240-
2,
241-
"never"
242-
],
109+
"semi": [2, "always"],
110+
"semi-spacing": [2, { "before": false, "after": true }],
111+
"space-before-blocks": [2, "always"],
112+
"space-before-function-paren": [2, "never"],
113+
"space-in-parens": [2, "never"],
243114
"space-infix-ops": 2,
244-
"space-return-throw-case": 2,
245-
"space-unary-ops": [
246-
2,
247-
{
248-
"words": true,
249-
"nonwords": false
250-
}
251-
],
252-
"spaced-comment": [
253-
0,
254-
"always",
255-
{
256-
"markers": [
257-
"global",
258-
"globals",
259-
"eslint",
260-
"eslint-disable",
261-
"*package",
262-
"!",
263-
","
264-
]
265-
}
266-
],
115+
"space-unary-ops": [2, { "words": true, "nonwords": false }],
116+
"spaced-comment": [0, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
267117
"use-isnan": 2,
268118
"valid-typeof": 2,
269-
"wrap-iife": [
270-
2,
271-
"any"
272-
],
273-
"yoda": [
274-
2,
275-
"never"
276-
]
119+
"wrap-iife": [2, "any"],
120+
"yoda": [2, "never"]
277121
}
278122
}

‎.gitignore‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,30 @@
1+
# always ignore files
2+
*.DS_Store
13
*.sublime-*
2-
_gh_pages
4+
5+
# test related, or directories generated by tests
6+
test/actual
37
actual
4-
bower_components
8+
coverage
9+
.nyc*
10+
11+
# npm
512
node_modules
613
npm-debug.log
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
725
temp
8-
test/actual
926
tmp
1027
TODO.md
11-
vendor
28+
29+
examples/*/dist
30+
examples/*/site

‎.jshintrc‎

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

‎.travis.yml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
sudo: false
2+
os:
3+
- linux
4+
- osx
25
language: node_js
36
node_js:
4-
- "stable"
5-
- "5"
6-
- "4"
7-
- "0.12"
8-
- "0.10"
7+
- node
8+
- '7'
9+
- '6'
10+
- '5'
11+
- '4'
12+
- '0.12'
13+
- '0.10'
914
matrix:
15+
allow_failures: []
1016
fast_finish: true
11-
allow_failures:
12-
- node_js: "0.10"

‎LICENSE‎

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

3-
Copyright (c) 2014-2016, Jon Schlinkert.
3+
Copyright (c) 2014-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

0 commit comments

Comments
 (0)