diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a45b595..36fbceb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: run: pnpm install - name: Run build - run: pnpm run build + run: pnpm build test: name: Run Tests diff --git a/apps/api/package.json b/apps/api/package.json index 6d3a874..a0b6c16 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -11,6 +11,8 @@ "dev": "nest start --watch", "start:debug": "nest start --debug --watch", "start:prod": "node dist/main", + "typecheck": "tsc --noEmit", + "clean": "rm -rf dist", "db:create": "mikro-orm database:create && pnpm db:migration:up", "db:sync": "mikro-orm schema:update --run", "db:fresh": "mikro-orm schema:fresh --seed --run --config=./src/config/mikro-orm.config.ts", diff --git a/apps/web/package.json b/apps/web/package.json index 82629bd..cb36f09 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -6,7 +6,9 @@ "scripts": { "dev": "vite", "build": "tsc && vite build", - "preview": "vite preview" + "preview": "vite preview", + "typecheck": "tsc --noEmit", + "clean": "rm -rf dist node_modules/.vite" }, "dependencies": { "@dnd-kit/core": "^6.3.1", diff --git a/package.json b/package.json index 07a75e7..c40d5e0 100644 --- a/package.json +++ b/package.json @@ -2,29 +2,25 @@ "name": "dropit", "private": true, "scripts": { - "build": "dotenv -e .env -- turbo build", - "dev": "dotenv -e .env -- turbo dev", - "typecheck": "dotenv -e .env -- turbo typecheck", + "build": "pnpm --recursive --filter '{packages/*}' build && pnpm --filter api build && pnpm --filter web build", + "dev": "pnpm --parallel --filter '{apps/*}' dev", + "typecheck": "pnpm --recursive --filter '{apps/*}' typecheck", "lint": "biome lint .", "lint:fix": "biome lint --fix .", "format": "biome format .", - "clean": "turbo clean && rm -rf node_modules", - "with-env": "dotenv -e .env --", + "clean": "pnpm --recursive --filter '{apps/*}' clean && rm -rf node_modules", "test:api:unit": "dotenv -e .env -- pnpm --filter api test:unit", "test:api:integration": "dotenv -e .env -- pnpm --filter api test:integration:docker", - "db:seed": "dotenv -e .env -- turbo db:seed", - "db:fresh": "dotenv -e .env -- turbo db:fresh" + "db:seed": "pnpm --filter api db:seed", + "db:fresh": "pnpm --filter api db:fresh" }, "devDependencies": { "@biomejs/biome": "1.5.3", - "turbo": "^2.3.3", + "dotenv-cli": "^10.0.0", "typescript": "^5.3.3" }, "packageManager": "pnpm@8.15.4", "engines": { "node": ">=20.0.0" - }, - "dependencies": { - "dotenv-cli": "^8.0.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3da86fd..e680da8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,17 +7,13 @@ settings: importers: .: - dependencies: - dotenv-cli: - specifier: ^8.0.0 - version: 8.0.0 devDependencies: '@biomejs/biome': specifier: 1.5.3 version: 1.5.3 - turbo: - specifier: ^2.3.3 - version: 2.5.0 + dotenv-cli: + specifier: ^10.0.0 + version: 10.0.0 typescript: specifier: ^5.3.3 version: 5.8.3 @@ -5084,21 +5080,28 @@ packages: esutils: 2.0.3 dev: false - /dotenv-cli@8.0.0: - resolution: {integrity: sha512-aLqYbK7xKOiTMIRf1lDPbI+Y+Ip/wo5k3eyp6ePysVaSqbyxjyK3dK35BTxG+rmd7djf5q2UPs4noPNH+cj0Qw==} + /dotenv-cli@10.0.0: + resolution: {integrity: sha512-lnOnttzfrzkRx2echxJHQRB6vOAMSCzzZg79IxpC00tU42wZPuZkQxNNrrwVAxaQZIIh001l4PxVlCrBxngBzA==} hasBin: true dependencies: cross-spawn: 7.0.6 - dotenv: 16.5.0 - dotenv-expand: 10.0.0 + dotenv: 17.2.1 + dotenv-expand: 11.0.7 minimist: 1.2.8 - dev: false + dev: true /dotenv-expand@10.0.0: resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==} engines: {node: '>=12'} dev: false + /dotenv-expand@11.0.7: + resolution: {integrity: sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==} + engines: {node: '>=12'} + dependencies: + dotenv: 16.5.0 + dev: true + /dotenv@16.4.5: resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==} engines: {node: '>=12'} @@ -5112,7 +5115,11 @@ packages: /dotenv@16.5.0: resolution: {integrity: sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==} engines: {node: '>=12'} - dev: false + + /dotenv@17.2.1: + resolution: {integrity: sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==} + engines: {node: '>=12'} + dev: true /dset@3.1.4: resolution: {integrity: sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==} @@ -8895,66 +8902,6 @@ packages: safe-buffer: 5.2.1 dev: false - /turbo-darwin-64@2.5.0: - resolution: {integrity: sha512-fP1hhI9zY8hv0idym3hAaXdPi80TLovmGmgZFocVAykFtOxF+GlfIgM/l4iLAV9ObIO4SUXPVWHeBZQQ+Hpjag==} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /turbo-darwin-arm64@2.5.0: - resolution: {integrity: sha512-p9sYq7kXH7qeJwIQE86cOWv/xNqvow846l6c/qWc26Ib1ci5W7V0sI5thsrP3eH+VA0d+SHalTKg5SQXgNQBWA==} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /turbo-linux-64@2.5.0: - resolution: {integrity: sha512-1iEln2GWiF3iPPPS1HQJT6ZCFXynJPd89gs9SkggH2EJsj3eRUSVMmMC8y6d7bBbhBFsiGGazwFIYrI12zs6uQ==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /turbo-linux-arm64@2.5.0: - resolution: {integrity: sha512-bKBcbvuQHmsX116KcxHJuAcppiiBOfivOObh2O5aXNER6mce7YDDQJy00xQQNp1DhEfcSV2uOsvb3O3nN2cbcA==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /turbo-windows-64@2.5.0: - resolution: {integrity: sha512-9BCo8oQ7BO7J0K913Czbc3tw8QwLqn2nTe4E47k6aVYkM12ASTScweXPTuaPFP5iYXAT6z5Dsniw704Ixa5eGg==} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /turbo-windows-arm64@2.5.0: - resolution: {integrity: sha512-OUHCV+ueXa3UzfZ4co/ueIHgeq9B2K48pZwIxKSm5VaLVuv8M13MhM7unukW09g++dpdrrE1w4IOVgxKZ0/exg==} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /turbo@2.5.0: - resolution: {integrity: sha512-PvSRruOsitjy6qdqwIIyolv99+fEn57gP6gn4zhsHTEcCYgXPhv6BAxzAjleS8XKpo+Y582vTTA9nuqYDmbRuA==} - hasBin: true - optionalDependencies: - turbo-darwin-64: 2.5.0 - turbo-darwin-arm64: 2.5.0 - turbo-linux-64: 2.5.0 - turbo-linux-arm64: 2.5.0 - turbo-windows-64: 2.5.0 - turbo-windows-arm64: 2.5.0 - dev: true - /tweetnacl@0.14.5: resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==} dev: false diff --git a/turbo.json b/turbo.json deleted file mode 100644 index 292bfc2..0000000 --- a/turbo.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "https://turbo.build/schema.json", - "globalDependencies": ["**/.env.*local"], - "globalEnv": [ - "NODE_ENV", - "API_PORT", - "DB_PASSWORD", - "DB_USER", - "DB_NAME", - "DB_HOST", - "DB_PORT", - "DB_USER_TEST", - "DB_PASSWORD_TEST", - "DB_NAME_TEST", - "DB_PORT_TEST", - "DB_HOST_TEST", - "BETTER_AUTH_SECRET", - "TRUSTED_ORIGINS", - "VITE_API_URL" - ], - "tasks": { - "build": { - "dependsOn": ["^build"], - "outputs": ["dist/**"] - }, - "lint": { - "dependsOn": ["^lint"] - }, - "lint:fix": { - "outputs": [] - }, - "format": { - "outputs": [] - }, - "dev": { - "persistent": true, - "dependsOn": ["build"], - "cache": false - }, - "db:seed": { - "cache": false - }, - "db:fresh": { - "cache": false - }, - "clean": { - "cache": false - } - } -}