Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@seth-mg
seth-mg committed Feb 6, 2019
2 parents 0f4bd79 + 4303bd8 commit 3186554
Show file tree
Hide file tree
Showing 37 changed files with 492 additions and 323 deletions.
262 changes: 131 additions & 131 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
@@ -1,131 +1,131 @@
{
"parserOptions": {
"ecmaVersion": 6,
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"sourceType": "module"
},

"env": {
"es6": true,
"node": true
},

"globals": {
"document": false,
"navigator": false,
"window": false
},

"rules": {
"accessor-pairs": 1,
"arrow-parens": [1, "always"],
"arrow-spacing": [1, { "before": true, "after": true }],
"block-spacing": [1, "always"],
"brace-style": [1, "1tbs", { "allowSingleLine": true }],
"comma-dangle": [1, "never"],
"comma-spacing": [1, { "before": false, "after": true }],
"comma-style": [1, "last"],
"constructor-super": 1,
"curly": [1, "multi-line"],
"dot-location": [1, "property"],
"eol-last": 0,
"eqeqeq": [0, "allow-null"],
"generator-star-spacing": [1, { "before": true, "after": true }],
"handle-callback-err": [1, "^(err|error)$" ],
"indent": [1, 4],
"jsx-quotes": [1, "prefer-single"],
"key-spacing": [1, { "beforeColon": false, "afterColon": true }],
"keyword-spacing": [1, { "before": true, "after": true }],
"new-cap": [1, { "newIsCap": false, "capIsNew": false }],
"new-parens": 1,
"no-array-constructor": 1,
"no-caller": 1,
"no-class-assign": 1,
"no-cond-assign": 1,
"no-const-assign": 1,
"no-control-regex": 1,
"no-debugger": 1,
"no-delete-var": 1,
"no-dupe-args": 1,
"no-dupe-class-members": 1,
"no-dupe-keys": 1,
"no-duplicate-case": 1,
"no-empty-character-class": 1,
"no-empty-pattern": 1,
"no-eval": 1,
"no-ex-assign": 1,
"no-extend-native": 1,
"no-extra-bind": 1,
"no-extra-boolean-cast": 1,
"no-extra-parens": [1, "functions"],
"no-fallthrough": 1,
"no-floating-decimal": 1,
"no-func-assign": 1,
"no-implied-eval": 1,
"no-inner-declarations": [1, "functions"],
"no-invalid-regexp": 1,
"no-irregular-whitespace": 1,
"no-iterator": 1,
"no-label-var": 1,
"no-labels": [1, { "allowLoop": false, "allowSwitch": false }],
"no-lone-blocks": 1,
"no-mixed-spaces-and-tabs": 1,
"no-multi-spaces": 1,
"no-multi-str": 1,
"no-multiple-empty-lines": [1, { "max": 1 }],
"no-native-reassign": 1,
"no-negated-in-lhs": 1,
"no-new": 1,
"no-new-func": 1,
"no-new-object": 1,
"no-new-require": 1,
"no-new-symbol": 1,
"no-new-wrappers": 1,
"no-obj-calls": 1,
"no-octal": 1,
"no-octal-escape": 1,
"no-path-concat": 1,
"no-proto": 1,
"no-redeclare": 1,
"no-regex-spaces": 1,
"no-return-assign": [1, "except-parens"],
"no-self-assign": 1,
"no-self-compare": 1,
"no-sequences": 1,
"no-shadow-restricted-names": 1,
"no-spaced-func": 1,
"no-sparse-arrays": 1,
"no-this-before-super": 1,
"no-throw-literal": 1,
"no-trailing-spaces": 0,
"no-undef": 1,
"no-undef-init": 1,
"no-unexpected-multiline": 1,
"no-unneeded-ternary": [1, { "defaultAssignment": false }],
"no-unreachable": 1,
"no-unused-vars": 0,
"no-useless-call": 1,
"no-useless-constructor": 1,
"no-with": 1,
"one-var": [1, { "initialized": "never" }],
"operator-linebreak": [1, "after", { "overrides": { "?": "before", ":": "before" } }],
"padded-blocks": [0, "never"],
"quotes": 0,
"semi": [0, "never"],
"semi-spacing": [1, { "before": false, "after": true }],
"space-before-blocks": [1, "always"],
"space-before-function-paren": 0,
"space-in-parens": [1, "never"],
"space-infix-ops": 1,
"space-unary-ops": [1, { "words": true, "nonwords": false }],
"spaced-comment": 0,
"template-curly-spacing": [1, "never"],
"use-isnan": 1,
"valid-typeof": 1,
"wrap-iife": [1, "any"],
"yield-star-spacing": [1, "both"]
}
}
{
"parserOptions": {
"ecmaVersion": 6,
"ecmaFeatures": {
"ecmaVersion": true,
"jsx": true
},
"sourceType": "module"
},

"env": {
"es6": true,
"node": true
},

"globals": {
"document": false,
"navigator": false,
"window": false
},

"rules": {
"accessor-pairs": 1,
"arrow-parens": [1, "always"],
"arrow-spacing": [1, { "before": true, "after": true }],
"block-spacing": [1, "always"],
"brace-style": [1, "1tbs", { "allowSingleLine": true }],
"comma-dangle": [1, "never"],
"comma-spacing": [1, { "before": false, "after": true }],
"comma-style": [1, "last"],
"constructor-super": 1,
"curly": [1, "multi-line"],
"dot-location": [1, "property"],
"eol-last": 0,
"eqeqeq": [0, "allow-null"],
"generator-star-spacing": [1, { "before": true, "after": true }],
"handle-callback-err": [1, "^(err|error)$" ],
"indent": [1, 4],
"jsx-quotes": [1, "prefer-single"],
"key-spacing": [1, { "beforeColon": false, "afterColon": true }],
"keyword-spacing": [1, { "before": true, "after": true }],
"new-cap": [1, { "newIsCap": false, "capIsNew": false }],
"new-parens": 1,
"no-array-constructor": 1,
"no-caller": 1,
"no-class-assign": 1,
"no-cond-assign": 1,
"no-const-assign": 1,
"no-control-regex": 1,
"no-debugger": 1,
"no-delete-var": 1,
"no-dupe-args": 1,
"no-dupe-class-members": 1,
"no-dupe-keys": 1,
"no-duplicate-case": 1,
"no-empty-character-class": 1,
"no-empty-pattern": 1,
"no-eval": 1,
"no-ex-assign": 1,
"no-extend-native": 1,
"no-extra-bind": 1,
"no-extra-boolean-cast": 1,
"no-extra-parens": [1, "functions"],
"no-fallthrough": 1,
"no-floating-decimal": 1,
"no-func-assign": 1,
"no-implied-eval": 1,
"no-inner-declarations": [1, "functions"],
"no-invalid-regexp": 1,
"no-irregular-whitespace": 1,
"no-iterator": 1,
"no-label-var": 1,
"no-labels": [1, { "allowLoop": false, "allowSwitch": false }],
"no-lone-blocks": 1,
"no-mixed-spaces-and-tabs": 1,
"no-multi-spaces": 1,
"no-multi-str": 1,
"no-multiple-empty-lines": [1, { "max": 1 }],
"no-native-reassign": 1,
"no-negated-in-lhs": 1,
"no-new": 1,
"no-new-func": 1,
"no-new-object": 1,
"no-new-require": 1,
"no-new-symbol": 1,
"no-new-wrappers": 1,
"no-obj-calls": 1,
"no-octal": 1,
"no-octal-escape": 1,
"no-path-concat": 1,
"no-proto": 1,
"no-redeclare": 1,
"no-regex-spaces": 1,
"no-return-assign": [1, "except-parens"],
"no-self-assign": 1,
"no-self-compare": 1,
"no-sequences": 1,
"no-shadow-restricted-names": 1,
"no-spaced-func": 1,
"no-sparse-arrays": 1,
"no-this-before-super": 1,
"no-throw-literal": 1,
"no-trailing-spaces": 0,
"no-undef": 1,
"no-undef-init": 1,
"no-unexpected-multiline": 1,
"no-unneeded-ternary": [1, { "defaultAssignment": false }],
"no-unreachable": 1,
"no-unused-vars": 0,
"no-useless-call": 1,
"no-useless-constructor": 1,
"no-with": 1,
"one-var": [1, { "initialized": "never" }],
"operator-linebreak": [1, "after", { "overrides": { "?": "before", ":": "before" } }],
"padded-blocks": [0, "never"],
"quotes": 0,
"semi": [0, "never"],
"semi-spacing": [1, { "before": false, "after": true }],
"space-before-blocks": [1, "always"],
"space-before-function-paren": 0,
"space-in-parens": [1, "never"],
"space-infix-ops": 1,
"space-unary-ops": [1, { "words": true, "nonwords": false }],
"spaced-comment": 0,
"template-curly-spacing": [1, "never"],
"use-isnan": 1,
"valid-typeof": 1,
"wrap-iife": [1, "any"],
"yield-star-spacing": [1, "both"]
}
}
32 changes: 17 additions & 15 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
language: node_js
node_js:
- "6.3.0"
- "7.2.0"
- "8.0.0"
before_install:
- npm install -g npm
before_script:
- npm install grunt-cli -g
script: grunt
notifications:
slack:
rooms:
- secure: 4FRaTAAiYyeUvgw2RhmblgbNiJO4wmd34OBgWcwURjP9oVmFfSwR9r1LNCdUGxrPOghexSY2DjXIuvIrfTfi/xYbhHb3Kw7PEAyB8IuBMlKtY4NSFou62S2VhYpxyg58T+C7P2zi0eDnDE06pwTCoGPaimxMZQY91yQ0yPYDPVXbwe5SjEgamzlwGBxlS/0A6w1iCPHg27/iO2hXtdW3oLS2I0F/Q8Q95RBkX9hpg6yqHlTV7jRbSqvQ9OFBqk/tXMHQvhoPDGgCgQDuykJuaAYx7g9d0YL0eEYYOh9B/TJ/kNOwdRFBu5kuQ2/nFS5Z0S3Y3UIhdYjUmm9gSMnwIbYnrW22EqDJLoT9Zi3Gv7Prg/8/fSkWsof7BJTMSuXUqO1AxDGKIxFv9uSF1daZoY+AC1ooU1xDu1nNvWVYPlkwEdDxxmHpFkGT3ESTZYccPovQl8Z5K0I1BBAVdJKDzm07lE6VHbxkKcvK6gG0TN3uLxnSlQtjkfJ+aVMq1kxeVsB9lEsKs9oezsKzzbftMm525aXPg+OAv+31CUFWxvT/p4ps8Q+AV6aZpoPHkpK8VryyNirUeZ/m4m4ebDHhD9vcN+JqE9gzshT+0U3g19SvLiUMQtbuZ2BUvrq2hh2LEGs03AFZaNg9AEUVA1PQRhV5NILyoS/lbiBYJPT39Sg=

