Skip to content

Commit 3186554

Browse files
seth-mgseth-mg
committed
Merge branch 'develop'
2 parents 0f4bd79 + 4303bd8 commit 3186554

37 files changed

+492
-323
lines changed

‎.eslintrc.json‎

Lines changed: 131 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,131 @@
1-
{
2-
"parserOptions": {
3-
"ecmaVersion": 6,
4-
"ecmaFeatures": {
5-
"experimentalObjectRestSpread": true,
6-
"jsx": true
7-
},
8-
"sourceType": "module"
9-
},
10-
11-
"env": {
12-
"es6": true,
13-
"node": true
14-
},
15-
16-
"globals": {
17-
"document": false,
18-
"navigator": false,
19-
"window": false
20-
},
21-
22-
"rules": {
23-
"accessor-pairs": 1,
24-
"arrow-parens": [1, "always"],
25-
"arrow-spacing": [1, { "before": true, "after": true }],
26-
"block-spacing": [1, "always"],
27-
"brace-style": [1, "1tbs", { "allowSingleLine": true }],
28-
"comma-dangle": [1, "never"],
29-
"comma-spacing": [1, { "before": false, "after": true }],
30-
"comma-style": [1, "last"],
31-
"constructor-super": 1,
32-
"curly": [1, "multi-line"],
33-
"dot-location": [1, "property"],
34-
"eol-last": 0,
35-
"eqeqeq": [0, "allow-null"],
36-
"generator-star-spacing": [1, { "before": true, "after": true }],
37-
"handle-callback-err": [1, "^(err|error)$" ],
38-
"indent": [1, 4],
39-
"jsx-quotes": [1, "prefer-single"],
40-
"key-spacing": [1, { "beforeColon": false, "afterColon": true }],
41-
"keyword-spacing": [1, { "before": true, "after": true }],
42-
"new-cap": [1, { "newIsCap": false, "capIsNew": false }],
43-
"new-parens": 1,
44-
"no-array-constructor": 1,
45-
"no-caller": 1,
46-
"no-class-assign": 1,
47-
"no-cond-assign": 1,
48-
"no-const-assign": 1,
49-
"no-control-regex": 1,
50-
"no-debugger": 1,
51-
"no-delete-var": 1,
52-
"no-dupe-args": 1,
53-
"no-dupe-class-members": 1,
54-
"no-dupe-keys": 1,
55-
"no-duplicate-case": 1,
56-
"no-empty-character-class": 1,
57-
"no-empty-pattern": 1,
58-
"no-eval": 1,
59-
"no-ex-assign": 1,
60-
"no-extend-native": 1,
61-
"no-extra-bind": 1,
62-
"no-extra-boolean-cast": 1,
63-
"no-extra-parens": [1, "functions"],
64-
"no-fallthrough": 1,
65-
"no-floating-decimal": 1,
66-
"no-func-assign": 1,
67-
"no-implied-eval": 1,
68-
"no-inner-declarations": [1, "functions"],
69-
"no-invalid-regexp": 1,
70-
"no-irregular-whitespace": 1,
71-
"no-iterator": 1,
72-
"no-label-var": 1,
73-
"no-labels": [1, { "allowLoop": false, "allowSwitch": false }],
74-
"no-lone-blocks": 1,
75-
"no-mixed-spaces-and-tabs": 1,
76-
"no-multi-spaces": 1,
77-
"no-multi-str": 1,
78-
"no-multiple-empty-lines": [1, { "max": 1 }],
79-
"no-native-reassign": 1,
80-
"no-negated-in-lhs": 1,
81-
"no-new": 1,
82-
"no-new-func": 1,
83-
"no-new-object": 1,
84-
"no-new-require": 1,
85-
"no-new-symbol": 1,
86-
"no-new-wrappers": 1,
87-
"no-obj-calls": 1,
88-
"no-octal": 1,
89-
"no-octal-escape": 1,
90-
"no-path-concat": 1,
91-
"no-proto": 1,
92-
"no-redeclare": 1,
93-
"no-regex-spaces": 1,
94-
"no-return-assign": [1, "except-parens"],
95-
"no-self-assign": 1,
96-
"no-self-compare": 1,
97-
"no-sequences": 1,
98-
"no-shadow-restricted-names": 1,
99-
"no-spaced-func": 1,
100-
"no-sparse-arrays": 1,
101-
"no-this-before-super": 1,
102-
"no-throw-literal": 1,
103-
"no-trailing-spaces": 0,
104-
"no-undef": 1,
105-
"no-undef-init": 1,
106-
"no-unexpected-multiline": 1,
107-
"no-unneeded-ternary": [1, { "defaultAssignment": false }],
108-
"no-unreachable": 1,
109-
"no-unused-vars": 0,
110-
"no-useless-call": 1,
111-
"no-useless-constructor": 1,
112-
"no-with": 1,
113-
"one-var": [1, { "initialized": "never" }],
114-
"operator-linebreak": [1, "after", { "overrides": { "?": "before", ":": "before" } }],
115-
"padded-blocks": [0, "never"],
116-
"quotes": 0,
117-
"semi": [0, "never"],
118-
"semi-spacing": [1, { "before": false, "after": true }],
119-
"space-before-blocks": [1, "always"],
120-
"space-before-function-paren": 0,
121-
"space-in-parens": [1, "never"],
122-
"space-infix-ops": 1,
123-
"space-unary-ops": [1, { "words": true, "nonwords": false }],
124-
"spaced-comment": 0,
125-
"template-curly-spacing": [1, "never"],
126-
"use-isnan": 1,
127-
"valid-typeof": 1,
128-
"wrap-iife": [1, "any"],
129-
"yield-star-spacing": [1, "both"]
130-
}
131-
}
1+
{
2+
"parserOptions": {
3+
"ecmaVersion": 6,
4+
"ecmaFeatures": {
5+
"ecmaVersion": true,
6+
"jsx": true
7+
},
8+
"sourceType": "module"
9+
},
10+
11+
"env": {
12+
"es6": true,
13+
"node": true
14+
},
15+
16+
"globals": {
17+
"document": false,
18+
"navigator": false,
19+
"window": false
20+
},
21+
22+
"rules": {
23+
"accessor-pairs": 1,
24+
"arrow-parens": [1, "always"],
25+
"arrow-spacing": [1, { "before": true, "after": true }],
26+
"block-spacing": [1, "always"],
27+
"brace-style": [1, "1tbs", { "allowSingleLine": true }],
28+
"comma-dangle": [1, "never"],
29+
"comma-spacing": [1, { "before": false, "after": true }],
30+
"comma-style": [1, "last"],
31+
"constructor-super": 1,
32+
"curly": [1, "multi-line"],
33+
"dot-location": [1, "property"],
34+
"eol-last": 0,
35+
"eqeqeq": [0, "allow-null"],
36+
"generator-star-spacing": [1, { "before": true, "after": true }],
37+
"handle-callback-err": [1, "^(err|error)$" ],
38+
"indent": [1, 4],
39+
"jsx-quotes": [1, "prefer-single"],
40+
"key-spacing": [1, { "beforeColon": false, "afterColon": true }],
41+
"keyword-spacing": [1, { "before": true, "after": true }],
42+
"new-cap": [1, { "newIsCap": false, "capIsNew": false }],
43+
"new-parens": 1,
44+
"no-array-constructor": 1,
45+
"no-caller": 1,
46+
"no-class-assign": 1,
47+
"no-cond-assign": 1,
48+
"no-const-assign": 1,
49+
"no-control-regex": 1,
50+
"no-debugger": 1,
51+
"no-delete-var": 1,
52+
"no-dupe-args": 1,
53+
"no-dupe-class-members": 1,
54+
"no-dupe-keys": 1,
55+
"no-duplicate-case": 1,
56+
"no-empty-character-class": 1,
57+
"no-empty-pattern": 1,
58+
"no-eval": 1,
59+
"no-ex-assign": 1,
60+
"no-extend-native": 1,
61+
"no-extra-bind": 1,
62+
"no-extra-boolean-cast": 1,
63+
"no-extra-parens": [1, "functions"],
64+
"no-fallthrough": 1,
65+
"no-floating-decimal": 1,
66+
"no-func-assign": 1,
67+
"no-implied-eval": 1,
68+
"no-inner-declarations": [1, "functions"],
69+
"no-invalid-regexp": 1,
70+
"no-irregular-whitespace": 1,
71+
"no-iterator": 1,
72+
"no-label-var": 1,
73+
"no-labels": [1, { "allowLoop": false, "allowSwitch": false }],
74+
"no-lone-blocks": 1,
75+
"no-mixed-spaces-and-tabs": 1,
76+
"no-multi-spaces": 1,
77+
"no-multi-str": 1,
78+
"no-multiple-empty-lines": [1, { "max": 1 }],
79+
"no-native-reassign": 1,
80+
"no-negated-in-lhs": 1,
81+
"no-new": 1,
82+
"no-new-func": 1,
83+
"no-new-object": 1,
84+
"no-new-require": 1,
85+
"no-new-symbol": 1,
86+
"no-new-wrappers": 1,
87+
"no-obj-calls": 1,
88+
"no-octal": 1,
89+
"no-octal-escape": 1,
90+
"no-path-concat": 1,
91+
"no-proto": 1,
92+
"no-redeclare": 1,
93+
"no-regex-spaces": 1,
94+
"no-return-assign": [1, "except-parens"],
95+
"no-self-assign": 1,
96+
"no-self-compare": 1,
97+
"no-sequences": 1,
98+
"no-shadow-restricted-names": 1,
99+
"no-spaced-func": 1,
100+
"no-sparse-arrays": 1,
101+
"no-this-before-super": 1,
102+
"no-throw-literal": 1,
103+
"no-trailing-spaces": 0,
104+
"no-undef": 1,
105+
"no-undef-init": 1,
106+
"no-unexpected-multiline": 1,
107+
"no-unneeded-ternary": [1, { "defaultAssignment": false }],
108+
"no-unreachable": 1,
109+
"no-unused-vars": 0,
110+
"no-useless-call": 1,
111+
"no-useless-constructor": 1,
112+
"no-with": 1,
113+
"one-var": [1, { "initialized": "never" }],
114+
"operator-linebreak": [1, "after", { "overrides": { "?": "before", ":": "before" } }],
115+
"padded-blocks": [0, "never"],
116+
"quotes": 0,
117+
"semi": [0, "never"],
118+
"semi-spacing": [1, { "before": false, "after": true }],
119+
"space-before-blocks": [1, "always"],
120+
"space-before-function-paren": 0,
121+
"space-in-parens": [1, "never"],
122+
"space-infix-ops": 1,
123+
"space-unary-ops": [1, { "words": true, "nonwords": false }],
124+
"spaced-comment": 0,
125+
"template-curly-spacing": [1, "never"],
126+
"use-isnan": 1,
127+
"valid-typeof": 1,
128+
"wrap-iife": [1, "any"],
129+
"yield-star-spacing": [1, "both"]
130+
}
131+
}

