Unverified Commit 5086c6be authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: add app-dir alias for `next/*` subpackages (#78447)

parent 42b2dded
...@@ -196,19 +196,23 @@ pub async fn get_next_client_import_map( ...@@ -196,19 +196,23 @@ pub async fn get_next_client_import_map(
&format!("next/dist/compiled/react-server-dom-turbopack{react_flavor}/*"), &format!("next/dist/compiled/react-server-dom-turbopack{react_flavor}/*"),
), ),
); );
import_map.insert_exact_alias( insert_exact_alias_or_js(
&mut import_map,
"next/head", "next/head",
request_to_import_mapping(project_path, "next/dist/client/components/noop-head"), request_to_import_mapping(project_path, "next/dist/client/components/noop-head"),
); );
import_map.insert_exact_alias( insert_exact_alias_or_js(
&mut import_map,
"next/dynamic", "next/dynamic",
request_to_import_mapping(project_path, "next/dist/shared/lib/app-dynamic"), request_to_import_mapping(project_path, "next/dist/shared/lib/app-dynamic"),
); );
import_map.insert_exact_alias( insert_exact_alias_or_js(
&mut import_map,
"next/link", "next/link",
request_to_import_mapping(project_path, "next/dist/client/app-dir/link"), request_to_import_mapping(project_path, "next/dist/client/app-dir/link"),
); );
import_map.insert_exact_alias( insert_exact_alias_or_js(
&mut import_map,
"next/form", "next/form",
request_to_import_mapping(project_path, "next/dist/client/app-dir/form"), request_to_import_mapping(project_path, "next/dist/client/app-dir/form"),
); );
...@@ -337,19 +341,23 @@ pub async fn get_next_server_import_map( ...@@ -337,19 +341,23 @@ pub async fn get_next_server_import_map(
ServerContextType::AppSSR { .. } ServerContextType::AppSSR { .. }
| ServerContextType::AppRSC { .. } | ServerContextType::AppRSC { .. }
| ServerContextType::AppRoute { .. } => { | ServerContextType::AppRoute { .. } => {
import_map.insert_exact_alias( insert_exact_alias_or_js(
&mut import_map,
"next/head", "next/head",
request_to_import_mapping(project_path, "next/dist/client/components/noop-head"), request_to_import_mapping(project_path, "next/dist/client/components/noop-head"),
); );
import_map.insert_exact_alias( insert_exact_alias_or_js(
&mut import_map,
"next/dynamic", "next/dynamic",
request_to_import_mapping(project_path, "next/dist/shared/lib/app-dynamic"), request_to_import_mapping(project_path, "next/dist/shared/lib/app-dynamic"),
); );
import_map.insert_exact_alias( insert_exact_alias_or_js(
&mut import_map,
"next/link", "next/link",
request_to_import_mapping(project_path, "next/dist/client/app-dir/link"), request_to_import_mapping(project_path, "next/dist/client/app-dir/link"),
); );
import_map.insert_exact_alias( insert_exact_alias_or_js(
&mut import_map,
"next/form", "next/form",
request_to_import_mapping(project_path, "next/dist/client/app-dir/form"), request_to_import_mapping(project_path, "next/dist/client/app-dir/form"),
); );
...@@ -450,18 +458,21 @@ pub async fn get_next_edge_import_map( ...@@ -450,18 +458,21 @@ pub async fn get_next_edge_import_map(
ServerContextType::AppSSR { .. } ServerContextType::AppSSR { .. }
| ServerContextType::AppRSC { .. } | ServerContextType::AppRSC { .. }
| ServerContextType::AppRoute { .. } => { | ServerContextType::AppRoute { .. } => {
import_map.insert_exact_alias( insert_exact_alias_or_js(
&mut import_map,
"next/head", "next/head",
request_to_import_mapping(project_path, "next/dist/client/components/noop-head"), request_to_import_mapping(project_path, "next/dist/client/components/noop-head"),
); );
import_map.insert_exact_alias( insert_exact_alias_or_js(
&mut import_map,
"next/dynamic", "next/dynamic",
request_to_import_mapping(project_path, "next/dist/shared/lib/app-dynamic"), request_to_import_mapping(project_path, "next/dist/shared/lib/app-dynamic"),
); );
import_map.insert_exact_alias( insert_exact_alias_or_js(
&mut import_map,
"next/link", "next/link",
request_to_import_mapping(project_path, "next/dist/client/app-dir/link"), request_to_import_mapping(project_path, "next/dist/client/app-dir/link"),
) );
} }
} }
...@@ -1124,6 +1135,16 @@ async fn insert_instrumentation_client_alias( ...@@ -1124,6 +1135,16 @@ async fn insert_instrumentation_client_alias(
Ok(()) Ok(())
} }
// To alias e.g. both `import "next/link"` and `import "next/link.js"`
fn insert_exact_alias_or_js(
import_map: &mut ImportMap,
pattern: &str,
mapping: ResolvedVc<ImportMapping>,
) {
import_map.insert_exact_alias(pattern, mapping);
import_map.insert_exact_alias(format!("{pattern}.js"), mapping);
}
/// Creates a direct import mapping to the result of resolving a request /// Creates a direct import mapping to the result of resolving a request
/// in a context. /// in a context.
fn request_to_import_mapping( fn request_to_import_mapping(
......
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