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

fix: splitChunks.enforce should enforce minChunks to be 1
web-infra-dev · Oct 22, 2023 · 5cc7c50 · 5cc7c50
1 parent c9f7691
commit 5cc7c50
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 16 deletions.
diff --git a/crates/rspack_binding_options/src/options/raw_split_chunks.rs b/crates/rspack_binding_options/src/options/raw_split_chunks.rs
@@ -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

diff --git a/webpack-test/configCases/split-chunks-common/correct-order/test.filter.js b/webpack-test/configCases/split-chunks-common/correct-order/test.filter.js
@@ -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'
diff --git a/webpack-test/configCases/split-chunks-common/extract-async-from-entry/test.filter.js b/webpack-test/configCases/split-chunks-common/extract-async-from-entry/test.filter.js
diff --git a/webpack-test/configCases/split-chunks-common/hot-multi/test.filter.js b/webpack-test/configCases/split-chunks-common/hot-multi/test.filter.js
diff --git a/webpack-test/configCases/split-chunks-common/hot-multi/webpack.config.js b/webpack-test/configCases/split-chunks-common/hot-multi/webpack.config.js
@@ -1,5 +1,5 @@
 var HotModuleReplacementPlugin =
-	require("../../../../").HotModuleReplacementPlugin;
+	require("@rspack/core").HotModuleReplacementPlugin;
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
 	entry: {

diff --git a/webpack-test/configCases/split-chunks-common/hot/test.filter.js b/webpack-test/configCases/split-chunks-common/hot/test.filter.js
@@ -1 +1 @@
-module.exports = () => {return false}
+module.exports = () => 'block: require.main https://github.com/web-infra-dev/rspack/issues/3562'
diff --git a/webpack-test/configCases/split-chunks-common/hot/webpack.config.js b/webpack-test/configCases/split-chunks-common/hot/webpack.config.js
@@ -1,5 +1,5 @@
 var HotModuleReplacementPlugin =
-	require("../../../../").HotModuleReplacementPlugin;
+	require("@rspack/core").HotModuleReplacementPlugin;
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
 	entry: {

diff --git a/webpack-test/configCases/split-chunks-common/inverted-order/test.filter.js b/webpack-test/configCases/split-chunks-common/inverted-order/test.filter.js
@@ -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'
diff --git a/webpack-test/configCases/split-chunks-common/issue-12128/test.filter.js b/webpack-test/configCases/split-chunks-common/issue-12128/test.filter.js
diff --git a/webpack-test/configCases/split-chunks-common/library/test.filter.js b/webpack-test/configCases/split-chunks-common/library/test.filter.js
@@ -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'
diff --git a/webpack-test/configCases/split-chunks-common/move-entry/test.filter.js b/webpack-test/configCases/split-chunks-common/move-entry/test.filter.js
diff --git a/webpack-test/configCases/split-chunks-common/move-to-grandparent/test.filter.js b/webpack-test/configCases/split-chunks-common/move-to-grandparent/test.filter.js
diff --git a/webpack-test/configCases/split-chunks-common/simple/test.filter.js b/webpack-test/configCases/split-chunks-common/simple/test.filter.js
@@ -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'
diff --git a/webpack-test/configCases/split-chunks-common/target-node/test.filter.js b/webpack-test/configCases/split-chunks-common/target-node/test.filter.js
@@ -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'
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'
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'
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'
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'