diff --git a/.dockerignore b/.dockerignore index 31a09799..1f3d8c31 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,7 +2,6 @@ /app # Build Artifacts -**/.turbo /server/dist /client/.next diff --git a/.gitignore b/.gitignore index e669c132..67c9c63f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,5 @@ node_modules # macOS .DS_Store -# Turbo -.turbo - # Intellij .idea diff --git a/client/Dockerfile b/client/Dockerfile index a8f5686b..46aed108 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache g++ git curl make python3 libc6-compat \ FROM base as dependencies -COPY package.json pnpm-*.yaml turbo.json ./ +COPY package.json pnpm-*.yaml ./ COPY ./schema/package.json ./schema/package.json COPY ./client/package.json ./client/package.json @@ -25,7 +25,7 @@ RUN pnpm run build --filter client FROM base as production -COPY --from=builder /app/package.json /app/pnpm-*.yaml /app/turbo.json ./ +COPY --from=builder /app/package.json /app/pnpm-*.yaml ./ COPY --from=builder /app/client/package.json ./client/package.json RUN pnpm install --filter client --prod --frozen-lockfile --workspace-root diff --git a/client/package.json b/client/package.json index e9a526d5..7ec1648c 100644 --- a/client/package.json +++ b/client/package.json @@ -13,7 +13,7 @@ "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", "@hello-pangea/dnd": "^16.2.0", - "@hookform/resolvers": "3.0.0", + "@hookform/resolvers": "3.0.1", "@monaco-editor/react": "^4.4.6", "@mui/icons-material": "^5.11.16", "@mui/lab": "^5.0.0-alpha.125", @@ -22,7 +22,7 @@ "@mui/x-date-pickers": "6.0.4", "@react-oauth/google": "^0.9.0", "@reduxjs/toolkit": "^1.9.3", - "axios": "^1.3.4", + "axios": "^1.3.5", "clsx": "^1.2.1", "dayjs": "^1.11.7", "downloadjs": "^1.4.7", @@ -71,7 +71,7 @@ "autoprefixer": "^10.4.14", "csstype": "^3.1.2", "eslint-config-next": "^13.2.4", - "eslint-plugin-tailwindcss": "^3.10.3", + "eslint-plugin-tailwindcss": "^3.11.0", "eslint-plugin-unused-imports": "^2.0.0", "next-sitemap": "^4.0.6", "postcss": "^8.4.21", diff --git a/client/public/robots.txt b/client/public/robots.txt index 92e6bb35..3a7e2829 100644 --- a/client/public/robots.txt +++ b/client/public/robots.txt @@ -1,7 +1,6 @@ # * User-agent: * Allow: / -Disallow: /*/* # Host Host: https://rxresu.me diff --git a/package.json b/package.json index 6cdf6946..01be797a 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,13 @@ "version": "3.7.0", "private": true, "scripts": { - "dev": "env-cmd --silent cross-var cross-env VERSION=$npm_package_version turbo run dev", - "build": "env-cmd --silent cross-var cross-env VERSION=$npm_package_version turbo run build", - "start": "env-cmd --silent cross-var cross-env VERSION=$npm_package_version turbo run start", + "dev": "env-cmd --silent cross-var cross-env VERSION=$npm_package_version pnpm run --recursive --parallel --stream dev", + "build": "env-cmd --silent cross-var cross-env VERSION=$npm_package_version pnpm run --recursive --parallel build", + "start": "env-cmd --silent cross-var cross-env VERSION=$npm_package_version pnpm run --recursive --parallel --stream start", "update-deps": "ncu -x nanoid --deep -u && pnpm install", "generate-env": "ts-node ./scripts/generate-env.ts", "format": "prettier --write .", - "lint": "turbo run lint" + "lint": "pnpm run --recursive --parallel lint" }, "workspaces": [ "schema", @@ -29,10 +29,9 @@ "eslint": "^8.37.0", "eslint-plugin-import": "^2.27.5", "eslint-plugin-simple-import-sort": "^10.0.0", - "npm-check-updates": "^16.10.2", + "npm-check-updates": "^16.10.7", "prettier": "^2.8.7", "ts-node": "^10.9.1", - "turbo": "^1.8.8", "typescript": "^5.0.3" }, "resolutions": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c4a11295..10888d6d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,17 +40,14 @@ importers: specifier: ^10.0.0 version: 10.0.0(eslint@8.37.0) npm-check-updates: - specifier: ^16.10.2 - version: 16.10.2 + specifier: ^16.10.7 + version: 16.10.7 prettier: specifier: ^2.8.7 version: 2.8.7 ts-node: specifier: ^10.9.1 version: 10.9.1(@types/node@18.15.11)(typescript@5.0.3) - turbo: - specifier: ^1.8.8 - version: 1.8.8 typescript: specifier: ^5.0.3 version: 5.0.3 @@ -73,8 +70,8 @@ importers: specifier: ^16.2.0 version: 16.2.0(@types/react-dom@17.0.2)(@types/react@17.0.2)(react-dom@18.2.0)(react@18.2.0) '@hookform/resolvers': - specifier: 3.0.0 - version: 3.0.0(react-hook-form@7.43.9) + specifier: 3.0.1 + version: 3.0.1(react-hook-form@7.43.9) '@monaco-editor/react': specifier: ^4.4.6 version: 4.4.6(monaco-editor@0.37.0)(react-dom@18.2.0)(react@18.2.0) @@ -100,8 +97,8 @@ importers: specifier: ^1.9.3 version: 1.9.3(react-redux@8.0.5)(react@18.2.0) axios: - specifier: ^1.3.4 - version: 1.3.4 + specifier: ^1.3.5 + version: 1.3.5 clsx: specifier: ^1.2.1 version: 1.2.1 @@ -242,8 +239,8 @@ importers: specifier: ^13.2.4 version: 13.2.4(eslint@8.37.0)(typescript@5.0.3) eslint-plugin-tailwindcss: - specifier: ^3.10.3 - version: 3.10.3(tailwindcss@3.3.1) + specifier: ^3.11.0 + version: 3.11.0(tailwindcss@3.3.1) eslint-plugin-unused-imports: specifier: ^2.0.0 version: 2.0.0(@typescript-eslint/eslint-plugin@5.57.1)(eslint@8.37.0) @@ -279,40 +276,40 @@ importers: version: 3.306.0 '@nestjs/axios': specifier: ^2.0.0 - version: 2.0.0(@nestjs/common@9.3.12)(axios@1.3.4)(reflect-metadata@0.1.13)(rxjs@7.8.0) + version: 2.0.0(@nestjs/common@9.4.0)(axios@1.3.5)(reflect-metadata@0.1.13)(rxjs@7.8.0) '@nestjs/common': - specifier: ^9.3.12 - version: 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + specifier: ^9.4.0 + version: 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) '@nestjs/config': specifier: ^2.3.1 - version: 2.3.1(@nestjs/common@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0) + version: 2.3.1(@nestjs/common@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) '@nestjs/core': - specifier: ^9.3.12 - version: 9.3.12(@nestjs/common@9.3.12)(@nestjs/platform-express@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0) + specifier: ^9.4.0 + version: 9.4.0(@nestjs/common@9.4.0)(@nestjs/platform-express@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) '@nestjs/jwt': specifier: ^10.0.3 - version: 10.0.3(@nestjs/common@9.3.12) + version: 10.0.3(@nestjs/common@9.4.0) '@nestjs/mapped-types': specifier: ^1.2.2 - version: 1.2.2(@nestjs/common@9.3.12)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13) + version: 1.2.2(@nestjs/common@9.4.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13) '@nestjs/passport': specifier: ^9.0.3 - version: 9.0.3(@nestjs/common@9.3.12)(passport@0.6.0) + version: 9.0.3(@nestjs/common@9.4.0)(passport@0.6.0) '@nestjs/platform-express': - specifier: ^9.3.12 - version: 9.3.12(@nestjs/common@9.3.12)(@nestjs/core@9.3.12) + specifier: ^9.4.0 + version: 9.4.0(@nestjs/common@9.4.0)(@nestjs/core@9.4.0) '@nestjs/schedule': specifier: ^2.2.1 - version: 2.2.1(@nestjs/common@9.3.12)(@nestjs/core@9.3.12)(reflect-metadata@0.1.13) + version: 2.2.1(@nestjs/common@9.4.0)(@nestjs/core@9.4.0)(reflect-metadata@0.1.13) '@nestjs/serve-static': specifier: ^3.0.1 - version: 3.0.1(@nestjs/common@9.3.12)(@nestjs/core@9.3.12) + version: 3.0.1(@nestjs/common@9.4.0)(@nestjs/core@9.4.0) '@nestjs/terminus': specifier: ^9.2.2 - version: 9.2.2(@nestjs/axios@2.0.0)(@nestjs/common@9.3.12)(@nestjs/core@9.3.12)(@nestjs/typeorm@9.0.1)(reflect-metadata@0.1.13)(rxjs@7.8.0)(typeorm@0.3.12) + version: 9.2.2(@nestjs/axios@2.0.0)(@nestjs/common@9.4.0)(@nestjs/core@9.4.0)(@nestjs/typeorm@9.0.1)(reflect-metadata@0.1.13)(rxjs@7.8.0)(typeorm@0.3.13) '@nestjs/typeorm': specifier: ^9.0.1 - version: 9.0.1(@nestjs/common@9.3.12)(@nestjs/core@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0)(typeorm@0.3.12) + version: 9.0.1(@nestjs/common@9.4.0)(@nestjs/core@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0)(typeorm@0.3.13) '@types/passport': specifier: ^1.0.12 version: 1.0.12 @@ -386,8 +383,8 @@ importers: specifier: ^7.8.0 version: 7.8.0 typeorm: - specifier: 0.3.12 - version: 0.3.12(pg@8.10.0)(ts-node@10.9.1) + specifier: 0.3.13 + version: 0.3.13(pg@8.10.0)(ts-node@10.9.1) uuid: specifier: ^9.0.0 version: 9.0.0 @@ -439,7 +436,7 @@ importers: version: 0.5.21 ts-loader: specifier: ^9.4.2 - version: 9.4.2(typescript@5.0.3)(webpack@5.77.0) + version: 9.4.2(typescript@5.0.3)(webpack@5.78.0) ts-node: specifier: ^10.9.1 version: 10.9.1(@types/node@18.15.11)(typescript@5.0.3) @@ -450,8 +447,8 @@ importers: specifier: ^5.0.3 version: 5.0.3 webpack: - specifier: ^5.77.0 - version: 5.77.0 + specifier: ^5.78.0 + version: 5.78.0 packages: @@ -1976,8 +1973,8 @@ packages: - react-native dev: false - /@hookform/resolvers@3.0.0(react-hook-form@7.43.9): - resolution: {integrity: sha512-SQPefakODpyq25b/phHXDKCdRrEfPcCXV7B4nAa139wE1DxufYbbNAjeo0T04ZXBokRxZ+wD8iA1kkVMa3QwjQ==} + /@hookform/resolvers@3.0.1(react-hook-form@7.43.9): + resolution: {integrity: sha512-n5oOt0cLw9mQNW3/k9zWaPsNWQcc0k6Jpc7XUrg2Q/AqqsHp3IVa1juqHCxczXI6uXHBa69ILc4pdtsRGyuzsw==} peerDependencies: react-hook-form: ^7.0.0 dependencies: @@ -2352,7 +2349,7 @@ packages: react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0) dev: false - /@nestjs/axios@2.0.0(@nestjs/common@9.3.12)(axios@1.3.4)(reflect-metadata@0.1.13)(rxjs@7.8.0): + /@nestjs/axios@2.0.0(@nestjs/common@9.4.0)(axios@1.3.5)(reflect-metadata@0.1.13)(rxjs@7.8.0): resolution: {integrity: sha512-F6oceoQLEn031uun8NiommeMkRIojQqVryxQy/mK7fx0CI0KbgkJL3SloCQcsOD+agoEnqKJKXZpEvL6FNswJg==} peerDependencies: '@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0 @@ -2360,8 +2357,8 @@ packages: reflect-metadata: ^0.1.12 rxjs: ^6.0.0 || ^7.0.0 dependencies: - '@nestjs/common': 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) - axios: 1.3.4 + '@nestjs/common': 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + axios: 1.3.5 reflect-metadata: 0.1.13 rxjs: 7.8.0 dev: false @@ -2400,8 +2397,8 @@ packages: - webpack-cli dev: true - /@nestjs/common@9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0): - resolution: {integrity: sha512-NtrUG2VgCbhmZEO1yRt/Utq16uFRV+xeHAOtdYIsfHGG0ssAV2lVLlvFFAQYh0SQ+KuYY1Gsxd3GK2JFoJCNqQ==} + /@nestjs/common@9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0): + resolution: {integrity: sha512-RUcVAQsEF4WPrmzFXEOUfZnPwrLTe1UVlzXTlSyfqfqbdWDPKDGlIPVelBLfc5/+RRUQ0I5iE4+CQvpCmkqldw==} peerDependencies: cache-manager: <=5 class-transformer: '*' @@ -2423,17 +2420,17 @@ packages: reflect-metadata: 0.1.13 rxjs: 7.8.0 tslib: 2.5.0 - uid: 2.0.1 + uid: 2.0.2 dev: false - /@nestjs/config@2.3.1(@nestjs/common@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0): + /@nestjs/config@2.3.1(@nestjs/common@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0): resolution: {integrity: sha512-Ckzel0NZ9CWhNsLfE1hxfDuxJuEbhQvGxSlmZ1/X8awjRmAA/g3kT6M1+MO1SHj1wMtPyUfd9WpwkiqFbiwQgA==} peerDependencies: '@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0 reflect-metadata: ^0.1.13 rxjs: ^6.0.0 || ^7.2.0 dependencies: - '@nestjs/common': 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/common': 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) dotenv: 16.0.3 dotenv-expand: 10.0.0 lodash: 4.17.21 @@ -2442,8 +2439,8 @@ packages: uuid: 9.0.0 dev: false - /@nestjs/core@9.3.12(@nestjs/common@9.3.12)(@nestjs/platform-express@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0): - resolution: {integrity: sha512-Qe0ZjJo7bOlfudn7KHLppYrt5i4k1nR1+9d5ppYat2bb5knCIT4kIqblj666n+22/2zvsHRiTo015cLyLKsLRQ==} + /@nestjs/core@9.4.0(@nestjs/common@9.4.0)(@nestjs/platform-express@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0): + resolution: {integrity: sha512-yTLryCgFD0462wPe4HIzhyTcDgibt8Stfwb5YzcX7Ma0NM4m8uBIpcPG109KBubp8ZmV85e5mw4rl20qLQQVsQ==} requiresBuild: true peerDependencies: '@nestjs/common': ^9.0.0 @@ -2460,8 +2457,8 @@ packages: '@nestjs/websockets': optional: true dependencies: - '@nestjs/common': 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) - '@nestjs/platform-express': 9.3.12(@nestjs/common@9.3.12)(@nestjs/core@9.3.12) + '@nestjs/common': 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/platform-express': 9.4.0(@nestjs/common@9.4.0)(@nestjs/core@9.4.0) '@nuxtjs/opencollective': 0.3.2 fast-safe-stringify: 2.1.1 iterare: 1.2.1 @@ -2469,22 +2466,22 @@ packages: reflect-metadata: 0.1.13 rxjs: 7.8.0 tslib: 2.5.0 - uid: 2.0.1 + uid: 2.0.2 transitivePeerDependencies: - encoding dev: false - /@nestjs/jwt@10.0.3(@nestjs/common@9.3.12): + /@nestjs/jwt@10.0.3(@nestjs/common@9.4.0): resolution: {integrity: sha512-WO8MI3uEMOFKpbO+SAg6l4aRCr+9KvaL+raFMZaXuEUDphXek6pqdox+4tex9242pNSJUA0trfAMaiy/yVrXQg==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 dependencies: - '@nestjs/common': 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/common': 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) '@types/jsonwebtoken': 9.0.1 jsonwebtoken: 9.0.0 dev: false - /@nestjs/mapped-types@1.2.2(@nestjs/common@9.3.12)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13): + /@nestjs/mapped-types@1.2.2(@nestjs/common@9.4.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13): resolution: {integrity: sha512-3dHxLXs3M0GPiriAcCFFJQHoDFUuzTD5w6JDhE7TyfT89YKpe6tcCCIqOZWdXmt9AZjjK30RkHRSFF+QEnWFQg==} peerDependencies: '@nestjs/common': ^7.0.8 || ^8.0.0 || ^9.0.0 @@ -2497,30 +2494,30 @@ packages: class-validator: optional: true dependencies: - '@nestjs/common': 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/common': 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) class-transformer: 0.5.1 class-validator: 0.14.0 reflect-metadata: 0.1.13 dev: false - /@nestjs/passport@9.0.3(@nestjs/common@9.3.12)(passport@0.6.0): + /@nestjs/passport@9.0.3(@nestjs/common@9.4.0)(passport@0.6.0): resolution: {integrity: sha512-HplSJaimEAz1IOZEu+pdJHHJhQyBOPAYWXYHfAPQvRqWtw4FJF1VXl1Qtk9dcXQX1eKytDtH+qBzNQc19GWNEg==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 passport: ^0.4.0 || ^0.5.0 || ^0.6.0 dependencies: - '@nestjs/common': 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/common': 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) passport: 0.6.0 dev: false - /@nestjs/platform-express@9.3.12(@nestjs/common@9.3.12)(@nestjs/core@9.3.12): - resolution: {integrity: sha512-iQToH9rnZHmm3a2YDKLEN7weU2qC/EVOBnuwTf1lIkqB48yLxlykSJu3KmgtlUUNDt2/HY527QIo+GZSZfCLyg==} + /@nestjs/platform-express@9.4.0(@nestjs/common@9.4.0)(@nestjs/core@9.4.0): + resolution: {integrity: sha512-PpnfghpNq7mwG43z3+pacHulsabUCBMla4nUikntXT525ORpZSDvh/nLi1HLfE4w5+FcINc8/RBOyYTeRVmiRQ==} peerDependencies: '@nestjs/common': ^9.0.0 '@nestjs/core': ^9.0.0 dependencies: - '@nestjs/common': 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) - '@nestjs/core': 9.3.12(@nestjs/common@9.3.12)(@nestjs/platform-express@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/common': 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/core': 9.4.0(@nestjs/common@9.4.0)(@nestjs/platform-express@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) body-parser: 1.20.2 cors: 2.8.5 express: 4.18.2 @@ -2530,15 +2527,15 @@ packages: - supports-color dev: false - /@nestjs/schedule@2.2.1(@nestjs/common@9.3.12)(@nestjs/core@9.3.12)(reflect-metadata@0.1.13): + /@nestjs/schedule@2.2.1(@nestjs/common@9.4.0)(@nestjs/core@9.4.0)(reflect-metadata@0.1.13): resolution: {integrity: sha512-7jev9Q3aFnRajKAi/At+9rzwflZNN10SA5PcdCvxc35GFfTdM2a6O5GA7tiIbLuOOzdjPYPbC3RxP4tpXOHVWw==} peerDependencies: '@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0 '@nestjs/core': ^7.0.0 || ^8.0.0 || ^9.0.0 reflect-metadata: ^0.1.12 dependencies: - '@nestjs/common': 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) - '@nestjs/core': 9.3.12(@nestjs/common@9.3.12)(@nestjs/platform-express@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/common': 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/core': 9.4.0(@nestjs/common@9.4.0)(@nestjs/platform-express@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) cron: 2.3.0 reflect-metadata: 0.1.13 uuid: 9.0.0 @@ -2558,7 +2555,7 @@ packages: - chokidar dev: true - /@nestjs/serve-static@3.0.1(@nestjs/common@9.3.12)(@nestjs/core@9.3.12): + /@nestjs/serve-static@3.0.1(@nestjs/common@9.4.0)(@nestjs/core@9.4.0): resolution: {integrity: sha512-i766UJPYOqvQ2BbRKh0/+Mmq5NkJnmKcShjWV1i5qpXyeM0KDZTn0n7g7ykWq/3LbQgjpMzrhYtGv35GX7GVQw==} peerDependencies: '@fastify/static': ^6.5.0 @@ -2574,12 +2571,12 @@ packages: fastify: optional: true dependencies: - '@nestjs/common': 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) - '@nestjs/core': 9.3.12(@nestjs/common@9.3.12)(@nestjs/platform-express@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/common': 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/core': 9.4.0(@nestjs/common@9.4.0)(@nestjs/platform-express@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) path-to-regexp: 0.2.5 dev: false - /@nestjs/terminus@9.2.2(@nestjs/axios@2.0.0)(@nestjs/common@9.3.12)(@nestjs/core@9.3.12)(@nestjs/typeorm@9.0.1)(reflect-metadata@0.1.13)(rxjs@7.8.0)(typeorm@0.3.12): + /@nestjs/terminus@9.2.2(@nestjs/axios@2.0.0)(@nestjs/common@9.4.0)(@nestjs/core@9.4.0)(@nestjs/typeorm@9.0.1)(reflect-metadata@0.1.13)(rxjs@7.8.0)(typeorm@0.3.13): resolution: {integrity: sha512-AWUA8XLcgxWUjUFYHDqi42M7CZn2e+DEWxP+MqNAbMzz4ybB5jGcFK5Fy8qwaNBoWg6KMF1JiXOOygGXgk9ydg==} peerDependencies: '@grpc/grpc-js': '*' @@ -2624,18 +2621,18 @@ packages: typeorm: optional: true dependencies: - '@nestjs/axios': 2.0.0(@nestjs/common@9.3.12)(axios@1.3.4)(reflect-metadata@0.1.13)(rxjs@7.8.0) - '@nestjs/common': 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) - '@nestjs/core': 9.3.12(@nestjs/common@9.3.12)(@nestjs/platform-express@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0) - '@nestjs/typeorm': 9.0.1(@nestjs/common@9.3.12)(@nestjs/core@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0)(typeorm@0.3.12) + '@nestjs/axios': 2.0.0(@nestjs/common@9.4.0)(axios@1.3.5)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/common': 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/core': 9.4.0(@nestjs/common@9.4.0)(@nestjs/platform-express@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/typeorm': 9.0.1(@nestjs/common@9.4.0)(@nestjs/core@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0)(typeorm@0.3.13) boxen: 5.1.2 check-disk-space: 3.3.1 reflect-metadata: 0.1.13 rxjs: 7.8.0 - typeorm: 0.3.12(pg@8.10.0)(ts-node@10.9.1) + typeorm: 0.3.13(pg@8.10.0)(ts-node@10.9.1) dev: false - /@nestjs/typeorm@9.0.1(@nestjs/common@9.3.12)(@nestjs/core@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0)(typeorm@0.3.12): + /@nestjs/typeorm@9.0.1(@nestjs/common@9.4.0)(@nestjs/core@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0)(typeorm@0.3.13): resolution: {integrity: sha512-A2BgLIPsMtmMI0bPKEf4bmzgFPsnvHqNBx3KkvaJ7hJrBQy0OqYOb+Rr06ifblKWDWS2tUPNrAFQbZjtk3PI+g==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 @@ -2644,11 +2641,11 @@ packages: rxjs: ^7.2.0 typeorm: ^0.3.0 dependencies: - '@nestjs/common': 9.3.12(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) - '@nestjs/core': 9.3.12(@nestjs/common@9.3.12)(@nestjs/platform-express@9.3.12)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/common': 9.4.0(cache-manager@5.2.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) + '@nestjs/core': 9.4.0(@nestjs/common@9.4.0)(@nestjs/platform-express@9.4.0)(reflect-metadata@0.1.13)(rxjs@7.8.0) reflect-metadata: 0.1.13 rxjs: 7.8.0 - typeorm: 0.3.12(pg@8.10.0)(ts-node@10.9.1) + typeorm: 0.3.13(pg@8.10.0)(ts-node@10.9.1) uuid: 8.3.2 dev: false @@ -3844,8 +3841,8 @@ packages: engines: {node: '>=4'} dev: true - /axios@1.3.4: - resolution: {integrity: sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==} + /axios@1.3.5: + resolution: {integrity: sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==} dependencies: follow-redirects: 1.15.1 form-data: 4.0.0 @@ -5127,11 +5124,6 @@ packages: safe-buffer: 5.2.1 dev: false - /content-type@1.0.4: - resolution: {integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==} - engines: {node: '>= 0.6'} - dev: false - /content-type@1.0.5: resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} engines: {node: '>= 0.6'} @@ -5295,11 +5287,6 @@ packages: resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==} dev: true - /date-fns@2.29.3: - resolution: {integrity: sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==} - engines: {node: '>=0.11'} - dev: false - /dayjs@1.11.7: resolution: {integrity: sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==} dev: false @@ -5860,8 +5847,8 @@ packages: eslint: 8.37.0 dev: true - /eslint-plugin-tailwindcss@3.10.3(tailwindcss@3.3.1): - resolution: {integrity: sha512-yDJDs0R6AHT1quc9cCB5mpg5s5hBH0yE5L57GYWfRQWidF3HVEVrRF+Hg/4metBJzKikTD9QPIFd6CZANarWOQ==} + /eslint-plugin-tailwindcss@3.11.0(tailwindcss@3.3.1): + resolution: {integrity: sha512-RaraOG4D6VXutKnoNvFQ4+frTWGJDKtezy1yCrGFS7Um1to/npDNdh2GL19IRoGB/eanbtwhxFXy+xyEw0grAg==} engines: {node: '>=12.13.0'} peerDependencies: tailwindcss: ^3.2.2 @@ -6041,7 +6028,7 @@ packages: array-flatten: 1.1.1 body-parser: 1.20.1 content-disposition: 0.5.4 - content-type: 1.0.4 + content-type: 1.0.5 cookie: 0.5.0 cookie-signature: 1.0.6 debug: 2.6.9 @@ -8504,8 +8491,8 @@ packages: npm-normalize-package-bin: 3.0.0 dev: true - /npm-check-updates@16.10.2: - resolution: {integrity: sha512-njcps3jbtviL8Bqmv5vh2EeUY4z3dEORr7t0CIOR6+M05yhch5GzYT9MObQaA/pi0miDqukf2Y829c1SAc3n+w==} + /npm-check-updates@16.10.7: + resolution: {integrity: sha512-hVJCULf8AoVob9FDvoC7hrkQGuWhWctE9k3sNmR+M6hxZJnlb+03Ph4G1w/pHmI5BGHoo+ZPJtVEXkJsA+JwPQ==} engines: {node: '>=14.14'} hasBin: true dependencies: @@ -8519,15 +8506,16 @@ packages: globby: 11.1.0 hosted-git-info: 5.2.1 ini: 4.0.0 + js-yaml: 4.1.0 json-parse-helpfulerror: 1.0.3 jsonlines: 0.1.1 lodash: 4.17.21 - minimatch: 7.4.5 + minimatch: 8.0.3 p-map: 4.0.0 pacote: 15.1.1 parse-github-url: 1.0.2 progress: 2.0.3 - prompts-ncu: 2.5.1 + prompts-ncu: 3.0.0 rc-config-loader: 4.1.2 remote-git-tags: 3.0.0 rimraf: 4.4.1 @@ -8538,7 +8526,6 @@ packages: strip-json-comments: 5.0.0 untildify: 4.0.0 update-notifier: 6.0.2 - yaml: 2.2.1 transitivePeerDependencies: - bluebird - supports-color @@ -9218,9 +9205,9 @@ packages: retry: 0.12.0 dev: true - /prompts-ncu@2.5.1: - resolution: {integrity: sha512-Hdd7GgV7b76Yh9FP9HL1D9xqtJCJdVPpiM2vDtuoc8W1KfweJe15gutFYmxkq83ViFaagFM8K0UcPCQ/tZq8bA==} - engines: {node: '>= 6'} + /prompts-ncu@3.0.0: + resolution: {integrity: sha512-qyz9UxZ5MlPKWVhWrCmSZ1ahm2GVYdjLb8og2sg0IPth1KRuhcggHGuijz0e41dkx35p1t1q3GRISGH7QGALFA==} + engines: {node: '>= 14'} dependencies: kleur: 4.1.5 sisteransi: 1.0.5 @@ -10564,7 +10551,7 @@ packages: webpack: 5.76.2 dev: true - /terser-webpack-plugin@5.3.5(webpack@5.77.0): + /terser-webpack-plugin@5.3.5(webpack@5.78.0): resolution: {integrity: sha512-AOEDLDxD2zylUGf/wxHxklEkOe2/r+seuyOWujejFrIxHf11brA1/dWQNIgXa1c6/Wkxgu7zvv0JhOWfc2ELEA==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -10585,7 +10572,7 @@ packages: schema-utils: 3.1.1 serialize-javascript: 6.0.0 terser: 5.15.0 - webpack: 5.77.0 + webpack: 5.78.0 dev: true /terser@5.15.0: @@ -10682,7 +10669,7 @@ packages: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} dev: true - /ts-loader@9.4.2(typescript@5.0.3)(webpack@5.77.0): + /ts-loader@9.4.2(typescript@5.0.3)(webpack@5.78.0): resolution: {integrity: sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==} engines: {node: '>=12.0.0'} peerDependencies: @@ -10694,7 +10681,7 @@ packages: micromatch: 4.0.5 semver: 7.3.8 typescript: 5.0.3 - webpack: 5.77.0 + webpack: 5.78.0 dev: true /ts-node@10.9.1(@types/node@18.15.11)(typescript@5.0.3): @@ -10799,67 +10786,6 @@ packages: safe-buffer: 5.2.1 dev: false - /turbo-darwin-64@1.8.8: - resolution: {integrity: sha512-18cSeIm7aeEvIxGyq7PVoFyEnPpWDM/0CpZvXKHpQ6qMTkfNt517qVqUTAwsIYqNS8xazcKAqkNbvU1V49n65Q==} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /turbo-darwin-arm64@1.8.8: - resolution: {integrity: sha512-ruGRI9nHxojIGLQv1TPgN7ud4HO4V8mFBwSgO6oDoZTNuk5ybWybItGR+yu6fni5vJoyMHXOYA2srnxvOc7hjQ==} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /turbo-linux-64@1.8.8: - resolution: {integrity: sha512-N/GkHTHeIQogXB1/6ZWfxHx+ubYeb8Jlq3b/3jnU4zLucpZzTQ8XkXIAfJG/TL3Q7ON7xQ8yGOyGLhHL7MpFRg==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /turbo-linux-arm64@1.8.8: - resolution: {integrity: sha512-hKqLbBHgUkYf2Ww8uBL9UYdBFQ5677a7QXdsFhONXoACbDUPvpK4BKlz3NN7G4NZ+g9dGju+OJJjQP0VXRHb5w==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /turbo-windows-64@1.8.8: - resolution: {integrity: sha512-2ndjDJyzkNslXxLt+PQuU21AHJWc8f6MnLypXy3KsN4EyX/uKKGZS0QJWz27PeHg0JS75PVvhfFV+L9t9i+Yyg==} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /turbo-windows-arm64@1.8.8: - resolution: {integrity: sha512-xCA3oxgmW9OMqpI34AAmKfOVsfDljhD5YBwgs0ZDsn5h3kCHhC4x9W5dDk1oyQ4F5EXSH3xVym5/xl1J6WRpUg==} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /turbo@1.8.8: - resolution: {integrity: sha512-qYJ5NjoTX+591/x09KgsDOPVDUJfU9GoS+6jszQQlLp1AHrf1wRFA3Yps8U+/HTG03q0M4qouOfOLtRQP4QypA==} - hasBin: true - requiresBuild: true - optionalDependencies: - turbo-darwin-64: 1.8.8 - turbo-darwin-arm64: 1.8.8 - turbo-linux-64: 1.8.8 - turbo-linux-arm64: 1.8.8 - turbo-windows-64: 1.8.8 - turbo-windows-arm64: 1.8.8 - dev: true - /type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} @@ -10912,8 +10838,8 @@ packages: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} dev: false - /typeorm@0.3.12(pg@8.10.0)(ts-node@10.9.1): - resolution: {integrity: sha512-sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA==} + /typeorm@0.3.13(pg@8.10.0)(ts-node@10.9.1): + resolution: {integrity: sha512-AqyKG4xtYST2zpgX/LdAleP8WAjwyO7EemRtG67EmmbFpWsPBk9BVr87wkN59huBned3qPEehVOSUQ81pNuH8A==} engines: {node: '>= 12.9.0'} hasBin: true peerDependencies: @@ -10923,7 +10849,7 @@ packages: hdb-pool: ^0.1.6 ioredis: ^5.0.4 mongodb: ^3.6.0 - mssql: ^7.3.0 + mssql: ^9.1.1 mysql2: ^2.2.5 || ^3.0.1 oracledb: ^5.1.0 pg: ^8.5.1 @@ -10975,7 +10901,6 @@ packages: buffer: 6.0.3 chalk: 4.1.2 cli-highlight: 2.1.11 - date-fns: 2.29.3 debug: 4.3.4 dotenv: 16.0.3 glob: 8.1.0 @@ -11020,8 +10945,8 @@ packages: engines: {node: '>=12.20'} hasBin: true - /uid@2.0.1: - resolution: {integrity: sha512-PF+1AnZgycpAIEmNtjxGBVmKbZAQguaa4pBUq6KNaGEcpzZ2klCNZLM34tsjp76maN00TttiiUf6zkIBpJQm2A==} + /uid@2.0.2: + resolution: {integrity: sha512-u3xV3X7uzvi5b1MncmZo3i2Aw222Zk1keqLA1YkHldREkAhAqi65wuPfe7lHx8H/Wzy+8CE7S7uS3jekIM5s8g==} engines: {node: '>=8'} dependencies: '@lukeed/csprng': 1.1.0 @@ -11372,8 +11297,8 @@ packages: - uglify-js dev: true - /webpack@5.77.0: - resolution: {integrity: sha512-sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==} + /webpack@5.78.0: + resolution: {integrity: sha512-gT5DP72KInmE/3azEaQrISjTvLYlSM0j1Ezhht/KLVkrqtv10JoP/RXhwmX/frrutOPuSq3o5Vq0ehR/4Vmd1g==} engines: {node: '>=10.13.0'} hasBin: true peerDependencies: @@ -11403,7 +11328,7 @@ packages: neo-async: 2.6.2 schema-utils: 3.1.1 tapable: 2.2.1 - terser-webpack-plugin: 5.3.5(webpack@5.77.0) + terser-webpack-plugin: 5.3.5(webpack@5.78.0) watchpack: 2.4.0 webpack-sources: 3.2.3 transitivePeerDependencies: @@ -11566,11 +11491,6 @@ packages: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} - /yaml@2.2.1: - resolution: {integrity: sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==} - engines: {node: '>= 14'} - dev: true - /yargs-parser@20.2.9: resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} engines: {node: '>=10'} diff --git a/server/Dockerfile b/server/Dockerfile index cc0f2f5c..1b7077f6 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache g++ git curl make python3 libc6-compat \ FROM base AS dependencies -COPY package.json pnpm-*.yaml turbo.json ./ +COPY package.json pnpm-*.yaml ./ COPY ./schema/package.json ./schema/package.json COPY ./server/package.json ./server/package.json @@ -31,7 +31,7 @@ RUN apt-get update \ && apt-get install -y curl build-essential \ && curl -fsSL https://get.pnpm.io/install.sh | node - add --global pnpm -COPY --from=builder /app/package.json /app/pnpm-*.yaml /app/turbo.json ./ +COPY --from=builder /app/package.json /app/pnpm-*.yaml ./ COPY --from=builder /app/server/package.json ./server/package.json RUN pnpm dlx playwright install --with-deps chromium diff --git a/server/package.json b/server/package.json index 1216c67e..bd8b0c9e 100644 --- a/server/package.json +++ b/server/package.json @@ -10,13 +10,13 @@ "dependencies": { "@aws-sdk/client-s3": "^3.306.0", "@nestjs/axios": "^2.0.0", - "@nestjs/common": "^9.3.12", + "@nestjs/common": "^9.4.0", "@nestjs/config": "^2.3.1", - "@nestjs/core": "^9.3.12", + "@nestjs/core": "^9.4.0", "@nestjs/jwt": "^10.0.3", "@nestjs/mapped-types": "^1.2.2", "@nestjs/passport": "^9.0.3", - "@nestjs/platform-express": "^9.3.12", + "@nestjs/platform-express": "^9.4.0", "@nestjs/schedule": "^2.2.1", "@nestjs/serve-static": "^3.0.1", "@nestjs/terminus": "^9.2.2", @@ -45,7 +45,7 @@ "reflect-metadata": "^0.1.13", "rimraf": "^4.4.1", "rxjs": "^7.8.0", - "typeorm": "0.3.12", + "typeorm": "0.3.13", "uuid": "^9.0.0" }, "devDependencies": { @@ -68,6 +68,6 @@ "ts-node": "^10.9.1", "tsconfig-paths": "^4.2.0", "typescript": "^5.0.3", - "webpack": "^5.77.0" + "webpack": "^5.78.0" } } diff --git a/turbo.json b/turbo.json deleted file mode 100644 index ee7472fc..00000000 --- a/turbo.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$schema": "https://turborepo.org/schema.json", - "globalDependencies": [".env"], - "pipeline": { - "dev": {}, - "lint": {}, - "start": {}, - "build": { - "outputs": ["dist/**", ".next/**"], - "dependsOn": ["^build"] - } - } -}