release 0.63.1-beta

fix typo in keyboard shortcuts description

LICENSE

@@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.js.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -658,4 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+<http://www.js.gnu.org/licenses/>.

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/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/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/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.5",
+  "version": "0.63.1-beta",
   "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",
@@ -41,8 +41,9 @@
     "@excalidraw/excalidraw": "0.16.1",
     "archiver": "6.0.1",
     "async-mutex": "0.4.0",
-    "axios": "1.6.2",
+    "axios": "1.6.5",
     "better-sqlite3": "8.4.0",
+    "boxicons": "2.1.4",
     "chokidar": "3.5.3",
     "cls-hooked": "4.2.2",
     "compression": "1.7.4",
@@ -58,9 +59,10 @@
     "escape-html": "1.0.3",
     "express": "4.18.2",
     "express-partial-content": "1.0.2",
-    "express-rate-limit": "7.1.4",
+    "express-rate-limit": "7.1.5",
     "express-session": "1.17.3",
-    "fs-extra": "11.1.1",
+    "force-graph": "1.43.4",
+    "fs-extra": "11.2.0",
     "helmet": "7.1.0",
     "html": "1.0.0",
     "html2plaintext": "2.1.4",
@@ -72,14 +74,19 @@
     "is-svg": "4.3.2",
     "jimp": "0.22.10",
     "joplin-turndown-plugin-gfm": "1.0.12",
-    "jsdom": "22.1.0",
+    "jquery": "3.7.1",
+    "jquery-hotkeys": "0.2.2",
+    "jsdom": "23.2.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",
+    "node-abi": "3.52.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,37 +99,38 @@
     "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",
