Update Theia to 1.23.0

msujew · msujew · commit e383831951ca · 2022-04-06T14:31:33.000+02:00
diff --git a/arduino-ide-extension/package.json b/arduino-ide-extension/package.json
@@ -21,23 +21,23 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.3.7",
-    "@theia/application-package": "1.22.1",
-    "@theia/core": "1.22.1",
-    "@theia/editor": "1.22.1",
-    "@theia/editor-preview": "1.22.1",
-    "@theia/electron": "1.22.1",
-    "@theia/filesystem": "1.22.1",
-    "@theia/git": "1.22.1",
-    "@theia/keymaps": "1.22.1",
-    "@theia/markers": "1.22.1",
-    "@theia/monaco": "1.22.1",
-    "@theia/navigator": "1.22.1",
-    "@theia/outline-view": "1.22.1",
-    "@theia/output": "1.22.1",
-    "@theia/preferences": "1.22.1",
-    "@theia/search-in-workspace": "1.22.1",
-    "@theia/terminal": "1.22.1",
-    "@theia/workspace": "1.22.1",
+    "@theia/application-package": "1.23.0",
+    "@theia/core": "1.23.0",
+    "@theia/editor": "1.23.0",
+    "@theia/editor-preview": "1.23.0",
+    "@theia/electron": "1.23.0",
+    "@theia/filesystem": "1.23.0",
+    "@theia/git": "1.23.0",
+    "@theia/keymaps": "1.23.0",
+    "@theia/markers": "1.23.0",
+    "@theia/monaco": "1.23.0",
+    "@theia/navigator": "1.23.0",
+    "@theia/outline-view": "1.23.0",
+    "@theia/output": "1.23.0",
+    "@theia/preferences": "1.23.0",
+    "@theia/search-in-workspace": "1.23.0",
+    "@theia/terminal": "1.23.0",
+    "@theia/workspace": "1.23.0",
     "@tippyjs/react": "^4.2.5",
     "@types/atob": "^2.1.2",
     "@types/auth0-js": "^9.14.0",
diff --git a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts
@@ -11,14 +11,14 @@ import { FrontendApplicationConfig } from '@theia/application-package/lib/applic
 import {
   ElectronMainApplication as TheiaElectronMainApplication,
   ElectronMainExecutionParams,
-  TheiaBrowserWindowOptions,
 } from '@theia/core/lib/electron-main/electron-main-application';
 import { SplashServiceImpl } from '../splash/splash-service-impl';
 import { URI } from '@theia/core/shared/vscode-uri';
 import * as electronRemoteMain from '@theia/core/electron-shared/@electron/remote/main';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import * as os from '@theia/core/lib/common/os';
-import { RELOAD_REQUESTED_SIGNAL, Restart } from '@theia/core/lib/electron-common/messaging/electron-messages';
+import { Restart } from '@theia/core/lib/electron-common/messaging/electron-messages';
+import { TheiaBrowserWindowOptions } from '@theia/core/lib/electron-main/theia-electron-window';
 
 app.commandLine.appendSwitch('disable-http-cache');
 
@@ -158,8 +158,6 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     app.on('second-instance', this.onSecondInstance.bind(this));
     app.on('window-all-closed', this.onWindowAllClosed.bind(this));
 
-    ipcMain.on(RELOAD_REQUESTED_SIGNAL, event => this.handleReload(event));
-
     ipcMain.on(Restart, ({ sender }) => {
       this.restart(sender.id);
     });
@@ -185,7 +183,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     options = this.avoidOverlap(options);
     let electronWindow: BrowserWindow | undefined;
     if (this._windows.length) {
-      electronWindow = new BrowserWindow(options);
+      electronWindow = await super.createWindow(options);
     } else {
       const { bounds } = screen.getDisplayNearestPoint(
         screen.getCursorScreenPoint()
@@ -272,10 +270,6 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
       }
     });
     this.attachClosedWorkspace(electronWindow);
-    this.attachReadyToShow(electronWindow);
-    this.attachSaveWindowState(electronWindow);
-    this.attachGlobalShortcuts(electronWindow);
-    this.restoreMaximizedState(electronWindow, options);
     electronRemoteMain.enable(electronWindow.webContents);
     return electronWindow;
   }
@@ -381,7 +375,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     super.onWillQuit(event);
   }
 
-  get windows(): BrowserWindow[] {
-    return this._windows.slice();
+  get browserWindows(): BrowserWindow[] {
+      return this._windows;
   }
 }
