Unverified Commit deb81cf2 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

fix styled-jsx alias (#55581)

### What?

makes sure that styled-jsx is always bundled as it contains `react` and
it being external would break the react vendoring
parent 1a9b0f6f
...@@ -389,11 +389,6 @@ async fn insert_next_server_special_aliases( ...@@ -389,11 +389,6 @@ async fn insert_next_server_special_aliases(
NextRuntime::Edge => request_to_import_mapping(context_dir, request), NextRuntime::Edge => request_to_import_mapping(context_dir, request),
NextRuntime::NodeJs => external_request_to_import_mapping(request), NextRuntime::NodeJs => external_request_to_import_mapping(request),
}; };
let passthrough_external_if_node =
move |context_dir: Vc<FileSystemPath>, request: &str| match runtime {
NextRuntime::Edge => request_to_import_mapping(context_dir, request),
NextRuntime::NodeJs => ImportMapping::External(None).cell(),
};
match (mode, ty) { match (mode, ty) {
(_, ServerContextType::Pages { pages_dir }) => { (_, ServerContextType::Pages { pages_dir }) => {
import_map.insert_exact_alias( import_map.insert_exact_alias(
...@@ -441,11 +436,11 @@ async fn insert_next_server_special_aliases( ...@@ -441,11 +436,11 @@ async fn insert_next_server_special_aliases(
); );
import_map.insert_exact_alias( import_map.insert_exact_alias(
"styled-jsx", "styled-jsx",
passthrough_external_if_node(app_dir, "next/dist/compiled/styled-jsx"), request_to_import_mapping(get_next_package(app_dir), "styled-jsx"),
); );
import_map.insert_wildcard_alias( import_map.insert_wildcard_alias(
"styled-jsx/", "styled-jsx/",
passthrough_external_if_node(app_dir, "next/dist/compiled/styled-jsx/*"), request_to_import_mapping(get_next_package(app_dir), "styled-jsx/*"),
); );
import_map.insert_exact_alias( import_map.insert_exact_alias(
"react/jsx-runtime", "react/jsx-runtime",
...@@ -561,6 +556,14 @@ async fn insert_next_server_special_aliases( ...@@ -561,6 +556,14 @@ async fn insert_next_server_special_aliases(
// @opentelemetry/api // @opentelemetry/api
request_to_import_mapping(app_dir, "next/dist/compiled/@opentelemetry/api"), request_to_import_mapping(app_dir, "next/dist/compiled/@opentelemetry/api"),
); );
import_map.insert_exact_alias(
"styled-jsx",
request_to_import_mapping(get_next_package(app_dir), "styled-jsx"),
);
import_map.insert_wildcard_alias(
"styled-jsx/",
request_to_import_mapping(get_next_package(app_dir), "styled-jsx/*"),
);
import_map.insert_exact_alias( import_map.insert_exact_alias(
"react/jsx-runtime", "react/jsx-runtime",
......
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