@codingame/monaco-vscode-extension-gallery-service-override 2.1.4 → 2.2.0-next.2

package/extensionGallery.js

@@ -14,7 +14,6 @@ import { IExtensionRecommendationNotificationService } from 'vscode/vscode/vs/pl
 import { IIgnoredExtensionsManagementService, IgnoredExtensionsManagementService } from 'vscode/vscode/vs/platform/userDataSync/common/ignoredExtensions';
 import { IExtensionManifestPropertiesService, ExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
 import { IBuiltinExtensionsScannerService } from 'vscode/vscode/vs/platform/extensions/common/extensions';
-import { BuiltinExtensionsScannerService } from './vscode/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.js';
 import { ExtensionIgnoredRecommendationsService } from './vscode/src/vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService.js';
 import { IWorkspaceExtensionsConfigService, WorkspaceExtensionsConfigService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
 import { ExtensionRecommendationNotificationService } from './vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.js';
@@ -29,9 +28,12 @@ import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { registerAssets } from 'vscode/assets';
+import { getExtensionManifests } from 'vscode/extensions';
 
 registerAssets({
-    'vs/workbench/services/extensionManagement/common/media/defaultIcon.png': ( new URL('./assets/defaultIcon.png', import.meta.url).toString())
+    'vs/workbench/services/extensionManagement/common/media/defaultIcon.png': ( new URL('./assets/defaultIcon.png', import.meta.url).toString()),
+    'vs/workbench/contrib/extensions/browser/media/theme-icon.png': new URL('./assets/theme-icon.png', import.meta.url).href,
+    'vs/workbench/contrib/extensions/browser/media/language-icon.svg': new URL('./assets/theme-icon.png', import.meta.url).href
 });
 let ExtensionManagementServerServiceOverride = class ExtensionManagementServerServiceOverride extends ExtensionManagementServerService {
     constructor(isWebOnly, remoteAgentService, labelService, instantiationService) {
@@ -50,6 +52,11 @@ ExtensionManagementServerServiceOverride = __decorate([
     ( __param(2, ILabelService)),
     ( __param(3, IInstantiationService))
 ], ExtensionManagementServerServiceOverride);
+class CustomBuiltinExtensionsScannerService {
+    async scanBuiltinExtensions() {
+        return getExtensionManifests();
+    }
+}
 function getServiceOverride(options = { webOnly: false }) {
     return {
         [( IExtensionGalleryService.toString())]: new SyncDescriptor(ExtensionGalleryService, [], true),
@@ -63,7 +70,7 @@ function getServiceOverride(options = { webOnly: false }) {
         [( IIgnoredExtensionsManagementService.toString())]: new SyncDescriptor(IgnoredExtensionsManagementService, [], true),
         [( IExtensionManifestPropertiesService.toString())]: new SyncDescriptor(ExtensionManifestPropertiesService, [], true),
         [( IExtensionManagementService.toString())]: new SyncDescriptor(ExtensionManagementService, [], true),
-        [( IBuiltinExtensionsScannerService.toString())]: new SyncDescriptor(BuiltinExtensionsScannerService, [], true),
+        [( IBuiltinExtensionsScannerService.toString())]: new SyncDescriptor(CustomBuiltinExtensionsScannerService, [], true),
         [( IWorkspaceExtensionsConfigService.toString())]: new SyncDescriptor(WorkspaceExtensionsConfigService, [], true),
         [( IExtensionTipsService.toString())]: new SyncDescriptor(ExtensionTipsService, [], true),
         [( IRemoteUserDataProfilesService.toString())]: new SyncDescriptor(RemoteUserDataProfilesService, [], true),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "2.1.4",
+  "version": "2.2.0-next.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,15 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.1.4",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0-next.2",
     "vscode-marked": "npm:marked@=3.0.2",
-    "vscode-semver": "npm:semver@=5.5.0"
+    "vscode-semver": "npm:semver@=5.5.0",
+    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.2",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0-next.2",
+    "@codingame/monaco-vscode-extensions-service-override": "2.2.0-next.2",
+    "@codingame/monaco-vscode-environment-service-override": "2.2.0-next.2",
+    "@codingame/monaco-vscode-layout-service-override": "2.2.0-next.2",
+    "@codingame/monaco-vscode-host-service-override": "2.2.0-next.2",
+    "@codingame/monaco-vscode-base-service-override": "2.2.0-next.2"
   }
 }

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionEditor.js

@@ -51,7 +51,7 @@ import { ExtensionsTree, ExtensionData, ExtensionsGridView, getExtensions } from
 import { RemoteBadgeWidget, VerifiedPublisherWidget, InstallCountWidget, RatingsWidget, SponsorWidget, ExtensionStatusWidget, ExtensionWidget, ExtensionRecommendationWidget, onClick } from './extensionsWidgets.js';
 import { ExtensionContainers, VIEWLET_ID, IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { renderMarkdownDocument, DEFAULT_MARKDOWN_STYLES } from 'vscode/vscode/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer';
-import { ShowCurrentReleaseNotesActionId } from '../../update/common/update.js';
+import { ShowCurrentReleaseNotesActionId } from 'vscode/vscode/vs/workbench/contrib/update/common/update';
 import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED, IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IExtensionRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations';

package/vscode/src/vs/workbench/contrib/update/common/update.js

@@ -1,3 +0,0 @@
-const ShowCurrentReleaseNotesActionId = 'update.showCurrentReleaseNotes';
-
-export { ShowCurrentReleaseNotesActionId };

package/vscode/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.js

@@ -1,85 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { isWeb, Language } from 'vscode/vscode/vs/base/common/platform';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
-import { getGalleryExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { FileAccess, builtinExtensionsPath } from 'vscode/vscode/vs/base/common/network';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { localizeManifest } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionNls';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
-
-let BuiltinExtensionsScannerService = class BuiltinExtensionsScannerService {
-    constructor(environmentService, uriIdentityService, extensionResourceLoaderService, productService, logService) {
-        this.extensionResourceLoaderService = extensionResourceLoaderService;
-        this.logService = logService;
-        this.builtinExtensionsPromises = [];
-        if (isWeb) {
-            const nlsBaseUrl = productService.extensionsGallery?.nlsBaseUrl;
-            if (nlsBaseUrl && productService.commit && !Language.isDefaultVariant()) {
-                this.nlsUrl = URI.joinPath(( URI.parse(nlsBaseUrl)), productService.commit, productService.version, Language.value());
-            }
-            const builtinExtensionsServiceUrl = ( FileAccess.asBrowserUri(builtinExtensionsPath));
-            if (builtinExtensionsServiceUrl) {
-                let bundledExtensions = [];
-                if (environmentService.isBuilt) {
-                    bundledExtensions = [ ];
-                }
-                else {
-                    const builtinExtensionsElement = mainWindow.document.getElementById('vscode-workbench-builtin-extensions');
-                    const builtinExtensionsElementAttribute = builtinExtensionsElement ? builtinExtensionsElement.getAttribute('data-settings') : undefined;
-                    if (builtinExtensionsElementAttribute) {
-                        try {
-                            bundledExtensions = JSON.parse(builtinExtensionsElementAttribute);
-                        }
-                        catch (error) {  }
-                    }
-                }
-                this.builtinExtensionsPromises = ( bundledExtensions.map(async (e) => {
-                    const id = getGalleryExtensionId(e.packageJSON.publisher, e.packageJSON.name);
-                    return {
-                        identifier: { id },
-                        location: uriIdentityService.extUri.joinPath(builtinExtensionsServiceUrl, e.extensionPath),
-                        type: 0 ,
-                        isBuiltin: true,
-                        manifest: e.packageNLS ? await this.localizeManifest(id, e.packageJSON, e.packageNLS) : e.packageJSON,
-                        readmeUrl: e.readmePath ? uriIdentityService.extUri.joinPath(builtinExtensionsServiceUrl, e.readmePath) : undefined,
-                        changelogUrl: e.changelogPath ? uriIdentityService.extUri.joinPath(builtinExtensionsServiceUrl, e.changelogPath) : undefined,
-                        targetPlatform: "web" ,
-                        validations: [],
-                        isValid: true
-                    };
-                }));
-            }
-        }
-    }
-    async scanBuiltinExtensions() {
-        return [...(await Promise.all(this.builtinExtensionsPromises))];
-    }
-    async localizeManifest(extensionId, manifest, fallbackTranslations) {
-        if (!this.nlsUrl) {
-            return localizeManifest(this.logService, manifest, fallbackTranslations);
-        }
-        const uri = URI.joinPath(this.nlsUrl, extensionId, 'package');
-        try {
-            const res = await this.extensionResourceLoaderService.readExtensionResource(uri);
-            const json = JSON.parse(( res.toString()));
-            return localizeManifest(this.logService, manifest, json, fallbackTranslations);
-        }
-        catch (e) {
-            this.logService.error(e);
-            return localizeManifest(this.logService, manifest, fallbackTranslations);
-        }
-    }
-};
-BuiltinExtensionsScannerService = ( __decorate([
-    ( __param(0, IWorkbenchEnvironmentService)),
-    ( __param(1, IUriIdentityService)),
-    ( __param(2, IExtensionResourceLoaderService)),
-    ( __param(3, IProductService)),
-    ( __param(4, ILogService))
-], BuiltinExtensionsScannerService));
-
-export { BuiltinExtensionsScannerService };