pake-cli 0.1.1 → 0.1.2

package/README.md

@@ -44,59 +44,57 @@
         <td><img src=https://cdn.fliggy.com/upic/mc41xq.jpg width=600/></td>
     </tr>
     <tr>
-        <td>YouTube 
-            <a href="https://github.com/tw93/Pake/releases/latest/download/YouTube.dmg">Mac</a>
-            <a href="https://github.com/tw93/Pake/releases/latest/download/YouTube_amd64.deb">Linux</a>
-            <a href="https://github.com/tw93/Pake/releases/latest/download/YouTube_x64.msi">Windows</a>
+        <td>ChatGPT 
+            <a href="https://github.com/tw93/Pake/releases/latest/download/ChatGPT.dmg">Mac</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/ChatGPT_amd64.deb">Linux</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/ChatGPT_x64.msi">Windows</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_amd64.deb">Linux</a>
-            <a href="https://github.com/tw93/Pake/releases/latest/download/Reference_x64.msi">Windows</a>
+          <td>Qwerty 
+            <a href="https://github.com/tw93/Pake/releases/latest/download/Qwerty.dmg">Mac</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/Qwerty_amd64.deb">Linux</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/Qwerty_x64.msi">Windows</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/sfnTXf.png width=600/></td>
+        <td><img src=https://cdn.fliggy.com/upic/CJjagn.jpg width=600/></td>
     </tr>
     <tr>
-        <td>Code 
+        <td>Code
             <a href="https://github.com/tw93/Pake/releases/latest/download/Code.dmg">Mac</a>
             <a href="https://github.com/tw93/Pake/releases/latest/download/Code_amd64.deb">Linux</a>
             <a href="https://github.com/tw93/Pake/releases/latest/download/Code_x64.msi">Windows</a>
         </td>
-        <td>Qwerty 
-            <a href="https://github.com/tw93/Pake/releases/latest/download/Qwerty.dmg">Mac</a>
-            <a href="https://github.com/tw93/Pake/releases/latest/download/Qwerty_amd64.deb">Linux</a>
-            <a href="https://github.com/tw93/Pake/releases/latest/download/Qwerty_x64.msi">Windows</a>
+         <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_amd64.deb">Linux</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/Reference_x64.msi">Windows</a>
         </td>
     </tr>
     <tr>
         <td><img src=https://cdn.fliggy.com/upic/EB1OYP.jpg width=600/></td>
-        <td><img src=https://cdn.fliggy.com/upic/FGdQec.png width=600/></td>
+        <td><img src=https://cdn.fliggy.com/upic/KFsZIY.png width=600/></td>
     </tr>
-    <tr>
-        <td>Flomo 
+        <tr>
+           <td>YouTube
+            <a href="https://github.com/tw93/Pake/releases/latest/download/YouTube.dmg">Mac</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/YouTube_amd64.deb">Linux</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/YouTube_x64.msi">Windows</a>
+        </td>
+        <td>Flomo
             <a href="https://github.com/tw93/Pake/releases/latest/download/Flomo.dmg">Mac</a>
             <a href="https://github.com/tw93/Pake/releases/latest/download/Flomo_amd64.deb">Linux</a>
             <a href="https://github.com/tw93/Pake/releases/latest/download/Flomo_x64.msi">Windows</a>
         </td>
-        <td>YuQue 
-            <a href="https://github.com/tw93/Pake/releases/latest/download/YuQue.dmg">Mac</a>
-            <a href="https://github.com/tw93/Pake/releases/latest/download/YuQue_amd64.deb">Linux</a>
-            <a href="https://github.com/tw93/Pake/releases/latest/download/YuQue_x64.msi">Windows</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/jg9Eeu.jpg width=600/></td>
-        <td><img src=https://cdn.fliggy.com/upic/02SZQl.png width=600/></td>
     </tr>
 </table>
 
 注意：Windows 下不能安装到 `C:\Program File`，会直接闪退，建议安装到其他非管理员权限目录，比如 `D:\Program Files (x86)` 。
 
-对于轻度使用用户，使用 **GitHub Actions 在线编译多系统版本** 也是一个不错的选择，可查看[文档](/docs/README.md)。
-
 ## 命令行打包
 
 <kbd>
