TURBOPACK: fix subpath imports resolving to dependencies

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

@@ -47,7 +47,7 @@ use crate::{
         parse::{Request, stringify_data_uri},
         pattern::{Pattern, PatternMatch, read_matches},
         plugin::{AfterResolvePlugin, AfterResolvePluginCondition, BeforeResolvePlugin},
-        remap::{ExportsField, ImportsField, ReplacedSubpathValueResult},
+        remap::{ExportImport, ExportsField, ImportsField, ReplacedSubpathValueResult},
     },
     source::Source,
 };
@@ -2940,6 +2940,7 @@ async fn resolve_into_package(
                         conditions,
                         unspecified_conditions,
                         query,
+                        ExportImport::Export,
                     )
                     .await?,
                 );
@@ -3215,6 +3216,7 @@ async fn handle_exports_imports_field(
     conditions: &BTreeMap<RcStr, ConditionValue>,
     unspecified_conditions: &ConditionValue,
     query: RcStr,
+    kind: ExportImport,
 ) -> Result<Vc<ResolveResult>> {
     let mut results = Vec::new();
     let mut conditions_state = FxHashMap::default();
@@ -3249,12 +3251,13 @@ async fn handle_exports_imports_field(
     } in results
     {
         if let Some(result_path) = result_path.with_normalized_path() {
-            let request = *Request::parse(Pattern::Concatenation(vec![
-                Pattern::Constant(rcstr!("./")),
-                result_path.clone(),
-            ]))
-            .to_resolved()
-            .await?;
+            let request =
+                Pattern::Concatenation(vec![Pattern::Constant(rcstr!("./")), result_path.clone()]);
+            let request = match kind {
+                ExportImport::Export => request,
+                ExportImport::Import => Pattern::alternatives(vec![request, result_path.clone()]),
+            };
+            let request = *Request::parse(request).to_resolved().await?;
 
             let resolve_result = Box::pin(resolve_internal_inline(
                 package_path.clone(),
@@ -3356,6 +3359,7 @@ async fn resolve_package_internal_with_imports_field(
         conditions,
         unspecified_conditions,
         RcStr::default(),
+        ExportImport::Import,
     )
     .await
 }

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

@@ -16,7 +16,7 @@ use crate::resolve::{
 
 /// A small helper type to differentiate parsing exports and imports fields.
 #[derive(Copy, Clone)]
-enum ExportImport {
+pub(crate) enum ExportImport {
     Export,
     Import,
 }

turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/index.js

@@ -1,7 +1,8 @@
 import foo from '#foo'
 import dep from '#dep'
+import depInNm from '#dep-in-nm'
 import pattern from '#pattern/pat.js'
 import conditionalImport from '#conditional'
 const conditionalRequire = require('#conditional')
 
-console.log(foo, dep, pattern, conditionalImport, conditionalRequire)
+console.log(foo, dep, depInNm, pattern, conditionalImport, conditionalRequire)

turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/package.json

@@ -3,13 +3,15 @@
   "imports": {
     "#foo": "./foo.js",
     "#dep": "dep",
+    "#dep-in-nm": "dep-in-nm",
     "#conditional": {
       "import": "./import.mjs",
       "require": "./require.cjs"
     },
     "#pattern/*.js": "./*.js"
   },
   "dependencies": {
-    "dep": "./dep"
+    "dep": "./dep",
+    "dep-in-nm": "dep-in-nm"
   }
 }

turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/output/0rv8_turbopack-tests_tests_snapshot_imports_subpath-imports_input_index_1jr1_4n.js → turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/output/0rv8_turbopack-tests_tests_snapshot_imports_subpath-imports_input_index_01i6qyk.js

@@ -1,5 +1,5 @@
 (globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([
-    "output/0rv8_turbopack-tests_tests_snapshot_imports_subpath-imports_input_index_1jr1_4n.js",
-    {"otherChunks":["output/1do3_crates_turbopack-tests_tests_snapshot_imports_subpath-imports_input_14v1xaq._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/index.js [test] (ecmascript)"]}
+    "output/0rv8_turbopack-tests_tests_snapshot_imports_subpath-imports_input_index_01i6qyk.js",
+    {"otherChunks":["output/1do3_crates_turbopack-tests_tests_snapshot_imports_subpath-imports_input_1p6gt_f._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/index.js [test] (ecmascript)"]}
 ]);
 // Dummy runtime