pake-cli 2.4.0-beta → 2.4.0

package/README.md

@@ -171,7 +171,7 @@ npm install -g pake-cli
 pake url [OPTIONS]...
 
 # Feel free to play with Pake! It might take a while to prepare the environment the first time you launch Pake.
-pake https://weekly.tw93.fun --name Weekly --transparent
+pake https://weekly.tw93.fun --name Weekly --hide-title-bar
 ```
 
 If you are new to the command line, you can compile packages online with _GitHub Actions_. See the [Tutorial](<https://github.com/tw93/Pake/wiki/Online-Compilation-(used-by-ordinary-users)>) for more information.
@@ -197,7 +197,7 @@ npm run build
 
 1. You can refer to the [codebase structure](https://github.com/tw93/Pake/wiki/Description-of-Pake's-code-structure) before working on Pake, which will help you much in development.
 2. Modify the `url` and `productName` fields in the `pake.json` file under the src-tauri directory, the "domain" field in the `tauri.config.json` file needs to be modified synchronously, as well as the `icon` and `identifier` fields in the `tauri.xxx.conf.json` file. You can select an `icon` from the `icons` directory or download one from [macOSicons](https://macosicons.com/#/) to match your product needs.
-3. For configurations on window properties, you can modify the `pake.json` file to change the value of `width`, `height`, `fullscreen` (or not), `resizable` (or not) of the `windows` property. To adapt to the immersive header on Mac, change `transparent` to `true`, look for the `Header` element, and add the `padding-top` property.
+3. For configurations on window properties, you can modify the `pake.json` file to change the value of `width`, `height`, `fullscreen` (or not), `resizable` (or not) of the `windows` property. To adapt to the immersive header on Mac, change `hideTitleBar` to `true`, look for the `Header` element, and add the `padding-top` property.
 4. For advanced usages such as style rewriting, advertisement removal, JS injection, container message communication, and user-defined shortcut keys, see [Advanced Usage of Pake](https://github.com/tw93/Pake/wiki/Advanced-Usage-of-Pake).
 
 ## Developers

package/dist/cli.js

@@ -20,7 +20,7 @@ import psl from 'psl';
 import isUrl from 'is-url';
 
 var name = "pake-cli";
-var version = "2.4.0-beta";
+var version = "2.4.0";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
 var engines = {
 	node: ">=16.0.0"
@@ -127,7 +127,7 @@ var windows = [
 	{
 		url: "https://weread.qq.com",
 		url_type: "web",
-		transparent: true,
+		hide_title_bar: true,
 		fullscreen: false,
 		width: 1200,
 		height: 780,
@@ -474,17 +474,18 @@ async function combineFiles(files, output) {
 }
 
 async function mergeConfig(url, options, tauriConf) {
-    const { width, height, fullscreen, transparent, alwaysOnTop, disabledWebShortcuts, userAgent, showSystemTray, systemTrayIcon, iterCopyFile, identifier, name, resizable = true, inject, safeDomain, } = options;
+    const { width, height, fullscreen, hideTitleBar, alwaysOnTop, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, iterCopyFile, identifier, name, resizable = true, inject, safeDomain, } = options;
     const { platform } = process;
     // Set Windows parameters.
     const tauriConfWindowOptions = {
         width,
         height,
         fullscreen,
-        transparent,
-        alwaysOnTop,
-        disabledWebShortcuts,
         resizable,
+        hide_title_bar: hideTitleBar,
+        activation_shortcut: activationShortcut,
+        always_on_top: alwaysOnTop,
+        disabled_web_shortcuts: disabledWebShortcuts,
     };
     Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
     tauriConf.package.productName = name;
@@ -734,7 +735,8 @@ class BaseBuilder {
         return this.options.debug ? 'npm run build:debug' : 'npm run build';
     }
     getBasePath() {
-        return 'src-tauri/target/release/bundle/';
+        const basePath = this.options.debug ? 'debug' : 'release';
+        return `src-tauri/target/${basePath}/bundle/`;
     }
     getBuildAppPath(npmDirectory, fileName, fileType) {
         return path.join(npmDirectory, this.getBasePath(), fileType.toLowerCase(), `${fileName}.${fileType}`);
@@ -828,7 +830,7 @@ const DEFAULT_PAKE_OPTIONS = {
     width: 1200,
     fullscreen: false,
     resizable: true,
-    transparent: false,
+    hideTitleBar: false,
     alwaysOnTop: false,
     disabledWebShortcuts: false,
     activationShortcut: '',
@@ -1023,7 +1025,7 @@ program
     .option('--width <number>', 'Window width', validateNumberInput, DEFAULT_PAKE_OPTIONS.width)
     .option('--height <number>', 'Window height', validateNumberInput, DEFAULT_PAKE_OPTIONS.height)
     .option('--fullscreen', 'Start in full screen', DEFAULT_PAKE_OPTIONS.fullscreen)
-    .option('--hide-title-bar', 'Only for Mac, hide title bar', DEFAULT_PAKE_OPTIONS.transparent)
+    .option('--hide-title-bar', 'Only for Mac, hide title bar', DEFAULT_PAKE_OPTIONS.hideTitleBar)
     .option('--activation-shortcut <string>', 'Shortcut key to active App', DEFAULT_PAKE_OPTIONS.activationShortcut)
     .option('--multi-arch', 'Only for Mac, supports both Intel and M1', DEFAULT_PAKE_OPTIONS.multiArch)
     .option('--inject [injects...]', 'Injection of .js or .css Files', DEFAULT_PAKE_OPTIONS.inject)
@@ -1035,7 +1037,6 @@ program
     .addOption(new Option('--disabled-web-shortcuts', 'Disabled webPage shortcuts').default(DEFAULT_PAKE_OPTIONS.disabledWebShortcuts).hideHelp())
     .addOption(new Option('--show-system-tray', 'Show system tray in app').default(DEFAULT_PAKE_OPTIONS.showSystemTray).hideHelp())
     .addOption(new Option('--system-tray-icon <string>', 'Custom system tray icon').default(DEFAULT_PAKE_OPTIONS.systemTrayIcon).hideHelp())
-    .addOption(new Option('--transparent', 'Only for Mac, hide title bar').default(DEFAULT_PAKE_OPTIONS.transparent).hideHelp())
     .version(packageJson.version, '-v, --version', 'Output the current version')
     .action(async (url, options) => {
     await checkUpdateTips();

package/package.json

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

package/src-tauri/pake.json

@@ -3,7 +3,7 @@
     {
       "url": "https://weread.qq.com",
       "url_type": "web",
-      "transparent": true,
+      "hide_title_bar": true,
       "fullscreen": false,
       "width": 1200,
       "height": 780,

package/src-tauri/src/app/config.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WindowConfig {
     pub url: String,
-    pub transparent: bool,
+    pub hide_title_bar: bool,
     pub fullscreen: bool,
     pub width: f64,
     pub height: f64,

package/src-tauri/src/app/window.rs

@@ -42,7 +42,7 @@ pub fn get_window(app: &mut App, config: PakeConfig, _data_dir: PathBuf) -> Wind
 
     #[cfg(target_os = "macos")]
     {
-        let title_bar_style = if window_config.transparent {
+        let title_bar_style = if window_config.hide_title_bar {
             TitleBarStyle::Overlay
         } else {
             TitleBarStyle::Visible

package/src-tauri/src/inject/style.js

@@ -412,7 +412,7 @@ window.addEventListener('DOMContentLoaded', _event => {
     }
   `;
   const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
-  if (window['pakeConfig']?.transparent && isMac) {
+  if (window['pakeConfig']?.hide_title_bar && isMac) {
     const topPaddingStyleElement = document.createElement('style');
     topPaddingStyleElement.innerHTML = topPaddingCSS;
     document.head.appendChild(topPaddingStyleElement);