From efc81012190fc1f29fd5c39cf47eb661d7401867 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Wed, 25 Jan 2023 10:29:24 +0200 Subject: [PATCH] fix node-fetch package runtime error Signed-off-by: Jari Kolehmainen --- nx.json | 8 +++- packages/core/package.json | 2 +- packages/core/yarn.lock | 39 ------------------- packages/node-fetch/package.json | 11 +++--- packages/node-fetch/tsconfig.json | 1 - packages/node-fetch/webpack.ts | 1 - packages/open-lens/build/download_binaries.ts | 2 +- packages/open-lens/package.json | 2 +- packages/open-lens/webpack/renderer.ts | 1 - packages/open-lens/yarn.lock | 19 +-------- 10 files changed, 17 insertions(+), 69 deletions(-) diff --git a/nx.json b/nx.json index 9d7be8fbe7..9e3776ca75 100644 --- a/nx.json +++ b/nx.json @@ -5,7 +5,8 @@ "options": { "cacheableOperations": [ "build", - "prepare:dev" + "prepare:dev", + "prepare:lint" ] } } @@ -20,6 +21,11 @@ "dependsOn": [ "prepare:dev" ] + }, + "lint": { + "dependsOn": [ + "^prepare:lint" + ] } } } diff --git a/packages/core/package.json b/packages/core/package.json index 6e0617712d..7826d3d226 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -120,6 +120,7 @@ "@astronautlabs/jsonpath": "^1.1.0", "@hapi/call": "^9.0.0", "@hapi/subtext": "^7.0.4", + "@k8slens/node-fetch": "^6.4.0-alpha.4", "@kubernetes/client-node": "^0.18.0", "@material-ui/styles": "^4.11.5", "@ogre-tools/fp": "^12.0.1", @@ -162,7 +163,6 @@ "mobx-utils": "^6.0.4", "moment": "^2.29.4", "moment-timezone": "^0.5.40", - "@k8slens/node-fetch": "^6.4.0-alpha.4", "node-pty": "0.10.1", "npm": "^8.19.3", "p-limit": "^3.1.0", diff --git a/packages/core/yarn.lock b/packages/core/yarn.lock index e18958eddd..ae107288ed 100644 --- a/packages/core/yarn.lock +++ b/packages/core/yarn.lock @@ -4879,11 +4879,6 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -data-uri-to-buffer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b" - integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA== - data-urls@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" @@ -6324,14 +6319,6 @@ fecha@^4.2.0: resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== -fetch-blob@^3.1.2, fetch-blob@^3.1.4: - version "3.2.0" - resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9" - integrity sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ== - dependencies: - node-domexception "^1.0.0" - web-streams-polyfill "^3.0.3" - figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -6599,13 +6586,6 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" -formdata-polyfill@^4.0.10: - version "4.0.10" - resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423" - integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g== - dependencies: - fetch-blob "^3.1.2" - forwarded@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" @@ -9773,20 +9753,6 @@ node-addon-api@^5.0.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501" integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA== -node-domexception@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" - integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== - -node-fetch@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.0.tgz#37e71db4ecc257057af828d523a7243d651d91e4" - integrity sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA== - dependencies: - data-uri-to-buffer "^4.0.0" - fetch-blob "^3.1.4" - formdata-polyfill "^4.0.10" - node-forge@^1, node-forge@^1.2.1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -13475,11 +13441,6 @@ wcwidth@^1.0.0: dependencies: defaults "^1.0.3" -web-streams-polyfill@^3.0.3: - version "3.2.1" - resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6" - integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q== - webidl-conversions@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" diff --git a/packages/node-fetch/package.json b/packages/node-fetch/package.json index 08f69d10a8..bef522c7c2 100644 --- a/packages/node-fetch/package.json +++ b/packages/node-fetch/package.json @@ -4,13 +4,14 @@ "description": "Node fetch for Lens", "license": "MIT", "private": false, - "exports": { - ".": "./dist/index.js" - }, - "types": "./dist/src/index.d.ts", + "main": "./dist/index.js", + "types": "./dist/index.d.ts", "scripts": { "clean": "rm -rf dist/", - "build": "webpack --config webpack.ts" + "build": "webpack --config webpack.ts", + "lint": "exit 0", + "prepare:dev": "yarn run build", + "prepare:lint": "yarn run build" }, "dependencies": { "node-fetch": "^3.3.0" diff --git a/packages/node-fetch/tsconfig.json b/packages/node-fetch/tsconfig.json index 001fc6a2ca..534a5fd447 100644 --- a/packages/node-fetch/tsconfig.json +++ b/packages/node-fetch/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "composite": true, "outDir": "dist/", "paths": { "*": [ diff --git a/packages/node-fetch/webpack.ts b/packages/node-fetch/webpack.ts index 0a8a8d4375..2d39dbd347 100644 --- a/packages/node-fetch/webpack.ts +++ b/packages/node-fetch/webpack.ts @@ -10,7 +10,6 @@ export default { path: path.resolve(__dirname, "dist"), filename: "index.js", library: { - name: "NodeFetch", type: "commonjs", }, clean: true, diff --git a/packages/open-lens/build/download_binaries.ts b/packages/open-lens/build/download_binaries.ts index 36c933de02..5160f331ab 100644 --- a/packages/open-lens/build/download_binaries.ts +++ b/packages/open-lens/build/download_binaries.ts @@ -8,7 +8,7 @@ import { open } from "fs/promises"; import type { WriteStream } from "fs-extra"; import { constants, ensureDir, unlink } from "fs-extra"; import path from "path"; -import type * as FetchModule from "node-fetch"; +import type * as FetchModule from "@k8slens/node-fetch"; import { promisify } from "util"; import { pipeline as _pipeline, Transform, Writable } from "stream"; import type { SingleBar } from "cli-progress"; diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json index 17fa922440..75d79ace08 100644 --- a/packages/open-lens/package.json +++ b/packages/open-lens/package.json @@ -201,6 +201,7 @@ "mobx": "^6.7.0" }, "devDependencies": { + "@k8slens/node-fetch": "^6.4.0-alpha.4", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10", "@swc/core": "^1.3.28", "@swc/jest": "^0.2.24", @@ -212,7 +213,6 @@ "@types/gunzip-maybe": "^1.4.0", "@types/lodash": "^4.14.191", "@types/node": "^16.18.6", - "@types/node-fetch": "^2.6.2", "@types/proper-lockfile": "^4.1.2", "@types/react-dom": "^17.0.16", "@types/react-router-dom": "^5.3.3", diff --git a/packages/open-lens/webpack/renderer.ts b/packages/open-lens/webpack/renderer.ts index baf090202e..48fc524ed9 100644 --- a/packages/open-lens/webpack/renderer.ts +++ b/packages/open-lens/webpack/renderer.ts @@ -50,7 +50,6 @@ ], }, externals: [ - "node-fetch", "npm", "win-ca" ], diff --git a/packages/open-lens/yarn.lock b/packages/open-lens/yarn.lock index ae29047da4..7b8455085c 100644 --- a/packages/open-lens/yarn.lock +++ b/packages/open-lens/yarn.lock @@ -1886,15 +1886,7 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node-fetch@^2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da" - integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A== - dependencies: - "@types/node" "*" - form-data "^3.0.0" - -"@types/node@*", "@types/node@^18.11.17": +"@types/node@*": version "18.11.18" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== @@ -4894,15 +4886,6 @@ form-data@^2.5.0: combined-stream "^1.0.6" mime-types "^2.1.12" -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"