Skip to content

Commit 0ec28c3

Browse files
authored
feat(cli): migrate tauri-build version (#8529)
* feat(cli): migrate tauri-build version This changes the migrate command to also migrate the tauri-build dependency to v2, previously it only updated the tauri dependency. * lint
1 parent 29ced5c commit 0ec28c3

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"tauri-cli": patch:feat
3+
"@tauri-apps/cli": patch:feat
4+
---
5+
6+
Include tauri-build on the migration script.

tooling/cli/src/interface/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use std::{
1313
use crate::helpers::config::Config;
1414
use tauri_bundler::bundle::{PackageType, Settings, SettingsBuilder};
1515

16-
pub use rust::{manifest, MobileOptions, Options, Rust as AppInterface};
16+
pub use rust::{MobileOptions, Options, Rust as AppInterface};
1717

1818
pub trait DevProcess {
1919
fn kill(&self) -> std::io::Result<()>;

tooling/cli/src/migrate/manifest.rs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,25 @@ pub fn migrate(tauri_dir: &Path) -> Result<()> {
3737
}
3838

3939
fn migrate_manifest(manifest: &mut Document) -> Result<()> {
40+
let version = dependency_version();
41+
4042
let dependencies = manifest
4143
.as_table_mut()
4244
.entry("dependencies")
4345
.or_insert(Item::Table(Table::new()))
4446
.as_table_mut()
4547
.expect("manifest dependencies isn't a table");
4648

47-
let version = dependency_version();
48-
migrate_dependency(dependencies, "tauri", version, &features_to_remove());
49+
migrate_dependency(dependencies, "tauri", &version, &features_to_remove());
50+
51+
let build_dependencies = manifest
52+
.as_table_mut()
53+
.entry("build-dependencies")
54+
.or_insert(Item::Table(Table::new()))
55+
.as_table_mut()
56+
.expect("manifest build-dependencies isn't a table");
57+
58+
migrate_dependency(build_dependencies, "tauri-build", &version, &[]);
4959

5060
let lib = manifest
5161
.as_table_mut()
@@ -116,7 +126,7 @@ fn dependency_version() -> String {
116126
}
117127
}
118128

119-
fn migrate_dependency(dependencies: &mut Table, name: &str, version: String, remove: &[&str]) {
129+
fn migrate_dependency(dependencies: &mut Table, name: &str, version: &str, remove: &[&str]) {
120130
let item = dependencies.entry(name).or_insert(Item::None);
121131

122132
// do not rewrite if dependency uses workspace inheritance
@@ -138,7 +148,7 @@ fn migrate_dependency(dependencies: &mut Table, name: &str, version: String, rem
138148
}
139149
}
140150

141-
fn migrate_dependency_table<D: TableLike>(dep: &mut D, version: String, remove: &[&str]) {
151+
fn migrate_dependency_table<D: TableLike>(dep: &mut D, version: &str, remove: &[&str]) {
142152
*dep.entry("version").or_insert(Item::None) = Item::Value(version.into());
143153
let manifest_features = dep.entry("features").or_insert(Item::None);
144154
if let Some(features_array) = manifest_features.as_array_mut() {

0 commit comments

Comments
 (0)