Skip to content

Commit

Permalink
Switch theia extensions to peer depdendencies
Browse files Browse the repository at this point in the history
Fixes eclipse-glsp/glsp#535
Fixes eclipse-glsp/glsp#757
Contributed on behalf of STMicroelectronics
  • Loading branch information
tortmayr committed Dec 21, 2022
1 parent eaf17a0 commit 5024da3
Show file tree
Hide file tree
Showing 6 changed files with 386 additions and 663 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@

### Breaking Changes

- [theia] Updated Theia dependencies to `1.27.0`. Due to API breaks, Theia versions `<1.27.0` are no longer supported. [#119](https://github.com/eclipse-glsp/glsp-theia-integration/pull/119) - Contributed on behalf of STMicroelectronics <br>
- [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>
This also causes breaking changes in:
- `GlspServerContribution` (and inherited classes)
- `connect` method now takes a `Channel` instead of a `Connection` parameter
- `BaseGlspServerContribution` (and inherited classes)
- `forward` method now takes a `Channel` as first parameter instead of a `Connection`
- [deps] Switch theia extension dependencies to peer dependencies. These dependencies are no longer autoresolved and have to be declared
in the application package. [#xxx](https://github.com/eclipse-glsp/glsp-theia-integration/pull/xxx) - Contributed on behalf of STMicroelectronics <br>

## [1.0.0 - 30/06/2022](https://github.com/eclipse-glsp/glsp-theia-integration/releases/tag/v1.0.0)

Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Eclipse GLSP - Theia Integration for GLSP Clients [![Build Status](https://ci.eclipse.org/glsp/job/eclipse-glsp/job/glsp-theia-integration/job/master/badge/icon)](https://ci.eclipse.org/glsp/job/eclipse-glsp/job/glsp-theia-integration/job/master/)


This project contains the glue code necessary to integrate diagram editors built with the [graphical language server platform](https://github.com/eclipse-glsp/glsp) with [Eclipse Theia](https://github.com/theia-ide/theia) as well as an example Theia application for testing purposes.

This project is built with `yarn` and is available from npm via [@eclipse-glsp/theia-integration](https://www.npmjs.com/package/@eclipse-glsp/theia-integration).
Expand All @@ -19,9 +18,9 @@ If that is the case, a new compatible 1.0.0 version prefixed with the supported
| 0.9.0 | >=1.20.0 <= 1.25.0 |
| 1.0.0 | >=1.25.0 <= 1.26.0 |
| 1.0.0-theia1.27.0 | >=1.27.0 |
| next | >=1.27.0 |
| next | >=1.33.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`:
> 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`:
```json
...
Expand Down
27 changes: 14 additions & 13 deletions examples/browser-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@
"name": "browser-app",
"version": "1.1.0-next",
"dependencies": {
"@eclipse-glsp-examples/workflow-theia": "^1.1.0-next",
"@theia/core": "^1.27.0",
"@theia/editor": "^1.27.0",
"@theia/filesystem": "^1.27.0",
"@theia/markers": "^1.27.0",
"@theia/messages": "^1.27.0",
"@theia/monaco": "^1.27.0",
"@theia/navigator": "^1.27.0",
"@theia/preferences": "^1.27.0",
"@theia/process": "^1.27.0",
"@theia/terminal": "^1.27.0",
"@theia/workspace": "^1.27.0"
"@eclipse-glsp-examples/workflow-theia": "1.1.0-next",
"@theia/core": "1.33.0",
"@theia/editor": "1.33.0",
"@theia/filesystem": "1.33.0",
"@theia/markers": "1.33.0",
"@theia/messages": "1.33.0",
"@theia/monaco": "1.33.0",
"@theia/navigator": "1.33.0",
"@theia/preferences": "1.33.0",
"@theia/process": "1.33.0",
"@theia/terminal": "1.33.0",
"@theia/workspace": "1.33.0",
"sprotty-theia": "0.13.0-next.9cbedec"
},
"devDependencies": {
"@theia/cli": "^1.27.0"
"@theia/cli": "1.33.0"
},
"scripts": {
"build": "theia build --mode development",
Expand Down
19 changes: 1 addition & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,9 @@
},
"devDependencies": {
"@eclipse-glsp/config": "1.1.0-next.e31f2e5.119",
"@types/node": "14.x",
"lerna": "^6.1.0",
"rimraf": "^3.0.2",
"@types/node": "16.x",
"typescript": "^4.9.3"
},
"resolutions": {
"**/@theia/core": "1.29.1",
"**/@theia/editor": "1.29.1",
"**/@theia/filesystem": "1.29.1",
"**/@theia/markers": "1.29.1",
"**/@theia/messages": "1.29.1",
"**/@theia/monaco": "1.29.1",
"**/@theia/navigator": "1.29.1",
"**/@theia/preferences": "1.29.1",
"**/@theia/process": "1.29.1",
"**/@theia/terminal": "1.29.1",
"**/@theia/workspace": "1.29.1",
"**/@theia/cli": "1.29.1",
"**/sprotty": "0.13.0-next.f4445dd.342"
},
"workspaces": [
"packages/theia-integration",
"examples/*"
Expand Down
8 changes: 5 additions & 3 deletions packages/theia-integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@
],
"dependencies": {
"@eclipse-glsp/client": "next",
"@theia/core": "^1.27.0",
"@theia/messages": "^1.27.0",
"sprotty-theia": "0.12.0",
"vscode-jsonrpc": "8.0.2"
},
"peerDependencies": {
"@theia/core": "^1.33.0",
"@theia/messages": "^1.33.0",
"sprotty-theia": "0.13.0-next.9cbedec"
},
"scripts": {
"build": "tsc -b",
"clean": "rimraf lib tsconfig.tsbuildinfo ",
Expand Down
Loading

0 comments on commit 5024da3

Please sign in to comment.