Skip to content

Fix @types/node conflict with grpc and port type #1258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2021
Merged

Fix @types/node conflict with grpc and port type #1258

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a8ce37
Fix @types/node conflict with grpc and port type
nikhilag May 8, 2021
00bce36
Merge branch 'master' into master
lahirumaramba May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix @types/node conflict with grpc and port type
  • Loading branch information
@nikhilag
nikhilag committed May 8, 2021
commit 6a8ce37f8fc34efb584dd17662590c236eec093f
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/utils/api-request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down