Merge branch 'main' into fy/friendly-volhard

Author: JSerFeng

.cargo/config.toml

@@ -55,7 +55,12 @@ rustflags = [
 [target.wasm32-wasip1-threads]
 rustflags = [
   "-C",
-  "target-feature=+simd128", 
+  "target-feature=+simd128",
+  "-C",
+  # Set initial and max memory to 2GB to disable memory.grow at runtime.
+  # The allocator uses this link-time value to decide whether to call memory.grow,
+  # so it must match the runtime initial pages to ensure memory.grow is never called.
+  "link-args=--initial-memory=2147483648 --max-memory=2147483648",
   "--cfg", "tokio_unstable"
 ]
 

.github/workflows/bench-rust.yml

@@ -49,7 +49,7 @@ jobs:
           key: rust-bench-${{ inputs.target }}
 
       - name: Install cargo-codspeed binary
-        uses: taiki-e/install-action@d858f8113943481093e02986a7586a4819a3bfd6 # v2
+        uses: taiki-e/install-action@0abfcd587b70a713fdaa7fb502c885e2112acb15 # v2
         with:
           tool: cargo-codspeed@4.4.1
 

.github/workflows/reusable-build-build.yml

@@ -70,7 +70,7 @@ jobs:
 
       - name: Install cargo-zigbuild for musl build
         if: ${{ contains(inputs.target, 'musl') }}
-        uses: taiki-e/install-action@d858f8113943481093e02986a7586a4819a3bfd6 # v2
+        uses: taiki-e/install-action@0abfcd587b70a713fdaa7fb502c885e2112acb15 # v2
         with:
           tool: cargo-zigbuild
 
@@ -156,6 +156,7 @@ jobs:
       - name: Build wasm32-wasip1-threads with linux
         if: ${{ inputs.target == 'wasm32-wasip1-threads' && inputs.profile != 'release' }}
         run: |
+
           DISABLE_PLUGIN=1 RUST_TARGET=wasm32-wasip1-threads RSPACK_TARGET_BROWSER=1 pnpm build:binding:${{ inputs.profile }}
           DISABLE_PLUGIN=1 RUST_TARGET=wasm32-wasip1-threads pnpm build:binding:${{ inputs.profile }}
 

.github/workflows/reusable-build-test.yml

@@ -172,8 +172,7 @@ jobs:
           NODE_NO_WARNINGS: 1
           WASM: 1
           RSPACK_LOADER_WORKER_THREADS: 1
-          NODE_OPTIONS: '--max_old_space_size=8192 --stack-trace-limit=100'
-        run: pnpm run build:js && pnpm --filter "@rspack/cli" test && pnpm --filter "@rspack/tests" test
+        run: pnpm run test:ci
 
       - name: Upload Test Reporter
         if: always()

.github/workflows/reusable-rust-test.yml

@@ -95,7 +95,7 @@ jobs:
         run: cargo codegen
 
       - name: Install cargo-deny
-        uses: taiki-e/install-action@d858f8113943481093e02986a7586a4819a3bfd6 # v2
+        uses: taiki-e/install-action@0abfcd587b70a713fdaa7fb502c885e2112acb15 # v2
         with:
           tool: cargo-deny@0.18.3
       - name: Check licenses

crates/node_binding/package.json

@@ -35,8 +35,8 @@
   "devDependencies": {
     "@emnapi/core": "1.9.2",
     "@emnapi/runtime": "1.9.2",
-    "@napi-rs/cli": "3.6.0",
-    "@napi-rs/wasm-runtime": "1.1.2",
+    "@napi-rs/cli": "3.6.1",
+    "@napi-rs/wasm-runtime": "1.1.3",
     "@types/node": "^20.19.39",
     "emnapi": "1.9.2",
     "typescript": "^6.0.2"

crates/node_binding/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
   },

crates/node_binding/rspack.wasi.cjs

@@ -26,9 +26,10 @@ 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,
 })
 
@@ -97,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
   },

crates/node_binding/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 },
         }
       },
     })

crates/node_binding/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 },
         };
       },
     });