From e426c53654f01c92177f0bc328690eba12866e9f Mon Sep 17 00:00:00 2001 From: Vijay A Date: Fri, 9 Aug 2024 17:45:29 -0500 Subject: [PATCH] Upgrade electron to '32.0.0-beta.3' --- package.json | 2 +- pnpm-lock.yaml | 22 +++++++++++----------- src/webview/contextMenuBuilder.ts | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index d077ac9514..769f54bf14 100644 --- a/package.json +++ b/package.json @@ -163,7 +163,7 @@ "chalk": "5.3.0", "concurrently": "8.2.2", "cross-env": "7.0.3", - "electron": "31.3.1", + "electron": "32.0.0-beta.5", "electron-builder": "24.13.3", "esbuild": "0.16.17", "esbuild-plugin-copy": "2.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6a9adef780..8d745ca2b2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,7 +43,7 @@ importers: version: 5.1.0 '@electron/remote': specifier: 2.1.2 - version: 2.1.2(electron@31.3.1) + version: 2.1.2(electron@32.0.0-beta.5) '@emotion/react': specifier: 11.11.4 version: 11.11.4(@types/react@18.3.3)(react@18.3.1) @@ -73,7 +73,7 @@ importers: version: 7.4.0(history@5.3.0)(mobx@6.13.1)(path-to-regexp@6.2.2) '@syed_umair/electron-process-manager': specifier: 1.1.0 - version: 1.1.0(electron@31.3.1) + version: 1.1.0(electron@32.0.0-beta.5) auto-launch: specifier: 5.0.6 version: 5.0.6 @@ -353,8 +353,8 @@ importers: specifier: 7.0.3 version: 7.0.3 electron: - specifier: 31.3.1 - version: 31.3.1 + specifier: 32.0.0-beta.5 + version: 32.0.0-beta.5 electron-builder: specifier: 24.13.3 version: 24.13.3(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) @@ -3235,8 +3235,8 @@ packages: resolution: {integrity: sha512-1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg==} engines: {node: '>=8.0.0'} - electron@31.3.1: - resolution: {integrity: sha512-9fiuWlRhBfygtcT+auRd/WdBK/f8LZZcrpx0RjpXhH2DPTP/PfnkC4JB1PW55qCbGbh4wAgkYbf4ExIag8oGCA==} + electron@32.0.0-beta.5: + resolution: {integrity: sha512-z1WFBLKv7oFXTI69LhLGsKINC1Mkk8A2R4uW0xsXPimczt/1+9VzbI9HQPKPZHu9celzjWY8kYS2ELzLX2+URA==} engines: {node: '>= 12.20.55'} hasBin: true @@ -8172,9 +8172,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@electron/remote@2.1.2(electron@31.3.1)': + '@electron/remote@2.1.2(electron@32.0.0-beta.5)': dependencies: - electron: 31.3.1 + electron: 32.0.0-beta.5 '@electron/universal@1.5.1': dependencies: @@ -9100,9 +9100,9 @@ snapshots: mobx: 6.13.1 path-to-regexp: 6.2.2 - '@syed_umair/electron-process-manager@1.1.0(electron@31.3.1)': + '@syed_umair/electron-process-manager@1.1.0(electron@32.0.0-beta.5)': dependencies: - electron: 31.3.1 + electron: 32.0.0-beta.5 electron-process-reporter: 1.4.0 '@szmarczak/http-timer@4.0.6': @@ -11172,7 +11172,7 @@ snapshots: jsonfile: 4.0.0 mkdirp: 0.5.6 - electron@31.3.1: + electron@32.0.0-beta.5: dependencies: '@electron/get': 2.0.3 '@types/node': 20.14.10 diff --git a/src/webview/contextMenuBuilder.ts b/src/webview/contextMenuBuilder.ts index d686059633..92a246cf59 100644 --- a/src/webview/contextMenuBuilder.ts +++ b/src/webview/contextMenuBuilder.ts @@ -867,8 +867,8 @@ export class ContextMenuBuilder { new MenuItem({ label: this.stringTable.goBack(), accelerator: `${cmdOrCtrlShortcutKey()}+left`, - enabled: webContents.canGoBack(), - click: () => webContents.goBack(), + enabled: webContents.navigationHistory.canGoBack(), + click: () => webContents.navigationHistory.goBack(), }), ); } @@ -882,8 +882,8 @@ export class ContextMenuBuilder { new MenuItem({ label: this.stringTable.goForward(), accelerator: `${cmdOrCtrlShortcutKey()}+right`, - enabled: webContents.canGoForward(), - click: () => webContents.goForward(), + enabled: webContents.navigationHistory.canGoForward(), + click: () => webContents.navigationHistory.goForward(), }), ); }