Merge branch 'master' into master

assaf · Apr 29, 2018 · 5d7e872 · 5d7e872
2 parents c661457 + ec46759
commit 5d7e872
Show file tree

Hide file tree

Showing 20 changed files with 3,677 additions and 3,917 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,10 @@
 {
-  "stage":    0,
-  "optional": [ "runtime" ]
+  "presets": [
+    [ "env", {
+      "targets": {
+        "node": "8.6"
+      }
+    }]
+  ],
+  "plugins": [ "transform-runtime" ]
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 node_js:
   - 8
-  - 9
+  - 10
 env:
   - DEBUG=zombie
 notifications:

diff --git a/Gulpfile.js b/Gulpfile.js
@@ -16,7 +16,7 @@ gulp.task('default', ['watch']);
 
 // gulp lint -> errors if code dirty
 gulp.task('lint', function () {
-  return gulp.src([ 'js/**/*.js', 'test/*.js' ])
+  return gulp.src([ 'src/**/*.js', 'test/*.js' ])
     .pipe(eslint())
     .pipe(eslint.formatEach())
     .pipe(eslint.failOnError());