summaryrefslogtreecommitdiff
path: root/web-ui/config
diff options
context:
space:
mode:
authorDuda Dornelles <ddornell@thoughtworks.com>2014-12-17 08:52:56 -0200
committerDuda Dornelles <ddornell@thoughtworks.com>2014-12-17 08:53:02 -0200
commit218dfaaa1a08e137455ae611056ad1dd5532e853 (patch)
tree808c22151126345d34112d66e7b51276815db9e2 /web-ui/config
parent9f33dc14a03087623834ae28b9e7eb4d49c537b5 (diff)
Fixing package for web-ui
Diffstat (limited to 'web-ui/config')
-rw-r--r--web-ui/config/buildoptions.js20
-rw-r--r--web-ui/config/package.sh18
2 files changed, 17 insertions, 21 deletions
diff --git a/web-ui/config/buildoptions.js b/web-ui/config/buildoptions.js
index 400dffb1..5cf29dc0 100644
--- a/web-ui/config/buildoptions.js
+++ b/web-ui/config/buildoptions.js
@@ -19,10 +19,22 @@
baseUrl: '../app',
wrap: true,
almond: true,
- optimize: 'none',
+ optimize: 'uglify',
mainConfigFile: '../app/js/main.js',
- out: '../.tmp/app.concatenated.js',
- include: ['js/main'],
- name: 'bower_components/almond/almond'
+ 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',
+
})
diff --git a/web-ui/config/package.sh b/web-ui/config/package.sh
index d376113c..797c30c5 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 buildmain
+./go dist:buildmain
# copy files
@@ -36,19 +36,3 @@ 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/bower_components/utf8/utf8.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
-