Skip to content

Commit e383831

Browse files
msujewmsujew
committed
Update Theia to 1.23.0
1 parent e5b3462 commit e383831

File tree

8 files changed

+1200
-580
lines changed

8 files changed

+1200
-580
lines changed

‎arduino-ide-extension/package.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@
2121
},
2222
"dependencies": {
2323
"@grpc/grpc-js": "^1.3.7",
24-
"@theia/application-package": "1.22.1",
25-
"@theia/core": "1.22.1",
26-
"@theia/editor": "1.22.1",
27-
"@theia/editor-preview": "1.22.1",
28-
"@theia/electron": "1.22.1",
29-
"@theia/filesystem": "1.22.1",
30-
"@theia/git": "1.22.1",
31-
"@theia/keymaps": "1.22.1",
32-
"@theia/markers": "1.22.1",
33-
"@theia/monaco": "1.22.1",
34-
"@theia/navigator": "1.22.1",
35-
"@theia/outline-view": "1.22.1",
36-
"@theia/output": "1.22.1",
37-
"@theia/preferences": "1.22.1",
38-
"@theia/search-in-workspace": "1.22.1",
39-
"@theia/terminal": "1.22.1",
40-
"@theia/workspace": "1.22.1",
24+
"@theia/application-package": "1.23.0",
25+
"@theia/core": "1.23.0",
26+
"@theia/editor": "1.23.0",
27+
"@theia/editor-preview": "1.23.0",
28+
"@theia/electron": "1.23.0",
29+
"@theia/filesystem": "1.23.0",
30+
"@theia/git": "1.23.0",
31+
"@theia/keymaps": "1.23.0",
32+
"@theia/markers": "1.23.0",
33+
"@theia/monaco": "1.23.0",
34+
"@theia/navigator": "1.23.0",
35+
"@theia/outline-view": "1.23.0",
36+
"@theia/output": "1.23.0",
37+
"@theia/preferences": "1.23.0",
38+
"@theia/search-in-workspace": "1.23.0",
39+
"@theia/terminal": "1.23.0",
40+
"@theia/workspace": "1.23.0",
4141
"@tippyjs/react": "^4.2.5",
4242
"@types/atob": "^2.1.2",
4343
"@types/auth0-js": "^9.14.0",

‎arduino-ide-extension/src/electron-main/theia/electron-main-application.ts

+5-11
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import { FrontendApplicationConfig } from '@theia/application-package/lib/applic
1111
import {
1212
ElectronMainApplication as TheiaElectronMainApplication,
1313
ElectronMainExecutionParams,
14-
TheiaBrowserWindowOptions,
1514
} from '@theia/core/lib/electron-main/electron-main-application';
1615
import { SplashServiceImpl } from '../splash/splash-service-impl';
1716
import { URI } from '@theia/core/shared/vscode-uri';
1817
import * as electronRemoteMain from '@theia/core/electron-shared/@electron/remote/main';
1918
import { Deferred } from '@theia/core/lib/common/promise-util';
2019
import * as os from '@theia/core/lib/common/os';
21-
import { RELOAD_REQUESTED_SIGNAL, Restart } from '@theia/core/lib/electron-common/messaging/electron-messages';
20+
import { Restart } from '@theia/core/lib/electron-common/messaging/electron-messages';
21+
import { TheiaBrowserWindowOptions } from '@theia/core/lib/electron-main/theia-electron-window';
2222

2323
app.commandLine.appendSwitch('disable-http-cache');
2424

@@ -158,8 +158,6 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
158158
app.on('second-instance', this.onSecondInstance.bind(this));
159159
app.on('window-all-closed', this.onWindowAllClosed.bind(this));
160160

161-
ipcMain.on(RELOAD_REQUESTED_SIGNAL, event => this.handleReload(event));
162-
163161
ipcMain.on(Restart, ({ sender }) => {
164162
this.restart(sender.id);
165163
});
@@ -185,7 +183,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
185183
options = this.avoidOverlap(options);
186184
let electronWindow: BrowserWindow | undefined;
187185
if (this._windows.length) {
188-
electronWindow = new BrowserWindow(options);
186+
electronWindow = await super.createWindow(options);
189187
} else {
190188
const { bounds } = screen.getDisplayNearestPoint(
191189
screen.getCursorScreenPoint()
@@ -272,10 +270,6 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
272270
}
273271
});
274272
this.attachClosedWorkspace(electronWindow);
275-
this.attachReadyToShow(electronWindow);
276-
this.attachSaveWindowState(electronWindow);
277-
this.attachGlobalShortcuts(electronWindow);
278-
this.restoreMaximizedState(electronWindow, options);
279273
electronRemoteMain.enable(electronWindow.webContents);
280274
return electronWindow;
281275
}
@@ -381,7 +375,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
381375
super.onWillQuit(event);
382376
}
383377

384-
get windows(): BrowserWindow[] {
385-
return this._windows.slice();
378+
get browserWindows(): BrowserWindow[] {
379+
return this._windows;
386380
}
387381
}

