Skip to content

Commit 019a74e

Browse files
fix(cli): correct module name resolution for clipboard and globalShortcut plugins (#9931)
1 parent ddaabda commit 019a74e

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
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:bug'
3+
'@tauri-apps/cli': 'patch:bug'
4+
---
5+
6+
Fix wrong migration of `clipboard` and `globalShortcut` modules

tooling/cli/src/migrate/frontend.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub fn migrate(app_dir: &Path, tauri_dir: &Path) -> Result<()> {
4949
let new_contents =
5050
tauri_api_import_regex.replace_all(&js_contents, |cap: &regex::bytes::Captures<'_>| {
5151
let module = cap.get(1).unwrap().as_bytes();
52-
let module = String::from_utf8_lossy(module).to_string();
52+
let mut module = String::from_utf8_lossy(module).to_string();
5353
let original = cap.get(0).unwrap().as_bytes();
5454
let original = String::from_utf8_lossy(original).to_string();
5555

@@ -58,17 +58,16 @@ pub fn migrate(app_dir: &Path, tauri_dir: &Path) -> Result<()> {
5858
{
5959
renamed_to.to_string()
6060
} else if PLUGINIFIED_MODULES.contains(&module.as_str()) {
61-
let plugin = format!("@tauri-apps/plugin-{module}");
62-
new_npm_packages.push(plugin.clone());
63-
new_cargo_packages.push(format!(
64-
"tauri-plugin-{}",
65-
if module == "clipboard" {
66-
"clipboard-manager"
67-
} else {
68-
&module
69-
}
70-
));
71-
plugin
61+
match module.as_str() {
62+
"clipboard" => module = String::from("clipboard-manager"),
63+
"globalShortcut" => module = String::from("global-shortcut"),
64+
_ => {}
65+
}
66+
let js_plugin = format!("@tauri-apps/plugin-{module}");
67+
let cargo_crate = format!("tauri-plugin-{module}");
68+
new_npm_packages.push(js_plugin.clone());
69+
new_cargo_packages.push(cargo_crate);
70+
js_plugin
7271
} else {
7372
return original;
7473
};

0 commit comments

Comments
 (0)