diff --git a/.env.example b/.env.example index e82b6a7..9fb1c6c 100644 --- a/.env.example +++ b/.env.example @@ -11,7 +11,6 @@ MINIO_BUCKET_NAME=your-bucket-name MINIO_ENDPOINT=your-endpoint MINIO_SECRET_KEY=your-secret-key MINIO_USE_SSL=true -MINIO_PORT=9000 NODE_ENV=production TOKEN_SECRET=your-secret-key diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 9e88b7f..e349a4d 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -1,21 +1,12 @@ -name: Lint and Check Types +name: CI on: [push] jobs: - validations: - name: Validations + test: runs-on: docker steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup Node - uses: actions/setup-node@v4 - with: - node-version: 22 - - name: Install - run: npm install - - name: Prisma Generate - run: npm run prisma:generate - - name: Lint - run: npm run lint - - name: Check Types - run: npm run check-types + - name: Status + run: git status + - name: Host + run: cat /etc/hosts \ No newline at end of file diff --git a/apps/api/.gitignore b/apps/api/.gitignore index 2b6bbfa..52962c2 100644 --- a/apps/api/.gitignore +++ b/apps/api/.gitignore @@ -56,6 +56,3 @@ profile-* profile* *clinic* *flamegraph* - -# prisma -prisma/client diff --git a/apps/api/eslint.config.mjs b/apps/api/eslint.config.js similarity index 100% rename from apps/api/eslint.config.mjs rename to apps/api/eslint.config.js diff --git a/apps/api/package.json b/apps/api/package.json index e2aa519..5a4a009 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -7,8 +7,6 @@ "test": "test" }, "scripts": { - "lint": "eslint . --max-warnings 0", - "check-types": "tsc --noEmit", "test": "ts-node --test test/**/*.test.ts", "start": "node dist/index.js", "dev": "nodemon --delay 2000ms src/index.ts", diff --git a/apps/api/prisma/schema.prisma b/apps/api/prisma/schema.prisma index 23f0c55..112080e 100644 --- a/apps/api/prisma/schema.prisma +++ b/apps/api/prisma/schema.prisma @@ -6,7 +6,6 @@ generator client { provider = "prisma-client-js" - output = "./client" } datasource db { diff --git a/apps/api/src/config.ts b/apps/api/src/config.ts index c47cfa4..d0ea62d 100644 --- a/apps/api/src/config.ts +++ b/apps/api/src/config.ts @@ -3,7 +3,7 @@ import dotenv from 'dotenv'; import path from 'path'; const rootDir = path.resolve(process.cwd(), '../../'); -dotenv.config({ path: `${rootDir}/.env` }); +dotenv.config({ path: `${rootDir}/.env.local` }); const schema = z .object({ diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts index 4e9f955..389a42d 100644 --- a/apps/api/src/index.ts +++ b/apps/api/src/index.ts @@ -4,7 +4,7 @@ import fastifyCookie from '@fastify/cookie'; import fastifyCors from '@fastify/cors'; import mercurius from 'mercurius'; import mercuriusCodegen from 'mercurius-codegen'; -import { PrismaClient } from '../prisma/client'; +import { PrismaClient } from '@prisma/client'; import config from './config'; import { resolvers } from './resolvers'; import schema from './schema'; diff --git a/apps/api/src/services/minio.service.ts b/apps/api/src/services/minio.service.ts index 925c88f..9037852 100644 --- a/apps/api/src/services/minio.service.ts +++ b/apps/api/src/services/minio.service.ts @@ -91,7 +91,7 @@ export class MinioService { try { await this.client.statObject(this.bucketName, objectName); return true; - } catch (_error) { + } catch (error) { return false; } } diff --git a/apps/api/src/services/token.service.ts b/apps/api/src/services/token.service.ts index c338967..411dfc2 100644 --- a/apps/api/src/services/token.service.ts +++ b/apps/api/src/services/token.service.ts @@ -2,7 +2,7 @@ import jwt from 'jsonwebtoken'; import { v4 as uuidv4 } from 'uuid'; import crypto from 'crypto'; import { TokenConfig } from '../config'; -import { PrismaClient } from '../../prisma/client'; +import { PrismaClient } from '@prisma/client'; import { MemcService } from './memc.service'; type TransactionClient = Omit< @@ -90,7 +90,7 @@ export class TokenService { ); const tx = txn - ? (callback: (tx: TransactionClient) => Promise) => callback(txn) + ? (callback: Function) => callback(txn) : this.prisma.$transaction.bind(this.prisma); await tx(async (tx) => { diff --git a/apps/api/src/types.ts b/apps/api/src/types.ts index d3864fe..b007799 100644 --- a/apps/api/src/types.ts +++ b/apps/api/src/types.ts @@ -1,4 +1,4 @@ -import type { PrismaClient } from '../prisma/client'; +import { PrismaClient } from '@prisma/client'; import { MinioService, TokenService, diff --git a/apps/api/src/utils/middlewares.ts b/apps/api/src/utils/middlewares.ts index bd95a9f..1cfa3b3 100644 --- a/apps/api/src/utils/middlewares.ts +++ b/apps/api/src/utils/middlewares.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-unsafe-function-type */ import { MercuriusContext } from 'mercurius'; const isCallback = ( diff --git a/apps/web/eslint.config.mjs b/apps/web/eslint.config.js similarity index 100% rename from apps/web/eslint.config.mjs rename to apps/web/eslint.config.js diff --git a/apps/web/package.json b/apps/web/package.json index eca838f..3848aba 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -2,9 +2,8 @@ "name": "web", "private": true, "version": "0.0.0", + "type": "module", "scripts": { - "lint": "eslint . --max-warnings 0", - "check-types": "tsc --noEmit", "dev": "vite", "build": "tsc -b && vite build", "preview": "vite preview" diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx index e7ccc31..40323d6 100644 --- a/apps/web/src/App.tsx +++ b/apps/web/src/App.tsx @@ -27,8 +27,8 @@ function App() { // Check if user is already authenticated const checkAuth = () => { - const token = window.localStorage.getItem('token'); - const storedUserId = window.localStorage.getItem('userId'); + const token = localStorage.getItem('token'); + const storedUserId = localStorage.getItem('userId'); if (token && storedUserId) { setIsAuthenticated(true); @@ -52,8 +52,8 @@ function App() { } catch (error) { console.error('Logout failed:', error); } finally { - window.localStorage.removeItem('token'); - window.localStorage.removeItem('userId'); + localStorage.removeItem('token'); + localStorage.removeItem('userId'); setIsAuthenticated(false); setUserId(''); setSelectedRoomId(null); diff --git a/apps/web/src/components/chat-room.tsx b/apps/web/src/components/chat-room.tsx index a296f2e..d717d32 100644 --- a/apps/web/src/components/chat-room.tsx +++ b/apps/web/src/components/chat-room.tsx @@ -75,7 +75,10 @@ interface ChatRoomProps { } export function ChatRoom(props: ChatRoomProps) { - const [variables, setVariables] = createSignal({}); + const [variables, setVariables] = createSignal({ + id: props.roomId, + roomId: props.roomId, + }); const [message, setMessage] = createSignal(''); const [messages, setMessages] = createSignal([]); const [confirmLeave, setConfirmLeave] = createSignal(false); @@ -237,9 +240,9 @@ export function ChatRoom(props: ChatRoomProps) { } }; - window.document.addEventListener('mousedown', handleClickOutside); + document.addEventListener('mousedown', handleClickOutside); return () => { - window.document.removeEventListener('mousedown', handleClickOutside); + document.removeEventListener('mousedown', handleClickOutside); }; }); @@ -342,8 +345,8 @@ export function ChatRoom(props: ChatRoomProps) { {showEmojiPicker() && (
- {/* @ts-expect-error - emoji-picker-element is not typed */} - setPickerRef(el)} /> + {/* @ts-ignore */} + setPickerRef(el)}>
)} diff --git a/apps/web/src/components/login-form.tsx b/apps/web/src/components/login-form.tsx index 2ebe95d..3cd7c91 100644 --- a/apps/web/src/components/login-form.tsx +++ b/apps/web/src/components/login-form.tsx @@ -48,8 +48,8 @@ export function LoginForm(props: LoginFormProps) { if (result.data?.login) { const { accessToken, user } = result.data.login; - window.localStorage.setItem('token', accessToken); - window.localStorage.setItem('userId', user.id); + localStorage.setItem('token', accessToken); + localStorage.setItem('userId', user.id); props.onLoginSuccess(accessToken, user.id); } else { setError('Login failed: No data received from server'); diff --git a/apps/web/src/components/register-form.tsx b/apps/web/src/components/register-form.tsx index d36283a..5352a5a 100644 --- a/apps/web/src/components/register-form.tsx +++ b/apps/web/src/components/register-form.tsx @@ -56,8 +56,8 @@ export function RegisterForm(props: RegisterFormProps) { if (result.data?.register) { const { accessToken, user } = result.data.register; - window.localStorage.setItem('token', accessToken); - window.localStorage.setItem('userId', user.id); + localStorage.setItem('token', accessToken); + localStorage.setItem('userId', user.id); props.onRegisterSuccess(accessToken, user.id); } else { setError('Registration failed: No data received from server'); diff --git a/apps/web/src/components/room-list.tsx b/apps/web/src/components/room-list.tsx index 0654658..20b6236 100644 --- a/apps/web/src/components/room-list.tsx +++ b/apps/web/src/components/room-list.tsx @@ -172,7 +172,7 @@ export function RoomList(props: RoomListProps) { // Check if the current user is a member of a room const isMember = (room: Room) => { - const userId = window.localStorage.getItem('userId'); + const userId = localStorage.getItem('userId'); return room.members?.some((member) => member.id === userId); }; diff --git a/apps/web/src/lib/graphql-client.ts b/apps/web/src/lib/graphql-client.ts index 3791c8b..36fb596 100644 --- a/apps/web/src/lib/graphql-client.ts +++ b/apps/web/src/lib/graphql-client.ts @@ -37,7 +37,7 @@ export const client = createClient({ ], // For development, we'll add a simple header-based authentication fetchOptions: () => { - const token = window.localStorage.getItem('token'); + const token = localStorage.getItem('token'); return { credentials: 'include', headers: { diff --git a/package-lock.json b/package-lock.json index 54a921b..10acf2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -158,25 +158,19 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", - "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.27.1", + "@babel/helper-validator-identifier": "^7.25.9", "js-tokens": "^4.0.0", - "picocolors": "^1.1.1" + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/code-frame/node_modules/picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "license": "ISC" - }, "node_modules/@babel/compat-data": { "version": "7.26.8", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", @@ -413,18 +407,18 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", - "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -440,25 +434,25 @@ } }, "node_modules/@babel/helpers": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.1.tgz", - "integrity": "sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz", + "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==", "license": "MIT", "dependencies": { - "@babel/template": "^7.27.1", - "@babel/types": "^7.27.1" + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.27.2", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz", - "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz", + "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==", "license": "MIT", "dependencies": { - "@babel/types": "^7.27.1" + "@babel/types": "^7.26.9" }, "bin": { "parser": "bin/babel-parser.js" @@ -885,36 +879,40 @@ } }, "node_modules/@babel/runtime": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz", - "integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.9.tgz", + "integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==", "license": "MIT", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/runtime-corejs3": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.27.1.tgz", - "integrity": "sha512-909rVuj3phpjW6y0MCXAZ5iNeORePa6ldJvp2baWGcTjwqbBDDz6xoS5JHJ7lS88NlwLYj07ImL/8IUMtDZzTA==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.26.9.tgz", + "integrity": "sha512-5EVjbTegqN7RSJle6hMWYxO4voo4rI+9krITk+DWR+diJgGrjZjrIBnJhjrHYYQsFgI7j1w1QnrvV7YSKBfYGg==", "dev": true, "license": "MIT", "dependencies": { - "core-js-pure": "^3.30.2" + "core-js-pure": "^3.30.2", + "regenerator-runtime": "^0.14.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/template": { - "version": "7.27.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", - "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", + "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.27.1", - "@babel/parser": "^7.27.2", - "@babel/types": "^7.27.1" + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9" }, "engines": { "node": ">=6.9.0" @@ -948,13 +946,13 @@ } }, "node_modules/@babel/types": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz", - "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz", + "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==", "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.27.1" + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -5233,9 +5231,9 @@ } }, "node_modules/fastify": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/fastify/-/fastify-5.3.2.tgz", - "integrity": "sha512-AIPqBgtqBAwkOkrnwesEE+dOyU30dQ4kh7udxeGVR05CRGwubZx+p2H8P0C4cRnQT0+EPK4VGea2DTL2RtWttg==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/fastify/-/fastify-5.2.1.tgz", + "integrity": "sha512-rslrNBF67eg8/Gyn7P2URV8/6pz8kSAscFL4EThZJ8JBMaXacVdVE4hmUcnPNKERl5o/xTiBSLfdowBRhVF1WA==", "funding": [ { "type": "github", @@ -5258,9 +5256,9 @@ "find-my-way": "^9.0.0", "light-my-request": "^6.0.0", "pino": "^9.0.0", - "process-warning": "^5.0.0", + "process-warning": "^4.0.0", "rfdc": "^1.3.1", - "secure-json-parse": "^4.0.0", + "secure-json-parse": "^3.0.1", "semver": "^7.6.0", "toad-cache": "^3.7.0" } @@ -5271,38 +5269,6 @@ "integrity": "sha512-HCxs+YnRaWzCl+cWRYFnHmeRFyR5GVnJTAaCJQiYzQSDwK9MgJdyAsuL3nh0EWRCYMgQ5MeziymvmAhUHYHDUQ==", "license": "MIT" }, - "node_modules/fastify/node_modules/process-warning": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-5.0.0.tgz", - "integrity": "sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fastify" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fastify" - } - ], - "license": "MIT" - }, - "node_modules/fastify/node_modules/secure-json-parse": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-4.0.0.tgz", - "integrity": "sha512-dxtLJO6sc35jWidmLxo7ij+Eg48PM/kleBsxpC8QJE0qJICe+KawkDQmvCMZUr9u7WKVHgMW6vy3fQ7zMiFZMA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fastify" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fastify" - } - ], - "license": "BSD-3-Clause" - }, "node_modules/fastparallel": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/fastparallel/-/fastparallel-2.4.1.tgz", @@ -8204,7 +8170,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", - "dev": true, "license": "ISC" }, "node_modules/picomatch": { @@ -8572,6 +8537,12 @@ "node": ">= 12.13.0" } }, + "node_modules/regenerator-runtime": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", + "license": "MIT" + }, "node_modules/registry-auth-token": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz", @@ -9449,51 +9420,6 @@ "dev": true, "license": "MIT" }, - "node_modules/tinyglobby": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", - "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", - "dev": true, - "license": "MIT", - "dependencies": { - "fdir": "^6.4.4", - "picomatch": "^4.0.2" - }, - "engines": { - "node": ">=12.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/SuperchupuDev" - } - }, - "node_modules/tinyglobby/node_modules/fdir": { - "version": "6.4.4", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", - "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "picomatch": "^3 || ^4" - }, - "peerDependenciesMeta": { - "picomatch": { - "optional": true - } - } - }, - "node_modules/tinyglobby/node_modules/picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/tinygradient": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/tinygradient/-/tinygradient-1.1.5.tgz", @@ -10039,18 +9965,15 @@ } }, "node_modules/vite": { - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz", - "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.1.tgz", + "integrity": "sha512-n2GnqDb6XPhlt9B8olZPrgMD/es/Nd1RdChF6CBD/fHW6pUyUTt2sQW2fPRX5GiD9XEa6+8A6A4f2vT6pSsE7Q==", "dev": true, "license": "MIT", "dependencies": { "esbuild": "^0.25.0", - "fdir": "^6.4.4", - "picomatch": "^4.0.2", "postcss": "^8.5.3", - "rollup": "^4.34.9", - "tinyglobby": "^0.2.13" + "rollup": "^4.30.1" }, "bin": { "vite": "bin/vite.js" @@ -10138,34 +10061,6 @@ } } }, - "node_modules/vite/node_modules/fdir": { - "version": "6.4.4", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", - "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "picomatch": "^3 || ^4" - }, - "peerDependenciesMeta": { - "picomatch": { - "optional": true - } - } - }, - "node_modules/vite/node_modules/picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/vitefu": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.0.6.tgz", diff --git a/package.json b/package.json index 4b59961..8fa7b12 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,7 @@ "start:api": "turbo run start --filter=api", "lint": "turbo run lint", "format": "prettier --write \"**/*.{ts,tsx,md}\"", - "check-types": "turbo run check-types", - "prisma:generate": "turbo run prisma:generate" + "check-types": "turbo run check-types" }, "devDependencies": { "@types/node": "^22.13.9", diff --git a/packages/eslint-config/base.js b/packages/eslint-config/base.js index 7b23abd..80d5b42 100644 --- a/packages/eslint-config/base.js +++ b/packages/eslint-config/base.js @@ -1,4 +1,4 @@ -import eslint from '@eslint/js'; +import js from '@eslint/js'; import turboPlugin from 'eslint-plugin-turbo'; import tseslint from 'typescript-eslint'; @@ -7,30 +7,18 @@ import tseslint from 'typescript-eslint'; * * @type {import("eslint").Linter.Config[]} * */ -export const config = tseslint.config( - eslint.configs.recommended, - tseslint.configs.recommended, - [ - { - plugins: { - turbo: turboPlugin, - }, - rules: { - 'turbo/no-undeclared-env-vars': 'warn', - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-empty-object-type': 'off', - '@typescript-eslint/no-unused-vars': [ - 'error', - { - argsIgnorePattern: '^_', - varsIgnorePattern: '^_', - caughtErrorsIgnorePattern: '^_', - }, - ], - }, +export const config = [ + js.configs.recommended, + ...tseslint.configs.recommended, + { + plugins: { + turbo: turboPlugin, }, - { - ignores: ['dist/**', 'prisma/client/**'], + rules: { + 'turbo/no-undeclared-env-vars': 'warn', }, - ] -); + }, + { + ignores: ['dist/**'], + }, +]; diff --git a/packages/eslint-config/solid.js b/packages/eslint-config/solid.js index 951f157..92c6aaa 100644 --- a/packages/eslint-config/solid.js +++ b/packages/eslint-config/solid.js @@ -1,3 +1,4 @@ +import js from '@eslint/js'; import solid from 'eslint-plugin-solid/configs/typescript'; import * as tsParser from '@typescript-eslint/parser'; import { config as baseConfig } from './base.js'; @@ -8,19 +9,15 @@ import { config as baseConfig } from './base.js'; * @type {import("eslint").Linter.Config[]} */ export const config = [ ...baseConfig, + js.configs.recommended, { files: ['**/*.{ts,tsx}'], ...solid, - ignores: ['turbo/generators/**', 'vite.config.ts'], languageOptions: { parser: tsParser, parserOptions: { project: 'tsconfig.json', }, - globals: { - window: true, - console: true, - }, }, }, ]; diff --git a/packages/ui/package.json b/packages/ui/package.json index de7adbd..ceae1b7 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -5,7 +5,6 @@ "exports": { "./*": "./src/*.tsx" }, - "type": "module", "scripts": { "lint": "eslint . --max-warnings 0", "generate:component": "turbo gen react-component", diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsx index 2a1e82e..8212175 100644 --- a/packages/ui/src/button.tsx +++ b/packages/ui/src/button.tsx @@ -8,13 +8,13 @@ interface ButtonProps { appName: string; } -export const Button = (props: ButtonProps) => { +export const Button = ({ children, className, appName }: ButtonProps) => { return ( ); }; diff --git a/packages/ui/src/card.tsx b/packages/ui/src/card.tsx index 8e92799..19d330d 100644 --- a/packages/ui/src/card.tsx +++ b/packages/ui/src/card.tsx @@ -1,6 +1,11 @@ import { type JSX } from 'solid-js/jsx-runtime'; -export function Card(props: { +export function Card({ + className, + title, + children, + href, +}: { className?: string; title: string; children: JSX.Element; @@ -8,15 +13,15 @@ export function Card(props: { }): JSX.Element { return (

- {props.title} -> + {title} ->

-

{props.children}

+

{children}

); } diff --git a/packages/ui/src/code.tsx b/packages/ui/src/code.tsx index 3d69f1f..9ed9271 100644 --- a/packages/ui/src/code.tsx +++ b/packages/ui/src/code.tsx @@ -1,8 +1,11 @@ import { type JSX } from 'solid-js/jsx-runtime'; -export function Code(props: { +export function Code({ + children, + className, +}: { children: JSX.Element; className?: string; }): JSX.Element { - return {props.children}; + return {children}; } diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json index da3b702..44c6177 100644 --- a/packages/ui/tsconfig.json +++ b/packages/ui/tsconfig.json @@ -3,6 +3,5 @@ "compilerOptions": { "outDir": "dist" }, - "include": ["src"], - "exclude": ["turbo/generators"] + "include": ["src"] } diff --git a/turbo.json b/turbo.json index e8b5eb3..4e97ff0 100644 --- a/turbo.json +++ b/turbo.json @@ -23,7 +23,7 @@ ], "tasks": { "build": { - "dependsOn": ["^build", "^prisma:generate"], + "dependsOn": ["^build"], "inputs": [".env*"], "outputs": ["dist/**"] }, @@ -34,13 +34,9 @@ "dependsOn": ["^check-types"] }, "dev": { - "dependsOn": ["^prisma:generate"], "cache": false, "persistent": true }, - "prisma:generate": { - "cache": false - }, "start": { "cache": false, "persistent": true