style/center pane: optimize the identification of options pages

Currently translated at 55.4% (81 of 146 strings)

Translation: Trilium Notes/Website
Translate-URL: https://hosted.weblate.org/projects/trilium/website/ar/

.github/workflows/main-docker.yml

@@ -86,12 +86,12 @@ jobs:
 
       - name: Upload Playwright trace
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: Playwright trace (${{ matrix.dockerfile }})
           path: test-output/playwright/output
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         if: ${{ !cancelled() }}
         with:
           name: Playwright report (${{ matrix.dockerfile }})
@@ -209,7 +209,7 @@ jobs:
           touch "/tmp/digests/${digest#sha256:}"
 
       - name: Upload digest
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: digests-${{ env.PLATFORM_PAIR }}-${{ matrix.dockerfile }}
           path: /tmp/digests/*
@@ -223,7 +223,7 @@ jobs:
       - build
     steps:
       - name: Download digests
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           path: /tmp/digests
           pattern: digests-*

.github/workflows/nightly.yml

@@ -89,7 +89,7 @@ jobs:
           name: Nightly Build
 
       - name: Publish artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: ${{ github.event_name == 'pull_request' }}
         with:
           name: TriliumNotes ${{ matrix.os.name }} ${{ matrix.arch }}

.github/workflows/playwright.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: Upload test report
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: e2e report
           path: apps/server-e2e/test-output

.github/workflows/release.yml

@@ -73,7 +73,7 @@ jobs:
           GPG_SIGNING_KEY: ${{ secrets.GPG_SIGN_KEY }}
 
       - name: Upload the artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: release-desktop-${{ matrix.os.name }}-${{ matrix.arch }}
           path: apps/desktop/upload/*.*
@@ -100,7 +100,7 @@ jobs:
           arch: ${{ matrix.arch }}
 
       - name: Upload the artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: release-server-linux-${{ matrix.arch }}
           path: upload/*.*
@@ -120,7 +120,7 @@ jobs:
             docs/Release Notes
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           merge-multiple: true
           pattern: release-*

_regroup/package.json

@@ -39,7 +39,7 @@
     "@stylistic/eslint-plugin": "5.5.0",        
     "@types/express": "5.0.3",    
     "@types/node": "22.18.12",    
-    "@types/yargs": "17.0.33",
+    "@types/yargs": "17.0.34",
     "@vitest/coverage-v8": "3.2.4",
     "eslint": "9.38.0",
     "eslint-plugin-simple-import-sort": "12.1.1",

apps/client/package.json

@@ -55,11 +55,11 @@
     "mark.js": "8.11.1",
     "marked": "16.4.1",
     "mermaid": "11.12.0",
-    "mind-elixir": "5.3.3",
+    "mind-elixir": "5.3.4",
     "normalize.css": "8.0.1",
     "panzoom": "9.4.3",
     "preact": "10.27.2",
-    "react-i18next": "16.1.2",
+    "react-i18next": "16.2.0",
     "reveal.js": "5.2.1",
     "svg-pan-zoom": "3.6.2",
     "tabulator-tables": "6.3.1",
@@ -74,9 +74,9 @@
     "@types/leaflet-gpx": "1.3.8",
     "@types/mark.js": "8.11.12",
     "@types/reveal.js": "5.2.1",
-    "@types/tabulator-tables": "6.2.11",
+    "@types/tabulator-tables": "6.3.0",
     "copy-webpack-plugin": "13.0.1",
-    "happy-dom": "20.0.7",
+    "happy-dom": "20.0.8",
     "script-loader": "0.7.2",
     "vite-plugin-static-copy": "3.1.4"
   }

apps/client/src/share.ts

@@ -9,6 +9,16 @@ async function ensureJQuery() {
     (window as any).$ = $;
 }
 
+async function applyMath() {
+    const anyMathBlock = document.querySelector("#content .math-tex");
+    if (!anyMathBlock) {
+        return;
+    }
+
+    const renderMathInElement = (await import("./services/math.js")).renderMathInElement;
+    renderMathInElement(document.getElementById("content"));
+}
+
 async function formatCodeBlocks() {
     const anyCodeBlock = document.querySelector("#content pre");
     if (!anyCodeBlock) {
@@ -21,4 +31,54 @@ async function formatCodeBlocks() {
 
 async function setupTextNote() {
     formatCodeBlocks();
+    applyMath();
+
+    const setupMermaid = (await import("./share/mermaid.js")).default;
+    setupMermaid();
 }
+
+/**
+ * Fetch note with given ID from backend
+ *
+ * @param noteId of the given note to be fetched. If false, fetches current note.
+ */
+async function fetchNote(noteId: string | null = null) {
+    if (!noteId) {
+        noteId = document.body.getAttribute("data-note-id");
+    }
+
+    const resp = await fetch(`api/notes/${noteId}`);
+
+    return await resp.json();
+}
+
+document.addEventListener(
+    "DOMContentLoaded",
+    () => {
+        const noteType = determineNoteType();
+
+        if (noteType === "text") {
+            setupTextNote();
+        }
+
+        const toggleMenuButton = document.getElementById("toggleMenuButton");
+        const layout = document.getElementById("layout");
+
+        if (toggleMenuButton && layout) {
+            toggleMenuButton.addEventListener("click", () => layout.classList.toggle("showMenu"));
+        }
+    },
+    false
+);
+
+function determineNoteType() {
+    const bodyClass = document.body.className;
+    const match = bodyClass.match(/type-([^\s]+)/);
+    return match ? match[1] : null;
+}
+
+// workaround to prevent webpack from removing "fetchNote" as dead code:
+// add fetchNote as property to the window object
+Object.defineProperty(window, "fetchNote", {
+    value: fetchNote
+});

apps/client/src/share/mermaid.ts

