pake-cli 3.6.3 → 3.6.4

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.6.3";
+var version = "3.6.4";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -504,9 +504,9 @@ 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 +551,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 +563,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 +577,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 +624,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.',
         },
@@ -1083,12 +1092,9 @@ 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

package/package.json

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

package/src-tauri/.pake/pake.json

@@ -1,7 +1,7 @@
 {
     "windows": [
         {
-            "url": "https://twitter.com/",
+            "url": "https://example.com",
             "url_type": "web",
             "hide_title_bar": false,
             "fullscreen": false,

package/src-tauri/.pake/tauri.conf.json

@@ -1,6 +1,6 @@
 {
-    "productName": "twitter",
-    "identifier": "com.pake.4fd9c9",
+    "productName": "Final App",
+    "identifier": "com.pake.c984d0",
     "version": "1.0.0",
     "app": {
         "withGlobalTauri": true,
@@ -14,11 +14,15 @@
     },
     "bundle": {
         "icon": [
-            "icons/icon.icns"
+            "icons/final_app.icns"
         ],
         "active": true,
         "targets": [
-            "app"
+            "dmg"
+        ],
+        "resources": [
+            "icons/final_app.icns"
         ]
-    }
+    },
+    "mainBinaryName": "pake-finalapp"
 }

package/src-tauri/.pake/tauri.linux.conf.json

@@ -1,5 +1,4 @@
 {
-  "productName": "weekly",
   "bundle": {
     "icon": ["png/weekly_512.png"],
     "active": true,

package/src-tauri/.pake/tauri.macos.conf.json

@@ -1,11 +1,14 @@
 {
     "bundle": {
         "icon": [
-            "icons/icon.icns"
+            "icons/final_app.icns"
         ],
         "active": true,
         "targets": [
-            "app"
+            "dmg"
+        ],
+        "resources": [
+            "icons/final_app.icns"
         ]
     }
 }

package/src-tauri/Cargo.lock

@@ -2588,7 +2588,7 @@ dependencies = [
 
 [[package]]
 name = "pake"
-version = "3.6.3"
+version = "3.6.4"
 dependencies = [
  "serde",
  "serde_json",

package/src-tauri/Cargo.toml

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

package/src-tauri/tauri.linux.conf.json

@@ -1,5 +1,4 @@
 {
-  "productName": "weekly",
   "bundle": {
     "icon": ["png/weekly_512.png"],
     "active": true,