From abd113d00928e570930d6ebbad360cf4c1329c22 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Wed, 18 Jan 2017 12:39:28 +0000
Subject: [PATCH] Fixing UI and frontend compilation

---
 frontend/webpack/base.js       | 15 ++++++++-------
 frontend/webpack/production.js |  2 +-
 ui/Makefile                    |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/webpack/base.js b/frontend/webpack/base.js
index 8b0b5919..3c8ab616 100644
--- a/frontend/webpack/base.js
+++ b/frontend/webpack/base.js
@@ -50,7 +50,7 @@ module.exports = {
       ],
       loaders: [
         'babel-loader'
-      ]
+      ],
     }, {
       test: /\.json?$/,
       exclude: /node_modules/,
@@ -60,7 +60,7 @@ module.exports = {
       ],
       loaders: [
         'json-loader'
-      ]
+      ],
     }, {
       test: /\.png/,
       exclude: /node_modules/,
@@ -68,18 +68,19 @@ module.exports = {
         FRONTEND,
         UI
       ],
-      loader: [
+      loaders: [
         'url-loader'
-      ]
+      ],
     },
     {
       test: /\.(eot|svg|ttf|woff|woff2)$/,
-      exclude: /node_modules/,
-      loader: 'file-loader',
       include: [
         FRONTEND,
         UI
-      ]
+      ],
+      loaders: [
+        'file-loader'
+      ],
     }]
   }
 };
diff --git a/frontend/webpack/production.js b/frontend/webpack/production.js
index 392f4a00..0307a183 100644
--- a/frontend/webpack/production.js
+++ b/frontend/webpack/production.js
@@ -3,7 +3,7 @@ const base = require('./base');
 
 
 module.exports = Object.assign(base, {
-  devtool: 'hidden-source-map',
+  devtool: 'eval-source-map',
   entry: [
     base.entry
   ],
diff --git a/ui/Makefile b/ui/Makefile
index 4c6e60a9..9d80ba55 100644
--- a/ui/Makefile
+++ b/ui/Makefile
@@ -41,6 +41,7 @@ install-production: compile clean
 
 .PHONY: compile
 compile: install
+	cp -R src/ dist/.
 	$(bindir)/babel src --out-dir dist --source-maps inline
 
 .PHONY: build