No wasm mode (#810)

* query parameter to see a page without wasm

* pre render at same depth as render

* remove loader node rather than hide it

* Update html.go

* Update html.go

* prevent loader to show in non wasm mode

* cleanup

pkg/app/gen/app.css

@@ -1,7 +1,11 @@
 /*------------------------------------------------------------------------------
   Loader
 ------------------------------------------------------------------------------*/
-.goapp-app-info {
+.app-wasm-loader-hidden {
+  display: none;
+}
+
+.app-wasm-loader {
   position: fixed;
   top: 0;
   left: 0;

pkg/app/gen/app.js

@@ -190,11 +190,15 @@ function goappKeepBodyClean() {
 // Web Assembly
 // -----------------------------------------------------------------------------
 async function goappInitWebAssembly() {
+  const loader = document.getElementById("app-wasm-loader");
+
   if (!goappCanLoadWebAssembly()) {
-    document.getElementById("app-wasm-loader").style.display = "none";
+    loader.remove();
     return;
   }
 
+  loader.className = "app-wasm-loader";
+
   let instantiateStreaming = WebAssembly.instantiateStreaming;
   if (!instantiateStreaming) {
     instantiateStreaming = async (resp, importObject) => {
@@ -219,6 +223,7 @@ async function goappInitWebAssembly() {
     );
 
     go.run(wasm.instance);
+    loader.remove();
   } catch (err) {
     loaderIcon.className = "goapp-logo";
     loaderLabel.innerText = err;
@@ -227,9 +232,14 @@ async function goappInitWebAssembly() {
 }
 
 function goappCanLoadWebAssembly() {
-  return !/bot|googlebot|crawler|spider|robot|crawling/i.test(
-    navigator.userAgent
-  );
+  if (
+    /bot|googlebot|crawler|spider|robot|crawling/i.test(navigator.userAgent)
+  ) {
+    return false;
+  }
+
+  const urlParams = new URLSearchParams(window.location.search);
+  return urlParams.get("wasm") !== "false";
 }
 
 async function fetchWithProgress(url, progess) {

pkg/app/html.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"io"
 	"reflect"
+	"strconv"
 
 	"github.com/maxence-charriere/go-app/v9/pkg/errors"
 )
@@ -309,14 +310,13 @@ func (e *htmlElement) html(w io.Writer) {
 		io.WriteString(w, k)
 
 		if v != "" {
-			io.WriteString(w, `="`)
-			io.WriteString(w, resolveAttributeURLValue(k, v, func(s string) string {
+			io.WriteString(w, `=`)
+			io.WriteString(w, strconv.Quote(resolveAttributeURLValue(k, v, func(s string) string {
 				if e.dispatcher != nil {
 					return e.dispatcher.resolveStaticResource(v)
 				}
 				return v
-			}))
-			io.WriteString(w, `"`)
+			})))
 		}
 	}
 
@@ -353,14 +353,13 @@ func (e *htmlElement) htmlWithIndent(w io.Writer, indent int) {
 		io.WriteString(w, k)
 
 		if v != "" {
-			io.WriteString(w, `="`)
-			io.WriteString(w, resolveAttributeURLValue(k, v, func(s string) string {
+			io.WriteString(w, `=`)
+			io.WriteString(w, strconv.Quote(resolveAttributeURLValue(k, v, func(s string) string {
 				if e.dispatcher != nil {
 					return e.dispatcher.resolveStaticResource(v)
 				}
 				return v
-			}))
-			io.WriteString(w, `"`)
+			})))
 		}
 	}
 

pkg/app/http.go

@@ -10,7 +10,6 @@ import (
 	"net/http"
 	"os"
 	"reflect"
-	"runtime"
 	"sort"
 	"strconv"
 	"strings"
@@ -682,21 +681,11 @@ func (h *Handler) servePage(w http.ResponseWriter, r *http.Request) {
 		StaticResourceResolver: h.resolveStaticPath,
 		ActionHandlers:         actionHandlers,
 	}
-	body := h.Body().privateBody(Div())
-	if err := mount(&disp, body); err != nil {
-		panic(errors.New("mounting pre-rendering container failed").
-			WithTag("server-side", disp.isServerSide()).
-			WithTag("body-type", reflect.TypeOf(disp.Body)).
-			Wrap(err))
-	}
-	disp.Body = body
-	disp.init()
-	defer disp.Close()
-
-	disp.Mount(Div().Body(
+	body := h.Body().privateBody(
+		Div(), // Pre-rendeging placeholder
 		Aside().
 			ID("app-wasm-loader").
-			Class("goapp-app-info").
+			Class("app-wasm-loader-hidden").
 			Body(
 				Img().
 					ID("app-wasm-loader-icon").
@@ -707,8 +696,18 @@ func (h *Handler) servePage(w http.ResponseWriter, r *http.Request) {
 					Class("goapp-label").
 					Text(page.loadingLabel),
 			),
-		Div().ID("app-pre-render").Body(content),
-	))
+	)
+	if err := mount(&disp, body); err != nil {
+		panic(errors.New("mounting pre-rendering container failed").
+			WithTag("server-side", disp.isServerSide()).
+			WithTag("body-type", reflect.TypeOf(disp.Body)).
+			Wrap(err))
+	}
+	disp.Body = body
+	disp.init()
+	defer disp.Close()
+
+	disp.Mount(content)
 
 	for len(disp.dispatches) != 0 {
 		disp.Consume()
@@ -865,13 +864,6 @@ type Icon struct {
 // web app.
 type Environment map[string]string
 
-func normalizeFilePath(path string) string {
-	if runtime.GOOS == "windows" {
-		return strings.ReplaceAll(path, "/", `\`)
-	}
-	return path
-}
-
 func isRemoteLocation(path string) bool {
 	return strings.HasPrefix(path, "https://") ||
 		strings.HasPrefix(path, "http://")
@@ -881,18 +873,3 @@ func isStaticResourcePath(path string) bool {
 	return strings.HasPrefix(path, "/web/") ||
 		strings.HasPrefix(path, "web/")
 }
-
-type httpResource struct {
-	Path        string
-	ContentType string
-	Body        []byte
-	ExpireAt    time.Time
-}
-
-func (r httpResource) Len() int {
-	return len(r.Body)
-}
-
-func (r httpResource) IsExpired() bool {
-	return r.ExpireAt != time.Time{} && r.ExpireAt.Before(time.Now())
-}