Skip to content

Commit

Permalink
Merge pull request #434 from Martii/restoreExpressMinify
Browse files Browse the repository at this point in the history
Restore broken *express-minify* ability to minify everything

Auto-merge
  • Loading branch information
Martii committed Nov 21, 2014
2 parents b02d1f8 + 899eafd commit baa8cd5
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ var compression = require('compression');
var cookieParser = require('cookie-parser');
var favicon = require('serve-favicon');

var minify = null;
try {
minify = require('express-minify');
} catch (e) {}

var session = require('express-session');
var MongoStore = require('connect-mongo')(session);
var mongoose = require('mongoose');
Expand Down Expand Up @@ -93,12 +98,8 @@ app.set('views', __dirname + '/views');

// Setup minification
// Order is important here as Ace will fail with an invalid content encoding issue
if (isPro) {
app.use(require('express-minify')());
} else if (isDev) {
try {
app.use(require('express-minify')());
} catch (e) {}
if (minify && isPro || isDev) {

This comment has been minimized.

Copy link
@jerone

jerone Nov 21, 2014

Contributor

You probably want to put Brackets around the environment checks:

if (minify && (isPro || isDev)) {

This comment has been minimized.

Copy link
@Martii

Martii Nov 21, 2014

Author Member

Thank you... was late.

app.use(minify());
}

// Routes
Expand Down

0 comments on commit baa8cd5

Please sign in to comment.