pake-cli 3.11.0 → 3.11.1

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.11.0";
+var version = "3.11.1";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -682,7 +682,15 @@ Terminal=false
             // Avoid copying if source and destination are the same
             const absoluteDestPath = path.resolve(iconPath);
             if (resolvedIconPath !== absoluteDestPath) {
-                await fsExtra.copy(resolvedIconPath, iconPath);
+                try {
+                    await fsExtra.copy(resolvedIconPath, iconPath);
+                }
+                catch (error) {
+                    if (!(error instanceof Error &&
+                        error.message.includes('Source and destination must not be the same'))) {
+                        throw error;
+                    }
+                }
             }
         }
         if (updateIconPath) {
@@ -796,13 +804,20 @@ class BaseBuilder {
         this.options = options;
     }
     getBuildEnvironment() {
-        return IS_MAC
-            ? {
-                CFLAGS: '-fno-modules',
-                CXXFLAGS: '-fno-modules',
-                MACOSX_DEPLOYMENT_TARGET: '14.0',
-            }
-            : undefined;
+        if (!IS_MAC) {
+            return undefined;
+        }
+        const currentPath = process.env.PATH || '';
+        const systemToolsPath = '/usr/bin';
+        const buildPath = currentPath.startsWith(`${systemToolsPath}:`)
+            ? currentPath
+            : `${systemToolsPath}:${currentPath}`;
+        return {
+            CFLAGS: '-fno-modules',
+            CXXFLAGS: '-fno-modules',
+            MACOSX_DEPLOYMENT_TARGET: '14.0',
+            PATH: buildPath,
+        };
     }
     getInstallTimeout() {
         // Windows needs more time due to native compilation and antivirus scanning
@@ -834,6 +849,21 @@ class BaseBuilder {
             }
         }
     }
+    async copyFileWithSamePathGuard(sourcePath, destinationPath) {
+        if (path.resolve(sourcePath) === path.resolve(destinationPath)) {
+            return;
+        }
+        try {
+            await fsExtra.copy(sourcePath, destinationPath, { overwrite: true });
+        }
+        catch (error) {
+            if (error instanceof Error &&
+                error.message.includes('Source and destination must not be the same')) {
+                return;
+            }
+            throw error;
+        }
+    }
     async prepare() {
         const tauriSrcPath = path.join(npmDirectory, 'src-tauri');
         const tauriTargetPath = path.join(tauriSrcPath, 'target');
@@ -879,7 +909,7 @@ class BaseBuilder {
             if (isChina) {
                 logger.info(`✺ Located in China, using ${packageManager}/rsProxy CN mirror.`);
                 const projectCnConf = path.join(tauriSrcPath, 'rust_proxy.toml');
-                await fsExtra.copy(projectCnConf, projectConf);
+                await this.copyFileWithSamePathGuard(projectCnConf, projectConf);
                 await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}${peerDepsOption}`, timeout, { ...buildEnv, CI: 'true' });
             }
             else {
@@ -898,7 +928,7 @@ class BaseBuilder {
                 usedMirror = true;
                 try {
                     const projectCnConf = path.join(tauriSrcPath, 'rust_proxy.toml');
-                    await fsExtra.copy(projectCnConf, projectConf);
+                    await this.copyFileWithSamePathGuard(projectCnConf, projectConf);
                     await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}${peerDepsOption}`, timeout, { ...buildEnv, CI: 'true' });
                     retrySpinner.succeed(chalk.green('Package installed with CN mirror!'));
                 }
@@ -1034,33 +1064,21 @@ class BaseBuilder {
             message.includes('appimage tool failed') ||
             message.includes('strip tool'));
     }
-    /**
-     * 解析目标架构
-     */
     resolveTargetArch(requestedArch) {
         if (requestedArch === 'auto' || !requestedArch) {
             return process.arch;
         }
         return requestedArch;
     }
-    /**
-     * 获取Tauri构建目标
-     */
     getTauriTarget(arch, platform = process.platform) {
         const platformMappings = BaseBuilder.ARCH_MAPPINGS[platform];
         if (!platformMappings)
             return null;
         return platformMappings[arch] || null;
     }
-    /**
-     * 获取架构显示名称（用于文件名）
-     */
     getArchDisplayName(arch) {
         return BaseBuilder.ARCH_DISPLAY_NAMES[arch] || arch;
     }
-    /**
-     * 构建基础构建命令
-     */
     buildBaseCommand(packageManager, configPath, target) {
         const baseCommand = this.options.debug
             ? `${packageManager} run build:debug`
@@ -1077,9 +1095,6 @@ class BaseBuilder {
         }
         return fullCommand;
     }
-    /**
-     * 获取构建特性列表
-     */
     getBuildFeatures() {
         const features = ['cli-build'];
         // Add macos-proxy feature for modern macOS (Darwin 23+ = macOS 14+)
@@ -1188,7 +1203,6 @@ class BaseBuilder {
     }
 }
 BaseBuilder.packageManagerCache = null;
