Refactor TypeScript configs and dev scripts for NodeNext

sebastiankrll · sebastiankrll · commit 193515fb013b · 2025-12-31T23:52:49.000+01:00
diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile
@@ -43,4 +43,4 @@ COPY --from=installer /app .
 # Expose port if needed
 EXPOSE 3001
 
-CMD node apps/api/dist/index.js
+CMD ["node", "apps/api/dist/index.js"]
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -3,7 +3,7 @@
 	"type": "module",
 	"scripts": {
 		"start": "node dist/index.js",
-		"dev": "tsup --watch --onSuccess \"node dist/index.cjs\"",
+		"dev": "tsx watch src/index.ts",
 		"build": "tsc",
 		"format-and-lint": "biome check .",
 		"format-and-lint:fix": "biome check . --write"
diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts
@@ -7,9 +7,9 @@ import { pgFindAirportFlights, pgHealthCheck, pgShutdown, prisma } from "@sr24/d
 import { rdsConnect, rdsGetSingle, rdsGetTimeSeries, rdsHealthCheck, rdsShutdown, rdsSub } from "@sr24/db/redis";
 import type { AirportLong, ControllerLong, DashboardData, InitialData, PilotLong, RedisAll } from "@sr24/types/interface";
 import Fastify from "fastify";
-import type { Prisma } from "../../../packages/db/src/generated/prisma";
-import { authPlugin } from "./plugins";
-import { getMetar, getTaf } from "./weather";
+import type { Prisma } from "../../../packages/db/src/generated/prisma/index.js";
+import { authPlugin } from "./plugins.js";
+import { getMetar, getTaf } from "./weather.js";
 
 let initialData: InitialData | null = null;
 let dashboardData: DashboardData | null = null;
diff --git a/apps/api/tsconfig.json b/apps/api/tsconfig.json
@@ -1,8 +1,14 @@
 {
 	"extends": "@sr24/typescript-config/base.json",
 	"compilerOptions": {
+		"target": "ES2022",
+		"module": "NodeNext",
+		"moduleResolution": "NodeNext",
+		"lib": ["ES2022"],
+		"types": ["node"],
+		"rootDir": "src",
 		"outDir": "dist",
-		"rootDir": "src"
+		"noEmit": false
 	},
 	"include": ["src"],
 	"exclude": ["dist"]
diff --git a/apps/ingestion/Dockerfile b/apps/ingestion/Dockerfile
@@ -40,4 +40,4 @@ ENV NODE_ENV=production
 # Copy only the compiled files and dependencies
 COPY --from=installer /app .
 
-CMD node apps/ingestion/dist/index.js
+CMD ["node", "apps/ingestion/dist/index.js"]
diff --git a/apps/ingestion/package.json b/apps/ingestion/package.json
@@ -3,7 +3,7 @@
 	"type": "module",
 	"scripts": {
 		"start": "node dist/index.js",
-		"dev": "tsup --watch --onSuccess \"node dist/index.cjs\"",
+		"dev": "tsx watch src/index.ts",
 		"build": "tsc",
 		"format-and-lint": "biome check .",
 		"format-and-lint:fix": "biome check . --write"
diff --git a/apps/ingestion/tsconfig.json b/apps/ingestion/tsconfig.json
@@ -1,8 +1,14 @@
 {
 	"extends": "@sr24/typescript-config/base.json",
 	"compilerOptions": {
+		"target": "ES2022",
+		"module": "NodeNext",
+		"moduleResolution": "NodeNext",
+		"lib": ["ES2022"],
+		"types": ["node"],
+		"rootDir": "src",
 		"outDir": "dist",
-		"rootDir": "src"
+		"noEmit": false
 	},
 	"include": ["src"],
 	"exclude": ["dist"]
diff --git a/apps/updater/Dockerfile b/apps/updater/Dockerfile
@@ -33,4 +33,4 @@ ENV NODE_ENV=production
 # Copy only the compiled files and dependencies
 COPY --from=installer /app .
 
-CMD node apps/updater/dist/index.js
+CMD ["node", "apps/updater/dist/index.js"]
diff --git a/apps/updater/package.json b/apps/updater/package.json
@@ -3,7 +3,7 @@
 	"type": "module",
 	"scripts": {
 		"start": "node dist/index.js",
-		"dev": "tsup --watch --onSuccess \"node dist/index.cjs\"",
+		"dev": "tsx watch src/index.ts",
 		"build": "tsc",
 		"format-and-lint": "biome check .",
 		"format-and-lint:fix": "biome check . --write"
diff --git a/apps/updater/tsconfig.json b/apps/updater/tsconfig.json
@@ -1,8 +1,14 @@
 {
 	"extends": "@sr24/typescript-config/base.json",
 	"compilerOptions": {
+		"target": "ES2022",
+		"module": "NodeNext",
+		"moduleResolution": "NodeNext",
+		"lib": ["ES2022"],
+		"types": ["node"],
+		"rootDir": "src",
 		"outDir": "dist",
-		"rootDir": "src"
+		"noEmit": false
 	},
 	"include": ["src"],
 	"exclude": ["dist"]
diff --git a/apps/web/app/(map)/lib/pilotFeatures.ts b/apps/web/app/(map)/lib/pilotFeatures.ts
@@ -1,4 +1,4 @@
-import type { PilotDelta, InitialData } from "@sr24/types/interface";
+import type { InitialData, PilotDelta } from "@sr24/types/interface";
 import { Feature, type Map as OlMap } from "ol";
 import type { Extent } from "ol/extent";
 import { Point } from "ol/geom";
diff --git a/apps/websocket/Dockerfile b/apps/websocket/Dockerfile
@@ -43,4 +43,4 @@ COPY --from=installer /app .
 # Expose port if needed
 EXPOSE 3002
 
-CMD node apps/websocket/dist/index.js
+CMD ["node", "apps/websocket/dist/index.js"]
diff --git a/apps/websocket/package.json b/apps/websocket/package.json
@@ -3,7 +3,7 @@
 	"type": "module",
 	"scripts": {
 		"start": "node dist/index.js",
-		"dev": "tsup --watch --onSuccess \"node dist/index.cjs\"",
+		"dev": "tsx watch src/index.ts",
 		"build": "tsc",
 		"format-and-lint": "biome check .",
 		"format-and-lint:fix": "biome check . --write"
diff --git a/apps/websocket/tsconfig.json b/apps/websocket/tsconfig.json
@@ -1,8 +1,14 @@
 {
 	"extends": "@sr24/typescript-config/base.json",
 	"compilerOptions": {
+		"target": "ES2022",
+		"module": "NodeNext",
+		"moduleResolution": "NodeNext",
+		"lib": ["ES2022"],
+		"types": ["node"],
+		"rootDir": "src",
 		"outDir": "dist",
-		"rootDir": "src"
+		"noEmit": false
 	},
 	"include": ["src"],
 	"exclude": ["dist"]
diff --git a/packages/db/package.json b/packages/db/package.json
@@ -1,7 +1,8 @@
 {
 	"name": "@sr24/db",
-	"type": "module",
 	"version": "1.0.0",
+	"private": true,
+	"type": "module",
 	"exports": {
 		"./pg": {
 			"types": "./src/pg.ts",
@@ -12,6 +13,7 @@
 			"default": "./dist/redis.js"
 		}
 	},
+	"types": "./dist/index.d.ts",
 	"scripts": {
 		"dev": "tsc --watch",
 		"build": "tsc && shx cp -r src/generated dist/generated",
diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json
@@ -1,8 +1,14 @@
 {
 	"extends": "@sr24/typescript-config/base.json",
 	"compilerOptions": {
+		"target": "ES2022",
+		"module": "NodeNext",
+		"moduleResolution": "NodeNext",
+		"lib": ["ES2022"],
+		"types": ["node"],
+		"rootDir": "src",
 		"outDir": "dist",
-		"rootDir": "src"
+		"noEmit": false
 	},
 	"include": ["src"],
 	"exclude": ["dist"]
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,19 +1,13 @@
 {
 	"name": "@sr24/types",
 	"version": "1.0.0",
-	"main": "dist/index.js",
-	"types": "dist/index.d.ts",
+	"private": true,
+	"types": "src/index.ts",
 	"exports": {
 		"./db": "./src/db.ts",
 		"./vatsim": "./src/vatsim.ts",
 		"./interface": "./src/interface.ts"
 	},
-	"scripts": {
-		"dev": "tsc --watch",
-		"build": "tsc",
-		"format-and-lint": "biome check .",
-		"format-and-lint:fix": "biome check . --write"
-	},
 	"devDependencies": {
 		"@sr24/typescript-config": "*",
 		"@types/geojson": "^7946.0.16",
diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json
@@ -1,8 +1,10 @@
 {
 	"extends": "@sr24/typescript-config/base.json",
 	"compilerOptions": {
-		"outDir": "dist",
-		"rootDir": "src"
+		"compilerOptions": {
+			"noEmit": true,
+			"lib": ["ES2022"]
+		}
 	},
 	"include": ["src"],
 	"exclude": ["dist"]
diff --git a/packages/typescript-config/base.json b/packages/typescript-config/base.json
@@ -1,22 +1,13 @@
 {
 	"$schema": "https://json.schemastore.org/tsconfig",
 	"compilerOptions": {
-		"composite": false,
-		"declaration": true,
-		"declarationMap": true,
-		"esModuleInterop": true,
+		"strict": true,
+		"skipLibCheck": true,
 		"forceConsistentCasingInFileNames": true,
-		"inlineSources": false,
+		"esModuleInterop": true,
+		"resolveJsonModule": true,
 		"isolatedModules": true,
-		"module": "esnext",
-		"target": "esnext",
-		"moduleResolution": "bundler",
-		"noUnusedLocals": false,
-		"noUnusedParameters": false,
-		"preserveWatchOutput": true,
-		"skipLibCheck": true,
-		"strict": true,
-		"strictNullChecks": true
+		"verbatimModuleSyntax": true
 	},
 	"exclude": ["node_modules"]
 }
