🔀 merge main

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -28,7 +28,7 @@ body:
     attributes:
       label: Pake version
       description: >
-        Please provide the version of Pake you are using. If you are using the master/dev branch, please provide the commit id.
+        Please provide the version of Pake you are using. If you are using the main/dev branch, please provide the commit id.
     validations:
       required: true
   - type: textarea

.github/workflows/contribute_list.yml

@@ -2,7 +2,7 @@ name: Build Contribute List
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   contrib-readme-job:

CONTRIBUTING.md

@@ -6,15 +6,15 @@
 
 ```mermaid
 graph LR
-    b_dev(dev) --> b_master(master);
+    b_dev(dev) --> b_main(main);
     contributions([Develop / Pull requests]) -.-> b_dev;
 ```
 
 - `dev` branch
   - `dev` is the developing branch.
   - It's **RECOMMENDED** to commit feature PR to `dev`.
-- `master` branch
+- `main` branch
-  - `master` is the release branch, we will make tag and publish version on this branch.
+  - `main` is the release branch, we will make tag and publish version on this branch.
   - If it is a document modification, it can be submitted to this branch.
 
 ## More

Dockerfile

@@ -18,7 +18,6 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
     mkdir -p /cargo-cache && \
     cp -R /usr/local/cargo/registry /cargo-cache/ && \
     cp -R /usr/local/cargo/git /cargo-cache/
-
 # Verify the content of /cargo-cache && clean unnecessary files
 RUN ls -la /cargo-cache/registry && ls -la /cargo-cache/git && rm -rfd /cargo-cache/registry/src
 

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>

README_CN.md

@@ -1,4 +1,4 @@
-<h4 align="right"><a href="https://github.com/tw93/Pake">English</a> | <strong>简体中文</strong> | <a href="https://github.com/tw93/Pake/blob/master/README_JP.md">日本語</a></h4>
+<h4 align="right"><a href="https://github.com/tw93/Pake">English</a> | <strong>简体中文</strong> | <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>

README_JP.md

@@ -1,4 +1,4 @@
-<h4 align="right"><a href="https://github.com/tw93/Pake">English</a> | <a href="https://github.com/tw93/Pake/blob/master/README_CN.md">简体中文</a> | <strong>日本語</strong></h4>
+<h4 align="right"><a href="https://github.com/tw93/Pake">English</a> | <a href="https://github.com/tw93/Pake/blob/main/README_CN.md">简体中文</a> | <strong>日本語</strong></h4>
 <p align="center">
     <img src=https://gw.alipayobjects.com/zos/k/fa/logo-modified.png width=138/>
 </p>

bin/README.md

@@ -1,4 +1,4 @@
-<h4 align="right"><strong>English</strong> | <a href="https://github.com/tw93/Pake/blob/master/bin/README_CN.md">简体中文</a></h4>
+<h4 align="right"><strong>English</strong> | <a href="https://github.com/tw93/Pake/blob/main/bin/README_CN.md">简体中文</a></h4>
 
 ## Installation
 

bin/README_CN.md

@@ -1,4 +1,4 @@
-<h4 align="right"><strong><a href="https://github.com/tw93/Pake/tree/master/bin">English</a></strong> | 简体中文</h4>
+<h4 align="right"><strong><a href="https://github.com/tw93/Pake/tree/main/bin">English</a></strong> | 简体中文</h4>
 
 ## 安装
 

dist/cli.js

@@ -132,6 +132,7 @@ var windows = [
 		width: 1200,
 		height: 780,
 		resizable: true,
+		dark_mode: false,
 		always_on_top: false,
 		dark_mode: false,
 		activation_shortcut: "",

src-tauri/src/app/window.rs

@@ -26,8 +26,8 @@ pub fn get_window(app: &mut App, config: &PakeConfig, _data_dir: PathBuf) -> Web
 
     let mut window_builder = WebviewWindowBuilder::new(app, "pake", url)
         .title("")
+        .visible(false)
         .user_agent(user_agent)
-        .visible(false) // Prevent initial shaking
         .resizable(window_config.resizable)
         .fullscreen(window_config.fullscreen)
         .inner_size(window_config.width, window_config.height)
@@ -36,7 +36,6 @@ pub fn get_window(app: &mut App, config: &PakeConfig, _data_dir: PathBuf) -> Web
         .initialization_script(include_str!("../inject/component.js"))
         .initialization_script(include_str!("../inject/event.js"))
         .initialization_script(include_str!("../inject/style.js"))
-        //This is necessary to allow for file injection by external developers for customization purposes.
         .initialization_script(include_str!("../inject/custom.js"));
 
     if !config.proxy_url.is_empty() {