fix: default resolve roots (#6340)

Author: ahabhgk

Cargo.lock

@@ -25,7 +25,7 @@ json = { workspace = true }
 mime_guess = { workspace = true }
 num-bigint = "0.4.4"
 once_cell = { workspace = true }
-oxc_resolver = { version = "1.6.7", features = ["package_json_raw_json_api"] }
+oxc_resolver = { version = "1.7.0", features = ["package_json_raw_json_api"] }
 paste = { workspace = true }
 petgraph = { version = "0.6.4", features = ["serde-1"] }
 rayon = { workspace = true }

crates/rspack_core/Cargo.toml

@@ -281,6 +281,7 @@ fn to_oxc_resolver_options(
     restrictions,
     roots,
     builtin_modules: false,
+    imports_fields: vec![vec!["imports".to_string()]],
   }
 }
 

crates/rspack_core/src/resolver/resolver_impl.rs

@@ -477,6 +477,9 @@ Object {
     "modules": Array [
       "node_modules",
     ],
+    "roots": Array [
+      "<cwd>",
+    ],
   },
   "resolveLoader": Object {
     "conditionNames": Array [

packages/rspack-test-tools/tests/__snapshots__/Defaults.unittest.js.snap

@@ -9,30 +9,33 @@ module.exports = {
 	cwd: path.resolve(__dirname, "../../../../rspack/tests/fixtures"),
 	diff: e =>
 		e.toMatchInlineSnapshot(`
-    - Expected
-    + Received
+		- Expected
+		+ Received
 
-    @@ ... @@
-    -   "cache": false,
-    -   "context": "<cwd>",
-    +   "cache": Object {
-    +     "type": "filesystem",
-    +   },
-    +   "context": "<cwd>/tests/fixtures",
-    @@ ... @@
-    -     "chunkLoadingGlobal": "webpackChunk_rspack_core",
-    +     "chunkLoadingGlobal": "webpackChunk",
-    @@ ... @@
-    -     "devtoolNamespace": "@rspack/core",
-    +     "devtoolNamespace": "",
-    @@ ... @@
-    -     "hotUpdateGlobal": "webpackHotUpdate_rspack_core",
-    +     "hotUpdateGlobal": "webpackHotUpdate",
-    @@ ... @@
-    -     "path": "<cwd>/dist",
-    +     "path": "<cwd>/tests/fixtures/dist",
-    @@ ... @@
-    -     "uniqueName": "@rspack/core",
-    +     "uniqueName": "",
-  `)
+		@@ ... @@
+		-   "cache": false,
+		-   "context": "<cwd>",
+		+   "cache": Object {
+		+     "type": "filesystem",
+		+   },
+		+   "context": "<cwd>/tests/fixtures",
+		@@ ... @@
+		-     "chunkLoadingGlobal": "webpackChunk_rspack_core",
+		+     "chunkLoadingGlobal": "webpackChunk",
+		@@ ... @@
+		-     "devtoolNamespace": "@rspack/core",
+		+     "devtoolNamespace": "",
+		@@ ... @@
+		-     "hotUpdateGlobal": "webpackHotUpdate_rspack_core",
+		+     "hotUpdateGlobal": "webpackHotUpdate",
+		@@ ... @@
+		-     "path": "<cwd>/dist",
+		+     "path": "<cwd>/tests/fixtures/dist",
+		@@ ... @@
+		-     "uniqueName": "@rspack/core",
+		+     "uniqueName": "",
+		@@ ... @@
+		-       "<cwd>",
+		+       "<cwd>/tests/fixtures",
+	`)
 };

packages/rspack-test-tools/tests/defaultsCases/cache/non-root.js

@@ -6,23 +6,26 @@ module.exports = {
 	}),
 	diff: e =>
 		e.toMatchInlineSnapshot(`
-    - Expected
-    + Received
+		- Expected
+		+ Received
 
-    @@ ... @@
-    -   "context": "<cwd>",
-    +   "context": "<cwd>/tests/fixtures/browserslist",
-    @@ ... @@
-    -     "chunkLoadingGlobal": "webpackChunk_rspack_core",
-    +     "chunkLoadingGlobal": "webpackChunkbrowserslist_test",
-    @@ ... @@
-    -     "devtoolNamespace": "@rspack/core",
-    +     "devtoolNamespace": "browserslist-test",
-    @@ ... @@
-    -     "hotUpdateGlobal": "webpackHotUpdate_rspack_core",
-    +     "hotUpdateGlobal": "webpackHotUpdatebrowserslist_test",
-    @@ ... @@
-    -     "uniqueName": "@rspack/core",
-    +     "uniqueName": "browserslist-test",
-  `)
+		@@ ... @@
+		-   "context": "<cwd>",
+		+   "context": "<cwd>/tests/fixtures/browserslist",
+		@@ ... @@
+		-     "chunkLoadingGlobal": "webpackChunk_rspack_core",
+		+     "chunkLoadingGlobal": "webpackChunkbrowserslist_test",
+		@@ ... @@
+		-     "devtoolNamespace": "@rspack/core",
+		+     "devtoolNamespace": "browserslist-test",
+		@@ ... @@
+		-     "hotUpdateGlobal": "webpackHotUpdate_rspack_core",
+		+     "hotUpdateGlobal": "webpackHotUpdatebrowserslist_test",
+		@@ ... @@
+		-     "uniqueName": "@rspack/core",
+		+     "uniqueName": "browserslist-test",
+		@@ ... @@
+		-       "<cwd>",
+		+       "<cwd>/tests/fixtures/browserslist",
+	`)
 };

packages/rspack-test-tools/tests/defaultsCases/config/browserslist.js

@@ -128,6 +128,7 @@ export const applyRspackOptionsDefaults = (
 
 	options.resolve = cleverMerge(
 		getResolveDefaults({
+			context: options.context!,
 			targetProperties,
 			mode: options.mode,
 			css: options.experiments.css!
@@ -876,10 +877,12 @@ const getResolveLoaderDefaults = () => {
 // The values are aligned with webpack
 // https://github.com/webpack/webpack/blob/b9fb99c63ca433b24233e0bbc9ce336b47872c08/lib/config/defaults.js#L1431
 const getResolveDefaults = ({
+	context,
 	targetProperties,
 	mode,
 	css
 }: {
+	context: string;
 	targetProperties: any;
 	mode?: Mode;
 	css: boolean;
@@ -927,6 +930,7 @@ const getResolveDefaults = ({
 		extensions: [],
 		aliasFields: [],
 		exportsFields: ["exports"],
+		roots: [context],
 		mainFields: ["main"],
 		byDependency: {
 			wasm: esmDeps(),

packages/rspack/src/config/defaults.ts

@@ -0,0 +1 @@
+export default 'a'

packages/rspack/tests/configCases/resolve/roots/dir/a.js

@@ -0,0 +1 @@
+export default "b"

packages/rspack/tests/configCases/resolve/roots/dir2/b.js

@@ -0,0 +1,8 @@
+import a from "/dir/a";
+
+it("should support roots", async () => {
+  expect(a).toBe("a");
+  const b = "b"; // keep /dir2/ as a context module
+  const m = await import("/dir2/" + b);
+  expect(m.default).toBe("b")
+})