Merge pull request #189 from james-ff/master

Updated to React 16
onefinestay · Apr 16, 2018 · 075f8ea · 075f8ea
2 parents 2f4a6d0 + c01a254
commit 075f8ea
Show file tree

Hide file tree

Showing 13 changed files with 672 additions and 711 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -89,7 +89,7 @@
     "no-loop-func": 2,
     "no-mixed-requires": [1, true],
     "no-mixed-spaces-and-tabs": [2, false],
-    "no-multi-spaces": [2, { exceptions: { "VariableDeclarator": true } }],
+    "no-multi-spaces": [2, { "exceptions": { "VariableDeclarator": true } }],
     "no-multi-str": 2,
     "no-multiple-empty-lines": [0, {"max": 2}],
     "no-native-reassign": 2,
@@ -141,7 +141,7 @@
     "block-scoped-var": 0,
     "brace-style": [0, "1tbs"],
     "camelcase": 2,
-    "comma-dangle": [2, always-multiline],
+    "comma-dangle": [2, "always-multiline"],
     "comma-spacing": 2,
     "comma-style": 0,
     "complexity": [0, 11],

diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ example/css/*.css
 dist/ui-coverage/
 npm-debug.log
 .publish
+.vscode