OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix undefined navigator in bootstrap fork

Browse Source 
Due to some files that now import browser.ts.
This commit is contained in:
Asher 2019-02-26 14:08:50 -06:00
parent 04e02bdb08
commit fa26c0bcd6
No known key found for this signature in database
GPG Key ID: 7BB4BA9C783D2BBC
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/vscode/webpack.bootstrap.config.js
View File

@ -49,6 +49,7 @@ module.exports = merge(
"node-pty": path.resolve(fills, "empty.ts"), "node-pty": path.resolve(fills, "empty.ts"),
"windows-mutex": path.resolve(fills, "empty.ts"), "windows-mutex": path.resolve(fills, "empty.ts"),
"windows-process-tree": 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"), "electron": path.join(vsFills, "stdioElectron.ts"),
"native-keymap": path.join(vsFills, "native-keymap.ts"), "native-keymap": path.join(vsFills, "native-keymap.ts"),

8
scripts/vscode.patch
View File

@ -312,14 +312,6 @@ index 667b47218a..36dd5ddd3e 100644
@@ -9 +9 @@ import { URI } from 'vs/base/common/uri'; @@ -9 +9 @@ import { URI } from 'vs/base/common/uri';
-import { isMacintosh } from 'vs/base/common/platform'; -import { isMacintosh } from 'vs/base/common/platform';
+import { isMacintosh } from 'vs/base/browser/browser'; +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 diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
index 56eaeef6f4..ec8a6e5960 100644 index 56eaeef6f4..ec8a6e5960 100644
--- a/src/vs/platform/windows/common/windows.ts --- a/src/vs/platform/windows/common/windows.ts