pake-cli 3.0.0-beta → 3.0.2

package/README.md

@@ -1,4 +1,4 @@
-<h4 align="right"><strong>English</strong> | <a href="https://github.com/tw93/Pake/blob/master/README_CN.md">简体中文</a> | <a href="https://github.com/tw93/Pake/blob/master/README_JP.md">日本語</a></h4>
+<h4 align="right"><strong>English</strong> | <a href="https://github.com/tw93/Pake/blob/main/README_CN.md">简体中文</a> | <a href="https://github.com/tw93/Pake/blob/main/README_JP.md">日本語</a></h4>
 <p align="center">
     <img src=https://gw.alipayobjects.com/zos/k/fa/logo-modified.png width=138/>
 </p>
@@ -220,6 +220,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <sub><b>Pan93412</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/stone-w4tch3r">
+            <img src="https://avatars.githubusercontent.com/u/100294019?v=4" width="90;" alt="stone-w4tch3r"/>
+            <br />
+            <sub><b>Данил Бизимов</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/wanghanzhen">
             <img src="https://avatars.githubusercontent.com/u/25301012?v=4" width="90;" alt="wanghanzhen"/>
@@ -233,15 +240,15 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Bryan Lee</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/essesoul">
             <img src="https://avatars.githubusercontent.com/u/58624474?v=4" width="90;" alt="essesoul"/>
             <br />
             <sub><b>Essesoul</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/YangguangZhou">
             <img src="https://avatars.githubusercontent.com/u/61733195?v=4" width="90;" alt="YangguangZhou"/>
@@ -277,6 +284,14 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <sub><b>Ikko Eltociear Ashimine</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/mattbajorek">
+            <img src="https://avatars.githubusercontent.com/u/17235301?v=4" width="90;" alt="mattbajorek"/>
+            <br />
+            <sub><b>Matt Bajorek</b></sub>
+        </a>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/QingZ11">
             <img src="https://avatars.githubusercontent.com/u/38887077?v=4" width="90;" alt="QingZ11"/>
@@ -284,14 +299,27 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <sub><b>Steam</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/Tianj0o">
+            <img src="https://avatars.githubusercontent.com/u/68584284?v=4" width="90;" alt="Tianj0o"/>
+            <br />
+            <sub><b>Qitianjia</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/xinyii">
+            <img src="https://avatars.githubusercontent.com/u/17895104?v=4" width="90;" alt="xinyii"/>
+            <br />
+            <sub><b>Yi Xin</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/exposir">
             <img src="https://avatars.githubusercontent.com/u/33340988?v=4" width="90;" alt="exposir"/>
             <br />
             <sub><b>孟世博</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/2nthony">
             <img src="https://avatars.githubusercontent.com/u/19513289?v=4" width="90;" alt="2nthony"/>
@@ -312,7 +340,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Abu Taher Siddik</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/kidylee">
             <img src="https://avatars.githubusercontent.com/u/841310?v=4" width="90;" alt="kidylee"/>
@@ -340,8 +369,7 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Fechin</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/ImgBotApp">
             <img src="https://avatars.githubusercontent.com/u/31427850?v=4" width="90;" alt="ImgBotApp"/>
@@ -356,20 +384,14 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <sub><b>Jiaqi Gu</b></sub>
         </a>
     </td>
-    <td align="center">
-        <a href="https://github.com/mattbajorek">
-            <img src="https://avatars.githubusercontent.com/u/17235301?v=4" width="90;" alt="mattbajorek"/>
-            <br />
-            <sub><b>Matt Bajorek</b></sub>
-        </a>
-    </td>
     <td align="center">
         <a href="https://github.com/Milo123459">
             <img src="https://avatars.githubusercontent.com/u/50248166?v=4" width="90;" alt="Milo123459"/>
             <br />
             <sub><b>Milo</b></sub>
         </a>
-    </td>
+    </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"/>
@@ -377,21 +399,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <sub><b>Po Chen</b></sub>
         </a>
     </td>
