pake-cli 3.7.4 → 3.7.6

package/README.md

@@ -1,4 +1,4 @@
-<h4 align="right"><strong>English</strong> | <a href="README_CN.md">简体中文</a> | <a href="README_JP.md">日本語</a></h4>
+<h4 align="right"><strong>English</strong> | <a href="README_CN.md">简体中文</a></h4>
 <p align="center">
     <img src=https://gw.alipayobjects.com/zos/k/fa/logo-modified.png width=138/>
 </p>
@@ -196,7 +196,7 @@ For style customization, feature enhancement, container communication and other
 Pake's development can not be without these Hackers. They contributed a lot of capabilities for Pake. Also, welcome to follow them! ❤️
 
 <a href="https://github.com/tw93/Pake/graphs/contributors">
-  <img src="https://raw.githubusercontent.com/tw93/Pake/main/CONTRIBUTORS.svg?sanitize=true" alt="Contributors" width="1000" />
+  <img src="./CONTRIBUTORS.svg?v=2" alt="Contributors" width="1000" />
 </a>
 
 ## Support

package/dist/cli.js

@@ -22,7 +22,7 @@ import * as psl from 'psl';
 import { InvalidArgumentError, program as program$1, Option } from 'commander';
 
 var name = "pake-cli";
-var version = "3.7.4";
+var version = "3.7.6";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -843,10 +843,10 @@ class BaseBuilder {
                 logger.info(`✺ Located in China, using ${packageManager}/rsProxy CN mirror.`);
                 const projectCnConf = path.join(tauriSrcPath, 'rust_proxy.toml');
                 await fsExtra.copy(projectCnConf, projectConf);
-                await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}${peerDepsOption}`, timeout, buildEnv);
+                await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}${peerDepsOption}`, timeout, { ...buildEnv, CI: 'true' });
             }
             else {
-                await shellExec(`cd "${npmDirectory}" && ${packageManager} install${peerDepsOption}`, timeout, buildEnv);
+                await shellExec(`cd "${npmDirectory}" && ${packageManager} install${peerDepsOption}`, timeout, { ...buildEnv, CI: 'true' });
             }
             spinner.succeed(chalk.green('Package installed!'));
         }
