Bring back webviewContentExternalBaseUrlTemplate

We need a distinct property just for webviews
This commit is contained in:
Matt Bierner 2021-10-27 10:48:17 -07:00
parent 0e53bb6664
commit f191b9d9fd
No known key found for this signature in database
GPG key ID: 099C331567E11888
4 changed files with 4 additions and 3 deletions

View file

@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.62.0",
"distro": "b20d22b7ba814d2fdc985ad724271807ca95f2a8",
"distro": "084dcc16aa74953bab0548580b3af2b0f2eb1134",
"author": {
"name": "Microsoft Corporation"
},

View file

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

View file

@ -53,6 +53,7 @@ export interface IProductConfiguration {
readonly updateUrl?: string;
readonly webEndpointUrl?: string;
readonly webEndpointUrlTemplate?: string;
readonly webviewContentExternalBaseUrlTemplate?: string;
readonly target?: string;
readonly settingsSearchBuildId?: number;

View file

@ -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');