Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d

2026-02-04 17:23:45 -05:00 · 2020-06-30 04:40:21 +00:00
parent a8a7559229
commit 1388493cc1
602 changed files with 16375 additions and 12940 deletions
--- a/src/vs/code/electron-browser/issue/issueReporter.html
+++ b/src/vs/code/electron-browser/issue/issueReporter.html
@@ -1,17 +1,23 @@
 <!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
 <!DOCTYPE html>
 <html>
+	<head>
+		<meta charset="utf-8" />
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
+		<style>
+			body {
+				display: none
+			}
+		</style>
+	</head>
+	<body aria-label="">
+	</body>

-<head>
-	<meta charset="utf-8" />
-	<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
-	<style>body{display: none}</style>
-</head>
-
-<body>
-</body>
-
-<!-- Startup via issueReporter.js -->
-<script src="issueReporter.js"></script>
+	<!-- Init Bootstrap Helpers -->
+	<script src="../../../../bootstrap.js"></script>
+	<script src="../../../../vs/loader.js"></script>
+	<script src="../../../../bootstrap-window.js"></script>

+	<!-- Startup via issueReporter.js -->
+	<script src="issueReporter.js"></script>
 </html>
--- a/src/vs/code/electron-browser/issue/issueReporter.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -6,7 +6,13 @@
 //@ts-check
 'use strict';

-const bootstrapWindow = require('../../../../bootstrap-window');
+/**
+ * @type {{ load: (modules: string[], resultCallback: (result, configuration: object) => any, options: object) => unknown }}
+ */
+const bootstrapWindow = (() => {
+	// @ts-ignore (defined in bootstrap-window.js)
+	return window.MonacoBootstrapWindow;
+})();

 bootstrapWindow.load(['vs/code/electron-browser/issue/issueReporterMain'], function (issueReporter, configuration) {
 	issueReporter.startup(configuration);
--- a/src/vs/code/electron-browser/processExplorer/processExplorer.html
+++ b/src/vs/code/electron-browser/processExplorer/processExplorer.html
@@ -1,17 +1,19 @@
 <!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
 <!DOCTYPE html>
 <html>
+	<head>
+		<meta charset="utf-8" />
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
+	</head>
+	<body aria-label="">
+		<table id="process-list"></table>
+	</body>

-<head>
-	<meta charset="utf-8" />
-	<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
-</head>
+	<!-- Init Bootstrap Helpers -->
+	<script src="../../../../bootstrap.js"></script>
+	<script src="../../../../vs/loader.js"></script>
+	<script src="../../../../bootstrap-window.js"></script>

-<body aria-label="">
-	<table id="process-list"></table>
-</body>
-
-<!-- Startup via processExplorer.js -->
-<script src="processExplorer.js"></script>
-
-</html>
+	<!-- Startup via processExplorer.js -->
+	<script src="processExplorer.js"></script>
+</html>
--- a/src/vs/code/electron-browser/processExplorer/processExplorer.js
+++ b/src/vs/code/electron-browser/processExplorer/processExplorer.js
@@ -6,8 +6,14 @@
 //@ts-check
 'use strict';

-const bootstrapWindow = require('../../../../bootstrap-window');
+/**
+ * @type {{ load: (modules: string[], resultCallback: (result, configuration: object) => any, options: object) => unknown }}
+ */
+const bootstrapWindow = (() => {
+	// @ts-ignore (defined in bootstrap-window.js)
+	return window.MonacoBootstrapWindow;
+})();

 bootstrapWindow.load(['vs/code/electron-browser/processExplorer/processExplorerMain'], function (processExplorer, configuration) {
 	processExplorer.startup(configuration.data);
-}, { forceEnableDeveloperKeybindings: true });
+}, { forceEnableDeveloperKeybindings: true });
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.html
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.html
@@ -11,7 +11,12 @@
 	Shared Process
 </body>

+<!-- Init Bootstrap Helpers -->
+<script src="../../../../bootstrap.js"></script>
+<script src="../../../../vs/loader.js"></script>
+<script src="../../../../bootstrap-window.js"></script>
+
 <!-- Startup via sharedProcess.js -->
 <script src="sharedProcess.js"></script>

-</html>
+</html>
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
@@ -6,8 +6,21 @@
 //@ts-check
 'use strict';