-    <td align="center">
-        <a href="https://github.com/Tianj0o">
-            <img src="https://avatars.githubusercontent.com/u/68584284?v=4" width="90;" alt="Tianj0o"/>
-            <br />
-            <sub><b>Qitianjia</b></sub>
-        </a>
-    </td>
     <td align="center">
         <a href="https://github.com/geekvest">
             <img src="https://avatars.githubusercontent.com/u/126322776?v=4" width="90;" alt="geekvest"/>
             <br />
             <sub><b>Null</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/houhoz">
             <img src="https://avatars.githubusercontent.com/u/19684376?v=4" width="90;" alt="houhoz"/>
@@ -426,7 +440,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Ranger</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/hetz">
             <img src="https://avatars.githubusercontent.com/u/820141?v=4" width="90;" alt="hetz"/>

package/dist/cli.js

@@ -20,7 +20,7 @@ import * as psl from 'psl';
 import isUrl from 'is-url';
 
 var name = "pake-cli";
-var version$1 = "3.0.0-beta";
+var version$1 = "3.0.2";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
 var engines = {
 	node: ">=16.0.0"
@@ -69,8 +69,8 @@ var license = "MIT";
 var dependencies = {
 	"@tauri-apps/api": "^1.6.0",
 	"@tauri-apps/cli": "^2.1.0",
-	axios: "^1.7.8",
-	chalk: "^5.3.0",
+	axios: "^1.7.9",
+	chalk: "^5.4.0",
 	commander: "^11.1.0",
 	"file-type": "^18.7.0",
 	"fs-extra": "^11.2.0",
@@ -91,7 +91,7 @@ var devDependencies = {
 	"@rollup/plugin-terser": "^0.4.4",
 	"@types/fs-extra": "^11.0.4",
 	"@types/is-url": "^1.2.32",
-	"@types/node": "^20.17.9",
+	"@types/node": "^20.17.10",
 	"@types/page-icon": "^0.3.6",
 	"@types/prompts": "^2.4.9",
 	"@types/psl": "^1.1.3",
@@ -100,7 +100,7 @@ var devDependencies = {
 	"@types/update-notifier": "^6.0.8",
 	"app-root-path": "^3.1.0",
 	"cross-env": "^7.0.3",
-	rollup: "^4.28.0",
+	rollup: "^4.29.1",
 	"rollup-plugin-typescript2": "^0.36.0",
 	tslib: "^2.8.1",
 	typescript: "^5.7.2"
@@ -163,30 +163,22 @@ var pakeConf = {
 
 var productName$1 = "WeRead";
 var identifier = "com.pake.weread";
-var version = "2.0.0";
-var plugins = {
-};
+var version = "1.0.0";
 var app = {
-	security: {
-		csp: null
-	},
+	withGlobalTauri: true,
 	trayIcon: {
 		iconPath: "png/weread_512.png",
 		iconAsTemplate: false,
 		id: "pake-tray"
-	},
-	withGlobalTauri: true
+	}
 };
 var build = {
-	beforeBuildCommand: "",
-	frontendDist: "../dist",
-	beforeDevCommand: ""
+	frontendDist: "../dist"
 };
 var CommonConf = {
 	productName: productName$1,
 	identifier: identifier,
 	version: version,
-	plugins: plugins,
 	app: app,
 	build: build
 };
@@ -197,22 +189,14 @@ var bundle$2 = {
 		"png/weread_32.ico"
 	],
 	active: true,
-	category: "DeveloperTool",
-	copyright: "",
-	externalBin: [
-	],
-	longDescription: "",
 	resources: [
 		"png/weread_32.ico"
 	],
-	shortDescription: "",
 	targets: [
 		"msi"
 	],
 	windows: {
-		certificateThumbprint: null,
 		digestAlgorithm: "sha256",
-		timestampUrl: "",
 		wix: {
 			language: [
 				"en-US"
@@ -230,22 +214,8 @@ var bundle$1 = {
 		"icons/weread.icns"
 	],
 	active: true,
-	category: "DeveloperTool",
-	copyright: "",
-	externalBin: [
-	],
-	longDescription: "",
 	macOS: {
-		entitlements: null,
-		exceptionDomain: null,
-		frameworks: [
-		],
-		providerShortName: null,
-		signingIdentity: null
 	},
-	resources: [
-	],
-	shortDescription: "",
 	targets: [
 		"dmg"
 	]
@@ -254,14 +224,12 @@ var MacConf = {
 	bundle: bundle$1
 };
 
-var productName = "weread";
+var productName = "we-read";
 var bundle = {
 	icon: [
 		"png/weread_512.png"
 	],
 	active: true,
-	category: "DeveloperTool",
-	copyright: "",
 	linux: {
 		deb: {
 			depends: [
@@ -273,12 +241,6 @@ var bundle = {
 			}
 		}
 	},
-	externalBin: [
-	],
-	longDescription: "",
-	resources: [
-	],
-	shortDescription: "",
 	targets: [
 		"deb",
 		"appimage"
@@ -419,7 +381,7 @@ async function isChinaIP(ip, domain) {
     try {
         const delay = await ping(ip);
         logger.debug(`${domain} latency is ${delay} ms`);
-        return delay > 500;
+        return delay > 1000;
     }
     catch (error) {
         logger.debug(`ping ${domain} failed!`);
@@ -481,7 +443,7 @@ async function mergeConfig(url, options, tauriConf) {
     Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
     tauriConf.productName = name;
     tauriConf.identifier = identifier;
-    if (platform == "win32") {
+    if (platform == 'win32') {
         tauriConf.bundle.windows.wix.language[0] = installerLanguage;
     }
     //Judge the type of URL, whether it is a file or a website.
@@ -619,7 +581,7 @@ async function mergeConfig(url, options, tauriConf) {
         tauriConf.pake.inject = [];
         await fsExtra.writeFile(injectFilePath, '');
     }
-    tauriConf.pake.proxy_url = proxyUrl || "";
+    tauriConf.pake.proxy_url = proxyUrl || '';
     // Save config file.
     const platformConfigPaths = {
         win32: 'tauri.windows.conf.json',
@@ -1006,10 +968,10 @@ program
     .option('--fullscreen', 'Start in full screen', DEFAULT_PAKE_OPTIONS.fullscreen)
     .option('--hide-title-bar', 'Only for Mac, hide title bar', DEFAULT_PAKE_OPTIONS.hideTitleBar)
     .option('--activation-shortcut <string>', 'Shortcut key to active App', DEFAULT_PAKE_OPTIONS.activationShortcut)
-    .option('--multi-arch', 'Only for Mac, supports both Intel and M1', DEFAULT_PAKE_OPTIONS.multiArch)
-    .option('--inject [injects...]', 'Injection of .js or .css Files', DEFAULT_PAKE_OPTIONS.inject)
+    .option('--inject <url>', 'Injection of .js or .css files', DEFAULT_PAKE_OPTIONS.inject)
+    .option('--proxy-url <url>', "Proxy URL for all network requests", DEFAULT_PAKE_OPTIONS.proxyUrl)
     .option('--debug', 'Debug build and more output', DEFAULT_PAKE_OPTIONS.debug)
-    .option('--proxy-url', "Proxy URL", DEFAULT_PAKE_OPTIONS.proxyUrl)
+    .option('--multi-arch', 'Only for Mac, supports both Intel and M1', DEFAULT_PAKE_OPTIONS.multiArch)
     .addOption(new Option('--user-agent <string>', 'Custom user agent').default(DEFAULT_PAKE_OPTIONS.userAgent).hideHelp())
     .addOption(new Option('--targets <string>', 'Only for Linux, option "deb" or "appimage"').default(DEFAULT_PAKE_OPTIONS.targets).hideHelp())
     .addOption(new Option('--always-on-top', 'Always on the top level').default(DEFAULT_PAKE_OPTIONS.alwaysOnTop).hideHelp())

package/dist/dev.js

@@ -263,30 +263,22 @@ var pakeConf = {
 
 var productName$1 = "WeRead";
 var identifier = "com.pake.weread";
-var version = "2.0.0";
-var plugins = {
-};
+var version = "1.0.0";
 var app = {
-	security: {
-		csp: null
-	},
+	withGlobalTauri: true,
 	trayIcon: {
 		iconPath: "png/weread_512.png",
 		iconAsTemplate: false,
 		id: "pake-tray"
-	},
-	withGlobalTauri: true
+	}
 };
 var build = {
-	beforeBuildCommand: "",
-	frontendDist: "../dist",
-	beforeDevCommand: ""
+	frontendDist: "../dist"
 };
 var CommonConf = {
 	productName: productName$1,
 	identifier: identifier,
 	version: version,
-	plugins: plugins,
 	app: app,
 	build: build
 };
@@ -297,22 +289,14 @@ var bundle$2 = {
 		"png/weread_32.ico"
 	],
 	active: true,
-	category: "DeveloperTool",
-	copyright: "",
-	externalBin: [
-	],
-	longDescription: "",
 	resources: [
 		"png/weread_32.ico"
 	],
-	shortDescription: "",
 	targets: [
 		"msi"
 	],
 	windows: {
-		certificateThumbprint: null,
 		digestAlgorithm: "sha256",
-		timestampUrl: "",
 		wix: {
 			language: [
 				"en-US"
@@ -330,22 +314,8 @@ var bundle$1 = {
 		"icons/weread.icns"
 	],
 	active: true,
-	category: "DeveloperTool",
-	copyright: "",
-	externalBin: [
-	],
-	longDescription: "",
 	macOS: {
-		entitlements: null,
-		exceptionDomain: null,
-		frameworks: [
-		],
-		providerShortName: null,
-		signingIdentity: null
 	},
-	resources: [
-	],
-	shortDescription: "",
 	targets: [
 		"dmg"
 	]
@@ -354,14 +324,12 @@ var MacConf = {
 	bundle: bundle$1
 };
 
-var productName = "weread";
+var productName = "we-read";
 var bundle = {
 	icon: [
 		"png/weread_512.png"
 	],
 	active: true,
-	category: "DeveloperTool",
-	copyright: "",
 	linux: {
 		deb: {
 			depends: [
@@ -373,12 +341,6 @@ var bundle = {
 			}
 		}
 	},
-	externalBin: [
-	],
-	longDescription: "",
-	resources: [
-	],
-	shortDescription: "",
 	targets: [
 		"deb",
 		"appimage"
@@ -521,10 +483,10 @@ async function mergeConfig(url, options, tauriConf) {
         disabled_web_shortcuts: disabledWebShortcuts,
     };
     Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
-    tauriConf.package.productName = name;
-    tauriConf.tauri.bundle.identifier = identifier;
-    if (platform == "win32") {
-        tauriConf.tauri.bundle.windows.wix.language[0] = installerLanguage;
+    tauriConf.productName = name;
+    tauriConf.identifier = identifier;
+    if (platform == 'win32') {
+        tauriConf.bundle.windows.wix.language[0] = installerLanguage;
     }
     //Judge the type of URL, whether it is a file or a website.
     const pathExists = await fsExtra.pathExists(url);
@@ -661,7 +623,7 @@ async function mergeConfig(url, options, tauriConf) {
         tauriConf.pake.inject = [];
         await fsExtra.writeFile(injectFilePath, '');
     }
-    tauriConf.pake.proxy_url = proxyUrl || "";
+    tauriConf.pake.proxy_url = proxyUrl || '';
     // Save config file.
     const platformConfigPaths = {
         win32: 'tauri.windows.conf.json',