pake-cli 3.7.3 → 3.7.5

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.3";
+var version = "3.7.5";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -484,7 +484,7 @@ async function mergeConfig(url, options, tauriConf) {
             await fsExtra.copy(sourcePath, destPath);
         }
     }));
-    const { width, height, fullscreen, maximize, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name = 'pake-app', resizable = true, inject, proxyUrl, installerLanguage, hideOnClose, incognito, title, wasm, enableDragDrop, multiInstance, startToTray, forceInternalNavigation, zoom, minWidth, minHeight, ignoreCertificateErrors, } = options;
+    const { width, height, fullscreen, maximize, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name = 'pake-app', resizable = true, inject, proxyUrl, installerLanguage, hideOnClose, incognito, title, wasm, enableDragDrop, multiInstance, startToTray, forceInternalNavigation, zoom, minWidth, minHeight, ignoreCertificateErrors, newWindow, } = options;
     const { platform } = process;
     const platformHideOnClose = hideOnClose ?? platform === 'darwin';
     const tauriConfWindowOptions = {
@@ -509,6 +509,7 @@ async function mergeConfig(url, options, tauriConf) {
         min_width: minWidth,
         min_height: minHeight,
         ignore_certificate_errors: ignoreCertificateErrors,
+        new_window: newWindow,
     };
     Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
     tauriConf.productName = name;
@@ -842,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!'));
         }
@@ -861,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) {
@@ -1275,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', '');
@@ -1305,7 +1307,7 @@ class LinuxBuilder extends BaseBuilder {
                 }
             }
         }
