Unverified Commit 46fe103d authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Don't externalize various new `next/*` entrypoints (#77844)

`next/cache`,`next/form`,`next/head`, `next/compat/router`, and
`next/server` were missing in the regex
parent 082b2dd1
...@@ -249,37 +249,6 @@ pub async fn get_next_client_import_map( ...@@ -249,37 +249,6 @@ pub async fn get_next_client_import_map(
Ok(import_map.cell()) Ok(import_map.cell())
} }
/// Computes the Next-specific client import map.
#[turbo_tasks::function]
pub async fn get_next_build_import_map() -> Result<Vc<ImportMap>> {
let mut import_map = ImportMap::empty();
insert_package_alias(
&mut import_map,
&format!("{VIRTUAL_PACKAGE_NAME}/"),
next_js_fs().root().to_resolved().await?,
);
let external = ImportMapping::External(None, ExternalType::CommonJs, ExternalTraced::Traced)
.resolved_cell();
import_map.insert_exact_alias("next", external);
import_map.insert_wildcard_alias("next/", external);
import_map.insert_exact_alias("styled-jsx", external);
import_map.insert_exact_alias(
"styled-jsx/style",
ImportMapping::External(
Some("styled-jsx/style.js".into()),
ExternalType::CommonJs,
ExternalTraced::Traced,
)
.resolved_cell(),
);
import_map.insert_wildcard_alias("styled-jsx/", external);
Ok(import_map.cell())
}
/// Computes the Next-specific client fallback import map, which provides /// Computes the Next-specific client fallback import map, which provides
/// polyfills to Node.js externals. /// polyfills to Node.js externals.
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -93,7 +93,7 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin { ...@@ -93,7 +93,7 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin {
}; };
// from https://github.com/vercel/next.js/blob/8d1c619ad650f5d147207f267441caf12acd91d1/packages/next/src/build/handle-externals.ts#L188 // from https://github.com/vercel/next.js/blob/8d1c619ad650f5d147207f267441caf12acd91d1/packages/next/src/build/handle-externals.ts#L188
let never_external_regex = lazy_regex::regex!("^(?:private-next-pages\\/|next\\/(?:dist\\/pages\\/|(?:app|document|link|image|legacy\\/image|constants|dynamic|script|navigation|headers|router)$)|string-hash|private-next-rsc-action-validate|private-next-rsc-action-client-wrapper|private-next-rsc-server-reference$)"); let never_external_regex = lazy_regex::regex!("^(?:private-next-pages\\/|next\\/(?:dist\\/pages\\/|(?:app|cache|document|link|form|head|image|legacy\\/image|constants|dynamic|script|navigation|headers|router|compat\\/router|server)$)|string-hash|private-next-rsc-action-validate|private-next-rsc-action-client-wrapper|private-next-rsc-server-reference|private-next-rsc-cache-wrapper$)");
let Pattern::Constant(package_subpath) = package_subpath else { let Pattern::Constant(package_subpath) = package_subpath else {
return Ok(ResolveResultOption::none()); return Ok(ResolveResultOption::none());
......
...@@ -189,7 +189,7 @@ export function makeExternalHandler({ ...@@ -189,7 +189,7 @@ export function makeExternalHandler({
} }
const notExternalModules = const notExternalModules =
/^(?:private-next-pages\/|next\/(?:dist\/pages\/|(?:app|document|link|form|image|legacy\/image|constants|dynamic|script|navigation|headers|router)$)|string-hash|private-next-rsc-action-validate|private-next-rsc-action-client-wrapper|private-next-rsc-server-reference|private-next-rsc-cache-wrapper$)/ /^(?:private-next-pages\/|next\/(?:dist\/pages\/|(?:app|cache|document|link|form|head|image|legacy\/image|constants|dynamic|script|navigation|headers|router|compat\/router|server)$)|string-hash|private-next-rsc-action-validate|private-next-rsc-action-client-wrapper|private-next-rsc-server-reference|private-next-rsc-cache-wrapper$)/
if (notExternalModules.test(request)) { if (notExternalModules.test(request)) {
return return
} }
......
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