diff --git a/package.json b/package.json index 375fc826ec7f..e40bbdc1998e 100644 --- a/package.json +++ b/package.json @@ -426,7 +426,7 @@ "typed-emitter": "^1.4.0", "typedoc": "0.23.21", "typedoc-plugin-markdown": "^3.13.6", - "typescript": "^4.8.4", + "typescript": "^4.9.3", "typescript-plugin-css-modules": "^3.4.0", "webpack": "^5.75.0", "webpack-cli": "^4.9.2", diff --git a/src/common/utils/readableStream.ts b/src/common/utils/readableStream.ts index 136e18c841d1..59fb5ae4f4e7 100644 --- a/src/common/utils/readableStream.ts +++ b/src/common/utils/readableStream.ts @@ -4,7 +4,6 @@ */ import { Readable } from "readable-stream"; -import type { ReadableStreamDefaultReadResult } from "stream/web"; import type { TypedArray } from "type-fest"; /** @@ -24,8 +23,8 @@ export class ReadableWebToNodeStream extends Readable { * Default web API stream reader * https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader */ - private reader: ReadableStreamReader; - private pendingRead?: Promise>; + private reader: ReadableStreamDefaultReader; + private pendingRead?: Promise>; /** * diff --git a/src/renderer/components/dock/logs/store.ts b/src/renderer/components/dock/logs/store.ts index 53f6f031963b..58462f41db85 100644 --- a/src/renderer/components/dock/logs/store.ts +++ b/src/renderer/components/dock/logs/store.ts @@ -193,8 +193,8 @@ export class LogStore { */ getLastSinceTime(tabId: TabId): string { const logs = this.podLogs.get(tabId) ?? []; - const timestamps = this.getTimestamps(logs[logs.length - 1]); - const stamp = timestamps[0] ? new Date(timestamps[0]) : new Date(); + const [timestamp] = this.getTimestamps(logs[logs.length - 1]) ?? []; + const stamp = timestamp ? new Date(timestamp) : new Date(); stamp.setSeconds(stamp.getSeconds() + 1); // avoid duplicates from last second @@ -211,8 +211,8 @@ export class LogStore { return [extraction[1], extraction[2]]; } - getTimestamps(logs: string): RegExpMatchArray { - return logs.match(/^\d+\S+/gm) ?? []; + getTimestamps(logs: string) { + return logs.match(/^\d+\S+/gm); } removeTimestamps(logs: string): string { diff --git a/yarn.lock b/yarn.lock index e388b958d34b..d1a7a5018c5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12287,10 +12287,10 @@ typescript-plugin-css-modules@^3.4.0: stylus "^0.54.8" tsconfig-paths "^3.9.0" -typescript@^4.8.4: - version "4.8.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" - integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== +typescript@^4.9.3: + version "4.9.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.3.tgz#3aea307c1746b8c384435d8ac36b8a2e580d85db" + integrity sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA== typical@^4.0.0: version "4.0.0"