microsoft · tonyanziano · Feb 3, 2021 · Jan 27, 2021 · Jan 28, 2021 · Jan 29, 2021
@@ -78,6 +78,6 @@
   },
   "dependencies": {
     "lerna": "^3.14.1",
-    "keytar": "^4.7.0"
+    "keytar": "7.3.0"
   }
 }
@@ -90,7 +90,7 @@
     "sass-loader": "^7.1.0",
     "style-loader": "^0.21.0",
     "terser-webpack-plugin": "2.3.3",
-    "typescript": "3.1.1",
+    "typescript": "4.1.3",
     "typings-for-css-modules-loader": "^1.7.0",
     "url-loader": "^1.0.1",
     "webpack": "^4.32.2",

@@ -44,7 +44,12 @@ export const forwardToMain: Middleware = _store => next => action => {
   if ((action as any).meta && (action as any).meta.doNotForward) {
     return next(action);
   }
+
+  // Electron 9 does not allow functions to be sent over ipc (https://www.electronjs.org/docs/api/ipc-renderer#ipcrenderersendchannel-args)
+  // JSON.stringify() removes function properties from objects -- these functions do not need to be maintained in the main process' copy of state
+  const processedAction = JSON.parse(JSON.stringify(action));
+
   // forward the action over ipc to the main process
-  ipcRenderer.sendSync('sync-store', action);
+  ipcRenderer.sendSync('sync-store', processedAction);
   return next(action);
 };
@@ -100,11 +100,11 @@
     "concurrently": "^3.5.1",
     "cross-env": "^5.1.3",
     "del": "^3.0.0",
-    "electron": "4.1.1",
+    "electron": "11.0.1",
     "electron-builder": "20.29.0",
     "electron-builder-http": "19.27.5",
     "electron-builder-lib": "20.23.1",
-    "electron-rebuild": "1.8.5",
+    "electron-rebuild": "2.3.4",
     "eslint": "^5.12.0",
     "eslint-config-prettier": "^3.5.0",
     "eslint-plugin-import": "2.20.0",
@@ -119,7 +119,7 @@
     "npm-run-all": "^4.1.5",
     "spectron": "^6.0.0",
     "through2": "^2.0.3",
-    "typescript": "3.1.1",
+    "typescript": "4.1.3",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0"
   },
@@ -147,7 +147,7 @@
     "https-proxy-agent": "2.2.3",
     "jest-fetch-mock": "^1.6.2",
     "jsonwebtoken": "^8.3.0",
-    "keytar": "^4.7.0",
+    "keytar": "7.3.0",
     "mkdirp": "^0.5.1",
     "moment": "^2.22.1",
     "node-fetch": "^2.3.0",
