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

fix: splitChunks.enforce, pass more webpack-tests #4353

Merged
merged 1 commit into from
Oct 20, 2023
Merged

fix: splitChunks.enforce, pass more webpack-tests #4353

Show file tree
Hide file tree
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
8 changes: 5 additions & 3 deletions crates/rspack_binding_options/src/options/raw_split_chunks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,11 @@ impl From<RawSplitChunksOptions> for new_split_chunks_plugin::PluginOptions {
&overall_max_initial_size
});

let min_chunks = v
.min_chunks
.unwrap_or(if enforce { 1 } else { overall_min_chunks });
let min_chunks = if enforce {
1
} else {
v.min_chunks.unwrap_or(overall_min_chunks)
};

let r#type = v
.r#type
Expand Down
2 changes: 1 addition & 1 deletion webpack-test/configCases/split-chunks-common/correct-order/test.filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = () => "https://github.com/web-infra-dev/rspack/issues/3562"
module.exports = () => 'block: https://github.com/web-infra-dev/rspack/issues/3562'
1 change: 0 additions & 1 deletion webpack-test/configCases/split-chunks-common/extract-async-from-entry/test.filter.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion webpack-test/configCases/split-chunks-common/hot-multi/test.filter.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion webpack-test/configCases/split-chunks-common/hot-multi/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var HotModuleReplacementPlugin =
require("../../../../").HotModuleReplacementPlugin;
require("@rspack/core").HotModuleReplacementPlugin;
/** @type {import("@rspack/core").Configuration} */
module.exports = {
entry: {
Expand Down
2 changes: 1 addition & 1 deletion webpack-test/configCases/split-chunks-common/hot/test.filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = () => {return false}
module.exports = () => 'block: require.main https://github.com/web-infra-dev/rspack/issues/3562'
2 changes: 1 addition & 1 deletion webpack-test/configCases/split-chunks-common/hot/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var HotModuleReplacementPlugin =
require("../../../../").HotModuleReplacementPlugin;
require("@rspack/core").HotModuleReplacementPlugin;
/** @type {import("@rspack/core").Configuration} */
module.exports = {
entry: {
Expand Down
2 changes: 1 addition & 1 deletion webpack-test/configCases/split-chunks-common/inverted-order/test.filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = () => "https://github.com/web-infra-dev/rspack/issues/3562"
module.exports = () => 'block: require.main https://github.com/web-infra-dev/rspack/issues/3562'
1 change: 0 additions & 1 deletion webpack-test/configCases/split-chunks-common/issue-12128/test.filter.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion webpack-test/configCases/split-chunks-common/library/test.filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = () => "https://github.com/web-infra-dev/rspack/issues/3564"
module.exports = () => 'block: require.ensure https://github.com/web-infra-dev/rspack/issues/4304'
1 change: 0 additions & 1 deletion webpack-test/configCases/split-chunks-common/move-entry/test.filter.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion webpack-test/configCases/split-chunks-common/move-to-grandparent/test.filter.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion webpack-test/configCases/split-chunks-common/simple/test.filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = () => "https://github.com/web-infra-dev/rspack/issues/3562"
module.exports = () => 'block: require.main https://github.com/web-infra-dev/rspack/issues/3562'
2 changes: 1 addition & 1 deletion webpack-test/configCases/split-chunks-common/target-node/test.filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = () => {return "`splitChunks.name` doesn't support passing function"}
module.exports = () => 'block: not support function type splitChunks.name https://github.com/web-infra-dev/rspack/issues/4333'
Loading