Merge branch 'develop' into tree

Author: SiriusXT

.github/workflows/nightly.yml

@@ -11,6 +11,7 @@ on:
   pull_request:
     paths:
       - .github/actions/build-electron/*
+      - .github/workflows/nightly.yml
       - forge.config.cjs
 
 concurrency:
@@ -76,7 +77,7 @@ jobs:
           WINDOWS_SIGN_EXECUTABLE: ${{ vars.WINDOWS_SIGN_EXECUTABLE }}
 
       - name: Publish release
-        uses: softprops/action-gh-release@v2.2.2
+        uses: softprops/action-gh-release@v2.3.2
         if: ${{ github.event_name != 'pull_request' }}
         with:
           make_latest: false
@@ -116,7 +117,7 @@ jobs:
           arch: ${{ matrix.arch }}
 
       - name: Publish release
-        uses: softprops/action-gh-release@v2.2.2
+        uses: softprops/action-gh-release@v2.3.2
         if: ${{ github.event_name != 'pull_request' }}
         with:
           make_latest: false

.github/workflows/release.yml

@@ -114,7 +114,7 @@ jobs:
           path: upload
 
       - name: Publish stable release
-        uses: softprops/action-gh-release@v2.2.2
+        uses: softprops/action-gh-release@v2.3.2
         with:
           draft: false
           body_path: docs/Release Notes/Release Notes/${{ github.ref_name }}.md

.gitignore

@@ -1,5 +1,11 @@
 # See https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
 
+# Workaround for Nx bug: parent .gitignore files with '*' can cause
+# `nx show projects` to return nothing by ignoring subprojects.
+# See: https://github.com/nrwl/nx/issues/27368
+# Unignore everything to ensure Nx detects all projects
+!*
+
 # compiled output
 dist
 tmp
@@ -45,4 +51,4 @@ upload
 .rollup.cache
 *.tsbuildinfo
 
-/result
+/result

_regroup/package.json

@@ -35,7 +35,7 @@
     "chore:generate-openapi": "tsx bin/generate-openapi.js"
   },
   "devDependencies": {    
-    "@playwright/test": "1.52.0",
+    "@playwright/test": "1.53.0",
     "@stylistic/eslint-plugin": "4.4.1",        
     "@types/express": "5.0.3",    
     "@types/node": "22.15.31",    

apps/client/package.json

@@ -51,8 +51,7 @@
     "mind-elixir": "4.6.0",
     "normalize.css": "8.0.1",
     "panzoom": "9.4.3",
-    "react": "19.1.0",
-    "react-dom": "19.1.0",
+    "preact": "10.26.9",
     "split.js": "1.6.5",
     "svg-pan-zoom": "3.6.2",
     "vanilla-js-wheel-zoom": "9.0.4"
@@ -64,18 +63,18 @@
     "@types/leaflet": "1.9.18",
     "@types/leaflet-gpx": "1.3.7",
     "@types/mark.js": "8.11.12",
-    "@types/react": "19.1.7",
-    "@types/react-dom": "19.1.6",
     "copy-webpack-plugin": "13.0.0",
-    "happy-dom": "17.6.3",
+    "happy-dom": "18.0.1",
     "script-loader": "0.7.2",
     "vite-plugin-static-copy": "3.0.0"
   },
   "nx": {
     "name": "client",
     "targets": {
       "serve": {
-        "dependsOn": ["^build"]
+        "dependsOn": [
+          "^build"
+        ]
       }
     }
   }

apps/client/src/translations/cn/translation.json

@@ -1333,7 +1333,7 @@
     "recovery_keys_used": "已使用: {{date}}",
     "recovery_keys_unused": "恢复代码 {{index}} 未使用",
     "oauth_title": "OAuth/OpenID 认证",
-    "oauth_description": "OpenID 是一种标准化方式，允许您使用其他服务（如 Google）的账户登录网站，以验证您的身份。请参阅这些 <a href=\"https://developers.google.com/identity/openid-connect/openid-connect\">指南</a> 通过 Google 设置 OpenID 服务。",
+    "oauth_description": "OpenID 是一种标准化方式，允许您使用其他服务（如 Google）的账号登录网站来验证您的身份。默认的身份提供者是 Google，但您可以更改为任何其他 OpenID 提供者。点击<a href=\"#root/_hidden/_help/_help_Otzi9La2YAUX/_help_WOcw2SLH6tbX/_help_7DAiwaf8Z7Rz\">这里</a>了解更多信息。请参阅这些 <a href=\"https://developers.google.com/identity/openid-connect/openid-connect\">指南</a> 通过 Google 设置 OpenID 服务。",
     "oauth_description_warning": "要启用 OAuth/OpenID，您需要设置 config.ini 文件中的 OAuth/OpenID 基础 URL、客户端 ID 和客户端密钥，并重新启动应用程序。如果要从环境变量设置，请设置 TRILIUM_OAUTH_BASE_URL、TRILIUM_OAUTH_CLIENT_ID 和 TRILIUM_OAUTH_CLIENT_SECRET 环境变量。",
     "oauth_missing_vars": "缺少以下设置项: {{missingVars}}",
     "oauth_user_account": "用户账号：",

apps/client/src/translations/en/translation.json

@@ -1493,7 +1493,7 @@
     "recovery_keys_used": "Used: {{date}}",
     "recovery_keys_unused": "Recovery code {{index}} is unused",
     "oauth_title": "OAuth/OpenID",
-    "oauth_description": "OpenID is a standardized way to let you log into websites using an account from another service, like Google, to verify your identity. Follow these <a href=\"https://developers.google.com/identity/openid-connect/openid-connect\">instructions</a> to setup an OpenID service through Google.",
+    "oauth_description": "OpenID is a standardized way to let you log into websites using an account from another service, like Google, to verify your identity. The default issuer is Google, but you can change it to any other OpenID provider. Check <a href=\"#root/_hidden/_help/_help_Otzi9La2YAUX/_help_WOcw2SLH6tbX/_help_7DAiwaf8Z7Rz\">here</a> for more information. Follow these <a href=\"https://developers.google.com/identity/openid-connect/openid-connect\">instructions</a> to setup an OpenID service through Google.",
     "oauth_description_warning": "To enable OAuth/OpenID, you need to set the OAuth/OpenID base URL, client ID and client secret in the config.ini file and restart the application. If you want to set from environment variables, please set TRILIUM_OAUTH_BASE_URL, TRILIUM_OAUTH_CLIENT_ID and TRILIUM_OAUTH_CLIENT_SECRET.",
     "oauth_missing_vars": "Missing settings: {{variables}}",
     "oauth_user_account": "User Account: ",

apps/client/src/types-assets.d.ts

@@ -3,7 +3,7 @@ declare module "*.png" {
     export default path;
 }
 
-declare module "@triliumnext/ckeditor5/emoji_definitions/en.json?url" {
+declare module "*?url" {
     var path: string;
     export default path;
 }

apps/client/src/types.d.ts

@@ -57,6 +57,8 @@ declare global {
 
         process?: ElectronProcess;
         glob?: CustomGlobals;
+
+        EXCALIDRAW_ASSET_PATH?: string;
     }
 
     interface AutoCompleteConfig {