Fix gateway bug and reorganise dependencies (#158)

Co-authored-by: Ong Jun Xiong <[email protected]> Co-authored-by: Charisma Kausar <[email protected]> Co-authored-by: Charisma Kausar <[email protected]> Co-authored-by: Gabriel Goh <[email protected]> Co-authored-by: chunweii <[email protected]>
CS3219-AY2324S1 · Oct 20, 2023 · 3f2ad47 · 3f2ad47
1 parent 4093f1d
commit 3f2ad47
Show file tree

Hide file tree

Showing 15 changed files with 183 additions and 302 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -26,16 +26,11 @@
     "@radix-ui/react-switch": "^1.0.3",
     "@radix-ui/react-tabs": "^1.0.4",
     "@tanstack/react-table": "^8.10.4",
-    "@types/node": "20.6.0",
-    "@types/react": "18.2.21",
-    "@types/react-dom": "18.2.7",
     "autoprefixer": "10.4.15",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.0.0",
     "cmdk": "^0.2.0",
     "diff-match-patch": "^1.0.5",
-    "eslint": "8.49.0",
-    "eslint-config-next": "13.4.19",
     "firebase": "^10.4.0",
     "lodash": "^4.17.21",
     "lucide-react": "^0.279.0",
@@ -53,12 +48,16 @@
     "tailwindcss": "3.3.3",
     "tailwindcss-animate": "^1.0.7",
     "twilio-video": "^2.28.1",
-    "typescript": "5.2.2",
     "zod": "^3.22.4"
   },
   "devDependencies": {
     "@types/diff-match-patch": "^1.0.34",
     "@types/lodash": "^4.14.199",
-    "@types/socket.io-client": "^3.0.0"
+    "@types/react": "^18.2.30",
+    "@types/react-dom": "^18.2.14",
+    "@types/socket.io-client": "^3.0.0",
+    "eslint": "^8.51.0",
+    "eslint-config-next": "^13.5.6",
+    "typescript": "^5.2.2"
   }
 }
diff --git a/package.json b/package.json
@@ -18,6 +18,8 @@
     "@babel/cli": "^7.22.15",
     "@babel/core": "^7.22.19",
     "@babel/preset-env": "^7.22.15",
+    "@types/express": "^4.17.20",
+    "@types/node": "^20.8.7",
     "@types/swagger-ui-express": "^4.1.4",
     "@typescript-eslint/eslint-plugin": "^6.7.3",
     "@typescript-eslint/parser": "^6.7.3",
@@ -32,6 +34,7 @@
   "dependencies": {
     "@prisma/client": "^5.4.2",
     "dotenv-cli": "^7.3.0",
+    "express": "^4.18.2",
     "swagger-ui-express": "^5.0.0"
   }
 }
