Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nicjansma/resourcetiming-compress…
Browse files Browse the repository at this point in the history
…ion.js into master
  • Loading branch information
nicjansma committed Aug 30, 2022
2 parents fe3254f + c404cda commit 6e4ede5
Show file tree
Hide file tree
Showing 6 changed files with 295 additions and 378 deletions.
6 changes: 4 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
language: node_js
node_js:
- "node"
- "6"
- "5"
- "4"
- "lts/*"
- "8"
- "10"
- "12"
sudo: required
addons:
chrome: stable
2 changes: 1 addition & 1 deletion dist/resourcetiming-compression.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/resourcetiming-decompression.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"));
Expand Down
Loading

0 comments on commit 6e4ede5

Please sign in to comment.