Unverified Commit 40d7843d authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: fix subpath imports pointing to external packages (#93308)

Closes https://github.com/vercel/next.js/issues/93295
Closes #93914

https://nodejs.org/api/packages.html#subpath-exports:

> All target paths in the
["exports"](https://nodejs.org/api/packages.html#exports) map (the
values associated with export keys) must be relative URL strings
starting with `./`

but

>Unlike the "exports" field, the "imports" field permits mapping to
external packages.
>The resolution rules for the imports field are otherwise analogous to
the exports field.
parent 21d47a45
...@@ -47,7 +47,7 @@ use crate::{ ...@@ -47,7 +47,7 @@ use crate::{
parse::{Request, stringify_data_uri}, parse::{Request, stringify_data_uri},
pattern::{Pattern, PatternMatch, read_matches}, pattern::{Pattern, PatternMatch, read_matches},
plugin::{AfterResolvePlugin, AfterResolvePluginCondition, BeforeResolvePlugin}, plugin::{AfterResolvePlugin, AfterResolvePluginCondition, BeforeResolvePlugin},
remap::{ExportsField, ImportsField, ReplacedSubpathValueResult}, remap::{ExportImport, ExportsField, ImportsField, ReplacedSubpathValueResult},
}, },
source::Source, source::Source,
}; };
...@@ -2940,6 +2940,7 @@ async fn resolve_into_package( ...@@ -2940,6 +2940,7 @@ async fn resolve_into_package(
conditions, conditions,
unspecified_conditions, unspecified_conditions,
query, query,
ExportImport::Export,
) )
.await?, .await?,
); );
...@@ -3215,6 +3216,7 @@ async fn handle_exports_imports_field( ...@@ -3215,6 +3216,7 @@ async fn handle_exports_imports_field(
conditions: &BTreeMap<RcStr, ConditionValue>, conditions: &BTreeMap<RcStr, ConditionValue>,
unspecified_conditions: &ConditionValue, unspecified_conditions: &ConditionValue,
query: RcStr, query: RcStr,
ty: ExportImport,
) -> Result<Vc<ResolveResult>> { ) -> Result<Vc<ResolveResult>> {
let mut results = Vec::new(); let mut results = Vec::new();
let mut conditions_state = FxHashMap::default(); let mut conditions_state = FxHashMap::default();
...@@ -3248,13 +3250,14 @@ async fn handle_exports_imports_field( ...@@ -3248,13 +3250,14 @@ async fn handle_exports_imports_field(
map_key, map_key,
} in results } in results
{ {
if let Some(result_path) = result_path.with_normalized_path() { let request = match ty {
let request = *Request::parse(Pattern::Concatenation(vec![ ExportImport::Export => {
Pattern::Constant(rcstr!("./")), // Only relative paths are allowed in exports fields
result_path.clone(), Pattern::Concatenation(vec![Pattern::Constant(rcstr!("./")), result_path.clone()])
])) }
.to_resolved() ExportImport::Import => result_path.clone(),
.await?; };
let request = *Request::parse(request).to_resolved().await?;
let resolve_result = Box::pin(resolve_internal_inline( let resolve_result = Box::pin(resolve_internal_inline(
package_path.clone(), package_path.clone(),
...@@ -3279,8 +3282,10 @@ async fn handle_exports_imports_field( ...@@ -3279,8 +3282,10 @@ async fn handle_exports_imports_field(
// - "prefix...<dynamic>...suffix" // - "prefix...<dynamic>...suffix"
let mut old_request_key = result_path; let mut old_request_key = result_path;
// Remove the Pattern::Constant(rcstr!("./")), from above again if matches!(ty, ExportImport::Export) {
// Remove the Pattern::Constant(rcstr!("./")) from above again
old_request_key.push_front(rcstr!("./").into()); old_request_key.push_front(rcstr!("./").into());
}
let new_request_key = req.clone(); let new_request_key = req.clone();
resolve_result.with_replaced_request_key_pattern( resolve_result.with_replaced_request_key_pattern(
...@@ -3299,7 +3304,6 @@ async fn handle_exports_imports_field( ...@@ -3299,7 +3304,6 @@ async fn handle_exports_imports_field(
}; };
resolved_results.push(resolve_result); resolved_results.push(resolve_result);
} }
}
// other options do not apply anymore when an exports field exist // other options do not apply anymore when an exports field exist
Ok(merge_results_with_affecting_sources( Ok(merge_results_with_affecting_sources(
...@@ -3356,6 +3360,7 @@ async fn resolve_package_internal_with_imports_field( ...@@ -3356,6 +3360,7 @@ async fn resolve_package_internal_with_imports_field(
conditions, conditions,
unspecified_conditions, unspecified_conditions,
RcStr::default(), RcStr::default(),
ExportImport::Import,
) )
.await .await
} }
......
...@@ -16,7 +16,7 @@ use crate::resolve::{ ...@@ -16,7 +16,7 @@ use crate::resolve::{
/// A small helper type to differentiate parsing exports and imports fields. /// A small helper type to differentiate parsing exports and imports fields.
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
enum ExportImport { pub(crate) enum ExportImport {
Export, Export,
Import, Import,
} }
......
import foo from './nested'
it('should resolve nested subpath imports', () => {
expect(foo).toBe('foo')
})
...@@ -4,4 +4,10 @@ import pattern from '#pattern/pat.js' ...@@ -4,4 +4,10 @@ import pattern from '#pattern/pat.js'
import conditionalImport from '#conditional' import conditionalImport from '#conditional'
const conditionalRequire = require('#conditional') const conditionalRequire = require('#conditional')
console.log(foo, dep, pattern, conditionalImport, conditionalRequire) it('should resolve subpath imports', () => {
expect(foo).toBe('foo')
expect(dep).toBe('dep')
expect(pattern).toBe('pat')
expect(conditionalImport).toBe('import')
expect(conditionalRequire).toBe('require')
})
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push(["output/0_9x_turbopack-tests_tests_snapshot_imports_subpath-imports-nested_input_0w09esu._.js",
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/foo.js [test] (ecmascript)", ((__turbopack_context__) => {
"use strict";
__turbopack_context__.s([
"default",
()=>__TURBOPACK__default__export__
]);
const __TURBOPACK__default__export__ = 'foo';
}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/nested/index.js [test] (ecmascript)", ((__turbopack_context__) => {
"use strict";
__turbopack_context__.s([
"default",
()=>__TURBOPACK__default__export__
]);
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2d$nested$2f$input$2f$foo$2e$js__$5b$test$5d$__$28$ecmascript$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/foo.js [test] (ecmascript)");
;
const __TURBOPACK__default__export__ = __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2d$nested$2f$input$2f$foo$2e$js__$5b$test$5d$__$28$ecmascript$29$__["default"];
}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/index.js [test] (ecmascript)", ((__turbopack_context__) => {
"use strict";
__turbopack_context__.s([]);
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2d$nested$2f$input$2f$nested$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/nested/index.js [test] (ecmascript)");
;
console.log(__TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2d$nested$2f$input$2f$nested$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__["default"]);
}),
]);
//# sourceMappingURL=0_9x_turbopack-tests_tests_snapshot_imports_subpath-imports-nested_input_0w09esu._.js.map
\ No newline at end of file
{
"version": 3,
"sources": [],
"sections": [
{"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/foo.js"],"sourcesContent":["export default 'foo'\n"],"names":[],"mappings":";;;;uCAAe"}},
{"offset": {"line": 13, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/nested/index.js"],"sourcesContent":["import foo from '#foo'\nexport default foo\n"],"names":[],"mappings":";;;;AAAA;;uCACe,8NAAG"}},
{"offset": {"line": 24, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/index.js"],"sourcesContent":["import foo from './nested'\n\nconsole.log(foo)\n"],"names":["console","log"],"mappings":";AAAA;;AAEAA,QAAQC,GAAG,CAAC,0OAAG"}}]
}
\ No newline at end of file
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([
"output/1ece_tests_snapshot_imports_subpath-imports-nested_input_index_0cpull6.js",
{"otherChunks":["output/0_9x_turbopack-tests_tests_snapshot_imports_subpath-imports-nested_input_0w09esu._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports-nested/input/index.js [test] (ecmascript)"]}
]);
// Dummy runtime
\ No newline at end of file
(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)"]}
]);
// Dummy runtime
\ No newline at end of file
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push(["output/1do3_crates_turbopack-tests_tests_snapshot_imports_subpath-imports_input_14v1xaq._.js",
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/foo.js [test] (ecmascript)", ((__turbopack_context__) => {
"use strict";
__turbopack_context__.s([
"default",
()=>__TURBOPACK__default__export__
]);
const __TURBOPACK__default__export__ = 'foo';
}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/dep/index.js [test] (ecmascript)", ((__turbopack_context__) => {
"use strict";
__turbopack_context__.s([
"default",
()=>__TURBOPACK__default__export__
]);
const __TURBOPACK__default__export__ = 'dep';
}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/pat.js [test] (ecmascript)", ((__turbopack_context__) => {
"use strict";
__turbopack_context__.s([
"default",
()=>__TURBOPACK__default__export__
]);
const __TURBOPACK__default__export__ = 'pat';
}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/import.mjs [test] (ecmascript)", ((__turbopack_context__) => {
"use strict";
__turbopack_context__.s([
"default",
()=>__TURBOPACK__default__export__
]);
const __TURBOPACK__default__export__ = 'import';
}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/require.cjs [test] (ecmascript)", ((__turbopack_context__, module, exports) => {
module.exports = 'require';
}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/index.js [test] (ecmascript)", ((__turbopack_context__) => {
"use strict";
__turbopack_context__.s([]);
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2f$input$2f$foo$2e$js__$5b$test$5d$__$28$ecmascript$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/foo.js [test] (ecmascript)");
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2f$input$2f$dep$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/dep/index.js [test] (ecmascript)");
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2f$input$2f$pat$2e$js__$5b$test$5d$__$28$ecmascript$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/pat.js [test] (ecmascript)");
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2f$input$2f$import$2e$mjs__$5b$test$5d$__$28$ecmascript$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/import.mjs [test] (ecmascript)");
;
;
;
;
const conditionalRequire = __turbopack_context__.r("[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/require.cjs [test] (ecmascript)");
console.log(__TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2f$input$2f$foo$2e$js__$5b$test$5d$__$28$ecmascript$29$__["default"], __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2f$input$2f$dep$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__["default"], __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2f$input$2f$pat$2e$js__$5b$test$5d$__$28$ecmascript$29$__["default"], __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$imports$2f$subpath$2d$imports$2f$input$2f$import$2e$mjs__$5b$test$5d$__$28$ecmascript$29$__["default"], conditionalRequire);
}),
]);
//# sourceMappingURL=1do3_crates_turbopack-tests_tests_snapshot_imports_subpath-imports_input_14v1xaq._.js.map
\ No newline at end of file
{
"version": 3,
"sources": [],
"sections": [
{"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/foo.js"],"sourcesContent":["export default 'foo'\n"],"names":[],"mappings":";;;;uCAAe"}},
{"offset": {"line": 13, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/dep/index.js"],"sourcesContent":["export default 'dep'\n"],"names":[],"mappings":";;;;uCAAe"}},
{"offset": {"line": 22, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/pat.js"],"sourcesContent":["export default 'pat'\n"],"names":[],"mappings":";;;;uCAAe"}},
{"offset": {"line": 31, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/import.mjs"],"sourcesContent":["export default 'import'\n"],"names":[],"mappings":";;;;uCAAe"}},
{"offset": {"line": 39, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/require.cjs"],"sourcesContent":["module.exports = 'require'\n"],"names":["module","exports"],"mappings":"AAAAA,OAAOC,OAAO,GAAG"}},
{"offset": {"line": 44, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/index.js"],"sourcesContent":["import foo from '#foo'\nimport dep from '#dep'\nimport pattern from '#pattern/pat.js'\nimport conditionalImport from '#conditional'\nconst conditionalRequire = require('#conditional')\n\nconsole.log(foo, dep, pattern, conditionalImport, conditionalRequire)\n"],"names":["conditionalRequire","console","log"],"mappings":";AAAA;AACA;AACA;AACA;;;;;AACA,MAAMA;AAENC,QAAQC,GAAG,CAAC,oNAAG,EAAE,6NAAG,EAAE,oNAAO,EAAE,wNAAiB,EAAEF"}}]
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment