Clean up icons.

Author: GirlBossRush

src/vs/server/services/environmentService.ts

@@ -18,7 +18,7 @@ import { getLogLevel } from 'vs/platform/log/common/log';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { toWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IWebWorkspace, IWorkbenchConfigurationSerialized } from 'vs/platform/workspaces/common/workbench';
-import { AssetPaths, SERVICE_WORKER_FILE_NAME } from 'vs/server/services/net/common/http';
+import { AssetPaths, ICON_SIZES, SERVICE_WORKER_FILE_NAME } from 'vs/server/services/net/common/http';
 import { getCachedNlsConfiguration, getLocaleFromConfig } from 'vs/workbench/services/extensions/node/nls';
 import { RemoteExtensionLogFileName } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { ParsedRequest } from './net/abstractIncomingRequestService';
@@ -88,6 +88,7 @@ export class EnvironmentServerService extends NativeEnvironmentService implement
 		const productConfiguration: Writeable<IProductConfiguration> = {
 			...productService,
 
+			// Service Worker
 			serviceWorker: {
 				scope: req.pathPrefix,
 				url: this.createRequestUrl(req, SERVICE_WORKER_FILE_NAME).toString(),
@@ -97,22 +98,17 @@ export class EnvironmentServerService extends NativeEnvironmentService implement
 			logoutEndpointUrl: logoutEndpointUrl.toString(),
 			webEndpointUrl: this.createRequestUrl(req, AssetPaths.StaticBase).toString(),
 			webEndpointUrlTemplate: this.createRequestUrl(req, AssetPaths.StaticBase).toString(),
-			icons: [
-				{
-					src: this.createRequestUrl(req, '/static/resources/web/pwa-icon-192.png').toString(),
-					type: 'image/png',
-					sizes: '192x192',
-				},
-				{
-					src: this.createRequestUrl(req, '/static/resources/web/pwa-icon-512.png').toString(),
-					type: 'image/png',
-					sizes: '512x512',
-				},
-			],
 
 			// Proxy
 			/** The URL constructor should be decoded here to retain the port template variable. */
 			proxyEndpointUrlTemplate: decodeURI(this.createRequestUrl(req, AssetPaths.ProxyUri).toString()),
+
+			// Metadata
+			icons: ICON_SIZES.map((size => ({
+				src: this.createRequestUrl(req, `/static/resources/web/pwa-icon-${size}.png`).toString(),
+				type: 'image/png',
+				sizes: `${size}x${size}`,
+			})))
 		};
 
 		if (!this.configuration.disableUpdateCheck) {
@@ -284,3 +280,4 @@ export class EnvironmentServerService extends NativeEnvironmentService implement
 		];
 	}
 }
+

src/vs/server/services/net/common/http.ts

@@ -144,6 +144,8 @@ export interface ClientTheme {
 	foregroundColor: string;
 }
 
+export const ICON_SIZES = [192, 512];
+
 /**
  * Returns the relative path prefix for a given URL path.
  * @remark This is especially useful when creating URLs which have to remain