Upgrade Theia dependencies to 1.28.0

Update code for removed API in ThemeService. Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
eclipse-cdt-cloud · Aug 31, 2022 · 4e699e2 · 4e699e2
1 parent 8fbb35e
commit 4e699e2
Show file tree

Hide file tree

Showing 8 changed files with 1,409 additions and 820 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
     - name: install dependencies on ubuntu

diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
@@ -16,7 +16,7 @@ RUN sudo apt-get update \
     # Clear package info (to free space)
     && sudo rm -rf /var/lib/apt/lists/*
 
-ENV NODE_VERSION="12.14.1"
+ENV NODE_VERSION="16.17.0"
 RUN bash -c ". .nvm/nvm.sh \
     && nvm install $NODE_VERSION \
     && nvm use $NODE_VERSION \

diff --git a/examples/browser/package.json b/examples/browser/package.json
@@ -15,24 +15,24 @@
     }
   },
   "dependencies": {
-    "@theia/core": "1.21.0",
-    "@theia/editor": "1.21.0",
-    "@theia/filesystem": "1.21.0",
-    "@theia/getting-started": "1.21.0",
-    "@theia/keymaps": "1.21.0",
-    "@theia/markers": "1.21.0",
-    "@theia/messages": "1.21.0",
-    "@theia/monaco": "1.21.0",
-    "@theia/navigator": "1.21.0",
-    "@theia/preferences": "1.21.0",
-    "@theia/process": "1.21.0",
-    "@theia/terminal": "1.21.0",
-    "@theia/vsx-registry": "1.21.0",
-    "@theia/workspace": "1.21.0",
+    "@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-traceviewer": "0.1.0"
   },
   "devDependencies": {
-    "@theia/cli": "1.21.0"
+    "@theia/cli": "1.28.0"
   },
   "scripts": {
     "prepare": "theia build --mode development",

diff --git a/examples/electron/package.json b/examples/electron/package.json
@@ -25,25 +25,26 @@
     }
   },
   "dependencies": {
-    "@theia/core": "1.21.0",
-    "@theia/editor": "1.21.0",
-    "@theia/electron": "1.21.0",
-    "@theia/filesystem": "1.21.0",
-    "@theia/getting-started": "1.21.0",
-    "@theia/keymaps": "1.21.0",
-    "@theia/markers": "1.21.0",
-    "@theia/messages": "1.21.0",
-    "@theia/monaco": "1.21.0",
-    "@theia/navigator": "1.21.0",
-    "@theia/preferences": "1.21.0",
-    "@theia/process": "1.21.0",
-    "@theia/terminal": "1.21.0",
-    "@theia/vsx-registry": "1.21.0",
-    "@theia/workspace": "1.21.0",
+    "@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-traceviewer": "0.1.0"
   },
   "devDependencies": {
-    "@theia/cli": "1.21.0",
+    "@theia/cli": "1.28.0",
+    "electron": "^15.3.5",
     "electron-builder": "~22.9.1"
   },
   "scripts": {

diff --git a/package.json b/package.json
@@ -39,10 +39,10 @@
   },
   "homepage": "https://github.com/theia-ide/theia-trace-extension",
   "devDependencies": {
-    "@theia/cli": "1.21.0",
+    "@theia/cli": "1.28.0",
     "jsonc-parser": "^3.0.0",
     "lerna": "^4.0.0",
-    "typescript": "4.5.4"
+    "typescript": "4.5.5"
   },
   "workspaces": [
     "examples/*",

diff --git a/theia-extensions/viewer-prototype/package.json b/theia-extensions/viewer-prototype/package.json
@@ -15,9 +15,9 @@
     "src"
   ],
   "dependencies": {
-    "@theia/core": "1.21.0",
-    "@theia/editor": "1.21.0",
-    "@theia/filesystem": "1.21.0",
+    "@theia/core": "1.28.0",
+    "@theia/editor": "1.28.0",
+    "@theia/filesystem": "1.28.0",
     "traceviewer-base": "0.1.0",
     "traceviewer-react-components": "0.1.0",
     "tree-kill": "latest",

diff --git a/theia-extensions/viewer-prototype/src/browser/trace-viewer/trace-viewer.tsx b/theia-extensions/viewer-prototype/src/browser/trace-viewer/trace-viewer.tsx
@@ -82,6 +82,7 @@ export class TraceViewerWidget extends ReactWidget implements StatefulWidget {
     @inject(MessageService) protected readonly messageService: MessageService;
     @inject(TraceExplorerContribution) protected readonly traceExplorerContribution: TraceExplorerContribution;
     @inject(WidgetManager) protected readonly widgetManager!: WidgetManager;
+    @inject(ThemeService) protected readonly themeService: ThemeService;
 
     @postConstruct()
     async init(): Promise<void> {
@@ -90,8 +91,8 @@ export class TraceViewerWidget extends ReactWidget implements StatefulWidget {
         this.title.label = 'Trace: ' + this.uri.base;
         this.title.closable = true;
         this.addClass('theia-trace-open');
-        this.backgroundTheme = ThemeService.get().getCurrentTheme().type;
-        ThemeService.get().onDidColorThemeChange(() => this.updateBackgroundTheme());
+        this.backgroundTheme = this.themeService.getCurrentTheme().type;
+        this.themeService.onDidColorThemeChange(() => this.updateBackgroundTheme());
         if (!this.options.traceUUID) {
             this.initialize();
         }
@@ -143,7 +144,7 @@ export class TraceViewerWidget extends ReactWidget implements StatefulWidget {
     }
 
     protected updateBackgroundTheme(): void {
-        const currentThemeType = ThemeService.get().getCurrentTheme().type;
+        const currentThemeType = this.themeService.getCurrentTheme().type;
         signalManager().fireThemeChangedSignal(currentThemeType);
     }