Merge branch 'main' into siriusxt_split

This commit is contained in:
SiriusXT 2025-09-03 14:05:08 +08:00
commit 4e2ffad70d
12 changed files with 381 additions and 339 deletions

2
.nvmrc
View File

@ -1 +1 @@
22.18.0 22.19.0

View File

@ -36,7 +36,7 @@
}, },
"devDependencies": { "devDependencies": {
"@playwright/test": "1.55.0", "@playwright/test": "1.55.0",
"@stylistic/eslint-plugin": "5.2.3", "@stylistic/eslint-plugin": "5.3.1",
"@types/express": "5.0.3", "@types/express": "5.0.3",
"@types/node": "22.18.0", "@types/node": "22.18.0",
"@types/yargs": "17.0.33", "@types/yargs": "17.0.33",
@ -49,7 +49,7 @@
"rcedit": "4.0.1", "rcedit": "4.0.1",
"rimraf": "6.0.1", "rimraf": "6.0.1",
"tslib": "2.8.1", "tslib": "2.8.1",
"typedoc": "0.28.11", "typedoc": "0.28.12",
"typedoc-plugin-missing-exports": "4.1.0" "typedoc-plugin-missing-exports": "4.1.0"
}, },
"optionalDependencies": { "optionalDependencies": {

View File

@ -30,7 +30,7 @@
"autocomplete.js": "0.38.1", "autocomplete.js": "0.38.1",
"bootstrap": "5.3.8", "bootstrap": "5.3.8",
"boxicons": "2.1.4", "boxicons": "2.1.4",
"dayjs": "1.11.14", "dayjs": "1.11.18",
"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",
@ -52,7 +52,7 @@
"normalize.css": "8.0.1", "normalize.css": "8.0.1",
"panzoom": "9.4.3", "panzoom": "9.4.3",
"preact": "10.27.1", "preact": "10.27.1",
"react-i18next": "15.7.2", "react-i18next": "15.7.3",
"split.js": "1.6.5", "split.js": "1.6.5",
"svg-pan-zoom": "3.6.2", "svg-pan-zoom": "3.6.2",
"tabulator-tables": "6.3.1", "tabulator-tables": "6.3.1",

View File

@ -844,7 +844,8 @@
"note_type": "Тип нотатки", "note_type": "Тип нотатки",
"editable": "Редагув.", "editable": "Редагув.",
"basic_properties": "Основні Властивості", "basic_properties": "Основні Властивості",
"language": "Мова" "language": "Мова",
"configure_code_notes": "Конфігурація нотатки з кодом..."
}, },
"book_properties": { "book_properties": {
"view_type": "Тип перегляду", "view_type": "Тип перегляду",
@ -1586,7 +1587,8 @@
"hoist-this-note-workspace": "Закріпити цю нотатку (робочий простір)", "hoist-this-note-workspace": "Закріпити цю нотатку (робочий простір)",
"refresh-saved-search-results": "Оновити збережені результати пошуку", "refresh-saved-search-results": "Оновити збережені результати пошуку",
"create-child-note": "Створити дочірню нотатку", "create-child-note": "Створити дочірню нотатку",
"unhoist": "Відкріпити" "unhoist": "Відкріпити",
"toggle-sidebar": "Перемикання бічної панелі"
}, },
"title_bar_buttons": { "title_bar_buttons": {
"window-on-top": "Тримати вікно зверху" "window-on-top": "Тримати вікно зверху"
@ -1909,8 +1911,8 @@
"open-in-popup": "Швидке редагування" "open-in-popup": "Швидке редагування"
}, },
"shared_info": { "shared_info": {
"shared_publicly": "Ця нотатка опублікована на {{- link}}", "shared_publicly": "Ця нотатка опублікована на {{- link}}.",
"shared_locally": "Цю нотатку опубліковано локально на {{- link}}", "shared_locally": "Цю нотатку опубліковано локально на {{- link}}.",
"help_link": "Щоб отримати допомогу, відвідайте <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">вікі</a>." "help_link": "Щоб отримати допомогу, відвідайте <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">вікі</a>."
}, },
"note_types": { "note_types": {
@ -2018,5 +2020,11 @@
}, },
"units": { "units": {
"percentage": "%" "percentage": "%"
},
"ui-performance": {
"title": "Продуктивність",
"enable-motion": "Увімкнути переходи та анімацію",
"enable-shadows": "Увімкнути тіні",
"enable-backdrop-effects": "Увімкнути фонові ефекти для меню, спливаючих вікон та панелей"
} }
} }

View File

@ -1,4 +1,4 @@
FROM node:22.18.0-bullseye-slim AS builder FROM node:22.19.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:22.18.0-bullseye-slim FROM node:22.19.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 \

View File

@ -1,4 +1,4 @@
FROM node:22.18.0-alpine AS builder FROM node:22.19.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:22.18.0-alpine FROM node:22.19.0-alpine
# Install runtime dependencies # Install runtime dependencies
RUN apk add --no-cache su-exec shadow RUN apk add --no-cache su-exec shadow

View File

@ -1,4 +1,4 @@
FROM node:22.18.0-alpine AS builder FROM node:22.19.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:22.18.0-alpine FROM node:22.19.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

View File

@ -1,4 +1,4 @@
FROM node:22.18.0-bullseye-slim AS builder FROM node:22.19.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:22.18.0-bullseye-slim FROM node:22.19.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

View File

@ -55,7 +55,7 @@
"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.14", "dayjs": "1.11.18",
"debounce": "2.2.0", "debounce": "2.2.0",
"debug": "4.4.1", "debug": "4.4.1",
"ejs": "3.1.10", "ejs": "3.1.10",

View File

@ -81,7 +81,7 @@
"url": "https://github.com/TriliumNext/Notes/issues" "url": "https://github.com/TriliumNext/Notes/issues"
}, },
"homepage": "https://github.com/TriliumNext/Notes#readme", "homepage": "https://github.com/TriliumNext/Notes#readme",
"packageManager": "pnpm@10.15.0", "packageManager": "pnpm@10.15.1",
"pnpm": { "pnpm": {
"patchedDependencies": { "patchedDependencies": {
"@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch", "@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch",

View File

@ -30,7 +30,7 @@
"@codemirror/lang-xml": "6.1.0", "@codemirror/lang-xml": "6.1.0",
"@codemirror/legacy-modes": "6.5.1", "@codemirror/legacy-modes": "6.5.1",
"@codemirror/search": "6.5.11", "@codemirror/search": "6.5.11",
"@codemirror/view": "6.38.1", "@codemirror/view": "6.38.2",
"@fsegurai/codemirror-theme-abcdef": "6.2.2", "@fsegurai/codemirror-theme-abcdef": "6.2.2",
"@fsegurai/codemirror-theme-abyss": "6.2.2", "@fsegurai/codemirror-theme-abyss": "6.2.2",
"@fsegurai/codemirror-theme-android-studio": "6.2.2", "@fsegurai/codemirror-theme-android-studio": "6.2.2",

672
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff