From d85a5011aaaf58a9372175936481b404f62ff7ca Mon Sep 17 00:00:00 2001 From: putskoo Date: Sat, 7 Sep 2013 19:57:11 +0300 Subject: [PATCH] build task fixed --- .gitignore | 1 + Gruntfile.js | 7 ++++++- package.json | 1 + server.js | 8 +++----- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 50483d1..1b12363 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ bower_components node_modules temp +dist lib-cov *.seed *.log diff --git a/Gruntfile.js b/Gruntfile.js index 790049d..81eee88 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -80,7 +80,12 @@ module.exports = function(grunt) { }, build: { files: { - 'dist/': ['./public/{css/**, img/**}', 'views/**'] + 'dist/': [ + './public/{css/**, img/**}', + 'views/**', + 'server.js', + 'node_modules/**' + ] } } }, diff --git a/package.json b/package.json index 761e7f7..13178b1 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "grunt-contrib-less": "~0.7.0", "grunt-contrib-watch": "~0.5.1", "grunt-contrib-clean": "~0.5.0", + "grunt-contrib-uglify": "~0.2.4", "grunt-usemin": "~0.1.12" }, "scripts": { diff --git a/server.js b/server.js index b714253..413f2ab 100644 --- a/server.js +++ b/server.js @@ -1,9 +1,7 @@ require('colors'); var express = require('express'), - app = express(), - path = require('path'), - isProduction = process.argv[2] === 'prod'; + app = express(); app .disable('x-powered-by') @@ -11,11 +9,11 @@ app .set('view engine', 'html') .set('port', process.env.PORT || 3000) - .set('views', (isProduction ? 'dist/' : '') + 'views') + .set('views', 'views') .use(express.favicon()) .use(express.logger('tiny')) - .use(express.static((isProduction ? 'dist/' : '') + 'public')) + .use(express.static('public')) .use(express.bodyParser()) .use(express.methodOverride()) .use(express.cookieParser())