From 6a8ce37f8fc34efb584dd17662590c236eec093f Mon Sep 17 00:00:00 2001
From: Nikhil Agarwal <nikhil@witbybit.com>
Date: Sat, 8 May 2021 11:51:36 +0530
Subject: [PATCH] Fix @types/node conflict with grpc and port type

---
 package-lock.json        | 6 +++---
 package.json             | 2 +-
 src/utils/api-request.ts | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2192ef23ef..41a1cb2db4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -970,9 +970,9 @@
       }
     },
     "@types/node": {
-      "version": "10.17.26",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz",
-      "integrity": "sha512-myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw=="
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz",
+      "integrity": "sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA=="
     },
     "@types/request": {
       "version": "2.48.5",
diff --git a/package.json b/package.json
index 1d5132c8c1..275e785388 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
   "dependencies": {
     "@firebase/database": "^0.10.0",
     "@firebase/database-types": "^0.7.2",
-    "@types/node": "^10.10.0",
+    "@types/node": ">=12.12.47",
     "dicer": "^0.3.0",
     "jsonwebtoken": "^8.5.1",
     "node-forge": "^0.10.0"
diff --git a/src/utils/api-request.ts b/src/utils/api-request.ts
index a41a2f9b48..5b1b153288 100644
--- a/src/utils/api-request.ts
+++ b/src/utils/api-request.ts
@@ -728,7 +728,7 @@ class HttpRequestConfigImpl implements HttpRequestConfig {
   public buildRequestOptions(): https.RequestOptions {
     const parsed = this.buildUrl();
     const protocol = parsed.protocol;
-    let port: string | undefined = parsed.port;
+    let port: string | null = parsed.port;
     if (!port) {
       const isHttps = protocol === 'https:';
       port = isHttps ? '443' : '80';