aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Fix React Developer Tools for some users (#2783)

Browse source 
* Fix react dev tools test

* Fix test
This commit is contained in:
Devin Binnie 2023-07-11 11:32:49 -04:00 committed by GitHub
parent e4e38dc000
commit adf4b40836
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 737 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

846
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -172,7 +172,7 @@
"electron-builder": "23.3.3",
"electron-connect": "0.6.3",
"electron-context-menu": "3.6.1",
"electron-devtools-installer": "3.2.0",
"electron-extension-installer": "1.2.0",
"electron-is-dev": "2.0.0",
"electron-log": "4.4.8",
"electron-mocha": "11.0.2",

2
src/main/app/initialize.test.js
View file

@ -79,7 +79,7 @@ jest.mock('main/i18nManager', () => ({
setLocale: jest.fn(),
}));
jest.mock('electron-devtools-installer', () => {
jest.mock('electron-extension-installer', () => {
return () => ({
REACT_DEVELOPER_TOOLS: 'react-developer-tools',
});

8
src/main/app/initialize.ts
View file

@ -4,7 +4,7 @@
import path from 'path';
import {app, ipcMain, nativeTheme, session} from 'electron';
import installExtension, {REACT_DEVELOPER_TOOLS} from 'electron-devtools-installer';
import installExtension, {REACT_DEVELOPER_TOOLS} from 'electron-extension-installer';
import isDev from 'electron-is-dev';
import {
@ -335,7 +335,11 @@ 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, {
loadExtensionOptions: {
allowFileAccess: true,
},
}).
then((name) => log.info(`Added Extension: ${name}`)).
catch((err) => log.error('An error occurred: ', err));
}