feat(plugins): allow to install che-plugins in devworkspace

Signed-off-by: Vitaliy Gulyy <[email protected]>
eclipse-che · Jan 31, 2022 · 6724cfc · 6724cfc
1 parent c12893c
commit 6724cfc
Show file tree

Hide file tree

Showing 35 changed files with 3,601 additions and 416 deletions.
diff --git a/extensions/eclipse-che-theia-about/package.json b/extensions/eclipse-che-theia-about/package.json
@@ -9,7 +9,8 @@
     "inversify": "^5.0.1",
     "@theia/core": "next",
     "@theia/mini-browser": "next",
-    "@eclipse-che/theia-plugin-ext": "^0.0.1"
+    "@eclipse-che/theia-plugin-ext": "^0.0.1",
+    "react": "^16.8.0"
   },
   "devDependencies": {
     "ts-jest": "27.0.7",

diff --git a/extensions/eclipse-che-theia-plugin-ext/package.json b/extensions/eclipse-che-theia-plugin-ext/package.json
@@ -37,7 +37,9 @@
     "drivelist": "9.0.2",
     "@eclipse-che/theia-remote-api": "^0.0.1",
     "@eclipse-che/workspace-telemetry-client": "latest",
-    "mime": "2.5.2"
+    "mime": "2.5.2",
+    "react": "^16.8.0",
+    "@phosphor/messaging": "1"
   },
   "devDependencies": {
     "clean-webpack-plugin": "^3.0.0",

diff --git a/extensions/eclipse-che-theia-plugin-ext/src/browser/che-frontend-module.ts b/extensions/eclipse-che-theia-plugin-ext/src/browser/che-frontend-module.ts
@@ -21,7 +21,6 @@ import {
   CheTaskClient,
   CheTaskService,
 } from '../common/che-protocol';
-import { CHE_PLUGIN_SERVICE_PATH, ChePluginService, ChePluginServiceClient } from '../common/che-plugin-protocol';
 import { CheSideCarContentReaderRegistryImpl, CheSideCarResourceResolver } from './che-sidecar-resource';
 import { CommandContribution, ResourceResolver } from '@theia/core/lib/common';
 import { ContainerModule, interfaces } from 'inversify';
@@ -35,6 +34,7 @@ import { ChePluginFrontentService } from './plugin/che-plugin-frontend-service';
 import { ChePluginHandleRegistry } from './che-plugin-handle-registry';
 import { ChePluginManager } from './plugin/che-plugin-manager';
 import { ChePluginMenu } from './plugin/che-plugin-menu';
+import { ChePluginServiceClient } from '@eclipse-che/theia-remote-api/lib/common/plugin-service';
 import { ChePluginServiceClientImpl } from './plugin/che-plugin-service-client';
 import { ChePluginView } from './plugin/che-plugin-view';
 import { ChePluginViewContribution } from './plugin/che-plugin-view-contribution';
@@ -72,13 +72,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
   bind(ChePluginServiceClientImpl).toSelf().inSingletonScope();
   bind(ChePluginServiceClient).toService(ChePluginServiceClientImpl);
-  bind(ChePluginService)
-    .toDynamicValue(ctx => {
-      const provider = ctx.container.get(WebSocketConnectionProvider);
-      const client: ChePluginServiceClient = ctx.container.get(ChePluginServiceClient);
-      return provider.createProxy<ChePluginService>(CHE_PLUGIN_SERVICE_PATH, client);
-    })
-    .inSingletonScope();
 
   rebind(WebviewEnvironment).to(CheWebviewEnvironment).inSingletonScope();
 

diff --git a/...nsions/eclipse-che-theia-plugin-ext/src/browser/plugin/che-plugin-command-contribution.ts b/...nsions/eclipse-che-theia-plugin-ext/src/browser/plugin/che-plugin-command-contribution.ts
@@ -12,7 +12,7 @@ import { Command, CommandContribution, CommandRegistry, MessageService } from '@
 import { inject, injectable } from 'inversify';
 
 import { ChePluginManager } from './che-plugin-manager';
-import { ChePluginRegistry } from '../../common/che-plugin-protocol';
+import { ChePluginRegistry } from '@eclipse-che/theia-remote-api/lib/common/plugin-service';
 import { QuickInputService } from '@theia/core/lib/browser';
 
 function cmd(id: string, label: string): Command {

diff --git a/extensions/eclipse-che-theia-plugin-ext/src/browser/plugin/che-plugin-frontend-service.ts b/extensions/eclipse-che-theia-plugin-ext/src/browser/plugin/che-plugin-frontend-service.ts
@@ -11,8 +11,8 @@
 import { DeployedPlugin, HostedPluginServer, PluginMetadata } from '@theia/plugin-ext/lib/common/plugin-protocol';
 import { inject, injectable } from 'inversify';
 
-import { ChePluginMetadata } from '../../common/che-plugin-protocol';
-import { PluginFilter } from '../../common/plugin/plugin-filter';
+import { ChePluginMetadata } from '@eclipse-che/theia-remote-api/lib/common/plugin-service';
+import { PluginFilter } from './plugin-filter';
 
 @injectable()
 export class ChePluginFrontentService {