v2.0.0

eclipse-glsp · Oct 15, 2023 · 6764619 · 6764619
1 parent ebc2240
commit 6764619
Show file tree

Hide file tree

Showing 11 changed files with 285 additions and 260 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,7 +10,6 @@
     "source.fixAll.eslint": true
   },
   "eslint.validate": ["javascript", "typescript"],
-  "prettier.prettierPath": "node_modules/prettier",
   "search.exclude": {
     "**/node_modules": true,
     "**/lib": true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,21 +1,24 @@
 # Eclipse GLSP Theia Integration Changelog
 
-## [1.1.0 - Upcoming]()
+## [2.0.0- 14/10/2023](https://github.com/eclipse-glsp/glsp-theia-integration/releases/tag/v2.0.0)
 
 ### Changes
 
--   [protocol] Updated to vscode-jsonrpc 8.0.2 to be compliant with client [#136](https://github.com/eclipse-glsp/glsp-theia-integration/pull/136)
--   [backend] Added support for using custom JVM args in `GLSPSocketServerContribution` [#125](https://github.com/eclipse-glsp/glsp-theia-integration/pull/125)
--   [diagram] Fixed a bug that prevented proper focus tracking when switching between tabs [#132](https://github.com/eclipse-glsp/glsp-theia-integration/pull/132)
--   [diagram] Fixed a bug that could cause dispatching of `SaveActions` even if the diagram is not dirty [#141](https://github.com/eclipse-glsp/glsp-theia-integration/pull/141) - Contributed on behalf of STMicroelectronics
--   [backend] (Web)Socket based `GLSPServerContributions` now support auto-assigned ports [#151](https://github.com/eclipse-glsp/glsp-theia-integration/pull/151)
+-   [protocol] Update to vscode-jsonrpc 8.0.2 to be compliant with client [#136](https://github.com/eclipse-glsp/glsp-theia-integration/pull/136)
+-   [backend] Add support for using custom JVM args in `GLSPSocketServerContribution` [#125](https://github.com/eclipse-glsp/glsp-theia-integration/pull/125)
+-   [diagram] Fix a bug that prevented proper focus tracking when switching between tabs [#132](https://github.com/eclipse-glsp/glsp-theia-integration/pull/132)
+-   [diagram] Fix a bug that could cause dispatching of `SaveAction`s even if the diagram is not dirty [#141](https://github.com/eclipse-glsp/glsp-theia-integration/pull/141) - Contributed on behalf of STMicroelectronics
+-   [backend] (Web)Socket based `GLSPServerContributions` now supports auto-assigned ports [#151](https://github.com/eclipse-glsp/glsp-theia-integration/pull/151)
 -   [validation] Only keep live validation markers in problems view and clean all others [#153](https://github.com/eclipse-glsp/glsp-theia-integration/pull/153)
 -   [backend] Provide `GLSPNodeServerContribution` to enable direct server integration into the Theia backed [#154](https://github.com/eclipse-glsp/glsp-theia-integration) - Contributed on behalf of STMicroelectronics
 -   [theia] Add support for showing server progress in Theia [#168](https://github.com/eclipse-glsp/glsp-theia-integration/pull/168)
+-   [websocket] Add support for Websocket communication to GLSP server from both the backend and the frontend directly [#155](https://github.com/eclipse-glsp/glsp-theia-integration/pull/155) [#159(https://github.com/eclipse-glsp/glsp-theia-integration/pull/159)] [#179](https://github.com/eclipse-glsp/glsp-theia-integration/pull/179)
+-   [backend] Fix a bug that disconnected all Theia clients when closing a single one [#164](https://github.com/eclipse-glsp/glsp-theia-integration/pull/164)
+-   [diagram] Add support for icons in context menu submenus [#180](https://github.com/eclipse-glsp/glsp-theia-integration/pull/180)
 
 ### Breaking Changes
 
--   [theia] Updated Theia dependencies to `1.33.0`. Due to API breaks, Theia versions `<1.33.0` are no longer supported. [#119](https://github.com/eclipse-glsp/glsp-theia-integration/pull/119) - Contributed on behalf of STMicroelectronics <br>
+-   [theia] Update Theia dependencies to `1.33.0`. Due to API breaks, Theia versions `<1.33.0` are no longer supported. [#119](https://github.com/eclipse-glsp/glsp-theia-integration/pull/119) - Contributed on behalf of STMicroelectronics <br>
     This also causes breaking changes in:
     -   `GlspServerContribution` (and inherited classes)
         -   `connect` method now takes a `Channel` instead of a `Connection` parameter
@@ -27,12 +30,32 @@
     -   `GLSPClientContribution.waitForActivation` is now optional and is not implemented by default.
     -   `GLSPClientProviderImpl` has been renamed to `GLSPClientProvider`, function keys have been renamed has well
     -   Removed `GLSPContribution.Service` and dropped the related deprecated session concept.
--   [API] Removed dependency to sprotty-theia [#149](https://github.com/eclipse-glsp/glsp-theia-integration/pull/149)
+-   [API] Remove dependency to sprotty-theia [#149](https://github.com/eclipse-glsp/glsp-theia-integration/pull/149)
     -   Modules from `sprotty-theia` are no longer reexported via the browser index.ts file
--   [diagram] Refactored `GLSPDiagramConfiguration`. Diagram containers are now child containers of the Theia DI container [#152](https://github.com/eclipse-glsp/glsp-theia-integration/pull/1525)
+-   [diagram] Refactor `GLSPDiagramConfiguration`. Diagram containers are now child containers of the Theia DI container [#152](https://github.com/eclipse-glsp/glsp-theia-integration/pull/1525)
     -   `GLSPDiagramConfiguration`
         -   `doCreateContainer` method has been renamed to `configureContainer` and requires additional arguments.
--   [theia] BaseGLSPClientContribution: changed `createGLSPClient(connectionProvider: ConnectionProvider)` to an async function
+-   [theia] BaseGLSPClientContribution: change `createGLSPClient(connectionProvider: ConnectionProvider)` to an async function [#155](https://github.com/eclipse-glsp/glsp-theia-integration/pull/155)
+-   [deps] Update to inversify 6 and Typescript 5.x [#163](https://github.com/eclipse-glsp/glsp-theia-integration/pull/163)
+    -   GLSP uses a synchronous inversify context this means with inversify 6.x decorator methods (e.g. @postConstruct) with asynchronous results are no longer supported
+-   [API] Remove `TheiaGLSPConnector`. The diagram DI container is now a child container of the Theia main container and has direct access to all Theia services [#173](https://github.com/eclipse-glsp/glsp-theia-integration/pull/173)
+
+    -   Refactor/rename `SavableGLSPModelSource` -> `GLSPSavable`
+    -   Move export functionality from removed connector to `theiaExportModule`
+    -   Encapsulate forwarding to Theia selection service in `theiaSelectionModule`
+    -   Encapsulate source model changed handling in `theiaSourceModelWatcherModule`
+    -   Moving handling of navigation targets into `theiaNavigationModule`
+    -   Move server message & process handling from removed connector to `theiaNotificationModule`
+    -   Remove `GLSPNotificationManager`
+    -   Remove dedicated `ServerStatus` handling in `GLSPDiagramWidget` and use the new `statusModule` instead
+
+-   [diagram] Refactor `GLSPDiagramWidget` and removed `dispatchInitialActions` method. [#176](https://github.com/eclipse-glsp/glsp-theia-integration/pull/176)
+    -   To dispatch custom initial actions use the new `IDiagramStartup` service instead.
+    -   Unify related multi-injection bindings and consistently use `ContributionProvider`s for them
+        -   Remove `DiagramConfigurationRegistry`
+        -   Remove `GLSPClientProvider`
+        -   `GLSPDiagramWidget` now directly injects Theia services -> use `GLSPDiagramWidgetFactory` to for construction
+-   [API] Rename `ServerStatusAction` -> `StatusAction` & `ServerMessageAction`->`MessageAction` [#178](https://github.com/eclipse-glsp/glsp-theia-integration/pull/178)
 
 ## [1.0.0 - 30/06/2022](https://github.com/eclipse-glsp/glsp-theia-integration/releases/tag/v1.0.0)
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -78,7 +78,7 @@ pipeline {
         stage('Deploy (master only)') {
             when { 
                 allOf {
-                    branch 'master'
+                    branch 'skipForRelease'
                     expression {  
                       /* Only trigger the deployment job if the changeset contains changes in 
                       the `packages` or `examples/workflow-theia` directory */

diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ If that is the case, a new compatible 1.0.0 version prefixed with the supported
 | 1.0.0                           | >=1.25.0 <= 1.26.0 |
 | 1.0.0-theia1.27.0               | >=1.27.0           |
 | 1.0.0-theia1.34.0               | >=1.34.0 < 1.39.0  |
+| 2.0.0                           | >=1.39.0           |
 | next                            | >=1.39.0           |
 
 > Note: For versions <=1.0.0 it is not possible to safely restrict the maximum version of Theia packages. If you encounter build errors related to multiple resolved Theia versions please add a resolutions block to the `package.json` of your project e.g. for `1.0.0-theia1.27.0`:

diff --git a/examples/browser-app/package.json b/examples/browser-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "browser-app",
-  "version": "1.1.0-next",
+  "version": "2.0.0",
   "private": true,
   "scripts": {
     "build": "theia build --mode development",
@@ -13,7 +13,7 @@
     "watch": "theia build --watch --mode development"
   },
   "dependencies": {
-    "@eclipse-glsp-examples/workflow-theia": "1.1.0-next",
+    "@eclipse-glsp-examples/workflow-theia": "~2.0.0",
     "@theia/core": "1.39.0",
     "@theia/editor": "1.39.0",
     "@theia/filesystem": "1.39.0",

diff --git a/examples/workflow-theia/package.json b/examples/workflow-theia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp-examples/workflow-theia",
-  "version": "1.1.0-next",
+  "version": "2.0.0",
   "private": "true",
   "description": "Theia extension for the workflow GLSP example",
   "keywords": [
@@ -36,10 +36,10 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp-examples/workflow-glsp": "next",
-    "@eclipse-glsp-examples/workflow-server": "next",
-    "@eclipse-glsp-examples/workflow-server-bundled": "next",
-    "@eclipse-glsp/theia-integration": "1.1.0-next"
+    "@eclipse-glsp-examples/workflow-glsp": "~2.0.0",
+    "@eclipse-glsp-examples/workflow-server": "~2.0.0",
+    "@eclipse-glsp-examples/workflow-server-bundled": "~2.0.0",
+    "@eclipse-glsp/theia-integration": "~2.0.0"
   },
   "devDependencies": {
     "mvn-artifact-download": "5.1.0"

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0",
+  "version": "2.0.0",
   "useWorkspaces": true,
   "npmClient": "yarn",
   "command": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parent",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "private": true,
   "workspaces": [
     "packages/theia-integration",
@@ -27,7 +27,7 @@
     "watch": "lerna run --parallel watch"
   },
   "devDependencies": {
-    "@eclipse-glsp/dev": "next",
+    "@eclipse-glsp/dev": "2.0.0",
     "@types/node": "16.x",
     "lerna": "^6.6.2",
     "typescript": "^5.1.3"

diff --git a/packages/theia-integration/README.md b/packages/theia-integration/README.md
@@ -17,6 +17,7 @@ If that is the case, a new compatible 1.0.0 version prefixed with the supported
 | 1.0.0                           | >=1.25.0 <= 1.26.0 |
 | 1.0.0-theia1.27.0               | >=1.27.0           |
 | 1.0.0-theia1.34.0               | >=1.34.0 < 1.39.0  |
+| 2.0.0                           | >=1.39.0           |
 | next                            | >=1.39.0           |
 
 > Note: Due to a transitive dependency to `sprotty-theia` it's currently not possible to safely restrict the maximum version of Theia packages. If you encounter build errors related to multiple resolved Theia versions please add a resolutions block to the `package.json` of your project e.g. for `1.0.0-theia1.27.0`:

diff --git a/packages/theia-integration/package.json b/packages/theia-integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/theia-integration",
-  "version": "1.1.0-next",
+  "version": "2.0.0",
   "description": "Glue code to integrate GLSP clients into Eclipse Theia",
   "keywords": [
     "theia-extension",
@@ -44,7 +44,7 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/client": "next",
+    "@eclipse-glsp/client": "~2.0.0",
     "ws": "~8.11.0"
   },
   "devDependencies": {