diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index d16c69433bb..be075ea581b 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -29,13 +29,11 @@ var build = path.join(root, '.build'); var commit = util.getVersion(root); var baseModules = [ - 'applicationinsights', 'assert', - 'child_process', 'chokidar', 'crypto', 'emmet', + 'applicationinsights', 'assert', 'child_process', 'chokidar', 'crypto', 'emmet', 'events', 'fs', 'getmac', 'glob', 'graceful-fs', 'http', 'http-proxy-agent', 'https', 'https-proxy-agent', 'iconv-lite', 'electron', 'net', - 'os', 'path', 'readline', 'remote', 'sax', 'semver', - 'stream', 'string_decoder', 'url', 'vscode-textmate', 'winreg', - 'yauzl', 'native-keymap' + 'os', 'path', 'readline', 'sax', 'semver', 'stream', 'string_decoder', 'url', + 'vscode-textmate', 'winreg', 'yauzl', 'native-keymap' ]; // Build diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index 94c9281bd04..6922242dd81 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -19,8 +19,7 @@ import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpe import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; -import {ipcRenderer as ipc, webFrame} from 'electron'; -import remote = require('remote'); +import {ipcRenderer as ipc, webFrame, remote} from 'electron'; export class CloseEditorAction extends Action { @@ -147,7 +146,7 @@ export class ToggleDevToolsAction extends Action { } public run(): Promise { - remote.getCurrentWindow().toggleDevTools(); + remote.getCurrentWindow().webContents.toggleDevTools(); return Promise.as(true); } diff --git a/src/vs/workbench/electron-browser/integration.ts b/src/vs/workbench/electron-browser/integration.ts index 0a1487c19dd..7bc7e368e20 100644 --- a/src/vs/workbench/electron-browser/integration.ts +++ b/src/vs/workbench/electron-browser/integration.ts @@ -24,8 +24,7 @@ import {IConfigurationService, IConfigurationServiceEvent, ConfigurationServiceE import win = require('vs/workbench/electron-browser/window'); -import remote = require('remote'); -import {ipcRenderer as ipc, webFrame} from 'electron'; +import {ipcRenderer as ipc, webFrame, remote} from 'electron'; export class ElectronIntegration { diff --git a/src/vs/workbench/electron-browser/update.ts b/src/vs/workbench/electron-browser/update.ts index 74363dd696b..c0d263fdfa0 100644 --- a/src/vs/workbench/electron-browser/update.ts +++ b/src/vs/workbench/electron-browser/update.ts @@ -10,7 +10,6 @@ import severity from 'vs/base/common/severity'; import {Promise} from 'vs/base/common/winjs.base'; import {Action} from 'vs/base/common/actions'; import {ipcRenderer as ipc, shell} from 'electron'; -import remote = require('remote'); import {isLinux} from 'vs/base/common/platform'; import {IMessageService} from 'vs/platform/message/common/message'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; diff --git a/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts b/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts index 8783cec96f8..a681c9dc1f3 100644 --- a/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts +++ b/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts @@ -21,8 +21,7 @@ import {IEventService} from 'vs/platform/event/common/event'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle'; -import remote = require('remote'); -import {ipcRenderer as ipc} from 'electron'; +import {ipcRenderer as ipc, remote} from 'electron'; export interface IPath { filePath: string; diff --git a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts index 60a8f5b439e..7d5c036dd75 100644 --- a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts +++ b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts @@ -20,7 +20,7 @@ import { RawGitService, DelayedRawGitService } from 'vs/workbench/parts/git/node import URI from 'vs/base/common/uri'; import { spawn, exec } from 'child_process'; import { join } from 'path'; -import * as remote from 'remote'; +import { remote } from 'electron'; function findSpecificGit(gitPath: string): Promise { return new Promise((c, e) => { diff --git a/src/vs/workbench/parts/git/electron-main/index.html b/src/vs/workbench/parts/git/electron-main/index.html index a2c9eb73556..54677c7986b 100644 --- a/src/vs/workbench/parts/git/electron-main/index.html +++ b/src/vs/workbench/parts/git/electron-main/index.html @@ -71,7 +71,7 @@ var electron = require('electron'); var shell = electron.shell; var ipc = electron.ipcRenderer; - var remote = require('remote'); + var remote = electron.remote; var currentWindow = remote.getCurrentWindow(); function init(context) { diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsTracker.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsTracker.ts index cf436f05ec1..4ca7b57e32e 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippetsTracker.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsTracker.ts @@ -19,7 +19,6 @@ import {IFileService} from 'vs/platform/files/common/files'; import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; -import remote = require('remote'); import fs = require('fs'); export class SnippetsTracker implements workbenchExt.IWorkbenchContribution { diff --git a/src/vs/workbench/services/message/electron-browser/messageService.ts b/src/vs/workbench/services/message/electron-browser/messageService.ts index 6e093d0c6a9..5ba1f60e74a 100644 --- a/src/vs/workbench/services/message/electron-browser/messageService.ts +++ b/src/vs/workbench/services/message/electron-browser/messageService.ts @@ -14,8 +14,6 @@ import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; -import remote = require('remote'); - export class MessageService extends WorkbenchMessageService { constructor( @@ -36,7 +34,7 @@ export class MessageService extends WorkbenchMessageService { confirmation.secondaryButton = nls.localize('cancelButton', "Cancel"); } - let opts: remote.IMessageBoxOptions = { + let opts: Electron.Dialog.ShowMessageBoxOptions = { title: confirmation.title || this.contextService.getConfiguration().env.appName, message: confirmation.message, buttons: [ diff --git a/src/vs/workbench/services/window/electron-browser/windowService.ts b/src/vs/workbench/services/window/electron-browser/windowService.ts index 1c48f770dcb..96b1c142fbc 100644 --- a/src/vs/workbench/services/window/electron-browser/windowService.ts +++ b/src/vs/workbench/services/window/electron-browser/windowService.ts @@ -9,8 +9,7 @@ import {ElectronWindow} from 'vs/workbench/electron-browser/window'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; import Event, {Emitter} from 'vs/base/common/event'; -import remote = require('remote'); -import {ipcRenderer as ipc} from 'electron'; +import {ipcRenderer as ipc, remote} from 'electron'; export var IWindowService = createDecorator('windowService');