Merge pull request #259 from TriliumNext/feature/server_esm

Server ESM port: Basic imports

Author: eliandoran

.vscode/tasks.json

@@ -0,0 +1,17 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+      {
+        "type": "npm",
+        "script": "errors",
+        "problemMatcher": "$tsc-watch",
+        "isBackground": true,
+        "presentation": {
+          "revealProblems": "never"
+        },
+        "runOptions": {
+          "runOn": "folderOpen"
+        }
+      }
+    ]
+  }

electron.ts

@@ -1,22 +1,24 @@
 "use strict";
 
-import electron = require("electron");
-import sqlInit = require("./src/services/sql_init");
-import appIconService = require("./src/services/app_icon");
-import windowService = require("./src/services/window");
-import tray = require("./src/services/tray");
+import electron from "electron";
+import electronDebug from "electron-debug";
+import electronDl from "electron-dl";
+import sqlInit from "./src/services/sql_init.js";
+import appIconService from "./src/services/app_icon.js";
+import windowService from "./src/services/window.js";
+import tray from "./src/services/tray.js";
 
 // Prevent Trilium starting twice on first install and on uninstall for the Windows installer.
 if (require('electron-squirrel-startup')) {
   process.exit(0);
 }
 
 // Adds debug features like hotkeys for triggering dev tools and reload
-require("electron-debug")();
+electronDebug();
 
 appIconService.installLocalAppIcon();
 
-require("electron-dl")({ saveAs: true });
+electronDl({ saveAs: true });
 
 // needed for excalidraw export https://github.com/zadam/trilium/issues/4271
 electron.app.commandLine.appendSwitch(
@@ -65,4 +67,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');

package-lock.json

@@ -41,7 +41,8 @@
     "make-electron": "npm run webpack && npm run prepare-dist && electron-forge make",
     "package-electron": "electron-forge package",
     "prepare-dist": "rimraf ./dist && tsc && ts-node ./bin/copy-dist.ts",
-    "update-build-info": "ts-node bin/update-build-info.ts"
+    "update-build-info": "ts-node bin/update-build-info.ts",
+    "errors": "tsc --watch --noEmit"
   },
   "dependencies": {
     "@braintree/sanitize-url": "^7.1.0",
@@ -145,6 +146,7 @@
     "@types/sax": "^1.2.7",
     "@types/semver": "^7.5.8",
     "@types/serve-favicon": "^2.5.7",
+    "@types/session-file-store": "^1.2.5",
     "@types/stream-throttle": "^0.1.4",
     "@types/tmp": "^0.2.6",
     "@types/turndown": "^5.0.4",

package.json

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

spec/etapi/app_info.ts

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

spec/etapi/backup.ts

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

spec/etapi/import.ts

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

spec/etapi/notes.ts

@@ -1,9 +1,9 @@
-import BNote = require("../../src/becca/entities/bnote");
-import BBranch = require("../../src/becca/entities/bbranch");
-import BAttribute = require("../../src/becca/entities/battribute");
-import becca = require("../../src/becca/becca");
-import randtoken = require("rand-token");
-import SearchResult = require("../../src/services/search/search_result");
+import BNote from "../../src/becca/entities/bnote.js";
+import BBranch from "../../src/becca/entities/bbranch.js";
+import BAttribute from "../../src/becca/entities/battribute.js";
+import becca from "../../src/becca/becca.js";
+import randtoken from "rand-token";
+import SearchResult from "../../src/services/search/search_result.js";
 import { NoteType } from "../../src/becca/entities/rows";
 randtoken.generator({ source: "crypto" });
 
@@ -80,7 +80,7 @@ function note(title: string, extraParams = {}) {
   return new NoteBuilder(note);
 }
 
-export = {
+export default {
   NoteBuilder,
   findNoteByTitle,
   note,

spec/search/becca_mocking.ts

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