dnrops
/
tauri
mirror of https://github.com/tauri-apps/tauri
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(cli): incorrect JS generated by frontend migration closes #10500 (#10542) 

* fix(cli): incorrect JS generated by frontend migration closes #10500
This commit is contained in:
Lucas Fernandes Nogueira 2024-08-12 00:10:27 -03:00 committed by GitHub
parent f3837d5b98
commit 3beba92b5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.changes/fix-v1-frontend-migration.md Normal file
View File

@ -0,0 +1,6 @@
---
"tauri-cli": patch:bug
"@tauri-apps/cli": patch:bug
---
Fixes v1 frontend code migration when using plugin default imports.

14
tooling/cli/src/migrate/migrations/v1/frontend.rs
View File

@ -207,8 +207,8 @@ fn migrate_imports<'a>(
// ```
// to:
// ```
// import dialog from "@tauri-apps/plugin-dialog"
// import cli as superCli from "@tauri-apps/plugin-cli"
// import * as dialog from "@tauri-apps/plugin-dialog"
// import * as cli as superCli from "@tauri-apps/plugin-cli"
// ```
import if PLUGINIFIED_MODULES.contains(&import) && module == "@tauri-apps/api" => {
let js_plugin: &str = MODULES_MAP[&format!("@tauri-apps/api/{import}")];
@ -219,9 +219,11 @@ fn migrate_imports<'a>(
if specifier.local.name.as_str() != import {
let local = &specifier.local.name;
imports_to_add.push(format!("\nimport {import} as {local} from \"{js_plugin}\""));
imports_to_add.push(format!(
"\nimport * as {import} as {local} from \"{js_plugin}\""
));
} else {
imports_to_add.push(format!("\nimport {import} from \"{js_plugin}\""));
imports_to_add.push(format!("\nimport * as {import} from \"{js_plugin}\""));
};
None
}
@ -393,8 +395,8 @@ import { register } from "@tauri-apps/plugin-global-shortcut";
import clipboard from "@tauri-apps/plugin-clipboard-manager";
import * as fs from "@tauri-apps/plugin-fs";
import "./App.css";
import dialog from "@tauri-apps/plugin-dialog"
import cli as superCli from "@tauri-apps/plugin-cli"
import * as dialog from "@tauri-apps/plugin-dialog"
import * as cli as superCli from "@tauri-apps/plugin-cli"
const appWindow = getCurrentWebviewWindow()
function App() {