From d3e4217bed2eae02be79ddc7ae0341524128c0e5 Mon Sep 17 00:00:00 2001 From: Tw93 Date: Mon, 16 Dec 2024 15:09:57 +0800 Subject: [PATCH] :bug: cli support tauri2 --- bin/README.md | 2 +- bin/README_CN.md | 2 +- bin/helpers/merge.ts | 6 +++--- bin/types.ts | 7 +++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/bin/README.md b/bin/README.md index 15c6cfa..bad05c9 100644 --- a/bin/README.md +++ b/bin/README.md @@ -221,7 +221,7 @@ Specify the system tray icon. This is only effective when the system tray is ena #### [installer-language] -Set the Windows Installer language. Options include `zh-CN`, `ja-JP`, More at [Tauri Document](https://tauri.app/zh-cn/v1/guides/building/windows/#internationalization). Default is `en-US`. +Set the Windows Installer language. Options include `zh-CN`, `ja-JP`, More at [Tauri Document](https://tauri.app/distribute/windows-installer/#internationalization). Default is `en-US`. ```shell --installer-language diff --git a/bin/README_CN.md b/bin/README_CN.md index 35cefd5..8db9b56 100644 --- a/bin/README_CN.md +++ b/bin/README_CN.md @@ -222,7 +222,7 @@ Linux,默认为 `all`。 #### [installer-language] -设置 Windows 安装包语言。支持 `zh-CN`、`ja-JP`,更多在 [Tauri 文档](https://tauri.app/zh-cn/v1/guides/building/windows/#internationalization)。默认为 `en-US`。 +设置 Windows 安装包语言。支持 `zh-CN`、`ja-JP`,更多在 [Tauri 文档](https://tauri.app/distribute/windows-installer/#internationalization)。默认为 `en-US`。 ```shell --installer-language diff --git a/bin/helpers/merge.ts b/bin/helpers/merge.ts index ea47aee..2e19c8f 100644 --- a/bin/helpers/merge.ts +++ b/bin/helpers/merge.ts @@ -45,10 +45,10 @@ export async function mergeConfig(url: string, options: PakeAppOptions, tauriCon }; Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions }); - tauriConf.package.productName = name; - tauriConf.tauri.bundle.identifier = identifier; + tauriConf.productName = name; + tauriConf.identifier = identifier; if (platform == "win32") { - tauriConf.tauri.bundle.windows.wix.language[0] = installerLanguage; + tauriConf.bundle.windows.wix.language[0] = installerLanguage; } //Judge the type of URL, whether it is a file or a website. diff --git a/bin/types.ts b/bin/types.ts index 0bbd935..ac14e6a 100644 --- a/bin/types.ts +++ b/bin/types.ts @@ -27,7 +27,6 @@ export interface PakeCliOptions { // Enable windows always on top, default false alwaysOnTop: boolean; - // Force Mac to use dark mode, default false darkMode: boolean; @@ -58,11 +57,11 @@ export interface PakeCliOptions { // Debug mode, outputs more logs debug: boolean; - /** 需要注入页面的外部脚本 */ + /** External scripts that need to be injected into the page. */ inject: string[]; - // Proxy - proxyUrl: string; + // Set Api Proxy + proxyUrl: string; // Installer language, valid for Windows users, default is en-US installerLanguage: string;