phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 2 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
4 changed files with 737 additions and 121 deletions
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-builder": "23.3.3",
"electron-connect": "0.6.3", "electron-connect": "0.6.3",
"electron-context-menu": "3.6.1", "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-is-dev": "2.0.0",
"electron-log": "4.4.8", "electron-log": "4.4.8",
"electron-mocha": "11.0.2", "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(), setLocale: jest.fn(),
})); }));
jest.mock('electron-devtools-installer', () => { jest.mock('electron-extension-installer', () => {
return () => ({ return () => ({
REACT_DEVELOPER_TOOLS: 'react-developer-tools', REACT_DEVELOPER_TOOLS: 'react-developer-tools',
}); });

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

@@ -4,7 +4,7 @@
import path from 'path'; import path from 'path';
import {app, ipcMain, nativeTheme, session} from 'electron'; 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 isDev from 'electron-is-dev';
import { import {
@@ -335,7 +335,11 @@ async function initializeAfterAppReady() {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore // @ts-ignore
if (global.isDev || __IS_NIGHTLY_BUILD__) { if (global.isDev || __IS_NIGHTLY_BUILD__) {
installExtension(REACT_DEVELOPER_TOOLS). installExtension(REACT_DEVELOPER_TOOLS, {
loadExtensionOptions: {
allowFileAccess: true,
},
}).
then((name) => log.info(`Added Extension: ${name}`)). then((name) => log.info(`Added Extension: ${name}`)).
catch((err) => log.error('An error occurred: ', err)); catch((err) => log.error('An error occurred: ', err));
} }