+    "ws": "8.16.0",
     "xml2js": "0.6.2",
     "yauzl": "2.10.0"
   },
   "devDependencies": {
     "cross-env": "7.0.3",
     "electron": "25.9.8",
-    "electron-builder": "24.6.4",
+    "electron-builder": "24.9.1",
     "electron-packager": "17.1.2",
     "electron-rebuild": "3.2.9",
-    "eslint": "8.54.0",
+    "eslint": "8.56.0",
     "eslint-config-airbnb-base": "15.0.0",
-    "eslint-config-prettier": "9.0.0",
-    "eslint-plugin-import": "2.29.0",
-    "eslint-plugin-jsonc": "2.10.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-jsonc": "2.11.2",
     "eslint-plugin-prettier": "5.0.1",
     "esm": "3.2.25",
     "husky": "8.0.3",
     "jasmine": "5.1.0",
     "jsdoc": "4.0.2",
     "jsonc-eslint-parser": "2.4.0",
-    "lint-staged": "15.1.0",
+    "lint-staged": "15.2.0",
     "lorem-ipsum": "2.0.8",
-    "nodemon": "3.0.1",
-    "prettier": "3.1.0",
+    "nodemon": "3.0.2",
+    "prettier": "3.1.1",
     "rcedit": "4.0.1",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4"

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,11 +1,11 @@
 "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'
@@ -37,7 +37,7 @@ class BAttachment extends AbstractBeccaEntity {
 
         /** @type {string} */
         this.attachmentId = row.attachmentId;
-        /** 
+        /**
          * either noteId or revisionId to which this attachment belongs
          * @type {string}
          */
@@ -153,7 +153,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.

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_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/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/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_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/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,9 @@ 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>
 </div>`;
 
 export default class HighlightsListOptions 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/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();

src/routes/api/backend_log.js

@@ -1,8 +1,8 @@
 "use strict";
 
 const fs = require('fs');
-const dateUtils = require('../../services/date_utils');
-const {LOG_DIR} = require('../../services/data_dir');
+const dateUtils = require('../../services/date_utils.js');
+const {LOG_DIR} = require('../../services/data_dir.js');
 
 function getBackendLog() {
     const file = `${LOG_DIR}/trilium-${dateUtils.localNowDate()}.log`;

src/routes/api/branches.js

@@ -1,15 +1,15 @@
 "use strict";
 
-const sql = require('../../services/sql');
-const utils = require('../../services/utils');
-const entityChangesService = require('../../services/entity_changes');
-const treeService = require('../../services/tree');
-const eraseService = require('../../services/erase');
-const becca = require('../../becca/becca');
-const TaskContext = require('../../services/task_context');
-const branchService = require("../../services/branches");
-const log = require("../../services/log");
-const ValidationError = require("../../errors/validation_error");
+const sql = require('../../services/sql.js');
+const utils = require('../../services/utils.js');
+const entityChangesService = require('../../services/entity_changes.js');
+const treeService = require('../../services/tree.js');
+const eraseService = require('../../services/erase.js');
+const becca = require('../../becca/becca.js');
+const TaskContext = require('../../services/task_context.js');
+const branchService = require('../../services/branches.js');
+const log = require('../../services/log.js');
+const ValidationError = require('../../errors/validation_error.js');
 const eventService = require("../../services/events.js");
 
 /**

src/routes/api/bulk_action.js

@@ -1,5 +1,5 @@
-const becca = require("../../becca/becca");
-const bulkActionService = require("../../services/bulk_actions");
+const becca = require('../../becca/becca.js');
+const bulkActionService = require('../../services/bulk_actions.js');
 
 function execute(req) {
     const {noteIds, includeDescendants} = req.body;

src/routes/api/clipper.js

@@ -1,18 +1,18 @@
 "use strict";
 
-const attributeService = require("../../services/attributes");
-const cloneService = require("../../services/cloning");
-const noteService = require('../../services/notes');
-const dateNoteService = require('../../services/date_notes');
-const dateUtils = require('../../services/date_utils');
-const imageService = require('../../services/image');
-const appInfo = require('../../services/app_info');
-const ws = require('../../services/ws');
-const log = require('../../services/log');
-const utils = require('../../services/utils');
+const attributeService = require('../../services/attributes.js');
+const cloneService = require('../../services/cloning.js');
+const noteService = require('../../services/notes.js');
+const dateNoteService = require('../../services/date_notes.js');
+const dateUtils = require('../../services/date_utils.js');
+const imageService = require('../../services/image.js');
+const appInfo = require('../../services/app_info.js');
+const ws = require('../../services/ws.js');
+const log = require('../../services/log.js');
+const utils = require('../../services/utils.js');
 const path = require('path');
-const htmlSanitizer = require('../../services/html_sanitizer');
-const {formatAttrForSearch} = require("../../services/attribute_formatter");
+const htmlSanitizer = require('../../services/html_sanitizer.js');
+const {formatAttrForSearch} = require('../../services/attribute_formatter.js');
 const jsdom = require("jsdom");
 const { JSDOM } = jsdom;
 

src/routes/api/cloning.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const cloningService = require('../../services/cloning');
+const cloningService = require('../../services/cloning.js');
 
 function cloneNoteToBranch(req) {
     const {noteId, parentBranchId} = req.params;

src/routes/api/database.js

@@ -1,10 +1,10 @@
 "use strict";
 
-const sql = require('../../services/sql');
-const log = require('../../services/log');
-const backupService = require('../../services/backup');
-const anonymizationService = require('../../services/anonymization');
-const consistencyChecksService = require('../../services/consistency_checks');
+const sql = require('../../services/sql.js');
+const log = require('../../services/log.js');
+const backupService = require('../../services/backup.js');
+const anonymizationService = require('../../services/anonymization.js');
+const consistencyChecksService = require('../../services/consistency_checks.js');
 
 function getExistingBackups() {
     return backupService.getExistingBackups();

src/routes/api/etapi_tokens.js

@@ -1,4 +1,4 @@
-const etapiTokenService = require("../../services/etapi_tokens");
+const etapiTokenService = require('../../services/etapi_tokens.js');
 
 function getTokens() {
     const tokens = etapiTokenService.getTokens();

src/routes/api/export.js

@@ -1,12 +1,12 @@
 "use strict";
 
-const zipExportService = require('../../services/export/zip');
-const singleExportService = require('../../services/export/single');
-const opmlExportService = require('../../services/export/opml');
-const becca = require('../../becca/becca');
-const TaskContext = require("../../services/task_context");
-const log = require("../../services/log");
-const NotFoundError = require("../../errors/not_found_error");
+const zipExportService = require('../../services/export/zip.js');
+const singleExportService = require('../../services/export/single.js');
+const opmlExportService = require('../../services/export/opml.js');
+const becca = require('../../becca/becca.js');
+const TaskContext = require('../../services/task_context.js');
+const log = require('../../services/log.js');
+const NotFoundError = require('../../errors/not_found_error.js');
 
 function exportBranch(req, res) {
     const {branchId, type, format, version, taskId} = req.params;

src/routes/api/files.js

@@ -1,16 +1,16 @@
 "use strict";
 
-const protectedSessionService = require('../../services/protected_session');
-const utils = require('../../services/utils');
-const log = require('../../services/log');
-const noteService = require('../../services/notes');
+const protectedSessionService = require('../../services/protected_session.js');
+const utils = require('../../services/utils.js');
+const log = require('../../services/log.js');
+const noteService = require('../../services/notes.js');
 const tmp = require('tmp');
 const fs = require('fs');
 const { Readable } = require('stream');
 const chokidar = require('chokidar');
-const ws = require('../../services/ws');
-const becca = require("../../becca/becca");
-const ValidationError = require("../../errors/validation_error");
+const ws = require('../../services/ws.js');
+const becca = require('../../becca/becca.js');
+const ValidationError = require('../../errors/validation_error.js');
 
 function updateFile(req) {
     const note = becca.getNoteOrThrow(req.params.noteId);

src/routes/api/fonts.js

@@ -1,4 +1,4 @@
-const optionService = require('../../services/options');
+const optionService = require('../../services/options.js');
 
 function getFontCss(req, res) {
     res.setHeader('Content-Type', 'text/css');

src/routes/api/image.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const imageService = require('../../services/image');
-const becca = require('../../becca/becca');
-const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
+const imageService = require('../../services/image.js');
+const becca = require('../../becca/becca.js');
+const RESOURCE_DIR = require('../../services/resource_dir.js').RESOURCE_DIR;
 const fs = require('fs');
 
 function returnImageFromNote(req, res) {

src/routes/api/import.js

@@ -1,16 +1,16 @@
 "use strict";
 
-const enexImportService = require('../../services/import/enex');
-const opmlImportService = require('../../services/import/opml');
-const zipImportService = require('../../services/import/zip');
-const singleImportService = require('../../services/import/single');
-const cls = require('../../services/cls');
+const enexImportService = require('../../services/import/enex.js');
+const opmlImportService = require('../../services/import/opml.js');
+const zipImportService = require('../../services/import/zip.js');
+const singleImportService = require('../../services/import/single.js');
+const cls = require('../../services/cls.js');
 const path = require('path');
-const becca = require('../../becca/becca');
-const beccaLoader = require('../../becca/becca_loader');
-const log = require('../../services/log');
-const TaskContext = require('../../services/task_context');
-const ValidationError = require("../../errors/validation_error");
+const becca = require('../../becca/becca.js');
+const beccaLoader = require('../../becca/becca_loader.js');
+const log = require('../../services/log.js');
+const TaskContext = require('../../services/task_context.js');
+const ValidationError = require('../../errors/validation_error.js');
 
 async function importNotesToBranch(req) {
     const {parentNoteId} = req.params;

src/routes/api/keys.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const keyboardActions = require('../../services/keyboard_actions');
-const becca = require('../../becca/becca');
+const keyboardActions = require('../../services/keyboard_actions.js');
+const becca = require('../../becca/becca.js');
 
 function getKeyboardActions() {
     return keyboardActions.getKeyboardActions();

src/routes/api/login.js

@@ -1,17 +1,17 @@
 "use strict";
 
-const options = require('../../services/options');
-const utils = require('../../services/utils');
-const dateUtils = require('../../services/date_utils');
-const instanceId = require('../../services/instance_id');
-const passwordEncryptionService = require('../../services/encryption/password_encryption');
-const protectedSessionService = require('../../services/protected_session');
-const appInfo = require('../../services/app_info');
-const eventService = require('../../services/events');
-const sqlInit = require('../../services/sql_init');
-const sql = require('../../services/sql');
-const ws = require("../../services/ws");
-const etapiTokenService = require("../../services/etapi_tokens");
+const options = require('../../services/options.js');
+const utils = require('../../services/utils.js');
+const dateUtils = require('../../services/date_utils.js');
+const instanceId = require('../../services/instance_id.js');
+const passwordEncryptionService = require('../../services/encryption/password_encryption.js');
+const protectedSessionService = require('../../services/protected_session.js');
+const appInfo = require('../../services/app_info.js');
+const eventService = require('../../services/events.js');
+const sqlInit = require('../../services/sql_init.js');
+const sql = require('../../services/sql.js');
+const ws = require('../../services/ws.js');
+const etapiTokenService = require('../../services/etapi_tokens.js');
 
 function loginSync(req) {
     if (!sqlInit.schemaExists()) {

src/routes/api/note_map.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const becca = require("../../becca/becca");
+const becca = require('../../becca/becca.js');
 const { JSDOM } = require("jsdom");
 
 function buildDescendantCountMap(noteIdsToCount) {

src/routes/api/notes.js

@@ -1,15 +1,15 @@
 "use strict";
 
-const noteService = require('../../services/notes');
-const eraseService = require('../../services/erase');
-const treeService = require('../../services/tree');
-const sql = require('../../services/sql');
-const utils = require('../../services/utils');
-const log = require('../../services/log');
-const TaskContext = require('../../services/task_context');
-const becca = require("../../becca/becca");
-const ValidationError = require("../../errors/validation_error");
-const blobService = require("../../services/blob");
+const noteService = require('../../services/notes.js');
+const eraseService = require('../../services/erase.js');
+const treeService = require('../../services/tree.js');
+const sql = require('../../services/sql.js');
+const utils = require('../../services/utils.js');
+const log = require('../../services/log.js');
+const TaskContext = require('../../services/task_context.js');
+const becca = require('../../becca/becca.js');
+const ValidationError = require('../../errors/validation_error.js');
+const blobService = require('../../services/blob.js');
 
 function getNote(req) {
     return becca.getNoteOrThrow(req.params.noteId);

src/routes/api/options.js

@@ -1,9 +1,9 @@
 "use strict";
 
-const optionService = require('../../services/options');
-const log = require('../../services/log');
-const searchService = require('../../services/search/services/search');
-const ValidationError = require("../../errors/validation_error");
+const optionService = require('../../services/options.js');
+const log = require('../../services/log.js');
+const searchService = require('../../services/search/services/search.js');
+const ValidationError = require('../../errors/validation_error.js');
 
 // options allowed to be updated directly in the Options dialog
 const ALLOWED_OPTIONS = new Set([

src/routes/api/other.js

@@ -1,5 +1,5 @@
-const becca = require("../../becca/becca");
-const markdownService = require("../../services/import/markdown");
+const becca = require('../../becca/becca.js');
+const markdownService = require('../../services/import/markdown.js');
 
 function getIconUsage() {
     const iconClassToCountMap = {};

src/routes/api/password.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const passwordService = require('../../services/encryption/password');
-const ValidationError = require("../../errors/validation_error");
+const passwordService = require('../../services/encryption/password.js');
+const ValidationError = require('../../errors/validation_error.js');
 
 function changePassword(req) {
     if (passwordService.isPasswordSet()) {