Fix tsconfig extends from node_modules (#9419)

parcel-bundler · Dec 5, 2023 · b530d34 · b530d34
1 parent 3045177
commit b530d34
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/packages/utils/node-resolver-core/test/fixture/node_modules/@scope/tsconfig/tsconfig.json b/packages/utils/node-resolver-core/test/fixture/node_modules/@scope/tsconfig/tsconfig.json
diff --git a/packages/utils/node-resolver-core/test/fixture/tsconfig/extends-node-module/bar.ts b/packages/utils/node-resolver-core/test/fixture/tsconfig/extends-node-module/bar.ts
diff --git a/packages/utils/node-resolver-core/test/fixture/tsconfig/extends-node-module/tsconfig.json b/packages/utils/node-resolver-core/test/fixture/tsconfig/extends-node-module/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@scope/tsconfig/tsconfig.json"
+}
diff --git a/packages/utils/node-resolver-rs/src/lib.rs b/packages/utils/node-resolver-rs/src/lib.rs
@@ -1145,7 +1145,7 @@ impl<'a, Fs: FileSystem> ResolveRequest<'a, Fs> {
                 entries: Fields::TSCONFIG,
                 flags: Flags::NODE_CJS,
                 cache: CacheCow::Borrowed(&self.resolver.cache),
-                include_node_modules: Cow::Borrowed(self.resolver.include_node_modules.as_ref()),
+                include_node_modules: Cow::Owned(IncludeNodeModules::default()),
                 conditions: ExportsCondition::TYPES,
                 module_dir_resolver: self.resolver.module_dir_resolver.clone(),
               };
@@ -2381,6 +2381,22 @@ mod tests {
         .0,
       Resolution::Path(root().join("tsconfig/extends-extension/foo.js"))
     );
+
+    let mut extends_node_module_resolver = test_resolver();
+    extends_node_module_resolver.include_node_modules = Cow::Owned(IncludeNodeModules::Bool(false));
+    assert_eq!(
+      extends_node_module_resolver
+        .resolve(
+          "./bar",
+          &root().join("tsconfig/extends-node-module/index.js"),
+          SpecifierType::Esm
+        )
+        .result
+        .unwrap()
+        .0,
+      Resolution::Path(root().join("tsconfig/extends-node-module/bar.ts"))
+    );
+
     assert_eq!(
       test_resolver()
         .resolve(