Skip to content

Commit

Permalink
Upgrade to node 18
Browse files Browse the repository at this point in the history
  • Loading branch information
mustard-mh committed Jun 12, 2024
1 parent f724e81 commit 4906186
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: "yarn"

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Install dependencies
run: |
Expand Down
13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Gitpod",
"description": "Gitpod Support",
"publisher": "gitpod",
"version": "0.0.165",
"version": "0.0.166",
"license": "MIT",
"icon": "resources/gitpod.png",
"repository": {
Expand All @@ -14,7 +14,7 @@
"url": "https://github.com/gitpod-io/gitpod/issues"
},
"engines": {
"vscode": "^1.81.0"
"vscode": "^1.82.0"
},
"categories": [
"Other"
Expand Down Expand Up @@ -65,7 +65,10 @@
"type": "string",
"description": "The log level for ssh proxy.",
"scope": "application",
"enum": ["none", "debug"],
"enum": [
"none",
"debug"
],
"default": "none"
}
}
Expand Down Expand Up @@ -402,7 +405,7 @@
"@types/google-protobuf": "^3.7.4",
"@types/js-yaml": "^4.0.5",
"@types/mocha": "^9.1.1",
"@types/node": "16.x",
"@types/node": "18.x",
"@types/proper-lockfile": "^4.1.2",
"@types/semver": "^7.3.10",
"@types/ssh2": "^0.5.52",
Expand All @@ -429,8 +432,8 @@
"webpack-cli": "^4.7.2"
},
"dependencies": {
"@connectrpc/connect-node": "1.1.2",
"@connectrpc/connect": "1.1.2",
"@connectrpc/connect-node": "1.1.2",
"@gitpod/gitpod-protocol": "main-gha",
"@gitpod/local-app-api-grpcweb": "main-gha",
"@gitpod/public-api": "main-gha",
Expand Down
4 changes: 2 additions & 2 deletions src/heartbeat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ export class HeartbeatManager extends Disposable {
private lastActivity = new Date().getTime();
private lastActivityEvent: string = 'init';
private isWorkspaceRunning = true;
private heartBeatHandle: NodeJS.Timer | undefined;
private heartBeatHandle: ReturnType<typeof setInterval> | undefined;

private eventCounterMap = new Map<string, number>();

private ideHeartbeatTelemetryHandle: NodeJS.Timer | undefined;
private ideHeartbeatTelemetryHandle: ReturnType<typeof setInterval> | undefined;
private ideHeartbeatData: Pick<IDEHeartbeatTelemetryData, 'successfulCount' | 'totalCount'> = {
successfulCount: 0,
totalCount: 0,
Expand Down
2 changes: 1 addition & 1 deletion src/metrics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export function getConnectMetricsInterceptor(): Interceptor {
export class MetricsReporter {
private static readonly REPORT_INTERVAL = 60000;

private intervalHandler: NodeJS.Timer | undefined;
private intervalHandler: ReturnType<typeof setInterval> | undefined;

constructor(
private readonly gitpodHost: string,
Expand Down
15 changes: 11 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -426,10 +426,12 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a"
integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==

"@types/[email protected]":
version "16.11.36"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.36.tgz#9ab9f8276987132ed2b225cace2218ba794fc751"
integrity sha512-FR5QJe+TaoZ2GsMHkjuwoNabr+UrJNRr2HNOo+r/7vhcuntM6Ee/pRPOnRhhL2XE9OOvX9VLEq+BcXl3VjNoWA==
"@types/[email protected]":
version "18.19.34"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.34.tgz#c3fae2bbbdb94b4a52fe2d229d0dccce02ef3d27"
integrity sha512-eXF4pfBNV5DAMKGbI02NnDtWrQ40hAN558/2vvS4gMpMIxaf6JmD7YjnZbq0Q9TDSSkKBamime8ewRoomHdt4g==
dependencies:
undici-types "~5.26.4"

"@types/node@>=12.12.47", "@types/node@>=13.7.0":
version "18.14.2"
Expand Down Expand Up @@ -3993,6 +3995,11 @@ underscore@^1.12.1:
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==

undici-types@~5.26.4:
version "5.26.5"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==

undici@^5.25.4:
version "5.25.4"
resolved "https://registry.yarnpkg.com/undici/-/undici-5.25.4.tgz#7d8ef81d94f84cd384986271e5e5599b6dff4296"
Expand Down

0 comments on commit 4906186

Please sign in to comment.