From fa26c0bcd6faa45e8890379a84aa982fb0d20254 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 26 Feb 2019 14:08:50 -0600 Subject: [PATCH] Fix undefined navigator in bootstrap fork Due to some files that now import browser.ts. --- packages/vscode/webpack.bootstrap.config.js | 1 + scripts/vscode.patch | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/vscode/webpack.bootstrap.config.js b/packages/vscode/webpack.bootstrap.config.js index 24158cba..7ddd2c3a 100644 --- a/packages/vscode/webpack.bootstrap.config.js +++ b/packages/vscode/webpack.bootstrap.config.js @@ -49,6 +49,7 @@ module.exports = merge( "node-pty": path.resolve(fills, "empty.ts"), "windows-mutex": path.resolve(fills, "empty.ts"), "windows-process-tree": path.resolve(fills, "empty.ts"), + "vs/base/browser/browser": path.resolve(fills, "empty.ts"), "electron": path.join(vsFills, "stdioElectron.ts"), "native-keymap": path.join(vsFills, "native-keymap.ts"), diff --git a/scripts/vscode.patch b/scripts/vscode.patch index 4e3c6d71..44f95a41 100644 --- a/scripts/vscode.patch +++ b/scripts/vscode.patch @@ -312,14 +312,6 @@ index 667b47218a..36dd5ddd3e 100644 @@ -9 +9 @@ import { URI } from 'vs/base/common/uri'; -import { isMacintosh } from 'vs/base/common/platform'; +import { isMacintosh } from 'vs/base/browser/browser'; -diff --git a/src/vs/platform/launch/electron-main/launchService.ts b/src/vs/platform/launch/electron-main/launchService.ts -index ba14b19533..d1590f50ef 100644 ---- a/src/vs/platform/launch/electron-main/launchService.ts -+++ b/src/vs/platform/launch/electron-main/launchService.ts -@@ -9 +9,2 @@ import { IURLService } from 'vs/platform/url/common/url'; --import { IProcessEnvironment, isMacintosh } from 'vs/base/common/platform'; -+import { IProcessEnvironment } from 'vs/base/common/platform'; -+import { isMacintosh } from 'vs/base/browser/browser'; diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts index 56eaeef6f4..ec8a6e5960 100644 --- a/src/vs/platform/windows/common/windows.ts