feat: upgrade to 1.64

src/vs/workbench/browser/client.ts

@@ -14,7 +14,7 @@ import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/commo
 import { ILogService } from 'vs/platform/log/common/log';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import type { IProductConfiguration } from 'vs/workbench/workbench.web.api';
+import type { IProductConfiguration } from 'vs/workbench/workbench.web.main';
 
 /**
  * @file All client-side customization to VS Code should live in this file when
@@ -29,6 +29,7 @@ export class CodeServerClientAdditions extends Disposable {
 	static LOGOUT_COMMAND_ID = 'code-server.logout';
 	static AUTH_KEY = 'code-server.authed';
 	productConfiguration: Partial<IProductConfiguration>;
+	ctor: any;
 
 	private sourceIsTrustedServiceWorker = (source: string): boolean => {
 		return this.productConfiguration.serviceWorker?.url === source;
@@ -45,7 +46,7 @@ export class CodeServerClientAdditions extends Disposable {
 	});
 
 
-	constructor (
+	constructor(
 		productConfiguration: Partial<IProductConfiguration>,
 		@ILogService private logService: ILogService,
 		@INotificationService private notificationService: INotificationService,

src/vs/workbench/browser/web.main.ts

@@ -67,12 +67,9 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { mixin, safeStringify } from 'vs/base/common/objects';
 import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
 import { IndexedDB } from 'vs/base/browser/indexedDB';
-<<<<<<< HEAD
 import { CodeServerClientAdditions } from 'vs/workbench/browser/client';
-=======
 import { BrowserCredentialsService } from 'vs/workbench/services/credentials/browser/credentialsService';
 import { IWorkspace } from 'vs/workbench/services/host/browser/browserHostService';
->>>>>>> upstream/release/1.64
 
 export class BrowserMain extends Disposable {
 
@@ -189,17 +186,12 @@ export class BrowserMain extends Disposable {
 		serviceCollection.set(ILogService, logService);
 
 		// Remote
-<<<<<<< HEAD
-		const connectionToken = environmentService.options.connectionToken || getCookieValue('vscode-tkn');
+		const connectionToken = environmentService.options.connectionToken || getCookieValue(connectionTokenCookieName);
 		/**
 		 * Add proxy URL template to the resolver.
 		 * @author coder
 		 */
 		const remoteAuthorityResolverService = new RemoteAuthorityResolverService(connectionToken, this.configuration.resourceUriProvider, this.configuration.productConfiguration?.proxyEndpointUrlTemplate);
-=======
-		const connectionToken = environmentService.options.connectionToken || getCookieValue(connectionTokenCookieName);
-		const remoteAuthorityResolverService = new RemoteAuthorityResolverService(connectionToken, this.configuration.resourceUriProvider);
->>>>>>> upstream/release/1.64
 		serviceCollection.set(IRemoteAuthorityResolverService, remoteAuthorityResolverService);
 
 		// Signing