Merge pull request #506 from gridaco/canary

emsdk 5.0.0

Author: softmarshmallow

.github/workflows/build-canvas.yml

@@ -7,8 +7,8 @@ on:
       - main
   pull_request:
     paths:
-      - ".github/workflows/*"
-      - "crates/*"
+      - ".github/workflows/**"
+      - "crates/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/test-crates.yml

@@ -6,8 +6,8 @@ on:
       - main
   pull_request:
     paths:
-      - ".github/workflows/*"
-      - "crates/*"
+      - ".github/workflows/**"
+      - "crates/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

bin/activate-emsdk

@@ -14,8 +14,9 @@ EMSDK_ROOT = os.path.join('third_party', 'externals', 'emsdk')
 
 EMSDK_PATH = os.path.join(EMSDK_ROOT, 'emsdk.py')
 
-# This should match what's in //MODULE.bazel
-EMSDK_VERSION = '4.0.7'
+# Keep this aligned with the emsdk submodule and local builds.
+# (The emsdk git submodule is currently at 5.0.0.)
+EMSDK_VERSION = '5.0.0'
 
 def main():
     if sysconfig.get_platform() in ['linux-aarch64', 'linux-arm64']:

crates/grida-canvas-wasm/.cargo/config.toml

@@ -37,7 +37,6 @@ rustflags = [
   # Allow undefined symbols (useful for dynamic linking and Skia integration)
   "-C",
   "link-arg=-sERROR_ON_UNDEFINED_SYMBOLS=0",
-  # Currently only targeting web (fs=false)
   # Target both web (browser) and Node.js.
   # NOTE: this affects the generated Emscripten JS glue (loader/runtime selection).
   "-C",

crates/grida-canvas-wasm/AGENTS.md

@@ -14,25 +14,16 @@ Note: the artifacts are git included for faster CI builds.
 
 When building the WASM glue with `-sENVIRONMENT=web,node`, Emscripten emits a Node-only branch that uses Node built-ins (`fs`, `path`, sometimes `crypto`). Some bundlers (notably **Next.js Turbopack**) will still try to resolve those built-ins when the module is imported from a Client Component and fail with **"Can't resolve 'fs'"**.
 
-We keep a **single package** that works in both browser and Node by combining three measures:
-
-- **Patch Emscripten glue to use `node:*` built-ins**
-  - Script: `scripts/prebuild-patch-emscripten-js-glue.cjs`
-  - Patched file: `lib/bin/grida-canvas-wasm.js`
-  - Rewrites `require("fs")` → `require("node:fs")`, `require("path")` → `require("node:path")`, `require("crypto")` → `require("node:crypto")`
-  - Reference issue: `https://github.com/emscripten-core/emscripten/issues/26134`
+We keep a **single package** that works in both browser and Node by ensuring the Emscripten glue is not bundled into `dist/index.*`:
 
 - **Do NOT bundle the Emscripten glue into `dist/index.*`**
   - `lib/index.ts` imports `./grida-canvas-wasm` (a thin wrapper)
   - Wrapper: `lib/grida-canvas-wasm.ts` imports `./bin/grida-canvas-wasm`
   - `tsup.config.ts` sets `external: ["./grida-canvas-wasm"]` and copies `lib/bin/*` via `publicDir`
   - Result: `dist/index.js` only imports `./grida-canvas-wasm`, and the actual glue stays as `dist/grida-canvas-wasm.js` (copied), so Turbopack never sees Node built-ins inside the bundled entry.
 
-- **Run the glue patch before bundling**
-  - `package.json` uses `prebuild` to patch `lib/bin/grida-canvas-wasm.js` before `tsup` runs.
-
 ⚠️ Notes:
-- Simply setting `tsup.external` to `["node:fs", "node:path", ...]` is **not sufficient** here; bundling the glue can still produce `require("fs")` in `dist/index.js`, which breaks Turbopack.
+- Simply setting `tsup.external` to `["node:fs", "node:path", ...]` is **not sufficient** here; bundling the glue can still produce Node built-in imports in `dist/index.js`, which breaks Turbopack.
 - If you change `lib/index.ts` to import `./bin/grida-canvas-wasm` directly (no wrapper + external), re-verify `pnpm --filter editor build` with Turbopack.
 
 ## Build System

crates/grida-canvas-wasm/lib/bin/grida-canvas-wasm.js

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:efe80841ff082eae434cad346ece1ad6d91fa10fc4ae3e0a7a400cf13c88c3c8
-size 12868264
+oid sha256:16bc581263902e9085c4275cad54587f8018f81e1f63e74c667adb09b9b92b6a
+size 12867497

crates/grida-canvas-wasm/lib/bin/grida_canvas_wasm.wasm

@@ -1,6 +1,6 @@
 {
   "name": "@grida/canvas-wasm",
-  "version": "0.90.0-canary.0",
+  "version": "0.90.0-canary.2",
   "private": false,
   "description": "WASM bindings for Grida Canvas",
   "keywords": [
@@ -21,7 +21,6 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsup",
-    "prebuild": "node ./scripts/prebuild-patch-emscripten-js-glue.cjs",
     "dev": "tsup --watch",
     "serve": "serve -p 4020",
     "test": "vitest run",

crates/grida-canvas-wasm/package.json

@@ -1206,9 +1206,6 @@ pub struct JSONBooleanOperationNode {
 fn default_active() -> bool {
     true
 }
-fn default_locked() -> bool {
-    false
-}
 fn default_false() -> bool {
     false
 }
@@ -1218,10 +1215,6 @@ fn default_opacity() -> f32 {
 fn default_rotation() -> f32 {
     0.0
 }
-fn default_z_index() -> i32 {
-    0
-}
-
 fn default_stroke_width() -> f32 {
     0.0
 }