Move typescript config into @dotkomonline/config (#1206)

.github/workflows/ci.yml

@@ -45,10 +45,5 @@ jobs:
       - name: Lint
         run: pnpm lint-check
 
-      - name: Build
-        run: |
-          pnpm run -F @dotkomonline/brevduen \
-            -F @dotkomonline/invoicification \
-            -F @dotkomonline/rif \
-            -F @dotkomonline/rpc \
-            build
+      - name: Build docker images
+        run: pnpm run docker:build

apps/dashboard/Dockerfile

@@ -17,7 +17,12 @@ ENV DOCKER_BUILD=1
 
 RUN npm install -g [email protected] [email protected] --ignore-scripts
 COPY --from=builder /app/out/json .
-RUN pnpm install --ignore-scripts
+COPY --from=builder /app/out/full/packages/db/prisma/schema.prisma packages/db/prisma/schema.prisma
+
+# Must enable scripts here for Prisma codegen to build
+RUN apk update && apk add --no-cache python3 gcc g++ make
+RUN pnpm install
+
 COPY --from=builder /app/out/full .
 RUN turbo run build --filter @dotkomonline/dashboard
 

apps/dashboard/package.json

@@ -5,6 +5,7 @@
   "scripts": {
     "dev": "next dev -p 3002 --turbo",
     "build": "next build",
+    "docker:build": "docker build --platform linux/amd64 -t dashboard:latest -f Dockerfile --progress plain ../..",
     "start": "next start",
     "lint": "biome check . --write",
     "lint-check": "biome check .",

apps/invoicification/package.json

@@ -9,7 +9,7 @@
     "lint": "biome check . --write",
     "lint-check": "biome check .",
     "type-check": "tsc --noEmit",
-    "docker:build": "docker build --platform linux/amd64 -t invoicification:latest -f Dockerfile ../..",
+    "docker:build": "docker build --platform linux/amd64 -t invoicification:latest -f Dockerfile --progress plain ../..",
     "docker:push:prod": "docker tag invoicification:latest 891459268445.dkr.ecr.eu-north-1.amazonaws.com/monoweb/prod/invoicification:latest && docker push 891459268445.dkr.ecr.eu-north-1.amazonaws.com/monoweb/prod/invoicification:latest"
   },
   "dependencies": {

apps/rif/package.json

@@ -9,7 +9,7 @@
     "lint": "biome check . --write",
     "lint-check": "biome check .",
     "type-check": "tsc --noEmit",
-    "docker:build": "docker build --platform linux/amd64 -t rif:latest -f Dockerfile ../..",
+    "docker:build": "docker build --platform linux/amd64 -t rif:latest -f Dockerfile --progress plain ../..",
     "docker:push:prod": "docker tag rif:latest 891459268445.dkr.ecr.eu-north-1.amazonaws.com/monoweb/prod/rif:latest && docker push 891459268445.dkr.ecr.eu-north-1.amazonaws.com/monoweb/prod/rif:latest"
   },
   "dependencies": {

apps/rpc/Dockerfile

@@ -17,9 +17,14 @@ ENV DOCKER_BUILD=1
 
 RUN npm install -g [email protected] [email protected] --ignore-scripts
 COPY --from=builder /app/out/json .
-RUN pnpm install --ignore-scripts
-COPY --from=builder /app/out/full .
-RUN turbo run build --filter @dotkomonline/rpc
+COPY --from=builder /app/out/full/packages/db/prisma/schema.prisma packages/db/prisma/schema.prisma
+
+# Must enable scripts here for Prisma codegen to build
+RUN apk update && apk add --no-cache python3 gcc g++ make
+RUN pnpm install
+
+# Install for production
+RUN pnpm install --production
 
 FROM base AS runner
 WORKDIR /app
@@ -34,7 +39,7 @@ RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 rpc
 USER rpc
 
-COPY --from=installer --chown=nodejs:rpc --chmod=755 /app/apps/rpc/dist/index.js ./
-COPY --from=installer --chown=nodejs:rpc --chmod=755 /app/apps/rpc/package.json ./
+COPY --from=installer --chown=rpc:nodejs --chmod=755 /app .
+COPY --from=builder --chown=rpc:nodejs --chmod=755 /app/out/full .
 
-CMD node index.js
+CMD node --loader ./apps/rpc/runtime.mjs --experimental-strip-types ./apps/rpc/src/index.ts

apps/rpc/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "dotenv -o -- tsx watch src/index.ts",
-    "build": "tsup src/index.ts",
+    "docker:build": "docker build --platform linux/amd64 -t rpc:latest -f Dockerfile --progress plain ../..",
     "lint": "biome check . --write",
     "lint-check": "biome check .",
     "type-check": "tsc --noEmit"
@@ -29,8 +29,6 @@
     "@types/node": "^22.0.0",
     "dotenv-cli": "^8.0.0",
     "tslib": "^2.6.2",
-    "tsup": "^8.3.0",
-    "tsx": "^4.15.6",
     "typescript": "^5.8"
   }
 }