‎.travis.yml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
language: node_js
2-
node_js:
3-
- "6.3.0"
4-
- "7.2.0"
5-
- "8.0.0"
6-
before_install:
7-
- npm install -g npm
8-
before_script:
9-
- npm install grunt-cli -g
10-
script: grunt
11-
notifications:
12-
slack:
13-
rooms:
14-
- secure: 4FRaTAAiYyeUvgw2RhmblgbNiJO4wmd34OBgWcwURjP9oVmFfSwR9r1LNCdUGxrPOghexSY2DjXIuvIrfTfi/xYbhHb3Kw7PEAyB8IuBMlKtY4NSFou62S2VhYpxyg58T+C7P2zi0eDnDE06pwTCoGPaimxMZQY91yQ0yPYDPVXbwe5SjEgamzlwGBxlS/0A6w1iCPHg27/iO2hXtdW3oLS2I0F/Q8Q95RBkX9hpg6yqHlTV7jRbSqvQ9OFBqk/tXMHQvhoPDGgCgQDuykJuaAYx7g9d0YL0eEYYOh9B/TJ/kNOwdRFBu5kuQ2/nFS5Z0S3Y3UIhdYjUmm9gSMnwIbYnrW22EqDJLoT9Zi3Gv7Prg/8/fSkWsof7BJTMSuXUqO1AxDGKIxFv9uSF1daZoY+AC1ooU1xDu1nNvWVYPlkwEdDxxmHpFkGT3ESTZYccPovQl8Z5K0I1BBAVdJKDzm07lE6VHbxkKcvK6gG0TN3uLxnSlQtjkfJ+aVMq1kxeVsB9lEsKs9oezsKzzbftMm525aXPg+OAv+31CUFWxvT/p4ps8Q+AV6aZpoPHkpK8VryyNirUeZ/m4m4ebDHhD9vcN+JqE9gzshT+0U3g19SvLiUMQtbuZ2BUvrq2hh2LEGs03AFZaNg9AEUVA1PQRhV5NILyoS/lbiBYJPT39Sg=
15-
1+
language: node_js
2+
node_js:
3+
- "6.15.1"
4+
- "7.10.1"
5+
- "8.14.0"
6+
- "9.11.2"
7+
- "10.14.1"
8+
- "11.4.0"
9+
before_install:
10+
- npm install -g npm
11+
before_script:
12+
- npm install grunt-cli -g
13+
script: grunt
14+
notifications:
15+
slack:
16+
rooms:
17+
- secure: 4FRaTAAiYyeUvgw2RhmblgbNiJO4wmd34OBgWcwURjP9oVmFfSwR9r1LNCdUGxrPOghexSY2DjXIuvIrfTfi/xYbhHb3Kw7PEAyB8IuBMlKtY4NSFou62S2VhYpxyg58T+C7P2zi0eDnDE06pwTCoGPaimxMZQY91yQ0yPYDPVXbwe5SjEgamzlwGBxlS/0A6w1iCPHg27/iO2hXtdW3oLS2I0F/Q8Q95RBkX9hpg6yqHlTV7jRbSqvQ9OFBqk/tXMHQvhoPDGgCgQDuykJuaAYx7g9d0YL0eEYYOh9B/TJ/kNOwdRFBu5kuQ2/nFS5Z0S3Y3UIhdYjUmm9gSMnwIbYnrW22EqDJLoT9Zi3Gv7Prg/8/fSkWsof7BJTMSuXUqO1AxDGKIxFv9uSF1daZoY+AC1ooU1xDu1nNvWVYPlkwEdDxxmHpFkGT3ESTZYccPovQl8Z5K0I1BBAVdJKDzm07lE6VHbxkKcvK6gG0TN3uLxnSlQtjkfJ+aVMq1kxeVsB9lEsKs9oezsKzzbftMm525aXPg+OAv+31CUFWxvT/p4ps8Q+AV6aZpoPHkpK8VryyNirUeZ/m4m4ebDHhD9vcN+JqE9gzshT+0U3g19SvLiUMQtbuZ2BUvrq2hh2LEGs03AFZaNg9AEUVA1PQRhV5NILyoS/lbiBYJPT39Sg=

0 commit comments

Comments
 (0)