pake-cli 3.3.0 → 3.3.1

package/README.md

@@ -306,6 +306,15 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>GoodbyeNJN</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/eltociear">
+                    <img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="90;" alt="eltociear"/>
+                    <br />
+                    <sub><b>Ikko Eltociear Ashimine</b></sub>
+                </a>
+            </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/kittizz">
                     <img src="https://avatars.githubusercontent.com/u/62899732?v=4" width="90;" alt="kittizz"/>
@@ -313,8 +322,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Kittizz</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/mattbajorek">
                     <img src="https://avatars.githubusercontent.com/u/17235301?v=4" width="90;" alt="mattbajorek"/>
@@ -357,6 +364,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Yue Yang</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/lkieryan">
                     <img src="https://avatars.githubusercontent.com/u/187804088?v=4" width="90;" alt="lkieryan"/>
@@ -364,8 +373,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Kieran</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/exposir">
                     <img src="https://avatars.githubusercontent.com/u/33340988?v=4" width="90;" alt="exposir"/>
@@ -408,6 +415,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Ayaka Neko</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/turkyden">
                     <img src="https://avatars.githubusercontent.com/u/24560160?v=4" width="90;" alt="turkyden"/>
@@ -415,8 +424,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Dengju Deng</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/fvn-elmy">
                     <img src="https://avatars.githubusercontent.com/u/71275745?v=4" width="90;" alt="fvn-elmy"/>
@@ -459,6 +466,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Milo</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/princemaple">
                     <img src="https://avatars.githubusercontent.com/u/1329716?v=4" width="90;" alt="princemaple"/>
@@ -466,8 +475,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Po Chen</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/beautifulrem">
                     <img src="https://avatars.githubusercontent.com/u/98527099?v=4" width="90;" alt="beautifulrem"/>
@@ -510,6 +517,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Liudonghua</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/liusishan">
                     <img src="https://avatars.githubusercontent.com/u/33129823?v=4" width="90;" alt="liusishan"/>
@@ -517,8 +526,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Liusishan</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/piaoyidage">
                     <img src="https://avatars.githubusercontent.com/u/5135405?v=4" width="90;" alt="piaoyidage"/>

package/dist/cli.js

@@ -22,7 +22,7 @@ import sharp from 'sharp';
 import * as psl from 'psl';
 
 var name = "pake-cli";
-var version = "3.3.0";
+var version = "3.3.1";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -85,7 +85,7 @@ var dependencies = {
 	ora: "^8.2.0",
 	prompts: "^2.4.2",
 	psl: "^1.15.0",
-	sharp: "^0.34.3",
+	sharp: "^0.33.4",
 	"tmp-promise": "^3.0.3",
 	"update-notifier": "^7.3.1"
 };
@@ -1154,7 +1154,7 @@ async function checkUpdateTips() {
 const ICON_CONFIG = {
     minFileSize: 100,
     downloadTimeout: 10000,
-    supportedFormats: ['png', 'ico', 'jpeg', 'jpg', 'webp'],
+    supportedFormats: ['png', 'ico', 'jpeg', 'jpg', 'webp', 'icns'],
     whiteBackground: { r: 255, g: 255, b: 255 },
 };
 // API Configuration
@@ -1235,6 +1235,14 @@ async function handleIcon(options, url) {
         if (options.icon.startsWith('http')) {
             const downloadedPath = await downloadIcon(options.icon);
             if (downloadedPath && options.name) {
+                // Check if the downloaded file is already in the correct format for the platform
+                const downloadedExt = path.extname(downloadedPath).toLowerCase();
+                const isCorrectFormat = (IS_WIN && downloadedExt === '.ico') ||
+                    (IS_LINUX && downloadedExt === '.png') ||
+                    (!IS_WIN && !IS_LINUX && downloadedExt === '.icns'); // macOS
+                if (isCorrectFormat) {
+                    return downloadedPath;
+                }
                 // Convert downloaded icon to platform-specific format
                 const convertedPath = await convertIconFormat(downloadedPath, options.name);
                 if (convertedPath) {
@@ -1546,7 +1554,7 @@ program
     .option('--fullscreen', 'Start in full screen', DEFAULT_PAKE_OPTIONS.fullscreen)
     .option('--hide-title-bar', 'For Mac, hide title bar', DEFAULT_PAKE_OPTIONS.hideTitleBar)
     .option('--multi-arch', 'For Mac, both Intel and M1', DEFAULT_PAKE_OPTIONS.multiArch)
-    .option('--inject <./style.css,./script.js,...>', 'Injection of .js or .css files', (val, previous) => {
+    .option('--inject <files>', 'Inject local CSS/JS files into the page', (val, previous) => {
     if (!val)
         return DEFAULT_PAKE_OPTIONS.inject;
     // Split by comma and trim whitespace, filter out empty strings
@@ -1564,7 +1572,7 @@ program
     .addOption(new Option('--user-agent <string>', 'Custom user agent')
     .default(DEFAULT_PAKE_OPTIONS.userAgent)
     .hideHelp())
-    .addOption(new Option('--targets <string>', 'Build target: Linux: "deb", "rpm", "appimage", "deb-arm64", "rpm-arm64", "appimage-arm64"; Windows: "x64", "arm64"; macOS: "intel", "apple", "universal"').default(DEFAULT_PAKE_OPTIONS.targets))
+    .addOption(new Option('--targets <string>', 'Build target format for your system').default(DEFAULT_PAKE_OPTIONS.targets))
     .addOption(new Option('--app-version <string>', 'App version, the same as package.json version')
     .default(DEFAULT_PAKE_OPTIONS.appVersion)
     .hideHelp())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。",
   "engines": {
     "node": ">=18.0.0"
@@ -63,7 +63,7 @@
     "ora": "^8.2.0",
     "prompts": "^2.4.2",
     "psl": "^1.15.0",
-    "sharp": "^0.34.3",
+    "sharp": "^0.33.4",
     "tmp-promise": "^3.0.3",
     "update-notifier": "^7.3.1"
   },

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

@@ -1,7 +1,7 @@
 {
     "windows": [
         {
-            "url": "https://web-serial-example.netlify.app/",
+            "url": "https://weekly.tw93.fun",
             "url_type": "web",
             "hide_title_bar": false,
             "fullscreen": false,
@@ -16,7 +16,6 @@
             "incognito": false,
             "enable_wasm": false,
             "enable_drag_drop": false,
-            "enable_serial": true,
             "title": null
         }
     ],

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

@@ -1,6 +1,6 @@
 {
-    "productName": "SerialTerminal",
-    "identifier": "com.pake.76e98c",
+    "productName": "WeeklyIconFixed",
+    "identifier": "com.pake.33f03a",
     "version": "1.0.0",
     "app": {
         "withGlobalTauri": true,
@@ -13,14 +13,14 @@
     },
     "bundle": {
         "icon": [
-            "icons/serialterminal.icns"
+            "icons/weeklyiconfixed.icns"
         ],
         "active": true,
         "targets": [
-            "dmg"
+            "app"
         ],
         "resources": [
-            "icons/serialterminal.icns"
+            "icons/weeklyiconfixed.icns"
         ]
     }
 }

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

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