pake-cli 2.1.7 → 2.1.9

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Tw93
+Copyright (c) 2023 Tw93
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -159,7 +159,7 @@ In addition, double-click the title bar to switch to full-screen mode. For Mac u
 
 ![Pake](https://gw.alipayobjects.com/zos/k/zd/pake.gif)
 
-**Pake provides a command line tool, making the flow of package customization quicker and easier. See [documentation](./bin/README_CN.md) for more information.**
+**Pake provides a command line tool, making the flow of package customization quicker and easier. See [documentation](./bin/README.md) for more information.**
 
 ```bash
 # Install with npm

package/dist/cli.js

@@ -20,7 +20,7 @@ import isUrl from 'is-url';
 import fs from 'fs';
 
 var name = "pake-cli";
-var version = "2.1.7";
+var version = "2.1.9";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。";
 var engines = {
 	node: ">=16.0.0"
@@ -205,7 +205,7 @@ var tauri$2 = {
 			"png/weread_256.ico",
 			"png/weread_32.ico"
 		],
-		identifier: "com.tw93.weread",
+		identifier: "com.pake.weread",
 		active: true,
 		category: "DeveloperTool",
 		copyright: "",
@@ -241,7 +241,7 @@ var tauri$1 = {
 		icon: [
 			"icons/weread.icns"
 		],
-		identifier: "com.tw93.weread",
+		identifier: "com.pake.weread",
 		active: true,
 		category: "DeveloperTool",
 		copyright: "",
@@ -273,7 +273,7 @@ var tauri = {
 		icon: [
 			"png/weread_512.png"
 		],
-		identifier: "com.tw93.weread",
+		identifier: "com.pake.weread",
 		active: true,
 		category: "DeveloperTool",
 		copyright: "",
@@ -283,7 +283,7 @@ var tauri = {
 				"wget"
 			],
 			files: {
-				"/usr/share/applications/com-tw93-weread.desktop": "assets/com-tw93-weread.desktop"
+				"/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop"
 			}
 		},
 		externalBin: [
@@ -323,7 +323,7 @@ let tauriConfig = {
 // Generates an identifier based on the given URL.
 function getIdentifier(url) {
     const postFixHash = crypto.createHash('md5').update(url).digest('hex').substring(0, 6);
-    return `pake-${postFixHash}`;
+    return `com.pake.${postFixHash}`;
 }
 async function promptText(message, initial) {
     const response = await prompts({
@@ -613,9 +613,12 @@ class BaseBuilder {
         this.options = options;
     }
     async prepare() {
-        if (!IS_MAC) {
-            logger.info('✺ The first use requires installing system dependencies.');
-            logger.info('✺ See more in https://tauri.app/v1/guides/getting-started/prerequisites.');
+        const tauriSrcPath = path.join(npmDirectory, 'src-tauri');
+        const tauriTargetPath = path.join(tauriSrcPath, 'target');
+        const tauriTargetPathExists = await fsExtra.pathExists(tauriTargetPath);
+        if (!IS_MAC && !tauriTargetPathExists) {
+            logger.warn('✼ The first use requires installing system dependencies.');
+            logger.warn('✼ See more in https://tauri.app/v1/guides/getting-started/prerequisites.');
         }
         if (!checkRustInstalled()) {
             const res = await prompts({
@@ -633,12 +636,12 @@ class BaseBuilder {
         }
         const isChina = await isChinaDomain('www.npmjs.com');
         const spinner = getSpinner('Installing package...');
+        const rustProjectDir = path.join(tauriSrcPath, '.cargo');
+        const projectConf = path.join(rustProjectDir, 'config');
+        await fsExtra.ensureDir(rustProjectDir);
         if (isChina) {
             logger.info('✺ Located in China, using npm/rsProxy CN mirror.');
-            const rustProjectDir = path.join(npmDirectory, 'src-tauri', '.cargo');
-            await fsExtra.ensureDir(rustProjectDir);
-            const projectCnConf = path.join(npmDirectory, 'src-tauri', 'rust_proxy.toml');
-            const projectConf = path.join(rustProjectDir, 'config');
+            const projectCnConf = path.join(tauriSrcPath, 'rust_proxy.toml');
             await fsExtra.copy(projectCnConf, projectConf);
             await shellExec(`cd "${npmDirectory}" && npm install --registry=https://registry.npmmirror.com`);
         }
@@ -646,6 +649,9 @@ class BaseBuilder {
             await shellExec(`cd "${npmDirectory}" && npm install`);
         }
         spinner.succeed(chalk.green('Package installed!'));
+        if (!tauriTargetPathExists) {
+            logger.warn('✼ The first packaging may be slow, please be patient and wait, it will be faster afterwards.');
+        }
     }
     async build(url) {
         await this.buildAndCopy(url, this.options.targets);
@@ -780,7 +786,7 @@ const DEFAULT_PAKE_OPTIONS = {
 };
 
 async function checkUpdateTips() {
-    updateNotifier({ pkg: packageJson }).notify();
+    updateNotifier({ pkg: packageJson, updateCheckInterval: 1000 * 60 }).notify();
 }
 
 async function handleIcon(options) {

package/package.json

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

package/src-tauri/assets/com-tw93-weread.desktop

@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Categories=Office
-Exec=com-tw93-weread
-Icon=com-tw93-weread
-Name=com-tw93-weread
+Exec=com-pake-weread
+Icon=com-pake-weread
+Name=com-pake-weread
 Name[zh_CN]=微信阅读
 StartupNotify=true
 Terminal=false
-Type=Application
+Type=Application

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

@@ -2,14 +2,14 @@
   "tauri": {
     "bundle": {
       "icon": ["png/weread_512.png"],
-      "identifier": "com.tw93.weread",
+      "identifier": "com.pake.weread",
       "active": true,
       "category": "DeveloperTool",
       "copyright": "",
       "deb": {
         "depends": ["curl", "wget"],
         "files": {
-          "/usr/share/applications/com-tw93-weread.desktop": "assets/com-tw93-weread.desktop"
+          "/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop"
         }
       },
       "externalBin": [],

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

@@ -2,7 +2,7 @@
   "tauri": {
     "bundle": {
       "icon": ["icons/weread.icns"],
-      "identifier": "com.tw93.weread",
+      "identifier": "com.pake.weread",
       "active": true,
       "category": "DeveloperTool",
       "copyright": "",

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

@@ -2,7 +2,7 @@
   "tauri": {
     "bundle": {
       "icon": ["png/weread_256.ico", "png/weread_32.ico"],
-      "identifier": "com.tw93.weread",
+      "identifier": "com.pake.weread",
       "active": true,
       "category": "DeveloperTool",
       "copyright": "",