fix

web-infra-dev · May 15, 2024 · 131c35f · 131c35f
1 parent d9b8a2f
commit 131c35f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/crates/rspack_plugin_css/src/parser_and_generator/mod.rs b/crates/rspack_plugin_css/src/parser_and_generator/mod.rs
@@ -181,7 +181,6 @@ impl ParserAndGenerator for CssParserAndGenerator {
         exports.insert(key, vec![value]);
       }
 
-      exports.sort_keys();
       let normalized_exports = IndexMap::from_iter(
         exports
           .iter()

diff --git a/packages/rspack-test-tools/tests/__snapshots__/Defaults.test.js.snap b/packages/rspack-test-tools/tests/__snapshots__/Defaults.test.js.snap
@@ -147,15 +147,18 @@ Object {
     ],
     "generator": Object {
       "css": Object {
+        "esModule": true,
         "exportsConvention": "as-is",
         "exportsOnly": false,
       },
       "css/auto": Object {
+        "esModule": true,
         "exportsConvention": "as-is",
         "exportsOnly": false,
         "localIdentName": "[uniqueName]-[id]-[local]",
       },
       "css/module": Object {
+        "esModule": true,
         "exportsConvention": "as-is",
         "exportsOnly": false,
         "localIdentName": "[uniqueName]-[id]-[local]",

diff --git a/...est-tools/tests/builtinCases/plugin-css-modules/modules-composes/snapshot/output.snap.txt b/...est-tools/tests/builtinCases/plugin-css-modules/modules-composes/snapshot/output.snap.txt
@@ -34,30 +34,30 @@ __webpack_require__.r(__webpack_exports__);
 "./b.module.css": (function (module, __unused_webpack_exports, __webpack_require__) {
 "use strict";
 __webpack_require__.r(module.exports = {
-  "b": "___b_module____b--___eca6dd2253f6b569_eca" + " " + "___b_module____b-1--___eca6dd2253f6b569_eca",
   "b-1": "___b_module____b-1--___eca6dd2253f6b569_eca",
+  "b": "___b_module____b--___eca6dd2253f6b569_eca" + " " + "___b_module____b-1--___eca6dd2253f6b569_eca",
 });
 }),
 "./d.module.css": (function (module, __unused_webpack_exports, __webpack_require__) {
 "use strict";
 __webpack_require__.r(module.exports = {
-  "d": "___d_module____d--___a41e34edaa1ca3c_a41" + " " + "___d_module____d-1--___a41e34edaa1ca3c_a41",
   "d-1": "___d_module____d-1--___a41e34edaa1ca3c_a41",
+  "d": "___d_module____d--___a41e34edaa1ca3c_a41" + " " + "___d_module____d-1--___a41e34edaa1ca3c_a41",
 });
 }),
 "./f.module.css": (function (module, __unused_webpack_exports, __webpack_require__) {
 "use strict";
 __webpack_require__.r(module.exports = {
-  "f": "___f_module____f--___af10a85c64a6b515_af1" + " " + "___f_module____f-1--___af10a85c64a6b515_af1",
   "f-1": "___f_module____f-1--___af10a85c64a6b515_af1",
+  "f": "___f_module____f--___af10a85c64a6b515_af1" + " " + "___f_module____f-1--___af10a85c64a6b515_af1",
 });
 }),
 "./style.module.css": (function (module, __unused_webpack_exports, __webpack_require__) {
 "use strict";
 __webpack_require__.r(module.exports = {
-  "chain1": "___style_module____chain1--___afc435275e612570_afc" + " " + "___style_module____chain2--___afc435275e612570_afc" + " " + "c" + " " + __webpack_require__("./d.module.css")["d"] + " " + "e" + " " + __webpack_require__("./f.module.css")["f"],
   "chain2": "___style_module____chain2--___afc435275e612570_afc" + " " + "e" + " " + __webpack_require__("./f.module.css")["f"],
-  "root-class": "___style_module____root-class--___afc435275e612570_afc" + " " + "___style_module____chain1--___afc435275e612570_afc" + " " + "a" + " " + __webpack_require__("./b.module.css")["b"] + " " + "___style_module____chain2--___afc435275e612570_afc" + " " + "c" + " " + __webpack_require__("./d.module.css")["d"] + " " + "e" + " " + __webpack_require__("./f.module.css")["f"],
+  "chain1": "___style_module____chain1--___afc435275e612570_afc" + " " + "___style_module____chain2--___afc435275e612570_afc" + " " + "e" + " " + "c" + " " + __webpack_require__("./f.module.css")["f"] + " " + __webpack_require__("./d.module.css")["d"],
+  "root-class": "___style_module____chain2--___afc435275e612570_afc" + " " + "___style_module____root-class--___afc435275e612570_afc" + " " + "___style_module____chain1--___afc435275e612570_afc" + " " + "e" + " " + "c" + " " + "a" + " " + __webpack_require__("./f.module.css")["f"] + " " + __webpack_require__("./d.module.css")["d"] + " " + __webpack_require__("./b.module.css")["b"],
 });
 }),
 

diff --git a/packages/rspack-test-tools/tests/builtinCases/plugin-html/variant/snapshot/output.snap.txt b/packages/rspack-test-tools/tests/builtinCases/plugin-html/variant/snapshot/output.snap.txt
@@ -4,7 +4,7 @@
 <head>
   <meta charset="UTF-8" />
   <title>Rspack App</title>
-<script src="/runtime.js" crossorigin="anonymous" integrity="sha512-r9JAbyVBCdPQTowSuE23gZIsAL1UyY70qFDRL6XjC7duu7eezZxG0fbii74IixeMcxk34e1Lkhe9UKG4p9M9EQ=="></script><script src="/index.js" crossorigin="anonymous" integrity="sha512-skfk+E/xLjpvZMv7f/aa4RcoP3t1FWVQ7reE8TtePgtWAUx5+GVsBS04B3u7B32zjy6UdN3i/xCYzDUwuKE6aQ=="></script><link href="/index.css" rel="stylesheet" crossorigin="anonymous" integrity="sha512-vjhejkvTX8D8jzzC5Lc9ToCtcEDb0/NqtYmEHOid+ycq64hvW+JTG7Dw/ACFP6rApgiYwVMbEt6Zfb8j4EoZTA==" /></head>
+<script src="/runtime.js" crossorigin="anonymous" integrity="sha512-Z8DE47ZmQ5bU/mp6c4I3ewHpHl46cGOZbjPc9/Pt5OpeJn3x38iN9dlZhINyWovapvwQyJ4RKMZsWwNind6C5w=="></script><script src="/index.js" crossorigin="anonymous" integrity="sha512-l6sRQvbktXxqSDLGsWoCN587mmv9w3ZFak5/BxjtTQti+setTVc0ssQwC5jtjKMCW6maYvL8zvl/DhCKRi7S6w=="></script><link href="/index.css" rel="stylesheet" crossorigin="anonymous" integrity="sha512-vjhejkvTX8D8jzzC5Lc9ToCtcEDb0/NqtYmEHOid+ycq64hvW+JTG7Dw/ACFP6rApgiYwVMbEt6Zfb8j4EoZTA==" /></head>
 
 <body>
 

diff --git a/packages/rspack-test-tools/tests/defaultsCases/experiments/future-defaults-with-css.js b/packages/rspack-test-tools/tests/defaultsCases/experiments/future-defaults-with-css.js
@@ -25,7 +25,8 @@ module.exports = {
 		-         },
 		-         "test": /\\.css$/i,
 		-         "type": "css/auto",
-		@@ ... @@
+		-       },
+		-       Object {
 		-         "mimetype": "text/css+module",
 		-         "resolve": Object {
 		-           "fullySpecified": true,
@@ -38,39 +39,40 @@ module.exports = {
 		-         "resolve": Object {
 		-           "fullySpecified": true,
 		-           "preferRelative": true,
-		-         },
+		@@ ... @@
 		-         "type": "css",
 		-       },
-		-       Object {
 		@@ ... @@
 		-     "generator": Object {
 		-       "css": Object {
+		-         "esModule": true,
 		-         "exportsConvention": "as-is",
 		-         "exportsOnly": false,
 		-       },
 		-       "css/auto": Object {
+		-         "esModule": true,
 		-         "exportsConvention": "as-is",
 		-         "exportsOnly": false,
 		-         "localIdentName": "[uniqueName]-[id]-[local]",
 		-       },
 		-       "css/module": Object {
+		-         "esModule": true,
 		-         "exportsConvention": "as-is",
 		-         "exportsOnly": false,
 		-         "localIdentName": "[uniqueName]-[id]-[local]",
 		-       },
 		-     },
 		+     "generator": Object {},
 		@@ ... @@
-		-         },
-		-       },
 		-       "css": Object {
 		-         "namedExports": true,
-		@@ ... @@
+		-       },
 		-       "css/auto": Object {
 		-         "namedExports": true,
 		-       },
 		-       "css/module": Object {
 		-         "namedExports": true,
+		-       },
 		@@ ... @@
 		-         "css",
 		@@ ... @@
@@ -79,21 +81,21 @@ module.exports = {
 		+     "hashDigestLength": 16,
 		+     "hashFunction": "xxhash64",
 		@@ ... @@
+		-           "...",
 		-         ],
 		-       },
 		-       "css-import": Object {
 		-         "conditionNames": Array [
 		-           "webpack",
 		-           "production",
 		-           "style",
-		@@ ... @@
+		-         ],
 		-         "extensions": Array [
 		-           ".css",
 		-         ],
 		-         "mainFields": Array [
 		-           "style",
-		-           "...",
-		-         ],
+		@@ ... @@
 		-         "mainFiles": Array [],
 		-         "preferRelative": true,
 	`)
-Original file line number
+Diff line change
@@ Expand Up / @@ -181,7 +181,6 @@ impl ParserAndGenerator for CssParserAndGenerator { @@
             exports.insert(key, vec![value]);
           }
-          exports.sort_keys();
           let normalized_exports = IndexMap::from_iter(
             exports
               .iter()
@@ Expand Down @@