wasm bindgen submodule support (#802)

Author: guybedford

.github/workflows/pullrequest.yml

@@ -10,6 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@stable
@@ -42,6 +44,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@stable
@@ -79,14 +83,17 @@ jobs:
       - name: Install wasmpack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 
+      - name: Build wasm-bindgen
+        run: cd wasm-bindgen && cargo build --release --package wasm-bindgen-cli --bin wasm-bindgen
+
       - name: Build local worker-build
         run: cargo install --path ./worker-build --force --debug
 
       - name: Install npm dependencies
         run: npm ci
 
       - name: Run tests
-        run: npm run test
+        run: WASM_BINDGEN_PATH=./wasm-bindgen/target/release/wasm-bindgen npm run test
 
       - name: Run tests (http)
-        run: npm run test-http
+        run: WASM_BINDGEN_PATH=./wasm-bindgen/target/release/wasm-bindgen npm run test-http

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "wasm-bindgen"]
+	path = wasm-bindgen
+	url = [email protected]:wasm-bindgen/wasm-bindgen

Cargo.lock

@@ -8,7 +8,7 @@ members = [
     "worker-kv",
     "examples/*",
 ]
-exclude = ["examples/coredump", "examples/axum", "templates/*"]
+exclude = ["examples/coredump", "examples/axum", "templates/*", "wasm-bindgen"]
 resolver = "2"
 
 [workspace.dependencies]
@@ -19,15 +19,17 @@ chrono = { version = "0.4.41", default-features = false, features = [
 futures-channel = "0.3.31"
 futures-util = { version = "0.3.31", default-features = false }
 http = "1.3"
-js-sys = "0.3.77"
+js-sys = { version = "0.3.78", path = "./wasm-bindgen/crates/js-sys" }
 serde = { version = "1.0.164", features = ["derive"] }
 serde_json = "1.0.140"
 serde-wasm-bindgen = "0.6.5"
-wasm-bindgen = "0.2.101"
-wasm-bindgen-cli-support = "0.2.101"
-wasm-bindgen-futures = "0.4.51"
-wasm-bindgen-macro-support = "0.2.101"
-wasm-bindgen-test = "0.3.51"
+wasm-bindgen = { version = "0.2.101", path = "./wasm-bindgen" }
+wasm-bindgen-cli-support = { version = "0.2.101", path = "./wasm-bindgen/crates/cli-support" }
+wasm-bindgen-futures = { version = "0.4.51", path = "./wasm-bindgen/crates/futures" }
+wasm-bindgen-macro-support = { version = "0.2.101", path = "./wasm-bindgen/crates/macro-support" }
+wasm-bindgen-shared = { version = "0.2.101", path = "./wasm-bindgen/crates/shared" }
+wasm-bindgen-test = { version = "0.3.51", path = "./wasm-bindgen/crates/test" }
+web-sys = { version = "0.3.78", path = "./wasm-bindgen/crates/web-sys" }
 worker = { path = "worker", version = "0.6.1", features = ["queue", "d1", "axum", "timezone"] }
 worker-build = { path = "worker-build", version = "0.1.4" }
 worker-codegen = { path = "worker-codegen", version = "0.2.0" }
@@ -57,3 +59,13 @@ lto = true
 [profile.release.package."*"]
 codegen-units = 1
 opt-level = "z"
+
+[patch.crates-io]
+js-sys = { version = "0.3.78", path = './wasm-bindgen/crates/js-sys' }
+wasm-bindgen = { version = "0.2.101", path = './wasm-bindgen' }
+wasm-bindgen-cli-support = { version = "0.2.101", path = "./wasm-bindgen/crates/cli-support" }
+wasm-bindgen-futures = { version = "0.4.51", path = './wasm-bindgen/crates/futures' }
+wasm-bindgen-macro-support = { version = "0.2.101", path = "./wasm-bindgen/crates/macro-support" }
+wasm-bindgen-shared = { version = "0.2.101", path = "./wasm-bindgen/crates/shared" }
+wasm-bindgen-test = { version = "0.3.51", path = "./wasm-bindgen/crates/test" }
+web-sys = { version = "0.3.78", path = './wasm-bindgen/crates/web-sys' }

Cargo.toml

@@ -22,9 +22,9 @@
     "vitest": "^3.2.4"
   },
   "scripts": {
-    "install": "cargo install --path ./worker-build --force --debug",
-    "test": "cd worker-sandbox && NO_MINIFY=1 worker-build --dev && NODE_OPTIONS=--experimental-vm-modules npx vitest run",
-    "test-http": "cd worker-sandbox && NO_MINIFY=1 worker-build --dev --features http && NODE_OPTIONS=--experimental-vm-modules npx vitest run",
+    "install": "cd wasm-bindgen && cargo build --release --package wasm-bindgen-cli --bin wasm-bindgen && cd .. && cargo install --path ./worker-build --force --debug",
+    "test": "cd worker-sandbox && NO_MINIFY=1 WASM_BINDGEN_PATH=../wasm-bindgen/target/release/wasm-bindgen worker-build --dev && NODE_OPTIONS=--experimental-vm-modules npx vitest run",
+    "test-http": "cd worker-sandbox && NO_MINIFY=1 WASM_BINDGEN_PATH=../wasm-bindgen/target/release/wasm-bindgen worker-build --dev --features http && NODE_OPTIONS=--experimental-vm-modules npx vitest run",
     "lint": "cargo clippy --features d1,queue --all-targets --workspace -- -D warnings",
     "lint:fix": "cargo fmt && cargo clippy --features d1,queue --all-targets --workspace --fix -- -D warnings"
   }

package.json

@@ -52,6 +52,26 @@ pub fn download_prebuilt_or_cargo_install(
     version: &str,
     install_permitted: bool,
 ) -> Result<Status> {
+    // Check for custom wasm-bindgen path via environment variable
+    if matches!(tool, Tool::WasmBindgen) {
+        if let Ok(custom_path) = env::var("WASM_BINDGEN_PATH") {
+            let path = Path::new(&custom_path);
+            if path.exists() {
+                info!(
+                    "Using custom wasm-bindgen from WASM_BINDGEN_PATH: {}",
+                    custom_path
+                );
+                let download = Download::at(path.parent().unwrap_or(path));
+                return Ok(Status::Found(download));
+            } else {
+                warn!(
+                    "WASM_BINDGEN_PATH set but path doesn't exist: {}",
+                    custom_path
+                );
+            }
+        }
+    }
+
     // If the tool is installed globally and it has the right version, use
     // that. Assume that other tools are installed next to it.
     //