minify js

Author: chuckwagoncomputing

Dockerfile

@@ -1,10 +1,14 @@
 FROM debian:stable-slim
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update &&\
-  apt-get install -y wget minify &&\
+  apt-get install -y wget &&\
   wget https://github.com/mikefarah/yq/releases/download/v4.30.8/yq_linux_amd64 &&\
   chmod a+x yq_linux_amd64 &&\
   mv yq_linux_amd64 /usr/bin/yq &&\
+  wget https://github.com/tdewolff/minify/releases/download/v2.12.4/minify_linux_amd64.tar.gz &&\
+  tar -xzf minify_linux_amd64.tar.gz &&\
+  chmod a+x minify &&\
+  mv minify /usr/bin/ &&\
   apt-get autoremove -y && apt-get clean -y
 
 COPY main.sh /main.sh

gen.sh

@@ -11,11 +11,11 @@ for C in $COLORS; do
     CSS+=$(echo -e "\n[data-type*=$CT] {\nborder-color: $CC;\n}")
   fi
 done
-export CSS=$(echo "$CSS" | minify --type css)
+export CSS
 
-export JS=$(perl -0pe 's/\/\*DATA\*\//\`$ENV{JSON}\`,/;' -pe 's/\/\/\/COLS\/\/\//$ENV{COLS}/;' -pe 's/\/\/\/PRINT_COLS\/\/\//$ENV{PRINT_COLS}/;' $DIR/script.js | minify --type js | perl -0pe 's/}`,];/}`,\/\*DATA\*\/];/;')
+export JS=$(perl -0pe 's/\/\*DATA\*\//\`$ENV{JSON}\`,/;' -pe 's/\/\/\/COLS\/\/\//$ENV{COLS}/;' -pe 's/\/\/\/PRINT_COLS\/\/\//$ENV{PRINT_COLS}/;' $DIR/script.js)
 
-TEXT=$(minify $DIR/pinout.html | perl -0pe 's/###JS###/$ENV{JS}/;' -pe 's/###CSS###/$ENV{CSS}/;')
+TEXT=$(perl -0pe 's/###JS###/$ENV{JS}/;' -pe 's/###CSS###/$ENV{CSS}/;' $DIR/pinout.html | minify --type html | perl -0pe 's/}`]/}`,\/\*DATA\*\/]/;')
 if [ $? -ne 0 ]; then
   echo "Error in gen.sh"
   exit 1;

script.js

@@ -1,3 +1,4 @@
+;(function() {
 // gen.sh and append.sh replace DATA with the JSON of a connector
 var connectorData = [
 /*DATA*/
@@ -326,3 +327,4 @@ window.addEventListener('load', function() {
     }
   }
 });
+})()