Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-07 02:25:57 +02:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/main' into standalone

Browse Source
This commit is contained in:
Elian Doran
2026-03-28 12:29:46 +02:00
parent d084c426fd dc50ca157d
commit 4f6de0c68d
14 changed files with 290 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/build-docs/package.json
View File

@@ -16,7 +16,7 @@
"license": "AGPL-3.0-only",
"packageManager": "pnpm@10.33.0",
"devDependencies": {
"@redocly/cli": "2.25.1",
"@redocly/cli": "2.25.2",
"archiver": "7.0.1",
"fs-extra": "11.3.4",
"js-yaml": "4.1.1",

8
apps/client-standalone/package.json
View File

@@ -23,7 +23,7 @@
"@mermaid-js/layout-elk": "0.2.1",
"@mind-elixir/node-menu": "5.0.1",
"@popperjs/core": "2.11.8",
"@preact/signals": "2.8.2",
"@preact/signals": "2.9.0",
"@sqlite.org/sqlite-wasm": "3.51.1-build2",
"@triliumnext/ckeditor5": "workspace:*",
"@triliumnext/codemirror": "workspace:*",
@@ -52,7 +52,7 @@
"js-sha256": "0.11.1",
"js-sha512": "0.9.0",
"jsplumb": "2.15.6",
"katex": "0.16.43",
"katex": "0.16.44",
"knockout": "3.5.1",
"leaflet": "1.9.4",
"leaflet-gpx": "2.2.0",
@@ -63,7 +63,7 @@
"normalize.css": "8.0.1",
"panzoom": "9.4.4",
"preact": "10.29.0",
"react-i18next": "16.6.6",
"react-i18next": "17.0.0",
"react-window": "2.2.7",
"reveal.js": "6.0.0",
"svg-pan-zoom": "3.6.2",
@@ -82,7 +82,7 @@
"@types/tabulator-tables": "6.3.1",
"copy-webpack-plugin": "14.0.0",
"cross-env": "7.0.3",
"happy-dom": "20.8.8",
"happy-dom": "20.8.9",
"script-loader": "0.7.2",
"vite-plugin-static-copy": "3.4.0"
}

8
apps/client/package.json
View File

@@ -28,7 +28,7 @@
"@mermaid-js/layout-elk": "0.2.1",
"@mind-elixir/node-menu": "5.0.1",
"@popperjs/core": "2.11.8",
"@preact/signals": "2.8.2",
"@preact/signals": "2.9.0",
"@triliumnext/ckeditor5": "workspace:*",
"@triliumnext/codemirror": "workspace:*",
"@triliumnext/commons": "workspace:*",
@@ -58,7 +58,7 @@
"jquery": "4.0.0",
"jquery.fancytree": "2.38.5",
"jsplumb": "2.15.6",
"katex": "0.16.43",
"katex": "0.16.44",
"leaflet": "1.9.4",
"leaflet-gpx": "2.2.0",
"mark.js": "8.11.1",
@@ -68,7 +68,7 @@
"normalize.css": "8.0.1",
"panzoom": "9.4.4",
"preact": "10.29.0",
"react-i18next": "16.6.6",
"react-i18next": "17.0.0",
"react-window": "2.2.7",
"reveal.js": "6.0.0",
"rrule": "2.8.1",
@@ -86,7 +86,7 @@
"@types/mark.js": "8.11.12",
"@types/tabulator-tables": "6.3.1",
"copy-webpack-plugin": "14.0.0",
"happy-dom": "20.8.8",
"happy-dom": "20.8.9",
"lightningcss": "1.32.0",
"script-loader": "0.7.2",
"vite-plugin-static-copy": "3.4.0"

2
apps/desktop/package.json
View File

@@ -36,7 +36,7 @@
"@triliumnext/core": "workspace:*",
"@triliumnext/server": "workspace:*",
"copy-webpack-plugin": "14.0.0",
"electron": "41.0.4",
"electron": "41.1.0",
"@electron-forge/cli": "7.11.1",
"@electron-forge/maker-deb": "7.11.1",
"@electron-forge/maker-dmg": "7.11.1",

2
apps/edit-docs/package.json
View File

