From 2e8ab7bac12046d734fb07a1b4fe5e03004b305e Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Mon, 5 Aug 2024 10:00:33 -0300 Subject: [PATCH] fix(cli): v1 migration should add the updater plugin if it is enabled (#10481) * fix(cli): v1 migration should add the updater plugin if it is enabled * fix change tag * move to process_updater * Update tooling/cli/src/migrate/migrations/v1/config.rs Co-authored-by: Fabian-Lars --------- Co-authored-by: Fabian-Lars --- .changes/v1-migrate-updater.md | 6 ++++++ tooling/cli/src/migrate/migrations/v1/config.rs | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .changes/v1-migrate-updater.md diff --git a/.changes/v1-migrate-updater.md b/.changes/v1-migrate-updater.md new file mode 100644 index 000000000..74af5344b --- /dev/null +++ b/.changes/v1-migrate-updater.md @@ -0,0 +1,6 @@ +--- +"tauri-cli": patch:bug +"@tauri-apps/cli": patch:bug +--- + +Migration from v1 to v2 now adds the updater plugin when it is active. diff --git a/tooling/cli/src/migrate/migrations/v1/config.rs b/tooling/cli/src/migrate/migrations/v1/config.rs index da0536443..241f2441a 100644 --- a/tooling/cli/src/migrate/migrations/v1/config.rs +++ b/tooling/cli/src/migrate/migrations/v1/config.rs @@ -110,8 +110,8 @@ fn migrate_config(config: &mut Value) -> Result { process_cli(&mut plugins, cli)?; } - // cli - process_updater(tauri_config, &mut plugins)?; + // updater + process_updater(tauri_config, &mut plugins, &mut migrated)?; } config.insert("plugins".into(), plugins.into()); @@ -512,6 +512,7 @@ fn process_cli(plugins: &mut Map, cli: Value) -> Result<()> { fn process_updater( tauri_config: &mut Map, plugins: &mut Map, + migrated: &mut MigratedConfig, ) -> Result<()> { if let Some(mut updater) = tauri_config.remove("updater") { if let Some(updater) = updater.as_object_mut() { @@ -528,6 +529,7 @@ fn process_updater( || updater.get("pubkey").is_some() { plugins.insert("updater".into(), serde_json::to_value(updater)?); + migrated.plugins.insert("updater".to_string()); } } }