From 99f3eebc5d1bb33ba033e5f54404b148b3576e47 Mon Sep 17 00:00:00 2001
From: sveisvei <sveinung.rosaker@gmail.com>
Date: Sun, 19 Jun 2016 20:47:34 +0200
Subject: [PATCH] fix frontend and fix deploy to dev-master with lerna

---
 .gitignore                                         |  4 ++--
 Procfile                                           |  2 +-
 package.json                                       |  3 ++-
 packages/unleash-frontend/.babelrc                 |  3 +++
 packages/unleash-frontend/lib/server-dev.js        |  2 +-
 packages/unleash-frontend/package.json             | 14 +++++++++-----
 packages/unleash-frontend/public/index.html        |  4 ++--
 .../unleash-frontend/public/{css => }/unleash.css  |  0
 packages/unleash-frontend/webpack.config.js        | 12 ++++++++----
 9 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 packages/unleash-frontend/.babelrc
 rename packages/unleash-frontend/public/{css => }/unleash.css (100%)

diff --git a/.gitignore b/.gitignore
index c12956e805..3f0dd79c56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,8 +22,8 @@ coverage
 build/Release
 
 # webpack output
-packages/unleash-frontend/public/js/bundle.js
-packages/unleash-frontend/public/js/bundle.js.map
+packages/unleash-frontend/public/bundle.js
+packages/unleash-frontend/public/bundle.js.map
 
 # liquibase stuff
 /sql
diff --git a/Procfile b/Procfile
index 7aa8e59d6a..d53116cbe5 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: npm run db-migrate && npm run start
+web: npm run bootstrap && npm run db-migrate && npm run start
diff --git a/package.json b/package.json
index d93f45e53d..77e09f0d0c 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,8 @@
     "start": "lerna --scope=unleash-server exec npm start",
     "publish": "lerna publish",
     "publish:dry": "lerna publish --skip-git --skip-npm",
-    "db-migrate": "lerna --scope=unleash-api exec npm run db-migrate"
+    "db-migrate": "lerna --scope=unleash-api exec npm run db-migrate",
+    "heroku-postbuild": "npm run bootstrap && lerna --scope=unleash-frontend exec npm run build"
   },
   "dependencies": {},
   "devDependencies": {
diff --git a/packages/unleash-frontend/.babelrc b/packages/unleash-frontend/.babelrc
new file mode 100644
index 0000000000..e68d2fea11
--- /dev/null
+++ b/packages/unleash-frontend/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015", "stage-2", "react"]
+}
diff --git a/packages/unleash-frontend/lib/server-dev.js b/packages/unleash-frontend/lib/server-dev.js
index f4e6106e3e..4d48b046bb 100644
--- a/packages/unleash-frontend/lib/server-dev.js
+++ b/packages/unleash-frontend/lib/server-dev.js
@@ -1,5 +1,5 @@
 'use strict';
-const server = require('unleash-server');
+const server = require('unleash-api');
 
 const unleash = server.start({});
 const app = unleash.app;
diff --git a/packages/unleash-frontend/package.json b/packages/unleash-frontend/package.json
index 66f7520e2e..233f77ca01 100644
--- a/packages/unleash-frontend/package.json
+++ b/packages/unleash-frontend/package.json
@@ -31,17 +31,19 @@
   },
   "main": "./lib/index.js",
   "dependencies": {
-    "jsx-loader": "0.12.2",
     "lodash": "^3.5.0",
     "moment": "^2.13.0",
     "react": "^0.13.1",
     "react-router": "^0.13.2",
     "reflux": "^0.2.10",
-    "reqwest": "^2.0.5",
-    "webpack": "^1.13.0",
-    "webpack-dev-middleware": "^1.6.1"
+    "reqwest": "^2.0.5"
   },
   "devDependencies": {
+    "babel-core": "^6.9.1",
+    "babel-loader": "^6.2.4",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-react": "^6.5.0",
+    "babel-preset-stage-2": "^6.5.0",
     "chai": "3.5.0",
     "coveralls": "^2.11.9",
     "istanbul": "^0.4.3",
@@ -52,7 +54,9 @@
     "react-tools": "^0.13.1",
     "supertest": "^1.2.0",
     "supervisor": "^0.10.0",
-    "unleash-api": "1.0.0-alpha.2"
+    "unleash-api": "1.0.0-alpha.2",
+    "webpack": "^2.1.0-beta.13",
+    "webpack-dev-middleware": "^1.6.1"
   },
   "jest": {
     "scriptPreprocessor": "<rootDir>/jest-preprocessor.js",
diff --git a/packages/unleash-frontend/public/index.html b/packages/unleash-frontend/public/index.html
index f3e1670009..5ba4ffe381 100644
--- a/packages/unleash-frontend/public/index.html
+++ b/packages/unleash-frontend/public/index.html
@@ -8,10 +8,10 @@
     <meta name="description" content="unleash">
 
     <link rel="stylesheet" href="//finncdn.no/bb/css/so/5.5.28/so.min.css">
-    <link rel="stylesheet" href="css/unleash.css">
+    <link rel="stylesheet" href="unleash.css">
 </head>
 <body>
     <div id="content"></div>
-    <script src="js/bundle.js"></script>
+    <script src="bundle.js"></script>
 </body>
 </html>
diff --git a/packages/unleash-frontend/public/css/unleash.css b/packages/unleash-frontend/public/unleash.css
similarity index 100%
rename from packages/unleash-frontend/public/css/unleash.css
rename to packages/unleash-frontend/public/unleash.css
diff --git a/packages/unleash-frontend/webpack.config.js b/packages/unleash-frontend/webpack.config.js
index 586c685275..d74a1ee510 100644
--- a/packages/unleash-frontend/webpack.config.js
+++ b/packages/unleash-frontend/webpack.config.js
@@ -4,15 +4,15 @@
 
 const path = require('path');
 const root = path.normalize(path.join(__dirname, '.'));
-const jsroot = path.join(path.join(root, 'public'), 'js');
+const jsroot = path.join(root, 'public', 'js');
 
 module.exports = {
 
     context: jsroot,
-    entry: 'app',
+    entry: './app.jsx',
 
     output: {
-        path: jsroot,
+        path: path.join(root, 'public'),
         filename: 'bundle.js',
         publicPath: '/js/',
     },
@@ -25,7 +25,11 @@ module.exports = {
 
     module: {
         loaders: [
-            { test: /\.jsx$/, loader: 'jsx?harmony' },
+            {
+                test: /\.jsx?$/,
+                exclude: /node_modules/,
+                loader: 'babel',
+            },
         ],
     },