From 3f48bfdb14489ac90b6a82b032833a1f456d0498 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Fri, 1 Oct 2021 16:27:52 -0700 Subject: [PATCH] Update to enable es6Interop. --- src/cp_test.ts | 4 ++-- src/metrics.ts | 2 +- src/metrics_test.ts | 2 +- src/object.ts | 2 +- src/object_test.ts | 2 +- tsconfig.json | 3 ++- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/cp_test.ts b/src/cp_test.ts index c6b5b06968..4e13187394 100644 --- a/src/cp_test.ts +++ b/src/cp_test.ts @@ -1,6 +1,6 @@ import { anything, anyFunction, instance, mock, verify, when } from 'ts-mockito'; import * as querystring from 'querystring'; -import * as WebSocket from 'isomorphic-ws'; +import WebSocket = require('isomorphic-ws'); import { CallAwaiter } from '../test'; import { KubeConfig } from './config'; @@ -44,7 +44,7 @@ describe('Cp', () => { it('should run extract tar command to a url', async () => { const kc = new KubeConfig(); const fakeWebSocketInterface: WebSocketInterface = mock(WebSocketHandler); - const fakeWebSocket: WebSocket = mock(WebSocket); + const fakeWebSocket: WebSocket = mock(WebSocket) as WebSocket; const callAwaiter: CallAwaiter = new CallAwaiter(); const exec = new Exec(kc, instance(fakeWebSocketInterface)); const cp = new Cp(kc, exec); diff --git a/src/metrics.ts b/src/metrics.ts index 765a75eb7b..b1335dadb5 100644 --- a/src/metrics.ts +++ b/src/metrics.ts @@ -1,4 +1,4 @@ -import * as request from 'request'; +import request = require('request'); import { KubeConfig } from './config'; import { HttpError, ObjectSerializer } from './gen/api'; diff --git a/src/metrics_test.ts b/src/metrics_test.ts index c9f6d30889..c5cfc86b27 100644 --- a/src/metrics_test.ts +++ b/src/metrics_test.ts @@ -1,6 +1,6 @@ import { fail } from 'assert'; import { expect } from 'chai'; -import * as nock from 'nock'; +import nock = require('nock'); import { KubeConfig } from './config'; import { V1Status, HttpError } from './gen/api'; import { Metrics, NodeMetricsList, PodMetricsList } from './metrics'; diff --git a/src/object.ts b/src/object.ts index 64ffb7493a..9a0888dd3a 100644 --- a/src/object.ts +++ b/src/object.ts @@ -1,5 +1,5 @@ import * as http from 'http'; -import * as request from 'request'; +import request = require('request'); import { ApisApi, HttpError, diff --git a/src/object_test.ts b/src/object_test.ts index 0c77fd4c53..c5c33d75a3 100644 --- a/src/object_test.ts +++ b/src/object_test.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as nock from 'nock'; +import nock = require('nock'); import { V1APIResource, V1APIResourceList } from './api'; import { KubeConfig } from './config'; import { KubernetesObjectApi } from './object'; diff --git a/tsconfig.json b/tsconfig.json index bf18bad069..3ba4c6949e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,8 @@ "strict": true, "forceConsistentCasingInFileNames": true, "importHelpers": true, - "skipLibCheck": true + "skipLibCheck": true, + "esModuleInterop": true // enable this when it works with tslint, or we switch to prettier // "declarationMap": true },