web - rename entry point

Benjamin Pasero · Benjamin Pasero · commit e4a837a0a327 · 2019-09-11T08:43:13.000+02:00
diff --git a/src/vs/code/browser/workbench/workbench-dev.html b/src/vs/code/browser/workbench/workbench-dev.html
@@ -14,7 +14,7 @@
 				default-src 'self';
 				img-src 'self' https: data: blob:;
 				media-src 'none';
-				script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval' https: 'sha256-4DqvCTjCHj2KW4QxC/Yt6uBwMRyYiEg7kOoykSEkonQ=' 'sha256-g94DXzh59qc37AZjL7sV1lYN7OX4K1fgKl4ts5tAQDw=';
+				script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval' https: 'sha256-4DqvCTjCHj2KW4QxC/Yt6uBwMRyYiEg7kOoykSEkonQ=' 'sha256-4i4ZKOTzR9VPdhew0hOqnhvy09L6eRM2iyzJlc5loi4=';
 				child-src 'self';
 				frame-src 'self' {{WEBVIEW_ENDPOINT}} https://*.vscode-webview-test.com;
 				worker-src 'self';
@@ -33,7 +33,6 @@
 		<!-- Workbench Icon/Manifest/CSS -->
 		<link rel="icon" href="/favicon.ico" type="image/x-icon" />
 		<link rel="manifest" href="/manifest.json">
-		<link data-name="vs/workbench/workbench.web.api" rel="stylesheet" href="./static/out/vs/workbench/workbench.web.api.css">
 	</head>
 
 	<body aria-label="">
@@ -58,7 +57,7 @@
 	<script src="./static/out/vs/loader.js"></script>
 	<script>
 		// NOTE: Changes to inline scripts require update of content security policy
-		require(['vs/code/browser/workbench/web.main'], function (web) {
+		require(['vs/code/browser/workbench/workbench'], function (web) {
 			web.main();
 		});
 	</script>
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
@@ -14,7 +14,7 @@
 				default-src 'self';
 				img-src 'self' https: data: blob:;
 				media-src 'none';
-				script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval' https: 'sha256-4DqvCTjCHj2KW4QxC/Yt6uBwMRyYiEg7kOoykSEkonQ=' 'sha256-kXwJWoOluR7vyWhuqykdzYEHvOuOu2ZZhnBm0EBbYvU=';
+				script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval' https: 'sha256-4DqvCTjCHj2KW4QxC/Yt6uBwMRyYiEg7kOoykSEkonQ=' 'sha256-4i4ZKOTzR9VPdhew0hOqnhvy09L6eRM2iyzJlc5loi4=';
 				child-src 'self';
 				frame-src 'self' {{WEBVIEW_ENDPOINT}} https://*.vscode-webview-test.com;
 				worker-src 'self';
@@ -62,9 +62,10 @@
 	<script src="./static/out/vs/loader.js"></script>
 	<script src="./static/out/vs/workbench/workbench.web.api.nls.js"></script>
 	<script src="./static/out/vs/workbench/workbench.web.api.js"></script>
-	<script src="./static/out/vs/code/browser/workbench/web.main.js"></script>
+	<script src="./static/out/vs/code/browser/workbench/workbench.js"></script>
 	<script>
-		require(['vs/code/browser/workbench/web.main'], function (web) {
+		// NOTE: Changes to inline scripts require update of content security policy
+		require(['vs/code/browser/workbench/workbench'], function (web) {
 			web.main();
 		});
 	</script>
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
diff --git a/src/vs/workbench/buildfile.web.js b/src/vs/workbench/buildfile.web.js
@@ -20,6 +20,6 @@ function createModuleDescription(name, exclude) {
 exports.collectModules = function () {
 	return [
 		createModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer', ['vs/base/common/worker/simpleWorker', 'vs/editor/common/services/editorSimpleWorker']),
-		createModuleDescription('vs/code/browser/workbench/web.main', ['vs/workbench/workbench.web.api']),
+		createModuleDescription('vs/code/browser/workbench/workbench', ['vs/workbench/workbench.web.api']),
 	];
 };
