Skip to content

Commit

Permalink
Upgrade to Theia 1.29.0
Browse files Browse the repository at this point in the history
Theia upgraded React to version 18, which generated conflicts with many
other versions used in the extension.

To resolve the conflicts, this PR forces the use of version 18 by
applying Yarn's `resolutions` block.

Signed-off-by: Rodrigo Pinto <rodrigo.pinto@calian.ca>
  • Loading branch information
Rodrigoplp-work authored and bhufmann committed Oct 12, 2022
1 parent 1026a08 commit 14ed8b2
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 35 deletions.
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.28.0",
"@theia/editor": "1.28.0",
"@theia/filesystem": "1.28.0",
"@theia/getting-started": "1.28.0",
"@theia/keymaps": "1.28.0",
"@theia/markers": "1.28.0",
"@theia/messages": "1.28.0",
"@theia/monaco": "1.28.0",
"@theia/navigator": "1.28.0",
"@theia/preferences": "1.28.0",
"@theia/process": "1.28.0",
"@theia/terminal": "1.28.0",
"@theia/vsx-registry": "1.28.0",
"@theia/workspace": "1.28.0",
"@theia/core": "1.29.0",
"@theia/editor": "1.29.0",
"@theia/filesystem": "1.29.0",
"@theia/getting-started": "1.29.0",
"@theia/keymaps": "1.29.0",
"@theia/markers": "1.29.0",
"@theia/messages": "1.29.0",
"@theia/monaco": "1.29.0",
"@theia/navigator": "1.29.0",
"@theia/preferences": "1.29.0",
"@theia/process": "1.29.0",
"@theia/terminal": "1.29.0",
"@theia/vsx-registry": "1.29.0",
"@theia/workspace": "1.29.0",
"theia-traceviewer": "0.1.0"
},
"devDependencies": {
"@theia/cli": "1.28.0"
"@theia/cli": "1.29.0"
},
"scripts": {
"prepare": "theia build --mode development",
Expand Down
32 changes: 16 additions & 16 deletions examples/electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@
}
},
"dependencies": {
"@theia/core": "1.28.0",
"@theia/editor": "1.28.0",
"@theia/electron": "1.28.0",
"@theia/filesystem": "1.28.0",
"@theia/getting-started": "1.28.0",
"@theia/keymaps": "1.28.0",
"@theia/markers": "1.28.0",
"@theia/messages": "1.28.0",
"@theia/monaco": "1.28.0",
"@theia/navigator": "1.28.0",
"@theia/preferences": "1.28.0",
"@theia/process": "1.28.0",
"@theia/terminal": "1.28.0",
"@theia/vsx-registry": "1.28.0",
"@theia/workspace": "1.28.0",
"@theia/core": "1.29.0",
"@theia/editor": "1.29.0",
"@theia/electron": "1.29.0",
"@theia/filesystem": "1.29.0",
"@theia/getting-started": "1.29.0",
"@theia/keymaps": "1.29.0",
"@theia/markers": "1.29.0",
"@theia/messages": "1.29.0",
"@theia/monaco": "1.29.0",
"@theia/navigator": "1.29.0",
"@theia/preferences": "1.29.0",
"@theia/process": "1.29.0",
"@theia/terminal": "1.29.0",
"@theia/vsx-registry": "1.29.0",
"@theia/workspace": "1.29.0",
"theia-traceviewer": "0.1.0"
},
"devDependencies": {
"@theia/cli": "1.28.0",
"@theia/cli": "1.29.0",
"electron": "^15.3.5",
"electron-builder": "~22.9.1"
},
Expand Down
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,14 @@
"url": "https://github.com/eclipse-cdt-cloud/theia-trace-extension/issues"
},
"homepage": "https://github.com/eclipse-cdt-cloud/theia-trace-extension",
"resolutions": {
"react": "^18.0.0",
"react-dom": "^18.0.0",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0"
},
"devDependencies": {
"@theia/cli": "1.28.0",
"@theia/cli": "1.29.0",
"jsonc-parser": "^3.0.0",
"lerna": "^4.0.0",
"typescript": "4.5.5"
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 @@ -15,9 +15,9 @@
"src"
],
"dependencies": {
"@theia/core": "1.28.0",
"@theia/editor": "1.28.0",
"@theia/filesystem": "1.28.0",
"@theia/core": "1.29.0",
"@theia/editor": "1.29.0",
"@theia/filesystem": "1.29.0",
"traceviewer-base": "0.1.0",
"traceviewer-react-components": "0.1.0",
"tree-kill": "latest",
Expand Down

0 comments on commit 14ed8b2

Please sign in to comment.