CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-01 10:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(tauri-utils): sort csp/plugin/header config maps during codegen so generate_context! is deterministic (#14986)

Browse Source 
* fix(tauri-utils): sort csp/plugin/header config maps during codegen so generate_context! is deterministic

* add comments explaining rationale, and todo for removing the hack in v3
This commit is contained in:
montyc1999
2026-02-23 10:14:56 -05:00
committed by GitHub
parent 7782c5525a
commit 7b16dafb1d
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.changes/fix-nondeterministic-context-codegen.md Normal file
View File

@@ -0,0 +1,7 @@
---
'tauri-utils': 'patch:bug'
---
Sort csp/plugin/header configs when generating HashMap constructors so that `generate_context!` is deterministic.
See: https://github.com/tauri-apps/tauri/issues/14978 for more information

26
crates/tauri-utils/src/config.rs
View File

@@ -3842,9 +3842,14 @@ mod build {
quote!(#prefix::Policy(#policy.into()))
}
Self::DirectiveMap(list) => {
// Pass a sorted vec so the HashMap constructor is deterministic
// see: https://github.com/tauri-apps/tauri/issues/14978
// TODO: Remove this in v3, use a BTreeMap instead of a HashMap
let mut sorted: Vec<_> = list.iter().collect();
sorted.sort_by_key(|(k, _)| *k);
let map = map_lit(
quote! { ::std::collections::HashMap },
list,
sorted,
str_lit,
identity,
);
@@ -3900,7 +3905,17 @@ mod build {
quote!(#prefix::List(#list))
}
Self::Map(m) => {
let map = map_lit(quote! { ::std::collections::HashMap }, m, str_lit, str_lit);
// Pass a sorted vec so the HashMap constructor is deterministic
// see: https://github.com/tauri-apps/tauri/issues/14978
// TODO: Remove this in v3, use a BTreeMap instead of a HashMap
let mut sorted: Vec<_> = m.iter().collect();
sorted.sort_by_key(|(k, _)| *k);
let map = map_lit(
quote! { ::std::collections::HashMap },
sorted,
str_lit,
str_lit,
);
quote!(#prefix::Map(#map))
}
})
@@ -4047,9 +4062,14 @@ mod build {
impl ToTokens for PluginConfig {
fn to_tokens(&self, tokens: &mut TokenStream) {
// Pass a sorted vec so the HashMap constructor is deterministic
// see: https://github.com/tauri-apps/tauri/issues/14978
// TODO: Remove this in v3, use a BTreeMap instead of a HashMap
let mut sorted: Vec<_> = self.0.iter().collect();
sorted.sort_by_key(|(k, _)| *k);
let config = map_lit(
quote! { ::std::collections::HashMap },
&self.0,
sorted,
str_lit,
json_value_lit,
);