For packaging, using r.js wont work properly for static deps,

falling back to minify.js and getting rid of the offending dependency

3 files changed, 22 insertions, 18 deletions

diff --git a/web-ui/config/buildoptions.js b/web-ui/config/buildoptions.js
index 5cf29dc0..400dffb1 100644
--- a/web-ui/config/buildoptions.js
+++ b/web-ui/config/buildoptions.js
@@ -19,22 +19,10 @@
   baseUrl: '../app',
   wrap: true,
   almond: true,
-  optimize: 'uglify',
+  optimize: 'none',
   mainConfigFile: '../app/js/main.js',
-  out: '../dist/app.min.js',
-  include: [
-    'bower_components/modernizr/modernizr',
-    'bower_components/lodash/dist/lodash',
-    'bower_components/jquery/dist/jquery',
-    'js/lib/highlightRegex',
-    'bower_components/handlebars/handlebars.min',
-    'bower_components/typeahead.js/dist/typeahead.bundle.min',
-    'bower_components/foundation/js/foundation',
-    'bower_components/foundation/js/foundation/foundation.reveal',
-    'bower_components/foundation/js/foundation/foundation.offcanvas',
-    'js/main'
-  ],
-  name:'bower_components/almond/almond',
-
+  out: '../.tmp/app.concatenated.js',
+  include: ['js/main'],
+  name: 'bower_components/almond/almond'
 })
 
diff --git a/web-ui/config/package.sh b/web-ui/config/package.sh
index 797c30c5..f7d7f3aa 100644
--- a/web-ui/config/package.sh
+++ b/web-ui/config/package.sh
@@ -28,7 +28,7 @@ mkdir -p dist
 ./go handlebars
 ./go imagemin
 ./go minify_html
-./go dist:buildmain
+./go buildmain
 
 
 # copy files
@@ -36,3 +36,18 @@ cd app
 cp --parents 404.html fonts/* locales/**/* bower_components/font-awesome/css/font-awesome.min.css bower_components/font-awesome/fonts/* ../dist
 cd -
 
+# concat js files and minify
+cat \
+app/bower_components/modernizr/modernizr.js \
+app/bower_components/lodash/dist/lodash.js \
+app/bower_components/jquery/dist/jquery.js \
+app/js/lib/highlightRegex.js \
+app/bower_components/handlebars/handlebars.min.js \
+app/bower_components/typeahead.js/dist/typeahead.bundle.min.js \
+app/bower_components/foundation/js/foundation.js \
+app/bower_components/foundation/js/foundation/foundation.reveal.js \
+app/bower_components/foundation/js/foundation/foundation.offcanvas.js \
+.tmp/app.concatenated.js > dist/app.js
+node_modules/.bin/minify dist/app.js > dist/app.min.js
+rm dist/app.js
+
diff --git a/web-ui/package.json b/web-ui/package.json
index 2dd348de..4f18251f 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "devDependencies": {
     "bower": "1.3.12",
+    "minify": "1.4.1",
     "handlebars": "2.0.0",
     "html-minifier": "^0.6.9",
     "imagemin": "3.1.0",
@@ -25,7 +26,7 @@
     "build": "npm run clean && npm run handlebars && npm run compass",
     "jshint": "node_modules/.bin/jshint --config=.jshintrc `find app -name '*.js' | grep -v -e 'lib' -e 'bower' -e 'generated'`",
     "clean": "rm -rf .tmp/ dist/**/* app/js/generated/hbs/* app/css/*",
-    "dist:buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js",
+    "buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js",
     "package": "/bin/bash config/package.sh",
     "imagemin": "node config/imagemin.js",
     "minify_html": "node_modules/.bin/html-minifier app/index.html --collapse-whitespace | sed 's|<!--usemin_start-->.*<!--usemin_end-->|<script src=\"app.min.js\" type=\"text/javascript\"></script>|' > dist/index.html"