@@ -1,12 +1,7 @@
-export default async function setupMermaid() {
-    const mermaidEls = document.querySelectorAll("#content pre code.language-mermaid");
-    if (mermaidEls.length === 0) {
-        return;
-    }
+import mermaid from "mermaid";
 
-    const mermaid = (await import("mermaid")).default;
-
-    for (const codeBlock of mermaidEls) {
+export default function setupMermaid() {
+    for (const codeBlock of document.querySelectorAll("#content pre code.language-mermaid")) {
         const parentPre = codeBlock.parentElement;
         if (!parentPre) {
             continue;

apps/client/src/stylesheets/theme-next-dark.css

@@ -166,6 +166,9 @@
     --protected-session-active-icon-color: #8edd8e;
     --sync-status-error-pulse-color: #f47871;
 
+    --center-pane-vert-layout-background-color-bgfx: #0c0c0c69;
+    --center-pane-horiz-layout-background-color-bgfx: #1e1e1ec7;
+
     --right-pane-heading-color: gray;
 
     --root-background: var(--left-pane-background-color);
@@ -192,9 +195,9 @@
     --badge-background-color: #ffffff1a;
     --badge-text-color: var(--muted-text-color);
 
-    --promoted-attribute-card-background-color: var(--card-background-color);
-    --promoted-attribute-card-shadow-color: #000000b3;
-
+    --promoted-attribute-card-background-color: #ffffff21;
+    --promoted-attribute-card-shadow: none;
+    
     --floating-button-shadow-color: #00000080;
     --floating-button-background-color: #494949d2;
     --floating-button-color: var(--button-text-color);
@@ -227,8 +230,8 @@
     --card-background-color: #ffffff12;
     --card-background-hover-color: #3c3c3c;
     --card-background-press-color: #464646;
-    --card-border-color: #222222;
-    --card-box-shadow: 0 0 12px rgba(0, 0, 0, 0.15);
+    --card-border-color: transparent;
+    --card-box-shadow: none;
 
     --calendar-color: var(--menu-text-color);
     --calendar-weekday-labels-color: var(--muted-text-color);
@@ -294,4 +297,10 @@ body ::-webkit-calendar-picker-indicator {
 
 body .todo-list input[type="checkbox"]:not(:checked):before {
     border-color: var(--muted-text-color) !important;
+}
+
+.tinted-quick-edit-dialog {
+    --modal-background-color: hsl(var(--custom-color-hue), 8.8%, 11.2%);
+    --modal-border-color: hsl(var(--custom-color-hue), 9.4%, 25.1%);
+    --promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 13.2%, 20.8%);
 }

apps/client/src/stylesheets/theme-next-light.css

@@ -159,6 +159,9 @@
     --protected-session-active-icon-color: #16b516;
     --sync-status-error-pulse-color: #ff5528;
 
+    --center-pane-vert-layout-background-color-bgfx: #ffffff75;
+    --center-pane-horiz-layout-background-color-bgfx: #ffffffd6;
+
     --right-pane-heading-color: gray;
 
     --root-background: var(--left-pane-background-color);
@@ -185,8 +188,8 @@
     --badge-background-color: #00000011;
     --badge-text-color: var(--muted-text-color);
 
-    --promoted-attribute-card-background-color: var(--card-background-color);
-    --promoted-attribute-card-shadow-color: #00000033;
+    --promoted-attribute-card-background-color: #00000014;
+    --promoted-attribute-card-shadow: none;
 
     --floating-button-shadow-color: #00000042;
     --floating-button-background-color: #eaeaeacc;
@@ -223,12 +226,12 @@
 
     --code-block-box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.1), 0px 0px 2px rgba(0, 0, 0, 0.2);
 
-    --card-background-color: var(--accented-background-color);
+    --card-background-color: #0000000d;
     --card-background-hover-color: #f9f9f9;
     --card-background-press-color: #efefef;
-    --card-border-color: #eaeaea;
+    --card-border-color: transparent;
     --card-shadow-color: rgba(0, 0, 0, 0.1);
-    --card-box-shadow: 0 0 12px var(--card-shadow-color);
+    --card-box-shadow: none;
 
     --calendar-color: var(--menu-text-color);
     --calendar-weekday-labels-color: var(--muted-text-color);
@@ -270,4 +273,10 @@
      * The --custom-color-hue variable contains the hue of the user-selected note color.
      * This value is unset for gray tones. */
     --custom-bg-color: hsl(var(--custom-color-hue), 37%, 89%, 1);
+}
+
+.tinted-quick-edit-dialog {
+    --modal-background-color: hsl(var(--custom-color-hue), 56%, 96%);
+    --modal-border-color: hsl(var(--custom-color-hue), 33%, 41%);
+    --promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 40%, 88%);
 }

apps/client/src/stylesheets/theme-next/pages.css

@@ -148,7 +148,7 @@ div.note-detail-empty {
     --options-card-min-width: 500px;
     --options-card-max-width: 900px;
     --options-card-padding: 17px;
-    --options-title-font-size: 1rem;
+    --options-title-font-size: .75rem;
     --options-title-offset: 13px;
 }
 /* Create a gap at the top of the option pages */
@@ -173,8 +173,7 @@ div.note-detail-empty {
 }
 
 .options-section:not(.tn-no-card) {
-    margin: auto;    
-    border-radius: 12px;
+    border-radius: 8px;
     border: 1px solid var(--card-border-color) !important;
     box-shadow: var(--card-box-shadow);
     background: var(--card-background-color);
@@ -182,7 +181,7 @@ div.note-detail-empty {
     margin-bottom: calc(var(--options-title-offset) + 26px) !important;
 }
 
-body.desktop .option-section:not(.tn-no-card) {
+body.desktop .options-section:not(.tn-no-card) {
     min-width: var(--options-card-min-width);
     max-width: var(--options-card-max-width);
 }
@@ -193,9 +192,16 @@ body.desktop .option-section:not(.tn-no-card) {
     padding-bottom: var(--default-padding);
 }
 
+.options-section:not(.tn-no-card) h4,
+.options-section:not(.tn-no-card) h5 {
+    text-transform: uppercase;
+    letter-spacing: .4pt;
+}
+
+
 .options-section:not(.tn-no-card) h4 {
     font-size: var(--options-title-font-size);
-    font-weight: bold;
+    font-weight: 600;
     color: var(--launcher-pane-text-color);
     margin-top: calc(-1 * var(--options-card-padding) - var(--options-title-font-size) - var(--options-title-offset)) !important;
     margin-bottom: calc(var(--options-title-offset) + var(--options-card-padding)) !important;

apps/client/src/stylesheets/theme-next/ribbon.css

@@ -34,6 +34,7 @@
 div.promoted-attributes-container {
     margin-top: 8px;
     margin-bottom: 8px;
+    margin-inline-start: 12px;
 }
 
 /*

apps/client/src/stylesheets/theme-next/shell.css

@@ -8,7 +8,7 @@
 }
 
 :root {
-    --dropdown-backdrop-filter: blur(10px) saturate(6);
+    --dropdown-backdrop-filter: blur(20px) saturate(6);
     --dropdown-border-radius: 10px;
 }
 
@@ -43,13 +43,19 @@ body.background-effects.platform-win32 {
     --tab-background-color: var(--window-background-color-bgfx);
     --new-tab-button-background: var(--window-background-color-bgfx);
     --active-tab-background-color: var(--launcher-pane-horiz-background-color);
+    --root-background: transparent;
 }
 
 body.background-effects.platform-win32.layout-vertical {
     --left-pane-background-color: var(--window-background-color-bgfx);
+    --center-pane-background-color-bgfx: var(--center-pane-vert-layout-background-color-bgfx);
     --background-material: mica;
 }
 
+body.background-effects.platform-win32.layout-horizontal {
+    --center-pane-background-color-bgfx: var(--center-pane-horiz-layout-background-color-bgfx);
+}
+
 body.background-effects.platform-win32,
 body.background-effects.platform-win32 #root-widget {
     background: var(--window-background-color-bgfx) !important;
@@ -59,6 +65,12 @@ body.background-effects.platform-win32.layout-horizontal #horizontal-main-contai
 body.background-effects.platform-win32.layout-vertical #vertical-main-container {
     background-color: var(--root-background);
 }
+
+/* Settings page */
+body.background-effects.platform-win32 #center-pane .note-split.options {
+    --note-split-background-color: var(--center-pane-background-color-bgfx);
+}
+
 /* #endregion */
 
 /* Matches when the left pane is collapsed */
@@ -1171,21 +1183,19 @@ body.layout-vertical .tab-row-widget-is-sorting .note-tab.note-tab-is-dragging .
  * CENTER PANE
  */
 
-#center-pane {
-    background: var(--main-background-color);
-}
-
-.vertical-layout #center-pane {
+ /* The first visible note split */
+.vertical-layout #center-pane .note-split:not(.visible ~ .visible) {
     border-radius: var(--center-pane-border-radius) 0 0 0;
 }
 
-.note-split {
+#center-pane .note-split {
     padding-top: 2px;
+    background-color: var(--note-split-background-color, var(--main-background-color));
     animation: note-entrance 100ms linear;
     /* will-change: opacity; -- causes some weird artifacts to the note menu in split view */
 }
 
-.split-note-container-widget > .gutter {
+#center-pane .split-note-container-widget > .gutter {
     background: var(--root-background) !important;
     transition: background 150ms ease-out;
 }
@@ -1328,8 +1338,7 @@ div.promoted-attribute-cell {
     --pa-card-padding-inline-end: 2px;
     --input-background-color: transparent;
 
-    box-shadow: 1px 1px 2px var(--promoted-attribute-card-shadow-color);
-
+    box-shadow: var(--promoted-attribute-card-shadow);
     display: inline-flex;
     margin: 0;
     border-radius: 8px;

apps/client/src/translations/ar/translation.json

@@ -12,6 +12,9 @@
   "toast": {
     "critical-error": {
       "title": "خطأ فادح"
+    },
+    "widget-error": {
+      "title": "فشل في البدء بعنصر الواجهة"
     }
   },
   "add_link": {
@@ -26,7 +29,8 @@
     "edit_branch_prefix": "تعديل بادئة الفرع",
     "prefix": "البادئة: ",
     "save": "حفظ",
-    "help_on_tree_prefix": "مساعدة حول بادئة الشجرة"
+    "help_on_tree_prefix": "مساعدة حول بادئة الشجرة",
+    "branch_prefix_saved": "تم حفظ بادئة الفرع."
   },
   "bulk_actions": {
     "bulk_actions": "اجراءات جماعية",
@@ -83,7 +87,8 @@
     "workspace_calendar_root": "‎تحديد جذر التقويم لكل مساحة عمل",
     "hide_highlight_widget": "اخفاء عنصر واجهة قائمة التمييزات",
     "is_owned_by_note": "تخص الملاحظة",
-    "and_more": "... و {{count}}مرات اكثر."
+    "and_more": "... و {{count}}مرات اكثر.",
+    "related_notes_title": "ملاحظات اخرى بنفس التسمية"
   },
   "rename_label": {
     "to": "الى",
@@ -127,7 +132,9 @@
     "delete_attachment": "حذف المرفق",
     "upload_new_revision": "رفع مراجعة جديدة",
     "copy_link_to_clipboard": "نسخ الرابط الى الحافظة",
-    "convert_attachment_into_note": "تحويل المرفق الى ملاحظة"
+    "convert_attachment_into_note": "تحويل المرفق الى ملاحظة",
+    "delete_success": "تم حذف المرفق \"{{title}}\" .",
+    "enter_new_name": "ادخل اسم مرفق جديد"
   },
   "calendar": {
     "week": "أسبوع",
@@ -259,7 +266,8 @@
   "note_paths": {
     "search": "بحث",
     "archived": "مؤرشف",
-    "title": "مسارات الملاحظة"
+    "title": "مسارات الملاحظة",
+    "clone_button": "جار نسخ الملاحظة الى مكان جديد..."
   },
   "script_executor": {
     "query": "استعلام",
@@ -372,7 +380,8 @@
     "export_note_title": "تصدير الملاحظة",
     "export_status": "حالة التصدير",
     "export_finished_successfully": "اكتمل التصدير بنجاح.",
-    "export_in_progress": "جار التصدير: {{progressCount}}"
+    "export_in_progress": "جار التصدير: {{progressCount}}",
+    "choose_export_type": "اختر نوع التصدير اولا من فضلك"
   },
   "help": {
     "troubleshooting": "أستكشاف الاخطاء واصلاحها",
@@ -402,7 +411,10 @@
     "movingCloningNotes": "نقل/ استنساخ الملاحظات",
     "deleteNotes": "حذف الملاحظة/ الشجرة الفرعية",
     "collapseWholeTree": "طي شجرة الملاحظة باكملها",
-    "followLink": "اتبع تلرابط تحت المؤشر"
+    "followLink": "اتبع تلرابط تحت المؤشر",
+    "onlyInDesktop": "في سطح المكتب فقط(Electron build)",
+    "createEditLink": "انشاء/ تحرير رابط خارجي",
+    "quickSearch": "الانتقال الى مربع البحث السريع"
   },
   "import": {
     "options": "خيارات",
@@ -465,7 +477,13 @@
     "delete_all_button": "حذف كل المراجعات",
     "settings": "اعدادات مراجعة الملاحظة",
     "diff_not_available": "المقارنة غير متوفرة.",
-    "help_title": "مساعدة حول مراجعات الملاحظة"
+    "help_title": "مساعدة حول مراجعات الملاحظة",
+    "diff_off_hint": "انقر لعرض محتويات الملاحظة",
+    "revisions_deleted": "تم حذف جميع نسخ المراجعات للملاحظة.",
+    "revision_restored": "تم استعادة نسخ المراجعة للملاحظة.",
+    "revision_deleted": "تم حذف مراجعة الملاحظة.",
+    "snapshot_interval": "فاصل زمني لحفظ لقطات اصدارات المراجعة: {{seconds}}",
+    "maximum_revisions": "حد عدد لقطات اصدارات الملاحظة: {{number}}"
   },
   "sort_child_notes": {
     "title": "عنوان",
@@ -479,13 +497,15 @@
     "sorting_direction": "اتجاه الترتيب",
     "natural_sort": "الترتيب الطبيعي",
     "natural_sort_language": "لغات الترتيب الطبيعي",
-    "sort_children_by": "ترتيب العناصر الفرعية حسب..."
+    "sort_children_by": "ترتيب العناصر الفرعية حسب...",
+    "sort_folders_at_top": "ترتيب المجلدات في الاعلى"
   },
   "recent_changes": {
     "undelete_link": "الغاء الحذف",
     "title": "التغيرات الاخيرة",
     "no_changes_message": "لايوجد تغيير لحد الان...",
-    "erase_notes_button": "مسح الملاحظات المحذوفة الان"
+    "erase_notes_button": "مسح الملاحظات المحذوفة الان",
+    "deleted_notes_message": "تم حذف الملاحظات نهائيا."
   },
   "edited_notes": {
     "deleted": "(حذف)",
@@ -705,7 +725,9 @@
     "default_token_name": "رمز جديد",
     "rename_token_title": "اعادة تسمية الرمز",
     "rename_token": "اعادة تسمية هذا الرمز",
-    "create_token": "انشاء رمز PEAPI جديد"
+    "create_token": "انشاء رمز PEAPI جديد",
+    "new_token_title": "رمز ETAPI جديد",
+    "token_created_title": "انشاء رمز ETAPI"
   },
   "password": {
     "heading": "كلمة المرور",
@@ -811,7 +833,8 @@
     "help_on_links": "مساعدة حول الارتباطات التشعبية",
     "notes_to_clone": "ملاحظات للنسخ",
     "target_parent_note": "الملاحظة الاصلية الهدف",
-    "clone_to_selected_note": "استنساخ الى الملاحظة المحددة"
+    "clone_to_selected_note": "استنساخ الى الملاحظة المحددة",
+    "no_path_to_clone_to": "لايوجد مسار لنسخ المحتوى الية."
   },
   "table_of_contents": {
     "unit": "عناوين",
@@ -1029,7 +1052,8 @@
   },
   "delete_note": {
     "delete_note": "حذف الملاحظة",
-    "delete_matched_notes": "حف الملاحظات المطابقة"
+    "delete_matched_notes": "حف الملاحظات المطابقة",
+    "delete_matched_notes_description": "سوف يؤدي هذا الى حذف الملاحظات المطابقة."
   },
   "rename_note": {
     "rename_note": "اعادة تسمية الملاحظة",
@@ -1312,7 +1336,8 @@
     "notes_to_move": "الملاحظات المراد نقلها",
     "target_parent_note": "ملاحظة الاصل الهدف",
     "dialog_title": "انقل الملاحظات الى...",
-    "move_button": "نقل الىالملاحظة المحددة"
+    "move_button": "نقل الىالملاحظة المحددة",
+    "error_no_path": "لايوجد مسار لنقل العنصر الية."
   },
   "delete_revisions": {
     "delete_note_revisions": "حذف مراجعات الملاحظة"
@@ -1363,7 +1388,8 @@
     "save_attributes": "حفظ السمات <enter>",
     "add_a_new_attribute": "اضافة سمة جديدة",
     "add_new_label_definition": "اضافة تعريف لتسمية جديدة",
-    "add_new_relation_definition": "اضافة تعريف لعلاقة جديدة"
+    "add_new_relation_definition": "اضافة تعريف لعلاقة جديدة",
+    "add_new_relation": "اضافة علاقة جديدة <kbd data-command=\"addNewRelation\">"
   },
   "zen_mode": {
     "button_exit": "الخروج من وضع Zen"
@@ -1434,5 +1460,8 @@
   },
   "png_export_button": {
     "button_title": "تصدير المخطط كملف PNG"
+  },
+  "protected_session_status": {
+    "inactive": "انقر للدخول الى جلسة محمية"
   }
 }

apps/client/src/translations/de/translation.json

@@ -184,7 +184,8 @@
     },
     "import-status": "Importstatus",
     "in-progress": "Import läuft: {{progress}}",
-    "successful": "Import erfolgreich abgeschlossen."
+    "successful": "Import erfolgreich abgeschlossen.",
+    "importZipRecommendation": "Beim Import einer ZIP-Datei wird die Notizhierarchie aus der Ordnerstruktur im Archiv übernommen."
   },
   "include_note": {
     "dialog_title": "Notiz beifügen",
@@ -1521,7 +1522,9 @@
     "window-on-top": "Dieses Fenster immer oben halten"
   },
   "note_detail": {
-    "could_not_find_typewidget": "Konnte typeWidget für Typ ‚{{type}}‘ nicht finden"
+    "could_not_find_typewidget": "Konnte typeWidget für Typ ‚{{type}}‘ nicht finden",
+    "printing": "Druckvorgang läuft…",
+    "printing_pdf": "PDF-Export läuft…"
   },
   "note_title": {
     "placeholder": "Titel der Notiz hier eingeben…"

apps/client/src/translations/en/translation.json

@@ -104,8 +104,7 @@
     "export_status": "Export status",
     "export_in_progress": "Export in progress: {{progressCount}}",
     "export_finished_successfully": "Export finished successfully.",
-    "format_pdf": "PDF - for printing or sharing purposes.",
-    "share-format": "HTML for web publishing - uses the same theme that is used shared notes, but can be published as a static website."
+    "format_pdf": "PDF - for printing or sharing purposes."
   },
   "help": {
     "title": "Cheatsheet",

apps/client/src/translations/hu/translation.json

@@ -1 +1,50 @@
-{}
+{
+  "about": {
+    "title": "A Trilium Notes-ról",
+    "homepage": "Kezdőlap:",
+    "app_version": "Alkalmazás verziója:",
+    "db_version": "Adatbázis verzió:",
+    "sync_version": "Verzió szinkronizálás :",
+    "build_revision": "Build revízió:",
+    "data_directory": "Adatkönyvtár:",
+    "build_date": "Build dátum:"
+  },
+  "toast": {
+    "critical-error": {
+      "title": "Kritikus hiba",
+      "message": "Kritikus hiba történt, amely megakadályozza a kliensalkalmazás indítását:\n\n{{message}}\n\nEzt valószínűleg egy váratlan szkripthiba okozza. Próbálja meg biztonságos módban elindítani az alkalmazást, és hárítsa el a problémát."
+    },
+    "widget-error": {
+      "title": "Nem sikerült inicializálni egy widgetet",
+      "message-custom": "A(z) \"{{id}}\" azonosítójú, \"{{title}}\" című jegyzetből származó egyéni widget inicializálása sikertelen volt a következő ok miatt:\n\n{{message}}",
+      "message-unknown": "Ismeretlen widget inicializálása sikertelen volt a következő ok miatt:\n\n{{message}}"
+    },
+    "bundle-error": {
+      "title": "Nem sikerült betölteni az egyéni szkriptet",
+      "message": "A(z) \"{{id}}\" azonosítójú, \"{{title}}\" című jegyzetből származó szkript nem hajtható végre a következő ok miatt:\n\n{{message}}"
+    }
+  },
+  "add_link": {
+    "add_link": "Link hozzáadása",
+    "help_on_links": "Segítség a linkekhez",
+    "note": "Jegyzet",
+    "search_note": "név szerinti jegyzetkeresés",
+    "link_title_mirrors": "A link cím tükrözi a jegyzet aktuális címét",
+    "link_title_arbitrary": "link cím önkényesen módosítható",
+    "link_title": "Link cím",
+    "button_add_link": "Link hozzáadása"
+  },
+  "branch_prefix": {
+    "edit_branch_prefix": "Az elágazás előtagjának szerkesztése",
+    "help_on_tree_prefix": "Segítség a fa előtagján",
+    "prefix": "Az előtag: ",
+    "save": "Mentés"
+  },
+  "bulk_actions": {
+    "bulk_actions": "Tömeges akciók",
+    "affected_notes": "Érintett jegyzetek",
+    "labels": "Címkék",
+    "relations": "Kapcsolatok",
+    "notes": "Jegyzetek"
+  }
+}

apps/client/src/widgets/FloatingButtons.css

@@ -6,7 +6,7 @@
 .floating-buttons-children,
 .show-floating-buttons {
     position: absolute;
-    top: var(--floating-buttons-vert-offset, 10px);
+    top: var(--floating-buttons-vert-offset, 14px);
     inset-inline-end: var(--floating-buttons-horiz-offset, 10px);
     display: flex;
     flex-direction: row;

apps/client/src/widgets/dialogs/export.tsx

@@ -79,8 +79,7 @@ export default function ExportDialog() {
                         values={[
                             { value: "html", label: t("export.format_html_zip") },
                             { value: "markdown", label: t("export.format_markdown") },
-                            { value: "opml", label: t("export.format_opml") },
-                            { value: "share", label: t("export.share-format") }
+                            { value: "opml", label: t("export.format_opml") }
                         ]}
                     />
 

apps/client/src/widgets/dialogs/popup_editor.ts

@@ -57,17 +57,19 @@ const TPL = /*html*/`\
         }
     </style>
 
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <div class="modal-title">
-                    <!-- This is where the first child will be injected -->
+    <div class="quick-edit-dialog-wrapper">
+        <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <div class="modal-title">
+                        <!-- This is where the first child will be injected -->
+                    </div>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-            </div>
 
-            <div class="modal-body">
-                <!-- This is where all but the first child will be injected. -->
+                <div class="modal-body">
+                    <!-- This is where all but the first child will be injected. -->
+                </div>
             </div>
         </div>
     </div>
@@ -79,6 +81,7 @@ export default class PopupEditorDialog extends Container<BasicWidget> {
     private noteContext: NoteContext;
     private $modalHeader!: JQuery<HTMLElement>;
     private $modalBody!: JQuery<HTMLElement>;
+    private $wrapper!: JQuery<HTMLDivElement>;
 
     constructor() {
         super();
@@ -93,6 +96,7 @@ export default class PopupEditorDialog extends Container<BasicWidget> {
         const $newWidget = $(TPL);
         this.$modalHeader = $newWidget.find(".modal-title");
         this.$modalBody = $newWidget.find(".modal-body");
+        this.$wrapper = $newWidget.find(".quick-edit-dialog-wrapper");
 
         const children = this.$widget.children();
         this.$modalHeader.append(children[0]);
@@ -112,6 +116,21 @@ export default class PopupEditorDialog extends Container<BasicWidget> {
             }
         });
 
+        const colorClass = this.noteContext.note?.getColorClass();
+        const wrapperElement = this.$wrapper.get(0)!;
+
+        if (colorClass) {
+            wrapperElement.className = "quick-edit-dialog-wrapper " + colorClass;
+        } else {
+            wrapperElement.className = "quick-edit-dialog-wrapper";
+        }
+
+        const customHue = getComputedStyle(wrapperElement).getPropertyValue("--custom-color-hue");
+        if (customHue) {
+            /* Apply the tinted-dialog class only if the custom color CSS class specifies a hue */
+            wrapperElement.classList.add("tinted-quick-edit-dialog");
+        }
+
         const activeEl = document.activeElement;
         if (activeEl && "blur" in activeEl) {
             (activeEl as HTMLElement).blur();

apps/client/src/widgets/note_wrapper.ts

@@ -61,7 +61,7 @@ export default class NoteWrapperWidget extends FlexContainer<BasicWidget> {
 
         this.$widget.addClass(utils.getNoteTypeClass(note.type));
         this.$widget.addClass(utils.getMimeTypeClass(note.mime));
-
+        this.$widget.toggleClass("options", note.isOptions());
         this.$widget.toggleClass("protected", note.isProtected);
 
         const noteLanguage = note?.getLabelValue("language");

apps/client/src/widgets/type_widgets/options/etapi.tsx

@@ -101,7 +101,7 @@ function TokenList({ tokens }: { tokens: EtapiToken[] }) {
 
     return (
         tokens.length ? (
-            <div style={{ overflow: "auto", height: "500px"}}>
+            <div style={{ overflow: "auto"}}>
                 <table className="table table-stripped">
                     <thead>
                         <tr>

apps/dump-db/package.json

@@ -13,7 +13,7 @@
   "devDependencies": {
     "@types/better-sqlite3": "7.6.13",
     "@types/mime-types": "3.0.1",
-    "@types/yargs": "17.0.33"
+    "@types/yargs": "17.0.34"
   },
   "scripts": {
     "dev": "tsx src/main.ts",

apps/edit-docs/src/edit-docs.ts

@@ -6,7 +6,7 @@ import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js
 import debounce from "@triliumnext/client/src/services/debounce.js";
 import { extractZip, importData, initializeDatabase, startElectron } from "./utils.js";
 import cls from "@triliumnext/server/src/services/cls.js";
-import type { AdvancedExportOptions, ExportFormat } from "@triliumnext/server/src/services/export/zip/abstract_provider.js";
+import type { AdvancedExportOptions } from "@triliumnext/server/src/services/export/zip.js";
 import { parseNoteMetaFile } from "@triliumnext/server/src/services/in_app_help.js";
 import type NoteMeta from "@triliumnext/server/src/services/meta/note_meta.js";
 
@@ -75,7 +75,7 @@ async function setOptions() {
     optionsService.setOption("compressImages", "false");
 }
 
-async function exportData(noteId: string, format: ExportFormat, outputPath: string, ignoredFiles?: Set<string>) {
+async function exportData(noteId: string, format: "html" | "markdown", outputPath: string, ignoredFiles?: Set<string>) {
     const zipFilePath = "output.zip";
 
     try {

apps/server/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.20.0-bullseye-slim AS builder
+FROM node:22.21.0-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:22.20.0-bullseye-slim
+FROM node:22.21.0-bullseye-slim
 # Install only runtime dependencies
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

apps/server/Dockerfile.alpine

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

apps/server/Dockerfile.alpine.rootless

@@ -1,4 +1,4 @@
-FROM node:22.20.0-alpine AS builder
+FROM node:22.21.0-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:22.20.0-alpine
+FROM node:22.21.0-alpine
 # Create a non-root user with configurable UID/GID
 ARG USER=trilium
 ARG UID=1001

apps/server/Dockerfile.rootless

@@ -1,4 +1,4 @@
-FROM node:22.20.0-bullseye-slim AS builder
+FROM node:22.21.0-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:22.20.0-bullseye-slim
+FROM node:22.21.0-bullseye-slim
 # Create a non-root user with configurable UID/GID
 ARG USER=trilium
 ARG UID=1001

apps/server/package.json

@@ -36,11 +36,11 @@
     "@triliumnext/commons": "workspace:*",
     "@triliumnext/express-partial-content": "workspace:*",
     "@triliumnext/turndown-plugin-gfm": "workspace:*",
-    "@types/archiver": "6.0.3",
+    "@types/archiver": "6.0.4",
     "@types/better-sqlite3": "7.6.13",
     "@types/cls-hooked": "4.3.9",
     "@types/compression": "1.8.1",
-    "@types/cookie-parser": "1.4.9",
+    "@types/cookie-parser": "1.4.10",
     "@types/debounce": "1.2.4",
     "@types/ejs": "3.1.5",
     "@types/escape-html": "1.0.4",
@@ -56,8 +56,7 @@
     "@types/sanitize-html": "2.16.0",
     "@types/sax": "1.2.7",
     "@types/serve-favicon": "2.5.7",
-    "@types/serve-static": "1.15.9",
-    "@types/session-file-store": "1.2.5",
+    "@types/serve-static": "1.15.10",
     "@types/stream-throttle": "0.1.4",
     "@types/supertest": "6.0.3",
     "@types/swagger-ui-express": "4.1.8",
@@ -100,7 +99,7 @@
     "i18next": "25.6.0",
     "i18next-fs-backend": "2.6.0",
     "image-type": "6.0.0",
-    "ini": "5.0.0",
+    "ini": "6.0.0",
     "is-animated": "2.0.2",
     "is-svg": "6.1.0",
     "jimp": "1.6.0",
@@ -110,7 +109,7 @@
     "multer": "2.0.2",
     "normalize-strings": "1.1.1",
     "ollama": "0.6.0",
-    "openai": "6.6.0",
+    "openai": "6.7.0",
     "rand-token": "1.0.1",
     "safe-compare": "1.1.4",
     "sanitize-filename": "1.6.3",
@@ -125,7 +124,7 @@
     "swagger-ui-express": "5.0.1",
     "time2fa": "1.4.2",
     "tmp": "0.2.5",
-    "turndown": "7.2.1",
+    "turndown": "7.2.2",
     "unescape": "1.0.1",
     "vite": "7.1.11",
     "ws": "8.18.3",

apps/server/scripts/build.ts

@@ -7,7 +7,6 @@ async function main() {
 
     // Copy assets
     build.copy("src/assets", "assets/");
-    build.triggerBuildAndCopyTo("packages/share-theme", "share-theme/assets/");
     build.copy("/packages/share-theme/src/templates", "share-theme/templates/");
 
     // Copy node modules dependencies

apps/server/src/assets/translations/ar/server.json

@@ -84,7 +84,9 @@
     "show-backend-log": "فتح صفحة \"سجل الخلفية\"",
     "edit-readonly-note": "تعديل ملاحظة القراءة فقط",
     "attributes-labels-and-relations": "سمات ( تسميات و علاقات)",
-    "render-active-note": "عرض ( اعادة عرض) الملاحظة المؤرشفة"
+    "render-active-note": "عرض ( اعادة عرض) الملاحظة المؤرشفة",
+    "show-help": "فتح دليل التعليمات",
+    "copy-without-formatting": "نسخ النص المحدد بدون تنسيق"
   },
   "setup_sync-from-server": {
     "note": "ملاحظة:",
@@ -196,7 +198,8 @@
     "expand": "توسيع",
     "site-theme": "المظهر العام للموقع",
     "image_alt": "صورة المقال",
-    "on-this-page": "في هذه السفحة"
+    "on-this-page": "في هذه السفحة",
+    "last-updated": "اخر تحديث {{- date}}"
   },
   "hidden_subtree_templates": {
     "description": "الوصف",
@@ -258,7 +261,8 @@
   },
   "share_page": {
     "parent": "الأصل:",
-    "child-notes": "الملاحظات الفرعية:"
+    "child-notes": "الملاحظات الفرعية:",
+    "no-content": "لاتحتوي هذة الملاحظة على محتوى."
   },
   "notes": {
     "duplicate-note-suffix": "(مكرر)",
@@ -339,7 +343,24 @@
     "toggle-system-tray-icon": "تبديل ايقونة علبة النظام",
     "switch-to-first-tab": "التبديل الى التبويب الاول",
     "follow-link-under-cursor": "اتبع الرابط اسفل المؤشر",
-    "paste-markdown-into-text": "لصق نص بتنسبق Markdown"
+    "paste-markdown-into-text": "لصق نص بتنسبق Markdown",
+    "move-note-up-in-hierarchy": "نقل الملاحظة للاعلى في الهيكل",
+    "move-note-down-in-hierarchy": "نقل الملاحظة للاسفل في الهيكل",
+    "select-all-notes-in-parent": "تحديد جميع الملاحظات التابعة للملاحظة الاصل",
+    "add-note-above-to-selection": "اضافة ملاحظة فوق الملاحظة المحددة",
+    "add-note-below-to-selection": "اصافة ملاحظة اسفل الملاحظة المحددة",
+    "add-include-note-to-text": "اضافة الملاحظة الى النص",
+    "toggle-ribbon-tab-image-properties": "اظهار/ اخفاء صورة علامة التبويب في الشريط.",
+    "toggle-ribbon-tab-classic-editor": "عرض/اخفاء تبويب المحور الكلاسيكي",
+    "toggle-ribbon-tab-basic-properties": "عرض/اخفاء تبويب الخصائص الاساسية",
+    "toggle-ribbon-tab-book-properties": "عرض/اخفاء تبويب خصائص الدفتر",
+    "toggle-ribbon-tab-file-properties": "عرض/ادخفاء تبويب خصائص الملف",
+    "toggle-ribbon-tab-owned-attributes": "عرض/اخفاء تبويب المميزات المملوكة",
+    "toggle-ribbon-tab-inherited-attributes": "عرض/اخفاء تبويب السمات الموروثة",
+    "toggle-ribbon-tab-promoted-attributes": "عرض/ اخفاء تبويب السمات المعززة",
+    "toggle-ribbon-tab-note-map": "عرض/اخفاء تبويب خريطة الملاحظات",
+    "toggle-ribbon-tab-similar-notes": "عرض/اخفاء شريط الملاحظات المشابهة",
+    "export-active-note-as-pdf": "تصدير الملاحظة النشطة كملفPDF"
   },
   "share_404": {
     "title": "غير موجود",
@@ -348,6 +369,7 @@
   "weekdayNumber": "الاسبوع{رقم الاسيوع}",
   "quarterNumber": "الربع {رقم الربع}",
   "pdf": {
-    "export_filter": "مستند PDF (.pdf)"
+    "export_filter": "مستند PDF (.pdf)",
+    "unable-to-export-title": "تعذر التصدير كملف PDF"
   }
 }

apps/server/src/assets/translations/de/server.json

@@ -274,7 +274,8 @@
     "export_filter": "PDF Dokument (*.pdf)",
     "unable-to-export-message": "Die aktuelle Notiz konnte nicht als PDF exportiert werden.",
     "unable-to-export-title": "Export als PDF fehlgeschlagen",
-    "unable-to-save-message": "Die ausgewählte Datei konnte nicht beschrieben werden. Erneut versuchen oder ein anderes Ziel auswählen."
+    "unable-to-save-message": "Die ausgewählte Datei konnte nicht beschrieben werden. Erneut versuchen oder ein anderes Ziel auswählen.",
+    "unable-to-print": "Notiz kann nicht gedruckt werden"
   },
   "tray": {
     "tooltip": "Trilium Notes",

apps/server/src/assets/translations/hu/server.json

@@ -23,6 +23,14 @@
     "edit-note-title": "Ugrás fáról a jegyzet részleteihez és a cím szerkesztése",
     "edit-branch-prefix": "\"Ág címjelzésének szerkesztése\" ablak mutatása",
     "clone-notes-to": "Kijelölt jegyzetek másolása",
-    "move-notes-to": "Kijelölt jegyzetek elhelyzése"
+    "move-notes-to": "Kijelölt jegyzetek elhelyzése",
+    "note-clipboard": "Megjegyzés vágólap",
+    "copy-notes-to-clipboard": "Másolja a kiválasztott jegyzeteket a vágólapra",
+    "paste-notes-from-clipboard": "A vágólapról szóló jegyzetek beillesztése aktív jegyzetbe",
+    "cut-notes-to-clipboard": "A kiválasztott jegyzetek kivágása a vágólapra",
+    "select-all-notes-in-parent": "Válassza ki az összes jegyzetet az aktuális jegyzetszintről",
+    "activate-next-tab": "Aktiválja a jobb oldali fület",
+    "activate-previous-tab": "Aktiválja a lapot a bal oldalon",
+    "open-new-window": "Nyiss új üres ablakot"
   }
 }

apps/server/src/becca/entities/bbranch.ts

@@ -278,11 +278,6 @@ class BBranch extends AbstractBeccaEntity<BBranch> {
             });
         }
     }
-
-    getParentNote() {
-        return this.parentNote;
-    }
-
 }
 
 export default BBranch;

apps/server/src/becca/entities/bnote.ts

@@ -1758,26 +1758,6 @@ class BNote extends AbstractBeccaEntity<BNote> {
         return childBranches;
     }
 
-    get encodedTitle() {
-        return encodeURIComponent(this.title);
-    }
-
-    getVisibleChildBranches() {
-        return this.getChildBranches().filter((branch) => !branch.getNote().isLabelTruthy("shareHiddenFromTree"));
-    }
-
-    getVisibleChildNotes() {
-        return this.getVisibleChildBranches().map((branch) => branch.getNote());
-    }
-
-    hasVisibleChildren() {
-        return this.getVisibleChildNotes().length > 0;
-    }
-
-    get shareId() {
-        return this.noteId;
-    }
-
     /**
      * Return an attribute by it's attributeId.  Requires the attribute cache to be available.
      * @param attributeId - the id of the attribute owned by this note

apps/server/src/etapi/notes.ts

@@ -14,7 +14,6 @@ import type { ParsedQs } from "qs";
 import type { NoteParams } from "../services/note-interface.js";
 import type { SearchParams } from "../services/search/services/types.js";
 import type { ValidatorMap } from "./etapi-interface.js";
-import type { ExportFormat } from "../services/export/zip/abstract_provider.js";
 
 function register(router: Router) {
     eu.route(router, "get", "/etapi/notes", (req, res, next) => {
@@ -150,7 +149,7 @@ function register(router: Router) {
         const note = eu.getAndCheckNote(req.params.noteId);
         const format = req.query.format || "html";
 
-        if (typeof format !== "string" || !["html", "markdown", "share"].includes(format)) {
+        if (typeof format !== "string" || !["html", "markdown"].includes(format)) {
             throw new eu.EtapiError(400, "UNRECOGNIZED_EXPORT_FORMAT", `Unrecognized export format '${format}', supported values are 'html' (default) or 'markdown'.`);
         }
 
@@ -160,7 +159,7 @@ function register(router: Router) {
         // (e.g. branchIds are not seen in UI), that we export "note export" instead.
         const branch = note.getParentBranches()[0];
 
-        zipExportService.exportToZip(taskContext, branch, format as ExportFormat, res);
+        zipExportService.exportToZip(taskContext, branch, format as "html" | "markdown", res);
     });
 
     eu.route(router, "post", "/etapi/notes/:noteId/import", (req, res, next) => {

apps/server/src/routes/api/export.ts

@@ -26,7 +26,7 @@ function exportBranch(req: Request, res: Response) {
     const taskContext = new TaskContext(taskId, "export", null);
 
     try {
-        if (type === "subtree" && (format === "html" || format === "markdown" || format === "share")) {
+        if (type === "subtree" && (format === "html" || format === "markdown")) {
             zipExportService.exportToZip(taskContext, branch, format, res);
         } else if (type === "single") {
             if (format !== "html" && format !== "markdown") {

apps/server/src/routes/assets.ts

@@ -32,7 +32,6 @@ async function register(app: express.Application) {
             req.url = `/${assetUrlFragment}` + req.url;
             vite.middlewares(req, res, next);
         });
-        app.use(`/share/assets/`, express.static(path.join(srcRoot, "../../packages/share-theme/dist")));
     } else {
         const publicDir = path.join(resourceDir, "public");
         if (!existsSync(publicDir)) {
@@ -43,7 +42,6 @@ async function register(app: express.Application) {
         app.use(`/${assetUrlFragment}/stylesheets`, persistentCacheStatic(path.join(publicDir, "stylesheets")));
         app.use(`/${assetUrlFragment}/fonts`, persistentCacheStatic(path.join(publicDir, "fonts")));
         app.use(`/${assetUrlFragment}/translations/`, persistentCacheStatic(path.join(publicDir, "translations")));
-        app.use(`/share/assets/`, persistentCacheStatic(path.join(resourceDir, "share-theme/assets")));
         app.use(`/node_modules/`, persistentCacheStatic(path.join(publicDir, "node_modules")));
     }
     app.use(`/${assetUrlFragment}/images`, persistentCacheStatic(path.join(resourceDir, "assets", "images")));

apps/server/src/services/export/single.ts

@@ -9,9 +9,8 @@ import type TaskContext from "../task_context.js";
 import type BBranch from "../../becca/entities/bbranch.js";
 import type { Response } from "express";
 import type BNote from "../../becca/entities/bnote.js";
-import type { ExportFormat } from "./zip/abstract_provider.js";
 
-function exportSingleNote(taskContext: TaskContext<"export">, branch: BBranch, format: ExportFormat, res: Response) {
+function exportSingleNote(taskContext: TaskContext<"export">, branch: BBranch, format: "html" | "markdown", res: Response) {
     const note = branch.getNote();
 
     if (note.type === "image" || note.type === "file") {
@@ -34,7 +33,7 @@ function exportSingleNote(taskContext: TaskContext<"export">, branch: BBranch, f
     taskContext.taskSucceeded(null);
 }
 
-export function mapByNoteType(note: BNote, content: string | Buffer<ArrayBufferLike>, format: ExportFormat) {
+export function mapByNoteType(note: BNote, content: string | Buffer<ArrayBufferLike>, format: "html" | "markdown") {
     let payload, extension, mime;
 
     if (typeof content !== "string") {

apps/server/src/services/export/zip.ts

@@ -1,9 +1,12 @@
 "use strict";
 
+import html from "html";
 import dateUtils from "../date_utils.js";
 import path from "path";
+import mimeTypes from "mime-types";
+import mdService from "./markdown.js";
 import packageInfo from "../../../package.json" with { type: "json" };
-import { getContentDisposition } from "../utils.js";
+import { getContentDisposition, escapeHtml, getResourceDir, isDev } from "../utils.js";
 import protectedSessionService from "../protected_session.js";
 import sanitize from "sanitize-filename";
 import fs from "fs";
@@ -15,48 +18,39 @@ import ValidationError from "../../errors/validation_error.js";
 import type NoteMeta from "../meta/note_meta.js";
 import type AttachmentMeta from "../meta/attachment_meta.js";
 import type AttributeMeta from "../meta/attribute_meta.js";
-import BBranch from "../../becca/entities/bbranch.js";
+import type BBranch from "../../becca/entities/bbranch.js";
 import type { Response } from "express";
 import type { NoteMetaFile } from "../meta/note_meta.js";
-import HtmlExportProvider from "./zip/html.js";
-import { AdvancedExportOptions, type ExportFormat, ZipExportProviderData } from "./zip/abstract_provider.js";
-import MarkdownExportProvider from "./zip/markdown.js";
-import ShareThemeExportProvider from "./zip/share_theme.js";
-import type BNote from "../../becca/entities/bnote.js";
-import { NoteType } from "@triliumnext/commons";
 
-async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch, format: ExportFormat, res: Response | fs.WriteStream, setHeaders = true, zipExportOptions?: AdvancedExportOptions) {
-    if (!["html", "markdown", "share"].includes(format)) {
-        throw new ValidationError(`Only 'html', 'markdown' and 'share' allowed as export format, '${format}' given`);
+type RewriteLinksFn = (content: string, noteMeta: NoteMeta) => string;
+
+export interface AdvancedExportOptions {
+    /**
+     * If `true`, then only the note's content will be kept. If `false` (default), then each page will have its own <html> template.
+     */
+    skipHtmlTemplate?: boolean;
+
+    /**
+     * Provides a custom function to rewrite the links found in HTML or Markdown notes. This method is called for every note imported, if it's of the right type.
+     *
+     * @param originalRewriteLinks the original rewrite links function. Can be used to access the default behaviour without having to reimplement it.
+     * @param getNoteTargetUrl the method to obtain a note's target URL, used internally by `originalRewriteLinks` but can be used here as well.
+     * @returns a function to rewrite the links in HTML or Markdown notes.
+     */
+    customRewriteLinks?: (originalRewriteLinks: RewriteLinksFn, getNoteTargetUrl: (targetNoteId: string, sourceMeta: NoteMeta) => string | null) => RewriteLinksFn;
+}
+
+async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch, format: "html" | "markdown", res: Response | fs.WriteStream, setHeaders = true, zipExportOptions?: AdvancedExportOptions) {
+    if (!["html", "markdown"].includes(format)) {
+        throw new ValidationError(`Only 'html' and 'markdown' allowed as export format, '${format}' given`);
     }
 
     const archive = archiver("zip", {
         zlib: { level: 9 } // Sets the compression level.
     });
-    const rewriteFn = (zipExportOptions?.customRewriteLinks ? zipExportOptions?.customRewriteLinks(rewriteLinks, getNoteTargetUrl) : rewriteLinks);
-    const provider = buildProvider();
 
     const noteIdToMeta: Record<string, NoteMeta> = {};
 
-    function buildProvider() {
-        const providerData: ZipExportProviderData = {
-            getNoteTargetUrl,
-            archive,
-            branch,
-            rewriteFn
-        };
-        switch (format) {
-            case "html":
-                return new HtmlExportProvider(providerData);
-            case "markdown":
-                return new MarkdownExportProvider(providerData);
-            case "share":
-                return new ShareThemeExportProvider(providerData);
-            default:
-                throw new Error();
-        }
-    }
-
     function getUniqueFilename(existingFileNames: Record<string, number>, fileName: string) {
         const lcFileName = fileName.toLowerCase();
 
@@ -78,7 +72,7 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
         }
     }
 
-    function getDataFileName(type: NoteType | null, mime: string, baseFileName: string, existingFileNames: Record<string, number>): string {
+    function getDataFileName(type: string | null, mime: string, baseFileName: string, existingFileNames: Record<string, number>): string {
         let fileName = baseFileName.trim();
         if (!fileName) {
             fileName = "note";
@@ -96,14 +90,36 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
         }
 
         let existingExtension = path.extname(fileName).toLowerCase();
-        const newExtension = provider.mapExtension(type, mime, existingExtension, format);
+        let newExtension;
+
+        // the following two are handled specifically since we always want to have these extensions no matter the automatic detection
+        // and/or existing detected extensions in the note name
+        if (type === "text" && format === "markdown") {
+            newExtension = "md";
+        } else if (type === "text" && format === "html") {
+            newExtension = "html";
+        } else if (mime === "application/x-javascript" || mime === "text/javascript") {
+            newExtension = "js";
+        } else if (type === "canvas" || mime === "application/json") {
+            newExtension = "json";
+        } else if (existingExtension.length > 0) {
+            // if the page already has an extension, then we'll just keep it
+            newExtension = null;
+        } else {
+            if (mime?.toLowerCase()?.trim() === "image/jpg") {
+                newExtension = "jpg";
+            } else if (mime?.toLowerCase()?.trim() === "text/mermaid") {
+                newExtension = "txt";
+            } else {
+                newExtension = mimeTypes.extension(mime) || "dat";
+            }
+        }
 
         // if the note is already named with the extension (e.g. "image.jpg"), then it's silly to append the exact same extension again
         if (newExtension && existingExtension !== `.${newExtension.toLowerCase()}`) {
             fileName += `.${newExtension}`;
         }
 
-
         return getUniqueFilename(existingFileNames, fileName);
     }
 
@@ -129,8 +145,7 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
         const notePath = parentMeta.notePath.concat([note.noteId]);
 
         if (note.noteId in noteIdToMeta) {
-            const extension = provider.mapExtension("text", "text/html", "", format);
-            const fileName = getUniqueFilename(existingFileNames, `${baseFileName}.clone.${extension}`);
+            const fileName = getUniqueFilename(existingFileNames, `${baseFileName}.clone.${format === "html" ? "html" : "md"}`);
 
             const meta: NoteMeta = {
                 isClone: true,
@@ -140,7 +155,7 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
                 prefix: branch.prefix,
                 dataFileName: fileName,
                 type: "text", // export will have text description
-                format: (format === "markdown" ? "markdown" : "html")
+                format: format
             };
             return meta;
         }
@@ -170,7 +185,7 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
         taskContext.increaseProgressCount();
 
         if (note.type === "text") {
-            meta.format = (format === "markdown" ? "markdown" : "html");
+            meta.format = format;
         }
 
         noteIdToMeta[note.noteId] = meta as NoteMeta;
@@ -179,13 +194,10 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
         note.sortChildren();
         const childBranches = note.getChildBranches().filter((branch) => branch?.noteId !== "_hidden");
 
-        let shouldIncludeFile = (!note.isProtected || protectedSessionService.isProtectedSessionAvailable());
-        if (format !== "share") {
-            shouldIncludeFile = shouldIncludeFile && (note.getContent().length > 0 || childBranches.length === 0);
-        }
+        const available = !note.isProtected || protectedSessionService.isProtectedSessionAvailable();
 
         // if it's a leaf, then we'll export it even if it's empty
-        if (shouldIncludeFile) {
+        if (available && (note.getContent().length > 0 || childBranches.length === 0)) {
             meta.dataFileName = getDataFileName(note.type, note.mime, baseFileName, existingFileNames);
         }
 
@@ -261,6 +273,8 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
         return url;
     }
 
+    const rewriteFn = (zipExportOptions?.customRewriteLinks ? zipExportOptions?.customRewriteLinks(rewriteLinks, getNoteTargetUrl) : rewriteLinks);
+
     function rewriteLinks(content: string, noteMeta: NoteMeta): string {
         content = content.replace(/src="[^"]*api\/images\/([a-zA-Z0-9_]+)\/[^"]*"/g, (match, targetNoteId) => {
             const url = getNoteTargetUrl(targetNoteId, noteMeta);
@@ -302,15 +316,53 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
         }
     }
 
-    function prepareContent(title: string, content: string | Buffer, noteMeta: NoteMeta, note?: BNote): string | Buffer {
-        const isText = ["html", "markdown"].includes(noteMeta?.format || "");
-        if (isText) {
+    function prepareContent(title: string, content: string | Buffer, noteMeta: NoteMeta): string | Buffer {
+        if (["html", "markdown"].includes(noteMeta?.format || "")) {
             content = content.toString();
+            content = rewriteFn(content, noteMeta);
         }
 
-        content = provider.prepareContent(title, content, noteMeta, note, branch);
+        if (noteMeta.format === "html" && typeof content === "string") {
+            if (!content.substr(0, 100).toLowerCase().includes("<html") && !zipExportOptions?.skipHtmlTemplate) {
+                if (!noteMeta?.notePath?.length) {
+                    throw new Error("Missing note path.");
+                }
 
-        return content;
+                const cssUrl = `${"../".repeat(noteMeta.notePath.length - 1)}style.css`;
+                const htmlTitle = escapeHtml(title);
+
+                // <base> element will make sure external links are openable - https://github.com/zadam/trilium/issues/1289#issuecomment-704066809
+                content = `<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="${cssUrl}">
+    <base target="_parent">
+    <title data-trilium-title>${htmlTitle}</title>
+</head>
+<body>
+  <div class="content">
+    <h1 data-trilium-h1>${htmlTitle}</h1>
+
+    <div class="ck-content">${content}</div>
+  </div>
+</body>
+</html>`;
+            }
+
+            return content.length < 100_000 ? html.prettyPrint(content, { indent_size: 2 }) : content;
+        } else if (noteMeta.format === "markdown" && typeof content === "string") {
+            let markdownContent = mdService.toMarkdown(content);
+
+            if (markdownContent.trim().length > 0 && !markdownContent.startsWith("# ")) {
+                markdownContent = `# ${title}\r
+${markdownContent}`;
+            }
+
+            return markdownContent;
+        } else {
+            return content;
+        }
     }
 
     function saveNote(noteMeta: NoteMeta, filePathPrefix: string) {
@@ -325,7 +377,7 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
 
             let content: string | Buffer = `<p>This is a clone of a note. Go to its <a href="${targetUrl}">primary location</a>.</p>`;
 
-            content = prepareContent(noteMeta.title, content, noteMeta, undefined);
+            content = prepareContent(noteMeta.title, content, noteMeta);
 
             archive.append(content, { name: filePathPrefix + noteMeta.dataFileName });
 
@@ -341,7 +393,7 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
         }
 
         if (noteMeta.dataFileName) {
-            const content = prepareContent(noteMeta.title, note.getContent(), noteMeta, note);
+            const content = prepareContent(noteMeta.title, note.getContent(), noteMeta);
 
             archive.append(content, {
                 name: filePathPrefix + noteMeta.dataFileName,
@@ -377,21 +429,138 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
         }
     }
 
-    const existingFileNames: Record<string, number> = format === "html" ? { navigation: 0, index: 1 } : {};
-    const rootMeta = createNoteMeta(branch, { notePath: [] }, existingFileNames);
-    if (!rootMeta) {
-        throw new Error("Unable to create root meta.");
+    function saveNavigation(rootMeta: NoteMeta, navigationMeta: NoteMeta) {
+        if (!navigationMeta.dataFileName) {
+            return;
+        }
+
+        function saveNavigationInner(meta: NoteMeta) {
+            let html = "<li>";
+
+            const escapedTitle = escapeHtml(`${meta.prefix ? `${meta.prefix} - ` : ""}${meta.title}`);
+
+            if (meta.dataFileName && meta.noteId) {
+                const targetUrl = getNoteTargetUrl(meta.noteId, rootMeta);
+
+                html += `<a href="${targetUrl}" target="detail">${escapedTitle}</a>`;
+            } else {
+                html += escapedTitle;
+            }
+
+            if (meta.children && meta.children.length > 0) {
+                html += "<ul>";
+
+                for (const child of meta.children) {
+                    html += saveNavigationInner(child);
+                }
+
+                html += "</ul>";
+            }
+
+            return `${html}</li>`;
+        }
+
+        const fullHtml = `<html>
+<head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+    <ul>${saveNavigationInner(rootMeta)}</ul>
+</body>
+</html>`;
+        const prettyHtml = fullHtml.length < 100_000 ? html.prettyPrint(fullHtml, { indent_size: 2 }) : fullHtml;
+
+        archive.append(prettyHtml, { name: navigationMeta.dataFileName });
     }
 
-    const metaFile: NoteMetaFile = {
-        formatVersion: 2,
-        appVersion: packageInfo.version,
-        files: [rootMeta]
-    };
+    function saveIndex(rootMeta: NoteMeta, indexMeta: NoteMeta) {
+        let firstNonEmptyNote;
+        let curMeta = rootMeta;
 
-    provider.prepareMeta(metaFile);
+        if (!indexMeta.dataFileName) {
+            return;
+        }
+
+        while (!firstNonEmptyNote) {
+            if (curMeta.dataFileName && curMeta.noteId) {
+                firstNonEmptyNote = getNoteTargetUrl(curMeta.noteId, rootMeta);
+            }
+
+            if (curMeta.children && curMeta.children.length > 0) {
+                curMeta = curMeta.children[0];
+            } else {
+                break;
+            }
+        }
+
+        const fullHtml = `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<frameset cols="25%,75%">
+    <frame name="navigation" src="navigation.html">
+    <frame name="detail" src="${firstNonEmptyNote}">
+</frameset>
+</html>`;
+
+        archive.append(fullHtml, { name: indexMeta.dataFileName });
+    }
+
+    function saveCss(rootMeta: NoteMeta, cssMeta: NoteMeta) {
+        if (!cssMeta.dataFileName) {
+            return;
+        }
+
+        const cssFile = isDev
+            ? path.join(__dirname, "../../../../../node_modules/ckeditor5/dist/ckeditor5-content.css")
+            : path.join(getResourceDir(), "ckeditor5-content.css");
+
+        archive.append(fs.readFileSync(cssFile, "utf-8"), { name: cssMeta.dataFileName });
+    }
 
     try {
+        const existingFileNames: Record<string, number> = format === "html" ? { navigation: 0, index: 1 } : {};
+        const rootMeta = createNoteMeta(branch, { notePath: [] }, existingFileNames);
+        if (!rootMeta) {
+            throw new Error("Unable to create root meta.");
+        }
+
+        const metaFile: NoteMetaFile = {
+            formatVersion: 2,
+            appVersion: packageInfo.version,
+            files: [rootMeta]
+        };
+
+        let navigationMeta: NoteMeta | null = null;
+        let indexMeta: NoteMeta | null = null;
+        let cssMeta: NoteMeta | null = null;
+
+        if (format === "html") {
+            navigationMeta = {
+                noImport: true,
+                dataFileName: "navigation.html"
+            };
+
+            metaFile.files.push(navigationMeta);
+
+            indexMeta = {
+                noImport: true,
+                dataFileName: "index.html"
+            };
+
+            metaFile.files.push(indexMeta);
+
+            cssMeta = {
+                noImport: true,
+                dataFileName: "style.css"
+            };
+
+            metaFile.files.push(cssMeta);
+        }
+
         for (const noteMeta of Object.values(noteIdToMeta)) {
             // filter out relations which are not inside this export
             noteMeta.attributes = (noteMeta.attributes || []).filter((attr) => {
@@ -415,6 +584,34 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
             }
             return;
         }
+
+        const metaFileJson = JSON.stringify(metaFile, null, "\t");
+
+        archive.append(metaFileJson, { name: "!!!meta.json" });
+
+        saveNote(rootMeta, "");
+
+        if (format === "html") {
+            if (!navigationMeta || !indexMeta || !cssMeta) {
+                throw new Error("Missing meta.");
+            }
+
+            saveNavigation(rootMeta, navigationMeta);
+            saveIndex(rootMeta, indexMeta);
+            saveCss(rootMeta, cssMeta);
+        }
+
+        const note = branch.getNote();
+        const zipFileName = `${branch.prefix ? `${branch.prefix} - ` : ""}${note.getTitleOrProtected() || "note"}.zip`;
+
+        if (setHeaders && "setHeader" in res) {
+            res.setHeader("Content-Disposition", getContentDisposition(zipFileName));
+            res.setHeader("Content-Type", "application/zip");
+        }
+
+        archive.pipe(res);
+        await archive.finalize();
+        taskContext.taskSucceeded(null);
     } catch (e: unknown) {
         const message = `Export failed with error: ${e instanceof Error ? e.message : String(e)}`;
         log.error(message);
@@ -426,30 +623,9 @@ async function exportToZip(taskContext: TaskContext<"export">, branch: BBranch,
             res.status(500).send(message);
         }
     }
-
-    const metaFileJson = JSON.stringify(metaFile, null, "\t");
-
-    archive.append(metaFileJson, { name: "!!!meta.json" });
-
-    saveNote(rootMeta, "");
-
-    provider.afterDone(rootMeta);
-
-    const note = branch.getNote();
-    const zipFileName = `${branch.prefix ? `${branch.prefix} - ` : ""}${note.getTitleOrProtected()}.zip`;
-
-    if (setHeaders && "setHeader" in res) {
-        res.setHeader("Content-Disposition", getContentDisposition(zipFileName));
-        res.setHeader("Content-Type", "application/zip");
-    }
-
-    archive.pipe(res);
-    await archive.finalize();
-
-    taskContext.taskSucceeded(null);
 }
 
-async function exportToZipFile(noteId: string, format: ExportFormat, zipFilePath: string, zipExportOptions?: AdvancedExportOptions) {
+async function exportToZipFile(noteId: string, format: "markdown" | "html", zipFilePath: string, zipExportOptions?: AdvancedExportOptions) {
     const fileOutputStream = fs.createWriteStream(zipFilePath);
     const taskContext = new TaskContext("no-progress-reporting", "export", null);
 

apps/server/src/services/export/zip/abstract_provider.ts

@@ -1,89 +0,0 @@
-import { Archiver } from "archiver";
-import type { default as NoteMeta, NoteMetaFile } from "../../meta/note_meta.js";
-import type BNote from "../../../becca/entities/bnote.js";
-import type BBranch from "../../../becca/entities/bbranch.js";
-import mimeTypes from "mime-types";
-import { NoteType } from "@triliumnext/commons";
-
-type RewriteLinksFn = (content: string, noteMeta: NoteMeta) => string;
-
-export type ExportFormat = "html" | "markdown" | "share";
-
-export interface AdvancedExportOptions {
-    /**
-     * If `true`, then only the note's content will be kept. If `false` (default), then each page will have its own <html> template.
-     */
-    skipHtmlTemplate?: boolean;
-
-    /**
-     * Provides a custom function to rewrite the links found in HTML or Markdown notes. This method is called for every note imported, if it's of the right type.
-     *
-     * @param originalRewriteLinks the original rewrite links function. Can be used to access the default behaviour without having to reimplement it.
-     * @param getNoteTargetUrl the method to obtain a note's target URL, used internally by `originalRewriteLinks` but can be used here as well.
-     * @returns a function to rewrite the links in HTML or Markdown notes.
-     */
-    customRewriteLinks?: (originalRewriteLinks: RewriteLinksFn, getNoteTargetUrl: (targetNoteId: string, sourceMeta: NoteMeta) => string | null) => RewriteLinksFn;
-}
-
-export interface ZipExportProviderData {
-    branch: BBranch;
-    getNoteTargetUrl: (targetNoteId: string, sourceMeta: NoteMeta) => string | null;
-    archive: Archiver;
-    zipExportOptions?: AdvancedExportOptions;
-    rewriteFn: RewriteLinksFn;
-}
-
-export abstract class ZipExportProvider {
-    branch: BBranch;
-    getNoteTargetUrl: (targetNoteId: string, sourceMeta: NoteMeta) => string | null;
-    archive: Archiver;
-    zipExportOptions?: AdvancedExportOptions;
-    rewriteFn: RewriteLinksFn;
-
-    constructor(data: ZipExportProviderData) {
-        this.branch = data.branch;
-        this.getNoteTargetUrl = data.getNoteTargetUrl;
-        this.archive = data.archive;
-        this.zipExportOptions = data.zipExportOptions;
-        this.rewriteFn = data.rewriteFn;
-    }
-
-    abstract prepareMeta(metaFile: NoteMetaFile): void;
-    abstract prepareContent(title: string, content: string | Buffer, noteMeta: NoteMeta, note: BNote | undefined, branch: BBranch): string | Buffer;
-    abstract afterDone(rootMeta: NoteMeta): void;
-
-    /**
-     * Determines the extension of the resulting file for a specific note type.
-     *
-     * @param type the type of the note.
-     * @param mime the mime type of the note.
-     * @param existingExtension the existing extension, including the leading period character.
-     * @param format the format requested for export (e.g. HTML, Markdown).
-     * @returns an extension *without* the leading period character, or `null` to preserve the existing extension instead.
-     */
-    mapExtension(type: NoteType | null, mime: string, existingExtension: string, format: ExportFormat) {
-        // the following two are handled specifically since we always want to have these extensions no matter the automatic detection
-        // and/or existing detected extensions in the note name
-        if (type === "text" && format === "markdown") {
-            return "md";
-        } else if (type === "text" && format === "html") {
-            return "html";
-        } else if (mime === "application/x-javascript" || mime === "text/javascript") {
-            return "js";
-        } else if (type === "canvas" || mime === "application/json") {
-            return "json";
-        } else if (existingExtension.length > 0) {
-            // if the page already has an extension, then we'll just keep it
-            return null;
-        } else {
-            if (mime?.toLowerCase()?.trim() === "image/jpg") {
-                return "jpg";
-            } else if (mime?.toLowerCase()?.trim() === "text/mermaid") {
-                return "txt";
-            } else {
-                return mimeTypes.extension(mime) || "dat";
-            }
-        }
-    }
-
-}

apps/server/src/services/export/zip/html.ts

@@ -1,176 +0,0 @@
-import type NoteMeta from "../../meta/note_meta.js";
-import { escapeHtml, getResourceDir, isDev } from "../../utils";
-import html from "html";
-import { ZipExportProvider } from "./abstract_provider.js";
-import path from "path";
-import fs from "fs";
-
-export default class HtmlExportProvider extends ZipExportProvider {
-
-    private navigationMeta: NoteMeta | null = null;
-    private indexMeta: NoteMeta | null = null;
-    private cssMeta: NoteMeta | null = null;
-
-    prepareMeta(metaFile) {
-        this.navigationMeta = {
-            noImport: true,
-            dataFileName: "navigation.html"
-        };
-        metaFile.files.push(this.navigationMeta);
-
-        this.indexMeta = {
-            noImport: true,
-            dataFileName: "index.html"
-        };
-        metaFile.files.push(this.indexMeta);
-
-        this.cssMeta = {
-            noImport: true,
-            dataFileName: "style.css"
-        };
-        metaFile.files.push(this.cssMeta);
-    }
-
-    prepareContent(title: string, content: string | Buffer, noteMeta: NoteMeta): string | Buffer {
-        if (noteMeta.format === "html" && typeof content === "string") {
-            if (!content.substr(0, 100).toLowerCase().includes("<html") && !this.zipExportOptions?.skipHtmlTemplate) {
-                if (!noteMeta?.notePath?.length) {
-                    throw new Error("Missing note path.");
-                }
-
-                const cssUrl = `${"../".repeat(noteMeta.notePath.length - 1)}style.css`;
-                const htmlTitle = escapeHtml(title);
-
-                // <base> element will make sure external links are openable - https://github.com/zadam/trilium/issues/1289#issuecomment-704066809
-                content = `<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="${cssUrl}">
-    <base target="_parent">
-    <title data-trilium-title>${htmlTitle}</title>
-</head>
-<body>
-    <div class="content">
-    <h1 data-trilium-h1>${htmlTitle}</h1>
-
-    <div class="ck-content">${content}</div>
-    </div>
-</body>
-</html>`;
-            }
-
-            if (content.length < 100_000) {
-                content = html.prettyPrint(content, { indent_size: 2 })
-            }
-            content = this.rewriteFn(content as string, noteMeta);
-            return content;
-        } else {
-            return content;
-        }
-    }
-
-    afterDone(rootMeta: NoteMeta) {
-        if (!this.navigationMeta || !this.indexMeta || !this.cssMeta) {
-            throw new Error("Missing meta.");
-        }
-
-        this.#saveNavigation(rootMeta, this.navigationMeta);
-        this.#saveIndex(rootMeta, this.indexMeta);
-        this.#saveCss(rootMeta, this.cssMeta);
-    }
-
-    #saveNavigationInner(rootMeta: NoteMeta, meta: NoteMeta) {
-        let html = "<li>";
-
-        const escapedTitle = escapeHtml(`${meta.prefix ? `${meta.prefix} - ` : ""}${meta.title}`);
-
-        if (meta.dataFileName && meta.noteId) {
-            const targetUrl = this.getNoteTargetUrl(meta.noteId, rootMeta);
-
-            html += `<a href="${targetUrl}" target="detail">${escapedTitle}</a>`;
-        } else {
-            html += escapedTitle;
-        }
-
-        if (meta.children && meta.children.length > 0) {
-            html += "<ul>";
-
-            for (const child of meta.children) {
-                html += this.#saveNavigationInner(rootMeta, child);
-            }
-
-            html += "</ul>";
-        }
-
-        return `${html}</li>`;
-    }
-
-    #saveNavigation(rootMeta: NoteMeta, navigationMeta: NoteMeta) {
-        if (!navigationMeta.dataFileName) {
-            return;
-        }
-
-        const fullHtml = `<html>
-    <head>
-        <meta charset="utf-8">
-        <link rel="stylesheet" href="style.css">
-    </head>
-    <body>
-        <ul>${this.#saveNavigationInner(rootMeta, rootMeta)}</ul>
-    </body>
-    </html>`;
-        const prettyHtml = fullHtml.length < 100_000 ? html.prettyPrint(fullHtml, { indent_size: 2 }) : fullHtml;
-
-        this.archive.append(prettyHtml, { name: navigationMeta.dataFileName });
-    }
-
-    #saveIndex(rootMeta: NoteMeta, indexMeta: NoteMeta) {
-        let firstNonEmptyNote;
-        let curMeta = rootMeta;
-
-        if (!indexMeta.dataFileName) {
-            return;
-        }
-
-        while (!firstNonEmptyNote) {
-            if (curMeta.dataFileName && curMeta.noteId) {
-                firstNonEmptyNote = this.getNoteTargetUrl(curMeta.noteId, rootMeta);
-            }
-
-            if (curMeta.children && curMeta.children.length > 0) {
-                curMeta = curMeta.children[0];
-            } else {
-                break;
-            }
-        }
-
-        const fullHtml = `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-</head>
-<frameset cols="25%,75%">
-    <frame name="navigation" src="navigation.html">
-    <frame name="detail" src="${firstNonEmptyNote}">
-</frameset>
-</html>`;
-
-        this.archive.append(fullHtml, { name: indexMeta.dataFileName });
-    }
-
-    #saveCss(rootMeta: NoteMeta, cssMeta: NoteMeta) {
-        if (!cssMeta.dataFileName) {
-            return;
-        }
-
-        const cssFile = isDev
-            ? path.join(__dirname, "../../../../../../node_modules/ckeditor5/dist/ckeditor5-content.css")
-            : path.join(getResourceDir(), "ckeditor5-content.css");
-        const cssContent = fs.readFileSync(cssFile, "utf-8");
-        this.archive.append(cssContent, { name: cssMeta.dataFileName });
-    }
-
-}
-

apps/server/src/services/export/zip/markdown.ts

@@ -1,27 +0,0 @@
-import NoteMeta from "../../meta/note_meta"
-import { ZipExportProvider } from "./abstract_provider.js"
-import mdService from "../markdown.js";
-
-export default class MarkdownExportProvider extends ZipExportProvider {
-
-    prepareMeta() { }
-
-    prepareContent(title: string, content: string | Buffer, noteMeta: NoteMeta): string | Buffer {
-        if (noteMeta.format === "markdown" && typeof content === "string") {
-            let markdownContent = mdService.toMarkdown(content);
-
-            if (markdownContent.trim().length > 0 && !markdownContent.startsWith("# ")) {
-                markdownContent = `# ${title}\r
-${markdownContent}`;
-            }
-
-            markdownContent = this.rewriteFn(markdownContent, noteMeta);
-            return markdownContent;
-        } else {
-            return content;
-        }
-    }
-
-    afterDone() { }
-
-}

apps/server/src/services/export/zip/share_theme.ts

@@ -1,117 +0,0 @@
-import { join } from "path";
-import NoteMeta, { NoteMetaFile } from "../../meta/note_meta";
-import { ExportFormat, ZipExportProvider } from "./abstract_provider.js";
-import { RESOURCE_DIR } from "../../resource_dir";
-import { getResourceDir, isDev } from "../../utils";
-import fs from "fs";
-import { renderNoteForExport } from "../../../share/content_renderer";
-import type BNote from "../../../becca/entities/bnote.js";
-import type BBranch from "../../../becca/entities/bbranch.js";
-
-export default class ShareThemeExportProvider extends ZipExportProvider {
-
-    private assetsMeta: NoteMeta[] = [];
-    private indexMeta: NoteMeta | null = null;
-
-    prepareMeta(metaFile: NoteMetaFile): void {
-        const assets = [
-            "style.css",
-            "script.js",
-            "boxicons.css",
-            "boxicons.eot",
-            "boxicons.woff2",
-            "boxicons.woff",
-            "boxicons.ttf",
-            "boxicons.svg",
-            "icon-color.svg"
-        ];
-
-        for (const asset of assets) {
-            const assetMeta = {
-                noImport: true,
-                dataFileName: asset
-            };
-            this.assetsMeta.push(assetMeta);
-            metaFile.files.push(assetMeta);
-        }
-
-        this.indexMeta = {
-            noImport: true,
-            dataFileName: "index.html"
-        };
-
-        metaFile.files.push(this.indexMeta);
-    }
-
-    prepareContent(title: string, content: string | Buffer, noteMeta: NoteMeta, note: BNote | undefined, branch: BBranch): string | Buffer {
-        if (!noteMeta?.notePath?.length) {
-            throw new Error("Missing note path.");
-        }
-        const basePath = "../".repeat(noteMeta.notePath.length - 1);
-
-        if (note) {
-            content = renderNoteForExport(note, branch, basePath, noteMeta.notePath.slice(0, -1));
-            if (typeof content === "string") {
-                content = content.replace(/href="[^"]*\.\/([a-zA-Z0-9_\/]{12})[^"]*"/g, "href=\"#root/$1\"");
-                content = this.rewriteFn(content, noteMeta);
-            }
-        }
-
-        return content;
-    }
-
-    afterDone(rootMeta: NoteMeta): void {
-        this.#saveAssets(rootMeta, this.assetsMeta);
-        this.#saveIndex(rootMeta);
-    }
-
-    mapExtension(type: string | null, mime: string, existingExtension: string, format: ExportFormat): string | null {
-        if (mime.startsWith("image/")) {
-            return null;
-        }
-
-        return "html";
-    }
-
-    #saveIndex(rootMeta: NoteMeta) {
-        if (!this.indexMeta?.dataFileName) {
-            return;
-        }
-
-        const note = this.branch.getNote();
-        const fullHtml = this.prepareContent(rootMeta.title ?? "", note.getContent(), rootMeta, note, this.branch);
-        this.archive.append(fullHtml, { name: this.indexMeta.dataFileName });
-    }
-
-    #saveAssets(rootMeta: NoteMeta, assetsMeta: NoteMeta[]) {
-        for (const assetMeta of assetsMeta) {
-            if (!assetMeta.dataFileName) {
-                continue;
-            }
-
-            let cssContent = getShareThemeAssets(assetMeta.dataFileName);
-            this.archive.append(cssContent, { name: assetMeta.dataFileName });
-        }
-    }
-
-}
-
-function getShareThemeAssets(nameWithExtension: string) {
-    // Rename share.css to style.css.
-    if (nameWithExtension === "style.css") {
-        nameWithExtension = "share.css";
-    } else if (nameWithExtension === "script.js") {
-        nameWithExtension = "share.js";
-    }
-
-    let path: string | undefined;
-    if (nameWithExtension === "icon-color.svg") {
-        path = join(RESOURCE_DIR, "images", nameWithExtension);
-    } else if (isDev) {
-        path = join(getResourceDir(), "..", "..", "client", "dist", "src", nameWithExtension);
-    } else {
-        path = join(getResourceDir(), "public", "src", nameWithExtension);
-    }
-
-    return fs.readFileSync(path);
-}

apps/server/src/services/meta/note_meta.ts

@@ -1,7 +1,6 @@
 import type { NoteType } from "@triliumnext/commons";
 import type AttachmentMeta from "./attachment_meta.js";
 import type AttributeMeta from "./attribute_meta.js";
-import type { ExportFormat } from "../export/zip/abstract_provider.js";
 
 export interface NoteMetaFile {
     formatVersion: number;
@@ -20,7 +19,7 @@ export default interface NoteMeta {
     type?: NoteType;
     mime?: string;
     /** 'html' or 'markdown', applicable to text notes only */
-    format?: ExportFormat;
+    format?: "html" | "markdown";
     dataFileName?: string;
     dirFileName?: string;
     /** this file should not be imported (e.g., HTML navigation) */

apps/server/src/share/content_renderer.ts

@@ -1,22 +1,10 @@
 import { parse, HTMLElement, TextNode } from "node-html-parser";
 import shaca from "./shaca/shaca.js";
-import assetPath, { assetUrlFragment } from "../services/asset_path.js";
+import assetPath from "../services/asset_path.js";
 import shareRoot from "./share_root.js";
 import escapeHtml from "escape-html";
 import type SNote from "./shaca/entities/snote.js";
-import BNote from "../becca/entities/bnote.js";
-import type BBranch from "../becca/entities/bbranch.js";
 import { t } from "i18next";
-import SBranch from "./shaca/entities/sbranch.js";
-import options from "../services/options.js";
-import utils, { isDev, safeExtractMessageAndStackFromError } from "../services/utils.js";
-import ejs from "ejs";
-import log from "../services/log.js";
-import { join } from "path";
-import { readFileSync } from "fs";
-
-const shareAdjustedAssetPath = isDev ? assetPath : `../${assetPath}`;
-const templateCache: Map<string, string> = new Map();
 
 /**
  * Represents the output of the content renderer.
@@ -28,192 +16,7 @@ export interface Result {
     isEmpty?: boolean;
 }
 
-interface Subroot {
-    note?: SNote | BNote;
-    branch?: SBranch | BBranch
-}
-
-function getSharedSubTreeRoot(note: SNote | BNote | undefined): Subroot {
-    if (!note || note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
-        // share root itself is not shared
-        return {};
-    }
-
-    // every path leads to share root, but which one to choose?
-    // for the sake of simplicity, URLs are not note paths
-    const parentBranch = note.getParentBranches()[0];
-
-    if (note instanceof BNote) {
-        return {
-            note,
-            branch: parentBranch
-        }
-    }
-
-    if (parentBranch.parentNoteId === shareRoot.SHARE_ROOT_NOTE_ID) {
-        return {
-            note,
-            branch: parentBranch
-        };
-    }
-
-    return getSharedSubTreeRoot(parentBranch.getParentNote());
-}
-
-export function renderNoteForExport(note: BNote, parentBranch: BBranch, basePath: string, ancestors: string[]) {
-    const subRoot: Subroot = {
-        branch: parentBranch,
-        note: parentBranch.getNote()
-    };
-
-    return renderNoteContentInternal(note, {
-        subRoot,
-        rootNoteId: parentBranch.noteId,
-        cssToLoad: [
-            `${basePath}style.css`,
-            `${basePath}boxicons.css`
-        ],
-        jsToLoad: [
-            `${basePath}script.js`
-        ],
-        logoUrl: `${basePath}icon-color.svg`,
-        ancestors
-    });
-}
-
-export function renderNoteContent(note: SNote) {
-    const subRoot = getSharedSubTreeRoot(note);
-
-    const ancestors: string[] = [];
-    let notePointer = note;
-    while (notePointer.parents[0]?.noteId !== subRoot.note?.noteId) {
-        const pointerParent = notePointer.parents[0];
-        if (!pointerParent) {
-            break;
-        }
-        ancestors.push(pointerParent.noteId);
-        notePointer = pointerParent;
-    }
-
-    // Determine CSS to load.
-    const cssToLoad: string[] = [];
-    if (!note.isLabelTruthy("shareOmitDefaultCss")) {
-        cssToLoad.push(`assets/styles.css`);
-        cssToLoad.push(`assets/scripts.css`);
-    }
-    for (const cssRelation of note.getRelations("shareCss")) {
-        cssToLoad.push(`api/notes/${cssRelation.value}/download`);
-    }
-
-    // Determine JS to load.
-    const jsToLoad: string[] = [
-        "assets/scripts.js"
-    ];
-    for (const jsRelation of note.getRelations("shareJs")) {
-        jsToLoad.push(`api/notes/${jsRelation.value}/download`);
-    }
-
-    const customLogoId = note.getRelation("shareLogo")?.value;
-    const logoUrl = customLogoId ? `api/images/${customLogoId}/image.png` : `../${assetUrlFragment}/images/icon-color.svg`;
-
-    return renderNoteContentInternal(note, {
-        subRoot,
-        rootNoteId: "_share",
-        cssToLoad,
-        jsToLoad,
-        logoUrl,
-        ancestors
-    });
-}
-
-interface RenderArgs {
-    subRoot: Subroot;
-    rootNoteId: string;
-    cssToLoad: string[];
-    jsToLoad: string[];
-    logoUrl: string;
-    ancestors: string[];
-}
-
-function renderNoteContentInternal(note: SNote | BNote, renderArgs: RenderArgs) {
-    const { header, content, isEmpty } = getContent(note);
-    const showLoginInShareTheme = options.getOption("showLoginInShareTheme");
-    const opts = {
-        note,
-        header,
-        content,
-        isEmpty,
-        assetPath: shareAdjustedAssetPath,
-        assetUrlFragment,
-        showLoginInShareTheme,
-        t,
-        isDev,
-        utils,
-        ...renderArgs
-    };
-
-    // Check if the user has their own template.
-    if (note.hasRelation("shareTemplate")) {
-        // Get the template note and content
-        const templateId = note.getRelation("shareTemplate")?.value;
-        const templateNote = templateId && shaca.getNote(templateId);
-
-        // Make sure the note type is correct
-        if (templateNote && templateNote.type === "code" && templateNote.mime === "application/x-ejs") {
-            // EJS caches the result of this so we don't need to pre-cache
-            const includer = (path: string) => {
-                const childNote = templateNote.children.find((n) => path === n.title);
-                if (!childNote) throw new Error(`Unable to find child note: ${path}.`);
-                if (childNote.type !== "code" || childNote.mime !== "application/x-ejs") throw new Error("Incorrect child note type.");
-
-                const template = childNote.getContent();
-                if (typeof template !== "string") throw new Error("Invalid template content type.");
-
-                return { template };
-            };
-
-            // Try to render user's template, w/ fallback to default view
-            try {
-                const content = templateNote.getContent();
-                if (typeof content === "string") {
-                    return ejs.render(content, opts, { includer });
-                }
-            } catch (e: unknown) {
-                const [errMessage, errStack] = safeExtractMessageAndStackFromError(e);
-                log.error(`Rendering user provided share template (${templateId}) threw exception ${errMessage} with stacktrace: ${errStack}`);
-            }
-        }
-    }
-
-    // Render with the default view otherwise.
-    const templatePath = getDefaultTemplatePath("page");
-    return ejs.render(readTemplate(templatePath), opts, {
-        includer: (path) => {
-            // Path is relative to apps/server/dist/assets/views
-            return { template: readTemplate(getDefaultTemplatePath(path)) };
-        }
-    });
-}
-
-function getDefaultTemplatePath(template: string) {
-    // Path is relative to apps/server/dist/assets/views
-    return process.env.NODE_ENV === "development"
-        ? join(__dirname, `../../../../packages/share-theme/src/templates/${template}.ejs`)
-        : `../../share-theme/templates/${template}.ejs`;
-}
-
-function readTemplate(path: string) {
-    const cachedTemplate = templateCache.get(path);
-    if (cachedTemplate) {
-        return cachedTemplate;
-    }
-
-    const templateString = readFileSync(path, "utf-8");
-    templateCache.set(path, templateString);
-    return templateString;
-}
-
-export function getContent(note: SNote | BNote) {
+export function getContent(note: SNote) {
     if (note.isProtected) {
         return {
             header: "",
@@ -262,7 +65,7 @@ function renderIndex(result: Result) {
     result.content += "</ul>";
 }
 
-function renderText(result: Result, note: SNote | BNote) {
+function renderText(result: Result, note: SNote) {
     if (typeof result.content !== "string") return;
     const document = parse(result.content || "");
 
@@ -371,7 +174,7 @@ export function renderCode(result: Result) {
     }
 }
 
-function renderMermaid(result: Result, note: SNote | BNote) {
+function renderMermaid(result: Result, note: SNote) {
     if (typeof result.content !== "string") {
         return;
     }
@@ -385,11 +188,11 @@ function renderMermaid(result: Result, note: SNote | BNote) {
 </details>`;
 }
 
-function renderImage(result: Result, note: SNote | BNote) {
+function renderImage(result: Result, note: SNote) {
     result.content = `<img src="api/images/${note.noteId}/${note.encodedTitle}?${note.utcDateModified}">`;
 }
 
-function renderFile(note: SNote | BNote, result: Result) {
+function renderFile(note: SNote, result: Result) {
     if (note.mime === "application/pdf") {
         result.content = `<iframe class="pdf-view" src="api/notes/${note.noteId}/view"></iframe>`;
     } else {

apps/server/src/share/routes.ts

@@ -4,12 +4,41 @@ import type { Request, Response, Router } from "express";
 
 import shaca from "./shaca/shaca.js";
 import shacaLoader from "./shaca/shaca_loader.js";
+import shareRoot from "./share_root.js";
+import contentRenderer from "./content_renderer.js";
+import assetPath, { assetUrlFragment } from "../services/asset_path.js";
+import appPath from "../services/app_path.js";
 import searchService from "../services/search/services/search.js";
 import SearchContext from "../services/search/search_context.js";
+import log from "../services/log.js";
 import type SNote from "./shaca/entities/snote.js";
+import type SBranch from "./shaca/entities/sbranch.js";
 import type SAttachment from "./shaca/entities/sattachment.js";
-import { renderNoteContent } from "./content_renderer.js";
-import utils from "../services/utils.js";
+import utils, { isDev, safeExtractMessageAndStackFromError } from "../services/utils.js";
+import options from "../services/options.js";
+import { t } from "i18next";
+import ejs from "ejs";
+import { join } from "path";
+
+function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } {
+    if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
+        // share root itself is not shared
+        return {};
+    }
+
+    // every path leads to share root, but which one to choose?
+    // for the sake of simplicity, URLs are not note paths
+    const parentBranch = note.getParentBranches()[0];
+
+    if (parentBranch.parentNoteId === shareRoot.SHARE_ROOT_NOTE_ID) {
+        return {
+            note,
+            branch: parentBranch
+        };
+    }
+
+    return getSharedSubTreeRoot(parentBranch.getParentNote());
+}
 
 function addNoIndexHeader(note: SNote, res: Response) {
     if (note.isLabelTruthy("shareDisallowRobotIndexing")) {
@@ -80,7 +109,8 @@ function renderImageAttachment(image: SNote, res: Response, attachmentName: stri
     let svgString = "<svg/>";
     const attachment = image.getAttachmentByTitle(attachmentName);
     if (!attachment) {
-
+        res.status(404);
+        renderDefault(res, "404");
         return;
     }
     const content = attachment.getContent();
@@ -108,19 +138,12 @@ function renderImageAttachment(image: SNote, res: Response, attachmentName: stri
     res.send(svg);
 }
 
-function render404(res: Response) {
-    res.status(404);
-    const shareThemePath = `../../share-theme/templates/404.ejs`;
-    res.render(shareThemePath);
-}
-
 function register(router: Router) {
-
     function renderNote(note: SNote, req: Request, res: Response) {
         if (!note) {
             console.log("Unable to find note ", note);
             res.status(404);
-            render404(res);
+            renderDefault(res, "404");
             return;
         }
 
@@ -138,7 +161,63 @@ function register(router: Router) {
             return;
         }
 
-        res.send(renderNoteContent(note));
+        const { header, content, isEmpty } = contentRenderer.getContent(note);
+        const subRoot = getSharedSubTreeRoot(note);
+        const showLoginInShareTheme = options.getOption("showLoginInShareTheme");
+        const opts = {
+            note,
+            header,
+            content,
+            isEmpty,
+            subRoot,
+            assetPath: isDev ? assetPath : `../${assetPath}`,
+            assetUrlFragment,
+            appPath: isDev ? appPath : `../${appPath}`,
+            showLoginInShareTheme,
+            t,
+            isDev,
+            utils
+        };
+        let useDefaultView = true;
+
+        // Check if the user has their own template
+        if (note.hasRelation("shareTemplate")) {
+            // Get the template note and content
+            const templateId = note.getRelation("shareTemplate")?.value;
+            const templateNote = templateId && shaca.getNote(templateId);
+
+            // Make sure the note type is correct
+            if (templateNote && templateNote.type === "code" && templateNote.mime === "application/x-ejs") {
+                // EJS caches the result of this so we don't need to pre-cache
+                const includer = (path: string) => {
+                    const childNote = templateNote.children.find((n) => path === n.title);
+                    if (!childNote) throw new Error(`Unable to find child note: ${path}.`);
+                    if (childNote.type !== "code" || childNote.mime !== "application/x-ejs") throw new Error("Incorrect child note type.");
+
+                    const template = childNote.getContent();
+                    if (typeof template !== "string") throw new Error("Invalid template content type.");
+
+                    return { template };
+                };
+
+                // Try to render user's template, w/ fallback to default view
+                try {
+                    const content = templateNote.getContent();
+                    if (typeof content === "string") {
+                        const ejsResult = ejs.render(content, opts, { includer });
+                        res.send(ejsResult);
+                        useDefaultView = false; // Rendering went okay, don't use default view
+                    }
+                } catch (e: unknown) {
+                    const [errMessage, errStack] = safeExtractMessageAndStackFromError(e);
+                    log.error(`Rendering user provided share template (${templateId}) threw exception ${errMessage} with stacktrace: ${errStack}`);
+                }
+            }
+        }
+
+        if (useDefaultView) {
+            renderDefault(res, "page", opts);
+        }
     }
 
     router.get("/share/", (req, res) => {
@@ -322,6 +401,14 @@ function register(router: Router) {
     });
 }
 
+function renderDefault(res: Response<any, Record<string, any>>, template: "page" | "404", opts: any = {}) {
+    // Path is relative to apps/server/dist/assets/views
+    const shareThemePath = process.env.NODE_ENV === "development"
+        ? join(__dirname, `../../../../packages/share-theme/src/templates/${template}.ejs`)
+        : `../../share-theme/templates/${template}.ejs`;
+    res.render(shareThemePath, opts);
+}
+
 export default {
     register
 };

apps/website/package.json

@@ -12,8 +12,8 @@
 		"i18next-http-backend": "3.0.2",
 		"preact": "10.27.2",
 		"preact-iso": "2.11.0",
-		"preact-render-to-string": "6.6.2",
-		"react-i18next": "16.1.2"
+		"preact-render-to-string": "6.6.3",
+		"react-i18next": "16.2.0"
 	},
 	"devDependencies": {
 		"@preact/preset-vite": "2.10.2",

apps/website/public/translations/ar/translation.json

@@ -7,7 +7,8 @@
     },
     "download_helper_server_hosted": {
         "title": "استضافة مدفوعة",
-        "download_triliumcc": "بدلا من ذلك، راجع trillum. cc"
+        "download_triliumcc": "بدلا من ذلك، راجع trillum. cc",
+        "download_pikapod": "اعدلد على PikaPods"
     },
     "get-started": {
         "architecture": "المعمارية:",
@@ -22,7 +23,8 @@
     "organization_benefits": {
         "title": "تنظيم",
         "note_structure_title": "هيكيلية الملاحظة",
-        "hoisting_title": "مساحات العمل والتركيز على الملاحظة"
+        "hoisting_title": "مساحات العمل والتركيز على الملاحظة",
+        "attributes_title": "العلاقات وجداول الملاحظة"
     },
     "productivity_benefits": {
         "sync_title": "‎المزامنة",
@@ -30,7 +32,8 @@
         "protected_notes_title": "الملاحظات المحمية",
         "search_title": "البحث القوي",
         "web_clipper_title": "اداة قص الويب",
-        "title": "الانتاجية والسلامة"
+        "title": "الانتاجية والسلامة",
+        "jump_to_title": "الاوامر والبحث السريع"
     },
     "note_types": {
         "canvas_title": "مساحة العمل",
@@ -66,14 +69,16 @@
         "paypal": "PayPal",
         "title": "ادعمنا",
         "financial_donations_title": "التبرعات المالية",
-        "github_sponsors": "الرعاة على GitHub"
+        "github_sponsors": "الرعاة على GitHub",
+        "buy_me_a_coffee": "Buy Me A Coffee"
     },
     "download_helper_desktop_windows": {
         "download_scoop": "Scoop",
         "download_exe": "تحميل ملف التثبيت (exe.)",
         "title_x64": "ويندوز 64 بت",
         "download_zip": "النسخة المحمولة بصيغة zip",
-        "title_arm64": "نظام ويندوز عاى ARM"
+        "title_arm64": "نظام ويندوز عاى ARM",
+        "quick_start": "للتثبيت باستخدام Winget:"
     },
     "download_helper_desktop_linux": {
         "download_deb": ".deb",
@@ -112,6 +117,11 @@
         "download_dmg": "تحميل ملف التثبيت (dmg.)",
         "download_homebrew_cask": "Homebrew Cask",
         "download_zip": "النسخة المحمولة بصيغة zip",
-        "title_x64": "نظام macOS لاصدار intel"
+        "title_x64": "نظام macOS لاصدار intel",
+        "title_arm64": "نظام macOS لمعالجة اجهزة Apple Silicon",
+        "quick_start": "للتثبيت بواسطة Homebrew:"
+    },
+    "contribute": {
+        "title": "طرق اخرى للمساهمة"
     }
 }

apps/website/public/translations/hu/translation.json

@@ -1 +1,44 @@
-{}
+{
+    "get-started": {
+        "title": "Kezdés",
+        "desktop_title": "Töltsd le az asztali alkalmazást (v{{version}})",
+        "architecture": "Szerkezet:",
+        "older_releases": "Régebbi kiadások megtekintése",
+        "server_title": "Szerver beállítása több eszközről történő hozzáféréshez"
+    },
+    "hero_section": {
+        "title": "Rendszerezd a gondolataidat. Építsd fel a személyes tudásbázisodat.",
+        "subtitle": "A Trilium egy nyílt forráskódú megoldás jegyzeteléshez és személyes tudásbázis rendszerezéséhez. Használd helyben az asztali gépeden, vagy szinkronizáld a saját szervereddel, hogy jegyzeteid mindenhol elérhetőek legyenek.",
+        "get_started": "Kezdés",
+        "github": "GitHub",
+        "dockerhub": "Docker Hub",
+        "screenshot_alt": "A Trilium Notes asztali alkalmazás képernyőképe"
+    },
+    "organization_benefits": {
+        "title": "Szervezet",
+        "note_structure_title": "Jegyzet szerkezet",
+        "note_structure_description": "A jegyzetek hierarchikusan rendezhetők. Nincs szükség mappákra, mivel minden jegyzet tartalmazhat aljegyzeteket. Egyetlen jegyzet több helyre is hozzáadható a hierarchiában.",
+        "attributes_title": "Jegyzetcímkék és kapcsolatok",
+        "attributes_description": "Használjon kapcsolatokat a jegyzetek között, vagy adjon hozzá címkéket az egyszerű kategorizálás érdekében. Használjon kiemelt attribútumokat strukturált információk beviteléhez, amelyek táblázatokban és táblákon használhatók.",
+        "hoisting_title": "Munkaterületek és kiemelés",
+        "hoisting_description": "Könnyedén különítse el a személyes és munkahelyi jegyzeteit úgy, hogy csoportosítja őket egy munkaterület alatt, amely a jegyzetfát csak egy adott jegyzetkészlet megjelenítésére összpontosítja."
+    },
+    "productivity_benefits": {
+        "title": "Termelékenység és biztonság",
+        "revisions_title": "Megjegyzés felülvizsgálatai",
+        "revisions_content": "A jegyzetek rendszeresen tárolódnak a háttérben, és a revíziók felhasználhatók felülvizsgálatra vagy véletlen változások visszavonására. A revíziók igény szerint is létrehozhatók.",
+        "sync_title": "Szinkronizálás",
+        "sync_content": "Használjon saját maga által üzemeltetett vagy felhő alapu példányt, hogy könnyen szinkronizálja a jegyzeteket több eszközön keresztül, és hozzáférjen a mobiltelefonjáról egy PWA segítségével.",
+        "protected_notes_title": "Védett jegyzetek",
+        "protected_notes_content": "Védje az érzékeny személyes adatokat a jegyzetek titkosításával és a jelszóval védett munkamenet mögötti zárolással.",
+        "jump_to_title": "Gyors keresés és parancsok",
+        "jump_to_content": "Ugorj gyorsan a jegyzetekhez vagy a felhasználói felület parancsaihoz a hierarchia területén, keresve a címüket, a fuzzy illesztéssel, hogy megmagyarázza az elírásokat vagy az enyhe különbségeket.",
+        "search_title": "Erőteljes keresés",
+        "search_content": "Vagy keressen szöveget a jegyzetekben, és szűkítse le a keresést a szülői jegyzet szűrésével vagy mélységével."
+    },
+    "note_types": {
+        "file_description": "Beágyazott multimédiás fájlokat, például PDF-eket, képeket, videókat, alkalmazáson belüli előnézettel.",
+        "canvas_title": "Vászon",
+        "canvas_description": "Rendezzen formákat, képeket és szöveget egy végtelen vászonra, ugyanazzal a technológiával mint ami excalidraw.com mögött van. Ideális diagramokhoz, vázlatokhoz és vizuális tervezéshez."
+    }
+}

docs/README-ar.md

@@ -61,8 +61,8 @@ quick overview:
   Docker](./docs/User%20Guide/User%20Guide/Installation%20&%20Setup/Server%20Installation/1.%20Installing%20the%20server/Using%20Docker.md)
 - [ترقية تريليوم
   للملاحظات](./docs/User%20Guide/User%20Guide/Installation%20%26%20Setup/Upgrading%20TriliumNext.md)
-- [Basic Concepts and
-  Features](./docs/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Notes.md)
+- [مفاهيم ومميزات
+  اساسية](./docs/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Notes.md)
 - [Patterns of Personal Knowledge
   Base](https://triliumnext.github.io/Docs/Wiki/patterns-of-personal-knowledge)
 
@@ -110,7 +110,7 @@ quick overview:
   location pins and GPX tracks
 * [Scripting](https://triliumnext.github.io/Docs/Wiki/scripts) - see [Advanced
   showcases](https://triliumnext.github.io/Docs/Wiki/advanced-showcases)
-* [REST API](https://triliumnext.github.io/Docs/Wiki/etapi) for automation
+* [واجهة REST API](https://triliumnext.github.io/Docs/Wiki/etapi) للأتمتة
 * Scales well in both usability and performance upwards of 100 000 notes
 * Touch optimized [mobile
   frontend](https://triliumnext.github.io/Docs/Wiki/mobile-frontend) for

docs/README-hu.md

@@ -9,85 +9,85 @@
 
 <hr />
 
-# Trilium Notes
+# Trilium Jegyzetek
 
-![GitHub Sponsors](https://img.shields.io/github/sponsors/eliandoran)
-![LiberaPay patrons](https://img.shields.io/liberapay/patrons/ElianDoran)\
-![Docker Pulls](https://img.shields.io/docker/pulls/triliumnext/trilium)
-![GitHub Downloads (all assets, all
-releases)](https://img.shields.io/github/downloads/triliumnext/trilium/total)\
+![GitHub szponzorok](https://img.shields.io/github/sponsors/eliandoran)
+![LiberaPay támogatók](https://img.shields.io/liberapay/patrons/ElianDoran)\
+![Docker pull-ok](https://img.shields.io/docker/pulls/triliumnext/trilium)
+![GitHub letöltések (összes tartalom, összes
+kiadás)](https://img.shields.io/github/downloads/triliumnext/trilium/total)\
 [![RelativeCI](https://badges.relative-ci.com/badges/Di5q7dz9daNDZ9UXi0Bp?branch=develop)](https://app.relative-ci.com/projects/Di5q7dz9daNDZ9UXi0Bp)
-[![Translation
-status](https://hosted.weblate.org/widget/trilium/svg-badge.svg)](https://hosted.weblate.org/engage/trilium/)
+[![Fordítás
+állapota](https://hosted.weblate.org/widget/trilium/svg-badge.svg)](https://hosted.weblate.org/engage/trilium/)
 
-[English](./README.md) | [Chinese (Simplified)](./docs/README-ZH_CN.md) |
-[Chinese (Traditional)](./docs/README-ZH_TW.md) | [Russian](./docs/README-ru.md)
-| [Japanese](./docs/README-ja.md) | [Italian](./docs/README-it.md) |
-[Spanish](./docs/README-es.md)
+[angol](./README.md) | [egyszerűsített kínai](./docs/README-ZH_CN.md) |
+[hagyományos kínai](./docs/README-ZH_TW.md) | [orosz](./docs/README-ru.md) |
+[japán](./docs/README-ja.md) | [olasz](./docs/README-it.md) |
+[spanyol](./docs/README-es.md)
 
-Trilium Notes is a free and open-source, cross-platform hierarchical note taking
-application with focus on building large personal knowledge bases.
+A Trilium Notes egy ingyenes és nyílt forráskódú, platformfüggetlen hierarchikus
+jegyzetelő alkalmazás, amely nagy személyes tudásbázisok építésére összpontosít.
 
-See [screenshots](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) for
-quick overview:
+A gyors áttekintésért lásd a
+[képernyőképeket](https://triliumnext.github.io/Docs/Wiki/screenshot-tour):
 
 <a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="./docs/app.png" alt="Trilium Screenshot" width="1000"></a>
 
-## ⏬ Download
-- [Latest release](https://github.com/TriliumNext/Trilium/releases/latest) –
-  stable version, recommended for most users.
+## ⏬ Letöltés
+- [Legújabb kiadás](https://github.com/TriliumNext/Trilium/releases/latest) –
+  stabil verzió, a legtöbb felhasználó számára ajánlott.
 - [Nightly build](https://github.com/TriliumNext/Trilium/releases/tag/nightly) –
-  unstable development version, updated daily with the latest features and
-  fixes.
+  instabil fejlesztői verzió, naponta frissül a legújabb funkciókkal és
+  javításokkal.
 
-## 📚 Documentation
+## 📚 Dokumentáció
 
-**Visit our comprehensive documentation at
-[docs.triliumnotes.org](https://docs.triliumnotes.org/)**
+**Tekintse meg átfogó dokumentációnkat a [docs.triliumnotes.org]
+címen(https://docs.triliumnotes.org/)**
 
-Our documentation is available in multiple formats:
-- **Online Documentation**: Browse the full documentation at
-  [docs.triliumnotes.org](https://docs.triliumnotes.org/)
-- **In-App Help**: Press `F1` within Trilium to access the same documentation
-  directly in the application
-- **GitHub**: Navigate through the [User
-  Guide](./docs/User%20Guide/User%20Guide/) in this repository
+Dokumentációink többféle formátumban is elérhetők:
+- **Online dokumentáció**: Böngéssze a teljes dokumentációt a
+  [docs.triliumnotes.org](https://docs.triliumnotes.org/) címen.
+- **Alkalmazáson belüli súgó**: Nyomja meg az `F1` billentyűt a Triliumon belül,
+  hogy ugyanazt a dokumentációt közvetlenül az alkalmazásban is elérje.
+- **GitHub**: Navigálj a [Felhasználói
+  útmutatóban](./docs/User%20Guide/User%20Guide/) ebben a repository-ban
 
-### Quick Links
-- [Getting Started Guide](https://docs.triliumnotes.org/)
-- [Installation
-  Instructions](./docs/User%20Guide/User%20Guide/Installation%20&%20Setup/Server%20Installation.md)
+### Gyorslinkek
+- [Kezdő lépések útmutatója](https://docs.triliumnotes.org/)
+- [Telepítési
+  utasítások](./docs/User%20Guide/User%20Guide/Installation%20&%20Setup/Server%20Installation.md)
 - [Docker
-  Setup](./docs/User%20Guide/User%20Guide/Installation%20&%20Setup/Server%20Installation/1.%20Installing%20the%20server/Using%20Docker.md)
-- [Upgrading
-  TriliumNext](./docs/User%20Guide/User%20Guide/Installation%20%26%20Setup/Upgrading%20TriliumNext.md)
-- [Basic Concepts and
-  Features](./docs/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Notes.md)
-- [Patterns of Personal Knowledge
-  Base](https://triliumnext.github.io/Docs/Wiki/patterns-of-personal-knowledge)
+  beállítás](./docs/User%20Guide/User%20Guide/Installation%20&%20Setup/Server%20Installation/1.%20Installing%20the%20server/Using%20Docker.md)
+- [TriliumNext
+  Frissítése](./docs/User%20Guide/User%20Guide/Installation%20%26%20Setup/Upgrading%20TriliumNext.md)
+- [Alapfogalmak és
+  jellemzők](./docs/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Notes.md)
+- [A személyes tudásbázis
+  mintái](https://triliumnext.github.io/Docs/Wiki/patterns-of-personal-knowledge)
 
-## 🎁 Features
+## 🎁 Jellemzők
 
-* Notes can be arranged into arbitrarily deep tree. Single note can be placed
-  into multiple places in the tree (see
-  [cloning](https://triliumnext.github.io/Docs/Wiki/cloning-notes))
-* Rich WYSIWYG note editor including e.g. tables, images and
-  [math](https://triliumnext.github.io/Docs/Wiki/text-notes) with markdown
+* A jegyzetek önkényesen mély fába rendezhetők. Egyetlen jegyzetet lehet
+  elhelyezni a többi fába (lásd
+  [klónozás](https://triliumnext.github.io/Docs/Wiki/cloning-notes))
+* Gazdag WYSIWYG jegyzetszerkesztő, beleértve például az asztalokat, képeket és
+  [math](https://triliumnext.github.io/Docs/Wiki/text-notes) markdownt
   [autoformat](https://triliumnext.github.io/Docs/Wiki/text-notes#autoformat)
-* Support for editing [notes with source
-  code](https://triliumnext.github.io/Docs/Wiki/code-notes), including syntax
-  highlighting
-* Fast and easy [navigation between
-  notes](https://triliumnext.github.io/Docs/Wiki/note-navigation), full text
-  search and [note
-  hoisting](https://triliumnext.github.io/Docs/Wiki/note-hoisting)
-* Seamless [note
-  versioning](https://triliumnext.github.io/Docs/Wiki/note-revisions)
-* Note [attributes](https://triliumnext.github.io/Docs/Wiki/attributes) can be
-  used for note organization, querying and advanced
-  [scripting](https://triliumnext.github.io/Docs/Wiki/scripts)
-* UI available in English, German, Spanish, French, Romanian, and Chinese
-  (simplified and traditional)
+* Szerkesztés támogatása [jegyzetek
+  forráskóddal](https://triliumnext.github.io/Docs/Wiki/code-notes), beleértve a
+  szintaxis kiemelését
+* Gyors és egyszerű [navigáció a jegyzetek
+  között](https://triliumnext.github.io/Docs/Wiki/note-navigation), teljes
+  szöveges keresés és
+  [megjegyzés](https://triliumnext.github.io/Docs/Wiki/note-hoisting)
+* Zökkenőmentes
+  [jegyzetváltozat](https://triliumnext.github.io/Docs/Wiki/note-revisions)
+* Megjegyzés [attribútumok](https://triliumnext.github.io/Docs/Wiki/attributes)
+  használható jegyzetszervezéshez, lekérdezéshez és speciális
+  [szkriptelés](https://triliumnext.github.io/Docs/Wiki/scripts)
+* UI elérhető angol, német, spanyol, francia, román és kínai (egyszerűsített és
+  hagyományos)
 * Direct [OpenID and TOTP
   integration](./docs/User%20Guide/User%20Guide/Installation%20%26%20Setup/Server%20Installation/Multi-Factor%20Authentication.md)
   for more secure login
@@ -105,11 +105,12 @@ Our documentation is available in multiple formats:
 * [Relation maps](https://triliumnext.github.io/Docs/Wiki/relation-map) and
   [link maps](https://triliumnext.github.io/Docs/Wiki/link-map) for visualizing
   notes and their relations
-* Mind maps, based on [Mind Elixir](https://docs.mind-elixir.com/)
-* [Geo maps](./docs/User%20Guide/User%20Guide/Note%20Types/Geo%20Map.md) with
-  location pins and GPX tracks
-* [Scripting](https://triliumnext.github.io/Docs/Wiki/scripts) - see [Advanced
-  showcases](https://triliumnext.github.io/Docs/Wiki/advanced-showcases)
+* Elmetérképek, [Mind Elixir](https://docs.mind-elixir.com/) alapján
+* [Geo térképek](./docs/User%20Guide/User%20Guide/Note%20Types/Geo%20Map.md)
+  helymeghatározó tűkkel és GPX nyomokkal
+* [Szkriptelés](https://triliumnext.github.io/Docs/Wiki/scripts) - lásd:
+  [Speciális
+  bemutatók](https://triliumnext.github.io/Docs/Wiki/advanced-showcases)
 * [REST API](https://triliumnext.github.io/Docs/Wiki/etapi) for automation
 * Scales well in both usability and performance upwards of 100 000 notes
 * Touch optimized [mobile

package.json

@@ -51,7 +51,7 @@
     "eslint": "9.38.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-playwright": "2.2.2",
-    "eslint-plugin-react-hooks": "7.0.0",
+    "eslint-plugin-react-hooks": "7.0.1",
     "happy-dom": "~20.0.0",
     "jiti": "2.6.1",
     "jsonc-eslint-parser": "2.4.1",
@@ -80,7 +80,7 @@
     "url": "https://github.com/TriliumNext/Trilium/issues"
   },
   "homepage": "https://triliumnotes.org",
-  "packageManager": "pnpm@10.18.3",
+  "packageManager": "pnpm@10.19.0",
   "pnpm": {
     "patchedDependencies": {
       "@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch",

packages/ckeditor5-admonition/package.json

@@ -32,7 +32,7 @@
     "eslint": "9.38.0",
     "eslint-config-ckeditor5": ">=9.1.0",
     "http-server": "14.1.1",
-    "lint-staged": "16.2.5",
+    "lint-staged": "16.2.6",
     "stylelint": "16.25.0",
     "stylelint-config-ckeditor5": ">=9.1.0",
     "ts-node": "10.9.2",

packages/ckeditor5-footnotes/package.json

@@ -33,7 +33,7 @@
     "eslint": "9.38.0",
     "eslint-config-ckeditor5": ">=9.1.0",
     "http-server": "14.1.1",
-    "lint-staged": "16.2.5",
+    "lint-staged": "16.2.6",
     "stylelint": "16.25.0",
     "stylelint-config-ckeditor5": ">=9.1.0",
     "ts-node": "10.9.2",

packages/ckeditor5-keyboard-marker/package.json

@@ -35,7 +35,7 @@
     "eslint": "9.38.0",
     "eslint-config-ckeditor5": ">=9.1.0",
     "http-server": "14.1.1",
-    "lint-staged": "16.2.5",
+    "lint-staged": "16.2.6",
     "stylelint": "16.25.0",
     "stylelint-config-ckeditor5": ">=9.1.0",
     "ts-node": "10.9.2",

packages/ckeditor5-math/package.json

@@ -36,7 +36,7 @@
     "eslint": "9.38.0",
     "eslint-config-ckeditor5": ">=9.1.0",
     "http-server": "14.1.1",
-    "lint-staged": "16.2.5",
+    "lint-staged": "16.2.6",
     "stylelint": "16.25.0",
     "stylelint-config-ckeditor5": ">=9.1.0",
     "ts-node": "10.9.2",

packages/ckeditor5-mermaid/package.json

@@ -35,7 +35,7 @@
     "eslint": "9.38.0",
     "eslint-config-ckeditor5": ">=9.1.0",
     "http-server": "14.1.1",
-    "lint-staged": "16.2.5",
+    "lint-staged": "16.2.6",
     "stylelint": "16.25.0",
     "stylelint-config-ckeditor5": ">=9.1.0",
     "ts-node": "10.9.2",

packages/ckeditor5/package.json

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

packages/codemirror/package.json

@@ -5,12 +5,12 @@
   "type": "module",
   "main": "./src/index.ts",
   "dependencies": {
-    "@codemirror/commands": "6.9.0",
+    "@codemirror/commands": "6.10.0",
     "@codemirror/lang-css": "6.3.1",
     "@codemirror/lang-html": "6.4.11",
     "@codemirror/lang-javascript": "6.2.4",
     "@codemirror/lang-json": "6.0.2",
-    "@codemirror/lang-markdown": "6.4.0",
+    "@codemirror/lang-markdown": "6.5.0",
     "@codemirror/lang-php": "6.0.2",
     "@codemirror/lang-vue": "0.1.3",
     "@codemirror/lang-xml": "6.1.0",

packages/share-theme/package.json

@@ -21,11 +21,6 @@
     "Zerebos <me@zerebos.com>"
   ],
   "license": "Apache-2.0",
-  "dependencies": {
-    "katex": "0.16.25",
-    "mermaid": "11.12.0",
-    "boxicons": "2.1.4"
-  },
   "devDependencies": {
     "@digitak/esrun": "3.2.26",
     "@types/swagger-ui": "5.21.1",

packages/share-theme/scripts/build.ts

@@ -1,3 +1,4 @@
+import fs from "node:fs";
 import path from "node:path";
 // import {fileURLToPath} from "node:url";
 
@@ -50,9 +51,8 @@ async function runBuild() {
     await esbuild.build({
         entryPoints: entryPoints,
         bundle: true,
-        splitting: true,
         outdir: path.join(rootDir, "dist"),
-        format: "esm",
+        format: "cjs",
         target: ["chrome96"],
         loader: {
             ".png": "dataurl",
@@ -60,8 +60,6 @@ async function runBuild() {
             ".woff": "dataurl",
             ".woff2": "dataurl",
             ".ttf": "dataurl",
-            ".eot": "empty",
-            ".svg": "empty",
             ".html": "text",
             ".css": "css"
         },

packages/share-theme/src/scripts/index.ts

@@ -3,10 +3,6 @@ import setupExpanders from "./modules/expanders";
 import setupMobileMenu from "./modules/mobile";
 import setupSearch from "./modules/search";
 import setupThemeSelector from "./modules/theme";
-import setupMermaid from "./modules/mermaid";
-import setupMath from "./modules/math";
-import api from "./modules/api";
-import "boxicons/css/boxicons.min.css";
 
 function $try<T extends (...a: unknown[]) => unknown>(func: T, ...args: Parameters<T>) {
     try {
@@ -17,39 +13,8 @@ function $try<T extends (...a: unknown[]) => unknown>(func: T, ...args: Paramete
     }
 }
 
-Object.assign(window, api);
 $try(setupThemeSelector);
 $try(setupToC);
 $try(setupExpanders);
 $try(setupMobileMenu);
 $try(setupSearch);
-
-function setupTextNote() {
-    $try(setupMermaid);
-    $try(setupMath);
-}
-
-document.addEventListener(
-    "DOMContentLoaded",
-    () => {
-        const noteType = determineNoteType();
-
-        if (noteType === "text") {
-            setupTextNote();
-        }
-
-        const toggleMenuButton = document.getElementById("toggleMenuButton");
-        const layout = document.getElementById("layout");
-
-        if (toggleMenuButton && layout) {
-            toggleMenuButton.addEventListener("click", () => layout.classList.toggle("showMenu"));
-        }
-    },
-    false
-);
-
-function determineNoteType() {
-    const bodyClass = document.body.className;
-    const match = bodyClass.match(/type-([^\s]+)/);
-    return match ? match[1] : null;
-}

packages/share-theme/src/scripts/modules/api.ts

@@ -1,18 +0,0 @@
-/**
- * Fetch note with given ID from backend
- *
- * @param noteId of the given note to be fetched. If false, fetches current note.
- */
-async function fetchNote(noteId: string | null = null) {
-    if (!noteId) {
-        noteId = document.body.getAttribute("data-note-id");
-    }
-
-    const resp = await fetch(`api/notes/${noteId}`);
-
-    return await resp.json();
-}
-
-export default {
-    fetchNote
-};

packages/share-theme/src/scripts/modules/math.ts

@@ -1,14 +0,0 @@
-import "katex/dist/katex.min.css";
-
-export default async function setupMath() {
-    const anyMathBlock = document.querySelector("#content .math-tex");
-    if (!anyMathBlock) {
-        return;
-    }
-
-    const renderMathInElement = (await import("katex/contrib/auto-render")).default;
-    await import("katex/contrib/mhchem");
-
-    renderMathInElement(document.getElementById("content"));
-    document.body.classList.add("math-loaded");
-}

packages/share-theme/src/styles/content.css

@@ -46,8 +46,4 @@
 
 #content img {
     max-width: 100%;
-}
-
-body:not(.math-loaded) .math-tex {
-    visibility: hidden;
 }

packages/share-theme/src/templates/page.ejs

@@ -30,11 +30,17 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <link rel="shortcut icon" href="<% if (note.hasRelation("shareFavicon")) { %>api/notes/<%= note.getRelation("shareFavicon").value %>/download<% } else { %>../favicon.ico<% } %>">
-    <% for (const url of cssToLoad) { %>
-        <link href="<%= url %>" rel="stylesheet">
+    <script src="../<%= appPath %>/share.js" type="module"></script>
+    <% if (!isDev && !note.isLabelTruthy("shareOmitDefaultCss")) { %>
+        <link href="<%= assetPath %>/src/share.css" rel="stylesheet">
+        <link href="<%= assetPath %>/src/boxicons.css" rel="stylesheet">
     <% } %>
-    <% for (const url of jsToLoad) { %>
-        <script type="module" src="<%= url %>"></script>
+
+    <% for (const cssRelation of note.getRelations("shareCss")) { %>
+        <link href="api/notes/<%= cssRelation.value %>/download" rel="stylesheet">
+    <% } %>
+    <% for (const jsRelation of note.getRelations("shareJs")) { %>
+        <script type="module" src="api/notes/<%= jsRelation.value %>/download"></script>
     <% } %>
     <% if (note.hasLabel("shareDisallowRobotIndexing")) { %>
         <meta name="robots" content="noindex,follow" />
@@ -74,6 +80,8 @@
     <%- renderSnippets("head:end") %>
 </head>
 <%
+const customLogoId = subRoot.note.getRelation("shareLogo")?.value;
+const logoUrl = customLogoId ? `api/images/${customLogoId}/image.png` : `../${assetUrlFragment}/images/icon-color.svg`;
 const logoWidth = subRoot.note.getLabelValue("shareLogoWidth") ?? 53;
 const logoHeight = subRoot.note.getLabelValue("shareLogoHeight") ?? 40;
 const mobileLogoHeight = logoHeight && logoWidth ? 32 / (logoWidth / logoHeight) : "";
@@ -123,7 +131,16 @@ content = content.replaceAll(headingRe, (...match) => {
             </div>
         <% if (hasTree) { %>
             <nav id="menu">
-                <%- include("tree_item", {note: subRoot.note, activeNote: note, subRoot: subRoot, ancestors}) %>
+                <%
+                const ancestors = [];
+                let notePointer = note;
+                while (notePointer.parents[0].noteId !== "_share") {
+                    const pointerParent = notePointer.parents[0];
+                    ancestors.push(pointerParent.noteId);
+                    notePointer = pointerParent;
+                }
+                %>
+                <%- include("tree_item", {note: subRoot.note, activeNote: note, subRoot: subRoot, ancestors: ancestors}) %>
             </nav>
         <% } %>   
         </div>

packages/share-theme/src/templates/tree_item.ejs

@@ -1,16 +1,7 @@
 <%
 const linkClass = `type-${note.type}` + (activeNote.noteId === note.noteId ? " active" : "");
 const isExternalLink = note.hasLabel("shareExternal");
-let linkHref;
-
-if (isExternalLink) {
-    linkHref = note.getLabelValue("shareExternal");
-} else if (note.shareId) {
-    linkHref = `./${note.shareId}`;
-} else {
-    linkHref = `#${note.getBestNotePath().join("/")}`;
-}
-
+const linkHref = isExternalLink ? note.getLabelValue("shareExternal") : `./${note.shareId}`;
 const target = isExternalLink ? ` target="_blank" rel="noopener noreferrer"` : "";
 %>
 

packages/share-theme/src/types.d.ts

@@ -1,5 +0,0 @@
-declare module "katex/contrib/auto-render" {
-    export default function renderMathInElement(elem: HTMLElement, options?: {})
-}
-
-declare module "katex/contrib/mhchem" {}

packages/turndown-plugin-gfm/package.json

@@ -22,7 +22,7 @@
     "gfm"
   ],
   "devDependencies": {
-    "turndown": "7.2.1",
+    "turndown": "7.2.2",
     "turndown-attendant": "0.0.3"
   }
 }

scripts/electron-start.mts

@@ -3,7 +3,7 @@ import { getElectronPath, isNixOS } from "./utils.mjs";
 
 const LD_LIBRARY_PATH = isNixOS() && execSync("nix eval --raw nixpkgs#gcc.cc.lib").toString("utf-8") + "/lib";
 
-execSync(`${getElectronPath()} ${process.argv[2]}`, {
+execSync(`${getElectronPath()} ${process.argv[2]} --no-sandbox`, {
     stdio: "inherit",
     env: {
         ...process.env,