Merge branch 'main' of github.com:ut-code/CourseMate into make-it-ssg

Author: nakaterm

.github/workflows/ci.yml

@@ -26,7 +26,6 @@ jobs:
         with:
           bun-version: latest
       - run: bun i --frozen-lockfile
-        working-directory: server
       - run: bunx prisma db push
         working-directory: server
 
@@ -39,7 +38,7 @@ jobs:
       - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
-      - run: bun install
+      - run: bun install --frozen-lockfile
       - run: bun run build
 
   biome:

.gitignore

@@ -22,3 +22,5 @@ lerna-debug.log*
 *.njsproj
 *.sln
 *.sw?
+
+tsconfig.tsbuildinfo

bun.lock

@@ -4,8 +4,3 @@ export function panic(reason: string): never {
     cause: "panic",
   });
 }
-
-// expected error
-export function error(reason: string, code?: number): never {
-  throw new Error(reason, { cause: code });
-}

common/bun.lock

@@ -1,5 +1,7 @@
 // common/type/types.ts
 
+import type { Message } from "./zod/types.ts";
+
 export type {
   UserID,
   GUID,
@@ -34,3 +36,23 @@ export type {
   InitSharedRoom,
   UpdateRoom,
 } from "./zod/types.ts";
+
+export type SSEChatEvents = {
+  "Chat:Append": {
+    message: Message;
+    sender: string; // user name
+  };
+  "Chat:Update": {
+    id: number;
+    message: Message;
+  };
+  "Chat:Delete": {
+    id: number;
+  };
+  "Chat:Ping": "";
+};
+export type SSEChatEventEnum = "Chat:Append" | "Chat:Update" | "Chat:Delete";
+export type SSEChatEvent<T extends SSEChatEventEnum> = {
+  event: T;
+  data: SSEChatEvents[T];
+};

common/lib/panic.ts

@@ -78,7 +78,7 @@ export const DaySchema = z.enum([
   "other",
 ]);
 
-export const PeriodSchema = z.number().min(0).max(6);
+export const PeriodSchema = z.coerce.number().min(0).max(6);
 
 export const SlotSchema = z.object({
   day: DaySchema,

common/types.ts

@@ -2,8 +2,16 @@
   "name": "course-mate",
   "private": true,
   "version": "1.0.0",
-  "description": "",
+  "author": "",
   "main": "index.js",
+  "devDependencies": {
+    "@biomejs/biome": "^1.9.1",
+    "lefthook": "^1.10.10",
+    "lint-staged": "^15.2.10"
+  },
+  "description": "",
+  "keywords": [],
+  "license": "ISC",
   "scripts": {
     "prepare": "lefthook install && (cd server; bun run prepare)",
     "check": "bun type && bun style:check",
@@ -20,23 +28,14 @@
     "watch:web": "cd web; bun run dev",
     "watch:server": "cd server; bun run dev",
     "seed": "cd server; bun prisma db seed",
-    "prepare:deploy:web": "bun install --frozen-lockfile && bun run build:web",
-    "prepare:deploy:server": "bun install --frozen-lockfile",
+    "prepare:deploy:web": "bun install && bun run build:web",
+    "prepare:deploy:server": "bun install",
     "deploy:web": "cd web; bun run start --port $PORT",
-    "deploy:server": "cd server; bun run src/main.ts",
+    "deploy:server": "cd server; bun run src/index.ts",
     "dev-db": "make dev-db",
     "test": "make test",
     "spell": "bunx cspell --quiet ."
   },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "workspaces": ["common", "web", "server"],
-  "devDependencies": {
-    "@biomejs/biome": "^1.9.1",
-    "lefthook": "^1.10.10",
-    "lint-staged": "^15.2.10"
-  },
-  "dependencies": {},
-  "trustedDependencies": ["@biomejs/biome", "lefthook"]
+  "trustedDependencies": ["@biomejs/biome", "lefthook"],
+  "workspaces": ["common", "web", "server"]
 }