quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-13 04:28:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update @electron/remote usage for electron v14

Browse source
This commit is contained in:
Labhansh Agrawal 2021-11-23 09:20:10 +05:30
parent e7acdeac37
commit 4c90d7555c
5 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/index.ts
View file

@ -10,8 +10,8 @@ if (['--help', '-v', '--version'].includes(process.argv[1])) {
}
// Enable remote module
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-var-requires
require('@electron/remote/main').initialize();
import {initialize as remoteInitialize} from '@electron/remote/main';
remoteInitialize();
// Native
import {resolve} from 'path';

10
app/ui/window.ts
View file

@ -1,4 +1,4 @@
import {app, BrowserWindow, shell, Menu, BrowserWindowConstructorOptions, Event, WebPreferences} from 'electron';
import {app, BrowserWindow, shell, Menu, BrowserWindowConstructorOptions, Event} from 'electron';
import {isAbsolute, normalize, sep} from 'path';
import {URL, fileURLToPath} from 'url';
import {v4 as uuidv4} from 'uuid';
@ -14,6 +14,7 @@ import contextMenuTemplate from './contextmenu';
import {execCommand} from '../commands';
import {setRendererType, unsetRendererType} from '../utils/renderer-utils';
import {decorateSessionOptions, decorateSessionClass} from '../plugins';
import {enable as remoteEnable} from '@electron/remote/main';
export function newWindow(
options_: BrowserWindowConstructorOptions,
@ -38,12 +39,15 @@ export function newWindow(
webPreferences: {
nodeIntegration: true,
navigateOnDragDrop: true,
enableRemoteModule: true,
contextIsolation: false
} as WebPreferences,
},
...options_
};
const window = new BrowserWindow(app.plugins.getDecoratedBrowserOptions(winOpts));
// Enable remote module on this window
remoteEnable(window.webContents);
window.uid = classOpts.uid;
app.plugins.onWindowClass(window);

4
lib/command-registry.ts
View file

@ -1,9 +1,9 @@
import * as remote from '@electron/remote';
import {require as remoteRequire} from '@electron/remote';
import {HyperDispatch} from './hyper';
import {closeSearch} from './actions/sessions';
// TODO: Should be updates to new async API https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31
const {getDecoratedKeymaps} = remote.require('./plugins') as typeof import('../app/plugins');
const {getDecoratedKeymaps} = remoteRequire('./plugins') as typeof import('../app/plugins');
let commands: Record<string, (event: any, dispatch: HyperDispatch) => void> = {
'editor:search-close': (e, dispatch) => {

4
lib/utils/config.ts
View file

@ -1,8 +1,8 @@
import {ipcRenderer} from 'electron';
import * as remote from '@electron/remote';
import {require as remoteRequire} from '@electron/remote';
// TODO: Should be updates to new async API https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31
const plugins = remote.require('./plugins') as typeof import('../../app/plugins');
const plugins = remoteRequire('./plugins') as typeof import('../../app/plugins');
export function getConfig() {
return plugins.getDecoratedConfig();

4
lib/utils/plugins.ts
View file

@ -1,6 +1,6 @@
// eslint-disable-next-line eslint-comments/disable-enable-pair
/* eslint-disable @typescript-eslint/no-unsafe-return */
import * as remote from '@electron/remote';
import {require as remoteRequire} from '@electron/remote';
// TODO: Should be updates to new async API https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31
import {connect as reduxConnect, Options} from 'react-redux';
@ -32,7 +32,7 @@ import IPCChildProcess from './ipc-child-process';
import ChildProcess from 'child_process';
// remote interface to `../plugins`
const plugins = remote.require('./plugins') as typeof import('../../app/plugins');
const plugins = remoteRequire('./plugins') as typeof import('../../app/plugins');
// `require`d modules
let modules: hyperPlugin[];