Skip to content

Commit 85bfd49

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/api_docs
; Conflicts: ; _regroup/package.json ; pnpm-lock.yaml
2 parents 3ac2481 + 23f2e1e commit 85bfd49

File tree

22 files changed

+999
-583
lines changed

22 files changed

+999
-583
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.21.0
1+
24.11.0

_regroup/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@
3838
"@playwright/test": "1.56.1",
3939
"@stylistic/eslint-plugin": "5.5.0",
4040
"@types/express": "5.0.5",
41-
"@types/node": "24.9.1",
41+
"@types/node": "24.9.2",
4242
"@types/yargs": "17.0.34",
4343
"@vitest/coverage-v8": "3.2.4",
44-
"eslint": "9.38.0",
44+
"eslint": "9.39.0",
4545
"eslint-plugin-simple-import-sort": "12.1.1",
4646
"esm": "3.2.25",
4747
"jsdoc": "4.0.5",
4848
"lorem-ipsum": "2.0.8",
4949
"rcedit": "4.0.1",
50-
"rimraf": "6.0.1",
51-
"tslib": "2.8.1"
50+
"rimraf": "6.1.0",
51+
"tslib": "2.8.1"
5252
},
5353
"optionalDependencies": {
5454
"appdmg": "0.6.6"

apps/client/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"circular-deps": "dpdm -T src/**/*.ts --tree=false --warning=false --skip-dynamic-imports=circular"
1616
},
1717
"dependencies": {
18-
"@eslint/js": "9.38.0",
18+
"@eslint/js": "9.39.0",
1919
"@excalidraw/excalidraw": "0.18.0",
2020
"@fullcalendar/core": "6.1.19",
2121
"@fullcalendar/daygrid": "6.1.19",
@@ -37,12 +37,12 @@
3737
"bootstrap": "5.3.8",
3838
"boxicons": "2.1.4",
3939
"color": "5.0.2",
40-
"dayjs": "1.11.18",
40+
"dayjs": "1.11.19",
4141
"dayjs-plugin-utc": "0.1.2",
4242
"debounce": "2.2.0",
4343
"draggabilly": "3.0.0",
4444
"force-graph": "1.51.0",
45-
"globals": "16.4.0",
45+
"globals": "16.5.0",
4646
"i18next": "25.6.0",
4747
"i18next-http-backend": "3.0.2",
4848
"jquery": "3.7.1",
@@ -59,7 +59,7 @@
5959
"normalize.css": "8.0.1",
6060
"panzoom": "9.4.3",
6161
"preact": "10.27.2",
62-
"react-i18next": "16.2.1",
62+
"react-i18next": "16.2.3",
6363
"reveal.js": "5.2.1",
6464
"svg-pan-zoom": "3.6.2",
6565
"tabulator-tables": "6.3.1",
@@ -76,7 +76,7 @@
7676
"@types/reveal.js": "5.2.1",
7777
"@types/tabulator-tables": "6.3.0",
7878
"copy-webpack-plugin": "13.0.1",
79-
"happy-dom": "20.0.8",
79+
"happy-dom": "20.0.10",
8080
"script-loader": "0.7.2",
8181
"vite-plugin-static-copy": "3.1.4"
8282
}

apps/desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@triliumnext/commons": "workspace:*",
3636
"@triliumnext/server": "workspace:*",
3737
"copy-webpack-plugin": "13.0.1",
38-
"electron": "38.4.0",
38+
"electron": "38.5.0",
3939
"@electron-forge/cli": "7.10.2",
4040
"@electron-forge/maker-deb": "7.10.2",
4141
"@electron-forge/maker-dmg": "7.10.2",

