fix(pack): non-hoist less-loader not found (#2273)

Author: fireairforce

crates/pack-core/src/import_map.rs

@@ -356,15 +356,25 @@ pub async fn get_utoopack_dependency_package(
 
     let dependency_path_to_root = &source.ident().path().owned().await?.parent();
 
-    Ok(Vc::cell(
-        dependency_path_to_root
-            .path
-            // This is a hack for special node_modules structure like pnpm
-            // for example: require("node_modules/.pnpm/[email protected]/node_modules/loader-runner/lib/LoaderRunner.js") can't be resolve,
-            // but require(".pnpm/[email protected]/node_modules/loader-runner/lib/LoaderRunner.js)" can be
-            .replacen("node_modules/", "", 1)
-            .into(),
-    ))
+    #[cfg(not(feature = "test"))]
+    {
+        let project_root = pack_path.root().owned().await?;
+        let relative_path = match project_root.get_relative_path_to(dependency_path_to_root) {
+            Some(relative) => relative,
+            None => dependency_path_to_root.path.clone(),
+        };
+        Ok(Vc::cell(relative_path.into()))
+    }
+    #[cfg(feature = "test")]
+    {
+        Ok(Vc::cell(
+            dependency_path_to_root
+                .path
+                .clone()
+                .replacen("node_modules/", "", 1)
+                .into(),
+        ))
+    }
 }
 
 pub fn get_client_resolved_map(

crates/pack-core/src/shared/webpack_rules/mod.rs

@@ -9,11 +9,9 @@ use turbopack::module_options::{
     WebpackLoaderBuiltinConditionSet, WebpackLoaderBuiltinConditionSetMatch, WebpackLoadersOptions,
 };
 use turbopack_core::resolve::{ExternalTraced, ExternalType, options::ImportMapping};
-use turbopack_core::resolve::{ResolveResult, ResolveResultItem};
 
 use crate::{
     config::Config,
-    import_map::get_utoopack_dependency_package,
     shared::webpack_rules::{
         less::get_less_loader_rules, sass::get_sass_loader_rules,
         style_loader::get_style_loader_rules,
@@ -168,14 +166,11 @@ pub async fn webpack_loader_options(
 
 #[turbo_tasks::function]
 async fn loader_runner_package_mapping(pack_path: FileSystemPath) -> Result<Vc<ImportMapping>> {
-    Ok(
-        ImportMapping::Direct(ResolveResult::primary(ResolveResultItem::External {
-            name: get_utoopack_dependency_package(pack_path, rcstr!("loader-runner"))
-                .owned()
-                .await?,
-            ty: ExternalType::CommonJs,
-            traced: ExternalTraced::Untraced,
-        }))
-        .cell(),
-    )
+    Ok(ImportMapping::PrimaryAlternativeExternal {
+        name: Some(rcstr!("loader-runner")),
+        ty: ExternalType::CommonJs,
+        traced: ExternalTraced::Untraced,
+        lookup_dir: pack_path,
+    }
+    .cell())
 }

packages/pack/package.json

@@ -56,7 +56,6 @@
   },
   "devDependencies": {
     "@napi-rs/cli": "^2.18.0",
-    "@swc/helpers": "^0.5.15",
     "@types/babel__code-frame": "7.0.2",
     "@types/node": "^20.3.0",
     "styled-jsx": "^5.1.6",