From 14908014c3db4fb4d5a3d7a422e50d9760d28091 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Tue, 19 Aug 2025 18:53:30 +0000 Subject: [PATCH 1/4] regen --- settings | 2 +- src/gen/.openapi-generator/COMMIT | 4 ++-- src/gen/http/http.ts | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/settings b/settings index 4954878e7e..06c43a14ef 100644 --- a/settings +++ b/settings @@ -30,4 +30,4 @@ export CLIENT_VERSION="0.8-SNAPSHOT" # Name of the release package export PACKAGE_NAME="@kubernetes/node-client" -export OPENAPI_GENERATOR_COMMIT=3e032bfcfd74b03f33fa5fb3d073286daf5cdbe1 +export OPENAPI_GENERATOR_COMMIT=d06ed32df0a30fe12a1c7ba98722c12e867b6060 diff --git a/src/gen/.openapi-generator/COMMIT b/src/gen/.openapi-generator/COMMIT index 2e148d692c..a56708a808 100644 --- a/src/gen/.openapi-generator/COMMIT +++ b/src/gen/.openapi-generator/COMMIT @@ -1,2 +1,2 @@ -Requested Commit/Tag : 3e032bfcfd74b03f33fa5fb3d073286daf5cdbe1 -Actual Commit : 3e032bfcfd74b03f33fa5fb3d073286daf5cdbe1 +Requested Commit/Tag : d06ed32df0a30fe12a1c7ba98722c12e867b6060 +Actual Commit : d06ed32df0a30fe12a1c7ba98722c12e867b6060 diff --git a/src/gen/http/http.ts b/src/gen/http/http.ts index 525eee647c..79bcf792e0 100644 --- a/src/gen/http/http.ts +++ b/src/gen/http/http.ts @@ -3,7 +3,6 @@ import FormData from "form-data"; import { URL, URLSearchParams } from 'url'; import * as http from 'http'; import * as https from 'https'; -import { AbortSignal } from "node-fetch/externals"; import { Observable, from } from '../rxjsStub.js'; export * from './isomorphic-fetch.js'; From 0ae5ddfbdd5ea9f31b40c458b936f1dcdba94f59 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Tue, 19 Aug 2025 18:58:40 +0000 Subject: [PATCH 2/4] update test --- src/watch.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/watch.ts b/src/watch.ts index 98db927d45..4c51399a62 100644 --- a/src/watch.ts +++ b/src/watch.ts @@ -39,9 +39,10 @@ export class Watch { const requestInit = await this.config.applyToFetchOptions({}); const controller = new AbortController(); + const timeoutSignal = AbortSignal.timeout(30000); + requestInit.signal = AbortSignal.any([controller.signal, timeoutSignal]); requestInit.signal = controller.signal as AbortSignal; requestInit.method = 'GET'; - requestInit.timeout = 30000; let doneCalled: boolean = false; const doneCallOnce = (err: any) => { From c663ee7feb5e110f72a5c7a5a55324bb23200819 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Thu, 21 Aug 2025 17:15:37 +0000 Subject: [PATCH 3/4] update tsconfig --- package.json | 2 +- tsconfig-with-tests.json | 7 +------ tsconfig.json | 5 +---- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 9903e21cd6..052b8a1178 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "lint": "eslint \".\" && prettier --check \"./src/**/*.ts\"", "clean": "rm -Rf node_modules/ dist/", "build": "tsc", - "build-with-tests": "tsc --project tsconfig-with-tests.json && cp 'src/test/echo space.js' dist/test", + "build-with-tests": "tsc && cp 'src/test/echo space.js' dist/test", "generate": "./generate-client.sh", "watch": "tsc --watch", "test": "c8 node --test --test-reporter=spec --import tsx src/*_test.ts", diff --git a/tsconfig-with-tests.json b/tsconfig-with-tests.json index 0542a3e9d5..98928a3edd 100644 --- a/tsconfig-with-tests.json +++ b/tsconfig-with-tests.json @@ -1,9 +1,4 @@ { "extends": "./tsconfig.json", - "exclude": [], - "compilerOptions": { - "paths": { - "node-fetch/externals": ["./node_modules/@types/node-fetch/externals.d.ts"] - } - } + "exclude": [] } diff --git a/tsconfig.json b/tsconfig.json index 18424c2e5c..20caf8fc24 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,10 +16,7 @@ "importHelpers": true, "skipLibCheck": true, "esModuleInterop": true, - "useDefineForClassFields": false, - "paths": { - "node-fetch/externals": ["./node_modules/@types/node-fetch/externals.d.ts"] - } + "useDefineForClassFields": false // enable this in the future // "declarationMap": true }, From 3754a208e86291ad02210c4151a12aee4a473149 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Thu, 21 Aug 2025 17:23:05 +0000 Subject: [PATCH 4/4] revert --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 052b8a1178..9903e21cd6 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "lint": "eslint \".\" && prettier --check \"./src/**/*.ts\"", "clean": "rm -Rf node_modules/ dist/", "build": "tsc", - "build-with-tests": "tsc && cp 'src/test/echo space.js' dist/test", + "build-with-tests": "tsc --project tsconfig-with-tests.json && cp 'src/test/echo space.js' dist/test", "generate": "./generate-client.sh", "watch": "tsc --watch", "test": "c8 node --test --test-reporter=spec --import tsx src/*_test.ts",