maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Hardcode commit for webview endpoint in public product.json

Browse source 
Fixes #135641

Also fixes duplicated names `webEndpointUrlTemplate` and `webContentExternalBaseUrlTemplate`
This commit is contained in:
Matt Bierner 2021-10-25 15:27:25 -07:00
parent 207fece665
commit 1100001c70
No known key found for this signature in database
GPG key ID: 099C331567E11888
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
product.json
View file

@ -23,7 +23,7 @@
"licenseFileName": "LICENSE.txt",
"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
"urlProtocol": "code-oss",
"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/",
"webEndpointUrlTemplate": "https://{{uuid}}.vscode-webview.net/{{quality}}/5f19eee5dc9588ca96192f89587b5878b7d7180d/out/vs/workbench/contrib/webview/browser/pre/",
"extensionAllowedProposedApi": [
"ms-vscode.vscode-js-profile-flame",
"ms-vscode.vscode-js-profile-table",

2
src/vs/base/common/product.ts
View file

@ -144,8 +144,6 @@ export interface IProductConfiguration {
readonly 'configurationSync.store'?: ConfigurationSyncStore;
readonly darwinUniversalAssetId?: string;
readonly webviewContentExternalBaseUrlTemplate?: string;
}
export type ImportantExtensionTip = { name: string; languages?: string[]; pattern?: string; isExtensionPack?: boolean };

2
src/vs/workbench/services/environment/browser/environmentService.ts
View file

@ -227,7 +227,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
@memoize
get webviewExternalEndpoint(): string {
const endpoint = this.options.webviewEndpoint
|| this.productService.webviewContentExternalBaseUrlTemplate
|| this.productService.webEndpointUrlTemplate
|| 'https://{{uuid}}.vscode-webview.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/';
const webviewExternalEndpointCommit = this.payload?.get('webviewExternalEndpointCommit');