summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-09-28 17:59:48 +0200
committerOskar Nyberg <oskar@mullvad.net>2021-09-30 14:25:48 +0200
commit8dbba0decaf05851c007dc1031aca1417efb917d (patch)
treee4d00aa1321146b2329d9d7db969d78bc21053f9
parente764979d1d4a8a780c10f956f71886ae11339b5e (diff)
downloadmullvadvpn-8dbba0decaf05851c007dc1031aca1417efb917d.tar.xz
mullvadvpn-8dbba0decaf05851c007dc1031aca1417efb917d.zip
Update @types/node to latest
-rw-r--r--gui/package-lock.json28
-rw-r--r--gui/package.json2
-rw-r--r--gui/src/main/daemon-rpc.ts2
-rw-r--r--gui/src/renderer/components/WireguardKeys.tsx2
4 files changed, 10 insertions, 24 deletions
diff --git a/gui/package-lock.json b/gui/package-lock.json
index aeef595d1e..01bdfccf26 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -35,7 +35,7 @@
"@types/google-protobuf": "^3.7.2",
"@types/history": "^4.7.8",
"@types/mocha": "^5.2.6",
- "@types/node": "^10.12.3",
+ "@types/node": "^16.10.1",
"@types/node-gettext": "^3.0.1",
"@types/rbush": "^2.0.2",
"@types/react": "^16.9.56",
@@ -531,11 +531,6 @@
"node": "^8.13.0 || >=10.10.0"
}
},
- "node_modules/@grpc/grpc-js/node_modules/@types/node": {
- "version": "16.10.1",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.1.tgz",
- "integrity": "sha512-4/Z9DMPKFexZj/Gn3LylFgamNKHm4K3QDi0gz9B26Uk0c8izYf97B5fxfpspMNkWlFupblKM/nV8+NA9Ffvr+w=="
- },
"node_modules/@gulp-sourcemaps/identity-map": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz",
@@ -990,10 +985,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "10.17.60",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
- "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==",
- "dev": true
+ "version": "16.10.1",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.1.tgz",
+ "integrity": "sha512-4/Z9DMPKFexZj/Gn3LylFgamNKHm4K3QDi0gz9B26Uk0c8izYf97B5fxfpspMNkWlFupblKM/nV8+NA9Ffvr+w=="
},
"node_modules/@types/node-gettext": {
"version": "3.0.1",
@@ -14104,13 +14098,6 @@
"integrity": "sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA==",
"requires": {
"@types/node": ">=12.12.47"
- },
- "dependencies": {
- "@types/node": {
- "version": "16.10.1",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.1.tgz",
- "integrity": "sha512-4/Z9DMPKFexZj/Gn3LylFgamNKHm4K3QDi0gz9B26Uk0c8izYf97B5fxfpspMNkWlFupblKM/nV8+NA9Ffvr+w=="
- }
}
},
"@gulp-sourcemaps/identity-map": {
@@ -14491,10 +14478,9 @@
"dev": true
},
"@types/node": {
- "version": "10.17.60",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
- "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==",
- "dev": true
+ "version": "16.10.1",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.1.tgz",
+ "integrity": "sha512-4/Z9DMPKFexZj/Gn3LylFgamNKHm4K3QDi0gz9B26Uk0c8izYf97B5fxfpspMNkWlFupblKM/nV8+NA9Ffvr+w=="
},
"@types/node-gettext": {
"version": "3.0.1",
diff --git a/gui/package.json b/gui/package.json
index 779740512d..2eb1b8f35b 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -41,7 +41,7 @@
"@types/google-protobuf": "^3.7.2",
"@types/history": "^4.7.8",
"@types/mocha": "^5.2.6",
- "@types/node": "^10.12.3",
+ "@types/node": "^16.10.1",
"@types/node-gettext": "^3.0.1",
"@types/rbush": "^2.0.2",
"@types/react": "^16.9.56",
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index 89360fbc15..9df81f119e 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -125,7 +125,7 @@ export class DaemonRpc {
private connectionObservers: ConnectionObserver[] = [];
private nextSubscriptionId = 0;
private subscriptions: Map<number, grpc.ClientReadableStream<grpcTypes.DaemonEvent>> = new Map();
- private reconnectionTimeout?: number;
+ private reconnectionTimeout?: NodeJS.Timer;
constructor(connectionParams: string) {
this.client = (new ManagementServiceClient(
diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx
index e76820b006..4a45d58d36 100644
--- a/gui/src/renderer/components/WireguardKeys.tsx
+++ b/gui/src/renderer/components/WireguardKeys.tsx
@@ -68,7 +68,7 @@ export default class WireguardKeys extends React.Component<IProps, IState> {
public componentDidMount() {
this.verifyKey();
- this.keyAgeUpdateInterval = setInterval(this.setAgeOfKeyStringState, 60 * 1000);
+ this.keyAgeUpdateInterval = window.setInterval(this.setAgeOfKeyStringState, 60 * 1000);
}
public componentWillUnmount() {