diff --git a/arduino-ide-extension/src/electron-main/theia/electron-main-window-service.ts b/arduino-ide-extension/src/electron-main/theia/electron-main-window-service.ts
@@ -11,7 +11,7 @@ export class ElectronMainWindowServiceImpl extends TheiaElectronMainWindowServic
   openNewWindow(url: string, { external }: NewWindowOptions): undefined {
     if (!external) {
       const sanitizedUrl = this.sanitize(url);
-      const existing = this.app.windows.find(
+      const existing = this.app.browserWindows.find(
         (window) => this.sanitize(window.webContents.getURL()) === sanitizedUrl
       );
       if (existing) {
diff --git a/browser-app/package.json b/browser-app/package.json
@@ -4,26 +4,26 @@
   "version": "2.0.0-rc5",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@theia/core": "1.22.1",
-    "@theia/debug": "1.22.1",
-    "@theia/editor": "1.22.1",
-    "@theia/editor-preview": "1.22.1",
-    "@theia/file-search": "1.22.1",
-    "@theia/filesystem": "1.22.1",
-    "@theia/keymaps": "1.22.1",
-    "@theia/messages": "1.22.1",
-    "@theia/monaco": "1.22.1",
-    "@theia/navigator": "1.22.1",
-    "@theia/plugin-ext": "1.22.1",
-    "@theia/plugin-ext-vscode": "1.22.1",
-    "@theia/preferences": "1.22.1",
-    "@theia/process": "1.22.1",
-    "@theia/terminal": "1.22.1",
-    "@theia/workspace": "1.22.1",
+    "@theia/core": "1.23.0",
+    "@theia/debug": "1.23.0",
+    "@theia/editor": "1.23.0",
+    "@theia/editor-preview": "1.23.0",
+    "@theia/file-search": "1.23.0",
+    "@theia/filesystem": "1.23.0",
+    "@theia/keymaps": "1.23.0",
+    "@theia/messages": "1.23.0",
+    "@theia/monaco": "1.23.0",
+    "@theia/navigator": "1.23.0",
+    "@theia/plugin-ext": "1.23.0",
+    "@theia/plugin-ext-vscode": "1.23.0",
+    "@theia/preferences": "1.23.0",
+    "@theia/process": "1.23.0",
+    "@theia/terminal": "1.23.0",
+    "@theia/workspace": "1.23.0",
     "arduino-ide-extension": "2.0.0-rc5"
   },
   "devDependencies": {
-    "@theia/cli": "1.22.1"
+    "@theia/cli": "1.23.0"
   },
   "scripts": {
     "prepare": "theia build --mode development",
@@ -60,4 +60,4 @@
       }
     }
   }
-}
+}
diff --git a/electron-app/package.json b/electron-app/package.json
@@ -5,27 +5,27 @@
   "license": "AGPL-3.0-or-later",
   "main": "src-gen/frontend/electron-main.js",
   "dependencies": {
-    "@theia/core": "1.22.1",
-    "@theia/debug": "1.22.1",
-    "@theia/editor": "1.22.1",
-    "@theia/editor-preview": "1.22.1",
-    "@theia/electron": "1.22.1",
-    "@theia/file-search": "1.22.1",
-    "@theia/filesystem": "1.22.1",
-    "@theia/keymaps": "1.22.1",
-    "@theia/messages": "1.22.1",
-    "@theia/monaco": "1.22.1",
-    "@theia/navigator": "1.22.1",
-    "@theia/plugin-ext": "1.22.1",
-    "@theia/plugin-ext-vscode": "1.22.1",
-    "@theia/preferences": "1.22.1",
-    "@theia/process": "1.22.1",
-    "@theia/terminal": "1.22.1",
-    "@theia/workspace": "1.22.1",
+    "@theia/core": "1.23.0",
+    "@theia/debug": "1.23.0",
+    "@theia/editor": "1.23.0",
+    "@theia/editor-preview": "1.23.0",
+    "@theia/electron": "1.23.0",
+    "@theia/file-search": "1.23.0",
+    "@theia/filesystem": "1.23.0",
+    "@theia/keymaps": "1.23.0",
+    "@theia/messages": "1.23.0",
+    "@theia/monaco": "1.23.0",
+    "@theia/navigator": "1.23.0",
+    "@theia/plugin-ext": "1.23.0",
+    "@theia/plugin-ext-vscode": "1.23.0",
+    "@theia/preferences": "1.23.0",
+    "@theia/process": "1.23.0",
+    "@theia/terminal": "1.23.0",
+    "@theia/workspace": "1.23.0",
     "arduino-ide-extension": "2.0.0-rc5"
   },
   "devDependencies": {
-    "@theia/cli": "1.22.1",
+    "@theia/cli": "1.23.0",
     "electron": "^15.3.5"
   },
   "scripts": {
@@ -64,4 +64,4 @@
       }
     }
   }
-}
+}
diff --git a/electron/build/template-package.json b/electron/build/template-package.json
@@ -11,7 +11,7 @@
     "node-log-rotate": "^0.1.5"
   },
   "devDependencies": {
-    "@theia/cli": "1.22.1",
+    "@theia/cli": "1.23.0",
     "cross-env": "^7.0.2",
     "electron-builder": "22.10.5",
     "electron-notarize": "^1.1.1",
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "node": ">=14.0.0 <15"
   },
   "devDependencies": {
-    "@theia/cli": "1.22.1",
+    "@theia/cli": "1.23.0",
     "@types/sinon": "^2.3.5",
     "@types/jsdom": "^11.0.4",
     "@typescript-eslint/eslint-plugin": "^4.27.0",
@@ -30,7 +30,7 @@
     "reflect-metadata": "^0.1.10",
     "rimraf": "^2.6.1",
     "semver": "^7.3.2",
-    "typescript": "^3.9.2",
+    "typescript": "^4.5.5",
     "jsdom": "^11.5.1"
   },
   "resolutions": {
diff --git a/yarn.lock b/yarn.lock