-const bootstrap = require('../../../../bootstrap');
-const bootstrapWindow = require('../../../../bootstrap-window');
+/**
+ * @type {{ load: (modules: string[], resultCallback: (result, configuration: object) => any, options?: object) => unknown }}
+ */
+const bootstrapWindow = (() => {
+	// @ts-ignore (defined in bootstrap-window.js)
+	return window.MonacoBootstrapWindow;
+})();
+
+/**
+ * @type {{ avoidMonkeyPatchFromAppInsights: () => void; }}
+ */
+const bootstrap = (() => {
+	// @ts-ignore (defined in bootstrap.js)
+	return window.MonacoBootstrap;
+})();

 // Avoid Monkey Patches from Application Insights
 bootstrap.avoidMonkeyPatchFromAppInsights();
--- a/src/vs/code/electron-browser/workbench/workbench.html
+++ b/src/vs/code/electron-browser/workbench/workbench.html
@@ -3,11 +3,16 @@
 <html>
 	<head>
 		<meta charset="utf-8" />
-		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote-resource:; media-src 'none'; frame-src 'self' https://*.vscode-webview-test.com; object-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https: vscode-remote-resource:;">
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote-resource:; media-src 'none'; frame-src 'self' vscode-webview: https://*.vscode-webview-test.com; object-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https: vscode-remote-resource:;">
 	</head>
 	<body aria-label="">
 	</body>

+	<!-- Init Bootstrap Helpers -->
+	<script src="../../../../bootstrap.js"></script>
+	<script src="../../../../vs/loader.js"></script>
+	<script src="../../../../bootstrap-window.js"></script>
+
 	<!-- Startup via workbench.js -->
 	<script src="workbench.js"></script>
 </html>
--- a/src/vs/code/electron-browser/workbench/workbench.js
+++ b/src/vs/code/electron-browser/workbench/workbench.js
@@ -3,6 +3,8 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

+/// <reference path="../../../../typings/require.d.ts" />
+
 //@ts-check
 'use strict';

@@ -31,11 +33,17 @@ const perf = (function () {

 perf.mark('renderer/started');

-const bootstrapWindow = require('../../../../bootstrap-window');
-
 // Setup shell environment
 process['lazyEnv'] = getLazyEnv();

+/**
+ * @type {{ load: (modules: string[], resultCallback: (result, configuration: object) => any, options: object) => unknown }}
+ */
+const bootstrapWindow = (() => {
+	// @ts-ignore (defined in bootstrap-window.js)
+	return window.MonacoBootstrapWindow;
+})();
+
 // Load workbench main JS, CSS and NLS all in parallel. This is an
 // optimization to prevent a waterfall of loading to happen, because
 // we know for a fact that workbench.desktop.main will depend on
@@ -55,18 +63,20 @@ bootstrapWindow.load([
 			// @ts-ignore
 			return require('vs/workbench/electron-browser/desktop.main').main(configuration);
 		});
-	}, {
-	removeDeveloperKeybindingsAfterLoad: true,
-	canModifyDOM: function (windowConfig) {
-		showPartsSplash(windowConfig);
 	},
-	beforeLoaderConfig: function (windowConfig, loaderConfig) {
-		loaderConfig.recordStats = true;
-	},
-	beforeRequire: function () {
-		perf.mark('willLoadWorkbenchMain');
+	{
+		removeDeveloperKeybindingsAfterLoad: true,
+		canModifyDOM: function (windowConfig) {
+			showPartsSplash(windowConfig);
+		},
+		beforeLoaderConfig: function (windowConfig, loaderConfig) {
+			loaderConfig.recordStats = true;
+		},
+		beforeRequire: function () {
+			perf.mark('willLoadWorkbenchMain');
+		}
 	}
-});
+);

 /**
 * @param {{
@@ -84,7 +94,7 @@ function showPartsSplash(configuration) {
 	let data;
 	if (typeof configuration.partsSplashPath === 'string') {
 		try {
-			data = JSON.parse(require('fs').readFileSync(configuration.partsSplashPath, 'utf8'));
+			data = JSON.parse(require.__$__nodeRequire('fs').readFileSync(configuration.partsSplashPath, 'utf8'));
 		} catch (e) {
 			// ignore
 		}
@@ -173,7 +183,7 @@ function showPartsSplash(configuration) {
 */
 function getLazyEnv() {

-	const ipc = require('electron').ipcRenderer;
+	const ipc = require.__$__nodeRequire('electron').ipcRenderer;

 	return new Promise(function (resolve) {
 		const handle = setTimeout(function () {
@@ -183,7 +193,7 @@ function getLazyEnv() {

 		ipc.once('vscode:acceptShellEnv', function (event, shellEnv) {
 			clearTimeout(handle);
-			bootstrapWindow.assign(process.env, shellEnv);
+			Object.assign(process.env, shellEnv);
 			// @ts-ignore
 			resolve(process.env);
 		});