From 475ecc1eca86a35379d124c5b2d65520f079e06c Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 22 Aug 2022 13:42:06 -0700 Subject: [PATCH] Use default export to fix issue with package lying with types (#6081) Signed-off-by: Sebastian Malton Signed-off-by: Sebastian Malton --- src/common/k8s-api/__tests__/kube-api.test.ts | 3 +-- src/common/k8s-api/kube-object.store.ts | 2 +- src/common/utils/abort-controller.ts | 2 +- src/renderer/kube-watch-api/kube-watch-api.ts | 6 +----- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/common/k8s-api/__tests__/kube-api.test.ts b/src/common/k8s-api/__tests__/kube-api.test.ts index 75f73a2490..05da1f89d5 100644 --- a/src/common/k8s-api/__tests__/kube-api.test.ts +++ b/src/common/k8s-api/__tests__/kube-api.test.ts @@ -6,7 +6,6 @@ import { forRemoteCluster, KubeApi } from "../kube-api"; import { KubeJsonApi } from "../kube-json-api"; import { KubeObject } from "../kube-object"; -import AbortController from "abort-controller"; import { delay } from "../../utils/delay"; import { PassThrough } from "stream"; import { ApiManager } from "../api-manager"; @@ -15,7 +14,7 @@ import { DeploymentApi, Ingress, IngressApi, Pod, PodApi } from "../endpoints"; import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting"; import apiManagerInjectable from "../api-manager/manager.injectable"; import autoRegistrationInjectable from "../api-manager/auto-registration.injectable"; -import { AbortController } from "abort-controller"; +import AbortController from "abort-controller"; jest.mock("../api-manager"); diff --git a/src/common/k8s-api/kube-object.store.ts b/src/common/k8s-api/kube-object.store.ts index bf511beb27..5412bbc87c 100644 --- a/src/common/k8s-api/kube-object.store.ts +++ b/src/common/k8s-api/kube-object.store.ts @@ -20,7 +20,7 @@ import logger from "../logger"; import assert from "assert"; import type { PartialDeep } from "type-fest"; import { entries } from "../utils/objects"; -import { AbortController } from "abort-controller"; +import AbortController from "abort-controller"; export type OnLoadFailure = (error: unknown) => void; diff --git a/src/common/utils/abort-controller.ts b/src/common/utils/abort-controller.ts index 5550dcc9e3..db40edd6f6 100644 --- a/src/common/utils/abort-controller.ts +++ b/src/common/utils/abort-controller.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { AbortController } from "abort-controller"; +import AbortController from "abort-controller"; /** * This is like an `AbortController` but will also abort if the parent aborts, diff --git a/src/renderer/kube-watch-api/kube-watch-api.ts b/src/renderer/kube-watch-api/kube-watch-api.ts index f38132d84e..95c0442fcb 100644 --- a/src/renderer/kube-watch-api/kube-watch-api.ts +++ b/src/renderer/kube-watch-api/kube-watch-api.ts @@ -9,11 +9,7 @@ import { once } from "lodash"; import type { ClusterFrameContext } from "../cluster-frame-context/cluster-frame-context"; import logger from "../../common/logger"; import type { KubeObjectStoreLoadAllParams, KubeObjectStoreSubscribeParams } from "../../common/k8s-api/kube-object.store"; -import type { RequestInit } from "node-fetch"; -import { AbortController } from "abort-controller"; - -// TODO: upgrade node-fetch once we are starting to use ES modules -type LegacyAbortSignal = NonNullable; +import AbortController from "abort-controller"; // Kubernetes watch-api client // API: https://developer.mozilla.org/en-US/docs/Web/API/Streams_API/Using_readable_streams