From c0022c3dc4881c42cbb15355e29ffa53e68d8a32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 08:57:30 -0400
Subject: [PATCH 01/48] Bump eslint-plugin-react from 7.31.8 to 7.31.10 (#6386)

Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.31.8 to 7.31.10.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.31.8...v7.31.10)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a61e2e74bb..d0d487569f 100644
--- a/package.json
+++ b/package.json
@@ -382,7 +382,7 @@
     "eslint": "^8.24.0",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-react": "7.31.8",
+    "eslint-plugin-react": "7.31.10",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-unused-imports": "^2.0.0",
     "flex.box": "^3.4.4",
diff --git a/yarn.lock b/yarn.lock
index 1ce58eac24..6d3ce1d3dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5613,10 +5613,10 @@ eslint-plugin-react-hooks@^4.6.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
   integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
 
-eslint-plugin-react@7.31.8:
-  version "7.31.8"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.8.tgz#3a4f80c10be1bcbc8197be9e8b641b2a3ef219bf"
-  integrity sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==
+eslint-plugin-react@7.31.10:
+  version "7.31.10"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.10.tgz#6782c2c7fe91c09e715d536067644bbb9491419a"
+  integrity sha512-e4N/nc6AAlg4UKW/mXeYWd3R++qUano5/o+t+wnWxIf+bLsOaH3a4q74kX3nDjYym3VBN4HyO9nEn1GcAqgQOA==
   dependencies:
     array-includes "^3.1.5"
     array.prototype.flatmap "^1.3.0"

From 8f87163272d6ce1ec35a08f125cdf3a501463ab4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 08:59:14 -0400
Subject: [PATCH 02/48] Bump @pmmmwh/react-refresh-webpack-plugin from 0.5.7 to
 0.5.8 (#6381)

Bumps [@pmmmwh/react-refresh-webpack-plugin](https://github.com/pmmmwh/react-refresh-webpack-plugin) from 0.5.7 to 0.5.8.
- [Release notes](https://github.com/pmmmwh/react-refresh-webpack-plugin/releases)
- [Changelog](https://github.com/pmmmwh/react-refresh-webpack-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pmmmwh/react-refresh-webpack-plugin/compare/v0.5.7...v0.5.8)

---
updated-dependencies:
- dependency-name: "@pmmmwh/react-refresh-webpack-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index d0d487569f..40b3c17118 100644
--- a/package.json
+++ b/package.json
@@ -298,7 +298,7 @@
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.60",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8",
     "@sentry/types": "^6.19.7",
     "@swc/cli": "^0.1.57",
     "@swc/core": "^1.3.5",
diff --git a/yarn.lock b/yarn.lock
index 6d3ce1d3dd..6e8a01341a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1443,14 +1443,14 @@
     "@ogre-tools/fp" "^11.0.0"
     lodash "^4.17.21"
 
-"@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"
-  integrity sha512-bcKCAzF0DV2IIROp9ZHkRJa6O4jy7NlnHdWL3GmcUxYWNjLXkK5kfELELwEfSP5hXPfVL/qOGMAROuMQb9GG8Q==
+"@pmmmwh/react-refresh-webpack-plugin@^0.5.8":
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.8.tgz#da3383761e2c0c440610819f3204769022a38d12"
+  integrity sha512-wxXRwf+IQ6zvHSJZ+5T2RQNEsq+kx4jKRXfFvdt3nBIUzJUAvXEFsUeoaohDe/Kr84MTjGwcuIUPNcstNJORsA==
   dependencies:
     ansi-html-community "^0.0.8"
     common-path-prefix "^3.0.0"
-    core-js-pure "^3.8.1"
+    core-js-pure "^3.23.3"
     error-stack-parser "^2.0.6"
     find-up "^5.0.0"
     html-entities "^2.1.0"
@@ -4440,15 +4440,10 @@ copy-anything@^2.0.1:
   dependencies:
     is-what "^3.14.1"
 
-core-js-pure@^3.20.2:
-  version "3.22.5"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.5.tgz#bdee0ed2f9b78f2862cda4338a07b13a49b6c9a9"
-  integrity sha512-8xo9R00iYD7TcV7OrC98GwxiUEAabVWO3dix+uyWjnYrx9fyASLlIX+f/3p5dW5qByaP2bcZ8X/T47s55et/tA==
-
-core-js-pure@^3.8.1:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.0.tgz#819adc8dfb808205ce25b51d50591becd615db7e"
-  integrity sha512-VaJUunCZLnxuDbo1rNOzwbet9E1K9joiXS5+DQMPtgxd24wfsZbJZMMfQLGYMlCUvSxLfsRUUhoOR2x28mFfeg==
+core-js-pure@^3.20.2, core-js-pure@^3.23.3:
+  version "3.25.5"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.5.tgz#79716ba54240c6aa9ceba6eee08cf79471ba184d"
+  integrity sha512-oml3M22pHM+igfWHDfdLVq2ShWmjM2V4L+dQEBs0DWVIqEm9WHCwGAlZ6BmyBQGy5sFrJmcx+856D9lVKyGWYg==
 
 core-util-is@1.0.2:
   version "1.0.2"

From dac6d82e279b6686d965460bee2216bc543e4d3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:00:14 -0400
Subject: [PATCH 03/48] Bump electron-builder from 23.3.3 to 23.6.0 (#6379)

Bumps [electron-builder](https://github.com/electron-userland/electron-builder/tree/HEAD/packages/electron-builder) from 23.3.3 to 23.6.0.
- [Release notes](https://github.com/electron-userland/electron-builder/releases)
- [Changelog](https://github.com/electron-userland/electron-builder/blob/master/packages/electron-builder/CHANGELOG.md)
- [Commits](https://github.com/electron-userland/electron-builder/commits/v23.6.0/packages/electron-builder)

---
updated-dependencies:
- dependency-name: electron-builder
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 293 +++++++++------------------------------------------
 2 files changed, 53 insertions(+), 242 deletions(-)

diff --git a/package.json b/package.json
index 40b3c17118..457d24ef44 100644
--- a/package.json
+++ b/package.json
@@ -375,7 +375,7 @@
     "deepdash": "^5.3.9",
     "dompurify": "^2.4.0",
     "electron": "^19.1.1",
-    "electron-builder": "^23.3.3",
+    "electron-builder": "^23.6.0",
     "electron-notarize": "^0.3.0",
     "esbuild": "^0.15.10",
     "esbuild-loader": "^2.20.0",
diff --git a/yarn.lock b/yarn.lock
index 6e8a01341a..0e19f6176c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3085,13 +3085,6 @@ ajv@^8.0.0, ajv@^8.8.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ansi-align@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
-  integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==
-  dependencies:
-    string-width "^4.1.0"
-
 ansi-escapes@^4.2.1:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
@@ -3173,10 +3166,10 @@ app-builder-bin@4.0.0:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
   integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
 
-app-builder-lib@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz#78b9dbb0bd8a69842461edd77a3226d0547c5939"
-  integrity sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ==
+app-builder-lib@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8"
+  integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA==
   dependencies:
     "7zip-bin" "~5.1.1"
     "@develar/schema-utils" "~2.6.5"
@@ -3184,13 +3177,13 @@ app-builder-lib@23.3.3:
     "@malept/flatpak-bundler" "^0.4.0"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
+    builder-util "23.6.0"
+    builder-util-runtime "9.1.1"
     chromium-pickle-js "^0.2.0"
     debug "^4.3.4"
     ejs "^3.1.7"
     electron-osx-sign "^0.6.0"
-    electron-publish "23.3.3"
+    electron-publish "23.6.0"
     form-data "^4.0.0"
     fs-extra "^10.1.0"
     hosted-git-info "^4.1.0"
@@ -3596,20 +3589,6 @@ boolean@^3.0.1:
   resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
   integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
 
-boxen@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50"
-  integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==
-  dependencies:
-    ansi-align "^3.0.0"
-    camelcase "^6.2.0"
-    chalk "^4.1.0"
-    cli-boxes "^2.2.1"
-    string-width "^4.2.2"
-    type-fest "^0.20.2"
-    widest-line "^3.1.0"
-    wrap-ansi "^7.0.0"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3711,25 +3690,25 @@ builder-util-runtime@8.9.2:
     debug "^4.3.2"
     sax "^1.2.4"
 
-builder-util-runtime@9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz#6c62c493ba2b73c2af92432db4013b5a327f02b2"
-  integrity sha512-SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA==
+builder-util-runtime@9.1.1:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60"
+  integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==
   dependencies:
     debug "^4.3.4"
     sax "^1.2.4"
 
-builder-util@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz#449ee57ec1ffc7e59f7a3a8a1a33d25cf5e39e43"
-  integrity sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA==
+builder-util@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9"
+  integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ==
   dependencies:
     "7zip-bin" "~5.1.1"
     "@types/debug" "^4.1.6"
     "@types/fs-extra" "^9.0.11"
     app-builder-bin "4.0.0"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "9.0.3"
+    builder-util-runtime "9.1.1"
     chalk "^4.1.1"
     cross-spawn "^7.0.3"
     debug "^4.3.4"
@@ -3993,11 +3972,6 @@ chromium-pickle-js@^0.2.0:
   resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
   integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
 ci-info@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
@@ -4039,11 +4013,6 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-boxes@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
-  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
-
 cli-columns@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
@@ -4088,13 +4057,13 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
   dependencies:
     string-width "^4.2.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
 clone-deep@^4.0.1:
@@ -4377,18 +4346,6 @@ config-chain@^1.1.11:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-configstore@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
-  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
-  dependencies:
-    dot-prop "^5.2.0"
-    graceful-fs "^4.1.2"
-    make-dir "^3.0.0"
-    unique-string "^2.0.0"
-    write-file-atomic "^3.0.0"
-    xdg-basedir "^4.0.0"
-
 connect-history-api-fallback@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
@@ -4921,14 +4878,14 @@ dlv@^1.1.3:
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
   integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
 
-dmg-builder@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz#b37547f8403c3e9f7c60265a93d902f5b0c395ea"
-  integrity sha512-ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ==
+dmg-builder@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948"
+  integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA==
   dependencies:
-    app-builder-lib "23.3.3"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
+    app-builder-lib "23.6.0"
+    builder-util "23.6.0"
+    builder-util-runtime "9.1.1"
     fs-extra "^10.0.0"
     iconv-lite "^0.6.2"
     js-yaml "^4.1.0"
@@ -5109,23 +5066,23 @@ ejs@^3.1.7:
   dependencies:
     jake "^10.8.5"
 
-electron-builder@^23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz#88d4e584a99b9e36ca4e8432b1163a1ef877355f"
-  integrity sha512-mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw==
+electron-builder@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b"
+  integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw==
   dependencies:
     "@types/yargs" "^17.0.1"
-    app-builder-lib "23.3.3"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
+    app-builder-lib "23.6.0"
+    builder-util "23.6.0"
+    builder-util-runtime "9.1.1"
     chalk "^4.1.1"
-    dmg-builder "23.3.3"
+    dmg-builder "23.6.0"
     fs-extra "^10.0.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
     read-config-file "6.2.0"
-    update-notifier "^5.1.0"
-    yargs "^17.0.1"
+    simple-update-notifier "^1.0.7"
+    yargs "^17.5.1"
 
 electron-devtools-installer@^3.2.0:
   version "3.2.0"
@@ -5157,14 +5114,14 @@ electron-osx-sign@^0.6.0:
     minimist "^1.2.0"
     plist "^3.0.1"
 
-electron-publish@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz#c4125fbb00620acb854f6e994fd3ab3115662ddd"
-  integrity sha512-1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ==
+electron-publish@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9"
+  integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg==
   dependencies:
     "@types/fs-extra" "^9.0.11"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
+    builder-util "23.6.0"
+    builder-util-runtime "9.1.1"
     chalk "^4.1.1"
     fs-extra "^10.0.0"
     lazy-val "^1.0.5"
@@ -5514,11 +5471,6 @@ escalade@^3.1.1:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
-escape-goat@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
-  integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
-
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -6447,13 +6399,6 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
-global-dirs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
-  integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==
-  dependencies:
-    ini "2.0.0"
-
 global-tunnel-ng@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
@@ -6657,11 +6602,6 @@ has-unicode@^2.0.1:
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
-has-yarn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
-  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
-
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -6987,11 +6927,6 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-lazy@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-
 import-local@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
@@ -7038,11 +6973,6 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
-  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
-
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -7166,13 +7096,6 @@ is-callable@^1.1.4, is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
 is-ci@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
@@ -7265,14 +7188,6 @@ is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
   integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
 
-is-installed-globally@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
-  integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
-  dependencies:
-    global-dirs "^3.0.0"
-    is-path-inside "^3.0.2"
-
 is-lambda@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
@@ -7283,11 +7198,6 @@ is-negative-zero@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
-is-npm@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8"
-  integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==
-
 is-number-object@^1.0.4:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
@@ -7383,7 +7293,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -7412,11 +7322,6 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
-is-yarn-global@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
-  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
-
 is2@^2.0.6:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/is2/-/is2-2.0.7.tgz#d084e10cab3bd45d6c9dfde7a48599fcbb93fcac"
@@ -8293,13 +8198,6 @@ kuler@^2.0.0:
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
   integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
 
-latest-version@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
-  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
-  dependencies:
-    package-json "^6.3.0"
-
 lazy-cache@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
@@ -9872,16 +9770,6 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-package-json@^6.3.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
-  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
-  dependencies:
-    got "^9.6.0"
-    registry-auth-token "^4.0.0"
-    registry-url "^5.0.0"
-    semver "^6.2.0"
-
 pacote@^13.0.3, pacote@^13.6.1, pacote@^13.6.2:
   version "13.6.2"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a"
@@ -10451,13 +10339,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pupa@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
-  integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==
-  dependencies:
-    escape-goat "^2.0.0"
-
 q@^1.0.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -10546,7 +10427,7 @@ raw-body@2.5.1:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-rc@^1.2.7, rc@^1.2.8:
+rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -10847,20 +10728,6 @@ regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-registry-auth-token@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
-  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
-  dependencies:
-    rc "^1.2.8"
-
-registry-url@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
-  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
-  dependencies:
-    rc "^1.2.8"
-
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -11225,13 +11092,6 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
 
-semver-diff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
-  integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
-  dependencies:
-    semver "^6.3.0"
-
 semver@^5.6.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -11746,7 +11606,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -12422,13 +12282,6 @@ typed-regex@^0.0.8:
   resolved "https://registry.yarnpkg.com/typed-regex/-/typed-regex-0.0.8.tgz#e791c5e069dfe4af0fd0e1413891f20553be57a1"
   integrity sha512-1XkGm1T/rUngbFROIOw9wPnMAKeMsRoc+c9O6GwOHz6aH/FrJFtcyd2sHASbT0OXeGLot5N1shPNpwHGTv9RdQ==
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -12578,26 +12431,6 @@ unzip-crx-3@^0.2.0:
     mkdirp "^0.5.1"
     yaku "^0.16.6"
 
-update-notifier@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"
-  integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==
-  dependencies:
-    boxen "^5.0.0"
-    chalk "^4.1.0"
-    configstore "^5.0.1"
-    has-yarn "^2.1.0"
-    import-lazy "^2.1.0"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.4.0"
-    is-npm "^5.0.0"
-    is-yarn-global "^0.3.0"
-    latest-version "^5.1.0"
-    pupa "^2.1.1"
-    semver "^7.3.4"
-    semver-diff "^3.1.1"
-    xdg-basedir "^4.0.0"
-
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -13035,13 +12868,6 @@ wide-align@^1.1.5:
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
-widest-line@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
-  integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
-  dependencies:
-    string-width "^4.0.0"
-
 wildcard@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
@@ -13124,16 +12950,6 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
 write-file-atomic@^4.0.0, write-file-atomic@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
@@ -13152,11 +12968,6 @@ ws@^8.2.3, ws@^8.4.2, ws@^8.9.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e"
   integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==
 
-xdg-basedir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
-  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
-
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
@@ -13234,12 +13045,12 @@ yargs-parser@^21.0.0:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
   integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
 
-yargs@^17.0.1, yargs@^17.3.1:
-  version "17.5.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e"
-  integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==
+yargs@^17.3.1, yargs@^17.5.1:
+  version "17.6.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c"
+  integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==
   dependencies:
-    cliui "^7.0.2"
+    cliui "^8.0.1"
     escalade "^3.1.1"
     get-caller-file "^2.0.5"
     require-directory "^2.1.1"

From 10c3a452a4449b70f3bb5ae22fd3188f2dac6f2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:06:07 -0400
Subject: [PATCH 04/48] Bump @types/tar from 6.1.2 to 6.1.3 (#6380)

* Bump @types/tar from 6.1.2 to 6.1.3

Bumps [@types/tar](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/tar) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/tar)

---
updated-dependencies:
- dependency-name: "@types/tar"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix type errors

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Sebastian Malton <sebastian@malton.name>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sebastian Malton <sebastian@malton.name>
---
 package.json            |  2 +-
 src/common/utils/tar.ts |  5 ++---
 yarn.lock               | 17 +++++------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 457d24ef44..8e67bb7b72 100644
--- a/package.json
+++ b/package.json
@@ -350,7 +350,7 @@
     "@types/semver": "^7.3.12",
     "@types/sharp": "^0.31.0",
     "@types/spdy": "^3.4.5",
-    "@types/tar": "^6.1.2",
+    "@types/tar": "^6.1.3",
     "@types/tar-stream": "^2.2.2",
     "@types/tcp-port-used": "^1.0.1",
     "@types/tempy": "^0.3.0",
diff --git a/src/common/utils/tar.ts b/src/common/utils/tar.ts
index 58008dfe9d..3102098976 100644
--- a/src/common/utils/tar.ts
+++ b/src/common/utils/tar.ts
@@ -5,7 +5,6 @@
 
 // Helper for working with tarball files (.tar, .tgz)
 // Docs: https://github.com/npm/node-tar
-import type { FileStat } from "tar";
 import tar from "tar";
 import path from "path";
 import { parse } from "./json";
@@ -35,7 +34,7 @@ export function readFileFromTar<ParseJson extends boolean>({ tarPath, filePath,
       file: tarPath,
       filter: entryPath => path.normalize(entryPath) === filePath,
       sync: true,
-      onentry(entry: FileStat) {
+      onentry(entry) {
         entry.on("data", chunk => {
           fileChunks.push(chunk);
         });
@@ -63,7 +62,7 @@ export async function listTarEntries(filePath: string): Promise<string[]> {
   await tar.list({
     file: filePath,
     onentry: (entry) => {
-      entries.push(path.normalize(entry.path as unknown as string));
+      entries.push(path.normalize(entry.path));
     },
   });
 
diff --git a/yarn.lock b/yarn.lock
index 0e19f6176c..f22177fa21 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2540,10 +2540,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/tar@^6.1.2":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.2.tgz#e60108a7d1b08cc91bf2faf1286cc08fdad48bbe"
-  integrity sha512-bnX3RRm70/n1WMwmevdOAeDU4YP7f5JSubgnuU+yrO+xQQjwDboJj3u2NTJI5ngCQhXihqVVAH5h5J8YpdpEvg==
+"@types/tar@^6.1.3":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.3.tgz#46a2ce7617950c4852dfd7e9cd41aa8161b9d750"
+  integrity sha512-YzDOr5kdAeqS8dcO6NTTHTMJ44MUCBDoLEIyPtwEn7PssKqUYL49R1iCVJPeiPzPlKi6DbH33eZkpeJ27e4vHg==
   dependencies:
     "@types/node" "*"
     minipass "^3.3.5"
@@ -8918,14 +8918,7 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
-  integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
-  dependencies:
-    yallist "^4.0.0"
-
-minipass@^3.3.5:
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6, minipass@^3.3.5:
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.5.tgz#6da7e53a48db8a856eeb9153d85b230a2119e819"
   integrity sha512-rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA==

From 2c8a583bba9c53f4b36a09514b6f1aedc1403bf3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:13:25 -0400
Subject: [PATCH 05/48] Bump @typescript-eslint/parser from 5.39.0 to 5.40.0
 (#6389)

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.39.0 to 5.40.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.40.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 48 +++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 8e67bb7b72..bc8c460dab 100644
--- a/package.json
+++ b/package.json
@@ -362,7 +362,7 @@
     "@types/webpack-env": "^1.18.0",
     "@types/webpack-node-externals": "^2.5.3",
     "@typescript-eslint/eslint-plugin": "^5.39.0",
-    "@typescript-eslint/parser": "^5.39.0",
+    "@typescript-eslint/parser": "^5.40.0",
     "adr": "^1.4.3",
     "ansi_up": "^5.1.0",
     "chart.js": "^2.9.4",
diff --git a/yarn.lock b/yarn.lock
index f22177fa21..5633c77ccc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2701,14 +2701,14 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.39.0":
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.39.0.tgz#93fa0bc980a3a501e081824f6097f7ca30aaa22b"
-  integrity sha512-PhxLjrZnHShe431sBAGHaNe6BDdxAASDySgsBCGxcBecVCi8NQWxQZMcizNA4g0pN51bBAn/FUfkWG3SDVcGlA==
+"@typescript-eslint/parser@^5.40.0":
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.0.tgz#432bddc1fe9154945660f67c1ba6d44de5014840"
+  integrity sha512-Ah5gqyX2ySkiuYeOIDg7ap51/b63QgWZA7w6AHtFrag7aH0lRQPbLzUjk0c9o5/KZ6JRkTTDKShL4AUrQa6/hw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.39.0"
-    "@typescript-eslint/types" "5.39.0"
-    "@typescript-eslint/typescript-estree" "5.39.0"
+    "@typescript-eslint/scope-manager" "5.40.0"
+    "@typescript-eslint/types" "5.40.0"
+    "@typescript-eslint/typescript-estree" "5.40.0"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.39.0":
@@ -2719,6 +2719,14 @@
     "@typescript-eslint/types" "5.39.0"
     "@typescript-eslint/visitor-keys" "5.39.0"
 
+"@typescript-eslint/scope-manager@5.40.0":
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.0.tgz#d6ea782c8e3a2371ba3ea31458dcbdc934668fc4"
+  integrity sha512-d3nPmjUeZtEWRvyReMI4I1MwPGC63E8pDoHy0BnrYjnJgilBD3hv7XOiETKLY/zTwI7kCnBDf2vWTRUVpYw0Uw==
+  dependencies:
+    "@typescript-eslint/types" "5.40.0"
+    "@typescript-eslint/visitor-keys" "5.40.0"
+
 "@typescript-eslint/type-utils@5.39.0":
   version "5.39.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.39.0.tgz#0a8c00f95dce4335832ad2dc6bc431c14e32a0a6"
@@ -2734,6 +2742,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.39.0.tgz#f4e9f207ebb4579fd854b25c0bf64433bb5ed78d"
   integrity sha512-gQMZrnfEBFXK38hYqt8Lkwt8f4U6yq+2H5VDSgP/qiTzC8Nw8JO3OuSUOQ2qW37S/dlwdkHDntkZM6SQhKyPhw==
 
+"@typescript-eslint/types@5.40.0":
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.0.tgz#8de07e118a10b8f63c99e174a3860f75608c822e"
+  integrity sha512-V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw==
+
 "@typescript-eslint/typescript-estree@5.39.0":
   version "5.39.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.39.0.tgz#c0316aa04a1a1f4f7f9498e3c13ef1d3dc4cf88b"
@@ -2747,6 +2760,19 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.40.0":
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz#e305e6a5d65226efa5471ee0f12e0ffaab6d3075"
+  integrity sha512-b0GYlDj8TLTOqwX7EGbw2gL5EXS2CPEWhF9nGJiGmEcmlpNBjyHsTwbqpyIEPVpl6br4UcBOYlcI2FJVtJkYhg==
+  dependencies:
+    "@typescript-eslint/types" "5.40.0"
+    "@typescript-eslint/visitor-keys" "5.40.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/utils@5.39.0":
   version "5.39.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.39.0.tgz#b7063cca1dcf08d1d21b0d91db491161ad0be110"
@@ -2767,6 +2793,14 @@
     "@typescript-eslint/types" "5.39.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.40.0":
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.0.tgz#dd2d38097f68e0d2e1e06cb9f73c0173aca54b68"
+  integrity sha512-ijJ+6yig+x9XplEpG2K6FUdJeQGGj/15U3S56W9IqXKJqleuD7zJ2AX/miLezwxpd7ZxDAqO87zWufKg+RPZyQ==
+  dependencies:
+    "@typescript-eslint/types" "5.40.0"
+    eslint-visitor-keys "^3.3.0"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"

From 8df55efbb592836ad06de7481dab2add5ff14a1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:13:47 -0400
Subject: [PATCH 06/48] Bump playwright from 1.26.1 to 1.27.0 (#6390)

Bumps [playwright](https://github.com/Microsoft/playwright) from 1.26.1 to 1.27.0.
- [Release notes](https://github.com/Microsoft/playwright/releases)
- [Commits](https://github.com/Microsoft/playwright/compare/v1.26.1...v1.27.0)

---
updated-dependencies:
- dependency-name: playwright
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index bc8c460dab..9d6f9e4615 100644
--- a/package.json
+++ b/package.json
@@ -402,7 +402,7 @@
     "node-gyp": "^8.3.0",
     "node-loader": "^2.0.0",
     "nodemon": "^2.0.20",
-    "playwright": "^1.26.1",
+    "playwright": "^1.27.0",
     "postcss": "^8.4.17",
     "postcss-loader": "^6.2.1",
     "query-string": "^7.1.1",
diff --git a/yarn.lock b/yarn.lock
index 5633c77ccc..0ae3b9926b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10001,17 +10001,17 @@ pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
-playwright-core@1.26.1:
-  version "1.26.1"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.26.1.tgz#a162f476488312dcf12638d97685144de6ada512"
-  integrity sha512-hzFchhhxnEiPc4qVPs9q2ZR+5eKNifY2hQDHtg1HnTTUuphYCBP8ZRb2si+B1TR7BHirgXaPi48LIye5SgrLAA==
+playwright-core@1.27.0:
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.27.0.tgz#e5f9d2bc19ebdd9581a01e74f019bb91aa7cf55d"
+  integrity sha512-VBKaaFUVKDo3akW+o4DwbK1ZyXh46tcSwQKPK3lruh8IJd5feu55XVZx4vOkbb2uqrNdIF51sgsadYT533SdpA==
 
-playwright@^1.26.1:
-  version "1.26.1"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.26.1.tgz#0082c1d6a1c9cefe3f7a593396ad8568746184d0"
-  integrity sha512-WQmEdCgYYe8jOEkhkW9QLcK0PB+w1RZztBLYIT10MEEsENYg251cU0IzebDINreQsUt+HCwwRhtdz4weH9ICcQ==
+playwright@^1.27.0:
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.27.0.tgz#68a0e29f1756da105b22291a7c3f402ae749213a"
+  integrity sha512-F+0+0RD03LS+KdNAMMp63OBzu+NwYYLd52pKLczuSlTsV5b/SLkUoNhSfzDFngEFOuRL2gk0LlfGW3mKiUBk6w==
   dependencies:
-    playwright-core "1.26.1"
+    playwright-core "1.27.0"
 
 plist@^3.0.1, plist@^3.0.4:
   version "3.0.5"

From 4a769a9b96f9d2999b19fb29f81702b05097fe5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:16:20 -0400
Subject: [PATCH 07/48] Bump joi from 17.6.2 to 17.6.3 (#6388)

Bumps [joi](https://github.com/hapijs/joi) from 17.6.2 to 17.6.3.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Commits](https://github.com/hapijs/joi/compare/v17.6.2...v17.6.3)

---
updated-dependencies:
- dependency-name: joi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9d6f9e4615..3d390fb0a1 100644
--- a/package.json
+++ b/package.json
@@ -246,7 +246,7 @@
     "history": "^4.10.1",
     "http-proxy": "^1.18.1",
     "immer": "^9.0.15",
-    "joi": "^17.6.2",
+    "joi": "^17.6.3",
     "js-yaml": "^4.1.0",
     "jsdom": "^16.7.0",
     "lodash": "^4.17.15",
diff --git a/yarn.lock b/yarn.lock
index 0ae3b9926b..112ba6e6a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7862,10 +7862,10 @@ jest@^28.1.3:
     import-local "^3.0.2"
     jest-cli "^28.1.3"
 
-joi@^17.6.2:
-  version "17.6.2"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.2.tgz#00ac55ce6495596545cce45309f38738cfbd7cd3"
-  integrity sha512-+gqqdh1xc1wb+Lor0J9toqgeReyDOCqOdG8QSdRcEvwrcRiFQZneUCGKjFjuyBWUb3uaFOgY56yMaZ5FIc+H4w==
+joi@^17.6.3:
+  version "17.6.3"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.3.tgz#b8e9e143f0188884563e6de50f8b23ddcd3cb2f5"
+  integrity sha512-YlQsIaS9MHYekzf1Qe11LjTkNzx9qhYluK3172z38RxYoAUf82XMX1p1DG1H4Wtk2ED/vPdSn9OggqtDu+aTow==
   dependencies:
     "@hapi/hoek" "^9.0.0"
     "@hapi/topo" "^5.0.0"

From dfcbfa49e0d39fa8e2ef9ce4c25a10151e653604 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:33:02 -0400
Subject: [PATCH 08/48] Bump typedoc from 0.23.15 to 0.23.16 (#6391)

Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.23.15 to 0.23.16.
- [Release notes](https://github.com/TypeStrong/TypeDoc/releases)
- [Changelog](https://github.com/TypeStrong/typedoc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TypeStrong/TypeDoc/compare/v0.23.15...v0.23.16)

---
updated-dependencies:
- dependency-name: typedoc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3d390fb0a1..089d2dc628 100644
--- a/package.json
+++ b/package.json
@@ -425,7 +425,7 @@
     "ts-node": "^10.9.1",
     "type-fest": "^2.14.0",
     "typed-emitter": "^1.4.0",
-    "typedoc": "0.23.15",
+    "typedoc": "0.23.16",
     "typedoc-plugin-markdown": "^3.13.6",
     "typescript": "^4.8.4",
     "typescript-plugin-css-modules": "^3.4.0",
diff --git a/yarn.lock b/yarn.lock
index 112ba6e6a2..75ccc448f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12321,10 +12321,10 @@ typedoc-plugin-markdown@^3.13.6:
   dependencies:
     handlebars "^4.7.7"
 
-typedoc@0.23.15:
-  version "0.23.15"
-  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.15.tgz#6d995c47d34e5785dadffe0ebc28372bd019e5e5"
-  integrity sha512-x9Zu+tTnwxb9YdVr+zvX7LYzyBl1nieOr6lrSHbHsA22/RJK2m4Y525WIg5Mj4jWCmfL47v6f4hUzY7EIuwS5w==
+typedoc@0.23.16:
+  version "0.23.16"
+  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.16.tgz#09881ada725c2190ac5d3bb0edadcc5bfeda4bfe"
+  integrity sha512-rumYsCeNRXlyuZVzefD7050n7ptL2uudsCJg50dY0v/stKniqIlRpvx/F/6expC0/Q6Dbab+g/JpZuB7Sw90FA==
   dependencies:
     lunr "^2.3.9"
     marked "^4.0.19"

From 6fa26dd0e0866cb18dcb9c7846e70da59ea33cb8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:33:23 -0400
Subject: [PATCH 09/48] Bump @typescript-eslint/eslint-plugin from 5.39.0 to
 5.40.0 (#6393)

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.39.0 to 5.40.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.40.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 75 +++++++++++++++-------------------------------------
 2 files changed, 22 insertions(+), 55 deletions(-)

diff --git a/package.json b/package.json
index 089d2dc628..c689c98038 100644
--- a/package.json
+++ b/package.json
@@ -361,7 +361,7 @@
     "@types/webpack-dev-server": "^4.7.2",
     "@types/webpack-env": "^1.18.0",
     "@types/webpack-node-externals": "^2.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.39.0",
+    "@typescript-eslint/eslint-plugin": "^5.40.0",
     "@typescript-eslint/parser": "^5.40.0",
     "adr": "^1.4.3",
     "ansi_up": "^5.1.0",
diff --git a/yarn.lock b/yarn.lock
index 75ccc448f5..cc202a40d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2687,14 +2687,14 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^5.39.0":
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.39.0.tgz#778b2d9e7f293502c7feeea6c74dca8eb3e67511"
-  integrity sha512-xVfKOkBm5iWMNGKQ2fwX5GVgBuHmZBO1tCRwXmY5oAIsPscfwm2UADDuNB8ZVYCtpQvJK4xpjrK7jEhcJ0zY9A==
+"@typescript-eslint/eslint-plugin@^5.40.0":
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.0.tgz#0159bb71410eec563968288a17bd4478cdb685bd"
+  integrity sha512-FIBZgS3DVJgqPwJzvZTuH4HNsZhHMa9SjxTKAZTlMsPw/UzpEjcf9f4dfgDJEHjK+HboUJo123Eshl6niwEm/Q==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.39.0"
-    "@typescript-eslint/type-utils" "5.39.0"
-    "@typescript-eslint/utils" "5.39.0"
+    "@typescript-eslint/scope-manager" "5.40.0"
+    "@typescript-eslint/type-utils" "5.40.0"
+    "@typescript-eslint/utils" "5.40.0"
     debug "^4.3.4"
     ignore "^5.2.0"
     regexpp "^3.2.0"
@@ -2711,14 +2711,6 @@
     "@typescript-eslint/typescript-estree" "5.40.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.39.0":
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.39.0.tgz#873e1465afa3d6c78d8ed2da68aed266a08008d0"
-  integrity sha512-/I13vAqmG3dyqMVSZPjsbuNQlYS082Y7OMkwhCfLXYsmlI0ca4nkL7wJ/4gjX70LD4P8Hnw1JywUVVAwepURBw==
-  dependencies:
-    "@typescript-eslint/types" "5.39.0"
-    "@typescript-eslint/visitor-keys" "5.39.0"
-
 "@typescript-eslint/scope-manager@5.40.0":
   version "5.40.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.0.tgz#d6ea782c8e3a2371ba3ea31458dcbdc934668fc4"
@@ -2727,39 +2719,21 @@
     "@typescript-eslint/types" "5.40.0"
     "@typescript-eslint/visitor-keys" "5.40.0"
 
-"@typescript-eslint/type-utils@5.39.0":
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.39.0.tgz#0a8c00f95dce4335832ad2dc6bc431c14e32a0a6"
-  integrity sha512-KJHJkOothljQWzR3t/GunL0TPKY+fGJtnpl+pX+sJ0YiKTz3q2Zr87SGTmFqsCMFrLt5E0+o+S6eQY0FAXj9uA==
+"@typescript-eslint/type-utils@5.40.0":
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.40.0.tgz#4964099d0158355e72d67a370249d7fc03331126"
+  integrity sha512-nfuSdKEZY2TpnPz5covjJqav+g5qeBqwSHKBvz7Vm1SAfy93SwKk/JeSTymruDGItTwNijSsno5LhOHRS1pcfw==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.39.0"
-    "@typescript-eslint/utils" "5.39.0"
+    "@typescript-eslint/typescript-estree" "5.40.0"
+    "@typescript-eslint/utils" "5.40.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.39.0":
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.39.0.tgz#f4e9f207ebb4579fd854b25c0bf64433bb5ed78d"
-  integrity sha512-gQMZrnfEBFXK38hYqt8Lkwt8f4U6yq+2H5VDSgP/qiTzC8Nw8JO3OuSUOQ2qW37S/dlwdkHDntkZM6SQhKyPhw==
-
 "@typescript-eslint/types@5.40.0":
   version "5.40.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.0.tgz#8de07e118a10b8f63c99e174a3860f75608c822e"
   integrity sha512-V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw==
 
-"@typescript-eslint/typescript-estree@5.39.0":
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.39.0.tgz#c0316aa04a1a1f4f7f9498e3c13ef1d3dc4cf88b"
-  integrity sha512-qLFQP0f398sdnogJoLtd43pUgB18Q50QSA+BTE5h3sUxySzbWDpTSdgt4UyxNSozY/oDK2ta6HVAzvGgq8JYnA==
-  dependencies:
-    "@typescript-eslint/types" "5.39.0"
-    "@typescript-eslint/visitor-keys" "5.39.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
 "@typescript-eslint/typescript-estree@5.40.0":
   version "5.40.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz#e305e6a5d65226efa5471ee0f12e0ffaab6d3075"
@@ -2773,25 +2747,18 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.39.0":
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.39.0.tgz#b7063cca1dcf08d1d21b0d91db491161ad0be110"
-  integrity sha512-+DnY5jkpOpgj+EBtYPyHRjXampJfC0yUZZzfzLuUWVZvCuKqSdJVC8UhdWipIw7VKNTfwfAPiOWzYkAwuIhiAg==
+"@typescript-eslint/utils@5.40.0":
+  version "5.40.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.40.0.tgz#647f56a875fd09d33c6abd70913c3dd50759b772"
+  integrity sha512-MO0y3T5BQ5+tkkuYZJBjePewsY+cQnfkYeRqS6tPh28niiIwPnQ1t59CSRcs1ZwJJNOdWw7rv9pF8aP58IMihA==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.39.0"
-    "@typescript-eslint/types" "5.39.0"
-    "@typescript-eslint/typescript-estree" "5.39.0"
+    "@typescript-eslint/scope-manager" "5.40.0"
+    "@typescript-eslint/types" "5.40.0"
+    "@typescript-eslint/typescript-estree" "5.40.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
-
-"@typescript-eslint/visitor-keys@5.39.0":
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.39.0.tgz#8f41f7d241b47257b081ddba5d3ce80deaae61e2"
-  integrity sha512-yyE3RPwOG+XJBLrhvsxAidUgybJVQ/hG8BhiJo0k8JSAYfk/CshVcxf0HwP4Jt7WZZ6vLmxdo1p6EyN3tzFTkg==
-  dependencies:
-    "@typescript-eslint/types" "5.39.0"
-    eslint-visitor-keys "^3.3.0"
+    semver "^7.3.7"
 
 "@typescript-eslint/visitor-keys@5.40.0":
   version "5.40.0"

From bf9a4de379939823497f7b40f88be56ef4725bb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:50:47 -0400
Subject: [PATCH 10/48] Bump eslint from 8.24.0 to 8.25.0 (#6394)

Bumps [eslint](https://github.com/eslint/eslint) from 8.24.0 to 8.25.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.24.0...v8.25.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 24 +++++++++---------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index c689c98038..d56854adc1 100644
--- a/package.json
+++ b/package.json
@@ -379,7 +379,7 @@
     "electron-notarize": "^0.3.0",
     "esbuild": "^0.15.10",
     "esbuild-loader": "^2.20.0",
-    "eslint": "^8.24.0",
+    "eslint": "^8.25.0",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-react": "7.31.10",
diff --git a/yarn.lock b/yarn.lock
index cc202a40d3..636eb5a300 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -608,10 +608,10 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.10.tgz#78a42897c2cf8db9fd5f1811f7590393b77774c7"
   integrity sha512-w0Ou3Z83LOYEkwaui2M8VwIp+nLi/NA60lBLMvaJ+vXVMcsARYdEzLNE7RSm4+lSg4zq4d7fAVuzk7PNQ5JFgg==
 
-"@eslint/eslintrc@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.2.tgz#58b69582f3b7271d8fa67fe5251767a5b38ea356"
-  integrity sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==
+"@eslint/eslintrc@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
+  integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -748,11 +748,6 @@
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
-  integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
-
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
@@ -5626,14 +5621,13 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^8.24.0:
-  version "8.24.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.24.0.tgz#489516c927a5da11b3979dbfb2679394523383c8"
-  integrity sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==
+eslint@^8.25.0:
+  version "8.25.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.25.0.tgz#00eb962f50962165d0c4ee3327708315eaa8058b"
+  integrity sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==
   dependencies:
-    "@eslint/eslintrc" "^1.3.2"
+    "@eslint/eslintrc" "^1.3.3"
     "@humanwhocodes/config-array" "^0.10.5"
-    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
     "@humanwhocodes/module-importer" "^1.0.1"
     ajv "^6.10.0"
     chalk "^4.0.0"

From 393470e012016281a6a48477545dd6e7e88aa0ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:52:17 -0400
Subject: [PATCH 11/48] Bump @swc/core from 1.3.5 to 1.3.6 (#6392)

Bumps [@swc/core](https://github.com/swc-project/swc) from 1.3.5 to 1.3.6.
- [Release notes](https://github.com/swc-project/swc/releases)
- [Changelog](https://github.com/swc-project/swc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/swc-project/swc/compare/v1.3.5...v1.3.6)

---
updated-dependencies:
- dependency-name: "@swc/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 138 +++++++++++++++++++++++++--------------------------
 2 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/package.json b/package.json
index d56854adc1..7ec12a7f15 100644
--- a/package.json
+++ b/package.json
@@ -301,7 +301,7 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8",
     "@sentry/types": "^6.19.7",
     "@swc/cli": "^0.1.57",
-    "@swc/core": "^1.3.5",
+    "@swc/core": "^1.3.6",
     "@swc/jest": "^0.2.23",
     "@testing-library/dom": "^7.31.2",
     "@testing-library/jest-dom": "^5.16.5",
diff --git a/yarn.lock b/yarn.lock
index 636eb5a300..0b738fbecd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1616,101 +1616,101 @@
     slash "3.0.0"
     source-map "^0.7.3"
 
-"@swc/core-android-arm-eabi@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.3.5.tgz#01a4234f0b67d0ddba5076e55584fc40d3c225d8"
-  integrity sha512-gIq3fuXiRMtVhTf2ZQ9Z6JeuqvL30JOM0L+S6zAZD4v8lpGJ1ejpw7rghpAsGSG9Qc9oaNjx5yayTg3z/EtBzA==
+"@swc/core-android-arm-eabi@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.3.6.tgz#0b127ccc7e6ea3e652e250afc3322d17aacec664"
+  integrity sha512-FQk/4cRRDoMPLgSm/1WvEqRqlSgBb6Twd5W13NYUbXJpzPGoPHhzwaCEbpGjPKG/OvAqA2NVrWquuJjhDvQyVQ==
   dependencies:
     "@swc/wasm" "1.2.122"
 
-"@swc/core-android-arm64@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.3.5.tgz#5f4b918bb6cab80ff7462c0d5bda9654d462843b"
-  integrity sha512-SsRA6AhNZK8YXBbv7DAp5Zgv4tOWvPJlEBoOZ0uLIot7oYghWvSVs3jOgEzJSbQLU5U7ad6Q6boBdg0Q/kb2Ew==
+"@swc/core-android-arm64@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.3.6.tgz#9f0e76328ef35793157dfe84a40499a2f437981b"
+  integrity sha512-6qjZYatlFAN0IKhhYFsN+BaywooHFpK9/A/jMkjgIfbUoDz3wPJWZc2MDvcttgqZ+cfsSCcGeNw++H894z1zfw==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-darwin-arm64@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.5.tgz#1502be83c9415ead13f56342c17d639abdb4183f"
-  integrity sha512-Jyem+f3/aTKJTRzyvdSfYS358jo7245g7nWmwmhQMgZI3/z2VcYHpIIYOi+dgsBaMRevK9tbsW0TSx805Njzjw==
+"@swc/core-darwin-arm64@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.6.tgz#9a87819bf4879a165a7b4b868577f76dc94562e3"
+  integrity sha512-2qjaABxA7cloVTkS+uDEcVQ5buSi8de7qEv6P6InDE/iCjnI5ALyDxn7eauJJsVKimh9DyqN9sSZJ/z9U4FDUQ==
 
-"@swc/core-darwin-x64@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.5.tgz#14eeda0ac5481bcaaf96ef86cc471c8c040ef38f"
-  integrity sha512-zW1tfS000RlHcqKp1HJK5vXBR0/AHw74qzOK0uh/G1cTczFDX2Hep4IuOxSJ1+7Zx9oFEOKSEY0lPXYbDAlF2w==
+"@swc/core-darwin-x64@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.6.tgz#804109765a69d8d7dab09d55f4bf0918254b3cf3"
+  integrity sha512-+OtW18d2o3RUuXodB41ZDj0iRCeXNL0OxVU0jTl7iyCWDypmCzhalbaQXD/ZJxgnpGRB7/s2ZwNR/gzjXgz9VA==
 
-"@swc/core-freebsd-x64@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.3.5.tgz#a940f72168acf8c46ade544ce89e2b053469fd9d"
-  integrity sha512-H2f0NkfqYDC6+vJO6wSBwiGnnR/cK9AQx574izPw3Utmb28zC+FOPAY63QLA/orNHjwHa6B6AuVDNwYuKUrRHQ==
+"@swc/core-freebsd-x64@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.3.6.tgz#f5450dede877f61cee427c1ea16165eb74fcfe36"
+  integrity sha512-f+ePNodn7ET9qEa93VMfnsPNnubWKIkn0EfxmfzJCt/abNVZ7+DyCSABfWKkexOZ8OuNyxnBCdKLL6nlizxkhQ==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-linux-arm-gnueabihf@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.5.tgz#574449cee392019319e3f12c6f1f08ebd65bcbec"
-  integrity sha512-PvuhjUCsNQDtwSSXWmmF6tU8jnAcFVRZt6bBNltvPW48oHNmIq9lEZ+hJTSPvqqxLvi9W7HG5ADzsTAaciKeRw==
+"@swc/core-linux-arm-gnueabihf@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.6.tgz#851871559363783818ee38725a6391b83ed3aff0"
+  integrity sha512-JwdJmqKzsdq7Itg5ssKDEY9mP3AkQ+XENF6WXXlaNu1U/InqQhD0DqsFzw4TQ4LzB7lB7Wj+dv3JjKIhnHNNag==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-linux-arm64-gnu@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.5.tgz#bcdff8e6e89d0b4618844e52f8f292c9edf706fe"
-  integrity sha512-NQ1LVrIvAsSwSoKO6DzHQMxzpvo17v/2LREqBiaNuCwDyYg2yFdgUdVW4FcbrdBK4MurRA2HFZZ/rt5DqAg3+A==
+"@swc/core-linux-arm64-gnu@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.6.tgz#2afd9f3d4f2b051b79ed9f3549ccc8fa81ca6809"
+  integrity sha512-sRoPnwYFX+t95S7khi4KL2lZMZwbuzvPUf8NYmtTzfqVIseo8HD6IMgyeaQHYDfwDGF5elQGi4ALjRx2huSi0Q==
 
-"@swc/core-linux-arm64-musl@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.5.tgz#01669a577d8edd45a30e8a86eac0ed9bc54bb0f5"
-  integrity sha512-DDcM3ciJRBBjyN7qqw/AEEFh61YjiuxOcZ5SqYR0wyfroqOFX1+5JtCGJ9mU2MZ4Vfmxb1v5IFoQ3nfgJDcd8g==
+"@swc/core-linux-arm64-musl@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.6.tgz#607cc220c8640f2d36e4e2426784a6a0fc55fa1e"
+  integrity sha512-XT8vRcxGaKujiplFfuMtGRgZ3Nx611TMVLUg91alzEIe2Adtrpaumzrwv2vqVdMr4X4GBK9z0rHsqkDLPhmuaw==
 
-"@swc/core-linux-x64-gnu@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.5.tgz#167dbf0bfa3594c68c8d73cfee7c16ef07d75c78"
-  integrity sha512-AJR0J+b3jMmXuIxqhgrX/7vworHjciUPZuoyY2OrIhSXwMPVbWfb72h9oQdMbARfodTFLVJGQqy2Pij67+C0GQ==
+"@swc/core-linux-x64-gnu@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.6.tgz#725386afc5092cf945245ba0d500f6fc1411efd9"
+  integrity sha512-nip81Ngcx8cory+FtapKhXb/rgh/pTAlvTiwJjMhsE3xcKRsbnJEPMVIoArCBV0BmYJBLWvOtpHf8B62JS7L5w==
 
-"@swc/core-linux-x64-musl@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.5.tgz#80ecafd2d007db69149924dc755513ff6f4b0403"
-  integrity sha512-+Ig/rJ/GOZyQgCO72PFR+oJYUee0zQRsd6fpeuE66rn8P07a26WY1ZfMGw8miWcURccjDgAc1XCwVn6wa/OTCw==
+"@swc/core-linux-x64-musl@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.6.tgz#b59ac6a51192713a500b81b558979e56761b5e0a"
+  integrity sha512-IzrQB67BY/rSZPJXWU3XzpkJqh4vYkYuOUmz1yrV/vxgPjJp/kUllfBYsHCiIedb7sjvfTt409SIN0FlPJY2+Q==
 
-"@swc/core-win32-arm64-msvc@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.5.tgz#035b5afe2052ba0ba5f43c5e701f5adabc0aa420"
-  integrity sha512-9Go5jiGWToT+00/J26E92n/JIHqG2wcaw79Z1+Z7GHrrm5TeL0VMyTMGLMeGFvtje/j+Lv0y4XKed+dKnRvc5w==
+"@swc/core-win32-arm64-msvc@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.6.tgz#50b7c16904f159dca5d4b29225dd55c11626ac95"
+  integrity sha512-gLsE/4qgqTxy0OOFJKi9QRs9mVYv4yOXSwPB2Rb+grOmNnG+Ds2LWqGEaABKDErnUtTQiOzLpdwesNZxeJgMhA==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-win32-ia32-msvc@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.5.tgz#6f3dc877626376b3bc9f394d39da66bfae25e7ce"
-  integrity sha512-AIeD5uKVkvXTAbKAwyPFubFrXmQR77PNun59DHZWtRpxgOcHqK6xug9DfUSfc2zMw/ftEe9kNruUUS96023jfQ==
+"@swc/core-win32-ia32-msvc@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.6.tgz#8e9d55586184b2a11978fe9dbc9a8a3a16d2e54a"
+  integrity sha512-0Jr7KMGEPapYGni+97oNOeVP7edBwjMGQ9HsJUUN1uIE7fALQ+zVGuwbc+22myql2Uhh5V5hZx5xtVraqLVMHw==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-win32-x64-msvc@1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.5.tgz#87f285df2a334c4114bbc47ecd20f27b1ca2fa0b"
-  integrity sha512-GtrAkUo5xVTogwTDH9Zms7LELdTKyRll+K9o87P+YOEizCUvA0BPE1N4mu+ZqsI/dv56g2N4gNCD8RVLH3HekQ==
+"@swc/core-win32-x64-msvc@1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.6.tgz#a3c2bcf71b26cc4984adce4bfefb214664ce3b01"
+  integrity sha512-O3F/jxqaFwGq9XxYeCIVRCDIR4+GdSBu/5io6TkN8O5QLqB3/KOJVDn6TALtbL6ClwjUwZt66HKnYeSx19j2Ow==
 
-"@swc/core@^1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.5.tgz#7f8812325b2c7f304c1d09dc6f2d38e4fb96ed45"
-  integrity sha512-H5YNI9rCViudhEmu9g/Yc8ai6k5/pfy+ItYns0SZ+iSZen+bgWeGb+9p4KRQhzNNC8Lfkfw+ENHzSwZltpWG6Q==
+"@swc/core@^1.3.6":
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.6.tgz#909af865ee5044fe138ff85b40afb5d171d621a1"
+  integrity sha512-L3EemOWywrxXsRQFeU50PYFwrDKOxi2RGTT+TT3CcbIszwc7qnE6vsVzEll/eK32H1veicc0EegkZgtD4PFNRA==
   optionalDependencies:
-    "@swc/core-android-arm-eabi" "1.3.5"
-    "@swc/core-android-arm64" "1.3.5"
-    "@swc/core-darwin-arm64" "1.3.5"
-    "@swc/core-darwin-x64" "1.3.5"
-    "@swc/core-freebsd-x64" "1.3.5"
-    "@swc/core-linux-arm-gnueabihf" "1.3.5"
-    "@swc/core-linux-arm64-gnu" "1.3.5"
-    "@swc/core-linux-arm64-musl" "1.3.5"
-    "@swc/core-linux-x64-gnu" "1.3.5"
-    "@swc/core-linux-x64-musl" "1.3.5"
-    "@swc/core-win32-arm64-msvc" "1.3.5"
-    "@swc/core-win32-ia32-msvc" "1.3.5"
-    "@swc/core-win32-x64-msvc" "1.3.5"
+    "@swc/core-android-arm-eabi" "1.3.6"
+    "@swc/core-android-arm64" "1.3.6"
+    "@swc/core-darwin-arm64" "1.3.6"
+    "@swc/core-darwin-x64" "1.3.6"
+    "@swc/core-freebsd-x64" "1.3.6"
+    "@swc/core-linux-arm-gnueabihf" "1.3.6"
+    "@swc/core-linux-arm64-gnu" "1.3.6"
+    "@swc/core-linux-arm64-musl" "1.3.6"
+    "@swc/core-linux-x64-gnu" "1.3.6"
+    "@swc/core-linux-x64-musl" "1.3.6"
+    "@swc/core-win32-arm64-msvc" "1.3.6"
+    "@swc/core-win32-ia32-msvc" "1.3.6"
+    "@swc/core-win32-x64-msvc" "1.3.6"
 
 "@swc/jest@^0.2.23":
   version "0.2.23"

From 19631f064d5b52b2926639b7219aec011eebfd48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:56:38 -0400
Subject: [PATCH 12/48] Bump @types/node from 16.11.64 to 16.11.65 (#6395)

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 16.11.64 to 16.11.65.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7ec12a7f15..13e2be83ed 100644
--- a/package.json
+++ b/package.json
@@ -331,7 +331,7 @@
     "@types/md5-file": "^4.0.2",
     "@types/mini-css-extract-plugin": "^2.4.0",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^16.11.64",
+    "@types/node": "^16.11.65",
     "@types/node-fetch": "^2.6.2",
     "@types/npm": "^2.0.32",
     "@types/proper-lockfile": "^4.1.2",
diff --git a/yarn.lock b/yarn.lock
index 0b738fbecd..ee3713a991 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2271,10 +2271,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.24.tgz#20ba1bf69c1b4ab405c7a01e950c4f446b05029f"
   integrity sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g==
 
-"@types/node@^16.11.26", "@types/node@^16.11.64":
-  version "16.11.64"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.64.tgz#9171f327298b619e2c52238b120c19056415d820"
-  integrity sha512-z5hPTlVFzNwtJ2LNozTpJcD1Cu44c4LNuzaq1mwxmiHWQh2ULdR6Vjwo1UGldzRpzL0yUEdZddnfqGW2G70z6Q==
+"@types/node@^16.11.26", "@types/node@^16.11.65":
+  version "16.11.65"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.65.tgz#59500b86af757d6fcabd3dec32fecb6e357d7a45"
+  integrity sha512-Vfz7wGMOr4jbQGiQHVJm8VjeQwM9Ya7mHe9LtQ264/Epf5n1KiZShOFqk++nBzw6a/ubgYdB9Od7P+MH/LjoWw==
 
 "@types/npm@^2.0.32":
   version "2.0.32"

From 078bee4a379748d3885292afab46b92bea441734 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 10:03:47 -0400
Subject: [PATCH 13/48] Bump electron from 19.1.1 to 19.1.2 (#6396)

Bumps [electron](https://github.com/electron/electron) from 19.1.1 to 19.1.2.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v19.1.1...v19.1.2)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 13e2be83ed..8e9b9637a1 100644
--- a/package.json
+++ b/package.json
@@ -374,7 +374,7 @@
     "css-loader": "^6.7.1",
     "deepdash": "^5.3.9",
     "dompurify": "^2.4.0",
-    "electron": "^19.1.1",
+    "electron": "^19.1.2",
     "electron-builder": "^23.6.0",
     "electron-notarize": "^0.3.0",
     "esbuild": "^0.15.10",
diff --git a/yarn.lock b/yarn.lock
index ee3713a991..f08316ed57 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5150,10 +5150,10 @@ electron-window-state@^5.0.3:
     jsonfile "^4.0.0"
     mkdirp "^0.5.1"
 
-electron@^19.1.1:
-  version "19.1.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.1.tgz#f2b7b0dbc02701091a451e2f807097f387231455"
-  integrity sha512-cVjX+vYH431iNdIpDXU1cfx83heS/lkPVorpaiERSPcycwiZYFtE5xjL8XAARV11TG+AmN4gxBFMSb9R7DhStw==
+electron@^19.1.2:
+  version "19.1.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.2.tgz#4b0858b74a76be6998af103a6d81f3784d93e7dc"
+  integrity sha512-KbKz9eFfm10aBYWJ5dwR/73Y9L8gjflXUSSYzBZSW2FJEEaNk3ZtxGMw77iAocQU/G8tCZ7fNxQq/vNI2Foz+g==
   dependencies:
     "@electron/get" "^1.14.1"
     "@types/node" "^16.11.26"

From da91347121de9bc9671b6cf71887ef9a4b1b6573 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 11 Oct 2022 16:04:08 +0200
Subject: [PATCH 14/48] Clickable links in pods details for ServiceAccount,
 PriorityClass and RuntimeClass (#6352)

* Clickable links in pods details

Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>

* Make linter happy

Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>

* Use withInjectables

Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>

* ServiceAccounts are namespaced

Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>

* Revert legacy APIs

Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>

* Make linter happy

Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>

Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>
---
 .../+workloads-pods/pod-details.tsx           | 57 ++++++++++++++++---
 1 file changed, 50 insertions(+), 7 deletions(-)

diff --git a/src/renderer/components/+workloads-pods/pod-details.tsx b/src/renderer/components/+workloads-pods/pod-details.tsx
index da87515355..726c5326b6 100644
--- a/src/renderer/components/+workloads-pods/pod-details.tsx
+++ b/src/renderer/components/+workloads-pods/pod-details.tsx
@@ -10,11 +10,11 @@ import kebabCase from "lodash/kebabCase";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { Link } from "react-router-dom";
 import { observable, reaction, makeObservable } from "mobx";
-import type { NodeApi } from "../../../common/k8s-api/endpoints";
 import { Pod } from "../../../common/k8s-api/endpoints";
+import type { NodeApi, PriorityClassApi, RuntimeClassApi, ServiceAccountApi } from "../../../common/k8s-api/endpoints";
 import { DrawerItem, DrawerTitle } from "../drawer";
 import { Badge } from "../badge";
-import { cssNames, toJS } from "../../utils";
+import { cssNames, stopPropagation, toJS } from "../../utils";
 import { PodDetailsContainer } from "./pod-details-container";
 import { PodDetailsAffinities } from "./pod-details-affinities";
 import { PodDetailsTolerations } from "./pod-details-tolerations";
@@ -35,6 +35,9 @@ import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.inject
 import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
 import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
 import nodeApiInjectable from "../../../common/k8s-api/endpoints/node.api.injectable";
+import runtimeClassApiInjectable from "../../../common/k8s-api/endpoints/runtime-class.api.injectable";
+import serviceAccountApiInjectable from "../../../common/k8s-api/endpoints/service-account.api.injectable";
+import priorityClassApiInjectable from "../../../common/k8s-api/endpoints/priority-class.api.injectable";
 
 export interface PodDetailsProps extends KubeObjectDetailsProps<Pod> {
 }
@@ -44,6 +47,9 @@ interface Dependencies {
   getActiveClusterEntity: GetActiveClusterEntity;
   getDetailsUrl: GetDetailsUrl;
   nodeApi: NodeApi;
+  priorityClassApi: PriorityClassApi;
+  runtimeClassApi: RuntimeClassApi;
+  serviceAccountApi: ServiceAccountApi;
 }
 
 @observer
@@ -94,6 +100,22 @@ class NonInjectedPodDetails extends React.Component<PodDetailsProps & Dependenci
     const initContainers = pod.getInitContainers();
     const containers = pod.getContainers();
 
+    const namespace = pod.getNs();
+    const priorityClassName = pod.getPriorityClassName();
+    const runtimeClassName = pod.getRuntimeClassName();
+    const serviceAccountName = pod.getServiceAccountName();
+
+    const priorityClassDetailsUrl = getDetailsUrl(this.props.priorityClassApi.getUrl({
+      name: priorityClassName,
+    }));
+    const runtimeClassDetailsUrl = getDetailsUrl(this.props.runtimeClassApi.getUrl({
+      name: runtimeClassName,
+    }));
+    const serviceAccountDetailsUrl = getDetailsUrl(this.props.serviceAccountApi.getUrl({
+      name: serviceAccountName,
+      namespace,
+    }));
+
     return (
       <div className="PodDetails">
         {!isMetricHidden && (
@@ -130,16 +152,34 @@ class NonInjectedPodDetails extends React.Component<PodDetailsProps & Dependenci
           {podIPs.map(label => <Badge key={label} label={label} />)}
         </DrawerItem>
         <DrawerItem name="Service Account">
-          {pod.getServiceAccountName()}
+          <Link
+            key="link"
+            to={serviceAccountDetailsUrl}
+            onClick={stopPropagation}
+          >
+            {serviceAccountName}
+          </Link>
         </DrawerItem>
-        <DrawerItem name="Priority Class" hidden={pod.getPriorityClassName() === ""}>
-          {pod.getPriorityClassName()}
+        <DrawerItem name="Priority Class" hidden={priorityClassName === ""}>
+          <Link
+            key="link"
+            to={priorityClassDetailsUrl}
+            onClick={stopPropagation}
+          >
+            {priorityClassName}
+          </Link>
         </DrawerItem>
         <DrawerItem name="QoS Class">
           {pod.getQosClass()}
         </DrawerItem>
-        <DrawerItem name="Runtime Class" hidden={pod.getRuntimeClassName() === ""}>
-          {pod.getRuntimeClassName()}
+        <DrawerItem name="Runtime Class" hidden={runtimeClassName === ""}>
+          <Link
+            key="link"
+            to={runtimeClassDetailsUrl}
+            onClick={stopPropagation}
+          >
+            {runtimeClassName}
+          </Link>
         </DrawerItem>
 
         <DrawerItem
@@ -207,5 +247,8 @@ export const PodDetails = withInjectables<Dependencies, PodDetailsProps>(NonInje
     getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
     getDetailsUrl: di.inject(getDetailsUrlInjectable),
     nodeApi: di.inject(nodeApiInjectable),
+    priorityClassApi: di.inject(priorityClassApiInjectable),
+    runtimeClassApi: di.inject(runtimeClassApiInjectable),
+    serviceAccountApi: di.inject(serviceAccountApiInjectable),
   }),
 });

From f021d9d0db90af492d581746822622adb7a30469 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Tue, 11 Oct 2022 10:40:02 -0400
Subject: [PATCH 15/48] Change notification when extension is not found (#5184)

* Change notification when extension is not found

- Removes legacy downloadFile and downloadJson in favour of using
  `node-fetch`

- A notification will be displayed if the URL provided results in a
  status of 404

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Resolve PR comments

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../fetch/download-binary.injectable.ts       |  56 ++++++
 src/common/fetch/download-json.injectable.ts  |  56 ++++++
 src/common/fetch/fetch.injectable.ts          |   4 +-
 src/common/fetch/timeout-controller.ts        |  17 ++
 src/common/utils/camelCase.ts                 |  12 +-
 src/common/utils/downloadFile.ts              |  53 ------
 src/common/utils/index.ts                     |   1 -
 src/common/utils/type-narrowing.ts            |   2 +-
 .../navigation-using-application-menu.test.ts |   8 +
 .../+extensions/__tests__/extensions.test.tsx |  49 +++---
 .../attempt-install-by-info.injectable.tsx    | 164 +++++++++++++-----
 .../attempt-install.injectable.ts             |  30 ----
 .../attempt-install.injectable.tsx            | 148 ++++++++++++++++
 .../attempt-install/attempt-install.tsx       | 126 --------------
 ...ate-temp-files-and-validate.injectable.tsx |  97 +++++++++++
 ...ate-temp-files-and-validate.injectable.tsx | 104 -----------
 .../get-extension-dest-folder.injectable.ts   |  11 +-
 .../attempt-install/install-request.ts        |   8 -
 .../unpack-extension.injectable.tsx           | 115 ++++++++++++
 .../unpack-extension.injectable.tsx           | 130 --------------
 .../validate-package.tsx                      |  18 +-
 .../attempt-installs.injectable.ts            |  27 +--
 .../components/+extensions/extensions.tsx     |   5 +-
 ...nstall-extension-from-input.injectable.tsx |  27 ++-
 ...tall-from-select-file-dialog.injectable.ts |   2 +-
 .../+extensions/install-on-drop.injectable.ts |  26 +++
 .../install-on-drop.injectable.ts             |  18 --
 .../install-on-drop/install-on-drop.tsx       |  16 --
 .../components/+extensions/install.tsx        |   4 +-
 src/renderer/components/input/input.tsx       |   3 +-
 30 files changed, 735 insertions(+), 602 deletions(-)
 create mode 100644 src/common/fetch/download-binary.injectable.ts
 create mode 100644 src/common/fetch/download-json.injectable.ts
 create mode 100644 src/common/fetch/timeout-controller.ts
 delete mode 100644 src/common/utils/downloadFile.ts
 delete mode 100644 src/renderer/components/+extensions/attempt-install/attempt-install.injectable.ts
 create mode 100644 src/renderer/components/+extensions/attempt-install/attempt-install.injectable.tsx
 delete mode 100644 src/renderer/components/+extensions/attempt-install/attempt-install.tsx
 create mode 100644 src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx
 delete mode 100644 src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.injectable.tsx
 rename src/renderer/components/+extensions/attempt-install/{get-extension-dest-folder => }/get-extension-dest-folder.injectable.ts (51%)
 delete mode 100644 src/renderer/components/+extensions/attempt-install/install-request.ts
 create mode 100644 src/renderer/components/+extensions/attempt-install/unpack-extension.injectable.tsx
 delete mode 100644 src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.injectable.tsx
 rename src/renderer/components/+extensions/attempt-install/{validate-package => }/validate-package.tsx (69%)
 rename src/renderer/components/+extensions/{attempt-installs => }/attempt-installs.injectable.ts (53%)
 create mode 100644 src/renderer/components/+extensions/install-on-drop.injectable.ts
 delete mode 100644 src/renderer/components/+extensions/install-on-drop/install-on-drop.injectable.ts
 delete mode 100644 src/renderer/components/+extensions/install-on-drop/install-on-drop.tsx

diff --git a/src/common/fetch/download-binary.injectable.ts b/src/common/fetch/download-binary.injectable.ts
new file mode 100644
index 0000000000..27ef43d59b
--- /dev/null
+++ b/src/common/fetch/download-binary.injectable.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { RequestInit, Response } from "node-fetch";
+import type { AsyncResult } from "../utils/async-result";
+import fetchInjectable from "./fetch.injectable";
+
+export interface DownloadBinaryOptions {
+  signal?: AbortSignal | null | undefined;
+}
+
+export type DownloadBinary = (url: string, opts?: DownloadBinaryOptions) => Promise<AsyncResult<Buffer, string>>;
+
+const downloadBinaryInjectable = getInjectable({
+  id: "download-binary",
+  instantiate: (di): DownloadBinary => {
+    const fetch = di.inject(fetchInjectable);
+
+    return async (url, opts) => {
+      let result: Response;
+
+      try {
+        // TODO: upgrade node-fetch once we switch to ESM
+        result = await fetch(url, opts as RequestInit);
+      } catch (error) {
+        return {
+          callWasSuccessful: false,
+          error: String(error),
+        };
+      }
+
+      if (result.status < 200 || 300 <= result.status) {
+        return {
+          callWasSuccessful: false,
+          error: result.statusText,
+        };
+      }
+
+      try {
+        return {
+          callWasSuccessful: true,
+          response: await result.buffer(),
+        };
+      } catch (error) {
+        return {
+          callWasSuccessful: false,
+          error: String(error),
+        };
+      }
+    };
+  },
+});
+
+export default downloadBinaryInjectable;
diff --git a/src/common/fetch/download-json.injectable.ts b/src/common/fetch/download-json.injectable.ts
new file mode 100644
index 0000000000..503cd373ec
--- /dev/null
+++ b/src/common/fetch/download-json.injectable.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { RequestInit, Response } from "node-fetch";
+import type { JsonValue } from "type-fest";
+import type { AsyncResult } from "../utils/async-result";
+import fetchInjectable from "./fetch.injectable";
+
+export interface DownloadJsonOptions {
+  signal?: AbortSignal | null | undefined;
+}
+
+export type DownloadJson = (url: string, opts?: DownloadJsonOptions) => Promise<AsyncResult<JsonValue, string>>;
+
+const downloadJsonInjectable = getInjectable({
+  id: "download-json",
+  instantiate: (di): DownloadJson => {
+    const fetch = di.inject(fetchInjectable);
+
+    return async (url, opts) => {
+      let result: Response;
+
+      try {
+        result = await fetch(url, opts as RequestInit);
+      } catch (error) {
+        return {
+          callWasSuccessful: false,
+          error: String(error),
+        };
+      }
+
+      if (result.status < 200 || 300 <= result.status) {
+        return {
+          callWasSuccessful: false,
+          error: result.statusText,
+        };
+      }
+
+      try {
+        return {
+          callWasSuccessful: true,
+          response: await result.json(),
+        };
+      } catch (error) {
+        return {
+          callWasSuccessful: false,
+          error: String(error),
+        };
+      }
+    };
+  },
+});
+
+export default downloadJsonInjectable;
diff --git a/src/common/fetch/fetch.injectable.ts b/src/common/fetch/fetch.injectable.ts
index c6d2a7e1af..c4c30bc2d8 100644
--- a/src/common/fetch/fetch.injectable.ts
+++ b/src/common/fetch/fetch.injectable.ts
@@ -3,10 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { RequestInfo, RequestInit, Response } from "node-fetch";
 import fetch from "node-fetch";
+import type { RequestInit, Response } from "node-fetch";
 
-export type Fetch = (url: RequestInfo, init?: RequestInit) => Promise<Response>;
+export type Fetch = (url: string, init?: RequestInit) => Promise<Response>;
 
 const fetchInjectable = getInjectable({
   id: "fetch",
diff --git a/src/common/fetch/timeout-controller.ts b/src/common/fetch/timeout-controller.ts
new file mode 100644
index 0000000000..702becdc9d
--- /dev/null
+++ b/src/common/fetch/timeout-controller.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+/**
+ * Creates an AbortController with an associated timeout
+ * @param timeout The number of milliseconds before this controller will auto abort
+ */
+export function withTimeout(timeout: number): AbortController {
+  const controller = new AbortController();
+  const id = setTimeout(() => controller.abort(), timeout);
+
+  controller.signal.addEventListener("abort", () => clearTimeout(id));
+
+  return controller;
+}
diff --git a/src/common/utils/camelCase.ts b/src/common/utils/camelCase.ts
index 3ef727a2e5..a37e4c7f5c 100644
--- a/src/common/utils/camelCase.ts
+++ b/src/common/utils/camelCase.ts
@@ -6,7 +6,8 @@
 // Convert object's keys to camelCase format
 import { camelCase } from "lodash";
 import type { SingleOrMany } from "./types";
-import { isObject } from "./type-narrowing";
+import { isObject, isString } from "./type-narrowing";
+import * as object from "./objects";
 
 export function toCamelCase<T extends Record<string, unknown>[]>(obj: T): T;
 export function toCamelCase<T extends Record<string, unknown>>(obj: T): T;
@@ -17,11 +18,10 @@ export function toCamelCase(obj: SingleOrMany<Record<string, unknown> | unknown>
   }
 
   if (isObject(obj)) {
-    return Object.fromEntries(
-      Object.entries(obj)
-        .map(([key, value]) => {
-          return [camelCase(key), toCamelCase(value)];
-        }),
+    return object.fromEntries(
+      object.entries(obj)
+        .filter((pair): pair is [string, unknown] => isString(pair[0]))
+        .map(([key, value]) => [camelCase(key), isObject(value) ? toCamelCase(value) : value]),
     );
   }
 
diff --git a/src/common/utils/downloadFile.ts b/src/common/utils/downloadFile.ts
deleted file mode 100644
index 5f3e658aa6..0000000000
--- a/src/common/utils/downloadFile.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import request from "request";
-import type { JsonValue } from "type-fest";
-import { parse } from "./json";
-
-export interface DownloadFileOptions {
-  url: string;
-  gzip?: boolean;
-  timeout?: number;
-}
-
-export interface DownloadFileTicket<T> {
-  url: string;
-  promise: Promise<T>;
-  cancel(): void;
-}
-
-export function downloadFile({ url, timeout, gzip = true }: DownloadFileOptions): DownloadFileTicket<Buffer> {
-  const fileChunks: Buffer[] = [];
-  const req = request(url, { gzip, timeout });
-  const promise: Promise<Buffer> = new Promise((resolve, reject) => {
-    req.on("data", (chunk: Buffer) => {
-      fileChunks.push(chunk);
-    });
-    req.once("error", err => {
-      reject({ url, err });
-    });
-    req.once("complete", () => {
-      resolve(Buffer.concat(fileChunks));
-    });
-  });
-
-  return {
-    url,
-    promise,
-    cancel() {
-      req.abort();
-    },
-  };
-}
-
-export function downloadJson(args: DownloadFileOptions): DownloadFileTicket<JsonValue> {
-  const { promise, ...rest } = downloadFile(args);
-
-  return {
-    promise: promise.then(res => parse(res.toString())),
-    ...rest,
-  };
-}
diff --git a/src/common/utils/index.ts b/src/common/utils/index.ts
index a9acaede86..36e77c6e79 100644
--- a/src/common/utils/index.ts
+++ b/src/common/utils/index.ts
@@ -14,7 +14,6 @@ export * from "./convertMemory";
 export * from "./debouncePromise";
 export * from "./delay";
 export * from "./disposer";
-export * from "./downloadFile";
 export * from "./escapeRegExp";
 export * from "./formatDuration";
 export * from "./getRandId";
diff --git a/src/common/utils/type-narrowing.ts b/src/common/utils/type-narrowing.ts
index eb5b6996cf..d2d33929a2 100644
--- a/src/common/utils/type-narrowing.ts
+++ b/src/common/utils/type-narrowing.ts
@@ -103,7 +103,7 @@ export function isBoolean(val: unknown): val is boolean {
  * checks if val is of type object and isn't null
  * @param val the value to be checked
  */
-export function isObject(val: unknown): val is object {
+export function isObject(val: unknown): val is Record<string | symbol | number, unknown> {
   return typeof val === "object" && val !== null;
 }
 
diff --git a/src/features/extensions/navigation-using-application-menu.test.ts b/src/features/extensions/navigation-using-application-menu.test.ts
index a9e7e23b74..8533b216f7 100644
--- a/src/features/extensions/navigation-using-application-menu.test.ts
+++ b/src/features/extensions/navigation-using-application-menu.test.ts
@@ -6,6 +6,8 @@
 import type { RenderResult } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import downloadBinaryInjectable, { type DownloadBinary } from "../../common/fetch/download-binary.injectable";
+import downloadJsonInjectable, { type DownloadJson } from "../../common/fetch/download-json.injectable";
 import focusWindowInjectable from "../../renderer/navigation/focus-window.injectable";
 
 // TODO: Make components free of side effects by making them deterministic
@@ -15,14 +17,20 @@ describe("extensions - navigation using application menu", () => {
   let builder: ApplicationBuilder;
   let rendered: RenderResult;
   let focusWindowMock: jest.Mock;
+  let downloadJson: jest.MockedFunction<DownloadJson>;
+  let downloadBinary: jest.MockedFunction<DownloadBinary>;
 
   beforeEach(async () => {
     builder = getApplicationBuilder();
 
     builder.beforeWindowStart((windowDi) => {
       focusWindowMock = jest.fn();
+      downloadJson = jest.fn().mockImplementation((url) => { throw new Error(`Unexpected call to downloadJson for url=${url}`); });
+      downloadBinary = jest.fn().mockImplementation((url) => { throw new Error(`Unexpected call to downloadJson for url=${url}`); });
 
       windowDi.override(focusWindowInjectable, () => focusWindowMock);
+      windowDi.override(downloadJsonInjectable, () => downloadJson);
+      windowDi.override(downloadBinaryInjectable, () => downloadBinary);
     });
 
     rendered = await builder.render();
diff --git a/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/src/renderer/components/+extensions/__tests__/extensions.test.tsx
index 52843d8b3d..27db8da81a 100644
--- a/src/renderer/components/+extensions/__tests__/extensions.test.tsx
+++ b/src/renderer/components/+extensions/__tests__/extensions.test.tsx
@@ -25,23 +25,10 @@ import extensionInstallationStateStoreInjectable from "../../../../extensions/ex
 import { observable, when } from "mobx";
 import type { DeleteFile } from "../../../../common/fs/delete-file.injectable";
 import deleteFileInjectable from "../../../../common/fs/delete-file.injectable";
-
-jest.mock("../../notifications");
-
-jest.mock("../../../../common/utils/downloadFile", () => ({
-  downloadFile: jest.fn(({ url }) => ({
-    promise: Promise.resolve(),
-    url,
-    cancel: () => {},
-  })),
-  downloadJson: jest.fn(({ url }) => ({
-    promise: Promise.resolve({}),
-    url,
-    cancel: () => { },
-  })),
-}));
-
-jest.mock("../../../../common/utils/tar");
+import type { DownloadJson } from "../../../../common/fetch/download-json.injectable";
+import type { DownloadBinary } from "../../../../common/fetch/download-binary.injectable";
+import downloadJsonInjectable from "../../../../common/fetch/download-json.injectable";
+import downloadBinaryInjectable from "../../../../common/fetch/download-binary.injectable";
 
 describe("Extensions", () => {
   let extensionLoader: ExtensionLoader;
@@ -50,6 +37,8 @@ describe("Extensions", () => {
   let extensionInstallationStateStore: ExtensionInstallationStateStore;
   let render: DiRender;
   let deleteFileMock: jest.MockedFunction<DeleteFile>;
+  let downloadJson: jest.MockedFunction<DownloadJson>;
+  let downloadBinary: jest.MockedFunction<DownloadBinary>;
 
   beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
@@ -65,6 +54,12 @@ describe("Extensions", () => {
     deleteFileMock = jest.fn();
     di.override(deleteFileInjectable, () => deleteFileMock);
 
+    downloadJson = jest.fn().mockImplementation((url) => { throw new Error(`Unexpected call to downloadJson for url=${url}`); });
+    di.override(downloadJsonInjectable, () => downloadJson);
+
+    downloadBinary = jest.fn().mockImplementation((url) => { throw new Error(`Unexpected call to downloadJson for url=${url}`); });
+    di.override(downloadBinaryInjectable, () => downloadBinary);
+
     extensionLoader = di.inject(extensionLoaderInjectable);
     extensionDiscovery = di.inject(extensionDiscoveryInjectable);
     extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable);
@@ -110,7 +105,7 @@ describe("Extensions", () => {
     // Approve confirm dialog
     fireEvent.click(await screen.findByText("Yes"));
 
-    await waitFor(() => {
+    await waitFor(async () => {
       expect(extensionDiscovery.uninstallExtension).toHaveBeenCalled();
       fireEvent.click(menuTrigger);
       expect(screen.getByText("Disable")).toHaveAttribute("aria-disabled", "true");
@@ -124,6 +119,7 @@ describe("Extensions", () => {
     render(<Extensions />);
 
     const resolveInstall = observable.box(false);
+    const url = "https://test.extensionurl/package.tgz";
 
     deleteFileMock.mockReturnValue(Promise.resolve());
     installExtensionFromInput.mockImplementation(async (input) => {
@@ -139,13 +135,26 @@ describe("Extensions", () => {
       exact: false,
     }), {
       target: {
-        value: "https://test.extensionurl/package.tgz",
+        value: url,
       },
     });
 
+    const doResolve = observable.box(false);
+
+    downloadBinary.mockImplementation(async (targetUrl) => {
+      expect(targetUrl).toBe(url);
+
+      await when(() => doResolve.get());
+
+      return {
+        callWasSuccessful: false,
+        error: "unknown location",
+      };
+    });
+
     fireEvent.click(await screen.findByText("Install"));
     expect((await screen.findByText("Install")).closest("button")).toBeDisabled();
-    resolveInstall.set(true);
+    doResolve.set(true);
   });
 
   it("displays spinner while extensions are loading", () => {
diff --git a/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx b/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx
index 36f6b2afc4..317162cc9f 100644
--- a/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx
+++ b/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx
@@ -2,8 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { downloadFile, downloadJson } from "../../../common/utils";
-import { Notifications } from "../notifications";
+import { isObject } from "../../../common/utils";
 import React from "react";
 import { SemVer } from "semver";
 import URLParse from "url-parse";
@@ -14,6 +13,12 @@ import extensionInstallationStateStoreInjectable from "../../../extensions/exten
 import confirmInjectable from "../confirm-dialog/confirm.injectable";
 import { reduce } from "lodash";
 import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable";
+import { withTimeout } from "../../../common/fetch/timeout-controller";
+import downloadBinaryInjectable from "../../../common/fetch/download-binary.injectable";
+import downloadJsonInjectable from "../../../common/fetch/download-json.injectable";
+import type { PackageJson } from "type-fest";
+import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 
 export interface ExtensionInfo {
   name: string;
@@ -21,6 +26,19 @@ export interface ExtensionInfo {
   requireConfirmation?: boolean;
 }
 
+interface NpmPackageVersionDescriptor extends PackageJson {
+  dist: {
+    integrity: string;
+    shasum: string;
+    tarball: string;
+  };
+}
+
+interface NpmRegistryPackageDescriptor {
+  versions: Partial<Record<string, NpmPackageVersionDescriptor>>;
+  "dist-tags"?: Partial<Record<string, string>>;
+}
+
 export type AttemptInstallByInfo = (info: ExtensionInfo) => Promise<void>;
 
 const attemptInstallByInfoInjectable = getInjectable({
@@ -31,84 +49,131 @@ const attemptInstallByInfoInjectable = getInjectable({
     const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable);
     const confirm = di.inject(confirmInjectable);
     const getBasenameOfPath = di.inject(getBasenameOfPathInjectable);
+    const downloadJson = di.inject(downloadJsonInjectable);
+    const downloadBinary = di.inject(downloadBinaryInjectable);
+    const showErrorNotification = di.inject(showErrorNotificationInjectable);
+    const logger = di.inject(loggerInjectable);
 
     return async (info) => {
-      const { name, version, requireConfirmation = false } = info;
+      const { name, version: versionOrTagName, requireConfirmation = false } = info;
       const disposer = extensionInstallationStateStore.startPreInstall();
       const baseUrl = await getBaseRegistryUrl();
       const registryUrl = new URLParse(baseUrl).set("pathname", name).toString();
-      let json: any;
-      let finalVersion = version;
+      let json: NpmRegistryPackageDescriptor;
 
       try {
-        json = await downloadJson({ url: registryUrl }).promise;
+        const result = await downloadJson(registryUrl);
 
-        if (!json || json.error || typeof json.versions !== "object" || !json.versions) {
-          const message = json?.error ? `: ${json.error}` : "";
-
-          Notifications.error(`Failed to get registry information for that extension${message}`);
+        if (!result.callWasSuccessful) {
+          showErrorNotification(`Failed to get registry information for extension: ${result.error}`);
 
           return disposer();
         }
+
+        if (!isObject(result.response) || Array.isArray(result.response)) {
+          showErrorNotification("Failed to get registry information for extension");
+
+          return disposer();
+        }
+
+        if (result.response.error || !isObject(result.response.versions)) {
+          const message = result.response.error ? `: ${result.response.error}` : "";
+
+          showErrorNotification(`Failed to get registry information for extension${message}`);
+
+          return disposer();
+        }
+
+        json = result.response as unknown as NpmRegistryPackageDescriptor;
       } catch (error) {
         if (error instanceof SyntaxError) {
-        // assume invalid JSON
-          console.warn("Set registry has invalid json", { url: baseUrl }, error);
-          Notifications.error("Failed to get valid registry information for that extension. Registry did not return valid JSON");
+          // assume invalid JSON
+          logger.warn("Set registry has invalid json", { url: baseUrl }, error);
+          showErrorNotification("Failed to get valid registry information for extension. Registry did not return valid JSON");
         } else {
-          console.error("Failed to download registry information", error);
-          Notifications.error(`Failed to get valid registry information for that extension. ${error}`);
+          logger.error("Failed to download registry information", error);
+          showErrorNotification(`Failed to get valid registry information for extension. ${error}`);
         }
 
         return disposer();
       }
 
-      if (version) {
-        if (!json.versions[version]) {
-          if (json["dist-tags"][version]) {
-            finalVersion = json["dist-tags"][version];
-          } else {
-            Notifications.error((
-              <p>
-                {"The "}
-                <em>{name}</em>
-                {" extension does not have a version or tag "}
-                <code>{version}</code>
-                .
-              </p>
-            ));
+      let version = versionOrTagName;
 
-            return disposer();
+      if (versionOrTagName) {
+        validDistTagName:
+        if (!json.versions[versionOrTagName]) {
+          if (json["dist-tags"]) {
+            const potentialVersion = json["dist-tags"][versionOrTagName];
+
+            if (potentialVersion) {
+              if (!json.versions[potentialVersion]) {
+                showErrorNotification((
+                  <p>
+                    Configured registry claims to have tag
+                    {" "}
+                    <code>{versionOrTagName}</code>
+                    .
+                    {" "}
+                    But does not have version infomation for the reference.
+                  </p>
+                ));
+
+                return disposer();
+              }
+
+              version = potentialVersion;
+              break validDistTagName;
+            }
           }
+
+          showErrorNotification((
+            <p>
+              {"The "}
+              <em>{name}</em>
+              {" extension does not have a version or tag "}
+              <code>{versionOrTagName}</code>
+              .
+            </p>
+          ));
+
+          return disposer();
         }
       } else {
         const versions = Object.keys(json.versions)
           .map(version => new SemVer(version, { loose: true }))
-        // ignore pre-releases for auto picking the version
+          // ignore pre-releases for auto picking the version
           .filter(version => version.prerelease.length === 0);
 
         const latestVersion = reduce(versions, (prev, curr) => prev.compareMain(curr) === -1 ? curr : prev);
 
-        if (!latestVersion) {
-          console.error("No versions supplied for that extension", { name });
-          Notifications.error(`No versions found for ${name}`);
+        version = latestVersion?.format();
+      }
 
-          return disposer();
-        }
+      if (!version) {
+        logger.error("No versions supplied for extension", { name });
+        showErrorNotification(`No versions found for ${name}`);
 
-        finalVersion = latestVersion.format();
+        return disposer();
+      }
+
+      const versionInfo = json.versions[version];
+      const tarballUrl = versionInfo?.dist.tarball;
+
+      if (!tarballUrl) {
+        showErrorNotification("Configured registry has invalid data model. Please verify that it is like NPM's.");
+        logger.warn(`[ATTEMPT-INSTALL-BY-INFO]: registry returned unexpected data, final version is ${version} but the versions object is missing .dist.tarball as a string`, versionInfo);
+
+        return disposer();
       }
 
       if (requireConfirmation) {
         const proceed = await confirm({
           message: (
             <p>
-              Are you sure you want to install
-              {" "}
+              {"Are you sure you want to install "}
               <b>
-                {name}
-                @
-                {finalVersion}
+                {`${name}@${version}`}
               </b>
               ?
             </p>
@@ -122,12 +187,17 @@ const attemptInstallByInfoInjectable = getInjectable({
         }
       }
 
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const url = json.versions[finalVersion!].dist.tarball;
-      const fileName = getBasenameOfPath(url);
-      const { promise: dataP } = downloadFile({ url, timeout: 10 * 60 * 1000 });
+      const fileName = getBasenameOfPath(tarballUrl);
+      const { signal } = withTimeout(10 * 60 * 1000);
+      const request = await downloadBinary(tarballUrl, { signal });
 
-      return attemptInstall({ fileName, dataP }, disposer);
+      if (!request.callWasSuccessful) {
+        showErrorNotification(`Failed to download extension: ${request.error}`);
+
+        return disposer();
+      }
+
+      return attemptInstall({ fileName, data: request.response }, disposer);
     };
   },
 });
diff --git a/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.ts b/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.ts
deleted file mode 100644
index 21ceb73ecf..0000000000
--- a/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
-import uninstallExtensionInjectable from "../uninstall-extension/uninstall-extension.injectable";
-import { attemptInstall } from "./attempt-install";
-import unpackExtensionInjectable from "./unpack-extension/unpack-extension.injectable";
-import getExtensionDestFolderInjectable
-  from "./get-extension-dest-folder/get-extension-dest-folder.injectable";
-import createTempFilesAndValidateInjectable from "./create-temp-files-and-validate/create-temp-files-and-validate.injectable";
-import extensionInstallationStateStoreInjectable
-  from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
-
-const attemptInstallInjectable = getInjectable({
-  id: "attempt-install",
-
-  instantiate: (di) =>
-    attemptInstall({
-      extensionLoader: di.inject(extensionLoaderInjectable),
-      uninstallExtension: di.inject(uninstallExtensionInjectable),
-      unpackExtension: di.inject(unpackExtensionInjectable),
-      createTempFilesAndValidate: di.inject(createTempFilesAndValidateInjectable),
-      getExtensionDestFolder: di.inject(getExtensionDestFolderInjectable),
-      extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
-    }),
-});
-
-export default attemptInstallInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.tsx b/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.tsx
new file mode 100644
index 0000000000..cb73df7237
--- /dev/null
+++ b/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.tsx
@@ -0,0 +1,148 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
+import uninstallExtensionInjectable from "../uninstall-extension/uninstall-extension.injectable";
+import type { UnpackExtension } from "./unpack-extension.injectable";
+import unpackExtensionInjectable from "./unpack-extension.injectable";
+import type { GetExtensionDestFolder } from "./get-extension-dest-folder.injectable";
+import getExtensionDestFolderInjectable from "./get-extension-dest-folder.injectable";
+import type { CreateTempFilesAndValidate } from "./create-temp-files-and-validate.injectable";
+import createTempFilesAndValidateInjectable from "./create-temp-files-and-validate.injectable";
+import extensionInstallationStateStoreInjectable from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
+import type { Disposer } from "../../../../common/utils";
+import { disposer } from "../../../../common/utils";
+import { Notifications } from "../../notifications";
+import { Button } from "../../button";
+import type { ExtensionLoader } from "../../../../extensions/extension-loader";
+import type { LensExtensionId } from "../../../../extensions/lens-extension";
+import React from "react";
+import { remove as removeDir } from "fs-extra";
+import { shell } from "electron";
+import type { ExtensionInstallationStateStore } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
+import { ExtensionInstallationState } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
+
+export interface InstallRequest {
+  fileName: string;
+  data: Buffer;
+}
+
+interface Dependencies {
+  extensionLoader: ExtensionLoader;
+  uninstallExtension: (id: LensExtensionId) => Promise<boolean>;
+  unpackExtension: UnpackExtension;
+  createTempFilesAndValidate: CreateTempFilesAndValidate;
+  getExtensionDestFolder: GetExtensionDestFolder;
+  installStateStore: ExtensionInstallationStateStore;
+}
+
+export type AttemptInstall = (request: InstallRequest, cleanup?: Disposer) => Promise<void>;
+
+const attemptInstall = ({
+  extensionLoader,
+  uninstallExtension,
+  unpackExtension,
+  createTempFilesAndValidate,
+  getExtensionDestFolder,
+  installStateStore,
+}: Dependencies): AttemptInstall =>
+  async (request, cleanup) => {
+    const dispose = disposer(
+      installStateStore.startPreInstall(),
+      cleanup,
+    );
+
+    const validatedRequest = await createTempFilesAndValidate(request);
+
+    if (!validatedRequest) {
+      return dispose();
+    }
+
+    const { name, version, description } = validatedRequest.manifest;
+    const curState = installStateStore.getInstallationState(validatedRequest.id);
+
+    if (curState !== ExtensionInstallationState.IDLE) {
+      dispose();
+
+      return void Notifications.error(
+        <div className="flex column gaps">
+          <b>Extension Install Collision:</b>
+          <p>
+            {"The "}
+            <em>{name}</em>
+            {` extension is currently ${curState.toLowerCase()}.`}
+          </p>
+          <p>Will not proceed with this current install request.</p>
+        </div>,
+      );
+    }
+
+    const extensionFolder = getExtensionDestFolder(name);
+    const installedExtension = extensionLoader.getExtension(validatedRequest.id);
+
+    if (installedExtension) {
+      const { version: oldVersion } = installedExtension.manifest;
+
+      // confirm to uninstall old version before installing new version
+      const removeNotification = Notifications.info(
+        <div className="InstallingExtensionNotification flex gaps align-center">
+          <div className="flex column gaps">
+            <p>
+              {"Install extension "}
+              <b>{`${name}@${version}`}</b>
+              ?
+            </p>
+            <p>
+              {"Description: "}
+              <em>{description}</em>
+            </p>
+            <div
+              className="remove-folder-warning"
+              onClick={() => shell.openPath(extensionFolder)}
+            >
+              <b>Warning:</b>
+              {` ${name}@${oldVersion} will be removed before installation.`}
+            </div>
+          </div>
+          <Button
+            autoFocus
+            label="Install"
+            onClick={async () => {
+              removeNotification();
+
+              if (await uninstallExtension(validatedRequest.id)) {
+                await unpackExtension(validatedRequest, dispose);
+              } else {
+                dispose();
+              }
+            }}
+          />
+        </div>,
+        {
+          onClose: dispose,
+        },
+      );
+    } else {
+      // clean up old data if still around
+      await removeDir(extensionFolder);
+
+      // install extension if not yet exists
+      await unpackExtension(validatedRequest, dispose);
+    }
+  };
+
+const attemptInstallInjectable = getInjectable({
+  id: "attempt-install",
+  instantiate: (di) => attemptInstall({
+    extensionLoader: di.inject(extensionLoaderInjectable),
+    uninstallExtension: di.inject(uninstallExtensionInjectable),
+    unpackExtension: di.inject(unpackExtensionInjectable),
+    createTempFilesAndValidate: di.inject(createTempFilesAndValidateInjectable),
+    getExtensionDestFolder: di.inject(getExtensionDestFolderInjectable),
+    installStateStore: di.inject(extensionInstallationStateStoreInjectable),
+  }),
+});
+
+export default attemptInstallInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/attempt-install.tsx b/src/renderer/components/+extensions/attempt-install/attempt-install.tsx
deleted file mode 100644
index de8c968201..0000000000
--- a/src/renderer/components/+extensions/attempt-install/attempt-install.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type { ExtendableDisposer } from "../../../../common/utils";
-import { disposer } from "../../../../common/utils";
-import { Notifications } from "../../notifications";
-import { Button } from "../../button";
-import type { ExtensionLoader } from "../../../../extensions/extension-loader";
-import type { LensExtensionId } from "../../../../extensions/lens-extension";
-import React from "react";
-import { remove as removeDir } from "fs-extra";
-import { shell } from "electron";
-import type { InstallRequest } from "./install-request";
-import type { ExtensionInstallationStateStore } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
-import { ExtensionInstallationState } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
-import type { UnpackExtension } from "./unpack-extension/unpack-extension.injectable";
-import type { CreateTempFilesAndValidate } from "./create-temp-files-and-validate/create-temp-files-and-validate.injectable";
-import type { GetExtensionDestFolder } from "./get-extension-dest-folder/get-extension-dest-folder.injectable";
-
-interface Dependencies {
-  extensionLoader: ExtensionLoader;
-  uninstallExtension: (id: LensExtensionId) => Promise<boolean>;
-  unpackExtension: UnpackExtension;
-  createTempFilesAndValidate: CreateTempFilesAndValidate;
-  getExtensionDestFolder: GetExtensionDestFolder;
-  extensionInstallationStateStore: ExtensionInstallationStateStore;
-}
-
-export const attemptInstall =
-  ({
-    extensionLoader,
-    uninstallExtension,
-    unpackExtension,
-    createTempFilesAndValidate,
-    getExtensionDestFolder,
-    extensionInstallationStateStore,
-  }: Dependencies) =>
-    async (request: InstallRequest, d?: ExtendableDisposer): Promise<void> => {
-      console.log("Attempting to install extension");
-
-      const dispose = disposer(
-        extensionInstallationStateStore.startPreInstall(),
-        d,
-      );
-
-      const validatedRequest = await createTempFilesAndValidate(request);
-
-      if (!validatedRequest) {
-        return dispose();
-      }
-
-      const { name, version, description } = validatedRequest.manifest;
-      const curState = extensionInstallationStateStore.getInstallationState(
-        validatedRequest.id,
-      );
-
-      if (curState !== ExtensionInstallationState.IDLE) {
-        dispose();
-
-        return void Notifications.error(
-          <div className="flex column gaps">
-            <b>Extension Install Collision:</b>
-            <p>
-              {"The "}
-              <em>{name}</em>
-              {` extension is currently ${curState.toLowerCase()}.`}
-            </p>
-            <p>Will not proceed with this current install request.</p>
-          </div>,
-        );
-      }
-
-      const extensionFolder = getExtensionDestFolder(name);
-      const installedExtension = extensionLoader.getExtension(validatedRequest.id);
-
-      if (installedExtension) {
-        const { version: oldVersion } = installedExtension.manifest;
-
-        // confirm to uninstall old version before installing new version
-        const removeNotification = Notifications.info(
-          <div className="InstallingExtensionNotification flex gaps align-center">
-            <div className="flex column gaps">
-              <p>
-                {"Install extension "}
-                <b>{`${name}@${version}`}</b>
-                ?
-              </p>
-              <p>
-                {"Description: "}
-                <em>{description}</em>
-              </p>
-              <div
-                className="remove-folder-warning"
-                onClick={() => shell.openPath(extensionFolder)}
-              >
-                <b>Warning:</b>
-                {` ${name}@${oldVersion} will be removed before installation.`}
-              </div>
-            </div>
-            <Button
-              autoFocus
-              label="Install"
-              onClick={async () => {
-                removeNotification();
-
-                if (await uninstallExtension(validatedRequest.id)) {
-                  await unpackExtension(validatedRequest, dispose);
-                } else {
-                  dispose();
-                }
-              }}
-            />
-          </div>,
-          {
-            onClose: dispose,
-          },
-        );
-      } else {
-        // clean up old data if still around
-        await removeDir(extensionFolder);
-
-        // install extension if not yet exists
-        await unpackExtension(validatedRequest, dispose);
-      }
-    };
diff --git a/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx b/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx
new file mode 100644
index 0000000000..e9fea96e44
--- /dev/null
+++ b/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import extensionDiscoveryInjectable from "../../../../extensions/extension-discovery/extension-discovery.injectable";
+import { validatePackage } from "./validate-package";
+import type { ExtensionDiscovery } from "../../../../extensions/extension-discovery/extension-discovery";
+import { getMessageFromError } from "../get-message-from-error/get-message-from-error";
+import logger from "../../../../main/logger";
+import { Notifications } from "../../notifications";
+import path from "path";
+import fse from "fs-extra";
+import React from "react";
+import os from "os";
+import type { LensExtensionId, LensExtensionManifest } from "../../../../extensions/lens-extension";
+import type { InstallRequest } from "./attempt-install.injectable";
+
+export interface InstallRequestValidated {
+  fileName: string;
+  data: Buffer;
+  id: LensExtensionId;
+  manifest: LensExtensionManifest;
+  tempFile: string; // temp system path to packed extension for unpacking
+}
+
+interface Dependencies {
+  extensionDiscovery: ExtensionDiscovery;
+}
+
+export type CreateTempFilesAndValidate = (request: InstallRequest) => Promise<InstallRequestValidated | null>;
+
+const createTempFilesAndValidate = ({
+  extensionDiscovery,
+}: Dependencies): CreateTempFilesAndValidate => (
+  async ({ fileName, data }) => {
+    // copy files to temp
+    await fse.ensureDir(getExtensionPackageTemp());
+
+    // validate packages
+    const tempFile = getExtensionPackageTemp(fileName);
+
+    try {
+      await fse.writeFile(tempFile, data);
+      const manifest = await validatePackage(tempFile);
+      const id = path.join(
+        extensionDiscovery.nodeModulesPath,
+        manifest.name,
+        "package.json",
+      );
+
+      return {
+        fileName,
+        data,
+        manifest,
+        tempFile,
+        id,
+      };
+    } catch (error) {
+      const message = getMessageFromError(error);
+
+      logger.info(
+        `[EXTENSION-INSTALLATION]: installing ${fileName} has failed: ${message}`,
+        { error },
+      );
+      Notifications.error((
+        <div className="flex column gaps">
+          <p>
+            {"Installing "}
+            <em>{fileName}</em>
+            {" has failed, skipping."}
+          </p>
+          <p>
+            {"Reason: "}
+            <em>{message}</em>
+          </p>
+        </div>
+      ));
+    }
+
+    return null;
+  }
+);
+
+
+function getExtensionPackageTemp(fileName = "") {
+  return path.join(os.tmpdir(), "lens-extensions", fileName);
+}
+
+const createTempFilesAndValidateInjectable = getInjectable({
+  id: "create-temp-files-and-validate",
+  instantiate: (di) => createTempFilesAndValidate({
+    extensionDiscovery: di.inject(extensionDiscoveryInjectable),
+  }),
+});
+
+export default createTempFilesAndValidateInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.injectable.tsx b/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.injectable.tsx
deleted file mode 100644
index 951c45d246..0000000000
--- a/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.injectable.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import extensionDiscoveryInjectable from "../../../../../extensions/extension-discovery/extension-discovery.injectable";
-import React from "react";
-import type { LensExtensionId, LensExtensionManifest } from "../../../../../extensions/lens-extension";
-import { getMessageFromError } from "../../get-message-from-error/get-message-from-error";
-import type { InstallRequest } from "../install-request";
-import { validatePackage } from "../validate-package/validate-package";
-import joinPathsInjectable from "../../../../../common/path/join-paths.injectable";
-import tempDirectoryPathInjectable from "../../../../../common/os/temp-directory-path.injectable";
-import ensureDirInjectable from "../../../../../common/fs/ensure-dir.injectable";
-import writeFileInjectable from "../../../../../common/fs/write-file.injectable";
-import loggerInjectable from "../../../../../common/logger.injectable";
-import showErrorNotificationInjectable from "../../../notifications/show-error-notification.injectable";
-
-export interface InstallRequestValidated {
-  fileName: string;
-  data: Buffer;
-  id: LensExtensionId;
-  manifest: LensExtensionManifest;
-  tempFile: string; // temp system path to packed extension for unpacking
-}
-
-export type CreateTempFilesAndValidate = (req: InstallRequest) => Promise<InstallRequestValidated | null>;
-
-const createTempFilesAndValidateInjectable = getInjectable({
-  id: "create-temp-files-and-validate",
-
-  instantiate: (di) => {
-    const extensionDiscovery = di.inject(extensionDiscoveryInjectable);
-    const joinPaths = di.inject(joinPathsInjectable);
-    const tempDirectoryPath = di.inject(tempDirectoryPathInjectable);
-    const ensureDir = di.inject(ensureDirInjectable);
-    const writeFile = di.inject(writeFileInjectable);
-    const logger = di.inject(loggerInjectable);
-    const showErrorNotification = di.inject(showErrorNotificationInjectable);
-
-    const baseTempExtensionsDirectory = joinPaths(tempDirectoryPath, "lens-extensions");
-    const getExtensionPackageTemp = (fileName: string) => joinPaths(baseTempExtensionsDirectory, fileName);
-
-    return async ({
-      fileName,
-      dataP,
-    }: InstallRequest): Promise<InstallRequestValidated | null> => {
-      // copy files to temp
-      await ensureDir(baseTempExtensionsDirectory);
-
-      // validate packages
-      const tempFile = getExtensionPackageTemp(fileName);
-
-      try {
-        const data = await dataP;
-
-        if (!data) {
-          return null;
-        }
-
-        await writeFile(tempFile, data);
-        logger.info("validating package", tempFile);
-        const manifest = await validatePackage(tempFile);
-        const id = joinPaths(
-          extensionDiscovery.nodeModulesPath,
-          manifest.name,
-          "package.json",
-        );
-
-        return {
-          fileName,
-          data,
-          manifest,
-          tempFile,
-          id,
-        };
-      } catch (error) {
-        const message = getMessageFromError(error);
-
-        logger.info(
-          `[EXTENSION-INSTALLATION]: installing ${fileName} has failed: ${message}`,
-          { error },
-        );
-        showErrorNotification(
-          <div className="flex column gaps">
-            <p>
-              {"Installing "}
-              <em>{fileName}</em>
-              {" has failed, skipping."}
-            </p>
-            <p>
-              {"Reason: "}
-              <em>{message}</em>
-            </p>
-          </div>,
-        );
-      }
-
-      return null;
-    };
-  },
-});
-
-export default createTempFilesAndValidateInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.injectable.ts b/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder.injectable.ts
similarity index 51%
rename from src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.injectable.ts
rename to src/renderer/components/+extensions/attempt-install/get-extension-dest-folder.injectable.ts
index 2c46b595a4..6d6dbfbef3 100644
--- a/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.injectable.ts
+++ b/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder.injectable.ts
@@ -3,20 +3,19 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import joinPathsInjectable from "../../../../../common/path/join-paths.injectable";
-import extensionDiscoveryInjectable from "../../../../../extensions/extension-discovery/extension-discovery.injectable";
-import { sanitizeExtensionName } from "../../../../../extensions/lens-extension";
+import extensionDiscoveryInjectable from "../../../../extensions/extension-discovery/extension-discovery.injectable";
+import { sanitizeExtensionName } from "../../../../extensions/lens-extension";
+import path from "path";
 
-export type GetExtensionDestFolder = (extensionName: string) => string;
+export type GetExtensionDestFolder = (name: string) => string;
 
 const getExtensionDestFolderInjectable = getInjectable({
   id: "get-extension-dest-folder",
 
   instantiate: (di): GetExtensionDestFolder => {
     const extensionDiscovery = di.inject(extensionDiscoveryInjectable);
-    const joinPaths = di.inject(joinPathsInjectable);
 
-    return (name) => joinPaths(extensionDiscovery.localFolderPath, sanitizeExtensionName(name));
+    return (name) => path.join(extensionDiscovery.localFolderPath, sanitizeExtensionName(name));
   },
 });
 
diff --git a/src/renderer/components/+extensions/attempt-install/install-request.ts b/src/renderer/components/+extensions/attempt-install/install-request.ts
deleted file mode 100644
index c5af4e5f93..0000000000
--- a/src/renderer/components/+extensions/attempt-install/install-request.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-export interface InstallRequest {
-  fileName: string;
-  dataP: Promise<Buffer | null>;
-}
diff --git a/src/renderer/components/+extensions/attempt-install/unpack-extension.injectable.tsx b/src/renderer/components/+extensions/attempt-install/unpack-extension.injectable.tsx
new file mode 100644
index 0000000000..c81a69f9b0
--- /dev/null
+++ b/src/renderer/components/+extensions/attempt-install/unpack-extension.injectable.tsx
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
+import getExtensionDestFolderInjectable from "./get-extension-dest-folder.injectable";
+import extensionInstallationStateStoreInjectable from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
+import type { Disposer } from "../../../../common/utils";
+import { noop } from "../../../../common/utils";
+import { extensionDisplayName } from "../../../../extensions/lens-extension";
+import { getMessageFromError } from "../get-message-from-error/get-message-from-error";
+import path from "path";
+import fse from "fs-extra";
+import { when } from "mobx";
+import React from "react";
+import type { InstallRequestValidated } from "./create-temp-files-and-validate.injectable";
+import extractTarInjectable from "../../../../common/fs/extract-tar.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";
+import showInfoNotificationInjectable from "../../notifications/show-info-notification.injectable";
+import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable";
+
+export type UnpackExtension = (request: InstallRequestValidated, disposeDownloading?: Disposer) => Promise<void>;
+
+const unpackExtensionInjectable = getInjectable({
+  id: "unpack-extension",
+  instantiate: (di): UnpackExtension => {
+    const extensionLoader = di.inject(extensionLoaderInjectable);
+    const getExtensionDestFolder = di.inject(getExtensionDestFolderInjectable);
+    const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable);
+    const extractTar = di.inject(extractTarInjectable);
+    const logger = di.inject(loggerInjectable);
+    const showInfoNotification = di.inject(showInfoNotificationInjectable);
+    const showErrorNotification = di.inject(showErrorNotificationInjectable);
+
+    return async (request, disposeDownloading) => {
+      const {
+        id,
+        fileName,
+        tempFile,
+        manifest: { name, version },
+      } = request;
+
+      extensionInstallationStateStore.setInstalling(id);
+      disposeDownloading?.();
+
+      const displayName = extensionDisplayName(name, version);
+      const extensionFolder = getExtensionDestFolder(name);
+      const unpackingTempFolder = path.join(
+        path.dirname(tempFile),
+        `${path.basename(tempFile)}-unpacked`,
+      );
+
+      logger.info(`Unpacking extension ${displayName}`, { fileName, tempFile });
+
+      try {
+      // extract to temp folder first
+        await fse.remove(unpackingTempFolder).catch(noop);
+        await fse.ensureDir(unpackingTempFolder);
+        await extractTar(tempFile, { cwd: unpackingTempFolder });
+
+        // move contents to extensions folder
+        const unpackedFiles = await fse.readdir(unpackingTempFolder);
+        let unpackedRootFolder = unpackingTempFolder;
+
+        if (unpackedFiles.length === 1) {
+        // check if %extension.tgz was packed with single top folder,
+        // e.g. "npm pack %ext_name" downloads file with "package" root folder within tarball
+          unpackedRootFolder = path.join(unpackingTempFolder, unpackedFiles[0]);
+        }
+
+        await fse.ensureDir(extensionFolder);
+        await fse.move(unpackedRootFolder, extensionFolder, { overwrite: true });
+
+        // wait for the loader has actually install it
+        await when(() => extensionLoader.userExtensions.has(id));
+
+        // Enable installed extensions by default.
+        extensionLoader.setIsEnabled(id, true);
+
+        showInfoNotification((
+          <p>
+            {"Extension "}
+            <b>{displayName}</b>
+            {" successfully installed!"}
+          </p>
+        ));
+      } catch (error) {
+        const message = getMessageFromError(error);
+
+        logger.info(
+          `[EXTENSION-INSTALLATION]: installing ${request.fileName} has failed: ${message}`,
+          { error },
+        );
+        showErrorNotification((
+          <p>
+            {"Installing extension "}
+            <b>{displayName}</b>
+            {" has failed: "}
+            <em>{message}</em>
+          </p>
+        ));
+      } finally {
+      // Remove install state once finished
+        extensionInstallationStateStore.clearInstalling(id);
+
+        // clean up
+        fse.remove(unpackingTempFolder).catch(noop);
+        fse.unlink(tempFile).catch(noop);
+      }
+    };
+  },
+});
+
+export default unpackExtensionInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.injectable.tsx b/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.injectable.tsx
deleted file mode 100644
index 9a10062f7e..0000000000
--- a/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.injectable.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import React from "react";
-import { getInjectable } from "@ogre-tools/injectable";
-import extensionLoaderInjectable from "../../../../../extensions/extension-loader/extension-loader.injectable";
-import getExtensionDestFolderInjectable from "../get-extension-dest-folder/get-extension-dest-folder.injectable";
-import extensionInstallationStateStoreInjectable from "../../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
-import type { InstallRequestValidated } from "../create-temp-files-and-validate/create-temp-files-and-validate.injectable";
-import type { Disposer } from "../../../../utils";
-import { noop } from "../../../../utils";
-import { extensionDisplayName } from "../../../../../extensions/lens-extension";
-import joinPathsInjectable from "../../../../../common/path/join-paths.injectable";
-import loggerInjectable from "../../../../../common/logger.injectable";
-import { when } from "mobx";
-import { getMessageFromError } from "../../get-message-from-error/get-message-from-error";
-import showSuccessNotificationInjectable from "../../../notifications/show-success-notification.injectable";
-import showErrorNotificationInjectable from "../../../notifications/show-error-notification.injectable";
-import getDirnameOfPathInjectable from "../../../../../common/path/get-dirname.injectable";
-import getBasenameOfPathInjectable from "../../../../../common/path/get-basename.injectable";
-import extractTarInjectable from "../../../../../common/fs/extract-tar.injectable";
-import ensureDirInjectable from "../../../../../common/fs/ensure-dir.injectable";
-import removePathInjectable from "../../../../../common/fs/remove-path.injectable";
-import deleteFileInjectable from "../../../../../common/fs/delete-file.injectable";
-import readDirectoryInjectable from "../../../../../common/fs/read-directory.injectable";
-import moveInjectable from "../../../../../common/fs/move.injectable";
-
-export type UnpackExtension = (request: InstallRequestValidated, disposeDownloading?: Disposer) => Promise<void>;
-
-const unpackExtensionInjectable = getInjectable({
-  id: "unpack-extension",
-
-  instantiate: (di): UnpackExtension => {
-    const extensionLoader = di.inject(extensionLoaderInjectable);
-    const getExtensionDestFolder = di.inject(getExtensionDestFolderInjectable);
-    const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable);
-    const joinPaths = di.inject(joinPathsInjectable);
-    const getDirnameOfPath = di.inject(getDirnameOfPathInjectable);
-    const getBasenameOfPath = di.inject(getBasenameOfPathInjectable);
-    const logger = di.inject(loggerInjectable);
-    const showOkNotification = di.inject(showSuccessNotificationInjectable);
-    const showErrorNotification = di.inject(showErrorNotificationInjectable);
-    const extractTar = di.inject(extractTarInjectable);
-    const ensureDir = di.inject(ensureDirInjectable);
-    const removePath = di.inject(removePathInjectable);
-    const deleteFile = di.inject(deleteFileInjectable);
-    const readDirectory = di.inject(readDirectoryInjectable);
-    const move = di.inject(moveInjectable);
-
-    return async (request, disposeDownloading) => {
-      const {
-        id,
-        fileName,
-        tempFile,
-        manifest: { name, version },
-      } = request;
-
-      extensionInstallationStateStore.setInstalling(id);
-      disposeDownloading?.();
-
-      const displayName = extensionDisplayName(name, version);
-      const extensionFolder = getExtensionDestFolder(name);
-      const unpackingTempFolder = joinPaths(
-        getDirnameOfPath(tempFile),
-        `${getBasenameOfPath(tempFile)}-unpacked`,
-      );
-
-      logger.info(`Unpacking extension ${displayName}`, { fileName, tempFile });
-
-      try {
-        // extract to temp folder first
-        await removePath(unpackingTempFolder).catch(noop);
-        await ensureDir(unpackingTempFolder);
-        await extractTar(tempFile, { cwd: unpackingTempFolder });
-
-        // move contents to extensions folder
-        const unpackedFiles = await readDirectory(unpackingTempFolder);
-        let unpackedRootFolder = unpackingTempFolder;
-
-        if (unpackedFiles.length === 1) {
-        // check if %extension.tgz was packed with single top folder,
-        // e.g. "npm pack %ext_name" downloads file with "package" root folder within tarball
-          unpackedRootFolder = joinPaths(unpackingTempFolder, unpackedFiles[0]);
-        }
-
-        await ensureDir(extensionFolder);
-        await move(unpackedRootFolder, extensionFolder, { overwrite: true });
-
-        // wait for the loader has actually install it
-        await when(() => extensionLoader.userExtensions.has(id));
-
-        // Enable installed extensions by default.
-        extensionLoader.setIsEnabled(id, true);
-
-        showOkNotification(
-          <p>
-            {"Extension "}
-            <b>{displayName}</b>
-            {" successfully installed!"}
-          </p>,
-        );
-      } catch (error) {
-        const message = getMessageFromError(error);
-
-        logger.info(
-          `[EXTENSION-INSTALLATION]: installing ${request.fileName} has failed: ${message}`,
-          { error },
-        );
-        showErrorNotification(
-          <p>
-            {"Installing extension "}
-            <b>{displayName}</b>
-            {" has failed: "}
-            <em>{message}</em>
-          </p>,
-        );
-      } finally {
-        // Remove install state once finished
-        extensionInstallationStateStore.clearInstalling(id);
-
-        // clean up
-        removePath(unpackingTempFolder).catch(noop);
-        deleteFile(tempFile).catch(noop);
-      }
-    };
-  },
-});
-
-export default unpackExtensionInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/validate-package/validate-package.tsx b/src/renderer/components/+extensions/attempt-install/validate-package.tsx
similarity index 69%
rename from src/renderer/components/+extensions/attempt-install/validate-package/validate-package.tsx
rename to src/renderer/components/+extensions/attempt-install/validate-package.tsx
index ad3432574b..e9597b2d10 100644
--- a/src/renderer/components/+extensions/attempt-install/validate-package/validate-package.tsx
+++ b/src/renderer/components/+extensions/attempt-install/validate-package.tsx
@@ -2,27 +2,23 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { LensExtensionManifest } from "../../../../../extensions/lens-extension";
-import { hasTypedProperty, isObject, isString, listTarEntries, readFileFromTar } from "../../../../../common/utils";
-import { manifestFilename } from "../../../../../extensions/extension-discovery/extension-discovery";
+import type { LensExtensionManifest } from "../../../../extensions/lens-extension";
+import { hasTypedProperty, isObject, isString, listTarEntries, readFileFromTar } from "../../../../common/utils";
+import { manifestFilename } from "../../../../extensions/extension-discovery/extension-discovery";
 import path from "path";
 
-export const validatePackage = async (
-  filePath: string,
-): Promise<LensExtensionManifest> => {
+export async function validatePackage(filePath: string): Promise<LensExtensionManifest> {
   const tarFiles = await listTarEntries(filePath);
 
   // tarball from npm contains single root folder "package/*"
   const firstFile = tarFiles[0];
 
   if (!firstFile) {
-    throw new Error(`invalid extension bundle,  ${manifestFilename} not found`);
+    throw new Error(`invalid extension bundle, ${manifestFilename} not found`);
   }
 
   const rootFolder = path.normalize(firstFile).split(path.sep)[0];
-  const packedInRootFolder = tarFiles.every(entry =>
-    entry.startsWith(rootFolder),
-  );
+  const packedInRootFolder = tarFiles.every(entry => entry.startsWith(rootFolder));
   const manifestLocation = packedInRootFolder
     ? path.join(rootFolder, manifestFilename)
     : manifestFilename;
@@ -48,4 +44,4 @@ export const validatePackage = async (
   }
 
   throw new Error(`${manifestFilename} must specify "main" and/or "renderer" fields`);
-};
+}
diff --git a/src/renderer/components/+extensions/attempt-installs/attempt-installs.injectable.ts b/src/renderer/components/+extensions/attempt-installs.injectable.ts
similarity index 53%
rename from src/renderer/components/+extensions/attempt-installs/attempt-installs.injectable.ts
rename to src/renderer/components/+extensions/attempt-installs.injectable.ts
index 78939ef264..8f2a066492 100644
--- a/src/renderer/components/+extensions/attempt-installs/attempt-installs.injectable.ts
+++ b/src/renderer/components/+extensions/attempt-installs.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import getBasenameOfPathInjectable from "../../../../common/path/get-basename.injectable";
-import attemptInstallInjectable from "../attempt-install/attempt-install.injectable";
-import readFileNotifyInjectable from "../read-file-notify/read-file-notify.injectable";
+import attemptInstallInjectable from "./attempt-install/attempt-install.injectable";
+import path from "path";
+import readFileNotifyInjectable from "./read-file-notify/read-file-notify.injectable";
 
 export type AttemptInstalls = (filePaths: string[]) => Promise<void>;
 
@@ -14,16 +14,23 @@ const attemptInstallsInjectable = getInjectable({
 
   instantiate: (di): AttemptInstalls => {
     const attemptInstall = di.inject(attemptInstallInjectable);
-    const getBasenameOfPath = di.inject(getBasenameOfPathInjectable);
     const readFileNotify = di.inject(readFileNotifyInjectable);
 
     return async (filePaths) => {
-      await Promise.allSettled(filePaths.map(filePath => (
-        attemptInstall({
-          fileName: getBasenameOfPath(filePath),
-          dataP: readFileNotify(filePath),
-        })
-      )));
+      await Promise.allSettled(
+        filePaths.map(async filePath => {
+          const data = await readFileNotify(filePath);
+
+          if (!data) {
+            return;
+          }
+
+          return attemptInstall({
+            fileName: path.basename(filePath),
+            data,
+          });
+        }),
+      );
     };
   },
 });
diff --git a/src/renderer/components/+extensions/extensions.tsx b/src/renderer/components/+extensions/extensions.tsx
index 933dab8a9a..b9dfdb791b 100644
--- a/src/renderer/components/+extensions/extensions.tsx
+++ b/src/renderer/components/+extensions/extensions.tsx
@@ -32,7 +32,8 @@ import type { InstallExtensionFromInput } from "./install-extension-from-input.i
 import installExtensionFromInputInjectable from "./install-extension-from-input.injectable";
 import installFromSelectFileDialogInjectable from "./install-from-select-file-dialog.injectable";
 import type { LensExtensionId } from "../../../extensions/lens-extension";
-import installOnDropInjectable from "./install-on-drop/install-on-drop.injectable";
+import type { InstallOnDrop } from "./install-on-drop.injectable";
+import installOnDropInjectable from "./install-on-drop.injectable";
 import { supportedExtensionFormats } from "./supported-extension-formats";
 import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 import type { ExtensionInstallationStateStore } from "../../../extensions/extension-installation-state-store/extension-installation-state-store";
@@ -44,7 +45,7 @@ interface Dependencies {
   confirmUninstallExtension: ConfirmUninstallExtension;
   installExtensionFromInput: InstallExtensionFromInput;
   installFromSelectFileDialog: () => Promise<void>;
-  installOnDrop: (files: File[]) => Promise<void>;
+  installOnDrop: InstallOnDrop;
   extensionInstallationStateStore: ExtensionInstallationStateStore;
 }
 
diff --git a/src/renderer/components/+extensions/install-extension-from-input.injectable.tsx b/src/renderer/components/+extensions/install-extension-from-input.injectable.tsx
index 7b7d783283..3f9e5b0949 100644
--- a/src/renderer/components/+extensions/install-extension-from-input.injectable.tsx
+++ b/src/renderer/components/+extensions/install-extension-from-input.injectable.tsx
@@ -4,7 +4,6 @@
  */
 import React from "react";
 import type { ExtendableDisposer } from "../../../common/utils";
-import { downloadFile } from "../../../common/utils";
 import { InputValidators } from "../input";
 import { getMessageFromError } from "./get-message-from-error/get-message-from-error";
 import { getInjectable } from "@ogre-tools/injectable";
@@ -15,6 +14,8 @@ import readFileNotifyInjectable from "./read-file-notify/read-file-notify.inject
 import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable";
 import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
+import downloadBinaryInjectable from "../../../common/fetch/download-binary.injectable";
+import { withTimeout } from "../../../common/fetch/timeout-controller";
 
 export type InstallExtensionFromInput = (input: string) => Promise<void>;
 
@@ -29,19 +30,28 @@ const installExtensionFromInputInjectable = getInjectable({
     const getBasenameOfPath = di.inject(getBasenameOfPathInjectable);
     const showErrorNotification = di.inject(showErrorNotificationInjectable);
     const logger = di.inject(loggerInjectable);
+    const downloadBinary = di.inject(downloadBinaryInjectable);
 
     return async (input) => {
       let disposer: ExtendableDisposer | undefined = undefined;
 
       try {
-      // fixme: improve error messages for non-tar-file URLs
+        // fixme: improve error messages for non-tar-file URLs
         if (InputValidators.isUrl.validate(input)) {
-        // install via url
+          // install via url
           disposer = extensionInstallationStateStore.startPreInstall();
-          const { promise } = downloadFile({ url: input, timeout: 10 * 60 * 1000 });
+          const { signal } = withTimeout(10 * 60 * 1000);
+          const result = await downloadBinary(input, { signal });
+
+          if (!result.callWasSuccessful) {
+            showErrorNotification(`Failed to download extension: ${result.error}`);
+
+            return disposer();
+          }
+
           const fileName = getBasenameOfPath(input);
 
-          return await attemptInstall({ fileName, dataP: promise }, disposer);
+          return await attemptInstall({ fileName, data: result.response }, disposer);
         }
 
         try {
@@ -49,8 +59,13 @@ const installExtensionFromInputInjectable = getInjectable({
 
           // install from system path
           const fileName = getBasenameOfPath(input);
+          const data = await readFileNotify(input);
 
-          return await attemptInstall({ fileName, dataP: readFileNotify(input) });
+          if (!data) {
+            return;
+          }
+
+          return await attemptInstall({ fileName, data });
         } catch (error) {
           const extNameCaptures = InputValidators.isExtensionNameInstallRegex.captures(input);
 
diff --git a/src/renderer/components/+extensions/install-from-select-file-dialog.injectable.ts b/src/renderer/components/+extensions/install-from-select-file-dialog.injectable.ts
index 1ae77d664a..ae9dddc299 100644
--- a/src/renderer/components/+extensions/install-from-select-file-dialog.injectable.ts
+++ b/src/renderer/components/+extensions/install-from-select-file-dialog.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { requestOpenFilePickingDialog } from "../../ipc";
 import { supportedExtensionFormats } from "./supported-extension-formats";
-import attemptInstallsInjectable from "./attempt-installs/attempt-installs.injectable";
+import attemptInstallsInjectable from "./attempt-installs.injectable";
 import directoryForDownloadsInjectable from "../../../common/app-paths/directory-for-downloads/directory-for-downloads.injectable";
 
 interface Dependencies {
diff --git a/src/renderer/components/+extensions/install-on-drop.injectable.ts b/src/renderer/components/+extensions/install-on-drop.injectable.ts
new file mode 100644
index 0000000000..e1779eb223
--- /dev/null
+++ b/src/renderer/components/+extensions/install-on-drop.injectable.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import loggerInjectable from "../../../common/logger.injectable";
+import attemptInstallsInjectable from "./attempt-installs.injectable";
+
+export type InstallOnDrop = (files: File[]) => Promise<void>;
+
+const installOnDropInjectable = getInjectable({
+  id: "install-on-drop",
+
+  instantiate: (di): InstallOnDrop => {
+    const attemptInstalls = di.inject(attemptInstallsInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return (files) => {
+      logger.info("Install from D&D");
+
+      return attemptInstalls(files.map(({ path }) => path));
+    };
+  },
+});
+
+export default installOnDropInjectable;
diff --git a/src/renderer/components/+extensions/install-on-drop/install-on-drop.injectable.ts b/src/renderer/components/+extensions/install-on-drop/install-on-drop.injectable.ts
deleted file mode 100644
index 1a693fa7a6..0000000000
--- a/src/renderer/components/+extensions/install-on-drop/install-on-drop.injectable.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { installOnDrop } from "./install-on-drop";
-import attemptInstallsInjectable from "../attempt-installs/attempt-installs.injectable";
-
-const installOnDropInjectable = getInjectable({
-  id: "install-on-drop",
-
-  instantiate: (di) =>
-    installOnDrop({
-      attemptInstalls: di.inject(attemptInstallsInjectable),
-    }),
-});
-
-export default installOnDropInjectable;
diff --git a/src/renderer/components/+extensions/install-on-drop/install-on-drop.tsx b/src/renderer/components/+extensions/install-on-drop/install-on-drop.tsx
deleted file mode 100644
index 0a887f7c6f..0000000000
--- a/src/renderer/components/+extensions/install-on-drop/install-on-drop.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import logger from "../../../../main/logger";
-
-interface Dependencies {
-  attemptInstalls: (filePaths: string[]) => Promise<void>;
-}
-
-export const installOnDrop =
-  ({ attemptInstalls }: Dependencies) =>
-    async (files: File[]) => {
-      logger.info("Install from D&D");
-      await attemptInstalls(files.map(({ path }) => path));
-    };
diff --git a/src/renderer/components/+extensions/install.tsx b/src/renderer/components/+extensions/install.tsx
index b3d33dc7dd..607ed74aaa 100644
--- a/src/renderer/components/+extensions/install.tsx
+++ b/src/renderer/components/+extensions/install.tsx
@@ -56,9 +56,7 @@ const NonInjectedInstall: React.FC<Dependencies & InstallProps> = ({
       <div>
         <Input
           theme="round-black"
-          disabled={
-            extensionInstallationStateStore.anyPreInstallingOrInstalling
-          }
+          disabled={extensionInstallationStateStore.anyPreInstallingOrInstalling}
           placeholder={"Name or file path or URL"}
           showErrorsAsTooltip={{ preferredPositions: TooltipPosition.BOTTOM }}
           validators={installPath ? installInputValidator : undefined}
diff --git a/src/renderer/components/input/input.tsx b/src/renderer/components/input/input.tsx
index 3305c48e7b..bbbfa60a86 100644
--- a/src/renderer/components/input/input.tsx
+++ b/src/renderer/components/input/input.tsx
@@ -7,6 +7,7 @@ import "./input.scss";
 
 import type { DOMAttributes, InputHTMLAttributes, TextareaHTMLAttributes } from "react";
 import React from "react";
+import type { SingleOrMany } from "../../utils";
 import { autoBind, cssNames, debouncePromise, getRandId, isPromiseSettledFulfilled } from "../../utils";
 import { Icon } from "../icon";
 import type { TooltipProps } from "../tooltip";
@@ -72,7 +73,7 @@ export type InputProps = Omit<InputElementProps, "onChange" | "onSubmit"> & {
   iconLeft?: IconData;
   iconRight?: IconData;
   contentRight?: string | React.ReactNode; // Any component of string goes after iconRight
-  validators?: InputValidator<boolean> | InputValidator<boolean>[];
+  validators?: SingleOrMany<InputValidator>;
   blurOnEnter?: boolean;
   onChange?(value: string, evt: React.ChangeEvent<InputElement>): void;
   onSubmit?(value: string, evt: React.KeyboardEvent<InputElement>): void;

From 51af8f8aa446c15fe9c49cb10deb5f640d3bced1 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 11 Oct 2022 16:40:23 +0200
Subject: [PATCH 16/48] Leases view (#6378)

* Leases view

Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>

* Renamed default exports

Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>
---
 .../config/leases/leases-route.injectable.ts  | 25 ++++++
 .../leases/navigate-to-leases.injectable.ts   | 20 +++++
 src/common/k8s-api/endpoints/index.ts         |  1 +
 .../k8s-api/endpoints/lease.api.injectable.ts | 22 +++++
 src/common/k8s-api/endpoints/lease.api.ts     | 56 ++++++++++++
 src/common/rbac.ts                            |  3 +-
 .../components/+config-leases/index.ts        |  7 ++
 .../+config-leases/lease-details.scss         |  6 ++
 .../+config-leases/lease-details.tsx          | 51 +++++++++++
 .../leases-route-component.injectable.ts      | 21 +++++
 .../leases-sidebar-items.injectable.tsx       | 38 ++++++++
 .../components/+config-leases/leases.scss     | 24 +++++
 .../components/+config-leases/leases.tsx      | 87 +++++++++++++++++++
 .../+config-leases/store.injectable.ts        | 24 +++++
 .../components/+config-leases/store.ts        | 10 +++
 .../lease-detail-item.injectable.ts           | 33 +++++++
 src/renderer/utils/rbac.ts                    |  1 +
 17 files changed, 428 insertions(+), 1 deletion(-)
 create mode 100644 src/common/front-end-routing/routes/cluster/config/leases/leases-route.injectable.ts
 create mode 100644 src/common/front-end-routing/routes/cluster/config/leases/navigate-to-leases.injectable.ts
 create mode 100644 src/common/k8s-api/endpoints/lease.api.injectable.ts
 create mode 100644 src/common/k8s-api/endpoints/lease.api.ts
 create mode 100644 src/renderer/components/+config-leases/index.ts
 create mode 100644 src/renderer/components/+config-leases/lease-details.scss
 create mode 100644 src/renderer/components/+config-leases/lease-details.tsx
 create mode 100644 src/renderer/components/+config-leases/leases-route-component.injectable.ts
 create mode 100644 src/renderer/components/+config-leases/leases-sidebar-items.injectable.tsx
 create mode 100644 src/renderer/components/+config-leases/leases.scss
 create mode 100644 src/renderer/components/+config-leases/leases.tsx
 create mode 100644 src/renderer/components/+config-leases/store.injectable.ts
 create mode 100644 src/renderer/components/+config-leases/store.ts
 create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/lease-detail-item.injectable.ts

diff --git a/src/common/front-end-routing/routes/cluster/config/leases/leases-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/leases/leases-route.injectable.ts
new file mode 100644
index 0000000000..65ee0e3ffa
--- /dev/null
+++ b/src/common/front-end-routing/routes/cluster/config/leases/leases-route.injectable.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
+
+const leasesRouteInjectable = getInjectable({
+  id: "leases",
+
+  instantiate: (di) => {
+    const isAllowedResource = di.inject(isAllowedResourceInjectable, "leases");
+
+    return {
+      path: "/leases",
+      clusterFrame: true,
+      isEnabled: isAllowedResource,
+    };
+  },
+
+  injectionToken: frontEndRouteInjectionToken,
+});
+
+export default leasesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/config/leases/navigate-to-leases.injectable.ts b/src/common/front-end-routing/routes/cluster/config/leases/navigate-to-leases.injectable.ts
new file mode 100644
index 0000000000..5bf7d74ff1
--- /dev/null
+++ b/src/common/front-end-routing/routes/cluster/config/leases/navigate-to-leases.injectable.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import leasesRouteInjectable from "./leases-route.injectable";
+import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token";
+
+const navigateToLeasesInjectable = getInjectable({
+  id: "navigate-to-leases",
+
+  instantiate: (di) => {
+    const navigateToRoute = di.inject(navigateToRouteInjectionToken);
+    const route = di.inject(leasesRouteInjectable);
+
+    return () => navigateToRoute(route);
+  },
+});
+
+export default navigateToLeasesInjectable;
diff --git a/src/common/k8s-api/endpoints/index.ts b/src/common/k8s-api/endpoints/index.ts
index e13a969faa..c0493e6370 100644
--- a/src/common/k8s-api/endpoints/index.ts
+++ b/src/common/k8s-api/endpoints/index.ts
@@ -19,6 +19,7 @@ export * from "./events.api";
 export * from "./horizontal-pod-autoscaler.api";
 export * from "./ingress.api";
 export * from "./job.api";
+export * from "./lease.api";
 export * from "./limit-range.api";
 export * from "./namespace.api";
 export * from "./network-policy.api";
diff --git a/src/common/k8s-api/endpoints/lease.api.injectable.ts b/src/common/k8s-api/endpoints/lease.api.injectable.ts
new file mode 100644
index 0000000000..41bd5e3935
--- /dev/null
+++ b/src/common/k8s-api/endpoints/lease.api.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import assert from "assert";
+import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token";
+import { LeaseApi } from "./lease.api";
+import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token";
+
+const leaseApiInjectable = getInjectable({
+  id: "lease-api",
+  instantiate: (di) => {
+    assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "leaseApi is only available in certain environments");
+
+    return new LeaseApi();
+  },
+
+  injectionToken: kubeApiInjectionToken,
+});
+
+export default leaseApiInjectable;
diff --git a/src/common/k8s-api/endpoints/lease.api.ts b/src/common/k8s-api/endpoints/lease.api.ts
new file mode 100644
index 0000000000..22cfb778e4
--- /dev/null
+++ b/src/common/k8s-api/endpoints/lease.api.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api";
+import { KubeApi } from "../kube-api";
+import type { NamespaceScopedMetadata } from "../kube-object";
+import { KubeObject } from "../kube-object";
+
+export interface LeaseSpec {
+  acquireTime?: string;
+  holderIdentity: string;
+  leaseDurationSeconds: number;
+  leaseTransitions?: number;
+  renewTime: string;
+}
+
+export class Lease extends KubeObject<
+  NamespaceScopedMetadata,
+  void,
+  LeaseSpec
+> {
+  static readonly kind = "Lease";
+  static readonly namespaced = true;
+  static readonly apiBase = "/apis/coordination.k8s.io/v1/leases";
+
+  getAcquireTime(): string {
+    return this.spec.acquireTime || "";
+  }
+
+  getHolderIdentity(): string {
+    return this.spec.holderIdentity;
+  }
+
+  getLeaseDurationSeconds(): number {
+    return this.spec.leaseDurationSeconds;
+  }
+
+  getLeaseTransitions(): number | undefined {
+    return this.spec.leaseTransitions;
+  }
+
+  getRenewTime(): string {
+    return this.spec.renewTime;
+  }
+}
+
+export class LeaseApi extends KubeApi<Lease> {
+  constructor(opts: DerivedKubeApiOptions & IgnoredKubeApiOptions = {}) {
+    super({
+      ...opts,
+      objectConstructor: Lease,
+    });
+  }
+}
diff --git a/src/common/rbac.ts b/src/common/rbac.ts
index 71c636613a..bfa04ef46b 100644
--- a/src/common/rbac.ts
+++ b/src/common/rbac.ts
@@ -4,7 +4,7 @@
  */
 
 export type KubeResource =
-  "namespaces" | "nodes" | "events" | "resourcequotas" | "services" | "limitranges" |
+  "namespaces" | "nodes" | "events" | "resourcequotas" | "services" | "limitranges" | "leases" |
   "secrets" | "configmaps" | "ingresses" | "networkpolicies" | "persistentvolumeclaims" | "persistentvolumes" | "storageclasses" |
   "pods" | "daemonsets" | "deployments" | "statefulsets" | "replicasets" | "jobs" | "cronjobs" |
   "endpoints" | "customresourcedefinitions" | "horizontalpodautoscalers" | "podsecuritypolicies" | "poddisruptionbudgets" |
@@ -35,6 +35,7 @@ export const apiResourceRecord: Record<KubeResource, KubeApiResourceData> = {
   "jobs": { kind: "Job", group: "batch" },
   "namespaces": { kind: "Namespace" },
   "limitranges": { kind: "LimitRange" },
+  "leases": { kind: "Lease" },
   "networkpolicies": { kind: "NetworkPolicy", group: "networking.k8s.io" },
   "nodes": { kind: "Node" },
   "persistentvolumes": { kind: "PersistentVolume" },
diff --git a/src/renderer/components/+config-leases/index.ts b/src/renderer/components/+config-leases/index.ts
new file mode 100644
index 0000000000..dcef127fb2
--- /dev/null
+++ b/src/renderer/components/+config-leases/index.ts
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+export * from "./leases";
+export * from "./lease-details";
diff --git a/src/renderer/components/+config-leases/lease-details.scss b/src/renderer/components/+config-leases/lease-details.scss
new file mode 100644
index 0000000000..33628f74dd
--- /dev/null
+++ b/src/renderer/components/+config-leases/lease-details.scss
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+.LeaseDetails {}
\ No newline at end of file
diff --git a/src/renderer/components/+config-leases/lease-details.tsx b/src/renderer/components/+config-leases/lease-details.tsx
new file mode 100644
index 0000000000..617021edbf
--- /dev/null
+++ b/src/renderer/components/+config-leases/lease-details.tsx
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import "./lease-details.scss";
+
+import React from "react";
+import { observer } from "mobx-react";
+import { DrawerItem } from "../drawer";
+import type { KubeObjectDetailsProps } from "../kube-object-details";
+import { KubeObjectMeta } from "../kube-object-meta";
+import type { Lease } from "../../../common/k8s-api/endpoints";
+
+export interface LeaseDetailsProps extends KubeObjectDetailsProps<Lease> {
+}
+
+@observer
+export class LeaseDetails extends React.Component<LeaseDetailsProps> {
+
+  render() {
+    const { object: lease } = this.props;
+
+    return (
+      <div className="LeaseDetails">
+        <KubeObjectMeta object={lease} />
+
+        <DrawerItem name="Holder Identity">
+          {lease.getHolderIdentity()}
+        </DrawerItem>
+
+        <DrawerItem name="Lease Duration Seconds">
+          {lease.getLeaseDurationSeconds()}
+        </DrawerItem>
+
+        <DrawerItem name="Lease Transitions" hidden={lease.getLeaseTransitions() === undefined}>
+          {lease.getLeaseTransitions()}
+        </DrawerItem>
+
+        <DrawerItem name="Acquire Time" hidden={lease.getAcquireTime() === ""}>
+          {lease.getAcquireTime()}
+        </DrawerItem>
+
+        <DrawerItem name="Renew Time">
+          {lease.getRenewTime()}
+        </DrawerItem>
+
+      </div >
+    );
+  }
+}
diff --git a/src/renderer/components/+config-leases/leases-route-component.injectable.ts b/src/renderer/components/+config-leases/leases-route-component.injectable.ts
new file mode 100644
index 0000000000..ef0ffbf37d
--- /dev/null
+++ b/src/renderer/components/+config-leases/leases-route-component.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { Leases } from "./leases";
+import leasesRouteInjectable from "../../../common/front-end-routing/routes/cluster/config/leases/leases-route.injectable";
+import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
+
+const leasesRouteComponentInjectable = getInjectable({
+  id: "leases-route-component",
+
+  instantiate: (di) => ({
+    route: di.inject(leasesRouteInjectable),
+    Component: Leases,
+  }),
+
+  injectionToken: routeSpecificComponentInjectionToken,
+});
+
+export default leasesRouteComponentInjectable;
diff --git a/src/renderer/components/+config-leases/leases-sidebar-items.injectable.tsx b/src/renderer/components/+config-leases/leases-sidebar-items.injectable.tsx
new file mode 100644
index 0000000000..178cf8a172
--- /dev/null
+++ b/src/renderer/components/+config-leases/leases-sidebar-items.injectable.tsx
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+
+import leasesRouteInjectable from "../../../common/front-end-routing/routes/cluster/config/leases/leases-route.injectable";
+import { configSidebarItemId } from "../+config/config-sidebar-items.injectable";
+import { sidebarItemsInjectionToken } from "../layout/sidebar-items.injectable";
+import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
+import navigateToLeasesInjectable from "../../../common/front-end-routing/routes/cluster/config/leases/navigate-to-leases.injectable";
+
+const leasesSidebarItemsInjectable = getInjectable({
+  id: "leases-sidebar-items",
+
+  instantiate: (di) => {
+    const route = di.inject(leasesRouteInjectable);
+    const navigateToLeases = di.inject(navigateToLeasesInjectable);
+    const routeIsActive = di.inject(routeIsActiveInjectable, route);
+
+    return computed(() => [
+      {
+        id: "leases",
+        parentId: configSidebarItemId,
+        title: "Leases",
+        onClick: navigateToLeases,
+        isActive: routeIsActive,
+        isVisible: route.isEnabled,
+        orderNumber: 80,
+      },
+    ]);
+  },
+
+  injectionToken: sidebarItemsInjectionToken,
+});
+
+export default leasesSidebarItemsInjectable;
diff --git a/src/renderer/components/+config-leases/leases.scss b/src/renderer/components/+config-leases/leases.scss
new file mode 100644
index 0000000000..ab7cbce494
--- /dev/null
+++ b/src/renderer/components/+config-leases/leases.scss
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+.Leases {
+  .TableCell {
+    &.name {
+      flex: 2;
+    }
+
+    &.warning {
+      @include table-cell-warning;
+    }
+
+    &.keys {
+      flex: 2.5;
+    }
+
+    &.age {
+      flex: .5;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/components/+config-leases/leases.tsx b/src/renderer/components/+config-leases/leases.tsx
new file mode 100644
index 0000000000..1c665762ad
--- /dev/null
+++ b/src/renderer/components/+config-leases/leases.tsx
@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import "./leases.scss";
+
+import * as React from "react";
+import { observer } from "mobx-react";
+import type { Lease } from "../../../common/k8s-api/endpoints/lease.api";
+import { KubeObjectStatusIcon } from "../kube-object-status-icon";
+import type { KubeObjectDetailsProps } from "../kube-object-details";
+import { KubeObjectListLayout } from "../kube-object-list-layout";
+import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
+import { KubeObjectAge } from "../kube-object/age";
+import { autoBind } from "../../../common/utils";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import leaseStoreInjectable from "./store.injectable";
+import type { LeaseStore } from "./store";
+
+enum columnId {
+  name = "name",
+  namespace = "namespace",
+  holder = "holder",
+  age = "age",
+}
+
+export interface LeaseProps extends KubeObjectDetailsProps<Lease> {
+}
+
+interface Dependencies {
+  leaseStore: LeaseStore;
+}
+
+@observer
+class NonInjectedLease extends React.Component<LeaseProps & Dependencies> {
+  constructor(props: LeaseProps & Dependencies) {
+    super(props);
+    autoBind(this);
+  }
+
+  render() {
+    const { leaseStore } = this.props;
+
+    return (
+      <SiblingsInTabLayout>
+        <KubeObjectListLayout
+          isConfigurable
+          tableId="configuration_leases"
+          className="Leases"
+          store={leaseStore}
+          sortingCallbacks={{
+            [columnId.name]: lease => lease.getName(),
+            [columnId.namespace]: lease => lease.getNs(),
+            [columnId.holder]: lease => lease.getHolderIdentity(),
+            [columnId.age]: lease => -lease.getCreationTimestamp(),
+          }}
+          searchFilters={[
+            lease => lease.getSearchFields(),
+          ]}
+          renderHeaderTitle="Leases"
+          renderTableHeader={[
+            { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name },
+            { className: "warning", showWithColumn: columnId.name },
+            { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace },
+            { title: "Holder", className: "holder", sortBy: columnId.holder, id: columnId.holder },
+            { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age },
+          ]}
+          renderTableContents={lease => [
+            lease.getName(),
+            <KubeObjectStatusIcon key="icon" object={lease} />,
+            lease.getNs(),
+            lease.getHolderIdentity(),
+            <KubeObjectAge key="age" object={lease} />,
+          ]}
+        />
+      </SiblingsInTabLayout>
+    );
+  }
+}
+
+export const Leases = withInjectables<Dependencies, LeaseProps>(NonInjectedLease, {
+  getProps: (di, props) => ({
+    ...props,
+    leaseStore: di.inject(leaseStoreInjectable),
+  }),
+});
diff --git a/src/renderer/components/+config-leases/store.injectable.ts b/src/renderer/components/+config-leases/store.injectable.ts
new file mode 100644
index 0000000000..b9dda24b07
--- /dev/null
+++ b/src/renderer/components/+config-leases/store.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import assert from "assert";
+import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
+import leaseApiInjectable from "../../../common/k8s-api/endpoints/lease.api.injectable";
+import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
+import { LeaseStore } from "./store";
+
+const leaseStoreInjectable = getInjectable({
+  id: "lease-store",
+  instantiate: (di) => {
+    assert(di.inject(storesAndApisCanBeCreatedInjectable), "leaseStore is only available in certain environments");
+
+    const api = di.inject(leaseApiInjectable);
+
+    return new LeaseStore(api);
+  },
+  injectionToken: kubeObjectStoreInjectionToken,
+});
+
+export default leaseStoreInjectable;
diff --git a/src/renderer/components/+config-leases/store.ts b/src/renderer/components/+config-leases/store.ts
new file mode 100644
index 0000000000..db19aed8dd
--- /dev/null
+++ b/src/renderer/components/+config-leases/store.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
+import type { Lease, LeaseApi } from "../../../common/k8s-api/endpoints/lease.api";
+
+export class LeaseStore extends KubeObjectStore<Lease, LeaseApi> {
+}
diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/lease-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/lease-detail-item.injectable.ts
new file mode 100644
index 0000000000..baaabbf730
--- /dev/null
+++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/lease-detail-item.injectable.ts
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token";
+import { computed } from "mobx";
+import { LeaseDetails } from "../../../+config-leases";
+import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version";
+import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable";
+
+const leaseDetailItemInjectable = getInjectable({
+  id: "lease-detail-item",
+
+  instantiate: (di) => {
+    const kubeObject = di.inject(currentKubeObjectInDetailsInjectable);
+
+    return {
+      Component: LeaseDetails,
+      enabled: computed(() => isLease(kubeObject.get())),
+      orderNumber: 10,
+    };
+  },
+
+  injectionToken: kubeObjectDetailItemInjectionToken,
+});
+
+const isLease = kubeObjectMatchesToKindAndApiVersion(
+  "Lease",
+  ["coordination.k8s.io/v1"],
+);
+
+export default leaseDetailItemInjectable;
diff --git a/src/renderer/utils/rbac.ts b/src/renderer/utils/rbac.ts
index 9fcee6174c..46219febf6 100644
--- a/src/renderer/utils/rbac.ts
+++ b/src/renderer/utils/rbac.ts
@@ -10,6 +10,7 @@ export const ResourceNames: Record<KubeResource, string> = {
   "namespaces": "Namespaces",
   "nodes": "Nodes",
   "events": "Events",
+  "leases": "Leases",
   "resourcequotas": "Resource Quotas",
   "services": "Services",
   "secrets": "Secrets",

From 4e02ccb1c7bfc01ed814418e2a2f8536e3e427c2 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Tue, 11 Oct 2022 10:58:46 -0400
Subject: [PATCH 17/48] Fix ReactiveDuration to update as frequently as
 necessary (#6375)

- When used in non compact mode (eg KubeObjectMeta's age) the seconds
  can be displayed but previously between 10m and 180m of age, the
  display would only update every minute

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../components/duration/reactive-duration.tsx | 22 ++++++++++++++-----
 .../kube-object-meta/kube-object-meta.tsx     |  8 +------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/renderer/components/duration/reactive-duration.tsx b/src/renderer/components/duration/reactive-duration.tsx
index ce38b82509..42a6b0949b 100644
--- a/src/renderer/components/duration/reactive-duration.tsx
+++ b/src/renderer/components/duration/reactive-duration.tsx
@@ -18,19 +18,29 @@ export interface ReactiveDurationProps {
   compact?: boolean;
 }
 
+const everySecond = 1000;
+const everyMinute = 60 * 1000;
+
 /**
- * This function computes a resonable update
+ * This function computes a resonable update interval, matching `formatDuration`'s rules on when to display seconds
  */
-function computeUpdateInterval(creationTimestampEpoch: number): number {
+function computeUpdateInterval(creationTimestampEpoch: number, compact: boolean): number {
   const seconds = Math.floor((Date.now() - creationTimestampEpoch) / 1000);
   const minutes = Math.floor(seconds / 60);
 
   if (minutes < 10) {
-    // Update every second
-    return 1000;
+    return everySecond;
   }
 
-  return 60 * 1000;
+  if (compact) {
+    return everyMinute;
+  }
+
+  if (minutes < (60 * 3)) {
+    return everySecond;
+  }
+
+  return everyMinute;
 }
 
 export const ReactiveDuration = observer(({ timestamp, compact = true }: ReactiveDurationProps) => {
@@ -42,7 +52,7 @@ export const ReactiveDuration = observer(({ timestamp, compact = true }: Reactiv
 
   return (
     <>
-      {formatDuration(reactiveNow(computeUpdateInterval(timestampSeconds)) - timestampSeconds, compact)}
+      {formatDuration(reactiveNow(computeUpdateInterval(timestampSeconds, compact)) - timestampSeconds, compact)}
     </>
   );
 });
diff --git a/src/renderer/components/kube-object-meta/kube-object-meta.tsx b/src/renderer/components/kube-object-meta/kube-object-meta.tsx
index 20852d95ba..f339877eb2 100644
--- a/src/renderer/components/kube-object-meta/kube-object-meta.tsx
+++ b/src/renderer/components/kube-object-meta/kube-object-meta.tsx
@@ -62,13 +62,7 @@ const NonInjectedKubeObjectMeta = observer(({
       <DrawerItem name="Created" hidden={isHidden("creationTimestamp")}>
         <KubeObjectAge object={object} compact={false} />
         {" ago "}
-        {creationTimestamp && (
-          <>
-            (
-            <LocaleDate date={creationTimestamp} />
-            )
-          </>
-        )}
+        {creationTimestamp && <LocaleDate date={creationTimestamp} />}
       </DrawerItem>
       <DrawerItem name="Name" hidden={isHidden("name")}>
         {getName()}

From d96918c966e1bd36166f62faac7fb155db188dc2 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 13 Oct 2022 07:49:58 -0400
Subject: [PATCH 18/48] Fix windows shell not having all environment variables
 (#6402)

* Fix windows shell not having all environment variables

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix startup due to buildVersion dependency

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Call cleanup in computeShellEnvironment

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../user-store/resolved-shell.injectable.ts   |  13 ++
 src/main/__test__/shell-session.test.ts       |   6 +-
 .../local-shell-session.ts                    |   5 +-
 .../local-shell-session/open.injectable.ts    |  12 +-
 .../local-shell-session/techincal.test.ts     |  90 +++++++++++++
 .../node-shell-session/open.injectable.ts     |  10 ++
 src/main/shell-session/shell-session.ts       |  41 +++---
 ...pawn-pty.global-override-for-injectable.ts |  10 ++
 .../shell-session/spawn-pty.injectable.ts     |  21 ++++
 .../runnables/setup-shell.injectable.ts       |  17 ++-
 src/main/utils/clear-kube-env-vars.ts         |   2 +-
 src/main/utils/shell-env.ts                   | 118 ------------------
 .../compute-shell-environment.injectable.ts   |  62 +++++++++
 ...ironment.global-override-for-injectable.ts |  11 ++
 ...mpute-unix-shell-environment.injectable.ts |  93 ++++++++++++++
 15 files changed, 367 insertions(+), 144 deletions(-)
 create mode 100644 src/common/user-store/resolved-shell.injectable.ts
 create mode 100644 src/main/shell-session/local-shell-session/techincal.test.ts
 create mode 100644 src/main/shell-session/spawn-pty.global-override-for-injectable.ts
 create mode 100644 src/main/shell-session/spawn-pty.injectable.ts
 delete mode 100644 src/main/utils/shell-env.ts
 create mode 100644 src/main/utils/shell-env/compute-shell-environment.injectable.ts
 create mode 100644 src/main/utils/shell-env/compute-unix-shell-environment.global-override-for-injectable.ts
 create mode 100644 src/main/utils/shell-env/compute-unix-shell-environment.injectable.ts

diff --git a/src/common/user-store/resolved-shell.injectable.ts b/src/common/user-store/resolved-shell.injectable.ts
new file mode 100644
index 0000000000..98c219feff
--- /dev/null
+++ b/src/common/user-store/resolved-shell.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import userStoreInjectable from "./user-store.injectable";
+
+const resolvedShellInjectable = getInjectable({
+  id: "resolved-shell",
+  instantiate: (di) => di.inject(userStoreInjectable).resolvedShell,
+});
+
+export default resolvedShellInjectable;
diff --git a/src/main/__test__/shell-session.test.ts b/src/main/__test__/shell-session.test.ts
index 1fe8915e26..c8c0f1c8df 100644
--- a/src/main/__test__/shell-session.test.ts
+++ b/src/main/__test__/shell-session.test.ts
@@ -7,14 +7,14 @@ import { clearKubeconfigEnvVars } from "../utils/clear-kube-env-vars";
 
 describe("clearKubeconfigEnvVars tests", () => {
   it("should not touch non kubeconfig keys", () => {
-    expect(clearKubeconfigEnvVars({ a: 1 })).toStrictEqual({ a: 1 });
+    expect(clearKubeconfigEnvVars({ a: "22" })).toStrictEqual({ a: "22" });
   });
 
   it("should remove a single kubeconfig key", () => {
-    expect(clearKubeconfigEnvVars({ a: 1, kubeconfig: "1" })).toStrictEqual({ a: 1 });
+    expect(clearKubeconfigEnvVars({ a: "22", kubeconfig: "1" })).toStrictEqual({ a: "22" });
   });
 
   it("should remove a two kubeconfig key", () => {
-    expect(clearKubeconfigEnvVars({ a: 1, kubeconfig: "1", kUbeconfig: "1" })).toStrictEqual({ a: 1 });
+    expect(clearKubeconfigEnvVars({ a: "22", kubeconfig: "1", kUbeconfig: "1" })).toStrictEqual({ a: "22" });
   });
 });
diff --git a/src/main/shell-session/local-shell-session/local-shell-session.ts b/src/main/shell-session/local-shell-session/local-shell-session.ts
index c13bbeb5a2..49e6dd059f 100644
--- a/src/main/shell-session/local-shell-session/local-shell-session.ts
+++ b/src/main/shell-session/local-shell-session/local-shell-session.ts
@@ -36,11 +36,8 @@ export class LocalShellSession extends ShellSession {
   }
 
   public async open() {
-    let env = await this.getCachedShellEnv();
-
     // extensions can modify the env
-    env = this.dependencies.modifyTerminalShellEnv(this.cluster.id, env);
-
+    const env = this.dependencies.modifyTerminalShellEnv(this.cluster.id, await this.getCachedShellEnv());
     const shell = env.PTYSHELL;
 
     if (!shell) {
diff --git a/src/main/shell-session/local-shell-session/open.injectable.ts b/src/main/shell-session/local-shell-session/open.injectable.ts
index 0187ba97e7..bfb72911ec 100644
--- a/src/main/shell-session/local-shell-session/open.injectable.ts
+++ b/src/main/shell-session/local-shell-session/open.injectable.ts
@@ -17,6 +17,11 @@ import type WebSocket from "ws";
 import getDirnameOfPathInjectable from "../../../common/path/get-dirname.injectable";
 import joinPathsInjectable from "../../../common/path/join-paths.injectable";
 import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable";
+import computeShellEnvironmentInjectable from "../../utils/shell-env/compute-shell-environment.injectable";
+import spawnPtyInjectable from "../spawn-pty.injectable";
+import resolvedShellInjectable from "../../../common/user-store/resolved-shell.injectable";
+import appNameInjectable from "../../../common/vars/app-name.injectable";
+import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
 
 export interface OpenLocalShellSessionArgs {
   websocket: WebSocket;
@@ -34,13 +39,18 @@ const openLocalShellSessionInjectable = getInjectable({
     const dependencies: LocalShellSessionDependencies = {
       directoryForBinaries: di.inject(directoryForBinariesInjectable),
       isMac: di.inject(isMacInjectable),
-      modifyTerminalShellEnv: di.inject(modifyTerminalShellEnvInjectable),
       isWindows: di.inject(isWindowsInjectable),
       logger: di.inject(loggerInjectable),
       userStore: di.inject(userStoreInjectable),
+      resolvedShell: di.inject(resolvedShellInjectable),
+      appName: di.inject(appNameInjectable),
+      buildVersion: di.inject(buildVersionInjectable),
+      modifyTerminalShellEnv: di.inject(modifyTerminalShellEnvInjectable),
       getDirnameOfPath: di.inject(getDirnameOfPathInjectable),
       joinPaths: di.inject(joinPathsInjectable),
       getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
+      computeShellEnvironment: di.inject(computeShellEnvironmentInjectable),
+      spawnPty: di.inject(spawnPtyInjectable),
     };
 
     return (args) => {
diff --git a/src/main/shell-session/local-shell-session/techincal.test.ts b/src/main/shell-session/local-shell-session/techincal.test.ts
new file mode 100644
index 0000000000..fbe2ccaea3
--- /dev/null
+++ b/src/main/shell-session/local-shell-session/techincal.test.ts
@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { DiContainer } from "@ogre-tools/injectable";
+import { WebSocket } from "ws";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import type { Cluster } from "../../../common/cluster/cluster";
+import platformInjectable from "../../../common/vars/platform.injectable";
+import { getDiForUnitTesting } from "../../getDiForUnitTesting";
+import createKubectlInjectable from "../../kubectl/create-kubectl.injectable";
+import type { Kubectl } from "../../kubectl/kubectl";
+import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
+import type { OpenShellSession } from "../create-shell-session.injectable";
+import type { SpawnPty } from "../spawn-pty.injectable";
+import spawnPtyInjectable from "../spawn-pty.injectable";
+import openLocalShellSessionInjectable from "./open.injectable";
+
+describe("technical unit tests for local shell sessions", () => {
+  let di: DiContainer;
+
+  beforeEach(() => {
+    di = getDiForUnitTesting({
+      doGeneralOverrides: true,
+    });
+
+    di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");
+    di.override(buildVersionInjectable, () => ({
+      get: () => "1.1.1",
+    }));
+  });
+
+  describe("when on windows", () => {
+    let openLocalShellSession: OpenShellSession;
+    let spawnPtyMock: jest.MockedFunction<SpawnPty>;
+
+    beforeEach(() => {
+      di.override(platformInjectable, () => "win32");
+
+      spawnPtyMock = jest.fn();
+      di.override(spawnPtyInjectable, () => spawnPtyMock);
+
+      di.override(createKubectlInjectable, () => () => ({
+        binDir: async () => "/some-kubectl-binary-dir",
+        getBundledPath: () => "/some-bundled-kubectl-path",
+      }) as Partial<Kubectl> as Kubectl);
+
+      openLocalShellSession = di.inject(openLocalShellSessionInjectable);
+    });
+
+    describe("when opening a local shell session", () => {
+      it("should pass through all environment variables to shell", async () => {
+        process.env.MY_TEST_ENV_VAR = "true";
+
+        spawnPtyMock.mockImplementationOnce((file, args, options) => {
+          expect(options.env).toMatchObject({
+            MY_TEST_ENV_VAR: "true",
+          });
+
+          return {
+            cols: 80,
+            rows: 40,
+            pid: 12343,
+            handleFlowControl: false,
+            kill: jest.fn(),
+            onData: jest.fn(),
+            onExit: jest.fn(),
+            pause: jest.fn(),
+            process: "my-pty",
+            resize: jest.fn(),
+            resume: jest.fn(),
+            write: jest.fn(),
+            on: jest.fn(),
+
+          };
+        });
+
+        await openLocalShellSession({
+          cluster: {
+            getProxyKubeconfigPath: async () => "/some-proxy-kubeconfig",
+            preferences: {},
+          } as Partial<Cluster> as Cluster,
+          tabId: "my-tab-id",
+          websocket: new WebSocket(null),
+        });
+      });
+    });
+  });
+});
diff --git a/src/main/shell-session/node-shell-session/open.injectable.ts b/src/main/shell-session/node-shell-session/open.injectable.ts
index 9bc418d812..6080129d6a 100644
--- a/src/main/shell-session/node-shell-session/open.injectable.ts
+++ b/src/main/shell-session/node-shell-session/open.injectable.ts
@@ -12,6 +12,11 @@ import isMacInjectable from "../../../common/vars/is-mac.injectable";
 import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
 import createKubeJsonApiForClusterInjectable from "../../../common/k8s-api/create-kube-json-api-for-cluster.injectable";
+import computeShellEnvironmentInjectable from "../../utils/shell-env/compute-shell-environment.injectable";
+import spawnPtyInjectable from "../spawn-pty.injectable";
+import resolvedShellInjectable from "../../../common/user-store/resolved-shell.injectable";
+import appNameInjectable from "../../../common/vars/app-name.injectable";
+import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
 
 export interface NodeShellSessionArgs {
   websocket: WebSocket;
@@ -28,7 +33,12 @@ const openNodeShellSessionInjectable = getInjectable({
       isMac: di.inject(isMacInjectable),
       isWindows: di.inject(isWindowsInjectable),
       logger: di.inject(loggerInjectable),
+      resolvedShell: di.inject(resolvedShellInjectable),
+      appName: di.inject(appNameInjectable),
+      buildVersion: di.inject(buildVersionInjectable),
       createKubeJsonApiForCluster: di.inject(createKubeJsonApiForClusterInjectable),
+      computeShellEnvironment: di.inject(computeShellEnvironmentInjectable),
+      spawnPty: di.inject(spawnPtyInjectable),
     };
     const kubectl = createKubectl(params.cluster.version);
     const session = new NodeShellSession(dependencies, { kubectl, ...params });
diff --git a/src/main/shell-session/shell-session.ts b/src/main/shell-session/shell-session.ts
index 6514b0cf85..e17f533ccb 100644
--- a/src/main/shell-session/shell-session.ts
+++ b/src/main/shell-session/shell-session.ts
@@ -6,18 +6,18 @@
 import type { Cluster } from "../../common/cluster/cluster";
 import type { Kubectl } from "../kubectl/kubectl";
 import type WebSocket from "ws";
-import { shellEnv } from "../utils/shell-env";
-import { app } from "electron";
 import { clearKubeconfigEnvVars } from "../utils/clear-kube-env-vars";
 import path from "path";
 import os, { userInfo } from "os";
-import { UserStore } from "../../common/user-store";
-import * as pty from "node-pty";
+import type * as pty from "node-pty";
 import { appEventBus } from "../../common/app-event-bus/event-bus";
 import { stat } from "fs/promises";
 import { getOrInsertWith } from "../../common/utils";
 import { type TerminalMessage, TerminalChannels } from "../../common/terminal/channels";
 import type { Logger } from "../../common/logger";
+import type { ComputeShellEnvironment } from "../utils/shell-env/compute-shell-environment.injectable";
+import type { SpawnPty } from "./spawn-pty.injectable";
+import type { InitializableState } from "../../common/initializable-state/create";
 
 export class ShellOpenError extends Error {
   constructor(message: string, options?: ErrorOptions) {
@@ -107,6 +107,11 @@ export interface ShellSessionDependencies {
   readonly isWindows: boolean;
   readonly isMac: boolean;
   readonly logger: Logger;
+  readonly resolvedShell: string | undefined;
+  readonly appName: string;
+  readonly buildVersion: InitializableState<string>;
+  computeShellEnvironment: ComputeShellEnvironment;
+  spawnPty: SpawnPty;
 }
 
 export interface ShellSessionArgs {
@@ -148,14 +153,14 @@ export abstract class ShellSession {
 
   protected abstract get cwd(): string | undefined;
 
-  protected ensureShellProcess(shell: string, args: string[], env: Record<string, string | undefined>, cwd: string): { shellProcess: pty.IPty; resume: boolean } {
+  protected ensureShellProcess(shell: string, args: string[], env: Partial<Record<string, string>>, cwd: string): { shellProcess: pty.IPty; resume: boolean } {
     const resume = ShellSession.processes.has(this.terminalId);
     const shellProcess = getOrInsertWith(ShellSession.processes, this.terminalId, () => (
-      pty.spawn(shell, args, {
+      this.dependencies.spawnPty(shell, args, {
         rows: 30,
         cols: 80,
         cwd,
-        env: env as Record<string, string>,
+        env,
         name: "xterm-256color",
         // TODO: Something else is broken here so we need to force the use of winPty on windows
         useConpty: false,
@@ -331,19 +336,27 @@ export abstract class ShellSession {
   }
 
   protected async getShellEnv() {
-    const shell = UserStore.getInstance().resolvedShell;
-    const env = clearKubeconfigEnvVars(JSON.parse(JSON.stringify(await shellEnv(shell || userInfo().shell))));
-    const pathStr = [await this.kubectlBinDirP, ...this.getPathEntries(), process.env.PATH].join(path.delimiter);
+    const shell = this.dependencies.resolvedShell || userInfo().shell;
+    const result = await this.dependencies.computeShellEnvironment(shell);
+    const rawEnv = (() => {
+      if (result.callWasSuccessful) {
+        return result.response ?? process.env;
+      }
+
+      return process.env;
+    })();
+
+    const env = clearKubeconfigEnvVars(JSON.parse(JSON.stringify(rawEnv)));
+    const pathStr = [await this.kubectlBinDirP, ...this.getPathEntries(), env.PATH].join(path.delimiter);
 
     delete env.DEBUG; // don't pass DEBUG into shells
 
     if (this.dependencies.isWindows) {
-      env.SystemRoot = process.env.SystemRoot;
       env.PTYSHELL = shell || "powershell.exe";
       env.PATH = pathStr;
       env.LENS_SESSION = "true";
       env.WSLENV = [
-        process.env.WSLENV,
+        env.WSLENV,
         "KUBECONFIG/up:LENS_SESSION/u",
       ]
         .filter(Boolean)
@@ -363,8 +376,8 @@ export abstract class ShellSession {
 
     env.PTYPID = process.pid.toString();
     env.KUBECONFIG = await this.kubeconfigPathP;
-    env.TERM_PROGRAM = app.getName();
-    env.TERM_PROGRAM_VERSION = app.getVersion();
+    env.TERM_PROGRAM = this.dependencies.appName;
+    env.TERM_PROGRAM_VERSION = this.dependencies.buildVersion.get();
 
     if (this.cluster.preferences.httpsProxy) {
       env.HTTPS_PROXY = this.cluster.preferences.httpsProxy;
diff --git a/src/main/shell-session/spawn-pty.global-override-for-injectable.ts b/src/main/shell-session/spawn-pty.global-override-for-injectable.ts
new file mode 100644
index 0000000000..239f7c5e47
--- /dev/null
+++ b/src/main/shell-session/spawn-pty.global-override-for-injectable.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getGlobalOverride } from "../../common/test-utils/get-global-override";
+import spawnPtyInjectable from "./spawn-pty.injectable";
+
+export default getGlobalOverride(spawnPtyInjectable, () => () => {
+  throw new Error("Tried to spawn a PTY without an override");
+});
diff --git a/src/main/shell-session/spawn-pty.injectable.ts b/src/main/shell-session/spawn-pty.injectable.ts
new file mode 100644
index 0000000000..0639c7307b
--- /dev/null
+++ b/src/main/shell-session/spawn-pty.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { IPty, IPtyForkOptions, IWindowsPtyForkOptions } from "node-pty";
+import { spawn } from "node-pty";
+
+export type WindowsSpawnPtyOptions = Omit<IWindowsPtyForkOptions, "env"> & { env?: Partial<Record<string, string>> };
+export type UnixSpawnPtyOptions = Omit<IPtyForkOptions, "env"> & { env?: Partial<Record<string, string>> };
+export type SpawnPtyOptions = UnixSpawnPtyOptions | WindowsSpawnPtyOptions;
+
+export type SpawnPty = (file: string, args: string[], options: SpawnPtyOptions) => IPty;
+
+const spawnPtyInjectable = getInjectable({
+  id: "spawn-pty",
+  instantiate: () => spawn as SpawnPty,
+  causesSideEffects: true,
+});
+
+export default spawnPtyInjectable;
diff --git a/src/main/start-main-application/runnables/setup-shell.injectable.ts b/src/main/start-main-application/runnables/setup-shell.injectable.ts
index 147d2f24ab..9eb736b2db 100644
--- a/src/main/start-main-application/runnables/setup-shell.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-shell.injectable.ts
@@ -5,11 +5,11 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import loggerInjectable from "../../../common/logger.injectable";
 import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token";
-import { shellEnv } from "../../utils/shell-env";
 import os from "os";
 import { unionPATHs } from "../../../common/utils/union-env-path";
 import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable";
 import electronAppInjectable from "../../electron-app/electron-app.injectable";
+import computeShellEnvironmentInjectable from "../../utils/shell-env/compute-shell-environment.injectable";
 
 const setupShellInjectable = getInjectable({
   id: "setup-shell",
@@ -18,13 +18,24 @@ const setupShellInjectable = getInjectable({
     const logger = di.inject(loggerInjectable);
     const isSnapPackage = di.inject(isSnapPackageInjectable);
     const electronApp = di.inject(electronAppInjectable);
+    const computeShellEnvironment = di.inject(computeShellEnvironmentInjectable);
 
     return {
       id: "setup-shell",
-      run: async () => {
+      run: async (): Promise<void> => {
         logger.info("🐚 Syncing shell environment");
 
-        const env = await shellEnv(os.userInfo().shell);
+        const result = await computeShellEnvironment(os.userInfo().shell);
+
+        if (!result.callWasSuccessful) {
+          return void logger.error(`[SHELL-SYNC]: ${result.error}`);
+        }
+
+        const env = result.response;
+
+        if (!env) {
+          return void logger.debug("[SHELL-SYNC]: nothing to do, env not special in shells");
+        }
 
         if (!env.LANG) {
           // the LANG env var expects an underscore instead of electron's dash
diff --git a/src/main/utils/clear-kube-env-vars.ts b/src/main/utils/clear-kube-env-vars.ts
index fab11be4e1..f678f44807 100644
--- a/src/main/utils/clear-kube-env-vars.ts
+++ b/src/main/utils/clear-kube-env-vars.ts
@@ -13,7 +13,7 @@ const anyKubeconfig = /^kubeconfig$/i;
  * before KUBECONFIG and we only set KUBECONFIG.
  * @param env The current copy of env
  */
-export function clearKubeconfigEnvVars(env: Record<string, any>): Record<string, any> {
+export function clearKubeconfigEnvVars(env: Partial<Record<string, string>>): Partial<Record<string, string>> {
   return Object.fromEntries(
     Object.entries(env)
       .filter(([key]) => anyKubeconfig.exec(key) === null),
diff --git a/src/main/utils/shell-env.ts b/src/main/utils/shell-env.ts
deleted file mode 100644
index 6f4cce0be8..0000000000
--- a/src/main/utils/shell-env.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { spawn } from "child_process";
-import { randomUUID } from "crypto";
-import { basename } from "path";
-import { isWindows } from "../../common/vars";
-import logger from "../logger";
-
-export type EnvironmentVariables = Partial<Record<string, string>>;
-
-
-async function unixShellEnvironment(shell: string): Promise<EnvironmentVariables> {
-  const runAsNode = process.env["ELECTRON_RUN_AS_NODE"];
-  const noAttach = process.env["ELECTRON_NO_ATTACH_CONSOLE"];
-  const env = {
-    ...process.env,
-    ELECTRON_RUN_AS_NODE: "1",
-    ELECTRON_NO_ATTACH_CONSOLE: "1",
-  };
-  const mark = randomUUID().replace(/-/g, "");
-  const regex = new RegExp(`${mark}(.*)${mark}`);
-  const shellName = basename(shell);
-  let command: string;
-  let shellArgs: string[];
-  
-  if (/^pwsh(-preview)?$/.test(shellName)) {
-    // Older versions of PowerShell removes double quotes sometimes so we use "double single quotes" which is how
-    // you escape single quotes inside of a single quoted string.
-    command = `& '${process.execPath}' -p '''${mark}'' + JSON.stringify(process.env) + ''${mark}'''`;
-    shellArgs = ["-Login", "-Command"];
-  } else {
-    command = `'${process.execPath}' -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`;
-
-    if (shellName === "tcsh") {
-      shellArgs = ["-ic"];
-    } else {
-      shellArgs = ["-ilc"];
-    }
-  }
-
-  return new Promise((resolve, reject) => {
-    const shellProcess = spawn(shell, [...shellArgs, command], {
-      detached: true,
-      stdio: ["ignore", "pipe", "pipe"],
-      env,
-    });
-    const stdout: Buffer[] = [];
-
-    shellProcess.on("error", (err) => reject(err));
-    shellProcess.stdout.on("data", b => stdout.push(b));
-    shellProcess.on("close", (code, signal) => {
-      if (code || signal) {
-        return reject(new Error(`Unexpected return code from spawned shell (code: ${code}, signal: ${signal})`));
-      }
-
-      try {
-        const rawOutput = Buffer.concat(stdout).toString("utf-8");
-        const match = regex.exec(rawOutput);
-        const strippedRawOutput = match ? match[1] : "{}";
-        const resolvedEnv = JSON.parse(strippedRawOutput);
-
-        if (runAsNode) {
-          resolvedEnv["ELECTRON_RUN_AS_NODE"] = runAsNode;
-        } else {
-          delete resolvedEnv["ELECTRON_RUN_AS_NODE"];
-        }
-
-        if (noAttach) {
-          resolvedEnv["ELECTRON_NO_ATTACH_CONSOLE"] = noAttach;
-        } else {
-          delete resolvedEnv["ELECTRON_NO_ATTACH_CONSOLE"];
-        }
-
-        resolve(resolvedEnv);
-      } catch(err) {
-        reject(err);
-      }
-    });
-  });
-}
-
-let shellSyncFailed = false;
-
-/**
- * Attempts to get the shell environment per the user's existing startup scripts.
- * If the environment can't be retrieved after 5 seconds an error message is logged.
- * Subsequent calls after such a timeout simply log an error message without trying
- * to get the environment, unless forceRetry is true.
- * @param shell the shell to get the environment from
- * @returns object containing the shell's environment variables. An empty object is
- * returned if the call fails.
- */
-export async function shellEnv(shell: string) : Promise<EnvironmentVariables> {
-  if (isWindows) {
-    return {};
-  }
-  
-  if (!shellSyncFailed) {
-    try {
-      return await Promise.race([
-        unixShellEnvironment(shell),
-        new Promise<EnvironmentVariables>((_resolve, reject) => setTimeout(() => {
-          reject(new Error("Resolving shell environment is taking very long. Please review your shell configuration."));
-        }, 30_000)),
-      ]);
-    } catch (error) {
-      logger.error(`shellEnv: ${error}`);
-      shellSyncFailed = true;
-    }
-  } else {
-    logger.error("shellSync(): Resolving shell environment took too long. Please review your shell configuration.");
-  }
-
-  return {};
-}
diff --git a/src/main/utils/shell-env/compute-shell-environment.injectable.ts b/src/main/utils/shell-env/compute-shell-environment.injectable.ts
new file mode 100644
index 0000000000..e3a60fcd03
--- /dev/null
+++ b/src/main/utils/shell-env/compute-shell-environment.injectable.ts
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { AsyncResult } from "../../../common/utils/async-result";
+import { getInjectable } from "@ogre-tools/injectable";
+import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
+import { disposer } from "../../../common/utils";
+import computeUnixShellEnvironmentInjectable from "./compute-unix-shell-environment.injectable";
+
+export type EnvironmentVariables = Partial<Record<string, string>>;
+export type ComputeShellEnvironment = (shell: string) => Promise<AsyncResult<EnvironmentVariables | undefined, string>>;
+
+const computeShellEnvironmentInjectable = getInjectable({
+  id: "compute-shell-environment",
+  instantiate: (di): ComputeShellEnvironment => {
+    const isWindows = di.inject(isWindowsInjectable);
+    const computeUnixShellEnvironment = di.inject(computeUnixShellEnvironmentInjectable);
+
+    if (isWindows) {
+      return async () => ({
+        callWasSuccessful: true,
+        response: undefined,
+      });
+    }
+
+    return async (shell) => {
+      const controller = new AbortController();
+      const shellEnv = computeUnixShellEnvironment(shell, { signal: controller.signal });
+      const cleanup = disposer();
+
+      const timeoutHandle = setTimeout(() => controller.abort(), 30_000);
+
+      cleanup.push(() => clearTimeout(timeoutHandle));
+
+      try {
+        return {
+          callWasSuccessful: true,
+          response: await shellEnv,
+        };
+      } catch (error) {
+        if (controller.signal.aborted) {
+          return {
+            callWasSuccessful: false,
+            error: "Resolving shell environment is taking very long. Please review your shell configuration.",
+          };
+        }
+
+        return {
+          callWasSuccessful: false,
+          error: String(error),
+        };
+      } finally {
+        cleanup();
+      }
+    };
+  },
+});
+
+export default computeShellEnvironmentInjectable;
+
diff --git a/src/main/utils/shell-env/compute-unix-shell-environment.global-override-for-injectable.ts b/src/main/utils/shell-env/compute-unix-shell-environment.global-override-for-injectable.ts
new file mode 100644
index 0000000000..aac810aa62
--- /dev/null
+++ b/src/main/utils/shell-env/compute-unix-shell-environment.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../common/test-utils/get-global-override";
+import computeUnixShellEnvironmentInjectable from "./compute-unix-shell-environment.injectable";
+
+export default getGlobalOverride(computeUnixShellEnvironmentInjectable, () => async () => {
+  throw new Error("Tried to get unix shell env without override");
+});
diff --git a/src/main/utils/shell-env/compute-unix-shell-environment.injectable.ts b/src/main/utils/shell-env/compute-unix-shell-environment.injectable.ts
new file mode 100644
index 0000000000..7186e96a88
--- /dev/null
+++ b/src/main/utils/shell-env/compute-unix-shell-environment.injectable.ts
@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { spawn } from "child_process";
+import { randomUUID } from "crypto";
+import { basename } from "path";
+import type { EnvironmentVariables } from "./compute-shell-environment.injectable";
+import { getInjectable } from "@ogre-tools/injectable";
+
+interface UnixShellEnvOptions {
+  signal?: AbortSignal;
+}
+
+export type ComputeUnixShellEnvironment = (shell: string, opts?: UnixShellEnvOptions) => Promise<EnvironmentVariables>;
+
+const computeUnixShellEnvironmentInjectable = getInjectable({
+  id: "compute-unix-shell-environment",
+  instantiate: (): ComputeUnixShellEnvironment => async (shell, opts) => {
+    const runAsNode = process.env["ELECTRON_RUN_AS_NODE"];
+    const noAttach = process.env["ELECTRON_NO_ATTACH_CONSOLE"];
+    const env = {
+      ...process.env,
+      ELECTRON_RUN_AS_NODE: "1",
+      ELECTRON_NO_ATTACH_CONSOLE: "1",
+    };
+    const mark = randomUUID().replace(/-/g, "");
+    const regex = new RegExp(`${mark}(.*)${mark}`);
+    const shellName = basename(shell);
+    let command: string;
+    let shellArgs: string[];
+
+    if (/^pwsh(-preview)?$/.test(shellName)) {
+    // Older versions of PowerShell removes double quotes sometimes so we use "double single quotes" which is how
+    // you escape single quotes inside of a single quoted string.
+      command = `& '${process.execPath}' -p '''${mark}'' + JSON.stringify(process.env) + ''${mark}'''`;
+      shellArgs = ["-Login", "-Command"];
+    } else {
+      command = `'${process.execPath}' -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`;
+
+      if (shellName === "tcsh") {
+        shellArgs = ["-ic"];
+      } else {
+        shellArgs = ["-ilc"];
+      }
+    }
+
+    return new Promise((resolve, reject) => {
+      const shellProcess = spawn(shell, [...shellArgs, command], {
+        detached: true,
+        stdio: ["ignore", "pipe", "pipe"],
+        env,
+      });
+      const stdout: Buffer[] = [];
+
+      opts?.signal?.addEventListener("abort", () => shellProcess.kill());
+
+      shellProcess.on("error", (err) => reject(err));
+      shellProcess.stdout.on("data", b => stdout.push(b));
+      shellProcess.on("close", (code, signal) => {
+        if (code || signal) {
+          return reject(new Error(`Unexpected return code from spawned shell (code: ${code}, signal: ${signal})`));
+        }
+
+        try {
+          const rawOutput = Buffer.concat(stdout).toString("utf-8");
+          const match = regex.exec(rawOutput);
+          const strippedRawOutput = match ? match[1] : "{}";
+          const resolvedEnv = JSON.parse(strippedRawOutput);
+
+          if (runAsNode) {
+            resolvedEnv["ELECTRON_RUN_AS_NODE"] = runAsNode;
+          } else {
+            delete resolvedEnv["ELECTRON_RUN_AS_NODE"];
+          }
+
+          if (noAttach) {
+            resolvedEnv["ELECTRON_NO_ATTACH_CONSOLE"] = noAttach;
+          } else {
+            delete resolvedEnv["ELECTRON_NO_ATTACH_CONSOLE"];
+          }
+
+          resolve(resolvedEnv);
+        } catch(err) {
+          reject(err);
+        }
+      });
+    });
+  },
+  causesSideEffects: true,
+});
+
+export default computeUnixShellEnvironmentInjectable;

From 5a5eda935bf4d2270262c56467d23089f5d14a43 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 13 Oct 2022 07:50:19 -0400
Subject: [PATCH 19/48] Add better type safety around Channels (#6133)

* Add better type safety around Channels

- Reallow non-JSON serializable complex types

- Remove unnecessary JSON serialization step to IPC

- Remove unnecesary injectable-ization of MessageChannel and
  RequestChannel declarations

- Add channel listener injectable getter function to remove general need
  for type casting and improve type safety

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Add check to verify data in IPC related tests

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix implementation in light of new safety check in tests

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix listener ID clash potential

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Switch to not forcing split of request channel handlers being seperate from the listener decl

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Move message channels to changed signature too

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix not registering listener

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix test imports

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix type errors

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Refactor listening of different channel kinds

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Add test covering new checking code for request channel handlers

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../app-paths/app-paths-channel.injectable.ts |  22 ---
 src/common/app-paths/app-paths-channel.ts     |  13 ++
 .../restart-and-install-update-channel.ts     |  11 ++
 ...t-and-install-update-channel.injectable.ts |  21 ---
 .../selected-update-channel.injectable.ts     |   2 +-
 .../app-navigation-channel.injectable.ts      |  22 ---
 .../app-navigation-channel.ts                 |  12 ++
 ...ter-frame-navigation-channel.injectable.ts |  22 ---
 .../cluster-frame-navigation-channel.ts       |  12 ++
 src/common/fs/exec-file.injectable.ts         |  33 ++--
 ...able.ts => add-helm-repository-channel.ts} |  16 +-
 ...ve-helm-repositories-channel.injectable.ts |  23 ---
 .../get-active-helm-repositories-channel.ts   |  13 ++
 ...move-helm-repository-channel.injectable.ts |  22 ---
 .../helm/remove-helm-repository-channel.ts    |  13 ++
 .../root-frame-rendered-channel.injectable.ts |  21 ---
 .../root-frame/root-frame-rendered-channel.ts |  11 ++
 src/common/utils/channel/channel.test.ts      | 115 ++++++--------
 ...essage-channel-listener-injection-token.ts |  15 +-
 ...equest-channel-listener-injection-token.ts |  16 --
 .../listening-of-channels.injectable.ts       |  32 ----
 ...istening-on-message-channels.injectable.ts |  25 +++
 .../message-channel-injection-token.ts        |  16 --
 ...essage-channel-listener-injection-token.ts |  47 +++++-
 .../message-to-channel-injection-token.ts     |  22 +--
 .../request-channel-injection-token.ts        |  20 ---
 ...equest-channel-listener-injection-token.ts |  23 +--
 .../request-from-channel-injection-token.ts   |  22 +--
 src/common/utils/disposer.ts                  |   6 +-
 ...resolve-system-proxy-channel.injectable.ts |  21 ---
 .../resolve-system-proxy-channel.ts           |  11 ++
 .../sync-box/channel-listener.injectable.ts   |  15 ++
 src/common/utils/sync-box/channels.ts         |  21 +++
 .../sync-box/create-sync-box.injectable.ts    |  10 +-
 .../utils/sync-box/handler.injectable.ts      |  19 +++
 .../sync-box-channel-listener.injectable.ts   |  35 -----
 .../sync-box/sync-box-channel.injectable.ts   |  21 ---
 ...nc-box-initial-value-channel.injectable.ts |  24 ---
 src/common/utils/tentative-parse-json.ts      |  15 --
 src/common/utils/tentative-stringify-json.ts  |  15 --
 .../vars/build-semantic-version.injectable.ts |   2 +-
 .../selection-of-update-stability.test.ts     |   2 +-
 .../clear-as-deleting-channel.injectable.ts   |  20 ---
 .../common/clear-as-deleting-channel.ts       |  12 ++
 .../common/delete-channel.injectable.ts       |  20 ---
 .../delete-dialog/common/delete-channel.ts    |  12 ++
 .../set-as-deleting-channel.injectable.ts     |  20 ---
 .../common/set-as-deleting-channel.ts         |  12 ++
 ...as-deleteing-channel-handler.injectable.ts |  23 ---
 ...as-deleting-channel-listener.injectable.ts |  20 +++
 .../main/delete-channel-handler.injectable.ts |  56 -------
 .../delete-channel-listener.injectable.ts     |  51 ++++++
 ...as-deleteing-channel-handler.injectable.ts |  23 ---
 ...s-deleteing-channel-listener.injectable.ts |  20 +++
 .../request-clear-as-deleting.injectable.ts   |   3 +-
 .../renderer/request-delete.injectable.ts     |   3 +-
 .../request-set-as-deleting.injectable.ts     |   3 +-
 ...tom-helm-repository-in-preferences.test.ts |  21 ++-
 ...epository-from-list-in-preferences.test.ts |  27 ++--
 ...e-helm-repositories-in-preferences.test.ts |  68 ++++++--
 ...f-active-repository-in-preferences.test.ts |  11 +-
 .../navigation/reload-page/common/channel.ts  |  12 ++
 ...listener.global-override-for-injectable.ts |  13 ++
 .../renderer/register-listener.injectable.ts  |  15 ++
 ...ths-request-channel-listener.injectable.ts |  21 +--
 ...-and-install-update-listener.injectable.ts |  23 +--
 ...update-should-happen-on-quit.injectable.ts |  29 ++--
 .../build-version/setup-channel.injectable.ts |  17 +-
 .../helm/exec-helm/exec-helm.injectable.ts    |  20 +--
 ...-repository-channel-listener.injectable.ts |  22 +--
 ...epositories-channel-listener.injectable.ts |  22 +--
 ...-repository-channel-listener.injectable.ts |  22 +--
 .../create-electron-window.injectable.ts      |  14 +-
 .../create-lens-window.injectable.ts          |   2 +-
 ...l-in-electron-browser-window.injectable.ts |  33 ----
 .../lens-window/navigate.injectable.ts        |   2 +-
 ...d-current-application-window.injectable.ts |   4 +-
 .../channel-listener.injectable.ts            |  20 +++
 ...me-rendered-channel-listener.injectable.ts |  35 -----
 ...ist-message-channel-listener.injectable.ts |   8 +-
 .../enlist-message-channel-listener.test.ts   |   4 +-
 ...ist-request-channel-listener.injectable.ts |  16 +-
 .../enlist-request-channel-listener.test.ts   |  34 ++--
 .../channel-listeners/listener-tokens.ts      |  46 ++++++
 ...istening-on-request-channels.injectable.ts |  34 ++++
 .../start-listening-of-channels.injectable.ts |  26 ---
 .../start-listening-on-channels.injectable.ts |  29 ++++
 .../channel/message-to-channel.injectable.ts  |  21 +--
 .../utils/channel/message-to-channel.test.ts  | 148 ------------------
 ...stem-proxy-channel-responder.injectable.ts |  17 +-
 ...itial-value-channel-listener.injectable.ts |  28 ++--
 .../app-paths/setup-app-paths.injectable.ts   |   7 +-
 .../active-helm-repositories.injectable.ts    |   5 +-
 .../add-helm-repository.injectable.ts         |   3 +-
 .../remove-helm-repository.injectable.ts      |   3 +-
 .../test-utils/get-application-builder.tsx    |   9 +-
 .../restart-and-install-update.injectable.ts  |   5 +-
 ...-that-root-frame-is-rendered.injectable.ts |   9 +-
 src/renderer/navigation/events.ts             |  12 +-
 .../navigation-channel-listener.injectable.ts |  10 +-
 ...ist-message-channel-listener.injectable.ts |   8 +-
 .../enlist-message-channel-listener.test.ts   |   4 +-
 ...ist-request-channel-listener.injectable.ts |  19 ---
 .../start-listening-of-channels.injectable.ts |   4 +-
 .../channel/message-to-channel.injectable.ts  |  12 +-
 .../utils/channel/message-to-channel.test.ts  |  57 -------
 .../request-from-channel.injectable.ts        |  12 +-
 .../channel/request-from-channel.test.ts      | 121 --------------
 .../utils/channel/send-to-main.injectable.ts  |   9 +-
 .../resolve-system-proxy.injectable.ts        |   3 +-
 ...nitial-values-for-sync-boxes.injectable.ts |   3 +-
 .../channel-fakes/override-channels.ts        |  21 ++-
 .../override-messaging-from-main-to-window.ts | 100 ++++++------
 .../override-messaging-from-window-to-main.ts |  34 +---
 ...override-requesting-from-window-to-main.ts |  26 ++-
 115 files changed, 949 insertions(+), 1568 deletions(-)
 delete mode 100644 src/common/app-paths/app-paths-channel.injectable.ts
 create mode 100644 src/common/app-paths/app-paths-channel.ts
 create mode 100644 src/common/application-update/restart-and-install-update-channel.ts
 delete mode 100644 src/common/application-update/restart-and-install-update-channel/restart-and-install-update-channel.injectable.ts
 delete mode 100644 src/common/front-end-routing/app-navigation-channel.injectable.ts
 create mode 100644 src/common/front-end-routing/app-navigation-channel.ts
 delete mode 100644 src/common/front-end-routing/cluster-frame-navigation-channel.injectable.ts
 create mode 100644 src/common/front-end-routing/cluster-frame-navigation-channel.ts
 rename src/common/helm/{add-helm-repository-channel.injectable.ts => add-helm-repository-channel.ts} (50%)
 delete mode 100644 src/common/helm/get-active-helm-repositories-channel.injectable.ts
 create mode 100644 src/common/helm/get-active-helm-repositories-channel.ts
 delete mode 100644 src/common/helm/remove-helm-repository-channel.injectable.ts
 create mode 100644 src/common/helm/remove-helm-repository-channel.ts
 delete mode 100644 src/common/root-frame-rendered-channel/root-frame-rendered-channel.injectable.ts
 create mode 100644 src/common/root-frame/root-frame-rendered-channel.ts
 delete mode 100644 src/common/utils/channel/enlist-request-channel-listener-injection-token.ts
 delete mode 100644 src/common/utils/channel/listening-of-channels.injectable.ts
 create mode 100644 src/common/utils/channel/listening-on-message-channels.injectable.ts
 delete mode 100644 src/common/utils/channel/message-channel-injection-token.ts
 delete mode 100644 src/common/utils/channel/request-channel-injection-token.ts
 delete mode 100644 src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable.ts
 create mode 100644 src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.ts
 create mode 100644 src/common/utils/sync-box/channel-listener.injectable.ts
 create mode 100644 src/common/utils/sync-box/channels.ts
 create mode 100644 src/common/utils/sync-box/handler.injectable.ts
 delete mode 100644 src/common/utils/sync-box/sync-box-channel-listener.injectable.ts
 delete mode 100644 src/common/utils/sync-box/sync-box-channel.injectable.ts
 delete mode 100644 src/common/utils/sync-box/sync-box-initial-value-channel.injectable.ts
 delete mode 100644 src/common/utils/tentative-parse-json.ts
 delete mode 100644 src/common/utils/tentative-stringify-json.ts
 delete mode 100644 src/features/cluster/delete-dialog/common/clear-as-deleting-channel.injectable.ts
 create mode 100644 src/features/cluster/delete-dialog/common/clear-as-deleting-channel.ts
 delete mode 100644 src/features/cluster/delete-dialog/common/delete-channel.injectable.ts
 create mode 100644 src/features/cluster/delete-dialog/common/delete-channel.ts
 delete mode 100644 src/features/cluster/delete-dialog/common/set-as-deleting-channel.injectable.ts
 create mode 100644 src/features/cluster/delete-dialog/common/set-as-deleting-channel.ts
 delete mode 100644 src/features/cluster/delete-dialog/main/clear-as-deleteing-channel-handler.injectable.ts
 create mode 100644 src/features/cluster/delete-dialog/main/clear-as-deleting-channel-listener.injectable.ts
 delete mode 100644 src/features/cluster/delete-dialog/main/delete-channel-handler.injectable.ts
 create mode 100644 src/features/cluster/delete-dialog/main/delete-channel-listener.injectable.ts
 delete mode 100644 src/features/cluster/delete-dialog/main/set-as-deleteing-channel-handler.injectable.ts
 create mode 100644 src/features/cluster/delete-dialog/main/set-as-deleteing-channel-listener.injectable.ts
 create mode 100644 src/features/navigation/reload-page/common/channel.ts
 create mode 100644 src/features/navigation/reload-page/renderer/register-listener.global-override-for-injectable.ts
 create mode 100644 src/features/navigation/reload-page/renderer/register-listener.injectable.ts
 delete mode 100644 src/main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable.ts
 create mode 100644 src/main/start-main-application/runnables/root-frame-has-rendered/channel-listener.injectable.ts
 delete mode 100644 src/main/start-main-application/runnables/root-frame-rendered-channel-listener/root-frame-rendered-channel-listener.injectable.ts
 create mode 100644 src/main/utils/channel/channel-listeners/listener-tokens.ts
 create mode 100644 src/main/utils/channel/channel-listeners/listening-on-request-channels.injectable.ts
 delete mode 100644 src/main/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts
 create mode 100644 src/main/utils/channel/channel-listeners/start-listening-on-channels.injectable.ts
 delete mode 100644 src/main/utils/channel/message-to-channel.test.ts
 delete mode 100644 src/renderer/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts
 delete mode 100644 src/renderer/utils/channel/message-to-channel.test.ts
 delete mode 100644 src/renderer/utils/channel/request-from-channel.test.ts

diff --git a/src/common/app-paths/app-paths-channel.injectable.ts b/src/common/app-paths/app-paths-channel.injectable.ts
deleted file mode 100644
index 99fc738b41..0000000000
--- a/src/common/app-paths/app-paths-channel.injectable.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { AppPaths } from "./app-path-injection-token";
-import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
-import { messageChannelInjectionToken } from "../utils/channel/message-channel-injection-token";
-
-export type AppPathsChannel = RequestChannel<void, AppPaths>;
-
-const appPathsChannelInjectable = getInjectable({
-  id: "app-paths-channel",
-
-  instantiate: (): AppPathsChannel => ({
-    id: "app-paths",
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default appPathsChannelInjectable;
diff --git a/src/common/app-paths/app-paths-channel.ts b/src/common/app-paths/app-paths-channel.ts
new file mode 100644
index 0000000000..4502569d3b
--- /dev/null
+++ b/src/common/app-paths/app-paths-channel.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { AppPaths } from "./app-path-injection-token";
+import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+
+export type AppPathsChannel = RequestChannel<void, AppPaths>;
+
+export const appPathsChannel: AppPathsChannel = {
+  id: "app-paths",
+};
+
diff --git a/src/common/application-update/restart-and-install-update-channel.ts b/src/common/application-update/restart-and-install-update-channel.ts
new file mode 100644
index 0000000000..1d45d6330f
--- /dev/null
+++ b/src/common/application-update/restart-and-install-update-channel.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+
+export type RestartAndInstallUpdateChannel = MessageChannel<void>;
+
+export const restartAndInstallUpdateChannel: RestartAndInstallUpdateChannel = {
+  id: "restart-and-install-update-channel",
+};
diff --git a/src/common/application-update/restart-and-install-update-channel/restart-and-install-update-channel.injectable.ts b/src/common/application-update/restart-and-install-update-channel/restart-and-install-update-channel.injectable.ts
deleted file mode 100644
index b6d811e101..0000000000
--- a/src/common/application-update/restart-and-install-update-channel/restart-and-install-update-channel.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { MessageChannel } from "../../utils/channel/message-channel-injection-token";
-import { messageChannelInjectionToken } from "../../utils/channel/message-channel-injection-token";
-
-export type RestartAndInstallUpdateChannel = MessageChannel;
-
-const restartAndInstallUpdateChannel = getInjectable({
-  id: "restart-and-install-update-channel",
-
-  instantiate: (): RestartAndInstallUpdateChannel => ({
-    id: "restart-and-install-update-channel",
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default restartAndInstallUpdateChannel;
diff --git a/src/common/application-update/selected-update-channel/selected-update-channel.injectable.ts b/src/common/application-update/selected-update-channel/selected-update-channel.injectable.ts
index 8ca31e00aa..d11778b9bd 100644
--- a/src/common/application-update/selected-update-channel/selected-update-channel.injectable.ts
+++ b/src/common/application-update/selected-update-channel/selected-update-channel.injectable.ts
@@ -19,7 +19,7 @@ const selectedUpdateChannelInjectable = getInjectable({
 
   instantiate: (di): SelectedUpdateChannel => {
     const defaultUpdateChannel = di.inject(defaultUpdateChannelInjectable);
-    const state = observable.box<UpdateChannel>();
+    const state = observable.box<UpdateChannel>(undefined, { deep: false });
 
     return {
       value: computed(() => state.get() ?? defaultUpdateChannel.get()),
diff --git a/src/common/front-end-routing/app-navigation-channel.injectable.ts b/src/common/front-end-routing/app-navigation-channel.injectable.ts
deleted file mode 100644
index 869fbfdecd..0000000000
--- a/src/common/front-end-routing/app-navigation-channel.injectable.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { IpcRendererNavigationEvents } from "../../renderer/navigation/events";
-import type { MessageChannel } from "../utils/channel/message-channel-injection-token";
-import { messageChannelInjectionToken } from "../utils/channel/message-channel-injection-token";
-
-export type AppNavigationChannel = MessageChannel<string>;
-
-const appNavigationChannelInjectable = getInjectable({
-  id: "app-navigation-channel",
-
-  instantiate: (): AppNavigationChannel => ({
-    id: IpcRendererNavigationEvents.NAVIGATE_IN_APP,
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default appNavigationChannelInjectable;
diff --git a/src/common/front-end-routing/app-navigation-channel.ts b/src/common/front-end-routing/app-navigation-channel.ts
new file mode 100644
index 0000000000..e0b881eff9
--- /dev/null
+++ b/src/common/front-end-routing/app-navigation-channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { IpcRendererNavigationEvents } from "../../renderer/navigation/events";
+import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+
+export type AppNavigationChannel = MessageChannel<string>;
+
+export const appNavigationChannel: AppNavigationChannel = {
+  id: IpcRendererNavigationEvents.NAVIGATE_IN_APP,
+};
diff --git a/src/common/front-end-routing/cluster-frame-navigation-channel.injectable.ts b/src/common/front-end-routing/cluster-frame-navigation-channel.injectable.ts
deleted file mode 100644
index 596bd6d351..0000000000
--- a/src/common/front-end-routing/cluster-frame-navigation-channel.injectable.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { IpcRendererNavigationEvents } from "../../renderer/navigation/events";
-import type { MessageChannel } from "../utils/channel/message-channel-injection-token";
-import { messageChannelInjectionToken } from "../utils/channel/message-channel-injection-token";
-
-export type ClusterFrameNavigationChannel = MessageChannel<string>;
-
-const clusterFrameNavigationChannelInjectable = getInjectable({
-  id: "cluster-frame-navigation-channel",
-
-  instantiate: (): ClusterFrameNavigationChannel => ({
-    id: IpcRendererNavigationEvents.NAVIGATE_IN_CLUSTER,
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default clusterFrameNavigationChannelInjectable;
diff --git a/src/common/front-end-routing/cluster-frame-navigation-channel.ts b/src/common/front-end-routing/cluster-frame-navigation-channel.ts
new file mode 100644
index 0000000000..9d9a1904af
--- /dev/null
+++ b/src/common/front-end-routing/cluster-frame-navigation-channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { IpcRendererNavigationEvents } from "../../renderer/navigation/events";
+import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+
+export type ClusterFrameNavigationChannel = MessageChannel<string>;
+
+export const clusterFrameNavigationChannel: ClusterFrameNavigationChannel = {
+  id: IpcRendererNavigationEvents.NAVIGATE_IN_CLUSTER,
+};
diff --git a/src/common/fs/exec-file.injectable.ts b/src/common/fs/exec-file.injectable.ts
index 15d0ad48dc..8db31c602f 100644
--- a/src/common/fs/exec-file.injectable.ts
+++ b/src/common/fs/exec-file.injectable.ts
@@ -5,22 +5,33 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { ExecFileOptions } from "child_process";
 import { execFile } from "child_process";
-import { promisify } from "util";
+import type { AsyncResult } from "../utils/async-result";
 
-export type ExecFile = (filePath: string, args: string[], options: ExecFileOptions) => Promise<string>;
+export interface ExecFile {
+  (filePath: string, args: string[], options: ExecFileOptions): Promise<AsyncResult<string, { stderr: string; error: Error }>>;
+}
 
 const execFileInjectable = getInjectable({
   id: "exec-file",
 
-  instantiate: (): ExecFile => {
-    const asyncExecFile = promisify(execFile);
-
-    return async (filePath, args, options) => {
-      const result = await asyncExecFile(filePath, args, options);
-
-      return result.stdout;
-    };
-  },
+  instantiate: (): ExecFile => (filePath, args, options) => new Promise((resolve) => {
+    execFile(filePath, args, options, (error, stdout, stderr) => {
+      if (error) {
+        resolve({
+          callWasSuccessful: false,
+          error: {
+            error,
+            stderr,
+          },
+        });
+      } else {
+        resolve({
+          callWasSuccessful: true,
+          response: stdout,
+        });
+      }
+    });
+  }),
 
   causesSideEffects: true,
 });
diff --git a/src/common/helm/add-helm-repository-channel.injectable.ts b/src/common/helm/add-helm-repository-channel.ts
similarity index 50%
rename from src/common/helm/add-helm-repository-channel.injectable.ts
rename to src/common/helm/add-helm-repository-channel.ts
index 0bc10564ad..44471fe426 100644
--- a/src/common/helm/add-helm-repository-channel.injectable.ts
+++ b/src/common/helm/add-helm-repository-channel.ts
@@ -2,22 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
 import type { HelmRepo } from "./helm-repo";
-import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
 import type { AsyncResult } from "../utils/async-result";
+import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
 
 export type AddHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<string>>;
 
-const addHelmRepositoryChannelInjectable = getInjectable({
+export const addHelmRepositoryChannel: AddHelmRepositoryChannel = {
   id: "add-helm-repository-channel",
-
-  instantiate: (): AddHelmRepositoryChannel => ({
-    id: "add-helm-repository-channel",
-  }),
-
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default addHelmRepositoryChannelInjectable;
+};
diff --git a/src/common/helm/get-active-helm-repositories-channel.injectable.ts b/src/common/helm/get-active-helm-repositories-channel.injectable.ts
deleted file mode 100644
index ac7355ace7..0000000000
--- a/src/common/helm/get-active-helm-repositories-channel.injectable.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
-import type { HelmRepo } from "./helm-repo";
-import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
-import type { AsyncResult } from "../utils/async-result";
-
-export type GetHelmRepositoriesChannel = RequestChannel<void, AsyncResult<HelmRepo[]>>;
-
-const getActiveHelmRepositoriesChannelInjectable = getInjectable({
-  id: "get-active-helm-repositories-channel",
-
-  instantiate: (): GetHelmRepositoriesChannel => ({
-    id: "get-helm-active-list-repositories",
-  }),
-
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default getActiveHelmRepositoriesChannelInjectable;
diff --git a/src/common/helm/get-active-helm-repositories-channel.ts b/src/common/helm/get-active-helm-repositories-channel.ts
new file mode 100644
index 0000000000..26720e9a5f
--- /dev/null
+++ b/src/common/helm/get-active-helm-repositories-channel.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { HelmRepo } from "./helm-repo";
+import type { AsyncResult } from "../utils/async-result";
+import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+
+export type GetActiveHelmRepositoriesChannel = RequestChannel<void, AsyncResult<HelmRepo[]>>;
+
+export const getActiveHelmRepositoriesChannel: GetActiveHelmRepositoriesChannel = {
+  id: "get-helm-active-list-repositories",
+};
diff --git a/src/common/helm/remove-helm-repository-channel.injectable.ts b/src/common/helm/remove-helm-repository-channel.injectable.ts
deleted file mode 100644
index eddecb1ccd..0000000000
--- a/src/common/helm/remove-helm-repository-channel.injectable.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { HelmRepo } from "./helm-repo";
-import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
-
-export type RemoveHelmRepositoryChannel = RequestChannel<HelmRepo>;
-
-const removeHelmRepositoryChannelInjectable = getInjectable({
-  id: "remove-helm-repository-channel",
-
-  instantiate: (): RemoveHelmRepositoryChannel => ({
-    id: "remove-helm-repository-channel",
-  }),
-
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default removeHelmRepositoryChannelInjectable;
diff --git a/src/common/helm/remove-helm-repository-channel.ts b/src/common/helm/remove-helm-repository-channel.ts
new file mode 100644
index 0000000000..7eda160159
--- /dev/null
+++ b/src/common/helm/remove-helm-repository-channel.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { AsyncResult } from "../utils/async-result";
+import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import type { HelmRepo } from "./helm-repo";
+
+export type RemoveHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<string, string>>;
+
+export const removeHelmRepositoryChannel: RemoveHelmRepositoryChannel = {
+  id: "remove-helm-repository-channel",
+};
diff --git a/src/common/root-frame-rendered-channel/root-frame-rendered-channel.injectable.ts b/src/common/root-frame-rendered-channel/root-frame-rendered-channel.injectable.ts
deleted file mode 100644
index a7787c6cc4..0000000000
--- a/src/common/root-frame-rendered-channel/root-frame-rendered-channel.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { MessageChannel } from "../utils/channel/message-channel-injection-token";
-import { messageChannelInjectionToken } from "../utils/channel/message-channel-injection-token";
-
-export type RootFrameRenderedChannel = MessageChannel;
-
-const rootFrameRenderedChannelInjectable = getInjectable({
-  id: "root-frame-rendered-channel",
-
-  instantiate: (): RootFrameRenderedChannel => ({
-    id: "root-frame-rendered",
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default rootFrameRenderedChannelInjectable;
diff --git a/src/common/root-frame/root-frame-rendered-channel.ts b/src/common/root-frame/root-frame-rendered-channel.ts
new file mode 100644
index 0000000000..060ae8735c
--- /dev/null
+++ b/src/common/root-frame/root-frame-rendered-channel.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+
+export type RootFrameHasRenderedChannel = MessageChannel<void>;
+
+export const rootFrameHasRenderedChannel: RootFrameHasRenderedChannel = {
+  id: "root-frame-rendered",
+};
diff --git a/src/common/utils/channel/channel.test.ts b/src/common/utils/channel/channel.test.ts
index c5f52c0874..9a361b6770 100644
--- a/src/common/utils/channel/channel.test.ts
+++ b/src/common/utils/channel/channel.test.ts
@@ -4,31 +4,31 @@
  */
 import type { DiContainer } from "@ogre-tools/injectable";
 import { getInjectable } from "@ogre-tools/injectable";
-import type { MessageToChannel } from "./message-to-channel-injection-token";
-import { messageToChannelInjectionToken } from "./message-to-channel-injection-token";
+import type { SendMessageToChannel } from "./message-to-channel-injection-token";
+import { sendMessageToChannelInjectionToken } from "./message-to-channel-injection-token";
 import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
 import type { LensWindow } from "../../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
+import type { MessageChannel } from "./message-channel-listener-injection-token";
 import { messageChannelListenerInjectionToken } from "./message-channel-listener-injection-token";
-import type { MessageChannel } from "./message-channel-injection-token";
 import type { RequestFromChannel } from "./request-from-channel-injection-token";
 import { requestFromChannelInjectionToken } from "./request-from-channel-injection-token";
-import type { RequestChannel } from "./request-channel-injection-token";
-import { requestChannelListenerInjectionToken } from "./request-channel-listener-injection-token";
+import type { RequestChannel } from "./request-channel-listener-injection-token";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import { getPromiseStatus } from "../../test-utils/get-promise-status";
 import { runInAction } from "mobx";
+import type { RequestChannelHandler } from "../../../main/utils/channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "../../../main/utils/channel/channel-listeners/listener-tokens";
 
 type TestMessageChannel = MessageChannel<string>;
 type TestRequestChannel = RequestChannel<string, string>;
 
 describe("channel", () => {
   describe("messaging from main to renderer, given listener for channel in a window and application has started", () => {
-    let testMessageChannel: TestMessageChannel;
     let messageListenerInWindowMock: jest.Mock;
     let mainDi: DiContainer;
-    let messageToChannel: MessageToChannel;
+    let messageToChannel: SendMessageToChannel;
     let builder: ApplicationBuilder;
 
     beforeEach(async () => {
@@ -39,24 +39,17 @@ describe("channel", () => {
       const testChannelListenerInTestWindowInjectable = getInjectable({
         id: "test-channel-listener-in-test-window",
 
-        instantiate: (di) => ({
-          channel: di.inject(testMessageChannelInjectable),
+        instantiate: () => ({
+          channel: testMessageChannel,
           handler: messageListenerInWindowMock,
         }),
 
         injectionToken: messageChannelListenerInjectionToken,
       });
 
-      builder.beforeApplicationStart((mainDi) => {
-        runInAction(() => {
-          mainDi.register(testMessageChannelInjectable);
-        });
-      });
-
       builder.beforeWindowStart((windowDi) => {
         runInAction(() => {
           windowDi.register(testChannelListenerInTestWindowInjectable);
-          windowDi.register(testMessageChannelInjectable);
         });
       });
 
@@ -64,8 +57,7 @@ describe("channel", () => {
 
       await builder.startHidden();
 
-      testMessageChannel = mainDi.inject(testMessageChannelInjectable);
-      messageToChannel = mainDi.inject(messageToChannelInjectionToken);
+      messageToChannel = mainDi.inject(sendMessageToChannelInjectionToken);
     });
 
     describe("given window is started", () => {
@@ -109,9 +101,8 @@ describe("channel", () => {
   });
 
   describe("messaging from renderer to main, given listener for channel in a main and application has started", () => {
-    let testMessageChannel: TestMessageChannel;
     let messageListenerInMainMock: jest.Mock;
-    let messageToChannel: MessageToChannel;
+    let messageToChannel: SendMessageToChannel;
 
     beforeEach(async () => {
       const applicationBuilder = getApplicationBuilder();
@@ -121,9 +112,8 @@ describe("channel", () => {
       const testChannelListenerInMainInjectable = getInjectable({
         id: "test-channel-listener-in-main",
 
-        instantiate: (di) => ({
-          channel: di.inject(testMessageChannelInjectable),
-
+        instantiate: () => ({
+          channel: testMessageChannel,
           handler: messageListenerInMainMock,
         }),
 
@@ -133,13 +123,6 @@ describe("channel", () => {
       applicationBuilder.beforeApplicationStart((mainDi) => {
         runInAction(() => {
           mainDi.register(testChannelListenerInMainInjectable);
-          mainDi.register(testMessageChannelInjectable);
-        });
-      });
-
-      applicationBuilder.beforeWindowStart((windowDi) => {
-        runInAction(() => {
-          windowDi.register(testMessageChannelInjectable);
         });
       });
 
@@ -147,8 +130,7 @@ describe("channel", () => {
 
       const windowDi = applicationBuilder.applicationWindow.only.di;
 
-      testMessageChannel = windowDi.inject(testMessageChannelInjectable);
-      messageToChannel = windowDi.inject(messageToChannelInjectionToken);
+      messageToChannel = windowDi.inject(sendMessageToChannelInjectionToken);
     });
 
     it("when sending message, triggers listener in main", () => {
@@ -159,8 +141,7 @@ describe("channel", () => {
   });
 
   describe("requesting from main in renderer, given listener for channel in a main and application has started", () => {
-    let testRequestChannel: TestRequestChannel;
-    let requestListenerInMainMock: AsyncFnMock<(arg: string) => string>;
+    let requestListenerInMainMock: AsyncFnMock<RequestChannelHandler<TestRequestChannel>>;
     let requestFromChannel: RequestFromChannel;
 
     beforeEach(async () => {
@@ -168,28 +149,14 @@ describe("channel", () => {
 
       requestListenerInMainMock = asyncFn();
 
-      const testChannelListenerInMainInjectable = getInjectable({
-        id: "test-channel-listener-in-main",
-
-        instantiate: (di) => ({
-          channel: di.inject(testRequestChannelInjectable),
-
-          handler: requestListenerInMainMock,
-        }),
-
-        injectionToken: requestChannelListenerInjectionToken,
+      const testChannelListenerInMainInjectable = getRequestChannelListenerInjectable({
+        channel: testRequestChannel,
+        handler: () => requestListenerInMainMock,
       });
 
       applicationBuilder.beforeApplicationStart((mainDi) => {
         runInAction(() => {
           mainDi.register(testChannelListenerInMainInjectable);
-          mainDi.register(testRequestChannelInjectable);
-        });
-      });
-
-      applicationBuilder.beforeWindowStart((windowDi) => {
-        runInAction(() => {
-          windowDi.register(testRequestChannelInjectable);
         });
       });
 
@@ -197,8 +164,6 @@ describe("channel", () => {
 
       const windowDi = applicationBuilder.applicationWindow.only.di;
 
-      testRequestChannel = windowDi.inject(testRequestChannelInjectable);
-
       requestFromChannel = windowDi.inject(
         requestFromChannelInjectionToken,
       );
@@ -230,21 +195,37 @@ describe("channel", () => {
       });
     });
   });
+
+  it("when registering multiple handlers for the same channel, throws", async () => {
+    const applicationBuilder = getApplicationBuilder();
+
+    const testChannelListenerInMainInjectable = getRequestChannelListenerInjectable({
+      channel: testRequestChannel,
+      handler: () => () => "some-value",
+    });
+    const testChannelListenerInMain2Injectable = getRequestChannelListenerInjectable({
+      channel: testRequestChannel,
+      handler: () => () => "some-other-value",
+    });
+
+    testChannelListenerInMain2Injectable.id += "2";
+
+    applicationBuilder.beforeApplicationStart((mainDi) => {
+      runInAction(() => {
+        mainDi.register(testChannelListenerInMainInjectable);
+        mainDi.register(testChannelListenerInMain2Injectable);
+      });
+    });
+
+    await expect(applicationBuilder.render()).rejects.toThrow('Tried to register a multiple channel handlers for "some-request-channel-id", only one handler is supported for a request channel.');
+  });
 });
 
-const testMessageChannelInjectable = getInjectable({
-  id: "some-message-test-channel",
+const testMessageChannel: TestMessageChannel = {
+  id: "some-message-channel-id",
+};
 
-  instantiate: (): TestMessageChannel => ({
-    id: "some-message-channel-id",
-  }),
-});
-
-const testRequestChannelInjectable = getInjectable({
-  id: "some-request-test-channel",
-
-  instantiate: (): TestRequestChannel => ({
-    id: "some-request-channel-id",
-  }),
-});
+const testRequestChannel: TestRequestChannel = {
+  id: "some-request-channel-id",
+};
 
diff --git a/src/common/utils/channel/enlist-message-channel-listener-injection-token.ts b/src/common/utils/channel/enlist-message-channel-listener-injection-token.ts
index fa6983e130..34f62d51d5 100644
--- a/src/common/utils/channel/enlist-message-channel-listener-injection-token.ts
+++ b/src/common/utils/channel/enlist-message-channel-listener-injection-token.ts
@@ -3,14 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { MessageChannel } from "./message-channel-injection-token";
-import type { MessageChannelListener } from "./message-channel-listener-injection-token";
+import type { Disposer } from "../disposer";
+import type { MessageChannel, MessageChannelListener } from "./message-channel-listener-injection-token";
 
-export type EnlistMessageChannelListener = <
-  TChannel extends MessageChannel<any>,
->(listener: MessageChannelListener<TChannel>) => () => void;
+export type EnlistMessageChannelListener = (listener: MessageChannelListener<MessageChannel<unknown>>) => Disposer;
 
-export const enlistMessageChannelListenerInjectionToken =
-  getInjectionToken<EnlistMessageChannelListener>({
-    id: "enlist-message-channel-listener",
-  });
+export const enlistMessageChannelListenerInjectionToken = getInjectionToken<EnlistMessageChannelListener>({
+  id: "enlist-message-channel-listener",
+});
diff --git a/src/common/utils/channel/enlist-request-channel-listener-injection-token.ts b/src/common/utils/channel/enlist-request-channel-listener-injection-token.ts
deleted file mode 100644
index f87082c466..0000000000
--- a/src/common/utils/channel/enlist-request-channel-listener-injection-token.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { RequestChannel } from "./request-channel-injection-token";
-import type { RequestChannelListener } from "./request-channel-listener-injection-token";
-
-export type EnlistRequestChannelListener = <
-  TChannel extends RequestChannel<any, any>,
->(listener: RequestChannelListener<TChannel>) => () => void;
-
-export const enlistRequestChannelListenerInjectionToken =
-  getInjectionToken<EnlistRequestChannelListener>({
-    id: "enlist-request-channel-listener",
-  });
diff --git a/src/common/utils/channel/listening-of-channels.injectable.ts b/src/common/utils/channel/listening-of-channels.injectable.ts
deleted file mode 100644
index 30fee42fb9..0000000000
--- a/src/common/utils/channel/listening-of-channels.injectable.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { getStartableStoppable } from "../get-startable-stoppable";
-import { disposer } from "../index";
-import { messageChannelListenerInjectionToken } from "./message-channel-listener-injection-token";
-import { requestChannelListenerInjectionToken } from "./request-channel-listener-injection-token";
-import { enlistMessageChannelListenerInjectionToken } from "./enlist-message-channel-listener-injection-token";
-import { enlistRequestChannelListenerInjectionToken } from "./enlist-request-channel-listener-injection-token";
-
-const listeningOfChannelsInjectable = getInjectable({
-  id: "listening-of-channels",
-
-  instantiate: (di) => {
-    const enlistMessageChannelListener = di.inject(enlistMessageChannelListenerInjectionToken);
-    const enlistRequestChannelListener = di.inject(enlistRequestChannelListenerInjectionToken);
-    const messageChannelListeners = di.injectMany(messageChannelListenerInjectionToken);
-    const requestChannelListeners = di.injectMany(requestChannelListenerInjectionToken);
-
-    return getStartableStoppable("listening-of-channels", () => {
-      const messageChannelDisposers = messageChannelListeners.map(enlistMessageChannelListener);
-      const requestChannelDisposers = requestChannelListeners.map(enlistRequestChannelListener);
-
-      return disposer(...messageChannelDisposers, ...requestChannelDisposers);
-    });
-  },
-});
-
-
-export default listeningOfChannelsInjectable;
diff --git a/src/common/utils/channel/listening-on-message-channels.injectable.ts b/src/common/utils/channel/listening-on-message-channels.injectable.ts
new file mode 100644
index 0000000000..afe0c08f24
--- /dev/null
+++ b/src/common/utils/channel/listening-on-message-channels.injectable.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { getStartableStoppable } from "../get-startable-stoppable";
+import { disposer } from "../index";
+import { messageChannelListenerInjectionToken } from "./message-channel-listener-injection-token";
+import { enlistMessageChannelListenerInjectionToken } from "./enlist-message-channel-listener-injection-token";
+
+const listeningOnMessageChannelsInjectable = getInjectable({
+  id: "listening-on-message-channels",
+
+  instantiate: (di) => {
+    const enlistMessageChannelListener = di.inject(enlistMessageChannelListenerInjectionToken);
+    const messageChannelListeners = di.injectMany(messageChannelListenerInjectionToken);
+
+    return getStartableStoppable("listening-on-channels", () => (
+      disposer(messageChannelListeners.map(enlistMessageChannelListener))
+    ));
+  },
+});
+
+
+export default listeningOnMessageChannelsInjectable;
diff --git a/src/common/utils/channel/message-channel-injection-token.ts b/src/common/utils/channel/message-channel-injection-token.ts
deleted file mode 100644
index 3141acedf3..0000000000
--- a/src/common/utils/channel/message-channel-injection-token.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { JsonValue } from "type-fest";
-
-export interface MessageChannel<Message extends JsonValue | void = void> {
-  id: string;
-  _messageSignature?: Message;
-}
-
-export const messageChannelInjectionToken = getInjectionToken<MessageChannel<any>>({
-  id: "message-channel",
-});
diff --git a/src/common/utils/channel/message-channel-listener-injection-token.ts b/src/common/utils/channel/message-channel-listener-injection-token.ts
index 8879e19013..5bfc45a82d 100644
--- a/src/common/utils/channel/message-channel-listener-injection-token.ts
+++ b/src/common/utils/channel/message-channel-listener-injection-token.ts
@@ -2,17 +2,50 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { SetRequired } from "type-fest";
-import type { MessageChannel } from "./message-channel-injection-token";
+import type { DiContainerForInjection } from "@ogre-tools/injectable";
+import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
 
-export interface MessageChannelListener<TChannel extends MessageChannel<any>> {
-  channel: TChannel;
-  handler: (value: SetRequired<TChannel, "_messageSignature">["_messageSignature"]) => void;
+export interface MessageChannel<Message> {
+  id: string;
+  _messageSignature?: Message; // only used to mark `Message` as used
 }
 
-export const messageChannelListenerInjectionToken = getInjectionToken<MessageChannelListener<MessageChannel<any>>>(
+export type MessageChannelHandler<Channel> = Channel extends MessageChannel<infer Message>
+  ? (message: Message) => void
+  : never;
+
+export interface MessageChannelListener<Channel> {
+  channel: Channel;
+  handler: MessageChannelHandler<Channel>;
+}
+
+export const messageChannelListenerInjectionToken = getInjectionToken<MessageChannelListener<MessageChannel<unknown>>>(
   {
     id: "message-channel-listener",
   },
 );
+
+export interface GetMessageChannelListenerInfo<
+  Channel extends MessageChannel<Message>,
+  Message,
+> {
+  id: string;
+  channel: Channel;
+  handler: (di: DiContainerForInjection) => MessageChannelHandler<Channel>;
+  causesSideEffects?: boolean;
+}
+
+export function getMessageChannelListenerInjectable<
+  Channel extends MessageChannel<Message>,
+  Message,
+>(info: GetMessageChannelListenerInfo<Channel, Message>) {
+  return getInjectable({
+    id: `${info.channel.id}-listener-${info.id}`,
+    instantiate: (di) => ({
+      channel: info.channel,
+      handler: info.handler(di),
+    }),
+    injectionToken: messageChannelListenerInjectionToken,
+    causesSideEffects: info.causesSideEffects,
+  });
+}
diff --git a/src/common/utils/channel/message-to-channel-injection-token.ts b/src/common/utils/channel/message-to-channel-injection-token.ts
index 8c5f03b9ee..d179ab9870 100644
--- a/src/common/utils/channel/message-to-channel-injection-token.ts
+++ b/src/common/utils/channel/message-to-channel-injection-token.ts
@@ -3,21 +3,13 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { SetRequired } from "type-fest";
-import type { MessageChannel } from "./message-channel-injection-token";
+import type { MessageChannel } from "./message-channel-listener-injection-token";
 
-export interface MessageToChannel {
-  <TChannel extends MessageChannel<TMessage>, TMessage extends void>(
-    channel: TChannel,
-  ): void;
-
-  <TChannel extends MessageChannel<any>>(
-    channel: TChannel,
-    message: SetRequired<TChannel, "_messageSignature">["_messageSignature"],
-  ): void;
+export interface SendMessageToChannel {
+  (channel: MessageChannel<void>): void;
+  <Message>(channel: MessageChannel<Message>, message: Message): void;
 }
 
-export const messageToChannelInjectionToken =
-  getInjectionToken<MessageToChannel>({
-    id: "message-to-message-channel",
-  });
+export const sendMessageToChannelInjectionToken = getInjectionToken<SendMessageToChannel>({
+  id: "send-message-to-message-channel",
+});
diff --git a/src/common/utils/channel/request-channel-injection-token.ts b/src/common/utils/channel/request-channel-injection-token.ts
deleted file mode 100644
index 67044db878..0000000000
--- a/src/common/utils/channel/request-channel-injection-token.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { JsonValue } from "type-fest";
-
-export interface RequestChannel<
-  Request extends JsonValue | void = void,
-  Response extends JsonValue | void = void,
-> {
-  id: string;
-  _requestSignature?: Request;
-  _responseSignature?: Response;
-}
-
-export const requestChannelInjectionToken = getInjectionToken<RequestChannel<any, any>>({
-  id: "request-channel",
-});
diff --git a/src/common/utils/channel/request-channel-listener-injection-token.ts b/src/common/utils/channel/request-channel-listener-injection-token.ts
index 690b96d9dc..2f0b84a3cc 100644
--- a/src/common/utils/channel/request-channel-listener-injection-token.ts
+++ b/src/common/utils/channel/request-channel-listener-injection-token.ts
@@ -2,24 +2,9 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { SetRequired } from "type-fest";
-import type { RequestChannel } from "./request-channel-injection-token";
 
-export interface RequestChannelListener<TChannel extends RequestChannel<any, any>> {
-  channel: TChannel;
-
-  handler: (
-    request: SetRequired<TChannel, "_requestSignature">["_requestSignature"]
-  ) =>
-    | SetRequired<TChannel, "_responseSignature">["_responseSignature"]
-    | Promise<
-        SetRequired<TChannel, "_responseSignature">["_responseSignature"]
-      >;
+export interface RequestChannel<Request, Response> {
+  id: string;
+  _requestSignature?: Request; // used only to mark `Request` as "used"
+  _responseSignature?: Response; // used only to mark `Response` as "used"
 }
-
-export const requestChannelListenerInjectionToken = getInjectionToken<RequestChannelListener<RequestChannel<any, any>>>(
-  {
-    id: "request-channel-listener",
-  },
-);
diff --git a/src/common/utils/channel/request-from-channel-injection-token.ts b/src/common/utils/channel/request-from-channel-injection-token.ts
index f4d4fdbe0c..14e925f190 100644
--- a/src/common/utils/channel/request-from-channel-injection-token.ts
+++ b/src/common/utils/channel/request-from-channel-injection-token.ts
@@ -3,19 +3,13 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { SetRequired } from "type-fest";
-import type { RequestChannel } from "./request-channel-injection-token";
+import type { RequestChannel } from "./request-channel-listener-injection-token";
 
-export type RequestFromChannel = <
-  TChannel extends RequestChannel<any, any>,
->(
-  channel: TChannel,
-  ...request: TChannel["_requestSignature"] extends void
-    ? []
-    : [SetRequired<TChannel, "_requestSignature">["_requestSignature"]]
-) => Promise<SetRequired<TChannel, "_responseSignature">["_responseSignature"]>;
+export interface RequestFromChannel {
+  <Request, Response>(channel: RequestChannel<Request, Response>, request: Request): Promise<Response>;
+  <Response>(channel: RequestChannel<void, Response>): Promise<Response>;
+}
 
-export const requestFromChannelInjectionToken =
-  getInjectionToken<RequestFromChannel>({
-    id: "request-from-request-channel",
-  });
+export const requestFromChannelInjectionToken = getInjectionToken<RequestFromChannel>({
+  id: "request-from-request-channel",
+});
diff --git a/src/common/utils/disposer.ts b/src/common/utils/disposer.ts
index 05a349ab4d..2949a7ae35 100644
--- a/src/common/utils/disposer.ts
+++ b/src/common/utils/disposer.ts
@@ -3,6 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
+import type { SingleOrMany } from "./types";
+
 
 
 export interface Disposer {
@@ -17,9 +19,9 @@ export interface ExtendableDisposer extends Disposer {
   push(...vals: (Disposer | ExtendableDisposer | Disposable)[]): void;
 }
 
-export function disposer(...items: (Disposer | Disposable | undefined | null)[]): ExtendableDisposer {
+export function disposer(...items: SingleOrMany<Disposer | Disposable | undefined | null>[]): ExtendableDisposer {
   return Object.assign(() => {
-    for (const item of items) {
+    for (const item of items.flat()) {
       if (!item) {
         continue;
       }
diff --git a/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable.ts b/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable.ts
deleted file mode 100644
index 5dd17ddc6a..0000000000
--- a/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { RequestChannel } from "../channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../channel/request-channel-injection-token";
-
-export type ResolveSystemProxyChannel = RequestChannel<string, string>;
-
-const resolveSystemProxyChannelInjectable = getInjectable({
-  id: "resolve-system-proxy-channel",
-
-  instantiate: (): ResolveSystemProxyChannel => ({
-    id: "resolve-system-proxy-channel",
-  }),
-
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default resolveSystemProxyChannelInjectable;
diff --git a/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.ts b/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.ts
new file mode 100644
index 0000000000..c823a8a8f9
--- /dev/null
+++ b/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { RequestChannel } from "../channel/request-channel-listener-injection-token";
+
+export type ResolveSystemProxyChannel = RequestChannel<string, string>;
+
+export const resolveSystemProxyChannel: ResolveSystemProxyChannel = {
+  id: "resolve-system-proxy-channel",
+};
diff --git a/src/common/utils/sync-box/channel-listener.injectable.ts b/src/common/utils/sync-box/channel-listener.injectable.ts
new file mode 100644
index 0000000000..a97d95d726
--- /dev/null
+++ b/src/common/utils/sync-box/channel-listener.injectable.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { syncBoxChannel } from "./channels";
+import { getMessageChannelListenerInjectable } from "../channel/message-channel-listener-injection-token";
+import syncBoxStateInjectable from "./sync-box-state.injectable";
+
+const syncBoxChannelListenerInjectable = getMessageChannelListenerInjectable({
+  id: "init",
+  channel: syncBoxChannel,
+  handler: (di) => ({ id, value }) => di.inject(syncBoxStateInjectable, id).set(value),
+});
+
+export default syncBoxChannelListenerInjectable;
diff --git a/src/common/utils/sync-box/channels.ts b/src/common/utils/sync-box/channels.ts
new file mode 100644
index 0000000000..4df0462dc3
--- /dev/null
+++ b/src/common/utils/sync-box/channels.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { MessageChannel } from "../channel/message-channel-listener-injection-token";
+import type { RequestChannel } from "../channel/request-channel-listener-injection-token";
+
+export type SyncBoxChannel = MessageChannel<{ id: string; value: any }>;
+
+export const syncBoxChannel: SyncBoxChannel = {
+  id: "sync-box-channel",
+};
+
+export type SyncBoxInitialValueChannel = RequestChannel<
+  void,
+  { id: string; value: any }[]
+>;
+
+export const syncBoxInitialValueChannel: SyncBoxInitialValueChannel = {
+  id: "sync-box-initial-value-channel",
+};
diff --git a/src/common/utils/sync-box/create-sync-box.injectable.ts b/src/common/utils/sync-box/create-sync-box.injectable.ts
index 1328106e24..4a01fe71a0 100644
--- a/src/common/utils/sync-box/create-sync-box.injectable.ts
+++ b/src/common/utils/sync-box/create-sync-box.injectable.ts
@@ -5,17 +5,17 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { IObservableValue } from "mobx";
 import { computed } from "mobx";
-import syncBoxChannelInjectable from "./sync-box-channel.injectable";
-import { messageToChannelInjectionToken } from "../channel/message-to-channel-injection-token";
+import { syncBoxChannel } from "./channels";
+import { sendMessageToChannelInjectionToken } from "../channel/message-to-channel-injection-token";
 import syncBoxStateInjectable from "./sync-box-state.injectable";
 import type { SyncBox } from "./sync-box-injection-token";
+import { toJS } from "../toJS";
 
 const createSyncBoxInjectable = getInjectable({
   id: "create-sync-box",
 
   instantiate: (di) => {
-    const syncBoxChannel = di.inject(syncBoxChannelInjectable);
-    const messageToChannel = di.inject(messageToChannelInjectionToken);
+    const messageToChannel = di.inject(sendMessageToChannelInjectionToken);
     const getSyncBoxState = (id: string) => di.inject(syncBoxStateInjectable, id);
 
     return <Value>(id: string, initialValue: Value): SyncBox<Value> => {
@@ -26,7 +26,7 @@ const createSyncBoxInjectable = getInjectable({
       return {
         id,
 
-        value: computed(() => state.get()),
+        value: computed(() => toJS(state.get())),
 
         set: (value) => {
           state.set(value);
diff --git a/src/common/utils/sync-box/handler.injectable.ts b/src/common/utils/sync-box/handler.injectable.ts
new file mode 100644
index 0000000000..f520585474
--- /dev/null
+++ b/src/common/utils/sync-box/handler.injectable.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MessageChannelHandler } from "../channel/message-channel-listener-injection-token";
+import type { SyncBoxChannel } from "./channels";
+import syncBoxStateInjectable from "./sync-box-state.injectable";
+
+const syncBoxChannelHandlerInjectable = getInjectable({
+  id: "sync-box-channel-handler",
+  instantiate: (di): MessageChannelHandler<SyncBoxChannel> => {
+    const getSyncBoxState = (id: string) => di.inject(syncBoxStateInjectable, id);
+
+    return ({ id, value }) => getSyncBoxState(id)?.set(value);
+  },
+});
+
+export default syncBoxChannelHandlerInjectable;
diff --git a/src/common/utils/sync-box/sync-box-channel-listener.injectable.ts b/src/common/utils/sync-box/sync-box-channel-listener.injectable.ts
deleted file mode 100644
index b603c85997..0000000000
--- a/src/common/utils/sync-box/sync-box-channel-listener.injectable.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { SyncBoxChannel } from "./sync-box-channel.injectable";
-import syncBoxChannelInjectable from "./sync-box-channel.injectable";
-import syncBoxStateInjectable from "./sync-box-state.injectable";
-import type { MessageChannelListener } from "../channel/message-channel-listener-injection-token";
-import { messageChannelListenerInjectionToken } from "../channel/message-channel-listener-injection-token";
-
-const syncBoxChannelListenerInjectable = getInjectable({
-  id: "sync-box-channel-listener",
-
-  instantiate: (di): MessageChannelListener<SyncBoxChannel> => {
-    const getSyncBoxState = (id: string) => di.inject(syncBoxStateInjectable, id);
-    const channel = di.inject(syncBoxChannelInjectable);
-
-    return {
-      channel,
-
-      handler: ({ id, value }) => {
-        const target = getSyncBoxState(id);
-
-        if (target) {
-          target.set(value);
-        }
-      },
-    };
-  },
-
-  injectionToken: messageChannelListenerInjectionToken,
-});
-
-export default syncBoxChannelListenerInjectable;
diff --git a/src/common/utils/sync-box/sync-box-channel.injectable.ts b/src/common/utils/sync-box/sync-box-channel.injectable.ts
deleted file mode 100644
index 9389a99867..0000000000
--- a/src/common/utils/sync-box/sync-box-channel.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { MessageChannel } from "../channel/message-channel-injection-token";
-import { messageChannelInjectionToken } from "../channel/message-channel-injection-token";
-
-export type SyncBoxChannel = MessageChannel<{ id: string; value: any }>;
-
-const syncBoxChannelInjectable = getInjectable({
-  id: "sync-box-channel",
-
-  instantiate: (): SyncBoxChannel => ({
-    id: "sync-box-channel",
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default syncBoxChannelInjectable;
diff --git a/src/common/utils/sync-box/sync-box-initial-value-channel.injectable.ts b/src/common/utils/sync-box/sync-box-initial-value-channel.injectable.ts
deleted file mode 100644
index 89374c3565..0000000000
--- a/src/common/utils/sync-box/sync-box-initial-value-channel.injectable.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { RequestChannel } from "../channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../channel/request-channel-injection-token";
-
-export type SyncBoxInitialValueChannel = RequestChannel<
-  void,
-  { id: string; value: any }[]
->;
-
-const syncBoxInitialValueChannelInjectable = getInjectable({
-  id: "sync-box-initial-value-channel",
-
-  instantiate: (): SyncBoxInitialValueChannel => ({
-    id: "sync-box-initial-value-channel",
-  }),
-
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default syncBoxInitialValueChannelInjectable;
diff --git a/src/common/utils/tentative-parse-json.ts b/src/common/utils/tentative-parse-json.ts
deleted file mode 100644
index a0cb089a74..0000000000
--- a/src/common/utils/tentative-parse-json.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { pipeline } from "@ogre-tools/fp";
-import { defaultTo } from "lodash/fp";
-import { withErrorSuppression } from "./with-error-suppression/with-error-suppression";
-
-export const tentativeParseJson = (toBeParsed: any) => pipeline(
-  toBeParsed,
-  withErrorSuppression(JSON.parse),
-  defaultTo(toBeParsed),
-);
-
-
diff --git a/src/common/utils/tentative-stringify-json.ts b/src/common/utils/tentative-stringify-json.ts
deleted file mode 100644
index dc7206be7c..0000000000
--- a/src/common/utils/tentative-stringify-json.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { pipeline } from "@ogre-tools/fp";
-import { defaultTo } from "lodash/fp";
-import { withErrorSuppression } from "./with-error-suppression/with-error-suppression";
-
-export const tentativeStringifyJson = (toBeParsed: any) => pipeline(
-  toBeParsed,
-  withErrorSuppression(JSON.stringify),
-  defaultTo(toBeParsed),
-);
-
-
diff --git a/src/common/vars/build-semantic-version.injectable.ts b/src/common/vars/build-semantic-version.injectable.ts
index a41efb0bd7..2a49327480 100644
--- a/src/common/vars/build-semantic-version.injectable.ts
+++ b/src/common/vars/build-semantic-version.injectable.ts
@@ -7,7 +7,7 @@ import { getInjectionToken } from "@ogre-tools/injectable";
 import { SemVer } from "semver";
 import type { InitializableState } from "../initializable-state/create";
 import { createInitializableState } from "../initializable-state/create";
-import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
+import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
 
 export const buildVersionInjectionToken = getInjectionToken<InitializableState<string>>({
   id: "build-version-token",
diff --git a/src/features/application-update/selection-of-update-stability.test.ts b/src/features/application-update/selection-of-update-stability.test.ts
index d948573dcd..bfa6f0680d 100644
--- a/src/features/application-update/selection-of-update-stability.test.ts
+++ b/src/features/application-update/selection-of-update-stability.test.ts
@@ -222,7 +222,7 @@ describe("selection of update stability", () => {
             it('given user changes update channel to "alpha", when user would close the application, installs the update for being stable enough', () => {
               selectedUpdateChannel.setValue(updateChannels.alpha.id);
 
-              expect(setUpdateOnQuitMock).toHaveBeenLastCalledWith(false);
+              expect(setUpdateOnQuitMock).toHaveBeenLastCalledWith(true);
             });
           });
         });
diff --git a/src/features/cluster/delete-dialog/common/clear-as-deleting-channel.injectable.ts b/src/features/cluster/delete-dialog/common/clear-as-deleting-channel.injectable.ts
deleted file mode 100644
index d45fecb3c2..0000000000
--- a/src/features/cluster/delete-dialog/common/clear-as-deleting-channel.injectable.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { ClusterId } from "../../../../common/cluster-types";
-import type { RequestChannel } from "../../../../common/utils/channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../../../../common/utils/channel/request-channel-injection-token";
-
-export type ClearClusterAsDeletingChannel = RequestChannel<ClusterId, void>;
-
-const clearClusterAsDeletingChannelInjectable = getInjectable({
-  id: "clear-cluster-as-deleting-channel",
-  instantiate: (): ClearClusterAsDeletingChannel => ({
-    id: "clear-cluster-as-deleting",
-  }),
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default clearClusterAsDeletingChannelInjectable;
diff --git a/src/features/cluster/delete-dialog/common/clear-as-deleting-channel.ts b/src/features/cluster/delete-dialog/common/clear-as-deleting-channel.ts
new file mode 100644
index 0000000000..bf33a23165
--- /dev/null
+++ b/src/features/cluster/delete-dialog/common/clear-as-deleting-channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { ClusterId } from "../../../../common/cluster-types";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+
+export type ClearClusterAsDeletingChannel = RequestChannel<ClusterId, void>;
+
+export const clearClusterAsDeletingChannel: ClearClusterAsDeletingChannel = {
+  id: "clear-cluster-as-deleting",
+};
diff --git a/src/features/cluster/delete-dialog/common/delete-channel.injectable.ts b/src/features/cluster/delete-dialog/common/delete-channel.injectable.ts
deleted file mode 100644
index 9242b062c5..0000000000
--- a/src/features/cluster/delete-dialog/common/delete-channel.injectable.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { ClusterId } from "../../../../common/cluster-types";
-import type { RequestChannel } from "../../../../common/utils/channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../../../../common/utils/channel/request-channel-injection-token";
-
-export type DeleteClusterChannel = RequestChannel<ClusterId, void>;
-
-const deleteClusterChannelInjectable = getInjectable({
-  id: "delete-cluster-channel",
-  instantiate: (): DeleteClusterChannel => ({
-    id: "delete-cluster",
-  }),
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default deleteClusterChannelInjectable;
diff --git a/src/features/cluster/delete-dialog/common/delete-channel.ts b/src/features/cluster/delete-dialog/common/delete-channel.ts
new file mode 100644
index 0000000000..0e9142fcd3
--- /dev/null
+++ b/src/features/cluster/delete-dialog/common/delete-channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { ClusterId } from "../../../../common/cluster-types";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+
+export type DeleteClusterChannel = RequestChannel<ClusterId, void>;
+
+export const deleteClusterChannel: DeleteClusterChannel = {
+  id: "delete-cluster",
+};
diff --git a/src/features/cluster/delete-dialog/common/set-as-deleting-channel.injectable.ts b/src/features/cluster/delete-dialog/common/set-as-deleting-channel.injectable.ts
deleted file mode 100644
index b625dfa14e..0000000000
--- a/src/features/cluster/delete-dialog/common/set-as-deleting-channel.injectable.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { ClusterId } from "../../../../common/cluster-types";
-import type { RequestChannel } from "../../../../common/utils/channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../../../../common/utils/channel/request-channel-injection-token";
-
-export type SetClusterAsDeletingChannel = RequestChannel<ClusterId, void>;
-
-const setClusterAsDeletingChannelInjectable = getInjectable({
-  id: "set-cluster-as-deleting-channel",
-  instantiate: (): SetClusterAsDeletingChannel => ({
-    id: "set-cluster-as-deleting",
-  }),
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default setClusterAsDeletingChannelInjectable;
diff --git a/src/features/cluster/delete-dialog/common/set-as-deleting-channel.ts b/src/features/cluster/delete-dialog/common/set-as-deleting-channel.ts
new file mode 100644
index 0000000000..57ef2e3a8d
--- /dev/null
+++ b/src/features/cluster/delete-dialog/common/set-as-deleting-channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { ClusterId } from "../../../../common/cluster-types";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+
+export type SetClusterAsDeletingChannel = RequestChannel<ClusterId, void>;
+
+export const setClusterAsDeletingChannel: SetClusterAsDeletingChannel = {
+  id: "set-cluster-as-deleting",
+};
diff --git a/src/features/cluster/delete-dialog/main/clear-as-deleteing-channel-handler.injectable.ts b/src/features/cluster/delete-dialog/main/clear-as-deleteing-channel-handler.injectable.ts
deleted file mode 100644
index f1b89573d8..0000000000
--- a/src/features/cluster/delete-dialog/main/clear-as-deleteing-channel-handler.injectable.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
-import clustersThatAreBeingDeletedInjectable from "../../../../main/cluster/are-being-deleted.injectable";
-import clearClusterAsDeletingChannelInjectable from "../common/clear-as-deleting-channel.injectable";
-
-const clearClusterAsDeletingChannelHandlerInjectable = getInjectable({
-  id: "clear-cluster-as-deleting-channel-handler",
-  instantiate: (di) => {
-    const clustersThatAreBeingDeleted = di.inject(clustersThatAreBeingDeletedInjectable);
-
-    return {
-      channel: di.inject(clearClusterAsDeletingChannelInjectable),
-      handler: (clusterId) => clustersThatAreBeingDeleted.delete(clusterId),
-    };
-  },
-  injectionToken: requestChannelListenerInjectionToken,
-});
-
-export default clearClusterAsDeletingChannelHandlerInjectable;
diff --git a/src/features/cluster/delete-dialog/main/clear-as-deleting-channel-listener.injectable.ts b/src/features/cluster/delete-dialog/main/clear-as-deleting-channel-listener.injectable.ts
new file mode 100644
index 0000000000..a8dd2a80b0
--- /dev/null
+++ b/src/features/cluster/delete-dialog/main/clear-as-deleting-channel-listener.injectable.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import clustersThatAreBeingDeletedInjectable from "../../../../main/cluster/are-being-deleted.injectable";
+import { getRequestChannelListenerInjectable } from "../../../../main/utils/channel/channel-listeners/listener-tokens";
+import { clearClusterAsDeletingChannel } from "../common/clear-as-deleting-channel";
+
+const clearClusterAsDeletingChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: clearClusterAsDeletingChannel,
+  handler: (di) => {
+    const clustersThatAreBeingDeleted = di.inject(clustersThatAreBeingDeletedInjectable);
+
+    return (clusterId) => {
+      clustersThatAreBeingDeleted.delete(clusterId);
+    };
+  },
+});
+
+export default clearClusterAsDeletingChannelListenerInjectable;
diff --git a/src/features/cluster/delete-dialog/main/delete-channel-handler.injectable.ts b/src/features/cluster/delete-dialog/main/delete-channel-handler.injectable.ts
deleted file mode 100644
index 8945ffe625..0000000000
--- a/src/features/cluster/delete-dialog/main/delete-channel-handler.injectable.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
-import clusterFramesInjectable from "../../../../common/cluster-frames.injectable";
-import clusterStoreInjectable from "../../../../common/cluster-store/cluster-store.injectable";
-import directoryForLensLocalStorageInjectable from "../../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable";
-import deleteFileInjectable from "../../../../common/fs/delete-file.injectable";
-import joinPathsInjectable from "../../../../common/path/join-paths.injectable";
-import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
-import deleteClusterChannelInjectable from "../common/delete-channel.injectable";
-
-const deleteClusterChannelHandlerInjectable = getInjectable({
-  id: "delete-cluster-channel-handler",
-  instantiate: (di) => {
-    const appEventBus = di.inject(appEventBusInjectable);
-    const clusterStore = di.inject(clusterStoreInjectable);
-    const clusterFrames = di.inject(clusterFramesInjectable);
-    const joinPaths = di.inject(joinPathsInjectable);
-    const directoryForLensLocalStorage = di.inject(directoryForLensLocalStorageInjectable);
-    const deleteFile = di.inject(deleteFileInjectable);
-
-    return {
-      channel: di.inject(deleteClusterChannelInjectable),
-      handler: async (clusterId) =>{
-        appEventBus.emit({ name: "cluster", action: "remove" });
-
-        const cluster = clusterStore.getById(clusterId);
-
-        if (!cluster) {
-          return;
-        }
-
-        cluster.disconnect();
-        clusterFrames.delete(cluster.id);
-
-        // Remove from the cluster store as well, this should clear any old settings
-        clusterStore.clusters.delete(cluster.id);
-
-        try {
-          // remove the local storage file
-          const localStorageFilePath = joinPaths(directoryForLensLocalStorage, `${cluster.id}.json`);
-
-          await deleteFile(localStorageFilePath);
-        } catch {
-          // ignore error
-        }
-      },
-    };
-  },
-  injectionToken: requestChannelListenerInjectionToken,
-});
-
-export default deleteClusterChannelHandlerInjectable;
diff --git a/src/features/cluster/delete-dialog/main/delete-channel-listener.injectable.ts b/src/features/cluster/delete-dialog/main/delete-channel-listener.injectable.ts
new file mode 100644
index 0000000000..9b7617293a
--- /dev/null
+++ b/src/features/cluster/delete-dialog/main/delete-channel-listener.injectable.ts
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
+import clusterFramesInjectable from "../../../../common/cluster-frames.injectable";
+import clusterStoreInjectable from "../../../../common/cluster-store/cluster-store.injectable";
+import directoryForLensLocalStorageInjectable from "../../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable";
+import deleteFileInjectable from "../../../../common/fs/delete-file.injectable";
+import joinPathsInjectable from "../../../../common/path/join-paths.injectable";
+import { getRequestChannelListenerInjectable } from "../../../../main/utils/channel/channel-listeners/listener-tokens";
+import { deleteClusterChannel } from "../common/delete-channel";
+
+const deleteClusterChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: deleteClusterChannel,
+  handler: (di) => {
+    const appEventBus = di.inject(appEventBusInjectable);
+    const clusterStore = di.inject(clusterStoreInjectable);
+    const clusterFrames = di.inject(clusterFramesInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
+    const directoryForLensLocalStorage = di.inject(directoryForLensLocalStorageInjectable);
+    const deleteFile = di.inject(deleteFileInjectable);
+
+    return async (clusterId) => {
+      appEventBus.emit({ name: "cluster", action: "remove" });
+
+      const cluster = clusterStore.getById(clusterId);
+
+      if (!cluster) {
+        return;
+      }
+
+      cluster.disconnect();
+      clusterFrames.delete(cluster.id);
+
+      // Remove from the cluster store as well, this should clear any old settings
+      clusterStore.clusters.delete(cluster.id);
+
+      try {
+        // remove the local storage file
+        const localStorageFilePath = joinPaths(directoryForLensLocalStorage, `${cluster.id}.json`);
+
+        await deleteFile(localStorageFilePath);
+      } catch {
+        // ignore error
+      }
+    };
+  },
+});
+
+export default deleteClusterChannelListenerInjectable;
diff --git a/src/features/cluster/delete-dialog/main/set-as-deleteing-channel-handler.injectable.ts b/src/features/cluster/delete-dialog/main/set-as-deleteing-channel-handler.injectable.ts
deleted file mode 100644
index 0b8862e384..0000000000
--- a/src/features/cluster/delete-dialog/main/set-as-deleteing-channel-handler.injectable.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
-import clustersThatAreBeingDeletedInjectable from "../../../../main/cluster/are-being-deleted.injectable";
-import setClusterAsDeletingChannelInjectable from "../common/set-as-deleting-channel.injectable";
-
-const setClusterAsDeletingChannelHandlerInjectable = getInjectable({
-  id: "set-cluster-as-deleting-channel-handler",
-  instantiate: (di) => {
-    const clustersThatAreBeingDeleted = di.inject(clustersThatAreBeingDeletedInjectable);
-
-    return {
-      channel: di.inject(setClusterAsDeletingChannelInjectable),
-      handler: (clusterId) => clustersThatAreBeingDeleted.add(clusterId),
-    };
-  },
-  injectionToken: requestChannelListenerInjectionToken,
-});
-
-export default setClusterAsDeletingChannelHandlerInjectable;
diff --git a/src/features/cluster/delete-dialog/main/set-as-deleteing-channel-listener.injectable.ts b/src/features/cluster/delete-dialog/main/set-as-deleteing-channel-listener.injectable.ts
new file mode 100644
index 0000000000..f532b4a81f
--- /dev/null
+++ b/src/features/cluster/delete-dialog/main/set-as-deleteing-channel-listener.injectable.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import clustersThatAreBeingDeletedInjectable from "../../../../main/cluster/are-being-deleted.injectable";
+import { getRequestChannelListenerInjectable } from "../../../../main/utils/channel/channel-listeners/listener-tokens";
+import { setClusterAsDeletingChannel } from "../common/set-as-deleting-channel";
+
+const setClusterAsDeletingChannelHandlerInjectable = getRequestChannelListenerInjectable({
+  channel: setClusterAsDeletingChannel,
+  handler: (di) => {
+    const clustersThatAreBeingDeleted = di.inject(clustersThatAreBeingDeletedInjectable);
+
+    return (clusterId) => {
+      clustersThatAreBeingDeleted.add(clusterId);
+    };
+  },
+});
+
+export default setClusterAsDeletingChannelHandlerInjectable;
diff --git a/src/features/cluster/delete-dialog/renderer/request-clear-as-deleting.injectable.ts b/src/features/cluster/delete-dialog/renderer/request-clear-as-deleting.injectable.ts
index b480630f6c..e476998ca0 100644
--- a/src/features/cluster/delete-dialog/renderer/request-clear-as-deleting.injectable.ts
+++ b/src/features/cluster/delete-dialog/renderer/request-clear-as-deleting.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { ClusterId } from "../../../../common/cluster-types";
 import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable";
-import clearClusterAsDeletingChannelInjectable from "../common/clear-as-deleting-channel.injectable";
+import { clearClusterAsDeletingChannel } from "../common/clear-as-deleting-channel";
 
 export type RequestClearClusterAsDeleting = (clusterId: ClusterId) => Promise<void>;
 
@@ -13,7 +13,6 @@ const requestClearClusterAsDeletingInjectable = getInjectable({
   id: "request-clear-cluster-as-deleting",
   instantiate: (di): RequestClearClusterAsDeleting => {
     const requestChannel = di.inject(requestFromChannelInjectable);
-    const clearClusterAsDeletingChannel = di.inject(clearClusterAsDeletingChannelInjectable);
 
     return (clusterId) => requestChannel(clearClusterAsDeletingChannel, clusterId);
   },
diff --git a/src/features/cluster/delete-dialog/renderer/request-delete.injectable.ts b/src/features/cluster/delete-dialog/renderer/request-delete.injectable.ts
index 602923e60e..c1286e3103 100644
--- a/src/features/cluster/delete-dialog/renderer/request-delete.injectable.ts
+++ b/src/features/cluster/delete-dialog/renderer/request-delete.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { ClusterId } from "../../../../common/cluster-types";
 import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable";
-import deleteClusterChannelInjectable from "../common/delete-channel.injectable";
+import { deleteClusterChannel } from "../common/delete-channel";
 
 export type RequestDeleteCluster = (clusterId: ClusterId) => Promise<void>;
 
@@ -13,7 +13,6 @@ const requestDeleteClusterInjectable = getInjectable({
   id: "request-delete-cluster",
   instantiate: (di): RequestDeleteCluster => {
     const requestChannel = di.inject(requestFromChannelInjectable);
-    const deleteClusterChannel = di.inject(deleteClusterChannelInjectable);
 
     return (clusterId) => requestChannel(deleteClusterChannel, clusterId);
   },
diff --git a/src/features/cluster/delete-dialog/renderer/request-set-as-deleting.injectable.ts b/src/features/cluster/delete-dialog/renderer/request-set-as-deleting.injectable.ts
index 997348d44d..de3a6393b3 100644
--- a/src/features/cluster/delete-dialog/renderer/request-set-as-deleting.injectable.ts
+++ b/src/features/cluster/delete-dialog/renderer/request-set-as-deleting.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { ClusterId } from "../../../../common/cluster-types";
 import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable";
-import setClusterAsDeletingChannelInjectable from "../common/set-as-deleting-channel.injectable";
+import { setClusterAsDeletingChannel } from "../common/set-as-deleting-channel";
 
 export type RequestSetClusterAsDeleting = (clusterId: ClusterId) => Promise<void>;
 
@@ -13,7 +13,6 @@ const requestSetClusterAsDeletingInjectable = getInjectable({
   id: "request-set-cluster-as-deleting",
   instantiate: (di): RequestSetClusterAsDeleting => {
     const requestChannel = di.inject(requestFromChannelInjectable);
-    const setClusterAsDeletingChannel = di.inject(setClusterAsDeletingChannelInjectable);
 
     return (clusterId) => requestChannel(setClusterAsDeletingChannel, clusterId);
   },
diff --git a/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts b/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts
index fb7b655dfe..6df4402130 100644
--- a/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts
+++ b/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts
@@ -8,6 +8,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
+import type { ExecFile } from "../../common/fs/exec-file.injectable";
 import execFileInjectable from "../../common/fs/exec-file.injectable";
 import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
 import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
@@ -24,9 +25,7 @@ describe("add custom helm repository in preferences", () => {
   let showSuccessNotificationMock: jest.Mock;
   let showErrorNotificationMock: jest.Mock;
   let rendered: RenderResult;
-  let execFileMock: AsyncFnMock<
-    ReturnType<typeof execFileInjectable["instantiate"]>
-  >;
+  let execFileMock: AsyncFnMock<ExecFile>;
   let getActiveHelmRepositoriesMock: AsyncFnMock<() => Promise<AsyncResult<HelmRepo[]>>>;
 
   beforeEach(async () => {
@@ -184,9 +183,13 @@ describe("add custom helm repository in preferences", () => {
 
             describe("when activation rejects", () => {
               beforeEach(async () => {
-                await execFileMock.reject(
-                  "Some error",
-                );
+                await execFileMock.resolve({
+                  callWasSuccessful: false,
+                  error: {
+                    error: new Error("Some error"),
+                    stderr: "",
+                  },
+                });
               });
 
               it("renders", () => {
@@ -219,8 +222,10 @@ describe("add custom helm repository in preferences", () => {
                     "some-helm-binary-path",
                     ["repo", "add", "some-custom-repository", "http://some.url"],
                   ],
-
-                  "",
+                  {
+                    callWasSuccessful: true,
+                    response: "",
+                  },
                 );
               });
 
diff --git a/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts b/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts
index 98e94321bd..73831bec04 100644
--- a/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts
+++ b/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts
@@ -7,6 +7,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
+import type { ExecFile } from "../../common/fs/exec-file.injectable";
 import execFileInjectable from "../../common/fs/exec-file.injectable";
 import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
 import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
@@ -21,9 +22,7 @@ describe("add helm repository from list in preferences", () => {
   let showSuccessNotificationMock: jest.Mock;
   let showErrorNotificationMock: jest.Mock;
   let rendered: RenderResult;
-  let execFileMock: AsyncFnMock<
-    ReturnType<typeof execFileInjectable["instantiate"]>
-  >;
+  let execFileMock: AsyncFnMock<ExecFile>;
   let getActiveHelmRepositoriesMock: AsyncFnMock<() => Promise<AsyncResult<HelmRepo[]>>>;
   let callForPublicHelmRepositoriesMock: AsyncFnMock<() => Promise<HelmRepo[]>>;
 
@@ -129,9 +128,13 @@ describe("add helm repository from list in preferences", () => {
 
           describe("when adding rejects", () => {
             beforeEach(async () => {
-              await execFileMock.reject(
-                "Some error",
-              );
+              await execFileMock.resolve({
+                callWasSuccessful: false,
+                error: {
+                  error: new Error("Some error"),
+                  stderr: "",
+                },
+              });
             });
 
             it("renders", () => {
@@ -164,8 +167,10 @@ describe("add helm repository from list in preferences", () => {
                   "some-helm-binary-path",
                   ["repo", "add", "Some to be added repository", "some-other-url"],
                 ],
-
-                "",
+                {
+                  callWasSuccessful: true,
+                  response: "",
+                },
               );
             });
 
@@ -243,8 +248,10 @@ describe("add helm repository from list in preferences", () => {
                           "some-helm-binary-path",
                           ["repo", "remove", "Some already active repository"],
                         ],
-
-                        "",
+                        {
+                          callWasSuccessful: true,
+                          response: "",
+                        },
                       );
                     });
 
diff --git a/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts b/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts
index 19aaf28938..30e5bac5eb 100644
--- a/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts
+++ b/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts
@@ -83,7 +83,13 @@ describe("listing active helm repositories in preferences", () => {
 
     describe("when getting configuration rejects", () => {
       beforeEach(async () => {
-        await execFileMock.reject("some-error");
+        await execFileMock.resolve({
+          callWasSuccessful: false,
+          error: {
+            error: new Error("some error"),
+            stderr: "some-error",
+          },
+        });
       });
 
       it("shows error notification", () => {
@@ -115,7 +121,10 @@ describe("listing active helm repositories in preferences", () => {
 
         await execFileMock.resolveSpecific(
           ["some-helm-binary-path", ["env"]],
-          "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path",
+          {
+            callWasSuccessful: true,
+            response: "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path",
+          },
         );
       });
 
@@ -154,7 +163,10 @@ describe("listing active helm repositories in preferences", () => {
 
         await execFileMock.resolveSpecific(
           ["some-helm-binary-path", ["env"]],
-          "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml",
+          {
+            callWasSuccessful: true,
+            response: "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml",
+          },
         );
       });
 
@@ -193,11 +205,13 @@ describe("listing active helm repositories in preferences", () => {
 
         await execFileMock.resolveSpecific(
           ["some-helm-binary-path", ["env"]],
-
-          [
-            "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml",
-            "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path",
-          ].join("\n"),
+          {
+            callWasSuccessful: true,
+            response: [
+              "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml",
+              "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path",
+            ].join("\n"),
+          },
         );
       });
 
@@ -219,7 +233,13 @@ describe("listing active helm repositories in preferences", () => {
 
       describe("when updating repositories reject with any other error", () => {
         beforeEach(async () => {
-          await execFileMock.reject("Some error");
+          await execFileMock.resolve({
+            callWasSuccessful: false,
+            error: {
+              error: new Error("Some error"),
+              stderr: "Some error",
+            },
+          });
         });
 
         it("shows error notification", () => {
@@ -249,9 +269,13 @@ describe("listing active helm repositories in preferences", () => {
         beforeEach(async () => {
           execFileMock.mockClear();
 
-          await execFileMock.reject(
-            "Error: no repositories found. You must add one before updating",
-          );
+          await execFileMock.resolve({
+            callWasSuccessful: false,
+            error: {
+              error: new Error("no repositories found. You must add one before updating"),
+              stderr: "no repositories found. You must add one before updating",
+            },
+          });
         });
 
         it("renders", () => {
@@ -274,7 +298,13 @@ describe("listing active helm repositories in preferences", () => {
 
         describe("when adding default repository reject", () => {
           beforeEach(async () => {
-            await execFileMock.reject("Some error");
+            await execFileMock.resolve({
+              callWasSuccessful: false,
+              error: {
+                error: new Error("Some error"),
+                stderr: "Some error",
+              },
+            });
           });
 
           it("shows error notification", () => {
@@ -307,7 +337,6 @@ describe("listing active helm repositories in preferences", () => {
             await execFileMock.resolveSpecific(
               [
                 "some-helm-binary-path",
-
                 [
                   "repo",
                   "add",
@@ -315,8 +344,10 @@ describe("listing active helm repositories in preferences", () => {
                   "https://charts.bitnami.com/bitnami",
                 ],
               ],
-
-              "",
+              {
+                callWasSuccessful: true,
+                response: "",
+              },
             );
           });
 
@@ -380,7 +411,10 @@ describe("listing active helm repositories in preferences", () => {
 
           await execFileMock.resolveSpecific(
             ["some-helm-binary-path", ["repo", "update"]],
-            "",
+            {
+              callWasSuccessful: true,
+              response: "",
+            },
           );
         });
 
diff --git a/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts b/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts
index 7a3e787a53..8d029d3412 100644
--- a/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts
+++ b/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts
@@ -8,6 +8,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
+import type { ExecFile } from "../../common/fs/exec-file.injectable";
 import execFileInjectable from "../../common/fs/exec-file.injectable";
 import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
 import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
@@ -19,9 +20,7 @@ describe("remove helm repository from list of active repositories in preferences
   let builder: ApplicationBuilder;
   let rendered: RenderResult;
   let getActiveHelmRepositoriesMock: AsyncFnMock<() => Promise<AsyncResult<HelmRepo[]>>>;
-  let execFileMock: AsyncFnMock<
-    ReturnType<typeof execFileInjectable["instantiate"]>
-  >;
+  let execFileMock: AsyncFnMock<ExecFile>;
 
   beforeEach(async () => {
     builder = getApplicationBuilder();
@@ -101,8 +100,10 @@ describe("remove helm repository from list of active repositories in preferences
                 "some-helm-binary-path",
                 ["repo", "remove", "some-active-repository"],
               ],
-
-              "",
+              {
+                callWasSuccessful: true,
+                response: "",
+              },
             );
           });
 
diff --git a/src/features/navigation/reload-page/common/channel.ts b/src/features/navigation/reload-page/common/channel.ts
new file mode 100644
index 0000000000..b920067a4d
--- /dev/null
+++ b/src/features/navigation/reload-page/common/channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { MessageChannel } from "../../../../common/utils/channel/message-channel-listener-injection-token";
+
+export type ReloadPageChannel = MessageChannel<void>;
+
+export const reloadPageChannel: ReloadPageChannel = {
+  id: "reload-page-channel",
+};
diff --git a/src/features/navigation/reload-page/renderer/register-listener.global-override-for-injectable.ts b/src/features/navigation/reload-page/renderer/register-listener.global-override-for-injectable.ts
new file mode 100644
index 0000000000..c0a43713b7
--- /dev/null
+++ b/src/features/navigation/reload-page/renderer/register-listener.global-override-for-injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../../common/test-utils/get-global-override";
+import { reloadPageChannel } from "../common/channel";
+import reloadPageChannelListenerInjectable from "./register-listener.injectable";
+
+export default getGlobalOverride(reloadPageChannelListenerInjectable, () => ({
+  channel: reloadPageChannel,
+  handler: () => {},
+}));
diff --git a/src/features/navigation/reload-page/renderer/register-listener.injectable.ts b/src/features/navigation/reload-page/renderer/register-listener.injectable.ts
new file mode 100644
index 0000000000..a42d818729
--- /dev/null
+++ b/src/features/navigation/reload-page/renderer/register-listener.injectable.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getMessageChannelListenerInjectable } from "../../../../common/utils/channel/message-channel-listener-injection-token";
+import { reloadPageChannel } from "../common/channel";
+
+const reloadPageChannelListenerInjectable = getMessageChannelListenerInjectable({
+  id: "handler",
+  channel: reloadPageChannel,
+  handler: () => () => location.reload(),
+  causesSideEffects: true,
+});
+
+export default reloadPageChannelListenerInjectable;
diff --git a/src/main/app-paths/app-paths-request-channel-listener.injectable.ts b/src/main/app-paths/app-paths-request-channel-listener.injectable.ts
index 3bd0c95bf7..568d63f1ea 100644
--- a/src/main/app-paths/app-paths-request-channel-listener.injectable.ts
+++ b/src/main/app-paths/app-paths-request-channel-listener.injectable.ts
@@ -2,26 +2,17 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { RequestChannelListener } from "../../common/utils/channel/request-channel-listener-injection-token";
-import { requestChannelListenerInjectionToken } from "../../common/utils/channel/request-channel-listener-injection-token";
-import type { AppPathsChannel } from "../../common/app-paths/app-paths-channel.injectable";
-import appPathsChannelInjectable from "../../common/app-paths/app-paths-channel.injectable";
+import { appPathsChannel } from "../../common/app-paths/app-paths-channel";
 import appPathsInjectable from "../../common/app-paths/app-paths.injectable";
+import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
 
-const appPathsRequestChannelListenerInjectable = getInjectable({
-  id: "app-paths-request-channel-listener",
-
-  instantiate: (di): RequestChannelListener<AppPathsChannel> => {
-    const channel = di.inject(appPathsChannelInjectable);
+const appPathsRequestChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: appPathsChannel,
+  handler: (di) => {
     const appPaths = di.inject(appPathsInjectable);
 
-    return {
-      channel,
-      handler: () => appPaths,
-    };
+    return () => appPaths;
   },
-  injectionToken: requestChannelListenerInjectionToken,
 });
 
 export default appPathsRequestChannelListenerInjectable;
diff --git a/src/main/application-update/restart-and-install-update/restart-and-install-update-listener.injectable.ts b/src/main/application-update/restart-and-install-update/restart-and-install-update-listener.injectable.ts
index 0580114885..87f232d9b1 100644
--- a/src/main/application-update/restart-and-install-update/restart-and-install-update-listener.injectable.ts
+++ b/src/main/application-update/restart-and-install-update/restart-and-install-update-listener.injectable.ts
@@ -2,25 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import restartAndInstallUpdateChannel from "../../../common/application-update/restart-and-install-update-channel/restart-and-install-update-channel.injectable";
-import { messageChannelListenerInjectionToken } from "../../../common/utils/channel/message-channel-listener-injection-token";
+import { restartAndInstallUpdateChannel } from "../../../common/application-update/restart-and-install-update-channel";
+import { getMessageChannelListenerInjectable } from "../../../common/utils/channel/message-channel-listener-injection-token";
 import quitAndInstallUpdateInjectable from "../quit-and-install-update.injectable";
 
-const restartAndInstallUpdateListenerInjectable = getInjectable({
-  id: "restart-and-install-update-listener",
-
-  instantiate: (di) => {
-    const quitAndInstall = di.inject(quitAndInstallUpdateInjectable);
-    const channel = di.inject(restartAndInstallUpdateChannel);
-
-    return {
-      channel,
-      handler: quitAndInstall,
-    };
-  },
-
-  injectionToken: messageChannelListenerInjectionToken,
+const restartAndInstallUpdateListenerInjectable = getMessageChannelListenerInjectable({
+  id: "restart",
+  channel: restartAndInstallUpdateChannel,
+  handler: (di) => di.inject(quitAndInstallUpdateInjectable),
 });
 
 export default restartAndInstallUpdateListenerInjectable;
diff --git a/src/main/application-update/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts b/src/main/application-update/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts
index 12ec2d7c6e..9be8fdd18f 100644
--- a/src/main/application-update/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts
+++ b/src/main/application-update/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts
@@ -7,7 +7,7 @@ import { autorun } from "mobx";
 import { getStartableStoppable } from "../../../common/utils/get-startable-stoppable";
 import setUpdateOnQuitInjectable from "../../electron-app/features/set-update-on-quit.injectable";
 import selectedUpdateChannelInjectable from "../../../common/application-update/selected-update-channel/selected-update-channel.injectable";
-import type { UpdateChannel } from "../../../common/application-update/update-channels";
+import type { ReleaseChannel, UpdateChannel } from "../../../common/application-update/update-channels";
 import discoveredUpdateVersionInjectable from "../../../common/application-update/discovered-update-version/discovered-update-version.injectable";
 
 const watchIfUpdateShouldHappenOnQuitInjectable = getInjectable({
@@ -20,33 +20,26 @@ const watchIfUpdateShouldHappenOnQuitInjectable = getInjectable({
 
     return getStartableStoppable("watch-if-update-should-happen-on-quit", () =>
       autorun(() => {
-        const sufficientlyStableUpdateChannels =
-          getSufficientlyStableUpdateChannels(selectedUpdateChannel.value.get());
+        const sufficientlyStableUpdateChannels = getSufficientlyStableUpdateChannels(selectedUpdateChannel.value.get());
+        const updateIsDiscoveredFromChannel = discoveredVersionState.value.get()?.updateChannel;
 
-        const discoveredVersion = discoveredVersionState.value.get();
-
-        const updateIsDiscoveredFromChannel = discoveredVersion?.updateChannel;
-
-        const updateOnQuit = updateIsDiscoveredFromChannel
-          ? sufficientlyStableUpdateChannels.includes(
-            updateIsDiscoveredFromChannel,
-          )
-          : false;
-
-        setUpdateOnQuit(updateOnQuit);
+        setUpdateOnQuit((
+          updateIsDiscoveredFromChannel
+            ? sufficientlyStableUpdateChannels.includes(updateIsDiscoveredFromChannel.id)
+            : false
+        ));
       }),
     );
   },
 });
 
-const getSufficientlyStableUpdateChannels = (updateChannel: UpdateChannel): UpdateChannel[] => {
+const getSufficientlyStableUpdateChannels = (updateChannel: UpdateChannel): ReleaseChannel[] => {
   if (!updateChannel.moreStableUpdateChannel) {
-    return [updateChannel];
+    return [updateChannel.id];
   }
 
   return [
-    updateChannel,
-
+    updateChannel.id,
     ...getSufficientlyStableUpdateChannels(updateChannel.moreStableUpdateChannel),
   ];
 };
diff --git a/src/main/build-version/setup-channel.injectable.ts b/src/main/build-version/setup-channel.injectable.ts
index a34edc0eac..05da92db6e 100644
--- a/src/main/build-version/setup-channel.injectable.ts
+++ b/src/main/build-version/setup-channel.injectable.ts
@@ -2,22 +2,17 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import { requestChannelListenerInjectionToken } from "../../common/utils/channel/request-channel-listener-injection-token";
 import { buildVersionChannel } from "../../common/vars/build-semantic-version.injectable";
+import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
 import buildVersionInjectable from "../vars/build-version/build-version.injectable";
 
-const setupBuildVersionRequestChannelInjectable = getInjectable({
-  id: "setup-build-version-request-channel",
-  instantiate: (di) => {
+const buildVersionChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: buildVersionChannel,
+  handler: (di) => {
     const buildVersion = di.inject(buildVersionInjectable);
 
-    return {
-      channel: buildVersionChannel,
-      handler: () => buildVersion.get(),
-    };
+    return () => buildVersion.get();
   },
-  injectionToken: requestChannelListenerInjectionToken,
 });
 
-export default setupBuildVersionRequestChannelInjectable;
+export default buildVersionChannelListenerInjectable;
diff --git a/src/main/helm/exec-helm/exec-helm.injectable.ts b/src/main/helm/exec-helm/exec-helm.injectable.ts
index dbe65eda34..d81da0c8b8 100644
--- a/src/main/helm/exec-helm/exec-helm.injectable.ts
+++ b/src/main/helm/exec-helm/exec-helm.injectable.ts
@@ -6,9 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable";
 import execFileInjectable from "../../../common/fs/exec-file.injectable";
 import helmBinaryPathInjectable from "../helm-binary-path.injectable";
 import type { AsyncResult } from "../../../common/utils/async-result";
-import { getErrorMessage } from "../../../common/utils/get-error-message";
 
-export type ExecHelm = (args: string[]) => Promise<AsyncResult<string>>;
+export type ExecHelm = (args: string[]) => Promise<AsyncResult<string, string>>;
 
 const execHelmInjectable = getInjectable({
   id: "exec-helm",
@@ -18,15 +17,18 @@ const execHelmInjectable = getInjectable({
     const helmBinaryPath = di.inject(helmBinaryPathInjectable);
 
     return async (args) => {
-      try {
-        const response = await execFile(helmBinaryPath, args, {
-          maxBuffer: 32 * 1024 * 1024 * 1024, // 32 MiB
-        });
+      const response = await execFile(helmBinaryPath, args, {
+        maxBuffer: 32 * 1024 * 1024 * 1024, // 32 MiB
+      });
 
-        return { callWasSuccessful: true, response };
-      } catch (error) {
-        return { callWasSuccessful: false, error: getErrorMessage(error) };
+      if (response.callWasSuccessful) {
+        return response;
       }
+
+      return {
+        callWasSuccessful: false,
+        error: response.error.stderr || response.error.error.message,
+      };
     };
   },
 });
diff --git a/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts
index f4effd1a62..1c68bf6fd7 100644
--- a/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts
+++ b/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts
@@ -2,25 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import addHelmRepositoryChannelInjectable from "../../../../common/helm/add-helm-repository-channel.injectable";
+import { addHelmRepositoryChannel } from "../../../../common/helm/add-helm-repository-channel";
+import { getRequestChannelListenerInjectable } from "../../../utils/channel/channel-listeners/listener-tokens";
 import addHelmRepositoryInjectable from "./add-helm-repository.injectable";
-import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
 
-const addHelmRepositoryChannelListenerInjectable = getInjectable({
-  id: "add-helm-repository-channel-listener",
-
-  instantiate: (di) => {
-    const addHelmRepository = di.inject(addHelmRepositoryInjectable);
-    const channel = di.inject(addHelmRepositoryChannelInjectable);
-
-    return {
-      channel,
-      handler: addHelmRepository,
-    };
-  },
-
-  injectionToken: requestChannelListenerInjectionToken,
+const addHelmRepositoryChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: addHelmRepositoryChannel,
+  handler: (di) => di.inject(addHelmRepositoryInjectable),
 });
 
 export default addHelmRepositoryChannelListenerInjectable;
diff --git a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts
index e48ec7665e..5ef0f2b5a4 100644
--- a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts
+++ b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts
@@ -2,25 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
-import getActiveHelmRepositoriesChannelInjectable from "../../../../common/helm/get-active-helm-repositories-channel.injectable";
+import { getActiveHelmRepositoriesChannel } from "../../../../common/helm/get-active-helm-repositories-channel";
+import { getRequestChannelListenerInjectable } from "../../../utils/channel/channel-listeners/listener-tokens";
 import getActiveHelmRepositoriesInjectable from "./get-active-helm-repositories.injectable";
 
-const getActiveHelmRepositoriesChannelListenerInjectable = getInjectable({
-  id: "get-active-helm-repositories-channel-listener",
-
-  instantiate: (di) => {
-    const getActiveHelmRepositories = di.inject(getActiveHelmRepositoriesInjectable);
-
-    return {
-      channel: di.inject(getActiveHelmRepositoriesChannelInjectable),
-
-      handler: getActiveHelmRepositories,
-    };
-  },
-
-  injectionToken: requestChannelListenerInjectionToken,
+const getActiveHelmRepositoriesChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: getActiveHelmRepositoriesChannel,
+  handler: (di) => di.inject(getActiveHelmRepositoriesInjectable),
 });
 
 export default getActiveHelmRepositoriesChannelListenerInjectable;
diff --git a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts
index b9b2f11777..8a4e04b87c 100644
--- a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts
+++ b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts
@@ -2,25 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
 import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable";
-import removeHelmRepositoryChannelInjectable from "../../../../common/helm/remove-helm-repository-channel.injectable";
+import { removeHelmRepositoryChannel } from "../../../../common/helm/remove-helm-repository-channel";
+import { getRequestChannelListenerInjectable } from "../../../utils/channel/channel-listeners/listener-tokens";
 
-const removeHelmRepositoryChannelListenerInjectable = getInjectable({
-  id: "remove-helm-repository-channel-listener",
-
-  instantiate: (di) => {
-    const removeHelmRepository = di.inject(removeHelmRepositoryInjectable);
-    const channel = di.inject(removeHelmRepositoryChannelInjectable);
-
-    return {
-      channel,
-      handler: removeHelmRepository,
-    };
-  },
-
-  injectionToken: requestChannelListenerInjectionToken,
+const removeHelmRepositoryChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: removeHelmRepositoryChannel,
+  handler: (di) => di.inject(removeHelmRepositoryInjectable),
 });
 
 export default removeHelmRepositoryChannelListenerInjectable;
diff --git a/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
index 252db16a1f..07f9b8fb7e 100644
--- a/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
@@ -6,7 +6,6 @@ import { getInjectable } from "@ogre-tools/injectable";
 import loggerInjectable from "../../../../common/logger.injectable";
 import applicationWindowStateInjectable from "./application-window-state.injectable";
 import { BrowserWindow } from "electron";
-import sendToChannelInElectronBrowserWindowInjectable from "./send-to-channel-in-electron-browser-window.injectable";
 import type { ElectronWindow } from "./create-lens-window.injectable";
 import type { RequireExactlyOne } from "type-fest";
 import openLinkInBrowserInjectable from "../../../../common/utils/open-link-in-browser.injectable";
@@ -45,7 +44,6 @@ const createElectronWindowInjectable = getInjectable({
 
   instantiate: (di): CreateElectronWindow => {
     const logger = di.inject(loggerInjectable);
-    const sendToChannelInLensWindow = di.inject(sendToChannelInElectronBrowserWindowInjectable);
     const openLinkInBrowser = di.inject(openLinkInBrowserInjectable);
 
     return (configuration) => {
@@ -140,7 +138,17 @@ const createElectronWindowInjectable = getInjectable({
 
         show: () => browserWindow.show(),
         close: () => browserWindow.close(),
-        send: (args) => sendToChannelInLensWindow(configuration.id, browserWindow, args),
+        send: ({ channel, data, frameInfo }) => {
+          if (frameInfo) {
+            browserWindow.webContents.sendToFrame(
+              [frameInfo.processId, frameInfo.frameId],
+              channel,
+              data,
+            );
+          } else {
+            browserWindow.webContents.send(channel, data);
+          }
+        },
 
         reload: () => {
           const wc = browserWindow.webContents;
diff --git a/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts
index 6dcf6b0174..b44e5774bd 100644
--- a/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts
@@ -20,7 +20,7 @@ export interface ElectronWindow {
 export interface SendToViewArgs {
   channel: string;
   frameInfo?: ClusterFrameInfo;
-  data?: unknown[];
+  data?: unknown;
 }
 
 export interface LensWindow {
diff --git a/src/main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable.ts
deleted file mode 100644
index 08de6fec46..0000000000
--- a/src/main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { BrowserWindow } from "electron";
-import type { SendToViewArgs } from "./create-lens-window.injectable";
-
-const sendToChannelInElectronBrowserWindowInjectable = getInjectable({
-  id: "send-to-channel-in-electron-browser-window",
-
-  instantiate:
-    () =>
-      (
-        windowId: string,
-        browserWindow: BrowserWindow,
-        { channel, frameInfo, data = [] }: SendToViewArgs,
-      ) => {
-        if (frameInfo) {
-          browserWindow.webContents.sendToFrame(
-            [frameInfo.processId, frameInfo.frameId],
-            channel,
-            ...data,
-          );
-        } else {
-          browserWindow.webContents.send(channel, ...data);
-        }
-      },
-
-  causesSideEffects: true,
-});
-
-export default sendToChannelInElectronBrowserWindowInjectable;
diff --git a/src/main/start-main-application/lens-window/navigate.injectable.ts b/src/main/start-main-application/lens-window/navigate.injectable.ts
index 1916b8205f..8b204be9b3 100644
--- a/src/main/start-main-application/lens-window/navigate.injectable.ts
+++ b/src/main/start-main-application/lens-window/navigate.injectable.ts
@@ -37,7 +37,7 @@ const navigateInjectable = getInjectable({
       applicationWindow.send({
         channel,
         frameInfo,
-        data: [url],
+        data: url,
       });
     };
   },
diff --git a/src/main/start-main-application/lens-window/reload-current-application-window.injectable.ts b/src/main/start-main-application/lens-window/reload-current-application-window.injectable.ts
index daaf88a24c..9b0d04fe9f 100644
--- a/src/main/start-main-application/lens-window/reload-current-application-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/reload-current-application-window.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { IpcRendererNavigationEvents } from "../../../renderer/navigation/events";
 import currentClusterFrameInjectable from "./current-cluster-frame/current-cluster-frame.injectable";
 import getCurrentApplicationWindowInjectable from "./application-window/get-current-application-window.injectable";
+import { reloadPageChannel } from "../../../features/navigation/reload-page/common/channel";
 
 const reloadCurrentApplicationWindowInjectable = getInjectable({
   id: "reload-current-application-window",
@@ -25,7 +25,7 @@ const reloadCurrentApplicationWindowInjectable = getInjectable({
 
       if (frameInfo) {
         lensWindow.send({
-          channel: IpcRendererNavigationEvents.RELOAD_PAGE,
+          channel: reloadPageChannel.id,
           frameInfo,
         });
       } else {
diff --git a/src/main/start-main-application/runnables/root-frame-has-rendered/channel-listener.injectable.ts b/src/main/start-main-application/runnables/root-frame-has-rendered/channel-listener.injectable.ts
new file mode 100644
index 0000000000..40f5ceb788
--- /dev/null
+++ b/src/main/start-main-application/runnables/root-frame-has-rendered/channel-listener.injectable.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getMessageChannelListenerInjectable } from "../../../../common/utils/channel/message-channel-listener-injection-token";
+import { rootFrameHasRenderedChannel } from "../../../../common/root-frame/root-frame-rendered-channel";
+import { runManyFor } from "../../../../common/runnable/run-many-for";
+import { afterRootFrameIsReadyInjectionToken } from "../../runnable-tokens/after-root-frame-is-ready-injection-token";
+
+const rootFrameRenderedChannelListenerInjectable = getMessageChannelListenerInjectable({
+  id: "action",
+  channel: rootFrameHasRenderedChannel,
+  handler: (di) => {
+    const runMany = runManyFor(di);
+
+    return runMany(afterRootFrameIsReadyInjectionToken);
+  },
+});
+
+export default rootFrameRenderedChannelListenerInjectable;
diff --git a/src/main/start-main-application/runnables/root-frame-rendered-channel-listener/root-frame-rendered-channel-listener.injectable.ts b/src/main/start-main-application/runnables/root-frame-rendered-channel-listener/root-frame-rendered-channel-listener.injectable.ts
deleted file mode 100644
index 83ebf7bf91..0000000000
--- a/src/main/start-main-application/runnables/root-frame-rendered-channel-listener/root-frame-rendered-channel-listener.injectable.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import rootFrameRenderedChannelInjectable from "../../../../common/root-frame-rendered-channel/root-frame-rendered-channel.injectable";
-import { runManyFor } from "../../../../common/runnable/run-many-for";
-import { afterRootFrameIsReadyInjectionToken } from "../../runnable-tokens/after-root-frame-is-ready-injection-token";
-import { messageChannelListenerInjectionToken } from "../../../../common/utils/channel/message-channel-listener-injection-token";
-
-const rootFrameRenderedChannelListenerInjectable = getInjectable({
-  id: "root-frame-rendered-channel-listener",
-
-  instantiate: (di) => {
-    const channel = di.inject(rootFrameRenderedChannelInjectable);
-
-    const runMany = runManyFor(di);
-
-    const runRunnablesAfterRootFrameIsReady = runMany(
-      afterRootFrameIsReadyInjectionToken,
-    );
-
-    return {
-      channel,
-
-      handler: async () => {
-        await runRunnablesAfterRootFrameIsReady();
-      },
-    };
-  },
-
-  injectionToken: messageChannelListenerInjectionToken,
-});
-
-export default rootFrameRenderedChannelListenerInjectable;
diff --git a/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts b/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
index 6b7fa9b8df..6ace54c845 100644
--- a/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
+++ b/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
@@ -6,8 +6,6 @@ import { getInjectable } from "@ogre-tools/injectable";
 import type { IpcMainEvent } from "electron";
 import ipcMainInjectable from "../ipc-main/ipc-main.injectable";
 import { enlistMessageChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-message-channel-listener-injection-token";
-import { pipeline } from "@ogre-tools/fp";
-import { tentativeParseJson } from "../../../../common/utils/tentative-parse-json";
 
 const enlistMessageChannelListenerInjectable = getInjectable({
   id: "enlist-message-channel-listener-for-main",
@@ -17,11 +15,7 @@ const enlistMessageChannelListenerInjectable = getInjectable({
 
     return ({ channel, handler }) => {
       const nativeOnCallback = (_: IpcMainEvent, message: unknown) => {
-        pipeline(
-          message,
-          tentativeParseJson,
-          handler,
-        );
+        handler(message);
       };
 
       ipcMain.on(channel.id, nativeOnCallback);
diff --git a/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts b/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
index 3bd0398d8e..407ffabd8f 100644
--- a/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
+++ b/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
@@ -88,8 +88,8 @@ describe("enlist message channel listener in main", () => {
       expect(handlerMock).toHaveBeenCalledWith(true);
     });
 
-    it("given stringified object as message, when message arrives, calls the handler with the message", () => {
-      onMock.mock.calls[0][1]({} as IpcMainEvent, JSON.stringify({ some: "object" }));
+    it("given object as message, when message arrives, calls the handler with the message", () => {
+      onMock.mock.calls[0][1]({} as IpcMainEvent, { some: "object" });
 
       expect(handlerMock).toHaveBeenCalledWith({ some: "object" });
     });
diff --git a/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts b/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts
index 6f118288f3..d72e4afcaf 100644
--- a/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts
+++ b/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts
@@ -5,20 +5,20 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { IpcMainInvokeEvent } from "electron";
 import ipcMainInjectable from "../ipc-main/ipc-main.injectable";
-import { enlistRequestChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-request-channel-listener-injection-token";
-import { pipeline } from "@ogre-tools/fp";
-import { tentativeParseJson } from "../../../../common/utils/tentative-parse-json";
-import { tentativeStringifyJson } from "../../../../common/utils/tentative-stringify-json";
+import type { Disposer } from "../../../../common/utils";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import type { RequestChannelListener } from "./listener-tokens";
+
+export type EnlistRequestChannelListener = <TChannel extends RequestChannel<unknown, unknown>>(listener: RequestChannelListener<TChannel>) => Disposer;
 
 const enlistRequestChannelListenerInjectable = getInjectable({
   id: "enlist-request-channel-listener-for-main",
 
-  instantiate: (di) => {
+  instantiate: (di): EnlistRequestChannelListener => {
     const ipcMain = di.inject(ipcMainInjectable);
 
     return ({ channel, handler }) => {
-      const nativeHandleCallback = (_: IpcMainInvokeEvent, request: unknown) =>
-        pipeline(request, tentativeParseJson, handler, tentativeStringifyJson);
+      const nativeHandleCallback = (_: IpcMainInvokeEvent, request: unknown) => handler(request);
 
       ipcMain.handle(channel.id, nativeHandleCallback);
 
@@ -27,8 +27,6 @@ const enlistRequestChannelListenerInjectable = getInjectable({
       };
     };
   },
-
-  injectionToken: enlistRequestChannelListenerInjectionToken,
 });
 
 export default enlistRequestChannelListenerInjectable;
diff --git a/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts b/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts
index 12a5e9af74..2c13bbd8f9 100644
--- a/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts
+++ b/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts
@@ -5,11 +5,19 @@
 import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
 import ipcMainInjectable from "../ipc-main/ipc-main.injectable";
 import type { IpcMain, IpcMainInvokeEvent } from "electron";
-import type { EnlistRequestChannelListener } from "../../../../common/utils/channel/enlist-request-channel-listener-injection-token";
-import { enlistRequestChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-request-channel-listener-injection-token";
 import { getPromiseStatus } from "../../../../common/test-utils/get-promise-status";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import type { EnlistRequestChannelListener } from "./enlist-request-channel-listener.injectable";
+import enlistRequestChannelListenerInjectable from "./enlist-request-channel-listener.injectable";
+import type { RequestChannelHandler } from "./listener-tokens";
+
+type TestRequestChannel = RequestChannel<unknown, unknown>;
+
+const testRequestChannel: TestRequestChannel = {
+  id: "some-channel-id",
+};
 
 describe("enlist request channel listener in main", () => {
   let enlistRequestChannelListener: EnlistRequestChannelListener;
@@ -30,20 +38,18 @@ describe("enlist request channel listener in main", () => {
 
     di.override(ipcMainInjectable, () => ipcMainStub);
 
-    enlistRequestChannelListener = di.inject(
-      enlistRequestChannelListenerInjectionToken,
-    );
+    enlistRequestChannelListener = di.inject(enlistRequestChannelListenerInjectable);
   });
 
   describe("when called", () => {
-    let handlerMock: AsyncFnMock<(message: any) => any>;
+    let handlerMock: AsyncFnMock<RequestChannelHandler<TestRequestChannel>>;
     let disposer: () => void;
 
     beforeEach(() => {
       handlerMock = asyncFn();
 
       disposer = enlistRequestChannelListener({
-        channel: { id: "some-channel-id" },
+        channel: testRequestChannel,
         handler: handlerMock,
       });
     });
@@ -91,7 +97,7 @@ describe("enlist request channel listener in main", () => {
         it("resolves with the response", async () => {
           const actual = await actualPromise;
 
-          expect(actual).toBe('"some-response"');
+          expect(actual).toBe("some-response");
         });
 
         it("when disposing the listener, de-registers the listener", () => {
@@ -106,7 +112,7 @@ describe("enlist request channel listener in main", () => {
 
         const actual = await actualPromise;
 
-        expect(actual).toBe("42");
+        expect(actual).toBe(42);
       });
 
       it("given boolean as response, when handler resolves with response, listener resolves with stringified response", async () => {
@@ -114,15 +120,15 @@ describe("enlist request channel listener in main", () => {
 
         const actual = await actualPromise;
 
-        expect(actual).toBe("true");
+        expect(actual).toBe(true);
       });
 
-      it("given object as response, when handler resolves with response, listener resolves with stringified response", async () => {
+      it("given object as response, when handler resolves with response, listener resolves with response", async () => {
         await handlerMock.resolve({ some: "object" });
 
         const actual = await actualPromise;
 
-        expect(actual).toBe(JSON.stringify({ some: "object" }));
+        expect(actual).toEqual({ some: "object" });
       });
     });
 
@@ -138,8 +144,8 @@ describe("enlist request channel listener in main", () => {
       expect(handlerMock).toHaveBeenCalledWith(true);
     });
 
-    it("given stringified object as request, when request arrives, calls the handler with the request", () => {
-      handleMock.mock.calls[0][1]({} as IpcMainInvokeEvent, JSON.stringify({ some: "object" }));
+    it("given object as request, when request arrives, calls the handler with the request", () => {
+      handleMock.mock.calls[0][1]({} as IpcMainInvokeEvent, { some: "object" });
 
       expect(handlerMock).toHaveBeenCalledWith({ some: "object" });
     });
diff --git a/src/main/utils/channel/channel-listeners/listener-tokens.ts b/src/main/utils/channel/channel-listeners/listener-tokens.ts
new file mode 100644
index 0000000000..a3cd5af4f4
--- /dev/null
+++ b/src/main/utils/channel/channel-listeners/listener-tokens.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { DiContainerForInjection } from "@ogre-tools/injectable";
+import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+
+export type RequestChannelHandler<Channel> = Channel extends RequestChannel<infer Request, infer Response>
+  ? (req: Request) => Promise<Response> | Response
+  : never;
+
+export interface RequestChannelListener<Channel> {
+  channel: Channel;
+  handler: RequestChannelHandler<Channel>;
+}
+
+
+export const requestChannelListenerInjectionToken = getInjectionToken<RequestChannelListener<RequestChannel<unknown, unknown>>>( {
+  id: "request-channel-listener",
+});
+
+export interface GetRequestChannelListenerInjectableInfo<
+  Channel extends RequestChannel<Request, Response>,
+  Request,
+  Response,
+> {
+  channel: Channel;
+  handler: (di: DiContainerForInjection) => RequestChannelHandler<Channel>;
+}
+
+export function getRequestChannelListenerInjectable<
+  Channel extends RequestChannel<Request, Response>,
+  Request,
+  Response,
+>(info: GetRequestChannelListenerInjectableInfo<Channel, Request, Response>) {
+  return getInjectable({
+    id: `${info.channel.id}-listener`,
+    instantiate: (di) => ({
+      channel: info.channel,
+      handler: info.handler(di),
+    }),
+    injectionToken: requestChannelListenerInjectionToken,
+  });
+}
diff --git a/src/main/utils/channel/channel-listeners/listening-on-request-channels.injectable.ts b/src/main/utils/channel/channel-listeners/listening-on-request-channels.injectable.ts
new file mode 100644
index 0000000000..80b94fbe0e
--- /dev/null
+++ b/src/main/utils/channel/channel-listeners/listening-on-request-channels.injectable.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { disposer } from "../../../../common/utils";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import { getStartableStoppable } from "../../../../common/utils/get-startable-stoppable";
+import enlistRequestChannelListenerInjectable from "./enlist-request-channel-listener.injectable";
+import { requestChannelListenerInjectionToken } from "./listener-tokens";
+
+const listeningOnRequestChannelsInjectable = getInjectable({
+  id: "listening-on-request-channels",
+  instantiate: (di) => {
+    const enlistRequestChannelListener = di.inject(enlistRequestChannelListenerInjectable);
+    const requestChannelListeners = di.injectMany(requestChannelListenerInjectionToken);
+
+    return getStartableStoppable("listening-on-request-channels", () => {
+      const seenChannels = new Set<RequestChannel<unknown, unknown>>();
+
+      for (const listener of requestChannelListeners) {
+        if (seenChannels.has(listener.channel)) {
+          throw new Error(`Tried to register a multiple channel handlers for "${listener.channel.id}", only one handler is supported for a request channel.`);
+        }
+
+        seenChannels.add(listener.channel);
+      }
+
+      return disposer(requestChannelListeners.map(enlistRequestChannelListener));
+    });
+  },
+});
+
+export default listeningOnRequestChannelsInjectable;
diff --git a/src/main/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts b/src/main/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts
deleted file mode 100644
index 78d73044e9..0000000000
--- a/src/main/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { onLoadOfApplicationInjectionToken } from "../../../start-main-application/runnable-tokens/on-load-of-application-injection-token";
-import listeningOfChannelsInjectable from "../../../../common/utils/channel/listening-of-channels.injectable";
-
-const startListeningOfChannelsInjectable = getInjectable({
-  id: "start-listening-of-channels-main",
-
-  instantiate: (di) => {
-    const listeningOfChannels = di.inject(listeningOfChannelsInjectable);
-
-    return {
-      id: "start-listening-of-channels-main",
-      run: async () => {
-        await listeningOfChannels.start();
-      },
-    };
-  },
-
-  injectionToken: onLoadOfApplicationInjectionToken,
-});
-
-export default startListeningOfChannelsInjectable;
diff --git a/src/main/utils/channel/channel-listeners/start-listening-on-channels.injectable.ts b/src/main/utils/channel/channel-listeners/start-listening-on-channels.injectable.ts
new file mode 100644
index 0000000000..d1cf5d68d6
--- /dev/null
+++ b/src/main/utils/channel/channel-listeners/start-listening-on-channels.injectable.ts
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { onLoadOfApplicationInjectionToken } from "../../../start-main-application/runnable-tokens/on-load-of-application-injection-token";
+import listeningOnMessageChannelsInjectable from "../../../../common/utils/channel/listening-on-message-channels.injectable";
+import listeningOnRequestChannelsInjectable from "./listening-on-request-channels.injectable";
+
+const startListeningOnChannelsInjectable = getInjectable({
+  id: "start-listening-on-channels-main",
+
+  instantiate: (di) => {
+    const listeningOnMessageChannels = di.inject(listeningOnMessageChannelsInjectable);
+    const listeningOnRequestChannels = di.inject(listeningOnRequestChannelsInjectable);
+
+    return {
+      id: "start-listening-on-channels-main",
+      run: async () => {
+        await listeningOnMessageChannels.start();
+        await listeningOnRequestChannels.start();
+      },
+    };
+  },
+
+  injectionToken: onLoadOfApplicationInjectionToken,
+});
+
+export default startListeningOnChannelsInjectable;
diff --git a/src/main/utils/channel/message-to-channel.injectable.ts b/src/main/utils/channel/message-to-channel.injectable.ts
index cbcdc2badd..1435ea59b5 100644
--- a/src/main/utils/channel/message-to-channel.injectable.ts
+++ b/src/main/utils/channel/message-to-channel.injectable.ts
@@ -3,9 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { messageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
-import type { MessageChannel } from "../../../common/utils/channel/message-channel-injection-token";
-import { tentativeStringifyJson } from "../../../common/utils/tentative-stringify-json";
+import type { SendMessageToChannel } from "../../../common/utils/channel/message-to-channel-injection-token";
+import { sendMessageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
 import getVisibleWindowsInjectable from "../../start-main-application/lens-window/get-visible-windows.injectable";
 
 const messageToChannelInjectable = getInjectable({
@@ -14,18 +13,14 @@ const messageToChannelInjectable = getInjectable({
   instantiate: (di) => {
     const getVisibleWindows = di.inject(getVisibleWindowsInjectable);
 
-    // TODO: Figure out way to improve typing in internals
-    // Notice that this should be injected using "messageToChannelInjectionToken" which is typed correctly.
-    return (channel: MessageChannel<any>, message?: unknown) => {
-      const stringifiedMessage = tentativeStringifyJson(message);
-
-      getVisibleWindows().forEach((lensWindow) =>
-        lensWindow.send({ channel: channel.id, data: stringifiedMessage ? [stringifiedMessage] : [] }),
-      );
-    };
+    return ((channel, data) => {
+      for (const window of getVisibleWindows()) {
+        window.send({ channel: channel.id, data });
+      }
+    }) as SendMessageToChannel;
   },
 
-  injectionToken: messageToChannelInjectionToken,
+  injectionToken: sendMessageToChannelInjectionToken,
 });
 
 export default messageToChannelInjectable;
diff --git a/src/main/utils/channel/message-to-channel.test.ts b/src/main/utils/channel/message-to-channel.test.ts
deleted file mode 100644
index 6d5e83a548..0000000000
--- a/src/main/utils/channel/message-to-channel.test.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { MessageToChannel } from "../../../common/utils/channel/message-to-channel-injection-token";
-import { messageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
-import type { MessageChannel } from "../../../common/utils/channel/message-channel-injection-token";
-import type { LensWindow } from "../../start-main-application/lens-window/application-window/create-lens-window.injectable";
-import sendToChannelInElectronBrowserWindowInjectable from "../../start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable";
-import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
-
-describe("message to channel from main", () => {
-  let messageToChannel: MessageToChannel;
-  let someTestWindow: LensWindow;
-  let someOtherTestWindow: LensWindow;
-  let sendToChannelInBrowserMock: jest.Mock;
-
-  beforeEach(async () => {
-    const builder = getApplicationBuilder();
-
-    sendToChannelInBrowserMock = jest.fn();
-
-    builder.beforeApplicationStart(mainDi => {
-      mainDi.override(sendToChannelInElectronBrowserWindowInjectable, () => sendToChannelInBrowserMock);
-    });
-
-    await builder.startHidden();
-
-    someTestWindow = builder.applicationWindow.create("some-test-window-id");
-    someOtherTestWindow = builder.applicationWindow.create("some-other-test-window-id");
-
-    messageToChannel = builder.mainDi.inject(messageToChannelInjectionToken);
-  });
-
-  it("given no visible windows, when messaging to channel, does not message to any window", () => {
-    messageToChannel(someChannel, "some-message");
-
-    expect(sendToChannelInBrowserMock).not.toHaveBeenCalled();
-  });
-
-  describe("given started window", () => {
-    beforeEach(async () => {
-      await someTestWindow.start();
-    });
-
-    it("when messaging to channel, messages to window", () => {
-      messageToChannel(someChannel, "some-message");
-
-      expect(sendToChannelInBrowserMock.mock.calls).toEqual([
-        [
-          "some-test-window-id",
-
-          null,
-
-          {
-            channel: "some-channel",
-            data: ['"some-message"'],
-          },
-        ],
-      ]);
-    });
-
-    it("given boolean as message, when messaging to channel, messages to window with stringified message", () => {
-      messageToChannel(someChannel, true);
-
-      expect(sendToChannelInBrowserMock.mock.calls).toEqual([
-        [
-          "some-test-window-id",
-
-          null,
-
-          {
-            channel: "some-channel",
-            data: ["true"],
-          },
-        ],
-      ]);
-    });
-
-    it("given number as message, when messaging to channel, messages to window with stringified message", () => {
-      messageToChannel(someChannel, 42);
-
-      expect(sendToChannelInBrowserMock.mock.calls).toEqual([
-        [
-          "some-test-window-id",
-
-          null,
-
-          {
-            channel: "some-channel",
-            data: ["42"],
-          },
-        ],
-      ]);
-    });
-
-    it("given object as message, when messaging to channel, messages to window with stringified message", () => {
-      messageToChannel(someChannel, { some: "object" });
-
-      expect(sendToChannelInBrowserMock.mock.calls).toEqual([
-        [
-          "some-test-window-id",
-
-          null,
-
-          {
-            channel: "some-channel",
-            data: [JSON.stringify({ some: "object" })],
-          },
-        ],
-      ]);
-    });
-  });
-
-  it("given multiple started windows, when messaging to channel, messages to window", async () => {
-    await someTestWindow.start();
-    await someOtherTestWindow.start();
-
-    messageToChannel(someChannel, "some-message");
-
-    expect(sendToChannelInBrowserMock.mock.calls).toEqual([
-      [
-        "some-test-window-id",
-
-        null,
-
-        {
-          channel: "some-channel",
-          data: ['"some-message"'],
-        },
-      ],
-
-      [
-        "some-other-test-window-id",
-
-        null,
-
-        {
-          channel: "some-channel",
-          data: ['"some-message"'],
-        },
-      ],
-    ]);
-  });
-});
-
-const someChannel: MessageChannel<any> = { id: "some-channel" };
diff --git a/src/main/utils/resolve-system-proxy/resolve-system-proxy-channel-responder.injectable.ts b/src/main/utils/resolve-system-proxy/resolve-system-proxy-channel-responder.injectable.ts
index c7a1747770..a2cd605633 100644
--- a/src/main/utils/resolve-system-proxy/resolve-system-proxy-channel-responder.injectable.ts
+++ b/src/main/utils/resolve-system-proxy/resolve-system-proxy-channel-responder.injectable.ts
@@ -2,20 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import resolveSystemProxyChannelInjectable from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable";
+import { resolveSystemProxyChannel } from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-channel";
+import { getRequestChannelListenerInjectable } from "../channel/channel-listeners/listener-tokens";
 import resolveSystemProxyInjectable from "./resolve-system-proxy.injectable";
-import { requestChannelListenerInjectionToken } from "../../../common/utils/channel/request-channel-listener-injection-token";
 
-const resolveSystemProxyChannelResponderInjectable = getInjectable({
-  id: "resolve-system-proxy-channel-responder",
-
-  instantiate: (di) => ({
-    channel: di.inject(resolveSystemProxyChannelInjectable),
-    handler: di.inject(resolveSystemProxyInjectable),
-  }),
-
-  injectionToken: requestChannelListenerInjectionToken,
+const resolveSystemProxyChannelResponderInjectable = getRequestChannelListenerInjectable({
+  channel: resolveSystemProxyChannel,
+  handler: (di) => di.inject(resolveSystemProxyInjectable),
 });
 
 export default resolveSystemProxyChannelResponderInjectable;
diff --git a/src/main/utils/sync-box/sync-box-initial-value-channel-listener.injectable.ts b/src/main/utils/sync-box/sync-box-initial-value-channel-listener.injectable.ts
index 5eb043291a..da78d76c36 100644
--- a/src/main/utils/sync-box/sync-box-initial-value-channel-listener.injectable.ts
+++ b/src/main/utils/sync-box/sync-box-initial-value-channel-listener.injectable.ts
@@ -2,30 +2,20 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import syncBoxInitialValueChannelInjectable from "../../../common/utils/sync-box/sync-box-initial-value-channel.injectable";
+import { syncBoxInitialValueChannel } from "../../../common/utils/sync-box/channels";
 import { syncBoxInjectionToken } from "../../../common/utils/sync-box/sync-box-injection-token";
-import { requestChannelListenerInjectionToken } from "../../../common/utils/channel/request-channel-listener-injection-token";
+import { getRequestChannelListenerInjectable } from "../channel/channel-listeners/listener-tokens";
 
-const syncBoxInitialValueChannelListenerInjectable = getInjectable({
-  id: "sync-box-initial-value-channel-listener",
-
-  instantiate: (di) => {
-    const channel = di.inject(syncBoxInitialValueChannelInjectable);
+const syncBoxInitialValueChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: syncBoxInitialValueChannel,
+  handler: (di) => {
     const syncBoxes = di.injectMany(syncBoxInjectionToken);
 
-    return {
-      channel,
-
-      handler: () =>
-        syncBoxes.map((box) => ({
-          id: box.id,
-          value: box.value.get(),
-        })),
-    };
+    return () => syncBoxes.map((box) => ({
+      id: box.id,
+      value: box.value.get(),
+    }));
   },
-
-  injectionToken: requestChannelListenerInjectionToken,
 });
 
 export default syncBoxInitialValueChannelListenerInjectable;
diff --git a/src/renderer/app-paths/setup-app-paths.injectable.ts b/src/renderer/app-paths/setup-app-paths.injectable.ts
index 3660ad9db8..50ad4df34a 100644
--- a/src/renderer/app-paths/setup-app-paths.injectable.ts
+++ b/src/renderer/app-paths/setup-app-paths.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import appPathsStateInjectable from "../../common/app-paths/app-paths-state.injectable";
 import { beforeFrameStartsInjectionToken } from "../before-frame-starts/before-frame-starts-injection-token";
-import appPathsChannelInjectable from "../../common/app-paths/app-paths-channel.injectable";
+import { appPathsChannel } from "../../common/app-paths/app-paths-channel";
 import { requestFromChannelInjectionToken } from "../../common/utils/channel/request-from-channel-injection-token";
 
 const setupAppPathsInjectable = getInjectable({
@@ -13,15 +13,12 @@ const setupAppPathsInjectable = getInjectable({
 
   instantiate: (di) => {
     const requestFromChannel = di.inject(requestFromChannelInjectionToken);
-    const appPathsChannel = di.inject(appPathsChannelInjectable);
     const appPathsState = di.inject(appPathsStateInjectable);
 
     return {
       id: "setup-app-paths",
       run: async () => {
-        const appPaths = await requestFromChannel(
-          appPathsChannel,
-        );
+        const appPaths = await requestFromChannel(appPathsChannel);
 
         appPathsState.set(appPaths);
       },
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/active-helm-repositories.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/active-helm-repositories.injectable.ts
index 94fdeaa393..2894e88b09 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/active-helm-repositories.injectable.ts
+++ b/src/renderer/components/+preferences/kubernetes/helm-charts/active-helm-repositories.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { asyncComputed } from "@ogre-tools/injectable-react";
-import getActiveHelmRepositoriesChannelInjectable from "../../../../../common/helm/get-active-helm-repositories-channel.injectable";
+import { getActiveHelmRepositoriesChannel } from "../../../../../common/helm/get-active-helm-repositories-channel";
 import { requestFromChannelInjectionToken } from "../../../../../common/utils/channel/request-from-channel-injection-token";
 import showErrorNotificationInjectable from "../../../notifications/show-error-notification.injectable";
 import helmRepositoriesErrorStateInjectable from "./helm-repositories-error-state.injectable";
@@ -15,12 +15,11 @@ const activeHelmRepositoriesInjectable = getInjectable({
 
   instantiate: (di) => {
     const requestFromChannel = di.inject(requestFromChannelInjectionToken);
-    const getHelmRepositoriesChannel = di.inject(getActiveHelmRepositoriesChannelInjectable);
     const showErrorNotification = di.inject(showErrorNotificationInjectable);
     const helmRepositoriesErrorState = di.inject(helmRepositoriesErrorStateInjectable);
 
     return asyncComputed(async () => {
-      const result = await requestFromChannel(getHelmRepositoriesChannel);
+      const result = await requestFromChannel(getActiveHelmRepositoriesChannel);
 
       if (result.callWasSuccessful) {
         return result.response;
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts
index 50e02f4235..9a2370635b 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts
+++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts
@@ -3,19 +3,18 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import addHelmRepositoryChannelInjectable from "../../../../../../../common/helm/add-helm-repository-channel.injectable";
 import type { HelmRepo } from "../../../../../../../common/helm/helm-repo";
 import { requestFromChannelInjectionToken } from "../../../../../../../common/utils/channel/request-from-channel-injection-token";
 import activeHelmRepositoriesInjectable from "../../active-helm-repositories.injectable";
 import showErrorNotificationInjectable from "../../../../../notifications/show-error-notification.injectable";
 import showSuccessNotificationInjectable from "../../../../../notifications/show-success-notification.injectable";
+import { addHelmRepositoryChannel } from "../../../../../../../common/helm/add-helm-repository-channel";
 
 const addHelmRepositoryInjectable = getInjectable({
   id: "add-public-helm-repository",
 
   instantiate: (di) => {
     const requestFromChannel = di.inject(requestFromChannelInjectionToken);
-    const addHelmRepositoryChannel = di.inject(addHelmRepositoryChannelInjectable);
     const activeHelmRepositories = di.inject(activeHelmRepositoriesInjectable);
     const showErrorNotification = di.inject(showErrorNotificationInjectable);
     const showSuccessNotification = di.inject(showSuccessNotificationInjectable);
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts
index 4f316baed0..3aa56a4b04 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts
+++ b/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts
@@ -6,14 +6,13 @@ import { getInjectable } from "@ogre-tools/injectable";
 import type { HelmRepo } from "../../../../../common/helm/helm-repo";
 import { requestFromChannelInjectionToken } from "../../../../../common/utils/channel/request-from-channel-injection-token";
 import activeHelmRepositoriesInjectable from "./active-helm-repositories.injectable";
-import removeHelmRepositoryChannelInjectable from "../../../../../common/helm/remove-helm-repository-channel.injectable";
+import { removeHelmRepositoryChannel } from "../../../../../common/helm/remove-helm-repository-channel";
 
 const removePublicHelmRepositoryInjectable = getInjectable({
   id: "remove-public-helm-repository",
 
   instantiate: (di) => {
     const requestFromChannel = di.inject(requestFromChannelInjectionToken);
-    const removeHelmRepositoryChannel = di.inject(removeHelmRepositoryChannelInjectable);
     const activeHelmRepositories = di.inject(activeHelmRepositoriesInjectable);
 
     return async (repository: HelmRepo) => {
diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx
index 7d6630be82..45f33bdc9e 100644
--- a/src/renderer/components/test-utils/get-application-builder.tsx
+++ b/src/renderer/components/test-utils/get-application-builder.tsx
@@ -61,7 +61,6 @@ import createApplicationWindowInjectable from "../../../main/start-main-applicat
 import type { CreateElectronWindow } from "../../../main/start-main-application/lens-window/application-window/create-electron-window.injectable";
 import createElectronWindowInjectable from "../../../main/start-main-application/lens-window/application-window/create-electron-window.injectable";
 import { applicationWindowInjectionToken } from "../../../main/start-main-application/lens-window/application-window/application-window-injection-token";
-import sendToChannelInElectronBrowserWindowInjectable from "../../../main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable";
 import closeAllWindowsInjectable from "../../../main/start-main-application/lens-window/hide-all-windows/close-all-windows.injectable";
 import type { LensWindow } from "../../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
 import type { FakeExtensionOptions } from "./get-extension-fake";
@@ -166,7 +165,7 @@ export const getApplicationBuilder = () => {
     mainDi.register(mainExtensionsStateInjectable);
   });
 
-  const overrideChannelsForWindow = overrideChannels(mainDi);
+  const { overrideForWindow, sendToWindow } = overrideChannels(mainDi);
 
   const beforeApplicationStartCallbacks: Callback[] = [];
   const beforeWindowStartCallbacks: Callback[] = [];
@@ -208,7 +207,7 @@ export const getApplicationBuilder = () => {
 
     const windowDi = getRendererDi({ doGeneralOverrides: true });
 
-    overrideChannelsForWindow(windowDi, windowId);
+    overrideForWindow(windowDi, windowId);
     overrideFsWithFakes(windowDi, fsState);
 
     runInAction(() => {
@@ -259,9 +258,7 @@ export const getApplicationBuilder = () => {
       },
 
       send: (arg) => {
-        const sendFake = mainDi.inject(sendToChannelInElectronBrowserWindowInjectable) as any;
-
-        sendFake(windowId, null, arg);
+        sendToWindow(windowId, arg);
       },
 
       reload: () => {
diff --git a/src/renderer/components/update-button/restart-and-install-update.injectable.ts b/src/renderer/components/update-button/restart-and-install-update.injectable.ts
index 854e0a428f..83fb3d72a3 100644
--- a/src/renderer/components/update-button/restart-and-install-update.injectable.ts
+++ b/src/renderer/components/update-button/restart-and-install-update.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import restartAndInstallUpdateChannel from "../../../common/application-update/restart-and-install-update-channel/restart-and-install-update-channel.injectable";
+import { restartAndInstallUpdateChannel } from "../../../common/application-update/restart-and-install-update-channel";
 import messageToChannelInjectable from "../../utils/channel/message-to-channel.injectable";
 
 const restartAndInstallUpdateInjectable = getInjectable({
@@ -11,10 +11,9 @@ const restartAndInstallUpdateInjectable = getInjectable({
 
   instantiate: (di) => {
     const messageToChannel = di.inject(messageToChannelInjectable);
-    const channel = di.inject(restartAndInstallUpdateChannel);
 
     return () => {
-      messageToChannel(channel);
+      messageToChannel(restartAndInstallUpdateChannel);
     };
   },
 });
diff --git a/src/renderer/frames/root-frame/broadcast-that-root-frame-is-rendered.injectable.ts b/src/renderer/frames/root-frame/broadcast-that-root-frame-is-rendered.injectable.ts
index e6493e2832..841d19e002 100644
--- a/src/renderer/frames/root-frame/broadcast-that-root-frame-is-rendered.injectable.ts
+++ b/src/renderer/frames/root-frame/broadcast-that-root-frame-is-rendered.injectable.ts
@@ -3,18 +3,17 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { messageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
-import rootFrameIsRenderedChannelInjectable from "../../../common/root-frame-rendered-channel/root-frame-rendered-channel.injectable";
+import { sendMessageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
+import { rootFrameHasRenderedChannel } from "../../../common/root-frame/root-frame-rendered-channel";
 
 const broadcastThatRootFrameIsRenderedInjectable = getInjectable({
   id: "broadcast-that-root-frame-is-rendered",
 
   instantiate: (di) => {
-    const messageToChannel = di.inject(messageToChannelInjectionToken);
-    const rootFrameIsRenderedChannel = di.inject(rootFrameIsRenderedChannelInjectable);
+    const messageToChannel = di.inject(sendMessageToChannelInjectionToken);
 
     return () => {
-      messageToChannel(rootFrameIsRenderedChannel);
+      messageToChannel(rootFrameHasRenderedChannel);
     };
   },
 });
diff --git a/src/renderer/navigation/events.ts b/src/renderer/navigation/events.ts
index 35021e1d72..7cacd1b313 100644
--- a/src/renderer/navigation/events.ts
+++ b/src/renderer/navigation/events.ts
@@ -5,14 +5,11 @@
 
 import { ipcRenderer } from "electron";
 import { reaction } from "mobx";
-import { broadcastMessage, ipcRendererOn } from "../../common/ipc";
-import {
-  getLegacyGlobalDiForExtensionApi,
-} from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
+import { broadcastMessage } from "../../common/ipc";
+import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import matchedClusterIdInjectable from "./matched-cluster-id.injectable";
 
 export const enum IpcRendererNavigationEvents {
-  RELOAD_PAGE = "renderer:page-reload",
   CLUSTER_VIEW_CURRENT_ID = "renderer:cluster-id-of-active-view",
   NAVIGATE_IN_APP = "renderer:navigate",
   NAVIGATE_IN_CLUSTER = "renderer:navigate-in-cluster",
@@ -27,11 +24,6 @@ export function bindEvents() {
   if (process.isMainFrame) {
     bindClusterManagerRouteEvents();
   }
-
-  // Reload dashboard window
-  ipcRendererOn(IpcRendererNavigationEvents.RELOAD_PAGE, () => {
-    location.reload();
-  });
 }
 
 // Handle events only in main window renderer process (see also: cluster-manager.tsx)
diff --git a/src/renderer/navigation/navigation-channel-listener.injectable.ts b/src/renderer/navigation/navigation-channel-listener.injectable.ts
index 3a17451071..1b33b4fe2c 100644
--- a/src/renderer/navigation/navigation-channel-listener.injectable.ts
+++ b/src/renderer/navigation/navigation-channel-listener.injectable.ts
@@ -2,12 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
+import type { InjectionToken } from "@ogre-tools/injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 import currentlyInClusterFrameInjectable from "../routes/currently-in-cluster-frame.injectable";
-import appNavigationChannelInjectable from "../../common/front-end-routing/app-navigation-channel.injectable";
-import clusterFrameNavigationChannelInjectable from "../../common/front-end-routing/cluster-frame-navigation-channel.injectable";
+import { appNavigationChannel } from "../../common/front-end-routing/app-navigation-channel";
+import { clusterFrameNavigationChannel } from "../../common/front-end-routing/cluster-frame-navigation-channel";
 import focusWindowInjectable from "./focus-window.injectable";
 import { navigateToUrlInjectionToken } from "../../common/front-end-routing/navigate-to-url-injection-token";
+import type { MessageChannel, MessageChannelListener } from "../../common/utils/channel/message-channel-listener-injection-token";
 import { messageChannelListenerInjectionToken } from "../../common/utils/channel/message-channel-listener-injection-token";
 
 const navigationChannelListenerInjectable = getInjectable({
@@ -15,8 +17,6 @@ const navigationChannelListenerInjectable = getInjectable({
 
   instantiate: (di) => {
     const currentlyInClusterFrame = di.inject(currentlyInClusterFrameInjectable);
-    const appNavigationChannel = di.inject(appNavigationChannelInjectable);
-    const clusterFrameNavigationChannel = di.inject(clusterFrameNavigationChannelInjectable);
     const focusWindow = di.inject(focusWindowInjectable);
     const navigateToUrl = di.inject(navigateToUrlInjectionToken);
 
@@ -34,7 +34,7 @@ const navigationChannelListenerInjectable = getInjectable({
       },
     };
   },
-  injectionToken: messageChannelListenerInjectionToken,
+  injectionToken: messageChannelListenerInjectionToken as InjectionToken<MessageChannelListener<MessageChannel<string>>, void>,
 });
 
 export default navigationChannelListenerInjectable;
diff --git a/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts b/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
index 6d76e35340..1e5b14bb40 100644
--- a/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
+++ b/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
@@ -6,8 +6,6 @@ import ipcRendererInjectable from "../ipc-renderer.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 import type { IpcRendererEvent } from "electron";
 import { enlistMessageChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-message-channel-listener-injection-token";
-import { tentativeParseJson } from "../../../../common/utils/tentative-parse-json";
-import { pipeline } from "@ogre-tools/fp";
 
 const enlistMessageChannelListenerInjectable = getInjectable({
   id: "enlist-message-channel-listener-for-renderer",
@@ -17,11 +15,7 @@ const enlistMessageChannelListenerInjectable = getInjectable({
 
     return ({ channel, handler }) => {
       const nativeCallback = (_: IpcRendererEvent, message: unknown) => {
-        pipeline(
-          message,
-          tentativeParseJson,
-          handler,
-        );
+        handler(message);
       };
 
       ipcRenderer.on(channel.id, nativeCallback);
diff --git a/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts b/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
index 4653dcdd5d..f5555d94f3 100644
--- a/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
+++ b/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
@@ -88,8 +88,8 @@ describe("enlist message channel listener in renderer", () => {
       expect(handlerMock).toHaveBeenCalledWith(true);
     });
 
-    it("given stringified object as message, when message arrives, calls the handler with the message", () => {
-      onMock.mock.calls[0][1]({} as IpcRendererEvent, JSON.stringify({ some: "object" }));
+    it("given object as message, when message arrives, calls the handler with the message", () => {
+      onMock.mock.calls[0][1]({} as IpcRendererEvent, { some: "object" });
 
       expect(handlerMock).toHaveBeenCalledWith({ some: "object" });
     });
diff --git a/src/renderer/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts b/src/renderer/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts
deleted file mode 100644
index 03253a06f2..0000000000
--- a/src/renderer/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { enlistRequestChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-request-channel-listener-injection-token";
-
-const enlistRequestChannelListenerInjectable = getInjectable({
-  id: "enlist-request-channel-listener-for-renderer",
-
-  instantiate: () => {
-    // Requests from main to renderer are not implemented yet.
-    return () => () => {};
-  },
-
-  injectionToken: enlistRequestChannelListenerInjectionToken,
-});
-
-export default enlistRequestChannelListenerInjectable;
diff --git a/src/renderer/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts b/src/renderer/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts
index e423299915..3b10ef6bd9 100644
--- a/src/renderer/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts
+++ b/src/renderer/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts
@@ -4,13 +4,13 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { beforeFrameStartsInjectionToken } from "../../../before-frame-starts/before-frame-starts-injection-token";
-import listeningOfChannelsInjectable from "../../../../common/utils/channel/listening-of-channels.injectable";
+import listeningOnMessageChannelsInjectable from "../../../../common/utils/channel/listening-on-message-channels.injectable";
 
 const startListeningOfChannelsInjectable = getInjectable({
   id: "start-listening-of-channels-renderer",
 
   instantiate: (di) => {
-    const listeningOfChannels = di.inject(listeningOfChannelsInjectable);
+    const listeningOfChannels = di.inject(listeningOnMessageChannelsInjectable);
 
     return {
       id: "start-listening-of-channels-renderer",
diff --git a/src/renderer/utils/channel/message-to-channel.injectable.ts b/src/renderer/utils/channel/message-to-channel.injectable.ts
index 3e493fd322..eab7e4ec7f 100644
--- a/src/renderer/utils/channel/message-to-channel.injectable.ts
+++ b/src/renderer/utils/channel/message-to-channel.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { messageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
+import type { SendMessageToChannel } from "../../../common/utils/channel/message-to-channel-injection-token";
+import { sendMessageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
 import sendToMainInjectable from "./send-to-main.injectable";
-import type { MessageChannel } from "../../../common/utils/channel/message-channel-injection-token";
 
 const messageToChannelInjectable = getInjectable({
   id: "message-to-channel",
@@ -13,14 +13,12 @@ const messageToChannelInjectable = getInjectable({
   instantiate: (di) => {
     const sendToMain = di.inject(sendToMainInjectable);
 
-    // TODO: Figure out way to improve typing in internals
-    // Notice that this should be injected using "messageToChannelInjectionToken" which is typed correctly.
-    return (channel: MessageChannel<any>, message?: unknown) => {
+    return ((channel, message) => {
       sendToMain(channel.id, message);
-    };
+    }) as SendMessageToChannel;
   },
 
-  injectionToken: messageToChannelInjectionToken,
+  injectionToken: sendMessageToChannelInjectionToken,
 });
 
 export default messageToChannelInjectable;
diff --git a/src/renderer/utils/channel/message-to-channel.test.ts b/src/renderer/utils/channel/message-to-channel.test.ts
deleted file mode 100644
index 443abfb0dc..0000000000
--- a/src/renderer/utils/channel/message-to-channel.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { MessageToChannel } from "../../../common/utils/channel/message-to-channel-injection-token";
-import type { MessageChannel } from "../../../common/utils/channel/message-channel-injection-token";
-import { getDiForUnitTesting } from "../../getDiForUnitTesting";
-import { messageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
-import ipcRendererInjectable from "./ipc-renderer.injectable";
-import type { IpcRenderer } from "electron";
-
-describe("message to channel from renderer", () => {
-  let messageToChannel: MessageToChannel;
-  let sendMock: jest.Mock;
-
-  beforeEach(() => {
-    const di = getDiForUnitTesting({ doGeneralOverrides: true });
-
-    sendMock = jest.fn();
-
-    di.override(ipcRendererInjectable, () => ({
-      send: sendMock,
-    }) as unknown as IpcRenderer);
-
-    messageToChannel = di.inject(messageToChannelInjectionToken);
-  });
-
-  it("given string as message, when messaging to channel, sends stringified message", () => {
-    messageToChannel(someChannel, "some-message");
-
-    expect(sendMock).toHaveBeenCalledWith("some-channel-id", '"some-message"');
-  });
-
-  it("given boolean as message, when messaging to channel, sends stringified message", () => {
-    messageToChannel(someChannel, true);
-
-    expect(sendMock).toHaveBeenCalledWith("some-channel-id", "true");
-  });
-
-  it("given number as message, when messaging to channel, sends stringified message", () => {
-    messageToChannel(someChannel, 42);
-
-    expect(sendMock).toHaveBeenCalledWith("some-channel-id", "42");
-  });
-
-  it("given object as message, when messaging to channel, sends stringified message", () => {
-    messageToChannel(someChannel, { some: "object" });
-
-    expect(sendMock).toHaveBeenCalledWith(
-      "some-channel-id",
-      JSON.stringify({ some: "object" }),
-    );
-  });
-});
-
-const someChannel: MessageChannel<any> = { id: "some-channel-id" };
diff --git a/src/renderer/utils/channel/request-from-channel.injectable.ts b/src/renderer/utils/channel/request-from-channel.injectable.ts
index f77287a2ed..fd0815b1a3 100644
--- a/src/renderer/utils/channel/request-from-channel.injectable.ts
+++ b/src/renderer/utils/channel/request-from-channel.injectable.ts
@@ -4,10 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import ipcRendererInjectable from "./ipc-renderer.injectable";
+import type { RequestFromChannel } from "../../../common/utils/channel/request-from-channel-injection-token";
 import { requestFromChannelInjectionToken } from "../../../common/utils/channel/request-from-channel-injection-token";
-import { pipeline } from "@ogre-tools/fp";
-import { tentativeStringifyJson } from "../../../common/utils/tentative-stringify-json";
-import { tentativeParseJson } from "../../../common/utils/tentative-parse-json";
 
 const requestFromChannelInjectable = getInjectable({
   id: "request-from-channel",
@@ -15,13 +13,7 @@ const requestFromChannelInjectable = getInjectable({
   instantiate: (di) => {
     const ipcRenderer = di.inject(ipcRendererInjectable);
 
-    return async (channel, ...[request]) =>
-      await pipeline(
-        request,
-        tentativeStringifyJson,
-        (req) => ipcRenderer.invoke(channel.id, req),
-        tentativeParseJson,
-      );
+    return ((channel, request) => ipcRenderer.invoke(channel.id, request)) as RequestFromChannel;
   },
 
   injectionToken: requestFromChannelInjectionToken,
diff --git a/src/renderer/utils/channel/request-from-channel.test.ts b/src/renderer/utils/channel/request-from-channel.test.ts
deleted file mode 100644
index d7b343bf02..0000000000
--- a/src/renderer/utils/channel/request-from-channel.test.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { MessageChannel } from "../../../common/utils/channel/message-channel-injection-token";
-import { getDiForUnitTesting } from "../../getDiForUnitTesting";
-import ipcRendererInjectable from "./ipc-renderer.injectable";
-import type { IpcRenderer } from "electron";
-import type { AsyncFnMock } from "@async-fn/jest";
-import asyncFn from "@async-fn/jest";
-import type { RequestFromChannel } from "../../../common/utils/channel/request-from-channel-injection-token";
-import { requestFromChannelInjectionToken } from "../../../common/utils/channel/request-from-channel-injection-token";
-import requestFromChannelInjectable from "./request-from-channel.injectable";
-import { getPromiseStatus } from "../../../common/test-utils/get-promise-status";
-
-describe("request from channel in renderer", () => {
-  let requestFromChannel: RequestFromChannel;
-  let invokeMock: AsyncFnMock<(channelId: string, request: any) => any>;
-
-  beforeEach(() => {
-    const di = getDiForUnitTesting({ doGeneralOverrides: true });
-
-    di.unoverride(requestFromChannelInjectable);
-
-    invokeMock = asyncFn();
-
-    di.override(ipcRendererInjectable, () => ({
-      invoke: invokeMock,
-    }) as unknown as IpcRenderer);
-
-    requestFromChannel = di.inject(requestFromChannelInjectionToken);
-  });
-
-  describe("when messaging to channel", () => {
-    let actualPromise: Promise<any>;
-
-    beforeEach(() => {
-      actualPromise = requestFromChannel(someChannel, "some-message");
-    });
-
-    it("sends stringified message", () => {
-      expect(invokeMock).toHaveBeenCalledWith("some-channel-id", '"some-message"');
-    });
-
-    it("does not resolve yet", async () => {
-      const promiseStatus = await getPromiseStatus(actualPromise);
-
-      expect(promiseStatus.fulfilled).toBe(false);
-    });
-
-    it("when invoking resolves, resolves", async () => {
-      await invokeMock.resolve("some-response");
-
-      const actual = await actualPromise;
-
-      expect(actual).toBe("some-response");
-    });
-
-    it("when invoking resolves with stringified string, resolves with string", async () => {
-      await invokeMock.resolve('"some-response"');
-
-      const actual = await actualPromise;
-
-      expect(actual).toBe("some-response");
-    });
-
-    it("when invoking resolves with stringified boolean, resolves with boolean", async () => {
-      await invokeMock.resolve("true");
-
-      const actual = await actualPromise;
-
-      expect(actual).toBe(true);
-    });
-
-    it("when invoking resolves with stringified number, resolves with number", async () => {
-      await invokeMock.resolve("42");
-
-      const actual = await actualPromise;
-
-      expect(actual).toBe(42);
-    });
-
-    it("when invoking resolves with stringified object, resolves with object", async () => {
-      await invokeMock.resolve(JSON.stringify({ some: "object" }));
-
-      const actual = await actualPromise;
-
-      expect(actual).toEqual({ some: "object" });
-    });
-  });
-
-  it("given string as message, when messaging to channel, sends stringified message", () => {
-    requestFromChannel(someChannel, "some-message");
-
-    expect(invokeMock).toHaveBeenCalledWith("some-channel-id", '"some-message"');
-  });
-
-  it("given boolean as message, when messaging to channel, sends stringified message", () => {
-    requestFromChannel(someChannel, true);
-
-    expect(invokeMock).toHaveBeenCalledWith("some-channel-id", "true");
-  });
-
-  it("given number as message, when messaging to channel, sends stringified message", () => {
-    requestFromChannel(someChannel, 42);
-
-    expect(invokeMock).toHaveBeenCalledWith("some-channel-id", "42");
-  });
-
-  it("given object as message, when messaging to channel, sends stringified message", () => {
-    requestFromChannel(someChannel, { some: "object" });
-
-    expect(invokeMock).toHaveBeenCalledWith(
-      "some-channel-id",
-      JSON.stringify({ some: "object" }),
-    );
-  });
-});
-
-const someChannel: MessageChannel<any> = { id: "some-channel-id" };
diff --git a/src/renderer/utils/channel/send-to-main.injectable.ts b/src/renderer/utils/channel/send-to-main.injectable.ts
index 0811a78798..6eb4540062 100644
--- a/src/renderer/utils/channel/send-to-main.injectable.ts
+++ b/src/renderer/utils/channel/send-to-main.injectable.ts
@@ -3,9 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { JsonValue } from "type-fest";
 import ipcRendererInjectable from "./ipc-renderer.injectable";
-import { tentativeStringifyJson } from "../../../common/utils/tentative-stringify-json";
 
 const sendToMainInjectable = getInjectable({
   id: "send-to-main",
@@ -13,11 +11,8 @@ const sendToMainInjectable = getInjectable({
   instantiate: (di) => {
     const ipcRenderer = di.inject(ipcRendererInjectable);
 
-    // TODO: Figure out way to improve typing in internals
-    return <T>(channelId: string, message: JsonValue extends T ? T : never ) => {
-      const stringifiedMessage = tentativeStringifyJson(message);
-
-      ipcRenderer.send(channelId, ...(stringifiedMessage ? [stringifiedMessage] : []));
+    return (channelId: string, message: any) => {
+      ipcRenderer.send(channelId, message);
     };
   },
 });
diff --git a/src/renderer/utils/resolve-proxy/resolve-system-proxy.injectable.ts b/src/renderer/utils/resolve-proxy/resolve-system-proxy.injectable.ts
index 8fcb9063d0..5468a8c7b7 100644
--- a/src/renderer/utils/resolve-proxy/resolve-system-proxy.injectable.ts
+++ b/src/renderer/utils/resolve-proxy/resolve-system-proxy.injectable.ts
@@ -5,14 +5,13 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { resolveSystemProxyInjectionToken } from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-injection-token";
 import requestFromChannelInjectable from "../channel/request-from-channel.injectable";
-import resolveSystemProxyChannelInjectable from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable";
+import { resolveSystemProxyChannel } from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-channel";
 
 const resolveSystemProxyInjectable = getInjectable({
   id: "resolve-system-proxy-for-renderer",
 
   instantiate: (di) => {
     const requestFromChannel = di.inject(requestFromChannelInjectable);
-    const resolveSystemProxyChannel = di.inject(resolveSystemProxyChannelInjectable);
 
     return async (url) => requestFromChannel(resolveSystemProxyChannel, url);
   },
diff --git a/src/renderer/utils/sync-box/provide-initial-values-for-sync-boxes.injectable.ts b/src/renderer/utils/sync-box/provide-initial-values-for-sync-boxes.injectable.ts
index f7d692cdef..b356aa0b32 100644
--- a/src/renderer/utils/sync-box/provide-initial-values-for-sync-boxes.injectable.ts
+++ b/src/renderer/utils/sync-box/provide-initial-values-for-sync-boxes.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
-import syncBoxInitialValueChannelInjectable from "../../../common/utils/sync-box/sync-box-initial-value-channel.injectable";
+import { syncBoxInitialValueChannel } from "../../../common/utils/sync-box/channels";
 import createSyncBoxStateInjectable from "../../../common/utils/sync-box/sync-box-state.injectable";
 import { requestFromChannelInjectionToken } from "../../../common/utils/channel/request-from-channel-injection-token";
 import { runInAction } from "mobx";
@@ -17,7 +17,6 @@ const provideInitialValuesForSyncBoxesInjectable = getInjectable({
 
   instantiate: (di) => {
     const requestFromChannel = di.inject(requestFromChannelInjectionToken);
-    const syncBoxInitialValueChannel = di.inject(syncBoxInitialValueChannelInjectable);
 
     const syncBoxes = di.injectMany(syncBoxInjectionToken);
 
diff --git a/src/test-utils/channel-fakes/override-channels.ts b/src/test-utils/channel-fakes/override-channels.ts
index 7d3a20cd75..798fcd84af 100644
--- a/src/test-utils/channel-fakes/override-channels.ts
+++ b/src/test-utils/channel-fakes/override-channels.ts
@@ -3,18 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { DiContainer } from "@ogre-tools/injectable";
+import type { SendToViewArgs } from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
 import { overrideMessagingFromMainToWindow } from "./override-messaging-from-main-to-window";
 import { overrideMessagingFromWindowToMain } from "./override-messaging-from-window-to-main";
 import { overrideRequestingFromWindowToMain } from "./override-requesting-from-window-to-main";
 
-export const overrideChannels = (mainDi: DiContainer) => {
-  const overrideMessagingFromMainToWindowForWindow = overrideMessagingFromMainToWindow(mainDi);
+export interface OverrideChannels {
+  overrideForWindow: (windowDi: DiContainer, windowId: string) => void;
+  sendToWindow: (windowId: string, args: SendToViewArgs) => void;
+}
+
+export const overrideChannels = (mainDi: DiContainer): OverrideChannels => {
+  const { overrideEnlistForWindow, sendToWindow } = overrideMessagingFromMainToWindow();
   const overrideMessagingFromWindowToForWindow = overrideMessagingFromWindowToMain(mainDi);
   const overrideRequestingFromWindowToMainForWindow = overrideRequestingFromWindowToMain(mainDi);
 
-  return (windowDi: DiContainer, windowId: string) => {
-    overrideMessagingFromMainToWindowForWindow(windowDi, windowId);
-    overrideMessagingFromWindowToForWindow(windowDi);
-    overrideRequestingFromWindowToMainForWindow(windowDi);
+  return {
+    overrideForWindow: (windowDi, windowId) => {
+      overrideEnlistForWindow(windowDi, windowId);
+      overrideMessagingFromWindowToForWindow(windowDi);
+      overrideRequestingFromWindowToMainForWindow(windowDi);
+    },
+    sendToWindow,
   };
 };
diff --git a/src/test-utils/channel-fakes/override-messaging-from-main-to-window.ts b/src/test-utils/channel-fakes/override-messaging-from-main-to-window.ts
index 852b2cfb0b..f9275c18b2 100644
--- a/src/test-utils/channel-fakes/override-messaging-from-main-to-window.ts
+++ b/src/test-utils/channel-fakes/override-messaging-from-main-to-window.ts
@@ -3,18 +3,22 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type {  MessageChannelListener } from "../../common/utils/channel/message-channel-listener-injection-token";
-import sendToChannelInElectronBrowserWindowInjectable from "../../main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable";
-import type { SendToViewArgs } from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
 import enlistMessageChannelListenerInjectableInRenderer from "../../renderer/utils/channel/channel-listeners/enlist-message-channel-listener.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
-import { tentativeParseJson } from "../../common/utils/tentative-parse-json";
-import { getOrInsert } from "../../common/utils";
+import { getOrInsert, getOrInsertSet } from "../../common/utils";
+import type { SendToViewArgs } from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
+import { deserialize, serialize } from "v8";
 
 type ListenerSet = Set<MessageChannelListener<any>>;
 type WindowListenerMap = Map<string, ListenerSet>;
 type ListenerFakeMap = Map<string, WindowListenerMap>;
 
-export const overrideMessagingFromMainToWindow = (mainDi: DiContainer) => {
+export interface OverriddenWindowMessaging {
+  sendToWindow(windowId: string, args: SendToViewArgs): void;
+  overrideEnlistForWindow(windowDi: DiContainer, windowId: string): void;
+}
+
+export const overrideMessagingFromMainToWindow = (): OverriddenWindowMessaging => {
   const messageChannelListenerFakesForRenderer: ListenerFakeMap = new Map();
 
   const getWindowListeners = (channelId: string, windowId: string) => {
@@ -24,68 +28,52 @@ export const overrideMessagingFromMainToWindow = (mainDi: DiContainer) => {
       new Map(),
     );
 
-    return getOrInsert<string, ListenerSet>(
-      channelListeners,
-      windowId,
-      new Set(),
-    );
+    return getOrInsertSet(channelListeners, windowId);
   };
 
-  mainDi.override(
-    sendToChannelInElectronBrowserWindowInjectable,
+  return {
+    overrideEnlistForWindow: (windowDi, windowId) => {
+      windowDi.override(
+        enlistMessageChannelListenerInjectableInRenderer,
 
-    () =>
-      (
-        windowId: string,
-        browserWindow,
-        { channel: channelId, frameInfo, data = [] }: SendToViewArgs,
-      ) => {
-        const windowListeners = getWindowListeners(channelId, windowId);
-
-        if (frameInfo) {
-          throw new Error(
-            `Tried to send message to frame "${frameInfo.frameId}" in process "${frameInfo.processId}" using channel "${channelId}" which isn't supported yet.`,
+        () => (listener) => {
+          const windowListeners = getWindowListeners(
+            listener.channel.id,
+            windowId,
           );
-        }
 
-        if (data.length > 1) {
-          throw new Error(
-            `Tried to send message to channel "${channelId}" with more than one argument which is not supported in MessageChannelListener yet.`,
-          );
-        }
+          windowListeners.add(listener);
 
-        if (windowListeners.size === 0) {
-          throw new Error(
-            `Tried to send message to channel "${channelId}" but there where no listeners. Current channels with listeners: "${[
-              ...messageChannelListenerFakesForRenderer.keys(),
-            ].join('", "')}"`,
-          );
-        }
+          return () => {
+            windowListeners.delete(listener);
+          };
+        },
+      );
+    },
+    sendToWindow: (windowId, { channel, data, frameInfo }) => {
+      try {
+        data = deserialize(serialize(data));
+      } catch (error) {
+        throw new Error(`Tried to send a message to channel "${channel}" that is not compatible with StructuredClone: ${error}`);
+      }
 
-        const message = tentativeParseJson(data[0]);
+      const windowListeners = getWindowListeners(channel, windowId);
 
-        windowListeners.forEach((listener) =>
-          listener.handler(message),
+      if (frameInfo) {
+        throw new Error(
+          `Tried to send message to frame "${frameInfo.frameId}" in process "${frameInfo.processId}" using channel "${channel}" which isn't supported yet.`,
         );
-      },
-  );
+      }
 
-  return (windowDi: DiContainer, windowId: string) => {
-    windowDi.override(
-      enlistMessageChannelListenerInjectableInRenderer,
-
-      () => (listener) => {
-        const windowListeners = getWindowListeners(
-          listener.channel.id,
-          windowId,
+      if (windowListeners.size === 0) {
+        throw new Error(
+          `Tried to send message to channel "${channel}" but there where no listeners. Current channels with listeners: "${[
+            ...messageChannelListenerFakesForRenderer.keys(),
+          ].join('", "')}"`,
         );
+      }
 
-        windowListeners.add(listener);
-
-        return () => {
-          windowListeners.delete(listener);
-        };
-      },
-    );
+      windowListeners.forEach((listener) => listener.handler(data));
+    },
   };
 };
diff --git a/src/test-utils/channel-fakes/override-messaging-from-window-to-main.ts b/src/test-utils/channel-fakes/override-messaging-from-window-to-main.ts
index ba6813235b..f00f4e626c 100644
--- a/src/test-utils/channel-fakes/override-messaging-from-window-to-main.ts
+++ b/src/test-utils/channel-fakes/override-messaging-from-window-to-main.ts
@@ -3,54 +3,36 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { DiContainer } from "@ogre-tools/injectable";
-import assert from "assert";
-import type { MessageChannel } from "../../common/utils/channel/message-channel-injection-token";
-import type { MessageChannelListener } from "../../common/utils/channel/message-channel-listener-injection-token";
+import type { MessageChannel, MessageChannelListener } from "../../common/utils/channel/message-channel-listener-injection-token";
 import enlistMessageChannelListenerInjectableInMain from "../../main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable";
+import { getOrInsertSet } from "../../renderer/utils";
 import sendToMainInjectable from "../../renderer/utils/channel/send-to-main.injectable";
 
 export const overrideMessagingFromWindowToMain = (mainDi: DiContainer) => {
   const messageChannelListenerFakesForMain = new Map<
     string,
-    Set<MessageChannelListener<MessageChannel<any>>>
+    Set<MessageChannelListener<MessageChannel<unknown>>>
   >();
 
   mainDi.override(
     enlistMessageChannelListenerInjectableInMain,
 
     () => (listener) => {
-      const channelId = listener.channel.id;
+      const listeners = getOrInsertSet(messageChannelListenerFakesForMain, listener.channel.id);
 
-      if (!messageChannelListenerFakesForMain.has(channelId)) {
-        messageChannelListenerFakesForMain.set(channelId, new Set());
-      }
-
-      const listeners = messageChannelListenerFakesForMain.get(
-        channelId,
-      );
-
-      assert(listeners);
-
-      // TODO: Figure out typing
-      listeners.add(
-        listener as unknown as MessageChannelListener<MessageChannel<any>>,
-      );
+      listeners.add(listener);
 
       return () => {
-        // TODO: Figure out typing
-        listeners.delete(
-          listener as unknown as MessageChannelListener<MessageChannel<any>>,
-        );
+        listeners.delete(listener);
       };
     },
   );
 
   return (windowDi: DiContainer) => {
     windowDi.override(sendToMainInjectable, () => (channelId, message) => {
-      const listeners =
-        messageChannelListenerFakesForMain.get(channelId) || new Set();
+      const listeners = messageChannelListenerFakesForMain.get(channelId);
 
-      if (listeners.size === 0) {
+      if (!listeners || listeners.size === 0) {
         throw new Error(
           `Tried to send message to channel "${channelId}" but there where no listeners. Current channels with listeners: "${[
             ...messageChannelListenerFakesForMain.keys(),
diff --git a/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts b/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts
index 8ee4227289..ddf758f5b6 100644
--- a/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts
+++ b/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts
@@ -3,35 +3,29 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { DiContainer } from "@ogre-tools/injectable";
-import type { RequestChannel } from "../../common/utils/channel/request-channel-injection-token";
-import type { RequestChannelListener } from "../../common/utils/channel/request-channel-listener-injection-token";
+import type { RequestChannel } from "../../common/utils/channel/request-channel-listener-injection-token";
+import type { RequestFromChannel } from "../../common/utils/channel/request-from-channel-injection-token";
 import enlistRequestChannelListenerInjectableInMain from "../../main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable";
+import type { RequestChannelListener } from "../../main/utils/channel/channel-listeners/listener-tokens";
 import requestFromChannelInjectable from "../../renderer/utils/channel/request-from-channel.injectable";
 
 export const overrideRequestingFromWindowToMain = (mainDi: DiContainer) => {
   const requestChannelListenerFakesForMain = new Map<
-      string,
-      RequestChannelListener<RequestChannel<any, any>>
-    >();
+    string,
+    RequestChannelListener<RequestChannel<unknown, unknown>>
+  >();
 
   mainDi.override(
     enlistRequestChannelListenerInjectableInMain,
 
     () => (listener) => {
-      if (requestChannelListenerFakesForMain.get(listener.channel.id)) {
+      if (requestChannelListenerFakesForMain.has(listener.channel.id)) {
         throw new Error(
           `Tried to enlist listener for channel "${listener.channel.id}", but it was already enlisted`,
         );
       }
 
-      requestChannelListenerFakesForMain.set(
-        listener.channel.id,
-
-          // TODO: Figure out typing
-          listener as unknown as RequestChannelListener<
-            RequestChannel<any, any>
-          >,
-      );
+      requestChannelListenerFakesForMain.set(listener.channel.id, listener);
 
       return () => {
         requestChannelListenerFakesForMain.delete(listener.channel.id);
@@ -43,7 +37,7 @@ export const overrideRequestingFromWindowToMain = (mainDi: DiContainer) => {
     windowDi.override(
       requestFromChannelInjectable,
 
-      () => async (channel, ...[request]) => {
+      () => (async (channel, request) => {
         const requestListener = requestChannelListenerFakesForMain.get(channel.id);
 
         if (!requestListener) {
@@ -53,7 +47,7 @@ export const overrideRequestingFromWindowToMain = (mainDi: DiContainer) => {
         }
 
         return requestListener.handler(request);
-      },
+      }) as RequestFromChannel,
     );
   };
 };

From a0a630a75999bcadfdd3c0acbf796979fae2a70a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 08:36:38 -0400
Subject: [PATCH 20/48] Bump @swc/core from 1.3.6 to 1.3.7 (#6406)

Bumps [@swc/core](https://github.com/swc-project/swc) from 1.3.6 to 1.3.7.
- [Release notes](https://github.com/swc-project/swc/releases)
- [Changelog](https://github.com/swc-project/swc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/swc-project/swc/compare/v1.3.6...v1.3.7)

---
updated-dependencies:
- dependency-name: "@swc/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 138 +++++++++++++++++++++++++--------------------------
 2 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/package.json b/package.json
index 8e9b9637a1..a958b19b5a 100644
--- a/package.json
+++ b/package.json
@@ -301,7 +301,7 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8",
     "@sentry/types": "^6.19.7",
     "@swc/cli": "^0.1.57",
-    "@swc/core": "^1.3.6",
+    "@swc/core": "^1.3.7",
     "@swc/jest": "^0.2.23",
     "@testing-library/dom": "^7.31.2",
     "@testing-library/jest-dom": "^5.16.5",
diff --git a/yarn.lock b/yarn.lock
index f08316ed57..f88d1c497e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1616,101 +1616,101 @@
     slash "3.0.0"
     source-map "^0.7.3"
 
-"@swc/core-android-arm-eabi@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.3.6.tgz#0b127ccc7e6ea3e652e250afc3322d17aacec664"
-  integrity sha512-FQk/4cRRDoMPLgSm/1WvEqRqlSgBb6Twd5W13NYUbXJpzPGoPHhzwaCEbpGjPKG/OvAqA2NVrWquuJjhDvQyVQ==
+"@swc/core-android-arm-eabi@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.3.7.tgz#31dc887e5dc2db25ac1a9503478ea6cabc1da9ac"
+  integrity sha512-zvUpTBOUnXDkfp2JXv1T3NfyimxsAnqEfT65gWC/3ZpB/gmc59vqYVko4Pifyvuxo5aVvEdT2gfHlWM/aXwtpg==
   dependencies:
     "@swc/wasm" "1.2.122"
 
-"@swc/core-android-arm64@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.3.6.tgz#9f0e76328ef35793157dfe84a40499a2f437981b"
-  integrity sha512-6qjZYatlFAN0IKhhYFsN+BaywooHFpK9/A/jMkjgIfbUoDz3wPJWZc2MDvcttgqZ+cfsSCcGeNw++H894z1zfw==
+"@swc/core-android-arm64@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.3.7.tgz#2b6d35343d68946b5bc2b654fa2fa4c0e8afe4d6"
+  integrity sha512-qnh1aYTrIjuFOkgxUYG8SGzpPD92o/w5hrHUy71LfUbHf5HRs7FpMgQXtTGnk33S/uMCvSv7V/ewv+t+N6tlVA==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-darwin-arm64@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.6.tgz#9a87819bf4879a165a7b4b868577f76dc94562e3"
-  integrity sha512-2qjaABxA7cloVTkS+uDEcVQ5buSi8de7qEv6P6InDE/iCjnI5ALyDxn7eauJJsVKimh9DyqN9sSZJ/z9U4FDUQ==
+"@swc/core-darwin-arm64@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.7.tgz#addfcf1dd1562b04ead371a3a228f1e33eb8c2d3"
+  integrity sha512-q8NgUK/CleCmGYIuskL1sCad8opkfJD/8GWd+MkGSi+MGkExrLMmJftgG5FCj0l/xCHxGGNYj1TCrM/qV6CheA==
 
-"@swc/core-darwin-x64@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.6.tgz#804109765a69d8d7dab09d55f4bf0918254b3cf3"
-  integrity sha512-+OtW18d2o3RUuXodB41ZDj0iRCeXNL0OxVU0jTl7iyCWDypmCzhalbaQXD/ZJxgnpGRB7/s2ZwNR/gzjXgz9VA==
+"@swc/core-darwin-x64@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.7.tgz#d0886d5c0573c871a42cac77cfaf091c6cc2768d"
+  integrity sha512-dKrJkZYbF7Qi1wQgyVnR1a5Vk8UN7fJ/WlK6pZVJwMvWLoZgYE+U0Nn7RsVB4LmOxHtaJF7eesbGUm2y2NVEwA==
 
-"@swc/core-freebsd-x64@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.3.6.tgz#f5450dede877f61cee427c1ea16165eb74fcfe36"
-  integrity sha512-f+ePNodn7ET9qEa93VMfnsPNnubWKIkn0EfxmfzJCt/abNVZ7+DyCSABfWKkexOZ8OuNyxnBCdKLL6nlizxkhQ==
+"@swc/core-freebsd-x64@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.3.7.tgz#2fa4f8554fcf3101a411570032b3ccfcd4833d3e"
+  integrity sha512-ENHthc4iFPlBj0xaf2DbJLDzYSBA4QMQEA2HhZoSWWMsqhg8mGZxwgRd6+loROGZ2a5HKMZXIxCev8BbYnE0OA==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-linux-arm-gnueabihf@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.6.tgz#851871559363783818ee38725a6391b83ed3aff0"
-  integrity sha512-JwdJmqKzsdq7Itg5ssKDEY9mP3AkQ+XENF6WXXlaNu1U/InqQhD0DqsFzw4TQ4LzB7lB7Wj+dv3JjKIhnHNNag==
+"@swc/core-linux-arm-gnueabihf@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.7.tgz#76e5f6d114c3051c12bfb603bb51bfee67d512e0"
+  integrity sha512-anE65tcRLr/fYayXkpwZ7p7Ft5HCH4rvi3wSFdK8ycRWn9fVZhyWUJkJ3p1S0R19xr7hcb14hyxqPbd4m0I4yA==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-linux-arm64-gnu@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.6.tgz#2afd9f3d4f2b051b79ed9f3549ccc8fa81ca6809"
-  integrity sha512-sRoPnwYFX+t95S7khi4KL2lZMZwbuzvPUf8NYmtTzfqVIseo8HD6IMgyeaQHYDfwDGF5elQGi4ALjRx2huSi0Q==
+"@swc/core-linux-arm64-gnu@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.7.tgz#924076423e4ac7eb3d95f5dc5de03d3301aac81a"
+  integrity sha512-Qv6f76Tt8t51qb29R2isWvuQM26Xi7ZJavAv0hMdCxfkF+h1Yd14j82H7afGzdONH1LyLaPrhWSQirU/ZtBtdA==
 
-"@swc/core-linux-arm64-musl@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.6.tgz#607cc220c8640f2d36e4e2426784a6a0fc55fa1e"
-  integrity sha512-XT8vRcxGaKujiplFfuMtGRgZ3Nx611TMVLUg91alzEIe2Adtrpaumzrwv2vqVdMr4X4GBK9z0rHsqkDLPhmuaw==
+"@swc/core-linux-arm64-musl@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.7.tgz#967ce8320b9c39d3ff7efe495b3af03ddfc8cf2b"
+  integrity sha512-paYbmvm7+7QxjyMzRd4X4tyhHw5VgkGCMBYC3PbfpuI7SsCdmEFG9v1t5uMbTf60VU1wB4/n+AxY9KCZLfK7DQ==
 
-"@swc/core-linux-x64-gnu@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.6.tgz#725386afc5092cf945245ba0d500f6fc1411efd9"
-  integrity sha512-nip81Ngcx8cory+FtapKhXb/rgh/pTAlvTiwJjMhsE3xcKRsbnJEPMVIoArCBV0BmYJBLWvOtpHf8B62JS7L5w==
+"@swc/core-linux-x64-gnu@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.7.tgz#2f55017c05f0a7a9099d1b85ee6ae22bee93a118"
+  integrity sha512-tkIHt64mmqEVM0CTGvUsB37Pv7AD/BinOEe6oPfMcS/2a00kYvXn9kEVKPqNTpiFpjYGoFQJaVV8UsD+iv8IvQ==
 
-"@swc/core-linux-x64-musl@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.6.tgz#b59ac6a51192713a500b81b558979e56761b5e0a"
-  integrity sha512-IzrQB67BY/rSZPJXWU3XzpkJqh4vYkYuOUmz1yrV/vxgPjJp/kUllfBYsHCiIedb7sjvfTt409SIN0FlPJY2+Q==
+"@swc/core-linux-x64-musl@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.7.tgz#ce3a83a99389436e8ef1d86a59b6bdba16b2a0e3"
+  integrity sha512-V0xeTS8kvnTlghO1YyO1QgfPqsY896MknYCzBeK9CGKkGbc3JaxSoyb11nbGEDEaUwzDd9gj9L4D2uP+IWpoyw==
 
-"@swc/core-win32-arm64-msvc@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.6.tgz#50b7c16904f159dca5d4b29225dd55c11626ac95"
-  integrity sha512-gLsE/4qgqTxy0OOFJKi9QRs9mVYv4yOXSwPB2Rb+grOmNnG+Ds2LWqGEaABKDErnUtTQiOzLpdwesNZxeJgMhA==
+"@swc/core-win32-arm64-msvc@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.7.tgz#11e53a2b79f7de2b78e4f10cc45c45e87753b0ce"
+  integrity sha512-LeauQIok8tw4Mjmj7wlc7C62HCUx3xa5k6tNQnKWbDs7odZVWisgDxn7RSl9/xxlC8wPLTVUyBh3O1rHigVfWg==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-win32-ia32-msvc@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.6.tgz#8e9d55586184b2a11978fe9dbc9a8a3a16d2e54a"
-  integrity sha512-0Jr7KMGEPapYGni+97oNOeVP7edBwjMGQ9HsJUUN1uIE7fALQ+zVGuwbc+22myql2Uhh5V5hZx5xtVraqLVMHw==
+"@swc/core-win32-ia32-msvc@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.7.tgz#126b930a77af3d0dcbacf07782d6f20a16511b32"
+  integrity sha512-E1C8bpUrml0vIv4FTSP7f4CwkZVGsCY9fBsBHCC4j9N1mtQk8/nzpGOUsPo4QP+FTYJiNKedZ4Cy7baihnV4Lw==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-win32-x64-msvc@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.6.tgz#a3c2bcf71b26cc4984adce4bfefb214664ce3b01"
-  integrity sha512-O3F/jxqaFwGq9XxYeCIVRCDIR4+GdSBu/5io6TkN8O5QLqB3/KOJVDn6TALtbL6ClwjUwZt66HKnYeSx19j2Ow==
+"@swc/core-win32-x64-msvc@1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.7.tgz#a1298b635d2cbbcf3cba3dbd37cdd6b577296efa"
+  integrity sha512-Ti9H/1hqBrxhYtNLVaLsahO/iiJn1Zd4qSc0LZpl6wBJxP4LltLV4MLeib6i8lg11pj4ijIhzZfC6bT614ee3w==
 
-"@swc/core@^1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.6.tgz#909af865ee5044fe138ff85b40afb5d171d621a1"
-  integrity sha512-L3EemOWywrxXsRQFeU50PYFwrDKOxi2RGTT+TT3CcbIszwc7qnE6vsVzEll/eK32H1veicc0EegkZgtD4PFNRA==
+"@swc/core@^1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.7.tgz#46eaa4af5f61ced1694fca64fb6d93ba5485747a"
+  integrity sha512-g4ptYRZRE+g/6wLB3WBuWhAWJsZDUeiSOvKVM1Wdn29Vi/EgLuVaY5ssz0HLQJxuDSJGwtAOZA8exh4+AKNHLw==
   optionalDependencies:
-    "@swc/core-android-arm-eabi" "1.3.6"
-    "@swc/core-android-arm64" "1.3.6"
-    "@swc/core-darwin-arm64" "1.3.6"
-    "@swc/core-darwin-x64" "1.3.6"
-    "@swc/core-freebsd-x64" "1.3.6"
-    "@swc/core-linux-arm-gnueabihf" "1.3.6"
-    "@swc/core-linux-arm64-gnu" "1.3.6"
-    "@swc/core-linux-arm64-musl" "1.3.6"
-    "@swc/core-linux-x64-gnu" "1.3.6"
-    "@swc/core-linux-x64-musl" "1.3.6"
-    "@swc/core-win32-arm64-msvc" "1.3.6"
-    "@swc/core-win32-ia32-msvc" "1.3.6"
-    "@swc/core-win32-x64-msvc" "1.3.6"
+    "@swc/core-android-arm-eabi" "1.3.7"
+    "@swc/core-android-arm64" "1.3.7"
+    "@swc/core-darwin-arm64" "1.3.7"
+    "@swc/core-darwin-x64" "1.3.7"
+    "@swc/core-freebsd-x64" "1.3.7"
+    "@swc/core-linux-arm-gnueabihf" "1.3.7"
+    "@swc/core-linux-arm64-gnu" "1.3.7"
+    "@swc/core-linux-arm64-musl" "1.3.7"
+    "@swc/core-linux-x64-gnu" "1.3.7"
+    "@swc/core-linux-x64-musl" "1.3.7"
+    "@swc/core-win32-arm64-msvc" "1.3.7"
+    "@swc/core-win32-ia32-msvc" "1.3.7"
+    "@swc/core-win32-x64-msvc" "1.3.7"
 
 "@swc/jest@^0.2.23":
   version "0.2.23"

From b4ba9c2c796ddcdb2209d0329fb8d079aaa77698 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 08:37:03 -0400
Subject: [PATCH 21/48] Bump postcss from 8.4.17 to 8.4.18 (#6405)

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.17 to 8.4.18.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.17...8.4.18)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a958b19b5a..eac06bfb68 100644
--- a/package.json
+++ b/package.json
@@ -403,7 +403,7 @@
     "node-loader": "^2.0.0",
     "nodemon": "^2.0.20",
     "playwright": "^1.27.0",
-    "postcss": "^8.4.17",
+    "postcss": "^8.4.18",
     "postcss-loader": "^6.2.1",
     "query-string": "^7.1.1",
     "randomcolor": "^0.6.2",
diff --git a/yarn.lock b/yarn.lock
index f88d1c497e..9f517e5b04 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10109,10 +10109,10 @@ postcss@^6.0.14, postcss@^6.0.2:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^8.3.0, postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.7:
-  version "8.4.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.17.tgz#f87863ec7cd353f81f7ab2dec5d67d861bbb1be5"
-  integrity sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==
+postcss@^8.3.0, postcss@^8.4.14, postcss@^8.4.18, postcss@^8.4.7:
+  version "8.4.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.18.tgz#6d50046ea7d3d66a85e0e782074e7203bc7fbca2"
+  integrity sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==
   dependencies:
     nanoid "^3.3.4"
     picocolors "^1.0.0"

From 4d4b8b026fa8e872cc08e689b6f99186813a5f0e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 09:15:07 -0400
Subject: [PATCH 22/48] Bump react-select from 5.4.0 to 5.5.0 (#6404)

* Bump react-select from 5.4.0 to 5.5.0

Bumps [react-select](https://github.com/JedWatson/react-select) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@5.4.0...react-select@5.5.0)

---
updated-dependencies:
- dependency-name: react-select
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update snapshots

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Sebastian Malton <sebastian@malton.name>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sebastian Malton <sebastian@malton.name>
---
 package.json                                  |  2 +-
 ...tory-from-list-in-preferences.test.ts.snap |  4 +--
 ...lling-helm-chart-from-new-tab.test.ts.snap |  4 +--
 .../namespace-select-filter.test.tsx.snap     |  6 ++---
 yarn.lock                                     | 27 ++++++++++++++++---
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index eac06bfb68..9f11a786f4 100644
--- a/package.json
+++ b/package.json
@@ -411,7 +411,7 @@
     "react-refresh": "^0.14.0",
     "react-refresh-typescript": "^2.0.7",
     "react-router-dom": "^5.3.4",
-    "react-select": "^5.4.0",
+    "react-select": "^5.5.0",
     "react-select-event": "^5.5.1",
     "react-table": "^7.8.0",
     "react-window": "^1.8.7",
diff --git a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
index 2e520db845..12975a3f66 100644
--- a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
@@ -1756,7 +1756,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
     />
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="theme-lens selection-of-active-public-helm-repository-options Select__menu css-26l3qy-menu"
@@ -4811,7 +4811,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
     />
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="theme-lens selection-of-active-public-helm-repository-options Select__menu css-26l3qy-menu"
diff --git a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
index 043ee215ba..8a3f4f094c 100644
--- a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
+++ b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
@@ -3071,7 +3071,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
     </div>
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="theme-outlined install-chart-version-select-for-some-first-tab-id-options Select__menu css-26l3qy-menu"
@@ -7984,7 +7984,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
     </div>
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="NamespaceSelectMenu theme-outlined install-chart-namespace-select-for-some-first-tab-id-options Select__menu css-26l3qy-menu"
diff --git a/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap b/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap
index 5d147fea18..3bf716f2d4 100644
--- a/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap
+++ b/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap
@@ -172,7 +172,7 @@ exports[`<NamespaceSelectFilter /> when clicked renders 1`] = `
     </div>
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="NamespaceSelectFilterMenu theme-dark namespace-select-filter-options Select__menu css-26l3qy-menu"
@@ -822,7 +822,7 @@ exports[`<NamespaceSelectFilter /> when clicked when 'test-2' is clicked when cl
     </div>
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="NamespaceSelectFilterMenu theme-dark namespace-select-filter-options Select__menu css-26l3qy-menu"
@@ -1340,7 +1340,7 @@ exports[`<NamespaceSelectFilter /> when clicked when 'test-2' is clicked when cl
     </div>
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="NamespaceSelectFilterMenu theme-dark namespace-select-filter-options Select__menu css-26l3qy-menu"
diff --git a/yarn.lock b/yarn.lock
index 9f517e5b04..31569dbf05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -623,6 +623,18 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@floating-ui/core@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.0.1.tgz#00e64d74e911602c8533957af0cce5af6b2e93c8"
+  integrity sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA==
+
+"@floating-ui/dom@^1.0.1":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.0.2.tgz#c5184c52c6f50abd11052d71204f4be2d9245237"
+  integrity sha512-5X9WSvZ8/fjy3gDu8yx9HAA4KG1lazUN2P4/VnaXLxTO9Dz53HI1oYoh1OlhqFNlHgGDiwFX5WhFCc2ljbW3yA==
+  dependencies:
+    "@floating-ui/core" "^1.0.1"
+
 "@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
@@ -10527,18 +10539,20 @@ react-select-event@^5.5.1:
   dependencies:
     "@testing-library/dom" ">=7"
 
-react-select@^5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.4.0.tgz#81f6ac73906126706f104751ee14437bd16798f4"
-  integrity sha512-CjE9RFLUvChd5SdlfG4vqxZd55AZJRrLrHzkQyTYeHlpOztqcgnyftYAolJ0SGsBev6zAs6qFrjm6KU3eo2hzg==
+react-select@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.5.0.tgz#c82286e20b26194738186ada54cc8a0c677dfc6e"
+  integrity sha512-yzA+eavdxpF5Onf0u9KZ84qxr8r/CwPPn777bRkslbDtEUYx2+m13OrhP3WVa30+aWYxwkO/pkLcZ7q7r/6OhQ==
   dependencies:
     "@babel/runtime" "^7.12.0"
     "@emotion/cache" "^11.4.0"
     "@emotion/react" "^11.8.1"
+    "@floating-ui/dom" "^1.0.1"
     "@types/react-transition-group" "^4.4.0"
     memoize-one "^5.0.0"
     prop-types "^15.6.0"
     react-transition-group "^4.3.0"
+    use-isomorphic-layout-effect "^1.1.2"
 
 react-swipeable@^6.1.0:
   version "6.2.2"
@@ -12446,6 +12460,11 @@ url-parse@^1.5.10:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+use-isomorphic-layout-effect@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb"
+  integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==
+
 use-memo-one@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.2.tgz#0c8203a329f76e040047a35a1197defe342fab20"

From 3649db7bc0f37433f45df3259e0ab6d4ead129cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 09:15:21 -0400
Subject: [PATCH 23/48] Bump electron from 19.1.2 to 19.1.3 (#6409)

Bumps [electron](https://github.com/electron/electron) from 19.1.2 to 19.1.3.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v19.1.2...v19.1.3)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9f11a786f4..802be21633 100644
--- a/package.json
+++ b/package.json
@@ -374,7 +374,7 @@
     "css-loader": "^6.7.1",
     "deepdash": "^5.3.9",
     "dompurify": "^2.4.0",
-    "electron": "^19.1.2",
+    "electron": "^19.1.3",
     "electron-builder": "^23.6.0",
     "electron-notarize": "^0.3.0",
     "esbuild": "^0.15.10",
diff --git a/yarn.lock b/yarn.lock
index 31569dbf05..f3f32900ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5162,10 +5162,10 @@ electron-window-state@^5.0.3:
     jsonfile "^4.0.0"
     mkdirp "^0.5.1"
 
-electron@^19.1.2:
-  version "19.1.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.2.tgz#4b0858b74a76be6998af103a6d81f3784d93e7dc"
-  integrity sha512-KbKz9eFfm10aBYWJ5dwR/73Y9L8gjflXUSSYzBZSW2FJEEaNk3ZtxGMw77iAocQU/G8tCZ7fNxQq/vNI2Foz+g==
+electron@^19.1.3:
+  version "19.1.3"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.3.tgz#90a2b6c3d738789d657477d87d1539f008be6536"
+  integrity sha512-P2kfFc8UqVvPHE1w9qTZSPNpfOqd+CK34K3wBqJwokzYdVBLsVkbIoLxyByjJ/cU35WaeCL5bsI8kXALfPvebw==
   dependencies:
     "@electron/get" "^1.14.1"
     "@types/node" "^16.11.26"

From 57f06b850e044cc7f8e0f40c591e0238e228603f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 09:15:36 -0400
Subject: [PATCH 24/48] Bump playwright from 1.27.0 to 1.27.1 (#6403)

Bumps [playwright](https://github.com/Microsoft/playwright) from 1.27.0 to 1.27.1.
- [Release notes](https://github.com/Microsoft/playwright/releases)
- [Commits](https://github.com/Microsoft/playwright/compare/v1.27.0...v1.27.1)

---
updated-dependencies:
- dependency-name: playwright
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 802be21633..15e0310fea 100644
--- a/package.json
+++ b/package.json
@@ -402,7 +402,7 @@
     "node-gyp": "^8.3.0",
     "node-loader": "^2.0.0",
     "nodemon": "^2.0.20",
-    "playwright": "^1.27.0",
+    "playwright": "^1.27.1",
     "postcss": "^8.4.18",
     "postcss-loader": "^6.2.1",
     "query-string": "^7.1.1",
diff --git a/yarn.lock b/yarn.lock
index f3f32900ed..f321690ab1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9974,17 +9974,17 @@ pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
-playwright-core@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.27.0.tgz#e5f9d2bc19ebdd9581a01e74f019bb91aa7cf55d"
-  integrity sha512-VBKaaFUVKDo3akW+o4DwbK1ZyXh46tcSwQKPK3lruh8IJd5feu55XVZx4vOkbb2uqrNdIF51sgsadYT533SdpA==
+playwright-core@1.27.1:
+  version "1.27.1"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.27.1.tgz#840ef662e55a3ed759d8b5d3d00a5f885a7184f4"
+  integrity sha512-9EmeXDncC2Pmp/z+teoVYlvmPWUC6ejSSYZUln7YaP89Z6lpAaiaAnqroUt/BoLo8tn7WYShcfaCh+xofZa44Q==
 
-playwright@^1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.27.0.tgz#68a0e29f1756da105b22291a7c3f402ae749213a"
-  integrity sha512-F+0+0RD03LS+KdNAMMp63OBzu+NwYYLd52pKLczuSlTsV5b/SLkUoNhSfzDFngEFOuRL2gk0LlfGW3mKiUBk6w==
+playwright@^1.27.1:
+  version "1.27.1"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.27.1.tgz#4eecac5899566c589d4220ca8acc16abe8a67450"
+  integrity sha512-xXYZ7m36yTtC+oFgqH0eTgullGztKSRMb4yuwLPl8IYSmgBM88QiB+3IWb1mRIC9/NNwcgbG0RwtFlg+EAFQHQ==
   dependencies:
-    playwright-core "1.27.0"
+    playwright-core "1.27.1"
 
 plist@^3.0.1, plist@^3.0.4:
   version "3.0.5"

From 491082f784449a602c2c6ea41d0043268595c3b1 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Fri, 14 Oct 2022 09:27:10 +0300
Subject: [PATCH 25/48] Add data-origin to status bar items for better
 observability (#6400)

* Passing id to status-bar-items

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Add data-origin prop for status bar items

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Fixing status bar tests

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Update snapshots

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Fix linter

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Rename id -> origin because it is not unique

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 ...haracters-in-page-registrations.test.tsx.snap |  2 ++
 .../navigate-to-extension-page.test.tsx.snap     |  5 +++++
 .../navigating-between-routes.test.tsx.snap      |  2 ++
 ...vigation-using-application-menu.test.tsx.snap |  2 ++
 ...time-since-update-was-downloaded.test.ts.snap |  3 +++
 ...ling-update-using-topbar-button.test.tsx.snap |  2 ++
 .../installing-update-using-tray.test.ts.snap    |  6 ++++++
 .../__snapshots__/installing-update.test.ts.snap |  6 ++++++
 .../periodical-checking-of-updates.test.ts.snap  |  1 +
 .../selection-of-update-stability.test.ts.snap   |  1 +
 .../delete-cluster-dialog.test.tsx.snap          |  5 +++++
 .../keyboard-shortcuts.test.tsx.snap             |  8 ++++++++
 ...avigation-using-application-menu.test.ts.snap |  2 ++
 ...m-helm-repository-in-preferences.test.ts.snap | 12 ++++++++++++
 ...ository-from-list-in-preferences.test.ts.snap | 10 ++++++++++
 ...helm-repositories-in-preferences.test.ts.snap | 10 ++++++++++
 ...active-repository-in-preferences.test.ts.snap |  4 ++++
 .../closing-preferences.test.tsx.snap            |  8 ++++++++
 ...xtension-adding-preference-tabs.test.tsx.snap |  1 +
 ...ation-to-application-preferences.test.ts.snap |  2 ++
 ...navigation-to-editor-preferences.test.ts.snap |  2 ++
 ...-extension-specific-preferences.test.tsx.snap | 10 ++++++++++
 ...gation-to-kubernetes-preferences.test.ts.snap |  2 ++
 .../navigation-to-proxy-preferences.test.ts.snap |  2 ++
 ...gation-to-telemetry-preferences.test.tsx.snap |  5 +++++
 ...vigation-to-terminal-preferences.test.ts.snap |  2 ++
 ...avigation-using-application-menu.test.ts.snap |  2 ++
 .../navigation-using-tray.test.ts.snap           |  2 ++
 ...ems-originating-from-extensions.test.tsx.snap |  6 ++++++
 ...avigation-using-application-menu.test.ts.snap |  3 +++
 .../status-bar-item-injection-token.ts           |  1 +
 .../status-bar-item-registrator.injectable.tsx   |  1 +
 .../status-bar/status-bar-items.injectable.tsx   | 16 ++++++++++++----
 .../components/status-bar/status-bar.test.tsx    |  2 +-
 .../components/status-bar/status-bar.tsx         | 16 +++++++++++-----
 35 files changed, 154 insertions(+), 10 deletions(-)

diff --git a/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap b/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
index dab11ecc9b..3eb46b81e9 100644
--- a/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
+++ b/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
@@ -182,6 +182,7 @@ exports[`extension special characters in page registrations renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -302,6 +303,7 @@ exports[`extension special characters in page registrations when navigating to r
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap b/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap
index 9dbfb50aea..048afb8493 100644
--- a/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap
+++ b/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap
@@ -182,6 +182,7 @@ exports[`navigate to extension page renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -302,6 +303,7 @@ exports[`navigate to extension page when extension navigates to child route rend
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -438,6 +440,7 @@ exports[`navigate to extension page when extension navigates to route with param
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -574,6 +577,7 @@ exports[`navigate to extension page when extension navigates to route without pa
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -710,6 +714,7 @@ exports[`navigate to extension page when extension navigates to route without pa
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/__snapshots__/navigating-between-routes.test.tsx.snap b/src/features/__snapshots__/navigating-between-routes.test.tsx.snap
index ce6dfe219f..5808ef6828 100644
--- a/src/features/__snapshots__/navigating-between-routes.test.tsx.snap
+++ b/src/features/__snapshots__/navigating-between-routes.test.tsx.snap
@@ -106,6 +106,7 @@ exports[`navigating between routes given route with optional path parameters whe
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -226,6 +227,7 @@ exports[`navigating between routes given route without path parameters when navi
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap b/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
index 132ef5e0b0..b5b54a989f 100644
--- a/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
+++ b/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
@@ -182,6 +182,7 @@ exports[`add-cluster - navigation using application menu renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -386,6 +387,7 @@ exports[`add-cluster - navigation using application menu when navigating to add
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap b/src/features/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap
index 93808e443c..69c8ff0ac1 100644
--- a/src/features/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap
+++ b/src/features/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap
@@ -201,6 +201,7 @@ exports[`force user to update when too long since update was downloaded when app
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -420,6 +421,7 @@ exports[`force user to update when too long since update was downloaded when app
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -686,6 +688,7 @@ exports[`force user to update when too long since update was downloaded when app
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap b/src/features/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
index f136545fc1..4e33733f69 100644
--- a/src/features/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
+++ b/src/features/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
@@ -201,6 +201,7 @@ exports[`encourage user to update when sufficient time passed since update was d
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -402,6 +403,7 @@ exports[`encourage user to update when sufficient time passed since update was d
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/application-update/__snapshots__/installing-update-using-tray.test.ts.snap b/src/features/application-update/__snapshots__/installing-update-using-tray.test.ts.snap
index 85da39aa60..7922c4659d 100644
--- a/src/features/application-update/__snapshots__/installing-update-using-tray.test.ts.snap
+++ b/src/features/application-update/__snapshots__/installing-update-using-tray.test.ts.snap
@@ -183,6 +183,7 @@ exports[`installing update using tray when started renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -384,6 +385,7 @@ exports[`installing update using tray when started when user checks for updates
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -585,6 +587,7 @@ exports[`installing update using tray when started when user checks for updates
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -804,6 +807,7 @@ exports[`installing update using tray when started when user checks for updates
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1023,6 +1027,7 @@ exports[`installing update using tray when started when user checks for updates
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1224,6 +1229,7 @@ exports[`installing update using tray when started when user checks for updates
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/application-update/__snapshots__/installing-update.test.ts.snap b/src/features/application-update/__snapshots__/installing-update.test.ts.snap
index 8d589d432a..42b59bfab2 100644
--- a/src/features/application-update/__snapshots__/installing-update.test.ts.snap
+++ b/src/features/application-update/__snapshots__/installing-update.test.ts.snap
@@ -183,6 +183,7 @@ exports[`installing update when started renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -384,6 +385,7 @@ exports[`installing update when started when user checks for updates renders 1`]
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -585,6 +587,7 @@ exports[`installing update when started when user checks for updates when new up
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -804,6 +807,7 @@ exports[`installing update when started when user checks for updates when new up
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1023,6 +1027,7 @@ exports[`installing update when started when user checks for updates when new up
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1224,6 +1229,7 @@ exports[`installing update when started when user checks for updates when no new
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap b/src/features/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap
index 25483ce178..3a9779a33a 100644
--- a/src/features/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap
+++ b/src/features/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap
@@ -183,6 +183,7 @@ exports[`periodical checking of updates given updater is enabled and configurati
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/application-update/__snapshots__/selection-of-update-stability.test.ts.snap b/src/features/application-update/__snapshots__/selection-of-update-stability.test.ts.snap
index 6c0e7da36c..0533d66176 100644
--- a/src/features/application-update/__snapshots__/selection-of-update-stability.test.ts.snap
+++ b/src/features/application-update/__snapshots__/selection-of-update-stability.test.ts.snap
@@ -183,6 +183,7 @@ exports[`selection of update stability when started renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap b/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
index 907f60bb8f..39d6efa75c 100644
--- a/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
+++ b/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
@@ -312,6 +312,7 @@ exports[`Deleting a cluster when an internal kubeconfig cluster is used when the
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -698,6 +699,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1117,6 +1119,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1615,6 +1618,7 @@ exports[`Deleting a cluster when the kubeconfig has multiple clusters when the d
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2113,6 +2117,7 @@ exports[`Deleting a cluster when the kubeconfig has only one cluster when the di
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap b/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
index 6704a798ae..d9c8504408 100644
--- a/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
+++ b/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
@@ -264,6 +264,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -546,6 +547,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing ESC
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -828,6 +830,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing SHI
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1122,6 +1125,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing SHI
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1323,6 +1327,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1524,6 +1529,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing ESC
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1725,6 +1731,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing SHI
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1938,6 +1945,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing SHI
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
index 66a49f4355..bf03515a34 100644
--- a/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -182,6 +182,7 @@ exports[`extensions - navigation using application menu renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -408,6 +409,7 @@ exports[`extensions - navigation using application menu when navigating to exten
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
index 433cf01bac..b824016800 100644
--- a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
@@ -560,6 +560,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1149,6 +1150,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1738,6 +1740,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2438,6 +2441,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -3035,6 +3039,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -3735,6 +3740,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -4617,6 +4623,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -5317,6 +5324,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -6199,6 +6207,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -6900,6 +6909,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -7486,6 +7496,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -8072,6 +8083,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
index 12975a3f66..d453863fb4 100644
--- a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
@@ -560,6 +560,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1149,6 +1150,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1740,6 +1742,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2380,6 +2383,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2969,6 +2973,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -3547,6 +3552,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -4170,6 +4176,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -4795,6 +4802,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -5479,6 +5487,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -6057,6 +6066,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
index 2e1faa2e6b..dcbac4a681 100644
--- a/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
@@ -560,6 +560,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1138,6 +1139,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1608,6 +1610,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2186,6 +2189,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2656,6 +2660,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -3234,6 +3239,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -3857,6 +3863,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -4327,6 +4334,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -4797,6 +4805,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -5267,6 +5276,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
index b18419092b..9690003f48 100644
--- a/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
@@ -560,6 +560,7 @@ exports[`remove helm repository from list of active repositories in preferences
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1149,6 +1150,7 @@ exports[`remove helm repository from list of active repositories in preferences
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1738,6 +1740,7 @@ exports[`remove helm repository from list of active repositories in preferences
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2316,6 +2319,7 @@ exports[`remove helm repository from list of active repositories in preferences
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
index a6619bfd26..720d17ab66 100644
--- a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
@@ -633,6 +633,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -887,6 +888,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1007,6 +1009,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1127,6 +1130,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1777,6 +1781,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -2031,6 +2036,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -2285,6 +2291,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -2539,6 +2546,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap b/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
index e5713ce61b..37b1c86792 100644
--- a/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
@@ -646,6 +646,7 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
index d30c193738..8f3df16d7c 100644
--- a/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
@@ -297,6 +297,7 @@ exports[`preferences - navigation to application preferences given in some child
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -935,6 +936,7 @@ exports[`preferences - navigation to application preferences given in some child
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
index a5f0f25565..ccb22a9388 100644
--- a/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
@@ -621,6 +621,7 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1143,6 +1144,7 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
index e0357f140f..1d894a42df 100644
--- a/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
@@ -286,6 +286,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -586,6 +587,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -886,6 +888,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1209,6 +1212,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1847,6 +1851,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -2520,6 +2525,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -2831,6 +2837,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -3089,6 +3096,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -3378,6 +3386,7 @@ exports[`preferences - navigation to extension specific preferences when navigat
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -3666,6 +3675,7 @@ exports[`preferences - navigation to extension specific preferences when navigat
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
index 98d08a56a7..e97c2a1e4d 100644
--- a/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
@@ -621,6 +621,7 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1173,6 +1174,7 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
index 51502f3bd3..6c0d16035f 100644
--- a/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
@@ -621,6 +621,7 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -935,6 +936,7 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
index d0bfd5cbd0..b82a730aa2 100644
--- a/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
@@ -283,6 +283,7 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -921,6 +922,7 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1571,6 +1573,7 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1859,6 +1862,7 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -2110,6 +2114,7 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
index 5286eeb983..c4288ab971 100644
--- a/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
@@ -621,6 +621,7 @@ exports[`preferences - navigation to terminal preferences given in preferences,
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1110,6 +1111,7 @@ exports[`preferences - navigation to terminal preferences given in preferences,
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
index df792b6e42..52faefc5a2 100644
--- a/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -182,6 +182,7 @@ exports[`preferences - navigation using application menu renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -820,6 +821,7 @@ exports[`preferences - navigation using application menu when navigating to pref
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap b/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
index b34af2b18c..804a28d827 100644
--- a/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
@@ -183,6 +183,7 @@ exports[`show-about-using-tray renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -823,6 +824,7 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap b/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
index 3272b6688f..d4c048366c 100644
--- a/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
+++ b/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
@@ -183,6 +183,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -190,6 +191,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
         >
           <div
             class="item"
+            data-origin="some-name"
           >
             <div
               data-testid="some-testId"
@@ -199,6 +201,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
           </div>
           <div
             class="item"
+            data-origin="some-name"
           >
             <div
               data-testid="some-testId"
@@ -213,6 +216,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
         >
           <div
             class="item"
+            data-origin="some-name"
           >
             <div
               data-testid="some-testId"
@@ -222,6 +226,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
           </div>
           <div
             class="item"
+            data-origin="some-name"
           >
             <span
               data-testid="some-testId"
@@ -231,6 +236,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
           </div>
           <div
             class="item"
+            data-origin="some-name"
           >
             <span
               data-testid="some-testId"
diff --git a/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
index fe3b7f7d61..928887b393 100644
--- a/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -182,6 +182,7 @@ exports[`welcome - navigation using application menu renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -821,6 +822,7 @@ exports[`welcome - navigation using application menu when navigated somewhere el
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1021,6 +1023,7 @@ exports[`welcome - navigation using application menu when navigated somewhere el
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/renderer/components/status-bar/status-bar-item-injection-token.ts b/src/renderer/components/status-bar/status-bar-item-injection-token.ts
index 0fec934077..c2c4ecb289 100644
--- a/src/renderer/components/status-bar/status-bar-item-injection-token.ts
+++ b/src/renderer/components/status-bar/status-bar-item-injection-token.ts
@@ -7,6 +7,7 @@ import type { IComputedValue } from "mobx";
 import type React from "react";
 
 export interface StatusBarItem {
+  origin?: string;
   component: React.ComponentType<any>;
   position: "left" | "right";
   visible: IComputedValue<boolean>;
diff --git a/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx b/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx
index 71293126f7..ed909a8284 100644
--- a/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx
+++ b/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx
@@ -74,6 +74,7 @@ const toItemInjectableFor = (extension: LensRendererExtension, getRandomId: () =
       id,
 
       instantiate: () => ({
+        origin: extension.sanitizedExtensionId,
         component,
         position,
         visible: visible ?? computed(() => true),
diff --git a/src/renderer/components/status-bar/status-bar-items.injectable.tsx b/src/renderer/components/status-bar/status-bar-items.injectable.tsx
index 855b8654c9..2b5be6fdb3 100644
--- a/src/renderer/components/status-bar/status-bar-items.injectable.tsx
+++ b/src/renderer/components/status-bar/status-bar-items.injectable.tsx
@@ -10,9 +10,14 @@ import type { StatusBarItem } from "./status-bar-item-injection-token";
 import { statusBarItemInjectionToken } from "./status-bar-item-injection-token";
 import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
 
+interface StatusItem {
+  origin?: string;
+  component: React.ComponentType<StatusBarItemProps>;
+}
+
 export interface StatusBarItems {
-  right: React.ComponentType<StatusBarItemProps>[];
-  left: React.ComponentType<StatusBarItemProps>[];
+  right: StatusItem[];
+  left: StatusItem[];
 }
 
 interface Dependencies {
@@ -27,13 +32,16 @@ function getStatusBarItems({ registrations }: Dependencies): IComputedValue<Stat
     };
 
     for (const registration of registrations.get()) {
-      const { position = "right", component, visible } = registration;
+      const { position = "right", component, visible, origin } = registration;
 
       if (!visible.get()) {
         continue;
       }
 
-      res[position].push(component);
+      res[position].push({
+        origin,
+        component,
+      });
     }
 
     // This is done so that the first ones registered are closest to the corner
diff --git a/src/renderer/components/status-bar/status-bar.test.tsx b/src/renderer/components/status-bar/status-bar.test.tsx
index 8aaf40b9c4..82ce2e2852 100644
--- a/src/renderer/components/status-bar/status-bar.test.tsx
+++ b/src/renderer/components/status-bar/status-bar.test.tsx
@@ -65,7 +65,7 @@ describe("<StatusBar />", () => {
 
     builder.beforeWindowStart((windowDi) => {
       windowDi.override(statusBarItemsInjectable, () => computed(() => ({
-        right: [ () => <span data-testid={testId} >{text}</span> ],
+        right: [ { origin: testId, component: () => <span data-testid={testId} >{text}</span> }],
         left: [],
       }) as StatusBarItems));
     });
diff --git a/src/renderer/components/status-bar/status-bar.tsx b/src/renderer/components/status-bar/status-bar.tsx
index 1214a104c7..dabad3bf17 100644
--- a/src/renderer/components/status-bar/status-bar.tsx
+++ b/src/renderer/components/status-bar/status-bar.tsx
@@ -22,18 +22,24 @@ const NonInjectedStatusBar = observer(({ items }: Dependencies & StatusBarProps)
   const { left, right } = items.get();
 
   return (
-    <div className={styles.StatusBar}>
+    <div className={styles.StatusBar} data-testid="status-bar">
       <div className={styles.leftSide} data-testid="status-bar-left">
         {left.map((Item, index) => (
-          <div className={styles.item} key={index}>
-            <Item />
+          <div
+            className={styles.item}
+            key={index}
+            data-origin={Item.origin}>
+            {<Item.component/>}
           </div>
         ))}
       </div>
       <div className={styles.rightSide} data-testid="status-bar-right">
         {right.map((Item, index) => (
-          <div className={styles.item} key={index}>
-            <Item />
+          <div
+            className={styles.item}
+            key={index}
+            data-origin={Item.origin}>
+            {<Item.component/>}
           </div>
         ))}
       </div>

From 19a18ebe2aad3b70e154c0a64e34ea529f9cc44b Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Fri, 14 Oct 2022 08:32:56 +0200
Subject: [PATCH 26/48] Clickable StorageClass (#6410)

Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>

Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>
---
 .../volume-claim-details.tsx                  | 21 ++++++++++++++-----
 .../+storage-volumes/volume-details.tsx       | 19 +++++++++++++----
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx b/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx
index 4cb013e5d6..250ab2e713 100644
--- a/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx
+++ b/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx
@@ -14,7 +14,7 @@ import { Link } from "react-router-dom";
 import { ResourceMetrics } from "../resource-metrics";
 import { VolumeClaimDiskChart } from "./volume-claim-disk-chart";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import { PersistentVolumeClaim } from "../../../common/k8s-api/endpoints";
+import { PersistentVolumeClaim, storageClassApi } from "../../../common/k8s-api/endpoints";
 import { ClusterMetricsResourceType } from "../../../common/cluster-types";
 import { KubeObjectMeta } from "../kube-object-meta";
 import logger from "../../../common/logger";
@@ -27,6 +27,7 @@ import type { PodStore } from "../+workloads-pods/store";
 import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
 import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
 import podStoreInjectable from "../+workloads-pods/store.injectable";
+import { stopPropagation } from "../../../renderer/utils";
 
 export interface PersistentVolumeClaimDetailsProps extends KubeObjectDetailsProps<PersistentVolumeClaim> {
 }
@@ -78,6 +79,10 @@ class NonInjectedPersistentVolumeClaimDetails extends React.Component<Persistent
     const pods = volumeClaim.getPods(podStore.items);
     const isMetricHidden = getActiveClusterEntity()?.isMetricHidden(ClusterMetricsResourceType.VolumeClaim);
 
+    const storageClassDetailsUrl = getDetailsUrl(storageClassApi.getUrl({
+      name: storageClassName,
+    }));
+
     return (
       <div className="PersistentVolumeClaimDetails">
         {!isMetricHidden && (
@@ -89,15 +94,21 @@ class NonInjectedPersistentVolumeClaimDetails extends React.Component<Persistent
             object={volumeClaim}
             metrics={this.metrics}
           >
-            <VolumeClaimDiskChart/>
+            <VolumeClaimDiskChart />
           </ResourceMetrics>
         )}
-        <KubeObjectMeta object={volumeClaim}/>
+        <KubeObjectMeta object={volumeClaim} />
         <DrawerItem name="Access Modes">
           {accessModes?.join(", ")}
         </DrawerItem>
         <DrawerItem name="Storage Class Name">
-          {storageClassName}
+          <Link
+            key="link"
+            to={storageClassDetailsUrl}
+            onClick={stopPropagation}
+          >
+            {storageClassName}
+          </Link>
         </DrawerItem>
         <DrawerItem name="Storage">
           {volumeClaim.getStorage()}
@@ -116,7 +127,7 @@ class NonInjectedPersistentVolumeClaimDetails extends React.Component<Persistent
         <DrawerTitle>Selector</DrawerTitle>
 
         <DrawerItem name="Match Labels" labelsOnly>
-          {volumeClaim.getMatchLabels().map(label => <Badge key={label} label={label}/>)}
+          {volumeClaim.getMatchLabels().map(label => <Badge key={label} label={label} />)}
         </DrawerItem>
 
         <DrawerItem name="Match Expressions">
diff --git a/src/renderer/components/+storage-volumes/volume-details.tsx b/src/renderer/components/+storage-volumes/volume-details.tsx
index 4e2a436b91..32ab0c5307 100644
--- a/src/renderer/components/+storage-volumes/volume-details.tsx
+++ b/src/renderer/components/+storage-volumes/volume-details.tsx
@@ -11,11 +11,12 @@ import { Link } from "react-router-dom";
 import { observer } from "mobx-react";
 import { DrawerItem, DrawerTitle } from "../drawer";
 import { Badge } from "../badge";
-import { PersistentVolume, persistentVolumeClaimApi } from "../../../common/k8s-api/endpoints";
+import { PersistentVolume, persistentVolumeClaimApi, storageClassApi } from "../../../common/k8s-api/endpoints";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { KubeObjectMeta } from "../kube-object-meta";
 import { getDetailsUrl } from "../kube-detail-params";
 import logger from "../../../common/logger";
+import { stopPropagation } from "../../../renderer/utils";
 
 export interface PersistentVolumeDetailsProps extends KubeObjectDetailsProps<PersistentVolume> {
 }
@@ -37,9 +38,13 @@ export class PersistentVolumeDetails extends React.Component<PersistentVolumeDet
 
     const { accessModes, capacity, persistentVolumeReclaimPolicy, storageClassName, claimRef, flexVolume, mountOptions, nfs } = volume.spec;
 
+    const storageClassDetailsUrl = getDetailsUrl(storageClassApi.getUrl({
+      name: storageClassName,
+    }));
+
     return (
       <div className="PersistentVolumeDetails">
-        <KubeObjectMeta object={volume}/>
+        <KubeObjectMeta object={volume} />
         <DrawerItem name="Capacity">
           {capacity?.storage}
         </DrawerItem>
@@ -57,10 +62,16 @@ export class PersistentVolumeDetails extends React.Component<PersistentVolumeDet
           {persistentVolumeReclaimPolicy}
         </DrawerItem>
         <DrawerItem name="Storage Class Name">
-          {storageClassName}
+          <Link
+            key="link"
+            to={storageClassDetailsUrl}
+            onClick={stopPropagation}
+          >
+            {storageClassName}
+          </Link>
         </DrawerItem>
         <DrawerItem name="Status" labelsOnly>
-          <Badge label={volume.getStatus()}/>
+          <Badge label={volume.getStatus()} />
         </DrawerItem>
 
         {nfs && (

From 07a775c32d3290babcd1ed242ded50ddc0b30b95 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Fri, 14 Oct 2022 16:56:54 +0300
Subject: [PATCH 27/48] Fix scss compilation warning by removing flex.box
 dependency (#6411)

* Save only used selectors from flex.box library

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Remove flex.box dependency

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 package.json                         |   1 -
 src/renderer/components/app.scss     |   2 +-
 src/renderer/components/flexbox.scss | 114 +++++++++++++++++++++++++++
 yarn.lock                            |   5 --
 4 files changed, 115 insertions(+), 7 deletions(-)
 create mode 100644 src/renderer/components/flexbox.scss

diff --git a/package.json b/package.json
index 15e0310fea..e3e6301163 100644
--- a/package.json
+++ b/package.json
@@ -385,7 +385,6 @@
     "eslint-plugin-react": "7.31.10",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-unused-imports": "^2.0.0",
-    "flex.box": "^3.4.4",
     "fork-ts-checker-webpack-plugin": "^6.5.2",
     "gunzip-maybe": "^1.4.2",
     "html-webpack-plugin": "^5.5.0",
diff --git a/src/renderer/components/app.scss b/src/renderer/components/app.scss
index 19c7b53d6f..434159eee0 100755
--- a/src/renderer/components/app.scss
+++ b/src/renderer/components/app.scss
@@ -7,7 +7,7 @@
 @tailwind components;
 @tailwind utilities;
 
-@import "~flex.box";
+@import "./flexbox";
 @import "../themes/theme-vars";
 @import "./fonts";
 
diff --git a/src/renderer/components/flexbox.scss b/src/renderer/components/flexbox.scss
new file mode 100644
index 0000000000..5ebad45641
--- /dev/null
+++ b/src/renderer/components/flexbox.scss
@@ -0,0 +1,114 @@
+//-- Flexbox
+.flex {
+  display: flex;
+
+  &.inline {
+    display: inline-flex;
+  }
+
+  &.fullsize {
+    width: 100vw;
+    height: 100vh;
+  }
+
+  &.column {
+    flex-direction: column;
+    &.reverse {
+      flex-direction: column-reverse;
+    }
+  }
+
+  &.reverse {
+    flex-direction: row-reverse;
+  }
+
+  &.wrap {
+    flex-wrap: wrap;
+    &-reverse {
+      flex-wrap: wrap-reverse;
+    }
+  }
+
+  &.auto {
+    > * {
+      flex: 1 1 0%;
+    }
+  }
+
+  &.center {
+    > * {
+      margin: auto;
+    }
+  }
+
+  $flex: flex-start flex-end center;
+  $justifyContent: join($flex, space-around space-between);
+  $alignContent: join($justifyContent, stretch);
+  $alignItems: join($flex, stretch baseline);
+
+  // align items in x-axis for flex=row (default) and in y-axis when flex=column mode
+  @each $mod in $justifyContent {
+    &.justify-#{$mod} {
+      justify-content: $mod;
+    }
+  }
+
+  @each $mod in $alignItems {
+    &.align-#{$mod} {
+      align-items: $mod;
+    }
+  }
+  @each $mod in $alignContent {
+    &.content-#{$mod} {
+      align-content: $mod;
+    }
+  }
+
+  // gaps
+  &.gaps {
+    $gap: var(--flex-gap, 1em);
+    &.column {
+      &:not(.reverse) > :not(:last-child) {
+        margin-bottom: $gap;
+      }
+      &.reverse > :not(:last-child) {
+        margin-top: $gap;
+      }
+    }
+    &:not(.column) {
+      &:not(.reverse) > :not(:last-child) {
+        margin-right: $gap;
+      }
+      &.reverse > :not(:last-child) {
+        margin-left: $gap;
+      }
+    }
+  }
+
+  // children
+  > .box {
+    &.grow {
+      flex: 1 0;
+      &-fixed {
+        flex: 1 0 0;
+      }
+    }
+    &.center {
+      margin: auto;
+    }
+    &.left {
+      margin-left: 0;
+      margin-right: auto;
+    }
+    &.right {
+      margin-right: 0;
+      margin-left: auto;
+    }
+
+    @each $mod in $alignItems {
+      &.self-#{$mod} {
+        align-self: $mod;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index f321690ab1..17d4651ff1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6098,11 +6098,6 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
-flex.box@^3.4.4:
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/flex.box/-/flex.box-3.4.4.tgz#cef28a542458f4668c5d499bcd7fa97aa82b8413"
-  integrity sha512-PG0rguh20zXyBuWmMmDCR0JjW9rtxK48OGMSzpLyGSRioTKeMNs9nbn1Dun+EsIp3wZozSpChbqMsU8a3IgHXg==
-
 fn.name@1.x.x:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"

From 7e693d92fe0dc61e5b544fb64ad605b1fb18d6c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 16:21:38 -0400
Subject: [PATCH 28/48] Bump moment-timezone from 0.5.37 to 0.5.38 (#6415)

Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.37 to 0.5.38.
- [Release notes](https://github.com/moment/moment-timezone/releases)
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md)
- [Commits](https://github.com/moment/moment-timezone/compare/0.5.37...0.5.38)

---
updated-dependencies:
- dependency-name: moment-timezone
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e3e6301163..372d969020 100644
--- a/package.json
+++ b/package.json
@@ -259,7 +259,7 @@
     "mobx-utils": "^6.0.4",
     "mock-fs": "^5.1.4",
     "moment": "^2.29.4",
-    "moment-timezone": "^0.5.37",
+    "moment-timezone": "^0.5.38",
     "monaco-editor": "^0.29.1",
     "monaco-editor-webpack-plugin": "^5.0.0",
     "node-fetch": "^2.6.7",
diff --git a/yarn.lock b/yarn.lock
index 17d4651ff1..75cd482e75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9012,10 +9012,10 @@ mock-http@^1.1.0:
   dependencies:
     mergee "^1.0.0"
 
-moment-timezone@^0.5.37:
-  version "0.5.37"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.37.tgz#adf97f719c4e458fdb12e2b4e87b8bec9f4eef1e"
-  integrity sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==
+moment-timezone@^0.5.38:
+  version "0.5.38"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.38.tgz#9674a5397b8be7c13de820fd387d8afa0f725aad"
+  integrity sha512-nMIrzGah4+oYZPflDvLZUgoVUO4fvAqHstvG3xAUnMolWncuAiLDWNnJZj6EwJGMGfb1ZcuTFE6GI3hNOVWI/Q==
   dependencies:
     moment ">= 2.9.0"
 

From 7cd47ebbf340bd393f0c72558703bb4ceb361845 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 16:21:55 -0400
Subject: [PATCH 29/48] Bump @types/node from 16.11.65 to 16.11.66 (#6414)

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 16.11.65 to 16.11.66.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 372d969020..564141f638 100644
--- a/package.json
+++ b/package.json
@@ -331,7 +331,7 @@
     "@types/md5-file": "^4.0.2",
     "@types/mini-css-extract-plugin": "^2.4.0",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^16.11.65",
+    "@types/node": "^16.11.66",
     "@types/node-fetch": "^2.6.2",
     "@types/npm": "^2.0.32",
     "@types/proper-lockfile": "^4.1.2",
diff --git a/yarn.lock b/yarn.lock
index 75cd482e75..d8c4206d3b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2283,10 +2283,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.24.tgz#20ba1bf69c1b4ab405c7a01e950c4f446b05029f"
   integrity sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g==
 
-"@types/node@^16.11.26", "@types/node@^16.11.65":
-  version "16.11.65"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.65.tgz#59500b86af757d6fcabd3dec32fecb6e357d7a45"
-  integrity sha512-Vfz7wGMOr4jbQGiQHVJm8VjeQwM9Ya7mHe9LtQ264/Epf5n1KiZShOFqk++nBzw6a/ubgYdB9Od7P+MH/LjoWw==
+"@types/node@^16.11.26", "@types/node@^16.11.66":
+  version "16.11.66"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.66.tgz#97f6891c3b8770e21163b93918d57fd1b799e235"
+  integrity sha512-+xvMrGl3eAygKcf5jm+4zA4tbfEgmKM9o6/glTmN0RFVdu2VuFXMYYtRmuv3zTGCgAYMnEZLde3B7BTp+Yxcig==
 
 "@types/npm@^2.0.32":
   version "2.0.32"

From b193621a68e27cb36a61ddcb49e689d9e5e2b421 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 16:22:26 -0400
Subject: [PATCH 30/48] Bump esbuild from 0.15.10 to 0.15.11 (#6412)

Bumps [esbuild](https://github.com/evanw/esbuild) from 0.15.10 to 0.15.11.
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.15.10...v0.15.11)

---
updated-dependencies:
- dependency-name: esbuild
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 228 +++++++++++++++++++++++++--------------------------
 2 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/package.json b/package.json
index 564141f638..bf6bdb0449 100644
--- a/package.json
+++ b/package.json
@@ -377,7 +377,7 @@
     "electron": "^19.1.3",
     "electron-builder": "^23.6.0",
     "electron-notarize": "^0.3.0",
-    "esbuild": "^0.15.10",
+    "esbuild": "^0.15.11",
     "esbuild-loader": "^2.20.0",
     "eslint": "^8.25.0",
     "eslint-plugin-header": "^3.1.1",
diff --git a/yarn.lock b/yarn.lock
index d8c4206d3b..d40f1b6588 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -598,15 +598,15 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
-"@esbuild/android-arm@0.15.10":
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.10.tgz#a5f9432eb221afc243c321058ef25fe899886892"
-  integrity sha512-FNONeQPy/ox+5NBkcSbYJxoXj9GWu8gVGJTVmUyoOCKQFDTrHVKgNSzChdNt0I8Aj/iKcsDf2r9BFwv+FSNUXg==
+"@esbuild/android-arm@0.15.11":
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.11.tgz#bdd9c3e098183bdca97075aa4c3e0152ed3e10ee"
+  integrity sha512-PzMcQLazLBkwDEkrNPi9AbjFt6+3I7HKbiYF2XtWQ7wItrHvEOeO3T8Am434zAozWtVP7lrTue1bEfc2nYWeCA==
 
-"@esbuild/linux-loong64@0.15.10":
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.10.tgz#78a42897c2cf8db9fd5f1811f7590393b77774c7"
-  integrity sha512-w0Ou3Z83LOYEkwaui2M8VwIp+nLi/NA60lBLMvaJ+vXVMcsARYdEzLNE7RSm4+lSg4zq4d7fAVuzk7PNQ5JFgg==
+"@esbuild/linux-loong64@0.15.11":
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.11.tgz#2f4f9a1083dcb4fc65233b6f59003c406abf32e5"
+  integrity sha512-geWp637tUhNmhL3Xgy4Bj703yXB9dqiLJe05lCUfjSFDrQf9C/8pArusyPUbUbPwlC/EAUjBw32sxuIl/11dZw==
 
 "@eslint/eslintrc@^1.3.3":
   version "1.3.3"
@@ -5334,75 +5334,75 @@ es6-error@^4.1.1:
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
-esbuild-android-64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.10.tgz#8a59a84acbf2eca96996cadc35642cf055c494f0"
-  integrity sha512-UI7krF8OYO1N7JYTgLT9ML5j4+45ra3amLZKx7LO3lmLt1Ibn8t3aZbX5Pu4BjWiqDuJ3m/hsvhPhK/5Y/YpnA==
+esbuild-android-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.11.tgz#50402129c3e85bb06434e212374c5f693e4c5f01"
+  integrity sha512-rrwoXEiuI1kaw4k475NJpexs8GfJqQUKcD08VR8sKHmuW9RUuTR2VxcupVvHdiGh9ihxL9m3lpqB1kju92Ialw==
 
-esbuild-android-arm64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.10.tgz#f453851dc1d8c5409a38cf7613a33852faf4915d"
-  integrity sha512-EOt55D6xBk5O05AK8brXUbZmoFj4chM8u3riGflLa6ziEoVvNjRdD7Cnp82NHQGfSHgYR06XsPI8/sMuA/cUwg==
+esbuild-android-arm64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.11.tgz#49bee35218ea2ccf1a0c5f187af77c1c0a5dee71"
+  integrity sha512-/hDubOg7BHOhUUsT8KUIU7GfZm5bihqssvqK5PfO4apag7YuObZRZSzViyEKcFn2tPeHx7RKbSBXvAopSHDZJQ==
 
-esbuild-darwin-64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.10.tgz#778bd29c8186ff47b176c8af58c08cf0fb8e6b86"
-  integrity sha512-hbDJugTicqIm+WKZgp208d7FcXcaK8j2c0l+fqSJ3d2AzQAfjEYDRM3Z2oMeqSJ9uFxyj/muSACLdix7oTstRA==
+esbuild-darwin-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.11.tgz#89a90c8cf6f0029ac4169bfedd012a0412c1575f"
+  integrity sha512-1DqHD0ms3AhiwkKnjRUzmiW7JnaJJr5FKrPiR7xuyMwnjDqvNWDdMq4rKSD9OC0piFNK6n0LghsglNMe2MwJtA==
 
-esbuild-darwin-arm64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.10.tgz#b30bbefb46dc3c5d4708b0435e52f6456578d6df"
-  integrity sha512-M1t5+Kj4IgSbYmunf2BB6EKLkWUq+XlqaFRiGOk8bmBapu9bCDrxjf4kUnWn59Dka3I27EiuHBKd1rSO4osLFQ==
+esbuild-darwin-arm64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.11.tgz#556f4385c6de806cc81132dd7b8af00fe9d292df"
+  integrity sha512-OMzhxSbS0lwwrW40HHjRCeVIJTURdXFA8c3GU30MlHKuPCcvWNUIKVucVBtNpJySXmbkQMDJdJNrXzNDyvoqvQ==
 
-esbuild-freebsd-64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.10.tgz#ab301c5f6ded5110dbdd611140bef1a7c2e99236"
-  integrity sha512-KMBFMa7C8oc97nqDdoZwtDBX7gfpolkk6Bcmj6YFMrtCMVgoU/x2DI1p74DmYl7CSS6Ppa3xgemrLrr5IjIn0w==
+esbuild-freebsd-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.11.tgz#fd86fd1b3b65366048f35b996d9cdf3547384eee"
+  integrity sha512-8dKP26r0/Qyez8nTCwpq60QbuYKOeBygdgOAWGCRalunyeqWRoSZj9TQjPDnTTI9joxd3QYw3UhVZTKxO9QdRg==
 
-esbuild-freebsd-arm64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.10.tgz#a5b09b867a6ff49110f52343b6f12265db63d43f"
-  integrity sha512-m2KNbuCX13yQqLlbSojFMHpewbn8wW5uDS6DxRpmaZKzyq8Dbsku6hHvh2U+BcLwWY4mpgXzFUoENEf7IcioGg==
+esbuild-freebsd-arm64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.11.tgz#d346bcacfe9779ebc1a11edac1bdedeff6dda3b1"
+  integrity sha512-aSGiODiukLGGnSg/O9+cGO2QxEacrdCtCawehkWYTt5VX1ni2b9KoxpHCT9h9Y6wGqNHmXFnB47RRJ8BIqZgmQ==
 
-esbuild-linux-32@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.10.tgz#5282fe9915641caf9c8070e4ba2c3e16d358f837"
-  integrity sha512-guXrwSYFAvNkuQ39FNeV4sNkNms1bLlA5vF1H0cazZBOLdLFIny6BhT+TUbK/hdByMQhtWQ5jI9VAmPKbVPu1w==
+esbuild-linux-32@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.11.tgz#64b50e774bf75af7dcc6a73ad509f2eb0ac4487b"
+  integrity sha512-lsrAfdyJBGx+6aHIQmgqUonEzKYeBnyfJPkT6N2dOf1RoXYYV1BkWB6G02tjsrz1d5wZzaTc3cF+TKmuTo/ZwA==
 
-esbuild-linux-64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.10.tgz#f3726e85a00149580cb19f8abfabcbb96f5d52bb"
-  integrity sha512-jd8XfaSJeucMpD63YNMO1JCrdJhckHWcMv6O233bL4l6ogQKQOxBYSRP/XLWP+6kVTu0obXovuckJDcA0DKtQA==
+esbuild-linux-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.11.tgz#fba3a78b95769772863f8f6dc316abca55cf8416"
+  integrity sha512-Y2Rh+PcyVhQqXKBTacPCltINN3uIw2xC+dsvLANJ1SpK5NJUtxv8+rqWpjmBgaNWKQT1/uGpMmA9olALy9PLVA==
 
-esbuild-linux-arm64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.10.tgz#2f0056e9d5286edb0185b56655caa8c574d8dbe7"
-  integrity sha512-GByBi4fgkvZFTHFDYNftu1DQ1GzR23jws0oWyCfhnI7eMOe+wgwWrc78dbNk709Ivdr/evefm2PJiUBMiusS1A==
+esbuild-linux-arm64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.11.tgz#c0cb31980eee066bfd39a4593660a0ecebe926cb"
+  integrity sha512-uhcXiTwTmD4OpxJu3xC5TzAAw6Wzf9O1XGWL448EE9bqGjgV1j+oK3lIHAfsHnuIn8K4nDW8yjX0Sv5S++oRuw==
 
-esbuild-linux-arm@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.10.tgz#40a9270da3c8ffa32cf72e24a79883e323dff08d"
-  integrity sha512-6N8vThLL/Lysy9y4Ex8XoLQAlbZKUyExCWyayGi2KgTBelKpPgj6RZnUaKri0dHNPGgReJriKVU6+KDGQwn10A==
+esbuild-linux-arm@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.11.tgz#7824d20099977aa671016c7de7a5038c9870010f"
+  integrity sha512-TJllTVk5aSyqPFvvcHTvf6Wu1ZKhWpJ/qNmZO8LL/XeB+LXCclm7HQHNEIz6MT7IX8PmlC1BZYrOiw2sXSB95A==
 
-esbuild-linux-mips64le@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.10.tgz#90ce1c4ee0202edb4ac69807dea77f7e5804abc4"
-  integrity sha512-BxP+LbaGVGIdQNJUNF7qpYjEGWb0YyHVSKqYKrn+pTwH/SiHUxFyJYSP3pqkku61olQiSBnSmWZ+YUpj78Tw7Q==
+esbuild-linux-mips64le@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.11.tgz#10627331c90164e553429ed25e025184bba485b6"
+  integrity sha512-WD61y/R1M4BLe4gxXRypoQ0Ci+Vjf714QYzcPNkiYv5I8K8WDz2ZR8Bm6cqKxd6rD+e/rZgPDbhQ9PCf7TMHmA==
 
-esbuild-linux-ppc64le@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.10.tgz#782837ae7bd5b279178106c9dd801755a21fabdf"
-  integrity sha512-LoSQCd6498PmninNgqd/BR7z3Bsk/mabImBWuQ4wQgmQEeanzWd5BQU2aNi9mBURCLgyheuZS6Xhrw5luw3OkQ==
+esbuild-linux-ppc64le@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.11.tgz#be42679a36a5246b893fc8b898135ebacb5a0a14"
+  integrity sha512-JVleZS9oPVLTlBhPTWgOwxFWU/wMUdlBwTbGA4GF8c38sLbS13cupj+C8bLq929jU7EMWry4SaL+tKGIaTlqKg==
 
-esbuild-linux-riscv64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.10.tgz#d7420d806ece5174f24f4634303146f915ab4207"
-  integrity sha512-Lrl9Cr2YROvPV4wmZ1/g48httE8z/5SCiXIyebiB5N8VT7pX3t6meI7TQVHw/wQpqP/AF4SksDuFImPTM7Z32Q==
+esbuild-linux-riscv64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.11.tgz#3ac2f328e3db73cbff833ada94314d8e79503e54"
+  integrity sha512-9aLIalZ2HFHIOZpmVU11sEAS9F8TnHw49daEjcgMpBXHFF57VuT9f9/9LKJhw781Gda0P9jDkuCWJ0tFbErvJw==
 
-esbuild-linux-s390x@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.10.tgz#21fdf0cb3494a7fb520a71934e4dffce67fe47be"
-  integrity sha512-ReP+6q3eLVVP2lpRrvl5EodKX7EZ1bS1/z5j6hsluAlZP5aHhk6ghT6Cq3IANvvDdscMMCB4QEbI+AjtvoOFpA==
+esbuild-linux-s390x@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.11.tgz#e774e0df061b6847d86783bf3c8c4300a72e03ad"
+  integrity sha512-sZHtiXXOKsLI3XGBGoYO4qKBzJlb8xNsWmvFiwFMHFzA4AXgDP1KDp7Dawe9C2pavTRBDvl+Ok4n/DHQ59oaTg==
 
 esbuild-loader@^2.20.0:
   version "2.20.0"
@@ -5416,63 +5416,63 @@ esbuild-loader@^2.20.0:
     tapable "^2.2.0"
     webpack-sources "^2.2.0"
 
-esbuild-netbsd-64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.10.tgz#6c06b3107e3df53de381e6299184d4597db0440f"
-  integrity sha512-iGDYtJCMCqldMskQ4eIV+QSS/CuT7xyy9i2/FjpKvxAuCzrESZXiA1L64YNj6/afuzfBe9i8m/uDkFHy257hTw==
+esbuild-netbsd-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.11.tgz#55e265fa4489e3f396b16c81f6f5a11d6ca2a9a4"
+  integrity sha512-hUC9yN06K9sg7ju4Vgu9ChAPdsEgtcrcLfyNT5IKwKyfpLvKUwCMZSdF+gRD3WpyZelgTQfJ+pDx5XFbXTlB0A==
 
-esbuild-openbsd-64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.10.tgz#4daef5f5d8e74bbda53b65160029445d582570cf"
-  integrity sha512-ftMMIwHWrnrYnvuJQRJs/Smlcb28F9ICGde/P3FUTCgDDM0N7WA0o9uOR38f5Xe2/OhNCgkjNeb7QeaE3cyWkQ==
+esbuild-openbsd-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.11.tgz#bc04103ccfd8c2f2241e1add0b51a095955b73c4"
+  integrity sha512-0bBo9SQR4t66Wd91LGMAqmWorzO0TTzVjYiifwoFtel8luFeXuPThQnEm5ztN4g0fnvcp7AnUPPzS/Depf17wQ==
 
-esbuild-sunos-64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.10.tgz#5fe7bef267a02f322fd249a8214d0274937388a7"
-  integrity sha512-mf7hBL9Uo2gcy2r3rUFMjVpTaGpFJJE5QTDDqUFf1632FxteYANffDZmKbqX0PfeQ2XjUDE604IcE7OJeoHiyg==
+esbuild-sunos-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.11.tgz#ccd580305d31fde07b5c386da79c942aaf069013"
+  integrity sha512-EuBdTGlsMTjEl1sQnBX2jfygy7iR6CKfvOzi+gEOfhDqbHXsmY1dcpbVtcwHAg9/2yUZSfMJHMAgf1z8M4yyyw==
 
-esbuild-windows-32@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.10.tgz#48e3dde25ab0135579a288b30ab6ddef6d1f0b28"
-  integrity sha512-ttFVo+Cg8b5+qHmZHbEc8Vl17kCleHhLzgT8X04y8zudEApo0PxPg9Mz8Z2cKH1bCYlve1XL8LkyXGFjtUYeGg==
+esbuild-windows-32@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.11.tgz#40fe1d48f9b20a76f6db5109aaaf1511aed58c71"
+  integrity sha512-O0/Wo1Wk6dc0rZSxkvGpmTNIycEznHmkObTFz2VHBhjPsO4ZpCgfGxNkCpz4AdAIeMczpTXt/8d5vdJNKEGC+Q==
 
-esbuild-windows-64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.10.tgz#387a9515bef3fee502d277a5d0a2db49a4ecda05"
-  integrity sha512-2H0gdsyHi5x+8lbng3hLbxDWR7mKHWh5BXZGKVG830KUmXOOWFE2YKJ4tHRkejRduOGDrBvHBriYsGtmTv3ntA==
+esbuild-windows-64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.11.tgz#80c58b1ef2ff030c78e3a06e7a922776cc4cb687"
+  integrity sha512-x977Q4HhNjnHx00b4XLAnTtj5vfbdEvkxaQwC1Zh5AN8g5EX+izgZ6e5QgqJgpzyRNJqh4hkgIJF1pyy1be0mQ==
 
-esbuild-windows-arm64@0.15.10:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.10.tgz#5a6fcf2fa49e895949bf5495cf088ab1b43ae879"
-  integrity sha512-S+th4F+F8VLsHLR0zrUcG+Et4hx0RKgK1eyHc08kztmLOES8BWwMiaGdoW9hiXuzznXQ0I/Fg904MNbr11Nktw==
+esbuild-windows-arm64@0.15.11:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.11.tgz#018624023b5c3f0cca334cc99f5ef7134d396333"
+  integrity sha512-VwUHFACuBahrvntdcMKZteUZ9HaYrBRODoKe4tIWxguQRvvYoYb7iu5LrcRS/FQx8KPZNaa72zuqwVtHeXsITw==
 
-esbuild@^0.15.10, esbuild@^0.15.6:
-  version "0.15.10"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.10.tgz#85c2f8446e9b1fe04fae68daceacba033eedbd42"
-  integrity sha512-N7wBhfJ/E5fzn/SpNgX+oW2RLRjwaL8Y0ezqNqhjD6w0H2p0rDuEz2FKZqpqLnO8DCaWumKe8dsC/ljvVSSxng==
+esbuild@^0.15.11, esbuild@^0.15.6:
+  version "0.15.11"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.11.tgz#524d48612a9aa7edc1753c83459cb6fcae0cb66e"
+  integrity sha512-OgHGuhlfZ//mToxjte1D5iiiQgWfJ2GByVMwEC/IuoXsBGkuyK1+KrjYu0laSpnN/L1UmLUCv0s25vObdc1bVg==
   optionalDependencies:
-    "@esbuild/android-arm" "0.15.10"
-    "@esbuild/linux-loong64" "0.15.10"
-    esbuild-android-64 "0.15.10"
-    esbuild-android-arm64 "0.15.10"
-    esbuild-darwin-64 "0.15.10"
-    esbuild-darwin-arm64 "0.15.10"
-    esbuild-freebsd-64 "0.15.10"
-    esbuild-freebsd-arm64 "0.15.10"
-    esbuild-linux-32 "0.15.10"
-    esbuild-linux-64 "0.15.10"
-    esbuild-linux-arm "0.15.10"
-    esbuild-linux-arm64 "0.15.10"
-    esbuild-linux-mips64le "0.15.10"
-    esbuild-linux-ppc64le "0.15.10"
-    esbuild-linux-riscv64 "0.15.10"
-    esbuild-linux-s390x "0.15.10"
-    esbuild-netbsd-64 "0.15.10"
-    esbuild-openbsd-64 "0.15.10"
-    esbuild-sunos-64 "0.15.10"
-    esbuild-windows-32 "0.15.10"
-    esbuild-windows-64 "0.15.10"
-    esbuild-windows-arm64 "0.15.10"
+    "@esbuild/android-arm" "0.15.11"
+    "@esbuild/linux-loong64" "0.15.11"
+    esbuild-android-64 "0.15.11"
+    esbuild-android-arm64 "0.15.11"
+    esbuild-darwin-64 "0.15.11"
+    esbuild-darwin-arm64 "0.15.11"
+    esbuild-freebsd-64 "0.15.11"
+    esbuild-freebsd-arm64 "0.15.11"
+    esbuild-linux-32 "0.15.11"
+    esbuild-linux-64 "0.15.11"
+    esbuild-linux-arm "0.15.11"
+    esbuild-linux-arm64 "0.15.11"
+    esbuild-linux-mips64le "0.15.11"
+    esbuild-linux-ppc64le "0.15.11"
+    esbuild-linux-riscv64 "0.15.11"
+    esbuild-linux-s390x "0.15.11"
+    esbuild-netbsd-64 "0.15.11"
+    esbuild-openbsd-64 "0.15.11"
+    esbuild-sunos-64 "0.15.11"
+    esbuild-windows-32 "0.15.11"
+    esbuild-windows-64 "0.15.11"
+    esbuild-windows-arm64 "0.15.11"
 
 escalade@^3.1.1:
   version "3.1.1"

From 94a5f86b091ecdd2198fa7e34da640eac55bf598 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 08:48:34 +0300
Subject: [PATCH 31/48] Bump @typescript-eslint/eslint-plugin from 5.40.0 to
 5.40.1 (#6419)

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.40.0 to 5.40.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.40.1/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 75 ++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index bf6bdb0449..5c043eab81 100644
--- a/package.json
+++ b/package.json
@@ -361,7 +361,7 @@
     "@types/webpack-dev-server": "^4.7.2",
     "@types/webpack-env": "^1.18.0",
     "@types/webpack-node-externals": "^2.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.40.0",
+    "@typescript-eslint/eslint-plugin": "^5.40.1",
     "@typescript-eslint/parser": "^5.40.0",
     "adr": "^1.4.3",
     "ansi_up": "^5.1.0",
diff --git a/yarn.lock b/yarn.lock
index d40f1b6588..88ee554ffc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2694,14 +2694,14 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^5.40.0":
-  version "5.40.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.0.tgz#0159bb71410eec563968288a17bd4478cdb685bd"
-  integrity sha512-FIBZgS3DVJgqPwJzvZTuH4HNsZhHMa9SjxTKAZTlMsPw/UzpEjcf9f4dfgDJEHjK+HboUJo123Eshl6niwEm/Q==
+"@typescript-eslint/eslint-plugin@^5.40.1":
+  version "5.40.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.1.tgz#3203a6ff396b1194083faaa6e5110c401201d7d5"
+  integrity sha512-FsWboKkWdytGiXT5O1/R9j37YgcjO8MKHSUmWnIEjVaz0krHkplPnYi7mwdb+5+cs0toFNQb0HIrN7zONdIEWg==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.40.0"
-    "@typescript-eslint/type-utils" "5.40.0"
-    "@typescript-eslint/utils" "5.40.0"
+    "@typescript-eslint/scope-manager" "5.40.1"
+    "@typescript-eslint/type-utils" "5.40.1"
+    "@typescript-eslint/utils" "5.40.1"
     debug "^4.3.4"
     ignore "^5.2.0"
     regexpp "^3.2.0"
@@ -2726,13 +2726,21 @@
     "@typescript-eslint/types" "5.40.0"
     "@typescript-eslint/visitor-keys" "5.40.0"
 
-"@typescript-eslint/type-utils@5.40.0":
-  version "5.40.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.40.0.tgz#4964099d0158355e72d67a370249d7fc03331126"
-  integrity sha512-nfuSdKEZY2TpnPz5covjJqav+g5qeBqwSHKBvz7Vm1SAfy93SwKk/JeSTymruDGItTwNijSsno5LhOHRS1pcfw==
+"@typescript-eslint/scope-manager@5.40.1":
+  version "5.40.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.1.tgz#a7a5197dfd234622a2421ea590ee0ccc02e18dfe"
+  integrity sha512-jkn4xsJiUQucI16OLCXrLRXDZ3afKhOIqXs4R3O+M00hdQLKR58WuyXPZZjhKLFCEP2g+TXdBRtLQ33UfAdRUg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.40.0"
-    "@typescript-eslint/utils" "5.40.0"
+    "@typescript-eslint/types" "5.40.1"
+    "@typescript-eslint/visitor-keys" "5.40.1"
+
+"@typescript-eslint/type-utils@5.40.1":
+  version "5.40.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.40.1.tgz#091e4ce3bebbdb68f4980bae9dee2e4e1725f601"
+  integrity sha512-DLAs+AHQOe6n5LRraXiv27IYPhleF0ldEmx6yBqBgBLaNRKTkffhV1RPsjoJBhVup2zHxfaRtan8/YRBgYhU9Q==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.40.1"
+    "@typescript-eslint/utils" "5.40.1"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
@@ -2741,6 +2749,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.0.tgz#8de07e118a10b8f63c99e174a3860f75608c822e"
   integrity sha512-V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw==
 
+"@typescript-eslint/types@5.40.1":
+  version "5.40.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.1.tgz#de37f4f64de731ee454bb2085d71030aa832f749"
+  integrity sha512-Icg9kiuVJSwdzSQvtdGspOlWNjVDnF3qVIKXdJ103o36yRprdl3Ge5cABQx+csx960nuMF21v8qvO31v9t3OHw==
+
 "@typescript-eslint/typescript-estree@5.40.0":
   version "5.40.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz#e305e6a5d65226efa5471ee0f12e0ffaab6d3075"
@@ -2754,15 +2767,29 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.40.0":
-  version "5.40.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.40.0.tgz#647f56a875fd09d33c6abd70913c3dd50759b772"
-  integrity sha512-MO0y3T5BQ5+tkkuYZJBjePewsY+cQnfkYeRqS6tPh28niiIwPnQ1t59CSRcs1ZwJJNOdWw7rv9pF8aP58IMihA==
+"@typescript-eslint/typescript-estree@5.40.1":
+  version "5.40.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.1.tgz#9a7d25492f02c69882ce5e0cd1857b0c55645d72"
+  integrity sha512-5QTP/nW5+60jBcEPfXy/EZL01qrl9GZtbgDZtDPlfW5zj/zjNrdI2B5zMUHmOsfvOr2cWqwVdWjobCiHcedmQA==
+  dependencies:
+    "@typescript-eslint/types" "5.40.1"
+    "@typescript-eslint/visitor-keys" "5.40.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.40.1":
+  version "5.40.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.40.1.tgz#3204fb73a559d3b7bab7dc9d3c44487c2734a9ca"
+  integrity sha512-a2TAVScoX9fjryNrW6BZRnreDUszxqm9eQ9Esv8n5nXApMW0zeANUYlwh/DED04SC/ifuBvXgZpIK5xeJHQ3aw==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.40.0"
-    "@typescript-eslint/types" "5.40.0"
-    "@typescript-eslint/typescript-estree" "5.40.0"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.40.1"
+    "@typescript-eslint/types" "5.40.1"
+    "@typescript-eslint/typescript-estree" "5.40.1"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
     semver "^7.3.7"
@@ -2775,6 +2802,14 @@
     "@typescript-eslint/types" "5.40.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.40.1":
+  version "5.40.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.1.tgz#f3d2bf5af192f4432b84cec6fdcb387193518754"
+  integrity sha512-A2DGmeZ+FMja0geX5rww+DpvILpwo1OsiQs0M+joPWJYsiEFBLsH0y1oFymPNul6Z5okSmHpP4ivkc2N0Cgfkw==
+  dependencies:
+    "@typescript-eslint/types" "5.40.1"
+    eslint-visitor-keys "^3.3.0"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"

From 271a3539838d01ee1a9315933171e4fc838a87f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 09:16:51 -0400
Subject: [PATCH 32/48] Bump react-select from 5.5.0 to 5.5.1 (#6413)

Bumps [react-select](https://github.com/JedWatson/react-select) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@5.5.0...react-select@5.5.1)

---
updated-dependencies:
- dependency-name: react-select
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 5c043eab81..665e482aa3 100644
--- a/package.json
+++ b/package.json
@@ -410,7 +410,7 @@
     "react-refresh": "^0.14.0",
     "react-refresh-typescript": "^2.0.7",
     "react-router-dom": "^5.3.4",
-    "react-select": "^5.5.0",
+    "react-select": "^5.5.1",
     "react-select-event": "^5.5.1",
     "react-table": "^7.8.0",
     "react-window": "^1.8.7",
diff --git a/yarn.lock b/yarn.lock
index 88ee554ffc..46aad74255 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10569,10 +10569,10 @@ react-select-event@^5.5.1:
   dependencies:
     "@testing-library/dom" ">=7"
 
-react-select@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.5.0.tgz#c82286e20b26194738186ada54cc8a0c677dfc6e"
-  integrity sha512-yzA+eavdxpF5Onf0u9KZ84qxr8r/CwPPn777bRkslbDtEUYx2+m13OrhP3WVa30+aWYxwkO/pkLcZ7q7r/6OhQ==
+react-select@^5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.5.1.tgz#60cc6767e77396cdf1d6f49a10555b80d27e749a"
+  integrity sha512-zOXIKvNqrnBn030Goi7pRHfLJHnvjPweA4uDyj9me8YPqgkaJp+vX3eNGHOzTlI442rbfPUMGrEZQnymJn/XUg==
   dependencies:
     "@babel/runtime" "^7.12.0"
     "@emotion/cache" "^11.4.0"

From e75a31b66593fd0d25553717de174ac5180fc544 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 09:17:14 -0400
Subject: [PATCH 33/48] Bump @typescript-eslint/parser from 5.40.0 to 5.40.1
 (#6417)

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.40.0 to 5.40.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.40.1/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 48 +++++++-----------------------------------------
 2 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index 665e482aa3..52d21e159a 100644
--- a/package.json
+++ b/package.json
@@ -362,7 +362,7 @@
     "@types/webpack-env": "^1.18.0",
     "@types/webpack-node-externals": "^2.5.3",
     "@typescript-eslint/eslint-plugin": "^5.40.1",
-    "@typescript-eslint/parser": "^5.40.0",
+    "@typescript-eslint/parser": "^5.40.1",
     "adr": "^1.4.3",
     "ansi_up": "^5.1.0",
     "chart.js": "^2.9.4",
diff --git a/yarn.lock b/yarn.lock
index 46aad74255..c77c6ae85f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2708,24 +2708,16 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.40.0":
-  version "5.40.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.0.tgz#432bddc1fe9154945660f67c1ba6d44de5014840"
-  integrity sha512-Ah5gqyX2ySkiuYeOIDg7ap51/b63QgWZA7w6AHtFrag7aH0lRQPbLzUjk0c9o5/KZ6JRkTTDKShL4AUrQa6/hw==
+"@typescript-eslint/parser@^5.40.1":
+  version "5.40.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.1.tgz#e7f8295dd8154d0d37d661ddd8e2f0ecfdee28dd"
+  integrity sha512-IK6x55va5w4YvXd4b3VrXQPldV9vQTxi5ov+g4pMANsXPTXOcfjx08CRR1Dfrcc51syPtXHF5bgLlMHYFrvQtg==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.40.0"
-    "@typescript-eslint/types" "5.40.0"
-    "@typescript-eslint/typescript-estree" "5.40.0"
+    "@typescript-eslint/scope-manager" "5.40.1"
+    "@typescript-eslint/types" "5.40.1"
+    "@typescript-eslint/typescript-estree" "5.40.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.40.0":
-  version "5.40.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.0.tgz#d6ea782c8e3a2371ba3ea31458dcbdc934668fc4"
-  integrity sha512-d3nPmjUeZtEWRvyReMI4I1MwPGC63E8pDoHy0BnrYjnJgilBD3hv7XOiETKLY/zTwI7kCnBDf2vWTRUVpYw0Uw==
-  dependencies:
-    "@typescript-eslint/types" "5.40.0"
-    "@typescript-eslint/visitor-keys" "5.40.0"
-
 "@typescript-eslint/scope-manager@5.40.1":
   version "5.40.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.1.tgz#a7a5197dfd234622a2421ea590ee0ccc02e18dfe"
@@ -2744,29 +2736,11 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.40.0":
-  version "5.40.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.0.tgz#8de07e118a10b8f63c99e174a3860f75608c822e"
-  integrity sha512-V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw==
-
 "@typescript-eslint/types@5.40.1":
   version "5.40.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.1.tgz#de37f4f64de731ee454bb2085d71030aa832f749"
   integrity sha512-Icg9kiuVJSwdzSQvtdGspOlWNjVDnF3qVIKXdJ103o36yRprdl3Ge5cABQx+csx960nuMF21v8qvO31v9t3OHw==
 
-"@typescript-eslint/typescript-estree@5.40.0":
-  version "5.40.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz#e305e6a5d65226efa5471ee0f12e0ffaab6d3075"
-  integrity sha512-b0GYlDj8TLTOqwX7EGbw2gL5EXS2CPEWhF9nGJiGmEcmlpNBjyHsTwbqpyIEPVpl6br4UcBOYlcI2FJVtJkYhg==
-  dependencies:
-    "@typescript-eslint/types" "5.40.0"
-    "@typescript-eslint/visitor-keys" "5.40.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
 "@typescript-eslint/typescript-estree@5.40.1":
   version "5.40.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.1.tgz#9a7d25492f02c69882ce5e0cd1857b0c55645d72"
@@ -2794,14 +2768,6 @@
     eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.40.0":
-  version "5.40.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.0.tgz#dd2d38097f68e0d2e1e06cb9f73c0173aca54b68"
-  integrity sha512-ijJ+6yig+x9XplEpG2K6FUdJeQGGj/15U3S56W9IqXKJqleuD7zJ2AX/miLezwxpd7ZxDAqO87zWufKg+RPZyQ==
-  dependencies:
-    "@typescript-eslint/types" "5.40.0"
-    eslint-visitor-keys "^3.3.0"
-
 "@typescript-eslint/visitor-keys@5.40.1":
   version "5.40.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.1.tgz#f3d2bf5af192f4432b84cec6fdcb387193518754"

From 49445f6a6ad27ed787a4b27523043cb37feaed6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 09:17:30 -0400
Subject: [PATCH 34/48] Bump @swc/core from 1.3.7 to 1.3.9 (#6418)

Bumps [@swc/core](https://github.com/swc-project/swc) from 1.3.7 to 1.3.9.
- [Release notes](https://github.com/swc-project/swc/releases)
- [Changelog](https://github.com/swc-project/swc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/swc-project/swc/compare/v1.3.7...v1.3.9)

---
updated-dependencies:
- dependency-name: "@swc/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 138 +++++++++++++++++++++++++--------------------------
 2 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/package.json b/package.json
index 52d21e159a..7f705e83ae 100644
--- a/package.json
+++ b/package.json
@@ -301,7 +301,7 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8",
     "@sentry/types": "^6.19.7",
     "@swc/cli": "^0.1.57",
-    "@swc/core": "^1.3.7",
+    "@swc/core": "^1.3.9",
     "@swc/jest": "^0.2.23",
     "@testing-library/dom": "^7.31.2",
     "@testing-library/jest-dom": "^5.16.5",
diff --git a/yarn.lock b/yarn.lock
index c77c6ae85f..bf8f7dc56b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1628,101 +1628,101 @@
     slash "3.0.0"
     source-map "^0.7.3"
 
-"@swc/core-android-arm-eabi@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.3.7.tgz#31dc887e5dc2db25ac1a9503478ea6cabc1da9ac"
-  integrity sha512-zvUpTBOUnXDkfp2JXv1T3NfyimxsAnqEfT65gWC/3ZpB/gmc59vqYVko4Pifyvuxo5aVvEdT2gfHlWM/aXwtpg==
+"@swc/core-android-arm-eabi@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.3.9.tgz#6ab77525f2d22fcd321d0e29704d0820608b9e18"
+  integrity sha512-+F+sU2l49Po4tJoNtIpFwt0k1sspymvPMM+DCpnkHF1idzRiOU5NGgVzmLDjoO9AnxHa7EBJ3itN+PP2Dd06+A==
   dependencies:
     "@swc/wasm" "1.2.122"
 
-"@swc/core-android-arm64@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.3.7.tgz#2b6d35343d68946b5bc2b654fa2fa4c0e8afe4d6"
-  integrity sha512-qnh1aYTrIjuFOkgxUYG8SGzpPD92o/w5hrHUy71LfUbHf5HRs7FpMgQXtTGnk33S/uMCvSv7V/ewv+t+N6tlVA==
+"@swc/core-android-arm64@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.3.9.tgz#d9467488dd9c00d50180f9ccded9eed6f54e4423"
+  integrity sha512-HSWdex3yd4CRefkM2WVz0nTKjpirNZnwSlghqe4ct9QAYGMiiPesYgWPAnq/PpnYfmjQse4yvEclamGiek6zDA==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-darwin-arm64@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.7.tgz#addfcf1dd1562b04ead371a3a228f1e33eb8c2d3"
-  integrity sha512-q8NgUK/CleCmGYIuskL1sCad8opkfJD/8GWd+MkGSi+MGkExrLMmJftgG5FCj0l/xCHxGGNYj1TCrM/qV6CheA==
+"@swc/core-darwin-arm64@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.9.tgz#60ad2157bfa67038cf94fa0f9169f5d2609f6011"
+  integrity sha512-E7WJY1LsMJtOtUYc/JXl8qlt6USnzodWmdO1eAAOSAODEdX9AjgG3fRT94o3UcmvMrto7sxBXVExj8wG7Cxeng==
 
-"@swc/core-darwin-x64@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.7.tgz#d0886d5c0573c871a42cac77cfaf091c6cc2768d"
-  integrity sha512-dKrJkZYbF7Qi1wQgyVnR1a5Vk8UN7fJ/WlK6pZVJwMvWLoZgYE+U0Nn7RsVB4LmOxHtaJF7eesbGUm2y2NVEwA==
+"@swc/core-darwin-x64@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.9.tgz#947095894b526c90724f273b968e124019a3c267"
+  integrity sha512-0+dFCAcLEBxwIO+0Nt+OT8mjPpvBMBWIuFWB1DNiUu2K73+OB0i+llzsCJFoasISHR+YJD0bGyv+8AtVuUdFAw==
 
-"@swc/core-freebsd-x64@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.3.7.tgz#2fa4f8554fcf3101a411570032b3ccfcd4833d3e"
-  integrity sha512-ENHthc4iFPlBj0xaf2DbJLDzYSBA4QMQEA2HhZoSWWMsqhg8mGZxwgRd6+loROGZ2a5HKMZXIxCev8BbYnE0OA==
+"@swc/core-freebsd-x64@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.3.9.tgz#ebcb068df6528f824c803329d43d752889eef46f"
+  integrity sha512-JbHIeklQPRBEZUfKAKt/IB/ayi7dJZ9tEGu/fDxNfk8Znu1Md+YOKRyN5FPMXfYrL5yFUXnlFOb2LX6wjNhhjQ==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-linux-arm-gnueabihf@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.7.tgz#76e5f6d114c3051c12bfb603bb51bfee67d512e0"
-  integrity sha512-anE65tcRLr/fYayXkpwZ7p7Ft5HCH4rvi3wSFdK8ycRWn9fVZhyWUJkJ3p1S0R19xr7hcb14hyxqPbd4m0I4yA==
+"@swc/core-linux-arm-gnueabihf@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.9.tgz#0882d86a301f5eece588ec41fe7f1d0c9629f2c7"
+  integrity sha512-Yc1G8FGXmq6yGKtu5wYCcvVWBtqU0/3FUk6zJM+7pFiivKsVHJcgWrkgLO1u6h7bgEdQIYwfM3/BbRNE5CtdnA==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-linux-arm64-gnu@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.7.tgz#924076423e4ac7eb3d95f5dc5de03d3301aac81a"
-  integrity sha512-Qv6f76Tt8t51qb29R2isWvuQM26Xi7ZJavAv0hMdCxfkF+h1Yd14j82H7afGzdONH1LyLaPrhWSQirU/ZtBtdA==
+"@swc/core-linux-arm64-gnu@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.9.tgz#6bcf96a3826b069cb053f4b9b9f9148388d0f067"
+  integrity sha512-PrBjmPIMhoQLCpfaZl2b1cCXnaNPddQB/ssMVqQ6eXChBJfcv14M5BjxtI2ORi4HoEDlsbX+k50sL666M3lnBw==
 
-"@swc/core-linux-arm64-musl@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.7.tgz#967ce8320b9c39d3ff7efe495b3af03ddfc8cf2b"
-  integrity sha512-paYbmvm7+7QxjyMzRd4X4tyhHw5VgkGCMBYC3PbfpuI7SsCdmEFG9v1t5uMbTf60VU1wB4/n+AxY9KCZLfK7DQ==
+"@swc/core-linux-arm64-musl@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.9.tgz#cac78de3fcdd22417532d95ddc7c229ccfef9920"
+  integrity sha512-jJT56vt81o2N3O2nXp+MZGM6mbgkNx6lvvRT6yISW29fLM6NHBXmkGcjaWOD9VFJDRmu/MtFxbElPxr6ikrFYQ==
 
-"@swc/core-linux-x64-gnu@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.7.tgz#2f55017c05f0a7a9099d1b85ee6ae22bee93a118"
-  integrity sha512-tkIHt64mmqEVM0CTGvUsB37Pv7AD/BinOEe6oPfMcS/2a00kYvXn9kEVKPqNTpiFpjYGoFQJaVV8UsD+iv8IvQ==
+"@swc/core-linux-x64-gnu@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.9.tgz#e457e5f50ecc344278f69e90aafdcef4a152bae8"
+  integrity sha512-60ZreTvrJk3N7xvPzQeQJDePsXUmSUZkKD6lc0xzug4bv53NyUIQ8gH8nzVsV++D9NZeVxXp6WqqFLcgt7yEDQ==
 
-"@swc/core-linux-x64-musl@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.7.tgz#ce3a83a99389436e8ef1d86a59b6bdba16b2a0e3"
-  integrity sha512-V0xeTS8kvnTlghO1YyO1QgfPqsY896MknYCzBeK9CGKkGbc3JaxSoyb11nbGEDEaUwzDd9gj9L4D2uP+IWpoyw==
+"@swc/core-linux-x64-musl@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.9.tgz#0009205aeb5a42009794d75949f79d622563dac3"
+  integrity sha512-UBApPfUSP+w6ye6V1oT4EGh3LFCFrZaQsC1CkTuiYXXSmQMzkYE0Jzegn3R7MHWCJSneRwXRTKrkdhrNBUqWKA==
 
-"@swc/core-win32-arm64-msvc@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.7.tgz#11e53a2b79f7de2b78e4f10cc45c45e87753b0ce"
-  integrity sha512-LeauQIok8tw4Mjmj7wlc7C62HCUx3xa5k6tNQnKWbDs7odZVWisgDxn7RSl9/xxlC8wPLTVUyBh3O1rHigVfWg==
+"@swc/core-win32-arm64-msvc@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.9.tgz#2f4522c3da4d37dd08c1249a837c4a6643571c0a"
+  integrity sha512-4FQSalXbbnqTLVGRljRnw/bJ99Jwj1WnXz/aJM/SVL8S9Zbc82+3v+wXL/9NGwaAndu2QUkb2KPYNAHvB7PCdw==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-win32-ia32-msvc@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.7.tgz#126b930a77af3d0dcbacf07782d6f20a16511b32"
-  integrity sha512-E1C8bpUrml0vIv4FTSP7f4CwkZVGsCY9fBsBHCC4j9N1mtQk8/nzpGOUsPo4QP+FTYJiNKedZ4Cy7baihnV4Lw==
+"@swc/core-win32-ia32-msvc@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.9.tgz#e5dd2830a103b8fcb89e843cc6cd0587dbd9140a"
+  integrity sha512-ZkTw1Cm+b2QBf/NjkJJbocvgT0NWdfPQL0OyMkuTAinRzfrMmq/lmshjnqj3ysFVeI4uuJTNemiT6mivpLmuBw==
   dependencies:
     "@swc/wasm" "1.2.130"
 
-"@swc/core-win32-x64-msvc@1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.7.tgz#a1298b635d2cbbcf3cba3dbd37cdd6b577296efa"
-  integrity sha512-Ti9H/1hqBrxhYtNLVaLsahO/iiJn1Zd4qSc0LZpl6wBJxP4LltLV4MLeib6i8lg11pj4ijIhzZfC6bT614ee3w==
+"@swc/core-win32-x64-msvc@1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.9.tgz#49462ebcaed4caa5a3f99dcd2a48035b870750ae"
+  integrity sha512-moKi2prCKzYnXXlrLf5nwAN4uGSm4YpsW2xzYiZWJJDRqu74VoUWoDkG25jalHTfN/PSBQg4dkFWhhUe89JJVw==
 
-"@swc/core@^1.3.7":
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.7.tgz#46eaa4af5f61ced1694fca64fb6d93ba5485747a"
-  integrity sha512-g4ptYRZRE+g/6wLB3WBuWhAWJsZDUeiSOvKVM1Wdn29Vi/EgLuVaY5ssz0HLQJxuDSJGwtAOZA8exh4+AKNHLw==
+"@swc/core@^1.3.9":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.9.tgz#9dcc342cbcbe72ba6613a23840a2092c13699881"
+  integrity sha512-PCRCO9vIoEX3FyS3z/FkWVYJzuspUq0LLaWdK3L30+KQDtH29K+LQdRc2Dzin2MU5MpY4bSHydAwl9M6cmZ9OA==
   optionalDependencies:
-    "@swc/core-android-arm-eabi" "1.3.7"
-    "@swc/core-android-arm64" "1.3.7"
-    "@swc/core-darwin-arm64" "1.3.7"
-    "@swc/core-darwin-x64" "1.3.7"
-    "@swc/core-freebsd-x64" "1.3.7"
-    "@swc/core-linux-arm-gnueabihf" "1.3.7"
-    "@swc/core-linux-arm64-gnu" "1.3.7"
-    "@swc/core-linux-arm64-musl" "1.3.7"
-    "@swc/core-linux-x64-gnu" "1.3.7"
-    "@swc/core-linux-x64-musl" "1.3.7"
-    "@swc/core-win32-arm64-msvc" "1.3.7"
-    "@swc/core-win32-ia32-msvc" "1.3.7"
-    "@swc/core-win32-x64-msvc" "1.3.7"
+    "@swc/core-android-arm-eabi" "1.3.9"
+    "@swc/core-android-arm64" "1.3.9"
+    "@swc/core-darwin-arm64" "1.3.9"
+    "@swc/core-darwin-x64" "1.3.9"
+    "@swc/core-freebsd-x64" "1.3.9"
+    "@swc/core-linux-arm-gnueabihf" "1.3.9"
+    "@swc/core-linux-arm64-gnu" "1.3.9"
+    "@swc/core-linux-arm64-musl" "1.3.9"
+    "@swc/core-linux-x64-gnu" "1.3.9"
+    "@swc/core-linux-x64-musl" "1.3.9"
+    "@swc/core-win32-arm64-msvc" "1.3.9"
+    "@swc/core-win32-ia32-msvc" "1.3.9"
+    "@swc/core-win32-x64-msvc" "1.3.9"
 
 "@swc/jest@^0.2.23":
   version "0.2.23"

From bfef25a05e94b1178d43924a1f4a397afdbd1daa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:11:28 -0400
Subject: [PATCH 35/48] Bump @types/node from 16.11.66 to 16.11.68 (#6423)

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 16.11.66 to 16.11.68.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7f705e83ae..d67a75f45d 100644
--- a/package.json
+++ b/package.json
@@ -331,7 +331,7 @@
     "@types/md5-file": "^4.0.2",
     "@types/mini-css-extract-plugin": "^2.4.0",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^16.11.66",
+    "@types/node": "^16.11.68",
     "@types/node-fetch": "^2.6.2",
     "@types/npm": "^2.0.32",
     "@types/proper-lockfile": "^4.1.2",
diff --git a/yarn.lock b/yarn.lock
index bf8f7dc56b..e9cc50ffa0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2283,10 +2283,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.24.tgz#20ba1bf69c1b4ab405c7a01e950c4f446b05029f"
   integrity sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g==
 
-"@types/node@^16.11.26", "@types/node@^16.11.66":
-  version "16.11.66"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.66.tgz#97f6891c3b8770e21163b93918d57fd1b799e235"
-  integrity sha512-+xvMrGl3eAygKcf5jm+4zA4tbfEgmKM9o6/glTmN0RFVdu2VuFXMYYtRmuv3zTGCgAYMnEZLde3B7BTp+Yxcig==
+"@types/node@^16.11.26", "@types/node@^16.11.68":
+  version "16.11.68"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz#30ee923f4d940793e0380f5ce61c0bd4b7196b6c"
+  integrity sha512-JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ==
 
 "@types/npm@^2.0.32":
   version "2.0.32"

From 313b559ba28fd4aaf1fa23d6518e23fa07647ce5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:11:44 -0400
Subject: [PATCH 36/48] Bump typedoc from 0.23.16 to 0.23.17 (#6422)

Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.23.16 to 0.23.17.
- [Release notes](https://github.com/TypeStrong/TypeDoc/releases)
- [Changelog](https://github.com/TypeStrong/typedoc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TypeStrong/TypeDoc/compare/v0.23.16...v0.23.17)

---
updated-dependencies:
- dependency-name: typedoc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d67a75f45d..cd5add42d6 100644
--- a/package.json
+++ b/package.json
@@ -424,7 +424,7 @@
     "ts-node": "^10.9.1",
     "type-fest": "^2.14.0",
     "typed-emitter": "^1.4.0",
-    "typedoc": "0.23.16",
+    "typedoc": "0.23.17",
     "typedoc-plugin-markdown": "^3.13.6",
     "typescript": "^4.8.4",
     "typescript-plugin-css-modules": "^3.4.0",
diff --git a/yarn.lock b/yarn.lock
index e9cc50ffa0..0934843101 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12292,10 +12292,10 @@ typedoc-plugin-markdown@^3.13.6:
   dependencies:
     handlebars "^4.7.7"
 
-typedoc@0.23.16:
-  version "0.23.16"
-  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.16.tgz#09881ada725c2190ac5d3bb0edadcc5bfeda4bfe"
-  integrity sha512-rumYsCeNRXlyuZVzefD7050n7ptL2uudsCJg50dY0v/stKniqIlRpvx/F/6expC0/Q6Dbab+g/JpZuB7Sw90FA==
+typedoc@0.23.17:
+  version "0.23.17"
+  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.17.tgz#ca644e7ecac78be85cfd556f5436917a4ac76dda"
+  integrity sha512-3rtNubo1dK0pvs6ixpMAq4pESULd5/JNUqJbdyZoeilI14reb1RNVomN4fMgIadd0RMX1aenYjJSSMBOJ+/+0Q==
   dependencies:
     lunr "^2.3.9"
     marked "^4.0.19"

From 4491eb12d7776923f2bf33bbb73439c24c0ebeda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:12:00 -0400
Subject: [PATCH 37/48] Bump react-select from 5.5.1 to 5.5.2 (#6421)

Bumps [react-select](https://github.com/JedWatson/react-select) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@5.5.1...react-select@5.5.2)

---
updated-dependencies:
- dependency-name: react-select
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index cd5add42d6..2fe4a07b42 100644
--- a/package.json
+++ b/package.json
@@ -410,7 +410,7 @@
     "react-refresh": "^0.14.0",
     "react-refresh-typescript": "^2.0.7",
     "react-router-dom": "^5.3.4",
-    "react-select": "^5.5.1",
+    "react-select": "^5.5.2",
     "react-select-event": "^5.5.1",
     "react-table": "^7.8.0",
     "react-window": "^1.8.7",
diff --git a/yarn.lock b/yarn.lock
index 0934843101..03b165ca5c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10535,10 +10535,10 @@ react-select-event@^5.5.1:
   dependencies:
     "@testing-library/dom" ">=7"
 
-react-select@^5.5.1:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.5.1.tgz#60cc6767e77396cdf1d6f49a10555b80d27e749a"
-  integrity sha512-zOXIKvNqrnBn030Goi7pRHfLJHnvjPweA4uDyj9me8YPqgkaJp+vX3eNGHOzTlI442rbfPUMGrEZQnymJn/XUg==
+react-select@^5.5.2:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.5.2.tgz#40ac709338860b836feda5e43bdab56cb8ae5b57"
+  integrity sha512-zbcxtiqXvFW2Wh+dd8zAqMY6QaqX9Ez0WlcjSXycXn1ASpKdc17LcGJj7gAJiUcHI/UVlo6wfg44hgBsUPyEBQ==
   dependencies:
     "@babel/runtime" "^7.12.0"
     "@emotion/cache" "^11.4.0"

From 6c0bcc403bf79d860709e8abcc547d898cd683fc Mon Sep 17 00:00:00 2001
From: elvis chan <78713260+elvischan-crypto@users.noreply.github.com>
Date: Wed, 19 Oct 2022 15:17:07 +0100
Subject: [PATCH 38/48] fix jsonnet error with kube-prometheus >= v0.8 (#5687)

* fix jsonnet error with kube-prometheus > v0.8

kubelet ServiceMonitor moved to kubernetesControlPlane starting from v0.8

Signed-off-by: elvis chan <78713260+elvischan-crypto@users.noreply.github.com>

* Add not in custom-prometheuus.md about jsonnet version

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: elvis chan <78713260+elvischan-crypto@users.noreply.github.com>
Signed-off-by: Sebastian Malton <sebastian@malton.name>
Co-authored-by: Sebastian Malton <sebastian@malton.name>
---
 jsonnet/lens/custom-prometheus.jsonnet | 2 +-
 troubleshooting/custom-prometheus.md   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jsonnet/lens/custom-prometheus.jsonnet b/jsonnet/lens/custom-prometheus.jsonnet
index 9c733766ba..10384fdaa5 100644
--- a/jsonnet/lens/custom-prometheus.jsonnet
+++ b/jsonnet/lens/custom-prometheus.jsonnet
@@ -24,7 +24,7 @@
       },
     },
   },
-  prometheus+:: {
+  kubernetesControlPlane+:: {
     serviceMonitorKubelet+: {
       spec+: {
         endpoints: std.map(function(endpoint)
diff --git a/troubleshooting/custom-prometheus.md b/troubleshooting/custom-prometheus.md
index 3f9b746394..d0df10fd1d 100644
--- a/troubleshooting/custom-prometheus.md
+++ b/troubleshooting/custom-prometheus.md
@@ -31,14 +31,15 @@ metricRelabelings:
 
 ### Jsonnet
 
-The required label replacements are bundled in [jsonnet/lens/custom-prometheus](../jsonnet/lens/custom-prometheus.jsonnet). To install it copy the file or use
-[Jsonnet Bundler](https://github.com/jsonnet-bundler/jsonnet-bundler).
+The required label replacements are bundled in [jsonnet/lens/custom-prometheus](../jsonnet/lens/custom-prometheus.jsonnet).
+This file is currently for jsonnet versions >= 0.8.0
+To install it copy the file or use [Jsonnet Bundler](https://github.com/jsonnet-bundler/jsonnet-bundler).
 
 ```bash
 jb init && jb install https://github.com/lensapp/lens/jsonnet/lens@master
 ```
 
-When the installation was successful include it into your definitions. Using the [example](https://github.com/coreos/kube-prometheus#compiling) 
+When the installation was successful include it into your definitions. Using the [example](https://github.com/coreos/kube-prometheus#compiling)
 of kube-prometheus, e.g.:
 
 ```
@@ -60,4 +61,3 @@ local kp =
 ```
 helm upgrade --set server.global.scrape_interval=30s prometheus stable/prometheus
 ```
-

From 75bd780ab1406c7631cfcebd3c17ab3f4fd67ac7 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 19 Oct 2022 11:53:15 -0400
Subject: [PATCH 39/48] Update version on master to 6.2.0-alpha.0 (#6428)

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2fe4a07b42..eb2587a7cd 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "OpenLens",
   "description": "OpenLens - Open Source IDE for Kubernetes",
   "homepage": "https://github.com/lensapp/lens",
-  "version": "6.1.0",
+  "version": "6.2.0-alpha.0",
   "main": "static/build/main.js",
   "copyright": "© 2022 OpenLens Authors",
   "license": "MIT",

From 7e6751bf383cb965710fb0882d25e3e8b62359f3 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 19 Oct 2022 12:10:37 -0400
Subject: [PATCH 40/48] Add automatic workflow for bumping version on master
 (#6429)

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .github/workflows/bump-master-version.yaml | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/bump-master-version.yaml

diff --git a/.github/workflows/bump-master-version.yaml b/.github/workflows/bump-master-version.yaml
new file mode 100644
index 0000000000..504473e43f
--- /dev/null
+++ b/.github/workflows/bump-master-version.yaml
@@ -0,0 +1,35 @@
+name: Bump Version on master
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    if: ${{ github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release') }}
+    steps:
+      - name: Checkout Release from lens
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install dependencies
+        run: |
+          npm i --location=global semver
+      - name: Bump version to first alpha of next minor version
+        run: |
+          NEW_VERSION=$(cat package.json | jq .version --raw-output| xargs semver -i preminor --preid alpha)
+          cat package.json | jq --arg new_version "$NEW_VERSION" '.version = $new_version' > new-package.json
+          mv new-package.json package.json
+      - uses: peter-evans/create-pull-request@v4
+        with:
+          add-paths: package.json
+          commit-message: Update package.json version to next preminor because of recent release
+          signoff: true
+          delete-branch: true
+          title: Update version to next preminor
+          labels: chore

From 024c5ee52c09e2c9b528709779f022afc97f6c90 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 19 Oct 2022 14:00:04 -0400
Subject: [PATCH 41/48] Require milestones on PRs before merging (#6431)

* Require milestones on PRs before merging

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .github/workflows/require-milestone.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/workflows/require-milestone.yml

diff --git a/.github/workflows/require-milestone.yml b/.github/workflows/require-milestone.yml
new file mode 100644
index 0000000000..388aa48013
--- /dev/null
+++ b/.github/workflows/require-milestone.yml
@@ -0,0 +1,14 @@
+name: Require Milestone
+on:
+  pull_request:
+    types: [opened, edited, synchronize]
+jobs:
+  milestone:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Require Milestone
+        run: |
+          exit $(gh pr view ${{ github.event.pull_request.number }} --json milestone | jq 'if .milestone == null then 1 else 0 end')
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}

From c85165ab21d5794c5c2c0c3291fa90f87acf697d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 08:26:35 -0400
Subject: [PATCH 42/48] Bump tailwindcss from 3.1.8 to 3.2.0 (#6434)

Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.1.8 to 3.2.0.
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.1.8...v3.2.0)

---
updated-dependencies:
- dependency-name: tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 36 ++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index eb2587a7cd..7947d4ce9b 100644
--- a/package.json
+++ b/package.json
@@ -418,7 +418,7 @@
     "sass-loader": "^12.6.0",
     "sharp": "^0.31.1",
     "style-loader": "^3.3.1",
-    "tailwindcss": "^3.1.8",
+    "tailwindcss": "^3.2.0",
     "tar-stream": "^2.2.0",
     "ts-loader": "^9.4.1",
     "ts-node": "^10.9.1",
diff --git a/yarn.lock b/yarn.lock
index 03b165ca5c..a3c716736e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5887,10 +5887,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.11, fast-glob@^3.2.5, fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+fast-glob@^3.2.12, fast-glob@^3.2.5, fast-glob@^3.2.9:
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -10083,14 +10083,14 @@ postcss-modules-values@^4.0.0:
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-nested@5.0.6:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc"
-  integrity sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==
+postcss-nested@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.0.tgz#1572f1984736578f360cffc7eb7dca69e30d1735"
+  integrity sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==
   dependencies:
-    postcss-selector-parser "^6.0.6"
+    postcss-selector-parser "^6.0.10"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.6:
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
@@ -10117,7 +10117,7 @@ postcss@^6.0.14, postcss@^6.0.2:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^8.3.0, postcss@^8.4.14, postcss@^8.4.18, postcss@^8.4.7:
+postcss@^8.3.0, postcss@^8.4.17, postcss@^8.4.18, postcss@^8.4.7:
   version "8.4.18"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.18.tgz#6d50046ea7d3d66a85e0e782074e7203bc7fbca2"
   integrity sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==
@@ -11811,10 +11811,10 @@ table@^5.4.1:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
-tailwindcss@^3.1.8:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.8.tgz#4f8520550d67a835d32f2f4021580f9fddb7b741"
-  integrity sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==
+tailwindcss@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.2.0.tgz#0164a930645e7e1df301df1e9d434a52602c918d"
+  integrity sha512-ARh/W0uH5UlWIC2nn02V0+5fyF0k6qZliyt4QYic2upOhPUE/Spu1EURNc9txJ3+4j8OEmdigqfDpw4d2tA4vA==
   dependencies:
     arg "^5.0.2"
     chokidar "^3.5.3"
@@ -11822,18 +11822,18 @@ tailwindcss@^3.1.8:
     detective "^5.2.1"
     didyoumean "^1.2.2"
     dlv "^1.1.3"
-    fast-glob "^3.2.11"
+    fast-glob "^3.2.12"
     glob-parent "^6.0.2"
     is-glob "^4.0.3"
     lilconfig "^2.0.6"
     normalize-path "^3.0.0"
     object-hash "^3.0.0"
     picocolors "^1.0.0"
-    postcss "^8.4.14"
+    postcss "^8.4.17"
     postcss-import "^14.1.0"
     postcss-js "^4.0.0"
     postcss-load-config "^3.1.4"
-    postcss-nested "5.0.6"
+    postcss-nested "6.0.0"
     postcss-selector-parser "^6.0.10"
     postcss-value-parser "^4.2.0"
     quick-lru "^5.1.1"

From 244f0a11989fdc4edb1cf17a493b1c8aa6fd1bab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 08:26:44 -0400
Subject: [PATCH 43/48] Bump esbuild from 0.15.11 to 0.15.12 (#6433)

Bumps [esbuild](https://github.com/evanw/esbuild) from 0.15.11 to 0.15.12.
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.15.11...v0.15.12)

---
updated-dependencies:
- dependency-name: esbuild
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 228 +++++++++++++++++++++++++--------------------------
 2 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/package.json b/package.json
index 7947d4ce9b..10a521cf59 100644
--- a/package.json
+++ b/package.json
@@ -377,7 +377,7 @@
     "electron": "^19.1.3",
     "electron-builder": "^23.6.0",
     "electron-notarize": "^0.3.0",
-    "esbuild": "^0.15.11",
+    "esbuild": "^0.15.12",
     "esbuild-loader": "^2.20.0",
     "eslint": "^8.25.0",
     "eslint-plugin-header": "^3.1.1",
diff --git a/yarn.lock b/yarn.lock
index a3c716736e..c90593f6f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -598,15 +598,15 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
-"@esbuild/android-arm@0.15.11":
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.11.tgz#bdd9c3e098183bdca97075aa4c3e0152ed3e10ee"
-  integrity sha512-PzMcQLazLBkwDEkrNPi9AbjFt6+3I7HKbiYF2XtWQ7wItrHvEOeO3T8Am434zAozWtVP7lrTue1bEfc2nYWeCA==
+"@esbuild/android-arm@0.15.12":
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.12.tgz#e548b10a5e55b9e10537a049ebf0bc72c453b769"
+  integrity sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==
 
-"@esbuild/linux-loong64@0.15.11":
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.11.tgz#2f4f9a1083dcb4fc65233b6f59003c406abf32e5"
-  integrity sha512-geWp637tUhNmhL3Xgy4Bj703yXB9dqiLJe05lCUfjSFDrQf9C/8pArusyPUbUbPwlC/EAUjBw32sxuIl/11dZw==
+"@esbuild/linux-loong64@0.15.12":
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.12.tgz#475b33a2631a3d8ca8aa95ee127f9a61d95bf9c1"
+  integrity sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==
 
 "@eslint/eslintrc@^1.3.3":
   version "1.3.3"
@@ -5335,75 +5335,75 @@ es6-error@^4.1.1:
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
-esbuild-android-64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.11.tgz#50402129c3e85bb06434e212374c5f693e4c5f01"
-  integrity sha512-rrwoXEiuI1kaw4k475NJpexs8GfJqQUKcD08VR8sKHmuW9RUuTR2VxcupVvHdiGh9ihxL9m3lpqB1kju92Ialw==
+esbuild-android-64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.12.tgz#5e8151d5f0a748c71a7fbea8cee844ccf008e6fc"
+  integrity sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==
 
-esbuild-android-arm64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.11.tgz#49bee35218ea2ccf1a0c5f187af77c1c0a5dee71"
-  integrity sha512-/hDubOg7BHOhUUsT8KUIU7GfZm5bihqssvqK5PfO4apag7YuObZRZSzViyEKcFn2tPeHx7RKbSBXvAopSHDZJQ==
+esbuild-android-arm64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.12.tgz#5ee72a6baa444bc96ffcb472a3ba4aba2cc80666"
+  integrity sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==
 
-esbuild-darwin-64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.11.tgz#89a90c8cf6f0029ac4169bfedd012a0412c1575f"
-  integrity sha512-1DqHD0ms3AhiwkKnjRUzmiW7JnaJJr5FKrPiR7xuyMwnjDqvNWDdMq4rKSD9OC0piFNK6n0LghsglNMe2MwJtA==
+esbuild-darwin-64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.12.tgz#70047007e093fa1b3ba7ef86f9b3fa63db51fe25"
+  integrity sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==
 
-esbuild-darwin-arm64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.11.tgz#556f4385c6de806cc81132dd7b8af00fe9d292df"
-  integrity sha512-OMzhxSbS0lwwrW40HHjRCeVIJTURdXFA8c3GU30MlHKuPCcvWNUIKVucVBtNpJySXmbkQMDJdJNrXzNDyvoqvQ==
+esbuild-darwin-arm64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.12.tgz#41c951f23d9a70539bcca552bae6e5196696ae04"
+  integrity sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==
 
-esbuild-freebsd-64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.11.tgz#fd86fd1b3b65366048f35b996d9cdf3547384eee"
-  integrity sha512-8dKP26r0/Qyez8nTCwpq60QbuYKOeBygdgOAWGCRalunyeqWRoSZj9TQjPDnTTI9joxd3QYw3UhVZTKxO9QdRg==
+esbuild-freebsd-64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.12.tgz#a761b5afd12bbedb7d56c612e9cfa4d2711f33f0"
+  integrity sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==
 
-esbuild-freebsd-arm64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.11.tgz#d346bcacfe9779ebc1a11edac1bdedeff6dda3b1"
-  integrity sha512-aSGiODiukLGGnSg/O9+cGO2QxEacrdCtCawehkWYTt5VX1ni2b9KoxpHCT9h9Y6wGqNHmXFnB47RRJ8BIqZgmQ==
+esbuild-freebsd-arm64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.12.tgz#6b0839d4d58deabc6cbd96276eb8cbf94f7f335e"
+  integrity sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==
 
-esbuild-linux-32@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.11.tgz#64b50e774bf75af7dcc6a73ad509f2eb0ac4487b"
-  integrity sha512-lsrAfdyJBGx+6aHIQmgqUonEzKYeBnyfJPkT6N2dOf1RoXYYV1BkWB6G02tjsrz1d5wZzaTc3cF+TKmuTo/ZwA==
+esbuild-linux-32@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.12.tgz#bd50bfe22514d434d97d5150977496e2631345b4"
+  integrity sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==
 
-esbuild-linux-64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.11.tgz#fba3a78b95769772863f8f6dc316abca55cf8416"
-  integrity sha512-Y2Rh+PcyVhQqXKBTacPCltINN3uIw2xC+dsvLANJ1SpK5NJUtxv8+rqWpjmBgaNWKQT1/uGpMmA9olALy9PLVA==
+esbuild-linux-64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.12.tgz#074bb2b194bf658245f8490f29c01ffcdfa8c931"
+  integrity sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==
 
-esbuild-linux-arm64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.11.tgz#c0cb31980eee066bfd39a4593660a0ecebe926cb"
-  integrity sha512-uhcXiTwTmD4OpxJu3xC5TzAAw6Wzf9O1XGWL448EE9bqGjgV1j+oK3lIHAfsHnuIn8K4nDW8yjX0Sv5S++oRuw==
+esbuild-linux-arm64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.12.tgz#3bf789c4396dc032875a122988efd6f3733f28f5"
+  integrity sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==
 
-esbuild-linux-arm@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.11.tgz#7824d20099977aa671016c7de7a5038c9870010f"
-  integrity sha512-TJllTVk5aSyqPFvvcHTvf6Wu1ZKhWpJ/qNmZO8LL/XeB+LXCclm7HQHNEIz6MT7IX8PmlC1BZYrOiw2sXSB95A==
+esbuild-linux-arm@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.12.tgz#b91b5a8d470053f6c2c9c8a5e67ec10a71fe4a67"
+  integrity sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==
 
-esbuild-linux-mips64le@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.11.tgz#10627331c90164e553429ed25e025184bba485b6"
-  integrity sha512-WD61y/R1M4BLe4gxXRypoQ0Ci+Vjf714QYzcPNkiYv5I8K8WDz2ZR8Bm6cqKxd6rD+e/rZgPDbhQ9PCf7TMHmA==
+esbuild-linux-mips64le@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.12.tgz#2fb54099ada3c950a7536dfcba46172c61e580e2"
+  integrity sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==
 
-esbuild-linux-ppc64le@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.11.tgz#be42679a36a5246b893fc8b898135ebacb5a0a14"
-  integrity sha512-JVleZS9oPVLTlBhPTWgOwxFWU/wMUdlBwTbGA4GF8c38sLbS13cupj+C8bLq929jU7EMWry4SaL+tKGIaTlqKg==
+esbuild-linux-ppc64le@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.12.tgz#9e3b8c09825fb27886249dfb3142a750df29a1b7"
+  integrity sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==
 
-esbuild-linux-riscv64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.11.tgz#3ac2f328e3db73cbff833ada94314d8e79503e54"
-  integrity sha512-9aLIalZ2HFHIOZpmVU11sEAS9F8TnHw49daEjcgMpBXHFF57VuT9f9/9LKJhw781Gda0P9jDkuCWJ0tFbErvJw==
+esbuild-linux-riscv64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.12.tgz#923d0f5b6e12ee0d1fe116b08e4ae4478fe40693"
+  integrity sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==
 
-esbuild-linux-s390x@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.11.tgz#e774e0df061b6847d86783bf3c8c4300a72e03ad"
-  integrity sha512-sZHtiXXOKsLI3XGBGoYO4qKBzJlb8xNsWmvFiwFMHFzA4AXgDP1KDp7Dawe9C2pavTRBDvl+Ok4n/DHQ59oaTg==
+esbuild-linux-s390x@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.12.tgz#3b1620220482b96266a0c6d9d471d451a1eab86f"
+  integrity sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==
 
 esbuild-loader@^2.20.0:
   version "2.20.0"
@@ -5417,63 +5417,63 @@ esbuild-loader@^2.20.0:
     tapable "^2.2.0"
     webpack-sources "^2.2.0"
 
-esbuild-netbsd-64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.11.tgz#55e265fa4489e3f396b16c81f6f5a11d6ca2a9a4"
-  integrity sha512-hUC9yN06K9sg7ju4Vgu9ChAPdsEgtcrcLfyNT5IKwKyfpLvKUwCMZSdF+gRD3WpyZelgTQfJ+pDx5XFbXTlB0A==
+esbuild-netbsd-64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.12.tgz#276730f80da646859b1af5a740e7802d8cd73e42"
+  integrity sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==
 
-esbuild-openbsd-64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.11.tgz#bc04103ccfd8c2f2241e1add0b51a095955b73c4"
-  integrity sha512-0bBo9SQR4t66Wd91LGMAqmWorzO0TTzVjYiifwoFtel8luFeXuPThQnEm5ztN4g0fnvcp7AnUPPzS/Depf17wQ==
+esbuild-openbsd-64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.12.tgz#bd0eea1dd2ca0722ed489d88c26714034429f8ae"
+  integrity sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==
 
-esbuild-sunos-64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.11.tgz#ccd580305d31fde07b5c386da79c942aaf069013"
-  integrity sha512-EuBdTGlsMTjEl1sQnBX2jfygy7iR6CKfvOzi+gEOfhDqbHXsmY1dcpbVtcwHAg9/2yUZSfMJHMAgf1z8M4yyyw==
+esbuild-sunos-64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.12.tgz#5e56bf9eef3b2d92360d6d29dcde7722acbecc9e"
+  integrity sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==
 
-esbuild-windows-32@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.11.tgz#40fe1d48f9b20a76f6db5109aaaf1511aed58c71"
-  integrity sha512-O0/Wo1Wk6dc0rZSxkvGpmTNIycEznHmkObTFz2VHBhjPsO4ZpCgfGxNkCpz4AdAIeMczpTXt/8d5vdJNKEGC+Q==
+esbuild-windows-32@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.12.tgz#a4f1a301c1a2fa7701fcd4b91ef9d2620cf293d0"
+  integrity sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==
 
-esbuild-windows-64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.11.tgz#80c58b1ef2ff030c78e3a06e7a922776cc4cb687"
-  integrity sha512-x977Q4HhNjnHx00b4XLAnTtj5vfbdEvkxaQwC1Zh5AN8g5EX+izgZ6e5QgqJgpzyRNJqh4hkgIJF1pyy1be0mQ==
+esbuild-windows-64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.12.tgz#bc2b467541744d653be4fe64eaa9b0dbbf8e07f6"
+  integrity sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==
 
-esbuild-windows-arm64@0.15.11:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.11.tgz#018624023b5c3f0cca334cc99f5ef7134d396333"
-  integrity sha512-VwUHFACuBahrvntdcMKZteUZ9HaYrBRODoKe4tIWxguQRvvYoYb7iu5LrcRS/FQx8KPZNaa72zuqwVtHeXsITw==
+esbuild-windows-arm64@0.15.12:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.12.tgz#9a7266404334a86be800957eaee9aef94c3df328"
+  integrity sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==
 
-esbuild@^0.15.11, esbuild@^0.15.6:
-  version "0.15.11"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.11.tgz#524d48612a9aa7edc1753c83459cb6fcae0cb66e"
-  integrity sha512-OgHGuhlfZ//mToxjte1D5iiiQgWfJ2GByVMwEC/IuoXsBGkuyK1+KrjYu0laSpnN/L1UmLUCv0s25vObdc1bVg==
+esbuild@^0.15.12, esbuild@^0.15.6:
+  version "0.15.12"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.12.tgz#6c8e22d6d3b7430d165c33848298d3fc9a1f251c"
+  integrity sha512-PcT+/wyDqJQsRVhaE9uX/Oq4XLrFh0ce/bs2TJh4CSaw9xuvI+xFrH2nAYOADbhQjUgAhNWC5LKoUsakm4dxng==
   optionalDependencies:
-    "@esbuild/android-arm" "0.15.11"
-    "@esbuild/linux-loong64" "0.15.11"
-    esbuild-android-64 "0.15.11"
-    esbuild-android-arm64 "0.15.11"
-    esbuild-darwin-64 "0.15.11"
-    esbuild-darwin-arm64 "0.15.11"
-    esbuild-freebsd-64 "0.15.11"
-    esbuild-freebsd-arm64 "0.15.11"
-    esbuild-linux-32 "0.15.11"
-    esbuild-linux-64 "0.15.11"
-    esbuild-linux-arm "0.15.11"
-    esbuild-linux-arm64 "0.15.11"
-    esbuild-linux-mips64le "0.15.11"
-    esbuild-linux-ppc64le "0.15.11"
-    esbuild-linux-riscv64 "0.15.11"
-    esbuild-linux-s390x "0.15.11"
-    esbuild-netbsd-64 "0.15.11"
-    esbuild-openbsd-64 "0.15.11"
-    esbuild-sunos-64 "0.15.11"
-    esbuild-windows-32 "0.15.11"
-    esbuild-windows-64 "0.15.11"
-    esbuild-windows-arm64 "0.15.11"
+    "@esbuild/android-arm" "0.15.12"
+    "@esbuild/linux-loong64" "0.15.12"
+    esbuild-android-64 "0.15.12"
+    esbuild-android-arm64 "0.15.12"
+    esbuild-darwin-64 "0.15.12"
+    esbuild-darwin-arm64 "0.15.12"
+    esbuild-freebsd-64 "0.15.12"
+    esbuild-freebsd-arm64 "0.15.12"
+    esbuild-linux-32 "0.15.12"
+    esbuild-linux-64 "0.15.12"
+    esbuild-linux-arm "0.15.12"
+    esbuild-linux-arm64 "0.15.12"
+    esbuild-linux-mips64le "0.15.12"
+    esbuild-linux-ppc64le "0.15.12"
+    esbuild-linux-riscv64 "0.15.12"
+    esbuild-linux-s390x "0.15.12"
+    esbuild-netbsd-64 "0.15.12"
+    esbuild-openbsd-64 "0.15.12"
+    esbuild-sunos-64 "0.15.12"
+    esbuild-windows-32 "0.15.12"
+    esbuild-windows-64 "0.15.12"
+    esbuild-windows-arm64 "0.15.12"
 
 escalade@^3.1.1:
   version "3.1.1"

From 97fc7cf6fb38d8ee468c363fbcabf9143b2db968 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Thu, 20 Oct 2022 18:02:49 +0300
Subject: [PATCH 44/48] Export node-pty spawn from main to extensions (#6438)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/main/index.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/index.ts b/src/main/index.ts
index 8a95ad02db..870ca7490c 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -6,6 +6,7 @@
 // Main process
 
 import * as Mobx from "mobx";
+import { spawn } from "node-pty";
 import * as LensExtensionsCommonApi from "../extensions/common-api";
 import * as LensExtensionsMainApi from "../extensions/main-api";
 import { getDi } from "./getDi";
@@ -30,4 +31,8 @@ const LensExtensions = {
   Main: LensExtensionsMainApi,
 };
 
-export { Mobx, LensExtensions };
+const Pty = {
+  spawn,
+};
+
+export { Mobx, LensExtensions, Pty };

From c591f08bc4c84ec9a0506ff41d9a3345c227da66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 13:51:08 -0400
Subject: [PATCH 45/48] Bump react-select from 5.5.2 to 5.5.4 (#6445)

Bumps [react-select](https://github.com/JedWatson/react-select) from 5.5.2 to 5.5.4.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@5.5.2...react-select@5.5.4)

---
updated-dependencies:
- dependency-name: react-select
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 10a521cf59..62803298b2 100644
--- a/package.json
+++ b/package.json
@@ -410,7 +410,7 @@
     "react-refresh": "^0.14.0",
     "react-refresh-typescript": "^2.0.7",
     "react-router-dom": "^5.3.4",
-    "react-select": "^5.5.2",
+    "react-select": "^5.5.4",
     "react-select-event": "^5.5.1",
     "react-table": "^7.8.0",
     "react-window": "^1.8.7",
diff --git a/yarn.lock b/yarn.lock
index c90593f6f4..27ee7a6244 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8740,11 +8740,16 @@ memfs@^3.1.2, memfs@^3.4.1:
   dependencies:
     fs-monkey "1.0.3"
 
-"memoize-one@>=3.1.1 <6", memoize-one@^5.0.0, memoize-one@^5.1.1:
+"memoize-one@>=3.1.1 <6", memoize-one@^5.1.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
+memoize-one@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045"
+  integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -10535,17 +10540,17 @@ react-select-event@^5.5.1:
   dependencies:
     "@testing-library/dom" ">=7"
 
-react-select@^5.5.2:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.5.2.tgz#40ac709338860b836feda5e43bdab56cb8ae5b57"
-  integrity sha512-zbcxtiqXvFW2Wh+dd8zAqMY6QaqX9Ez0WlcjSXycXn1ASpKdc17LcGJj7gAJiUcHI/UVlo6wfg44hgBsUPyEBQ==
+react-select@^5.5.4:
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.5.4.tgz#da05b8b66d33f6fc1f92fdccd0fa50d7f4418554"
+  integrity sha512-lyr19joBUm/CNJgjZMBSnFvJ/MeHCmBYvQ050qYAP3EPa7Oenlnx9guhU+SW0goYgxLQyqwRvkFllQpFAp8tmQ==
   dependencies:
     "@babel/runtime" "^7.12.0"
     "@emotion/cache" "^11.4.0"
     "@emotion/react" "^11.8.1"
     "@floating-ui/dom" "^1.0.1"
     "@types/react-transition-group" "^4.4.0"
-    memoize-one "^5.0.0"
+    memoize-one "^6.0.0"
     prop-types "^15.6.0"
     react-transition-group "^4.3.0"
     use-isomorphic-layout-effect "^1.1.2"

From 8bc5856b8c19efb130aef4a1243f1a82f54a88bb Mon Sep 17 00:00:00 2001
From: Damien Degois <damien@degois.info>
Date: Fri, 21 Oct 2022 20:55:11 +0200
Subject: [PATCH 46/48] Fix AppImage windows not showing the application icon
 (#6444)

Signed-off-by: Damien Degois <damien@degois.info>

Signed-off-by: Damien Degois <damien@degois.info>
---
 ...ormation.global-override-for-injectable.ts |  1 +
 .../application-information.injectable.ts     |  6 ++---
 .../create-electron-window.injectable.ts      | 27 +++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/common/vars/application-information.global-override-for-injectable.ts b/src/common/vars/application-information.global-override-for-injectable.ts
index ac53b9f341..232a189ce1 100644
--- a/src/common/vars/application-information.global-override-for-injectable.ts
+++ b/src/common/vars/application-information.global-override-for-injectable.ts
@@ -7,6 +7,7 @@ import { getGlobalOverride } from "../test-utils/get-global-override";
 import applicationInformationInjectable from "./application-information.injectable";
 
 export default getGlobalOverride(applicationInformationInjectable, () => ({
+  name: "some-product-name",
   productName: "some-product-name",
   version: "6.0.0",
   build: {},
diff --git a/src/common/vars/application-information.injectable.ts b/src/common/vars/application-information.injectable.ts
index 559b15294b..56dfcf9d7e 100644
--- a/src/common/vars/application-information.injectable.ts
+++ b/src/common/vars/application-information.injectable.ts
@@ -5,16 +5,16 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import packageJson from "../../../package.json";
 
-export type ApplicationInformation = Pick<typeof packageJson, "version" | "config" | "productName" | "copyright" | "description"> & {
+export type ApplicationInformation = Pick<typeof packageJson, "version" | "config" | "productName" | "copyright" | "description" | "name"> & {
   build: Partial<typeof packageJson["build"]> & { publish?: unknown[] };
 };
 
 const applicationInformationInjectable = getInjectable({
   id: "application-information",
   instantiate: (): ApplicationInformation => {
-    const { version, config, productName, build, copyright, description } = packageJson;
+    const { version, config, productName, build, copyright, description, name } = packageJson;
 
-    return { version, config, productName, build, copyright, description };
+    return { version, config, productName, build, copyright, description, name };
   },
   causesSideEffects: true,
 });
diff --git a/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
index 07f9b8fb7e..5e44c9d3ad 100644
--- a/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
@@ -9,6 +9,12 @@ import { BrowserWindow } from "electron";
 import type { ElectronWindow } from "./create-lens-window.injectable";
 import type { RequireExactlyOne } from "type-fest";
 import openLinkInBrowserInjectable from "../../../../common/utils/open-link-in-browser.injectable";
+import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable";
+import lensResourcesDirInjectable from "../../../../common/vars/lens-resources-dir.injectable";
+import isLinuxInjectable from "../../../../common/vars/is-linux.injectable";
+import fsInjectable from "../../../../common/fs/fs.injectable";
+import applicationInformationInjectable from "../../../../common/vars/application-information.injectable";
+
 
 export type ElectronWindowTitleBarStyle = "hiddenInset" | "hidden" | "default" | "customButtonsOnHover";
 
@@ -45,6 +51,10 @@ const createElectronWindowInjectable = getInjectable({
   instantiate: (di): CreateElectronWindow => {
     const logger = di.inject(loggerInjectable);
     const openLinkInBrowser = di.inject(openLinkInBrowserInjectable);
+    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const lensResourcesDir = di.inject(lensResourcesDirInjectable);
+    const isLinux = di.inject(isLinuxInjectable);
+    const applicationInformation = di.inject(applicationInformationInjectable);
 
     return (configuration) => {
       const applicationWindowState = di.inject(
@@ -79,6 +89,23 @@ const createElectronWindowInjectable = getInjectable({
         },
       });
 
+      if (isLinux) {
+        const iconFileName = [
+          getAbsolutePath(lensResourcesDir, `../${applicationInformation.name}.png`),
+          `/usr/share/icons/hicolor/512x512/apps/${applicationInformation.name}.png`,
+        ].find(di.inject(fsInjectable).existsSync);
+
+        if (iconFileName != null) {
+          try {
+            browserWindow.setIcon(iconFileName);
+          } catch (err) {
+            logger.warn(`Error while setting window icon ${err}`);
+          }
+        } else {
+          logger.warn(`No suitable icon found for task bar.`);
+        }
+      }
+
       applicationWindowState.manage(browserWindow);
 
       browserWindow

From d4f9128f7781677d2d3563dc3f166d197c663bf2 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Fri, 21 Oct 2022 16:05:56 -0400
Subject: [PATCH 47/48] Fix links in Readme (#6441)

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0c4a63c174..f581e90401 100644
--- a/README.md
+++ b/README.md
@@ -19,15 +19,15 @@ Lens IDE a standalone application for MacOS, Windows and Linux operating systems
 
 ## Installation
 
-See [Getting Started](https://docs.k8slens.dev/main/getting-started/install-lens/) page.
+See [Getting Started](https://docs.k8slens.dev/getting-started/install-lens/) page.
 
 ## Development
 
-See [Development](https://docs.k8slens.dev/latest/contributing/development/) page.
+See [Development](https://docs.k8slens.dev/contributing/development/) page.
 
 ## Contributing
 
-See [Contributing](https://docs.k8slens.dev/latest/contributing/) page.
+See [Contributing](https://docs.k8slens.dev/contributing/) page.
 
 ## License
 

From 4f7776789b4cf667325984c044f3d827884ef2c6 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Fri, 21 Oct 2022 16:34:58 -0400
Subject: [PATCH 48/48] Update all links within application (#6442)

- URLs removed the /latest/ and /main/ pathname prefixes

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .github/workflows/mkdocs-manual.yml            |  6 +++---
 CONTRIBUTING.md                                |  2 +-
 .../get-started/your-first-extension.md        |  2 +-
 docs/extensions/guides/generator.md            | 18 +++++++++---------
 docs/extensions/guides/renderer-extension.md   |  2 +-
 src/common/vars.ts                             |  4 ++--
 ...gation-using-application-menu.test.tsx.snap |  2 +-
 ...igation-using-application-menu.test.ts.snap |  2 +-
 .../weblinks-store/currentVersion.ts           |  8 +++++++-
 9 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/mkdocs-manual.yml b/.github/workflows/mkdocs-manual.yml
index 56bfd0c831..03ec36da46 100644
--- a/.github/workflows/mkdocs-manual.yml
+++ b/.github/workflows/mkdocs-manual.yml
@@ -53,9 +53,9 @@ jobs:
           rm -fr ./docs/clusters ./docs/contributing ./docs/faq ./docs/getting-started ./docs/helm ./docs/support ./docs/supporting
           sed -i '/Protocol Handlers/d' ./mkdocs.yml
           sed -i '/IPC/d' ./mkdocs.yml
-          sed -i 's#../../clusters/adding-clusters.md#https://docs.k8slens.dev/latest/clusters/adding-clusters/#g' ./docs/extensions/get-started/your-first-extension.md
-          sed -i 's#clusters/adding-clusters.md#https://docs.k8slens.dev/latest/clusters/adding-clusters/#g' ./docs/README.md
-          sed -i 's#../../contributing/README.md#https://docs.k8slens.dev/latest/contributing/#g' ./docs/extensions/guides/generator.md
+          sed -i 's#../../clusters/adding-clusters.md#https://docs.k8slens.dev/getting-started/add-cluster/#g' ./docs/extensions/get-started/your-first-extension.md
+          sed -i 's#clusters/adding-clusters.md#https://docs.k8slens.dev//getting-started/adding-clusters/#g' ./docs/README.md
+          sed -i 's#../../contributing/README.md#https://docs.k8slens.dev/contributing/#g' ./docs/extensions/guides/generator.md
 
       - name: git config
         run: |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1c745f852d..beb082afe9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
 # Contributing to Lens
 
-See [Contributing to Lens](https://docs.k8slens.dev/latest/contributing/) documentation.
+See [Contributing to Lens](https://docs.k8slens.dev/contributing/) documentation.
diff --git a/docs/extensions/get-started/your-first-extension.md b/docs/extensions/get-started/your-first-extension.md
index c8c1167943..ec797f7441 100644
--- a/docs/extensions/get-started/your-first-extension.md
+++ b/docs/extensions/get-started/your-first-extension.md
@@ -78,7 +78,7 @@ npm run dev
 You must restart Lens for the extension to load.
 After this initial restart, reload Lens and it will automatically pick up changes any time the extension rebuilds.
 
-With Lens running, either connect to an existing cluster or create a new one - refer to the latest [Lens Documentation](https://docs.k8slens.dev/main/catalog/) for details on how to add a cluster in Lens IDE.
+With Lens running, either connect to an existing cluster or create a new one - refer to the latest [Lens Documentation](https://docs.k8slens.dev/getting-started/add-cluster/) for details on how to add a cluster in Lens IDE.
 You will see the "Hello World" page in the left-side cluster menu.
 
 ## Develop the Extension
diff --git a/docs/extensions/guides/generator.md b/docs/extensions/guides/generator.md
index 64838c1bc4..fbc1723b0b 100644
--- a/docs/extensions/guides/generator.md
+++ b/docs/extensions/guides/generator.md
@@ -46,14 +46,14 @@ Open `my-first-lens-ext/renderer.tsx` and change the value of `title` from `"Hel
 
 ```typescript
 clusterPageMenus = [
-    {
-        target: { pageId: "hello" },
-        title: "Hello Lens",
-        components: {
-            Icon: ExampleIcon,
-        }
-    }
-]
+  {
+    target: { pageId: "hello" },
+    title: "Hello Lens",
+    components: {
+      Icon: ExampleIcon,
+    },
+  },
+];
 ```
 
 Reload Lens and you will see that the menu item text has changed to "Hello Lens".
@@ -70,6 +70,6 @@ To debug your extension, please see our instructions on [Testing Extensions](../
 To dive deeper, consider looking at [Common Capabilities](../capabilities/common-capabilities.md), [Styling](../capabilities/styling.md), or [Extension Anatomy](anatomy.md).
 
 If you find problems with the Lens Extension Generator, or have feature requests, you are welcome to raise an [issue](https://github.com/lensapp/generator-lens-ext/issues).
-You can find the latest Lens contribution guidelines [here](https://docs.k8slens.dev/latest/contributing).
+You can find the latest Lens contribution guidelines [here](https://docs.k8slens.dev/contributing).
 
 The Generator source code is hosted at [GitHub](https://github.com/lensapp/generator-lens-ext).
diff --git a/docs/extensions/guides/renderer-extension.md b/docs/extensions/guides/renderer-extension.md
index d90a343692..4cc6e338bf 100644
--- a/docs/extensions/guides/renderer-extension.md
+++ b/docs/extensions/guides/renderer-extension.md
@@ -771,7 +771,7 @@ Construct the table using the `Renderer.Component.Table` and related elements.
 
 For each pod the name, age, and status are obtained using the `Renderer.K8sApi.Pod` methods.
 The table is constructed using the `Renderer.Component.Table` and related elements.
-See [Component documentation](https://docs.k8slens.dev/latest/extensions/api/modules/_renderer_api_components_/) for further details.
+See [Component documentation](https://api-docs.k8slens.dev/latest/extensions/api/modules/Renderer.Component/) for further details.
 
 ### `kubeObjectStatusTexts`
 
diff --git a/src/common/vars.ts b/src/common/vars.ts
index 94ac631896..1b0cf1cd2e 100644
--- a/src/common/vars.ts
+++ b/src/common/vars.ts
@@ -123,7 +123,7 @@ export const apiKubePrefix = "/api-kube"; // k8s cluster apis
 // Links
 export const issuesTrackerUrl = "https://github.com/lensapp/lens/issues" as string;
 export const slackUrl = "https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ" as string;
-export const supportUrl = "https://docs.k8slens.dev/latest/support/" as string;
+export const supportUrl = "https://docs.k8slens.dev/support/" as string;
 
 export const lensWebsiteWeblinkId = "lens-website-link";
 export const lensDocumentationWeblinkId = "lens-documentation-link";
@@ -132,4 +132,4 @@ export const lensTwitterWeblinkId = "lens-twitter-link";
 export const lensBlogWeblinkId = "lens-blog-link";
 export const kubernetesDocumentationWeblinkId = "kubernetes-documentation-link";
 
-export const docsUrl = "https://docs.k8slens.dev/main" as string;
+export const docsUrl = "https://docs.k8slens.dev" as string;
diff --git a/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap b/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
index b5b54a989f..0bc5f33667 100644
--- a/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
+++ b/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
@@ -279,7 +279,7 @@ exports[`add-cluster - navigation using application menu when navigating to add
               </code>
                file. 
               <a
-                href="https://docs.k8slens.dev/main/getting-started/add-cluster/"
+                href="https://docs.k8slens.dev/getting-started/add-cluster/"
                 rel="noreferrer"
                 target="_blank"
               >
diff --git a/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
index bf03515a34..5d383d77df 100644
--- a/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -275,7 +275,7 @@ exports[`extensions - navigation using application menu when navigating to exten
                 <p>
                   Add new features via Lens Extensions. Check out the 
                   <a
-                    href="https://docs.k8slens.dev/main/extensions/"
+                    href="https://docs.k8slens.dev/extensions/"
                     rel="noreferrer"
                     target="_blank"
                   >
diff --git a/src/migrations/weblinks-store/currentVersion.ts b/src/migrations/weblinks-store/currentVersion.ts
index 40025e64cb..afa404847b 100644
--- a/src/migrations/weblinks-store/currentVersion.ts
+++ b/src/migrations/weblinks-store/currentVersion.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { lensSlackWeblinkId, slackUrl } from "../../common/vars";
+import { docsUrl, lensDocumentationWeblinkId, lensSlackWeblinkId, slackUrl } from "../../common/vars";
 import type { WeblinkData } from "../../common/weblink-store";
 import type { MigrationDeclaration } from "../helpers";
 import packageJson from "../../../package.json";
@@ -20,6 +20,12 @@ export default {
       slackWeblink.url = slackUrl;
     }
 
+    const docsWeblink = weblinks.find(weblink => weblink.id === lensDocumentationWeblinkId);
+
+    if (docsWeblink) {
+      docsWeblink.url = docsUrl;
+    }
+
     store.set("weblinks", weblinks);
   },
 } as MigrationDeclaration;