pake-cli 3.6.3 → 3.7.2

package/dist/cli.js

@@ -22,12 +22,12 @@ import * as psl from 'psl';
 import { InvalidArgumentError, program as program$1, Option } from 'commander';
 
 var name = "pake-cli";
-var version = "3.6.3";
+var version = "3.7.2";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
 };
-var packageManager = "pnpm@10.15.0";
+var packageManager = "pnpm@10.26.2";
 var bin = {
 	pake: "./dist/cli.js"
 };
@@ -68,45 +68,50 @@ var scripts = {
 	prepublishOnly: "pnpm run cli:build"
 };
 var type = "module";
-var exports = "./dist/cli.js";
+var exports$1 = "./dist/cli.js";
 var license = "MIT";
 var dependencies = {
-	"@tauri-apps/api": "^2.9.0",
-	"@tauri-apps/cli": "^2.9.0",
+	"@tauri-apps/api": "^2.9.1",
+	"@tauri-apps/cli": "^2.9.6",
 	chalk: "^5.6.2",
-	commander: "^12.1.0",
-	execa: "^9.6.0",
-	"file-type": "^18.7.0",
-	"fs-extra": "^11.3.2",
+	commander: "^14.0.2",
+	execa: "^9.6.1",
+	"file-type": "^21.1.1",
+	"fs-extra": "^11.3.3",
 	"icon-gen": "^5.0.0",
 	loglevel: "^1.9.2",
-	ora: "^8.2.0",
+	ora: "^9.0.0",
 	prompts: "^2.4.2",
 	psl: "^1.15.0",
-	sharp: "^0.33.5",
+	sharp: "^0.34.5",
 	"tmp-promise": "^3.0.3",
 	"update-notifier": "^7.3.1"
 };
 var devDependencies = {
-	"@rollup/plugin-alias": "^5.1.1",
-	"@rollup/plugin-commonjs": "^28.0.8",
+	"@rollup/plugin-alias": "^6.0.0",
+	"@rollup/plugin-commonjs": "^29.0.0",
 	"@rollup/plugin-json": "^6.1.0",
-	"@rollup/plugin-replace": "^6.0.2",
+	"@rollup/plugin-replace": "^6.0.3",
 	"@rollup/plugin-terser": "^0.4.4",
 	"@types/fs-extra": "^11.0.4",
-	"@types/node": "^20.19.23",
+	"@types/node": "^25.0.3",
 	"@types/page-icon": "^0.3.6",
 	"@types/prompts": "^2.4.9",
 	"@types/tmp": "^0.2.6",
 	"@types/update-notifier": "^6.0.8",
 	"app-root-path": "^3.1.0",
-	"cross-env": "^7.0.3",
-	prettier: "^3.6.2",
-	rollup: "^4.52.5",
+	"cross-env": "^10.1.0",
+	prettier: "^3.7.4",
+	rollup: "^4.54.0",
 	"rollup-plugin-typescript2": "^0.36.0",
 	tslib: "^2.8.1",
 	typescript: "^5.9.3",
-	vitest: "^4.0.15"
+	vitest: "^4.0.16"
+};
+var pnpm = {
+	overrides: {
+		sharp: "^0.34.5"
+	}
 };
 var packageJson = {
 	name: name,
@@ -121,10 +126,11 @@ var packageJson = {
 	files: files,
 	scripts: scripts,
 	type: type,
-	exports: exports,
+	exports: exports$1,
 	license: license,
 	dependencies: dependencies,
-	devDependencies: devDependencies
+	devDependencies: devDependencies,
+	pnpm: pnpm
 };
 
 // Convert the current module URL to a file path
@@ -504,9 +510,12 @@ async function mergeConfig(url, options, tauriConf) {
     tauriConf.productName = name;
     tauriConf.identifier = identifier;
     tauriConf.version = appVersion;
-    if (platform === 'linux') {
-        tauriConf.mainBinaryName = `pake-${generateIdentifierSafeName(name)}`;
-    }
+    // Always set mainBinaryName to ensure binary uniqueness
+    const linuxBinaryName = `pake-${generateLinuxPackageName(name)}`;
+    tauriConf.mainBinaryName =
+        platform === 'linux'
+            ? linuxBinaryName
+            : `pake-${generateIdentifierSafeName(name)}`;
     if (platform == 'win32') {
         tauriConf.bundle.windows.wix.language[0] = installerLanguage;
     }
@@ -551,9 +560,9 @@ async function mergeConfig(url, options, tauriConf) {
         // Remove hardcoded desktop files and regenerate with correct app name
         delete tauriConf.bundle.linux.deb.files;
         // Generate correct desktop file configuration
-        const appNameSafe = getSafeAppName(name);
-        const identifier = `com.pake.${appNameSafe}`;
-        const desktopFileName = `${identifier}.desktop`;
+        const linuxName = generateLinuxPackageName(name);
+        const desktopFileName = `com.pake.${linuxName}.desktop`;
+        const iconName = `${linuxName}_512`;
         // Create desktop file content
         // Determine if title contains Chinese characters for Name[zh_CN]
         const chineseName = title && /[\u4e00-\u9fa5]/.test(title) ? title : null;
@@ -563,11 +572,12 @@ Type=Application
 Name=${name}
 ${chineseName ? `Name[zh_CN]=${chineseName}` : ''}
 Comment=${name}
-Exec=pake-${appNameSafe}
-Icon=${appNameSafe}_512
-Categories=Network;WebBrowser;
+Exec=${linuxBinaryName}
+Icon=${iconName}
+Categories=Network;WebBrowser;Utility;
 MimeType=text/html;text/xml;application/xhtml_xml;
 StartupNotify=true
+Terminal=false
 `;
         // Write desktop file to src-tauri/assets directory where Tauri expects it
         const srcAssetsDir = path.join(npmDirectory, 'src-tauri/assets');
@@ -576,8 +586,16 @@ StartupNotify=true
         await fsExtra.writeFile(srcDesktopFilePath, desktopContent);
         // Set up desktop file in bundle configuration
         // Use absolute path from src-tauri directory to assets
+        const desktopInstallPath = `/usr/share/applications/${desktopFileName}`;
         tauriConf.bundle.linux.deb.files = {
-            [`/usr/share/applications/${desktopFileName}`]: `assets/${desktopFileName}`,
+            [desktopInstallPath]: `assets/${desktopFileName}`,
+        };
+        // Add desktop file support for RPM
+        if (!tauriConf.bundle.linux.rpm) {
+            tauriConf.bundle.linux.rpm = {};
+        }
+        tauriConf.bundle.linux.rpm.files = {
+            [desktopInstallPath]: `assets/${desktopFileName}`,
         };
         const validTargets = [
             'deb',
@@ -615,7 +633,7 @@ StartupNotify=true
         },
         linux: {
             fileExt: '.png',
-            path: `png/${safeAppName}_512.png`,
+            path: `png/${generateLinuxPackageName(name)}_512.png`,
             defaultIcon: 'png/icon_512.png',
             message: 'Linux icon must be .png and 512x512px.',
         },
@@ -679,6 +697,10 @@ StartupNotify=true
             logger.warn(`✼ Default system tray icon will remain unchanged.`);
         }
     }
+    // Ensure trayIcon object exists before setting iconPath
+    if (!tauriConf.app.trayIcon) {
+        tauriConf.app.trayIcon = {};
+    }
     tauriConf.app.trayIcon.iconPath = trayIconPath;
     tauriConf.pake.system_tray_path = trayIconPath;
     delete tauriConf.app.trayIcon;
@@ -1083,12 +1105,11 @@ class BaseBuilder {
      */
     getBinaryName(appName) {
         const extension = process.platform === 'win32' ? '.exe' : '';
-        // Linux uses the unique binary name we set in merge.ts
-        if (process.platform === 'linux') {
-            return `pake-${generateIdentifierSafeName(appName)}${extension}`;
-        }
-        // Windows and macOS use 'pake' as binary name
-        return `pake${extension}`;
+        // Use unique binary name for all platforms to avoid conflicts
+        const nameToUse = process.platform === 'linux'
+            ? generateLinuxPackageName(appName)
+            : generateIdentifierSafeName(appName);
+        return `pake-${nameToUse}${extension}`;
     }
     /**
      * Check if this build has architecture-specific target
@@ -1287,8 +1308,11 @@ class LinuxBuilder extends BaseBuilder {
     }
     async build(url) {
         const targetTypes = ['deb', 'appimage', 'rpm'];
+        const requestedTargets = this.options.targets
+            .split(',')
+            .map((t) => t.trim());
         for (const target of targetTypes) {
-            if (this.options.targets === target) {
+            if (requestedTargets.includes(target)) {
                 await this.buildAndCopy(url, target);
             }
         }
@@ -1374,9 +1398,7 @@ const API_KEYS = {
     brandfetch: ['1idqvJC0CeFSeyp3Yf7', '1idej-yhU_ThggIHFyG'],
 };
 function generateIconPath(appName, isDefault = false) {
-    const safeName = isDefault
-        ? 'icon'
-        : generateSafeFilename(appName).toLowerCase();
+    const safeName = isDefault ? 'icon' : getIconBaseName(appName);
     const baseName = safeName;
     if (IS_WIN) {
         return path.join(npmDirectory, 'src-tauri', 'png', `${baseName}_256.ico`);
@@ -1386,6 +1408,12 @@ function generateIconPath(appName, isDefault = false) {
     }
     return path.join(npmDirectory, 'src-tauri', 'icons', `${baseName}.icns`);
 }
+function getIconBaseName(appName) {
+    const baseName = IS_LINUX
+        ? generateLinuxPackageName(appName)
+        : generateSafeFilename(appName).toLowerCase();
+    return baseName || 'pake-app';
+}
 async function copyWindowsIconIfNeeded(convertedPath, appName) {
     if (!IS_WIN || !convertedPath.endsWith('.ico')) {
         return convertedPath;
@@ -1490,7 +1518,7 @@ async function convertIconFormat(inputPath, appName) {
         const platformOutputDir = path.join(outputDir, 'converted-icons');
         await fsExtra.ensureDir(platformOutputDir);
         const processedInputPath = await preprocessIcon(inputPath);
-        const iconName = generateSafeFilename(appName).toLowerCase();
+        const iconName = getIconBaseName(appName);
         // Generate platform-specific format
         if (IS_WIN) {
             // Support multiple sizes for better Windows compatibility
@@ -1669,16 +1697,6 @@ async function tryGetFavicon(url, appName) {
                 if (error instanceof Error) {
                     logger.debug(`Icon service ${serviceUrl} failed: ${error.message}`);
                 }
-                // Network error handling
-                if ((IS_LINUX || IS_WIN) && error.code === 'ENOTFOUND') {
-                    return null;
-                }
-                // Icon generation error on Windows
-                if (IS_WIN &&
-                    error instanceof Error &&
-                    error.message.includes('icongen')) {
-                    return null;
-                }
                 continue;
             }
         }
@@ -1790,6 +1808,18 @@ function resolveAppName(name, platform) {
     const domain = getDomain(name) || 'pake';
     return platform !== 'linux' ? capitalizeFirstLetter(domain) : domain;
 }
+function resolveLocalAppName(filePath, platform) {
+    const baseName = path.parse(filePath).name || 'pake-app';
+    if (platform === 'linux') {
+        return generateLinuxPackageName(baseName) || 'pake-app';
+    }
+    const normalized = baseName
+        .replace(/[^a-zA-Z0-9\u4e00-\u9fff -]/g, '')
+        .replace(/^[ -]+/, '')
+        .replace(/\s+/g, ' ')
+        .trim();
+    return normalized || 'pake-app';
+}
 function isValidName(name, platform) {
     const platformRegexMapping = {
         linux: /^[a-z0-9\u4e00-\u9fff][a-z0-9\u4e00-\u9fff-]*$/,
@@ -1804,10 +1834,12 @@ async function handleOptions(options, url) {
     let name = options.name;
     const pathExists = await fsExtra.pathExists(url);
     if (!options.name) {
-        const defaultName = pathExists ? '' : resolveAppName(url, platform);
+        const defaultName = pathExists
+            ? resolveLocalAppName(url, platform)
+            : resolveAppName(url, platform);
         const promptMessage = 'Enter your application name';
         const namePrompt = await promptText(promptMessage, defaultName);
-        name = namePrompt || defaultName;
+        name = namePrompt?.trim() || defaultName;
     }
     if (name && platform === 'linux') {
         name = generateLinuxPackageName(name);

package/dist/test-local.html

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

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "pake-cli",
-  "version": "3.6.3",
+  "version": "3.7.2",
   "description": "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。",
   "engines": {
     "node": ">=18.0.0"
   },
-  "packageManager": "pnpm@10.15.0",
+  "packageManager": "pnpm@10.26.2",
   "bin": {
     "pake": "./dist/cli.js"
   },
@@ -49,41 +49,46 @@
   "exports": "./dist/cli.js",
   "license": "MIT",
   "dependencies": {
-    "@tauri-apps/api": "^2.9.0",
-    "@tauri-apps/cli": "^2.9.0",
+    "@tauri-apps/api": "^2.9.1",
+    "@tauri-apps/cli": "^2.9.6",
     "chalk": "^5.6.2",
-    "commander": "^12.1.0",
-    "execa": "^9.6.0",
-    "file-type": "^18.7.0",
-    "fs-extra": "^11.3.2",
+    "commander": "^14.0.2",
+    "execa": "^9.6.1",
+    "file-type": "^21.1.1",
+    "fs-extra": "^11.3.3",
     "icon-gen": "^5.0.0",
     "loglevel": "^1.9.2",
-    "ora": "^8.2.0",
+    "ora": "^9.0.0",
     "prompts": "^2.4.2",
     "psl": "^1.15.0",
-    "sharp": "^0.33.5",
+    "sharp": "^0.34.5",
     "tmp-promise": "^3.0.3",
     "update-notifier": "^7.3.1"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "^5.1.1",
-    "@rollup/plugin-commonjs": "^28.0.8",
+    "@rollup/plugin-alias": "^6.0.0",
+    "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-replace": "^6.0.2",
+    "@rollup/plugin-replace": "^6.0.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.19.23",
+    "@types/node": "^25.0.3",
     "@types/page-icon": "^0.3.6",
     "@types/prompts": "^2.4.9",
     "@types/tmp": "^0.2.6",
     "@types/update-notifier": "^6.0.8",
     "app-root-path": "^3.1.0",
-    "cross-env": "^7.0.3",
-    "prettier": "^3.6.2",
-    "rollup": "^4.52.5",
+    "cross-env": "^10.1.0",
+    "prettier": "^3.7.4",
+    "rollup": "^4.54.0",
     "rollup-plugin-typescript2": "^0.36.0",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.15"
+    "vitest": "^4.0.16"
+  },
+  "pnpm": {
+    "overrides": {
+      "sharp": "^0.34.5"
+    }
   }
 }