server-esm: Normalize quotes in require imports

electron.ts

@@ -1,17 +1,17 @@
 "use strict";
 
-import electron = require("electron");
+import electron = require('electron');
-import sqlInit = require("./src/services/sql_init");
+import sqlInit = require('./src/services/sql_init');
-import appIconService = require("./src/services/app_icon");
+import appIconService = require('./src/services/app_icon');
-import windowService = require("./src/services/window");
+import windowService = require('./src/services/window');
-import tray = require("./src/services/tray");
+import tray = require('./src/services/tray');
 
 // Adds debug features like hotkeys for triggering dev tools and reload
-require("electron-debug")();
+require('electron-debug')();
 
 appIconService.installLocalAppIcon();
 
-require("electron-dl")({ saveAs: true });
+require('electron-dl')({ saveAs: true });
 
 // needed for excalidraw export https://github.com/zadam/trilium/issues/4271
 electron.app.commandLine.appendSwitch(
@@ -60,4 +60,4 @@ electron.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.js");
+require('./src/www.js');

spec/etapi/app_info.spec.ts

@@ -1,4 +1,4 @@
-import etapi = require("../support/etapi");
+import etapi = require('../support/etapi');
 
 etapi.describeEtapi("app_info", () => {
   it("get", async () => {

spec/etapi/backup.spec.ts

@@ -1,4 +1,4 @@
-import etapi = require("../support/etapi");
+import etapi = require('../support/etapi');
 
 etapi.describeEtapi("backup", () => {
   it("create", async () => {

spec/etapi/import.spec.ts

@@ -1,6 +1,6 @@
-import etapi = require("../support/etapi");
+import etapi = require('../support/etapi');
-import fs = require("fs");
+import fs = require('fs');
-import path = require("path");
+import path = require('path');
 
 etapi.describeEtapi("import", () => {
   // temporarily skip this test since test-export.zip is missing

spec/etapi/notes.spec.ts

@@ -1,5 +1,5 @@
-import crypto = require("crypto");
+import crypto = require('crypto');
-import etapi = require("../support/etapi");
+import etapi = require('../support/etapi');
 
 etapi.describeEtapi("notes", () => {
   it("create", async () => {

spec/search/becca_mocking.ts

@@ -1,9 +1,9 @@
-import BNote = require("../../src/becca/entities/bnote");
+import BNote = require('../../src/becca/entities/bnote');
-import BBranch = require("../../src/becca/entities/bbranch");
+import BBranch = require('../../src/becca/entities/bbranch');
-import BAttribute = require("../../src/becca/entities/battribute");
+import BAttribute = require('../../src/becca/entities/battribute');
-import becca = require("../../src/becca/becca");
+import becca = require('../../src/becca/becca');
-import randtoken = require("rand-token");
+import randtoken = require('rand-token');
-import SearchResult = require("../../src/services/search/search_result");
+import SearchResult = require('../../src/services/search/search_result');
 import { NoteType } from "../../src/becca/entities/rows";
 randtoken.generator({ source: "crypto" });
 

spec/search/lexer.spec.ts

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

spec/search/search.spec.ts

@@ -4,7 +4,7 @@ import BBranch = require('../../src/becca/entities/bbranch');
 import SearchContext = require('../../src/services/search/search_context');
 import dateUtils = require('../../src/services/date_utils');
 import becca = require('../../src/becca/becca');
-// const { NoteBuilder, findNoteByTitle, note } = require("./becca_mocking");
+// const { NoteBuilder, findNoteByTitle, note } = require('./becca_mocking');
 import becca_mocking = require('./becca_mocking');
 
 describe('Search', () => {

spec/support/etapi.ts

@@ -1,5 +1,5 @@
-import child_process = require("child_process");
+import child_process = require('child_process');
-import kill = require("tree-kill");
+import kill = require('tree-kill');
 
 let etapiAuthToken: string | undefined;
 

src/becca/entities/bblob.ts

@@ -1,4 +1,4 @@
-import AbstractBeccaEntity = require("./abstract_becca_entity");
+import AbstractBeccaEntity = require('./abstract_becca_entity');
 import { BlobRow } from "./rows";
 
 // TODO: Why this does not extend the abstract becca?

src/becca/entities/bnote.ts

@@ -9,7 +9,7 @@ import AbstractBeccaEntity = require('./abstract_becca_entity');
 import BRevision = require('./brevision');
 import BAttachment = require('./battachment');
 import TaskContext = require('../../services/task_context');
-import dayjs = require("dayjs");
+import dayjs = require('dayjs');
 import utc = require('dayjs/plugin/utc');
 import eventService = require('../../services/events');
 import { AttachmentRow, NoteRow, NoteType, RevisionRow } from './rows';

src/becca/entities/brevision.ts

@@ -164,7 +164,7 @@ class BRevision extends AbstractBeccaEntity<BRevision> {
      * Revisions are not soft-deletable, they are immediately hard-deleted (erased).
      */
     eraseRevision() {
-        require("../../services/erase.js").eraseRevisions([this.revisionId]);
+        require('../../services/erase.js').eraseRevisions([this.revisionId]);
     }
 
     beforeSaving() {

src/etapi/mappers.ts

@@ -1,7 +1,7 @@
-import BAttachment = require("../becca/entities/battachment");
+import BAttachment = require('../becca/entities/battachment');
-import BAttribute = require("../becca/entities/battribute");
+import BAttribute = require('../becca/entities/battribute');
-import BBranch = require("../becca/entities/bbranch");
+import BBranch = require('../becca/entities/bbranch');
-import BNote = require("../becca/entities/bnote");
+import BNote = require('../becca/entities/bnote');
 
 function mapNoteToPojo(note: BNote) {
     return {

src/routes/api/attachments.ts

@@ -1,7 +1,7 @@
 import becca = require('../../becca/becca');
 import blobService = require('../../services/blob');
 import ValidationError = require('../../errors/validation_error');
-import imageService = require("../../services/image");
+import imageService = require('../../services/image');
 import { Request } from 'express';
 
 function getAttachmentBlob(req: Request) {

src/routes/api/branches.ts

@@ -10,7 +10,7 @@ import TaskContext = require('../../services/task_context');
 import branchService = require('../../services/branches');
 import log = require('../../services/log');
 import ValidationError = require('../../errors/validation_error');
-import eventService = require("../../services/events");
+import eventService = require('../../services/events');
 import { Request } from 'express';
 
 /**

src/routes/api/clipper.ts

@@ -15,9 +15,9 @@ import utils = require('../../services/utils');
 import path = require('path');
 import htmlSanitizer = require('../../services/html_sanitizer');
 import attributeFormatter = require('../../services/attribute_formatter');
-import jsdom = require("jsdom");
+import jsdom = require('jsdom');
-import BNote = require("../../becca/entities/bnote");
+import BNote = require('../../becca/entities/bnote');
-import ValidationError = require("../../errors/validation_error");
+import ValidationError = require('../../errors/validation_error');
 const { JSDOM } = jsdom;
 
 interface Image {

src/routes/api/revisions.ts

@@ -8,7 +8,7 @@ import cls = require('../../services/cls');
 import path = require('path');
 import becca = require('../../becca/becca');
 import blobService = require('../../services/blob');
-import eraseService = require("../../services/erase");
+import eraseService = require('../../services/erase');
 import { Request, Response } from 'express';
 import BRevision = require('../../becca/entities/brevision');
 import BNote = require('../../becca/entities/bnote');

src/routes/api/search.ts

@@ -9,7 +9,7 @@ import bulkActionService = require('../../services/bulk_actions');
 import cls = require('../../services/cls');
 import attributeFormatter = require('../../services/attribute_formatter');
 import ValidationError = require('../../errors/validation_error');
-import SearchResult = require("../../services/search/search_result");
+import SearchResult = require('../../services/search/search_result');
 
 function searchFromNote(req: Request) {
     const note = becca.getNoteOrThrow(req.params.noteId);

src/routes/assets.ts

@@ -1,6 +1,6 @@
 import assetPath = require('../services/asset_path');
-import path = require("path");
+import path = require('path');
-import express = require("express");
+import express = require('express');
 import env = require('../services/env');
 import serveStatic = require('serve-static');
 

src/routes/routes.ts

@@ -11,7 +11,7 @@ import sql = require('../services/sql');
 import entityChangesService = require('../services/entity_changes');
 import csurf = require('csurf');
 import { createPartialContentHandler } from "express-partial-content";
-import rateLimit = require("express-rate-limit");
+import rateLimit = require('express-rate-limit');
 import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity');
 import NotFoundError = require('../errors/not_found_error');
 import ValidationError = require('../errors/validation_error');

src/routes/session_parser.ts

@@ -1,4 +1,4 @@
-import session = require("express-session");
+import session = require('express-session');
 import sessionSecret = require('../services/session_secret');
 import dataDir = require('../services/data_dir');
 const FileStore = require('session-file-store')(session);

src/services/anonymization.ts

@@ -1,10 +1,10 @@
 import BUILTIN_ATTRIBUTES = require('./builtin_attributes');
-import fs = require("fs-extra");
+import fs = require('fs-extra');
 import dataDir = require('./data_dir');
 import dateUtils = require('./date_utils');
-import Database = require("better-sqlite3");
+import Database = require('better-sqlite3');
 import sql = require('./sql');
-import path = require("path");
+import path = require('path');
 
 function getFullAnonymizationScript() {
     // we want to delete all non-builtin attributes because they can contain sensitive names and values

src/services/backend_script_api_interface.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from "express";
-import AbstractBeccaEntity = require("../becca/entities/abstract_becca_entity");
+import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity');
-import BNote = require("../becca/entities/bnote");
+import BNote = require('../becca/entities/bnote');
 
 export interface ApiParams {
     startNote?: BNote;

src/services/bulk_actions.ts

@@ -3,7 +3,7 @@ import becca = require('../becca/becca');
 import cloningService = require('./cloning');
 import branchService = require('./branches');
 import utils = require('./utils');
-import eraseService = require("./erase");
+import eraseService = require('./erase');
 import BNote = require('../becca/entities/bnote');
 
 interface Action {

src/services/erase.ts

@@ -1,11 +1,11 @@
-import sql = require("./sql");
+import sql = require('./sql');
-import revisionService = require("./revisions");
+import revisionService = require('./revisions');
-import log = require("./log");
+import log = require('./log');
-import entityChangesService = require("./entity_changes");
+import entityChangesService = require('./entity_changes');
-import optionService = require("./options");
+import optionService = require('./options');
-import dateUtils = require("./date_utils");
+import dateUtils = require('./date_utils');
-import sqlInit = require("./sql_init");
+import sqlInit = require('./sql_init');
-import cls = require("./cls");
+import cls = require('./cls');
 import { EntityChange } from "./entity_changes_interface";
 
 function eraseNotes(noteIdsToErase: string[]) {

src/services/etapi_tokens.ts

@@ -1,7 +1,7 @@
 import becca = require('../becca/becca');
 import utils = require('./utils');
 import BEtapiToken = require('../becca/entities/betapi_token');
-import crypto = require("crypto");
+import crypto = require('crypto');
 
 function getTokens() {
     return becca.getEtapiTokens();

src/services/export/zip.ts

@@ -8,8 +8,8 @@ import mdService = require('./md');
 import packageInfo = require('../../../package.json');
 import utils = require('../utils');
 import protectedSessionService = require('../protected_session');
-import sanitize = require("sanitize-filename");
+import sanitize = require('sanitize-filename');
-import fs = require("fs");
+import fs = require('fs');
 import becca = require('../../becca/becca');
 const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
 import archiver = require('archiver');

src/services/hidden_subtree.ts

@@ -1,4 +1,4 @@
-import BAttribute = require("../becca/entities/battribute");
+import BAttribute = require('../becca/entities/battribute');
 import { AttributeType, NoteType } from "../becca/entities/rows";
 
 import becca = require('../becca/becca');

src/services/import/enex.ts

@@ -1,4 +1,4 @@
-import sax = require("sax");
+import sax = require('sax');
 import stream = require('stream');
 import { Throttle } from 'stream-throttle';
 import log = require('../log');
@@ -9,8 +9,8 @@ import imageService = require('../image');
 import protectedSessionService = require('../protected_session');
 import htmlSanitizer = require('../html_sanitizer');
 import sanitizeAttributeName = require('../sanitize_attribute_name');
-import TaskContext = require("../task_context");
+import TaskContext = require('../task_context');
-import BNote = require("../../becca/entities/bnote");
+import BNote = require('../../becca/entities/bnote');
 import { File } from "./common";
 
 /**

src/services/import/markdown.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import marked = require("marked");
+import marked = require('marked');
 import htmlSanitizer = require('../html_sanitizer');
 import importUtils = require('./utils');
 

src/services/import/opml.ts

@@ -1,7 +1,7 @@
 "use strict";
 
 import noteService = require('../../services/notes');
-import xml2js = require("xml2js");
+import xml2js = require('xml2js');
 import protectedSessionService = require('../protected_session');
 import htmlSanitizer = require('../html_sanitizer');
 import TaskContext = require('../task_context');

src/services/import/single.ts

@@ -1,7 +1,7 @@
 "use strict";
 
-import BNote = require("../../becca/entities/bnote");
+import BNote = require('../../becca/entities/bnote');
-import TaskContext = require("../task_context");
+import TaskContext = require('../task_context');
 
 import noteService = require('../../services/notes');
 import imageService = require('../../services/image');

src/services/import/zip.ts

@@ -10,7 +10,7 @@ import path = require('path');
 import protectedSessionService = require('../protected_session');
 import mimeService = require('./mime');
 import treeService = require('../tree');
-import yauzl = require("yauzl");
+import yauzl = require('yauzl');
 import htmlSanitizer = require('../html_sanitizer');
 import becca = require('../../becca/becca');
 import BAttachment = require('../../becca/entities/battachment');

src/services/log.ts

@@ -1,7 +1,7 @@
 "use strict";
 
 import { Request, Response } from "express";
-import fs = require("fs");
+import fs = require('fs');
 import dataDir = require('./data_dir');
 import cls = require('./cls');
 

src/services/meta/note_meta.ts

@@ -1,5 +1,5 @@
-import AttachmentMeta = require("./attachment_meta");
+import AttachmentMeta = require('./attachment_meta');
-import AttributeMeta = require("./attribute_meta");
+import AttributeMeta = require('./attribute_meta');
 
 interface NoteMeta {
     noteId?: string;

src/services/notes.ts

@@ -16,11 +16,11 @@ import BBranch = require('../becca/entities/bbranch');
 import BNote = require('../becca/entities/bnote');
 import BAttribute = require('../becca/entities/battribute');
 import BAttachment = require('../becca/entities/battachment');
-import dayjs = require("dayjs");
+import dayjs = require('dayjs');
 import htmlSanitizer = require('./html_sanitizer');
 import ValidationError = require('../errors/validation_error');
 import noteTypesService = require('./note_types');
-import fs = require("fs");
+import fs = require('fs');
 import ws = require('./ws');
 import html2plaintext = require('html2plaintext');
 import { AttachmentRow, AttributeRow, BranchRow, NoteRow, NoteType } from '../becca/entities/rows';

src/services/request.ts

@@ -202,8 +202,8 @@ function getProxyAgent(opts: ClientOpts) {
     }
 
     const AgentClass = HTTP === protocol
-        ? require("http-proxy-agent").HttpProxyAgent
+        ? require('http-proxy-agent').HttpProxyAgent
-        : require("https-proxy-agent").HttpsProxyAgent;
+        : require('https-proxy-agent').HttpsProxyAgent;
 
     return new AgentClass(opts.proxy);
 }

src/services/search/expressions/attribute_exists.ts

@@ -1,7 +1,7 @@
 "use strict";
 
-import NoteSet = require("../note_set");
+import NoteSet = require('../note_set');
-import SearchContext = require("../search_context");
+import SearchContext = require('../search_context');
 
 import becca = require('../../../becca/becca');
 import Expression = require('./expression');

src/services/search/expressions/expression.ts

@@ -1,7 +1,7 @@
 "use strict";
 
-import NoteSet = require("../note_set");
+import NoteSet = require('../note_set');
-import SearchContext = require("../search_context");
+import SearchContext = require('../search_context');
 
 abstract class Expression {
     name: string;

src/services/search/expressions/note_content_fulltext.ts

@@ -1,7 +1,7 @@
 "use strict";
 
 import { NoteRow } from "../../../becca/entities/rows";
-import SearchContext = require("../search_context");
+import SearchContext = require('../search_context');
 
 import Expression = require('./expression');
 import NoteSet = require('../note_set');
@@ -10,7 +10,7 @@ import becca = require('../../../becca/becca');
 import protectedSessionService = require('../../protected_session');
 import striptags = require('striptags');
 import utils = require('../../utils');
-import sql = require("../../sql");
+import sql = require('../../sql');
 
 const ALLOWED_OPERATORS = ['=', '!=', '*=*', '*=', '=*', '%='];
 

src/services/search/expressions/note_flat_text.ts

@@ -1,7 +1,7 @@
 "use strict";
 
-import BNote = require("../../../becca/entities/bnote");
+import BNote = require('../../../becca/entities/bnote');
-import SearchContext = require("../search_context");
+import SearchContext = require('../search_context');
 
 import Expression = require('./expression');
 import NoteSet = require('../note_set');

src/services/search/expressions/order_by_and_limit.ts

@@ -1,9 +1,9 @@
 "use strict";
 
-import BNote = require("../../../becca/entities/bnote");
+import BNote = require('../../../becca/entities/bnote');
-import NoteSet = require("../note_set");
+import NoteSet = require('../note_set');
-import SearchContext = require("../search_context");
+import SearchContext = require('../search_context');
-import Expression = require("./expression");
+import Expression = require('./expression');
 
 interface ValueExtractor {
     extract: (note: BNote) => number | string | null;

src/services/search/expressions/true.ts

@@ -1,7 +1,7 @@
 "use strict";
 
-import NoteSet = require("../note_set");
+import NoteSet = require('../note_set');
-import SearchContext = require("../search_context");
+import SearchContext = require('../search_context');
 
 import Expression = require('./expression');
 

src/services/search/note_set.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import BNote = require("../../becca/entities/bnote");
+import BNote = require('../../becca/entities/bnote');
 
 class NoteSet {
     

src/services/search/services/parse.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import dayjs = require("dayjs");
+import dayjs = require('dayjs');
 import AndExp = require('../expressions/and');
 import OrExp = require('../expressions/or');
 import NotExp = require('../expressions/not');
@@ -20,9 +20,9 @@ import ValueExtractor = require('../value_extractor');
 import utils = require('../../utils');
 import TrueExp = require('../expressions/true');
 import IsHiddenExp = require('../expressions/is_hidden');
-import SearchContext = require("../search_context");
+import SearchContext = require('../search_context');
 import { TokenData } from "./types";
-import Expression = require("../expressions/expression");
+import Expression = require('../expressions/expression');
 
 function getFulltext(_tokens: TokenData[], searchContext: SearchContext) {
     const tokens: string[] = _tokens.map(t => utils.removeDiacritic(t.token));

src/services/search/services/search.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import normalizeString = require("normalize-strings");
+import normalizeString = require('normalize-strings');
 import lex = require('./lex');
 import handleParens = require('./handle_parens');
 import parse = require('./parse');
@@ -11,11 +11,11 @@ import beccaService = require('../../../becca/becca_service');
 import utils = require('../../utils');
 import log = require('../../log');
 import hoistedNoteService = require('../../hoisted_note');
-import BNote = require("../../../becca/entities/bnote");
+import BNote = require('../../../becca/entities/bnote');
-import BAttribute = require("../../../becca/entities/battribute");
+import BAttribute = require('../../../becca/entities/battribute');
 import { SearchParams, TokenData } from "./types";
-import Expression = require("../expressions/expression");
+import Expression = require('../expressions/expression');
-import sql = require("../../sql");
+import sql = require('../../sql');
 
 function searchFromNote(note: BNote) {
     let searchResultNoteIds;

src/services/search/value_extractor.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import BNote = require("../../becca/entities/bnote");
+import BNote = require('../../becca/entities/bnote');
 
 /**
  * Search string is lower cased for case-insensitive comparison. But when retrieving properties,

src/services/sql.ts

@@ -8,7 +8,7 @@ import log = require('./log');
 import type { Statement, Database as DatabaseType, RunResult } from "better-sqlite3";
 import dataDir = require('./data_dir');
 import cls = require('./cls');
-import fs = require("fs-extra");
+import fs = require('fs-extra');
 import Database = require('better-sqlite3');
 
 const dbConnection: DatabaseType = new Database(dataDir.DOCUMENT_PATH);

src/services/utils.ts

@@ -4,7 +4,7 @@ import crypto = require('crypto');
 const randtoken = require('rand-token').generator({source: 'crypto'});
 import unescape = require('unescape');
 import escape = require('escape-html');
-import sanitize = require("sanitize-filename");
+import sanitize = require('sanitize-filename');
 import mimeTypes = require('mime-types');
 import path = require('path');
 

src/services/window.ts

@@ -1,5 +1,5 @@
 import path = require('path');
-import url = require("url");
+import url = require('url');
 import port = require('./port');
 import optionService = require('./options');
 import env = require('./env');
@@ -7,7 +7,7 @@ import log = require('./log');
 import sqlInit = require('./sql_init');
 import cls = require('./cls');
 import keyboardActionsService = require('./keyboard_actions');
-import remoteMain = require("@electron/remote/main")
+import remoteMain = require('@electron/remote/main')
 import { App, BrowserWindow, WebContents, ipcMain } from 'electron';
 
 // Prevent the window being garbage collected
@@ -100,7 +100,7 @@ function configureWebContents(webContents: WebContents, spellcheckEnabled: boole
     remoteMain.enable(webContents);
 
     mainWindow.webContents.setWindowOpenHandler((details) => {
-        require("electron").shell.openExternal(details.url);
+        require('electron').shell.openExternal(details.url);
         return { action: 'deny' }
     });
 

src/share/content_renderer.ts

@@ -3,7 +3,7 @@ import shaca = require('./shaca/shaca');
 import assetPath = require('../services/asset_path');
 import shareRoot = require('./share_root');
 import escapeHtml = require('escape-html');
-import SNote = require("./shaca/entities/snote");
+import SNote = require('./shaca/entities/snote');
 
 interface Result {
     header: string;

src/share/routes.ts

@@ -1,5 +1,5 @@
 import safeCompare = require('safe-compare');
-import ejs = require("ejs");
+import ejs = require('ejs');
 
 import type { Request, Response, Router } from "express";
 

src/share/shaca/entities/sattribute.ts

@@ -1,7 +1,7 @@
 "use strict";
 
 import { SAttributeRow } from "./rows";
-import SNote = require("./snote");
+import SNote = require('./snote');
 
 const AbstractShacaEntity = require('./abstract_shaca_entity');
 

src/share/shaca/shaca-interface.ts

@@ -1,7 +1,7 @@
-import SAttachment = require("./entities/sattachment");
+import SAttachment = require('./entities/sattachment');
-import SAttribute = require("./entities/sattribute");
+import SAttribute = require('./entities/sattribute');
-import SBranch = require("./entities/sbranch");
+import SBranch = require('./entities/sbranch');
-import SNote = require("./entities/snote");
+import SNote = require('./entities/snote');
 
 export default class Shaca {
 

src/types.d.ts

@@ -19,7 +19,7 @@ declare module 'normalize-strings' {
 }
 
 declare module 'joplin-turndown-plugin-gfm' {
-    import TurndownService = require("turndown");
+    import TurndownService = require('turndown');
     namespace gfm {
         function gfm(service: TurndownService): void;
     }

src/www.ts

@@ -54,7 +54,7 @@ function startTrilium() {
      * to do a complex evaluation.
      */
     if (utils.isElectron()) {
-        require("electron").app.requestSingleInstanceLock();
+        require('electron').app.requestSingleInstanceLock();
     }
 
     log.info(JSON.stringify(appInfo, null, 2));