Skip to content

Commit dc1a669

Browse files
committed
Revert "Hardcode commit for webview endpoint in public product.json"
This reverts commit 1100001.
1 parent 3d09c55 commit dc1a669

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

product.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"licenseFileName": "LICENSE.txt",
2424
"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
2525
"urlProtocol": "code-oss",
26-
"webEndpointUrlTemplate": "https://{{uuid}}.vscode-webview.net/{{quality}}/5f19eee5dc9588ca96192f89587b5878b7d7180d/out/vs/workbench/contrib/webview/browser/pre/",
26+
"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/",
2727
"extensionAllowedProposedApi": [
2828
"ms-vscode.vscode-js-profile-flame",
2929
"ms-vscode.vscode-js-profile-table",

src/vs/base/common/product.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ export interface IProductConfiguration {
144144
readonly 'configurationSync.store'?: ConfigurationSyncStore;
145145

146146
readonly darwinUniversalAssetId?: string;
147+
148+
readonly webviewContentExternalBaseUrlTemplate?: string;
147149
}
148150

149151
export type ImportantExtensionTip = { name: string; languages?: string[]; pattern?: string; isExtensionPack?: boolean };

src/vs/workbench/services/environment/browser/environmentService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
227227
@memoize
228228
get webviewExternalEndpoint(): string {
229229
const endpoint = this.options.webviewEndpoint
230-
|| this.productService.webEndpointUrlTemplate
230+
|| this.productService.webviewContentExternalBaseUrlTemplate
231231
|| 'https://{{uuid}}.vscode-webview.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/';
232232

233233
const webviewExternalEndpointCommit = this.payload?.get('webviewExternalEndpointCommit');

0 commit comments

Comments
 (0)