[MM-64867] Upgrade to Electron v37.2.2, some other package changes (#3462)
This commit is contained in:
@@ -85,7 +85,7 @@ jest.mock('main/i18nManager', () => ({
|
||||
setLocale: jest.fn(),
|
||||
}));
|
||||
|
||||
jest.mock('electron-extension-installer', () => {
|
||||
jest.mock('electron-devtools-installer', () => {
|
||||
return () => ({
|
||||
REACT_DEVELOPER_TOOLS: 'react-developer-tools',
|
||||
});
|
||||
|
@@ -5,7 +5,7 @@ import path from 'path';
|
||||
import {pathToFileURL} from 'url';
|
||||
|
||||
import {app, ipcMain, nativeTheme, net, protocol, session} from 'electron';
|
||||
import installExtension, {REACT_DEVELOPER_TOOLS} from 'electron-extension-installer';
|
||||
import installExtension, {REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS} from 'electron-devtools-installer';
|
||||
import isDev from 'electron-is-dev';
|
||||
|
||||
import {
|
||||
@@ -380,12 +380,12 @@ async function initializeAfterAppReady() {
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
if (global.isDev || __IS_NIGHTLY_BUILD__) {
|
||||
installExtension(REACT_DEVELOPER_TOOLS, {
|
||||
installExtension([REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS], {
|
||||
loadExtensionOptions: {
|
||||
allowFileAccess: true,
|
||||
},
|
||||
}).
|
||||
then((name) => log.info(`Added Extension: ${name}`)).
|
||||
then(([react, redux]) => log.info(`Added Extension: ${react.name}, ${redux.name}`)).
|
||||
catch((err) => log.error('An error occurred: ', err));
|
||||
}
|
||||
|
||||
|
@@ -12,7 +12,7 @@ import CallsWidgetWindow from 'main/windows/callsWidgetWindow';
|
||||
|
||||
import {createTemplate} from './app';
|
||||
|
||||
jest.mock('electron-extension-installer', () => {
|
||||
jest.mock('electron-devtools-installer', () => {
|
||||
return () => ({
|
||||
REACT_DEVELOPER_TOOLS: 'react-developer-tools',
|
||||
});
|
||||
|
Reference in New Issue
Block a user