upded to glsp-1.1.0-RC04, refactoring

imixs · Jan 23, 2023 · f132809 · f132809
1 parent 8bc5896
commit f132809
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 24 deletions.
diff --git a/open-bpmn.glsp-client/open-bpmn-app/package.json b/open-bpmn.glsp-client/open-bpmn-app/package.json
@@ -21,7 +21,8 @@
     "@theia/cli": "1.29.2"
   },
   "scripts": {
-    "prepare": "theia build --mode development",
+    "prepare": "yarn build",
+    "build": "theia build --mode development",
     "start": "theia start --GLSP_PORT=5007 --root-dir=../workspace",
     "start:external": "theia start --GLSP_PORT=5007 --root-dir=../workspace --debug",
     "watch": "theia build --watch --mode development"

diff --git a/open-bpmn.glsp-client/open-bpmn-glsp/package.json b/open-bpmn.glsp-client/open-bpmn-glsp/package.json
@@ -24,7 +24,7 @@
     }
   ],
   "dependencies": {
-    "@eclipse-glsp/client": "1.1.0-RC03",
+    "@eclipse-glsp/client": "1.1.0-RC04",
     "@open-bpmn/open-bpmn-model": "0.8.0",
     "@open-bpmn/open-bpmn-properties": "0.8.0",
     "balloon-css": "^0.5.0"

diff --git a/open-bpmn.glsp-client/open-bpmn-glsp/src/di.config.ts b/open-bpmn.glsp-client/open-bpmn-glsp/src/di.config.ts
@@ -17,7 +17,7 @@ import {
     configureDefaultModelElements,
     configureModelElement,
     ConsoleLogger,
-    createClientContainer,
+    createDiagramContainer,
     DeleteElementContextMenuItemProvider,
     editLabelFeature, moveFeature, selectFeature,
     LogLevel,
@@ -140,7 +140,7 @@ const bpmnDiagramModule = new ContainerModule((bind, unbind, isBound, rebind) =>
 
 export default function createBPMNDiagramContainer(widgetId: string): Container {
     // Create the createClientContainer with the diagramModule and the BPMN bpmnPropertyModule...
-    const container = createClientContainer(bpmnDiagramModule, bpmnPropertyModule);
+    const container = createDiagramContainer(bpmnDiagramModule, bpmnPropertyModule);
     overrideViewerOptions(container, {
         baseDiv: widgetId,
         hiddenDiv: widgetId + '_hidden'

diff --git a/open-bpmn.glsp-client/open-bpmn-model/package.json b/open-bpmn.glsp-client/open-bpmn-model/package.json
@@ -11,7 +11,7 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/client": "1.1.0-RC03"
+    "@eclipse-glsp/client": "1.1.0-RC04"
   },
   "files": [
     "lib",

diff --git a/open-bpmn.glsp-client/open-bpmn-properties/package.json b/open-bpmn.glsp-client/open-bpmn-properties/package.json
@@ -4,7 +4,7 @@
   "description": "GLSP property panel for BPMN 2.0",
   "license": "(GPL-3.0)",
   "dependencies": {
-    "@eclipse-glsp/client": "1.1.0-RC03",
+    "@eclipse-glsp/client": "1.1.0-RC04",
     "@open-bpmn/open-bpmn-model": "0.8.0",
     "@jsonforms/core": "3.0.0",
     "@jsonforms/react": "3.0.0",
@@ -14,7 +14,7 @@
   "peerDependencies": {
     "react": "^17.0.1",
     "react-dom": "^17.0.1"
-  },
+  },  
   "scripts": {
     "prepare": "yarn clean && yarn build && yarn lint",
     "clean": "rimraf lib tsconfig.tsbuildinfo",

diff --git a/open-bpmn.glsp-client/open-bpmn-theia/package.json b/open-bpmn.glsp-client/open-bpmn-theia/package.json
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@open-bpmn/open-bpmn-glsp": "0.8.0",
-    "@eclipse-glsp/theia-integration": "1.1.0-RC03"
+    "@eclipse-glsp/theia-integration": "1.1.0-RC04"
   },
   "files": [
     "lib",

diff --git a/...ser/diagram/bpmn-diagram-configuration.ts → ...src/browser/bpmn-diagram-configuration.ts b/...ser/diagram/bpmn-diagram-configuration.ts → ...src/browser/bpmn-diagram-configuration.ts
@@ -17,12 +17,10 @@ import { createBPMNDiagramContainer } from '@open-bpmn/open-bpmn-glsp';
 import {
     configureDiagramServer,
     GLSPDiagramConfiguration,
-    GLSPTheiaDiagramServer,
-    TheiaDiagramServer
+    GLSPTheiaDiagramServer
 } from '@eclipse-glsp/theia-integration/lib/browser';
 import { Container, injectable } from 'inversify';
-import 'sprotty-theia/css/theia-sprotty.css';
-import { BPMNLanguage } from '../../common/bpmn-language';
+import { BPMNLanguage } from '../common/bpmn-language';
 
 @injectable()
 export class BPMNDiagramConfiguration extends GLSPDiagramConfiguration {
@@ -31,7 +29,7 @@ export class BPMNDiagramConfiguration extends GLSPDiagramConfiguration {
     doCreateContainer(widgetId: string): Container {
         const container = createBPMNDiagramContainer(widgetId);
         configureDiagramServer(container, GLSPTheiaDiagramServer);
-        container.bind(TheiaDiagramServer).toService(GLSPTheiaDiagramServer);
+        container.bind(GLSPTheiaDiagramServer).toService(GLSPTheiaDiagramServer);
         return container;
     }
 }
diff --git a/open-bpmn.glsp-client/open-bpmn-theia/src/browser/frontend-module.ts b/open-bpmn.glsp-client/open-bpmn-theia/src/browser/frontend-module.ts
@@ -13,17 +13,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerContext, GLSPTheiaFrontendModule } from '@eclipse-glsp/theia-integration/lib/browser';
-import { DiagramConfiguration } from 'sprotty-theia';
+import { ContainerContext, GLSPDiagramConfiguration, GLSPTheiaFrontendModule } from '@eclipse-glsp/theia-integration';
 import { BPMNLanguage } from '../common/bpmn-language';
-import { BPMNDiagramConfiguration } from './diagram/bpmn-diagram-configuration';
+import { BPMNDiagramConfiguration } from './bpmn-diagram-configuration';
 
 export class BPMNTheiaFrontendModule extends GLSPTheiaFrontendModule {
     protected override enableCopyPaste = true;
     readonly diagramLanguage = BPMNLanguage;
 
     bindDiagramConfiguration(context: ContainerContext): void {
-        context.bind(DiagramConfiguration).to(BPMNDiagramConfiguration);
+        context.bind(GLSPDiagramConfiguration).to(BPMNDiagramConfiguration);
     }
 }
 

diff --git a/open-bpmn.glsp-client/open-bpmn-theia/src/common/bpmn-language.ts b/open-bpmn.glsp-client/open-bpmn-theia/src/common/bpmn-language.ts
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GLSPDiagramLanguage } from '@eclipse-glsp/theia-integration/lib/common';
+import { GLSPDiagramLanguage } from '@eclipse-glsp/theia-integration';
 
 export const BPMNLanguage: GLSPDiagramLanguage = {
     contributionId: 'Bpmn',

diff --git a/open-bpmn.glsp-client/package.json b/open-bpmn.glsp-client/package.json
@@ -27,15 +27,14 @@
     "prepare": "lerna run prepare",
     "watch": "lerna run --parallel watch",
     "build": "yarn install:only && lerna run build",
-    "lint": "yarn install:only && lerna run lint --",
+    "lint": "lerna run lint --",
     "install:only": "yarn install --ignore-scripts",
     "rebuild:browser": "theia rebuild:browser",
     "start": "yarn rebuild:browser && yarn --cwd open-bpmn-app start",
     "start:external": "yarn rebuild:browser && yarn --cwd open-bpmn-app start:external"
   },
-
   "devDependencies": {
-    "@eclipse-glsp/config": "1.1.0-next.d03ad9f.112",
+    "@eclipse-glsp/config": "1.1.0-next.fe535db.107",
     "rimraf": "^2.6.1",
     "lerna": "^6.1.0",
     "typescript": "^4.9.3"
@@ -45,10 +44,8 @@
     "open-bpmn-model",
     "open-bpmn-properties",
     "open-bpmn-theia",
-    "open-bpmn-app",
-    "workspaces/*"
+    "open-bpmn-app"
   ],
-
   "resolutions": {
     "**/@theia/core": "1.29.2",
     "**/@theia/editor": "1.29.2",