-        if (targets === 'rpm') {
+        if (this.currentBuildType === 'rpm') {
             return `${name}-${version}-1.${arch}`;
         }
         return `${name}_${version}_${arch}`;
@@ -1317,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'
@@ -1331,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;
@@ -1897,7 +1910,7 @@ const DEFAULT_PAKE_OPTIONS = {
     targets: (() => {
         switch (process.platform) {
             case 'linux':
-                return 'deb';
+                return 'deb,appimage';
             case 'darwin':
                 return 'dmg';
             case 'win32':
@@ -1925,6 +1938,7 @@ const DEFAULT_PAKE_OPTIONS = {
     minWidth: 0,
     minHeight: 0,
     ignoreCertificateErrors: false,
+    newWindow: false,
 };
 
 function validateNumberInput(value) {
@@ -2075,6 +2089,9 @@ ${green('|_|   \\__,_|_|\\_\\___|  can turn any webpage into a desktop app with
         .addOption(new Option('--iterative-build', 'Turn on rapid build mode (app only, no dmg/deb/msi), good for debugging')
         .default(DEFAULT_PAKE_OPTIONS.iterativeBuild)
         .hideHelp())
+        .addOption(new Option('--new-window', 'Allow new window for third-party login')
+        .default(DEFAULT_PAKE_OPTIONS.newWindow)
+        .hideHelp())
         .version(packageJson.version, '-v, --version')
         .configureHelp({
         sortSubcommands: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "3.7.3",
+  "version": "3.7.5",
   "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.5"
 dependencies = [
  "serde",
  "serde_json",

package/src-tauri/Cargo.toml

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

package/src-tauri/pake.json

@@ -18,7 +18,8 @@
       "enable_drag_drop": false,
       "maximize": false,
       "start_to_tray": false,
-      "force_internal_navigation": false
+      "force_internal_navigation": false,
+      "new_window": false
     }
   ],
   "user_agent": {

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

@@ -19,6 +19,7 @@ pub struct WindowConfig {
     pub title: Option<String>,
     pub enable_wasm: bool,
     pub enable_drag_drop: bool,
+    pub new_window: bool,
     pub start_to_tray: bool,
     #[serde(default)]
     pub force_internal_navigation: bool,

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
@@ -82,6 +86,11 @@ pub fn set_window(app: &mut App, config: &PakeConfig, tauri_config: &Config) ->
         window_builder = window_builder.disable_drag_drop_handler();
     }
 
+    if window_config.new_window {
+        window_builder = window_builder
+            .on_new_window(move |_url, _features| tauri::webview::NewWindowResponse::Allow);
+    }
+
     // Add initialization scripts
     window_builder = window_builder
         .initialization_script(&config_script)
@@ -148,9 +157,13 @@ pub fn set_window(app: &mut App, config: &PakeConfig, tauri_config: &Config) ->
         };
         window_builder = window_builder.title_bar_style(title_bar_style);
 
-        if window_config.dark_mode {
-            window_builder = window_builder.theme(Some(Theme::Dark));
-        }
+        // Default to following system theme (None), only force dark when explicitly set
+        let theme = if window_config.dark_mode {
+            Some(Theme::Dark)
+        } else {
+            None // Follow system theme
+        };
+        window_builder = window_builder.theme(theme);
     }
 
     // Windows and Linux: set data_directory before proxy_url

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

@@ -1,124 +1,59 @@
 document.addEventListener("DOMContentLoaded", () => {
-  // Helper: Calculate brightness from RGB color
-  const isDarkColor = (color) => {
-    if (!color) return false;
-    const match = color.match(/rgba?\((\d+),\s*(\d+),\s*(\d+)/);
-    if (!match) return false;
-    const r = parseInt(match[1]);
-    const g = parseInt(match[2]);
-    const b = parseInt(match[3]);
-    // Standard luminance formula
-    const luminance = 0.299 * r + 0.587 * g + 0.114 * b;
-    return luminance < 128;
-  };
-
-  // Debounce helper
   const debounce = (func, wait) => {
     let timeout;
-    return function executedFunction(...args) {
-      const later = () => {
-        clearTimeout(timeout);
-        func(...args);
-      };
+    return (...args) => {
       clearTimeout(timeout);
-      timeout = setTimeout(later, wait);
+      timeout = setTimeout(() => func(...args), wait);
     };
   };
 
-  // Function to detect and send theme to Rust
   const updateTheme = () => {
-    let mode = "light";
-    let detected = false;
-
-    // Strategy 1: Explicit DOM Class/Attribute (High Priority)
-    // Many apps use specific classes for hard-coded themes
     const doc = document.documentElement;
     const body = document.body;
+    let mode = null;
 
-    const isExplicitDark =
+    // Check for explicit theme classes or attributes
+    const isDark =
       doc.classList.contains("dark") ||
       body.classList.contains("dark") ||
       doc.getAttribute("data-theme") === "dark" ||
       body.getAttribute("data-theme") === "dark" ||
       doc.style.colorScheme === "dark";
 
-    const isExplicitLight =
+    const isLight =
       doc.classList.contains("light") ||
       body.classList.contains("light") ||
       doc.getAttribute("data-theme") === "light" ||
       body.getAttribute("data-theme") === "light" ||
       doc.style.colorScheme === "light";
 
-    if (isExplicitDark) {
-      mode = "dark";
-      detected = true;
-    } else if (isExplicitLight) {
-      mode = "light";
-      detected = true;
-    }
-
-    // Strategy 2: Computed Background Color (Fallback & Verification)
-    // If no explicit class is found, or to double-check, look at the actual background color.
-    // This is useful when the site relies purely on CSS media queries without classes.
-    if (!detected) {
-      const bodyBg = window.getComputedStyle(document.body).backgroundColor;
-      const htmlBg = window.getComputedStyle(
-        document.documentElement,
-      ).backgroundColor;
+    if (isDark) mode = "dark";
+    else if (isLight) mode = "light";
 
-      // Check body first, then html
-      if (bodyBg && bodyBg !== "rgba(0, 0, 0, 0)" && bodyBg !== "transparent") {
-        mode = isDarkColor(bodyBg) ? "dark" : "light";
-      } else if (
-        htmlBg &&
-        htmlBg !== "rgba(0, 0, 0, 0)" &&
-        htmlBg !== "transparent"
-      ) {
-        mode = isDarkColor(htmlBg) ? "dark" : "light";
-      } else {
-        // Strategy 3: System Preference (Last Resort)
-        if (
-          window.matchMedia &&
-          window.matchMedia("(prefers-color-scheme: dark)").matches
-        ) {
-          mode = "dark";
-        }
-      }
-    }
-
-    // Send to Rust
-    if (window.__TAURI__ && window.__TAURI__.core) {
+    // Only invoke Rust command if an explicit theme override is detected
+    if (mode && window.__TAURI__?.core) {
       window.__TAURI__.core.invoke("update_theme_mode", { mode });
     }
   };
 
-  // Debounced version of updateTheme
   const debouncedUpdateTheme = debounce(updateTheme, 200);
 
-  // Initial check
-  // Delay slightly to ensure styles are applied
-  setTimeout(updateTheme, 100);
-
-  // Watch for system theme changes
-  window
-    .matchMedia("(prefers-color-scheme: dark)")
-    .addEventListener("change", updateTheme);
+  // Initial check with delay to allow site to render
+  setTimeout(updateTheme, 500);
 
   // Watch for DOM changes
-  // We observe attributes for class changes, and also style changes just in case
-  const observer = new MutationObserver((mutations) => {
-    debouncedUpdateTheme();
-  });
-
-  observer.observe(document.documentElement, {
+  const observer = new MutationObserver(debouncedUpdateTheme);
+  const config = {
     attributes: true,
     attributeFilter: ["class", "data-theme", "style"],
     subtree: false,
-  });
+  };
 
-  observer.observe(document.body, {
-    attributes: true,
-    attributeFilter: ["class", "data-theme", "style"],
-    subtree: false,
-  });
+  observer.observe(document.documentElement, config);
+  observer.observe(document.body, config);
+
+  // Watch for system theme changes (though window should handle this natively now)
+  window
+    .matchMedia("(prefers-color-scheme: dark)")
+    .addEventListener("change", updateTheme);
 });

package/src-tauri/src/lib.rs

@@ -99,6 +99,14 @@ 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();
+                        }
+                    }
                 });
             }