Skip to content

Commit

Permalink
Uplift theia dependencies from v1.34.2 to 1.37.2
Browse files Browse the repository at this point in the history
Perform a side (minor) 'yarn upgrade' to keep the yarn.lock fully
aligned herein. This resulting yarn.lock is then based on going from
clean to having run the yarn command locally a few times.

Base this uplifted-to Theia version on community [1]'s below. Add a
clarifying step in README so the yarn commands work locally. Fix the
rebuild:browser scripting so it works with this and versus electron's.

[1] https://theia-ide.org/releases/

Signed-off-by: Marco Miller <marco.miller@ericsson.com>
  • Loading branch information
marco-miller committed Jun 13, 2023
1 parent e44236a commit 348561d
Show file tree
Hide file tree
Showing 8 changed files with 982 additions and 1,170 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ TRACE_SERVER_URL=https://my.trace.server:port/tsp/api yarn start:browser
It is possible to package the repository's example application with `electron-builder`. After running `yarn` in the repo root, run:

```bash
yarn rebuild:electron
cd examples/electron
yarn package
```
Expand Down
30 changes: 15 additions & 15 deletions examples/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
}
},
"dependencies": {
"@theia/core": "1.34.2",
"@theia/editor": "1.34.2",
"@theia/filesystem": "1.34.2",
"@theia/getting-started": "1.34.2",
"@theia/keymaps": "1.34.2",
"@theia/markers": "1.34.2",
"@theia/messages": "1.34.2",
"@theia/monaco": "1.34.2",
"@theia/navigator": "1.34.2",
"@theia/preferences": "1.34.2",
"@theia/process": "1.34.2",
"@theia/terminal": "1.34.2",
"@theia/vsx-registry": "1.34.2",
"@theia/workspace": "1.34.2",
"@theia/core": "1.37.2",
"@theia/editor": "1.37.2",
"@theia/filesystem": "1.37.2",
"@theia/getting-started": "1.37.2",
"@theia/keymaps": "1.37.2",
"@theia/markers": "1.37.2",
"@theia/messages": "1.37.2",
"@theia/monaco": "1.37.2",
"@theia/navigator": "1.37.2",
"@theia/preferences": "1.37.2",
"@theia/process": "1.37.2",
"@theia/terminal": "1.37.2",
"@theia/vsx-registry": "1.37.2",
"@theia/workspace": "1.37.2",
"theia-traceviewer": "0.1.0"
},
"devDependencies": {
"@theia/cli": "1.34.2"
"@theia/cli": "1.37.2"
},
"scripts": {
"prepare": "theia build --mode development",
Expand Down
30 changes: 15 additions & 15 deletions examples/docker/example-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
}
},
"dependencies": {
"@theia/core": "1.34.2",
"@theia/editor": "1.34.2",
"@theia/filesystem": "1.34.2",
"@theia/getting-started": "1.34.2",
"@theia/keymaps": "1.34.2",
"@theia/markers": "1.34.2",
"@theia/messages": "1.34.2",
"@theia/monaco": "1.34.2",
"@theia/navigator": "1.34.2",
"@theia/preferences": "1.34.2",
"@theia/process": "1.34.2",
"@theia/terminal": "1.34.2",
"@theia/vsx-registry": "1.34.2",
"@theia/workspace": "1.34.2",
"@theia/core": "1.37.2",
"@theia/editor": "1.37.2",
"@theia/filesystem": "1.37.2",
"@theia/getting-started": "1.37.2",
"@theia/keymaps": "1.37.2",
"@theia/markers": "1.37.2",
"@theia/messages": "1.37.2",
"@theia/monaco": "1.37.2",
"@theia/navigator": "1.37.2",
"@theia/preferences": "1.37.2",
"@theia/process": "1.37.2",
"@theia/terminal": "1.37.2",
"@theia/vsx-registry": "1.37.2",
"@theia/workspace": "1.37.2",
"theia-traceviewer": "next"
},
"devDependencies": {
"@theia/cli": "1.34.2"
"@theia/cli": "1.37.2"
},
"scripts": {
"prepare": "theia build",
Expand Down
7 changes: 5 additions & 2 deletions examples/electron/electron-builder.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
electronVersion: 15.5.7
electronVersion: 23.3.6
electronDist: ../../node_modules/electron/dist
productName: Theia Trace Example Application
appId: theia-trace-example

asar: false
nodeGypRebuild: false
npmRebuild: false

directories:
buildResources: resources
files:
- node_modules
- src-gen
- lib
- scripts
- package.json
- "!**node_modules/electron/**"
extraResources:
- from: plugins
to: app/plugins
Expand Down
36 changes: 18 additions & 18 deletions examples/electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,27 @@
}
},
"dependencies": {
"@theia/core": "1.34.2",
"@theia/editor": "1.34.2",
"@theia/electron": "1.34.2",
"@theia/filesystem": "1.34.2",
"@theia/getting-started": "1.34.2",
"@theia/keymaps": "1.34.2",
"@theia/markers": "1.34.2",
"@theia/messages": "1.34.2",
"@theia/monaco": "1.34.2",
"@theia/navigator": "1.34.2",
"@theia/preferences": "1.34.2",
"@theia/process": "1.34.2",
"@theia/terminal": "1.34.2",
"@theia/vsx-registry": "1.34.2",
"@theia/workspace": "1.34.2",
"@theia/core": "1.37.2",
"@theia/editor": "1.37.2",
"@theia/electron": "1.37.2",
"@theia/filesystem": "1.37.2",
"@theia/getting-started": "1.37.2",
"@theia/keymaps": "1.37.2",
"@theia/markers": "1.37.2",
"@theia/messages": "1.37.2",
"@theia/monaco": "1.37.2",
"@theia/navigator": "1.37.2",
"@theia/preferences": "1.37.2",
"@theia/process": "1.37.2",
"@theia/terminal": "1.37.2",
"@theia/vsx-registry": "1.37.2",
"@theia/workspace": "1.37.2",
"theia-traceviewer": "0.1.0"
},
"devDependencies": {
"@theia/cli": "1.34.2",
"electron": "^15.3.5",
"electron-builder": "~22.9.1"
"@theia/cli": "1.37.2",
"electron": "^23.2.4",
"electron-builder": "~23.6.0"
},
"scripts": {
"prepare": "theia build --mode development",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"clean": "lerna run clean",
"prepare:packages": "lerna run --ignore=\"*-example-app\" prepare",
"prepare:examples": "lerna run --scope=\"*-example-app\" --parallel prepare",
"rebuild:browser": "theia rebuild:browser",
"rebuild:browser": "yarn --cwd examples/browser theia rebuild:browser --cacheRoot ../..",
"rebuild:electron": "yarn --cwd examples/electron theia rebuild:electron --cacheRoot ../..",
"start:browser": "yarn rebuild:browser && yarn --cwd examples/browser start",
"start:electron": "yarn rebuild:electron && yarn --cwd examples/electron start",
Expand Down Expand Up @@ -47,7 +47,7 @@
"@types/react-dom": "^18.0.6"
},
"devDependencies": {
"@theia/cli": "1.34.2",
"@theia/cli": "1.37.2",
"jsonc-parser": "^3.0.0",
"lerna": "^4.0.0",
"prettier": "2.8.8",
Expand Down
6 changes: 3 additions & 3 deletions theia-extensions/viewer-prototype/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"style"
],
"dependencies": {
"@theia/core": "1.34.2",
"@theia/editor": "1.34.2",
"@theia/filesystem": "1.34.2",
"@theia/core": "1.37.2",
"@theia/editor": "1.37.2",
"@theia/filesystem": "1.37.2",
"traceviewer-base": "0.1.0",
"traceviewer-react-components": "0.1.0",
"tree-kill": "latest",
Expand Down
Loading

0 comments on commit 348561d

Please sign in to comment.