From 20bdae4a847f6dc5acd1e46ad1dde606269a7d15 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sun, 31 Aug 2025 10:49:50 +0300
Subject: [PATCH] chore(server/dx): serve source directly

---
 apps/server/.serve.env                   | 2 +-
 apps/server/package.json                 | 8 +++-----
 apps/server/src/services/resource_dir.ts | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/server/.serve.env b/apps/server/.serve.env
index 43591d92c..127084aa7 100644
--- a/apps/server/.serve.env
+++ b/apps/server/.serve.env
@@ -1,4 +1,4 @@
 TRILIUM_ENV=dev
 TRILIUM_DATA_DIR=./apps/server/data
-TRILIUM_RESOURCE_DIR=./apps/server/dist
+TRILIUM_RESOURCE_DIR=./apps/server/src
 TRILIUM_PUBLIC_SERVER=http://localhost:4200
\ No newline at end of file
diff --git a/apps/server/package.json b/apps/server/package.json
index a36d33d01..73a140a61 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -116,20 +116,18 @@
     ],
     "targets": {
       "serve": {
-        "executor": "@nx/js:node",
+        "executor": "nx:run-commands",
         "dependsOn": [
           {
             "projects": [
               "client"
             ],
             "target": "serve"
-          },
-          "build-without-client"
+          }
         ],
         "continuous": true,
         "options": {
-          "buildTarget": "server:build-without-client:development",
-          "runBuildTargetDependencies": false
+          "command": "tsx watch {projectRoot}/src/main.ts"
         }
       },
       "serve-nodir": {
diff --git a/apps/server/src/services/resource_dir.ts b/apps/server/src/services/resource_dir.ts
index c274b43ce..35c056af2 100644
--- a/apps/server/src/services/resource_dir.ts
+++ b/apps/server/src/services/resource_dir.ts
@@ -1,4 +1,3 @@
-import log from "./log.js";
 import path from "path";
 import fs from "fs";
 
@@ -10,7 +9,7 @@ const ELECTRON_APP_ROOT_DIR = path.resolve(RESOURCE_DIR, "../..");
 const DB_INIT_DIR = path.resolve(RESOURCE_DIR, "db");
 
 if (!fs.existsSync(DB_INIT_DIR)) {
-    log.error(`Could not find DB initialization directory: ${DB_INIT_DIR}`);
+    console.error(`Could not find DB initialization directory: ${DB_INIT_DIR}`);
     process.exit(1);
 }