‎arduino-ide-extension/src/electron-main/theia/electron-main-window-service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class ElectronMainWindowServiceImpl extends TheiaElectronMainWindowServic
1111
openNewWindow(url: string, { external }: NewWindowOptions): undefined {
1212
if (!external) {
1313
const sanitizedUrl = this.sanitize(url);
14-
const existing = this.app.windows.find(
14+
const existing = this.app.browserWindows.find(
1515
(window) => this.sanitize(window.webContents.getURL()) === sanitizedUrl
1616
);
1717
if (existing) {

‎browser-app/package.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
"version": "2.0.0-rc5",
55
"license": "AGPL-3.0-or-later",
66
"dependencies": {
7-
"@theia/core": "1.22.1",
8-
"@theia/debug": "1.22.1",
9-
"@theia/editor": "1.22.1",
10-
"@theia/editor-preview": "1.22.1",
11-
"@theia/file-search": "1.22.1",
12-
"@theia/filesystem": "1.22.1",
13-
"@theia/keymaps": "1.22.1",
14-
"@theia/messages": "1.22.1",
15-
"@theia/monaco": "1.22.1",
16-
"@theia/navigator": "1.22.1",
17-
"@theia/plugin-ext": "1.22.1",
18-
"@theia/plugin-ext-vscode": "1.22.1",
19-
"@theia/preferences": "1.22.1",
20-
"@theia/process": "1.22.1",
21-
"@theia/terminal": "1.22.1",
22-
"@theia/workspace": "1.22.1",
7+
"@theia/core": "1.23.0",
8+
"@theia/debug": "1.23.0",
9+
"@theia/editor": "1.23.0",
10+
"@theia/editor-preview": "1.23.0",
11+
"@theia/file-search": "1.23.0",
12+
"@theia/filesystem": "1.23.0",
13+
"@theia/keymaps": "1.23.0",
14+
"@theia/messages": "1.23.0",
15+
"@theia/monaco": "1.23.0",
16+
"@theia/navigator": "1.23.0",
17+
"@theia/plugin-ext": "1.23.0",
18+
"@theia/plugin-ext-vscode": "1.23.0",
19+
"@theia/preferences": "1.23.0",
20+
"@theia/process": "1.23.0",
21+
"@theia/terminal": "1.23.0",
22+
"@theia/workspace": "1.23.0",
2323
"arduino-ide-extension": "2.0.0-rc5"
2424
},
2525
"devDependencies": {
26-
"@theia/cli": "1.22.1"
26+
"@theia/cli": "1.23.0"
2727
},
2828
"scripts": {
2929
"prepare": "theia build --mode development",
@@ -60,4 +60,4 @@
6060
}
6161
}
6262
}
63-
}
63+
}

‎electron-app/package.json

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@
55
"license": "AGPL-3.0-or-later",
66
"main": "src-gen/frontend/electron-main.js",
77
"dependencies": {
8-
"@theia/core": "1.22.1",
9-
"@theia/debug": "1.22.1",
10-
"@theia/editor": "1.22.1",
11-
"@theia/editor-preview": "1.22.1",
12-
"@theia/electron": "1.22.1",
13-
"@theia/file-search": "1.22.1",
14-
"@theia/filesystem": "1.22.1",
15-
"@theia/keymaps": "1.22.1",
16-
"@theia/messages": "1.22.1",
17-
"@theia/monaco": "1.22.1",
18-
"@theia/navigator": "1.22.1",
19-
"@theia/plugin-ext": "1.22.1",
20-
"@theia/plugin-ext-vscode": "1.22.1",
21-
"@theia/preferences": "1.22.1",
22-
"@theia/process": "1.22.1",
23-
"@theia/terminal": "1.22.1",
24-
"@theia/workspace": "1.22.1",
8+
"@theia/core": "1.23.0",
9+
"@theia/debug": "1.23.0",
10+
"@theia/editor": "1.23.0",
11+
"@theia/editor-preview": "1.23.0",
12+
"@theia/electron": "1.23.0",
13+
"@theia/file-search": "1.23.0",
14+
"@theia/filesystem": "1.23.0",
15+
"@theia/keymaps": "1.23.0",
16+
"@theia/messages": "1.23.0",
17+
"@theia/monaco": "1.23.0",
18+
"@theia/navigator": "1.23.0",
19+
"@theia/plugin-ext": "1.23.0",
20+
"@theia/plugin-ext-vscode": "1.23.0",
21+
"@theia/preferences": "1.23.0",
22+
"@theia/process": "1.23.0",
23+
"@theia/terminal": "1.23.0",
24+
"@theia/workspace": "1.23.0",
2525
"arduino-ide-extension": "2.0.0-rc5"
2626
},
2727
"devDependencies": {
28-
"@theia/cli": "1.22.1",
28+
"@theia/cli": "1.23.0",
2929
"electron": "^15.3.5"
3030
},
3131
"scripts": {
@@ -64,4 +64,4 @@
6464
}
6565
}
6666
}
67-
}
67+
}

‎electron/build/template-package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"node-log-rotate": "^0.1.5"
1212
},
1313
"devDependencies": {
14-
"@theia/cli": "1.22.1",
14+
"@theia/cli": "1.23.0",
1515
"cross-env": "^7.0.2",
1616
"electron-builder": "22.10.5",
1717
"electron-notarize": "^1.1.1",

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"node": ">=14.0.0 <15"
1111
},
1212
"devDependencies": {
13-
"@theia/cli": "1.22.1",
13+
"@theia/cli": "1.23.0",
1414
"@types/sinon": "^2.3.5",
1515
"@types/jsdom": "^11.0.4",
1616
"@typescript-eslint/eslint-plugin": "^4.27.0",
@@ -30,7 +30,7 @@
3030
"reflect-metadata": "^0.1.10",
3131
"rimraf": "^2.6.1",
3232
"semver": "^7.3.2",
33-
"typescript": "^3.9.2",
33+
"typescript": "^4.5.5",
3434
"jsdom": "^11.5.1"
3535
},
3636
"resolutions": {

0 commit comments

Comments
 (0)