From 823d57f008d0be3b8556a73d832976b02a29625e Mon Sep 17 00:00:00 2001
From: Gengkun <ahabhgk@gmail.com>
Date: Fri, 20 Sep 2024 19:04:02 +0800
Subject: [PATCH] fix: infer async modules when incremental enabled (#7927)

---
 tests/plugin-test/copy-plugin/build/main.js               | 2 +-
 .../one_js.$0fbead3fcf058a7bcaa810f0daaa02f8$.css         | 8 ++++++++
 .../two_js.$fcffed5bfc474a7dfac52aaf639f0ddb$.css         | 8 ++++++++
 .../entryA.$a977c0cf8f971f151cb91fbca1c8ac9e$.css         | 8 ++++++++
 .../entryB.$db6a85db2a2c81f567d8000861bf0d58$.css         | 4 ++++
 .../1.main.$f8538f5e56ec62182291732e591c1adf$.css         | 4 ++++
 .../2.main.$d9f7eb2a8f97615867bf6cc133b9d1df$.css         | 4 ++++
 .../css-extract/cases/issue-6649/expected/main.js         | 8 ++++++++
 .../style.$1ba2a4aac89178ce862c28f809f968bc$.2.css        | 5 +++++
 .../style.$df926c7a640798a9cbbacdc248c1b320$.1.css        | 4 ++++
 10 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/one_js.$0fbead3fcf058a7bcaa810f0daaa02f8$.css
 create mode 100644 tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/two_js.$fcffed5bfc474a7dfac52aaf639f0ddb$.css
 create mode 100644 tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryA.$a977c0cf8f971f151cb91fbca1c8ac9e$.css
 create mode 100644 tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryB.$db6a85db2a2c81f567d8000861bf0d58$.css
 create mode 100644 tests/plugin-test/css-extract/cases/contenthash/expected/1.main.$f8538f5e56ec62182291732e591c1adf$.css
 create mode 100644 tests/plugin-test/css-extract/cases/contenthash/expected/2.main.$d9f7eb2a8f97615867bf6cc133b9d1df$.css
 create mode 100644 tests/plugin-test/css-extract/cases/js-hash/expected/style.$1ba2a4aac89178ce862c28f809f968bc$.2.css
 create mode 100644 tests/plugin-test/css-extract/cases/js-hash/expected/style.$df926c7a640798a9cbbacdc248c1b320$.1.css

diff --git a/tests/plugin-test/copy-plugin/build/main.js b/tests/plugin-test/copy-plugin/build/main.js
index a29a6dbf659..f0a40b486f0 100644
--- a/tests/plugin-test/copy-plugin/build/main.js
+++ b/tests/plugin-test/copy-plugin/build/main.js
@@ -1 +1 @@
-(()=>{"use strict";var r={},t={};function e(i){var o=t[i];if(void 0!==o)return o.exports;var n=t[i]={exports:{}};return r[i](n,n.exports,e),n.exports}e.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||Function("return this")()}catch(r){if("object"==typeof window)return window}}(),e.rv=function(){return"1.0.7"},(()=>{e.g.importScripts&&(r=e.g.location+"");var r,t=e.g.document;if(!r&&t&&(t.currentScript&&"SCRIPT"===t.currentScript.tagName.toUpperCase()&&(r=t.currentScript.src),!r)){var i=t.getElementsByTagName("script");if(i.length){for(var o=i.length-1;o>-1&&(!r||!/^http(s?):/.test(r));)r=i[o--].src}}if(!r)throw Error("Automatic publicPath is not supported in this browser");r=r.replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),e.p=r})(),e.ruid="bundler=rspack@1.0.7",e.p})();
\ No newline at end of file
+(()=>{"use strict";var r={},t={};function e(i){var o=t[i];if(void 0!==o)return o.exports;var n=t[i]={exports:{}};return r[i](n,n.exports,e),n.exports}e.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||Function("return this")()}catch(r){if("object"==typeof window)return window}}(),e.rv=function(){return"1.0.7"},(()=>{e.g.importScripts&&(r=e.g.location+"");var r,t=e.g.document;if(!r&&t&&(t.currentScript&&"SCRIPT"===t.currentScript.tagName.toUpperCase()&&(r=t.currentScript.src),!r)){var i=t.getElementsByTagName("script");if(i.length){for(var o=i.length-1;o>-1&&(!r||!/^http(s?):/.test(r));)r=i[o--].src}}if(!r)throw Error("Automatic publicPath is not supported in this browser");r=r.replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),e.p=r})(),e.ruid="bundler=rspack@1.0.7",e.p})();
diff --git a/tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/one_js.$0fbead3fcf058a7bcaa810f0daaa02f8$.css b/tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/one_js.$0fbead3fcf058a7bcaa810f0daaa02f8$.css
new file mode 100644
index 00000000000..f6a43c7e514
--- /dev/null
+++ b/tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/one_js.$0fbead3fcf058a7bcaa810f0daaa02f8$.css
@@ -0,0 +1,8 @@
+.a {
+  width: 100px;
+}
+
+.b {
+  width: 100px;
+}
+
diff --git a/tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/two_js.$fcffed5bfc474a7dfac52aaf639f0ddb$.css b/tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/two_js.$fcffed5bfc474a7dfac52aaf639f0ddb$.css
new file mode 100644
index 00000000000..c40231b8ae1
--- /dev/null
+++ b/tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/two_js.$fcffed5bfc474a7dfac52aaf639f0ddb$.css
@@ -0,0 +1,8 @@
+.b {
+  width: 100px;
+}
+
+.a {
+  width: 100px;
+}
+
diff --git a/tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryA.$a977c0cf8f971f151cb91fbca1c8ac9e$.css b/tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryA.$a977c0cf8f971f151cb91fbca1c8ac9e$.css
new file mode 100644
index 00000000000..c6856116b8c
--- /dev/null
+++ b/tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryA.$a977c0cf8f971f151cb91fbca1c8ac9e$.css
@@ -0,0 +1,8 @@
+.styleA {
+  background: red;
+}
+
+.styleB {
+  background: blue;
+}
+
diff --git a/tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryB.$db6a85db2a2c81f567d8000861bf0d58$.css b/tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryB.$db6a85db2a2c81f567d8000861bf0d58$.css
new file mode 100644
index 00000000000..95d70a8ec01
--- /dev/null
+++ b/tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryB.$db6a85db2a2c81f567d8000861bf0d58$.css
@@ -0,0 +1,4 @@
+.styleA {
+  background: red;
+}
+
diff --git a/tests/plugin-test/css-extract/cases/contenthash/expected/1.main.$f8538f5e56ec62182291732e591c1adf$.css b/tests/plugin-test/css-extract/cases/contenthash/expected/1.main.$f8538f5e56ec62182291732e591c1adf$.css
new file mode 100644
index 00000000000..cebc5c1c9f8
--- /dev/null
+++ b/tests/plugin-test/css-extract/cases/contenthash/expected/1.main.$f8538f5e56ec62182291732e591c1adf$.css
@@ -0,0 +1,4 @@
+body {
+  background: red;
+}
+
diff --git a/tests/plugin-test/css-extract/cases/contenthash/expected/2.main.$d9f7eb2a8f97615867bf6cc133b9d1df$.css b/tests/plugin-test/css-extract/cases/contenthash/expected/2.main.$d9f7eb2a8f97615867bf6cc133b9d1df$.css
new file mode 100644
index 00000000000..ec3b88b5d59
--- /dev/null
+++ b/tests/plugin-test/css-extract/cases/contenthash/expected/2.main.$d9f7eb2a8f97615867bf6cc133b9d1df$.css
@@ -0,0 +1,4 @@
+body {
+  background: green;
+}
+
diff --git a/tests/plugin-test/css-extract/cases/issue-6649/expected/main.js b/tests/plugin-test/css-extract/cases/issue-6649/expected/main.js
index 741edf1f01a..8b91d22f06e 100644
--- a/tests/plugin-test/css-extract/cases/issue-6649/expected/main.js
+++ b/tests/plugin-test/css-extract/cases/issue-6649/expected/main.js
@@ -100,14 +100,22 @@ __webpack_require__.e = function (chunkId) {
           // return url for filenames not based on template
           
           // return url for filenames based on template
+<<<<<<< HEAD
           return "" + chunkId + ".$" + "ab430f3232737cd7fe9a" + "$.css";
+=======
+          return "" + chunkId + ".$" + "bb3ca0a2a8332b9ea9ee" + "$.css";
+>>>>>>> 4e325fda8 (fix: infer async modules when incremental enabled (#7927))
         };
       
 })();
 // webpack/runtime/get_full_hash
 (() => {
 __webpack_require__.h = function () {
+<<<<<<< HEAD
 	return "346fef09900abc98cd47";
+=======
+	return "5fcc30abf165502e2631";
+>>>>>>> 4e325fda8 (fix: infer async modules when incremental enabled (#7927))
 };
 
 })();
diff --git a/tests/plugin-test/css-extract/cases/js-hash/expected/style.$1ba2a4aac89178ce862c28f809f968bc$.2.css b/tests/plugin-test/css-extract/cases/js-hash/expected/style.$1ba2a4aac89178ce862c28f809f968bc$.2.css
new file mode 100644
index 00000000000..06b02cfd2da
--- /dev/null
+++ b/tests/plugin-test/css-extract/cases/js-hash/expected/style.$1ba2a4aac89178ce862c28f809f968bc$.2.css
@@ -0,0 +1,5 @@
+
+.y47aAtdWkILSHa01rP4B {
+  background: green;
+}
+
diff --git a/tests/plugin-test/css-extract/cases/js-hash/expected/style.$df926c7a640798a9cbbacdc248c1b320$.1.css b/tests/plugin-test/css-extract/cases/js-hash/expected/style.$df926c7a640798a9cbbacdc248c1b320$.1.css
new file mode 100644
index 00000000000..3fea942b504
--- /dev/null
+++ b/tests/plugin-test/css-extract/cases/js-hash/expected/style.$df926c7a640798a9cbbacdc248c1b320$.1.css
@@ -0,0 +1,4 @@
+.y47aAtdWkILSHa01rP4B {
+  background: red;
+}
+