未验证 提交 1100001c 编写于 作者: M Matt Bierner

Hardcode commit for webview endpoint in public product.json

Fixes #135641

Also fixes duplicated names `webEndpointUrlTemplate` and `webContentExternalBaseUrlTemplate`
上级 207fece6
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
"licenseFileName": "LICENSE.txt", "licenseFileName": "LICENSE.txt",
"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new", "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
"urlProtocol": "code-oss", "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": [ "extensionAllowedProposedApi": [
"ms-vscode.vscode-js-profile-flame", "ms-vscode.vscode-js-profile-flame",
"ms-vscode.vscode-js-profile-table", "ms-vscode.vscode-js-profile-table",
......
...@@ -144,8 +144,6 @@ export interface IProductConfiguration { ...@@ -144,8 +144,6 @@ export interface IProductConfiguration {
readonly 'configurationSync.store'?: ConfigurationSyncStore; readonly 'configurationSync.store'?: ConfigurationSyncStore;
readonly darwinUniversalAssetId?: string; readonly darwinUniversalAssetId?: string;
readonly webviewContentExternalBaseUrlTemplate?: string;
} }
export type ImportantExtensionTip = { name: string; languages?: string[]; pattern?: string; isExtensionPack?: boolean }; export type ImportantExtensionTip = { name: string; languages?: string[]; pattern?: string; isExtensionPack?: boolean };
......
...@@ -227,7 +227,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment ...@@ -227,7 +227,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
@memoize @memoize
get webviewExternalEndpoint(): string { get webviewExternalEndpoint(): string {
const endpoint = this.options.webviewEndpoint 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/'; || 'https://{{uuid}}.vscode-webview.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/';
const webviewExternalEndpointCommit = this.payload?.get('webviewExternalEndpointCommit'); const webviewExternalEndpointCommit = this.payload?.get('webviewExternalEndpointCommit');
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册