pake-cli 1.2.7 → 1.2.9

package/README.md

@@ -58,8 +58,8 @@
         </td>
     </tr>
     <tr>
-        <td><img src=https://cdn.fliggy.com/upic/DX3dfG.png width=600/></td>
-        <td><img src=https://cdn.fliggy.com/upic/l5aC7R.png width=600/></td>
+        <td><img src=https://cdn.fliggy.com/upic/nYEKqN.jpg width=600/></td>
+        <td><img src=https://cdn.fliggy.com/upic/LW9BMz.png width=600/></td>
     </tr>
     <tr>
       <td>YouTube
@@ -67,15 +67,31 @@
             <a href="https://github.com/tw93/Pake/releases/latest/download/YouTube_x64.msi">Windows</a>
             <a href="https://github.com/tw93/Pake/releases/latest/download/YouTube_x86_64.deb">Linux</a>
         </td>
-         <td>Reference
-            <a href="https://github.com/tw93/Pake/releases/latest/download/Reference.dmg">Mac</a>
-            <a href="https://github.com/tw93/Pake/releases/latest/download/Reference_x64.msi">Windows</a>
-            <a href="https://github.com/tw93/Pake/releases/latest/download/Reference_x86_64.deb">Linux</a>
+         <td>XiaoHongShu
+            <a href="https://github.com/tw93/Pake/releases/latest/download/XiaoHongShu.dmg">Mac</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/XiaoHongShu_x64.msi">Windows</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/XiaoHongShu_x86_64.deb">Linux</a>
         </td>
     </tr>
     <tr>
-        <td><img src=https://cdn.fliggy.com/upic/Ea5ZRw.png width=600/></td>
-        <td><img src=https://cdn.fliggy.com/upic/KFsZIY.png width=600/></td>
+        <td><img src=https://cdn.fliggy.com/upic/s4ZLNC.jpg width=600/></td>
+        <td><img src=https://cdn.fliggy.com/upic/0CvT6K.png width=600/></td>
+    </tr>
+    <tr>
+        <td>ProgramMusic
+            <a href="https://github.com/tw93/Pake/releases/latest/download/ProgramMusic.dmg">Mac</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/ProgramMusic_x64.msi">Windows</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/ProgramMusic_x86_64.deb">Linux</a>
+        </td>
+        <td>CodeRunner
+            <a href="https://github.com/tw93/Pake/releases/latest/download/CodeRunner.dmg">Mac</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/CodeRunner_x64.msi">Windows</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/CodeRunner_x86_64.deb">Linux</a>
+        </td>
+    </tr>
+    <tr>
+        <td><img src=https://cdn.fliggy.com/upic/8A3FfQ.png width=600/></td>
+        <td><img src=https://cdn.fliggy.com/upic/EB1OYP.jpg width=600/></td>
     </tr>
     <tr>
         <td>Flomo
@@ -96,7 +112,7 @@
 </table>
 
 <details>
-<summary>🏂 You can download more applications (such as YuQue / RunCode) from <a href="https://github.com/tw93/Pake/releases">Releases</a>. <b>Click here to expand the shortcuts reference!</b></summary>
+<summary>🏂 You can download more applications (such as YuQue / Reference) from <a href="https://github.com/tw93/Pake/releases">Releases</a>. <b>Click here to expand the shortcuts reference!</b></summary>
 
 <br/>
 

package/dist/cli.js

@@ -49,6 +49,7 @@ const DEFAULT_PAKE_OPTIONS = {
     transparent: false,
     debug: false,
     multiArch: false,
+    targets: "all",
 };
 
 const tlds = [
@@ -1657,6 +1658,14 @@ function mergeTauriConfig(url, options, tauriConf) {
         const exists = yield fs.stat(options.icon)
             .then(() => true)
             .catch(() => false);
+        if (process.platform === "linux") {
+            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();
@@ -1708,9 +1717,9 @@ function mergeTauriConfig(url, options, tauriConf) {
             }
         }
         let bundleConf = { tauri: { bundle: tauriConf.tauri.bundle } };
-        yield fs.writeFile(configPath, Buffer.from(JSON.stringify(bundleConf), 'utf-8'));
+        yield fs.writeFile(configPath, Buffer.from(JSON.stringify(bundleConf, null, '\t'), 'utf-8'));
         const configJsonPath = path.join(npmDirectory, 'src-tauri/tauri.conf.json');
-        yield fs.writeFile(configJsonPath, Buffer.from(JSON.stringify(tauriConf), 'utf-8'));
+        yield fs.writeFile(configJsonPath, Buffer.from(JSON.stringify(tauriConf, null, '\t'), 'utf-8'));
     });
 }
 
