@rspack/binding-wasm32-wasi 2.0.0-rc.0 → 2.0.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/binding-wasm32-wasi",
-  "version": "2.0.0-rc.0",
+  "version": "2.0.0-rc.2",
   "license": "MIT",
   "description": "Node binding for rspack",
   "main": "rspack.wasi.cjs",
@@ -23,7 +23,9 @@
     "wasi-worker-browser.mjs"
   ],
   "dependencies": {
-    "@napi-rs/wasm-runtime": "1.1.2"
+    "@emnapi/core": "1.9.2",
+    "@emnapi/runtime": "1.9.2",
+    "@napi-rs/wasm-runtime": "1.1.3"
   },
   "cpu": [
     "wasm32"

package/rspack.wasi-browser.js

@@ -21,9 +21,10 @@ const __wasmUrl = new URL('./rspack.wasm32-wasi.wasm', import.meta.url).href
 const __emnapiContext = __emnapiGetDefaultContext()
 __emnapiContext.feature.Buffer = Buffer
 
+// Allocate 2GB fixed shared memory (initial == maximum to disable memory.grow).
 const __sharedMemory = new WebAssembly.Memory({
-  initial: 16384,
-  maximum: 65536,
+  initial: 32768,
+  maximum: 32768,
   shared: true,
 })
 
@@ -57,6 +58,10 @@ const {
       ...importObject.napi,
       ...importObject.emnapi,
       memory: __sharedMemory,
+      // Override emnapi's napi_adjust_external_memory to a no-op.
+      // emnapi implements this by calling memory.grow, but we've disabled memory.grow
+      // (initial == maximum).
+      napi_adjust_external_memory() { return 0 },
     }
     return importObject
   },

package/rspack.wasi.cjs

@@ -26,18 +26,20 @@ const __wasi = new __nodeWASI({
 
 const __emnapiContext = __emnapiGetDefaultContext()
 
+// Allocate 2GB fixed shared memory (initial == maximum to disable memory.grow).
 const __sharedMemory = new WebAssembly.Memory({
-  initial: 16384,
-  maximum: 65536,
+  initial: 32768,
+  maximum: 32768,
   shared: true,
 })
 
-let __wasmFilePath = __nodePath.join(__dirname, 'rspack.wasm32-wasi.wasm')
-const __wasmDebugFilePath = __nodePath.join(__dirname, 'rspack.wasm32-wasi.debug.wasm')
+const localWasmFilePath = __nodePath.join(__dirname, 'rspack.wasm32-wasi.wasm')
 
-if (__nodeFs.existsSync(__wasmDebugFilePath)) {
-  __wasmFilePath = __wasmDebugFilePath
-} else if (!__nodeFs.existsSync(__wasmFilePath)) {
+let __wasmFilePath;
+
+if (__nodeFs.existsSync(localWasmFilePath)) {
+  __wasmFilePath = localWasmFilePath
+} else {
   try {
     __wasmFilePath = require.resolve('@rspack/binding-wasm32-wasi/rspack.wasm32-wasi.wasm')
   } catch {
@@ -47,7 +49,7 @@ if (__nodeFs.existsSync(__wasmDebugFilePath)) {
 
 const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule } = __emnapiInstantiateNapiModuleSync(__nodeFs.readFileSync(__wasmFilePath), {
   context: __emnapiContext,
-  asyncWorkPoolSize: (function() {
+  asyncWorkPoolSize: (function () {
     const threadsSizeFromEnv = Number(process.env.NAPI_RS_ASYNC_WORK_POOL_SIZE ?? process.env.UV_THREADPOOL_SIZE)
     // NaN > 0 is false
     if (threadsSizeFromEnv > 0) {
@@ -76,14 +78,14 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
         s.toString().includes("kPublicPort")
       );
       if (kPublicPort) {
-        worker[kPublicPort].ref = () => {};
+        worker[kPublicPort].ref = () => { };
       }
 
       const kHandle = Object.getOwnPropertySymbols(worker).find(s =>
         s.toString().includes("kHandle")
       );
       if (kHandle) {
-        worker[kHandle].ref = () => {};
+        worker[kHandle].ref = () => { };
       }
 
       worker.unref();
@@ -96,6 +98,10 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
       ...importObject.napi,
       ...importObject.emnapi,
       memory: __sharedMemory,
+      // Override emnapi's napi_adjust_external_memory to a no-op.
+      // emnapi implements this by calling memory.grow, but we've disabled memory.grow
+      // (initial == maximum).
+      napi_adjust_external_memory() { return 0 },
     }
     return importObject
   },

package/wasi-worker-browser.mjs

@@ -16,10 +16,10 @@ const handler = new MessageHandler({
         // eslint-disable-next-line no-console
         console.log.apply(console, arguments)
       },
-      printErr: function() {
+      printErr: function () {
         // eslint-disable-next-line no-console
         console.error.apply(console, arguments)
-        
+
         errorOutputs.push([...arguments])
       },
     })
@@ -32,6 +32,10 @@ const handler = new MessageHandler({
           ...importObject.napi,
           ...importObject.emnapi,
           memory: wasmMemory,
+          // Override emnapi's napi_adjust_external_memory to a no-op.
+          // emnapi implements this by calling memory.grow, but we've disabled memory.grow
+          // (initial == maximum).
+          napi_adjust_external_memory() { return 0 },
         }
       },
     })

package/wasi-worker.mjs

@@ -19,7 +19,7 @@ Object.assign(globalThis, {
   require,
   Worker,
   importScripts: function (f) {
-    ;(0, eval)(fs.readFileSync(f, "utf8") + "//# sourceURL=" + f);
+    ; (0, eval)(fs.readFileSync(f, "utf8") + "//# sourceURL=" + f);
   },
   postMessage: function (msg) {
     if (parentPort) {
@@ -51,7 +51,11 @@ const handler = new MessageHandler({
           ...importObject.env,
           ...importObject.napi,
           ...importObject.emnapi,
-          memory: wasmMemory
+          memory: wasmMemory,
+          // Override emnapi's napi_adjust_external_memory to a no-op.
+          // emnapi implements this by calling memory.grow, but we've disabled memory.grow
+          // (initial == maximum).
+          napi_adjust_external_memory() { return 0 },
         };
       },
     });