Merge remote-tracking branch 'upstream/master'

.github/CONTRIBUTING.md

@@ -14,10 +14,10 @@ Install pnpm: `npm install -g [email protected]`
 
 Set the Electron mirror environment variable and install Electron:
 
-* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].0 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].2 -D`
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install [email protected].0 -D`
+    * `pnpm install [email protected].2 -D`
 
 NPM mirror:
 
@@ -28,7 +28,7 @@ NPM mirror:
 
 On the desktop, go to the app folder to run:
 
-* `pnpm install [email protected].0 -D`
+* `pnpm install [email protected].2 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.github/CONTRIBUTING_zh_CN.md

@@ -16,11 +16,11 @@
 
 * macOS/Linux: 
  ```
- ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].0 -D
+ ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install [email protected].2 -D
  ```
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install [email protected].0 -D`
+    * `pnpm install [email protected].2 -D`
 
 NPM 镜像：
 
@@ -30,7 +30,7 @@ NPM 镜像：
 
 桌面端进入 app 文件夹运行：
 
-* `pnpm install [email protected].0 -D`
+* `pnpm install [email protected].2 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.github/workflows/auto_aur_release_stable.yml

@@ -45,27 +45,51 @@ jobs:
           arch=("x86_64")
           url="https://b3log.org/siyuan"
           license=("AGPL-3.0-only")
-          _pkgname=siyuan-\${pkgver}-linux.AppImage
-          noextract=(siyuan-\${pkgver}-linux.AppImage)
           options=("!strip" "!debug")
           depends=("fuse2")
           optdepends=('pandoc: docx export')
           source=("https://github.com/siyuan-note/siyuan/releases/download/v\${pkgver}/siyuan-\${pkgver}-linux.AppImage")
           sha256sums=('SKIP')
 
-          _installdir=/opt/appimages
+          _pkgname=siyuan-\${pkgver}-linux.AppImage
+          noextract=("\${_pkgname}")
 
           prepare() {
-              chmod a+x \${_pkgname}
-              ./\${_pkgname} --appimage-extract >/dev/null
-              sed -i "s+AppRun+\${_installdir}/siyuan.AppImage+" "squashfs-root/siyuan.desktop"
-              sed -i "s+^Icon=.*+Icon=siyuan-bin+" "squashfs-root/siyuan.desktop"
+              chmod +x "\${_pkgname}"
+              ./"\${_pkgname}" --appimage-extract > /dev/null
+          }
+
+          build() {
+              # Adjust .desktop so it will work autside of AppImage container
+              sed -i \\
+                  -e "s|Exec=AppRun|Exec=/opt/\${pkgname}/\${pkgname}.AppImage|" \\
+                  -e "s+^Icon=.*+Icon=siyuan-bin+" \\
+                  "squashfs-root/siyuan.desktop"
+
+              # Fix permissions; .AppImage permissions are 700 for all directories
+              chmod -R a-x+rX squashfs-root/usr
           }
 
           package() {
-              install -Dm755 \${_pkgname} "\${pkgdir}/\${_installdir}/siyuan.AppImage"
-              install -Dm644 "squashfs-root/resources/stage/icon.png" "\${pkgdir}/usr/share/icons/hicolor/512x512/apps/siyuan-bin.png"
-              install -Dm644 "squashfs-root/siyuan.desktop" "\${pkgdir}/usr/share/applications/siyuan-bin.desktop"
+              # AppImage
+              install -Dm755 "\${srcdir}/\${_pkgname}" "\${pkgdir}/opt/\${pkgname}/\${pkgname}.AppImage"
+              install -Dm644 "\${srcdir}/squashfs-root/LICENSE" "\${pkgdir}/opt/\${pkgname}/LICENSE"
+
+              # Desktop file
+              install -Dm644 "\${srcdir}/squashfs-root/siyuan.desktop" \\
+                      "\${pkgdir}/usr/share/applications/siyuan.desktop"
+
+              # Icon images
+              install -Dm644 "squashfs-root/resources/stage/icon.png" \\
+                      "\${pkgdir}/usr/share/icons/hicolor/512x512/apps/siyuan-bin.png"
+
+              # Symlink executable
+              install -dm755 "\${pkgdir}/usr/bin"
+              ln -s "/opt/\${pkgname}/\${pkgname}.AppImage" "\${pkgdir}/usr/bin/siyuan"
+
+              # Symlink license
+              install -dm755 "\${pkgdir}/usr/share/licenses/\${pkgname}/"
+              ln -s "/opt/\${pkgname}/LICENSE" "\${pkgdir}/usr/share/licenses/\${pkgname}"
           }
           EOF
 

.gitignore

@@ -14,6 +14,7 @@
 app/node_modules
 app/stage/build
 app/build
+app/src/types/dist
 app/kernel*
 ios
 pprof

README.md

@@ -124,7 +124,13 @@ Some features are only available to paid members, for more details please refer
 
 ## 🌟 Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date)](https://star-history.com/#siyuan-note/siyuan&Date)
+<a href="https://star-history.com/#siyuan-note/siyuan&Date">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
+ </picture>
+</a>
 
 ## 🗺️ Roadmap
 

README_ja_JP.md

@@ -123,7 +123,13 @@ SiYuanは、プライバシーを最優先とする個人の知識管理シス
 
 ## 🌟 スター履歴
 
-[![Star History Chart](https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date)](https://star-history.com/#siyuan-note/siyuan&Date)
+<a href="https://star-history.com/#siyuan-note/siyuan&Date">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
+ </picture>
+</a>
 
 ## 🗺️ ロードマップ
 

README_zh_CN.md

@@ -42,6 +42,7 @@
   * [安装包](#安装包)
   * [Docker 部署](#docker-部署)
   * [Unraid 部署](#unraid-部署)
+  * [宝塔面板 部署](#宝塔面板部署)
   * [内部预览版](#内部预览版)
 * [🏘️ 社区](#️-社区)
 * [🛠️ 开发指南](#️-开发指南)
@@ -124,7 +125,13 @@
 
 ## 🌟 星标历史
 
-[![Star History Chart](https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date)](https://star-history.com/#siyuan-note/siyuan&Date)
+<a href="https://star-history.com/#siyuan-note/siyuan&Date">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date" />
+ </picture>
+</a>
 
 ## 🗺️ 路线图
 
@@ -294,6 +301,38 @@ Publish parameters: --accessAuthCode=******（访问授权码）
 
 </details>
 
+### 宝塔面板部署
+
+<details>
+<summary>宝塔面板 部署文档</summary>
+
+#### 前提
+
+* 仅适用于宝塔面板9.2.0及以上版本
+* 安装宝塔面板，前往[宝塔面板](https://www.bt.cn/new/download.html)官网，选择正式版的脚本下载安装
+
+#### 部署
+
+1. 登录宝塔面板，在左侧菜单栏中点击 `Docker`
+2. 首次会提示安装 `Docker` 和 `Docker Compose` 服务，点击立即安装，若已安装请忽略
+3. 安装完成后在 `Docker-应用商店-实用工具` 中找到 `思源笔记`，点击`安装`，也可以在搜索框直接搜索
+4. 设置域名等基本信息，点击 `确定`
+   * 名称：应用名称，默认 `siyuan_随机字符`
+   * 版本选择：默认 `latest`
+   * 域名：如你需要通过域名访问，请在此处填写你的域名
+   * 允许外部访问：如你需通过 `IP+Port` 直接访问，请勾选，如你已经设置了域名，请不要勾选此处
+   * 端口：默认 `6806`，可自行修改
+   * 访问授权码：默认随机生成
+   * 内存限制：0为不限制，根据实际需要设置
+5. 提交后面板会自动进行应用初始化，大概需要`1-3`分钟，初始化完成后即可访问
+
+#### 访问思源笔记
+
+* 如果你填写了域名，请在浏览器输入域名访问
+* 如你选择了 `IP+端口`，请在浏览器地输入 `http://<宝塔面板IP>:6806` 访问
+
+</details>
+
 ### 内部预览版
 
 我们会在有重大更新前发布内部预览版，请访问 [https://github.com/siyuan-note/insider](https://github.com/siyuan-note/insider)。

app/.eslintignore

@@ -1,7 +1,6 @@
 build
-dist
 node_modules
-public
 src/asset/pdf
+src/types/dist
 stage
 appearance