@@ -1932,7 +1941,6 @@ var MacConf = {
 var tauri = {
 	bundle: {
 		icon: [
-			"png/weread_256.ico",
 			"png/weread_512.png"
 		],
 		identifier: "com.tw93.weread",
@@ -2019,11 +2027,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";
@@ -2081,7 +2089,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`;
@@ -2126,7 +2134,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";
@@ -2134,19 +2142,24 @@ class LinuxBuilder {
             else {
                 arch = process.arch;
             }
-            const debName = `${name}_${tauriConf.package.version}_${arch}.deb`;
-            const appPath = this.getBuildAppPath(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.getBuildAppPath(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 deb app installer in', distPath);
-            logger.success('You can find the AppImage app installer in', distAppPath);
+            if (options.targets === "deb" || options.targets === "all") {
+                const debName = `${name}_${tauriConf.package.version}_${arch}.deb`;
+                const appPath = this.getBuildAppPath(npmDirectory, "deb", debName);
+                const distPath = path.resolve(`${name}.deb`);
+                yield fs.copyFile(appPath, distPath);
+                yield fs.unlink(appPath);
+                logger.success('Build Deb success!');
+                logger.success('You can find the deb app installer in', distPath);
+            }
+            if (options.targets === "appimage" || options.targets === "all") {
+                const appImageName = `${name}_${tauriConf.package.version}_${arch}.AppImage`;
+                const appImagePath = this.getBuildAppPath(npmDirectory, "appimage", appImageName);
+                const distAppPath = path.resolve(`${name}.AppImage`);
+                yield fs.copyFile(appImagePath, distAppPath);
+                yield fs.unlink(appImagePath);
+                logger.success('Build AppImage success!');
+                logger.success('You can find the AppImage app installer in', distAppPath);
+            }
         });
     }
     getBuildAppPath(npmDirectory, packageType, packageName) {
@@ -2170,7 +2183,7 @@ class BuilderFactory {
 }
 
 var name = "pake-cli";
-var version = "1.2.7";
+var version = "1.2.9";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。";
 var engines = {
 	node: ">=16.0.0"
@@ -2206,7 +2219,7 @@ var scripts = {
 	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",
+	"build:all-windows": "pwsh ./script/build.ps1",
 	tauri: "tauri",
 	cli: "rollup -c rollup.config.js --watch",
 	"cli:build": "cross-env NODE_ENV=production rollup -c rollup.config.js",
@@ -2286,6 +2299,7 @@ program
     .option('-r, --no-resizable', 'whether the window can be resizable', DEFAULT_PAKE_OPTIONS.resizable)
     .option('-d, --debug', 'debug', DEFAULT_PAKE_OPTIONS.debug)
     .option('-m, --multi-arch', "available for Mac only, and supports both Intel and M1", DEFAULT_PAKE_OPTIONS.multiArch)
+    .option('--targets <string>', "Select the output package format, support deb/appimage/all, only for Linux", DEFAULT_PAKE_OPTIONS.targets)
     .action((url, options) => __awaiter(void 0, void 0, void 0, function* () {
     yield checkUpdateTips();
     if (!url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。",
   "engines": {
     "node": ">=16.0.0"
@@ -36,7 +36,7 @@
     "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",
+    "build:all-windows": "pwsh ./script/build.ps1",
     "tauri": "tauri",
     "cli": "rollup -c rollup.config.js --watch",
     "cli:build": "cross-env NODE_ENV=production rollup -c rollup.config.js",

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

@@ -7,4 +7,4 @@ Name=com-tw93-weread
 Name[zh_CN]=微信阅读
 StartupNotify=true
 Terminal=false
-Type=Application
+Type=Application

package/src-tauri/src/main.rs

@@ -26,7 +26,7 @@ use wry::application::window::Icon;
 #[cfg(any(target_os = "linux", target_os = "windows"))]
 use wry::webview::WebContext;
 
-use dirs::download_dir;
+use dirs::desktop_dir;
 use std::path::PathBuf;
 
 enum UserEvent {
@@ -147,7 +147,7 @@ fn main() -> wry::Result<()> {
     let download_started = {
         let proxy = proxy.clone();
         move |uri: String, default_path: &mut PathBuf| {
-            let path = download_dir()
+            let path = desktop_dir()
                 .unwrap()
                 .join(default_path.display().to_string())
                 .as_path()
@@ -243,7 +243,7 @@ fn main() -> wry::Result<()> {
             Event::UserEvent(UserEvent::DownloadComplete(_, success)) => {
                 println!("Succeeded: {success}");
                 if success {
-                    let _ = webview.evaluate_script("window.pakeToast('Save in downloads folder')");
+                    let _ = webview.evaluate_script("window.pakeToast('Downloaded to Desktop~')");
                 } else {
                     println!("No output path")
                 }

package/src-tauri/src/pake.js

@@ -47,10 +47,21 @@ window.addEventListener("DOMContentLoaded", (_event) => {
     #Wrapper > div.sep20,
     #Main > div.box:nth-child(8),
     #masthead-ad,
+    #app > header > div > div.menu,
+    #root > div > div.fixed.top-0.left-0.w-64.h-screen.p-10.pb-0.flex.flex-col.justify-between > div > div.space-y-4 > a:nth-child(3),
     #Rightbar > div:nth-child(6) > div.sidebar_compliance {
       display: none !important;
     }
 
+    #app > header .right .avatar.logged-in{
+      opacity: 0;
+      transition: opacity 0.3s;
+    }
+
+    #app > header .right .avatar.logged-in:hover{
+      opacity: 1;
+    }
+
     #page .main_header, .cb-layout-basic--navbar,
     #app .splitpanes.splitpanes--horizontal.no-splitter header {
       padding-top: 20px;
@@ -86,10 +97,11 @@ window.addEventListener("DOMContentLoaded", (_event) => {
     }
 
     .panel.give_me .nav_view {
-      top: 154px !important;
+      top: 164px !important;
     }
 
-    .columns .column #header{
+    .columns .column #header,
+    .main > div > div.panel.give_me > div.header {
       padding-top: 30px;
     }
 

package/src-tauri/tauri.conf.json

@@ -1,30 +1,31 @@
 {
-  "package": {
-    "productName": "WeRead",
-    "version": "1.0.0"
-  },
-  "tauri": {
-    "windows": [
-      {
-        "url": "https://weread.qq.com/",
-        "transparent": true,
-        "fullscreen": false,
-        "width": 1200,
-        "height": 780,
-        "resizable": true
-      }
-    ],
-    "security": {
-      "csp": null
-    },
-    "updater": {
-      "active": false
-    }
-  },
-  "build": {
-    "devPath": "../dist",
-    "distDir": "../dist",
-    "beforeBuildCommand": "",
-    "beforeDevCommand": ""
+	"package": {
+	  "productName": "WeRead",
+	  "version": "1.0.0"
+	},
+	"tauri": {
+	  "windows": [
+		{
+		  "url": "https://weread.qq.com/",
+		  "transparent": true,
+		  "fullscreen": false,
+		  "width": 1200,
+		  "height": 780,
+		  "resizable": true
+		}
+	  ],
+	  "security": {
+		"csp": null
+	  },
+	  "updater": {
+		"active": false
+	  }
+	},
+	"build": {
+	  "devPath": "../dist",
+	  "distDir": "../dist",
+	  "beforeBuildCommand": "",
+	  "beforeDevCommand": ""
+	}
   }
-}
+  

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

@@ -1,36 +1,32 @@
 {
-  "tauri": {
-    "bundle": {
-      "icon": [
-        "png/weread_256.ico",
-        "png/weread_512.png"
-      ],
-      "identifier": "com.tw93.weread",
-      "active": true,
-      "category": "DeveloperTool",
-      "copyright": "",
-      "deb": {
-        "depends": [
-          "libwebkit2gtk-4.0-dev",
-          "build-essential",
-          "curl",
-          "wget",
-          "libssl-dev",
-          "libgtk-3-dev",
-          "libayatana-appindicator3-dev",
-          "librsvg2-dev",
-          "gnome-video-effects",
-          "gnome-video-effects-extra"
-        ],
-        "files": {
-          "/usr/share/applications/com-tw93-weread.desktop": "assets/com-tw93-weread.desktop"
-        }
-      },
-      "externalBin": [],
-      "longDescription": "",
-      "resources": [],
-      "shortDescription": "",
-      "targets": ["deb", "appimage"]
-    }
+	"tauri": {
+	  "bundle": {
+		"icon": ["png/weread_512.png"],
+		"identifier": "com.tw93.weread",
+		"active": true,
+		"category": "DeveloperTool",
+		"copyright": "",
+		"deb": {
+		  "depends": [
+			"libwebkit2gtk-4.0-dev",
+			"build-essential",
+			"curl",
+			"wget",
+			"libssl-dev",
+			"libgtk-3-dev",
+			"libayatana-appindicator3-dev",
+			"librsvg2-dev",
+			"gnome-video-effects",
+			"gnome-video-effects-extra"
+		  ],
+		  "files": {"/usr/share/applications/com-tw93-weread.desktop": "assets/com-tw93-weread.desktop"}
+		},
+		"externalBin": [],
+		"longDescription": "",
+		"resources": [],
+		"shortDescription": "",
+		"targets": ["deb", "appimage"]
+	  }
+	}
   }
-}
+  

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

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

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

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