diff options
| -rw-r--r-- | web-ui/config/compass.rb | 2 | ||||
| -rw-r--r-- | web-ui/config/package.sh | 21 | ||||
| -rw-r--r-- | web-ui/package.json | 5 |
3 files changed, 5 insertions, 23 deletions
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 diff --git a/web-ui/package.json b/web-ui/package.json index 24c4e91f..3dab5f80 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -13,7 +13,6 @@ "dompurify": "^0.8.4", "flightjs": "^1.5.1", "font-awesome": "^4.7.0", - "foundation": "^4.2.1-1", "handlebars": "^4.0.5", "he": "^1.1.0", "html-minifier": "2.1.6", @@ -37,8 +36,6 @@ "karma-junit-reporter": "0.2.2", "karma-phantomjs-launcher": "1.0.1", "karma-requirejs": "1.0.0", - "lodash": "^4.17.3", - "minify": "2.0.9", "modernizr": "^3.3.1", "quoted-printable": "^1.0.1", "requirejs": "2.2.0", @@ -59,7 +56,7 @@ "build": "npm run clean && npm run handlebars && npm run build-js && npm run add_git_version && npm run compass", "build-js": "webpack --colors --progress", "jshint": "jshint --config=.jshintrc app test", - "clean": "rm -rf .tmp/ 'dist/*' app/js/generated/hbs/* app/css/*", + "clean": "rm -rf 'dist/*' app/js/generated/hbs/* app/css/*", "buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js", "package": "/bin/bash config/package.sh", "imagemin": "node config/imagemin.js", |