Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/controllers/conflict-controller.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import {remote} from 'electron';
const remote = require('@electron/remote');
const {Menu, MenuItem} = remote;

import {autobind} from '../helpers';
Expand Down
3 changes: 2 additions & 1 deletion lib/controllers/issueish-list-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
const remote = require('@electron/remote');
const {Menu, MenuItem} = remote;
import {addEvent} from '../reporter-proxy';

Expand Down
2 changes: 1 addition & 1 deletion lib/controllers/root-controller.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fs from 'fs-extra';
import path from 'path';
import {remote} from 'electron';
const remote = require('@electron/remote');

import React, {Fragment} from 'react';
import PropTypes from 'prop-types';
Expand Down
2 changes: 1 addition & 1 deletion lib/git-shell-out-strategy.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
const remote = require('@electron/remote');

import {CompositeDisposable} from 'event-kit';
import {GitProcess} from 'dugite';
Expand Down
2 changes: 1 addition & 1 deletion lib/models/event-logger.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path';
import {remote} from 'electron';
const remote = require('@electron/remote');

let headless = null;

Expand Down
3 changes: 2 additions & 1 deletion lib/views/actionable-review-view.js
Original file line number Diff line number Diff line change
@@ -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';
const remote = require('@electron/remote');
import {TextBuffer} from 'atom';
import AtomTextEditor from '../atom/atom-text-editor';
import RefHolder from '../models/ref-holder';
Expand Down
2 changes: 1 addition & 1 deletion lib/views/directory-select.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import {remote} from 'electron';
const remote = require('@electron/remote');

import {TabbableTextEditor, TabbableButton} from './tabbable';

Expand Down
2 changes: 1 addition & 1 deletion lib/views/git-timings-view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {TextBuffer} from 'atom';
import {Emitter, CompositeDisposable} from 'event-kit';
import {remote} from 'electron';
const remote = require('@electron/remote');
const {dialog} = remote;
import React from 'react';
import ReactDom from 'react-dom';
Expand Down
2 changes: 1 addition & 1 deletion lib/views/staging-view.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Disposable, CompositeDisposable} from 'event-kit';
import {remote} from 'electron';
const remote = require('@electron/remote');
const {Menu, MenuItem} = remote;
import {File} from 'atom';
import React, {Fragment} from 'react';
Expand Down
3 changes: 2 additions & 1 deletion lib/worker-manager.js
Original file line number Diff line number Diff line change
@@ -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';
const remote = require('@electron/remote');
const {BrowserWindow} = remote;
import {Emitter, Disposable, CompositeDisposable} from 'event-kit';

Expand Down
3 changes: 2 additions & 1 deletion lib/worker.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const qs = require('querystring');

const {remote, ipcRenderer: ipc} = require('electron');
const {ipcRenderer: ipc} = require('electron');
const remote = require('@electron/remote');
const {GitProcess} = require('dugite');


Expand Down
Loading