Skip to content

Commit 4014f5c

Browse files
authored
Update dependencies to build again (#268)
1 parent 94b6006 commit 4014f5c

File tree

2 files changed

+25
-39
lines changed

2 files changed

+25
-39
lines changed

gulpfile.js

+16-30
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ var webpack = require("webpack-stream"),
3232
karma = require("karma"),
3333
mocha = require("gulp-mocha"),
3434
istanbul = require("gulp-istanbul"),
35-
del = require("del"),
36-
runSequence = require("run-sequence");
35+
del = require("del");
3736

3837
var clone = lodash.clone;
3938
var merge = lodash.merge;
@@ -114,11 +113,7 @@ gulp.task("test:nodejs:single", function() {
114113
return doTestsNodejs();
115114
});
116115

117-
gulp.task("test:nodejs", function(cb) {
118-
runSequence("test:lint",
119-
"test:nodejs:single",
120-
cb);
121-
});
116+
gulp.task("test:nodejs", gulp.series("test:lint", "test:nodejs:single"));
122117

123118
// ### BROWSER TASKS ###
124119
function doBrowserify(suffix, plugins) {
@@ -164,7 +159,7 @@ var KARMA_CONFIG = {
164159
},
165160
webpack: {
166161
mode: "development",
167-
devtool: "inline-source-map"
162+
devtool: ("true" === process.env.TRAVIS) ? false : "inline-source-map"
168163
},
169164
webpackMiddleware: {
170165
noInfo: true
@@ -267,11 +262,8 @@ gulp.task("test:browser:watch", function(done) {
267262
server.start();
268263
});
269264

270-
gulp.task("test:browser", function(cb) {
271-
runSequence("test:lint",
272-
"test:browser:single",
273-
cb);
274-
});
265+
gulp.task("test:browser", gulp.series("test:lint",
266+
"test:browser:single"));
275267

276268
// ## TRAVIS-CI TASKS ###
277269
gulp.task("travis:browser", function(cb) {
@@ -295,30 +287,24 @@ gulp.task("travis:browser", function(cb) {
295287
ARGV.sauce = false;
296288
ARGV.browsers="Firefox";
297289
}
298-
299-
runSequence("test:browser", cb);
290+
gulp.series("test:browser")(cb());
300291
});
301292

302293
// ### MAIN TASKS ###
303-
gulp.task("test", function(cb) {
304-
runSequence("test:lint",
294+
gulp.task("test", gulp.series("test:lint",
305295
"test:browser:single",
306-
"test:nodejs:single",
307-
cb);
308-
});
309-
gulp.task("clean", ["clean:coverage", "clean:dist"]);
310-
gulp.task("dist", function(cb) {
311-
runSequence("clean:dist",
296+
"test:nodejs:single"));
297+
gulp.task("clean", gulp.parallel("clean:coverage", "clean:dist"));
298+
gulp.task("dist", gulp.series("clean:dist",
312299
"test:lint",
313300
"test:browser",
314-
["bundle", "minify"],
315-
cb);
316-
});
301+
gulp.parallel("bundle", "minify"))
302+
);
317303

318304
// ### MAIN WATCHERS ###
319-
gulp.task("watch:test", ["test"], function() {
320-
return gulp.watch([SOURCES, TESTS], ["test:nodejs", "test:browser"]);
321-
});
305+
gulp.task("watch:test", gulp.series("test", function() {
306+
return gulp.watch([SOURCES, TESTS], gulp.series("test:nodejs", "test:browser"));
307+
}));
322308

323309
// ### DEFAULT ###
324-
gulp.task("default", ["test"]);
310+
gulp.task("default", gulp.series("test"));

package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
},
3232
"dependencies": {
3333
"base64url": "^3.0.1",
34-
"es6-promise": "^4.2.6",
35-
"lodash": "^4.17.11",
34+
"es6-promise": "^4.2.8",
35+
"lodash": "^4.17.15",
3636
"long": "^4.0.0",
37-
"node-forge": "^0.8.1",
38-
"uuid": "^3.3.2"
37+
"node-forge": "^0.8.5",
38+
"uuid": "^3.3.3"
3939
},
4040
"devDependencies": {
4141
"bowser": "^1.9.3",
@@ -44,12 +44,12 @@
4444
"conventional-changelog": "^1.1.0",
4545
"del": "^3.0.0",
4646
"eslint-plugin-mocha-no-only": "0.0.6",
47-
"gulp": "^3.8.10",
47+
"gulp": "^4.0.2",
4848
"gulp-eslint": "^4.0.1",
4949
"gulp-istanbul": "^1.1.1",
5050
"gulp-mocha": "^5.0.0",
5151
"gulp-rename": "^1.2.0",
52-
"gulp-uglify": "^3.0.0",
52+
"gulp-uglify": "^3.0.2",
5353
"gulp-util": "^3.0.7",
5454
"is-safari": "^1.0.0",
5555
"istanbul": "^0.4.0",
@@ -58,7 +58,7 @@
5858
"karma": "^2.0.0",
5959
"karma-chrome-launcher": "^2.0.0",
6060
"karma-coverage": "^1.1.1",
61-
"karma-firefox-launcher": "^1.0.1",
61+
"karma-firefox-launcher": "^1.2.0",
6262
"karma-ie-launcher": "^1.0.0",
6363
"karma-mocha": "^1.3.0",
6464
"karma-mocha-reporter": "^2.0.0",
@@ -68,8 +68,8 @@
6868
"karma-webpack": "^3.0.0",
6969
"mocha": "^5.0.0",
7070
"run-sequence": "^2.0.0",
71-
"watchify": "^3.7.0",
72-
"webpack": "^4.8.3",
71+
"watchify": "^3.11.1",
72+
"webpack": "^4.39.3",
7373
"webpack-stream": "^4.0.0",
7474
"yargs": "^11.1.0"
7575
}

0 commit comments

Comments
 (0)