diff --git a/crates/rspack_plugin_css/src/parser_and_generator/mod.rs b/crates/rspack_plugin_css/src/parser_and_generator/mod.rs index 205b47194b1f..88bd3e78e0bb 100644 --- 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 index e3d977104839..d14213080346 100644 --- 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/packages/rspack-test-tools/tests/builtinCases/plugin-css-modules/modules-composes/snapshot/output.snap.txt b/packages/rspack-test-tools/tests/builtinCases/plugin-css-modules/modules-composes/snapshot/output.snap.txt index 55dd6c2480c1..2ee5aa2f544d 100644 --- a/packages/rspack-test-tools/tests/builtinCases/plugin-css-modules/modules-composes/snapshot/output.snap.txt +++ b/packages/rspack-test-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 index 4a373210ab61..f15864931c3d 100644 --- 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 @@ Rspack App - + 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 index c4a2087cab19..bcd3f9e268a3 100644 --- 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,22 +39,24 @@ 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]", @@ -61,16 +64,15 @@ module.exports = { - }, + "generator": Object {}, @@ ... @@ - - }, - - }, - "css": Object { - "namedExports": true, - @@ ... @@ + - }, - "css/auto": Object { - "namedExports": true, - }, - "css/module": Object { - "namedExports": true, + - }, @@ ... @@ - "css", @@ ... @@ @@ -79,6 +81,7 @@ module.exports = { + "hashDigestLength": 16, + "hashFunction": "xxhash64", @@ ... @@ + - "...", - ], - }, - "css-import": Object { @@ -86,14 +89,13 @@ module.exports = { - "webpack", - "production", - "style", - @@ ... @@ + - ], - "extensions": Array [ - ".css", - ], - "mainFields": Array [ - "style", - - "...", - - ], + @@ ... @@ - "mainFiles": Array [], - "preferRelative": true, `)