Skip to content

Commit 01a3e3b

Browse files
committed
vscode: Use options.base for update checking
See #2358 (comment)
1 parent eca4448 commit 01a3e3b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ci/dev/vscode.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -769,10 +769,10 @@ index 096b9e23493539c9937940a56e555d95bbae38d9..ef37e614004f550f7b64eacd362f6894
769769
remove(key: string, scope: StorageScope): void {
770770
diff --git a/src/vs/server/browser/client.ts b/src/vs/server/browser/client.ts
771771
new file mode 100644
772-
index 0000000000000000000000000000000000000000..385b9da491d38a9f5d10fab6e4666c84a892f49d
772+
index 0000000000000000000000000000000000000000..71df1d2b0a718c6a6fbb66a075be52d1be3ff00d
773773
--- /dev/null
774774
+++ b/src/vs/server/browser/client.ts
775-
@@ -0,0 +1,240 @@
775+
@@ -0,0 +1,239 @@
776776
+import { Emitter } from 'vs/base/common/event';
777777
+import { URI } from 'vs/base/common/uri';
778778
+import { localize } from 'vs/nls';
@@ -926,8 +926,7 @@ index 0000000000000000000000000000000000000000..385b9da491d38a9f5d10fab6e4666c84
926926
+
927927
+ const logService = (services.get(ILogService) as ILogService);
928928
+ const storageService = (services.get(IStorageService) as IStorageService);
929-
+ // We set this here first in case the path changes.
930-
+ const updateCheckEndpoint = path.join(window.location.pathname, "/update/check")
929+
+ const updateCheckEndpoint = path.join(options.base, "/update/check")
931930
+ const getUpdate = async (): Promise<void> => {
932931
+ logService.debug("Checking for update...");
933932
+
@@ -1405,16 +1404,17 @@ index 0000000000000000000000000000000000000000..56331ff1fc32bbd82e769aaecb551e42
14051404
+require('../../bootstrap-amd').load('vs/server/entry');
14061405
diff --git a/src/vs/server/ipc.d.ts b/src/vs/server/ipc.d.ts
14071406
new file mode 100644
1408-
index 0000000000000000000000000000000000000000..6ce56bec114a6d8daf5dd3ded945ea78fc72a5c6
1407+
index 0000000000000000000000000000000000000000..fd0115a74eb2d7362a3bf2543cb354a29a58936a
14091408
--- /dev/null
14101409
+++ b/src/vs/server/ipc.d.ts
1411-
@@ -0,0 +1,131 @@
1410+
@@ -0,0 +1,132 @@
14121411
+/**
14131412
+ * External interfaces for integration into code-server over IPC. No vs imports
14141413
+ * should be made in this file.
14151414
+ */
14161415
+export interface Options {
14171416
+ disableTelemetry: boolean
1417+
+ base: string
14181418
+}
14191419
+
14201420
+export interface InitMessage {

0 commit comments

Comments
 (0)