diff --git a/Cargo.lock b/Cargo.lock index c47eb455892d..1ab01e74698b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1663,15 +1663,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generator" version = "0.7.5" @@ -1839,11 +1830,11 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.2", ] [[package]] @@ -7265,14 +7256,14 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "ustr-fxhash" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe38ae02de418d12de738120d42d829f9fcc3b98fb203620aab98026611db08" +checksum = "a4d2224cabd887261556e0d3a483a7e9f87dcbaab3b820df7d748305a8d5cbc8" dependencies = [ "byteorder", - "fxhash", "lazy_static", "parking_lot", + "rustc-hash 2.1.0", "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 71a1cafc765d..85747ead4904 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ derive_more = { version = "1.0.0" } either = { version = "1.13.0" } futures = { version = "0.3.31" } glob = { version = "0.3.1" } -hashlink = { version = "0.9.1" } +hashlink = { version = "0.10.0" } heck = { version = "0.5.0" } hex = { version = "0.4.3" } indexmap = { version = "2.7.0" } @@ -68,7 +68,7 @@ rspack_sources = { version = "0.4.1" } rustc-hash = { version = "2.1.0" } serde = { version = "1.0.216" } serde_json = { version = "1.0.133" } -simd-json = { version = "0.14.0-rc.2" } +simd-json = { version = "0.14.3" } smol_str = { version = "0.3.0" } stacker = { version = "0.1.17" } sugar_path = { version = "1.2.0", features = ["cached_current_dir"] } @@ -79,7 +79,7 @@ tracing-subscriber = { version = "0.3.19" } unicase = { version = "2.8.0" } url = { version = "2.5.4" } urlencoding = { version = "2.1.3" } -ustr = { package = "ustr-fxhash", version = "1.0.0" } +ustr = { package = "ustr-fxhash", version = "1.0.1" } xxhash-rust = { version = "0.8.12" } # Pinned diff --git a/packages/rspack-test-tools/tests/__snapshots__/StatsAPI.test.js.snap b/packages/rspack-test-tools/tests/__snapshots__/StatsAPI.test.js.snap index 873c79d5e68d..333e3ba3ff6f 100644 --- a/packages/rspack-test-tools/tests/__snapshots__/StatsAPI.test.js.snap +++ b/packages/rspack-test-tools/tests/__snapshots__/StatsAPI.test.js.snap @@ -318,7 +318,7 @@ Object { main.js, ], filteredModules: undefined, - hash: 6ce6ff107a4c39c2, + hash: b7792c75de914bcf, id: 909, idHints: Array [], initial: true, @@ -685,7 +685,7 @@ Object { errorsCount: 0, filteredAssets: undefined, filteredModules: undefined, - hash: 827e507540787a7e, + hash: f0ec7fcc2231784a, modules: Array [ Object { assets: Array [], diff --git a/packages/rspack-test-tools/tests/__snapshots__/StatsOutput.test.js.snap b/packages/rspack-test-tools/tests/__snapshots__/StatsOutput.test.js.snap index fb6834e6f39f..079b3e106813 100644 --- a/packages/rspack-test-tools/tests/__snapshots__/StatsOutput.test.js.snap +++ b/packages/rspack-test-tools/tests/__snapshots__/StatsOutput.test.js.snap @@ -59,7 +59,7 @@ runtime modules 1.61 KiB [no exports] [used exports unknown] -Rspack compiled successfully (9e7a7088bc7f5f5b) +Rspack compiled successfully (6f7f39d3a0485d93) `; exports[`statsOutput statsOutput/builtin-swc-loader-parse-error should print correct stats for 1`] = ` diff --git a/packages/rspack-test-tools/tests/statsAPICases/chunks.js b/packages/rspack-test-tools/tests/statsAPICases/chunks.js index fba9d9c5968f..593126f4fb77 100644 --- a/packages/rspack-test-tools/tests/statsAPICases/chunks.js +++ b/packages/rspack-test-tools/tests/statsAPICases/chunks.js @@ -144,7 +144,7 @@ module.exports = { main.js, ], filteredModules: undefined, - hash: 582278c180fdbd81, + hash: cebfd5f70fd80ce4, id: 909, idHints: Array [], initial: true, diff --git a/tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/async.$c4e695e4a317b7bf38b8$.css b/tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/async.$d026823092eb39bd50f7$.css similarity index 100% rename from tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/async.$c4e695e4a317b7bf38b8$.css rename to tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/async.$d026823092eb39bd50f7$.css diff --git a/tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/main.$c4e695e4a317b7bf38b8$.css b/tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/main.$d026823092eb39bd50f7$.css similarity index 100% rename from tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/main.$c4e695e4a317b7bf38b8$.css rename to tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/main.$d026823092eb39bd50f7$.css diff --git a/tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/main.js b/tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/main.js index b3b4ba16ea31..ef93b8fdb55f 100644 --- a/tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/main.js +++ b/tests/plugin-test/css-extract/cases/chunkFilename-fullhash/expected/main.js @@ -77,7 +77,7 @@ __webpack_require__.e = function (chunkId) { // webpack/runtime/get_full_hash (() => { __webpack_require__.h = function () { - return "c4e695e4a317b7bf38b8"; + return "d026823092eb39bd50f7"; }; })(); diff --git a/tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/one_js.$033ea71c0d77236628e7$.css b/tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/one_js.$d8568c498a2518ed3c0b$.css similarity index 100% rename from tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/one_js.$033ea71c0d77236628e7$.css rename to tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/one_js.$d8568c498a2518ed3c0b$.css diff --git a/tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/two_js.$b8f9aa2a9379090efe7c$.css b/tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/two_js.$fa4bf5ed0fee0c2a5abb$.css similarity index 100% rename from tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/two_js.$b8f9aa2a9379090efe7c$.css rename to tests/plugin-test/css-extract/cases/content-entries-with-same-import/expected/two_js.$fa4bf5ed0fee0c2a5abb$.css diff --git a/tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryA.$a592ecca149e370fdc1b$.css b/tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryA.$69c13c1bf095c299452e$.css similarity index 100% rename from tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryA.$a592ecca149e370fdc1b$.css rename to tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryA.$69c13c1bf095c299452e$.css diff --git a/tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryB.$746e3b8334d2e3e55742$.css b/tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryB.$b65aa87be1605a017a12$.css similarity index 100% rename from tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryB.$746e3b8334d2e3e55742$.css rename to tests/plugin-test/css-extract/cases/contenthash-multiple-entries/expected/entryB.$b65aa87be1605a017a12$.css diff --git a/tests/plugin-test/css-extract/cases/contenthash/expected/1.main.$c2b1ac5890b3ce869489$.css b/tests/plugin-test/css-extract/cases/contenthash/expected/1.main.$a509ee0bcfc54dbee585$.css similarity index 100% rename from tests/plugin-test/css-extract/cases/contenthash/expected/1.main.$c2b1ac5890b3ce869489$.css rename to tests/plugin-test/css-extract/cases/contenthash/expected/1.main.$a509ee0bcfc54dbee585$.css diff --git a/tests/plugin-test/css-extract/cases/contenthash/expected/2.main.$7f467bf86f8fa8dc5137$.css b/tests/plugin-test/css-extract/cases/contenthash/expected/2.main.$4786469c8ec9cd61dffc$.css similarity index 100% rename from tests/plugin-test/css-extract/cases/contenthash/expected/2.main.$7f467bf86f8fa8dc5137$.css rename to tests/plugin-test/css-extract/cases/contenthash/expected/2.main.$4786469c8ec9cd61dffc$.css 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 5054715c1fe1..42c1642fe3dc 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,14 @@ __webpack_require__.e = function (chunkId) { // return url for filenames not based on template // return url for filenames based on template - return "" + chunkId + ".$" + "4185091a00372d16b761" + "$.css"; + return "" + chunkId + ".$" + "045b86c2c3fee05a882a" + "$.css"; }; })(); // webpack/runtime/get_full_hash (() => { __webpack_require__.h = function () { - return "78ebdcf52651ae0b1318"; + return "950959268269901ed8e8"; }; })(); diff --git a/tests/plugin-test/css-extract/cases/js-hash/expected/style.$a3da500dff966e9966c0$.1.css b/tests/plugin-test/css-extract/cases/js-hash/expected/style.$75e40e6cc1aed6870a5d$.1.css similarity index 100% rename from tests/plugin-test/css-extract/cases/js-hash/expected/style.$a3da500dff966e9966c0$.1.css rename to tests/plugin-test/css-extract/cases/js-hash/expected/style.$75e40e6cc1aed6870a5d$.1.css diff --git a/tests/plugin-test/css-extract/cases/js-hash/expected/style.$146a308af46789c9abaf$.2.css b/tests/plugin-test/css-extract/cases/js-hash/expected/style.$7a566db692626c1ded2b$.2.css similarity index 100% rename from tests/plugin-test/css-extract/cases/js-hash/expected/style.$146a308af46789c9abaf$.2.css rename to tests/plugin-test/css-extract/cases/js-hash/expected/style.$7a566db692626c1ded2b$.2.css diff --git a/tests/webpack-test/__snapshots__/StatsTestCases.basictest.js.snap b/tests/webpack-test/__snapshots__/StatsTestCases.basictest.js.snap index dac44c614496..b508dd53e62b 100644 --- a/tests/webpack-test/__snapshots__/StatsTestCases.basictest.js.snap +++ b/tests/webpack-test/__snapshots__/StatsTestCases.basictest.js.snap @@ -456,7 +456,7 @@ Rspack x.x.x compiled successfully in X.23" `; exports[`StatsTestCases should print correct stats for immutable 1`] = ` -"asset 08bdbdde4cb728ad.js 10.4 KiB [emitted] [immutable] (name: main) +"asset a309a604082e563a.js 10.4 KiB [emitted] [immutable] (name: main) asset 7342054f673663df.js 167 bytes [emitted] [immutable]" `; @@ -540,19 +540,19 @@ Rspack x.x.x compiled with 2 warnings" `; exports[`StatsTestCases should print correct stats for issue-7577 1`] = ` -"asset a-runtime~main-be0b80b4e8cf8871.js 3.69 KiB [emitted] [immutable] (name: runtime~main) +"asset a-runtime~main-8ed37b9e446eb01b.js 3.69 KiB [emitted] [immutable] (name: runtime~main) asset a-main-f9892dc0f961d982.js 387 bytes [emitted] [immutable] (name: main) asset a-all-a_js-cace9eea394248e7.js 128 bytes [emitted] [immutable] (id hint: all) -Entrypoint main 4.19 KiB = a-runtime~main-be0b80b4e8cf8871.js 3.69 KiB a-all-a_js-cace9eea394248e7.js 128 bytes a-main-f9892dc0f961d982.js 387 bytes +Entrypoint main 4.19 KiB = a-runtime~main-8ed37b9e446eb01b.js 3.69 KiB a-all-a_js-cace9eea394248e7.js 128 bytes a-main-f9892dc0f961d982.js 387 bytes runtime modules 2.59 KiB 3 modules ./a.js 18 bytes [built] [code generated] Rspack x.x.x compiled successfully in X.23 -asset b-runtime~main-24bff1adff67ae2a.js 4.38 KiB [emitted] [immutable] (name: runtime~main) +asset b-runtime~main-d374c52d52a8c105.js 4.38 KiB [emitted] [immutable] (name: runtime~main) asset b-all-b_js-f689e3be6ed05e06.js 453 bytes [emitted] [immutable] (id hint: all) asset b-main-a97968a81f0fafdb.js 420 bytes [emitted] [immutable] (name: main) asset b-vendors-node_modules_vendor_js-8e4df31a4698ceb4.js 173 bytes [emitted] [immutable] (id hint: vendors) -Entrypoint main 5.41 KiB = b-runtime~main-24bff1adff67ae2a.js 4.38 KiB b-vendors-node_modules_vendor_js-8e4df31a4698ceb4.js 173 bytes b-all-b_js-f689e3be6ed05e06.js 453 bytes b-main-a97968a81f0fafdb.js 420 bytes +Entrypoint main 5.41 KiB = b-runtime~main-d374c52d52a8c105.js 4.38 KiB b-vendors-node_modules_vendor_js-8e4df31a4698ceb4.js 173 bytes b-all-b_js-f689e3be6ed05e06.js 453 bytes b-main-a97968a81f0fafdb.js 420 bytes runtime modules 3.17 KiB 5 modules cacheable modules 40 bytes ./b.js 17 bytes [built] [code generated] @@ -562,10 +562,10 @@ Rspack x.x.x compiled successfully in X.23 assets by chunk 862 bytes (id hint: all) asset c-all-b_js-b683c5304b71900e.js 480 bytes [emitted] [immutable] (id hint: all) asset c-all-c_js-2c876c6ecab93d9b.js 382 bytes [emitted] [immutable] (id hint: all) -asset c-runtime~main-96a5d41462ab7f22.js 11.1 KiB [emitted] [immutable] (name: runtime~main) -asset c-main-e071146c113b212b.js 643 bytes [emitted] [immutable] (name: main) +asset c-runtime~main-d7f987785eb841d4.js 11.1 KiB [emitted] [immutable] (name: runtime~main) +asset c-main-1b0ba12f79ed8053.js 643 bytes [emitted] [immutable] (name: main) asset c-vendors-node_modules_vendor_js-8e4df31a4698ceb4.js 173 bytes [emitted] [immutable] (id hint: vendors) -Entrypoint main 12.1 KiB = c-runtime~main-96a5d41462ab7f22.js 11.1 KiB c-all-c_js-2c876c6ecab93d9b.js 382 bytes c-main-e071146c113b212b.js 643 bytes +Entrypoint main 12.1 KiB = c-runtime~main-d7f987785eb841d4.js 11.1 KiB c-all-c_js-2c876c6ecab93d9b.js 382 bytes c-main-1b0ba12f79ed8053.js 643 bytes runtime modules 9.7 KiB 13 modules cacheable modules 101 bytes ./c.js 61 bytes [built] [code generated]