From c4f243f4b09fe8559a884723545add3a6c906b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= Date: Tue, 16 Jan 2018 20:16:03 -0600 Subject: [PATCH] Large dependencies update (#257) * Massive dependecy update --- .travis.yml | 3 +- Gruntfile.js | 2 +- lib/server/controllers/frontController.js | 4 +- package.json | 84 ++++++++++++----------- 4 files changed, 48 insertions(+), 45 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3027b9..7b0d53b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: node_js sudo: false node_js: + - "8.9" - "6.2" - - "4.0" + - "4.7" env: - CXX=g++-4.8 addons: diff --git a/Gruntfile.js b/Gruntfile.js index 3d9a755..313447f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -143,7 +143,7 @@ module.exports = function(grunt) { options: { reporter: 'spec', }, - src: ['test/core/fontAnalyzerTest.js'] + src: ['test/core/contentTypeCheckerTest.js'] }, coverage: { options: { diff --git a/lib/server/controllers/frontController.js b/lib/server/controllers/frontController.js index 0fd4c6a..f193a29 100644 --- a/lib/server/controllers/frontController.js +++ b/lib/server/controllers/frontController.js @@ -14,7 +14,7 @@ var FrontController = function(app) { app.get(route, function(req, res) { res.setHeader('Cache-Control', 'public, max-age=20'); res.render(path.join(__dirname, assetsPath, 'main.html'), { - baseUrl: app.locals.baseUrl + baseUrl: app.locals.baseUrl || '/' }); }); }); @@ -23,7 +23,7 @@ var FrontController = function(app) { app.get('/views/:viewName', function(req, res) { res.setHeader('Cache-Control', 'public, max-age=' + cacheDuration); res.render(path.join(__dirname, assetsPath, 'views/' + req.params.viewName), { - baseUrl: app.locals.baseUrl + baseUrl: app.locals.baseUrl || '/' }); }); diff --git a/package.json b/package.json index 52bb7ae..22494bb 100644 --- a/package.json +++ b/package.json @@ -20,37 +20,37 @@ }, "main": "./lib/index.js", "dependencies": { - "angular": "1.6.1", - "angular-animate": "1.6.1", + "angular": "1.6.8", + "angular-animate": "1.6.8", "angular-chart.js": "1.1.1", - "angular-local-storage": "0.5.0", - "angular-resource": "1.6.1", - "angular-route": "1.6.1", - "angular-sanitize": "1.6.1", - "async": "1.5.2", - "body-parser": "1.15.2", - "chart.js": "2.4.0", - "clean-css": "3.4.23", - "color-diff": "1.0.0", - "compression": "1.6.2", - "cors": "2.8.1", + "angular-local-storage": "0.7.1", + "angular-resource": "1.6.8", + "angular-route": "1.6.8", + "angular-sanitize": "1.6.8", + "async": "2.6.0", + "body-parser": "1.18.2", + "chart.js": "2.7.1", + "clean-css": "4.1.9", + "color-diff": "1.1.0", + "compression": "1.7.1", + "cors": "2.8.4", "css-mq-parser": "0.0.3", - "debug": "2.6.0", + "debug": "3.1.0", "easyxml": "2.0.1", - "ejs": "2.5.5", - "express": "4.14.0", - "fontkit": "1.5.1", - "imagemin": "5.2.2", - "imagemin-jpegoptim": "5.0.0", + "ejs": "2.5.7", + "express": "4.16.2", + "fontkit": "1.7.7", + "imagemin": "5.3.1", + "imagemin-jpegoptim": "5.2.0", "imagemin-jpegtran": "5.0.2", "imagemin-optipng": "5.2.1", - "imagemin-svgo": "5.2.0", + "imagemin-svgo": "6.0.0", "is-eot": "1.0.0", "is-gif": "1.0.0", - "is-http2": "1.1.0", + "is-http2": "1.2.0", "is-jpg": "1.0.0", "is-otf": "0.1.2", - "is-png": "1.0.0", + "is-png": "1.1.0", "is-svg": "2.1.0", "is-ttf": "0.2.2", "is-woff": "1.0.3", @@ -58,42 +58,44 @@ "lwip": "0.0.9", "md5": "2.2.1", "meow": "3.7.0", - "minimize": "2.0.0", + "minimize": "2.1.0", "parse-color": "1.0.0", "phantomas": "1.19.0", - "ps-node": "0.1.4", - "q": "1.4.1", - "request": "2.79.0", - "rimraf": "2.5.4", + "ps-node": "0.1.6", + "q": "1.5.1", + "request": "2.83.0", + "rimraf": "2.6.2", "temporary": "0.0.8", - "try-thread-sleep": "1.0.0", - "uglify-js": "2.7.5" + "try-thread-sleep": "1.0.2", + "uglify-js": "2.8.29" }, "devDependencies": { - "chai": "~3.5.0", + "chai": "~4.1.2", "grunt": "~1.0.1", "grunt-blanket": "~0.0.10", - "grunt-contrib-clean": "~1.0.0", + "grunt-contrib-clean": "~1.1.0", "grunt-contrib-concat": "~1.0.1", "grunt-contrib-copy": "~1.0.0", - "grunt-contrib-cssmin": "~1.0.2", - "grunt-contrib-htmlmin": "~2.0.0", + "grunt-contrib-cssmin": "~2.2.1", + "grunt-contrib-htmlmin": "~2.4.0", "grunt-contrib-jshint": "~1.1.0", - "grunt-contrib-less": "~1.4.0", - "grunt-contrib-uglify": "~2.0.0", + "grunt-contrib-less": "~1.4.1", + "grunt-contrib-uglify": "~3.3.0", + "grunt-contrib-watch": "~1.0.0", "grunt-env": "~0.4.4", "grunt-express": "~1.4.1", "grunt-filerev": "~2.3.1", "grunt-inline-angular-templates": "~0.1.5", "grunt-line-remover": "~0.0.2", - "grunt-mocha-test": "~0.13.2", + "grunt-mocha-test": "~0.13.3", + "grunt-parallel": "~0.5.1", "grunt-replace": "~1.0.1", "grunt-usemin": "~3.1.1", - "grunt-webfont": "~1.4.0", - "matchdep": "~1.0.1", - "mocha": "~3.2.0", - "sinon": "~1.17.4", - "sinon-chai": "~2.8.0" + "grunt-webfont": "~1.6.0", + "matchdep": "~2.0.0", + "mocha": "~4.1.0", + "sinon": "~4.1.6", + "sinon-chai": "~2.14.0" }, "scripts": { "test": "grunt test"