Merge branch 'main' into renovate/pnpm-package-manager

Author: stormslowly

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/ci.yml

@@ -209,7 +209,15 @@ jobs:
       - run: cargo test --all-features
         env:
           RUST_MIN_STACK: 8388608
-      - name: Test Node Bindings
+      - name: Build Node Bindings
+        run: npm run build:binding:debug
+      - name: Test
+        run: npm test
+      - name: Git status check
         run: |
-          npm run build:binding:debug
-          npm test
+          npm run format
+          if [[ -n "$(git status --porcelain)" ]]; then
+            echo "Working tree is dirty after tests/build. Please commit or revert the following changes:"
+            git status --short
+            exit 1
+          fi

.husky/pre-commit

@@ -1,4 +1,5 @@
 use std::{
+  alloc::{GlobalAlloc, Layout, System},
   env, fs,
   fs::read_to_string,
   future::Future,
@@ -7,6 +8,24 @@ use std::{
   sync::Arc,
 };
 
+#[global_allocator]
+static GLOBAL: NeverGrowInPlaceAllocator = NeverGrowInPlaceAllocator;
+
+/// Delegates `alloc`/`dealloc` to [`System`] but omits [`GlobalAlloc::realloc`],
+/// forcing the default "alloc-new + copy + dealloc-old" path so that benchmarks
+/// never benefit from non-deterministic in-place growth provided by `libc::realloc`.
+struct NeverGrowInPlaceAllocator;
+
+unsafe impl GlobalAlloc for NeverGrowInPlaceAllocator {
+  unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+    unsafe { System.alloc(layout) }
+  }
+
+  unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
+    unsafe { System.dealloc(ptr, layout) }
+  }
+}
+
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use rspack_resolver::{FileSystemOptions, FileSystemOs, ResolveOptions, Resolver};
 use serde_json::Value;

benches/resolver.rs

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "exports": "./a.js",
   "imports": {
+    "#/*": "./src/*.js",
     "#imports-field": "./b.js",
     "#b": "../b.js",
     "#ccc/": "c/",

fixtures/enhanced_resolve/test/fixtures/imports-field/package.json

@@ -0,0 +1 @@
+module.exports = "foo";

fixtures/enhanced_resolve/test/fixtures/imports-field/src/foo.js

@@ -194,6 +194,12 @@ export interface NapiResolveOptions {
    * Default `false`
    */
   enablePnp?: boolean;
+  /**
+   * Whether to enable `NODE_PATH` support
+   *
+   * Default `false`
+   */
+  nodePath?: boolean;
 }
 
 export interface ResolveResult {

napi/index.d.ts

@@ -42,7 +42,8 @@ if (__nodeFs.existsSync(__wasmDebugFilePath)) {
   __wasmFilePath = __wasmDebugFilePath;
 } else if (!__nodeFs.existsSync(__wasmFilePath)) {
   try {
-    __wasmFilePath = __nodePath.resolve("@rspack/resolver-binding-wasm32-wasi");
+    __wasmFilePath =
+      require.resolve("@rspack/resolver-binding-wasm32-wasi/resolver.wasm32-wasi.wasm");
   } catch {
     throw new Error(
       "Cannot find resolver.wasm32-wasi.wasm file, and @rspack/resolver-binding-wasm32-wasi package is not installed."

napi/index.js

@@ -215,6 +215,7 @@ impl ResolverFactory {
       symlinks: op.symlinks.unwrap_or(default.symlinks),
       builtin_modules: op.builtin_modules.unwrap_or(default.builtin_modules),
       enable_pnp: op.enable_pnp.unwrap_or_default(),
+      node_path: op.node_path.unwrap_or_default(),
     }
   }
 }