Skip to content

Commit 3beba92

Browse files
authored
fix(cli): incorrect JS generated by frontend migration closes #10500 (#10542)
* fix(cli): incorrect JS generated by frontend migration closes #10500
1 parent f3837d5 commit 3beba92

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
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+
Fixes v1 frontend code migration when using plugin default imports.

tooling/cli/src/migrate/migrations/v1/frontend.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ fn migrate_imports<'a>(
207207
// ```
208208
// to:
209209
// ```
210-
// import dialog from "@tauri-apps/plugin-dialog"
211-
// import cli as superCli from "@tauri-apps/plugin-cli"
210+
// import * as dialog from "@tauri-apps/plugin-dialog"
211+
// import * as cli as superCli from "@tauri-apps/plugin-cli"
212212
// ```
213213
import if PLUGINIFIED_MODULES.contains(&import) && module == "@tauri-apps/api" => {
214214
let js_plugin: &str = MODULES_MAP[&format!("@tauri-apps/api/{import}")];
@@ -219,9 +219,11 @@ fn migrate_imports<'a>(
219219

220220
if specifier.local.name.as_str() != import {
221221
let local = &specifier.local.name;
222-
imports_to_add.push(format!("\nimport {import} as {local} from \"{js_plugin}\""));
222+
imports_to_add.push(format!(
223+
"\nimport * as {import} as {local} from \"{js_plugin}\""
224+
));
223225
} else {
224-
imports_to_add.push(format!("\nimport {import} from \"{js_plugin}\""));
226+
imports_to_add.push(format!("\nimport * as {import} from \"{js_plugin}\""));
225227
};
226228
None
227229
}
@@ -393,8 +395,8 @@ import { register } from "@tauri-apps/plugin-global-shortcut";
393395
import clipboard from "@tauri-apps/plugin-clipboard-manager";
394396
import * as fs from "@tauri-apps/plugin-fs";
395397
import "./App.css";
396-
import dialog from "@tauri-apps/plugin-dialog"
397-
import cli as superCli from "@tauri-apps/plugin-cli"
398+
import * as dialog from "@tauri-apps/plugin-dialog"
399+
import * as cli as superCli from "@tauri-apps/plugin-cli"
398400
const appWindow = getCurrentWebviewWindow()
399401
400402
function App() {

0 commit comments

Comments
 (0)