upgrade to node.js 4 and npm 3, fix deps versions, migrate to gulp-cssnano

diff --git a/server/sonar-web/gulp/styles.js b/server/sonar-web/gulp/styles.js
index 607bae1df554d3297c5a1b7c0c40bb9838a10af0..26194a5f1c5be1c2f65f38c6dcc522b0b3b826fc 100644 (file)
--- a/server/sonar-web/gulp/styles.js
+++ b/server/sonar-web/gulp/styles.js
@@ -4,7 +4,7 @@ var gulp = require('gulp');
 var concat = require('gulp-concat');
 var gulpif = require('gulp-if');
 var less = require('gulp-less');
-var minifyCss = require('gulp-minify-css');
+var nano = require('gulp-cssnano');
 var sourcemaps = require('gulp-sourcemaps');
 var autoprefixer = require('gulp-autoprefixer');
 var plumber = require('gulp-plumber');
@@ -36,7 +36,7 @@ module.exports.styles = function (output, production, dev) {
           'IE 11'
         ]
       }))
-      .pipe(gulpif(production, minifyCss({ rebase: false })))
+      .pipe(gulpif(production, nano()))
       .pipe(concat('sonar.css'))
       .pipe(gulpif(dev, sourcemaps.write({ includeContent: true })))
       .pipe(gulp.dest(path.join(output, 'css')));

diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json
index 8d07774e928c86d4cffb7ec047321f20a92f277d..f534b133727f3cc92f9486ffdf2b62981f58c1a9 100644 (file)
--- a/server/sonar-web/package.json
+++ b/server/sonar-web/package.json
@@ -5,68 +5,68 @@
   "repository": "SonarSource/sonarqube",
   "license": "LGPL-3.0",
   "devDependencies": {
-    "babel-cli": "^6.3.17",
-    "babel-core": "^6.3.17",
+    "babel-cli": "6.3.17",
+    "babel-core": "6.3.17",
     "babel-eslint": "4.1.6",
-    "babel-loader": "^6.2.0",
-    "babel-polyfill": "^6.3.14",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-react": "^6.3.13",
-    "babel-preset-stage-0": "^6.3.13",
-    "babel-register": "^6.3.13",
+    "babel-loader": "6.2.0",
+    "babel-polyfill": "6.3.14",
+    "babel-preset-es2015": "6.3.13",
+    "babel-preset-react": "6.3.13",
+    "babel-preset-stage-0": "6.3.13",
+    "babel-register": "6.3.13",
     "backbone": "1.2.3",
     "backbone.marionette": "2.4.3",
     "blueimp-md5": "1.1.1",
     "chai": "3.3.0",
-    "classnames": "^2.2.0",
+    "classnames": "2.2.0",
     "clipboard": "1.5.5",
     "d3": "3.5.6",
     "del": "2.0.2",
-    "enzyme": "^1.2.0",
-    "eslint": "^1.10.3",
-    "eslint-plugin-import": "^0.11.0",
-    "eslint-plugin-mocha": "^1.1.0",
-    "eslint-plugin-react": "^3.11.3",
+    "enzyme": "1.2.0",
+    "eslint": "1.10.3",
+    "eslint-plugin-import": "0.11.0",
+    "eslint-plugin-mocha": "1.1.0",
+    "eslint-plugin-react": "3.11.3",
     "event-stream": "3.3.1",
-    "expose-loader": "^0.7.1",
+    "expose-loader": "0.7.1",
     "glob": "5.0.15",
     "gulp": "3.9.0",
-    "gulp-autoprefixer": "^3.1.0",
+    "gulp-autoprefixer": "3.1.0",
     "gulp-concat": "2.6.0",
+    "gulp-cssnano": "2.0.0",
     "gulp-if": "2.0.0",
     "gulp-less": "3.0.3",
-    "gulp-minify-css": "1.2.1",
     "gulp-plumber": "1.0.1",
     "gulp-rename": "1.2.2",
     "gulp-sourcemaps": "1.6.0",
     "gulp-util": "3.0.6",
-    "handlebars": "^2.0.0",
-    "handlebars-loader": "^1.1.4",
+    "handlebars": "2.0.0",
+    "handlebars-loader": "1.1.4",
     "history": "1.17.0",
-    "imports-loader": "^0.6.5",
-    "isparta": "^4.0.0",
+    "imports-loader": "0.6.5",
+    "isparta": "4.0.0",
     "jquery": "2.1.4",
     "jsdom": "6.5.1",
-    "mocha": "^2.3.4",
+    "mocha": "2.3.4",
     "moment": "2.10.6",
     "numeral": "1.5.3",
     "react": "0.14.2",
     "react-addons-test-utils": "0.14.2",
     "react-dom": "0.14.2",
-    "react-redux": "^4.0.1",
-    "react-router": "^1.0.2",
+    "react-redux": "4.0.1",
+    "react-router": "1.0.3",
     "react-select": "1.0.0-beta6",
-    "redux": "^3.0.5",
-    "redux-logger": "^2.2.1",
-    "redux-simple-router": "^1.0.1",
-    "redux-thunk": "^1.0.2",
-    "script-loader": "^0.6.1",
+    "redux": "3.0.5",
+    "redux-logger": "2.2.1",
+    "redux-simple-router": "1.0.1",
+    "redux-thunk": "1.0.2",
+    "script-loader": "0.6.1",
     "sinon": "1.15.4",
     "sinon-chai": "2.8.0",
     "underscore": "1.8.3",
     "vinyl-buffer": "1.0.0",
     "vinyl-source-stream": "1.1.0",
-    "webpack": "^1.12.9",
+    "webpack": "1.12.9",
     "whatwg-fetch": "0.10.0",
     "yargs": "3.27.0"
   },
@@ -76,5 +76,8 @@
     "test": "mocha --opts tests/mocha.opts tests",
     "coverage": "babel-node node_modules/.bin/isparta cover --root 'src/main/js' --include-all-sources --excludes '**/libs/**' --dir 'target/coverage' node_modules/.bin/_mocha -- --opts tests/mocha.opts tests",
     "lint": "eslint src/main/js"
+  },
+  "engines": {
+    "node": ">=4"
   }
 }

diff --git a/server/sonar-web/pom.xml b/server/sonar-web/pom.xml
index 74c48e44871e89c4730b0a442f9d3e6e7b4d8c2d..a8165295b7f90748fed01e911bf67c3806e5f431 100644 (file)
--- a/server/sonar-web/pom.xml
+++ b/server/sonar-web/pom.xml
@@ -102,8 +102,8 @@
             <configuration>
               <nodeDownloadRoot>https://nodejs.org/dist/</nodeDownloadRoot>
               <npmDownloadRoot>http://registry.npmjs.org/npm/-/</npmDownloadRoot>
-              <nodeVersion>v0.12.2</nodeVersion>
-              <npmVersion>2.9.1</npmVersion>
+              <nodeVersion>v4.2.4</nodeVersion>
+              <npmVersion>3.5.2</npmVersion>
             </configuration>
           </execution>
           <execution>

diff --git a/travis.sh b/travis.sh
index fcbaec38de93b276037d2c1a47068c14a6ab180f..487424f9dde12f48a7cb82815a0264e006c48607 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -71,6 +71,7 @@ MYSQL)
 WEB)
   set +eu
   source ~/.nvm/nvm.sh && nvm install 4
+  npm install -g npm@3.5.2
   cd server/sonar-web && npm install && npm test
   ;;