Skip to content

Commit d06008b

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/export_with_share_theme
2 parents 14b8d0a + 7f22532 commit d06008b

File tree

118 files changed

+2261
-1267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+2261
-1267
lines changed

.github/actions/build-server/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
- name: Set up node & dependencies
1313
uses: actions/setup-node@v6
1414
with:
15-
node-version: 22
15+
node-version: 24
1616
cache: "pnpm"
1717
- name: Install dependencies
1818
shell: bash

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- name: Setup Node.js
7575
uses: actions/setup-node@v6
7676
with:
77-
node-version: '22'
77+
node-version: '24'
7878
cache: 'pnpm'
7979

8080
# Install Node.js dependencies for the TypeScript script

.github/workflows/dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up node & dependencies
3131
uses: actions/setup-node@v6
3232
with:
33-
node-version: 22
33+
node-version: 24
3434
cache: "pnpm"
3535
- run: pnpm install --frozen-lockfile
3636

.github/workflows/main-docker.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Set up node & dependencies
4747
uses: actions/setup-node@v6
4848
with:
49-
node-version: 22
49+
node-version: 24
5050
cache: "pnpm"
5151

5252
- name: Install npm dependencies
@@ -86,12 +86,12 @@ jobs:
8686

8787
- name: Upload Playwright trace
8888
if: failure()
89-
uses: actions/upload-artifact@v4
89+
uses: actions/upload-artifact@v5
9090
with:
9191
name: Playwright trace (${{ matrix.dockerfile }})
9292
path: test-output/playwright/output
9393

94-
- uses: actions/upload-artifact@v4
94+
- uses: actions/upload-artifact@v5
9595
if: ${{ !cancelled() }}
9696
with:
9797
name: Playwright report (${{ matrix.dockerfile }})
@@ -146,7 +146,7 @@ jobs:
146146
- name: Set up node & dependencies
147147
uses: actions/setup-node@v6
148148
with:
149-
node-version: 22
149+
node-version: 24
150150
cache: 'pnpm'
151151

152152
- name: Install dependencies
@@ -209,7 +209,7 @@ jobs:
209209
touch "/tmp/digests/${digest#sha256:}"
210210
211211
- name: Upload digest
212-
uses: actions/upload-artifact@v4
212+
uses: actions/upload-artifact@v5
213213
with:
214214
name: digests-${{ env.PLATFORM_PAIR }}-${{ matrix.dockerfile }}
215215
path: /tmp/digests/*
@@ -223,7 +223,7 @@ jobs:
223223
- build
224224
steps:
225225
- name: Download digests
226-
uses: actions/download-artifact@v5
226+
uses: actions/download-artifact@v6
227227
with:
228228
path: /tmp/digests
229229
pattern: digests-*

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Set up node & dependencies
5353
uses: actions/setup-node@v6
5454
with:
55-
node-version: 22
55+
node-version: 24
5656
cache: 'pnpm'
5757
- name: Install dependencies
5858
run: pnpm install --frozen-lockfile
@@ -89,7 +89,7 @@ jobs:
8989
name: Nightly Build
9090

9191
- name: Publish artifacts
92-
uses: actions/upload-artifact@v4
92+
uses: actions/upload-artifact@v5
9393
if: ${{ github.event_name == 'pull_request' }}
9494
with:
9595
name: TriliumNotes ${{ matrix.os.name }} ${{ matrix.arch }}

.github/workflows/playwright.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: pnpm/action-setup@v4
2525
- uses: actions/setup-node@v6
2626
with:
27-
node-version: 22
27+
node-version: 24
2828
cache: 'pnpm'
2929

3030
- name: Install dependencies
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Upload test report
3737
if: failure()
38-
uses: actions/upload-artifact@v4
38+
uses: actions/upload-artifact@v5
3939
with:
4040
name: e2e report
4141
path: apps/server-e2e/test-output

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Set up node & dependencies
5151
uses: actions/setup-node@v6
5252
with:
53-
node-version: 22
53+
node-version: 24
5454
cache: 'pnpm'
5555
- name: Install dependencies
5656
run: pnpm install --frozen-lockfile
@@ -73,7 +73,7 @@ jobs:
7373
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGN_KEY }}
7474

7575
- name: Upload the artifact
76-
uses: actions/upload-artifact@v4
76+
uses: actions/upload-artifact@v5
7777
with:
7878
name: release-desktop-${{ matrix.os.name }}-${{ matrix.arch }}
7979
path: apps/desktop/upload/*.*
@@ -100,7 +100,7 @@ jobs:
100100
arch: ${{ matrix.arch }}
101101

102102
- name: Upload the artifact
103-
uses: actions/upload-artifact@v4
103+
uses: actions/upload-artifact@v5
104104
with:
105105
name: release-server-linux-${{ matrix.arch }}
106106
path: upload/*.*
@@ -120,7 +120,7 @@ jobs:
120120
docs/Release Notes
121121
122122
- name: Download all artifacts
123-
uses: actions/download-artifact@v5
123+
uses: actions/download-artifact@v6
124124
with:
125125
merge-multiple: true
126126
pattern: release-*

.github/workflows/website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up node & dependencies
3131
uses: actions/setup-node@v6
3232
with:
33-
node-version: 22
33+
node-version: 24
3434
cache: "pnpm"
3535

3636
- name: Install dependencies

_regroup/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
"devDependencies": {
3838
"@playwright/test": "1.56.1",
3939
"@stylistic/eslint-plugin": "5.5.0",
40-
"@types/express": "5.0.3",
41-
"@types/node": "22.18.12",
42-
"@types/yargs": "17.0.33",
40+
"@types/express": "5.0.5",
41+
"@types/node": "24.9.1",
42+
"@types/yargs": "17.0.34",
4343
"@vitest/coverage-v8": "3.2.4",
4444
"eslint": "9.38.0",
4545
"eslint-plugin-simple-import-sort": "12.1.1",

apps/client/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@
5454
"leaflet-gpx": "2.2.0",
5555
"mark.js": "8.11.1",
5656
"marked": "16.4.1",
57-
"mermaid": "11.12.0",
58-
"mind-elixir": "5.3.3",
57+
"mermaid": "11.12.1",
58+
"mind-elixir": "5.3.4",
5959
"normalize.css": "8.0.1",
6060
"panzoom": "9.4.3",
6161
"preact": "10.27.2",
62-
"react-i18next": "16.1.2",
62+
"react-i18next": "16.2.1",
6363
"reveal.js": "5.2.1",
6464
"svg-pan-zoom": "3.6.2",
6565
"tabulator-tables": "6.3.1",
@@ -74,9 +74,9 @@
7474
"@types/leaflet-gpx": "1.3.8",
7575
"@types/mark.js": "8.11.12",
7676
"@types/reveal.js": "5.2.1",
77-
"@types/tabulator-tables": "6.2.11",
77+
"@types/tabulator-tables": "6.3.0",
7878
"copy-webpack-plugin": "13.0.1",
79-
"happy-dom": "20.0.7",
79+
"happy-dom": "20.0.8",
8080
"script-loader": "0.7.2",
8181
"vite-plugin-static-copy": "3.1.4"
8282
}

0 commit comments

Comments
 (0)