gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-09 07:58:59 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/api_docs

Browse Source 
; Conflicts:
;	_regroup/package.json
;	pnpm-lock.yaml
This commit is contained in:
Elian Doran 2025-11-02 18:05:02 +02:00
commit 85bfd49d1c
No known key found for this signature in database
22 changed files with 1007 additions and 591 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.nvmrc
View File

@ -1 +1 @@
22.21.0 24.11.0

6
_regroup/package.json
View File

@ -38,16 +38,16 @@
"@playwright/test": "1.56.1", "@playwright/test": "1.56.1",
"@stylistic/eslint-plugin": "5.5.0", "@stylistic/eslint-plugin": "5.5.0",
"@types/express": "5.0.5", "@types/express": "5.0.5",
"@types/node": "24.9.1", "@types/node": "24.9.2",
"@types/yargs": "17.0.34", "@types/yargs": "17.0.34",
"@vitest/coverage-v8": "3.2.4", "@vitest/coverage-v8": "3.2.4",
"eslint": "9.38.0", "eslint": "9.39.0",
"eslint-plugin-simple-import-sort": "12.1.1", "eslint-plugin-simple-import-sort": "12.1.1",
"esm": "3.2.25", "esm": "3.2.25",
"jsdoc": "4.0.5", "jsdoc": "4.0.5",
"lorem-ipsum": "2.0.8", "lorem-ipsum": "2.0.8",
"rcedit": "4.0.1", "rcedit": "4.0.1",
"rimraf": "6.0.1", "rimraf": "6.1.0",
"tslib": "2.8.1" "tslib": "2.8.1"
}, },
"optionalDependencies": { "optionalDependencies": {

10
apps/client/package.json
View File

@ -15,7 +15,7 @@
"circular-deps": "dpdm -T src/**/*.ts --tree=false --warning=false --skip-dynamic-imports=circular" "circular-deps": "dpdm -T src/**/*.ts --tree=false --warning=false --skip-dynamic-imports=circular"
}, },
"dependencies": { "dependencies": {
"@eslint/js": "9.38.0", "@eslint/js": "9.39.0",
"@excalidraw/excalidraw": "0.18.0", "@excalidraw/excalidraw": "0.18.0",
"@fullcalendar/core": "6.1.19", "@fullcalendar/core": "6.1.19",
"@fullcalendar/daygrid": "6.1.19", "@fullcalendar/daygrid": "6.1.19",
@ -37,12 +37,12 @@
"bootstrap": "5.3.8", "bootstrap": "5.3.8",
"boxicons": "2.1.4", "boxicons": "2.1.4",
"color": "5.0.2", "color": "5.0.2",
"dayjs": "1.11.18", "dayjs": "1.11.19",
"dayjs-plugin-utc": "0.1.2", "dayjs-plugin-utc": "0.1.2",
"debounce": "2.2.0", "debounce": "2.2.0",
"draggabilly": "3.0.0", "draggabilly": "3.0.0",
"force-graph": "1.51.0", "force-graph": "1.51.0",
"globals": "16.4.0", "globals": "16.5.0",
"i18next": "25.6.0", "i18next": "25.6.0",
"i18next-http-backend": "3.0.2", "i18next-http-backend": "3.0.2",
"jquery": "3.7.1", "jquery": "3.7.1",
@ -59,7 +59,7 @@
"normalize.css": "8.0.1", "normalize.css": "8.0.1",
"panzoom": "9.4.3", "panzoom": "9.4.3",
"preact": "10.27.2", "preact": "10.27.2",
"react-i18next": "16.2.1", "react-i18next": "16.2.3",
"reveal.js": "5.2.1", "reveal.js": "5.2.1",
"svg-pan-zoom": "3.6.2", "svg-pan-zoom": "3.6.2",
"tabulator-tables": "6.3.1", "tabulator-tables": "6.3.1",
@ -76,7 +76,7 @@
"@types/reveal.js": "5.2.1", "@types/reveal.js": "5.2.1",
"@types/tabulator-tables": "6.3.0", "@types/tabulator-tables": "6.3.0",
"copy-webpack-plugin": "13.0.1", "copy-webpack-plugin": "13.0.1",
"happy-dom": "20.0.8", "happy-dom": "20.0.10",
"script-loader": "0.7.2", "script-loader": "0.7.2",
"vite-plugin-static-copy": "3.1.4" "vite-plugin-static-copy": "3.1.4"
} }

2
apps/desktop/package.json
View File

