Merge branch 'master' of github.com:nicjansma/resourcetiming-compress…

…ion.js into master
nicjansma · Aug 30, 2022 · 6e4ede5 · 6e4ede5
2 parents fe3254f + c404cda
commit 6e4ede5
Show file tree

Hide file tree

Showing 6 changed files with 295 additions and 378 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -11,6 +11,8 @@
         //
 
         // disabled for use of _jQuery
-        "no-underscore-dangle": 0
+        "no-underscore-dangle": 0,
+        "no-prototype-builtins": 0,
+        "no-control-regex": 0
     }
-}
+}
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: node_js
 node_js:
   - "node"
-  - "6"
-  - "5"
-  - "4"
+  - "lts/*"
+  - "8"
+  - "10"
+  - "12"
 sudo: required
 addons:
   chrome: stable
diff --git a/dist/resourcetiming-compression.min.js b/dist/resourcetiming-compression.min.js
diff --git a/dist/resourcetiming-decompression.min.js b/dist/resourcetiming-decompression.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -41,7 +41,7 @@
             .pipe(mocha());
     });
 
-    gulp.task("mocha-tap", function() {
+    gulp.task("mocha-tap", gulp.series("mocha", function() {
         return gulp.src("test/test-*.js",
             {
                 read: false
@@ -50,14 +50,14 @@
                 reporter: "tap",
                 output: "./test/mocha.tap"
             }));
-    });
+    }));
 
-    gulp.task("karma", function(done) {
+    gulp.task("karma", gulp.series("mocha", "mocha-tap", function(done) {
         new Server({
             configFile: path.join(__dirname, "karma.config.js"),
             singleRun: true
         }, done).start();
-    });
+    }));
 
     gulp.task("test", gulp.series("mocha", "mocha-tap", "karma"));
     gulp.task("default", gulp.series("lint", "lint:build", "compress", "test"));