From 33cc11ba8468a7e17ac8082b7cca29d5bd4888bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Thu, 21 May 2026 19:16:44 +0800
Subject: [PATCH] Update tsconfig: bundler resolution & path mappings

Switch moduleResolution to "bundler" in base and package tsconfigs and consolidate path aliases for monorepo packages. Remove several package-level baseUrl entries and update package paths to reference ../../packages/* (add explicit napcat-common/src and napcat-image-size/src mappings). Also add a rootDir override for napcat-core. These changes unify module resolution and path aliases so TypeScript and bundlers resolve workspace packages consistently.
---
 packages/napcat-common/tsconfig.json   | 11 +++--
 packages/napcat-protobuf/tsconfig.json |  2 +-
 packages/napcat-pty/tsconfig.json      |  3 +-
 packages/napcat-rpc/tsconfig.json      |  3 +-
 packages/napcat-types/tsconfig.json    | 21 ++++++----
 tsconfig.base.json                     | 56 ++++++++++++++++++++++++--
 6 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/packages/napcat-common/tsconfig.json b/packages/napcat-common/tsconfig.json
index f270a3d3..ded54eab 100644
--- a/packages/napcat-common/tsconfig.json
+++ b/packages/napcat-common/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "ES2021",
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "bundler",
     "lib": [
       "ES2021"
     ],
@@ -34,10 +34,15 @@
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
-    "baseUrl": ".",
     "paths": {
+      "napcat-common/src/*": [
+        "../../packages/napcat-common/src/*"
+      ],
+      "napcat-image-size/src/*": [
+        "../../packages/napcat-image-size/src/*"
+      ],
       "@/*": [
-        "../*"
+        "../../packages/*"
       ]
     },
     "skipLibCheck": true,
diff --git a/packages/napcat-protobuf/tsconfig.json b/packages/napcat-protobuf/tsconfig.json
index ab84a2f6..74a61861 100644
--- a/packages/napcat-protobuf/tsconfig.json
+++ b/packages/napcat-protobuf/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "ESNext",
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "bundler",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
diff --git a/packages/napcat-pty/tsconfig.json b/packages/napcat-pty/tsconfig.json
index 61e4248e..26b76ad0 100644
--- a/packages/napcat-pty/tsconfig.json
+++ b/packages/napcat-pty/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "ES2021",
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "bundler",
     "lib": [
       "ES2021"
     ],
@@ -34,7 +34,6 @@
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
-    "baseUrl": ".",
     "skipLibCheck": true,
     "skipDefaultLibCheck": true
   },
diff --git a/packages/napcat-rpc/tsconfig.json b/packages/napcat-rpc/tsconfig.json
index 8c8bbfff..e4975a21 100644
--- a/packages/napcat-rpc/tsconfig.json
+++ b/packages/napcat-rpc/tsconfig.json
@@ -4,10 +4,9 @@
     "outDir": "./dist",
     "rootDir": "./src",
     "noEmit": true,
-    "baseUrl": ".",
     "paths": {
       "@/*": [
-        "../*/"
+        "../../packages/*"
       ]
     }
   },
diff --git a/packages/napcat-types/tsconfig.json b/packages/napcat-types/tsconfig.json
index cd9cf281..aea42d9f 100644
--- a/packages/napcat-types/tsconfig.json
+++ b/packages/napcat-types/tsconfig.json
@@ -3,7 +3,6 @@
   "compilerOptions": {
     "outDir": "./dist",
     "rootDir": "..",
-    "baseUrl": ".",
     "declaration": true,
     "emitDeclarationOnly": true,
     "skipLibCheck": true,
@@ -11,25 +10,31 @@
     "noEmitOnError": false,
     "paths": {
       "napcat-core": [
-        "../napcat-core/index.ts"
+        "../../packages/napcat-core/index.ts"
       ],
       "napcat-onebot": [
-        "../napcat-onebot/index.ts"
+        "../../packages/napcat-onebot/index.ts"
+      ],
+      "napcat-common/src/*": [
+        "../../packages/napcat-common/src/*"
+      ],
+      "napcat-image-size/src/*": [
+        "../../packages/napcat-image-size/src/*"
       ],
       "@/napcat-core/*": [
-        "../napcat-core/*"
+        "../../packages/napcat-core/*"
       ],
       "@/napcat-onebot/*": [
-        "../napcat-onebot/*"
+        "../../packages/napcat-onebot/*"
       ],
       "@/napcat-common/*": [
-        "../napcat-common/*"
+        "../../packages/napcat-common/*"
       ],
       "@/napcat-webui-backend/*": [
-        "../napcat-webui-backend/*"
+        "../../packages/napcat-webui-backend/*"
       ],
       "@/*": [
-        "../*"
+        "../../packages/*"
       ]
     }
   },
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 31cb9338..306a5c84 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "ES2021",
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "bundler",
     "lib": [
       "ES2021"
     ],
@@ -30,10 +30,60 @@
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
-    "baseUrl": ".",
     "paths": {
+      "napcat-core": [
+        "./packages/napcat-core/index.ts"
+      ],
+      "napcat-core/*": [
+        "./packages/napcat-core/*"
+      ],
+      "napcat-onebot": [
+        "./packages/napcat-onebot/index.ts"
+      ],
+      "napcat-onebot/*": [
+        "./packages/napcat-onebot/*"
+      ],
+      "napcat-common": [
+        "./packages/napcat-common/src/index.ts"
+      ],
+      "napcat-common/src/*": [
+        "./packages/napcat-common/src/*"
+      ],
+      "napcat-image-size": [
+        "./packages/napcat-image-size/src/index.ts"
+      ],
+      "napcat-image-size/src/*": [
+        "./packages/napcat-image-size/src/*"
+      ],
+      "napcat-database": [
+        "./packages/napcat-database/src/index.ts"
+      ],
+      "napcat-database/src/*": [
+        "./packages/napcat-database/src/*"
+      ],
+      "napcat-protocol": [
+        "./packages/napcat-protocol/index.ts"
+      ],
+      "napcat-protocol/*": [
+        "./packages/napcat-protocol/*"
+      ],
+      "napcat-qrcode": [
+        "./packages/napcat-qrcode/index.ts"
+      ],
+      "napcat-qrcode/*": [
+        "./packages/napcat-qrcode/*"
+      ],
+      "napcat-webui-backend": [
+        "./packages/napcat-webui-backend/index.ts"
+      ],
+      "napcat-webui-backend/*": [
+        "./packages/napcat-webui-backend/*"
+      ],
+      "napcat-pty": [
+        "./packages/napcat-pty/node-pty.d.ts"
+      ],
       "@/*": [
-        "packages/*"
+        "./packages/*"
       ]
     },
     "skipLibCheck": true,