Switch to wasm bindgen instead of trunk

4 months ago · 5c1b9e4395
parent c7a137c58d
commit 5c1b9e4395
3 changed files with 44 additions and 11 deletions
--- a/24
+++ b/24
@ -1,7 +1,27 @@
 web/trees:
 	mkdir -p dist/trees
-	trunk build --release true trees.html --dist dist/trees
-	ln -sf `pwd`/assets dist/trees/assets
+
+	wasm-bindgen --no-typescript --target web \
+      --out-dir ./dist/trees \
+      --out-name "trees" \
+      ${CARGO_TARGET_DIR}/wasm32-unknown-unknown/release/trees.wasm
+
+	cp trees.html ./dist/trees/index.html
+	cp trees.css ./dist/trees/trees.css
+
+	rm -rf dist/trees/assets
+
+	rsync -av \
+		--include='*/' \
+		--include='*.png' \
+		--include='*.mono' \
+		--exclude='*' \
+		--delete \
+		assets/ \
+		dist/trees/assets

 web/trees/serve: web/trees
 	cd dist/trees && simple-http-server
+
+itch.io/trees:
+	butler push dist/trees popgame/trees:html5
--- a/flake.nix
+++ b/flake.nix
@ -50,7 +50,7 @@
                # Bug tracking
                git-bug
                # wasm builder
-                trunk
+                wasm-bindgen-cli_0_2_100
                simple-http-server
              ];
            LD_LIBRARY_PATH = lib.makeLibraryPath [
--- a/trees.html
+++ b/trees.html
@ -1,10 +1,23 @@
 <html>
+</html>
+
+<!doctype html>
+<html lang="en">
 <head>
-      <link
-      data-trunk
-      rel="css"
-      href="trees.css"
-    />
-    <link data-trunk rel="rust" data-bin="trees"/>
+  <link rel="css" href="trees.css" />
 </head>
+
+<body style="margin: 0px;">
+  <script type="module">
+    import init from './trees.js'
+
+    init().catch((error) => {
+      if (!error.message.startsWith("Using exceptions for control flow, don't mind me. This isn't actually an error!")) {
+        throw error;
+      }
+    });
+  </script>
+</body>
+
 </html>
+