From c65bb415a16ce58d4e40a941d8b86ca0f9dbe957 Mon Sep 17 00:00:00 2001 From: Becca Date: Fri, 4 Feb 2022 09:35:29 -0500 Subject: [PATCH] Remove remote dependency --- app/src/main-process/app-window.ts | 2 -- app/src/main-process/crash-window.ts | 2 -- app/src/main-process/main.ts | 3 --- package.json | 1 - yarn.lock | 5 ----- 5 files changed, 13 deletions(-) diff --git a/app/src/main-process/app-window.ts b/app/src/main-process/app-window.ts index 685bd63bf4..93085d1b40 100644 --- a/app/src/main-process/app-window.ts +++ b/app/src/main-process/app-window.ts @@ -19,7 +19,6 @@ import { menuFromElectronMenu } from '../models/app-menu' import { now } from './now' import * as path from 'path' import windowStateKeeper from 'electron-window-state' -import * as remoteMain from '@electron/remote/main' import * as ipcMain from './ipc-main' import * as ipcWebContents from './ipc-webcontents' @@ -74,7 +73,6 @@ export class AppWindow { } this.window = new BrowserWindow(windowOptions) - remoteMain.enable(this.window.webContents) savedWindowState.manage(this.window) this.shouldMaximizeOnShow = savedWindowState.isMaximized diff --git a/app/src/main-process/crash-window.ts b/app/src/main-process/crash-window.ts index 955801c78b..3a934d0589 100644 --- a/app/src/main-process/crash-window.ts +++ b/app/src/main-process/crash-window.ts @@ -2,7 +2,6 @@ import { BrowserWindow } from 'electron' import { Emitter, Disposable } from 'event-kit' import { ICrashDetails, ErrorType } from '../crash/shared' import { registerWindowStateChangedEvents } from '../lib/window-state' -import * as remoteMain from '@electron/remote/main' import * as ipcMain from './ipc-main' import * as ipcWebContents from './ipc-webcontents' @@ -52,7 +51,6 @@ export class CrashWindow { } this.window = new BrowserWindow(windowOptions) - remoteMain.enable(this.window.webContents) this.error = error this.errorType = errorType diff --git a/app/src/main-process/main.ts b/app/src/main-process/main.ts index f275863a2e..f21a4ec883 100644 --- a/app/src/main-process/main.ts +++ b/app/src/main-process/main.ts @@ -37,11 +37,8 @@ import { installAliveOriginFilter } from './alive-origin-filter' import { installSameOriginFilter } from './same-origin-filter' import * as ipcMain from './ipc-main' import { getArchitecture } from '../lib/get-architecture' -import * as remoteMain from '@electron/remote/main' import { buildSpellCheckMenu } from './menu/build-spell-check-menu' -remoteMain.initialize() - app.setAppLogsPath() enableSourceMaps() diff --git a/package.json b/package.json index 8ab230a9be..f01dc2f51d 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "yarn": ">= 1.9" }, "dependencies": { - "@electron/remote": "^2.0.1", "@primer/octicons": "^10.0.0", "@types/lodash": "^4.14.178", "@types/marked": "^4.0.1", diff --git a/yarn.lock b/yarn.lock index 68a3e0aaca..99da180838 100644 --- a/yarn.lock +++ b/yarn.lock @@ -537,11 +537,6 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" -"@electron/remote@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.1.tgz#810cbc595a21f0f94641eb2d7e8264063a3f84de" - integrity sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA== - "@es-joy/jsdoccomment@~0.18.0": version "0.18.0" resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz#2532b2ecb8576d694011b157c447ed6b12534c70"