Bumped electron to 13.6.1

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+## Added
+- [main] Bumped `electron` to v13.6.1 in PR [2318](https://github.com/microsoft/BotFramework-Emulator/pull/2318)
 
 ## v4.14.0 - 2021 - 7 - 15
 ## Added

packages/app/client/src/ui/editor/welcomePage/welcomePage.scss.d.ts

@@ -23,3 +23,5 @@ export const stepContent: string;
 export const spacing: string;
 export const marginFix: string;
 export const botInspectorHeaderContainer: string;
+export const flexRow: string;
+export const flexColumn: string;

packages/app/main/package.json

@@ -102,9 +102,9 @@
     "concurrently": "^3.5.1",
     "cross-env": "^5.1.3",
     "del": "^3.0.0",
-    "electron": "11.0.1",
-    "electron-builder": "22.9.1",
-    "electron-rebuild": "2.3.4",
+    "electron": "13.6.1",
+    "electron-builder": "22.11.4",
+    "electron-rebuild": "3.2.3",
     "eslint": "7.19.0",
     "eslint-config-prettier": "^3.5.0",
     "eslint-plugin-import": "2.20.0",
@@ -146,11 +146,12 @@
     "https-proxy-agent": "2.2.3",
     "jest-fetch-mock": "^1.6.2",
     "jsonwebtoken": "^8.3.0",
-    "keytar": "7.3.0",
+    "keytar": "7.7.0",
     "mkdirp": "^0.5.1",
     "moment": "^2.22.1",
     "node-fetch": "^2.3.0",
     "node-uuid": "^1.4.8",
+    "npmlog": "^5.0.1",
     "read-text-file": "^1.1.0",
     "redux": "^3.7.2",
     "redux-saga": "^0.16.0",
@@ -169,7 +170,7 @@
     "productName": "Bot Framework Emulator",
     "copyright": "Copyright © 2018 Microsoft Corporation",
     "electronDownload": {
-      "version": "11.0.1"
+      "version": "13.6.1"
     },
     "protocols": [
       {

packages/app/main/src/commands/electronCommands.ts

@@ -194,8 +194,8 @@ export class ElectronCommands {
   // ---------------------------------------------------------------------------
   // Moves an item to the trash
   @Command(Commands.UnlinkFile)
-  protected unlinkFile(filePath: string): boolean {
-    return shell.moveItemToTrash(path.resolve(filePath));
+  protected async unlinkFile(filePath: string): Promise<void> {
+    return shell.trashItem(path.resolve(filePath));
   }
 
   // ---------------------------------------------------------------------------

packages/app/main/src/main.ts

@@ -311,7 +311,7 @@ class EmulatorApplication {
       backgroundColor: '#f7f7f7',
       width: 1400,
       height: 920,
-      webPreferences: { enableRemoteModule: true, nodeIntegration: true, webviewTag: true },
+      webPreferences: { contextIsolation: false, enableRemoteModule: true, nodeIntegration: true, webviewTag: true },
     });
     this.initializeBrowserWindowListeners();
 

packages/app/main/src/services/azureAuthWorkflowService.ts

@@ -128,7 +128,7 @@ export class AzureAuthWorkflowService {
       alwaysOnTop: true,
       width: 490,
       height: 366,
-      webPreferences: { contextIsolation: true, nativeWindowOpen: true },
+      webPreferences: { nativeWindowOpen: true },
     });
 
     browserWindow.removeMenu();

packages/app/main/src/windowManager.ts

@@ -91,13 +91,13 @@ export class WindowManager {
       height: 600,
       title: 'Sign In',
       webPreferences: {
+        contextIsolation: false,
         nodeIntegration: false,
       },
     });
     this.add(win);
     const webContents = win.webContents;
 
-    // webContents.openDevTools();
     webContents.setZoomLevel(getSettings().windowState.zoomLevel);
 
     win.on('closed', () => {

packages/app/shared/src/state/actions/resourcesActions.spec.ts

@@ -122,6 +122,6 @@ describe('resources actions', () => {
     const action = openResourcesSettings(payload);
 
     expect(action.type).toBe(OPEN_RESOURCE_SETTINGS);
-    expect(action.payload).toEqual(payload);
+    expect(action.payload).toEqual({ dialog: payload, resolver: undefined });
   });
 });

packages/sdk/ui-react/src/widget/checkbox/checkbox.scss.d.ts

@@ -6,3 +6,4 @@ export const checkMark: string;
 export const checked: string;
 export const indeterminate: string;
 export const focused: string;
+export const ariaLiveRegion: string;

packages/sdk/ui-react/src/widget/collapsibleJsonViewer/collapsibleJsonViewer.scss.d.ts

@@ -1,2 +1,3 @@
 // This is a generated file. Changes are likely to result in being overwritten
 export const collapsibleJsonViewer: string;
+export const ariaRegion: string;