diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/gulpfile.js | 20 | ||||
| -rw-r--r-- | js/package.json | 21 |
2 files changed, 21 insertions, 20 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 { diff --git a/js/package.json b/js/package.json index 83f0f87fe8c..1166277aea4 100644 --- a/js/package.json +++ b/js/package.json @@ -16,26 +16,27 @@ "main": "src/ice.js", "devDependencies": { "bower": "^1.4.1", - "del": "^1.2.0", + "del": "^2.2.0", "esprima": "^2.2.0", "gulp": "^3.9.0", "gulp-concat": "^2.5.2", + "gulp-cssnano": "^2.0.0", "gulp-ext-replace": "^0.2.0", - "gulp-gzip": "1.1.0", - "gulp-jshint": "^1.11.0", + "gulp-gzip": "1.2.0", "gulp-ice-builder": "^1.0.1", - "gulp-minify-css": "^1.1.6", - "gulp-newer": "^0.5.0", - "gulp-open": "^0.3.2", + "gulp-jshint": "^2.0.0", + "gulp-newer": "^1.1.0", + "gulp-open": "^1.0.0", "gulp-sourcemaps": "^1.5.2", - "gulp-uglify": "^1.2.0", + "gulp-uglify": "^1.5.1", "gulp-util": "^3.0.5", "gulp-watch": "^4.2.4", "hogan.js": "^3.0.2", "http-proxy": "^1.11.1", - "source-map": "^0.4.2", - "through2": "^0.6.5", - "vinyl-paths": "^1.0.0" + "jshint": "^2.8.0", + "source-map": "^0.5.3", + "through2": "^2.0.0", + "vinyl-paths": "^2.1.0" }, "scripts": { "gulp:build": "gulp", |