lostecho/Pake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixup some bug for pake local html, update pake-cli version to 2.3.3

Browse Source
This commit is contained in:
Tlntin
2023-09-25 23:17:53 +08:00
parent a5d36f4419
commit f7411d2a6c
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/helpers/merge.ts vendored
View File

@@ -59,7 +59,9 @@ export async function mergeConfig(url: string, options: PakeAppOptions, tauriCon
fsExtra.moveSync(distDir, distBakDir, { overwrite: true }); fsExtra.moveSync(distDir, distBakDir, { overwrite: true });
fsExtra.copySync(dirName, distDir, { 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( await Promise.all(
filesToCopyBack.map(file => fsExtra.copy(path.join(distBakDir, file), path.join(distDir, file))), filesToCopyBack.map(file => fsExtra.copy(path.join(distBakDir, file), path.join(distDir, file))),
); );

7
dist/cli.js vendored
View File

@@ -55,8 +55,7 @@ var scripts = {
build: "npm run tauri build --release", build: "npm run tauri build --release",
"build:debug": "npm run tauri build -- --debug", "build:debug": "npm run tauri build -- --debug",
"build:mac": "npm run tauri build -- --target universal-apple-darwin", "build:mac": "npm run tauri build -- --target universal-apple-darwin",
"build:all-unix": "chmod +x ./script/build.sh && ./script/build.sh", "build:config": "chmod +x script/app_config.mjs && node script/app_config.mjs",
"build:all-windows": "pwsh ./script/build.ps1",
analyze: "cd src-tauri && cargo bloat --release --crates", analyze: "cd src-tauri && cargo bloat --release --crates",
tauri: "tauri", tauri: "tauri",
cli: "rollup -c rollup.config.js --watch", cli: "rollup -c rollup.config.js --watch",
@@ -506,7 +505,9 @@ async function mergeConfig(url, options, tauriConf) {
else { else {
fsExtra.moveSync(distDir, distBakDir, { overwrite: true }); fsExtra.moveSync(distDir, distBakDir, { overwrite: true });
fsExtra.copySync(dirName, distDir, { 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)))); await Promise.all(filesToCopyBack.map(file => fsExtra.copy(path.join(distBakDir, file), path.join(distDir, file))));
} }
tauriConf.pake.windows[0].url = fileName; tauriConf.pake.windows[0].url = fileName;

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "pake-cli", "name": "pake-cli",
"version": "2.3.2", "version": "2.3.3",
"description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。", "description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。",
"engines": { "engines": {
"node": ">=16.0.0" "node": ">=16.0.0"

25
src-tauri/src/app/menu.rs
View File

@@ -96,18 +96,19 @@ pub fn system_tray_handle(app: &tauri::AppHandle, event: SystemTrayEvent) {
let _res = app.save_window_state(StateFlags::all()); let _res = app.save_window_state(StateFlags::all());
std::process::exit(0); std::process::exit(0);
} }
"about" => { // ignore about for now, because about_pake.html have be erased.
let _about_window = WindowBuilder::new( // "about" => {
app, // let _about_window = WindowBuilder::new(
"about", // app,
WindowUrl::App(std::path::PathBuf::from("about_pake.html")), // "about",
) // WindowUrl::App(std::path::PathBuf::from("about_pake.html")),
.resizable(true) // )
.title("About") // .resizable(true)
.inner_size(600.0, 400.0) // .title("About")
.build() // .inner_size(600.0, 400.0)
.expect("can't open about!"); // .build()
} // .expect("can't open about!");
// }
_ => {} _ => {}
} }
}; };