From f7411d2a6ca2e65c9efc9acbf6c309e23c6f9635 Mon Sep 17 00:00:00 2001 From: Tlntin Date: Mon, 25 Sep 2023 23:17:53 +0800 Subject: [PATCH] fixup some bug for pake local html, update pake-cli version to 2.3.3 --- bin/helpers/merge.ts | 4 +++- dist/cli.js | 7 ++++--- package.json | 2 +- src-tauri/src/app/menu.rs | 25 +++++++++++++------------ 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/bin/helpers/merge.ts b/bin/helpers/merge.ts index 334f6ab..6a2344f 100644 --- a/bin/helpers/merge.ts +++ b/bin/helpers/merge.ts @@ -59,7 +59,9 @@ export async function mergeConfig(url: string, options: PakeAppOptions, tauriCon fsExtra.moveSync(distDir, distBakDir, { overwrite: true }); fsExtra.copySync(dirName, distDir, { overwrite: true }); - const filesToCopyBack = ['cli.js', 'about_pake.html']; + // ignore it, because about_pake.html have be erased. + // const filesToCopyBack = ['cli.js', 'about_pake.html']; + const filesToCopyBack = ['cli.js']; await Promise.all( filesToCopyBack.map(file => fsExtra.copy(path.join(distBakDir, file), path.join(distDir, file))), ); diff --git a/dist/cli.js b/dist/cli.js index ba14a83..c58c276 100644 --- a/dist/cli.js +++ b/dist/cli.js @@ -55,8 +55,7 @@ var scripts = { build: "npm run tauri build --release", "build:debug": "npm run tauri build -- --debug", "build:mac": "npm run tauri build -- --target universal-apple-darwin", - "build:all-unix": "chmod +x ./script/build.sh && ./script/build.sh", - "build:all-windows": "pwsh ./script/build.ps1", + "build:config": "chmod +x script/app_config.mjs && node script/app_config.mjs", analyze: "cd src-tauri && cargo bloat --release --crates", tauri: "tauri", cli: "rollup -c rollup.config.js --watch", @@ -506,7 +505,9 @@ async function mergeConfig(url, options, tauriConf) { else { fsExtra.moveSync(distDir, distBakDir, { overwrite: true }); fsExtra.copySync(dirName, distDir, { overwrite: true }); - const filesToCopyBack = ['cli.js', 'about_pake.html']; + // ignore it, because about_pake.html have be erased. + // const filesToCopyBack = ['cli.js', 'about_pake.html']; + const filesToCopyBack = ['cli.js']; await Promise.all(filesToCopyBack.map(file => fsExtra.copy(path.join(distBakDir, file), path.join(distDir, file)))); } tauriConf.pake.windows[0].url = fileName; diff --git a/package.json b/package.json index 48ea867..5b92eb3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pake-cli", - "version": "2.3.2", + "version": "2.3.3", "description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。", "engines": { "node": ">=16.0.0" diff --git a/src-tauri/src/app/menu.rs b/src-tauri/src/app/menu.rs index 86819b3..2431525 100644 --- a/src-tauri/src/app/menu.rs +++ b/src-tauri/src/app/menu.rs @@ -96,18 +96,19 @@ pub fn system_tray_handle(app: &tauri::AppHandle, event: SystemTrayEvent) { let _res = app.save_window_state(StateFlags::all()); std::process::exit(0); } - "about" => { - let _about_window = WindowBuilder::new( - app, - "about", - WindowUrl::App(std::path::PathBuf::from("about_pake.html")), - ) - .resizable(true) - .title("About") - .inner_size(600.0, 400.0) - .build() - .expect("can't open about!"); - } + // ignore about for now, because about_pake.html have be erased. + // "about" => { + // let _about_window = WindowBuilder::new( + // app, + // "about", + // WindowUrl::App(std::path::PathBuf::from("about_pake.html")), + // ) + // .resizable(true) + // .title("About") + // .inner_size(600.0, 400.0) + // .build() + // .expect("can't open about!"); + // } _ => {} } };