diff --git a/build.sh b/build.sh index 45bef28..27e23e6 100755 --- a/build.sh +++ b/build.sh @@ -11,12 +11,11 @@ cat jssrc/chibi.js \ jssrc/lang.js \ jssrc/wifi.js \ jssrc/term_* \ - jssrc/term.js > js/app-full.js - -yuicompressor js/app-full.js > js/app.js + jssrc/term.js \ + jssrc/soft_keyboard.js | npm run --silent minify > js/app.js echo "Building CSS..." -sass --style=compressed sass/app.scss css/app.css +npm run sass -- --output-style compressed sass/app.scss > css/app.css echo "ESPTerm front-end ready" diff --git a/packcss.sh b/packcss.sh deleted file mode 100755 index c166465..0000000 --- a/packcss.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -echo "Building css..." - -npm run sass -- --output-style compressed sass/app.scss > css/app.css diff --git a/packjs.sh b/packjs.sh deleted file mode 100755 index 737eb63..0000000 --- a/packjs.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -echo "Packing js..." - -cat jssrc/chibi.js \ - jssrc/keymaster.js \ - jssrc/utils.js \ - jssrc/modal.js \ - jssrc/notif.js \ - jssrc/appcommon.js \ - jssrc/lang.js \ - jssrc/wifi.js \ - jssrc/term_* \ - jssrc/term.js \ - jssrc/soft_keyboard.js | npm run --silent minify > js/app.js