Merge remote-tracking branch 'origin/main' into feat/user-environments

# Conflicts:
#	packages/hoppscotch-backend/jest.setup.js
#	packages/hoppscotch-backend/package.json

packages/hoppscotch-backend/docker-compose.yml

@@ -2,6 +2,7 @@ version: '3.0'
 services:
   local:
     build: .
+    command: ["pnpm", "run", "start:dev"]
     environment:
       - PRODUCTION=false
       - DATABASE_URL=postgresql://postgres:testpass@dev-db:5432/hoppscotch?connect_timeout=300

packages/hoppscotch-backend/jest.setup.js

@@ -1 +1 @@
-require('@relmify/jest-fp-ts');
+require('@relmify/jest-fp-ts');

packages/hoppscotch-backend/package.json

@@ -18,8 +18,7 @@
     "test:watch": "jest --watch",
     "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",
-    "postinstall": "prisma generate"
+    "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
     "@nestjs/apollo": "^10.1.6",
@@ -75,6 +74,9 @@
       "ts"
     ],
     "setupFilesAfterEnv": ["@relmify/jest-fp-ts"],
+    "moduleNameMapper": {
+      "^src/(.*)$": "<rootDir>/$1"
+    },
     "rootDir": "src",
     "testRegex": ".*\\.spec\\.ts$",
     "transform": {