diff --git a/product.json b/product.json index 6f2cf22a9a40961c158c23860022f02be5c64480..1868eed1b5b7676562fd817f4ad34d9a4011435e 100644 --- a/product.json +++ b/product.json @@ -23,7 +23,7 @@ "licenseFileName": "LICENSE.txt", "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new", "urlProtocol": "code-oss", - "webEndpointUrlTemplate": "https://{{uuid}}.vscode-webview.net/{{quality}}/5f19eee5dc9588ca96192f89587b5878b7d7180d/out/vs/workbench/contrib/webview/browser/pre/", + "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/", "extensionAllowedProposedApi": [ "ms-vscode.vscode-js-profile-flame", "ms-vscode.vscode-js-profile-table", diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts index 9a0298531ff95a11a978bc2f5ed5e76a15828064..c48445934b81a06ec17672cb74d7d61f5f7aa4f9 100644 --- a/src/vs/base/common/product.ts +++ b/src/vs/base/common/product.ts @@ -144,6 +144,8 @@ export interface IProductConfiguration { readonly 'configurationSync.store'?: ConfigurationSyncStore; readonly darwinUniversalAssetId?: string; + + readonly webviewContentExternalBaseUrlTemplate?: string; } export type ImportantExtensionTip = { name: string; languages?: string[]; pattern?: string; isExtensionPack?: boolean }; diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts index cdf66ef93e387346e490aaf083e402bfc2bf725d..ac5b8ac73074b26058ed596127c9ab2586a5e65c 100644 --- a/src/vs/workbench/services/environment/browser/environmentService.ts +++ b/src/vs/workbench/services/environment/browser/environmentService.ts @@ -227,7 +227,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment @memoize get webviewExternalEndpoint(): string { const endpoint = this.options.webviewEndpoint - || this.productService.webEndpointUrlTemplate + || this.productService.webviewContentExternalBaseUrlTemplate || 'https://{{uuid}}.vscode-webview.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/'; const webviewExternalEndpointCommit = this.payload?.get('webviewExternalEndpointCommit');