Merge branch 'main' of github.com:ut-code/CourseMate into fix/home-daisyUI

Author: GuY8528

Makefile

@@ -10,12 +10,12 @@ setup:
 	@echo "- edit web/.env"
 	@echo "- run make sync"
 
-setup-ci:
-	if [ ${DATABASE_URL} == "" ]; then echo 'Please set DATABASE_URL_FOR_SQL_GENERATION!'; exit 1; fi
+setup-ci: 
+	if [ "" == ${DATABASE_URL} ]; then echo 'Please set DATABASE_URL_FOR_SQL_GENERATION!'; exit 1; fi
 	make sync
 	make generate-sql
 
-sync: sync-server sync-web sync-root copy-common 
+sync: sync-server sync-web sync-root sync-common
 	lefthook install || true
 	@echo '----------------------------------------------------------------------------------------------------------'
 	@echo '| Most work is done. now running prisma-generate-sql (which might fail if .env.dev is not set configured)|'
@@ -42,17 +42,17 @@ test: dev-db
 	cd ./test; ENV_FILE=../server/.env.dev bun test
 	docker stop postgres
 
-prepare-deploy-web: copy-common
+prepare-deploy-web: sync-common
 	cd web; bun install; bun run build
-prepare-deploy-server: copy-common sync-server generate-sql
+prepare-deploy-server: sync-common sync-server generate-sql
 deploy-server:
 	cd server; bun src/main.ts
 
-docker: copy-common
+docker:
 	@# deferring `docker compose down`. https://qiita.com/KEINOS/items/532dc395fe0f89c2b574
 	trap 'docker compose down' EXIT; docker compose up --build
 
-docker-watch: copy-common
+docker-watch:
 	docker compose up --build --watch
 
 seed:
@@ -93,6 +93,8 @@ sync-server:
 
 sync-root:
 	bun install --frozen-lockfile
+sync-common:
+	cd common; bun install --frozen-lockfile
 
 
 # Static checks
@@ -117,7 +119,7 @@ format-check:
 	@exit 1
 
 # type checks
-type-check: copy-common
+type-check: 
 	make type-check-server
 	make type-check-web
 
@@ -133,9 +135,9 @@ type-check-web:
 start-all: build-web build-server
 	make serve-all
 
-build-web: copy-common-to-web
+build-web: 
 	cd web; bun run build
-build-server: copy-common-to-server
+build-server: 
 	cd server; bun run build
 
 serve-all:
@@ -145,17 +147,9 @@ serve-web:
 serve-server:
 	cd server; bun run serve 
 
-watch-web: copy-common-to-web
+watch-web: 
 	cd web; bun run dev
-watch-server: copy-common-to-server
+watch-server: 
 	cd server; bun run dev
 
-copy-common: copy-common-to-server copy-common-to-web
-copy-common-to-server:
-	@ if [ -d server/src/common ]; then rm -r server/src/common; fi
-	@ cp -r common server/src/common
-copy-common-to-web:
-	@ if [ -d web/common ]; then rm -r web/common; fi
-	@ cp -r common web/common
-
 .PHONY: test

bun.lockb

@@ -0,0 +1,15 @@
+# common
+
+To install dependencies:
+
+```bash
+bun install
+```
+
+To run:
+
+```bash
+bun run index.ts
+```
+
+This project was created using `bun init` in bun v1.1.29. [Bun](https://bun.sh) is a fast all-in-one JavaScript runtime.

common/README.md

@@ -0,0 +1,13 @@
+{
+  "name": "common",
+  "type": "module",
+  "devDependencies": {
+    "@types/bun": "latest"
+  },
+  "peerDependencies": {
+    "typescript": "^5.0.0"
+  },
+  "dependencies": {
+    "zod": "^3.23.8"
+  }
+}

common/bun.lockb

@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    // Enable latest features
+    "lib": ["ESNext", "DOM"],
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleDetection": "force",
+    "jsx": "react-jsx",
+    "allowJs": true,
+
+    // Bundler mode
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true,
+
+    // Best practices
+    "strict": true,
+    "skipLibCheck": true,
+    "noFallthroughCasesInSwitch": true,
+
+    // Some stricter flags (disabled by default)
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noPropertyAccessFromIndexSignature": false
+  }
+}

common/package.json

@@ -13,4 +13,4 @@ pre-commit:
       run: if [ "$(git branch --show-current)" == "main" ]; then echo "Cannot make commit on main! aborting..."; exit 1; fi
     cspell:
       glob: "*"
-      run: bunx cspell --quiet -- {staged_files}
+      run: bunx cspell --quiet .

common/tsconfig.json

@@ -11,12 +11,13 @@
   "license": "ISC",
   "devDependencies": {
     "@biomejs/biome": "^1.9.1",
-    "typescript": "^5.6.2"
-  },
-  "dependencies": {
     "@types/bun": "^1.1.10",
     "cspell": "^8.14.4",
+    "typescript": "^5.6.2",
+    "lefthook": "^1.8.2"
+  },
+  "dependencies": {
     "zod": "^3.23.8"
   },
-  "trustedDependencies": ["@biomejs/biome"]
+  "trustedDependencies": ["@biomejs/biome", "lefthook"]
 }