apps/rpc/runtime.mjs

@@ -0,0 +1,21 @@
+import path from "node:path"
+import { URL } from "node:url"
+
+export async function resolve(specifier, context, nextResolve) {
+  // Only handle relative or absolute paths without extensions
+  if (
+    (specifier.startsWith("./") || specifier.startsWith("../") || specifier.startsWith("/")) &&
+    !path.extname(specifier)
+  ) {
+    // Try with .ts extension first
+    const tsFile = `${specifier}.ts`
+    const resolvedTsPath = new URL(tsFile, context.parentURL).href
+    return {
+      url: resolvedTsPath,
+      shortCircuit: true,
+    }
+  }
+
+  // Let Node.js handle it if no match
+  return nextResolve(specifier)
+}

package.json

@@ -2,11 +2,7 @@
   "name": "monorepo",
   "version": "1.0.0",
   "description": "Monoweb is the next-generation web application for Online. This is the monorepo source.",
-  "keywords": [
-    "online",
-    "ntnu",
-    "student-association"
-  ],
+  "keywords": ["online", "ntnu", "student-association"],
   "homepage": "https://online.ntnu.no",
   "author": "Dotkom <[email protected]> (https://online.ntnu.no)",
   "bugs": {
@@ -37,13 +33,11 @@
     "type-check": "turbo run type-check",
     "clean": "turbo run clean",
     "docker:login": "aws ecr get-login-password --region eu-north-1 | docker login --username AWS --password-stdin 891459268445.dkr.ecr.eu-north-1.amazonaws.com",
+    "docker:build": "turbo run docker:build",
     "docker:login:public": "aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws",
     "shell": "pnpm --filter=@dotkomonline/shell start"
   },
