mirror of
https://github.com/Microsoft/vscode
synced 2024-09-19 10:40:41 +00:00
Make sure we use the webviewResourceRoot on for computing cspSource
Fixes #120879
This commit is contained in:
parent
84391165c3
commit
044a99585c
|
@ -73,7 +73,7 @@ export class NativeWorkbenchEnvironmentService extends AbstractNativeEnvironment
|
||||||
|
|
||||||
@memoize
|
@memoize
|
||||||
get webviewResourceRoot(): string {
|
get webviewResourceRoot(): string {
|
||||||
// On desktop, this endpoint is only used for the service worker to identify resouce loads and
|
// On desktop, this endpoint is only used for the service worker to identify resource loads and
|
||||||
// should never actually be requested.
|
// should never actually be requested.
|
||||||
//
|
//
|
||||||
// Required due to https://github.com/electron/electron/issues/28528
|
// Required due to https://github.com/electron/electron/issues/28528
|
||||||
|
@ -81,7 +81,10 @@ export class NativeWorkbenchEnvironmentService extends AbstractNativeEnvironment
|
||||||
}
|
}
|
||||||
|
|
||||||
@memoize
|
@memoize
|
||||||
get webviewCspSource(): string { return `${Schemas.vscodeWebviewResource}:`; }
|
get webviewCspSource(): string {
|
||||||
|
const uri = URI.parse(this.webviewResourceRoot.replace('{{uuid}}', '*'));
|
||||||
|
return `${uri.scheme}://${uri.authority}`;
|
||||||
|
}
|
||||||
|
|
||||||
@memoize
|
@memoize
|
||||||
get skipReleaseNotes(): boolean { return !!this.args['skip-release-notes']; }
|
get skipReleaseNotes(): boolean { return !!this.args['skip-release-notes']; }
|
||||||
|
|
Loading…
Reference in a new issue