From 3fc2eaf8a148c5918e1a0478d66e4cf117ed22e5 Mon Sep 17 00:00:00 2001 From: donal <donalspring@gmail.com> Date: Thu, 14 Jun 2018 23:25:37 +0200 Subject: [PATCH] FIX - issue with NODE_ENV --- server/config/express.js | 11 ++--------- package-lock.json | 4 ++-- package.json | 1 - 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index f6fbfb4..414eebe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4389,7 +4389,7 @@ "integrity": "sha1-ib2d9nMrUSVrxnBTQrugLtEhMe8=", "dev": true, "requires": { - "ms": "0.7.1" + "ms": "0.6.2" } }, "diff": { @@ -9241,7 +9241,7 @@ "optional": true }, "uglify-js": { - "version": "2.6.0", + "version": "2.4.24", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", "integrity": "sha1-+tV1XB4Vd2WLsG/5q25UjJW+vW4=", "dev": true, diff --git a/package.json b/package.json index 4cbc667..7be70da 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ }, "devDependencies": { "blanket": "1.2.3", - "connect-livereload": "0.6.0", "fs-extra": "5.0.0", "grunt": "1.0.2", "grunt-build-control": "0.7.1", diff --git a/server/config/express.js b/server/config/express.js index c16ca51..8d20a7e 100755 --- a/server/config/express.js +++ b/server/config/express.js @@ -26,16 +26,9 @@ app.use(methodOverride()); app.use(cookieParser()); if ('production' === env || 'dev' === env || 'test' === env) { - // app.use(express.static(path.join(config.root, 'public'))); - // app.set('appPath', path.join(config.root, 'public')); app.use(morgan('dev')); - } - - if ('development' === env || 'test' === env) { - app.use(require('connect-livereload')()); - app.use(express.static(path.join(config.root, '.tmp'))); - app.use(express.static(path.join(config.root, 'client'))); - app.set('appPath', path.join(config.root, 'client')); + } else { + // else 'development' app.use(morgan('dev')); app.use(errorHandler()); // Error handler - has to be last } -- Gitblit v1.9.3