Fix web extensions breaking when the commit changes

By just using the marketplace directly instead of going through the
backend.  I am not sure what the point is when searching extensions
already goes directly to the marketplace anyway.

Author: code-asher

patches/display-language.diff

@@ -199,7 +199,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 
  		const workbenchWebConfiguration = {
  			remoteAuthority,
-@@ -345,6 +348,7 @@ export class WebClientServer {
+@@ -338,6 +341,7 @@ export class WebClientServer {
  			WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${this._productService.commit}/${this._productService.version}/` : ''),
  			BASE: base,
  			VS_BASE: vscodeBase,

patches/logout.diff

@@ -46,8 +46,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  				updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
 +				logoutEndpoint: this._environmentService.args['auth'] ? base + '/logout' : undefined,
  				embedderIdentifier: 'server-distro',
- 				extensionsGallery: {
- 					...this._productService.extensionsGallery,
+ 				extensionsGallery: this._productService.extensionsGallery,
+ 			},
 Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts

patches/marketplace.diff

@@ -3,6 +3,11 @@ Add Open VSX default and an env var for marketplace, fix old marketplace
 Our old marketplace only supports `serviceUrl` but this causes the marketplace
 to be disabled entirely so this moves the template var check to fix that.
 
+This also removes serverRootPath from the web extension route because that will
+include the commit.  When you update code-server the web extension will continue
+using this path since it is stored in the browser but the path will 404 because
+the commit no longer matches.
+
 This can be tested by setting EXTENSIONS_GALLERY set to:
 
     '{"serviceUrl": "https://extensions.coder.com/api"}'
@@ -32,22 +37,19 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
 +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
-@@ -308,14 +308,14 @@ export class WebClientServer {
+@@ -308,14 +308,7 @@ export class WebClientServer {
  				codeServerVersion: this._productService.codeServerVersion,
  				rootEndpoint: base,
  				embedderIdentifier: 'server-distro',
 -				extensionsGallery: this._webExtensionResourceUrlTemplate ? {
-+				extensionsGallery: {
- 					...this._productService.extensionsGallery,
+-					...this._productService.extensionsGallery,
 -					'resourceUrlTemplate': this._webExtensionResourceUrlTemplate.with({
-+					'resourceUrlTemplate': this._webExtensionResourceUrlTemplate ? this._webExtensionResourceUrlTemplate.with({
- 						scheme: 'http',
- 						authority: remoteAuthority,
- 						path: `${this._webExtensionRoute}/${this._webExtensionResourceUrlTemplate.authority}${this._webExtensionResourceUrlTemplate.path}`
+-						scheme: 'http',
+-						authority: remoteAuthority,
+-						path: `${this._webExtensionRoute}/${this._webExtensionResourceUrlTemplate.authority}${this._webExtensionResourceUrlTemplate.path}`
 -					}).toString(true)
 -				} : undefined
-+					}).toString(true) : undefined
-+				}
++				extensionsGallery: this._productService.extensionsGallery,
  			},
  			callbackRoute: this._callbackRoute
  		};

patches/proxy-uri.diff

@@ -74,8 +74,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  				logoutEndpoint: this._environmentService.args['auth'] ? base + '/logout' : undefined,
 +				proxyEndpointTemplate: base + '/proxy/{{port}}',
  				embedderIdentifier: 'server-distro',
- 				extensionsGallery: {
- 					...this._productService.extensionsGallery,
+ 				extensionsGallery: this._productService.extensionsGallery,
+ 			},
 Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/web.main.ts

patches/service-worker.diff

@@ -30,8 +30,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
 +					path: base + '/_static/out/browser/serviceWorker.js',
 +				},
  				embedderIdentifier: 'server-distro',
- 				extensionsGallery: {
- 					...this._productService.extensionsGallery,
+ 				extensionsGallery: this._productService.extensionsGallery,
+ 			},
 Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts

patches/telemetry.diff

@@ -208,5 +208,5 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  				},
 +				enableTelemetry: this._productService.enableTelemetry,
  				embedderIdentifier: 'server-distro',
- 				extensionsGallery: {
- 					...this._productService.extensionsGallery,
+ 				extensionsGallery: this._productService.extensionsGallery,
+ 			},

patches/update-check.diff

@@ -111,8 +111,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  				rootEndpoint: base,
 +				updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
  				embedderIdentifier: 'server-distro',
- 				extensionsGallery: {
- 					...this._productService.extensionsGallery,
+ 				extensionsGallery: this._productService.extensionsGallery,
+ 			},
 Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
 ===================================================================
 --- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts