Integrate PR review: Linting and unwanted dependency

CrossBreezeNL · Nov 15, 2023 · bf517ee · bf517ee
1 parent dfd3f6e
commit bf517ee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/packages/model-service/src/common/model-service-rpc.ts b/packages/model-service/src/common/model-service-rpc.ts
@@ -11,7 +11,7 @@ import {
     SaveModelArgs,
     UpdateModelArgs
 } from '@crossbreeze/protocol';
-import { Event, JsonRpcServer } from '@theia/core';
+import { Event, RpcServer } from '@theia/core';
 
 /** Path used to communicate between the Theia frontend and backend */
 export const MODEL_SERVICE_PATH = '/services/model-service';
@@ -20,7 +20,7 @@ export const MODEL_SERVICE_PATH = '/services/model-service';
  * Protocol used by the Theia frontend-backend communication
  */
 export const ModelService = Symbol('ModelService');
-export interface ModelService extends JsonRpcServer<ModelServiceClient> {
+export interface ModelService extends RpcServer<ModelServiceClient> {
     open(args: OpenModelArgs): Promise<CrossModelRoot | undefined>;
     close(args: CloseModelArgs): Promise<void>;
     request(uri: string): Promise<CrossModelRoot | undefined>;

diff --git a/packages/model-service/src/node/model-service-backend-module.ts b/packages/model-service/src/node/model-service-backend-module.ts
@@ -2,7 +2,7 @@
  * Copyright (c) 2023 CrossBreeze.
  ********************************************************************************/
 
-import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
+import { ConnectionHandler, RpcConnectionHandler } from '@theia/core';
 import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { MODEL_SERVICE_PATH, ModelService, ModelServiceClient } from '../common/model-service-rpc';
@@ -15,7 +15,7 @@ export default new ContainerModule(bind => {
     bind(ConnectionHandler)
         .toDynamicValue(
             ctx =>
-                new JsonRpcConnectionHandler<ModelServiceClient>(MODEL_SERVICE_PATH, client => {
+                new RpcConnectionHandler<ModelServiceClient>(MODEL_SERVICE_PATH, client => {
                     // get the proxy client representing the frontend client and fulfill connection proxy with our service implementation
                     const server = ctx.container.get<ModelService>(ModelService);
                     server.setClient(client);

diff --git a/packages/react-model-ui/package.json b/packages/react-model-ui/package.json
@@ -38,7 +38,6 @@
     "@mui/icons-material": "^5.11.16",
     "@mui/material": "^5.13.5",
     "@mui/x-data-grid": "^6.2.1",
-    "@theia/core": "1.43.1",
     "immer": "^10.0.3",
     "react": "18.2.0",
     "react-tabs": "^6.0.1",