diff --git a/app/index.js b/app/index.js index bd0bc8f96..662b0ebfe 100644 --- a/app/index.js +++ b/app/index.js @@ -439,7 +439,6 @@ Generator.prototype.serverFiles = function () { this.template('../../templates/express/api.js', 'lib/controllers/api.js'); this.template('../../templates/express/index.js', 'lib/controllers/index.js'); this.template('../../templates/express/config/express.js', 'lib/config/express.js'); - this.template('../../templates/express/config/middlewares/nocache.js', 'lib/config/middlewares/nocache.js'); }; Generator.prototype.mongoFiles = function () { diff --git a/templates/express/config/express.js b/templates/express/config/express.js index 3619bcb8a..2f014e696 100644 --- a/templates/express/config/express.js +++ b/templates/express/config/express.js @@ -5,9 +5,20 @@ var express = require('express'), module.exports = function(app) { var rootPath = path.normalize(__dirname + '/../..'); - + app.configure('development', function(){ 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(); + }); + app.use(express.static(path.join(rootPath, '.tmp'))); app.use(express.static(path.join(rootPath, 'app'))); app.use(express.errorHandler()); diff --git a/templates/express/server.js b/templates/express/server.js index 0de900a8d..c98b24644 100644 --- a/templates/express/server.js +++ b/templates/express/server.js @@ -27,14 +27,11 @@ require('./lib/config/express')(app); var api = require('./lib/controllers/api'), index = require('./lib/controllers'); -// Middlewares -var noCache = require('./lib/config/middlewares/nocache'); - // Server Routes app.get('/api/awesomeThings', api.awesomeThings); // Angular Routes -app.get('/partials/*', noCache, index.partials); +app.get('/partials/*', index.partials); app.get('/*', index.index); // Start server