release 0.63.5

fix: invisible unchecked to-do items

README.md

@@ -1,8 +1,14 @@
 # Trilium Notes
 
+## Trilium is in maintenance mode - see details in https://github.com/zadam/trilium/issues/4620
+
+Preliminary disccusions on the successor organization are taking place in [Trilium Next discussions](https://github.com/orgs/TriliumNext/discussions). 
+
 [![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md) | [Japanese](https://github.com/zadam/trilium/blob/master/README.ja.md)
 
-Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. See [screenshots](https://github.com/zadam/trilium/wiki/Screenshot-tour) for quick overview:
+Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. 
+
+See [screenshots](https://github.com/zadam/trilium/wiki/Screenshot-tour) for quick overview:
 
 <a href="https://github.com/zadam/trilium/wiki/Screenshot-tour"><img src="https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png" alt="Trilium Screenshot" width="1000"></a>
 

bin/build-linux-x64.sh

@@ -2,49 +2,37 @@
 
 SRC_DIR=./dist/trilium-linux-x64-src
 
-if [ "$1" != "DONTCOPY" ]
-then
-    ./bin/copy-trilium.sh $SRC_DIR
-fi
+[ "$1" != "DONTCOPY" ] && ./bin/copy-trilium.sh "$SRC_DIR"
 
-rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
+rm -r "$SRC_DIR"/src/public/app-dist/*.mobile.*
 
 echo "Copying required linux-x64 binaries"
-
-cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
+cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node "$SRC_DIR"/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 
 echo "Packaging linux x64 electron build"
-
-./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
+./node_modules/.bin/electron-packager "$SRC_DIR" --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
 
 BUILD_DIR=./dist/trilium-linux-x64
-rm -rf $BUILD_DIR
+rm -rf "$BUILD_DIR"
 
-mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR
+mv "./dist/Trilium Notes-linux-x64" "$BUILD_DIR"
 
-cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png
+cp images/app-icons/png/128x128.png "$BUILD_DIR"/icon.png
+cp bin/tpl/anonymize-database.sql "$BUILD_DIR"/
 
-cp bin/tpl/anonymize-database.sql $BUILD_DIR/
+cp -r dump-db "$BUILD_DIR"/
+rm -rf "$BUILD_DIR"/dump-db/node_modules
 
-cp -r dump-db $BUILD_DIR/
-rm -rf $BUILD_DIR/dump-db/node_modules
-
-cp bin/tpl/trilium-portable.sh $BUILD_DIR/
-chmod 755 $BUILD_DIR/trilium-portable.sh
-
-cp bin/tpl/trilium-safe-mode.sh $BUILD_DIR/
-chmod 755 $BUILD_DIR/trilium-safe-mode.sh
-
-cp bin/tpl/trilium-no-cert-check.sh $BUILD_DIR/
-chmod 755 $BUILD_DIR/trilium-no-cert-check.sh
+for f in 'trilium-portable' 'trilium-safe-mode' 'trilium-no-cert-check'; do
+    cp bin/tpl/"$f".sh "$BUILD_DIR"/
+    chmod 755 "$BUILD_DIR"/"$f".sh
+done
 
 echo "Packaging linux x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`
 
-cd dist
-
-tar cJf trilium-linux-x64-${VERSION}.tar.xz trilium-linux-x64
-
-cd ..
+pushd dist
+    tar cJf "trilium-linux-x64-${VERSION}.tar.xz" trilium-linux-x64
+popd
 
 bin/build-debian.sh

bin/copy-trilium.sh

@@ -4,47 +4,49 @@ if [[ $# -eq 0 ]] ; then
     echo "Missing argument of target directory"
     exit 1
 fi
+if ! [[ $(which npm) ]]; then
+    echo "Missing npm"
+    exit 1
+fi
 
-n exec 18.18.2 npm run webpack
+n exec 18.18.2 npm run webpack || npm run webpack
 
-DIR=$1
+DIR="$1"
 
-rm -rf $DIR
-mkdir $DIR
+rm -rf "$DIR"
+mkdir -pv "$DIR"
 
 echo "Copying Trilium to build directory $DIR"
 
-cp -r images $DIR/
-cp -r libraries $DIR/
-cp -r src $DIR/
-cp -r db $DIR/
-cp -r package.json $DIR/
-cp -r package-lock.json $DIR/
-cp -r README.md $DIR/
-cp -r LICENSE $DIR/
-cp -r config-sample.ini $DIR/
-cp -r electron.js $DIR/
-cp webpack-* $DIR/
+for d in 'images' 'libraries' 'src' 'db'; do
+    cp -r "$d" "$DIR"/
+done
+for f in 'package.json' 'package-lock.json' 'README.md' 'LICENSE' 'config-sample.ini' 'electron.js'; do
+    cp "$f" "$DIR"/
+done
+cp webpack-* "$DIR"/      # here warning because there is no 'webpack-*', but webpack.config.js only
 
 # run in subshell (so we return to original dir)
 (cd $DIR && n exec 18.18.2 npm install --only=prod)
 
+if [[ -d "$DIR"/node_modules ]]; then
 # cleanup of useless files in dependencies
-rm -r $DIR/node_modules/image-q/demo
-rm -r $DIR/node_modules/better-sqlite3/Release
-rm -r $DIR/node_modules/better-sqlite3/deps/sqlite3.tar.gz
-rm -r $DIR/node_modules/@jimp/plugin-print/fonts
-rm -r $DIR/node_modules/jimp/browser
-rm -r $DIR/node_modules/jimp/fonts
+    for d in 'image-q/demo' 'better-sqlite3/Release' 'better-sqlite3/deps/sqlite3.tar.gz' '@jimp/plugin-print/fonts' 'jimp/browser' 'jimp/fonts'; do
+        [[ -e "$DIR"/node_modules/"$d" ]] && rm -rv "$DIR"/node_modules/"$d"
+    done
 
 # delete all tests (there are often large images as test file for jimp etc.)
-find $DIR/node_modules -name test -exec rm -rf {} \;
-find $DIR/node_modules -name docs -exec rm -rf {} \;
-find $DIR/node_modules -name demo -exec rm -rf {} \;
+    for d in 'test' 'docs' 'demo'; do
+        find "$DIR"/node_modules -name "$d" -exec rm -rf {} \;
+    done
+fi
 
 find $DIR/libraries -name "*.map" -type f -delete
 
-cp $DIR/src/public/app/share.js $DIR/src/public/app-dist/
-cp -r $DIR/src/public/app/doc_notes $DIR/src/public/app-dist/
+d="$DIR"/src/public
+[[ -d "$d"/app-dist ]] || mkdir -pv "$d"/app-dist
+cp "$d"/app/share.js "$d"/app-dist/
+cp -r "$d"/app/doc_notes "$d"/app-dist/
 
-rm -rf $DIR/src/public/app
+rm -rf "$d"/app
+unset f d DIR

bin/create-anonymization-script.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const anonymizationService = require('../src/services/anonymization');
+const anonymizationService = require('../src/services/anonymization.js');
 const fs = require('fs');
 const path = require('path');
 

db/migrations/0215__content_structure.sql

@@ -8,3 +8,6 @@ CREATE TABLE IF NOT EXISTS "blobs" (
 
 ALTER TABLE notes ADD blobId TEXT DEFAULT NULL;
 ALTER TABLE note_revisions ADD blobId TEXT DEFAULT NULL;
+
+CREATE INDEX IF NOT EXISTS IDX_notes_blobId on notes (blobId);
+CREATE INDEX IF NOT EXISTS IDX_note_revisions_blobId on note_revisions (blobId);

db/migrations/0216__move_content_into_blobs.js

@@ -1,6 +1,6 @@
 module.exports = () => {
-    const sql = require("../../src/services/sql");
-    const utils = require("../../src/services/utils");
+    const sql = require('../../src/services/sql.js');
+    const utils = require('../../src/services/utils.js');
 
     const existingBlobIds = new Set();
 

db/migrations/0218__rename_note_revision_to_revision.sql

@@ -21,5 +21,6 @@ CREATE INDEX `IDX_revisions_utcDateCreated` ON `revisions` (`utcDateCreated`);
 CREATE INDEX `IDX_revisions_utcDateLastEdited` ON `revisions` (`utcDateLastEdited`);
 CREATE INDEX `IDX_revisions_dateCreated` ON `revisions` (`dateCreated`);
 CREATE INDEX `IDX_revisions_dateLastEdited` ON `revisions` (`dateLastEdited`);
+CREATE INDEX IF NOT EXISTS IDX_revisions_blobId on revisions (blobId);
 
 UPDATE entity_changes SET entityName = 'revisions' WHERE entityName = 'note_revisions';

db/migrations/0219__attachments.sql

@@ -19,3 +19,5 @@ CREATE INDEX IDX_attachments_ownerId_role
 
 CREATE INDEX IDX_attachments_utcDateScheduledForErasureSince
     on attachments (utcDateScheduledForErasureSince);
+
+CREATE INDEX IF NOT EXISTS IDX_attachments_blobId on attachments (blobId);

db/migrations/0220__migrate_images_to_attachments.js

@@ -1,9 +1,9 @@
 module.exports = () => {
-    const beccaLoader = require("../../src/becca/becca_loader");
-    const becca = require("../../src/becca/becca");
-    const cls = require("../../src/services/cls");
-    const log = require("../../src/services/log");
-    const sql = require("../../src/services/sql");
+    const beccaLoader = require('../../src/becca/becca_loader.js');
+    const becca = require('../../src/becca/becca.js');
+    const cls = require('../../src/services/cls.js');
+    const log = require('../../src/services/log.js');
+    const sql = require('../../src/services/sql.js');
 
     cls.init(() => {
         // emergency disabling of image compression since it appears to make problems in migration to 0.61

db/migrations/0228__fix_blobIds.sql

@@ -0,0 +1,17 @@
+-- + is normally replaced by X and / by Y, but this can temporarily cause UNIQUE key exception
+-- this might create blob duplicates, but cleanup will eventually take care of it
+
+UPDATE blobs SET blobId = REPLACE(blobId, '+', 'A');
+UPDATE blobs SET blobId = REPLACE(blobId, '/', 'B');
+
+UPDATE notes SET blobId = REPLACE(blobId, '+', 'A');
+UPDATE notes SET blobId = REPLACE(blobId, '/', 'B');
+
+UPDATE attachments SET blobId = REPLACE(blobId, '+', 'A');
+UPDATE attachments SET blobId = REPLACE(blobId, '/', 'B');
+
+UPDATE revisions SET blobId = REPLACE(blobId, '+', 'A');
+UPDATE revisions SET blobId = REPLACE(blobId, '/', 'B');
+
+UPDATE entity_changes SET entityId = REPLACE(entityId, '+', 'A') WHERE entityName = 'blobs';
+UPDATE entity_changes SET entityId = REPLACE(entityId, '/', 'B') WHERE entityName = 'blobs';

docker_healthcheck.js

@@ -1,7 +1,7 @@
 const http = require("http");
 const ini = require("ini");
 const fs = require("fs");
-const dataDir = require("./src/services/data_dir");
+const dataDir = require('./src/services/data_dir.js');
 const config = ini.parse(fs.readFileSync(dataDir.CONFIG_INI_PATH, 'utf-8'));
 
 if (config.Network.https) {
@@ -10,8 +10,8 @@ if (config.Network.https) {
     process.exit(0);
 }
 
-const port = require('./src/services/port');
-const host = require('./src/services/host');
+const port = require('./src/services/port.js');
+const host = require('./src/services/host.js');
 
 const options = { timeout: 2000 };
 

dump-db/dump-db.js

@@ -2,7 +2,7 @@
 
 const yargs = require('yargs/yargs')
 const { hideBin } = require('yargs/helpers')
-const dumpService = require("./inc/dump");
+const dumpService = require('./inc/dump.js');
 
 yargs(hideBin(process.argv))
     .command('$0 <path_to_document> <target_directory>', 'dump the contents of document.db into the target directory', (yargs) => {

dump-db/inc/data_key.js

@@ -1,6 +1,6 @@
 const crypto = require("crypto");
-const sql = require("./sql");
-const decryptService = require("./decrypt");
+const sql = require('./sql.js');
+const decryptService = require('./decrypt.js');
 
 function getDataKey(password) {
     if (!password) {

dump-db/inc/dump.js

@@ -1,9 +1,9 @@
 const fs = require("fs");
 const sanitize = require("sanitize-filename");
-const sql = require("./sql");
-const decryptService = require("./decrypt");
-const dataKeyService = require("./data_key");
-const extensionService = require("./extension");
+const sql = require('./sql.js');
+const decryptService = require('./decrypt.js');
+const dataKeyService = require('./data_key.js');
+const extensionService = require('./extension.js');
 
 function dumpDocument(documentPath, targetPath, options) {
     const stats = {

electron.js

@@ -1,10 +1,10 @@
 'use strict';
 
 const {app, globalShortcut, BrowserWindow} = require('electron');
-const sqlInit = require('./src/services/sql_init');
-const appIconService = require('./src/services/app_icon');
-const windowService = require('./src/services/window');
-const tray = require('./src/services/tray');
+const sqlInit = require('./src/services/sql_init.js');
+const appIconService = require('./src/services/app_icon.js');
+const windowService = require('./src/services/window.js');
+const tray = require('./src/services/tray.js');
 
 // Adds debug features like hotkeys for triggering dev tools and reload
 require('electron-debug')();
@@ -59,4 +59,4 @@ app.on('will-quit', () => {
 // this is to disable electron warning spam in the dev console (local development only)
 process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
 
-require('./src/www');
+require('./src/www.js');

libraries/boxicons/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015-2021 Aniket Suvarna
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

libraries/ckeditor/ckeditor-content.css

@@ -5,8 +5,8 @@
 }
 
 /*
- * CKEditor 5 (v40.1.0) content styles.
- * Generated on Mon, 20 Nov 2023 08:41:49 GMT.
+ * CKEditor 5 (v41.0.0) content styles.
+ * Generated on Fri, 26 Jan 2024 10:23:49 GMT.
  * For more information, check out https://ckeditor.com/docs/ckeditor5/latest/installation/advanced/content-styles.html
  */
 
@@ -42,18 +42,6 @@
     overflow-wrap: break-word;
     position: relative;
 }
-/* @ckeditor/ckeditor5-table/theme/tablecaption.css */
-.ck-content .table > figcaption {
-    display: table-caption;
-    caption-side: top;
-    word-break: break-word;
-    text-align: center;
-    color: var(--ck-color-selector-caption-text);
-    background-color: var(--ck-color-selector-caption-background);
-    padding: .6em;
-    font-size: .75em;
-    outline-offset: -1px;
-}
 /* @ckeditor/ckeditor5-table/theme/table.css */
 .ck-content .table {
     margin: 0.9em auto;
@@ -87,12 +75,17 @@
 .ck-content[dir="ltr"] .table th {
     text-align: left;
 }
-/* @ckeditor/ckeditor5-media-embed/theme/mediaembed.css */
-.ck-content .media {
-    clear: both;
-    margin: 0.9em 0;
-    display: block;
-    min-width: 15em;
+/* @ckeditor/ckeditor5-table/theme/tablecaption.css */
+.ck-content .table > figcaption {
+    display: table-caption;
+    caption-side: top;
+    word-break: break-word;
+    text-align: center;
+    color: var(--ck-color-selector-caption-text);
+    background-color: var(--ck-color-selector-caption-background);
+    padding: .6em;
+    font-size: .75em;
+    outline-offset: -1px;
 }
 /* @ckeditor/ckeditor5-page-break/theme/pagebreak.css */
 .ck-content .page-break {
@@ -130,6 +123,13 @@
     -ms-user-select: none;
     user-select: none;
 }
+/* @ckeditor/ckeditor5-media-embed/theme/mediaembed.css */
+.ck-content .media {
+    clear: both;
+    margin: 0.9em 0;
+    display: block;
+    min-width: 15em;
+}
 /* @ckeditor/ckeditor5-list/theme/todolist.css */
 .ck-content .todo-list {
     list-style: none;
@@ -280,6 +280,42 @@
 .ck-editor__editable.ck-content .todo-list .todo-list__label.todo-list__label_without-description input[type=checkbox] {
     position: absolute;
 }
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ol {
+    list-style-type: decimal;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ol ol {
+    list-style-type: lower-latin;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ol ol ol {
+    list-style-type: lower-roman;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ol ol ol ol {
+    list-style-type: upper-latin;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ol ol ol ol ol {
+    list-style-type: upper-roman;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ul {
+    list-style-type: disc;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ul ul {
+    list-style-type: circle;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ul ul ul {
+    list-style-type: square;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ul ul ul ul {
+    list-style-type: square;
+}
 /* @ckeditor/ckeditor5-image/theme/image.css */
 .ck-content .image {
     display: table;
@@ -318,17 +354,6 @@
     flex-shrink: 1;
     max-width: 100%;
 }
-/* @ckeditor/ckeditor5-image/theme/imagecaption.css */
-.ck-content .image > figcaption {
-    display: table-caption;
-    caption-side: bottom;
-    word-break: break-word;
-    color: var(--ck-color-image-caption-text);
-    background-color: var(--ck-color-image-caption-background);
-    padding: .6em;
-    font-size: .75em;
-    outline-offset: -1px;
-}
 /* @ckeditor/ckeditor5-image/theme/imageresize.css */
 .ck-content img.image_resized {
     height: auto;
@@ -347,67 +372,16 @@
 .ck-content .image.image_resized > figcaption {
     display: block;
 }
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
-.ck-content .marker-yellow {
-    background-color: var(--ck-highlight-marker-yellow);
-}
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
-.ck-content .marker-green {
-    background-color: var(--ck-highlight-marker-green);
-}
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
-.ck-content .marker-pink {
-    background-color: var(--ck-highlight-marker-pink);
-}
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
-.ck-content .marker-blue {
-    background-color: var(--ck-highlight-marker-blue);
-}
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
-.ck-content .pen-red {
-    color: var(--ck-highlight-pen-red);
-    background-color: transparent;
-}
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
-.ck-content .pen-green {
-    color: var(--ck-highlight-pen-green);
-    background-color: transparent;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ol {
-    list-style-type: decimal;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ol ol {
-    list-style-type: lower-latin;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ol ol ol {
-    list-style-type: lower-roman;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ol ol ol ol {
-    list-style-type: upper-latin;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ol ol ol ol ol {
-    list-style-type: upper-roman;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ul {
-    list-style-type: disc;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ul ul {
-    list-style-type: circle;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ul ul ul {
-    list-style-type: square;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ul ul ul ul {
-    list-style-type: square;
+/* @ckeditor/ckeditor5-image/theme/imagecaption.css */
+.ck-content .image > figcaption {
+    display: table-caption;
+    caption-side: bottom;
+    word-break: break-word;
+    color: var(--ck-color-image-caption-text);
+    background-color: var(--ck-color-image-caption-background);
+    padding: .6em;
+    font-size: .75em;
+    outline-offset: -1px;
 }
 /* @ckeditor/ckeditor5-image/theme/imagestyle.css */
 .ck-content .image-style-block-align-left,
@@ -470,6 +444,32 @@
 .ck-content .image-inline.image-style-align-right {
     margin-left: var(--ck-inline-image-style-spacing);
 }
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-yellow {
+    background-color: var(--ck-highlight-marker-yellow);
+}
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-green {
+    background-color: var(--ck-highlight-marker-green);
+}
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-pink {
+    background-color: var(--ck-highlight-marker-pink);
+}
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-blue {
+    background-color: var(--ck-highlight-marker-blue);
+}
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .pen-red {
+    color: var(--ck-highlight-pen-red);
+    background-color: transparent;
+}
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .pen-green {
+    color: var(--ck-highlight-pen-green);
+    background-color: transparent;
+}
 /* @ckeditor/ckeditor5-block-quote/theme/blockquote.css */
 .ck-content blockquote {
     overflow: hidden;

libraries/jquery.hotkeys.js

@@ -1,195 +0,0 @@
-/*jslint browser: true*/
-/*jslint jquery: true*/
-
-/*
- * jQuery Hotkeys Plugin
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * Based upon the plugin by Tzury Bar Yochay:
- * http://github.com/tzuryby/hotkeys
- *
- * Original idea by:
- * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
- */
-
-/*
- * One small change is: now keys are passed by object { keys: '...' }
- * Might be useful, when you want to pass some other data to your handler
- */
-
-(function(jQuery) {
-
-  jQuery.hotkeys = {
-    version: "0.8",
-
-    specialKeys: {
-      8: "backspace",
-      9: "tab",
-      10: "return",
-      13: "return",
-      16: "shift",
-      17: "ctrl",
-      18: "alt",
-      19: "pause",
-      20: "capslock",
-      27: "esc",
-      32: "space",
-      33: "pageup",
-      34: "pagedown",
-      35: "end",
-      36: "home",
-      37: "left",
-      38: "up",
-      39: "right",
-      40: "down",
-      45: "insert",
-      46: "del",
-      59: ";",
-      61: "=",
-      96: "0",
-      97: "1",
-      98: "2",
-      99: "3",
-      100: "4",
-      101: "5",
-      102: "6",
-      103: "7",
-      104: "8",
-      105: "9",
-      106: "*",
-      107: "+",
-      109: "-",
-      110: ".",
-      111: "/",
-      112: "f1",
-      113: "f2",
-      114: "f3",
-      115: "f4",
-      116: "f5",
-      117: "f6",
-      118: "f7",
-      119: "f8",
-      120: "f9",
-      121: "f10",
-      122: "f11",
-      123: "f12",
-      144: "numlock",
-      145: "scroll",
-      173: "-",
-      186: ";",
-      187: "=",
-      188: ",",
-      189: "-",
-      190: ".",
-      191: "/",
-      192: "`",
-      219: "[",
-      220: "\\",
-      221: "]",
-      222: "'"
-    },
-
-    shiftNums: {
-      "`": "~",
-      "1": "!",
-      "2": "@",
-      "3": "#",
-      "4": "$",
-      "5": "%",
-      "6": "^",
-      "7": "&",
-      "8": "*",
-      "9": "(",
-      "0": ")",
-      "-": "_",
-      "=": "+",
-      ";": ": ",
-      "'": "\"",
-      ",": "<",
-      ".": ">",
-      "/": "?",
-      "\\": "|"
-    },
-
-    // excludes: button, checkbox, file, hidden, image, password, radio, reset, search, submit, url
-    textAcceptingInputTypes: [
-      "text", "password", "number", "email", "url", "range", "date", "month", "week", "time", "datetime",
-      "datetime-local", "search", "color", "tel"],
-
-    options: {
-      filterTextInputs: true
-    }
-  };
-
-  function keyHandler(handleObj) {
-    if (typeof handleObj.data === "string") {
-      handleObj.data = {
-        keys: handleObj.data
-      };
-    }
-
-    // Only care when a possible input has been specified
-    if (!handleObj.data || !handleObj.data.keys || typeof handleObj.data.keys !== "string") {
-      return;
-    }
-
-    var origHandler = handleObj.handler,
-      keys = handleObj.data.keys.toLowerCase().split(" ");
-
-    handleObj.handler = function(event) {
-      if (jQuery.hotkeys.options.filterTextInputs &&
-            event.target.tagName != 'WEBVIEW' &&
-            jQuery.inArray(event.target.type, jQuery.hotkeys.textAcceptingInputTypes) > -1) {
-        return;
-      }
-
-      var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[event.which],
-        character = String.fromCharCode(event.which).toLowerCase(),
-        modif = "",
-        possible = {};
-
-      jQuery.each(["alt", "ctrl", "shift"], function(index, specialKey) {
-
-        if (event[specialKey + 'Key'] && special !== specialKey) {
-          modif += specialKey + '+';
-        }
-      });
-
-      // metaKey is triggered off ctrlKey erronously
-      if (event.metaKey && !event.ctrlKey && special !== "meta") {
-        modif += "meta+";
-      }
-
-      if (event.metaKey && special !== "meta" && modif.indexOf("alt+ctrl+shift+") > -1) {
-        modif = modif.replace("alt+ctrl+shift+", "hyper+");
-      }
-
-      if (special) {
-        possible[modif + special] = true;
-      }
-      else {
-        possible[modif + character] = true;
-        possible[modif + jQuery.hotkeys.shiftNums[character]] = true;
-
-        // "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
-        if (modif === "shift+") {
-          possible[jQuery.hotkeys.shiftNums[character]] = true;
-        }
-      }
-
-      for (var i = 0, l = keys.length; i < l; i++) {
-        if (possible[keys[i]]) {
-          return origHandler.apply(this, arguments);
-        }
-      }
-    };
-  }
-
-  jQuery.each(["keydown", "keyup", "keypress"], function() {
-    jQuery.event.special[this] = {
-      add: keyHandler
-    };
-  });
-
-})(jQuery || this.jQuery || window.jQuery);

libraries/printThis.js

@@ -1,335 +0,0 @@
-/*
- * printThis v1.15.0
- * @desc Printing plug-in for jQuery
- * @author Jason Day
- *
- * Resources (based on):
- * - jPrintArea: http://plugins.jquery.com/project/jPrintArea
- * - jqPrint: https://github.com/permanenttourist/jquery.jqprint
- * - Ben Nadal: http://www.bennadel.com/blog/1591-Ask-Ben-Print-Part-Of-A-Web-Page-With-jQuery.htm
- *
- * Licensed under the MIT licence:
- *              http://www.opensource.org/licenses/mit-license.php
- *
- * (c) Jason Day 2015-2018
- *
- * Usage:
- *
- *  $("#mySelector").printThis({
- *      debug: false,                   // show the iframe for debugging
- *      importCSS: true,                // import parent page css
- *      importStyle: false,             // import style tags
- *      printContainer: true,           // grab outer container as well as the contents of the selector
- *      loadCSS: "path/to/my.css",      // path to additional css file - use an array [] for multiple
- *      pageTitle: "",                  // add title to print page
- *      removeInline: false,            // remove all inline styles from print elements
- *      removeInlineSelector: "body *", // custom selectors to filter inline styles. removeInline must be true
- *      printDelay: 333,                // variable print delay
- *      header: null,                   // prefix to html
- *      footer: null,                   // postfix to html
- *      base: false,                    // preserve the BASE tag, or accept a string for the URL
- *      formValues: true,               // preserve input/form values
- *      canvas: false,                  // copy canvas elements
- *      doctypeString: '...',           // enter a different doctype for older markup
- *      removeScripts: false,           // remove script tags from print content
- *      copyTagClasses: false           // copy classes from the html & body tag
- *      beforePrintEvent: null,         // callback function for printEvent in iframe
- *      beforePrint: null,              // function called before iframe is filled
- *      afterPrint: null                // function called before iframe is removed
- *  });
- *
- * Notes:
- *  - the loadCSS will load additional CSS (with or without @media print) into the iframe, adjusting layout
- */
-;
-(function($) {
-
-    function appendContent($el, content) {
-        if (!content) return;
-
-        // Simple test for a jQuery element
-        $el.append(content.jquery ? content.clone() : content);
-    }
-
-    function appendBody($body, $element, opt) {
-        // Clone for safety and convenience
-        // Calls clone(withDataAndEvents = true) to copy form values.
-        var $content = $element.clone(opt.formValues);
-
-        if (opt.formValues) {
-            // Copy original select and textarea values to their cloned counterpart
-            // Makes up for inability to clone select and textarea values with clone(true)
-            copyValues($element, $content, 'select, textarea');
-        }
-
-        if (opt.removeScripts) {
-            $content.find('script').remove();
-        }
-
-        if (opt.printContainer) {
-            // grab $.selector as container
-            $content.appendTo($body);
-        } else {
-            // otherwise just print interior elements of container
-            $content.each(function() {
-                $(this).children().appendTo($body)
-            });
-        }
-    }
-
-    // Copies values from origin to clone for passed in elementSelector
-    function copyValues(origin, clone, elementSelector) {
-        var $originalElements = origin.find(elementSelector);
-
-        clone.find(elementSelector).each(function(index, item) {
-            $(item).val($originalElements.eq(index).val());
-        });
-    }
-
-    var opt;
-    $.fn.printThis = function(options) {
-        opt = $.extend({}, $.fn.printThis.defaults, options);
-        var $element = this instanceof jQuery ? this : $(this);
-
-        var strFrameName = "printThis-" + (new Date()).getTime();
-
-        if (window.location.hostname !== document.domain && navigator.userAgent.match(/msie/i)) {
-            // Ugly IE hacks due to IE not inheriting document.domain from parent
-            // checks if document.domain is set by comparing the host name against document.domain
-            var iframeSrc = "javascript:document.write(\"<head><script>document.domain=\\\"" + document.domain + "\\\";</s" + "cript></head><body></body>\")";
-            var printI = document.createElement('iframe');
-            printI.name = "printIframe";
-            printI.id = strFrameName;
-            printI.className = "MSIE";
-            document.body.appendChild(printI);
-            printI.src = iframeSrc;
-
-        } else {
-            // other browsers inherit document.domain, and IE works if document.domain is not explicitly set
-            var $frame = $("<iframe id='" + strFrameName + "' name='printIframe' />");
-            $frame.appendTo("body");
-        }
-
-        var $iframe = $("#" + strFrameName);
-
-        // show frame if in debug mode
-        if (!opt.debug) $iframe.css({
-            position: "absolute",
-            width: "0px",
-            height: "0px",
-            left: "-600px",
-            top: "-600px"
-        });
-
-        // before print callback
-        if (typeof opt.beforePrint === "function") {
-            opt.beforePrint();
-        }
-
-        // $iframe.ready() and $iframe.load were inconsistent between browsers
-        setTimeout(function() {
-
-            // Add doctype to fix the style difference between printing and render
-            function setDocType($iframe, doctype){
-                var win, doc;
-                win = $iframe.get(0);
-                win = win.contentWindow || win.contentDocument || win;
-                doc = win.document || win.contentDocument || win;
-                doc.open();
-                doc.write(doctype);
-                doc.close();
-            }
-
-            if (opt.doctypeString){
-                setDocType($iframe, opt.doctypeString);
-            }
-
-            var $doc = $iframe.contents(),
-                $head = $doc.find("head"),
-                $body = $doc.find("body"),
-                $base = $('base'),
-                baseURL;
-
-            // add base tag to ensure elements use the parent domain
-            if (opt.base === true && $base.length > 0) {
-                // take the base tag from the original page
-                baseURL = $base.attr('href');
-            } else if (typeof opt.base === 'string') {
-                // An exact base string is provided
-                baseURL = opt.base;
-            } else {
-                // Use the page URL as the base
-                baseURL = document.location.protocol + '//' + document.location.host;
-            }
-
-            $head.append('<base href="' + baseURL + '">');
-
-            // import page stylesheets
-            if (opt.importCSS) $("link[rel=stylesheet]").each(function() {
-                var href = $(this).attr("href");
-                if (href) {
-                    var media = $(this).attr("media") || "all";
-                    $head.append("<link type='text/css' rel='stylesheet' href='" + href + "' media='" + media + "'>");
-                }
-            });
-
-            // import style tags
-            if (opt.importStyle) $("style").each(function() {
-                $head.append(this.outerHTML);
-            });
-
-            // add title of the page
-            if (opt.pageTitle) $head.append("<title>" + opt.pageTitle + "</title>");
-
-            // import additional stylesheet(s)
-            if (opt.loadCSS) {
-                if ($.isArray(opt.loadCSS)) {
-                    jQuery.each(opt.loadCSS, function(index, value) {
-                        $head.append("<link type='text/css' rel='stylesheet' href='" + this + "'>");
-                    });
-                } else {
-                    $head.append("<link type='text/css' rel='stylesheet' href='" + opt.loadCSS + "'>");
-                }
-            }
-
-            var pageHtml = $('html')[0];
-
-            // CSS VAR in html tag when dynamic apply e.g.  document.documentElement.style.setProperty("--foo", bar);
-            $doc.find('html').prop('style', pageHtml.style.cssText);
-
-            // copy 'root' tag classes
-            var tag = opt.copyTagClasses;
-            if (tag) {
-                tag = tag === true ? 'bh' : tag;
-                if (tag.indexOf('b') !== -1) {
-                    $body.addClass($('body')[0].className);
-                }
-                if (tag.indexOf('h') !== -1) {
-                    $doc.find('html').addClass(pageHtml.className);
-                }
-            }
-
-            // print header
-            appendContent($body, opt.header);
-
-            if (opt.canvas) {
-                // add canvas data-ids for easy access after cloning.
-                var canvasId = 0;
-                // .addBack('canvas') adds the top-level element if it is a canvas.
-                $element.find('canvas').addBack('canvas').each(function(){
-                    $(this).attr('data-printthis', canvasId++);
-                });
-            }
-
-            appendBody($body, $element, opt);
-
-            if (opt.canvas) {
-                // Re-draw new canvases by referencing the originals
-                $body.find('canvas').each(function(){
-                    var cid = $(this).data('printthis'),
-                        $src = $('[data-printthis="' + cid + '"]');
-
-                    this.getContext('2d').drawImage($src[0], 0, 0);
-
-                    // Remove the markup from the original
-                    if ($.isFunction($.fn.removeAttr)) {
-                        $src.removeAttr('data-printthis');
-                    } else {
-                        $.each($src, function(i, el) {
-                            el.removeAttribute('data-printthis')
-                        });
-                    }
-                });
-            }
-
-            // remove inline styles
-            if (opt.removeInline) {
-                // Ensure there is a selector, even if it's been mistakenly removed
-                var selector = opt.removeInlineSelector || '*';
-                // $.removeAttr available jQuery 1.7+
-                if ($.isFunction($.removeAttr)) {
-                    $body.find(selector).removeAttr("style");
-                } else {
-                    $body.find(selector).attr("style", "");
-                }
-            }
-
-            // print "footer"
-            appendContent($body, opt.footer);
-
-            // attach event handler function to beforePrint event
-            function attachOnBeforePrintEvent($iframe, beforePrintHandler) {
-                var win = $iframe.get(0);
-                win = win.contentWindow || win.contentDocument || win;
-
-                if (typeof beforePrintHandler === "function") {
-                    if ('matchMedia' in win) {
-                        win.matchMedia('print').addListener(function(mql) {
-                            if(mql.matches)  beforePrintHandler();
-                        });
-                    } else {
-                        win.onbeforeprint = beforePrintHandler;
-                    }
-                }
-            }
-            attachOnBeforePrintEvent($iframe, opt.beforePrint);
-
-            setTimeout(function() {
-                if ($iframe.hasClass("MSIE")) {
-                    // check if the iframe was created with the ugly hack
-                    // and perform another ugly hack out of neccessity
-                    window.frames["printIframe"].focus();
-                    $head.append("<script>  window.print(); </s" + "cript>");
-                } else {
-                    // proper method
-                    if (document.queryCommandSupported("print")) {
-                        $iframe[0].contentWindow.document.execCommand("print", false, null);
-                    } else {
-                        $iframe[0].contentWindow.focus();
-                        $iframe[0].contentWindow.print();
-                    }
-                }
-
-                // remove iframe after print
-                if (!opt.debug) {
-                    setTimeout(function() {
-                        $iframe.remove();
-
-                    }, 1000);
-                }
-
-                // after print callback
-                if (typeof opt.afterPrint === "function") {
-                    opt.afterPrint();
-                }
-
-            }, opt.printDelay);
-
-        }, 333);
-
-    };
-
-    // defaults
-    $.fn.printThis.defaults = {
-        debug: false,               // show the iframe for debugging
-        importCSS: true,            // import parent page css
-        importStyle: false,         // import style tags
-        printContainer: true,       // print outer container/$.selector
-        loadCSS: "",                // path to additional css file - use an array [] for multiple
-        pageTitle: "",              // add title to print page
-        removeInline: false,        // remove inline styles from print elements
-        removeInlineSelector: "*",  // custom selectors to filter inline styles. removeInline must be true
-        printDelay: 333,            // variable print delay
-        header: null,               // prefix to html
-        footer: null,               // postfix to html
-        base: false,                // preserve the BASE tag or accept a string for the URL
-        formValues: true,           // preserve input/form values
-        canvas: false,              // copy canvas content
-        doctypeString: '<!DOCTYPE html>', // enter a different doctype for older markup
-        removeScripts: false,       // remove script tags from print content
-        copyTagClasses: false,      // copy classes from the html & body tag
-        beforePrintEvent: null,     // callback function for printEvent in iframe
-        beforePrint: null,          // function called before iframe is filled
-        afterPrint: null            // function called before iframe is removed
-    };
-})(jQuery);

package.json

@@ -2,24 +2,24 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.62.3",
+  "version": "0.63.5",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {
-    "trilium": "./src/www"
+    "trilium": "src/www.js"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/zadam/trilium.git"
   },
   "scripts": {
-    "start-server": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon ./src/www",
-    "start-server-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon ./src/www",
-    "qstart-server": "npm run qswitch-server && TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon ./src/www",
+    "start-server": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/www.js",
+    "start-server-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/www.js",
+    "qstart-server": "npm run qswitch-server && TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/www.js",
     "start-electron": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron --inspect=5858 .",
     "start-electron-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 electron --inspect=5858 .",
     "qstart-electron": "npm run qswitch-electron && TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron --inspect=5858 .",
-    "start-test-server": "npm run qswitch-server; rm -rf ./data-test; cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 node ./src/www",
+    "start-test-server": "npm run qswitch-server; rm -rf ./data-test; cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 node src/www.js",
     "switch-server": "rm -rf ./node_modules/better-sqlite3 && npm install",
     "switch-electron": "./node_modules/.bin/electron-rebuild",
     "qswitch-server": "rm -rf ./node_modules/better-sqlite3/bin ; mkdir -p ./node_modules/better-sqlite3/build ; cp ./bin/better-sqlite3/linux-server-better_sqlite3.node ./node_modules/better-sqlite3/build/better_sqlite3.node",
@@ -43,6 +43,7 @@
     "async-mutex": "0.4.0",
     "axios": "1.6.2",
     "better-sqlite3": "8.4.0",
+    "boxicons": "2.1.4",
     "chokidar": "3.5.3",
     "cls-hooked": "4.2.2",
     "compression": "1.7.4",
@@ -60,6 +61,7 @@
     "express-partial-content": "1.0.2",
     "express-rate-limit": "7.1.4",
     "express-session": "1.17.3",
+    "force-graph": "1.43.4",
     "fs-extra": "11.1.1",
     "helmet": "7.1.0",
     "html": "1.0.0",
@@ -72,14 +74,19 @@
     "is-svg": "4.3.2",
     "jimp": "0.22.10",
     "joplin-turndown-plugin-gfm": "1.0.12",
+    "jquery": "3.7.1",
+    "jquery-hotkeys": "0.2.2",
     "jsdom": "22.1.0",
     "katex": "0.16.9",
     "marked": "9.1.6",
+    "mermaid": "10.6.1",
     "mime-types": "2.1.35",
     "multer": "1.4.5-lts.1",
     "node-abi": "3.51.0",
     "normalize-strings": "1.1.1",
     "open": "8.4.1",
+    "panzoom": "9.4.3",
+    "print-this": "2.0.0",
     "rand-token": "1.0.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
@@ -92,10 +99,11 @@
     "semver": "7.5.4",
     "serve-favicon": "2.5.0",
     "session-file-store": "1.5.0",
+    "split.js": "1.6.5",
     "stream-throttle": "0.1.3",
     "striptags": "3.2.0",
     "tmp": "0.2.1",
-    "tree-kill": "^1.2.2",
+    "tree-kill": "1.2.2",
     "turndown": "7.1.2",
     "unescape": "1.0.1",
     "ws": "8.14.2",
@@ -104,7 +112,7 @@
   },
   "devDependencies": {
     "cross-env": "7.0.3",
-    "electron": "25.9.5",
+    "electron": "25.9.8",
     "electron-builder": "24.6.4",
     "electron-packager": "17.1.2",
     "electron-rebuild": "3.2.9",

spec/etapi/app_info.js

@@ -1,7 +1,7 @@
 const {
     describeEtapi, postEtapi,
     putEtapiContent
-} = require("../support/etapi");
+} = require('../support/etapi.js');
 const {getEtapi} = require("../support/etapi.js");
 
 describeEtapi("app_info", () => {

spec/etapi/backup.js

@@ -1,7 +1,7 @@
 const {
     describeEtapi, postEtapi,
     getEtapi,
-} = require("../support/etapi");
+} = require('../support/etapi.js');
 const {putEtapiContent} = require("../support/etapi.js");
 
 describeEtapi("backup", () => {

spec/etapi/import.js

@@ -1,7 +1,7 @@
 const {
     describeEtapi, postEtapi,
     postEtapiContent,
-} = require("../support/etapi");
+} = require('../support/etapi.js');
 const fs = require("fs");
 const path = require("path");
 const {getEtapiContent} = require("../support/etapi.js");

spec/etapi/notes.js

@@ -7,7 +7,7 @@ const {
     getEtapiContent,
     patchEtapi, putEtapi,
     putEtapiContent
-} = require("../support/etapi");
+} = require('../support/etapi.js');
 
 describeEtapi("notes", () => {
     it("create", async () => {

spec/search/becca_mocking.js

@@ -1,7 +1,7 @@
-const BNote = require('../../src/becca/entities/bnote');
-const BBranch = require('../../src/becca/entities/bbranch');
-const BAttribute = require('../../src/becca/entities/battribute');
-const becca = require('../../src/becca/becca');
+const BNote = require('../../src/becca/entities/bnote.js');
+const BBranch = require('../../src/becca/entities/bbranch.js');
+const BAttribute = require('../../src/becca/entities/battribute.js');
+const becca = require('../../src/becca/becca.js');
 const randtoken = require('rand-token').generator({source: 'crypto'});
 
 /** @returns {BNote} */

spec/search/lexer.spec.js

@@ -1,4 +1,4 @@
-const lex = require('../../src/services/search/services/lex');
+const lex = require('../../src/services/search/services/lex.js');
 
 describe("Lexer fulltext", () => {
     it("simple lexing", () => {

spec/search/parens.spec.js

@@ -1,4 +1,4 @@
-const handleParens = require('../../src/services/search/services/handle_parens');
+const handleParens = require('../../src/services/search/services/handle_parens.js');
 
 describe("Parens handler", () => {
     it("handles parens", () => {

spec/search/parser.spec.js

@@ -1,5 +1,5 @@
-const SearchContext = require("../../src/services/search/search_context");
-const parse = require('../../src/services/search/services/parse');
+const SearchContext = require('../../src/services/search/search_context.js');
+const parse = require('../../src/services/search/services/parse.js');
 
 function tokens(toks, cur = 0) {
     return toks.map(arg => {

spec/search/search.spec.js

@@ -1,10 +1,10 @@
-const searchService = require('../../src/services/search/services/search');
-const BNote = require('../../src/becca/entities/bnote');
-const BBranch = require('../../src/becca/entities/bbranch');
-const SearchContext = require('../../src/services/search/search_context');
-const dateUtils = require('../../src/services/date_utils');
-const becca = require('../../src/becca/becca');
-const {NoteBuilder, findNoteByTitle, note} = require('./becca_mocking');
+const searchService = require('../../src/services/search/services/search.js');
+const BNote = require('../../src/becca/entities/bnote.js');
+const BBranch = require('../../src/becca/entities/bbranch.js');
+const SearchContext = require('../../src/services/search/search_context.js');
+const dateUtils = require('../../src/services/date_utils.js');
+const becca = require('../../src/becca/becca.js');
+const {NoteBuilder, findNoteByTitle, note} = require('./becca_mocking.js');
 
 describe("Search", () => {
     let rootNote;

spec/search/value_extractor.spec.js

@@ -1,7 +1,7 @@
-const {note} = require('./becca_mocking');
-const ValueExtractor = require('../../src/services/search/value_extractor');
-const becca = require('../../src/becca/becca');
-const SearchContext = require("../../src/services/search/search_context");
+const {note} = require('./becca_mocking.js');
+const ValueExtractor = require('../../src/services/search/value_extractor.js');
+const becca = require('../../src/becca/becca.js');
+const SearchContext = require('../../src/services/search/search_context.js');
 
 const dsc = new SearchContext();
 

src/anonymize.js

@@ -1,6 +1,6 @@
-const anonymizationService = require('./services/anonymization');
-const sqlInit = require('./services/sql_init');
-require('./becca/entity_constructor');
+const anonymizationService = require('./services/anonymization.js');
+const sqlInit = require('./services/sql_init.js');
+require('./becca/entity_constructor.js');
 
 sqlInit.dbReady.then(async () => {
     try {

src/app.js

@@ -4,11 +4,11 @@ const favicon = require('serve-favicon');
 const cookieParser = require('cookie-parser');
 const helmet = require('helmet');
 const compression = require('compression');
-const sessionParser = require('./routes/session_parser');
-const utils = require('./services/utils');
+const sessionParser = require('./routes/session_parser.js');
+const utils = require('./services/utils.js');
 
-require('./services/handlers');
-require('./becca/becca_loader');
+require('./services/handlers.js');
+require('./becca/becca_loader.js');
 
 const app = express();
 
@@ -37,21 +37,21 @@ app.use(`/robots.txt`, express.static(path.join(__dirname, 'public/robots.txt'))
 app.use(sessionParser);
 app.use(favicon(`${__dirname}/../images/app-icons/win/icon.ico`));
 
-require('./routes/assets').register(app);
-require('./routes/routes').register(app);
-require('./routes/custom').register(app);
-require('./routes/error_handlers').register(app);
+require('./routes/assets.js').register(app);
+require('./routes/routes.js').register(app);
+require('./routes/custom.js').register(app);
+require('./routes/error_handlers.js').register(app);
 
 // triggers sync timer
-require('./services/sync');
+require('./services/sync.js');
 
 // triggers backup timer
-require('./services/backup');
+require('./services/backup.js');
 
 // trigger consistency checks timer
-require('./services/consistency_checks');
+require('./services/consistency_checks.js');
 
-require('./services/scheduler');
+require('./services/scheduler.js');
 
 if (utils.isElectron()) {
     require('@electron/remote/main').initialize();

src/becca/becca.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const sql = require("../services/sql");
-const NoteSet = require("../services/search/note_set");
-const NotFoundError = require("../errors/not_found_error");
+const sql = require('../services/sql.js');
+const NoteSet = require('../services/search/note_set.js');
+const NotFoundError = require('../errors/not_found_error.js');
 
 /**
  * Becca is a backend cache of all notes, branches, and attributes.
@@ -148,7 +148,7 @@ class Becca {
     getRevision(revisionId) {
         const row = sql.getRow("SELECT * FROM revisions WHERE revisionId = ?", [revisionId]);
 
-        const BRevision = require("./entities/brevision"); // avoiding circular dependency problems
+        const BRevision = require('./entities/brevision.js'); // avoiding circular dependency problems
         return row ? new BRevision(row) : null;
     }
 
@@ -163,7 +163,7 @@ class Becca {
                WHERE attachmentId = ? AND isDeleted = 0`
             : `SELECT * FROM attachments WHERE attachmentId = ? AND isDeleted = 0`;
 
-        const BAttachment = require("./entities/battachment"); // avoiding circular dependency problems
+        const BAttachment = require('./entities/battachment.js'); // avoiding circular dependency problems
 
         return sql.getRows(query, [attachmentId])
             .map(row => new BAttachment(row))[0];
@@ -180,7 +180,7 @@ class Becca {
 
     /** @returns {BAttachment[]} */
     getAttachments(attachmentIds) {
-        const BAttachment = require("./entities/battachment"); // avoiding circular dependency problems
+        const BAttachment = require('./entities/battachment.js'); // avoiding circular dependency problems
         return sql.getManyRows("SELECT * FROM attachments WHERE attachmentId IN (???) AND isDeleted = 0", attachmentIds)
             .map(row => new BAttachment(row));
     }
@@ -189,7 +189,7 @@ class Becca {
     getBlob(entity) {
         const row = sql.getRow("SELECT *, LENGTH(content) AS contentLength FROM blobs WHERE blobId = ?", [entity.blobId]);
 
-        const BBlob = require("./entities/bblob"); // avoiding circular dependency problems
+        const BBlob = require('./entities/bblob.js'); // avoiding circular dependency problems
         return row ? new BBlob(row) : null;
     }
 
@@ -238,7 +238,7 @@ class Becca {
     getRecentNotesFromQuery(query, params = []) {
         const rows = sql.getRows(query, params);
 
-        const BRecentNote = require("./entities/brecent_note"); // avoiding circular dependency problems
+        const BRecentNote = require('./entities/brecent_note.js'); // avoiding circular dependency problems
         return rows.map(row => new BRecentNote(row));
     }
 
@@ -246,7 +246,7 @@ class Becca {
     getRevisionsFromQuery(query, params = []) {
         const rows = sql.getRows(query, params);
 
-        const BRevision = require("./entities/brevision"); // avoiding circular dependency problems
+        const BRevision = require('./entities/brevision.js'); // avoiding circular dependency problems
         return rows.map(row => new BRevision(row));
     }
 

src/becca/becca_loader.js

@@ -1,24 +1,24 @@
 "use strict";
 
-const sql = require('../services/sql');
-const eventService = require('../services/events');
-const becca = require('./becca');
-const sqlInit = require('../services/sql_init');
-const log = require('../services/log');
-const BNote = require('./entities/bnote');
-const BBranch = require('./entities/bbranch');
-const BAttribute = require('./entities/battribute');
-const BOption = require('./entities/boption');
-const BEtapiToken = require("./entities/betapi_token");
-const cls = require("../services/cls");
-const entityConstructor = require("../becca/entity_constructor");
+const sql = require('../services/sql.js');
+const eventService = require('../services/events.js');
+const becca = require('./becca.js');
+const sqlInit = require('../services/sql_init.js');
+const log = require('../services/log.js');
+const BNote = require('./entities/bnote.js');
+const BBranch = require('./entities/bbranch.js');
+const BAttribute = require('./entities/battribute.js');
+const BOption = require('./entities/boption.js');
+const BEtapiToken = require('./entities/betapi_token.js');
+const cls = require('../services/cls.js');
+const entityConstructor = require('../becca/entity_constructor.js');
 
 const beccaLoaded = new Promise((res, rej) => {
     sqlInit.dbReady.then(() => {
         cls.init(() => {
             load();
 
-            require('../services/options_init').initStartupOptions();
+            require('../services/options_init.js').initStartupOptions();
 
             res();
         });
@@ -71,7 +71,7 @@ function load() {
 function reload(reason) {
     load();
 
-    require('../services/ws').reloadFrontend(reason || "becca reloaded");
+    require('../services/ws.js').reloadFrontend(reason || "becca reloaded");
 }
 
 eventService.subscribeBeccaLoader([eventService.ENTITY_CHANGE_SYNCED],  ({entityName, entityRow}) => {

src/becca/becca_service.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const becca = require('./becca');
-const cls = require('../services/cls');
-const log = require('../services/log');
+const becca = require('./becca.js');
+const cls = require('../services/cls.js');
+const log = require('../services/log.js');
 
 function isNotePathArchived(notePath) {
     const noteId = notePath[notePath.length - 1];

src/becca/entities/abstract_becca_entity.js

@@ -1,14 +1,14 @@
 "use strict";
 
-const utils = require('../../services/utils');
-const sql = require('../../services/sql');
-const entityChangesService = require('../../services/entity_changes');
-const eventService = require("../../services/events");
-const dateUtils = require("../../services/date_utils");
-const cls = require("../../services/cls");
-const log = require("../../services/log");
-const protectedSessionService = require("../../services/protected_session");
-const blobService = require("../../services/blob");
+const utils = require('../../services/utils.js');
+const sql = require('../../services/sql.js');
+const entityChangesService = require('../../services/entity_changes.js');
+const eventService = require('../../services/events.js');
+const dateUtils = require('../../services/date_utils.js');
+const cls = require('../../services/cls.js');
+const log = require('../../services/log.js');
+const protectedSessionService = require('../../services/protected_session.js');
+const blobService = require('../../services/blob.js');
 
 let becca = null;
 
@@ -34,7 +34,7 @@ class AbstractBeccaEntity {
      */
     get becca() {
         if (!becca) {
-            becca = require('../becca');
+            becca = require('../becca.js');
         }
 
         return becca;

src/becca/entities/battachment.js

@@ -1,14 +1,15 @@
 "use strict";
 
-const utils = require('../../services/utils');
-const dateUtils = require('../../services/date_utils');
-const AbstractBeccaEntity = require("./abstract_becca_entity");
-const sql = require("../../services/sql");
-const protectedSessionService = require("../../services/protected_session");
-const log = require("../../services/log");
+const utils = require('../../services/utils.js');
+const dateUtils = require('../../services/date_utils.js');
+const AbstractBeccaEntity = require('./abstract_becca_entity.js');
+const sql = require('../../services/sql.js');
+const protectedSessionService = require('../../services/protected_session.js');
+const log = require('../../services/log.js');
 
 const attachmentRoleToNoteTypeMapping = {
-    'image': 'image'
+    'image': 'image',
+    'file': 'file'
 };
 
 /**
@@ -37,7 +38,7 @@ class BAttachment extends AbstractBeccaEntity {
 
         /** @type {string} */
         this.attachmentId = row.attachmentId;
-        /** 
+        /**
          * either noteId or revisionId to which this attachment belongs
          * @type {string}
          */
@@ -153,7 +154,7 @@ class BAttachment extends AbstractBeccaEntity {
             throw new Error(`Cannot convert protected attachment outside of protected session`);
         }
 
-        const noteService = require('../../services/notes');
+        const noteService = require('../../services/notes.js');
 
         const { note, branch } = noteService.createNewNote({
             parentNoteId: this.ownerId,

src/becca/entities/battribute.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const BNote = require('./bnote');
-const AbstractBeccaEntity = require("./abstract_becca_entity");
-const sql = require("../../services/sql");
-const dateUtils = require("../../services/date_utils");
-const promotedAttributeDefinitionParser = require("../../services/promoted_attribute_definition_parser");
-const {sanitizeAttributeName} = require("../../services/sanitize_attribute_name");
+const BNote = require('./bnote.js');
+const AbstractBeccaEntity = require('./abstract_becca_entity.js');
+const sql = require('../../services/sql.js');
+const dateUtils = require('../../services/date_utils.js');
+const promotedAttributeDefinitionParser = require('../../services/promoted_attribute_definition_parser.js');
+const {sanitizeAttributeName} = require('../../services/sanitize_attribute_name.js');
 
 
 /**

src/becca/entities/bbranch.js

@@ -1,12 +1,12 @@
 "use strict";
 
-const BNote = require('./bnote');
-const AbstractBeccaEntity = require("./abstract_becca_entity");
-const dateUtils = require("../../services/date_utils");
-const utils = require("../../services/utils");
-const TaskContext = require("../../services/task_context");
-const cls = require("../../services/cls");
-const log = require("../../services/log");
+const BNote = require('./bnote.js');
+const AbstractBeccaEntity = require('./abstract_becca_entity.js');
+const dateUtils = require('../../services/date_utils.js');
+const utils = require('../../services/utils.js');
+const TaskContext = require('../../services/task_context.js');
+const cls = require('../../services/cls.js');
+const log = require('../../services/log.js');
 
 /**
  * Branch represents a relationship between a child note and its parent note. Trilium allows a note to have multiple
@@ -161,7 +161,7 @@ class BBranch extends AbstractBeccaEntity {
 
             if (parentBranches.length === 1 && parentBranches[0] === this) {
                 // needs to be run before branches and attributes are deleted and thus attached relations disappear
-                const handlers = require("../../services/handlers");
+                const handlers = require('../../services/handlers.js');
                 handlers.runAttachedRelations(note, 'runOnNoteDeletion', note);
             }
         }

src/becca/entities/betapi_token.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const dateUtils = require('../../services/date_utils');
-const AbstractBeccaEntity = require("./abstract_becca_entity");
+const dateUtils = require('../../services/date_utils.js');
+const AbstractBeccaEntity = require('./abstract_becca_entity.js');
 
 /**
  * EtapiToken is an entity representing token used to authenticate against Trilium REST API from client applications.

src/becca/entities/bnote.js

@@ -1,17 +1,17 @@
 "use strict";
 
-const protectedSessionService = require('../../services/protected_session');
-const log = require('../../services/log');
-const sql = require('../../services/sql');
-const utils = require('../../services/utils');
-const dateUtils = require('../../services/date_utils');
-const AbstractBeccaEntity = require("./abstract_becca_entity");
-const BRevision = require("./brevision");
-const BAttachment = require("./battachment");
-const TaskContext = require("../../services/task_context");
+const protectedSessionService = require('../../services/protected_session.js');
+const log = require('../../services/log.js');
+const sql = require('../../services/sql.js');
+const utils = require('../../services/utils.js');
+const dateUtils = require('../../services/date_utils.js');
+const AbstractBeccaEntity = require('./abstract_becca_entity.js');
+const BRevision = require('./brevision.js');
+const BAttachment = require('./battachment.js');
+const TaskContext = require('../../services/task_context.js');
 const dayjs = require("dayjs");
 const utc = require('dayjs/plugin/utc');
-const eventService = require("../../services/events");
+const eventService = require('../../services/events.js');
 dayjs.extend(utc);
 
 const LABEL = 'label';
@@ -903,7 +903,7 @@ class BNote extends AbstractBeccaEntity {
         }
 
         try {
-            const searchService = require("../../services/search/services/search");
+            const searchService = require('../../services/search/services/search.js');
             const {searchResultNoteIds} = searchService.searchFromNote(this);
 
             const becca = this.becca;
@@ -1303,7 +1303,7 @@ class BNote extends AbstractBeccaEntity {
             }
         }
         else {
-            const BAttribute = require("./battribute");
+            const BAttribute = require('./battribute.js');
 
             new BAttribute({
                 noteId: this.noteId,
@@ -1343,7 +1343,7 @@ class BNote extends AbstractBeccaEntity {
      * @returns {BAttribute}
      */
     addAttribute(type, name, value = "", isInheritable = false, position = null) {
-        const BAttribute = require("./battribute");
+        const BAttribute = require('./battribute.js');
 
         return new BAttribute({
             noteId: this.noteId,
@@ -1448,7 +1448,7 @@ class BNote extends AbstractBeccaEntity {
     removeRelation(name, value) { return this.removeAttribute(RELATION, name, value); }
 
     searchNotesInSubtree(searchString) {
-        const searchService = require("../../services/search/services/search");
+        const searchService = require('../../services/search/services/search.js');
 
         return searchService.searchNotes(searchString);
     }
@@ -1462,7 +1462,7 @@ class BNote extends AbstractBeccaEntity {
      * @returns {{success: boolean, message: string, branchId: string, notePath: string}}
      */
     cloneTo(parentNoteId) {
-        const cloningService = require("../../services/cloning");
+        const cloningService = require('../../services/cloning.js');
 
         const branch = this.becca.getNote(parentNoteId).getParentBranches()[0];
 
@@ -1537,7 +1537,7 @@ class BNote extends AbstractBeccaEntity {
 
         parentNote.setContent(fixedContent);
 
-        const noteService = require("../../services/notes");
+        const noteService = require('../../services/notes.js');
         noteService.asyncPostProcessContent(parentNote, fixedContent); // to mark an unused attachment for deletion
 
         this.deleteNote();
@@ -1565,7 +1565,7 @@ class BNote extends AbstractBeccaEntity {
         }
 
         // needs to be run before branches and attributes are deleted and thus attached relations disappear
-        const handlers = require("../../services/handlers");
+        const handlers = require('../../services/handlers.js');
         handlers.runAttachedRelations(this, 'runOnNoteDeletion', this);
         taskContext.noteDeletionHandlerTriggered = true;
 

src/becca/entities/boption.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const dateUtils = require('../../services/date_utils');
-const AbstractBeccaEntity = require("./abstract_becca_entity");
+const dateUtils = require('../../services/date_utils.js');
+const AbstractBeccaEntity = require('./abstract_becca_entity.js');
 
 /**
  * Option represents a name-value pair, either directly configurable by the user or some system property.

src/becca/entities/brecent_note.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const dateUtils = require('../../services/date_utils');
-const AbstractBeccaEntity = require("./abstract_becca_entity");
+const dateUtils = require('../../services/date_utils.js');
+const AbstractBeccaEntity = require('./abstract_becca_entity.js');
 
 /**
  * RecentNote represents recently visited note.

src/becca/entities/brevision.js

@@ -1,12 +1,12 @@
 "use strict";
 
-const protectedSessionService = require('../../services/protected_session');
-const utils = require('../../services/utils');
-const dateUtils = require('../../services/date_utils');
-const becca = require('../becca');
-const AbstractBeccaEntity = require("./abstract_becca_entity");
-const sql = require("../../services/sql");
-const BAttachment = require("./battachment");
+const protectedSessionService = require('../../services/protected_session.js');
+const utils = require('../../services/utils.js');
+const dateUtils = require('../../services/date_utils.js');
+const becca = require('../becca.js');
+const AbstractBeccaEntity = require('./abstract_becca_entity.js');
+const sql = require('../../services/sql.js');
+const BAttachment = require('./battachment.js');
 
 /**
  * Revision represents a snapshot of note's title and content at some point in the past.
@@ -161,6 +161,13 @@ class BRevision extends AbstractBeccaEntity {
         return this.getAttachments().filter(attachment => attachment.title === title)[0];
     }
 
+    /**
+     * Revisions are not soft-deletable, they are immediately hard-deleted (erased).
+     */
+    eraseRevision() {
+        require("../../services/erase.js").eraseRevisions([this.revisionId]);
+    }
+
     beforeSaving() {
         super.beforeSaving();
 

src/becca/entity_constructor.js

@@ -1,12 +1,12 @@
-const BAttachment = require("./entities/battachment");
-const BAttribute = require('./entities/battribute');
-const BBlob = require("./entities/bblob");
-const BBranch = require('./entities/bbranch');
-const BEtapiToken = require('./entities/betapi_token');
-const BNote = require('./entities/bnote');
-const BOption = require('./entities/boption');
-const BRecentNote = require('./entities/brecent_note');
-const BRevision = require('./entities/brevision');
+const BAttachment = require('./entities/battachment.js');
+const BAttribute = require('./entities/battribute.js');
+const BBlob = require('./entities/bblob.js');
+const BBranch = require('./entities/bbranch.js');
+const BEtapiToken = require('./entities/betapi_token.js');
+const BNote = require('./entities/bnote.js');
+const BOption = require('./entities/boption.js');
+const BRecentNote = require('./entities/brecent_note.js');
+const BRevision = require('./entities/brevision.js');
 
 const ENTITY_NAME_TO_ENTITY = {
     "attachments": BAttachment,

src/becca/similarity.js

@@ -1,7 +1,7 @@
-const becca = require('./becca');
-const log = require('../services/log');
-const beccaService = require('./becca_service');
-const dateUtils = require('../services/date_utils');
+const becca = require('./becca.js');
+const log = require('../services/log.js');
+const beccaService = require('./becca_service.js');
+const dateUtils = require('../services/date_utils.js');
 const {JSDOM} = require("jsdom");
 
 const DEBUG = false;
@@ -35,7 +35,7 @@ const IGNORED_ATTR_NAMES = [
 function filterUrlValue(value) {
     return value
         .replace(/https?:\/\//ig, "")
-        .replace(/www\./ig, "")
+        .replace(/www.js\./ig, "")
         .replace(/(\.net|\.com|\.org|\.info|\.edu)/ig, "");
 }
 

src/etapi/app_info.js

@@ -1,5 +1,5 @@
-const appInfo = require('../services/app_info');
-const eu = require("./etapi_utils");
+const appInfo = require('../services/app_info.js');
+const eu = require('./etapi_utils.js');
 
 function register(router) {
     eu.route(router, 'get', '/etapi/app-info', (req, res, next) => {

src/etapi/attachments.js

@@ -1,8 +1,8 @@
-const becca = require("../becca/becca");
-const eu = require("./etapi_utils");
-const mappers = require("./mappers");
-const v = require("./validators");
-const utils = require("../services/utils");
+const becca = require('../becca/becca.js');
+const eu = require('./etapi_utils.js');
+const mappers = require('./mappers.js');
+const v = require('./validators.js');
+const utils = require('../services/utils.js');
 
 function register(router) {
     const ALLOWED_PROPERTIES_FOR_CREATE_ATTACHMENT = {

src/etapi/attributes.js

@@ -1,8 +1,8 @@
-const becca = require("../becca/becca");
-const eu = require("./etapi_utils");
-const mappers = require("./mappers");
-const attributeService = require("../services/attributes");
-const v = require("./validators");
+const becca = require('../becca/becca.js');
+const eu = require('./etapi_utils.js');
+const mappers = require('./mappers.js');
+const attributeService = require('../services/attributes.js');
+const v = require('./validators.js');
 
 function register(router) {
     eu.route(router, 'get', '/etapi/attributes/:attributeId', (req, res, next) => {

src/etapi/auth.js

@@ -1,7 +1,7 @@
-const becca = require("../becca/becca");
-const eu = require("./etapi_utils");
-const passwordEncryptionService = require("../services/encryption/password_encryption");
-const etapiTokenService = require("../services/etapi_tokens");
+const becca = require('../becca/becca.js');
+const eu = require('./etapi_utils.js');
+const passwordEncryptionService = require('../services/encryption/password_encryption.js');
+const etapiTokenService = require('../services/etapi_tokens.js');
 
 function register(router, loginMiddleware) {
     eu.NOT_AUTHENTICATED_ROUTE(router, 'post', '/etapi/auth/login', loginMiddleware, (req, res, next) => {

src/etapi/backup.js

@@ -1,5 +1,5 @@
-const eu = require("./etapi_utils");
-const backupService = require("../services/backup");
+const eu = require('./etapi_utils.js');
+const backupService = require('../services/backup.js');
 
 function register(router) {
     eu.route(router, 'put', '/etapi/backup/:backupName', async (req, res, next) => {

src/etapi/branches.js

@@ -1,9 +1,9 @@
-const becca = require("../becca/becca");
-const eu = require("./etapi_utils");
-const mappers = require("./mappers");
-const BBranch = require("../becca/entities/bbranch");
-const entityChangesService = require("../services/entity_changes");
-const v = require("./validators");
+const becca = require('../becca/becca.js');
+const eu = require('./etapi_utils.js');
+const mappers = require('./mappers.js');
+const BBranch = require('../becca/entities/bbranch.js');
+const entityChangesService = require('../services/entity_changes.js');
+const v = require('./validators.js');
 
 function register(router) {
     eu.route(router, 'get', '/etapi/branches/:branchId', (req, res, next) => {

src/etapi/etapi.openapi.yaml

@@ -427,6 +427,116 @@ paths:
             application/json; charset=utf-8:
               schema:
                 $ref: '#/components/schemas/Error'
+  /attachments:
+    post:
+      description: create an attachment
+      operationId: postAttachment
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CreateAttachment'
+      responses:
+        '201':
+          description: attachment created
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Attachment'
+        default:
+          description: unexpected error
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Error'
+  /attachments/{attachmentId}:
+    parameters:
+      - name: attachmentId
+        in: path
+        required: true
+        schema:
+          $ref: '#/components/schemas/EntityId'
+    get:
+      description: Returns an attachment identified by its ID
+      operationId: getAttachmentById
+      responses:
+        '200':
+          description: attachment response
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Attachment'
+        default:
+          description: unexpected error
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Error'
+    patch:
+      description: patch an attachment identified by the attachmentId with changes in the body. Only role, mime, title, and position are patchable.
+      operationId: patchAttachmentById
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Attachment'
+      responses:
+        '200':
+          description: attribute updated
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Attachment'
+        default:
+          description: unexpected error
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Error'
+    delete:
+      description: deletes an attachment based on the attachmentId supplied.
+      operationId: deleteAttachmentById
+      responses:
+        '204':
+          description: attachment deleted
+        default:
+          description: unexpected error
+          content:
+            application/json; charset=utf-8:
+              schema:
+                $ref: '#/components/schemas/Error'
+  /attachments/{attachmentId}/content:
+    parameters:
+      - name: attachmentId
+        in: path
+        required: true
+        schema:
+          $ref: '#/components/schemas/EntityId'
+    get:
+      description: Returns attachment content identified by its ID
+      operationId: getAttachmentContent
+      responses:
+        '200':
+          description: attachment content response
+          content:
+            text/html:
+              schema:
+                type: string
+    put:
+      description: Updates attachment content identified by its ID
+      operationId: putAttachmentContentById
+      requestBody:
+        description: html content of attachment
+        required: true
+        content:
+          text/plain:
+            schema:
+              type: string
+      responses:
+        '204':
+          description: attachment content updated
   /attributes:
     post:
       description: create an attribute for a given note
@@ -474,7 +584,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/Error'
     patch:
-      description: patch a attribute identified by the attributeId with changes in the body. For labels, only value and position can be updated. For relations, only position can be updated. If you want to modify other properties, you need to delete the old attribute and create a new one.
+      description: patch an attribute identified by the attributeId with changes in the body. For labels, only value and position can be updated. For relations, only position can be updated. If you want to modify other properties, you need to delete the old attribute and create a new one.
       operationId: patchAttributeById
       requestBody:
         required: true
@@ -496,7 +606,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/Error'
     delete:
-      description: deletes a attribute based on the attributeId supplied.
+      description: deletes an attribute based on the attributeId supplied.
       operationId: deleteAttributeById
       responses:
         '204':
@@ -884,6 +994,57 @@ components:
           $ref: '#/components/schemas/Note'
         branch:
           $ref: '#/components/schemas/Branch'
+    Attachment:
+      type: object
+      description: Attachment is owned by a note, has title and content
+      properties:
+        attachmentId:
+          $ref: '#/components/schemas/EntityId'
+          readOnly: true
+        ownerId:
+          $ref: '#/components/schemas/EntityId'
+          description: identifies the owner of the attachment, is either noteId or revisionId
+        role:
+          type: string
+        mime:
+          type: string
+        title:
+          type: string
+        position:
+          type: integer
+          format: int32
+        blobId:
+          type: string
+          description: ID of the blob object which effectively serves as a content hash
+        dateModified:
+          $ref: '#/components/schemas/LocalDateTime'
+          readOnly: true
+        utcDateModified:
+          $ref: '#/components/schemas/UtcDateTime'
+          readOnly: true
+        utcDateScheduledForErasureSince:
+          $ref: '#/components/schemas/UtcDateTime'
+          readOnly: true
+        contentLength:
+          type: integer
+          format: int32
+    CreateAttachment:
+      type: object
+      properties:
+        ownerId:
+          $ref: '#/components/schemas/EntityId'
+          description: identifies the owner of the attachment, is either noteId or revisionId
+        role:
+          type: string
+        mime:
+          type: string
+        title:
+          type: string
+        content:
+          type: string
+        position:
+          type: integer
+          format: int32
     Attribute:
       type: object
       description: Attribute (Label, Relation) is a key-value record attached to a note.

src/etapi/etapi_utils.js

@@ -1,9 +1,9 @@
-const cls = require("../services/cls");
-const sql = require("../services/sql");
-const log = require("../services/log");
-const becca = require("../becca/becca");
-const etapiTokenService = require("../services/etapi_tokens");
-const config = require("../services/config");
+const cls = require('../services/cls.js');
+const sql = require('../services/sql.js');
+const log = require('../services/log.js');
+const becca = require('../becca/becca.js');
+const etapiTokenService = require('../services/etapi_tokens.js');
+const config = require('../services/config.js');
 const GENERIC_CODE = "GENERIC";
 
 const noAuthentication = config.General && config.General.noAuthentication === true;

src/etapi/notes.js

@@ -1,14 +1,14 @@
-const becca = require("../becca/becca");
-const utils = require("../services/utils");
-const eu = require("./etapi_utils");
-const mappers = require("./mappers");
-const noteService = require("../services/notes");
-const TaskContext = require("../services/task_context");
-const v = require("./validators");
-const searchService = require("../services/search/services/search");
-const SearchContext = require("../services/search/search_context");
-const zipExportService = require("../services/export/zip");
-const zipImportService = require("../services/import/zip");
+const becca = require('../becca/becca.js');
+const utils = require('../services/utils.js');
+const eu = require('./etapi_utils.js');
+const mappers = require('./mappers.js');
+const noteService = require('../services/notes.js');
+const TaskContext = require('../services/task_context.js');
+const v = require('./validators.js');
+const searchService = require('../services/search/services/search.js');
+const SearchContext = require('../services/search/search_context.js');
+const zipExportService = require('../services/export/zip.js');
+const zipImportService = require('../services/import/zip.js');
 
 function register(router) {
     eu.route(router, 'get', '/etapi/notes', (req, res, next) => {

src/etapi/special_notes.js

@@ -1,7 +1,7 @@
-const specialNotesService = require("../services/special_notes");
-const dateNotesService = require("../services/date_notes");
-const eu = require("./etapi_utils");
-const mappers = require("./mappers");
+const specialNotesService = require('../services/special_notes.js');
+const dateNotesService = require('../services/date_notes.js');
+const eu = require('./etapi_utils.js');
+const mappers = require('./mappers.js');
 
 const getDateInvalidError = date => new eu.EtapiError(400, "DATE_INVALID", `Date "${date}" is not valid.`);
 const getMonthInvalidError = month => new eu.EtapiError(400, "MONTH_INVALID", `Month "${month}" is not valid.`);
@@ -74,4 +74,4 @@ function register(router) {
 
 module.exports = {
     register
-};
+};

src/etapi/validators.js

@@ -1,5 +1,5 @@
-const noteTypeService = require("../services/note_types");
-const dateUtils = require("../services/date_utils");
+const noteTypeService = require('../services/note_types.js');
+const dateUtils = require('../services/date_utils.js');
 
 function mandatory(obj) {
     if (obj === undefined ) {
@@ -64,7 +64,7 @@ function isNoteId(obj) {
         return;
     }
 
-    const becca = require('../becca/becca');
+    const becca = require('../becca/becca.js');
 
     if (typeof obj !== 'string') {
         return `'${obj}' is not a valid noteId`;

src/public/app/menus/image_context_menu.js

@@ -0,0 +1,44 @@
+import utils from "../services/utils.js";
+import contextMenu from "./context_menu.js";
+import imageService from "../services/image.js";
+
+const PROP_NAME = "imageContextMenuInstalled";
+
+function setupContextMenu($image) {
+    if (!utils.isElectron() || $image.prop(PROP_NAME)) {
+        return;
+    }
+
+    $image.prop(PROP_NAME, true);
+    $image.on('contextmenu', e => {
+        e.preventDefault();
+
+        contextMenu.show({
+            x: e.pageX,
+            y: e.pageY,
+            items: [
+                {
+                    title: "Copy reference to clipboard",
+                    command: "copyImageReferenceToClipboard",
+                    uiIcon: "bx bx-empty"
+                },
+                {title: "Copy image to clipboard", command: "copyImageToClipboard", uiIcon: "bx bx-empty"},
+            ],
+            selectMenuItemHandler: ({command}) => {
+                if (command === 'copyImageReferenceToClipboard') {
+                    imageService.copyImageReferenceToClipboard($image);
+                } else if (command === 'copyImageToClipboard') {
+                    const webContents = utils.dynamicRequire('@electron/remote').getCurrentWebContents();
+                    utils.dynamicRequire('electron');
+                    webContents.copyImageAt(e.pageX, e.pageY);
+                } else {
+                    throw new Error(`Unrecognized command '${command}'`);
+                }
+            }
+        });
+    });
+}
+
+export default {
+    setupContextMenu
+};

src/public/app/menus/tree_context_menu.js

@@ -50,10 +50,10 @@ export default class TreeContextMenu {
             { title: 'Open in a new tab <kbd>Ctrl+Click</kbd>', command: "openInTab", uiIcon: "bx bx-empty", enabled: noSelectedNotes },
             { title: 'Open in a new split', command: "openNoteInSplit", uiIcon: "bx bx-dock-right", enabled: noSelectedNotes },
             { title: 'Insert note after <kbd data-command="createNoteAfter"></kbd>', command: "insertNoteAfter", uiIcon: "bx bx-plus",
-                items: insertNoteAfterEnabled ? await noteTypesService.getNoteTypeItems("insertNoteAfter") : null,
+                items: insertNoteAfterEnabled ? await noteTypesService.getNoteTypeItems("insertNoteAfter", {removeDeprecatedTypes: true}) : null,
                 enabled: insertNoteAfterEnabled && noSelectedNotes },
             { title: 'Insert child note <kbd data-command="createNoteInto"></kbd>', command: "insertChildNote", uiIcon: "bx bx-plus",
-                items: notSearch ? await noteTypesService.getNoteTypeItems("insertChildNote") : null,
+                items: notSearch ? await noteTypesService.getNoteTypeItems("insertChildNote", {removeDeprecatedTypes: true}) : null,
                 enabled: notSearch && noSelectedNotes },
             { title: 'Delete <kbd data-command="deleteNotes"></kbd>', command: "deleteNotes", uiIcon: "bx bx-trash",
                 enabled: isNotRoot && !isHoisted && parentNotSearch },

src/public/app/services/branches.js

@@ -107,6 +107,13 @@ async function deleteNotes(branchIdsToDelete, forceDeleteAllClones = false) {
         return false;
     }
 
+    try {
+        await activateParentNotePath();
+    }
+    catch (e) {
+        console.error(e);
+    }
+
     const taskId = utils.randomString(10);
 
     let counter = 0;
@@ -134,6 +141,16 @@ async function deleteNotes(branchIdsToDelete, forceDeleteAllClones = false) {
     return true;
 }
 
+async function activateParentNotePath() {
+    // this is not perfect, maybe we should find the next/previous sibling, but that's more complex
+    const activeContext = appContext.tabManager.getActiveContext();
+    const parentNotePathArr = activeContext.notePathArray.slice(0, -1);
+
+    if (parentNotePathArr.length > 0) {
+        activeContext.setNote(parentNotePathArr.join("/"));
+    }
+}
+
 async function moveNodeUpInHierarchy(node) {
     if (hoistedNoteService.isHoistedNode(node)
         || hoistedNoteService.isTopLevelNode(node)

src/public/app/services/content_renderer.js

@@ -9,6 +9,7 @@ import linkService from "./link.js";
 import treeService from "./tree.js";
 import FNote from "../entities/fnote.js";
 import FAttachment from "../entities/fattachment.js";
+import imageContextMenuService from "../menus/image_context_menu.js";
 
 let idCounter = 1;
 
@@ -148,6 +149,8 @@ function renderImage(entity, $renderedContent, options = {}) {
             });
         });
     }
+
+    imageContextMenuService.setupContextMenu($img);
 }
 
 function renderFile(entity, type, $renderedContent) {

src/public/app/services/hoisted_note.js

@@ -48,11 +48,11 @@ async function checkNoteAccess(notePath, noteContext) {
 
     const hoistedNoteId = noteContext.hoistedNoteId;
 
-    if (!resolvedNotePath.includes(hoistedNoteId) && !resolvedNotePath.includes('_hidden')) {
+    if (!resolvedNotePath.includes(hoistedNoteId) && (!resolvedNotePath.includes('_hidden') || resolvedNotePath.includes('_lbBookmarks'))) {
         const requestedNote = await froca.getNote(treeService.getNoteIdFromUrl(resolvedNotePath));
         const hoistedNote = await froca.getNote(hoistedNoteId);
 
-        if (!hoistedNote.hasAncestor('_hidden')
+        if ((!hoistedNote.hasAncestor('_hidden') || resolvedNotePath.includes('_lbBookmarks'))
             && !await dialogService.confirm(`Requested note '${requestedNote.title}' is outside of hoisted note '${hoistedNote.title}' subtree and you must unhoist to access the note. Do you want to proceed with unhoisting?`)) {
             return false;
         }

src/public/app/services/library_loader.js

@@ -28,14 +28,14 @@ const ESLINT = {js: ["libraries/eslint.js"]};
 const RELATION_MAP = {
     js: [
         "libraries/jsplumb.js",
-        "libraries/panzoom.js"
+        "node_modules/panzoom/dist/panzoom.min.js"
     ],
     css: [
         "stylesheets/relation_map.css"
     ]
 };
 
-const PRINT_THIS = {js: ["libraries/printThis.js"]};
+const PRINT_THIS = {js: ["node_modules/print-this/printThis.js"]};
 
 const CALENDAR_WIDGET = {css: ["stylesheets/calendar.css"]};
 
@@ -51,11 +51,11 @@ const WHEEL_ZOOM = {
 };
 
 const FORCE_GRAPH = {
-    js: [ "libraries/force-graph.min.js"]
+    js: [ "node_modules/force-graph/dist/force-graph.min.js"]
 };
 
 const MERMAID = {
-    js: [ "libraries/mermaid.min.js" ]
+    js: [ "node_modules/mermaid/dist/mermaid.min.js" ]
 }
 
 const EXCALIDRAW = {

src/public/app/services/note_list_renderer.js

@@ -4,6 +4,7 @@ import froca from "./froca.js";
 import attributeRenderer from "./attribute_renderer.js";
 import libraryLoader from "./library_loader.js";
 import treeService from "./tree.js";
+import utils from "./utils.js";
 
 const TPL = `
 <div class="note-list">
@@ -215,7 +216,11 @@ class NoteListRenderer {
         if (highlightedTokens.length > 0) {
             await libraryLoader.requireLibrary(libraryLoader.MARKJS);
 
-            this.highlightRegex = new RegExp(highlightedTokens.join("|"), 'gi');
+            const regex = highlightedTokens
+                .map(token => utils.escapeRegExp(token))
+                .join("|");
+
+            this.highlightRegex = new RegExp(regex, 'gi');
         } else {
             this.highlightRegex = null;
         }

src/public/app/services/note_types.js

@@ -1,19 +1,21 @@
 import server from "./server.js";
 import froca from "./froca.js";
 
-async function getNoteTypeItems(command) {
+async function getNoteTypeItems(command, opts = {}) {
+    const removeDeprecatedTypes = !!opts.removeDeprecatedTypes;
+
     const items = [
         { title: "Text", command: command, type: "text", uiIcon: "bx bx-note" },
         { title: "Code", command: command, type: "code", uiIcon: "bx bx-code" },
         { title: "Saved Search", command: command, type: "search", uiIcon: "bx bx-file-find" },
-        { title: "Relation Map", command: command, type: "relationMap", uiIcon: "bx bx-map-alt" },
+        { title: "Relation Map", command: command, type: "relationMap", uiIcon: "bx bx-map-alt", deprecated: true },
         { title: "Note Map", command: command, type: "noteMap", uiIcon: "bx bx-map-alt" },
         { title: "Render Note", command: command, type: "render", uiIcon: "bx bx-extension" },
         { title: "Book", command: command, type: "book", uiIcon: "bx bx-book" },
         { title: "Mermaid Diagram", command: command, type: "mermaid", uiIcon: "bx bx-selection" },
         { title: "Canvas", command: command, type: "canvas", uiIcon: "bx bx-pen" },
         { title: "Web View", command: command, type: "webView", uiIcon: "bx bx-globe-alt" },
-    ];
+    ].filter(item => !removeDeprecatedTypes || !item.deprecated);
 
     const templateNoteIds = await server.get("search-templates");
     const templateNotes = await froca.getNotes(templateNoteIds);

src/public/app/services/utils.js

@@ -487,12 +487,14 @@ function areObjectsEqual () {
 }
 
 function copyHtmlToClipboard(content) {
-    const clipboardItem = new ClipboardItem({
-        'text/html': new Blob([content], {type: 'text/html'}),
-        'text/plain': new Blob([content], {type: 'text/plain'})
-    });
-
-    navigator.clipboard.write([clipboardItem]);
+    function listener(e) {
+        e.clipboardData.setData("text/html", content);
+        e.clipboardData.setData("text/plain", content);
+        e.preventDefault();
+    }
+    document.addEventListener("copy", listener);
+    document.execCommand("copy");
+    document.removeEventListener("copy", listener);
 }
 
 /**

src/public/app/widgets/attribute_widgets/attribute_editor.js

@@ -200,7 +200,7 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
             this.attributeDetailWidget.hide();
         });
 
-        this.$editor.on('blur', () => this.save());
+        this.$editor.on('blur', () => setTimeout(() => this.save(), 100)); // Timeout to fix https://github.com/zadam/trilium/issues/4160
 
         this.$addNewAttributeButton = this.$widget.find('.add-new-attribute-button');
         this.$addNewAttributeButton.on('click', e => this.addNewAttribute(e));

src/public/app/widgets/containers/right_pane_container.js

@@ -8,10 +8,13 @@ export default class RightPaneContainer extends FlexContainer {
         this.id('right-pane');
         this.css('height', '100%');
         this.collapsible();
+
+        this.rightPaneHidden = false;
     }
 
     isEnabled() {
         return super.isEnabled()
+            && !this.rightPaneHidden
             && this.children.length > 0
             && !!this.children.find(ch => ch.isEnabled() && ch.canBeShown());
     }
@@ -44,4 +47,10 @@ export default class RightPaneContainer extends FlexContainer {
             splitService.setupRightPaneResizer();
         }
     }
+
+    toggleRightPaneEvent() {
+        this.rightPaneHidden = !this.rightPaneHidden;
+
+        this.reEvaluateRightPaneVisibilityCommand();
+    }
 }

src/public/app/widgets/note_tree.js

@@ -1091,7 +1091,9 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
             return;
         }
 
-        const nodeCtx = this.#getActiveNodeCtx();
+        const activeNode = this.getActiveNode();
+        const activeNodeFocused = activeNode?.hasFocus();
+        const activeNotePath = activeNode ? treeService.getNotePath(activeNode) : null;
 
         const refreshCtx = {
             noteIdsToUpdate: new Set(),
@@ -1108,7 +1110,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
 
         await this.#executeTreeUpdates(refreshCtx, loadResults);
 
-        await this.#setActiveNode(nodeCtx, movedActiveNode, parentsOfAddedNodes);
+        await this.#setActiveNode(activeNotePath, activeNodeFocused, movedActiveNode, parentsOfAddedNodes);
 
         if (refreshCtx.noteIdsToReload.size > 0 || refreshCtx.noteIdsToUpdate.size > 0) {
             // workaround for https://github.com/mar10/fancytree/issues/1054
@@ -1257,73 +1259,42 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
         }
     }
 
-    #getActiveNodeCtx() {
-        const nodeCtx = {
-            activeNotePath: null,
-            activeNodeFocused: null,
-            nextNotePath: null
-        };
-
-        const activeNode = this.getActiveNode();
-        nodeCtx.activeNodeFocused = activeNode?.hasFocus();
-        nodeCtx.activeNotePath = activeNode ? treeService.getNotePath(activeNode) : null;
-        const nextNode = activeNode ? (activeNode.getNextSibling() || activeNode.getPrevSibling() || activeNode.getParent()) : null;
-        nodeCtx.nextNotePath = nextNode ? treeService.getNotePath(nextNode) : null;
-        return nodeCtx;
-    }
-
-    async #setActiveNode(nodeCtx, movedActiveNode, parentsOfAddedNodes) {
+    async #setActiveNode(activeNotePath, activeNodeFocused, movedActiveNode, parentsOfAddedNodes) {
         if (movedActiveNode) {
             for (const parentNode of parentsOfAddedNodes) {
                 const foundNode = (parentNode.getChildren() || []).find(child => child.data.noteId === movedActiveNode.data.noteId);
                 if (foundNode) {
-                    nodeCtx.activeNotePath = treeService.getNotePath(foundNode);
+                    activeNotePath = treeService.getNotePath(foundNode);
                     break;
                 }
             }
         }
 
-        if (!nodeCtx.activeNotePath) {
+        if (!activeNotePath) {
             return;
         }
 
-        let node = await this.expandToNote(nodeCtx.activeNotePath, false);
-        if (node && node.data.noteId !== treeService.getNoteIdFromUrl(nodeCtx.activeNotePath)) {
+        let node = await this.expandToNote(activeNotePath, false);
+
+        if (node && node.data.noteId !== treeService.getNoteIdFromUrl(activeNotePath)) {
             // if the active note has been moved elsewhere then it won't be found by the path,
             // so we switch to the alternative of trying to find it by noteId
-            const notesById = this.getNodesByNoteId(treeService.getNoteIdFromUrl(nodeCtx.activeNotePath));
+            const notesById = this.getNodesByNoteId(treeService.getNoteIdFromUrl(activeNotePath));
 
             // if there are multiple clones, then we'd rather not activate anyone
             node = notesById.length === 1 ? notesById[0] : null;
         }
 
-        if (node) {
-            if (nodeCtx.activeNodeFocused) {
-                // needed by Firefox: https://github.com/zadam/trilium/issues/1865
-                this.tree.$container.focus();
-            }
-
-            await node.setActive(true, {noEvents: true, noFocus: !nodeCtx.activeNodeFocused});
-        } else {
-            // this is used when the original note has been deleted, and we want to move the focus to the note above/below
-            node = await this.expandToNote(nodeCtx.nextNotePath, false);
-
-            if (node) {
-                // FIXME: this is conceptually wrong
-                //        here note tree is responsible for updating global state of the application
-                //        this should be done by NoteContext / TabManager and note tree should only listen to
-                //        changes in active note and just set the "active" state
-                // We don't await since that can bring up infinite cycles when e.g. custom widget does some backend requests which wait for max sync ID processed
-                appContext.tabManager.getActiveContext().setNote(nodeCtx.nextNotePath).then(() => {
-                    const newActiveNode = this.getActiveNode();
-
-                    // return focus if the previously active node was also focused
-                    if (newActiveNode && nodeCtx.activeNodeFocused) {
-                        newActiveNode.setFocus(true);
-                    }
-                });
-            }
+        if (!node) {
+            return;
         }
+
+        if (activeNodeFocused) {
+            // needed by Firefox: https://github.com/zadam/trilium/issues/1865
+            this.tree.$container.focus();
+        }
+
+        await node.setActive(true, {noEvents: true, noFocus: !activeNodeFocused});
     }
 
     sortChildren(node) {

src/public/app/widgets/title_bar_buttons.js

@@ -30,9 +30,14 @@ const TPL = `
         height: 40px;
         width: 40px;
     }
+    
     .title-bar-buttons .top-btn.active{
         background-color:var(--accented-background-color);
     }
+
+    .title-bar-buttons .btn.focus, .title-bar-buttons .btn:focus {
+        box-shadow: none;
+    }
     </style>
 
     <!-- divs act as a hitbox for the buttons, making them clickable on corners -->

src/public/app/widgets/type_widgets/image.js

@@ -1,7 +1,7 @@
 import utils from "../../services/utils.js";
 import TypeWidget from "./type_widget.js";
 import libraryLoader from "../../services/library_loader.js";
-import contextMenu from "../../menus/context_menu.js";
+import imageContextMenuService from "../../menus/image_context_menu.js";
 import imageService from "../../services/image.js";
 
 const TPL = `
@@ -55,36 +55,7 @@ class ImageTypeWidget extends TypeWidget {
             });
         });
 
-        if (utils.isElectron()) {
-            // for browser, we want to let the native menu
-            this.$imageView.on('contextmenu', e => {
-                e.preventDefault();
-
-                contextMenu.show({
-                    x: e.pageX,
-                    y: e.pageY,
-                    items: [
-                        {
-                            title: "Copy reference to clipboard",
-                            command: "copyImageReferenceToClipboard",
-                            uiIcon: "bx bx-empty"
-                        },
-                        {title: "Copy image to clipboard", command: "copyImageToClipboard", uiIcon: "bx bx-empty"},
-                    ],
-                    selectMenuItemHandler: ({command}) => {
-                        if (command === 'copyImageReferenceToClipboard') {
-                            imageService.copyImageReferenceToClipboard(this.$imageWrapper);
-                        } else if (command === 'copyImageToClipboard') {
-                            const webContents = utils.dynamicRequire('@electron/remote').getCurrentWebContents();
-                            utils.dynamicRequire('electron');
-                            webContents.copyImageAt(e.pageX, e.pageY);
-                        } else {
-                            throw new Error(`Unrecognized command '${command}'`);
-                        }
-                    }
-                });
-            });
-        }
+        imageContextMenuService.setupContextMenu(this.$imageView);
 
         super.doRender();
     }

src/public/app/widgets/type_widgets/options/text_notes/highlights_list.js

@@ -15,9 +15,11 @@ const TPL = `
     </div>
 
     <br/><br/>
-    <h5>Highlists List visibility</h5>
+    <h5>Highlights List visibility</h5>
 
-    <p>You can hide the hightlights widget per-note by adding a <code>#hideHighlightWidget</code> label.</p>
+    <p>You can hide the highlights widget per-note by adding a <code>#hideHighlightWidget</code> label.</p>
+    
+    <p>You can configure a keyboard shortcut for quickly toggling the right pane (including Highlights) in the Options -> Shortcuts (name "toggleRightPane").</p>
 </div>`;
 
 export default class HighlightsListOptions extends OptionsWidget {

src/public/app/widgets/type_widgets/options/text_notes/table_of_contents.js

@@ -11,6 +11,8 @@ const TPL = `
     </div>
     
     <p>You can also use this option to effectively disable TOC by setting a very high number.</p>
+    
+    <p>You can configure a keyboard shortcut for quickly toggling the right pane (including TOC) in the Options -> Shortcuts (name "toggleRightPane").</p>
 </div>`;
 
 export default class TableOfContentsOptions extends OptionsWidget {

src/public/app/widgets/type_widgets/relation_map.js

@@ -184,6 +184,8 @@ export default class RelationMapTypeWidget extends TypeWidget {
     }
 
     async loadMapData() {
+        toastService.showMessage("Relation Map has been deprecated since Trilium 0.63 and will be removed in a future version. Migrate your content to some other note type (e.g. canvas) as soon as possible.", 5000);
+
         this.mapData = {
             notes: [],
             // it is important to have this exact value here so that initial transform is the same as this

src/public/manifest.webmanifest

@@ -9,14 +9,9 @@
   "start_url": "/",
   "icons": [
     {
-      "src": "/assets/vX/images/app-icons/ios/apple-touch-icon.png",
-      "sizes": "180x180",
-      "type": "image/png"
-    },
-    {
-      "src": "/assets/vX/images/app-icons/png/512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
+          "src": "favicon.ico",
+          "sizes": "180x180 512x512",
+          "type": "image/x-icon"
     }
   ]
 }

src/public/stylesheets/ckeditor-theme.css

@@ -3,6 +3,7 @@ body {
 
     --ck-color-base-text: var(--main-text-color);
     --ck-color-base-foreground: var(--accented-background-color);
+    --ck-color-base-background: var(--main-background-color);
     --ck-color-focus-border: var(--main-border-color);
     --ck-color-text: var(--main-text-color);
     --ck-color-shadow-drop: var(--main-background-color);

src/public/stylesheets/theme-dark.css

@@ -88,3 +88,7 @@ body .CodeMirror {
 .excalidraw.theme--dark {
     --theme-filter: invert(80%) hue-rotate(180deg) !important;
 }
+
+body .todo-list input[type="checkbox"]:not(:checked):before {
+    border-color: var(--muted-text-color) !important;
+}

src/routes/api/app_info.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const appInfo = require('../../services/app_info');
+const appInfo = require('../../services/app_info.js');
 
 function getAppInfo() {
     return appInfo;

src/routes/api/attachments.js

@@ -1,6 +1,6 @@
-const becca = require("../../becca/becca");
-const blobService = require("../../services/blob");
-const ValidationError = require("../../errors/validation_error");
+const becca = require('../../becca/becca.js');
+const blobService = require('../../services/blob.js');
+const ValidationError = require('../../errors/validation_error.js');
 const imageService = require("../../services/image.js");
 
 function getAttachmentBlob(req) {

src/routes/api/attributes.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const sql = require('../../services/sql');
-const log = require('../../services/log');
-const attributeService = require('../../services/attributes');
-const BAttribute = require('../../becca/entities/battribute');
-const becca = require("../../becca/becca");
-const ValidationError = require("../../errors/validation_error");
+const sql = require('../../services/sql.js');
+const log = require('../../services/log.js');
+const attributeService = require('../../services/attributes.js');
+const BAttribute = require('../../becca/entities/battribute.js');
+const becca = require('../../becca/becca.js');
+const ValidationError = require('../../errors/validation_error.js');
 
 function getEffectiveNoteAttributes(req) {
     const note = becca.getNote(req.params.noteId);

src/routes/api/autocomplete.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const beccaService = require('../../becca/becca_service');
-const searchService = require('../../services/search/services/search');
-const log = require('../../services/log');
-const utils = require('../../services/utils');
-const cls = require('../../services/cls');
-const becca = require("../../becca/becca");
+const beccaService = require('../../becca/becca_service.js');
+const searchService = require('../../services/search/services/search.js');
+const log = require('../../services/log.js');
+const utils = require('../../services/utils.js');
+const cls = require('../../services/cls.js');
+const becca = require('../../becca/becca.js');
 
 function getAutocomplete(req) {
     const query = req.query.query.trim();