@ -35,7 +35,7 @@
"@triliumnext/commons": "workspace:*", "@triliumnext/commons": "workspace:*",
"@triliumnext/server": "workspace:*", "@triliumnext/server": "workspace:*",
"copy-webpack-plugin": "13.0.1", "copy-webpack-plugin": "13.0.1",
"electron": "38.4.0", "electron": "38.5.0",
"@electron-forge/cli": "7.10.2", "@electron-forge/cli": "7.10.2",
"@electron-forge/maker-deb": "7.10.2", "@electron-forge/maker-deb": "7.10.2",
"@electron-forge/maker-dmg": "7.10.2", "@electron-forge/maker-dmg": "7.10.2",

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

@ -12,7 +12,7 @@
"@triliumnext/desktop": "workspace:*", "@triliumnext/desktop": "workspace:*",
"@types/fs-extra": "11.0.4", "@types/fs-extra": "11.0.4",
"copy-webpack-plugin": "13.0.1", "copy-webpack-plugin": "13.0.1",
"electron": "38.4.0", "electron": "38.5.0",
"fs-extra": "11.3.2" "fs-extra": "11.3.2"
}, },
"scripts": { "scripts": {

4
apps/server/Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:24.10.0-bullseye-slim AS builder FROM node:24.11.0-bullseye-slim AS builder
RUN corepack enable RUN corepack enable
# Install native dependencies since we might be building cross-platform. # 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 # We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:24.10.0-bullseye-slim FROM node:24.11.0-bullseye-slim
# Install only runtime dependencies # Install only runtime dependencies
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \

4
apps/server/Dockerfile.alpine
View File

@ -1,4 +1,4 @@
FROM node:24.10.0-alpine AS builder FROM node:24.11.0-alpine AS builder
RUN corepack enable RUN corepack enable
# Install native dependencies since we might be building cross-platform. # 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 # We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:24.10.0-alpine FROM node:24.11.0-alpine
# Install runtime dependencies # Install runtime dependencies
RUN apk add --no-cache su-exec shadow RUN apk add --no-cache su-exec shadow

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

@ -1,4 +1,4 @@
FROM node:24.10.0-alpine AS builder FROM node:24.11.0-alpine AS builder
RUN corepack enable RUN corepack enable
# Install native dependencies since we might be building cross-platform. # 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 # We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:24.10.0-alpine FROM node:24.11.0-alpine
# Create a non-root user with configurable UID/GID # Create a non-root user with configurable UID/GID
ARG USER=trilium ARG USER=trilium
ARG UID=1001 ARG UID=1001

4
apps/server/Dockerfile.rootless
View File

@ -1,4 +1,4 @@
FROM node:24.10.0-bullseye-slim AS builder FROM node:24.11.0-bullseye-slim AS builder
RUN corepack enable RUN corepack enable
# Install native dependencies since we might be building cross-platform. # 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 # We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:24.10.0-bullseye-slim FROM node:24.11.0-bullseye-slim
# Create a non-root user with configurable UID/GID # Create a non-root user with configurable UID/GID
ARG USER=trilium ARG USER=trilium
ARG UID=1001 ARG UID=1001

14
apps/server/package.json
View File

@ -30,7 +30,7 @@
"node-html-parser": "7.0.1" "node-html-parser": "7.0.1"
}, },
"devDependencies": { "devDependencies": {
"@anthropic-ai/sdk": "0.67.0", "@anthropic-ai/sdk": "0.68.0",
"@braintree/sanitize-url": "7.1.1", "@braintree/sanitize-url": "7.1.1",
"@electron/remote": "2.1.3", "@electron/remote": "2.1.3",
"@preact/preset-vite": "2.10.2", "@preact/preset-vite": "2.10.2",
@ -67,28 +67,28 @@
"@types/xml2js": "0.4.14", "@types/xml2js": "0.4.14",
"archiver": "7.0.1", "archiver": "7.0.1",
"async-mutex": "0.5.0", "async-mutex": "0.5.0",
"axios": "1.13.0", "axios": "1.13.1",
"bindings": "1.5.0", "bindings": "1.5.0",
"bootstrap": "5.3.8", "bootstrap": "5.3.8",
"chardet": "2.1.0", "chardet": "2.1.1",
"cheerio": "1.1.2", "cheerio": "1.1.2",
"chokidar": "4.0.3", "chokidar": "4.0.3",
"cls-hooked": "4.2.2", "cls-hooked": "4.2.2",
"compression": "1.8.1", "compression": "1.8.1",
"cookie-parser": "1.4.7", "cookie-parser": "1.4.7",
"csrf-csrf": "3.2.2", "csrf-csrf": "3.2.2",
"dayjs": "1.11.18", "dayjs": "1.11.19",
"debounce": "2.2.0", "debounce": "2.2.0",
"debug": "4.4.3", "debug": "4.4.3",
"ejs": "3.1.10", "ejs": "3.1.10",
"electron": "38.4.0", "electron": "38.5.0",
"electron-debug": "4.1.0", "electron-debug": "4.1.0",
"electron-window-state": "5.0.3", "electron-window-state": "5.0.3",
"escape-html": "1.0.3", "escape-html": "1.0.3",
"express": "5.1.0", "express": "5.1.0",
"express-http-proxy": "2.1.2", "express-http-proxy": "2.1.2",
"express-openid-connect": "2.19.2", "express-openid-connect": "2.19.2",
"express-rate-limit": "8.1.0", "express-rate-limit": "8.2.1",
"express-session": "1.18.2", "express-session": "1.18.2",
"file-uri-to-path": "2.0.0", "file-uri-to-path": "2.0.0",
"fs-extra": "11.3.2", "fs-extra": "11.3.2",
@ -109,7 +109,7 @@
"mime-types": "3.0.1", "mime-types": "3.0.1",
"multer": "2.0.2", "multer": "2.0.2",
"normalize-strings": "1.1.1", "normalize-strings": "1.1.1",
"ollama": "0.6.0", "ollama": "0.6.2",
"openai": "6.7.0", "openai": "6.7.0",
"rand-token": "1.0.1", "rand-token": "1.0.1",
"safe-compare": "1.1.4", "safe-compare": "1.1.4",

4
apps/website/package.json
View File

@ -14,11 +14,11 @@
"preact": "10.27.2", "preact": "10.27.2",
"preact-iso": "2.11.0", "preact-iso": "2.11.0",
"preact-render-to-string": "6.6.3", "preact-render-to-string": "6.6.3",
"react-i18next": "16.2.1" "react-i18next": "16.2.3"
}, },
"devDependencies": { "devDependencies": {
"@preact/preset-vite": "2.10.2", "@preact/preset-vite": "2.10.2",
"eslint": "9.38.0", "eslint": "9.39.0",
"eslint-config-preact": "2.0.0", "eslint-config-preact": "2.0.0",
"typescript": "5.9.3", "typescript": "5.9.3",
"user-agent-data-types": "0.4.2", "user-agent-data-types": "0.4.2",

12
package.json
View File

@ -42,16 +42,16 @@
"@playwright/test": "1.56.1", "@playwright/test": "1.56.1",
"@triliumnext/server": "workspace:*", "@triliumnext/server": "workspace:*",
"@types/express": "5.0.5", "@types/express": "5.0.5",
"@types/node": "24.9.1", "@types/node": "24.9.2",
"@vitest/coverage-v8": "3.2.4", "@vitest/coverage-v8": "3.2.4",
"@vitest/ui": "3.2.4", "@vitest/ui": "3.2.4",
"chalk": "5.6.2", "chalk": "5.6.2",
"cross-env": "10.1.0", "cross-env": "10.1.0",
"dpdm": "3.14.0", "dpdm": "3.14.0",
"esbuild": "0.25.11", "esbuild": "0.25.12",
"eslint": "9.38.0", "eslint": "9.39.0",
"eslint-config-prettier": "10.1.8", "eslint-config-prettier": "10.1.8",
"eslint-plugin-playwright": "2.2.2", "eslint-plugin-playwright": "2.3.0",
"eslint-plugin-react-hooks": "7.0.1", "eslint-plugin-react-hooks": "7.0.1",
"happy-dom": "~20.0.0", "happy-dom": "~20.0.0",
"jiti": "2.6.1", "jiti": "2.6.1",
@ -81,7 +81,7 @@
"url": "https://github.com/TriliumNext/Trilium/issues" "url": "https://github.com/TriliumNext/Trilium/issues"
}, },
"homepage": "https://triliumnotes.org", "homepage": "https://triliumnotes.org",
"packageManager": "pnpm@10.19.0", "packageManager": "pnpm@10.20.0",
"pnpm": { "pnpm": {
"patchedDependencies": { "patchedDependencies": {
"@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch", "@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch",
@ -104,7 +104,7 @@
"on-headers@<1.1.0": ">=1.1.0", "on-headers@<1.1.0": ">=1.1.0",
"form-data@>=4.0.0 <4.0.4": ">=4.0.4", "form-data@>=4.0.0 <4.0.4": ">=4.0.4",
"form-data@>=3.0.0 <3.0.4": ">=3.0.4", "form-data@>=3.0.0 <3.0.4": ">=3.0.4",
"node-abi": "4.15.0" "node-abi": "4.17.0"
}, },
"ignoredBuiltDependencies": [ "ignoredBuiltDependencies": [
"sqlite3" "sqlite3"

2
packages/ckeditor5-admonition/package.json
View File

@ -29,7 +29,7 @@
"@vitest/browser": "3.2.4", "@vitest/browser": "3.2.4",
"@vitest/coverage-istanbul": "3.2.4", "@vitest/coverage-istanbul": "3.2.4",
"ckeditor5": "47.1.0", "ckeditor5": "47.1.0",
"eslint": "9.38.0", "eslint": "9.39.0",
"eslint-config-ckeditor5": ">=9.1.0", "eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1", "http-server": "14.1.1",
"lint-staged": "16.2.6", "lint-staged": "16.2.6",

2
packages/ckeditor5-footnotes/package.json
View File

@ -30,7 +30,7 @@
"@vitest/browser": "3.2.4", "@vitest/browser": "3.2.4",
"@vitest/coverage-istanbul": "3.2.4", "@vitest/coverage-istanbul": "3.2.4",
"ckeditor5": "47.1.0", "ckeditor5": "47.1.0",
"eslint": "9.38.0", "eslint": "9.39.0",
"eslint-config-ckeditor5": ">=9.1.0", "eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1", "http-server": "14.1.1",
"lint-staged": "16.2.6", "lint-staged": "16.2.6",

2
packages/ckeditor5-keyboard-marker/package.json
View File

@ -32,7 +32,7 @@
"@vitest/browser": "3.2.4", "@vitest/browser": "3.2.4",
"@vitest/coverage-istanbul": "3.2.4", "@vitest/coverage-istanbul": "3.2.4",
"ckeditor5": "47.1.0", "ckeditor5": "47.1.0",
"eslint": "9.38.0", "eslint": "9.39.0",
"eslint-config-ckeditor5": ">=9.1.0", "eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1", "http-server": "14.1.1",
"lint-staged": "16.2.6", "lint-staged": "16.2.6",

2
packages/ckeditor5-math/package.json
View File

@ -33,7 +33,7 @@
"@vitest/browser": "3.2.4", "@vitest/browser": "3.2.4",
"@vitest/coverage-istanbul": "3.2.4", "@vitest/coverage-istanbul": "3.2.4",
"ckeditor5": "47.1.0", "ckeditor5": "47.1.0",
"eslint": "9.38.0", "eslint": "9.39.0",
"eslint-config-ckeditor5": ">=9.1.0", "eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1", "http-server": "14.1.1",
"lint-staged": "16.2.6", "lint-staged": "16.2.6",

2
packages/ckeditor5-mermaid/package.json
View File

@ -32,7 +32,7 @@
"@vitest/browser": "3.2.4", "@vitest/browser": "3.2.4",
"@vitest/coverage-istanbul": "3.2.4", "@vitest/coverage-istanbul": "3.2.4",
"ckeditor5": "47.1.0", "ckeditor5": "47.1.0",
"eslint": "9.38.0", "eslint": "9.39.0",
"eslint-config-ckeditor5": ">=9.1.0", "eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1", "http-server": "14.1.1",
"lint-staged": "16.2.6", "lint-staged": "16.2.6",

2
packages/ckeditor5/package.json
View File

@ -15,7 +15,7 @@
"ckeditor5-premium-features": "47.1.0" "ckeditor5-premium-features": "47.1.0"
}, },
"devDependencies": { "devDependencies": {
"@smithy/middleware-retry": "4.4.5", "@smithy/middleware-retry": "4.4.6",
"@types/jquery": "3.5.33" "@types/jquery": "3.5.33"
} }
} }

