Merge pull request #457 from sparcs-kaist/feat/update-monorepo-build

Improve monorepo builds

.commitlintrc.json

@@ -1,6 +1,6 @@
 {
   "extends": ["@commitlint/config-conventional"],
   "rules": {
-    "header-max-length": [2, "always", 60]
+    "header-max-length": [2, "always", 72]
   }
 }

.eslintrc

@@ -118,7 +118,7 @@
     },
     "import/resolver": {
       "typescript": {
-        "project": ["./tsconfig.json"]
+        "project": ["./packages/*/tsconfig.json", "./tsconfig.json"]
       }
     },
     "react": {

package.json

@@ -10,14 +10,15 @@
     "web": "pnpm -F @biseo/web",
     "api": "dotenv -- pnpm -F @biseo/api",
     "interface": "pnpm -F @biseo/interface",
-    "dev": "dotenv -- pnpm -r --stream dev",
+    "dev": "dotenv -- pnpm -r --stream --parallel dev",
     "db": "dotenv -- pnpm -F @biseo/api db",
     "migrate": "dotenv -- pnpm -F @biseo/api migrate",
     "typegen": "pnpm -F @biseo/api typegen",
     "studio": "dotenv -- pnpm -F @biseo/api studio",
     "typecheck": "pnpm -r typecheck",
     "lint": "pnpm eslint . && pnpm prettier --config ./.prettierrc --check -u .",
-    "build": "pnpm -r build"
+    "build": "pnpm -r build",
+    "clean": "pnpm -r clean"
   },
   "lint-staged": {
     "*.{ts,tsx}": [

packages/api/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@biseo/api",
+  "private": true,
   "version": "2.0.0",
   "main": "src/index.ts",
   "license": "MIT",
@@ -11,8 +12,9 @@
     "typegen": "prisma generate",
     "migrate:dev": "pnpm db up --wait && prisma migrate dev",
     "studio": "pnpm db up --wait && prisma studio",
-    "build": "prisma generate && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json",
-    "env": "echo $NODE_ENV"
+    "build": "prisma generate && tsc && tsc-alias",
+    "env": "echo $NODE_ENV",
+    "clean": "rm -rf dist"
   },
   "files": [
     "dist",
@@ -40,6 +42,6 @@
     "nodemon": "^2.0.20",
     "ts-node": "^10.9.1",
     "tsc-alias": "^1.8.7",
-    "tsconfig-paths": "^4.1.2"
+    "tsconfig-paths": "^4.2.0"
   }
 }

packages/api/src/auth/token.ts

@@ -24,7 +24,7 @@ export const getUserFromToken = async (token: string): Promise<User | null> => {
   try {
     const { username, iat } = decoded.parse(jwt.verify(token, env.SECRET_KEY));
     if (iat < Math.floor(Date.now() / 1000) - MAX_AGE) return null;
-    return await prisma.user.findUnique({ where: { username } });
+    return prisma.user.findUnique({ where: { username } });
   } catch {
     return null;
   }

packages/api/tsconfig.json

@@ -1,3 +1,12 @@
 {
-  "extends": "../../tsconfig.json"
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist",
+    "baseUrl": "./src",
+    "paths": {
+      "@biseo/api/*": ["./*"]
+      // TODO: change to @/*
+    }
+  },
+  "include": ["./src/**/*.ts"]
 }

packages/interface/package.json

