@codingame/monaco-vscode-extensions-service-override 23.2.2 → 24.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-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/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";
@@ -33,7 +33,7 @@ export interface WorkerConfig {
 }
 declare function setLocalExtensionHost(_localExtensionHost: typeof LocalExtensionHost): void;
 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);
+    constructor(enableWorkerExtensionHost: boolean, 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: IExtension[], toRemove: IExtension[]): Promise<void>;
 }
 export declare class CustomBuiltinExtensionsScannerService extends ExtensionManifestTranslator implements IBuiltinExtensionsScannerService {
@@ -42,5 +42,9 @@ export declare class CustomBuiltinExtensionsScannerService extends ExtensionMani
     constructor(fileService: IFileService, extensionResourceLoaderService: IExtensionResourceLoaderService, logService: ILogService);
     scanBuiltinExtensions(): Promise<IExtension[]>;
 }
-export default function getServiceOverride(workerConfig?: WorkerConfig, _iframeAlternateDomain?: string): IEditorOverrideServices;
+export interface ExtensionServiceOverridesOptions {
+    enableWorkerExtensionHost?: boolean;
+    iframeAlternateDomain?: string;
+}
+export default function getServiceOverride({ enableWorkerExtensionHost, iframeAlternateDomain: _iframeAlternateDomain }?: ExtensionServiceOverridesOptions): IEditorOverrideServices;
 export { ExtensionHostKind, setLocalExtensionHost };

package/index.js

