Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-10 18:39:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/MFA

Browse Source
This commit is contained in:
Jin 2025-03-26 10:48:16 +01:00
commit 347c644f23
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/build-server/action.yml vendored
View File

@ -11,7 +11,7 @@ runs:
- name: Set up node & dependencies - name: Set up node & dependencies
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 22
cache: "npm" cache: "npm"
- name: Install dependencies - name: Install dependencies
shell: bash shell: bash

2
.github/workflows/dev.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
- name: Set up node & dependencies - name: Set up node & dependencies
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 22
cache: "npm" cache: "npm"
- run: npm ci - run: npm ci

2
.github/workflows/main-docker.yml vendored
View File

@ -45,7 +45,7 @@ jobs:
- name: Set up node & dependencies - name: Set up node & dependencies
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 22
cache: "npm" cache: "npm"
- name: Install npm dependencies - name: Install npm dependencies

2
.github/workflows/nightly.yml vendored
View File

@ -39,7 +39,7 @@ jobs:
- name: Set up node & dependencies - name: Set up node & dependencies
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 22
- name: Install dependencies - name: Install dependencies
run: npm ci run: npm ci
- name: Update nightly version - name: Update nightly version

2
.github/workflows/release.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
- name: Set up node & dependencies - name: Set up node & dependencies
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20 node-version: 22
- name: Run the build - name: Run the build
uses: ./.github/actions/build-electron uses: ./.github/actions/build-electron
with: with:

2
bin/build-server.sh
View File

@ -21,7 +21,7 @@ fi
echo "Selected Arch: $ARCH" echo "Selected Arch: $ARCH"
# Set Node.js version and architecture-specific filename # Set Node.js version and architecture-specific filename
NODE_VERSION=20.15.1 NODE_VERSION=22.14.0
BUILD_DIR="./build" BUILD_DIR="./build"
DIST_DIR="./dist" DIST_DIR="./dist"

2
electron.ts
View File

@ -23,7 +23,7 @@ electronDl({ saveAs: true });
// needed for excalidraw export https://github.com/zadam/trilium/issues/4271 // needed for excalidraw export https://github.com/zadam/trilium/issues/4271
electron.app.commandLine.appendSwitch("enable-experimental-web-platform-features"); electron.app.commandLine.appendSwitch("enable-experimental-web-platform-features");
electron.app.commandLine.appendSwitch("lang", options.getOption("formattingLocale") ?? "en"); electron.app.commandLine.appendSwitch("lang", options.getOptionOrNull("formattingLocale") ?? "en");
electron.app.userAgentFallback = `${electron.app.getName()} ${electron.app.getVersion()}`; electron.app.userAgentFallback = `${electron.app.getName()} ${electron.app.getVersion()}`;