diff options
| author | Duda Dornelles <ddornell@thoughtworks.com> | 2014-12-17 10:39:43 -0200 |
|---|---|---|
| committer | Duda Dornelles <ddornell@thoughtworks.com> | 2014-12-17 10:54:44 -0200 |
| commit | 93bdcc0c2a45fcf54ab979188c0de662dbed947a (patch) | |
| tree | 50adb2532d83b8ca223f5de63bc4ded1f4c90716 /web-ui/config | |
| parent | 218dfaaa1a08e137455ae611056ad1dd5532e853 (diff) | |
For packaging, using r.js wont work properly for static deps,
falling back to minify.js and getting rid of the offending dependency
Diffstat (limited to 'web-ui/config')
| -rw-r--r-- | web-ui/config/buildoptions.js | 20 | ||||
| -rw-r--r-- | web-ui/config/package.sh | 17 |
2 files changed, 20 insertions, 17 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 + |