diff options
| author | Joe George <joe@zeroc.com> | 2015-12-28 15:32:58 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-12-28 15:49:46 -0500 |
| commit | bb3f6cd8477170961e2992d18b5cbf132a69b127 (patch) | |
| tree | c0130ffd5305dfbe279059627e0d03286853d496 | |
| parent | Update JavaScript dependencies (diff) | |
| download | ice-bb3f6cd8477170961e2992d18b5cbf132a69b127.tar.bz2 ice-bb3f6cd8477170961e2992d18b5cbf132a69b127.tar.xz ice-bb3f6cd8477170961e2992d18b5cbf132a69b127.zip | |
Revert to gulp-minify-css as cssnano needs Node.js 5
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | js/gulpfile.js | 4 | ||||
| -rw-r--r-- | js/package.json | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index c86269c0332..f44f13a7526 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,9 @@ env: python: - "2.7" +before_install: +- nvm use node # This will use the latest version of Node.js + install: - git clone https://github.com/zeroc-ice/mcpp.git mcpp - make -C mcpp -j3 diff --git a/js/gulpfile.js b/js/gulpfile.js index 8570da58eaf..94ea2a58cf9 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'), - nano = require('gulp-cssnano'), + minifycss = require('gulp-minify-css'), 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(nano()) + .pipe(minifycss()) .pipe(gulp.dest("assets")) .pipe(gzip()) .pipe(gulp.dest("assets")); diff --git a/js/package.json b/js/package.json index 1166277aea4..c50d36ebc60 100644 --- a/js/package.json +++ b/js/package.json @@ -20,11 +20,11 @@ "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.2.0", "gulp-ice-builder": "^1.0.1", "gulp-jshint": "^2.0.0", + "gulp-minify-css": "^1.2.3", "gulp-newer": "^1.1.0", "gulp-open": "^1.0.0", "gulp-sourcemaps": "^1.5.2", |