From c620fde8713b13c12f5fe74b81b119af49f46775 Mon Sep 17 00:00:00 2001
From: Ville Touronen <touronen@gmail.com>
Date: Thu, 11 Feb 2016 15:23:09 +0200
Subject: [PATCH] Fix production build and production server

---
 .babelrc               | 3 +++
 config/webpack/prod.js | 5 ++++-
 package.json           | 2 +-
 server/server.js       | 6 ++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.babelrc b/.babelrc
index 4fe1a60bd..317fe8990 100644
--- a/.babelrc
+++ b/.babelrc
@@ -12,6 +12,9 @@
           }]
         }]
       ]
+  },
+    "production": {
+        "plugins": []
     }
   }
 }
diff --git a/config/webpack/prod.js b/config/webpack/prod.js
index 5a4051ee5..a774d9468 100644
--- a/config/webpack/prod.js
+++ b/config/webpack/prod.js
@@ -44,7 +44,7 @@ var config = {
     },
 
     debug: false,
-    //devtool: 'cheap-module-eval-source-map',
+
     resolve: {
         root: common.paths.ROOT,
         extensions: ['.', '', '.webpack.js', '.web.js', '.jsx', '.js']
@@ -66,6 +66,9 @@ var config = {
     },
     plugins: [
         //new webpack.HotModuleReplacementPlugin(),
+        new webpack.DefinePlugin({
+            'process.env.NODE_ENV': '"production"'
+        }),
         new webpack.ProvidePlugin({
             $: "jquery",
             jQuery: "jquery",
diff --git a/package.json b/package.json
index a343ab658..7d89a7020 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "start": "node dev_server",
     "production": "node server",
-    "deploy": "webpack -p --config config/webpack/prod.js"
+    "deploy": "NODE_ENV=production webpack -p --config config/webpack/prod.js"
   },
   "dependencies": {
     "app-module-path": "^1.0.5",
diff --git a/server/server.js b/server/server.js
index 5b06b82de..d8afbbab7 100644
--- a/server/server.js
+++ b/server/server.js
@@ -12,6 +12,12 @@ const settings = getSettings()
 const app = express()
 const passport = getPassport(settings)
 
+app.use('/', express.static(path.resolve(__dirname, '..', 'dist')));
+
+app.get('/', function (req, res) {
+    res.sendfile(path.resolve(__dirname, '..', 'dist'));
+});
+
 app.use(cookieParser());
 app.use(bodyParser.urlencoded({extended: true}));
 app.use(cookieSession({name: 's', secret: settings.sessionSecret, maxAge: 86400 * 1000}));