Merge pull request #64 from line/dev

beta release: 3.2342.13-beta

.dockerignore

@@ -1,6 +1,7 @@
 **/node_modules
 **/.next
-**/.turbo
 **/dist
 **/.env*
-!apps/web/.env.build
+!apps/web/.env.build
+docker
+volumes

.github/workflows/docker-beta-image.yml

@@ -34,7 +34,7 @@ jobs:
       uses: docker/build-push-action@v4
       with:
         context: .
-        file: ./apps/api/Dockerfile
+        file: ./docker/api.dockerfile
         push: ${{ github.event_name != 'pull_request' }}
         tags: ${{ steps.api-meta.outputs.tags }}
         labels: ${{ steps.api-meta.outputs.labels }}
@@ -67,7 +67,7 @@ jobs:
       uses: docker/build-push-action@v4
       with:
         context: .
-        file: ./apps/web/Dockerfile
+        file: ./docker/web.dockerfile
         push: ${{ github.event_name != 'pull_request' }}
         tags: ${{ steps.web-meta.outputs.tags }}
         labels: ${{ steps.web-meta.outputs.labels }}

.github/workflows/docker-dev-image.yml

@@ -34,7 +34,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: ./apps/api/Dockerfile
+          file: ./docker/api.dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.api-meta.outputs.tags }}
           labels: ${{ steps.api-meta.outputs.labels }}
@@ -67,7 +67,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: ./apps/web/Dockerfile
+          file: ./docker/web.dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.web-meta.outputs.tags }}
           labels: ${{ steps.web-meta.outputs.labels }}

.github/workflows/docker-prod-image.yml

@@ -36,7 +36,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: ./apps/api/Dockerfile
+          file: ./docker/api.dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.api-meta.outputs.tags }}
           labels: ${{ steps.api-meta.outputs.labels }}
@@ -69,7 +69,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: ./apps/web/Dockerfile
+          file: ./docker/web.dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.web-meta.outputs.tags }}
           labels: ${{ steps.web-meta.outputs.labels }}

.gitignore

@@ -30,15 +30,14 @@ yarn-error.log*
 .env.production.local
 
 # turbo
-.turbo
+!.turbo/.gitkeep
+**/.turbo
 
 # .env
 .env*
 !.env.example
 !.env.build
 
-
-.vscode
 volumes
 
 dist

.husky/pre-commit

@@ -1,5 +1,6 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
+yarn typecheck
 yarn format
 yarn lint

.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+  "recommendations": [
+    "bradlc.vscode-tailwindcss",
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode",
+    "expo.vscode-expo-tools",
+    "yoavbls.pretty-ts-errors"
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,15 @@
+{
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  },
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnSave": true,
+  "eslint.rules.customizations": [{ "rule": "*", "severity": "warn" }],
+  "eslint.workingDirectories": [
+    { "pattern": "apps/*/" },
+    { "pattern": "packages/*/" },
+    { "pattern": "tooling/*/" }
+  ],
+  "typescript.enablePromptUseWorkspaceTsdk": true,
+  "typescript.tsdk": "node_modules/typescript/lib"
+}

README.md

@@ -93,6 +93,16 @@ npm run migration:run
 yarn dev
 ```
 
+6. Also, you can run the `dev` target of one of apps in root directory:
+
+```bash
+# web
+yarn turbo run dev --filter=web
+
+# api
+yarn turbo run dev --filter=api
+```
+
 You can always find more information in each app/library's respective README.md file.
 
 ### Setting Up ABC User Feedback Manually
@@ -110,7 +120,7 @@ The client is based on React, React Hook Form, React Query, Tailwind css, MUI, a
 
 ### Build Docker Image
 
-For your code build, you can buile docker image using docker-compose
+For your code build, you can buile docker image using docker-compose. Please refer to [remote caching](https://turbo.build/repo/docs/core-concepts/remote-caching) and [deploying with docker](https://turbo.build/repo/docs/handbook/deploying-with-docker) using turborepo
 
 ```
 docker-compose build

apps/api/.eslintrc.js

