Skip to content
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

Jump to bottom

feat(turbopack): Handle fragment in requests #7771

Merged
merged 30 commits into from
Apr 9, 2024
Merged

feat(turbopack): Handle fragment in requests #7771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3a4367f
Add fields
kdy1 Mar 19, 2024
cc5038a
Add args
kdy1 Mar 19, 2024
b0c0927
Add args
kdy1 Mar 19, 2024
9b0611f
more work
kdy1 Mar 19, 2024
eea03e9
more work
kdy1 Mar 19, 2024
62ff661
more work
kdy1 Mar 19, 2024
0b7f101
more work
kdy1 Mar 19, 2024
90b6dd5
More work for format!
kdy1 Mar 19, 2024
501d102
more work
kdy1 Mar 19, 2024
0887ee6
TODO
kdy1 Mar 19, 2024
10b76b9
More
kdy1 Mar 20, 2024
78d76ae
Fix `turbopack-core`
kdy1 Mar 20, 2024
b348ba2
Fix
kdy1 Mar 20, 2024
14b16de
fix build
kdy1 Mar 20, 2024
c186b18
clippy
kdy1 Mar 20, 2024
713a4ed
with_fragment
kdy1 Mar 20, 2024
e4b54fd
Type
kdy1 Mar 22, 2024
0bd6f83
Replace type
kdy1 Mar 22, 2024
6fa8c08
fixup
kdy1 Mar 22, 2024
5aa750a
fix more
kdy1 Mar 22, 2024
729614b
fix more
kdy1 Mar 22, 2024
50680be
fix more
kdy1 Mar 22, 2024
1eb07bc
fix more
kdy1 Mar 22, 2024
b9e2697
Update crates/turbopack-core/src/resolve/parse.rs
kdy1 Apr 9, 2024
b7825b1
Update crates/turbopack-core/src/resolve/parse.rs
kdy1 Apr 9, 2024
eda354a
Merge branch 'main' into kdy1/pack-1006
kdy1 Apr 9, 2024
8e72191
review
kdy1 Apr 9, 2024
34b8fb8
review
kdy1 Apr 9, 2024
5770f89
fixup
kdy1 Apr 9, 2024
dafd4bf
fiix
kdy1 Apr 9, 2024
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: 12 additions & 6 deletions crates/turbopack-cli/src/build/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,18 @@ async fn build_internal(
.cloned()
.map(|r| async move {
Ok(match &*r.await? {
EntryRequest::Relative(p) => {
Request::relative(Value::new(p.clone().into()), Default::default(), false)
}
EntryRequest::Module(m, p) => {
Request::module(m.clone(), Value::new(p.clone().into()), Default::default())
}
EntryRequest::Relative(p) => Request::relative(
Value::new(p.clone().into()),
Default::default(),
Default::default(),
false,
),
EntryRequest::Module(m, p) => Request::module(
m.clone(),
Value::new(p.clone().into()),
Default::default(),
Default::default(),
),
})
})
.try_join()
Expand Down
18 changes: 12 additions & 6 deletions crates/turbopack-cli/src/dev/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,18 @@ async fn source(
let entry_requests = entry_requests
.iter()
.map(|r| match r {
EntryRequest::Relative(p) => {
Request::relative(Value::new(p.clone().into()), Default::default(), false)
}
EntryRequest::Module(m, p) => {
Request::module(m.clone(), Value::new(p.clone().into()), Default::default())
}
EntryRequest::Relative(p) => Request::relative(
Value::new(p.clone().into()),
Default::default(),
Default::default(),
false,
),
EntryRequest::Module(m, p) => Request::module(
m.clone(),
Value::new(p.clone().into()),
Default::default(),
Default::default(),
),
})
.collect();

Expand Down
41 changes: 35 additions & 6 deletions crates/turbopack-core/src/resolve/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,6 +1541,7 @@ async fn resolve_internal_inline(
path,
query,
force_in_lookup_dir,
fragment,
} => {
let mut results = Vec::new();
let matches = read_matches(
Expand All @@ -1563,6 +1564,7 @@ async fn resolve_internal_inline(
options_value,
options,
*query,
*fragment,
)
.await?,
);
Expand All @@ -1582,6 +1584,7 @@ async fn resolve_internal_inline(
path,
query,
force_in_lookup_dir,
fragment,
} => {
resolve_relative_request(
lookup_path,
Expand All @@ -1591,13 +1594,15 @@ async fn resolve_internal_inline(
path,
*query,
*force_in_lookup_dir,
*fragment,
)
.await?
}
Request::Module {
module,
path,
query,
fragment,
} => {
resolve_module_request(
lookup_path,
Expand All @@ -1607,13 +1612,18 @@ async fn resolve_internal_inline(
module,
path,
*query,
*fragment,
)
.await?
}
Request::ServerRelative { path, query } => {
Request::ServerRelative {
path,
query,
fragment,
} => {
let mut new_pat = path.clone();
new_pat.push_front(".".to_string().into());
let relative = Request::relative(Value::new(new_pat), *query, true);
let relative = Request::relative(Value::new(new_pat), *query, *fragment, true);

if !has_alias {
ResolvingIssue {
Expand All @@ -1640,7 +1650,11 @@ async fn resolve_internal_inline(
)
.await?
}
Request::Windows { path: _, query: _ } => {
Request::Windows {
path: _,
query: _,
fragment: _,
} => {
if !has_alias {
ResolvingIssue {
severity: IssueSeverity::Error.cell(),
Expand Down Expand Up @@ -1684,6 +1698,8 @@ async fn resolve_internal_inline(
Request::Uri {
protocol,
remainder,
query: _,
fragment: _,
} => {
let uri = format!("{}{}", protocol, remainder);
ResolveResult::primary_with_key(
Expand Down Expand Up @@ -1818,6 +1834,7 @@ async fn resolve_relative_request(
path_pattern: &Pattern,
query: Vc<String>,
force_in_lookup_dir: bool,
fragment: Vc<String>,
) -> Result<Vc<ResolveResult>> {
// Check alias field for aliases first
let lookup_path_ref = &*lookup_path.await?;
Expand All @@ -1832,6 +1849,7 @@ async fn resolve_relative_request(
Some(request)
},
query,
fragment,
)
.await?
{
Expand Down Expand Up @@ -1882,6 +1900,7 @@ async fn resolve_relative_request(
options_value,
options,
query,
fragment,
)
.await?,
);
Expand All @@ -1899,6 +1918,7 @@ async fn resolve_relative_request(
options_value,
options,
query,
fragment,
)
.await?,
);
Expand All @@ -1922,6 +1942,7 @@ async fn apply_in_package(
options_value: &ResolveOptions,
get_request: impl Fn(&FileSystemPath) -> Option<String>,
query: Vc<String>,
fragment: Vc<String>,
) -> Result<Option<Vc<ResolveResult>>> {
// Check alias field for module aliases first
for in_package in options_value.in_package.iter() {
Expand Down Expand Up @@ -1987,7 +2008,8 @@ async fn apply_in_package(
resolve_internal(
package_path,
Request::parse(Value::new(Pattern::Constant(value.to_string())))
.with_query(query),
.with_query(query)
.with_fragment(fragment),
options,
)
.with_replaced_request_key(value.to_string(), Value::new(request_key))
Expand Down Expand Up @@ -2023,6 +2045,7 @@ async fn resolve_module_request(
module: &str,
path: &Pattern,
query: Vc<String>,
fragment: Vc<String>,
) -> Result<Vc<ResolveResult>> {
// Check alias field for module aliases first
if let Some(result) = apply_in_package(
Expand All @@ -2034,6 +2057,7 @@ async fn resolve_module_request(
full_pattern.into_string()
},
query,
fragment,
)
.await?
{
Expand Down Expand Up @@ -2068,6 +2092,7 @@ async fn resolve_module_request(
Value::new(path.clone()),
package_path,
query,
fragment,
options,
));
}
Expand All @@ -2081,6 +2106,7 @@ async fn resolve_module_request(
options_value,
options,
query,
fragment,
)
.await?;
results.push(resolved)
Expand All @@ -2103,7 +2129,7 @@ async fn resolve_module_request(
"/".to_string().into(),
path.clone(),
]);
let relative = Request::relative(Value::new(pattern), query, true);
let relative = Request::relative(Value::new(pattern), query, fragment, true);
let relative_result =
resolve_internal_boxed(lookup_path, relative.resolve().await?, options).await?;
let relative_result = relative_result.with_replaced_request_key(
Expand All @@ -2122,6 +2148,7 @@ async fn resolve_into_package(
path: Value<Pattern>,
package_path: Vc<FileSystemPath>,
query: Vc<String>,
fragment: Vc<String>,
options: Vc<ResolveOptions>,
) -> Result<Vc<ResolveResult>> {
let path = path.into_value();
Expand Down Expand Up @@ -2186,7 +2213,7 @@ async fn resolve_into_package(
let mut new_pat = path.clone();
new_pat.push_front(".".to_string().into());

let relative = Request::relative(Value::new(new_pat), query, true);
let relative = Request::relative(Value::new(new_pat), query, fragment, true);
results
.push(resolve_internal_inline(package_path, relative.resolve().await?, options).await?);
}
Expand Down Expand Up @@ -2270,6 +2297,7 @@ async fn resolved(
options_value: &ResolveOptions,
options: Vc<ResolveOptions>,
query: Vc<String>,
fragment: Vc<String>,
) -> Result<Vc<ResolveResult>> {
let RealPathResult { path, symlinks } = &*fs_path.realpath_with_links().await?;

Expand All @@ -2281,6 +2309,7 @@ async fn resolved(
options_value,
|package_path| package_path.get_relative_path_to(path_ref),
query,
fragment,
)
.await?
{
Expand Down
Loading
Loading