fix: optimize CSS runtime requirements logic (#12529)

LingyuCoder · web-flow · commit 769e045fc86c · 2025-12-23T15:40:05.000+08:00
- Refactor runtime requirements check to be more granular
- Only add CSS loading runtime module when HAS_CSS_MODULES is required
- Only add PUBLIC_PATH and GET_CHUNK_CSS_FILENAME when needed
- Fix test cases to match expected behavior
diff --git a/crates/rspack_plugin_css/src/plugin/impl_plugin_for_css_plugin.rs b/crates/rspack_plugin_css/src/plugin/impl_plugin_for_css_plugin.rs
@@ -319,22 +319,36 @@ async fn runtime_requirements_in_tree(
     compilation,
   );
 
-  if (runtime_requirements.contains(RuntimeGlobals::HAS_CSS_MODULES)
+  if !is_enabled_for_chunk {
+    return Ok(None);
+  }
+
+  if runtime_requirements.contains(RuntimeGlobals::HAS_CSS_MODULES)
     || runtime_requirements.contains(RuntimeGlobals::ENSURE_CHUNK_HANDLERS)
-    || runtime_requirements.contains(RuntimeGlobals::HMR_DOWNLOAD_UPDATE_HANDLERS))
-    && is_enabled_for_chunk
+    || runtime_requirements.contains(RuntimeGlobals::HMR_DOWNLOAD_UPDATE_HANDLERS)
   {
-    runtime_requirements_mut.insert(RuntimeGlobals::PUBLIC_PATH);
-    runtime_requirements_mut.insert(RuntimeGlobals::GET_CHUNK_CSS_FILENAME);
-    runtime_requirements_mut.insert(RuntimeGlobals::HAS_OWN_PROPERTY);
     runtime_requirements_mut.insert(RuntimeGlobals::MODULE_FACTORIES_ADD_ONLY);
     runtime_requirements_mut.insert(RuntimeGlobals::MAKE_NAMESPACE_OBJECT);
+  }
+
+  if runtime_requirements.contains(RuntimeGlobals::HAS_CSS_MODULES) {
     compilation.add_runtime_module(
       chunk_ukey,
       CssLoadingRuntimeModule::new(&compilation.runtime_template).boxed(),
     )?;
   }
 
+  if runtime_requirements.contains(RuntimeGlobals::ENSURE_CHUNK_HANDLERS) {
+    runtime_requirements_mut.insert(RuntimeGlobals::PUBLIC_PATH);
+    runtime_requirements_mut.insert(RuntimeGlobals::GET_CHUNK_CSS_FILENAME);
+    runtime_requirements_mut.insert(RuntimeGlobals::HAS_OWN_PROPERTY);
+  }
+
+  if runtime_requirements.contains(RuntimeGlobals::HMR_DOWNLOAD_UPDATE_HANDLERS) {
+    runtime_requirements_mut.insert(RuntimeGlobals::PUBLIC_PATH);
+    runtime_requirements_mut.insert(RuntimeGlobals::GET_CHUNK_CSS_FILENAME);
+  }
+
   Ok(None)
 }
 
