fix: infer async modules when incremental enabled (#7927)

web-infra-dev · Oct 9, 2024 · 823d57f · 823d57f
1 parent 6111dc5
commit 823d57f
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 1 deletion.
diff --git a/tests/plugin-test/copy-plugin/build/main.js b/tests/plugin-test/copy-plugin/build/main.js
diff --git a/...s/content-entries-with-same-import/expected/one_js.$0fbead3fcf058a7bcaa810f0daaa02f8$.css b/...s/content-entries-with-same-import/expected/one_js.$0fbead3fcf058a7bcaa810f0daaa02f8$.css
@@ -0,0 +1,8 @@
+.a {
+  width: 100px;
+}
+
+.b {
+  width: 100px;
+}
+
diff --git a/...s/content-entries-with-same-import/expected/two_js.$fcffed5bfc474a7dfac52aaf639f0ddb$.css b/...s/content-entries-with-same-import/expected/two_js.$fcffed5bfc474a7dfac52aaf639f0ddb$.css
@@ -0,0 +1,8 @@
+.b {
+  width: 100px;
+}
+
+.a {
+  width: 100px;
+}
+
diff --git a/...cases/contenthash-multiple-entries/expected/entryA.$a977c0cf8f971f151cb91fbca1c8ac9e$.css b/...cases/contenthash-multiple-entries/expected/entryA.$a977c0cf8f971f151cb91fbca1c8ac9e$.css
@@ -0,0 +1,8 @@
+.styleA {
+  background: red;
+}
+
+.styleB {
+  background: blue;
+}
+
diff --git a/...cases/contenthash-multiple-entries/expected/entryB.$db6a85db2a2c81f567d8000861bf0d58$.css b/...cases/contenthash-multiple-entries/expected/entryB.$db6a85db2a2c81f567d8000861bf0d58$.css
@@ -0,0 +1,4 @@
+.styleA {
+  background: red;
+}
+
diff --git a/...test/css-extract/cases/contenthash/expected/1.main.$f8538f5e56ec62182291732e591c1adf$.css b/...test/css-extract/cases/contenthash/expected/1.main.$f8538f5e56ec62182291732e591c1adf$.css
@@ -0,0 +1,4 @@
+body {
+  background: red;
+}
+
diff --git a/...test/css-extract/cases/contenthash/expected/2.main.$d9f7eb2a8f97615867bf6cc133b9d1df$.css b/...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
@@ -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/...in-test/css-extract/cases/js-hash/expected/style.$1ba2a4aac89178ce862c28f809f968bc$.2.css b/...in-test/css-extract/cases/js-hash/expected/style.$1ba2a4aac89178ce862c28f809f968bc$.2.css
@@ -0,0 +1,5 @@
+
+.y47aAtdWkILSHa01rP4B {
+  background: green;
+}
+
diff --git a/...in-test/css-extract/cases/js-hash/expected/style.$df926c7a640798a9cbbacdc248c1b320$.1.css b/...in-test/css-extract/cases/js-hash/expected/style.$df926c7a640798a9cbbacdc248c1b320$.1.css
@@ -0,0 +1,4 @@
+.y47aAtdWkILSHa01rP4B {
+  background: red;
+}
+