@@ -117,6 +115,8 @@ pake url [options]
 pake https://weekly.tw93.fun --name Weekly --transparent
 ```
 
+假如你是不太会使用命令行的小白，使用 **GitHub Actions 在线编译多系统版本** 也是一个不错的选择，可查看[文档](./.github/workflows/docs/README.md)。
+
 ## 快捷键
 
 | Mac                         | Windows/Linux                  | 功能               |
@@ -146,7 +146,7 @@ npm i
 npm run dev
 
 // 打包应用
-npm run build:release
+npm run build
 
 ```
 
@@ -249,6 +249,13 @@ Pake 的发展离不开这些 Hacker 们，一起贡献了大量能力，也欢
             <sub><b>Aiello</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/nekomeowww">
+            <img src="https://avatars.githubusercontent.com/u/11081491?v=4" width="90;" alt="nekomeowww"/>
+            <br />
+            <sub><b>Ayaka Neko</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/houhoz">
             <img src="https://avatars.githubusercontent.com/u/19684376?v=4" width="90;" alt="houhoz"/>

package/dist/cli.js

@@ -1678,6 +1678,10 @@ const logger = {
     }
 };
 
+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* () {
         if (options.icon) {
@@ -1689,15 +1693,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) {
@@ -1773,10 +1783,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) => {
@@ -1943,7 +1949,8 @@ var tauri = {
 		],
 		shortDescription: "",
 		targets: [
-			"deb"
+			"deb",
+			"appimage"
 		]
 	}
 };
