From 1ef74289ef67f2e95657a20566c7b596c3d547dc Mon Sep 17 00:00:00 2001 From: Jim Ehrismann <40840436+jim-docker@users.noreply.github.com> Date: Tue, 6 Dec 2022 17:45:27 -0500 Subject: [PATCH] Release 6.2.5 (#6707) * Release 6.2.5 Signed-off-by: Jim Ehrismann * Bump electron from 19.1.8 to 19.1.9 (#6686) Bumps [electron](https://github.com/electron/electron) from 19.1.8 to 19.1.9. - [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.8...v19.1.9) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix race conditrion preventing window from opening (#6680) Signed-off-by: Sebastian Malton Signed-off-by: Sebastian Malton * Fix: remove excessive scrollbars from the TabLayout view (#6689) * Remove excessive scrollbars from the TabLayout view Signed-off-by: Alex Andreev * Updating snapshots Signed-off-by: Alex Andreev * Updating snapshots harder Signed-off-by: Alex Andreev Signed-off-by: Alex Andreev * Fix not being able to add custom helm repos (#6692) * Add missing safety checks in unit tests for structured clone issues Signed-off-by: Sebastian Malton * Fix not being able to add custom helm repos Signed-off-by: Sebastian Malton Signed-off-by: Sebastian Malton * Fix crash in PersistentVolumeDetails (#6691) Signed-off-by: Sebastian Malton Signed-off-by: Sebastian Malton * Fix top-bar .separator width (#6706) Signed-off-by: Alex Andreev Signed-off-by: Alex Andreev Signed-off-by: Jim Ehrismann Signed-off-by: dependabot[bot] Signed-off-by: Sebastian Malton Signed-off-by: Alex Andreev Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sebastian Malton Co-authored-by: Alex Andreev --- package.json | 4 +- .../endpoints/persistent-volume.api.ts | 2 +- ...ing-cluster-frame-components.test.tsx.snap | 4 +- .../order-of-sidebar-items.test.tsx.snap | 8 +- ...-and-tab-navigation-for-core.test.tsx.snap | 20 +++-- ...ab-navigation-for-extensions.test.tsx.snap | 32 +++++-- .../visibility-of-sidebar-items.test.tsx.snap | 8 +- .../workload-overview.test.tsx.snap | 4 +- ...when-cluster-is-not-relevant.test.tsx.snap | 8 +- ...when-cluster-is-not-relevant.test.tsx.snap | 12 ++- .../edit-namespace-from-new-tab.test.tsx.snap | 64 ++++++++++---- ...e-from-previously-opened-tab.test.tsx.snap | 8 +- ...when-cluster-is-not-relevant.test.tsx.snap | 12 ++- ...-custom-helm-repository-dialog-content.tsx | 3 +- ...lling-helm-chart-from-new-tab.test.ts.snap | 84 ++++++++++++++----- ...rt-from-previously-opened-tab.test.ts.snap | 8 +- ...tab-for-installing-helm-chart.test.ts.snap | 32 +++++-- .../upgrade-chart-new-tab.test.ts.snap | 28 +++++-- ...wing-details-for-helm-release.test.ts.snap | 64 ++++++++++---- .../__snapshots__/download-logs.test.tsx.snap | 8 +- .../create-lens-window.injectable.ts | 15 +++- .../components/+cluster/cluster-overview.tsx | 2 +- .../+storage-volumes/volume-details.tsx | 2 +- .../+workloads-overview/overview.tsx | 2 +- .../item-object-list/item-list-layout.scss | 2 +- .../components/layout/main-layout.module.scss | 4 +- .../layout/siblings-in-tab-layout.tsx | 4 +- .../components/layout/tab-layout-2.tsx | 4 +- .../components/layout/tab-layout.scss | 10 ++- src/renderer/components/layout/tab-layout.tsx | 5 +- .../layout/top-bar/top-bar.module.scss | 2 +- src/renderer/components/table/table.scss | 4 + .../__snapshots__/cluster-frame.test.tsx.snap | 6 +- .../override-messaging-from-window-to-main.ts | 7 ++ ...override-requesting-from-window-to-main.ts | 7 ++ yarn.lock | 8 +- 36 files changed, 368 insertions(+), 129 deletions(-) diff --git a/package.json b/package.json index 873923cabf77..0b604953780a 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.2.4", + "version": "6.2.5", "main": "static/build/main.js", "copyright": "© 2022 OpenLens Authors", "license": "MIT", @@ -375,7 +375,7 @@ "css-loader": "^6.7.1", "deepdash": "^5.3.9", "dompurify": "^2.4.1", - "electron": "^19.1.8", + "electron": "^19.1.9", "electron-builder": "^23.6.0", "electron-notarize": "^0.3.0", "esbuild": "^0.15.14", diff --git a/src/common/k8s-api/endpoints/persistent-volume.api.ts b/src/common/k8s-api/endpoints/persistent-volume.api.ts index 3524f6a606b4..db230e9da374 100644 --- a/src/common/k8s-api/endpoints/persistent-volume.api.ts +++ b/src/common/k8s-api/endpoints/persistent-volume.api.ts @@ -43,7 +43,7 @@ export interface PersistentVolumeSpec { capacity?: Partial>; flexVolume?: { driver: string; // ceph.rook.io/rook-ceph-system, - options: { + options?: { clusterNamespace: string; // rook-ceph, image: string; // pvc-c5d7c485-9f1b-11e8-b0ea-9600000e54fb, pool: string; // replicapool, diff --git a/src/features/cluster/__snapshots__/legacy-extension-adding-cluster-frame-components.test.tsx.snap b/src/features/cluster/__snapshots__/legacy-extension-adding-cluster-frame-components.test.tsx.snap index 7d9748dcbd9a..cac313639977 100644 --- a/src/features/cluster/__snapshots__/legacy-extension-adding-cluster-frame-components.test.tsx.snap +++ b/src/features/cluster/__snapshots__/legacy-extension-adding-cluster-frame-components.test.tsx.snap @@ -272,7 +272,9 @@ exports[`legacy extension adding cluster frame components given custom component -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2485,7 +2493,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
-
+
@@ -2939,7 +2949,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
-
+
@@ -3416,7 +3428,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -919,7 +921,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -1562,7 +1566,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -2274,7 +2280,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -2964,7 +2972,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -3726,7 +3736,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -4490,7 +4502,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -5216,7 +5230,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -5937,7 +5953,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -6649,7 +6667,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -7361,7 +7381,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -8073,7 +8095,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -8620,7 +8644,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -9341,7 +9367,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -9888,7 +9916,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
@@ -10435,7 +10465,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam class="TabLayout" data-testid="tab-layout" > -
+
diff --git a/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap b/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap index f82cbc2e0ed9..580d1d22d92f 100644 --- a/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap +++ b/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap @@ -298,7 +298,9 @@ exports[`cluster/namespaces - edit namespaces from previously opened tab given t
-
+
-
+
-
+
-
+
-
+
submitCustomRepository(helmRepo)} + next={() => submitCustomRepository(toJS(helmRepo))} testIdForNext="custom-helm-repository-submit-button" testIdForPrev="custom-helm-repository-cancel-button" > 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 8a3f4f094ce4..b114009a2f4b 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 @@ -273,7 +273,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -11909,7 +11935,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -946,7 +948,9 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
-
+
@@ -1699,7 +1703,9 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
-
+
@@ -2506,7 +2512,9 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
-
+
@@ -3349,7 +3357,9 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
-
+
@@ -4332,7 +4342,9 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
-
+
@@ -5317,7 +5329,9 @@ exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navi
-
+
diff --git a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap index c45e3d30b6a7..13945ab2a9d8 100644 --- a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap +++ b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap @@ -286,7 +286,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -1027,7 +1029,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -1773,7 +1777,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -2689,7 +2695,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -3666,7 +3674,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -4643,7 +4653,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -5865,7 +5877,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -7087,7 +7101,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -8309,7 +8325,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -9356,7 +9374,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -10405,7 +10425,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -11627,7 +11649,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -12604,7 +12628,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -13584,7 +13610,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -14500,7 +14528,9 @@ exports[`showing details for helm release given application is started when navi
-
+
@@ -15477,7 +15507,9 @@ exports[`showing details for helm release given application is started when navi
-
+
diff --git a/src/features/pod-logs/__snapshots__/download-logs.test.tsx.snap b/src/features/pod-logs/__snapshots__/download-logs.test.tsx.snap index 442d92dbe999..33e1deb85daa 100644 --- a/src/features/pod-logs/__snapshots__/download-logs.test.tsx.snap +++ b/src/features/pod-logs/__snapshots__/download-logs.test.tsx.snap @@ -273,7 +273,9 @@ exports[`download logs options in logs dock tab opening pod logs when logs avail
-
+
-
+
Promise; onFocus?: () => void; onBlur?: () => void; @@ -93,8 +98,12 @@ const createLensWindowInjectable = getInjectable({ }, }); - const { file: filePathForContent, url: urlForContent } = - configuration.getContentSource(); + const { + file: filePathForContent, + url: urlForContent, + } = configuration.getContentSource(); + + const beforeOpen = configuration.beforeOpen?.(); if (filePathForContent) { await browserWindow.loadFile(filePathForContent); @@ -102,7 +111,7 @@ const createLensWindowInjectable = getInjectable({ await browserWindow.loadUrl(urlForContent); } - await configuration.beforeOpen?.(); + await beforeOpen; } showWindow(); diff --git a/src/renderer/components/+cluster/cluster-overview.tsx b/src/renderer/components/+cluster/cluster-overview.tsx index 6eac0e30c743..f1cb9ad461e1 100644 --- a/src/renderer/components/+cluster/cluster-overview.tsx +++ b/src/renderer/components/+cluster/cluster-overview.tsx @@ -102,7 +102,7 @@ class NonInjectedClusterOverview extends React.Component { const isMetricHidden = hostedCluster.isMetricHidden(ClusterMetricsResourceType.Cluster); return ( - +
{this.renderClusterOverview(isLoaded, isMetricHidden)}
diff --git a/src/renderer/components/+storage-volumes/volume-details.tsx b/src/renderer/components/+storage-volumes/volume-details.tsx index 32ab0c5307bc..31d15c24a157 100644 --- a/src/renderer/components/+storage-volumes/volume-details.tsx +++ b/src/renderer/components/+storage-volumes/volume-details.tsx @@ -94,7 +94,7 @@ export class PersistentVolumeDetails extends React.Component { - Object.entries(flexVolume.options).map(([name, value]) => ( + Object.entries(flexVolume.options ?? {}).map(([name, value]) => ( {value} diff --git a/src/renderer/components/+workloads-overview/overview.tsx b/src/renderer/components/+workloads-overview/overview.tsx index 83a2bf9e846d..7c93bd429c51 100644 --- a/src/renderer/components/+workloads-overview/overview.tsx +++ b/src/renderer/components/+workloads-overview/overview.tsx @@ -103,7 +103,7 @@ class NonInjectedWorkloadsOverview extends React.Component { render() { return ( - +
Overview
diff --git a/src/renderer/components/item-object-list/item-list-layout.scss b/src/renderer/components/item-object-list/item-list-layout.scss index 254be55936d4..84427369ada3 100644 --- a/src/renderer/components/item-object-list/item-list-layout.scss +++ b/src/renderer/components/item-object-list/item-list-layout.scss @@ -31,7 +31,7 @@ > .items { position: relative; - min-height: 200px; + min-height: 130px; } } diff --git a/src/renderer/components/layout/main-layout.module.scss b/src/renderer/components/layout/main-layout.module.scss index fad743041c89..e8823104273e 100644 --- a/src/renderer/components/layout/main-layout.module.scss +++ b/src/renderer/components/layout/main-layout.module.scss @@ -23,9 +23,7 @@ } .contents { - grid-area: contents; - overflow: auto; - height: calc(100vh - var(--status-bar-height) - var(--main-layout-header)); + overflow: hidden; } .footer { diff --git a/src/renderer/components/layout/siblings-in-tab-layout.tsx b/src/renderer/components/layout/siblings-in-tab-layout.tsx index 04f53c0f855a..06e57227e984 100644 --- a/src/renderer/components/layout/siblings-in-tab-layout.tsx +++ b/src/renderer/components/layout/siblings-in-tab-layout.tsx @@ -12,6 +12,7 @@ import type { HierarchicalSidebarItem } from "./sidebar-items.injectable"; interface SiblingTabLayoutProps { children: React.ReactNode; + scrollable?: boolean; } interface Dependencies { @@ -19,13 +20,14 @@ interface Dependencies { } const NonInjectedSiblingsInTabLayout = observer( - ({ tabs, children }: Dependencies & SiblingTabLayoutProps) => { + ({ tabs, children, ...other }: Dependencies & SiblingTabLayoutProps) => { const dereferencedTabs = tabs.get(); if (dereferencedTabs.length) { return ( {children} diff --git a/src/renderer/components/layout/tab-layout-2.tsx b/src/renderer/components/layout/tab-layout-2.tsx index a0348383c18a..37a1bb7b3fb3 100644 --- a/src/renderer/components/layout/tab-layout-2.tsx +++ b/src/renderer/components/layout/tab-layout-2.tsx @@ -15,11 +15,13 @@ import type { HierarchicalSidebarItem } from "./sidebar-items.injectable"; export interface TabLayoutProps { tabs?: HierarchicalSidebarItem[]; children?: React.ReactNode; + scrollable?: boolean; } export const TabLayout = observer( ({ tabs = [], + scrollable, children, }: TabLayoutProps) => { const hasTabs = tabs.length > 0; @@ -49,7 +51,7 @@ export const TabLayout = observer( )} -
+
{children} diff --git a/src/renderer/components/layout/tab-layout.scss b/src/renderer/components/layout/tab-layout.scss index c447f77eea19..7ab3395e1590 100755 --- a/src/renderer/components/layout/tab-layout.scss +++ b/src/renderer/components/layout/tab-layout.scss @@ -11,16 +11,20 @@ > .Tabs { background: var(--layoutTabsBackground); - min-height: 32px; + min-height: 36px; } main { $spacing: $margin * 2; flex-grow: 1; - overflow-y: scroll; // always reserve space for scrollbar (17px) + overflow-y: hidden; overflow-x: auto; margin: $spacing; - margin-right: 0; + + &.scrollable { + overflow-y: scroll; + margin-right: 0; + } } } diff --git a/src/renderer/components/layout/tab-layout.tsx b/src/renderer/components/layout/tab-layout.tsx index 19f8db4d6df9..aa6c469878ac 100644 --- a/src/renderer/components/layout/tab-layout.tsx +++ b/src/renderer/components/layout/tab-layout.tsx @@ -20,6 +20,7 @@ export interface TabLayoutProps { contentClass?: IClassName; tabs?: TabLayoutRoute[]; children?: ReactNode; + scrollable?: boolean; } export interface TabLayoutRoute { @@ -31,7 +32,7 @@ export interface TabLayoutRoute { default?: boolean; // initial tab to open with provided `url, by default tabs[0] is used } -export const TabLayout = observer(({ className, contentClass, tabs = [], children }: TabLayoutProps) => { +export const TabLayout = observer(({ className, contentClass, tabs = [], scrollable, children }: TabLayoutProps) => { const currentLocation = navigation.location.pathname; const hasTabs = tabs.length > 0; const startTabUrl = hasTabs ? (tabs.find(tab => tab.default) || tabs[0])?.url : null; @@ -50,7 +51,7 @@ export const TabLayout = observer(({ className, contentClass, tabs = [], childre ))} )} -
+
{hasTabs && ( diff --git a/src/renderer/components/layout/top-bar/top-bar.module.scss b/src/renderer/components/layout/top-bar/top-bar.module.scss index 9b880442c69e..7b3646dec344 100644 --- a/src/renderer/components/layout/top-bar/top-bar.module.scss +++ b/src/renderer/components/layout/top-bar/top-bar.module.scss @@ -28,7 +28,7 @@ } .separator { - flex-basis: 100%; + flex-grow: 1; } :global(.is-mac) .topBar { diff --git a/src/renderer/components/table/table.scss b/src/renderer/components/table/table.scss index 982c89610109..a76f9c116ff5 100644 --- a/src/renderer/components/table/table.scss +++ b/src/renderer/components/table/table.scss @@ -14,6 +14,10 @@ overflow: auto; } + &.scrollable.virtual { + overflow: unset; + } + &.selectable { .TableHead, .TableRow { padding: 0 $padding; diff --git a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap index d629d8579877..eb8b67f8ff5c 100644 --- a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap +++ b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap @@ -786,7 +786,7 @@ exports[` given cluster with list nodes and namespaces permissio class="TabLayout" >
given cluster without list nodes, but with namespaces
-
+
{ ); } + try { + message = deserialize(serialize(message)); + } catch (error) { + throw new Error(`Tried to send a message to channel "${channelId}" that is not compatible with StructuredClone: ${error}`); + } + listeners.forEach((listener) => listener.handler(message)); }); }; 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 ddf758f5b6c9..70526bd84c23 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,6 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import type { DiContainer } from "@ogre-tools/injectable"; +import { deserialize, serialize } from "v8"; 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"; @@ -46,6 +47,12 @@ export const overrideRequestingFromWindowToMain = (mainDi: DiContainer) => { ); } + try { + request = deserialize(serialize(request)); + } catch (error) { + throw new Error(`Tried to request from channel "${channel.id}" with data that is not compatible with StructuredClone: ${error}`); + } + return requestListener.handler(request); }) as RequestFromChannel, ); diff --git a/yarn.lock b/yarn.lock index e23ddf852277..174377462bc9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5100,10 +5100,10 @@ electron-window-state@^5.0.3: jsonfile "^4.0.0" mkdirp "^0.5.1" -electron@^19.1.8: - version "19.1.8" - resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.8.tgz#3ce19c270ca86d05bbf0df5ceeaea2d23edc7083" - integrity sha512-UfPQdFjgKI0xCm1V5sV3iAVOs0kCwAE91xWzV5tI7ij14yOkxTdXp9BqTzFaSbQYLYxn6q1BUUe1nlzjJjzAnw== +electron@^19.1.9: + version "19.1.9" + resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.9.tgz#01995eea4014f7cdb2f616f5f3492d4ed6f5e4f0" + integrity sha512-XT5LkTzIHB+ZtD3dTmNnKjVBWrDWReCKt9G1uAFLz6uJMEVcIUiYO+fph5pLXETiBw/QZBx8egduMEfIccLx+g== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26"