diff --git a/src/vs/code/browser/workbench/workbench-dev.html b/src/vs/code/browser/workbench/workbench-dev.html index 1bf61922220c3abb9e3ae6e8f2f5ce36145bf7ff..68df0aa91e61e002c17c9832082ad02fdc32e3cc 100644 --- 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-4i4ZKOTzR9VPdhew0hOqnhvy09L6eRM2iyzJlc5loi4='; + script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval' https: 'sha256-4DqvCTjCHj2KW4QxC/Yt6uBwMRyYiEg7kOoykSEkonQ=' 'sha256-meDZW3XhN5JmdjFUrWGhTouRKBiWYtXHltaKnqn/WMo='; child-src 'self'; frame-src 'self' {{WEBVIEW_ENDPOINT}} https://*.vscode-webview-test.com; worker-src 'self'; @@ -57,8 +57,6 @@ diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html index 1fef79f6a950fad457117d24ca311932c09fbfc6..7d0ca33dea2d3bb35bbe7b8f46823bc8a4e45592 100644 --- 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-4i4ZKOTzR9VPdhew0hOqnhvy09L6eRM2iyzJlc5loi4='; + script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval' https: 'sha256-4DqvCTjCHj2KW4QxC/Yt6uBwMRyYiEg7kOoykSEkonQ='; child-src 'self'; frame-src 'self' {{WEBVIEW_ENDPOINT}} https://*.vscode-webview-test.com; worker-src 'self'; @@ -63,10 +63,4 @@ - diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts index 656bee0daa74646aaf858293aae7d066226b657c..66d2c7b4b57c37db11bb50c8e66269872e2e86dc 100644 --- a/src/vs/code/browser/workbench/workbench.ts +++ b/src/vs/code/browser/workbench/workbench.ts @@ -14,14 +14,6 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { request } from 'vs/base/parts/request/browser/request'; import { ICredentialsProvider } from 'vs/workbench/services/credentials/browser/credentialsService'; -export function main(): void { - const options: IWorkbenchConstructionOptions = JSON.parse(document.getElementById('vscode-workbench-web-configuration')!.getAttribute('data-settings')!); - options.urlCallbackProvider = new PollingURLCallbackProvider(); - options.credentialsProvider = new LocalStorageCredentialsProvider(); - - create(document.body, options); -} - interface ICredential { service: string; account: string; @@ -208,3 +200,9 @@ class PollingURLCallbackProvider extends Disposable implements IURLCallbackProvi return URI.parse(window.location.href).with({ path, query }); } } + +const options: IWorkbenchConstructionOptions = JSON.parse(document.getElementById('vscode-workbench-web-configuration')!.getAttribute('data-settings')!); +options.urlCallbackProvider = new PollingURLCallbackProvider(); +options.credentialsProvider = new LocalStorageCredentialsProvider(); + +create(document.body, options);