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

feat: compatible codeSplitting config with umi #1669

Merged
merged 3 commits into from
Oct 30, 2024
Merged

feat: compatible codeSplitting config with umi #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
489ffe0
feat: compatible codeSplitting config with umi
xusd320 Oct 29, 2024
be7cd89
test: fix e2e code-splitting.granular
xusd320 Oct 29, 2024
a6f356b
fix: umi codeSplitting: depPerChunk
xusd320 Oct 30, 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
4 changes: 2 additions & 2 deletions crates/mako/src/config/code_splitting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ pub struct ChunkGroup {
#[serde(default = "GenericUsizeDefault::<5000000>::value")]
pub max_size: usize,
#[serde(default)]
pub min_module_size: Option<usize>,
pub min_package_size: Option<usize>,
#[serde(default)]
pub priority: i8,
#[serde(default)]
Expand All @@ -102,7 +102,7 @@ impl Default for ChunkGroup {
max_size: GenericUsizeDefault::<5000000>::value(),
name: String::default(),
name_suffix: None,
min_module_size: None,
min_package_size: None,
test: None,
priority: i8::default(),
}
Expand Down
29 changes: 16 additions & 13 deletions crates/mako/src/generate/optimize_chunk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ impl Compiler {
// stage: modules
self.module_to_optimize_infos(&mut optimize_chunks_infos, None);

// stage: size
self.optimize_chunk_size(&mut optimize_chunks_infos);

// stage: name_suffix
self.optimize_name_suffix(&mut optimize_chunks_infos);

// stage: size
self.optimize_chunk_size(&mut optimize_chunks_infos);

// stage: apply
self.apply_optimize_infos(&optimize_chunks_infos);

Expand Down Expand Up @@ -264,13 +264,7 @@ impl Compiler {
);

// split new chunks until chunk size is less than max_size and there has more than 1 package can be split
while package_size_map.len() > 1
&& (chunk_size > info.group_options.max_size
|| (info.group_options.min_module_size.is_some()
&& package_size_map
.iter()
.any(|p| p.1 .0 < info.group_options.min_module_size.unwrap())))
{
while package_size_map.len() > 1 && chunk_size > info.group_options.max_size {
let mut new_chunk_size = 0;
let mut new_module_to_chunks = IndexMap::new();

Expand All @@ -283,8 +277,6 @@ impl Compiler {
let package_size = package.1 .0;
new_chunk_size == 0
|| new_chunk_size + package_size < info.group_options.max_size
&& (info.group_options.min_module_size.is_none()
|| package_size < info.group_options.min_module_size.unwrap())
} else {
false
}
Expand Down Expand Up @@ -344,6 +336,17 @@ impl Compiler {
module_to_package_map
.iter()
.for_each(|(package_name, module_ids)| {
let total_package_size =
module_ids.iter().fold(0_usize, |total, cur| {
total + self.get_module_size(cur).unwrap_or_default()
});

if total_package_size
< info.group_options.min_package_size.unwrap_or_default()
{
return;
}

let mut new_chunk_group_options = info.group_options.clone();
new_chunk_group_options.name =
format!("{}_{}", info.group_options.name, package_name);
Expand Down Expand Up @@ -635,7 +638,7 @@ fn code_splitting_strategy_granular(
name_suffix: Some(ChunkNameSuffixStrategy::PackageName),
allow_chunks: AllowChunks::Async,
test: Some(r"[/\\]node_modules[/\\]".to_string()),
min_module_size: Some(lib_min_size),
min_package_size: Some(lib_min_size),
priority: -20,
..Default::default()
},
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/plugins/ssu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ impl Plugin for SUPlus {
min_chunks: 0,
min_size: 0,
max_size: usize::MAX,
min_module_size: None,
min_package_size: None,
priority: 10,
test: Some(r"[/\\]node_modules[/\\]".to_string()),
},
Expand All @@ -182,7 +182,7 @@ impl Plugin for SUPlus {
min_size: 1,
max_size: usize::MAX,
name_suffix: None,
min_module_size: None,
min_package_size: None,
priority: 0,
..Default::default()
},
Expand Down
16 changes: 8 additions & 8 deletions e2e/fixtures/code-splitting.granular/expect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ assert(
);

assert(
files["lib_0_lib1-async.js"].includes('console.log("lib1")')
&& !files["lib_0_lib1-async.js"].includes("normal")
&& files["lib_1_lib2-async.js"].includes('console.log("lib2")')
&& !files["lib_1_lib2-async.js"].includes("normal")
&& files["lib_0_shared1-async.js"].includes('console.log("shared1")')
&& !files["lib_0_shared1-async.js"].includes("normal")
&& files["lib_0_shared2-async.js"].includes('console.log("shared2")')
&& !files["lib_0_shared2-async.js"].includes("normal"),
files["lib_lib1-async.js"].includes('console.log("lib1")')
&& !files["lib_lib1-async.js"].includes("normal")
&& files["lib_lib2-async.js"].includes('console.log("lib2")')
&& !files["lib_lib2-async.js"].includes("normal")
&& files["lib-async.js"].includes('console.log("shared1")')
&& files["lib-async.js"].includes("normal")
&& files["lib-async.js"].includes('console.log("shared2")')
&& files["lib-async.js"].includes("normal"),
"should split lib chunks"
);

Expand Down
74 changes: 47 additions & 27 deletions packages/bundler-mako/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,26 +566,52 @@ async function getMakoConfig(opts) {

const normalizedDevtool = devtool === false ? false : 'source-map';

if (process.env.GRANULAR_CHUNKS) {
codeSplitting = {
strategy: 'granular',
options: {
// copy from https://github.com/umijs/umi/blob/d8f3f1fa9586a8c7cab4d3b6a9e1637a6f47e1dc/packages/preset-umi/src/features/codeSplitting/codeSplitting.ts#L60
frameworkPackages: [
'react-dom',
'react',
// 'core-js',
// 'regenerator-runtime',
'history',
'react-router',
'react-router-dom',
'scheduler',
// TODO
// add renderer-react
],
},
};
}
let makoCodeSplittingConfig =
codeSplitting === false
? false
: codeSplitting?.jsStrategy === 'granularChunks'
? {
strategy: 'granular',
options: {
// copy from https://github.com/umijs/umi/blob/d8f3f1fa9586a8c7cab4d3b6a9e1637a6f47e1dc/packages/preset-umi/src/features/codeSplitting/codeSplitting.ts#L60
frameworkPackages: [
'react-dom',
'react',
// 'core-js',
// 'regenerator-runtime',
'history',
'react-router',
'react-router-dom',
'scheduler',
// TODO
// add renderer-react
],
},
}
: codeSplitting?.jsStrategy === 'depPerChunk'
? {
strategy: 'advanced',
options: {
groups: [
{
name: 'npm',
allowChunks: 'async',
test: '[\\\\/]node_modules[\\\\/]',
nameSuffix: 'packageName',
priority: -10,
minSize: 1,
minPackageSize: 1,
},
{
name: 'common',
allowChunks: 'async',
minChunks: 2,
priority: -20,
},
],
},
}
: { strategy: 'auto' };

const makoConfig = {
entry: opts.entry,
Expand All @@ -600,13 +626,7 @@ async function getMakoConfig(opts) {
},
manifest,
mdx: !!mdx,
codeSplitting:
codeSplitting === false
? false
: typeof codeSplitting === 'object' &&
codeSplitting.strategy === 'granular'
? codeSplitting
: { strategy: 'auto' },
codeSplitting: makoCodeSplittingConfig,
devtool: normalizedDevtool,
cjs,
dynamicImportToRequire,
Expand Down
Loading