@@ -1,6 +1,6 @@
 module.exports = {
   root: true,
-  extends: ['ufb'],
+  extends: ['@ufb/eslint-config/base', '@ufb/eslint-config/nestjs'],
   parserOptions: {
     project: 'tsconfig.json',
     tsconfigRootDir: __dirname,

apps/api/package.json

@@ -1,94 +1,95 @@
 {
   "name": "api",
   "version": "0.0.1",
-  "description": "",
-  "author": "",
   "private": true,
-  "license": "UNLICENSED",
   "scripts": {
     "build": "nest build",
+    "clean": "git clean -xdf dist .turbo node_modules",
     "dev": "nest start --watch",
+    "format": "prettier --check \"./src/**/*.{js,cjs,mjs,ts,tsx,md,json}\"",
+    "lint": "eslint \"src/**/*.ts\"",
+    "migration:generate": "npm run typeorm -- migration:generate src/configs/modules/typeorm-config/migrations/$npm_config_name",
+    "migration:revert": "npm run typeorm -- migration:revert",
+    "migration:run": "npm run typeorm -- migration:run",
     "start": "nest start",
-    "start:dev": "nest start --watch",
     "start:debug": "nest start --debug --watch",
+    "start:dev": "nest start --watch",
     "start:prod": "node dist/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\"",
     "test": "jest --detectOpenHandles --forceExit",
-    "test:watch": "jest --watch --detectOpenHandles",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json --runInBand --detectOpenHandles",
-    "typeorm": "ts-node --project ./tsconfig.json -r tsconfig-paths/register ./node_modules/typeorm/cli -d src/configs/modules/typeorm-config/typeorm-config.datasource.ts",
-    "migration:generate": "npm run typeorm -- migration:generate src/configs/modules/typeorm-config/migrations/$npm_config_name",
-    "migration:run": "npm run typeorm -- migration:run",
-    "migration:revert": "npm run typeorm -- migration:revert"
+    "test:watch": "jest --watch --detectOpenHandles",
+    "typecheck": "tsc --noEmit",
+    "typeorm": "ts-node --project ./tsconfig.json -r tsconfig-paths/register ./node_modules/typeorm/cli -d src/configs/modules/typeorm-config/typeorm-config.datasource.ts"
   },
+  "prettier": "@ufb/prettier-config",
   "dependencies": {
-    "@fastify/static": "^6.10.2",
+    "@fastify/static": "^6.11.2",
     "@nestjs-modules/mailer": "^1.9.1",
-    "@nestjs/common": "^9.4.2",
-    "@nestjs/config": "^2.3.2",
-    "@nestjs/core": "^9.4.2",
-    "@nestjs/jwt": "^10.0.3",
-    "@nestjs/passport": "^9.0.3",
-    "@nestjs/platform-express": "^9.4.2",
-    "@nestjs/platform-fastify": "^9.4.2",
-    "@nestjs/swagger": "^6.3.0",
-    "@nestjs/terminus": "^9.2.2",
-    "@nestjs/typeorm": "^9.0.1",
-    "@opensearch-project/opensearch": "^1.2.0",
-    "@willsoto/nestjs-prometheus": "^5.1.2",
-    "axios": "^1.4.0",
-    "bcrypt": "^5.1.0",
+    "@nestjs/common": "^10.2.7",
+    "@nestjs/config": "^3.1.1",
+    "@nestjs/core": "^10.2.7",
+    "@nestjs/jwt": "^10.1.1",
+    "@nestjs/passport": "^10.0.2",
+    "@nestjs/platform-express": "^10.2.7",
+    "@nestjs/platform-fastify": "^10.2.7",
+    "@nestjs/swagger": "^7.1.13",
+    "@nestjs/terminus": "^10.1.1",
+    "@nestjs/typeorm": "^10.0.0",
+    "@opensearch-project/opensearch": "^2.4.0",
+    "@willsoto/nestjs-prometheus": "^6.0.0",
+    "axios": "^1.5.1",
+    "bcrypt": "^5.1.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
-    "dayjs": "^1.11.9",
-    "exceljs": "^4.3.0",
+    "dayjs": "^1.11.10",
+    "exceljs": "^4.4.0",
     "fast-csv": "^4.3.6",
-    "mysql2": "^3.3.3",
-    "nestjs-cls": "^3.5.0",
-    "nestjs-pino": "^3.2.0",
+    "mysql2": "^3.6.2",
+    "nestjs-cls": "^3.6.0",
+    "nestjs-pino": "^3.5.0",
     "nestjs-typeorm-paginate": "^4.0.4",
-    "nodemailer": "^6.9.3",
+    "nodemailer": "^6.9.6",
     "passport": "^0.6.0",
     "passport-custom": "^1.1.1",
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
-    "pino-http": "^8.3.3",
-    "pino-pretty": "^10.0.0",
-    "prom-client": "^14.2.0",
+    "pino-http": "^8.5.0",
+    "pino-pretty": "^10.2.3",
+    "prom-client": "^15.0.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
     "source-map-support": "^0.5.21",
     "typeorm": "^0.3.17",
     "typeorm-naming-strategies": "^4.1.0",
     "typeorm-transactional": "^0.4.1",
-    "yup": "^0.32.11"
+    "yup": "0.32.11"
   },
   "devDependencies": {
-    "@faker-js/faker": "^7.6.0",
-    "@nestjs/cli": "^9.5.0",
-    "@nestjs/schematics": "^9.2.0",
-    "@nestjs/testing": "^9.4.2",
-    "@swc-node/jest": "^1.6.5",
-    "@swc/core": "^1.3.62",
-    "@types/bcrypt": "^5.0.0",
-    "@types/express": "^4.17.17",
-    "@types/jest": "29.2.4",
-    "@types/node": "18.11.18",
-    "@types/nodemailer": "^6.4.8",
-    "@types/supertest": "^2.0.12",
-    "@ufb/tsconfig": "0.0.0",
-    "eslint": "^8.42.0",
-    "eslint-config-ufb": "0.0.0",
-    "jest": "29.3.1",
+    "@faker-js/faker": "^8.2.0",
+    "@nestjs/cli": "^10.1.18",
+    "@nestjs/schematics": "^10.0.2",
+    "@nestjs/testing": "^10.2.7",
+    "@swc-node/jest": "^1.6.8",
+    "@swc/core": "^1.3.93",
+    "@types/bcrypt": "^5.0.1",
+    "@types/express": "^4.17.20",
+    "@types/jest": "^29.5.6",
+    "@types/node": "20.8.7",
+    "@types/nodemailer": "^6.4.13",
+    "@types/supertest": "^2.0.15",
+    "@ufb/eslint-config": "^0.1.0",
+    "@ufb/prettier-config": "^0.1.0",
+    "@ufb/tsconfig": "^0.1.0",
+    "eslint": "^8.51.0",
+    "jest": "^29.7.0",
     "mockdate": "^3.0.5",
-    "prettier": "^2.8.8",
     "supertest": "^6.3.3",
-    "ts-jest": "29.0.3",
-    "ts-loader": "^9.4.3",
+    "ts-jest": "^29.1.1",
+    "ts-loader": "^9.5.0",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^4.9.5"
+    "typescript": "^5.2.2"
   }
 }