Merge branch 'dev'

rwu823 · Jan 28, 2017 · d6f0fab · d6f0fab
2 parents 806c74e + b87b255
commit d6f0fab
Show file tree

Hide file tree

Showing 16 changed files with 5,237 additions and 8,616 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,18 +1,20 @@
 {
   "presets": [
-    "es2015",
-    "stage-0",
-    "react"
-  ],
-  "plugins": [
-    "transform-strict-mode"
+    ["env", {
+      "modules": false
+    }],
+    "stage-2",
+    "react",
   ],
   "env": {
-    "production": {
-      "plugins": [
-        "transform-react-constant-elements",
-        "transform-react-inline-elements"
+    "test": {
+      "presets": [
+        "env",
+        "stage-2",
+        "react"
       ]
     }
-  }
+  },
+  "plugins": [
+  ]
 }
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@ coverage
 npm-debug.log
 /dist
 /.nyc_output
+/npm
+/gh-pages
diff --git a/.npmignore b/.npmignore
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,17 @@
 language: node_js
 
 node_js:
-  - v4
-  - v5
-  - v6
+  - v7
 
-before_install:
-  - npm install -g npm
+env:
+  global:
+  matrix:
+    - TRAVIS_MATRIX=test
+    - TRAVIS_MATRIX=build
+    - TRAVIS_MATRIX=build.demo
+
+script:
+  - npm run $TRAVIS_MATRIX
 
 after_success:
-  - npm run coveralls
+  - node scripts/deploy