diff --git a/package.json b/package.json index 7344cde1d3..ce67551b31 100644 --- a/package.json +++ b/package.json @@ -207,7 +207,7 @@ "@astronautlabs/jsonpath": "^1.1.0", "@hapi/call": "^9.0.0", "@hapi/subtext": "^7.0.4", - "@kubernetes/client-node": "^0.16.3", + "@kubernetes/client-node": "^0.17.0", "@material-ui/styles": "^4.11.5", "@ogre-tools/fp": "9.0.1", "@ogre-tools/injectable": "9.0.1", diff --git a/src/jest-28-resolver.js b/src/jest-28-resolver.js index 46a94a5288..9ee76fd788 100644 --- a/src/jest-28-resolver.js +++ b/src/jest-28-resolver.js @@ -21,9 +21,12 @@ module.exports = (path, options) => { // Once we're able to migrate our Jest config to ESM and a browser crypto // implementation is available for the browser+ESM version of uuid to use (eg, via // https://github.com/jsdom/jsdom/pull/3352 or a similar polyfill), this can go away. - if (pkg.name === "uuid") { - delete pkg["exports"]; - delete pkg["module"]; + switch (pkg.name) { + case "uuid": + case "jose": + delete pkg["exports"]; + delete pkg["module"]; + break; } return pkg; diff --git a/src/jest.setup.ts b/src/jest.setup.ts index 2ab9b1b52d..6e7ef2fc85 100644 --- a/src/jest.setup.ts +++ b/src/jest.setup.ts @@ -7,6 +7,7 @@ import fetchMock from "jest-fetch-mock"; import configurePackages from "./common/configure-packages"; import { configure } from "mobx"; import { setImmediate } from "timers"; +import { TextEncoder, TextDecoder as TextDecoderNode } from "util"; // setup default configuration for external npm-packages configurePackages(); @@ -32,3 +33,6 @@ global.fail = ((error = "Test failed without explicit error") => { process.on("unhandledRejection", (err: any) => { global.fail(err); }); + +global.TextEncoder = TextEncoder; +global.TextDecoder = TextDecoderNode as unknown as typeof TextDecoder; diff --git a/yarn.lock b/yarn.lock index cf065c17ae..86768a213c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1058,10 +1058,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@kubernetes/client-node@^0.16.3": - version "0.16.3" - resolved "https://registry.yarnpkg.com/@kubernetes/client-node/-/client-node-0.16.3.tgz#a26a5abbd6e45603b4f75f0baff00e19853e5be7" - integrity sha512-L7IckuyuPfhd+/Urib8MRas9D6sfKEq8IaITYcaE6LlU+Y8MeD7MTbuW6Yb2WdeRuFN8HPSS47mxPnOUNYBXEg== +"@kubernetes/client-node@^0.17.0": + version "0.17.0" + resolved "https://registry.yarnpkg.com/@kubernetes/client-node/-/client-node-0.17.0.tgz#cbf69ff6c8a311c1461275169612ac46db00fe3f" + integrity sha512-oKQfRf7RPpJIF2Ft92g6jefbW3Mddf6IzcfpBNDWrAy66LmyAWds6fQTMsdutGPuXV6KD29u6RfM3rdzddGMIA== dependencies: "@types/js-yaml" "^4.0.1" "@types/node" "^10.12.0" @@ -1075,7 +1075,7 @@ isomorphic-ws "^4.0.1" js-yaml "^4.1.0" jsonpath-plus "^0.19.0" - openid-client "^4.1.1" + openid-client "^5.1.6" request "^2.88.0" rfc4648 "^1.3.0" shelljs "^0.8.5" @@ -1253,11 +1253,6 @@ "@ogre-tools/fp" "^9.0.1" lodash "^4.17.21" -"@panva/asn1.js@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@panva/asn1.js/-/asn1.js-1.0.0.tgz#dd55ae7b8129e02049f009408b97c61ccf9032f6" - integrity sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw== - "@pmmmwh/react-refresh-webpack-plugin@^0.5.7": version "0.5.7" resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.7.tgz#58f8217ba70069cc6a73f5d7e05e85b458c150e2" @@ -2856,7 +2851,7 @@ agentkeepalive@^3.4.1: dependencies: humanize-ms "^1.2.1" -aggregate-error@^3.0.0, aggregate-error@^3.1.0: +aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== @@ -6439,7 +6434,7 @@ globby@^11.0.1, globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -got@^11.8.0, got@^11.8.5: +got@^11.8.5: version "11.8.5" resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046" integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ== @@ -7912,12 +7907,10 @@ joi@^17.6.0: "@sideway/formula" "^3.0.0" "@sideway/pinpoint" "^2.0.0" -jose@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/jose/-/jose-2.0.5.tgz#29746a18d9fff7dcf9d5d2a6f62cb0c7cd27abd3" - integrity sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA== - dependencies: - "@panva/asn1.js" "^1.0.0" +jose@^4.1.4: + version "4.8.3" + resolved "https://registry.yarnpkg.com/jose/-/jose-4.8.3.tgz#5a754fb4aa5f2806608d083f438e6916b11087da" + integrity sha512-7rySkpW78d8LBp4YU70Wb7+OTgE3OwAALNVZxhoIhp4Kscp+p/fBkdpxGAMKxvCAMV4QfXBU9m6l9nX/vGwd2g== joycon@^3.0.1: version "3.1.1" @@ -8739,7 +8732,7 @@ make-dir@^3.0.0, make-dir@^3.1.0: dependencies: semver "^6.0.0" -make-error@^1.1.1, make-error@^1.3.6: +make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== @@ -9765,16 +9758,13 @@ opener@^1.5.2: resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== -openid-client@^4.1.1: - version "4.9.1" - resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-4.9.1.tgz#4f00a9d1566c0fa08f0dd5986cf0e6b1e5d14186" - integrity sha512-DYUF07AHjI3QDKqKbn2F7RqozT4hyi4JvmpodLrq0HHoNP7t/AjeG/uqiBK1/N2PZSAQEThVjDLHSmJN4iqu/w== +openid-client@^5.1.6: + version "5.1.8" + resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-5.1.8.tgz#3a24910288b32c32f548fb6e391f44178ce6370f" + integrity sha512-EPxJY6bT7YIYQEXSGxRC5flQ3GUhLy98ufdto6+BVBrFGPmwjUpy4xBcYuU/Wt9nPkO/3EgljBrr6Ezx4lp1RQ== dependencies: - aggregate-error "^3.1.0" - got "^11.8.0" - jose "^2.0.5" + jose "^4.1.4" lru-cache "^6.0.0" - make-error "^1.3.6" object-hash "^2.0.1" oidc-token-hash "^5.0.1"