From b67cbffbf9839961e30b588bbd13edd5532f80f9 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 17 Sep 2026 16:54:31 -0500
Subject: [PATCH] Update tsconfig to use allowJs to skip buildServer.js step

---
 index.js             |  4 +---
 package-lock.json    |  2 +-
 package.json         |  4 ++--
 tsconfig.server.json | 18 +++++++++---------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/index.js b/index.js
index 63c863966..7c42e30ae 100644
--- a/index.js
+++ b/index.js
@@ -32,9 +32,7 @@ if (isDev || options['prod-with-dev-env']) {
   if (devEnv.BackupPath) process.env.BACKUP_PATH = devEnv.BackupPath
   if (devEnv.ReactClientPath) process.env.REACT_CLIENT_PATH = devEnv.ReactClientPath
   if (devEnv.AllowedDevOrigins) {
-    process.env.ALLOWED_DEV_ORIGINS = Array.isArray(devEnv.AllowedDevOrigins)
-      ? devEnv.AllowedDevOrigins.join(',')
-      : String(devEnv.AllowedDevOrigins)
+    process.env.ALLOWED_DEV_ORIGINS = Array.isArray(devEnv.AllowedDevOrigins) ? devEnv.AllowedDevOrigins.join(',') : String(devEnv.AllowedDevOrigins)
   }
   process.env.SOURCE = 'local'
   process.env.ROUTER_BASE_PATH = devEnv.RouterBasePath ?? '/audiobookshelf'
diff --git a/package-lock.json b/package-lock.json
index abc221fa5..88d03072a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
         "xml2js": "^0.5.0"
       },
       "bin": {
-        "audiobookshelf": "index.js"
+        "audiobookshelf": "dist-server/index.js"
       },
       "devDependencies": {
         "@types/node": "^20.17.0",
diff --git a/package.json b/package.json
index 52a451842..3b6b44d5f 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
   "description": "Self-hosted audiobook and podcast server",
   "main": "dist-server/index.js",
   "scripts": {
-    "build:server": "node scripts/buildServer.js",
-    "dev": "nodemon --watch server --watch index.js --ext js,ts --exec \"npm run build:server && node dist-server/index.js\" -- --dev",
+    "build:server": "tsc -p tsconfig.server.json",
+    "dev": "nodemon --watch server --watch index.js --watch test --watch dev.js --ext js,ts --exec \"npm run build:server && node dist-server/index.js\" -- --dev",
     "start": "node dist-server/index.js",
     "start-dev": "node dist-server/index.js --prod-with-dev-env",
     "client": "cd client && npm ci && npm run generate",
diff --git a/tsconfig.server.json b/tsconfig.server.json
index 212a26240..a3c6ce5c8 100644
--- a/tsconfig.server.json
+++ b/tsconfig.server.json
@@ -5,16 +5,16 @@
     "moduleResolution": "node",
     "rootDir": ".",
     "outDir": "dist-server",
+    "allowJs": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,
-    "noEmitOnError": true
+    "noEmitOnError": true,
+    "incremental": true,
+    "tsBuildInfoFile": "dist-server/.tsbuildinfo",
+    "forceConsistentCasingInFileNames": true
   },
-  "include": [
-    "server/**/*.ts"
-  ],
-  "exclude": [
-    "node_modules",
-    "dist-server",
-    "client"
-  ]
+  "include": ["index.js", "dev.js", "server/**/*.js", "server/**/*.ts", "test/**/*.js", "test/**/*.ts"],
+  "exclude": ["node_modules", "dist-server", "client", "**/*.d.ts"]
 }