From 42306527afd087373df57306c090698d99e0db4b Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Wed, 28 Dec 2016 10:43:25 -0200
Subject: Output javascript bundle in dist folder and use it locally

---
 web-ui/app/index.html    | 2 +-
 web-ui/config/compass.rb | 2 +-
 web-ui/webpack.config.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'web-ui')

diff --git a/web-ui/app/index.html b/web-ui/app/index.html
index 4b6a81a0..941d3a21 100644
--- a/web-ui/app/index.html
+++ b/web-ui/app/index.html
@@ -106,7 +106,7 @@
 <script src="assets/bower_components/foundation/js/foundation/foundation.offcanvas.js"></script>
 <script src="assets/js/foundation/initialize_foundation.js"></script>
 <script src="assets/bower_components/iframe-resizer/js/iframeResizer.min.js"></script>
-<script src="assets/bower_components/requirejs/require.js" data-main="assets/js/main.js"></script>
+<script src="assets/js/bundle.js"></script>
 <!--usemin_end-->
 
 </body>
diff --git a/web-ui/config/compass.rb b/web-ui/config/compass.rb
index 9c52a04e..4adf2ee2 100644
--- a/web-ui/config/compass.rb
+++ b/web-ui/config/compass.rb
@@ -24,7 +24,7 @@ http_path = "/"
 css_dir = "#{target_dir}/css"
 sass_dir = "app/scss"
 images_dir = "app/images"
-javascripts_dir = "app/js"
+javascripts_dir = "dist/js"
 
 # You can select your preferred output style here (can be overridden via the command line):
 # output_style = :expanded or :nested or :compact or :compressed
diff --git a/web-ui/webpack.config.js b/web-ui/webpack.config.js
index 39bdd511..fb85bd16 100644
--- a/web-ui/webpack.config.js
+++ b/web-ui/webpack.config.js
@@ -3,7 +3,7 @@ var path = require('path')
 module.exports = {
   entry: './app/js/index.js',
   output: {
-    path: path.join(__dirname, '/app/js/'),
+    path: path.join(__dirname, '/dist/js/'),
     filename: 'bundle.js',
     publicPath: '/assets/js/'
   },
-- 
cgit v1.2.3