diff --git a/tests/rspack-test/builtinCases/plugin-html/variant/__snapshots__/output.snap.txt b/tests/rspack-test/builtinCases/plugin-html/variant/__snapshots__/output.snap.txt
@@ -1,3 +1,3 @@
 ```html title=output.html
-<!doctype html><html><head><meta charset="UTF-8"><title>Rspack App</title><script crossorigin integrity="sha512-YXG9TdCv5c+hzETohiLZ2SxJ8/XqLuMx4jREXi5oWY3vd7zuH/nXAiKx83KVF3C5+H6Bqve0ZSC9nrpNrb5G4A==" src="/runtime.js"></script><script crossorigin integrity="sha512-Suo2rxdzKWBwd8QCzEYzbPxiEFqbi+tK1D9wIhKVSSj2w27IeZ97mKVFTeqHcgvDoAREm2wNE6YqasvTKx3b0Q==" src="/index.js"></script><link crossorigin href="/index.css" integrity="sha512-vjhejkvTX8D8jzzC5Lc9ToCtcEDb0/NqtYmEHOid+ycq64hvW+JTG7Dw/ACFP6rApgiYwVMbEt6Zfb8j4EoZTA==" rel="stylesheet"></head><body></body></html>
+<!doctype html><html><head><meta charset="UTF-8"><title>Rspack App</title><script crossorigin integrity="sha512-Orikz3SNSn+AZ/83dHOamnEgt4/EwAPs7GkTrri81j23hMb7mU0Ql5E/88CAHP2fZSRCSRuEZIwfjE+1mhb00w==" src="/runtime.js"></script><script crossorigin integrity="sha512-Suo2rxdzKWBwd8QCzEYzbPxiEFqbi+tK1D9wIhKVSSj2w27IeZ97mKVFTeqHcgvDoAREm2wNE6YqasvTKx3b0Q==" src="/index.js"></script><link crossorigin href="/index.css" integrity="sha512-vjhejkvTX8D8jzzC5Lc9ToCtcEDb0/NqtYmEHOid+ycq64hvW+JTG7Dw/ACFP6rApgiYwVMbEt6Zfb8j4EoZTA==" rel="stylesheet"></head><body></body></html>
 ```
