@codingame/monaco-vscode-extensions-service-override 21.0.1 → 21.1.0

package/index.d.ts

@@ -15,7 +15,7 @@ import { IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWo
 import { IExtensionManifestPropertiesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
 import type { IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices";
 import { IUserDataInitializationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userData/browser/userDataInit.service";
 import { ExtensionService } from "./vscode/src/vs/workbench/services/extensions/browser/extensionService.js";
@@ -23,18 +23,24 @@ import { ExtensionHostKind } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IUserDataProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
 import { IWorkspaceTrustManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
 import { IRemoteExplorerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteExplorerService.service";
+import { IExtensionResourceLoaderService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service";
 import type { LocalExtensionHost } from "vscode/localExtensionHost";
+import { IBuiltinExtensionsScannerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions.service";
+import { ExtensionManifestTranslator } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionsScannerService";
 export interface WorkerConfig {
     url: string;
     options?: WorkerOptions;
 }
 declare function setLocalExtensionHost(_localExtensionHost: typeof LocalExtensionHost): void;
-export interface IExtensionWithExtHostKind extends IExtension {
-    extHostKind?: ExtensionHostKind;
-}
 export declare class ExtensionServiceOverride extends ExtensionService implements IExtensionService {
     constructor(workerConfig: WorkerConfig, instantiationService: IInstantiationService, notificationService: INotificationService, browserEnvironmentService: IBrowserWorkbenchEnvironmentService, telemetryService: ITelemetryService, extensionEnablementService: IWorkbenchExtensionEnablementService, fileService: IFileService, productService: IProductService, extensionManagementService: IWorkbenchExtensionManagementService, contextService: IWorkspaceContextService, configurationService: IConfigurationService, extensionManifestPropertiesService: IExtensionManifestPropertiesService, webExtensionsScannerService: IWebExtensionsScannerService, logService: ILogService, remoteAgentService: IRemoteAgentService, remoteExtensionsScannerService: IRemoteExtensionsScannerService, lifecycleService: ILifecycleService, remoteAuthorityResolverService: IRemoteAuthorityResolverService, userDataInitializationService: IUserDataInitializationService, userDataProfileService: IUserDataProfileService, workspaceTrustManagementService: IWorkspaceTrustManagementService, remoteExplorerService: IRemoteExplorerService, dialogService: IDialogService);
-    deltaExtensions(toAdd: IExtensionWithExtHostKind[], toRemove: IExtension[]): Promise<void>;
+    deltaExtensions(toAdd: IExtension[], toRemove: IExtension[]): Promise<void>;
+}
+export declare class CustomBuiltinExtensionsScannerService extends ExtensionManifestTranslator implements IBuiltinExtensionsScannerService {
+    readonly _serviceBrand: undefined;
+    private readonly builtinExtensionsPromises;
+    constructor(fileService: IFileService, extensionResourceLoaderService: IExtensionResourceLoaderService, logService: ILogService);
+    scanBuiltinExtensions(): Promise<IExtension[]>;
 }
 export default function getServiceOverride(workerConfig?: WorkerConfig, _iframeAlternateDomain?: string): IEditorOverrideServices;
 export { ExtensionHostKind, setLocalExtensionHost };

package/index.js

@@ -20,7 +20,7 @@ import { ExtensionManifestPropertiesService } from '@codingame/monaco-vscode-571
 import { IExtensionManifestPropertiesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { IUserDataInitializationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userData/browser/userDataInit.service';
 import { ExtensionsProposedApi } from './vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js';
@@ -31,7 +31,7 @@ import './vscode/src/vs/workbench/services/extensions/common/extensionRunningLoc
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { language } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { WebWorkerExtensionHost } from './vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
@@ -44,7 +44,11 @@ import { IExtensionBisectService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { changeUrlDomain } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/service-override/tools/url';
 import { CustomSchemas } from '@codingame/monaco-vscode-files-service-override';
 import { registerAssets } from '@codingame/monaco-vscode-api/assets';
-import { getForcedExtensionHostKind } from '@codingame/monaco-vscode-api/extensions';
+import { getForcedExtensionHostKind, getBuiltinExtensions } from '@codingame/monaco-vscode-api/extensions';
+import { WebExtensionsScannerService } from './vscode/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.js';
+import { IBuiltinExtensionsScannerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions.service';
+import { ExtensionManifestTranslator } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionsScannerService';
+import { getBuiltInExtensionTranslationsUris } from '@codingame/monaco-vscode-api/l10n';
 import './vscode/src/vs/workbench/api/browser/mainThreadLocalization.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js';
@@ -197,7 +201,7 @@ let ExtensionServiceOverride = class ExtensionServiceOverride extends ExtensionS
     constructor(workerConfig, instantiationService, notificationService, browserEnvironmentService, telemetryService, extensionEnablementService, fileService, productService, extensionManagementService, contextService, configurationService, extensionManifestPropertiesService, webExtensionsScannerService, logService, remoteAgentService, remoteExtensionsScannerService, lifecycleService, remoteAuthorityResolverService, userDataInitializationService, userDataProfileService, workspaceTrustManagementService, remoteExplorerService, dialogService) {
         const extensionsProposedApi = instantiationService.createInstance(ExtensionsProposedApi);
         const extensionHostFactory = new BrowserExtensionHostFactoryOverride(workerConfig, extensionsProposedApi, async () => await this._scanWebExtensions(), () => this._getExtensionRegistrySnapshotWhenReady(), instantiationService, remoteAgentService, remoteAuthorityResolverService, extensionEnablementService, logService);
-        super(extensionsProposedApi, extensionHostFactory, new LocalBrowserExtensionHostKindPicker(workerConfig != null
+        super({ hasLocalProcess: true, allowRemoteExtensionsInLocalWebWorker: true }, extensionsProposedApi, extensionHostFactory, new LocalBrowserExtensionHostKindPicker(workerConfig != null
             ? [
                 ExtensionHostKind.LocalWebWorker,
                 ExtensionHostKind.LocalProcess,
@@ -242,6 +246,32 @@ class ExtensionResourceLoaderServiceOverride extends ExtensionResourceLoaderServ
         return await super.readExtensionResource(uri);
     }
 }
+let CustomBuiltinExtensionsScannerService = class CustomBuiltinExtensionsScannerService extends ExtensionManifestTranslator {
+    constructor(fileService, extensionResourceLoaderService, logService) {
+        super(extensionResourceLoaderService, fileService, logService);
+        this.builtinExtensionsPromises = [];
+        const nlsConfiguration = {
+            devMode: false,
+            language: language,
+            pseudo: language === 'pseudo',
+            translations: getBuiltInExtensionTranslationsUris(language) ?? {}
+        };
+        this.builtinExtensionsPromises = getBuiltinExtensions().map(async (e) => {
+            return {
+                ...e,
+                manifest: await this.translateManifest(e.location, e.manifest, nlsConfiguration)
+            };
+        });
+    }
+    async scanBuiltinExtensions() {
+        return [...(await Promise.all(this.builtinExtensionsPromises))];
+    }
+};
+CustomBuiltinExtensionsScannerService = __decorate([
+    __param(0, IFileService),
+    __param(1, IExtensionResourceLoaderService),
+    __param(2, ILogService)
+], CustomBuiltinExtensionsScannerService);
 let iframeAlternateDomain;
 registerAssets({
     'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html': () => changeUrlDomain(new URL('./vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html', import.meta.url).href, iframeAlternateDomain)
@@ -260,8 +290,10 @@ function getServiceOverride(workerConfig, _iframeAlternateDomain) {
         [IExtensionService.toString()]: new SyncDescriptor(ExtensionServiceOverride, [_workerConfig], false),
         [IExtensionManifestPropertiesService.toString()]: new SyncDescriptor(ExtensionManifestPropertiesService, [], true),
         [IExtensionResourceLoaderService.toString()]: new SyncDescriptor(ExtensionResourceLoaderServiceOverride, [], true),
-        [IExtensionBisectService.toString()]: new SyncDescriptor(ExtensionBisectService, [], true)
+        [IExtensionBisectService.toString()]: new SyncDescriptor(ExtensionBisectService, [], true),
+        [IWebExtensionsScannerService.toString()]: new SyncDescriptor(WebExtensionsScannerService, [], true),
+        [IBuiltinExtensionsScannerService.toString()]: new SyncDescriptor(CustomBuiltinExtensionsScannerService, [], true)
     };
 }
 
-export { ExtensionServiceOverride, getServiceOverride as default, setLocalExtensionHost };
+export { CustomBuiltinExtensionsScannerService, ExtensionServiceOverride, getServiceOverride as default, setLocalExtensionHost };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "21.0.1",
+  "version": "21.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extensions service-override",
   "keywords": [],
@@ -15,33 +15,35 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common": "21.0.1",
-    "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common": "21.0.1",
-    "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common": "21.0.1",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "21.0.1",
-    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "21.0.1",
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "21.0.1",
-    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "21.0.1",
-    "@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-common": "21.0.1",
-    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "21.0.1",
-    "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common": "21.0.1",
-    "@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common": "21.0.1",
-    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "21.0.1",
-    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "21.0.1",
-    "@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common": "21.0.1",
-    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "21.0.1",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "21.0.1",
-    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "21.0.1",
-    "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common": "21.0.1",
-    "@codingame/monaco-vscode-api": "21.0.1",
-    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "21.0.1",
-    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "21.0.1",
-    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "21.0.1",
-    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "21.0.1",
-    "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "21.0.1",
-    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "21.0.1",
-    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "21.0.1",
-    "@codingame/monaco-vscode-files-service-override": "21.0.1"
+    "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common": "21.1.0",
+    "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common": "21.1.0",
+    "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common": "21.1.0",
+    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "21.1.0",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "21.1.0",
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "21.1.0",
+    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "21.1.0",
+    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "21.1.0",
+    "@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-common": "21.1.0",
+    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "21.1.0",
+    "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common": "21.1.0",
+    "@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common": "21.1.0",
+    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "21.1.0",
+    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "21.1.0",
+    "@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common": "21.1.0",
+    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "21.1.0",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "21.1.0",
+    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "21.1.0",
+    "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common": "21.1.0",
+    "@codingame/monaco-vscode-api": "21.1.0",
+    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "21.1.0",
+    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "21.1.0",
+    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "21.1.0",
+    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "21.1.0",
+    "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "21.1.0",
+    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "21.1.0",
+    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "21.1.0",
+    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "21.1.0",
+    "@codingame/monaco-vscode-files-service-override": "21.1.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.d.ts

@@ -5,7 +5,7 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { AbstractExtensionResourceLoaderService } from "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader";
+import { AbstractExtensionResourceLoaderService } from "../common/extensionResourceLoader.js";
 import { IExtensionGalleryManifestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest.service";
 export declare class ExtensionResourceLoaderService extends AbstractExtensionResourceLoaderService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js

@@ -8,7 +8,7 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { AbstractExtensionResourceLoaderService } from '@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader';
+import { AbstractExtensionResourceLoaderService } from '../common/extensionResourceLoader.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IExtensionGalleryManifestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest.service';
 

package/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.d.ts

@@ -0,0 +1,42 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { TargetPlatform } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
+import { IExtensionGalleryManifestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IExtensionResourceLoaderService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service";
+export declare function migratePlatformSpecificExtensionGalleryResourceURL(resource: URI, targetPlatform: TargetPlatform): URI | undefined;
+export declare abstract class AbstractExtensionResourceLoaderService extends Disposable implements IExtensionResourceLoaderService {
+    protected readonly _fileService: IFileService;
+    private readonly _storageService;
+    private readonly _productService;
+    private readonly _environmentService;
+    private readonly _configurationService;
+    private readonly _extensionGalleryManifestService;
+    protected readonly _logService: ILogService;
+    readonly _serviceBrand: undefined;
+    private readonly _initPromise;
+    private _extensionGalleryResourceUrlTemplate;
+    private _extensionGalleryAuthority;
+    constructor(_fileService: IFileService, _storageService: IStorageService, _productService: IProductService, _environmentService: IEnvironmentService, _configurationService: IConfigurationService, _extensionGalleryManifestService: IExtensionGalleryManifestService, _logService: ILogService);
+    private _init;
+    private resolve;
+    supportsExtensionGalleryResources(): Promise<boolean>;
+    getExtensionGalleryResourceURL({ publisher, name, version, targetPlatform }: {
+        publisher: string;
+        name: string;
+        version: string;
+        targetPlatform?: TargetPlatform;
+    }, path?: string): Promise<URI | undefined>;
+    abstract readExtensionResource(uri: URI): Promise<string>;
+    isExtensionGalleryResource(uri: URI): Promise<boolean>;
+    protected getExtensionGalleryRequestHeaders(): Promise<Record<string, string>>;
+    private _serviceMachineIdPromise;
+    private _getServiceMachineId;
+    private _getExtensionGalleryAuthority;
+    protected _isWebExtensionResourceEndPoint(uri: URI): boolean;
+}

package/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.js

@@ -0,0 +1,109 @@
+
+import { isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { format2 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { getServiceMachineId } from '@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/externalServices/common/serviceMachineId';
+import { TelemetryLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry';
+import { supportsTelemetry, getTelemetryLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
+import { RemoteAuthorities } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { TargetPlatform } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
+import { getExtensionGalleryManifestResourceUri, ExtensionGalleryResourceType } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+
+const WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT = '/web-extension-resource/';
+function migratePlatformSpecificExtensionGalleryResourceURL(resource, targetPlatform) {
+    if (resource.query !== `target=${targetPlatform}`) {
+        return undefined;
+    }
+    const paths = resource.path.split('/');
+    if (!paths[3]) {
+        return undefined;
+    }
+    paths[3] = `${paths[3]}+${targetPlatform}`;
+    return resource.with({ query: null, path: paths.join('/') });
+}
+class AbstractExtensionResourceLoaderService extends Disposable {
+    constructor(_fileService, _storageService, _productService, _environmentService, _configurationService, _extensionGalleryManifestService, _logService) {
+        super();
+        this._fileService = _fileService;
+        this._storageService = _storageService;
+        this._productService = _productService;
+        this._environmentService = _environmentService;
+        this._configurationService = _configurationService;
+        this._extensionGalleryManifestService = _extensionGalleryManifestService;
+        this._logService = _logService;
+        this._initPromise = this._init();
+    }
+    async _init() {
+        try {
+            const manifest = await this._extensionGalleryManifestService.getExtensionGalleryManifest();
+            this.resolve(manifest);
+            this._register(this._extensionGalleryManifestService.onDidChangeExtensionGalleryManifest(() => this.resolve(manifest)));
+        }
+        catch (error) {
+            this._logService.error(error);
+        }
+    }
+    resolve(manifest) {
+        this._extensionGalleryResourceUrlTemplate = manifest ? getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.ExtensionResourceUri) : undefined;
+        this._extensionGalleryAuthority = this._extensionGalleryResourceUrlTemplate ? this._getExtensionGalleryAuthority(( URI.parse(this._extensionGalleryResourceUrlTemplate))) : undefined;
+    }
+    async supportsExtensionGalleryResources() {
+        await this._initPromise;
+        return this._extensionGalleryResourceUrlTemplate !== undefined;
+    }
+    async getExtensionGalleryResourceURL({ publisher, name, version, targetPlatform }, path) {
+        await this._initPromise;
+        if (this._extensionGalleryResourceUrlTemplate) {
+            const uri = ( URI.parse(format2(this._extensionGalleryResourceUrlTemplate, {
+                publisher,
+                name,
+                version: targetPlatform !== undefined
+                    && targetPlatform !== TargetPlatform.UNDEFINED
+                    && targetPlatform !== TargetPlatform.UNKNOWN
+                    && targetPlatform !== TargetPlatform.UNIVERSAL
+                    ? `${version}+${targetPlatform}`
+                    : version,
+                path: 'extension'
+            })));
+            return this._isWebExtensionResourceEndPoint(uri) ? uri.with({ scheme: RemoteAuthorities.getPreferredWebSchema() }) : uri;
+        }
+        return undefined;
+    }
+    async isExtensionGalleryResource(uri) {
+        await this._initPromise;
+        return !!this._extensionGalleryAuthority && this._extensionGalleryAuthority === this._getExtensionGalleryAuthority(uri);
+    }
+    async getExtensionGalleryRequestHeaders() {
+        const headers = {
+            'X-Client-Name': `${this._productService.applicationName}${isWeb ? '-web' : ''}`,
+            'X-Client-Version': this._productService.version
+        };
+        if (supportsTelemetry(this._productService, this._environmentService) && getTelemetryLevel(this._configurationService) === TelemetryLevel.USAGE) {
+            headers['X-Machine-Id'] = await this._getServiceMachineId();
+        }
+        if (this._productService.commit) {
+            headers['X-Client-Commit'] = this._productService.commit;
+        }
+        return headers;
+    }
+    _getServiceMachineId() {
+        if (!this._serviceMachineIdPromise) {
+            this._serviceMachineIdPromise = getServiceMachineId(this._environmentService, this._fileService, this._storageService);
+        }
+        return this._serviceMachineIdPromise;
+    }
+    _getExtensionGalleryAuthority(uri) {
+        if (this._isWebExtensionResourceEndPoint(uri)) {
+            return uri.authority;
+        }
+        const index = uri.authority.indexOf('.');
+        return index !== -1 ? uri.authority.substring(index + 1) : undefined;
+    }
+    _isWebExtensionResourceEndPoint(uri) {
+        const uriPath = uri.path, serverRootPath = RemoteAuthorities.getServerRootPath();
+        return uriPath.startsWith(serverRootPath) && uriPath.startsWith(WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT, serverRootPath.length);
+    }
+}
+
+export { AbstractExtensionResourceLoaderService, migratePlatformSpecificExtensionGalleryResourceURL };

package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.d.ts

@@ -6,6 +6,7 @@ import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/w
 import { AuthenticationWWWAuthenticateRequest, MainThreadAuthenticationShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
+import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IAuthenticationAccessService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service";
 import { IAuthenticationUsageService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service";
@@ -37,6 +38,7 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     private readonly authenticationUsageService;
     private readonly dialogService;
     private readonly notificationService;
+    private readonly extensionService;
     private readonly telemetryService;
     private readonly openerService;
     private readonly logService;
@@ -48,9 +50,10 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     private readonly _registrations;
     private _sentProviderUsageEvents;
     private _suppressUnregisterEvent;
-    constructor(extHostContext: IExtHostContext, authenticationService: IAuthenticationService, authenticationExtensionsService: IAuthenticationExtensionsService, authenticationAccessService: IAuthenticationAccessService, authenticationUsageService: IAuthenticationUsageService, dialogService: IDialogService, notificationService: INotificationService, telemetryService: ITelemetryService, openerService: IOpenerService, logService: ILogService, urlService: IURLService, dynamicAuthProviderStorageService: IDynamicAuthenticationProviderStorageService, clipboardService: IClipboardService, quickInputService: IQuickInputService);
+    constructor(extHostContext: IExtHostContext, authenticationService: IAuthenticationService, authenticationExtensionsService: IAuthenticationExtensionsService, authenticationAccessService: IAuthenticationAccessService, authenticationUsageService: IAuthenticationUsageService, dialogService: IDialogService, notificationService: INotificationService, extensionService: IExtensionService, telemetryService: ITelemetryService, openerService: IOpenerService, logService: ILogService, urlService: IURLService, dynamicAuthProviderStorageService: IDynamicAuthenticationProviderStorageService, clipboardService: IClipboardService, quickInputService: IQuickInputService);
     $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean, supportedAuthorizationServer?: UriComponents[], supportsChallenges?: boolean): Promise<void>;
     $unregisterAuthenticationProvider(id: string): Promise<void>;
+    $ensureProvider(id: string): Promise<void>;
     $sendDidChangeSessions(providerId: string, event: AuthenticationSessionsChangeEvent): Promise<void>;
     $removeSession(providerId: string, sessionId: string): Promise<void>;
     $waitForUriHandler(expectedUri: UriComponents): Promise<UriComponents>;

package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js

@@ -9,10 +9,13 @@ import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
+import { ActivationKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
 import { IAuthenticationUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service';
+import { getAuthenticationProviderActivationEvent } from '@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common/vscode/vs/workbench/services/authentication/browser/authenticationService';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
@@ -56,7 +59,7 @@ class MainThreadAuthenticationProviderWithChallenges extends MainThreadAuthentic
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
-    constructor(extHostContext, authenticationService, authenticationExtensionsService, authenticationAccessService, authenticationUsageService, dialogService, notificationService, telemetryService, openerService, logService, urlService, dynamicAuthProviderStorageService, clipboardService, quickInputService) {
+    constructor(extHostContext, authenticationService, authenticationExtensionsService, authenticationAccessService, authenticationUsageService, dialogService, notificationService, extensionService, telemetryService, openerService, logService, urlService, dynamicAuthProviderStorageService, clipboardService, quickInputService) {
         super();
         this.authenticationService = authenticationService;
         this.authenticationExtensionsService = authenticationExtensionsService;
@@ -64,6 +67,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         this.authenticationUsageService = authenticationUsageService;
         this.dialogService = dialogService;
         this.notificationService = notificationService;
+        this.extensionService = extensionService;
         this.telemetryService = telemetryService;
         this.openerService = openerService;
         this.logService = logService;
@@ -141,6 +145,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             this._suppressUnregisterEvent = false;
         }
     }
+    async $ensureProvider(id) {
+        if (!this.authenticationService.isAuthenticationProviderRegistered(id)) {
+            return await this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), ActivationKind.Immediate);
+        }
+    }
     async $sendDidChangeSessions(providerId, event) {
         const obj = this._registrations.get(providerId);
         if (obj instanceof Emitter) {
@@ -504,13 +513,14 @@ MainThreadAuthentication = __decorate([
     ( __param(4, IAuthenticationUsageService)),
     ( __param(5, IDialogService)),
     ( __param(6, INotificationService)),
-    ( __param(7, ITelemetryService)),
-    ( __param(8, IOpenerService)),
-    ( __param(9, ILogService)),
-    ( __param(10, IURLService)),
-    ( __param(11, IDynamicAuthenticationProviderStorageService)),
-    ( __param(12, IClipboardService)),
-    ( __param(13, IQuickInputService))
+    ( __param(7, IExtensionService)),
+    ( __param(8, ITelemetryService)),
+    ( __param(9, IOpenerService)),
+    ( __param(10, ILogService)),
+    ( __param(11, IURLService)),
+    ( __param(12, IDynamicAuthenticationProviderStorageService)),
+    ( __param(13, IClipboardService)),
+    ( __param(14, IQuickInputService))
 ], MainThreadAuthentication);
 
 export { MainThreadAuthentication };

package/vscode/src/vs/workbench/api/browser/mainThreadSecretState.d.ts

@@ -3,7 +3,7 @@ import { IExtHostContext } from "../../services/extensions/common/extHostCustome
 import { MainThreadSecretStateShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { ISecretStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
 export declare class MainThreadSecretState extends Disposable implements MainThreadSecretStateShape {
     private readonly secretStorageService;
     private readonly logService;

package/vscode/src/vs/workbench/api/browser/mainThreadSecretState.js

@@ -6,7 +6,7 @@ import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { SequencerByKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { ISecretStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
 
 let MainThreadSecretState = class MainThreadSecretState extends Disposable {
     constructor(extHostContext, secretStorageService, logService, environmentService) {

package/vscode/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.d.ts

@@ -0,0 +1,95 @@
+import { ExtensionType, IExtension, IExtensionManifest } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
+import { IBuiltinExtensionsScannerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IScannedExtension, ScanOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement";
+import { IWebExtensionsScannerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IGalleryExtension, Metadata } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement";
+import { IExtensionGalleryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IExtensionManifestPropertiesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service";
+import { IExtensionResourceLoaderService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service";
+import { IExtensionStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionStorage.service";
+import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
+import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
+import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+export declare class WebExtensionsScannerService extends Disposable implements IWebExtensionsScannerService {
+    private readonly environmentService;
+    private readonly builtinExtensionsScannerService;
+    private readonly fileService;
+    private readonly logService;
+    private readonly galleryService;
+    private readonly extensionManifestPropertiesService;
+    private readonly extensionResourceLoaderService;
+    private readonly extensionStorageService;
+    private readonly storageService;
+    private readonly productService;
+    private readonly userDataProfilesService;
+    private readonly uriIdentityService;
+    readonly _serviceBrand: undefined;
+    private readonly systemExtensionsCacheResource;
+    private readonly customBuiltinExtensionsCacheResource;
+    private readonly resourcesAccessQueueMap;
+    private readonly extensionsEnabledWithApiProposalVersion;
+    constructor(environmentService: IBrowserWorkbenchEnvironmentService, builtinExtensionsScannerService: IBuiltinExtensionsScannerService, fileService: IFileService, logService: ILogService, galleryService: IExtensionGalleryService, extensionManifestPropertiesService: IExtensionManifestPropertiesService, extensionResourceLoaderService: IExtensionResourceLoaderService, extensionStorageService: IExtensionStorageService, storageService: IStorageService, productService: IProductService, userDataProfilesService: IUserDataProfilesService, uriIdentityService: IUriIdentityService, lifecycleService: ILifecycleService);
+    private _customBuiltinExtensionsInfoPromise;
+    private readCustomBuiltinExtensionsInfoFromEnv;
+    private checkAdditionalBuiltinExtensions;
+    /**
+     * All system extensions bundled with the product
+     */
+    private readSystemExtensions;
+    /**
+     * All extensions defined via `additionalBuiltinExtensions` API
+     */
+    private readCustomBuiltinExtensions;
+    private getCustomBuiltinExtensionsFromLocations;
+    private getCustomBuiltinExtensionsFromGallery;
+    private getCustomBuiltinExtensionsFromCache;
+    private _migrateExtensionsStoragePromise;
+    private migrateExtensionsStorage;
+    private updateCaches;
+    private updateSystemExtensionsCache;
+    private _updateCustomBuiltinExtensionsCachePromise;
+    private updateCustomBuiltinExtensionsCache;
+    private resolveBuiltinExtensionGalleryResources;
+    private resolveBuiltinGalleryExtensions;
+    private resolveDependenciesAndPackedExtensions;
+    private getExtensionsWithDependenciesAndPackedExtensions;
+    scanSystemExtensions(): Promise<IExtension[]>;
+    scanUserExtensions(profileLocation: URI, scanOptions?: ScanOptions): Promise<IScannedExtension[]>;
+    scanExtensionsUnderDevelopment(): Promise<IExtension[]>;
+    scanExistingExtension(extensionLocation: URI, extensionType: ExtensionType, profileLocation: URI): Promise<IScannedExtension | null>;
+    scanExtensionManifest(extensionLocation: URI): Promise<IExtensionManifest | null>;
+    addExtensionFromGallery(galleryExtension: IGalleryExtension, metadata: Metadata, profileLocation: URI): Promise<IScannedExtension>;
+    addExtension(location: URI, metadata: Metadata, profileLocation: URI): Promise<IScannedExtension>;
+    removeExtension(extension: IScannedExtension, profileLocation: URI): Promise<void>;
+    updateMetadata(extension: IScannedExtension, metadata: Partial<Metadata>, profileLocation: URI): Promise<IScannedExtension>;
+    copyExtensions(fromProfileLocation: URI, toProfileLocation: URI, filter: (extension: IScannedExtension) => boolean): Promise<void>;
+    private addWebExtension;
+    private addToInstalledExtensions;
+    private scanInstalledExtensions;
+    private toWebExtensionFromGallery;
+    private toWebExtensionFromExtensionGalleryResource;
+    private getPackageNLSResourceMapFromResources;
+    private toWebExtension;
+    private toScannedExtension;
+    private listExtensionResources;
+    private translateManifest;
+    private getExtensionManifest;
+    private getTranslations;
+    private readInstalledExtensions;
+    private writeInstalledExtensions;
+    private readCustomBuiltinExtensionsCache;
+    private writeCustomBuiltinExtensionsCache;
+    private readSystemExtensionsCache;
+    private writeSystemExtensionsCache;
+    private withWebExtensions;
+    private migrateWebExtensions;
+    private storeWebExtensions;
+    private getResourceAccessQueue;
+}