@@ -170,7 +170,7 @@
     "productName": "Bot Framework Emulator",
     "copyright": "Copyright © 2018 Microsoft Corporation",
     "electronDownload": {
-      "version": "4.1.1"
+      "version": "11.0.1"
     },
     "protocols": [
       {

@@ -401,7 +401,7 @@ export class AppMenuBuilder {
         { role: 'services', submenu: [] },
         { type: 'separator' },
         { role: 'hide' },
-        { role: 'hideothers' },
+        { role: 'hideOthers' },
         { role: 'unhide' },
         { type: 'separator' },
         { role: 'quit' },
@@ -439,12 +439,12 @@ export class AppMenuBuilder {
       label: 'View',
       id: 'view',
       submenu: [
-        { role: 'resetzoom', label: 'Reset Zoom' },
-        { role: 'zoomin' },
-        { role: 'zoomout' },
+        { role: 'resetZoom', label: 'Reset Zoom' },
+        { role: 'zoomIn' },
+        { role: 'zoomOut' },
         { type: 'separator' },
         { role: 'togglefullscreen' },
-        { role: 'toggledevtools' },
+        { role: 'toggleDevTools' },
       ],
     };
   }

@@ -80,7 +80,7 @@ export class AzureCommands {
   // Sign the user out of Azure
   @Command(Azure.SignUserOutOfAzure)
   protected async signUserOutOfAzure(prompt: boolean = true) {
-    await new Promise(resolve => session.defaultSession.clearStorageData({}, resolve));
+    await session.defaultSession.clearStorageData({});
 
     store.dispatch(azureLoggedInUserChanged(''));
     try {

@@ -182,9 +182,14 @@ export class ElectronCommands {
   // ---------------------------------------------------------------------------
   // Opens and item on the disk in Explorer (win) or Finder (mac)
   @Command(Commands.OpenFileLocation)
-  protected openFileLocation(filePath: string): boolean {
+  protected async openFileLocation(filePath: string): Promise<boolean> {
     const parts = path.parse(filePath);
-    return shell.openItem(path.resolve(parts.dir));
+    const err = await shell.openPath(path.resolve(parts.dir));
+    if (!err) {
+      // success
+      return true;
+    }
+    return false;
   }
 
   // ---------------------------------------------------------------------------

@@ -207,7 +207,7 @@ export class EmulatorCommands {
         message: 'You have successfully cleared state.',
         title: 'Success!',
       });
-      await new Promise(resolve => session.defaultSession.clearStorageData({}, resolve));
+      await session.defaultSession.clearStorageData({});
     }
 
     return true;

@@ -52,7 +52,7 @@ import {
   TunnelInfo,
   TunnelStatus,
 } from '@bfemulator/app-shared';
-import { app, BrowserWindow, Rectangle, screen, systemPreferences } from 'electron';
+import { app, BrowserWindow, nativeTheme, Rectangle, screen } from 'electron';
 import { CommandServiceImpl, CommandServiceInstance } from '@bfemulator/sdk-shared';
 
 import { AppUpdater } from './appUpdater';
@@ -177,7 +177,7 @@ class EmulatorApplication {
   }
 
   private initializeSystemPreferencesListeners() {
-    systemPreferences.on('inverted-color-scheme-changed', this.onInvertedColorSchemeChanged);
+    nativeTheme.on('updated', this.onInvertedColorSchemeChanged);
   }
 
   private initializeAppListeners() {
@@ -293,7 +293,7 @@ class EmulatorApplication {
     const { theme, availableThemes } = getSettings().windowState;
     const themeInfo = availableThemes.find(availableTheme => availableTheme.name === theme);
 
-    const isHighContrast = systemPreferences.isInvertedColorScheme();
+    const isHighContrast = nativeTheme.shouldUseInvertedColorScheme;
 
     const themeName = isHighContrast ? 'high-contrast' : themeInfo.name;
     const themeComponents = isHighContrast ? path.join('.', 'themes', 'high-contrast.css') : themeInfo.href;
@@ -306,7 +306,13 @@ class EmulatorApplication {
     if (this.mainBrowserWindow) {
       return;
     }
-    this.mainBrowserWindow = new BrowserWindow({ show: false, backgroundColor: '#f7f7f7', width: 1400, height: 920 });
+    this.mainBrowserWindow = new BrowserWindow({
+      show: false,
+      backgroundColor: '#f7f7f7',
+      width: 1400,
+      height: 920,
+      webPreferences: { enableRemoteModule: true, nodeIntegration: true },
+    });
     this.initializeBrowserWindowListeners();
 
     this.mainWindow = new Window(this.mainBrowserWindow);

@@ -163,7 +163,7 @@ export class BotEndpoint {
         client_secret: this.msaPassword,
         scope: `${this.msaAppId}/.default`,
         // flag to request a version 1.0 token
-        ...(this.use10Tokens ? { atver: 1 } : {}),
+        ...(this.use10Tokens ? { atver: '1' } : {}),
       } as { [key: string]: string }).toString(),
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded',

@@ -142,7 +142,7 @@ export class AzureAuthWorkflowService {
       webPreferences: { contextIsolation: true, nativeWindowOpen: true },
     });
 
-    browserWindow.setMenu(null);
+    browserWindow.removeMenu();
 
     const state = uuidv4();
     const requestId = uuidv4();

@@ -45,7 +45,12 @@ export const forwardToRenderer: Middleware = _store => next => action => {
   if ((action as any).meta && (action as any).meta.doNotForward) {
     return next(action);
   }
+
+  // Electron 9 does not allow functions to be sent over ipc (https://www.electronjs.org/docs/api/web-contents#contentssendchannel-args)
+  // JSON.stringify() removes function properties from objects -- these functions do not need to be maintained in the client's copy of state
+  const processedAction = JSON.parse(JSON.stringify(action));
+
   // forward the action over ipc to the client
-  emulatorApplication.mainBrowserWindow.webContents.send('sync-store', action);
+  emulatorApplication.mainBrowserWindow.webContents.send('sync-store', processedAction);
   return next(action);
 };
@@ -35,5 +35,5 @@ import { BrowserWindow, dialog, SaveDialogOptions } from 'electron';
 
 /** Shows a native save dialog */
 export const showSaveDialog = (window: BrowserWindow, options: SaveDialogOptions): string => {
-  return dialog.showSaveDialog(window, options);
+  return dialog.showSaveDialogSync(window, options);
 };
@@ -36,7 +36,7 @@
     "eslint-plugin-typescript": "^1.0.0-rc.3",
     "jest": "24.8.0",
     "rimraf": "^2.6.2",
-    "typescript": "3.1.1"
+    "typescript": "4.1.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.1.5",

@@ -56,7 +56,7 @@
     "jest-enzyme": "^7.0.0",
     "resolve-url-loader": "^2.3.0",
     "sass-loader": "^7.1.0",
-    "typescript": "3.1.1",
+    "typescript": "4.1.3",
     "typings-for-css-modules-loader": "^1.7.0",
     "webpack": "^4.32.2",
     "webpack-cli": "^3.3.2",

@@ -51,7 +51,7 @@
     "jest": "24.8.0",
     "resolve-url-loader": "^2.3.0",
     "sass-loader": "^7.1.0",
-    "typescript": "3.1.1",
+    "typescript": "4.1.3",
     "typings-for-css-modules-loader": "^1.7.0",
     "webpack": "^4.32.2",
     "webpack-cli": "^3.3.2",

@@ -53,7 +53,7 @@
     "sass-loader": "^7.1.0",
     "style-loader": "^0.21.0",
     "terser-webpack-plugin": "2.3.3",
-    "typescript": "3.1.1",
+    "typescript": "4.1.3",
     "typings-for-css-modules-loader": "^1.7.0",
     "webpack": "^4.32.2",
     "webpack-cli": "^3.3.2",

@@ -36,7 +36,7 @@
     "prettier-eslint": "^8.8.2",
     "prettier-eslint-cli": "5.0.0",
     "rimraf": "^2.6.2",
-    "typescript": "3.1.1"
+    "typescript": "^4.1.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.1.5",

@@ -38,7 +38,7 @@
     "prettier-eslint": "^8.8.2",
     "prettier-eslint-cli": "5.0.0",
     "rimraf": "^2.6.2",
-    "typescript": "3.1.1"
+    "typescript": "4.1.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.1.5",

@@ -31,7 +31,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import { EventEmitter } from 'electron';
+import { EventEmitter } from 'events';
 
 import { uniqueId } from '../utils';
 

@@ -5,7 +5,8 @@
     "experimentalDecorators": true,
     "lib": ["dom", "es2015.proxy", "es5", "esnext", "es7"],
     "outDir": "build",
-    "target": "esnext"
+    "target": "esnext",
+    "skipLibCheck": true
   },
   "include": [
     "./src"

@@ -47,7 +47,7 @@
     "resolve-url-loader": "^2.3.0",
     "rimraf": "^2.6.2",
     "sass-loader": "^7.1.0",
-    "typescript": "3.1.1",
+    "typescript": "4.1.3",
     "typings-for-css-modules-loader": "^1.7.0",
     "url-loader": "^1.0.1",
     "webpack": "^4.32.2",