Upgrade to express 4

Author: davidbanham

lib/core/mount.js

@@ -49,7 +49,15 @@
 var _ = require('underscore'),
 	express = require('express'),
 	path = require('path'),
-	utils = require('keystone-utils');
+	utils = require('keystone-utils'),
+	favicon = require('serve-favicon'),
+	morgan = require('morgan'),
+	methodOverride = require('method-override'),
+	expressSession = require('express-session'),
+	multer = require('multer'),
+	bodyParser = require('body-parser'),
+	cookieParser = require('cookie-parser'),
+	compression = require('compression');
 
 var dashes = '\n------------------------------------------------\n';
 
@@ -97,7 +105,7 @@ function mount(mountPath, parentApp, events) {
 		sessionOptions.key = 'keystone.sid';
 	}
 
-	sessionOptions.cookieParser = express.cookieParser(this.get('cookie secret'));
+	sessionOptions.cookieParser = cookieParser(this.get('cookie secret'));
 
 	var sessionStore = this.get('session store');
 
@@ -242,11 +250,11 @@ function mount(mountPath, parentApp, events) {
 	// Serve static assets
 
 	if (this.get('compress')) {
-		app.use(express.compress());
+		app.use(compression());
 	}
 
 	if (this.get('favico')) {
-		app.use(express.favicon(this.getPath('favico')));
+		app.use(favicon(this.getPath('favico')));
 	}
 
 	if (this.get('less')) {
@@ -299,17 +307,18 @@ function mount(mountPath, parentApp, events) {
 	// Handle dynamic requests
 
 	if (this.get('logger')) {
-		app.use(express.logger(this.get('logger')));
+		app.use(morgan(this.get('logger')));
 	}
 
 	if (this.get('file limit')) {
 		app.use(express.limit(this.get('file limit')));
 	}
 
-	app.use(express.bodyParser());
-	app.use(express.methodOverride());
+	app.use(bodyParser());
+	app.use(methodOverride());
 	app.use(sessionOptions.cookieParser);
-	app.use(express.session(sessionOptions));
+	app.use(expressSession(sessionOptions));
+	app.use(multer());
 	app.use(require('connect-flash')());
 
 	if (this.get('session') === true) {
@@ -357,10 +366,6 @@ function mount(mountPath, parentApp, events) {
 		}
 	});
 
-	// Route requests
-	
-	app.use(app.router);
-	
 	// Headless mode means don't bind the Keystone routes
 
 	if (!this.get('headless')) {

lib/core/start.js

@@ -43,9 +43,7 @@
  * @api public
  */
 
-var fs = require('fs'),
-	http = require('http'),
-	https = require('https');
+var fs = require('fs');
 
 var dashes = '\n------------------------------------------------\n';
 
@@ -99,13 +97,13 @@ function start(events) {
 		// http://nodejs.org/api/http.html#http_server_listen_port_hostname_backlog_callback
 		// and for history, see https://github.com/JedWatson/keystone/issues/154
 
-		keystone.httpServer = http.createServer(app);
-		events.onHttpServerCreated && events.onHttpServerCreated();
-		
 		var host = keystone.get('host'),
 			port = keystone.get('port'),
 			listen = keystone.get('listen'),
 			ssl = keystone.get('ssl');
+
+		keystone.httpServer = app.listen(port || 3000);
+		events.onHttpServerCreated && events.onHttpServerCreated();
 
 		// start the http server unless we're in ssl-only mode
 

package.json

@@ -15,7 +15,7 @@
     "connect-flash": "~0.1.1",
     "csv": "~0.3.7",
     "embedly": "~1.0.2",
-    "express": "~3.3.8",
+    "express": "~4.8.5",
     "jade": "~1.5.0",
     "keystone-utils": "~0.1.10",
     "knox": "~0.9.0",
@@ -28,7 +28,16 @@
     "queryfilter": "~0.0.4",
     "range_check": "~0.0.4",
     "semver": "~3.0.1",
-    "underscore": "~1.6.0"
+    "underscore": "~1.6.0",
+    "serve-favicon": "~2.0.1",
+    "morgan": "~1.2.3",
+    "method-override": "~2.1.3",
+    "body-parser": "~1.6.5",
+    "errorhandler": "~1.1.1",
+    "express-session": "~1.7.6",
+    "multer": "~0.1.4",
+    "cookie-parser": "~1.3.2",
+    "compression": "~1.0.11"
   },
   "devDependencies": {
     "browserify": "^5.9.1",

test/helpers/getExpressApp.js

@@ -1,5 +1,7 @@
 var keystone = require('../../index.js'),
-	mongoose = require('./getMongooseConnection.js');
+	mongoose = require('./getMongooseConnection.js'),
+	methodOverride = require('method-override'),
+	bodyParser = require('body-parser');
 
 function getExpressApp() {
 	var app;
@@ -8,10 +10,10 @@ function getExpressApp() {
 	keystone.connect(mongoose);
 	app = keystone.express();
 
-	app.use(keystone.express.bodyParser());
-	app.use(keystone.express.methodOverride());
+	app.use(bodyParser());
+	app.use(methodOverride());
 
 	return app;
 }
 
-module.exports = getExpressApp;
+module.exports = getExpressApp;

test/lib/view_test.js

@@ -1,11 +1,13 @@
 var demand = require('must'),
 	request = require('supertest'),
+	methodOverride = require('method-override'),
+	bodyParser = require('body-parser'),
 	keystone = require('../../index.js');
 
 var getApp = function() {
 	var app = keystone.express();
-	app.use(keystone.express.bodyParser());
-	app.use(keystone.express.methodOverride());
+	app.use(bodyParser());
+	app.use(methodOverride());
 	return app;
 }