-// 架构映射配置
 BaseBuilder.ARCH_MAPPINGS = {
     darwin: {
         arm64: 'aarch64-apple-darwin',
@@ -1204,7 +1218,6 @@ BaseBuilder.ARCH_MAPPINGS = {
         x64: 'x86_64-unknown-linux-gnu',
     },
 };
-// 架构名称映射（用于文件名生成）
 BaseBuilder.ARCH_DISPLAY_NAMES = {
     arm64: 'aarch64',
     x64: 'x64',

package/dist/test-local.html

@@ -0,0 +1 @@
+<html><body><h1>Hello Pake</h1></body></html>

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "pake-cli",
-  "version": "3.11.0",
+  "version": "3.11.1",
   "description": "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。",
   "engines": {
     "node": ">=18.0.0"
   },
+  "packageManager": "pnpm@10.26.2",
   "bin": {
     "pake": "./dist/cli.js"
   },
@@ -28,6 +29,22 @@
     "dist",
     "src-tauri"
   ],
+  "scripts": {
+    "start": "pnpm run dev",
+    "dev": "pnpm run tauri dev",
+    "build": "tauri build",
+    "build:debug": "tauri build --debug",
+    "build:mac": "tauri build --target universal-apple-darwin",
+    "analyze": "cd src-tauri && cargo bloat --release --crates",
+    "tauri": "tauri",
+    "cli": "cross-env NODE_ENV=development rollup -c -w",
+    "cli:build": "cross-env NODE_ENV=production rollup -c",
+    "test": "pnpm run cli:build && cross-env PAKE_CREATE_APP=1 node tests/index.js",
+    "format": "prettier --write . --ignore-unknown && find tests -name '*.js' -exec sed -i '' 's/[[:space:]]*$//' {} \\; && cd src-tauri && cargo fmt --verbose",
+    "format:check": "prettier --check . --ignore-unknown",
+    "update": "pnpm update --verbose && cd src-tauri && cargo update",
+    "prepublishOnly": "pnpm run cli:build"
+  },
   "type": "module",
   "exports": "./dist/cli.js",
   "license": "MIT",
@@ -69,19 +86,13 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.18"
   },
-  "scripts": {
-    "start": "pnpm run dev",
-    "dev": "pnpm run tauri dev",
-    "build": "tauri build",
-    "build:debug": "tauri build --debug",
-    "build:mac": "tauri build --target universal-apple-darwin",
-    "analyze": "cd src-tauri && cargo bloat --release --crates",
-    "tauri": "tauri",
-    "cli": "cross-env NODE_ENV=development rollup -c -w",
-    "cli:build": "cross-env NODE_ENV=production rollup -c",
-    "test": "pnpm run cli:build && cross-env PAKE_CREATE_APP=1 node tests/index.js",
-    "format": "prettier --write . --ignore-unknown && find tests -name '*.js' -exec sed -i '' 's/[[:space:]]*$//' {} \\; && cd src-tauri && cargo fmt --verbose",
-    "format:check": "prettier --check . --ignore-unknown",
-    "update": "pnpm update --verbose && cd src-tauri && cargo update"
+  "pnpm": {
+    "overrides": {
+      "sharp": "^0.34.5"
+    },
+    "onlyBuiltDependencies": [
+      "esbuild",
+      "sharp"
+    ]
   }
-}
+}

package/src-tauri/Cargo.lock

@@ -2564,7 +2564,7 @@ dependencies = [
 
 [[package]]
 name = "pake"
-version = "3.10.1"
+version = "3.11.1"
 dependencies = [
  "serde",
  "serde_json",

package/src-tauri/Cargo.toml

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

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

@@ -79,7 +79,7 @@ fn open_requested_window(
         tauri_config,
         WindowBuildOptions {
             label: &label,
-            url: WebviewUrl::External("about:blank".parse().unwrap()),
+            url: WebviewUrl::External(target_url.clone()),
             visible: true,
             new_window_features: Some(features),
         },
@@ -369,50 +369,20 @@ fn build_window(
     }
 
     if let Some(features) = new_window_features {
-        window_builder = window_builder.window_features(features).focused(true);
-    }
-
-    // Allow navigation to OAuth/authentication domains
-    window_builder = window_builder.on_navigation(|url| {
-        let url_str = url.as_str();
-
-        // Always allow same-origin navigation
-        if url_str.starts_with("http://localhost") || url_str.starts_with("http://127.0.0.1") {
-            return true;
-        }
-
-        // Check for OAuth/authentication domains
-        let auth_patterns = [
-            "accounts.google.com",
-            "login.microsoftonline.com",
-            "github.com/login",
-            "appleid.apple.com",
-            "facebook.com",
-            "twitter.com",
-        ];
-
-        let auth_paths = ["/oauth/", "/auth/", "/authorize", "/login"];
-
-        // Allow if matches auth patterns
-        for pattern in &auth_patterns {
-            if url_str.contains(pattern) {
-                #[cfg(debug_assertions)]
-                println!("Allowing OAuth navigation to: {}", url_str);
-                return true;
-            }
+        // window_features() crashes on macOS; only apply on other platforms.
+        #[cfg(target_os = "macos")]
+        {
+            let _ = features;
+            window_builder = window_builder.focused(true);
         }
 
-        for path in &auth_paths {
-            if url_str.contains(path) {
-                #[cfg(debug_assertions)]
-                println!("Allowing auth path navigation to: {}", url_str);
-                return true;
-            }
+        #[cfg(not(target_os = "macos"))]
+        {
+            window_builder = window_builder.window_features(features).focused(true);
         }
+    }
 
-        // Allow all other navigation by default
-        true
-    });
+    window_builder = window_builder.on_navigation(|_| true);
 
     window_builder.build()
 }

package/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "productName": "Weekly",
   "identifier": "com.pake.weekly",
-  "version": "3.10.1",
+  "version": "3.11.1",
   "app": {
     "withGlobalTauri": true,
     "trayIcon": {