diff options
| author | Joe George <joe@zeroc.com> | 2015-12-28 13:18:17 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-12-28 14:49:33 -0500 |
| commit | cc6798286e66470f4cc9df0e474cd5f569e096f7 (patch) | |
| tree | c1f496ac0f27eb749f41cb2fb679ba31a7ef2d05 /js/gulpfile.js | |
| parent | Object factory registration fix for VS 2015 (diff) | |
| download | ice-cc6798286e66470f4cc9df0e474cd5f569e096f7.tar.bz2 ice-cc6798286e66470f4cc9df0e474cd5f569e096f7.tar.xz ice-cc6798286e66470f4cc9df0e474cd5f569e096f7.zip | |
Update JavaScript dependencies
Diffstat (limited to 'js/gulpfile.js')
| -rw-r--r-- | js/gulpfile.js | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/js/gulpfile.js b/js/gulpfile.js index 714efec8747..8570da58eaf 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -17,7 +17,7 @@ var bower = require("bower"), gzip = require('gulp-gzip'), iceBuilder = require('gulp-ice-builder'), jshint = require('gulp-jshint'), - minifycss = require('gulp-minify-css'), + nano = require('gulp-cssnano'), newer = require('gulp-newer'), open = require("gulp-open"), path = require('path'), @@ -142,7 +142,7 @@ gulp.task("common:css", ["bower"], return gulp.src(common.styles) .pipe(newer("assets/common.css")) .pipe(concat("common.css")) - .pipe(minifycss()) + .pipe(nano()) .pipe(gulp.dest("assets")) .pipe(gzip()) .pipe(gulp.dest("assets")); @@ -346,15 +346,15 @@ gulp.task("watch", ["test:watch"].concat(useBinDist ? [] : ["dist:watch"])); gulp.task("test:run-with-browser", ["watch"].concat(useBinDist ? ["test"] : ["build"]), function(){ require("./bin/HttpServer")(); - var cmd = ["../scripts/TestController.py"] - cmd = cmd.concat(process.argv.slice(3)) + var cmd = ["../scripts/TestController.py"]; + cmd = cmd.concat(process.argv.slice(3)); var p = require("child_process").spawn("python", cmd, {stdio: "inherit"}); p.on("error", function(err) { if(err.message == "spawn python ENOENT") { - console.log("Error: python is required in PATH to run tests") - process.exit(1) + console.log("Error: python is required in PATH to run tests"); + process.exit(1); } else { @@ -370,8 +370,8 @@ gulp.task("test:run-with-browser", ["watch"].concat(useBinDist ? ["test"] : ["bu { p.kill(); }); - return gulp.src("./test/Common/index.html") - .pipe(open("", {url: "http://127.0.0.1:8080/test/Ice/acm/index.html"})); + return gulp.src("") + .pipe(open({uri: "http://127.0.0.1:8080/test/Ice/acm/index.html"})); }); gulp.task("test:run-with-node", (useBinDist ? ["test"] : ["build"]), @@ -381,8 +381,8 @@ gulp.task("test:run-with-node", (useBinDist ? ["test"] : ["build"]), { if(err.message == "spawn python ENOENT") { - console.log("Error: python is required in PATH to run tests") - process.exit(1) + console.log("Error: python is required in PATH to run tests"); + process.exit(1); } else { |