@@ -16,11 +16,11 @@ import { IRemoteAuthorityResolverService } from '@codingame/monaco-vscode-api/vs
 import { IRemoteExtensionsScannerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteExtensionsScanner.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, IWebExtensionsScannerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
-import { ExtensionManifestPropertiesService } from '@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
+import { ExtensionManifestPropertiesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
 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-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/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';
@@ -41,7 +41,7 @@ import { ExtensionResourceLoaderService } from './vscode/src/vs/platform/extensi
 import { IExtensionResourceLoaderService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service';
 import { ExtensionBisectService } from './vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js';
 import { IExtensionBisectService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/browser/extensionBisect.service';
-import { changeUrlDomain } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/service-override/tools/url';
+import { changeUrlDomain } from '@codingame/monaco-vscode-api/service-override/tools/url';
 import { CustomSchemas } from '@codingame/monaco-vscode-files-service-override';
 import { registerAssets } from '@codingame/monaco-vscode-api/assets';
 import { getForcedExtensionHostKind, getBuiltinExtensions } from '@codingame/monaco-vscode-api/extensions';
@@ -144,9 +144,9 @@ function setLocalExtensionHost(_localExtensionHost) {
     localExtensionHost = _localExtensionHost;
 }
 let BrowserExtensionHostFactoryOverride = class BrowserExtensionHostFactoryOverride extends BrowserExtensionHostFactory {
-    constructor(workerConfig, _extensionsProposedApi, _scanWebExtensions, _getExtensionRegistrySnapshotWhenReady, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService, _logService) {
+    constructor(enableWorkerExtensionHost, _extensionsProposedApi, _scanWebExtensions, _getExtensionRegistrySnapshotWhenReady, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService, _logService) {
         super(_extensionsProposedApi, _scanWebExtensions, _getExtensionRegistrySnapshotWhenReady, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService, _logService);
-        this.workerConfig = workerConfig;
+        this.enableWorkerExtensionHost = enableWorkerExtensionHost;
     }
     createExtensionHost(runningLocations, runningLocation, isInitialStart) {
         switch (runningLocation.kind) {
@@ -157,13 +157,13 @@ let BrowserExtensionHostFactoryOverride = class BrowserExtensionHostFactoryOverr
                 return this._instantiationService.createInstance(localExtensionHost, runningLocation, ExtensionHostStartup.EagerAutoStart, this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart));
             }
             case ExtensionHostKind.LocalWebWorker: {
-                if (this.workerConfig == null) {
+                if (!this.enableWorkerExtensionHost) {
                     return null;
                 }
                 const startup = isInitialStart
                     ? ExtensionHostStartup.EagerManualStart
                     : ExtensionHostStartup.EagerAutoStart;
-                return this._instantiationService.createInstance(WebWorkerExtensionHost, runningLocation, startup, this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart), this.workerConfig.url, this.workerConfig.options);
+                return this._instantiationService.createInstance(WebWorkerExtensionHost, runningLocation, startup, this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart));
             }
             case ExtensionHostKind.Remote: {
                 return super.createExtensionHost(runningLocations, runningLocation, isInitialStart);
@@ -199,10 +199,10 @@ LocalBrowserExtensionHostKindPicker = __decorate([
     __param(1, ILogService)
 ], LocalBrowserExtensionHostKindPicker);
 let ExtensionServiceOverride = class ExtensionServiceOverride extends ExtensionService {
-    constructor(workerConfig, instantiationService, notificationService, browserEnvironmentService, telemetryService, extensionEnablementService, fileService, productService, extensionManagementService, contextService, configurationService, extensionManifestPropertiesService, webExtensionsScannerService, logService, remoteAgentService, remoteExtensionsScannerService, lifecycleService, remoteAuthorityResolverService, userDataInitializationService, userDataProfileService, workspaceTrustManagementService, remoteExplorerService, dialogService) {
+    constructor(enableWorkerExtensionHost, 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({ hasLocalProcess: true, allowRemoteExtensionsInLocalWebWorker: true }, extensionsProposedApi, extensionHostFactory, new LocalBrowserExtensionHostKindPicker(workerConfig != null
+        const extensionHostFactory = new BrowserExtensionHostFactoryOverride(enableWorkerExtensionHost, extensionsProposedApi, async () => await this._scanWebExtensions(), () => this._getExtensionRegistrySnapshotWhenReady(), instantiationService, remoteAgentService, remoteAuthorityResolverService, extensionEnablementService, logService);
+        super({ hasLocalProcess: true, allowRemoteExtensionsInLocalWebWorker: true }, extensionsProposedApi, extensionHostFactory, new LocalBrowserExtensionHostKindPicker(enableWorkerExtensionHost
             ? [
                 ExtensionHostKind.LocalWebWorker,
                 ExtensionHostKind.LocalProcess,
@@ -277,18 +277,12 @@ 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)
 });
-function getServiceOverride(workerConfig, _iframeAlternateDomain) {
+function getServiceOverride({ enableWorkerExtensionHost, iframeAlternateDomain: _iframeAlternateDomain } = {}) {
     if (_iframeAlternateDomain != null) {
         iframeAlternateDomain = _iframeAlternateDomain;
     }
-    const _workerConfig = workerConfig != null
-        ? {
-            ...workerConfig,
-            url: changeUrlDomain(new URL(workerConfig.url, globalThis.location?.href ?? import.meta.url), iframeAlternateDomain)
-        }
-        : undefined;
     return {
-        [IExtensionService.toString()]: new SyncDescriptor(ExtensionServiceOverride, [_workerConfig], false),
+        [IExtensionService.toString()]: new SyncDescriptor(ExtensionServiceOverride, [enableWorkerExtensionHost], false),
         [IExtensionManifestPropertiesService.toString()]: new SyncDescriptor(ExtensionManifestPropertiesService, [], true),
         [IExtensionResourceLoaderService.toString()]: new SyncDescriptor(ExtensionResourceLoaderServiceOverride, [], true),
         [IExtensionBisectService.toString()]: new SyncDescriptor(ExtensionBisectService, [], true),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "23.2.2",
+  "version": "24.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extensions service-override",
   "keywords": [],
@@ -15,35 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common": "23.2.2",
-    "@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common": "23.2.2",
-    "@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common": "23.2.2",
-    "@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common": "23.2.2",
-    "@codingame/monaco-vscode-1f37b5fb-f500-54d2-b98a-d12d100cafca-common": "23.2.2",
-    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "23.2.2",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "23.2.2",
-    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "23.2.2",
-    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.2.2",
-    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "23.2.2",
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "23.2.2",
-    "@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common": "23.2.2",
-    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "23.2.2",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.2.2",
-    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "23.2.2",
-    "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common": "23.2.2",
-    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "23.2.2",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "23.2.2",
-    "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common": "23.2.2",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "23.2.2",
-    "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common": "23.2.2",
-    "@codingame/monaco-vscode-api": "23.2.2",
-    "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common": "23.2.2",
-    "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "23.2.2",
-    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "23.2.2",
-    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "23.2.2",
-    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "23.2.2",
-    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "23.2.2",
-    "@codingame/monaco-vscode-files-service-override": "23.2.2"
+    "@codingame/monaco-vscode-api": "24.1.0",
+    "@codingame/monaco-vscode-files-service-override": "24.1.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js

@@ -12,9 +12,9 @@ import { IExtensionManagementService, IExtensionGalleryService } from '@codingam
 import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtensionId } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionType, EXTENSION_CATEGORIES } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 
-const notFound = (id) => ( localize(1829, "Extension '{0}' not found.", id));
+const notFound = (id) => ( localize(1841, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    1830,
+    1842,
     "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
     'ms-dotnettools.csharp'
 ));
@@ -51,7 +51,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             return;
         }
         if (this.location) {
-            this.logger.info(( localize(1831, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(1843, "Extensions installed on {0}:", this.location)));
         }
         extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
         let lastId = undefined;
@@ -66,7 +66,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         const failed = [];
         try {
             if (extensions.length) {
-                this.logger.info(this.location ? ( localize(1832, "Installing extensions on {0}...", this.location)) : ( localize(1833, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(1844, "Installing extensions on {0}...", this.location)) : ( localize(1845, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -109,11 +109,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localize(1834, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(1846, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(1835, "Failed Installing Extensions: {0}", failed.join(', ')))));
+            throw ( new Error(( localize(1847, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -125,7 +125,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            1836,
+            1848,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(1837, "No extension to update")));
+            this.logger.info(( localize(1849, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            1838,
+            1850,
             "Updating extensions: {0}",
             ( extensionsToUpdate.map(ext => ext.extension.identifier.id)).join(', ')
         )));
@@ -154,7 +154,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         for (const extensionResult of installationResult) {
             if (extensionResult.error) {
                 this.logger.error(( localize(
-                    1839,
+                    1851,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
@@ -162,7 +162,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             else {
                 this.logger.info(( localize(
-                    1840,
+                    1852,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -177,7 +177,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (!force && (!version || (version === 'prerelease' && installedExtension.preRelease))) {
                     this.logger.info(( localize(
-                        1841,
+                        1853,
                         "Extension '{0}' v{1} is already installed. Use '--force' option to update to latest version or provide '@<version>' to install a specific version, for example: '{2}@1.2.3'.",
                         id,
                         installedExtension.manifest.version,
@@ -186,7 +186,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localize(1842, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(1854, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
                 if (installedExtension.preRelease && version !== 'prerelease') {
@@ -223,24 +223,24 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
                     this.logger.info(( localize(
-                        1842,
+                        1854,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    1843,
+                    1855,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(1844, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1845, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1856, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1857, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localize(1846, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1847, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1858, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1859, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -252,7 +252,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
                     this.logger.error(( localize(
-                        1848,
+                        1860,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -261,7 +261,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 }
                 else {
                     this.logger.info(( localize(
-                        1849,
+                        1861,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -280,11 +280,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         if (valid) {
             try {
                 await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true });
-                this.logger.info(( localize(1850, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(1862, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(1851, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(1863, "Cancelled installing extension '{0}'.", basename(vsix))));
                 }
                 else {
                     throw error;
@@ -319,7 +319,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             const newer = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier) && semverExports.gt(local.manifest.version, manifest.version));
             if (newer) {
                 this.logger.info(( localize(
-                    1852,
+                    1864,
                     "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.",
                     newer.identifier.id,
                     newer.manifest.version,
@@ -347,7 +347,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (( extensionsToUninstall.some(e => e.type === ExtensionType.System))) {
                 this.logger.info(( localize(
-                    1853,
+                    1865,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
@@ -355,26 +355,26 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (!force && ( extensionsToUninstall.some(e => e.isBuiltin))) {
                 this.logger.info(( localize(
-                    1854,
+                    1866,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(1855, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(1867, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    1856,
+                    1868,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localize(1857, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(1869, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -392,7 +392,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(1858, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1859, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(1870, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1871, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( __decorate([

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

@@ -2,7 +2,7 @@
 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 { getServiceMachineId } from '@codingame/monaco-vscode-api/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';

package/vscode/src/vs/platform/remote/common/managedSocket.d.ts

@@ -1,7 +1,7 @@
 import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
 import { Emitter, Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ISocket, SocketCloseEvent, SocketDiagnosticsEventType } from "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc.net";
+import { ISocket, SocketCloseEvent, SocketDiagnosticsEventType } from "@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc.net";
 export declare const makeRawSocketHeaders: (path: string, query: string, deubgLabel: string) => string;
 export declare const socketRawEndHeaderSequence: VSBuffer;
 export interface RemoteSocketHalf {
@@ -29,6 +29,6 @@ export declare abstract class ManagedSocket extends Disposable implements ISocke
     end(): void;
     abstract write(buffer: VSBuffer): void;
     protected abstract closeRemote(): void;
-    traceSocketEvent(type: SocketDiagnosticsEventType, data?: any): void;
+    traceSocketEvent(type: SocketDiagnosticsEventType, data?: VSBuffer | Uint8Array | ArrayBuffer | ArrayBufferView | unknown): void;
     dispose(): void;
 }

package/vscode/src/vs/platform/remote/common/managedSocket.js

@@ -2,7 +2,7 @@
 import { encodeBase64, VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { PauseableEmitter, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { SocketDiagnostics } from '@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc.net';
+import { SocketDiagnostics } from '@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc.net';
 
 const makeRawSocketHeaders = (path, query, deubgLabel) => {
     const buffer = ( new Uint8Array(16));

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

@@ -3,7 +3,7 @@ import { IExtHostContext } from "../../services/extensions/common/extHostCustome
 import { AuthenticationSession, AuthenticationSessionsChangeEvent, AuthenticationSessionAccount, IAuthenticationWwwAuthenticateRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication";
 import { IAuthenticationExtensionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
 import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
-import { MainThreadAuthenticationShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { IRegisterAuthenticationProviderDetails, IRegisterDynamicAuthenticationProviderDetails, 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";
@@ -53,14 +53,14 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     private _sentProviderUsageEvents;
     private _suppressUnregisterEvent;
     constructor(extHostContext: IExtHostContext, productService: IProductService, 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>;
+    $registerAuthenticationProvider({ id, label, supportsMultipleAccounts, resourceServer, supportedAuthorizationServers, supportsChallenges }: IRegisterAuthenticationProviderDetails): 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>;
     $showContinueNotification(message: string): Promise<boolean>;
-    $registerDynamicAuthenticationProvider(id: string, label: string, authorizationServer: UriComponents, clientId: string, clientSecret?: string): Promise<void>;
+    $registerDynamicAuthenticationProvider(details: IRegisterDynamicAuthenticationProviderDetails): Promise<void>;
     $setSessionsForDynamicAuthProvider(authProviderId: string, clientId: string, sessions: (IAuthorizationTokenResponse & {
         created_at: number;
     })[]): Promise<void>;