Bump wasm-bodge to 0.2.1 (#73)

* Bump wasm-bodge to 0.2.1

This release of wasm-bodge correctly handles scoped package names, which
means we no longer need the workarounds we had in place.

* Run `bodge:all`

* Updates automerge_subduction_wasm package name

---------

Co-authored-by: Brooklyn Zelenka <hello@brooklynzelenka.com>

Author: alexjg

automerge_sedimentree_wasm/package.json

@@ -65,7 +65,7 @@
       "import": "./dist/esm/slim.js",
       "require": "./dist/cjs/slim.cjs"
     },
-    "./wasm": "./dist/@automerge/automerge-sedimentree.wasm",
+    "./wasm": "./dist/automerge-sedimentree.wasm",
     "./wasm-base64": {
       "import": "./dist/esm/wasm-base64.js",
       "require": "./dist/cjs/wasm-base64.cjs"

automerge_subduction_wasm/package.json

@@ -65,7 +65,7 @@
       "import": "./dist/esm/slim.js",
       "require": "./dist/cjs/slim.cjs"
     },
-    "./wasm": "./dist/@automerge/automerge-subduction.wasm",
+    "./wasm": "./dist/automerge-subduction.wasm",
     "./wasm-base64": {
       "import": "./dist/esm/wasm-base64.js",
       "require": "./dist/cjs/wasm-base64.cjs"

flake.nix

@@ -92,14 +92,14 @@
 
         wasm-bodge = wasm-bodge-rustPlatform.buildRustPackage rec {
           pname = "wasm-bodge";
-          version = "0.2.0";
+          version = "0.2.1";
           src = pkgs.fetchFromGitHub {
             owner = "alexjg";
             repo = "wasm-bodge";
             rev = "v${version}";
-            hash = "sha256-yuCaOiGRHluZdYMG1U8A7eWF7eFOavldd+objwekB9E=";
+            hash = "sha256-dUlcAmhX1b87cvzv0+fLjVy+vnWR48FwjjrePl0KMfc=";
           };
-          cargoHash = "sha256-UOi8yE+hftKHMU/C/UCt3kfUNzQFDWE9VQ0dc7mDw5M=";
+          cargoHash = "sha256-CHZ5gzn1PczucqahQi+k9QjVdrTweK1TqNSrDXMRYUE=";
           nativeBuildInputs = [ unstable.cargo-auditable ];
           doCheck = false; # tests require npm/puppeteer infrastructure
         };

nix/commands.nix

@@ -482,24 +482,9 @@
     "bodge:all" = cmd "Build all wasm packages with wasm-bodge" ''
       set -e
 
-      # Workaround: wasm-bodge doesn't mkdir parents for scoped package names
-      # (e.g. dist/@automerge/ for @automerge/subduction.wasm).
-      # Pre-create the scope directory so the .wasm copy succeeds.
-      ensure_scope_dir() {
-        local pkg_json="$1"
-        local out_dir="$2"
-        local pkg_name
-        pkg_name=$(${pkgs.jq}/bin/jq -r '.name' "$pkg_json")
-        if [[ "$pkg_name" == @*/* ]]; then
-          local scope="''${pkg_name%%/*}"
-          mkdir -p "$out_dir/$scope"
-        fi
-      }
-
       for crate in sedimentree_wasm subduction_wasm automerge_sedimentree_wasm automerge_subduction_wasm; do
         echo "===> wasm-bodge build $crate..."
         rm -rf "$WORKSPACE_ROOT/$crate/dist"
-        ensure_scope_dir "$WORKSPACE_ROOT/$crate/package.json" "$WORKSPACE_ROOT/$crate/dist"
         ${wasm-bodge-bin} build \
           --crate-path "$WORKSPACE_ROOT/$crate" \
           --package-json "$WORKSPACE_ROOT/$crate/package.json" \
@@ -535,13 +520,6 @@
 
       rm -rf "$WORKSPACE_ROOT/$CRATE/dist"
 
-      # Workaround: wasm-bodge doesn't mkdir parents for scoped package names
-      PKG_NAME=$(${pkgs.jq}/bin/jq -r '.name' "$WORKSPACE_ROOT/$CRATE/package.json")
-      if [[ "$PKG_NAME" == @*/* ]]; then
-        SCOPE="''${PKG_NAME%%/*}"
-        mkdir -p "$WORKSPACE_ROOT/$CRATE/dist/$SCOPE"
-      fi
-
       echo "===> wasm-bodge build $CRATE..."
       ${wasm-bodge-bin} build \
         --crate-path "$WORKSPACE_ROOT/$CRATE" \

sedimentree_wasm/package.json

@@ -64,7 +64,7 @@
       "import": "./dist/esm/slim.js",
       "require": "./dist/cjs/slim.cjs"
     },
-    "./wasm": "./dist/@automerge/sedimentree.wasm",
+    "./wasm": "./dist/sedimentree.wasm",
     "./wasm-base64": {
       "import": "./dist/esm/wasm-base64.js",
       "require": "./dist/cjs/wasm-base64.cjs"

subduction_wasm/package.json

@@ -68,7 +68,7 @@
       "import": "./dist/esm/slim.js",
       "require": "./dist/cjs/slim.cjs"
     },
-    "./wasm": "./dist/@automerge/subduction.wasm",
+    "./wasm": "./dist/subduction.wasm",
     "./wasm-base64": {
       "import": "./dist/esm/wasm-base64.js",
       "require": "./dist/cjs/wasm-base64.cjs"