2
packages/codemirror/package.json
View File

@ -50,6 +50,6 @@
"codemirror-lang-elixir": "4.0.0", "codemirror-lang-elixir": "4.0.0",
"codemirror-lang-hcl": "0.1.0", "codemirror-lang-hcl": "0.1.0",
"codemirror-lang-mermaid": "0.5.0", "codemirror-lang-mermaid": "0.5.0",
"eslint-linter-browserify": "9.38.0" "eslint-linter-browserify": "9.39.0"
} }
} }

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

@ -35,8 +35,8 @@
"@typescript-eslint/eslint-plugin": "8.46.2", "@typescript-eslint/eslint-plugin": "8.46.2",
"@typescript-eslint/parser": "8.46.2", "@typescript-eslint/parser": "8.46.2",
"dotenv": "17.2.3", "dotenv": "17.2.3",
"esbuild": "0.25.11", "esbuild": "0.25.12",
"eslint": "9.38.0", "eslint": "9.39.0",
"highlight.js": "11.11.1", "highlight.js": "11.11.1",
"typescript": "5.9.3" "typescript": "5.9.3"
} }

1507
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

3
renovate.json
View File

@ -17,7 +17,8 @@
"**/node_modules/**", "**/node_modules/**",
"apps/edit-docs/demo/**", "apps/edit-docs/demo/**",
"apps/server/src/assets/doc_notes/**", "apps/server/src/assets/doc_notes/**",
"docs/**" "docs/**",
"apps/server/Dockerfile.legacy"
], ],
"html": { "html": {
"enabled": false "enabled": false