bump dependencies

selaux · May 5, 2014 · 91403fb · 91403fb
1 parent 4c50309
commit 91403fb
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 62 deletions.
diff --git a/frontend/webinterface.js b/frontend/webinterface.js
@@ -1,6 +1,9 @@
 'use strict';
 
 var express = require('express'),
+    favicon = require('serve-favicon'),
+    compression = require('compression'),
+    errorHandler = require('errorhandler'),
     exphbs  = require('express3-handlebars'),
     stylus = require('stylus'),
     routes = require('./routes'),
@@ -22,43 +25,34 @@ module.exports = Module.extend({
         var self = this,
             webinterface = express();
 
-        webinterface.configure(function () {
-            webinterface.set('port', self.config.port);
-
-            webinterface.set('views', path.join(__dirname, '/views'));
-            webinterface.engine('hbs', exphbs({
-                layoutsDir: path.join(__dirname, '/views/layouts/'),
-                partialsDir: path.join(__dirname, '/views/partials/'),
-                defaultLayout: 'main',
-                extname: '.hbs'
-            }));
-            webinterface.set('view engine', 'hbs');
-
-            webinterface.set('config', self.config);
-            webinterface.set('app', self.app);
-
-            webinterface.use(express.favicon(path.join(__dirname, '../build/public/images/favicon.ico')));
-            webinterface.use(express.logger('dev'));
-            webinterface.use(express.bodyParser());
-            webinterface.use(express.methodOverride());
-            webinterface.use(express.compress());
-            webinterface.use(webinterface.router);
-
-            webinterface.use(stylus.middleware({
-                src: __dirname,
-                dest: path.join(__dirname, '../build/public'),
-                compile: function (str, path) {
-                    return stylus(str)
-                        .set('filename', path)
-                        .set('include css', true);
-                }
-            }));
-            webinterface.use(express.static(path.join(__dirname, '../build/public')));
-        });
-
-        webinterface.configure('development', function(){
-            webinterface.use(express.errorHandler());
-        });
+        webinterface.set('port', self.config.port);
+
+        webinterface.set('views', path.join(__dirname, '/views'));
+        webinterface.engine('hbs', exphbs({
+            layoutsDir: path.join(__dirname, '/views/layouts/'),
+            partialsDir: path.join(__dirname, '/views/partials/'),
+            defaultLayout: 'main',
+            extname: '.hbs'
+        }));
+        webinterface.set('view engine', 'hbs');
+
+        webinterface.set('config', self.config);
+        webinterface.set('app', self.app);
+
+        webinterface.use(favicon(path.join(__dirname, '../build/public/images/favicon.ico')));
+        webinterface.use(compression());
+        webinterface.use(errorHandler());
+
+        webinterface.use(stylus.middleware({
+            src: __dirname,
+            dest: path.join(__dirname, '../build/public'),
+            compile: function (str, path) {
+                return stylus(str)
+                    .set('filename', path)
+                    .set('include css', true);
+            }
+        }));
+        webinterface.use(express.static(path.join(__dirname, '../build/public')));
 
         routes(webinterface);
 

diff --git a/package.json b/package.json
@@ -24,37 +24,40 @@
         "miner-dashboard": "app.js"
     },
     "dependencies": {
-        "async": "0.2.9",
+        "async": "0.8.0",
         "backbone": "1.1.2",
-        "jquery": "2.1.0",
-        "cheerio": "0.13.1",
-        "express": "3.4.8",
-        "express3-handlebars": "0.5.0",
+        "cheerio": "0.15.0",
+        "compression": "1.0.2",
+        "errorhandler": "1.0.1",
         "eventemitter2": "0.4.13",
-        "stylus": "0.42.3",
-        "lodash": "2.1.0",
-        "request": "2.27.0",
-        "socket.io": "0.9.16",
-        "grunt": "0.4.2",
-        "grunt-cli": "0.1.9",
+        "express": "4.1.1",
+        "express3-handlebars": "0.5.0",
+        "grunt": "0.4.4",
+        "grunt-browserify": "2.0.8",
+        "grunt-cli": "0.1.13",
         "grunt-contrib-copy": "0.5.0",
-        "grunt-contrib-handlebars": "0.7.0",
-        "grunt-browserify": "2.0.1",
-        "handlebars": "1.0.12",
-        "nodemailer": "0.5.3",
-        "numeral": "1.5.2",
-        "timespan": "2.3.0",
-        "moment": "2.4.0",
+        "grunt-contrib-handlebars": "0.8.0",
+        "handlebars": "1.3.0",
+        "jquery": "2.1.1",
+        "lodash": "2.4.1",
+        "moment": "2.6.0",
+        "nodemailer": "0.6.3",
         "nomnom": "1.6.2",
-        "rickshaw": "1.4.6"
+        "numeral": "1.5.3",
+        "request": "2.34.0",
+        "rickshaw": "1.4.6",
+        "serve-favicon": "2.0.0",
+        "socket.io": "0.9.16",
+        "stylus": "0.44.0",
+        "timespan": "2.3.0"
     },
     "devDependencies": {
-        "grunt-contrib-jshint": "0.6.3",
-        "grunt-mocha-test": "0.7.0",
-        "chai": "1.8.0",
-        "sinon": "1.7.3",
-        "sinon-chai": "2.4.0",
-        "sandboxed-module": "0.2.2"
+        "grunt-contrib-jshint": "0.10.0",
+        "grunt-mocha-test": "0.10.2",
+        "chai": "1.9.1",
+        "sinon": "1.9.1",
+        "sinon-chai": "2.5.0",
+        "sandboxed-module": "0.3.0"
     },
     "license": "MIT",
     "engines": {