Merge branch 'develop' into renovate/electron-36.x

apps/edit-docs/package.json

@@ -3,6 +3,10 @@
   "version": "0.0.1",
   "private": true,
   "description": "Desktop version of Trilium which imports the demo database (presented to new users at start-up) or the user guide and other documentation and saves the modifications for committing.",
+  "dependencies": {
+    "archiver": "7.0.1",
+    "better-sqlite3": "^11.9.1"
+  },
   "devDependencies": {
     "@triliumnext/client": "workspace:*",
     "@triliumnext/desktop": "workspace:*",
@@ -17,6 +21,59 @@
       "server"
     ],
     "targets": {
+      "build": {
+        "executor": "@nx/esbuild:esbuild",
+        "outputs": [
+          "{options.outputPath}"
+        ],
+        "options": {
+          "main": "apps/edit-docs/src/electron-docs-main.ts",
+          "outputPath": "apps/edit-docs/dist",
+          "outputFileName": "main.js",
+          "tsConfig": "apps/edit-docs/tsconfig.app.json",
+          "platform": "node",
+          "external": [
+            "electron",
+            "@electron/remote",
+            "better-sqlite3",
+            "./xhr-sync-worker.js"
+          ],
+          "format": [
+            "cjs"
+          ],
+          "minify": true,
+          "thirdParty": true,
+          "esbuildOptions": {
+            "splitting": false,
+            "loader": {
+              ".css": "text"
+            }
+          },
+          "assets": [
+            {
+              "glob": "**/*",
+              "input": "apps/server/dist/node_modules",
+              "output": "node_modules"
+            },
+            {
+              "glob": "**/*",
+              "input": "apps/server/dist/assets",
+              "output": "assets"
+            },
+            {
+              "glob": "**/*",
+              "input": "apps/server/dist/public",
+              "output": "public"
+            },
+            {
+              "glob": "xhr-sync-worker.js",
+              "input": "apps/server/node_modules/jsdom/lib/jsdom/living/xhr",
+              "output": ""
+            }
+          ],
+          "declarationRootDir": "apps/edit-docs/src"
+        }
+      },
       "rebuild-deps": {
         "executor": "nx:run-commands",
         "dependsOn": [
@@ -41,19 +98,34 @@
         "defaultConfiguration": "default",
         "configurations": {
           "default": {
-            "command": "electron .",
-            "cwd": "./apps/edit-docs/dist"
+            "command": "electron main.cjs",
+            "cwd": "{projectRoot}/dist"
           },
           "nixos": {
-            "command": "nix-shell -p electron_35 --run \"electron .\"",
-            "forwardAllArgs": false,
-            "cwd": "./apps/edit-docs/dist"
+            "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/main.cjs\"",
+            "cwd": ".",
+            "forwardAllArgs": false
+          }
+        }
+      },
+      "serve-nodir": {
+        "executor": "nx:run-commands",
+        "dependsOn": [
+          "rebuild-deps"
+        ],
+        "defaultConfiguration": "default",
+        "configurations": {
+          "default": {
+            "command": "electron main.cjs",
+            "cwd": "{projectRoot}/dist"
+          },
+          "nixos": {
+            "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/main.cjs\"",
+            "cwd": ".",
+            "forwardAllArgs": false
           }
         }
       }
     }
-  },
-  "dependencies": {
-    "archiver": "7.0.1"
-  }
-}
+  }  
+}

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

@@ -13,8 +13,9 @@ import TaskContext from "@triliumnext/server/src/services/task_context.js";
 import { deferred } from "@triliumnext/server/src/services/utils.js";
 import { parseNoteMetaFile } from "@triliumnext/server/src/services/in_app_help.js";
 import { resolve } from "path";
+import type NoteMeta from "@triliumnext/server/src/services/meta/note_meta.js";
 import electron from "electron";
-import { onReady } from "@triliumnext/desktop/src/electron-main.js";
+import windowService from "@triliumnext/server/src/services/window.js";
 
 interface NoteMapping {
     rootNoteId: string;
@@ -55,12 +56,25 @@ const NOTE_MAPPINGS: NoteMapping[] = [
 ];
 
 async function main() {
-    electron.app.on("ready", onReady);
+    const initializedPromise = deferred<void>();
+    electron.app.on("ready", async () => {
+        await initializedPromise;
+
+        console.log("Electron is ready!");
+
+        // Start the server.
+        await import("@triliumnext/server/src/main.js");
+
+        // Create the main window.
+        await windowService.createMainWindow(electron.app);
+
+        // Wait for the import to be finished and the application to be loaded before we listen to changes.
+        setTimeout(() => registerHandlers(), 10_000);
+    });
 
     await initializeTranslations();
     await initializeDatabase(true);
 
-    const initializedPromise = deferred<void>();
     cls.init(async () => {
         for (const mapping of NOTE_MAPPINGS) {
             if (!mapping.exportOnly) {
@@ -70,11 +84,6 @@ async function main() {
         setOptions();
         initializedPromise.resolve();
     });
-
-    await initializedPromise;
-
-    // Wait for the import to be finished and the application to be loaded before we listen to changes.
-    setTimeout(() => registerHandlers(), 10_000);
 }
 
 async function setOptions() {

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

@@ -40,4 +40,4 @@ async function exportData() {
     await exportToZipFile("root", "html", DEMO_ZIP_PATH);
 }
 
-await main();
+main();

apps/edit-docs/tsconfig.app.json

@@ -1,16 +1,21 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "target": "ES2020",
     "outDir": "dist",
+    "strict": false,
     "types": [
-      "node"
+      "node",
+      "express"
     ],
     "rootDir": "src",
-    "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo",
-    "verbatimModuleSyntax": false
+    "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo"
   },
   "include": [
-    "src/**/*.ts"
+    "src/**/*.ts",
+    "../server/src/*.d.ts"
   ],
   "exclude": [
     "eslint.config.js",

apps/edit-docs/webpack.config.cjs

@@ -1,53 +0,0 @@
-const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
-const CopyPlugin = require('copy-webpack-plugin');
-const { join } = require('path');
-
-const outputDir = join(__dirname, 'dist');
-
-module.exports = {
-  output: {
-    path: join(__dirname, 'dist'),
-  },
-  module: {
-    rules: [
-      {
-        test: /\.css$/i,
-        type: "asset/source"
-      }
-    ]
-  },
-  plugins: [
-    new NxAppWebpackPlugin({
-      target: 'node',
-      compiler: 'tsc',
-      main: './src/electron-docs-main.ts',
-      tsConfig: './tsconfig.app.json',
-      optimization: false,
-      outputHashing: 'none',
-      generatePackageJson: true,
-      externalDependencies: [
-        "electron/main",
-        "@electron/remote/main",
-        "electron",
-        "@electron/remote",        
-        "better-sqlite3"
-      ]
-    }),
-    new CopyPlugin({
-      patterns: [
-        {
-          from: "../desktop/dist/node_modules",
-          to: join(outputDir, "node_modules")
-        },
-        {
-          from: "../desktop/dist/assets",
-          to: join(outputDir, "assets")
-        },
-        {
-          from: "../desktop/dist/public",
-          to: join(outputDir, "public")
-        },
-      ]
-    })
-  ],
-};