Skip to content

Commit bc566d4

Browse files
committed
Try bumping webEndpointUrlTemplate again
Reverts dc1a669 Also bumps distro to pick up new product.json changes
1 parent 154af5a commit bc566d4

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.62.0",
4-
"distro": "5bf6b6a12ff7660d62231fd300c4d3873c318b93",
4+
"distro": "b20d22b7ba814d2fdc985ad724271807ca95f2a8",
55
"author": {
66
"name": "Microsoft Corporation"
77
},

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-
"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/",
26+
"webEndpointUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/dc1a6699060423b8c4d2ced736ad70195378fddf/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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ export interface IProductConfiguration {
144144
readonly 'configurationSync.store'?: ConfigurationSyncStore;
145145

146146
readonly darwinUniversalAssetId?: string;
147-
148-
readonly webviewContentExternalBaseUrlTemplate?: string;
149147
}
150148

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

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

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

233233
const webviewExternalEndpointCommit = this.payload?.get('webviewExternalEndpointCommit');
234234
return endpoint
235-
.replace('{{commit}}', webviewExternalEndpointCommit ?? this.productService.commit ?? '5f19eee5dc9588ca96192f89587b5878b7d7180d')
235+
.replace('{{commit}}', webviewExternalEndpointCommit ?? this.productService.commit ?? 'dc1a6699060423b8c4d2ced736ad70195378fddf')
236236
.replace('{{quality}}', (webviewExternalEndpointCommit ? 'insider' : this.productService.quality) ?? 'insider');
237237
}
238238

test/integration/browser/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ async function runTestsInBrowser(browserType: BrowserType, endpoint: url.UrlWith
6363
const testExtensionUri = url.format({ pathname: URI.file(path.resolve(optimist.argv.extensionDevelopmentPath)).path, protocol, host, slashes: true });
6464
const testFilesUri = url.format({ pathname: URI.file(path.resolve(optimist.argv.extensionTestsPath)).path, protocol, host, slashes: true });
6565

66-
const payloadParam = `[["extensionDevelopmentPath","${testExtensionUri}"],["extensionTestsPath","${testFilesUri}"],["enableProposedApi",""],["webviewExternalEndpointCommit","5f19eee5dc9588ca96192f89587b5878b7d7180d"],["skipWelcome","true"]]`;
66+
const payloadParam = `[["extensionDevelopmentPath","${testExtensionUri}"],["extensionTestsPath","${testFilesUri}"],["enableProposedApi",""],["webviewExternalEndpointCommit","dc1a6699060423b8c4d2ced736ad70195378fddf"],["skipWelcome","true"]]`;
6767

6868
if (path.extname(testWorkspaceUri) === '.code-workspace') {
6969
await page.goto(`${endpoint.href}&workspace=${testWorkspaceUri}&payload=${payloadParam}`);

0 commit comments

Comments
 (0)