Use @electron/remote module

This commit is contained in:
Labhansh Agrawal 2021-09-07 11:32:49 +00:00
parent b042d212fd
commit 832b51e1f3
9 changed files with 22 additions and 5 deletions

View file

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

View file

@ -10,6 +10,7 @@
}, },
"repository": "zeit/hyper", "repository": "zeit/hyper",
"dependencies": { "dependencies": {
"@electron/remote": "2.0.1",
"async-retry": "1.3.3", "async-retry": "1.3.3",
"chokidar": "^3.5.2", "chokidar": "^3.5.2",
"color": "4.0.1", "color": "4.0.1",

View file

@ -1,4 +1,4 @@
import {app, BrowserWindow, shell, Menu, BrowserWindowConstructorOptions, Event} from 'electron'; import {app, BrowserWindow, shell, Menu, BrowserWindowConstructorOptions, Event, WebPreferences} from 'electron';
import {isAbsolute, normalize, sep} from 'path'; import {isAbsolute, normalize, sep} from 'path';
import {URL, fileURLToPath} from 'url'; import {URL, fileURLToPath} from 'url';
import {v4 as uuidv4} from 'uuid'; import {v4 as uuidv4} from 'uuid';
@ -40,7 +40,7 @@ export function newWindow(
navigateOnDragDrop: true, navigateOnDragDrop: true,
enableRemoteModule: true, enableRemoteModule: true,
contextIsolation: false contextIsolation: false
}, } as WebPreferences,
...options_ ...options_
}; };
const window = new BrowserWindow(app.plugins.getDecoratedBrowserOptions(winOpts)); const window = new BrowserWindow(app.plugins.getDecoratedBrowserOptions(winOpts));

View file

@ -2,6 +2,11 @@
# yarn lockfile v1 # yarn lockfile v1
"@electron/remote@2.0.1":
version "2.0.1"
resolved "https://registry.npmjs.org/@electron/remote/-/remote-2.0.1.tgz#810cbc595a21f0f94641eb2d7e8264063a3f84de"
integrity sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA==
"@types/semver@^7.3.8": "@types/semver@^7.3.8":
version "7.3.8" version "7.3.8"
resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.8.tgz#508a27995498d7586dcecd77c25e289bfaf90c59" resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.8.tgz#508a27995498d7586dcecd77c25e289bfaf90c59"

View file

@ -1,4 +1,4 @@
import {remote} from 'electron'; import * as remote from '@electron/remote';
import {HyperDispatch} from './hyper'; import {HyperDispatch} from './hyper';
import {closeSearch} from './actions/sessions'; import {closeSearch} from './actions/sessions';
// TODO: Should be updates to new async API https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31 // TODO: Should be updates to new async API https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31

View file

@ -1,4 +1,5 @@
import {ipcRenderer, remote} from 'electron'; import {ipcRenderer} from 'electron';
import * as remote from '@electron/remote';
// TODO: Should be updates to new async API https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31 // 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 = remote.require('./plugins') as typeof import('../../app/plugins');

View file

@ -1,6 +1,6 @@
// eslint-disable-next-line eslint-comments/disable-enable-pair // eslint-disable-next-line eslint-comments/disable-enable-pair
/* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-unsafe-return */
import {remote} from 'electron'; import * as remote from '@electron/remote';
// TODO: Should be updates to new async API https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31 // 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'; import {connect as reduxConnect, Options} from 'react-redux';

View file

@ -23,6 +23,7 @@
"email": "team@zeit.co" "email": "team@zeit.co"
}, },
"dependencies": { "dependencies": {
"@electron/remote": "2.0.1",
"args": "5.0.1", "args": "5.0.1",
"chalk": "4.1.2", "chalk": "4.1.2",
"color": "4.0.1", "color": "4.0.1",

View file

@ -569,6 +569,11 @@
global-agent "^2.0.2" global-agent "^2.0.2"
global-tunnel-ng "^2.7.1" global-tunnel-ng "^2.7.1"
"@electron/remote@2.0.1":
version "2.0.1"
resolved "https://registry.npmjs.org/@electron/remote/-/remote-2.0.1.tgz#810cbc595a21f0f94641eb2d7e8264063a3f84de"
integrity sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA==
"@electron/universal@1.0.5": "@electron/universal@1.0.5":
version "1.0.5" version "1.0.5"
resolved "https://registry.npmjs.org/@electron/universal/-/universal-1.0.5.tgz#b812340e4ef21da2b3ee77b2b4d35c9b86defe37" resolved "https://registry.npmjs.org/@electron/universal/-/universal-1.0.5.tgz#b812340e4ef21da2b3ee77b2b4d35c9b86defe37"