language: node_js
node_js:
- "6.15.1"
- "7.10.1"
- "8.14.0"
- "9.11.2"
- "10.14.1"
- "11.4.0"
before_install:
- npm install -g npm
before_script:
- npm install grunt-cli -g
script: grunt
notifications:
slack:
rooms:
- secure: 4FRaTAAiYyeUvgw2RhmblgbNiJO4wmd34OBgWcwURjP9oVmFfSwR9r1LNCdUGxrPOghexSY2DjXIuvIrfTfi/xYbhHb3Kw7PEAyB8IuBMlKtY4NSFou62S2VhYpxyg58T+C7P2zi0eDnDE06pwTCoGPaimxMZQY91yQ0yPYDPVXbwe5SjEgamzlwGBxlS/0A6w1iCPHg27/iO2hXtdW3oLS2I0F/Q8Q95RBkX9hpg6yqHlTV7jRbSqvQ9OFBqk/tXMHQvhoPDGgCgQDuykJuaAYx7g9d0YL0eEYYOh9B/TJ/kNOwdRFBu5kuQ2/nFS5Z0S3Y3UIhdYjUmm9gSMnwIbYnrW22EqDJLoT9Zi3Gv7Prg/8/fSkWsof7BJTMSuXUqO1AxDGKIxFv9uSF1daZoY+AC1ooU1xDu1nNvWVYPlkwEdDxxmHpFkGT3ESTZYccPovQl8Z5K0I1BBAVdJKDzm07lE6VHbxkKcvK6gG0TN3uLxnSlQtjkfJ+aVMq1kxeVsB9lEsKs9oezsKzzbftMm525aXPg+OAv+31CUFWxvT/p4ps8Q+AV6aZpoPHkpK8VryyNirUeZ/m4m4ebDHhD9vcN+JqE9gzshT+0U3g19SvLiUMQtbuZ2BUvrq2hh2LEGs03AFZaNg9AEUVA1PQRhV5NILyoS/lbiBYJPT39Sg=
Loading

0 comments on commit 3186554

Please sign in to comment.