@@ -1996,7 +2003,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";
@@ -2046,7 +2053,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`;
@@ -2106,7 +2113,7 @@ 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";
@@ -2115,22 +2122,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();
         }
@@ -2145,7 +2157,7 @@ class BuilderFactory {
 }
 
 var name = "pake-cli";
-var version = "0.1.1";
+var version = "0.1.2";
 var description = "🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App 🤱🏻 A simple way to make any web page a desktop application using Rust.";
 var bin = {
 	pake: "./cli.js"
@@ -2161,14 +2173,13 @@ var author = {
 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:all-unix": "chmod +x ./script/build.sh && ./script/build.sh",
 	"build:all-windows": ".\\script\\build.bat",
 	tauri: "tauri",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App 🤱🏻 A simple way to make any web page a desktop application using Rust.",
   "bin": {
     "pake": "./cli.js"
@@ -16,14 +16,13 @@
   "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:all-unix": "chmod +x ./script/build.sh && ./script/build.sh",
     "build:all-windows": ".\\script\\build.bat",
     "tauri": "tauri",

package/src-tauri/Cargo.lock

@@ -49,7 +49,7 @@ dependencies = [
  "tauri-build",
  "tauri-utils",
  "webbrowser",
- "wry 0.21.1",
+ "wry 0.23.1",
 ]
 
 [[package]]
@@ -1262,20 +1262,6 @@ dependencies = [
  "system-deps 5.0.0",
 ]
 
-[[package]]
-name = "jni"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
 [[package]]
 name = "jni"
 version = "0.20.0"
@@ -2474,52 +2460,6 @@ dependencies = [
  "version-compare 0.1.1",
 ]
 
-[[package]]
-name = "tao"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43336f5d1793543ba96e2a1e75f3a5c7dcd592743be06a0ab3a190f4fcb4b934"
-dependencies = [
- "bitflags",
- "cairo-rs",
- "cc",
- "cocoa",
- "core-foundation",
- "core-graphics",
- "crossbeam-channel",
- "dispatch",
- "gdk",
- "gdk-pixbuf",
- "gdk-sys",
- "gdkx11-sys",
- "gio",
- "glib",
- "glib-sys",
- "gtk",
- "image",
- "instant",
- "jni 0.19.0",
- "lazy_static",
- "libc",
- "log",
- "ndk",
- "ndk-context",
- "ndk-sys",
- "objc",
- "once_cell",
- "parking_lot",
- "paste",
- "png",
- "raw-window-handle",
- "scopeguard",
- "serde",
- "unicode-segmentation",
- "uuid 1.2.2",
- "windows 0.39.0",
- "windows-implement",
- "x11-dl",
-]
-
 [[package]]
 name = "tao"
 version = "0.15.6"
@@ -2544,7 +2484,7 @@ dependencies = [
  "gtk",
  "image",
  "instant",
- "jni 0.20.0",
+ "jni",
  "lazy_static",
  "libc",
  "log",
@@ -3149,7 +3089,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a0cc7962b5aaa0dfcebaeef0161eec6edf5f4606c12e6777fd7d392f52033a5"
 dependencies = [
- "jni 0.20.0",
+ "jni",
  "ndk-context",
  "objc",
  "raw-window-handle",
@@ -3474,15 +3414,16 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.21.1"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff5c1352b4266fdf92c63479d2f58ab4cd29dc4e78fbc1b62011ed1227926945"
+checksum = "e3b4906cc7b3c5959893f3984bb60882ec94539eb14622077e6529f5b3d008ee"
 dependencies = [
  "base64",
  "block",
  "cocoa",
  "core-graphics",
  "crossbeam-channel",
+ "dunce",
  "gdk",
  "gio",
  "glib",
@@ -3498,7 +3439,8 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "tao 0.14.0",
+ "soup2",
+ "tao",
  "thiserror",
  "url",
  "webkit2gtk",
@@ -3510,9 +3452,9 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.22.5"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b4906cc7b3c5959893f3984bb60882ec94539eb14622077e6529f5b3d008ee"
+checksum = "a76c9236a810d4af02213f89f5bc55bf3262d40c4407b13a9fc847156ef8b856"
 dependencies = [
  "base64",
  "block",
@@ -3536,7 +3478,7 @@ dependencies = [
  "serde_json",
  "sha2",
  "soup2",
- "tao 0.15.6",
+ "tao",
  "thiserror",
  "url",
  "webkit2gtk",

package/src-tauri/Cargo.toml

@@ -21,7 +21,7 @@ tauri = { version = "1.2.1", features = [] }
 image = "0.24.5"
 tauri-utils = "1.2.1"
 webbrowser = "0.8.2"
-wry = "0.21.1"
+wry = "0.23.1"
 
 [features]
 # by default Tauri runs in production mode

package/src-tauri/src/main.rs

@@ -2,109 +2,76 @@
 #![windows_subsystem = "windows"]
 extern crate image;
 use tauri_utils::config::{Config, WindowConfig};
-#[cfg(target_os = "macos")]
-use wry::application::platform::macos::WindowBuilderExtMacOS;
-
-#[cfg(target_os = "macos")]
 use wry::{
     application::{
-        accelerator::{Accelerator, SysMods},
         event::{Event, StartCause, WindowEvent},
         event_loop::{ControlFlow, EventLoop},
-        keyboard::KeyCode,
-        menu::{MenuBar as Menu, MenuItem, MenuItemAttributes, MenuType},
+        menu::MenuType,
         window::{Fullscreen, Window, WindowBuilder},
     },
     webview::WebViewBuilder,
 };
 
-#[cfg(target_os = "windows")]
-use wry::{
-    application::{
-        event::{Event, StartCause, WindowEvent},
-        event_loop::{ControlFlow, EventLoop},
-        menu::MenuType,
-        window::{Fullscreen, Icon, Window, WindowBuilder},
-    },
-    webview::WebViewBuilder,
+#[cfg(target_os = "macos")]
+use wry::application::{
+    accelerator::{Accelerator, SysMods},
+    keyboard::KeyCode,
+    menu::{MenuBar as Menu, MenuItem, MenuItemAttributes},
+    platform::macos::WindowBuilderExtMacOS,
 };
 
+#[cfg(target_os = "windows")]
+use wry::application::window::Icon;
+
 #[cfg(target_os = "linux")]
-use wry::{
-    application::{
-        event::{Event, StartCause, WindowEvent},
-        event_loop::{ControlFlow, EventLoop},
-        menu::MenuType,
-        window::{Fullscreen, Window, WindowBuilder},
-    },
-    webview::{WebContext, WebViewBuilder},
-};
+use wry::webview::WebContext;
 
 fn main() -> wry::Result<()> {
     #[cfg(target_os = "macos")]
-    let mut menu_bar_menu = Menu::new();
-    #[cfg(target_os = "macos")]
-    let mut first_menu = Menu::new();
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::Hide);
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::EnterFullScreen);
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::Minimize);
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::Separator);
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::Copy);
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::Cut);
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::Paste);
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::Undo);
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::Redo);
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::SelectAll);
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::Separator);
-
-    #[cfg(target_os = "macos")]
-    let close_item = first_menu.add_item(
-        MenuItemAttributes::new("CloseWindow")
-            .with_accelerators(&Accelerator::new(SysMods::Cmd, KeyCode::KeyW)),
-    );
-
-    #[cfg(target_os = "macos")]
-    first_menu.add_native_item(MenuItem::Quit);
-
-    #[cfg(target_os = "macos")]
-    menu_bar_menu.add_submenu("App", true, first_menu);
-    #[cfg(target_os = "linux")]
-    let (package_name, windows_config) = get_windows_config();
+    let (menu_bar_menu, close_item) = {
+        let mut menu_bar_menu = Menu::new();
+        let mut first_menu = Menu::new();
+        first_menu.add_native_item(MenuItem::Hide);
+        first_menu.add_native_item(MenuItem::EnterFullScreen);
+        first_menu.add_native_item(MenuItem::Minimize);
+        first_menu.add_native_item(MenuItem::Separator);
+        first_menu.add_native_item(MenuItem::Copy);
+        first_menu.add_native_item(MenuItem::Cut);
+        first_menu.add_native_item(MenuItem::Paste);
+        first_menu.add_native_item(MenuItem::Undo);
+        first_menu.add_native_item(MenuItem::Redo);
+        first_menu.add_native_item(MenuItem::SelectAll);
+        first_menu.add_native_item(MenuItem::Separator);
+        let close_item = first_menu.add_item(
+            MenuItemAttributes::new("CloseWindow")
+                .with_accelerators(&Accelerator::new(SysMods::Cmd, KeyCode::KeyW)),
+        );
+        first_menu.add_native_item(MenuItem::Quit);
+        menu_bar_menu.add_submenu("App", true, first_menu);
+        (menu_bar_menu, close_item)
+    };
 
-    #[cfg(target_os = "linux")]
-    let package_name = package_name.expect("can't get package name in config file");
+    #[cfg(any(target_os = "linux", target_os = "windows"))]
+    let (
+        package_name,
+        WindowConfig {
+            url,
+            width,
+            height,
+            resizable,
+            fullscreen,
+            ..
+        },
+    ) = {
+        let (package_name, windows_config) = get_windows_config();
+        (
+            package_name
+                .expect("can't get package name in config file")
+                .to_lowercase(),
+            windows_config.unwrap_or_default(),
+        )
+    };
 
-    #[cfg(target_os = "linux")]
-    let WindowConfig {
-        url,
-        width,
-        height,
-        resizable,
-        fullscreen,
-        ..
-    } = windows_config.unwrap_or_default();
-    #[cfg(target_os = "windows")]
-    let (package_name, windows_config) = get_windows_config();
-    #[cfg(target_os = "windows")]
-    let WindowConfig {
-        url,
-        width,
-        height,
-        resizable,
-        fullscreen,
-        ..
-    } = windows_config.unwrap_or_default();
     #[cfg(target_os = "macos")]
     let WindowConfig {
         url,
@@ -127,19 +94,15 @@ fn main() -> wry::Result<()> {
         })
         .with_inner_size(wry::application::dpi::LogicalSize::new(width, height));
     #[cfg(target_os = "windows")]
-    let package_name = package_name
-        .expect("can't get package name in config file")
-        .to_lowercase();
-    #[cfg(target_os = "windows")]
-    let icon_path = format!("png/{}_32.ico", package_name);
-    #[cfg(target_os = "windows")]
-    let icon = load_icon(std::path::Path::new(&icon_path));
-    #[cfg(target_os = "windows")]
-    let window = common_window
-        .with_decorations(true)
-        .with_window_icon(Some(icon))
-        .build(&event_loop)
-        .unwrap();
+    let window = {
+        let icon_path = format!("png/{}_32.ico", package_name);
+        let icon = load_icon(std::path::Path::new(&icon_path));
+        common_window
+            .with_decorations(true)
+            .with_window_icon(Some(icon))
+            .build(&event_loop)
+            .unwrap()
+    };
 
     #[cfg(target_os = "linux")]
     let window = common_window.build(&event_loop).unwrap();
@@ -177,12 +140,11 @@ fn main() -> wry::Result<()> {
     #[cfg(target_os = "macos")]
     let webview = WebViewBuilder::new(window)?
         // .with_user_agent(user_agent_string)
-        // .with_accept_first_mouse(true)
         .with_url(&url.to_string())?
         .with_devtools(cfg!(feature = "devtools"))
         .with_initialization_script(include_str!("pake.js"))
         .with_ipc_handler(handler)
-        // .with_back_forward_navigation_gestures(true)
+        .with_back_forward_navigation_gestures(true)
         .build()?;
 
     #[cfg(target_os = "windows")]
@@ -193,42 +155,36 @@ fn main() -> wry::Result<()> {
         .with_devtools(cfg!(feature = "devtools"))
         .with_initialization_script(include_str!("pake.js"))
         .with_ipc_handler(handler)
-        // .with_back_forward_navigation_gestures(true)
         .build()?;
+
     // 自定义cookie文件夹，仅用于Linux
     // Custom Cookie folder, only for Linux
-    // #[cfg(target_os = "linux")]
-    // let config_path = format!("/home/{}/.config/{}", env!("USER"), package_name);
-    #[cfg(target_os = "linux")]
-    let user = std::env::var_os("USER");
     #[cfg(target_os = "linux")]
-    let config_path = match user {
-        Some(v) => format!(
-            "/home/{}/.config/{}", v.into_string().unwrap(), package_name
-        ),
-        None => panic!("can't found any user")
+    let webview = {
+        let user = std::env::var_os("USER");
+        let config_path = match user {
+            Some(v) => format!(
+                "/home/{}/.config/{}",
+                v.into_string().unwrap(),
+                package_name,
+            ),
+            None => panic!("can't found any user"),
+        };
+        let data_path = std::path::PathBuf::from(&config_path);
+        if !std::path::Path::new(&data_path).exists() {
+            std::fs::create_dir(&data_path)
+                .unwrap_or_else(|_| panic!("can't create dir {}", &config_path));
+        }
+        let mut web_content = WebContext::new(Some(data_path));
+        WebViewBuilder::new(window)?
+            // .with_user_agent(user_agent_string)
+            .with_url(&url.to_string())?
+            .with_devtools(cfg!(feature = "devtools"))
+            .with_initialization_script(include_str!("pake.js"))
+            .with_ipc_handler(handler)
+            .with_web_context(&mut web_content)
+            .build()?
     };
-    #[cfg(target_os = "linux")]
-    let data_path = std::path::PathBuf::from(&config_path);
-    #[cfg(target_os = "linux")]
-    if !std::path::Path::new(&data_path).exists() {
-        std::fs::create_dir(&data_path)
-            .unwrap_or_else(|_| panic!("can't create dir {}", &config_path));
-    }
-    #[cfg(target_os = "linux")]
-    let mut web_content = WebContext::new(Some(data_path));
-    #[cfg(target_os = "linux")]
-    let webview = WebViewBuilder::new(window)?
-        // .with_user_agent(user_agent_string)
-        // .with_accept_first_mouse(true)
-        .with_url(&url.to_string())?
-        .with_devtools(cfg!(feature = "devtools"))
-        .with_initialization_script(include_str!("pake.js"))
-        .with_ipc_handler(handler)
-        .with_web_context(&mut web_content)
-        // .with_back_forward_navigation_gestures(true)
-        .build()?;
-
     #[cfg(feature = "devtools")]
     {
         webview.open_devtools();

package/src-tauri/src/pake.js

@@ -55,6 +55,18 @@ window.addEventListener("DOMContentLoaded", (_event) => {
       padding-top: 20px;
     }
 
+    #__next .overflow-hidden .flex.flex-1.flex-col {
+        padding-left: 0;
+    }
+
+    #__next .overflow-hidden>.hidden.bg-gray-900 {
+      display: none;
+    }
+
+    #__next .overflow-hidden main .absolute .text-xs{
+      visibility: hidden;
+    }
+
     .lark > .dashboard-sidebar, .lark > .dashboard-sidebar > .sidebar-user-info , .lark > .dashboard-sidebar .index-module_wrapper_F-Wbq{
       padding-top:15px;
     }
@@ -306,16 +318,16 @@ window.addEventListener("DOMContentLoaded", (_event) => {
   document.addEventListener("click", (e) => {
     const origin = e.target.closest("a");
     if (origin && origin.href) {
+      const target = origin.target
       origin.target = "_self";
+      const hrefUrl = new URL(origin.href)
 
-      //额外处理下 twitter 的外跳，对于其他需要外跳的可以改这里成对应域名
-      const href = origin.href;
       if (
-        location.host === "twitter.com" &&
-        href.indexOf("twitter.com") === -1
+        window.location.host !== hrefUrl.host && // 如果 a 标签内链接的域名和当前页面的域名不一致 且
+        target === '_blank' // a 标签内链接的 target 属性为 _blank 时
       ) {
         e.preventDefault();
-        window.ipc.postMessage(`open_browser:${href}`);
+        window.ipc.postMessage(`open_browser:${origin.href}`);
       }
     }
   });

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

@@ -28,7 +28,7 @@
       "longDescription": "",
       "resources": [],
       "shortDescription": "",
-      "targets": ["deb"]
+      "targets": ["deb", "appimage"]
     }
   }
 }

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

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