ship a minified version of the widget-toolkit JS library

so use sites can switch between literal and minified version like we
do already for ExtJS via the debug flag.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/debian/control b/debian/control
index 25bd931daeb3b85db4222a4894ec5c74391e8116..ce62d4e5f5846f8cfe01b2f71785ce7922231099 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Build-Depends: debhelper-compat (= 13),
                libjs-marked,
                pve-eslint (>= 7.28.0),
                sassc,
+               uglifyjs,
 Standards-Version: 4.6.2
 Homepage: https://www.proxmox.com
 

diff --git a/src/Makefile b/src/Makefile
index c8481b65f01118057ff2bd8f38ad8a9d65ade19e..7cff5dd68335bbdec729f22797822b986a52e3bc 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ SUBDIRS= css images proxmox-dark
 
 # bundle it for now from the libjs-marked debian package to avoid touching our proxies file mapper,
 # we could also just ship a link to the packages file and load from same path as the widget-toolkit
-MARKEDJS=/usr/share/javascript/marked/marked.min.js
+MARKEDJS=/usr/share/javascript/marked/marked.js
 
 JSSRC=                                 \
        Utils.js                        \
@@ -128,11 +128,15 @@ proxmoxlib.js: .lint-incremental $(JSSRC)
        cat $(JSSRC) $(MARKEDJS)  >> $@.tmp
        mv $@.tmp $@
 
-install: proxmoxlib.js
+proxmoxlib.min.js: proxmoxlib.js
+       uglifyjs $< -c -m -o $@.tmp
+       mv $@.tmp $@
+
+install: proxmoxlib.js proxmoxlib.min.js
        install -d -m 755 $(WWWBASEDIR)
-       install -m 0644 proxmoxlib.js $(WWWBASEDIR)
+       install -m 0644 proxmoxlib.js proxmoxlib.min.js $(WWWBASEDIR)
        set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 
 .PHONY: clean
 clean:
-       rm -f proxmoxlib.js proxmoxlib.js.tmp .lint-incremental
+       rm -f proxmoxlib.js* proxmoxlib.min.js* .lint-incremental