From f1f8c52b0027c27a4339b8dba3d9c03bc9f9a0af Mon Sep 17 00:00:00 2001
From: James Brunton <james@stirlingpdf.com>
Date: Thu, 30 Oct 2025 16:39:37 +0000
Subject: [PATCH] Redesign tsconfig.json files

---
 frontend/package.json                                      | 6 +++---
 frontend/{tsconfig.core.json => src/core/tsconfig.json}    | 4 ++--
 .../proprietary/tsconfig.json}                             | 7 +++++--
 frontend/tsconfig.json                                     | 4 ++--
 frontend/vite.config.ts                                    | 2 +-
 frontend/vitest.config.ts                                  | 2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)
 rename frontend/{tsconfig.core.json => src/core/tsconfig.json} (74%)
 rename frontend/{tsconfig.proprietary.json => src/proprietary/tsconfig.json} (72%)

diff --git a/frontend/package.json b/frontend/package.json
index 892e48569..f031e0391 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -62,9 +62,9 @@
     "lint": "eslint --max-warnings=0",
     "build": "vite build",
     "preview": "vite preview",
-    "typecheck": "tsc --noEmit",
-    "typecheck:core": "tsc --noEmit --project tsconfig.core.json",
-    "typecheck:proprietary": "tsc --noEmit --project tsconfig.proprietary.json",
+    "typecheck": "npm run typecheck:proprietary",
+    "typecheck:core": "tsc --noEmit --project src/core/tsconfig.json",
+    "typecheck:proprietary": "tsc --noEmit --project src/proprietary/tsconfig.json",
     "typecheck:all": "npm run typecheck:core && npm run typecheck:proprietary",
     "check": "npm run typecheck && npm run lint && npm run test:run",
     "generate-licenses": "node scripts/generate-licenses.js",
diff --git a/frontend/tsconfig.core.json b/frontend/src/core/tsconfig.json
similarity index 74%
rename from frontend/tsconfig.core.json
rename to frontend/src/core/tsconfig.json
index a2491e09c..09818bb29 100644
--- a/frontend/tsconfig.core.json
+++ b/frontend/src/core/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "paths": {
       "@app/*": [
@@ -9,7 +9,7 @@
     }
   },
   "exclude": [
-    "src/proprietary",
+    "../proprietary",
     "node_modules"
   ]
 }
diff --git a/frontend/tsconfig.proprietary.json b/frontend/src/proprietary/tsconfig.json
similarity index 72%
rename from frontend/tsconfig.proprietary.json
rename to frontend/src/proprietary/tsconfig.json
index bcb363546..fee6a3912 100644
--- a/frontend/tsconfig.proprietary.json
+++ b/frontend/src/proprietary/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "paths": {
       "@app/*": [
@@ -9,5 +9,8 @@
       "@proprietary/*": ["src/proprietary/*"],
       "@core/*": ["src/core/*"]
     }
-  }
+  },
+  "exclude": [
+    "node_modules"
+  ]
 }
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index f0c859e07..57fd4bc3e 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -35,8 +35,8 @@
         "src/proprietary/*",
         "src/core/*"
       ],
-      "@core/*": ["src/core/*"],
-      "@proprietary/*": ["src/proprietary/*"]
+      "@proprietary/*": ["src/proprietary/*"],
+      "@core/*": ["src/core/*"]
     },
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index e5f4ddc8a..68847315a 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -10,7 +10,7 @@ export default defineConfig({
     react(),
     tsconfigPaths({
       projects: [
-        isProprietary ? './tsconfig.proprietary.json' : './tsconfig.core.json',
+        isProprietary ? './src/proprietary/tsconfig.json' : './src/core/tsconfig.json',
       ],
     }),
   ],
diff --git a/frontend/vitest.config.ts b/frontend/vitest.config.ts
index de759c5f8..4b0d9fd5c 100644
--- a/frontend/vitest.config.ts
+++ b/frontend/vitest.config.ts
@@ -10,7 +10,7 @@ export default defineConfig({
     react(),
     tsconfigPaths({
       projects: [
-        isProprietary ? './tsconfig.proprietary.json' : './tsconfig.core.json',
+        isProprietary ? './src/proprietary/tsconfig.json' : './src/core/tsconfig.json',
       ],
     }),
   ],