diff --git a/services/admin-service/package.json b/services/admin-service/package.json
@@ -16,12 +16,9 @@
   },
   "dependencies": {
     "dotenv": "^16.3.1",
-    "express": "^4.18.2",
     "firebase-admin": "^11.10.1"
   },
   "devDependencies": {
-    "@types/express": "^4.17.17",
-    "@types/node": "^20.6.2",
     "supertest": "^6.3.3",
     "swagger-autogen": "^2.23.6",
     "ts-node-dev": "^2.0.0",

diff --git a/services/admin-service/tsconfig.json b/services/admin-service/tsconfig.json
@@ -3,6 +3,7 @@
     "target": "es2016",
     "module": "commonjs",
     "resolveJsonModule": true,
+    "rootDir": ".",
     "outDir": "./dist",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,

diff --git a/services/collaboration-service/package.json b/services/collaboration-service/package.json
@@ -10,12 +10,10 @@
     "swagger-autogen": "ts-node swagger.ts"
   },
   "dependencies": {
-    "@types/express": "^4.17.17",
     "body-parser": "^1.20.2",
     "cookie-parser": "~1.4.4",
     "debug": "~2.6.9",
     "diff-match-patch": "^1.0.5",
-    "express": "~4.16.1",
     "express-openapi": "^12.1.3",
     "json0-ot-diff": "^1.1.2",
     "morgan": "~1.9.1",
@@ -34,9 +32,7 @@
     "@types/cookie-parser": "^1.4.4",
     "@types/cors": "^2.8.14",
     "@types/diff-match-patch": "^1.0.34",
-    "@types/express": "^4.17.17",
     "@types/morgan": "^1.9.5",
-    "@types/node": "^20.8.4",
     "@types/socket.io": "^3.0.2",
     "@types/swagger-ui-express": "^4.1.3",
     "@types/uuid": "^9.0.4",

diff --git a/services/collaboration-service/tsconfig.json b/services/collaboration-service/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "target": "ES2019",
     "module": "commonjs",
+    "rootDir": ".",
     "outDir": "./dist",
     "strict": true,
     "esModuleInterop": true,

diff --git a/services/gateway/package.json b/services/gateway/package.json
@@ -15,16 +15,13 @@
   "dependencies": {
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",
-    "express": "^4.18.2",
     "firebase-admin": "^11.10.1",
     "http-proxy-middleware": "^2.0.6",
     "morgan": "^1.10.0"
   },
   "devDependencies": {
     "@types/cors": "^2.8.14",
-    "@types/express": "^4.17.17",
     "@types/morgan": "^1.9.6",
-    "@types/node": "^20.6.3",
     "swagger-autogen": "^2.23.6",
     "ts-node-dev": "^2.0.0",
     "typescript": "^5.2.2"

diff --git a/services/gateway/tsconfig.json b/services/gateway/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "target": "es2016",
     "module": "commonjs",
+    "rootDir": ".",
     "outDir": "./dist",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,

diff --git a/services/matching-service/package.json b/services/matching-service/package.json
@@ -11,16 +11,13 @@
   "dependencies": {
     "cookie-parser": "~1.4.4",
     "debug": "~2.6.9",
-    "express": "~4.16.1",
     "morgan": "~1.9.1",
     "socket.io": "^4.7.2"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.4",
     "@types/cors": "^2.8.14",
-    "@types/express": "^4.17.17",
     "@types/morgan": "^1.9.5",
-    "@types/node": "^20.6.2",
     "ts-node-dev": "^2.0.0",
     "typescript": "^5.2.2"
   }

diff --git a/services/matching-service/tsconfig.json b/services/matching-service/tsconfig.json
@@ -3,6 +3,7 @@
     "target": "es2016",
     "module": "commonjs",
     "resolveJsonModule": true,
+    "rootDir": ".",
     "outDir": "./dist",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,

diff --git a/services/question-service/package.json b/services/question-service/package.json
@@ -9,11 +9,10 @@
     "swagger-autogen": "ts-node swagger-doc-gen.ts"
   },
   "dependencies": {
-    "cors": "^2.8.5",
     "cookie-parser": "~1.4.4",
+    "cors": "^2.8.5",
     "debug": "~2.6.9",
     "dotenv": "^16.3.1",
-    "express": "~4.16.1",
     "mongodb": "^6.1.0",
     "morgan": "~1.9.1",
     "sanitize-html": "^2.11.0",
@@ -23,9 +22,7 @@
   "devDependencies": {
     "@types/cookie-parser": "^1.4.4",
     "@types/cors": "^2.8.14",
-    "@types/express": "^4.17.17",
     "@types/morgan": "^1.9.5",
-    "@types/node": "^20.6.2",
     "@types/sanitize-html": "^2.9.0",
     "@types/swagger-ui-express": "^4.1.4",
     "ts-node": "^10.9.1",

diff --git a/services/question-service/tsconfig.json b/services/question-service/tsconfig.json
@@ -3,6 +3,7 @@
     "target": "es2016",
     "module": "commonjs",
     "resolveJsonModule": true,
+    "rootDir": ".",
     "outDir": "./dist",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,

diff --git a/services/user-service/package.json b/services/user-service/package.json
@@ -20,15 +20,12 @@
   "dependencies": {
     "cors": "^2.8.5",
     "debug": "~2.6.9",
-    "express": "^4.18.2",
     "morgan": "~1.9.1"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.4",
     "@types/cors": "^2.8.14",
-    "@types/express": "^4.17.17",
     "@types/morgan": "^1.9.5",
-    "@types/node": "^20.6.2",
     "@types/supertest": "^2.0.12",
     "dotenv-cli": "^7.3.0",
     "supertest": "^6.3.3",

diff --git a/services/user-service/tsconfig.json b/services/user-service/tsconfig.json
@@ -3,6 +3,7 @@
     "target": "es2016",
     "module": "commonjs",
     "resolveJsonModule": true,
+    "rootDir": ".",
     "outDir": "./dist",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,