pake-cli 1.2.8 → 1.3.0

package/dist/cli.js

@@ -1658,6 +1658,15 @@ function mergeTauriConfig(url, options, tauriConf) {
         const exists = yield fs.stat(options.icon)
             .then(() => true)
             .catch(() => false);
+        if (process.platform === "linux") {
+            delete tauriConf.tauri.bundle.deb.files;
+            if (["all", "deb", "appimage"].includes(options.targets)) {
+                tauriConf.tauri.bundle.targets = [options.targets];
+            }
+            else {
+                logger.warn("targets must be 'all', 'deb', 'appimage', we will use default 'all'");
+            }
+        }
         if (exists) {
             let updateIconPath = true;
             let customIconExt = path.extname(options.icon).toLowerCase();
@@ -1673,17 +1682,10 @@ function mergeTauriConfig(url, options, tauriConf) {
                 }
             }
             if (process.platform === "linux") {
-                delete tauriConf.tauri.bundle.deb.files;
                 if (customIconExt != ".png") {
                     updateIconPath = false;
                     logger.warn(`icon file in Linux must be 512 * 512 pix with .png type, but you give ${customIconExt}`);
                 }
-                if (["all", "deb", "appimage"].includes(options.targets)) {
-                    tauriConf.tauri.bundle.targets = [options.targets];
-                }
-                else {
-                    logger.warn("targets must be 'all', 'deb', 'appimage', we will use default 'all'");
-                }
             }
             if (process.platform === "darwin" && customIconExt !== ".icns") {
                 updateIconPath = false;
@@ -1698,6 +1700,21 @@ function mergeTauriConfig(url, options, tauriConf) {
         }
         else {
             logger.warn("the custom icon path may not exists. we will use default icon to replace it");
+            switch (process.platform) {
+                case "win32": {
+                    tauriConf.tauri.bundle.resources = ['png/icon_32.ico'];
+                    tauriConf.tauri.bundle.icon = ['png/icon_32.ico', 'png/icon_256.ico'];
+                    break;
+                }
+                case "darwin": {
+                    tauriConf.tauri.bundle.icon = ['icons/icon.icns'];
+                    break;
+                }
+                case "linux": {
+                    tauriConf.tauri.bundle.icon = ['png/icon_512.png'];
+                    break;
+                }
+            }
         }
         let configPath = "";
         switch (process.platform) {
@@ -2025,11 +2042,11 @@ class MacBuilder {
             yield mergeTauriConfig(url, options, tauriConf);
             let dmgName;
             if (options.multiArch) {
-                yield shellExec(`cd "${npmDirectory}" && npm install && npm run build:mac`);
+                yield shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build:mac`);
                 dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
             }
             else {
-                yield shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
+                yield shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build`);
                 let arch = "x64";
                 if (process.arch === "arm64") {
                     arch = "aarch64";
@@ -2087,7 +2104,7 @@ class WinBuilder {
             logger.debug('PakeAppOptions', options);
             const { name } = options;
             yield mergeTauriConfig(url, options, tauriConf);
-            yield shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
+            yield shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build`);
             const language = tauriConf.tauri.bundle.windows.wix.language[0];
             const arch = process.arch;
             const msiName = `${name}_${tauriConf.package.version}_${arch}_${language}.msi`;
@@ -2132,7 +2149,7 @@ class LinuxBuilder {
             logger.debug('PakeAppOptions', options);
             const { name } = options;
             yield mergeTauriConfig(url, options, tauriConf);
-            yield shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
+            yield shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build`);
             let arch;
             if (process.arch === "x64") {
                 arch = "amd64";
@@ -2181,7 +2198,7 @@ class BuilderFactory {
 }
 
 var name = "pake-cli";
-var version = "1.2.8";
+var version = "1.3.0";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。";
 var engines = {
 	node: ">=16.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "1.2.8",
+  "version": "1.3.0",
   "description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。",
   "engines": {
     "node": ">=16.0.0"