Merge 0abb53d into 9a2a457

vercel · Jun 23, 2023 · 510d869 · 510d869
2 parents 9a2a457 + 0abb53d
commit 510d869
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 1 deletion.
diff --git a/crates/turbopack-core/src/resolve/mod.rs b/crates/turbopack-core/src/resolve/mod.rs
@@ -1343,7 +1343,7 @@ async fn resolve_package_internal_with_imports_field(
     };
 
     handle_exports_imports_field(
-        context,
+        package_json_path.parent(),
         *package_json_path,
         resolve_options,
         imports,

diff --git a/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/foo.js b/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/foo.js
@@ -0,0 +1 @@
+export default "foo";
diff --git a/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/index.js b/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/index.js
@@ -0,0 +1,3 @@
+import foo from "./nested";
+
+console.log(foo);
diff --git a/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/nested/index.js b/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/nested/index.js
@@ -0,0 +1,2 @@
+import foo from "#foo";
+export default foo;
diff --git a/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/package.json b/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "subpath-imports",
+  "imports": {
+    "#foo": "./foo.js"
+  }
+}
diff --git a/...s-nested/output/a587c_tests_snapshot_imports_subpath-imports-nested_input_index_5771e1.js b/...s-nested/output/a587c_tests_snapshot_imports_subpath-imports-nested_input_index_5771e1.js
diff --git a/...s-nested/output/a587c_tests_snapshot_imports_subpath-imports-nested_input_index_b53fce.js b/...s-nested/output/a587c_tests_snapshot_imports_subpath-imports-nested_input_index_b53fce.js
diff --git a/...sted/output/a587c_tests_snapshot_imports_subpath-imports-nested_input_index_b53fce.js.map b/...sted/output/a587c_tests_snapshot_imports_subpath-imports-nested_input_index_b53fce.js.map
diff --git a/...s-nested/output/a587c_tests_snapshot_imports_subpath-imports-nested_input_index_dc7802.js b/...s-nested/output/a587c_tests_snapshot_imports_subpath-imports-nested_input_index_dc7802.js
diff --git a/...sted/output/a587c_tests_snapshot_imports_subpath-imports-nested_input_index_dc7802.js.map b/...sted/output/a587c_tests_snapshot_imports_subpath-imports-nested_input_index_dc7802.js.map