fix workflows & little fixes (#15)

* trying to trigger yml

* trying to add bun

* wip

* wip

* wip

* fixes

* wip

* wip

* wip

* wip

Author: scffs

.github/workflows/build-api.yml

@@ -1,24 +1,31 @@
 name: Build API
 
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+on: 
+  push: 
+    branches: [ "master" ]
+  pull_request: 
+    branches: [ "master" ]
 
-jobs:
-  build-api:
+jobs: 
+  build-api: 
     runs-on: ubuntu-latest
-    needs: linting
-    steps:
+    steps: 
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with: 
+          bun-version: 1.0.11 # or "latest", "canary", <sha>
+
       - name: Install dependencies
         run: bun i
 
+      - name: Install dependencies in API
+        run: |
+          cd apps/api
+          bun i
+
       - name: API build
         run: bun run build:api
 

.github/workflows/build-shared.yml

@@ -2,20 +2,22 @@ name: Build Shared
 
 on:
   push:
-    branches:
-      - main
+    branches: [ "master" ]
   pull_request:
-    branches:
-      - main
+    branches: [ "master" ]
 
 jobs:
   build-shared:
     runs-on: ubuntu-latest
-    needs: linting
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: 1.0.11 # or "latest", "canary", <sha>
+
       - name: Install dependencies
         run: bun i
 

.github/workflows/build-web.yml

@@ -2,20 +2,22 @@ name: Build Web
 
 on:
   push:
-    branches:
-      - main
+    branches: [ "master" ]
   pull_request:
-    branches:
-      - main
+    branches: [ "master" ]
 
 jobs:
   build-web:
     runs-on: ubuntu-latest
-    needs: linting
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: 1.0.11 # or "latest", "canary", <sha>
+
       - name: Install dependencies
         run: bun i
 

.github/workflows/lint.yml

@@ -2,11 +2,9 @@ name: Linting
 
 on:
   push:
-    branches:
-      - main
+    branches: [ "master" ]
   pull_request:
-    branches:
-      - main
+    branches: [ "master" ]
 
 jobs:
   linting:
@@ -15,6 +13,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: 1.0.11 # or "latest", "canary", <sha>
+
       - name: Install dependencies
         run: bun i
 

apps/api/package.json

@@ -6,6 +6,8 @@
     "dev": "bun run --watch src/index.ts",
     "db:start": "docker-compose up -d",
     "migrate": "npx prisma migrate dev && npx prisma generate",
+    "lint": "biome lint . --apply",
+    "format": "biome format . --write",
     "build": "bun build ./src/index.ts --outdir dist --minify --target bun --splitting",
     "build:types": "tsc --noEmit"
   },
@@ -16,7 +18,8 @@
   },
   "devDependencies": {
     "bun-types": "latest",
-    "prisma": "^5.6.0"
+    "prisma": "^5.6.0",
+    "shared": "workspace:*"
   },
   "repository": {
     "type": "git",

apps/api/src/handlers/userHandler.ts

@@ -1,6 +1,6 @@
-import { User } from '@prisma/client'
 import { getAllUsers, getUserById } from '../services/userService'
 import { ApiResponse, ContextWith } from '../types'
+import { User } from 'shared'
 
 type Params = { id: string }
 

apps/api/src/index.ts

@@ -1,11 +1,8 @@
+import { handleErrors } from '@utils'
 import Elysia from 'elysia'
 import users from './routes/user/userRoutes'
-import { handleErrors } from '@utils'
 
-const app = new Elysia()
-	.use(users)
-	.listen(3000)
-	.onError(handleErrors)
+const app = new Elysia().use(users).listen(3000).onError(handleErrors)
 
 console.log(
 	`🦊 Elysia is running at http://${app.server?.hostname}:${app.server?.port}`

apps/api/src/services/userService.ts

@@ -1,14 +1,15 @@
-import { PrismaClient, User as PrismaUser } from '@prisma/client'
+import { PrismaClient } from 'prisma/prisma-client/scripts/default-index'
+import { User } from 'shared'
 
 const db = new PrismaClient()
 
-export const getAllUsers = async (): Promise<PrismaUser[]> => {
+export const getAllUsers = async (): Promise<User[]> => {
 	return db.user.findMany()
 }
 
 export const getUserById = async (
 	userId: number
-): Promise<PrismaUser | null> => {
+): Promise<User | null> => {
 	return db.user.findUnique({
 		where: {
 			id: userId

apps/shared/package.json

@@ -5,6 +5,8 @@
   "main": "index.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "biome lint . --apply",
+    "format": "biome format . --write",
     "build": "tsc --noEmit"
   },
   "repository": {

apps/web/package.json

@@ -6,6 +6,8 @@
   "scripts": {
     "dev": "bunx --bun vite",
     "build": "tsc && vite build",
+    "lint": "biome lint . --apply",
+    "format": "biome format . --write",
     "preview": "vite preview"
   },
   "dependencies": {

apps/web/src/main.tsx

@@ -15,4 +15,5 @@ const AppProvider = () => {
 	)
 }
 
+// biome-ignore lint: It's OK
 render(<AppProvider />, document.getElementById('app')!)

apps/web/vite.config.ts

@@ -12,21 +12,21 @@ export default defineConfig({
 		terserOptions: {
 			compress: {
 				drop_console: true,
-				dead_code: true,
+				dead_code: true
 			},
 			toplevel: true,
 			keep_classnames: false,
 			keep_fnames: false,
-			safari10: false,
+			safari10: false
 		},
 		rollupOptions: {
 			logLevel: 'debug',
 			output: {
 				manualChunks: {
-					'@vkontakte/icons': ['@vkontakte/icons'],
-				},
-			},
-		},
+					'@vkontakte/icons': ['@vkontakte/icons']
+				}
+			}
+		}
 	},
 	// @ts-ignore unknown
 	plugins: [preact()],
@@ -36,8 +36,8 @@ export default defineConfig({
 			{ find: '@utils', replacement: path.resolve(__dirname, 'src/utils') },
 			{
 				find: '@components',
-				replacement: path.resolve(__dirname, 'src/components'),
-			},
-		],
-	},
+				replacement: path.resolve(__dirname, 'src/components')
+			}
+		]
+	}
 })

bun.lockb

@@ -8,9 +8,9 @@
     "prepare": "husky install && bun format",
     "dev:api": "cd apps/api && bun dev",
     "dev:startDB": "cd apps/api && db:start",
-    "lint": "biome lint .",
+    "lint": "biome lint . --apply",
     "format": "biome format . --write",
-    "checkAll": "biome check .",
+    "checkAll": "biome check . --apply",
     "build:web": "cd apps/web && bun run build",
     "build:api": "cd apps/api && bun run build",
     "build:api:types": "cd apps/api && bun run build:types",