From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 8 Jul 2021 12:05:44 +0000 (+0100)
Subject: Makefile: move --no-modules out of WASM_BINDGEN_OPTIONS
X-Git-Tag: otter-0.7.2~244
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6a03c15ac64c83221e91a54006f367e3c6e038a0;p=otter.git

Makefile: move --no-modules out of WASM_BINDGEN_OPTIONS

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Makefile b/Makefile
index cce4386c..63ea8ddf 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ USVG_OPTIONS = "--sans-serif-family=DejaVu Sans"
 WASM_BINDGEN = $(TARGET_DIR)/debug/wasm-bindgen
 WASM_BINDGEN_OPTIONS =						\
 	--remove-name-section --remove-producers-section	\
-	--typescript --no-modules				\
+	--typescript
 
 BUNDLE_SOURCES ?= bundle-rust-sources
 
@@ -256,7 +256,8 @@ docs/html/examples/%.toml: specs/%.toml
 $(addprefix $(WASM_PACKED)/,$(WASM_ASSETS) $(WASM_OUTPUTS)): stamp/wasm-bindgen
 stamp/wasm-bindgen: stamp/cargo.wasm-bindgen stamp/cargo.wasm-release
 	$(NAILING_CARGO_JUST_RUN) $(abspath $(WASM_BINDGEN)) \
-		$(WASM_BINDGEN_OPTIONS)	--out-dir target/packed-wasm \
+		$(WASM_BINDGEN_OPTIONS) --no-modules \
+		--out-dir target/packed-wasm \
 		target/$(WASM)/release/otter_wasm.wasm
 	$(stamp)
 
diff --git a/wasmtest.nodejs b/jstest/wasmtest.nodejs
similarity index 100%
rename from wasmtest.nodejs
rename to jstest/wasmtest.nodejs