@@ -13,7 +13,7 @@
"@triliumnext/desktop": "workspace:*",
"@types/fs-extra": "11.0.4",
"copy-webpack-plugin": "14.0.0",
"electron": "41.0.4",
"electron": "41.1.0",
"fs-extra": "11.3.4"
},
"scripts": {

4
apps/server/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM node:24.14.0-bullseye-slim AS builder
FROM node:24.14.1-bullseye-slim AS builder
RUN corepack enable
# 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/
# We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:24.14.0-bullseye-slim
FROM node:24.14.1-bullseye-slim
# Install only runtime dependencies
RUN apt-get update && \
apt-get install -y --no-install-recommends \

4
apps/server/Dockerfile.alpine
View File

@@ -1,4 +1,4 @@
FROM node:24.14.0-alpine AS builder
FROM node:24.14.1-alpine AS builder
RUN corepack enable
# 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/
# We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:24.14.0-alpine
FROM node:24.14.1-alpine
# Install runtime dependencies
RUN apk add --no-cache su-exec shadow

4
apps/server/Dockerfile.alpine.rootless
View File

@@ -1,4 +1,4 @@
FROM node:24.14.0-alpine AS builder
FROM node:24.14.1-alpine AS builder
RUN corepack enable
# 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/
# We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:24.14.0-alpine
FROM node:24.14.1-alpine
# Create a non-root user with configurable UID/GID
ARG USER=trilium
ARG UID=1001

4
apps/server/Dockerfile.rootless
View File

@@ -1,4 +1,4 @@
FROM node:24.14.0-bullseye-slim AS builder
FROM node:24.14.1-bullseye-slim AS builder
RUN corepack enable
# 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/
# We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:24.14.0-bullseye-slim
FROM node:24.14.1-bullseye-slim
# Create a non-root user with configurable UID/GID
ARG USER=trilium
ARG UID=1001

9
apps/server/package.json
View File

@@ -64,7 +64,7 @@
"@types/ws": "8.18.1",
"@types/xml2js": "0.4.14",
"archiver": "7.0.1",
"axios": "1.13.6",
"axios": "1.14.0",
"bindings": "1.5.0",
"bootstrap": "5.3.8",
"cheerio": "1.2.0",
@@ -76,12 +76,12 @@
"debounce": "3.0.0",
"debug": "4.4.3",
"ejs": "5.0.1",
"electron": "41.0.4",
"electron": "41.1.0",
"electron-debug": "4.1.0",
"electron-window-state": "5.0.3",
"express": "5.2.1",
"express-http-proxy": "2.1.2",
"express-openid-connect": "2.20.0",
"express-openid-connect": "2.20.1",
"express-rate-limit": "8.3.1",
"express-session": "1.19.0",
"file-uri-to-path": "2.0.0",
@@ -113,8 +113,7 @@
"time2fa": "1.4.2",
"tmp": "0.2.5",
"turnish": "1.8.0",
"vite": "8.0.2",
"ws": "8.20.0",
"vite": "8.0.3",
"xml2js": "0.6.2",
"yauzl": "3.2.1"
}

4
apps/website/package.json
View File

@@ -14,7 +14,7 @@
"preact": "10.29.0",
"preact-iso": "2.11.1",
"preact-render-to-string": "6.6.6",
"react-i18next": "16.6.6"
"react-i18next": "17.0.0"
},
"devDependencies": {
"@preact/preset-vite": "2.10.5",
@@ -22,7 +22,7 @@
"eslint-config-preact": "2.0.0",
"typescript": "5.9.3",
"user-agent-data-types": "0.4.3",
"vite": "8.0.2",
"vite": "8.0.3",
"vitest": "4.1.2"
},
"eslintConfig": {

4
package.json
View File

@@ -66,7 +66,7 @@
"eslint-config-prettier": "10.1.8",
"eslint-plugin-playwright": "2.10.1",
"eslint-plugin-simple-import-sort": "12.1.1",
"happy-dom": "20.8.8",
"happy-dom": "20.8.9",
"http-server": "14.1.1",
"jiti": "2.6.1",
"js-yaml": "4.1.1",
@@ -78,7 +78,7 @@
"typescript": "5.9.3",
"typescript-eslint": "8.57.2",
"upath": "2.0.1",
"vite": "8.0.2",
"vite": "8.0.3",
"vite-plugin-dts": "4.5.4",
"vitest": "4.1.2"
},

2
packages/share-theme/package.json
View File

@@ -25,7 +25,7 @@
"license": "Apache-2.0",
"dependencies": {
"fuse.js": "7.1.0",
"katex": "0.16.43",
"katex": "0.16.44",
"mermaid": "11.13.0"
},
"devDependencies": {

503
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff