Add mls-rs-wasm as dependency and fix WASM packaging (#1803)

- adds `mls-rs-wasm` as a dependency of `sdk`,
- fixes packaging for `stress`, and
- fixes packaging for `playground`.

packages/playground/package.json

@@ -65,6 +65,7 @@
         "vite": "^5.3.1",
         "vite-plugin-checker": "^0.8.0",
         "vite-plugin-replace": "^0.1.1",
+        "vite-plugin-wasm": "^3.3.0",
         "vite-tsconfig-paths": "^5.1.3"
     }
 }

packages/playground/vite.config.ts

@@ -4,6 +4,7 @@ import { default as checker } from 'vite-plugin-checker'
 import { nodePolyfills } from 'vite-plugin-node-polyfills'
 import { replaceCodePlugin } from 'vite-plugin-replace'
 import tsconfigPaths from 'vite-tsconfig-paths'
+import wasm from 'vite-plugin-wasm'
 import path from 'path'
 
 // https://vitejs.dev/config/
@@ -19,6 +20,7 @@ export default ({ mode }: { mode: string }) => {
             exclude: ['@connectrpc/connect-node'],
         },
         plugins: [
+            wasm(),
             tsconfigPaths(),
             replaceCodePlugin({
                 replacements: [

packages/sdk/package.json

@@ -29,6 +29,7 @@
         "@ethereumjs/util": "^8.0.1",
         "@river-build/dlog": "workspace:^",
         "@river-build/encryption": "workspace:^",
+        "@river-build/mls-rs-wasm": "^0.0.4",
         "@river-build/proto": "workspace:^",
         "@river-build/web3": "workspace:^",
         "browser-or-node": "^3.0.0",

packages/stress/esbuild.config.mjs

@@ -1,18 +1,24 @@
 import { build } from "esbuild";
-import { wasmLoader } from "esbuild-plugin-wasm";
 import esbuildPluginPino from "esbuild-plugin-pino";
 
 build({
-  entryPoints: ["./src/start.ts", "./src/demo.ts"],
+  entryPoints: {
+    start: "./src/start.ts",
+    demo: "./src/demo.ts",
+    // NOTE: For some reason esbuild is not picking it up
+    mls_rs_wasm_bg: "@river-build/mls-rs-wasm-node/mls_rs_wasm_bg.wasm",
+  },
   bundle: true,
   sourcemap: "inline",
   platform: "node",
   target: "node20",
   format: "cjs",
   outdir: "dist",
   outExtension: { ".js": ".cjs" },
-  plugins: [wasmLoader(), esbuildPluginPino({ transports: ["pino-pretty"] })],
-
+  plugins: [esbuildPluginPino({ transports: ["pino-pretty"] })],
+  alias: {
+    "@river-build/mls-rs-wasm": "@river-build/mls-rs-wasm-node",
+  },
   ignoreAnnotations: true,
   assetNames: "[name]",
   loader: {

packages/stress/package.json

@@ -29,13 +29,13 @@
         "pino-pretty": "^10.2.3"
     },
     "devDependencies": {
+        "@river-build/mls-rs-wasm-node": "^0.0.4",
         "@types/debug": "^4.1.8",
         "@types/lodash": "^4.14.186",
         "@types/node": "^20.5.0",
         "@typescript-eslint/eslint-plugin": "^6.10.0",
         "@typescript-eslint/parser": "^7.14.1",
         "esbuild": "^0.21.5",
-        "esbuild-plugin-wasm": "^1.1.0",
         "eslint": "^8.53.0",
         "eslint-import-resolver-typescript": "^3.5.5",
         "eslint-plugin-import": "^2.27.5",

yarn.lock

@@ -6530,6 +6530,20 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@river-build/mls-rs-wasm-node@npm:^0.0.4":
+  version: 0.0.4
+  resolution: "@river-build/mls-rs-wasm-node@npm:0.0.4"
+  checksum: 11983d654e4b48f3f5c61a3c662717e9697b72e986e41b19e26876c8f96136ee896e5eaf9ed166273f220d46ed63d41c7a0d55be4af0dbd2571be23c73a835c4
+  languageName: node
+  linkType: hard
+
+"@river-build/mls-rs-wasm@npm:^0.0.4":
+  version: 0.0.4
+  resolution: "@river-build/mls-rs-wasm@npm:0.0.4"
+  checksum: 9cb4cca4222bc260ae880395441b21b75a79486b07aeb0cdc39342ad510e836bd4ec87f93b5fd483da8827f2460cbe588c1e2703d7542be25acffe10f6d78eaa
+  languageName: node
+  linkType: hard
+
 "@river-build/playground@workspace:packages/playground":
   version: 0.0.0-use.local
   resolution: "@river-build/playground@workspace:packages/playground"
@@ -6585,6 +6599,7 @@ __metadata:
     vite-plugin-checker: ^0.8.0
     vite-plugin-node-polyfills: ^0.22.0
     vite-plugin-replace: ^0.1.1
+    vite-plugin-wasm: ^3.3.0
     vite-tsconfig-paths: ^5.1.3
     wagmi: ^2.13.0
     zod: ^3.21.4
@@ -6665,6 +6680,7 @@ __metadata:
     "@ethereumjs/util": ^8.0.1
     "@river-build/dlog": "workspace:^"
     "@river-build/encryption": "workspace:^"
+    "@river-build/mls-rs-wasm": ^0.0.4
     "@river-build/proto": "workspace:^"
     "@river-build/web3": "workspace:^"
     "@testing-library/react": ^14.2.1
@@ -6748,6 +6764,7 @@ __metadata:
     "@bufbuild/protobuf": ^1.9.0
     "@river-build/dlog": "workspace:^"
     "@river-build/encryption": "workspace:^"
+    "@river-build/mls-rs-wasm-node": ^0.0.4
     "@river-build/proto": "workspace:^"
     "@river-build/sdk": "workspace:^"
     "@river-build/web3": "workspace:^"
@@ -6758,7 +6775,6 @@ __metadata:
     "@typescript-eslint/parser": ^7.14.1
     esbuild: ^0.21.5
     esbuild-plugin-pino: ^2.2.0
-    esbuild-plugin-wasm: ^1.1.0
     eslint: ^8.53.0
     eslint-import-resolver-typescript: ^3.5.5
     eslint-plugin-import: ^2.27.5
@@ -13858,13 +13874,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-plugin-wasm@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "esbuild-plugin-wasm@npm:1.1.0"
-  checksum: 382df12ecb92634d0f526cad4792b0ac5dc8016cdf63e23d9ee099f0f2c530855463cc45045c4a6ec10a6a1bd2ff59b5c4b24e6314a361fa70cc57645caf602b
-  languageName: node
-  linkType: hard
-
 "esbuild@npm:0.17.19":
   version: 0.17.19
   resolution: "esbuild@npm:0.17.19"
@@ -29839,6 +29848,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite-plugin-wasm@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "vite-plugin-wasm@npm:3.3.0"
+  peerDependencies:
+    vite: ^2 || ^3 || ^4 || ^5
+  checksum: 844034955d6650f89988eebb543e4b3307a54d7b800365052f5b97683223d3b99640ecb22d1fd770e768239576629d975bdefc0c9545999564e206b331f0ac3b
+  languageName: node
+  linkType: hard
+
 "vite-tsconfig-paths@npm:^5.1.3":
   version: 5.1.3
   resolution: "vite-tsconfig-paths@npm:5.1.3"