Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
niklasramo committed Jul 27, 2017
2 parents 68f6259 + 2a81ee8 commit 983109a
Show file tree
Hide file tree
Showing 88 changed files with 7,908 additions and 4,676 deletions.
67 changes: 34 additions & 33 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,39 +62,40 @@ module.exports = {
"no-undef-init": "error",
"no-unused-vars": "error",
// Stylistic issues
"array-bracket-spacing": ["error", "never"],
"block-spacing": "error",
"brace-style": ["error", "stroustrup"],
"camelcase": "error",
"comma-dangle": ["error", "never"],
"comma-spacing": ["error", {"before": false, "after": true}],
"comma-style": ["error", "last"],
"computed-property-spacing": ["error", "never"],
"eol-last": ["error", "always"],
"func-call-spacing": ["error", "never"],
"indent": ["error", 2, {"SwitchCase": 1, "VariableDeclarator": 1, "FunctionDeclaration": {"body": 1, "parameters": 1}}],
"key-spacing": ["error", {"beforeColon": false, "afterColon": true, "mode": "strict"}],
"keyword-spacing": ["error", {"before": true, "after": true}],
"linebreak-style": ["error", "unix"],
"max-len": ["error", {"code": Infinity, "comments": 80}],
"new-parens": "error",
"no-multiple-empty-lines": ["error", {"max": 1}],
"no-tabs": "error",
"no-trailing-spaces": "error",
"no-whitespace-before-property": "error",
"object-curly-spacing": ["error", "never"],
"one-var-declaration-per-line": ["error", "initializations"],
"one-var": ["error", "never"],
"quote-props": ["error", "consistent", {"keywords": true}],
"quotes": ["error", "single", {"allowTemplateLiterals": true}],
"semi-spacing": ["error", {"before": false, "after": true}],
"semi": ["error", "always"],
"space-before-blocks": "error",
"space-before-function-paren": ["error", {"anonymous": "always", "named": "never", "asyncArrow": "always"}],
"space-in-parens": ["error", "never"],
"space-infix-ops": ["error", {"int32Hint": true}],
"space-unary-ops": "error",
"spaced-comment": ["error", "always", {"exceptions": ["!"]}],
"array-bracket-spacing": ["warn", "never"],
"block-spacing": "warn",
"brace-style": ["warn", "stroustrup"],
"camelcase": "warn",
"comma-dangle": ["warn", "never"],
"comma-spacing": ["warn", {"before": false, "after": true}],
"comma-style": ["warn", "last"],
"computed-property-spacing": ["warn", "never"],
"eol-last": ["warn", "always"],
"func-call-spacing": ["warn", "never"],
"indent": "off",
"indent-legacy": ["warn", 2, {"SwitchCase": 1, "VariableDeclarator": 1, "FunctionDeclaration": {"body": 1, "parameters": 1}}],
"key-spacing": ["warn", {"beforeColon": false, "afterColon": true, "mode": "strict"}],
"keyword-spacing": ["warn", {"before": true, "after": true}],
"linebreak-style": ["warn", "unix"],
"max-len": ["warn", {"code": Infinity, "comments": 80}],
"new-parens": "warn",
"no-multiple-empty-lines": ["warn", {"max": 1}],
"no-tabs": "warn",
"no-trailing-spaces": "warn",
"no-whitespace-before-property": "warn",
"object-curly-spacing": ["warn", "never"],
"one-var-declaration-per-line": ["warn", "initializations"],
"one-var": ["warn", "never"],
"quote-props": ["warn", "consistent", {"keywords": true}],
"quotes": ["warn", "single", {"allowTemplateLiterals": true}],
"semi-spacing": ["warn", {"before": false, "after": true}],
"semi": ["warn", "always"],
"space-before-blocks": "warn",
"space-before-function-paren": ["warn", {"anonymous": "always", "named": "never", "asyncArrow": "always"}],
"space-in-parens": ["warn", "never"],
"space-infix-ops": ["warn", {"int32Hint": true}],
"space-unary-ops": "warn",
"spaced-comment": ["warn", "always", {"exceptions": ["!"]}],
// ES6
"arrow-body-style": ["error", "always"],
"arrow-parens": ["error", "always"],
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ node_modules
website
/coverage
/website
/demos
*.log
*.env
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: node_js
node_js:
- "6"
- '6'
env:
global:
- secure: bDVeC8Sy6fC7OOG+Q27G2aZ6Yjcn5s3A+5ZgNQbpnV46Dq7+9nP+69KqtHsfUaDiunDA6n6CdvOXdWNG66nHMUE36nZg13h+mRHHxKehXcJN1QAbY9ZEXplCeAXDlTAsO54H3R9Cp8OmRMNtUC47MgygkmZqDDud+3iMyFqT+9U=
- secure: lzqfZleLwkf8OHvADsLidmOY0l1yQZZ0iqEn2XI5/pgBwfUbEXp00ysvhy6/+wbcpn7Y7lM9q955V1b0igYQ9Z8mY3KvdSsNfvF/HZFkgLNuaMaYZ2tCKUjdL5gI8N5yYW3e91EoDnQs8B9alqTnwuwilqVjz2SUuZBe50i/loE=
email: false
global:
- secure: UcHda6DVxvFcQPscXNG/6jd0pwVJoik0wx7AldoJSr1v5hZGXhdVuPUYpLVK53uhifl6DNxsovzCJF41zAg7QhJSqNaQlDXhoLghAC4iL/6VsVJBu4Jx2KZKrsPeMVJxqA6Q5FLQzF91jpkgV+pWf2g2RnXkDnm81EWIVQDhg83bs4HhrRTzdsND2nkl8iSucO9Nm3tDjC8rNaa9jagGyF3ZVTO+B/L/E0opNxPzZFdxL6UrQYjrplHjF4HEoNyBBLWf4p2Tco49xDFBNoTs8B+pBmI1i6WufuWiBhhMTwCYaKwQ0HGjKldC/v3kgYF3k+pnRQtQZdjlFrP48JI+BLn2lg0KrgU37xyDRatpTpOVD+sZ5rJlVIBYfTxgMBfdr4vQxXdXfQDwydCPl13b76XavJxEiivXvPP12IR1WD7Lpa6Smd8jroROCexwQiE8HKLaXF9uuLikgzqq2rbUNzKb3xxhMoRNNs194V44ez6oq5a2S5i9JLVmYyoGJP/hjCM7lM82mmkGIcbeFIg+V7By7VEBNLBZmWABYpSOdFv3aLPd/ckHrwhkS36wkttCiSyYUIKAKqeZwciCJqM7ibj/ZlHyUHRnXUbwLgJ+YwehJzFxotuF/9bf/7EUhHQYWVo+3+SMhg46B2nmFZW6ANWzXq06aiIoioEqd0RqiXY=
- secure: UIZsGf28/ZLxTsxrn+AVOOtrc1tBQoIP4Ym0LiaPbL40QZFdmd8EDGpCPKJGVGY673xZ1FD8AnzrpufOUhqzlVDKlH3+CE6fhqBU9ckTnvngCvx3Tr5RkwMMBPEsdugAZA/BF1KpkRboiPXvrp+3z5Mo4CliBQofh/EYZUCkIziGXUrCiJrkO30IojVonLsq9mhiL5Vd6fHeYfQczqxdbW0Xaq9nm68J6yWyva5wlLsnhiDRZPmnb3CWZUkKIDm2YM9AyZROvHW1qfNL70XyAVNLaJ6sRCT5+0A6s0OkIYbfSDB/hhlaFyw7y7sR2lBCG6RpbIaYOKVR673exonKyamuoP5XhqAZ0avXimB6Es0aGBLdXcQusJzw+x3oji7c4r+987nb0vyzuLx9KpaaeHk8PgcNeenEe//1YtRcffp2LvyCaKAflVQurVrDOTfaSmPakvFm1fBH4U4aEqjQA1lk39yqRu+7+9BsWh5yGdIAlluTI1mU9M1TTr2K4Fj3+yaqlvc2pSjrKXBuGZwcF+3kRxUzu8qiPUmEJmjrv2FBdOObLexTba1ScpW83rwqFunkyEzlUGhNvpDq6jWZ3FfTbOqSWGAS6PLYXXbA0s4j3qXgQZrBKzRi2Swf69gqy4BkQ1jspSLi8pP0p6TEodEm5BVzd+A/CsMMUzxDcwY=
Loading

0 comments on commit 983109a

Please sign in to comment.