Skip to content

Revert "TURBOPACK: Fix subpath imports resolving to dependencies" #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fireairforce merged 1 commit into from
May 21, 2026
Merged

Revert "TURBOPACK: Fix subpath imports resolving to dependencies" #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions turbopack/crates/turbopack-core/src/resolve/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ use crate::{
parse::{Request, stringify_data_uri},
pattern::{Pattern, PatternMatch, read_matches},
plugin::{AfterResolvePlugin, AfterResolvePluginCondition, BeforeResolvePlugin},
remap::{ExportImport, ExportsField, ImportsField, ReplacedSubpathValueResult},
remap::{ExportsField, ImportsField, ReplacedSubpathValueResult},
},
source::{OptionSource, Source, Sources},
};
Expand Down Expand Up @@ -2950,7 +2950,6 @@ async fn resolve_into_package(
conditions,
unspecified_conditions,
query,
ExportImport::Export,
)
.await?,
);
Expand Down Expand Up @@ -3230,7 +3229,6 @@ 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();
Expand Down Expand Up @@ -3265,13 +3263,12 @@ async fn handle_exports_imports_field(
} in results
{
if let Some(result_path) = result_path.with_normalized_path() {
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 request = *Request::parse(Pattern::Concatenation(vec![
Pattern::Constant(rcstr!("./")),
result_path.clone(),
]))
.to_resolved()
.await?;
Comment on lines +3266 to +3271
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot May 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The result_path variable is not used after being moved into the Pattern::Concatenation vector. Since it is an owned Pattern (returned by with_normalized_path), calling .clone() is unnecessary and incurs an extra allocation. You can move it directly.

            let request = *Request::parse(Pattern::Concatenation(vec![
                Pattern::Constant(rcstr!("./")),
                result_path,
            ]))
            .to_resolved()
            .await?;


let resolve_result = Box::pin(resolve_internal_inline(
package_path.clone(),
Expand Down Expand Up @@ -3373,7 +3370,6 @@ async fn resolve_package_internal_with_imports_field(
conditions,
unspecified_conditions,
RcStr::default(),
ExportImport::Import,
)
.await
}
Expand Down
2 changes: 1 addition & 1 deletion turbopack/crates/turbopack-core/src/resolve/remap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::resolve::{

/// A small helper type to differentiate parsing exports and imports fields.
#[derive(Copy, Clone)]
pub(crate) enum ExportImport {
enum ExportImport {
Export,
Import,
}
Expand Down
3 changes: 1 addition & 2 deletions turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
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, depInNm, pattern, conditionalImport, conditionalRequire)
console.log(foo, dep, pattern, conditionalImport, conditionalRequire)
1 change: 0 additions & 1 deletion ...bopack-tests/tests/snapshot/imports/subpath-imports/input/node_modules/dep-in-nm/index.js
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...ck-tests/tests/snapshot/imports/subpath-imports/input/node_modules/dep-in-nm/package.json
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions turbopack/crates/turbopack-tests/tests/snapshot/imports/subpath-imports/input/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
"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-in-nm": "dep-in-nm"
"dep": "./dep"
}
}
0 ...ubpath-imports_input_index_01i6qyk.js.map → ...ubpath-imports_input_index_1jr1_4n.js.map
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ts_subpath-imports_input_index_01i6qyk.js → ...ts_subpath-imports_input_index_1jr1_4n.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([
"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)"]}
"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
17 changes: 3 additions & 14 deletions ...mports_subpath-imports_input_1p6gt_f._.js → ...mports_subpath-imports_input_14v1xaq._.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions ...ts_subpath-imports_input_1p6gt_f._.js.map → ...ts_subpath-imports_input_14v1xaq._.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading