feat: add pnpm to control scripts

.github/workflows/test-and-lint.yml

@@ -15,10 +15,10 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install modules
-        run: yarn
+        run: pnpm
 
       - name: Run ESLint
-        run: yarn eslint . --ext .js,.jsx,.ts,.tsx
+        run: pnpm eslint . --ext .js,.jsx,.ts,.tsx
 
       - name: Run Tests
-        run: yarn jest
+        run: pnpm jest

.gitignore

@@ -1,5 +1,14 @@
-# Build
+
+
+
 node_modules
+
+
+##DB
+postgresql/
+
+## API
+# Build
 build
 yarn.lock
 package-lock.json
@@ -17,8 +26,3 @@ pnpm-lock.yaml
 
 # Logs
 .log
-
-# Tests
-docker/database/postgresql
-docker/database/postgresqltest
-docker/database/postgresqldev

.husky/commit-msg

@@ -2,4 +2,4 @@
 . "$(dirname "$0")/_/husky.sh"
 
 echo "\n🐶 [Husky] Validating commit message:"
-yarn commitlint --edit $1
+pnpm commitlint --edit $1

.husky/pre-commit

@@ -2,8 +2,8 @@
 . "$(dirname "$0")/_/husky.sh"
 
 echo "\n🐶 [Husky] Running prettier:"
-yarn pretty-quick --staged --pattern '**/*.*(js|ts)'
+pnpm pretty-quick --staged --pattern '**/*.*(js|ts)'
 
 echo "\n🐶 [Husky] Running ESLint:"
-yarn lint-staged
+pnpm lint-staged
 

.turbo/daemon/3344d20ba8ade279-turbo.log.2024-04-28

@@ -0,0 +1,39 @@
+2024-04-28T15:06:16.460577Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.460852Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.461188Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.470682Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.471173Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.473051Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.479657Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.479911Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.480921Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.480926Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.480928Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.480929Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.481786Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.482561Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.489572Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.489645Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.489648Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:16.489721Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.304357Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.305033Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.312650Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.312774Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.313049Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.314016Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.314030Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.314303Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.314709Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.322568Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.322582Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.322858Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.323781Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.324259Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.324431Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.324505Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.334070Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.334076Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.334320Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.334827Z  WARN turborepo_lib::package_changes_watcher: file event lagged
+2024-04-28T15:06:48.334901Z  WARN turborepo_lib::package_changes_watcher: file event lagged

package.json

@@ -1,86 +1,18 @@
 {
-  "name": "infinitybase-api-template",
-  "version": "2.0.0",
-  "main": "src/index.ts",
-  "license": "MIT",
+
+  "name": "bakosafe-server",
+  "version": "0.0.1",
+  "author": "InfinityBase - Guilherme Roque",
+  "license": "Apache-2.0",
+  "workspaces": [
+    "./packages/*"
+  ],
   "scripts": {
-    "dev": "NODE_ENV=development ts-node-dev --respawn --transpile-only -r tsconfig-paths/register -r dotenv/config src/server/index.ts",
-    "test": "sudo chmod +x ./scripts/init_test.sh && ./scripts/init_test.sh",
-    "start": "pm2-runtime start ./build/server/index.js",
-    "build": "tsc --project . && tscpaths -p tsconfig.json -s ./src -o ./build",
-    "copyFiles": "copyfiles --error --up 1 src/**/*.html build",
-    "postbuild": "yarn run copyFiles",
-    "migration:run": "ts-node -r tsconfig-paths/register -r dotenv/config ./node_modules/typeorm/cli.js migration:run",
-    "migration:create": "ts-node -r tsconfig-paths/register -r dotenv/config ./node_modules/typeorm/cli.js migration:create -n",
-    "migration:revert": "ts-node -r tsconfig-paths/register -r dotenv/config ./node_modules/typeorm/cli.js migration:revert",
-    "prepare": "husky install",
-    "database:start": "make -C ./ database-init env_file=.env",
-    "database:stop": "make -C ./ database-down env_file=.env",
-    "database:test": "make -C ./ database-init env_file=.env.test",
-    "chain:start": "make -C ./docker/chain up",
-    "run:prod": "make -C ./ deploy-prod env_file=.env.prod",
-    "run:stg": "make -C ./ deploy-stg env_file=.env.staging",
-    "run:test": "make -C ./ deploy-test env_file=.env.test"
-  },
-  "dependencies": {
-    "@noble/curves": "1.3.0",
-    "@passwordless-id/webauthn": "1.4.0",
-    "axios": "1.5.1",
-    "bcrypt": "5.1.0",
-    "body-parser": "1.20.2",
-    "bsafe": "0.0.49",
-    "cheerio": "1.0.0-rc.12",
-    "class-validator": "0.14.0",
-    "cookie-parser": "1.4.6",
-    "copyfiles": "2.4.1",
-    "cors": "2.8.5",
-    "date-fns": "2.30.0",
-    "dotenv": "16.4.5",
-    "express": "4.17.1",
-    "express-joi-validation": "5.0.0",
-    "fuels": "0.74.0",
-    "joi": "17.4.0",
-    "jsonwebtoken": "9.0.1",
-    "morgan": "1.10.0",
-    "nodemailer": "6.9.8",
-    "patch-package": "8.0.0",
-    "pg": "8.5.1",
-    "pm2": "5.3.0",
-    "reflect-metadata": "0.1.13",
-    "socket.io": "4.7.2",
-    "socket.io-client": "4.7.5",
-    "ts-node": "^10.9.1",
-    "tsconfig-paths": "^3.9.0",
-    "typeorm": "^0.2.29",
-    "typescript": "^4.6.3"
+    "dev":"turbo run dev",
+    "dev:db:start": "turbo run db:dev:start",
+    "dev:chain:start": "turbo run chain:dev:start"
   },
   "devDependencies": {
-    "@commitlint/cli": "12.0.1",
-    "@commitlint/config-conventional": "12.0.1",
-    "@trivago/prettier-plugin-sort-imports": "2.0.2",
-    "@types/cors": "2.8.10",
-    "@types/express": "4.17.11",
-    "@types/jest": "^29.5.4",
-    "@types/jsonwebtoken": "9.0.2",
-    "@types/morgan": "1.9.2",
-    "@types/node": "20.6.0",
-    "@types/supertest": "2.0.10",
-    "@typescript-eslint/eslint-plugin": "4.19.0",
-    "@typescript-eslint/parser": "4.19.0",
-    "eslint": "7.22.0",
-    "eslint-config-prettier": "8.1.0",
-    "eslint-plugin-prettier": "3.3.1",
-    "husky": "5.2.0",
-    "jest": "29.7.0",
-    "lint-staged": "10.5.4",
-    "prettier": "2.2.1",
-    "pretty-quick": "3.1.0",
-    "supertest": "6.1.3",
-    "ts-jest": "^29.1.1",
-    "ts-node-dev": "1.1.6",
-    "tscpaths": "0.0.9"
-  },
-  "resolutions": {
-    "string-width": "4.1.0"
+    "turbo": "^1.10.0"
   }
-}
+}

Dockerfile → packages/api/Dockerfile

@@ -5,13 +5,13 @@ WORKDIR api
 ADD . /api
 
 # Install app dependencies
-RUN yarn install
+RUN pnpm install
 
 # Install pm2
-RUN yarn global add pm2
+RUN pnpm global add pm2
 
 # Build
-RUN yarn build
+RUN pnpm build
 
 # Run!
 EXPOSE 3333

Dockerfile.stg → packages/api/Dockerfile.stg

@@ -5,12 +5,12 @@ WORKDIR api
 ADD . /api
 
 # Install app dependencies
-RUN yarn install
+RUN pnpm install
 
 # Build
-RUN yarn build
+RUN pnpm build
 
 # Run!
 EXPOSE 3333
 
-ENTRYPOINT ["yarn", "start"]
+ENTRYPOINT ["pnpm", "start"]

packages/api/Makefile

@@ -0,0 +1,17 @@
+deploy-prod:
+	docker-compose -f docker-compose.yml --env-file ${env_file} up --build -d  
+
+deploy-stg:
+	docker-compose -f docker-compose.yml --env-file ${env_file} up --build -d 
+
+deploy-test:
+	docker-compose -f docker-compose.yml --env-file ${env_file} up --build -d
+
+database-init:
+	docker-compose -f docker/database/docker-compose.yml --env-file ${env_file} up --build -d
+
+database-down:
+	docker-compose -f docker/database/docker-compose.yml --env-file ${env_file} down
+
+chain-start:
+	docker-compose -f docker/chain/docker-compose.yml --env-file ${env_file} up --build -d

packages/api/package.json

@@ -0,0 +1,81 @@
+{
+  "name": "bakosafe-api",
+  "version": "2.0.0",
+  "main": "src/index.ts",
+  "license": "MIT",
+  "scripts": {
+    "dev": "NODE_ENV=development ts-node-dev --respawn --transpile-only -r tsconfig-paths/register -r dotenv/config src/server/index.ts",
+    "test": "sudo chmod +x ./scripts/init_test.sh && ./scripts/init_test.sh",
+    "start": "pm2-runtime start ./build/server/index.js",
+    "build": "tsc --project . && tscpaths -p tsconfig.json -s ./src -o ./build",
+    "copyFiles": "copyfiles --error --up 1 src/**/*.html build",
+    "postbuild": "pnpm run copyFiles",
+    "migration:run": "ts-node -r tsconfig-paths/register -r dotenv/config ./node_modules/typeorm/cli.js migration:run",
+    "migration:create": "ts-node -r tsconfig-paths/register -r dotenv/config ./node_modules/typeorm/cli.js migration:create -n",
+    "migration:revert": "ts-node -r tsconfig-paths/register -r dotenv/config ./node_modules/typeorm/cli.js migration:revert",
+    "run:prod": "make -C ./ deploy-prod env_file=.env.prod",
+    "run:stg": "make -C ./ deploy-stg env_file=.env.staging",
+    "run:test": "make -C ./ deploy-test env_file=.env.test"
+  },
+  "dependencies": {
+    "@noble/curves": "1.3.0",
+    "@passwordless-id/webauthn": "1.4.0",
+    "axios": "1.5.1",
+    "bcrypt": "5.1.0",
+    "body-parser": "1.20.2",
+    "bsafe": "0.0.49",
+    "cheerio": "1.0.0-rc.12",
+    "class-validator": "0.14.0",
+    "cookie-parser": "1.4.6",
+    "copyfiles": "2.4.1",
+    "cors": "2.8.5",
+    "date-fns": "2.30.0",
+    "dotenv": "16.4.5",
+    "express": "4.17.1",
+    "express-joi-validation": "5.0.0",
+    "fuels": "0.74.0",
+    "joi": "17.4.0",
+    "jsonwebtoken": "9.0.1",
+    "morgan": "1.10.0",
+    "nodemailer": "6.9.8",
+    "patch-package": "8.0.0",
+    "pg": "8.5.1",
+    "pm2": "5.3.0",
+    "reflect-metadata": "0.1.13",
+    "socket.io": "4.7.2",
+    "socket.io-client": "4.7.5",
+    "ts-node": "^10.9.1",
+    "tsconfig-paths": "^3.9.0",
+    "typeorm": "^0.2.29",
+    "typescript": "^4.6.3"
+  },
+  "devDependencies": {
+    "@commitlint/cli": "12.0.1",
+    "@commitlint/config-conventional": "12.0.1",
+    "@trivago/prettier-plugin-sort-imports": "2.0.2",
+    "@types/cors": "2.8.10",
+    "@types/express": "4.17.11",
+    "@types/jest": "^29.5.4",
+    "@types/jsonwebtoken": "9.0.2",
+    "@types/morgan": "1.9.2",
+    "@types/node": "20.6.0",
+    "@types/supertest": "2.0.10",
+    "@typescript-eslint/eslint-plugin": "4.19.0",
+    "@typescript-eslint/parser": "4.19.0",
+    "eslint": "7.22.0",
+    "eslint-config-prettier": "8.1.0",
+    "eslint-plugin-prettier": "3.3.1",
+    "husky": "5.2.0",
+    "jest": "29.7.0",
+    "lint-staged": "10.5.4",
+    "prettier": "2.2.1",
+    "pretty-quick": "3.1.0",
+    "supertest": "6.1.3",
+    "ts-jest": "^29.1.1",
+    "ts-node-dev": "1.1.6",
+    "tscpaths": "0.0.9"
+  },
+  "resolutions": {
+    "string-width": "4.1.0"
+  }
+}

scripts/init_development.sh → packages/api/scripts/init_development.sh

@@ -1,7 +1,7 @@
 #database instance for testing
-yarn database:dev
+pnpm database:dev
 
 #give a timeout and run migrations
-sleep 5 && yarn migration:run
+sleep 5 && pnpm migration:run