From def81245a425178578318f3ec80d301c4c30f6b9 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Tue, 24 Nov 2020 12:59:06 -0500 Subject: [PATCH] vscode: Check updates with absolute path In case the window location path changes. Not entirely sure if it can but best to be on the safe side. --- ci/dev/vscode.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/dev/vscode.patch b/ci/dev/vscode.patch index 4f249d36..df3f673e 100644 --- a/ci/dev/vscode.patch +++ b/ci/dev/vscode.patch @@ -769,10 +769,10 @@ index 096b9e23493539c9937940a56e555d95bbae38d9..ef37e614004f550f7b64eacd362f6894 remove(key: string, scope: StorageScope): void { diff --git a/src/vs/server/browser/client.ts b/src/vs/server/browser/client.ts new file mode 100644 -index 0000000000000000000000000000000000000000..c6eef331346ebc244a26e8b1e5919d192225b971 +index 0000000000000000000000000000000000000000..385b9da491d38a9f5d10fab6e4666c84a892f49d --- /dev/null +++ b/src/vs/server/browser/client.ts -@@ -0,0 +1,237 @@ +@@ -0,0 +1,240 @@ +import { Emitter } from 'vs/base/common/event'; +import { URI } from 'vs/base/common/uri'; +import { localize } from 'vs/nls'; @@ -792,6 +792,7 @@ index 0000000000000000000000000000000000000000..c6eef331346ebc244a26e8b1e5919d19 +import { Options } from 'vs/server/ipc.d'; +import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; +import { ILogService } from 'vs/platform/log/common/log'; ++import * as path from 'vs/base/common/path'; + +class TelemetryService extends TelemetryChannelClient { + public constructor( @@ -925,10 +926,12 @@ index 0000000000000000000000000000000000000000..c6eef331346ebc244a26e8b1e5919d19 + + const logService = (services.get(ILogService) as ILogService); + const storageService = (services.get(IStorageService) as IStorageService); ++ // We set this here first in case the path changes. ++ const updateCheckEndpoint = path.join(window.location.pathname, "/update/check") + const getUpdate = async (): Promise => { + logService.debug("Checking for update..."); + -+ const response = await fetch("update/check", { ++ const response = await fetch(updateCheckEndpoint, { + headers: { "Accept": "application/json" }, + }); + if (!response.ok) {