apps/edit-docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@triliumnext/desktop": "workspace:*",
1313
"@types/fs-extra": "11.0.4",
1414
"copy-webpack-plugin": "13.0.1",
15-
"electron": "38.4.0",
15+
"electron": "38.5.0",
1616
"fs-extra": "11.3.2"
1717
},
1818
"scripts": {

apps/server/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:24.10.0-bullseye-slim AS builder
1+
FROM node:24.11.0-bullseye-slim AS builder
22
RUN corepack enable
33

44
# Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
77
# We have to use --no-frozen-lockfile due to CKEditor patches
88
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
99

10-
FROM node:24.10.0-bullseye-slim
10+
FROM node:24.11.0-bullseye-slim
1111
# Install only runtime dependencies
1212
RUN apt-get update && \
1313
apt-get install -y --no-install-recommends \

apps/server/Dockerfile.alpine

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:24.10.0-alpine AS builder
1+
FROM node:24.11.0-alpine AS builder
22
RUN corepack enable
33

44
# Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
77
# We have to use --no-frozen-lockfile due to CKEditor patches
88
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
99

10-
FROM node:24.10.0-alpine
10+
FROM node:24.11.0-alpine
1111
# Install runtime dependencies
1212
RUN apk add --no-cache su-exec shadow
1313

apps/server/Dockerfile.alpine.rootless

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:24.10.0-alpine AS builder
1+
FROM node:24.11.0-alpine AS builder
22
RUN corepack enable
33

44
# Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
77
# We have to use --no-frozen-lockfile due to CKEditor patches
88
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
99

10-
FROM node:24.10.0-alpine
10+
FROM node:24.11.0-alpine
1111
# Create a non-root user with configurable UID/GID
1212
ARG USER=trilium
1313
ARG UID=1001

apps/server/Dockerfile.rootless

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:24.10.0-bullseye-slim AS builder
1+
FROM node:24.11.0-bullseye-slim AS builder
22
RUN corepack enable
33

44
# Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
77
# We have to use --no-frozen-lockfile due to CKEditor patches
88
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
99

10-
FROM node:24.10.0-bullseye-slim
10+
FROM node:24.11.0-bullseye-slim
1111
# Create a non-root user with configurable UID/GID
1212
ARG USER=trilium
1313
ARG UID=1001

apps/server/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"node-html-parser": "7.0.1"
3131
},
3232
"devDependencies": {
33-
"@anthropic-ai/sdk": "0.67.0",
33+
"@anthropic-ai/sdk": "0.68.0",
3434
"@braintree/sanitize-url": "7.1.1",
3535
"@electron/remote": "2.1.3",
3636
"@preact/preset-vite": "2.10.2",
@@ -67,28 +67,28 @@
6767
"@types/xml2js": "0.4.14",
6868
"archiver": "7.0.1",
6969
"async-mutex": "0.5.0",
70-
"axios": "1.13.0",
70+
"axios": "1.13.1",
7171
"bindings": "1.5.0",
7272
"bootstrap": "5.3.8",
73-
"chardet": "2.1.0",
73+
"chardet": "2.1.1",
7474
"cheerio": "1.1.2",
7575
"chokidar": "4.0.3",
7676
"cls-hooked": "4.2.2",
7777
"compression": "1.8.1",
7878
"cookie-parser": "1.4.7",
7979
"csrf-csrf": "3.2.2",
80-
"dayjs": "1.11.18",
80+
"dayjs": "1.11.19",
8181
"debounce": "2.2.0",
8282
"debug": "4.4.3",
8383
"ejs": "3.1.10",
84-
"electron": "38.4.0",
84+
"electron": "38.5.0",
8585
"electron-debug": "4.1.0",
8686
"electron-window-state": "5.0.3",
8787
"escape-html": "1.0.3",
8888
"express": "5.1.0",
8989
"express-http-proxy": "2.1.2",
9090
"express-openid-connect": "2.19.2",
91-
"express-rate-limit": "8.1.0",
91+
"express-rate-limit": "8.2.1",
9292
"express-session": "1.18.2",
9393
"file-uri-to-path": "2.0.0",
9494
"fs-extra": "11.3.2",
@@ -109,7 +109,7 @@
109109
"mime-types": "3.0.1",
110110
"multer": "2.0.2",
111111
"normalize-strings": "1.1.1",
112-
"ollama": "0.6.0",
112+
"ollama": "0.6.2",
113113
"openai": "6.7.0",
114114
"rand-token": "1.0.1",
115115
"safe-compare": "1.1.4",

0 commit comments

Comments
 (0)