diff --git a/tests/rspack-test/configCases/css/no-extra-js-exports-output/test.js b/tests/rspack-test/configCases/css/no-extra-js-exports-output/test.js
@@ -13,9 +13,7 @@ it("should work", () => {
 		// and it still output two runtime module:
 		// 	 'webpack/runtime/make namespace object'
 		// 	 'webpack/runtime/css loading'
-		// DIFF: rspack generate extra js modules for css modules
-		// expect(stats.modules.length).toBe(4);
-		expect(stats.modules.length).toBe(8);
+		expect(stats.modules.length).toBe(4);
 	} else if (__STATS_I__ === 1) {
 		stats.modules
 			.filter(module => module.moduleType === "css/auto")
diff --git a/tests/rspack-test/configCases/hooks/rspack-issue-5571/index.js b/tests/rspack-test/configCases/hooks/rspack-issue-5571/index.js
@@ -1,3 +1,4 @@
+import "./index.css";
 const fs = __non_webpack_require__("fs");
 const path = __non_webpack_require__("path");
 
diff --git a/tests/rspack-test/configCases/source-map/verify-css-js-mix/index.js b/tests/rspack-test/configCases/source-map/verify-css-js-mix/index.js
@@ -14,10 +14,6 @@ it("verify importing css js source map", async () => {
 	expect(map.sources.sort()).toEqual([
 		"webpack:///./a.js",
 		"webpack:///./index.js",
-		"webpack:///webpack/runtime/auto_public_path",
-		"webpack:///webpack/runtime/get css chunk filename",
-		"webpack:///webpack/runtime/global",
-		"webpack:///webpack/runtime/has_own_property",
 		"webpack:///webpack/runtime/make_namespace_object",
 	]);
 	expect(map.file).toEqual("bundle0.js");
diff --git a/tests/rspack-test/statsOutputCases/css-concat/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/css-concat/__snapshots__/stats.txt
@@ -1,7 +1,7 @@
-asset main.js xx KiB [emitted] (name: main)
+asset main.js xx bytes [emitted] (name: main)
 asset main.css xx bytes [emitted] (name: main)
-Entrypoint main xx KiB = main.js xx KiB main.css xx bytes
-runtime modules xx KiB 6 modules
+Entrypoint main xx bytes = main.js xx bytes main.css xx bytes
+runtime modules xx bytes 2 modules
 cacheable modules xx bytes (javascript) xx bytes (css)
   ./index.js xx bytes [built] [code generated]
   ./foo.css xx bytes [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/dynamic-import/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/dynamic-import/__snapshots__/stats.txt
@@ -4,7 +4,7 @@ asset pages/home.js xx KiB [emitted] (name: pages/home)
 asset runtime.js xx KiB [emitted] (name: runtime)
 asset main.js xx KiB [emitted] (name: main)
 Entrypoint main 1.12 MiB = runtime.js xx KiB common.js 1.11 MiB main.js xx KiB
-runtime modules xx KiB 14 modules
+runtime modules xx KiB 13 modules
 cacheable modules 1.12 MiB
   modules by path ../../../../node_modules/.pnpm/ 1.1 MiB
     modules by path ../../../../node_modules/<PNPM_INNER>/react/ xx KiB 4 modules
diff --git a/tests/rspack-test/statsOutputCases/filename/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/filename/__snapshots__/stats.txt
@@ -1,6 +1,6 @@
 asset 889.xxxx.js xx KiB [emitted] (name: main)
 asset 769.xxxx.js xx bytes [emitted]
-runtime modules xx KiB 11 modules
+runtime modules xx KiB 10 modules
 cacheable modules xx bytes
   ./index.js xx bytes [built] [code generated]
   ./dynamic.js xx bytes [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/hot+production/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/hot+production/__snapshots__/stats.txt
@@ -1,4 +1,4 @@
 asset main.js xx KiB [emitted] (name: main)
-runtime modules xx KiB 12 modules
+runtime modules xx KiB 11 modules
 ./index.js xx bytes [built] [code generated]
 Rspack x.x.x compiled successfully in X s
diff --git a/tests/rspack-test/statsOutputCases/immutable/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/immutable/__snapshots__/stats.txt
@@ -1,2 +1,2 @@
-asset 1513c0e99cf8dddc.js xx KiB [emitted] [immutable] (name: main)
+asset 6954a74052160253.js xx KiB [emitted] [immutable] (name: main)
 asset ce122906ee13f376.js xx bytes [emitted] [immutable]
diff --git a/tests/rspack-test/statsOutputCases/import-context-filter/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/import-context-filter/__snapshots__/stats.txt
@@ -2,7 +2,7 @@ asset entry.js xx KiB [emitted] (name: entry)
 asset 870.js xx bytes [emitted]
 asset 897.js xx bytes [emitted]
 asset 985.js xx bytes [emitted]
-runtime modules xx KiB 11 modules
+runtime modules xx KiB 10 modules
 cacheable modules xx bytes
   modules by path ./templates/*.js xx bytes
     ./templates/bar.js xx bytes [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/import-weak-parser-option/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/import-weak-parser-option/__snapshots__/stats.txt
@@ -1,7 +1,7 @@
 asset entry.js xx KiB [emitted] (name: entry)
 asset 357.js xx bytes [emitted]
 asset 966.js xx bytes [emitted]
-runtime modules xx KiB 12 modules
+runtime modules xx KiB 11 modules
 cacheable modules xx bytes
   ./entry.js xx bytes [built] [code generated]
   ./modules/a.js xx bytes [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/import-weak/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/import-weak/__snapshots__/stats.txt
@@ -1,7 +1,7 @@
 asset entry.js xx KiB [emitted] (name: entry)
 asset 357.js xx bytes [emitted]
 asset 966.js xx bytes [emitted]
-runtime modules xx KiB 12 modules
+runtime modules xx KiB 11 modules
 cacheable modules xx bytes
   ./entry.js xx bytes [built] [code generated]
   ./modules/a.js xx bytes [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/import-with-invalid-options-comments/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/import-with-invalid-options-comments/__snapshots__/stats.txt
@@ -1,4 +1,4 @@
-runtime modules xx KiB 14 modules
+runtime modules xx KiB 13 modules
 cacheable modules xx bytes
   ./index.js xx bytes [built] [code generated]
   ./chunk.js xx bytes [built] [code generated] [2 warnings]
diff --git a/tests/rspack-test/statsOutputCases/issue-7577/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/issue-7577/__snapshots__/stats.txt
@@ -20,11 +20,11 @@ Rspack x.x.x compiled successfully in X s
 assets by chunk xx bytes (id hint: all)
   asset c-all-b_js-113206d7531c234d.js xx bytes [emitted] [immutable] (id hint: all)
   asset c-all-c_js-9f8c7c16580d157a.js xx bytes [emitted] [immutable] (id hint: all)
-asset c-runtime~main-9e132286f7a68e1d.js xx KiB [emitted] [immutable] (name: runtime~main)
+asset c-runtime~main-f25a17b47b43aefb.js xx KiB [emitted] [immutable] (name: runtime~main)
 asset c-main-831261ae36cba529.js xx bytes [emitted] [immutable] (name: main)
 asset c-vendors-node_modules_vendor_js-01281488ed24fc05.js xx bytes [emitted] [immutable] (id hint: vendors)
-Entrypoint main xx KiB = c-runtime~main-9e132286f7a68e1d.js xx KiB c-all-c_js-9f8c7c16580d157a.js xx bytes c-main-831261ae36cba529.js xx bytes
-runtime modules xx KiB 15 modules
+Entrypoint main xx KiB = c-runtime~main-f25a17b47b43aefb.js xx KiB c-all-c_js-9f8c7c16580d157a.js xx bytes c-main-831261ae36cba529.js xx bytes
+runtime modules xx KiB 14 modules
 cacheable modules xx bytes
   ./c.js xx bytes [built] [code generated]
   ./b.js xx bytes [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/module-assets/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/module-assets/__snapshots__/stats.txt
@@ -14,7 +14,7 @@ chunk (runtime: main) b.js (b) xx bytes [rendered]
   ./node_modules/b/index.js xx bytes [built] [code generated]
 chunk (runtime: main) main.js (main) xx bytes (javascript) xx KiB (runtime) [entry] [rendered]
   ./index.js xx bytes [built] [code generated]
-runtime modules xx KiB 10 modules
+runtime modules xx KiB 9 modules
 orphan modules xx bytes [orphan] 2 modules
 modules with assets xx bytes
   ./index.js xx bytes [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/named-chunks-plugin-async/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/named-chunks-plugin-async/__snapshots__/stats.txt
@@ -1,7 +1,7 @@
 asset entry.js xx KiB [emitted] (name: entry)
 asset modules_a_js.js xx bytes [emitted]
 asset modules_b_js.js xx bytes [emitted]
-runtime modules xx KiB 12 modules
+runtime modules xx KiB 11 modules
 cacheable modules xx bytes
   ./entry.js xx bytes [built] [code generated]
   ./modules/a.js xx bytes [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/output-module/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/output-module/__snapshots__/stats.txt
@@ -1,6 +1,6 @@
 asset main.mjs xx KiB [emitted] [javascript module] (name: main)
 asset 753.mjs xx bytes [emitted] [javascript module]
-runtime modules xx KiB 10 modules
+runtime modules xx KiB 9 modules
 orphan modules xx bytes [orphan] 2 modules
 cacheable modules xx bytes
   ./index.js + 1 modules xx bytes [code generated]
diff --git a/tests/rspack-test/statsOutputCases/performance-disabled/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/performance-disabled/__snapshots__/stats.txt
@@ -2,7 +2,7 @@ asset main.js xx KiB [emitted] (name: main)
 asset 266.js xx bytes [emitted]
 asset 327.js xx bytes [emitted]
 Entrypoint main xx KiB = main.js
-runtime modules xx KiB 12 modules
+runtime modules xx KiB 11 modules
 cacheable modules xx KiB
   ./index.js xx bytes [built] [code generated]
   ./a.js xx KiB [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/performance-error/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/performance-error/__snapshots__/stats.txt
@@ -2,7 +2,7 @@ asset main.js xx KiB [emitted] [big] (name: main)
 asset 266.js xx bytes [emitted]
 asset 327.js xx bytes [emitted]
 Entrypoint main [big] xx KiB = main.js
-runtime modules xx KiB 12 modules
+runtime modules xx KiB 11 modules
 cacheable modules xx KiB
   ./index.js xx bytes [built] [code generated]
   ./a.js xx KiB [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/performance-no-hints/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/performance-no-hints/__snapshots__/stats.txt
@@ -2,7 +2,7 @@ asset main.js xx KiB [emitted] [big] (name: main)
 asset 266.js xx bytes [emitted]
 asset 327.js xx bytes [emitted]
 Entrypoint main [big] xx KiB = main.js
-runtime modules xx KiB 12 modules
+runtime modules xx KiB 11 modules
 cacheable modules xx KiB
   ./index.js xx bytes [built] [code generated]
   ./a.js xx KiB [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/runtime-specific-used-exports/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/runtime-specific-used-exports/__snapshots__/stats.txt
@@ -52,7 +52,7 @@ production:
     ./dz.js xx bytes [built] [code generated]
     ./module.js?chunk xx bytes [dependent] [built] [code generated]
       [only some exports used: identity, w, x, y, z]
-  runtime modules xx KiB 22 modules
+  runtime modules xx KiB 20 modules
   cacheable modules xx KiB
     ./a.js xx bytes [built] [code generated]
       [no exports used]
@@ -129,7 +129,7 @@ development:
       [used exports unknown]
     ./module.js?chunk xx bytes [dependent] [built] [code generated]
       [used exports unknown]
-  runtime modules xx KiB 22 modules
+  runtime modules xx KiB 20 modules
   cacheable modules xx KiB
     ./a.js xx bytes [built] [code generated]
       [used exports unknown]
@@ -206,7 +206,7 @@ global:
     ./dz.js xx bytes [built] [code generated]
     ./module.js?chunk xx bytes [dependent] [built] [code generated]
       [only some exports used: identity, w, x, y, z]
-  runtime modules xx KiB 22 modules
+  runtime modules xx KiB 20 modules
   cacheable modules xx KiB
     ./a.js xx bytes [built] [code generated]
       [no exports used]
diff --git a/tests/rspack-test/statsOutputCases/scope-hoisting-bailouts/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/scope-hoisting-bailouts/__snapshots__/stats.txt
@@ -1,4 +1,4 @@
-runtime modules xx KiB 12 modules
+runtime modules xx KiB 11 modules
 cacheable modules xx bytes
   code generated modules xx bytes [code generated]
     ./index.js xx bytes [built] [code generated]
diff --git a/tests/rspack-test/statsOutputCases/scope-hoisting-multi/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/scope-hoisting-multi/__snapshots__/stats.txt
@@ -1,4 +1,4 @@
-runtime modules xx KiB 22 modules
+runtime modules xx KiB 20 modules
 orphan modules xx bytes [orphan] 4 modules
 cacheable modules xx bytes
   ./first.js xx bytes [built] [code generated]
@@ -10,7 +10,7 @@ cacheable modules xx bytes
   ./common_lazy_shared.js xx bytes [built] [code generated]
 Rspack x.x.x compiled successfully in X s
 
-runtime modules xx KiB 22 modules
+runtime modules xx KiB 20 modules
 cacheable modules xx KiB
   built modules xx bytes [built]
     orphan modules xx bytes [orphan]
diff --git a/tests/rspack-test/statsOutputCases/side-effects-issue-7428/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/side-effects-issue-7428/__snapshots__/stats.txt
@@ -1,6 +1,6 @@
 asset main.js xx KiB [emitted] (name: main)
 asset 0.js xx bytes [emitted]
-runtime modules xx KiB 11 modules
+runtime modules xx KiB 10 modules
 cacheable modules xx bytes
   modules by path ./components/src/ xx bytes
     orphan modules xx bytes [orphan]
diff --git a/tests/rspack-test/statsOutputCases/wasm-explorer-examples-sync/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/wasm-explorer-examples-sync/__snapshots__/stats.txt
@@ -21,7 +21,7 @@ chunk (runtime: main) 304f41ed8aa46cbb.module.wasm, 549.bundle.js, 5fde5d910acc4
   ./tests.js xx KiB [built] [code generated]
 chunk (runtime: main) bundle.js (main) xx bytes (javascript) xx KiB (runtime) [entry] [rendered]
   ./index.js xx bytes [built] [code generated]
-runtime modules xx KiB 13 modules
+runtime modules xx KiB 12 modules
 cacheable modules xx KiB (wasm) xx KiB (javascript)
   webassembly modules xx KiB (wasm) xx bytes (javascript)
     ./Q_rsqrt.wasm xx bytes (wasm) xx bytes (javascript) [built] [code generated]

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import "./index.css";`
`1`	`2`	`const fs = __non_webpack_require__("fs");`
`2`	`3`	`const path = __non_webpack_require__("path");`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-asset 1513c0e99cf8dddc.js xx KiB [emitted] [immutable] (name: main)`
	`1`	`+asset 6954a74052160253.js xx KiB [emitted] [immutable] (name: main)`
`2`	`2`	`asset ce122906ee13f376.js xx bytes [emitted] [immutable]`