From d83a6d27b7f92752a91a8d733353a38714e44951 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 28 Dec 2016 15:55:53 -0200 Subject: Update package script to use webpack files --- web-ui/config/compass.rb | 2 +- web-ui/config/package.sh | 21 +++------------------ 2 files changed, 4 insertions(+), 19 deletions(-) (limited to 'web-ui/config') diff --git a/web-ui/config/compass.rb b/web-ui/config/compass.rb index 4adf2ee2..9c52a04e 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 = "dist/js" +javascripts_dir = "app/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/config/package.sh b/web-ui/config/package.sh index ad4a3895..946b7f62 100644 --- a/web-ui/config/package.sh +++ b/web-ui/config/package.sh @@ -23,28 +23,12 @@ export PIXELATED_BUILD='package' mkdir -p dist # initial npm tasks -./go clean -./go compass -./go handlebars +./go build ./go imagemin ./go minify_html ./go minify_sandbox -./go add_git_version -./go buildmain -# copy files -cd app -cp --parents \ -404.html \ -fonts/* \ -locales/**/* \ -bower_components/font-awesome/css/font-awesome.min.css \ -bower_components/jquery-file-upload/css/jquery.fileupload.css \ -bower_components/font-awesome/fonts/* \ -../dist -cd - - # concat js files and minify for app.min.js cat \ app/bower_components/modernizr/modernizr.js \ @@ -58,7 +42,8 @@ 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 \ app/bower_components/iframe-resizer/js/iframeResizer.js \ -.tmp/app.concatenated.js > dist/app.js +app/js/1.bundle.js \ +app/js/bundle.js > dist/app.js node_modules/.bin/minify dist/app.js > dist/app.min.js rm dist/app.js -- cgit v1.2.3