From c0968d263d5531d21a6ff9df111d63ca2c6e43fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Fri, 5 Nov 2021 19:34:01 +0100 Subject: Start depending on npm. Chromium can't handle JavaScript-modules in XHTML-document [1]. The workaround is to use a javascript bundler. Here we start depending on browserify. I evaluated both that and webpack, and browserify seemed to work marginally better with typescript. Unfortunately this also makes us depend on npm, where we unfortunately already are bloatet... $ ls static/node_modules | wc -l 174 [1]: https://bugs.chromium.org/p/chromium/issues/detail?id=717643 --- module/calp/html/view/calendar.scm | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) (limited to 'module/calp/html/view/calendar.scm') diff --git a/module/calp/html/view/calendar.scm b/module/calp/html/view/calendar.scm index f9c60279..727fd8ba 100644 --- a/module/calp/html/view/calendar.scm +++ b/module/calp/html/view/calendar.scm @@ -104,21 +104,26 @@ ,(include-alt-css "/static/dark.css" '(title "Dark")) ,(include-alt-css "/static/light.css" '(title "Light")) - (script (@ (defer) (src "/static/types.js"))) - (script (@ (defer) (src "/static/lib.js"))) - (script (@ (defer) (src "/static/jcal.js"))) - (script (@ (defer) (src "/static/dragable.js"))) - (script (@ (defer) (src "/static/clock.js"))) - (script (@ (defer) (src "/static/popup.js"))) - ;; (script (@ (defer) (src "/static/rrule.js"))) - ;; (script (@ (defer) (src "/static/binders.js"))) - (script (@ (defer) (src "/static/server_connect.js"))) - ;; (script (@ (defer) (src "/static/input_list.js"))) - ;; (script (@ (defer) (src "/static/date_time.js"))) - ;; (script (@ (defer) (src "/static/vcal.js"))) - (script (@ (defer) (src "/static/script.js"))) - (script (@ (defer) (src "/static/vevent.js"))) - (script (@ (defer) (src "/static/globals.js"))) + ;; (script (@ (defer) (src "/static/types.js"))) + ;; (script (@ (defer) (src "/static/lib.js"))) + ;; (script (@ (defer) (src "/static/jcal.js"))) + ;; (script (@ (defer) (src "/static/dragable.js"))) + ;; (script (@ (defer) (src "/static/clock.js"))) + ;; (script (@ (defer) (src "/static/popup.js"))) + ;; ;; (script (@ (defer) (src "/static/rrule.js"))) + ;; ;; (script (@ (defer) (src "/static/binders.js"))) + ;; (script (@ (defer) (src "/static/server_connect.js"))) + ;; ;; (script (@ (defer) (src "/static/input_list.js"))) + ;; ;; (script (@ (defer) (src "/static/date_time.js"))) + ;; ;; (script (@ (defer) (src "/static/vcal.js"))) + ;; (script (@ (defer) (src "/static/script.js"))) + ;; (script (@ (defer) (src "/static/vevent.js"))) + ;; (script (@ (defer) (src "/static/globals.js"))) + + ;; (script (@ (type module) (src "/static/script.js"))) + ;; (script (@ (src "/static/dist/main.js"))) + (script (@ (src "/static/script.out.js"))) + ;; (script (@ (src "/static/build.js"))) ;; on load -- cgit v1.2.3