use the first result when resolving extends in tsconfig.json (vercel#…

…3282)
Nonius · Jan 13, 2023 · aa7cf5a · aa7cf5a
1 parent 21874f0
commit aa7cf5a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/crates/turbopack-ecmascript/src/typescript/resolve.rs b/crates/turbopack-ecmascript/src/typescript/resolve.rs
@@ -21,7 +21,7 @@ use turbopack_core::{
         origin::ResolveOriginVc,
         parse::{Request, RequestVc},
         pattern::QueryMapVc,
-        resolve, AliasPattern, ResolveResult, ResolveResultVc,
+        resolve, AliasPattern, ResolveResultVc,
     },
     source_asset::SourceAssetVc,
 };
@@ -72,8 +72,12 @@ pub async fn read_tsconfigs(
                         RequestVc::parse(Value::new(extends.to_string().into())),
                         resolve_options,
                     )
+                    .primary_assets()
                     .await?;
-                    if let ResolveResult::Single(asset, _) = *result {
+                    // There might be multiple alternatives like
+                    // "some/path/node_modules/xyz/abc.json" and "some/node_modules/xyz/abc.json".
+                    // We only want to use the first one.
+                    if let Some(&asset) = result.iter().next() {
                         data = asset.content().parse_json_with_comments();
                         tsconfig = asset;
                     } else {