-  "workspaces": [
-    "packages/*",
-    "apps/*"
-  ],
+  "workspaces": ["packages/*", "apps/*"],
   "packageManager": "[email protected]",
   "engines": {
     "node": ">=20.12.2",

packages/core/src/modules/attendance/attendance-repository.ts

@@ -1,4 +1,4 @@
-import type { DBClient } from "@dotkomonline/db"
+import { type DBClient, PrismaRuntime } from "@dotkomonline/db"
 import {
   type Attendance,
   type AttendanceId,
@@ -7,7 +7,6 @@ import {
   type Extras,
   ExtrasSchema,
 } from "@dotkomonline/types"
-import { Prisma } from "@prisma/client"
 import type { JsonValue } from "@prisma/client/runtime/library"
 
 export interface AttendanceRepository {
@@ -80,7 +79,7 @@ export class AttendanceRepositoryImpl implements AttendanceRepository {
 
   /** Prisma requires distinction between database null and json null, so here we choose database null */
   private correctNullTypes<T extends { extras?: unknown }>(data: T) {
-    return { ...data, extras: data.extras === null ? Prisma.DbNull : data.extras }
+    return { ...data, extras: data.extras === null ? PrismaRuntime.DbNull : data.extras }
   }
 
   /** Takes an object with unparsed JSON value yearCriteria and returns it with yearCriteria parsed */

packages/core/vitest-integration.setup.ts

@@ -1,6 +1,6 @@
 import type { S3Client } from "@aws-sdk/client-s3"
 import type { DBClient } from "@dotkomonline/db"
-import { getTestClient } from "@dotkomonline/db/src/test-databases"
+import { getPrismaClientForTest } from "@dotkomonline/db/test-harness"
 import type { ManagementClient } from "auth0"
 import { afterAll, beforeEach } from "vitest"
 import { mockDeep } from "vitest-mock-extended"
@@ -28,6 +28,6 @@ afterAll(async () => {
 })
 
 beforeEach(async () => {
-  dbClient = await getTestClient()
+  dbClient = await getPrismaClientForTest()
   core = await createServiceLayerForTesting()
 })

packages/db/package.json

@@ -2,9 +2,21 @@
   "name": "@dotkomonline/db",
   "version": "1.0.0",
   "type": "module",
-  "main": "./src/index.ts",
-  "types": "./src/index.ts",
   "private": true,
+  "exports": {
+    ".": {
+      "import": "./src/index.ts",
+      "types": "./src/index.ts"
+    },
+    "./schemas": {
+      "import": "./src/schemas.ts",
+      "types": "./src/schemas.ts"
+    },
+    "./test-harness": {
+      "import": "./src/test-harness.ts",
+      "types": "./src/test-harness.ts"
+    }
+  },
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
     "lint": "biome check . --write",
@@ -27,6 +39,7 @@
   "devDependencies": {
     "@biomejs/biome": "^1.9.3",
     "@dotkomonline/config": "workspace:*",
+    "@types/node": "^22.0.0",
     "@types/pg": "^8.10.9",
     "prisma": "^6.3.1",
     "tsx": "^4.19.3",

packages/db/prisma/schema.prisma

@@ -6,7 +6,7 @@ generator zod {
   provider = "zod-prisma-types"
   output   = "../src/schemas"
 
-  useMultipleFiles = true
+  useMultipleFiles = false
   createInputTypes = false
   addIncludeType   = false
   addSelectType    = false

packages/db/src/fixtures/attendance.ts

@@ -1,4 +1,5 @@
-import { Prisma } from "@prisma/client"
+import type { Prisma } from "@prisma/client"
+import { PrismaRuntime } from "../index"
 
 export const getAttendanceFixtures = (): Prisma.AttendanceCreateManyInput[] => [
   {
@@ -52,6 +53,6 @@ export const getAttendanceFixtures = (): Prisma.AttendanceCreateManyInput[] => [
     deregisterDeadline: new Date("2023-02-23 11:03:49.289+00"),
     createdAt: new Date("2023-02-23 11:03:49.289+00"),
     updatedAt: new Date("2023-02-23 11:03:49.289+00"),
-    extras: Prisma.DbNull,
+    extras: PrismaRuntime.DbNull,
   },
 ]

packages/db/src/index.ts

@@ -1,10 +1,15 @@
-import { type Prisma, PrismaClient } from "@prisma/client"
+import { createRequire } from "node:module"
+import type { Prisma, PrismaClient } from "@prisma/client"
 import type { DefaultArgs } from "@prisma/client/runtime/library"
 
-export * as schemas from "./schemas"
+const require = createRequire(import.meta.url)
+const { Prisma: _Prisma, PrismaClient: _PrismaClient } = require("@prisma/client")
+export type * from "@prisma/client"
 
+export const PrismaRuntime = _Prisma
+export const PrismaClientRuntime = _PrismaClient
 export type DBClient = PrismaClient<Prisma.PrismaClientOptions, never, DefaultArgs>
 export const createPrisma = (databaseUrl: string): DBClient =>
-  new PrismaClient({
+  new _PrismaClient({
     datasourceUrl: databaseUrl,
   })

packages/db/src/schemas.ts

@@ -0,0 +1 @@
+export * as schemas from "./schemas/index"

packages/db/src/test-databases.ts → packages/db/src/test-harness.ts

@@ -1,5 +1,5 @@
 // biome-ignore lint/style/useNodejsImportProtocol: Cannot import with node path on vercel
-import { spawn } from "node:child_process"
+import { spawn } from "child_process"
 import { PostgreSqlContainer } from "@testcontainers/postgresql"
 import { createPrisma } from "."
 
@@ -46,10 +46,8 @@ function migrateTestDatabase(dbUrl: string) {
   })
 }
 
-export async function getTestClient() {
+export async function getPrismaClientForTest() {
   const dbUrl = await getTestContainerDatabase()
-
   await migrateTestDatabase(dbUrl)
-
   return createPrisma(dbUrl)
 }

packages/db/tsconfig.json

@@ -2,7 +2,8 @@
   "extends": "../../packages/config/tsconfig.json",
   "compilerOptions": {
     "outDir": "dist",
-    "declaration": true
+    "declaration": true,
+    "types": ["node"]
   },
   "include": ["./**/*.ts", "./**/*.tsx"]
 }

packages/types/package.json

@@ -17,6 +17,7 @@
   "devDependencies": {
     "@biomejs/biome": "^1.9.3",
     "@dotkomonline/config": "workspace:*",
+    "@types/node": "^22.0.0",
     "typescript": "^5.8"
   }
 }

packages/types/src/article.ts

@@ -1,4 +1,4 @@
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 import type { z } from "zod"
 
 export const ArticleTagSchema = schemas.ArticleTagSchema.extend({})

packages/types/src/attendance/attendance-pool.ts

@@ -1,4 +1,4 @@
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 import { z } from "zod"
 
 export const YearCriteriaSchema = z.array(z.number())

packages/types/src/attendance/attendance.ts

@@ -1,4 +1,4 @@
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 import { z } from "zod"
 
 export const ExtraSchema = z.object({

packages/types/src/attendance/attendee.ts

@@ -1,4 +1,4 @@
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 import { z } from "zod"
 import type { User } from "../user"
 

packages/types/src/attendance/waitlist-attendee.ts

@@ -1,4 +1,4 @@
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 import type { z } from "zod"
 
 export const WaitlistAttendeeSchema = schemas.WaitlistAttendeeSchema.extend({})

packages/types/src/committee.ts

@@ -1,6 +1,6 @@
 import type { z } from "zod"
 
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 
 export const CommitteeSchema = schemas.CommitteeSchema.extend({})
 

packages/types/src/company.ts

@@ -1,4 +1,4 @@
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 import type { z } from "zod"
 
 export const CompanySchema = schemas.CompanySchema.extend({})

packages/types/src/event-committee.ts

@@ -1,4 +1,4 @@
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 import type { z } from "zod"
 
 export const EventCommitteeSchema = schemas.EventCommitteeSchema.extend({})

packages/types/src/event.ts

@@ -1,6 +1,6 @@
 import type { z } from "zod"
 
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 
 import { type Attendance, AttendanceSchema } from "./attendance/attendance"
 import type { AttendancePool } from "./attendance/attendance-pool"

packages/types/src/interest-group.ts

@@ -1,6 +1,6 @@
 import type { z } from "zod"
 
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 
 export const InterestGroupSchema = schemas.InterestGroupSchema.extend({})
 

packages/types/src/job-listing.ts

@@ -1,4 +1,4 @@
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 import { z } from "zod"
 import { CompanySchema } from "./company"
 

packages/types/src/mark.ts

@@ -1,4 +1,4 @@
-import { schemas } from "@dotkomonline/db"
+import { schemas } from "@dotkomonline/db/schemas"
 import type { z } from "zod"
 
 export const MarkSchema = schemas.MarkSchema.extend({})