From 011a4f03613051a607b1a968a2dab38695236b79 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Thu, 16 Jul 2020 14:40:49 +0200
Subject: [PATCH] Use a separate pkg subdirectory for wasm-pack output

---
 .gitignore           | 2 +-
 Makefile.toml        | 2 +-
 ui/static/index.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fdbb452..feba68b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
 
 # Generated assets
 ui/static/css/stoptime.css
-ui/static/stoptime_ui.*
+ui/static/pkg
diff --git a/Makefile.toml b/Makefile.toml
index b56db12..ac10a26 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -21,7 +21,7 @@ category = "Build"
 description = "Runs the Rust compiler via wasm-pack for the UI."
 install-crate = "wasm-pack"
 command = "wasm-pack"
-args = ["build", "--out-name", "stoptime_ui", "--out-dir", "static", "--target", "web"]
+args = ["build", "--out-name", "stoptime_ui", "--out-dir", "static/pkg", "--target", "web", "--dev", "--no-typescript"]
 cwd = "ui"
 
 [tasks.run]
diff --git a/ui/static/index.html b/ui/static/index.html
index cdec6dc..40854b8 100644
--- a/ui/static/index.html
+++ b/ui/static/index.html
@@ -11,7 +11,7 @@
 
     <!-- Load the UI via WASM -->
     <script type="module">
-      import init from "./stoptime_ui.js"
+      import init from "./pkg/stoptime_ui.js"
       init()
     </script>
   </head>