Skip to content

Turbopack chunking: split app code by monorepo package name #78073

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

Closed
wbinnssmith wants to merge 1 commit into from
Closed

Turbopack chunking: split app code by monorepo package name #78073

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: 13 additions & 5 deletions turbopack/crates/turbopack-core/src/chunk/chunking/dev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ pub async fn app_vendors_split<'l>(
)
.await?
{
folder_split(app_chunk_items, 0, key.into(), split_context).await?;
package_name_split(app_chunk_items, key, split_context).await?;
}

let mut key = format!("{}-vendors", name);
if !handle_split_group(
&mut vendors_chunk_items,
Expand All @@ -146,8 +147,8 @@ pub async fn app_vendors_split<'l>(
Ok(())
}

/// Split chunk items by node_modules package name. Continues splitting with
/// [folder_split] if necessary.
/// Split chunk items by package name (either by node_modules or monorepo package). Continues
/// splitting with [folder_split] if necessary.
#[tracing::instrument(level = Level::TRACE, skip_all, fields(name = display(&name)))]
async fn package_name_split<'l>(
chunk_items: Vec<&'l ChunkItemOrBatchWithInfo>,
Expand Down Expand Up @@ -260,10 +261,17 @@ fn is_app_code(ident: &str) -> bool {

/// Returns the package name of the given `ident`.
fn package_name(ident: &str) -> &str {
static PACKAGE_NAME_REGEX: Lazy<Regex> =
static NODE_MODULES_PACKAGE_REGEX: Lazy<Regex> =
Lazy::new(|| Regex::new(r"/node_modules/((?:@[^/]+/)?[^/]+)").unwrap());
if let Some(result) = PACKAGE_NAME_REGEX.find_iter(ident).last() {

static MONOREPO_PACKAGE_REGEX: Lazy<Regex> =
// Use `packages` as it's commonly used in monorepos.
Lazy::new(|| Regex::new(r"/packages/((?:@[^/]+/)?[^/]+)").unwrap());

if let Some(result) = NODE_MODULES_PACKAGE_REGEX.find_iter(ident).last() {
&result.as_str()["/node_modules/".len()..]
} else if let Some(result) = MONOREPO_PACKAGE_REGEX.find_iter(ident).last() {
&result.as_str()["/packages/".len()..]
} else {
""
}
Expand Down
Loading