Make target the full path

Author: mischnic

crates/next-core/src/next_server/resolve.rs

@@ -320,21 +320,7 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin {
             }
         };
 
-        let mut target = result_from_original_location.ident().path().owned().await?;
-        loop {
-            let parent = target.parent();
-            if parent.is_root() {
-                break;
-            }
-            if parent.file_name() == "node_modules" {
-                break;
-            }
-            if parent.file_name().starts_with("@") && parent.parent().file_name() == "node_modules"
-            {
-                break;
-            }
-            target = parent;
-        }
+        let target = result_from_original_location.ident().path().owned().await?;
 
         Ok(ResolveResultOption::some(*ResolveResult::primary(
             ResolveResultItem::External {

turbopack/crates/turbopack-core/src/resolve/mod.rs

@@ -414,6 +414,8 @@ pub enum ResolveResultItem {
         name: RcStr,
         ty: ExternalType,
         traced: ExternalTraced,
+        /// The file path to the resolved file. Passing a value will create a symlink in the output
+        /// root to be able to access potentially transitive dependencies.
         target: Option<FileSystemPath>,
     },
     Ignore,

turbopack/crates/turbopack/src/lib.rs

@@ -1085,6 +1085,27 @@ pub async fn replace_external(
         }
     };
 
+    // Determine the package folder, `target` is the full path to the resolved file.
+    let target = if let Some(mut target) = target {
+        loop {
+            let parent = target.parent();
+            if parent.is_root() {
+                break;
+            }
+            if parent.file_name() == "node_modules" {
+                break;
+            }
+            if parent.file_name().starts_with("@") && parent.parent().file_name() == "node_modules"
+            {
+                break;
+            }
+            target = parent;
+        }
+        Some(target)
+    } else {
+        None
+    };
+
     let module = CachedExternalModule::new(name.clone(), target, external_type, analyze_mode)
         .to_resolved()
         .await?;