Fixed issues with Express 4.0 integration

Author: DaftMonk

templates/common/_package.json

@@ -12,7 +12,7 @@
     "errorhandler": "~1.0.0",
     "lodash": "~2.4.1"<% if (mongo) { %>,
     "mongoose": "~3.8.8"<% } %><% if (mongoPassportUser) { %>,
-    "connect-mongo": "~0.4.0",
+    "connect-mongo": "mrzepinski/connect-mongo#2135988",
     "passport": "~0.2.0",
     "passport-local": "~0.1.6"<% } %><% if (jade) { %>,
     "jade": "~1.2.0"<% } %><% if (!jade) { %>,

templates/express/config/express.js

@@ -3,6 +3,7 @@
 var express = require('express'),
     favicon = require('static-favicon'),
     morgan = require('morgan'),
+    compression = require('compression'),
     bodyParser = require('body-parser'),
     methodOverride = require('method-override'),
     cookieParser = require('cookie-parser'),
@@ -17,59 +18,60 @@ var express = require('express'),
  * Express configuration
  */
 module.exports = function(app) {
-    var env = app.get('env');
+  var env = app.get('env');
 
-    if ('development' === env) {
-        app.use(require('connect-livereload')());
+  if ('development' === env) {
+    app.use(require('connect-livereload')());
 
-        // Disable caching of scripts for easier testing
-        app.use(function noCache(req, res, next) {
-            if (req.url.indexOf('/scripts/') === 0) {
-                res.header('Cache-Control', 'no-cache, no-store, must-revalidate');
-                res.header('Pragma', 'no-cache');
-                res.header('Expires', 0);
-            }
-            next();
-        });
+    // Disable caching of scripts for easier testing
+    app.use(function noCache(req, res, next) {
+      if (req.url.indexOf('/scripts/') === 0) {
+        res.header('Cache-Control', 'no-cache, no-store, must-revalidate');
+        res.header('Pragma', 'no-cache');
+        res.header('Expires', 0);
+      }
+      next();
+    });
 
-        app.use(express.static(path.join(config.root, '.tmp')));
-        app.use(express.static(path.join(config.root, 'app')));
-        app.set('views', config.root + '/app/views');
-    }
+    app.use(express.static(path.join(config.root, '.tmp')));
+    app.use(express.static(path.join(config.root, 'app')));
+    app.set('views', config.root + '/app/views');
+  }
 
-    if ('production' === env) {
-        app.use(favicon(path.join(config.root, 'public', 'favicon.ico')));
-        app.use(express.static(path.join(config.root, 'public')));
-        app.set('views', config.root + '/views');
-    }
+  if ('production' === env) {
+    app.use(compression());
+    app.use(favicon(path.join(config.root, 'public', 'favicon.ico')));
+    app.use(express.static(path.join(config.root, 'public')));
+    app.set('views', config.root + '/views');
+  }
 
-    <% if (!jade) { %>
-    app.engine('html', require('ejs').renderFile);
-    app.set('view engine', 'html');<% } %><% if (jade) { %>
-    app.set('view engine', 'jade');<% } %>
-    app.use(morgan('dev'));
-    app.use(bodyParser());
-    app.use(methodOverride());<% if(mongoPassportUser) { %>
-    app.use(cookieParser());
+  <% if (!jade) { %>
+  app.engine('html', require('ejs').renderFile);
+  app.set('view engine', 'html');<% } %><% if (jade) { %>
+  app.set('view engine', 'jade');<% } %>
+  app.use(morgan('dev'));
+  app.use(bodyParser());
+  app.use(methodOverride());<% if(mongoPassportUser) { %>
+  app.use(cookieParser());
 
-    // Persist sessions with mongoStore
-    app.use(session({
-        secret: 'angular-fullstack secret',
-        store: new mongoStore({
-            url: config.mongo.uri,
-            collection: 'sessions'
-        }, function () {
-            console.log('db connection open');
-        })
-    }));
+  // Persist sessions with mongoStore
+  app.use(session({
+    secret: 'angular-fullstack secret',
+    store: new mongoStore({
+      url: config.mongo.uri,
+      collection: 'sessions'
+    }, function () {
+      console.log('db connection open');
+    })
+  }));
 
-    // Use passport session
-    app.use(passport.initialize());
-    app.use(passport.session());
-    <% } %>
+  // Use passport session
+  app.use(passport.initialize());
+  app.use(passport.session());
+  <% } %>
 
-    // Error handler - has to be last
-    if ('development' === app.get('env')) {
-        app.use(errorHandler())
-    }
+  // Error handler - has to be last
+  if ('development' === app.get('env')) {
+    app.use(errorHandler());
+  }
 };

templates/express/routes.js

@@ -3,9 +3,8 @@
 var api = require('./controllers/api'),
     index = require('./controllers')<% if(mongoPassportUser) { %>,
     users = require('./controllers/users'),
-    session = require('./controllers/session');
-
-var middleware = require('./middleware')<% } %>;
+    session = require('./controllers/session'),
+    middleware = require('./middleware')<% } %>;
 
 /**
  * Application routes
@@ -17,15 +16,15 @@ module.exports = function(app) {
     .get(api.awesomeThings);
   <% if(mongoPassportUser) { %>
   app.route('/api/users')
-    .post(users.create),
+    .post(users.create)
     .put(users.changePassword);
   app.route('/api/users/me')
     .get(users.me);
   app.route('/api/users/:id')
     .get(users.show);
 
   app.route('/api/session')
-    .post(session.login),
+    .post(session.login)
     .delete(session.logout);<% } %>
 
   // All undefined api routes should return a 404

templates/express/server.js

@@ -12,10 +12,7 @@ var express = require('express')<% if (mongo) { %>,
 // Set default node environment to development
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-// Application Config
 var config = require('./lib/config/config');<% if (mongo) { %>
-
-// Connect to database
 var db = mongoose.connect(config.mongo.uri, config.mongo.options);
 
 // Bootstrap models
@@ -28,16 +25,13 @@ fs.readdirSync(modelsPath).forEach(function (file) {
 
 // Populate empty DB with sample data
 require('./lib/config/dummydata');<% } %><% if(mongoPassportUser) { %>
-  
+
 // Passport Configuration
 var passport = require('./lib/config/passport');<% } %>
 
+// Setup Express
 var app = express();
-
-// Express settings
 require('./lib/config/express')(app);
-
-// Routing
 require('./lib/routes')(app);
 
 // Start server