@theia/vsx-registry 1.18.0 → 1.19.0

package/lib/browser/vsx-extensions-widget.js

@@ -29,6 +29,7 @@ exports.VSXExtensionsWidget = exports.generateExtensionWidgetId = exports.VSXExt
 const inversify_1 = require("@theia/core/shared/inversify");
 const source_tree_1 = require("@theia/core/lib/browser/source-tree");
 const vsx_extensions_source_1 = require("./vsx-extensions-source");
+const nls_1 = require("@theia/core/lib/common/nls");
 let VSXExtensionsWidgetOptions = class VSXExtensionsWidgetOptions extends vsx_extensions_source_1.VSXExtensionsSourceOptions {
 };
 VSXExtensionsWidgetOptions = __decorate([
@@ -63,13 +64,13 @@ let VSXExtensionsWidget = VSXExtensionsWidget_1 = class VSXExtensionsWidget exte
     computeTitle() {
         switch (this.options.id) {
             case vsx_extensions_source_1.VSXExtensionsSourceOptions.INSTALLED:
-                return 'Installed';
+                return nls_1.nls.localize('vscode/extensions.contribution/installed filter', 'Installed');
             case vsx_extensions_source_1.VSXExtensionsSourceOptions.BUILT_IN:
-                return 'Built-in';
+                return nls_1.nls.localize('vscode/extensions.contribution/builtin filter', 'Built-in');
             case vsx_extensions_source_1.VSXExtensionsSourceOptions.RECOMMENDED:
-                return 'Recommended';
+                return nls_1.nls.localize('vscode/extensions.contribution/most popular recommended', 'Recommended');
             case vsx_extensions_source_1.VSXExtensionsSourceOptions.SEARCH_RESULT:
-                return 'Open VSX Registry';
+                return nls_1.nls.localize('theia/vsx-registry/openVSX', 'Open VSX Registry');
             default:
                 return '';
         }

package/lib/browser/vsx-extensions-widget.js.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-extensions-widget.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-widget.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,4DAA6F;AAC7F,qEAAuE;AACvE,mEAA0F;AAG1F,IAAa,0BAA0B,GAAvC,MAAa,0BAA2B,SAAQ,kDAA0B;CAEzE,CAAA;AAFY,0BAA0B;IADtC,sBAAU,EAAE;GACA,0BAA0B,CAEtC;AAFY,gEAA0B;AAI1B,QAAA,yBAAyB,GAAG,CAAC,QAAgB,EAAU,EAAE,CAAC,mBAAmB,CAAC,EAAE,GAAG,GAAG,GAAG,QAAQ,CAAC;AAG/G,IAAa,mBAAmB,2BAAhC,MAAa,mBAAoB,SAAQ,8BAAgB;IAIrD,MAAM,CAAC,YAAY,CAAC,MAA4B,EAAE,OAAmC;QACjF,MAAM,KAAK,GAAG,8BAAgB,CAAC,eAAe,CAAC,MAAM,EAAE;YACnD,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,kDAA0B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAChE,KAAK,CAAC,IAAI,CAAC,2CAAmB,CAAC,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,CAAC,MAAM,CAAC,8BAAgB,CAAC,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAChE,KAAK,CAAC,IAAI,CAAC,qBAAmB,CAAC,CAAC,MAAM,EAAE,CAAC;QACzC,OAAO,KAAK,CAAC,GAAG,CAAC,qBAAmB,CAAC,CAAC;IAC1C,CAAC;IASS,IAAI;;QACV,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;QAEtC,IAAI,CAAC,EAAE,GAAG,iCAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,KAAK,SAAG,IAAI,CAAC,OAAO,CAAC,KAAK,mCAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACxD,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;QAE3B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;IACxC,CAAC;IAES,YAAY;QAClB,QAAQ,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;YACrB,KAAK,kDAA0B,CAAC,SAAS;gBACrC,OAAO,WAAW,CAAC;YACvB,KAAK,kDAA0B,CAAC,QAAQ;gBACpC,OAAO,UAAU,CAAC;YACtB,KAAK,kDAA0B,CAAC,WAAW;gBACvC,OAAO,aAAa,CAAC;YACzB,KAAK,kDAA0B,CAAC,aAAa;gBACzC,OAAO,mBAAmB,CAAC;YAC/B;gBACI,OAAO,EAAE,CAAC;SACjB;IACL,CAAC;CACJ,CAAA;AAjDU,sBAAE,GAAG,gBAAgB,CAAC;AAgB7B;IADC,kBAAM,CAAC,0BAA0B,CAAC;8BACP,0BAA0B;oDAAC;AAGvD;IADC,kBAAM,CAAC,2CAAmB,CAAC;8BACS,2CAAmB;6DAAC;AAGzD;IADC,yBAAa,EAAE;;;;+CAYf;AAnCQ,mBAAmB;IAD/B,sBAAU,EAAE;GACA,mBAAmB,CAmD/B;AAnDY,kDAAmB"}
+{"version":3,"file":"vsx-extensions-widget.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-widget.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,4DAA6F;AAC7F,qEAAuE;AACvE,mEAA0F;AAC1F,oDAAiD;AAGjD,IAAa,0BAA0B,GAAvC,MAAa,0BAA2B,SAAQ,kDAA0B;CAEzE,CAAA;AAFY,0BAA0B;IADtC,sBAAU,EAAE;GACA,0BAA0B,CAEtC;AAFY,gEAA0B;AAI1B,QAAA,yBAAyB,GAAG,CAAC,QAAgB,EAAU,EAAE,CAAC,mBAAmB,CAAC,EAAE,GAAG,GAAG,GAAG,QAAQ,CAAC;AAG/G,IAAa,mBAAmB,2BAAhC,MAAa,mBAAoB,SAAQ,8BAAgB;IAIrD,MAAM,CAAC,YAAY,CAAC,MAA4B,EAAE,OAAmC;QACjF,MAAM,KAAK,GAAG,8BAAgB,CAAC,eAAe,CAAC,MAAM,EAAE;YACnD,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,kDAA0B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAChE,KAAK,CAAC,IAAI,CAAC,2CAAmB,CAAC,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,CAAC,MAAM,CAAC,8BAAgB,CAAC,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAChE,KAAK,CAAC,IAAI,CAAC,qBAAmB,CAAC,CAAC,MAAM,EAAE,CAAC;QACzC,OAAO,KAAK,CAAC,GAAG,CAAC,qBAAmB,CAAC,CAAC;IAC1C,CAAC;IASS,IAAI;;QACV,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;QAEtC,IAAI,CAAC,EAAE,GAAG,iCAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,KAAK,SAAG,IAAI,CAAC,OAAO,CAAC,KAAK,mCAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACxD,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;QAE3B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;IACxC,CAAC;IAES,YAAY;QAClB,QAAQ,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;YACrB,KAAK,kDAA0B,CAAC,SAAS;gBACrC,OAAO,SAAG,CAAC,QAAQ,CAAC,iDAAiD,EAAE,WAAW,CAAC,CAAC;YACxF,KAAK,kDAA0B,CAAC,QAAQ;gBACpC,OAAO,SAAG,CAAC,QAAQ,CAAC,+CAA+C,EAAE,UAAU,CAAC,CAAC;YACrF,KAAK,kDAA0B,CAAC,WAAW;gBACvC,OAAO,SAAG,CAAC,QAAQ,CAAC,yDAAyD,EAAE,aAAa,CAAC,CAAC;YAClG,KAAK,kDAA0B,CAAC,aAAa;gBACzC,OAAO,SAAG,CAAC,QAAQ,CAAC,4BAA4B,EAAE,mBAAmB,CAAC,CAAC;YAC3E;gBACI,OAAO,EAAE,CAAC;SACjB;IACL,CAAC;CACJ,CAAA;AAjDU,sBAAE,GAAG,gBAAgB,CAAC;AAgB7B;IADC,kBAAM,CAAC,0BAA0B,CAAC;8BACP,0BAA0B;oDAAC;AAGvD;IADC,kBAAM,CAAC,2CAAmB,CAAC;8BACS,2CAAmB;6DAAC;AAGzD;IADC,yBAAa,EAAE;;;;+CAYf;AAnCQ,mBAAmB;IAD/B,sBAAU,EAAE;GACA,mBAAmB,CAmD/B;AAnDY,kDAAmB"}

package/lib/browser/vsx-registry-frontend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-registry-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-registry-frontend-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,mCAAmC,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAkB/D,wBAyEG"}
+{"version":3,"file":"vsx-registry-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-registry-frontend-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,mCAAmC,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAoB/D,wBAqEG"}

package/lib/browser/vsx-registry-frontend-module.js

@@ -28,23 +28,17 @@ const vsx_extension_1 = require("./vsx-extension");
 const vsx_extension_editor_1 = require("./vsx-extension-editor");
 const vsx_extension_editor_manager_1 = require("./vsx-extension-editor-manager");
 const vsx_extensions_source_1 = require("./vsx-extensions-source");
-const vsx_environment_1 = require("../common/vsx-environment");
 const vsx_extensions_search_model_1 = require("./vsx-extensions-search-model");
 const recommended_extensions_preference_contribution_1 = require("./recommended-extensions/recommended-extensions-preference-contribution");
 const preference_provider_overrides_1 = require("./recommended-extensions/preference-provider-overrides");
-const ovsx_async_client_1 = require("./ovsx-async-client");
+const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
+const vsx_environment_1 = require("../common/vsx-environment");
 exports.default = new inversify_1.ContainerModule((bind, unbind) => {
-    bind(vsx_environment_1.VSXEnvironment).toSelf().inSingletonScope();
-    bind(ovsx_async_client_1.OVSXAsyncClient).toDynamicValue(ctx => {
-        const vsxEnvironment = ctx.container.get(vsx_environment_1.VSXEnvironment);
-        return new ovsx_async_client_1.OVSXAsyncClient(Promise.all([
-            vsxEnvironment.getVscodeApiVersion(),
-            vsxEnvironment.getRegistryApiUri()
-        ]).then(([apiVersion, apiUri]) => ({
-            apiVersion,
-            apiUrl: apiUri.toString()
-        })));
+    bind(ovsx_client_provider_1.OVSXClientProvider).toDynamicValue(ctx => {
+        const clientPromise = ovsx_client_provider_1.createOVSXClient(ctx.container.get(vsx_environment_1.VSXEnvironment));
+        return () => clientPromise;
     }).inSingletonScope();
+    bind(vsx_environment_1.VSXEnvironment).toDynamicValue(ctx => browser_1.WebSocketConnectionProvider.createProxy(ctx.container, vsx_environment_1.VSX_ENVIRONMENT_PATH)).inSingletonScope();
     bind(vsx_extension_1.VSXExtension).toSelf();
     bind(vsx_extension_1.VSXExtensionFactory).toFactory(ctx => (option) => {
         const child = ctx.container.createChild();

package/lib/browser/vsx-registry-frontend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-registry-frontend-module.js","sourceRoot":"","sources":["../../src/browser/vsx-registry-frontend-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vsx-registry-frontend-module.js","sourceRoot":"","sources":["../../src/browser/vsx-registry-frontend-module.ts"],"names":[],"mappings":"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"}

package/lib/common/ovsx-client-provider.d.ts

@@ -0,0 +1,21 @@
+/********************************************************************************
+ * Copyright (C) 2021 Ericsson and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { OVSXClient } from '@theia/ovsx-client';
+import { VSXEnvironment } from './vsx-environment';
+export declare const OVSXClientProvider: unique symbol;
+export declare type OVSXClientProvider = () => Promise<OVSXClient>;
+export declare function createOVSXClient(vsxEnvironment: VSXEnvironment): Promise<OVSXClient>;
+//# sourceMappingURL=ovsx-client-provider.d.ts.map

package/lib/common/ovsx-client-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ovsx-client-provider.d.ts","sourceRoot":"","sources":["../../src/common/ovsx-client-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,oBAAY,kBAAkB,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;AAE3D,wBAAsB,gBAAgB,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,CAM1F"}

package/lib/{browser/ovsx-async-client.js → common/ovsx-client-provider.js}

@@ -15,20 +15,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OVSXAsyncClient = void 0;
-const lib_1 = require("@theia/ovsx-client/lib");
-/**
- * In some instances, the OVSXClient must be created asynchronously. This class
- * makes it possible to get an un-initialized instance and wait for it to be ready.
- */
-class OVSXAsyncClient extends lib_1.OVSXClient {
-    constructor(asyncOptions) {
-        super(undefined); // hack: using methods at this point will fail.
-        this.ready = asyncOptions.then(options => {
-            this.options = options;
-            return this;
-        });
-    }
+exports.createOVSXClient = exports.OVSXClientProvider = void 0;
+const ovsx_client_1 = require("@theia/ovsx-client");
+exports.OVSXClientProvider = Symbol('OVSXClientProvider');
+async function createOVSXClient(vsxEnvironment) {
+    const [apiVersion, apiUrl] = await Promise.all([
+        vsxEnvironment.getVscodeApiVersion(),
+        vsxEnvironment.getRegistryApiUri()
+    ]);
+    return new ovsx_client_1.OVSXClient({ apiVersion, apiUrl: apiUrl.toString() });
 }
-exports.OVSXAsyncClient = OVSXAsyncClient;
-//# sourceMappingURL=ovsx-async-client.js.map
+exports.createOVSXClient = createOVSXClient;
+//# sourceMappingURL=ovsx-client-provider.js.map

package/lib/common/ovsx-client-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ovsx-client-provider.js","sourceRoot":"","sources":["../../src/common/ovsx-client-provider.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,oDAAgD;AAGnC,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAGxD,KAAK,UAAU,gBAAgB,CAAC,cAA8B;IACjE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC3C,cAAc,CAAC,mBAAmB,EAAE;QACpC,cAAc,CAAC,iBAAiB,EAAE;KACrC,CAAC,CAAC;IACH,OAAO,IAAI,wBAAU,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AACrE,CAAC;AAND,4CAMC"}

package/lib/common/vsx-environment.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2020 TypeFox and others.
+ * Copyright (C) 2021 Ericsson and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,14 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
-import URI from '@theia/core/lib/common/uri';
-export declare class VSXEnvironment {
-    protected readonly environments: EnvVariablesServer;
-    protected _registryUri: URI | undefined;
-    getRegistryUri(): Promise<URI>;
-    getRegistryApiUri(): Promise<URI>;
-    protected _apiVersion: string | undefined;
+export declare const VSX_ENVIRONMENT_PATH = "/services/vsx-environment";
+export declare const VSXEnvironment: unique symbol;
+export interface VSXEnvironment {
+    getRegistryUri(): Promise<string>;
+    getRegistryApiUri(): Promise<string>;
     getVscodeApiVersion(): Promise<string>;
 }
 //# sourceMappingURL=vsx-environment.d.ts.map

package/lib/common/vsx-environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-environment.d.ts","sourceRoot":"","sources":["../../src/common/vsx-environment.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAG7C,qBACa,cAAc;IAGvB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;IAEpD,SAAS,CAAC,YAAY,EAAE,GAAG,GAAG,SAAS,CAAC;IAClC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC;IAKvC,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;CAQ/C"}
+{"version":3,"file":"vsx-environment.d.ts","sourceRoot":"","sources":["../../src/common/vsx-environment.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAEhE,eAAO,MAAM,cAAc,eAA2B,CAAC;AACvD,MAAM,WAAW,cAAc;IAC3B,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACrC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C"}

package/lib/common/vsx-environment.js

@@ -1,6 +1,6 @@
 "use strict";
 /********************************************************************************
- * Copyright (C) 2020 TypeFox and others.
+ * Copyright (C) 2021 Ericsson and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,47 +14,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VSXEnvironment = void 0;
-const inversify_1 = require("@theia/core/shared/inversify");
-const env_variables_1 = require("@theia/core/lib/common/env-variables");
-const uri_1 = require("@theia/core/lib/common/uri");
-const plugin_vscode_types_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-types");
-let VSXEnvironment = class VSXEnvironment {
-    async getRegistryUri() {
-        if (!this._registryUri) {
-            const vsxRegistryUrl = await this.environments.getValue('VSX_REGISTRY_URL');
-            this._registryUri = new uri_1.default(vsxRegistryUrl && vsxRegistryUrl.value || 'https://open-vsx.org');
-        }
-        return this._registryUri;
-    }
-    async getRegistryApiUri() {
-        const registryUri = await this.getRegistryUri();
-        return registryUri.resolve('api');
-    }
-    async getVscodeApiVersion() {
-        if (!this._apiVersion) {
-            const apiVersion = await this.environments.getValue('VSCODE_API_VERSION');
-            this._apiVersion = (apiVersion === null || apiVersion === void 0 ? void 0 : apiVersion.value) || plugin_vscode_types_1.VSCODE_DEFAULT_API_VERSION;
-        }
-        return this._apiVersion;
-    }
-};
-__decorate([
-    inversify_1.inject(env_variables_1.EnvVariablesServer),
-    __metadata("design:type", Object)
-], VSXEnvironment.prototype, "environments", void 0);
-VSXEnvironment = __decorate([
-    inversify_1.injectable()
-], VSXEnvironment);
-exports.VSXEnvironment = VSXEnvironment;
+exports.VSXEnvironment = exports.VSX_ENVIRONMENT_PATH = void 0;
+exports.VSX_ENVIRONMENT_PATH = '/services/vsx-environment';
+exports.VSXEnvironment = Symbol('VSXEnvironment');
 //# sourceMappingURL=vsx-environment.js.map

package/lib/common/vsx-environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-environment.js","sourceRoot":"","sources":["../../src/common/vsx-environment.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAkE;AAClE,wEAA0E;AAC1E,oDAA6C;AAC7C,iGAAqG;AAGrG,IAAa,cAAc,GAA3B,MAAa,cAAc;IAMvB,KAAK,CAAC,cAAc;QAChB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACpB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;YAC5E,IAAI,CAAC,YAAY,GAAG,IAAI,aAAG,CAAC,cAAc,IAAI,cAAc,CAAC,KAAK,IAAI,sBAAsB,CAAC,CAAC;SACjG;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAChD,OAAO,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IAGD,KAAK,CAAC,mBAAmB;QACrB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YAC1E,IAAI,CAAC,WAAW,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,KAAI,gDAA0B,CAAC;SACtE;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;CAEJ,CAAA;AAzBG;IADC,kBAAM,CAAC,kCAAkB,CAAC;;oDACyB;AAH3C,cAAc;IAD1B,sBAAU,EAAE;GACA,cAAc,CA4B1B;AA5BY,wCAAc"}
+{"version":3,"file":"vsx-environment.js","sourceRoot":"","sources":["../../src/common/vsx-environment.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAErE,QAAA,oBAAoB,GAAG,2BAA2B,CAAC;AAEnD,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC"}

package/lib/node/vsx-environment-impl.d.ts

@@ -0,0 +1,26 @@
+/********************************************************************************
+ * Copyright (C) 2020 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import URI from '@theia/core/lib/common/uri';
+import { PluginVsCodeCliContribution } from '@theia/plugin-ext-vscode/lib/node/plugin-vscode-cli-contribution';
+import { VSXEnvironment } from '../common/vsx-environment';
+export declare class VSXEnvironmentImpl implements VSXEnvironment {
+    protected _registryUri: URI;
+    protected readonly pluginVscodeCli: PluginVsCodeCliContribution;
+    getRegistryUri(): Promise<string>;
+    getRegistryApiUri(): Promise<string>;
+    getVscodeApiVersion(): Promise<string>;
+}
+//# sourceMappingURL=vsx-environment-impl.d.ts.map

package/lib/node/vsx-environment-impl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vsx-environment-impl.d.ts","sourceRoot":"","sources":["../../src/node/vsx-environment-impl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,2BAA2B,EAAE,MAAM,kEAAkE,CAAC;AAC/G,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,qBACa,kBAAmB,YAAW,cAAc;IAErD,SAAS,CAAC,YAAY,MAA8E;IAGpG,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,2BAA2B,CAAC;IAE1D,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIjC,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIpC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;CAG/C"}

package/lib/node/vsx-environment-impl.js

@@ -0,0 +1,54 @@
+"use strict";
+/********************************************************************************
+ * Copyright (C) 2020 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VSXEnvironmentImpl = void 0;
+const inversify_1 = require("@theia/core/shared/inversify");
+const uri_1 = require("@theia/core/lib/common/uri");
+const plugin_vscode_cli_contribution_1 = require("@theia/plugin-ext-vscode/lib/node/plugin-vscode-cli-contribution");
+let VSXEnvironmentImpl = class VSXEnvironmentImpl {
+    constructor() {
+        var _a;
+        this._registryUri = new uri_1.default(((_a = process.env['VSX_REGISTRY_URL']) === null || _a === void 0 ? void 0 : _a.trim()) || 'https://open-vsx.org');
+    }
+    async getRegistryUri() {
+        return this._registryUri.toString(true);
+    }
+    async getRegistryApiUri() {
+        return this._registryUri.resolve('api').toString(true);
+    }
+    async getVscodeApiVersion() {
+        return this.pluginVscodeCli.vsCodeApiVersionPromise;
+    }
+};
+__decorate([
+    inversify_1.inject(plugin_vscode_cli_contribution_1.PluginVsCodeCliContribution),
+    __metadata("design:type", plugin_vscode_cli_contribution_1.PluginVsCodeCliContribution)
+], VSXEnvironmentImpl.prototype, "pluginVscodeCli", void 0);
+VSXEnvironmentImpl = __decorate([
+    inversify_1.injectable()
+], VSXEnvironmentImpl);
+exports.VSXEnvironmentImpl = VSXEnvironmentImpl;
+//# sourceMappingURL=vsx-environment-impl.js.map

package/lib/node/vsx-environment-impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vsx-environment-impl.js","sourceRoot":"","sources":["../../src/node/vsx-environment-impl.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAkE;AAClE,oDAA6C;AAC7C,qHAA+G;AAI/G,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;;QAEc,iBAAY,GAAG,IAAI,aAAG,CAAC,OAAA,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,0CAAE,IAAI,OAAM,sBAAsB,CAAC,CAAC;IAgBxG,CAAC;IAXG,KAAK,CAAC,cAAc;QAChB,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC;IACxD,CAAC;CACJ,CAAA;AAbG;IADC,kBAAM,CAAC,4DAA2B,CAAC;8BACA,4DAA2B;2DAAC;AALvD,kBAAkB;IAD9B,sBAAU,EAAE;GACA,kBAAkB,CAkB9B;AAlBY,gDAAkB"}

package/lib/node/vsx-extension-resolver.d.ts

@@ -14,9 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { PluginDeployerResolver, PluginDeployerResolverContext } from '@theia/plugin-ext/lib/common/plugin-protocol';
-import { OVSXClient } from '@theia/ovsx-client/lib/ovsx-client';
+import { OVSXClientProvider } from '../common/ovsx-client-provider';
 export declare class VSXExtensionResolver implements PluginDeployerResolver {
-    protected client: OVSXClient;
+    protected clientProvider: OVSXClientProvider;
     protected readonly downloadPath: string;
     constructor();
     accept(pluginId: string): boolean;

package/lib/node/vsx-extension-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-extension-resolver.d.ts","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AASlF,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAErH,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,qBACa,oBAAqB,YAAW,sBAAsB;IAG/D,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAE7B,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;;IAQxC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI3B,OAAO,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;cA2BpD,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAoBxF"}
+{"version":3,"file":"vsx-extension-resolver.d.ts","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AASlF,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAErH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,qBACa,oBAAqB,YAAW,sBAAsB;IAG/D,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAE7C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;;IAQxC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI3B,OAAO,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;cA4BpD,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAoBxF"}

package/lib/node/vsx-extension-resolver.js

@@ -33,7 +33,7 @@ const requestretry = require("requestretry");
 const inversify_1 = require("@theia/core/shared/inversify");
 const uri_1 = require("@theia/core/lib/common/uri");
 const vsx_extension_uri_1 = require("../common/vsx-extension-uri");
-const ovsx_client_1 = require("@theia/ovsx-client/lib/ovsx-client");
+const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
 let VSXExtensionResolver = class VSXExtensionResolver {
     constructor() {
         this.downloadPath = path.resolve(os.tmpdir(), uuid_1.v4());
@@ -49,7 +49,8 @@ let VSXExtensionResolver = class VSXExtensionResolver {
             return;
         }
         console.log(`[${id}]: trying to resolve latest version...`);
-        const extension = await this.client.getLatestCompatibleExtensionVersion(id);
+        const client = await this.clientProvider();
+        const extension = await client.getLatestCompatibleExtensionVersion(id);
         if (!extension) {
             return;
         }
@@ -92,9 +93,9 @@ let VSXExtensionResolver = class VSXExtensionResolver {
     }
 };
 __decorate([
-    inversify_1.inject(ovsx_client_1.OVSXClient),
-    __metadata("design:type", ovsx_client_1.OVSXClient)
-], VSXExtensionResolver.prototype, "client", void 0);
+    inversify_1.inject(ovsx_client_provider_1.OVSXClientProvider),
+    __metadata("design:type", Function)
+], VSXExtensionResolver.prototype, "clientProvider", void 0);
 VSXExtensionResolver = __decorate([
     inversify_1.injectable(),
     __metadata("design:paramtypes", [])

package/lib/node/vsx-extension-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-extension-resolver.js","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vsx-extension-resolver.js","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"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"}

package/lib/node/vsx-registry-backend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-registry-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/vsx-registry-backend-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAM/D,wBAOG"}
+{"version":3,"file":"vsx-registry-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/vsx-registry-backend-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAQ/D,wBAWG"}

package/lib/node/vsx-registry-backend-module.js

@@ -18,17 +18,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const inversify_1 = require("@theia/core/shared/inversify");
 const vsx_extension_resolver_1 = require("./vsx-extension-resolver");
 const plugin_protocol_1 = require("@theia/plugin-ext/lib/common/plugin-protocol");
-const plugin_vscode_types_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-types");
-const ovsx_client_1 = require("@theia/ovsx-client/lib/ovsx-client");
+const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
+const vsx_environment_1 = require("../common/vsx-environment");
+const vsx_environment_impl_1 = require("./vsx-environment-impl");
+const core_1 = require("@theia/core");
 exports.default = new inversify_1.ContainerModule(bind => {
-    bind(ovsx_client_1.OVSXClient).toConstantValue(new ovsx_client_1.OVSXClient({
-        apiVersion: process.env['VSCODE_API_VERSION'] || plugin_vscode_types_1.VSCODE_DEFAULT_API_VERSION,
-        apiUrl: resolveRegistryUrl()
-    }));
+    bind(ovsx_client_provider_1.OVSXClientProvider).toDynamicValue(ctx => {
+        const clientPromise = ovsx_client_provider_1.createOVSXClient(ctx.container.get(vsx_environment_1.VSXEnvironment));
+        return () => clientPromise;
+    }).inSingletonScope();
+    bind(vsx_environment_1.VSXEnvironment).to(vsx_environment_impl_1.VSXEnvironmentImpl).inSingletonScope();
+    bind(core_1.ConnectionHandler).toDynamicValue(ctx => new core_1.JsonRpcConnectionHandler(vsx_environment_1.VSX_ENVIRONMENT_PATH, () => ctx.container.get(vsx_environment_1.VSXEnvironment))).inSingletonScope();
     bind(vsx_extension_resolver_1.VSXExtensionResolver).toSelf().inSingletonScope();
     bind(plugin_protocol_1.PluginDeployerResolver).toService(vsx_extension_resolver_1.VSXExtensionResolver);
 });
-function resolveRegistryUrl() {
-    return process.env['VSX_REGISTRY_URL'] || plugin_vscode_types_1.VSX_REGISTRY_URL_DEFAULT;
-}
 //# sourceMappingURL=vsx-registry-backend-module.js.map

package/lib/node/vsx-registry-backend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-registry-backend-module.js","sourceRoot":"","sources":["../../src/node/vsx-registry-backend-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,4DAA+D;AAC/D,qEAAgE;AAChE,kFAAsF;AACtF,iGAA+H;AAC/H,oEAAgE;AAEhE,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,wBAAU,CAAC,CAAC,eAAe,CAAC,IAAI,wBAAU,CAAC;QAC5C,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,gDAA0B;QAC3E,MAAM,EAAE,kBAAkB,EAAE;KAC/B,CAAC,CAAC,CAAC;IACJ,IAAI,CAAC,6CAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,wCAAsB,CAAC,CAAC,SAAS,CAAC,6CAAoB,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC;AAEH,SAAS,kBAAkB;IACxB,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,8CAAwB,CAAC;AACtE,CAAC"}
+{"version":3,"file":"vsx-registry-backend-module.js","sourceRoot":"","sources":["../../src/node/vsx-registry-backend-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,4DAA+D;AAC/D,qEAAgE;AAChE,kFAAsF;AACtF,yEAAsF;AACtF,+DAAiF;AACjF,iEAA4D;AAC5D,sCAA0E;AAE1E,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAqB,yCAAkB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC9D,MAAM,aAAa,GAAG,uCAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,CAAC;QAC1E,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC;IAC/B,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,gCAAc,CAAC,CAAC,EAAE,CAAC,yCAAkB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC/D,IAAI,CAAC,wBAAiB,CAAC,CAAC,cAAc,CAClC,GAAG,CAAC,EAAE,CAAC,IAAI,+BAAwB,CAAC,sCAAoB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,CACrG,CAAC,gBAAgB,EAAE,CAAC;IACrB,IAAI,CAAC,6CAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,wCAAsB,CAAC,CAAC,SAAS,CAAC,6CAAoB,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@theia/vsx-registry",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "description": "Theia - VSX Registry",
   "dependencies": {
-    "@theia/core": "1.18.0",
-    "@theia/filesystem": "1.18.0",
-    "@theia/ovsx-client": "1.18.0",
-    "@theia/plugin-ext": "1.18.0",
-    "@theia/plugin-ext-vscode": "1.18.0",
-    "@theia/preferences": "1.18.0",
-    "@theia/workspace": "1.18.0",
+    "@theia/core": "1.19.0",
+    "@theia/filesystem": "1.19.0",
+    "@theia/ovsx-client": "1.19.0",
+    "@theia/plugin-ext": "1.19.0",
+    "@theia/plugin-ext-vscode": "1.19.0",
+    "@theia/preferences": "1.19.0",
+    "@theia/workspace": "1.19.0",
     "@types/bent": "^7.0.1",
-    "@types/sanitize-html": "^2.3.1",
+    "@types/markdown-it": "*",
     "@types/showdown": "^1.7.1",
     "bent": "^7.1.0",
+    "markdown-it": "^8.4.0",
     "p-debounce": "^2.1.0",
     "requestretry": "^3.1.0",
-    "sanitize-html": "^2.3.2",
     "semver": "^5.4.1",
     "showdown": "^1.9.1",
     "uuid": "^8.0.0"
@@ -55,10 +55,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.18.0"
+    "@theia/ext-scripts": "1.19.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "76318d01b7b3364cdf35ee456797699363f2634d"
+  "gitHead": "cebb5417bb40e320178e3a4e66070af514f0525f"
 }

package/src/browser/recommended-extensions/recommended-extensions-preference-contribution.ts

@@ -16,6 +16,7 @@
 
 import { createPreferenceProxy, PreferenceContribution, PreferenceSchema, PreferenceScope, PreferenceService } from '@theia/core/lib/browser';
 import { JsonSchemaContribution } from '@theia/core/lib/browser/json-schema-store';
+import { nls } from '@theia/core/lib/common/nls';
 import { PreferenceConfiguration } from '@theia/core/lib/browser/preferences/preference-configurations';
 import { interfaces } from '@theia/core/shared/inversify';
 import { ExtensionSchemaContribution, extensionsSchemaID } from './recommended-extensions-json-schema';
@@ -31,7 +32,7 @@ export const recommendedExtensionsPreferencesSchema: PreferenceSchema = {
     properties: {
         extensions: {
             $ref: extensionsSchemaID,
-            description: 'A list of the names of extensions recommended for use in this workspace.',
+            description: nls.localize('theia/vsx-registry/recommendedExtensions', 'A list of the names of extensions recommended for use in this workspace.'),
             defaultValue: { recommendations: [] },
         },
     },
@@ -44,7 +45,7 @@ export const recommendedExtensionNotificationPreferencesSchema: PreferenceSchema
     scope: PreferenceScope.Folder,
     properties: {
         [IGNORE_RECOMMENDATIONS_ID]: {
-            description: 'Controls whether notifications are shown for extension recommendations.',
+            description: nls.localize('theia/vsx-registry/showRecommendedExtensions', 'Controls whether notifications are shown for extension recommendations.'),
             default: false,
             type: 'boolean'
         }

package/src/browser/vsx-extension-commands.ts

@@ -14,24 +14,28 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import { nls } from '@theia/core/lib/common/nls';
 import { codicon } from '@theia/core/lib/browser';
 import { Command } from '@theia/core/lib/common';
 
 export namespace VSXExtensionsCommands {
 
+    const EXTENSIONS_CATEGORY_KEY = 'vscode/settingsLayout/extensions';
     const EXTENSIONS_CATEGORY = 'Extensions';
 
-    export const CLEAR_ALL: Command = {
+    export const CLEAR_ALL = Command.toLocalizedCommand({
         id: 'vsxExtensions.clearAll',
         category: EXTENSIONS_CATEGORY,
         label: 'Clear Search Results',
         iconClass: codicon('clear-all')
-    };
+    }, 'vscode/search.contribution/ClearSearchResultsAction.label', EXTENSIONS_CATEGORY_KEY);
     export const INSTALL_FROM_VSIX: Command & { dialogLabel: string } = {
         id: 'vsxExtensions.installFromVSIX',
-        category: EXTENSIONS_CATEGORY,
-        label: 'Install from VSIX...',
-        dialogLabel: 'Install from VSIX'
+        category: nls.localize(EXTENSIONS_CATEGORY_KEY, EXTENSIONS_CATEGORY),
+        originalCategory: EXTENSIONS_CATEGORY,
+        originalLabel: 'Install from VSIX...',
+        label: nls.localize('theia/vsx-registry/installFromVSIX', 'Install from VSIX') + '...',
+        dialogLabel: nls.localize('theia/vsx-registry/installFromVSIX', 'Install from VSIX')
     };
     export const COPY: Command = {
         id: 'vsxExtensions.copy'
@@ -39,19 +43,19 @@ export namespace VSXExtensionsCommands {
     export const COPY_EXTENSION_ID: Command = {
         id: 'vsxExtensions.copyExtensionId'
     };
-    export const SHOW_BUILTINS: Command = {
+    export const SHOW_BUILTINS = Command.toLocalizedCommand({
         id: 'vsxExtension.showBuiltins',
         label: 'Show Built-in Extensions',
         category: EXTENSIONS_CATEGORY,
-    };
-    export const SHOW_INSTALLED: Command = {
+    }, 'vscode/extensions.contribution/showBuiltInExtensions', EXTENSIONS_CATEGORY_KEY);
+    export const SHOW_INSTALLED = Command.toLocalizedCommand({
         id: 'vsxExtension.showInstalled',
         label: 'Show Installed Extensions',
         category: EXTENSIONS_CATEGORY,
-    };
-    export const SHOW_RECOMMENDATIONS: Command = {
+    }, 'vscode/extensions.contribution/showInstalledExtensions', EXTENSIONS_CATEGORY_KEY);
+    export const SHOW_RECOMMENDATIONS = Command.toLocalizedCommand({
         id: 'vsxExtension.showRecommendations',
         label: 'Show Recommended Extensions',
         category: EXTENSIONS_CATEGORY,
-    };
+    }, 'vscode/extensions.contribution/showRecommendedExtensions', EXTENSIONS_CATEGORY_KEY);
 }