@@ -862,7 +862,7 @@ class BaseBuilder {
                 try {
                     const projectCnConf = path.join(tauriSrcPath, 'rust_proxy.toml');
                     await fsExtra.copy(projectCnConf, projectConf);
-                    await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}${peerDepsOption}`, timeout, buildEnv);
+                    await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}${peerDepsOption}`, timeout, { ...buildEnv, CI: 'true' });
                     retrySpinner.succeed(chalk.green('Package installed with CN mirror!'));
                 }
                 catch (retryError) {
@@ -1276,6 +1276,7 @@ class WinBuilder extends BaseBuilder {
 class LinuxBuilder extends BaseBuilder {
     constructor(options) {
         super(options);
+        this.currentBuildType = '';
         const target = options.targets || 'deb';
         if (target.includes('-arm64')) {
             this.buildFormat = target.replace('-arm64', '');
@@ -1306,7 +1307,7 @@ class LinuxBuilder extends BaseBuilder {
                 }
             }
         }
-        if (targets === 'rpm') {
+        if (this.currentBuildType === 'rpm') {
             return `${name}-${version}-1.${arch}`;
         }
         return `${name}_${version}_${arch}`;
@@ -1318,10 +1319,16 @@ class LinuxBuilder extends BaseBuilder {
             .map((t) => t.trim());
         for (const target of targetTypes) {
             if (requestedTargets.includes(target)) {
+                this.currentBuildType = target;
                 await this.buildAndCopy(url, target);
             }
         }
     }
+    // Override buildAndCopy to ensure currentBuildType is synced if called directly, though the loop above handles it most of the time.
+    async buildAndCopy(url, target) {
+        this.currentBuildType = target;
+        await super.buildAndCopy(url, target);
+    }
     getBuildCommand(packageManager = 'pnpm') {
         const configPath = path.join('src-tauri', '.pake', 'tauri.conf.json');
         const buildTarget = this.buildArch === 'arm64'
@@ -1332,11 +1339,16 @@ class LinuxBuilder extends BaseBuilder {
         if (features.length > 0) {
             fullCommand += ` --features ${features.join(',')}`;
         }
+        if (this.currentBuildType) {
+            fullCommand += ` --bundles ${this.currentBuildType}`;
+        }
         // Enable verbose output for AppImage builds when debugging or PAKE_VERBOSE is set.
         // AppImage builds often fail with minimal error messages from linuxdeploy,
         // so verbose mode helps diagnose issues like strip failures and missing dependencies.
-        if (this.options.targets === 'appimage' &&
-            (this.options.debug || process.env.PAKE_VERBOSE)) {
+        if (this.currentBuildType === 'appimage' &&
+            (this.options.targets.includes('appimage') ||
+                this.options.debug ||
+                process.env.PAKE_VERBOSE)) {
             fullCommand += ' --verbose';
         }
         return fullCommand;
@@ -1898,7 +1910,7 @@ const DEFAULT_PAKE_OPTIONS = {
     targets: (() => {
         switch (process.platform) {
             case 'linux':
-                return 'deb';
+                return 'deb,appimage';
             case 'darwin':
                 return 'dmg';
             case 'win32':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "3.7.4",
+  "version": "3.7.6",
   "description": "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。",
   "engines": {
     "node": ">=18.0.0"

package/src-tauri/Cargo.lock

@@ -2539,7 +2539,7 @@ dependencies = [
 
 [[package]]
 name = "pake"
-version = "3.7.3"
+version = "3.7.6"
 dependencies = [
  "serde",
  "serde_json",

package/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pake"
-version = "3.7.3"
+version = "3.7.6"
 description = "🤱🏻 Turn any webpage into a desktop app with Rust."
 authors = ["Tw93"]
 license = "MIT"

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

@@ -58,12 +58,16 @@ pub fn set_window(app: &mut App, config: &PakeConfig, tauri_config: &Config) ->
         .visible(false)
         .user_agent(user_agent)
         .resizable(window_config.resizable)
-        .fullscreen(window_config.fullscreen)
         .maximized(window_config.maximize)
         .inner_size(window_config.width, window_config.height)
         .always_on_top(window_config.always_on_top)
         .incognito(window_config.incognito);
 
+    #[cfg(any(target_os = "windows", target_os = "macos"))]
+    {
+        window_builder = window_builder.fullscreen(window_config.fullscreen);
+    }
+
     if window_config.min_width > 0.0 || window_config.min_height > 0.0 {
         let min_w = if window_config.min_width > 0.0 {
             window_config.min_width

package/src-tauri/src/lib.rs

@@ -99,6 +99,16 @@ pub fn run_app() {
                 tauri::async_runtime::spawn(async move {
                     tokio::time::sleep(tokio::time::Duration::from_millis(WINDOW_SHOW_DELAY)).await;
                     window_clone.show().unwrap();
+
+                    // Fixed: Linux fullscreen issue with virtual keyboard
+                    #[cfg(all(not(target_os = "windows"), not(target_os = "macos")))]
+                    {
+                        if init_fullscreen {
+                            window_clone.set_fullscreen(true).unwrap();
+                            // Ensure webview maintains focus for input after fullscreen
+                            let _ = window_clone.set_focus();
+                        }
+                    }
                 });
             }
 
@@ -117,6 +127,14 @@ pub fn run_app() {
                                 tokio::time::sleep(Duration::from_millis(900)).await;
                             }
                         }
+                        #[cfg(all(not(target_os = "windows"), not(target_os = "macos")))]
+                        {
+                            if window.is_fullscreen().unwrap_or(false) {
+                                window.set_fullscreen(false).unwrap();
+                                // Restore focus after exiting fullscreen to fix input issues
+                                let _ = window.set_focus();
+                            }
+                        }
                         window.minimize().unwrap();
                         window.hide().unwrap();
                     });