From efb7cc9b32247f724f902390bd0259b2fb1ab607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Szabo?= Date: Thu, 23 Nov 2023 22:37:07 -0300 Subject: [PATCH] Moving all remote things to @electron/remote --- lib/controllers/conflict-controller.js | 2 +- lib/controllers/issueish-list-controller.js | 3 ++- lib/controllers/root-controller.js | 2 +- lib/git-shell-out-strategy.js | 2 +- lib/models/event-logger.js | 2 +- lib/views/actionable-review-view.js | 3 ++- lib/views/directory-select.js | 2 +- lib/views/git-timings-view.js | 2 +- lib/views/staging-view.js | 2 +- lib/worker-manager.js | 3 ++- lib/worker.js | 3 ++- package.json | 1 + 12 files changed, 16 insertions(+), 11 deletions(-) diff --git a/lib/controllers/conflict-controller.js b/lib/controllers/conflict-controller.js index f51e1236f2..b803e8e428 100644 --- a/lib/controllers/conflict-controller.js +++ b/lib/controllers/conflict-controller.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import {remote} from 'electron'; +import remote from '@electron/remote'; const {Menu, MenuItem} = remote; import {autobind} from '../helpers'; diff --git a/lib/controllers/issueish-list-controller.js b/lib/controllers/issueish-list-controller.js index 93ebfa9b61..348480e9c4 100644 --- a/lib/controllers/issueish-list-controller.js +++ b/lib/controllers/issueish-list-controller.js @@ -4,7 +4,8 @@ import {graphql, createFragmentContainer} from 'react-relay'; import {EndpointPropType} from '../prop-types'; import IssueishListView from '../views/issueish-list-view'; import Issueish from '../models/issueish'; -import {shell, remote} from 'electron'; +import {shell} from 'electron'; +import remote from '@electron/remote'; const {Menu, MenuItem} = remote; import {addEvent} from '../reporter-proxy'; diff --git a/lib/controllers/root-controller.js b/lib/controllers/root-controller.js index 7ba6779ae3..99083ff6f6 100644 --- a/lib/controllers/root-controller.js +++ b/lib/controllers/root-controller.js @@ -1,6 +1,6 @@ import fs from 'fs-extra'; import path from 'path'; -import {remote} from 'electron'; +import remote from '@electron/remote'; import React, {Fragment} from 'react'; import PropTypes from 'prop-types'; diff --git a/lib/git-shell-out-strategy.js b/lib/git-shell-out-strategy.js index b56cdcd641..e9afa735b5 100644 --- a/lib/git-shell-out-strategy.js +++ b/lib/git-shell-out-strategy.js @@ -3,7 +3,7 @@ import os from 'os'; import childProcess from 'child_process'; import fs from 'fs-extra'; import util from 'util'; -import {remote} from 'electron'; +import remote from '@electron/remote'; import {CompositeDisposable} from 'event-kit'; import {GitProcess} from 'dugite'; diff --git a/lib/models/event-logger.js b/lib/models/event-logger.js index 289057e108..404c5966d7 100644 --- a/lib/models/event-logger.js +++ b/lib/models/event-logger.js @@ -1,5 +1,5 @@ import path from 'path'; -import {remote} from 'electron'; +import remote from '@electron/remote'; let headless = null; diff --git a/lib/views/actionable-review-view.js b/lib/views/actionable-review-view.js index 888837db67..789183b540 100644 --- a/lib/views/actionable-review-view.js +++ b/lib/views/actionable-review-view.js @@ -1,7 +1,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import cx from 'classnames'; -import {remote, shell} from 'electron'; +import {shell} from 'electron'; +import remote from '@electron/remote'; import {TextBuffer} from 'atom'; import AtomTextEditor from '../atom/atom-text-editor'; import RefHolder from '../models/ref-holder'; diff --git a/lib/views/directory-select.js b/lib/views/directory-select.js index 0f62c24a67..b9be7362bb 100644 --- a/lib/views/directory-select.js +++ b/lib/views/directory-select.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import {remote} from 'electron'; +import remote from '@electron/remote'; import {TabbableTextEditor, TabbableButton} from './tabbable'; diff --git a/lib/views/git-timings-view.js b/lib/views/git-timings-view.js index f689917673..cd1b155c40 100644 --- a/lib/views/git-timings-view.js +++ b/lib/views/git-timings-view.js @@ -1,6 +1,6 @@ import {TextBuffer} from 'atom'; import {Emitter, CompositeDisposable} from 'event-kit'; -import {remote} from 'electron'; +import remote from '@electron/remote'; const {dialog} = remote; import React from 'react'; import ReactDom from 'react-dom'; diff --git a/lib/views/staging-view.js b/lib/views/staging-view.js index fa73b425fc..c29b16155f 100644 --- a/lib/views/staging-view.js +++ b/lib/views/staging-view.js @@ -1,5 +1,5 @@ import {Disposable, CompositeDisposable} from 'event-kit'; -import {remote} from 'electron'; +import remote from '@electron/remote'; const {Menu, MenuItem} = remote; import {File} from 'atom'; import React, {Fragment} from 'react'; diff --git a/lib/worker-manager.js b/lib/worker-manager.js index 17b9588191..3714c9523f 100644 --- a/lib/worker-manager.js +++ b/lib/worker-manager.js @@ -1,7 +1,8 @@ import path from 'path'; import querystring from 'querystring'; -import {remote, ipcRenderer as ipc} from 'electron'; +import {ipcRenderer as ipc} from 'electron'; +import remote from '@electron/remote'; const {BrowserWindow} = remote; import {Emitter, Disposable, CompositeDisposable} from 'event-kit'; diff --git a/lib/worker.js b/lib/worker.js index 7d3e1ad330..49ca4ecefb 100644 --- a/lib/worker.js +++ b/lib/worker.js @@ -1,6 +1,7 @@ const qs = require('querystring'); -const {remote, ipcRenderer: ipc} = require('electron'); +const {ipcRenderer: ipc} = require('electron'); +import remote from '@electron/remote'; const {GitProcess} = require('dugite'); diff --git a/package.json b/package.json index e170287a05..7de2aba5d2 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "@babel/plugin-proposal-object-rest-spread": "7.8.0", "@babel/preset-env": "7.12.1", "@babel/preset-react": "7.8.0", + "@electron/remote": "^2.1.0", "babel-plugin-relay": "5.0.0", "bintrees": "1.0.2", "bytes": "3.1.0",