diff --git a/app.js b/app.js index cf07fc02c7..633ba4e461 100755 --- a/app.js +++ b/app.js @@ -9,6 +9,7 @@ var path = require('path'); var mongoose = require('mongoose'); var passport = require('passport'); var expressValidator = require('express-validator'); +var connectAssets = require('connect-assets'); /** * Load controllers. @@ -55,8 +56,8 @@ var month = (day * 30); app.set('port', process.env.PORT || 3000); app.set('views', path.join(__dirname, 'views')); app.set('view engine', 'jade'); -app.use(require('connect-assets')({ - src: 'public', +app.use(connectAssets({ + paths: ['public/css', 'public/js'], helperContext: app.locals })); app.use(express.compress()); diff --git a/package.json b/package.json index 6c65f971f8..70c14d3950 100755 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "async": "~0.2.10", "bcrypt-nodejs": "~0.0.3", "cheerio": "~0.13.1", - "connect-assets": "~2.5.4", + "connect-assets": "~3.0.0-beta1", "express": "~3.4.8", "express-flash": "~0.0.2", "express-validator": "~1.0.1", @@ -35,6 +35,8 @@ "connect-mongo": "~0.4.0", "twilio": "~1.5.0", "validator": "~3.2.1", - "crypto": "0.0.3" + "crypto": "0.0.3", + "csso": "~1.3.11", + "uglify-js": "~2.4.12" } }