@@ -5,15 +5,20 @@
   "main": "dist/index.js",
   "types": "src/index.ts",
   "devDependencies": {
+    "concurrently": "^8.2.2",
+    "tsc-alias": "^1.8.7",
     "zod": "^3.21.4"
   },
   "files": [
     "dist",
     "src"
   ],
   "scripts": {
-    "typecheck": "tsc --noEmit",
-    "build": "tsc -p tsconfig.build.json"
+    "prepare": "pnpm build",
+    "dev": "tsc && (concurrently \"tsc -w\" \"tsc-alias -w\")",
+    "typecheck": "tsc",
+    "build": "tsc && tsc-alias",
+    "clean": "rm -rf dist"
   },
   "exports": {
     ".": "./dist/index.js",

packages/interface/src/admin/agenda/client.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-redeclare -- A Zod schema name and type should have the same names */
 import { z } from "zod";
-import { AgendaStatus } from "@biseo/interface/agenda";
+import { AgendaStatus } from "@/agenda";
 import { AdminAgenda, AdminAgendaCreate, AdminAgendaUpdate } from "./common";
 
 /**

packages/interface/src/admin/agenda/common.ts

@@ -1,11 +1,7 @@
 /* eslint-disable @typescript-eslint/no-redeclare -- A Zod schema name and type should have the same names */
 import { z } from "zod";
-import {
-  AgendaBase,
-  AgendaStatus,
-  ChoiceWithResult,
-} from "@biseo/interface/agenda";
-import { User } from "@biseo/interface/user";
+import { AgendaBase, AgendaStatus, ChoiceWithResult } from "@/agenda";
+import { User } from "@/user";
 
 /**
  * AdminAgendaStatus

packages/interface/src/admin/agenda/server.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-redeclare -- A Zod schema name and type should have the same names */
 import { z } from "zod";
-import { User } from "@biseo/interface/user";
-import { AgendaStatus, ChoiceWithResult } from "@biseo/interface/agenda";
+import { User } from "@/user";
+import { AgendaStatus, ChoiceWithResult } from "@/agenda";
 import { AdminAgenda } from "./common";
 
 /**

packages/interface/src/admin/user/common.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-redeclare -- A Zod schema name and type should have the same names */
 import { z } from "zod";
-import { User } from "@biseo/interface/user";
+import { User } from "@/user";
 
 /**
  * AdminUser

packages/interface/src/chat/common.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-redeclare -- A Zod schema name and type should have the same names */
 import { z } from "zod";
-import { ChatUser } from "@biseo/interface/user";
+import { ChatUser } from "@/user";
 
 /**
  * Message

packages/interface/tsconfig.json

@@ -1,3 +1,13 @@
 {
-  "extends": "../../tsconfig.json"
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist",
+    "declaration": true,
+    "declarationMap": true,
+    "baseUrl": "./src",
+    "paths": {
+      "@/*": ["./*"]
+    }
+  },
+  "include": ["./src/**/*.ts"]
 }

packages/web/package.json

@@ -9,7 +9,8 @@
     "build": "tsc && vite build",
     "typecheck": "tsc --noEmit",
     "preview": "vite preview",
-    "env": "echo $NODE_ENV"
+    "env": "echo $NODE_ENV",
+    "clean": "rm -rf dist"
   },
   "dependencies": {
     "@emotion/react": "^11.11.1",
@@ -27,12 +28,12 @@
     "zustand": "^4.3.2"
   },
   "devDependencies": {
-    "@biseo/interface": "*",
+    "@biseo/interface": "workspace:*",
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.9",
-    "@vitejs/plugin-react": "^3.0.0",
+    "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.13",
-    "vite": "^4.0.0",
-    "vite-plugin-svgr": "^3.2.0"
+    "vite": "^5.0.0",
+    "vite-plugin-svgr": "^4.2.0"
   }
 }

packages/web/src/assets/index.ts

@@ -1,10 +1,10 @@
-export { ReactComponent as CloseIcon } from "./close.svg";
-export { ReactComponent as CloseSmallIcon } from "./closeSmall.svg";
-export { ReactComponent as EmoticonIcon } from "./emoticon.svg";
-export { ReactComponent as LogoIcon } from "./logo.svg";
-export { ReactComponent as LogoLargeIcon } from "./logoLarge.svg";
-export { ReactComponent as SelectIcon } from "./select.svg";
-export { ReactComponent as SendIcon } from "./send.svg";
-export { ReactComponent as PlusIcon } from "./plus.svg";
-export { ReactComponent as DownArrowIcon } from "./downarrow.svg";
-export { ReactComponent as TrashIcon } from "./trash.svg";
+export { default as CloseIcon } from "./close.svg?react";
+export { default as CloseSmallIcon } from "./closeSmall.svg?react";
+export { default as EmoticonIcon } from "./emoticon.svg?react";
+export { default as LogoIcon } from "./logo.svg?react";
+export { default as LogoLargeIcon } from "./logoLarge.svg?react";
+export { default as SelectIcon } from "./select.svg?react";
+export { default as SendIcon } from "./send.svg?react";
+export { default as PlusIcon } from "./plus.svg?react";
+export { default as DownArrowIcon } from "./downarrow.svg?react";
+export { default as TrashIcon } from "./trash.svg?react";

packages/web/src/vite-plugin-svgr.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite-plugin-svgr/client" />

packages/web/tsconfig.json

@@ -2,16 +2,20 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "module": "ESNext",
-    "moduleResolution": "Node",
-    "target": "ESNext",
+    "moduleResolution": "Bundler",
     "useDefineForClassFields": true,
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "esModuleInterop": false,
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
     "jsxImportSource": "@emotion/react",
-    "types": ["vite-plugin-svgr/client"]
+    "types": ["vite-plugin-svgr/client"],
+    "baseUrl": "./src",
+    "paths": {
+      "@biseo/web/*": ["./*"]
+      // TODO: change to @/*
+    }
   },
   "include": ["src", "vite.config.ts"],
   "references": [

packages/web/tsconfig.node.json

@@ -1,8 +1,6 @@
 {
   "compilerOptions": {
     "composite": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
     "allowSyntheticDefaultImports": true
   },
   "include": ["vite.config.ts"]