pake-cli 1.0.0-beta.1 → 1.0.1

package/dist/cli.js

@@ -6,11 +6,11 @@ import isurl from 'is-url';
 import prompts from 'prompts';
 import path from 'path';
 import fs from 'fs/promises';
+import chalk from 'chalk';
 import crypto from 'crypto';
 import axios from 'axios';
 import { fileTypeFromBuffer } from 'file-type';
 import { dir } from 'tmp-promise';
-import chalk from 'chalk';
 import ora from 'ora';
 import shelljs from 'shelljs';
 import updateNotifier from 'update-notifier';
@@ -42,8 +42,8 @@ function __awaiter(thisArg, _arguments, P, generator) {
 
 const DEFAULT_PAKE_OPTIONS = {
     icon: '',
-    height: 800,
-    width: 1280,
+    height: 780,
+    width: 1200,
     fullscreen: false,
     resizable: true,
     transparent: false,
@@ -1593,6 +1593,24 @@ function validateUrlInput(url) {
 
 const npmDirectory = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
 
+const logger = {
+    info(...msg) {
+        log.info(...msg.map((m) => chalk.blue.bold(m)));
+    },
+    debug(...msg) {
+        log.debug(...msg);
+    },
+    error(...msg) {
+        log.error(...msg.map((m) => chalk.red.bold(m)));
+    },
+    warn(...msg) {
+        log.info(...msg.map((m) => chalk.yellow.bold(m)));
+    },
+    success(...msg) {
+        log.info(...msg.map((m) => chalk.green.bold(m)));
+    }
+};
+
 function promptText(message, initial) {
     return __awaiter(this, void 0, void 0, function* () {
         const response = yield prompts({
@@ -1617,18 +1635,43 @@ function mergeTauriConfig(url, options, tauriConf) {
         Object.assign(tauriConf.tauri.windows[0], Object.assign({ url }, tauriConfWindowOptions));
         tauriConf.package.productName = name;
         tauriConf.tauri.bundle.identifier = identifier;
-        tauriConf.tauri.bundle.icon = [options.icon];
-        if (process.platform === "win32") {
-            const ico_path = path.join(npmDirectory, 'src-tauri/png/weread_32.ico');
-            yield fs.copyFile(options.icon, ico_path);
+        const exists = yield fs.stat(options.icon)
+            .then(() => true)
+            .catch(() => false);
+        if (exists) {
+            let updateIconPath = true;
+            let customIconExt = path.extname(options.icon).toLowerCase();
+            if (process.platform === "win32") {
+                if (customIconExt === ".ico") {
+                    const ico_path = path.join(npmDirectory, `src-tauri/png/${name.toLowerCase()}_32.ico`);
+                    tauriConf.tauri.bundle.resources = [`png/${name.toLowerCase()}_32.ico`];
+                    yield fs.copyFile(options.icon, ico_path);
+                }
+                else {
+                    updateIconPath = false;
+                    logger.warn(`icon file in Windows must be 256 * 256 pix with .ico type, but you give ${customIconExt}`);
+                }
+            }
+            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 (process.platform === "darwin" && customIconExt !== ".icns") {
+                updateIconPath = false;
+                logger.warn(`icon file in MacOS must be .icns type, but you give ${customIconExt}`);
+            }
+            if (updateIconPath) {
+                tauriConf.tauri.bundle.icon = [options.icon];
+            }
+            else {
+                logger.warn(`icon file will not change with default.`);
+            }
         }
-        if (process.platform === "linux") {
-            const installSrc = `/usr/share/applications/${name}.desktop`;
-            const assertSrc = `src-tauri/assets/${name}.desktop`;
-            const assertPath = path.join(npmDirectory, assertSrc);
-            tauriConf.tauri.bundle.deb.files = {
-                [installSrc]: assertPath
-            };
+        else {
+            logger.warn("the custom icon path may not exists. we will use default icon to replace it");
         }
         let configPath = "";
         switch (process.platform) {
@@ -1659,23 +1702,9 @@ function getIdentifier(name, url) {
     return `pake-${postFixHash}`;
 }
 
-const logger = {
-    info(...msg) {
-        log.info(...msg.map((m) => chalk.blue.bold(m)));
-    },
-    debug(...msg) {
-        log.debug(...msg);
-    },
-    error(...msg) {
-        log.error(...msg.map((m) => chalk.red.bold(m)));
-    },
-    warn(...msg) {
-        log.info(...msg.map((m) => chalk.yellow.bold(m)));
-    },
-    success(...msg) {
-        log.info(...msg.map((m) => chalk.green.bold(m)));
-    }
-};
+const IS_MAC = process.platform === 'darwin';
+const IS_WIN = process.platform === 'win32';
+const IS_LINUX = process.platform === 'linux';
 
 function handleIcon(options, url) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -1688,15 +1717,21 @@ function handleIcon(options, url) {
             }
         }
         if (!options.icon) {
-            return inferIcon(options.name);
+            return getDefaultIcon();
         }
     });
 }
-function inferIcon(name, url) {
+function getDefaultIcon() {
     return __awaiter(this, void 0, void 0, function* () {
         logger.info('You have not provided an app icon, use the default icon.(use --icon option to assign an icon)');
-        const npmDirectory = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
-        return path.join(npmDirectory, 'pake-default.icns');
+        let iconPath = 'src-tauri/icons/icon.icns';
+        if (IS_WIN) {
+            iconPath = 'src-tauri/png/icon_256.ico';
+        }
+        else if (IS_LINUX) {
+            iconPath = 'src-tauri/png/icon_512.png';
+        }
+        return path.join(npmDirectory, iconPath);
     });
 }
 // export async function getIconFromPageUrl(url: string) {
@@ -1772,10 +1807,6 @@ function handleOptions(options, url) {
     });
 }
 
-const IS_MAC = process.platform === 'darwin';
-const IS_WIN = process.platform === 'win32';
-const IS_LINUX = process.platform === 'linux';
-
 function shellExec(command) {
     return new Promise((resolve, reject) => {
         shelljs.exec(command, { async: true, silent: false }, (code) => {
@@ -1816,7 +1847,7 @@ var tauri$3 = {
 			transparent: true,
 			fullscreen: false,
 			width: 1200,
-			height: 728,
+			height: 780,
 			resizable: true
 		}
 	],
@@ -1869,7 +1900,8 @@ var tauri$2 = {
 			wix: {
 				language: [
 					"en-US"
-				]
+				],
+				template: "assets/main.wxs"
 			}
 		}
 	}
@@ -1929,7 +1961,9 @@ var tauri = {
 				"libssl-dev",
 				"libgtk-3-dev",
 				"libayatana-appindicator3-dev",
-				"librsvg2-dev"
+				"librsvg2-dev",
+				"gnome-video-effects",
+				"gnome-video-effects-extra"
 			],
 			files: {
 				"/usr/share/applications/com-tw93-weread.desktop": "assets/com-tw93-weread.desktop"
@@ -1942,7 +1976,8 @@ var tauri = {
 		],
 		shortDescription: "",
 		targets: [
-			"deb"
+			"deb",
+			"appimage"
 		]
 	}
 };
@@ -1995,7 +2030,7 @@ class MacBuilder {
             log.debug('PakeAppOptions', options);
             const { name } = options;
             yield mergeTauriConfig(url, options, tauriConf);
-            yield shellExec(`cd ${npmDirectory} && npm install && npm run build:release`);
+            yield shellExec(`cd ${npmDirectory} && npm install && npm run build`);
             let arch = "x64";
             if (process.arch === "arm64") {
                 arch = "aarch64";
@@ -2045,7 +2080,7 @@ class WinBuilder {
             logger.debug('PakeAppOptions', options);
             const { name } = options;
             yield mergeTauriConfig(url, options, tauriConf);
-            yield shellExec(`cd ${npmDirectory} && npm install && npm run build:release`);
+            yield shellExec(`cd ${npmDirectory} && npm install && 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`;
@@ -2090,22 +2125,7 @@ class LinuxBuilder {
             logger.debug('PakeAppOptions', options);
             const { name } = options;
             yield mergeTauriConfig(url, options, tauriConf);
-            // write desktop
-            const assertSrc = `src-tauri/assets/${name}.desktop`;
-            const assertPath = path.join(npmDirectory, assertSrc);
-            const desktopStr = `
-[Desktop Entry]
-Encoding=UTF-8
-Categories=Office
-Exec=${name}
-Icon=${name}
-Name=${name}
-StartupNotify=true
-Terminal=false
-Type=Application
-    `;
-            yield fs.writeFile(assertPath, desktopStr);
-            yield shellExec(`cd ${npmDirectory} && npm install && npm run build:release`);
+            yield shellExec(`cd ${npmDirectory} && npm install && npm run build`);
             let arch = "";
             if (process.arch === "x64") {
                 arch = "amd64";
@@ -2114,22 +2134,27 @@ Type=Application
                 arch = process.arch;
             }
             const debName = `${name}_${tauriConf.package.version}_${arch}.deb`;
-            const appPath = this.getBuildedAppPath(npmDirectory, debName);
+            const appPath = this.getBuildedAppPath(npmDirectory, "deb", debName);
             const distPath = path.resolve(`${name}.deb`);
             yield fs.copyFile(appPath, distPath);
             yield fs.unlink(appPath);
+            const appImageName = `${name}_${tauriConf.package.version}_${arch}.AppImage`;
+            const appImagePath = this.getBuildedAppPath(npmDirectory, "appimage", appImageName);
+            const distAppPath = path.resolve(`${name}.AppImage`);
+            yield fs.copyFile(appImagePath, distAppPath);
+            yield fs.unlink(appImagePath);
             logger.success('Build success!');
-            logger.success('You can find the app installer in', distPath);
+            logger.success('You can find the deb app installer in', distPath);
+            logger.success('You can find the Appimage app installer in', distAppPath);
         });
     }
-    getBuildedAppPath(npmDirectory, dmgName) {
-        return path.join(npmDirectory, 'src-tauri/target/release/bundle/deb', dmgName);
+    getBuildedAppPath(npmDirectory, packageType, packageName) {
+        return path.join(npmDirectory, 'src-tauri/target/release/bundle/', packageType, packageName);
     }
 }
 
 class BuilderFactory {
     static create() {
-        console.log("now platform is ", process.platform);
         if (IS_MAC) {
             return new MacBuilder();
         }
@@ -2144,8 +2169,11 @@ class BuilderFactory {
 }
 
 var name = "pake-cli";
-var version = "1.0.0-beta.1";
+var version = "1.0.1";
 var description = "🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App 🤱🏻 A simple way to make any web page a desktop application using Rust.";
+var engines = {
+	node: "^14.13 || >=16.0.0"
+};
 var bin = {
 	pake: "./cli.js"
 };
@@ -2157,17 +2185,25 @@ var author = {
 	name: "Tw93",
 	email: "tw93@qq.com"
 };
+var keywords = [
+	"pake",
+	"pake-cli",
+	"rust",
+	"tauri",
+	"no-electron",
+	"productivity"
+];
 var files = [
 	"dist",
 	"src-tauri",
-	"cli.js",
-	"pake-default.icns"
+	"cli.js"
 ];
 var scripts = {
 	start: "npm run dev",
 	dev: "npm run tauri dev",
 	"dev:debug": "npm run tauri dev -- --features devtools",
-	"build:release": "npm run tauri build --release",
+	build: "npm run tauri build --release",
+	"build:mac": "npm run tauri build -- --target universal-apple-darwin",
 	"build:all-unix": "chmod +x ./script/build.sh && ./script/build.sh",
 	"build:all-windows": ".\\script\\build.bat",
 	tauri: "tauri",
@@ -2180,7 +2216,7 @@ var exports = "./dist/pake.js";
 var license = "MIT";
 var dependencies = {
 	"@tauri-apps/api": "^1.2.0",
-	"@tauri-apps/cli": "^1.2.1",
+	"@tauri-apps/cli": "^1.2.2",
 	axios: "^1.1.3",
 	chalk: "^5.1.2",
 	commander: "^9.4.1",
@@ -2216,9 +2252,11 @@ var packageJson = {
 	name: name,
 	version: version,
 	description: description,
+	engines: engines,
 	bin: bin,
 	repository: repository,
 	author: author,
+	keywords: keywords,
 	files: files,
 	scripts: scripts,
 	type: type,

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "pake-cli",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.1",
   "description": "🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App 🤱🏻 A simple way to make any web page a desktop application using Rust.",
+  "engines": {
+    "node": "^14.13 || >=16.0.0"
+  },
   "bin": {
     "pake": "./cli.js"
   },
@@ -13,17 +16,25 @@
     "name": "Tw93",
     "email": "tw93@qq.com"
   },
+  "keywords": [
+    "pake",
+    "pake-cli",
+    "rust",
+    "tauri",
+    "no-electron",
+    "productivity"
+  ],
   "files": [
     "dist",
     "src-tauri",
-    "cli.js",
-    "pake-default.icns"
+    "cli.js"
   ],
   "scripts": {
     "start": "npm run dev",
     "dev": "npm run tauri dev",
     "dev:debug": "npm run tauri dev -- --features devtools",
-    "build:release": "npm run tauri build --release",
+    "build": "npm run tauri build --release",
+    "build:mac": "npm run tauri build -- --target universal-apple-darwin",
     "build:all-unix": "chmod +x ./script/build.sh && ./script/build.sh",
     "build:all-windows": ".\\script\\build.bat",
     "tauri": "tauri",
@@ -36,7 +47,7 @@
   "license": "MIT",
   "dependencies": {
     "@tauri-apps/api": "^1.2.0",
-    "@tauri-apps/cli": "^1.2.1",
+    "@tauri-apps/cli": "^1.2.2",
     "axios": "^1.1.3",
     "chalk": "^5.1.2",
     "commander": "^9.4.1",