Skip to content

Commit 0b36122

Browse files
giacomocusinatogiacomocusinato
committed
chore: use [email protected] 
1 parent d596925 commit 0b36122

File tree

7 files changed

+415
-393
lines changed

7 files changed

+415
-393
lines changed

Diff for: ‎arduino-ide-extension/package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,29 @@
2424
},
2525
"dependencies": {
2626
"@grpc/grpc-js": "^1.8.14",
27-
"@theia/application-package": "1.51.0",
28-
"@theia/core": "1.51.0",
29-
"@theia/debug": "1.51.0",
30-
"@theia/editor": "1.51.0",
31-
"@theia/electron": "1.51.0",
32-
"@theia/filesystem": "1.51.0",
33-
"@theia/keymaps": "1.51.0",
34-
"@theia/markers": "1.51.0",
35-
"@theia/messages": "1.51.0",
36-
"@theia/monaco": "1.51.0",
27+
"@theia/application-package": "1.53.2",
28+
"@theia/core": "1.53.2",
29+
"@theia/debug": "1.53.2",
30+
"@theia/editor": "1.53.2",
31+
"@theia/electron": "1.53.2",
32+
"@theia/filesystem": "1.53.2",
33+
"@theia/keymaps": "1.53.2",
34+
"@theia/markers": "1.53.2",
35+
"@theia/messages": "1.53.2",
36+
"@theia/monaco": "1.53.2",
3737
"@theia/monaco-editor-core": "1.83.101",
38-
"@theia/navigator": "1.51.0",
39-
"@theia/outline-view": "1.51.0",
40-
"@theia/output": "1.51.0",
41-
"@theia/plugin-ext": "1.51.0",
42-
"@theia/plugin-ext-vscode": "1.51.0",
43-
"@theia/preferences": "1.51.0",
44-
"@theia/scm": "1.51.0",
45-
"@theia/search-in-workspace": "1.51.0",
46-
"@theia/terminal": "1.51.0",
47-
"@theia/test": "1.51.0",
48-
"@theia/typehierarchy": "1.51.0",
49-
"@theia/workspace": "1.51.0",
38+
"@theia/navigator": "1.53.2",
39+
"@theia/outline-view": "1.53.2",
40+
"@theia/output": "1.53.2",
41+
"@theia/plugin-ext": "1.53.2",
42+
"@theia/plugin-ext-vscode": "1.53.2",
43+
"@theia/preferences": "1.53.2",
44+
"@theia/scm": "1.53.2",
45+
"@theia/search-in-workspace": "1.53.2",
46+
"@theia/terminal": "1.53.2",
47+
"@theia/test": "1.53.2",
48+
"@theia/typehierarchy": "1.53.2",
49+
"@theia/workspace": "1.53.2",
5050
"@tippyjs/react": "^4.2.5",
5151
"@types/auth0-js": "^9.21.3",
5252
"@types/btoa": "^1.2.3",

Diff for: ‎arduino-ide-extension/src/browser/theia/debug/debug-session-contribution.ts

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { injectable } from '@theia/core/shared/inversify';
22
import { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';
33
import { DefaultDebugSessionFactory as TheiaDefaultDebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution';
4+
import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
45
import { DebugConfigurationSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
56
import {
67
DebugAdapterPath,
@@ -12,6 +13,7 @@ import { DebugSession } from './debug-session';
1213
@injectable()
1314
export class DefaultDebugSessionFactory extends TheiaDefaultDebugSessionFactory {
1415
override get(
16+
manager: DebugSessionManager,
1517
sessionId: string,
1618
options: DebugConfigurationSessionOptions,
1719
parentSession?: DebugSession
@@ -35,6 +37,9 @@ export class DefaultDebugSessionFactory extends TheiaDefaultDebugSessionFactory
3537
sessionId,
3638
options,
3739
parentSession,
40+
this.testService,
41+
options.testRun,
42+
manager,
3843
connection,
3944
this.terminalService,
4045
this.editorManager,

Diff for: ‎arduino-ide-extension/src/browser/toolbar/arduino-toolbar.tsx

+11-12
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
TabBarToolbarRegistry,
55
TabBarToolbarItem,
66
ReactTabBarToolbarItem,
7+
RenderedToolbarItem,
78
} from '@theia/core/lib/browser/shell/tab-bar-toolbar';
89
import { CommandRegistry } from '@theia/core/lib/common/command';
910
import { ReactWidget } from '@theia/core/lib/browser';
@@ -14,7 +15,7 @@ export const ARDUINO_TOOLBAR_ITEM_CLASS = 'arduino-tool-item';
1415
export namespace ArduinoToolbarComponent {
1516
export interface Props {
1617
side: 'left' | 'right';
17-
items: (TabBarToolbarItem | ReactTabBarToolbarItem)[];
18+
items: TabBarToolbarItem[];
1819
commands: CommandRegistry;
1920
labelParser: LabelParser;
2021
commandIsEnabled: (id: string) => boolean;
@@ -34,7 +35,7 @@ export class ArduinoToolbarComponent extends React.Component<
3435
this.state = { tooltip: '' };
3536
}
3637

37-
protected renderItem = (item: TabBarToolbarItem) => {
38+
protected renderItem = (item: RenderedToolbarItem) => {
3839
let innerText = '';
3940
let className = `arduino-tool-icon ${item.id}-icon`;
4041
if (item.text) {
@@ -46,7 +47,8 @@ export class ArduinoToolbarComponent extends React.Component<
4647
}
4748
}
4849
}
49-
const command = this.props.commands.getCommand(item.command);
50+
const command =
51+
item.command && this.props.commands.getCommand(item.command);
5052
const cls = `${ARDUINO_TOOLBAR_ITEM_CLASS} ${
5153
TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM
5254
} ${command && this.props.commandIsEnabled(command.id) ? 'enabled' : ''} ${
@@ -80,7 +82,9 @@ export class ArduinoToolbarComponent extends React.Component<
8082
const items = [
8183
<React.Fragment key={this.props.side + '-arduino-toolbar-tooltip'}>
8284
{[...this.props.items].map((item) =>
83-
TabBarToolbarItem.is(item) ? this.renderItem(item) : item.render()
85+
ReactTabBarToolbarItem.is(item)
86+
? item.render()
87+
: this.renderItem(item)
8488
)}
8589
</React.Fragment>,
8690
];
@@ -94,10 +98,7 @@ export class ArduinoToolbarComponent extends React.Component<
9498
}
9599

96100
export class ArduinoToolbar extends ReactWidget {
97-
protected items = new Map<
98-
string,
99-
TabBarToolbarItem | ReactTabBarToolbarItem
100-
>();
101+
protected items = new Map<string, TabBarToolbarItem>();
101102

102103
constructor(
103104
protected readonly tabBarToolbarRegistry: TabBarToolbarRegistry,
@@ -112,9 +113,7 @@ export class ArduinoToolbar extends ReactWidget {
112113
this.tabBarToolbarRegistry.onDidChange(() => this.updateToolbar());
113114
}
114115

115-
protected updateItems(
116-
items: Array<TabBarToolbarItem | ReactTabBarToolbarItem>
117-
): void {
116+
protected updateItems(items: Array<TabBarToolbarItem>): void {
118117
this.items.clear();
119118
const revItems = items
120119
.sort(TabBarToolbarItem.PRIORITY_COMPARATOR)
@@ -163,7 +162,7 @@ export class ArduinoToolbar extends ReactWidget {
163162

164163
protected executeCommand = (e: React.MouseEvent<HTMLElement>) => {
165164
const item = this.items.get(e.currentTarget.id);
166-
if (TabBarToolbarItem.is(item)) {
165+
if (item && item.command) {
167166
this.commands.executeCommand(item.command, this, e.target);
168167
}
169168
};

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
211211
);
212212
this._appInfo = updateAppInfo(this._appInfo, this._config);
213213
this.hookApplicationEvents();
214-
this.showInitialWindow();
214+
this.showInitialWindow(undefined);
215215
const port = await this.startBackend();
216216
this.startContentTracing();
217217
this._backendPort.resolve(port);
@@ -885,7 +885,7 @@ const fallbackFrontendAppConfig: FrontendApplicationConfig = {
885885
defaultIconTheme: 'none',
886886
validatePreferencesSchema: false,
887887
defaultLocale: '',
888-
electron: { showWindowEarly: true },
888+
electron: { showWindowEarly: true, uriScheme: 'custom://arduino-ide' },
889889
reloadOnReconnect: true,
890890
};
891891

Diff for: ‎electron-app/package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@
55
"license": "AGPL-3.0-or-later",
66
"main": "./src-gen/backend/electron-main.js",
77
"dependencies": {
8-
"@theia/core": "1.51.0",
9-
"@theia/debug": "1.51.0",
10-
"@theia/editor": "1.51.0",
11-
"@theia/electron": "1.51.0",
12-
"@theia/filesystem": "1.51.0",
13-
"@theia/keymaps": "1.51.0",
14-
"@theia/messages": "1.51.0",
15-
"@theia/monaco": "1.51.0",
16-
"@theia/navigator": "1.51.0",
17-
"@theia/plugin-ext": "1.51.0",
18-
"@theia/plugin-ext-vscode": "1.51.0",
19-
"@theia/preferences": "1.51.0",
20-
"@theia/terminal": "1.51.0",
21-
"@theia/workspace": "1.51.0",
8+
"@theia/core": "1.53.2",
9+
"@theia/debug": "1.53.2",
10+
"@theia/editor": "1.53.2",
11+
"@theia/electron": "1.53.2",
12+
"@theia/filesystem": "1.53.2",
13+
"@theia/keymaps": "1.53.2",
14+
"@theia/messages": "1.53.2",
15+
"@theia/monaco": "1.53.2",
16+
"@theia/navigator": "1.53.2",
17+
"@theia/plugin-ext": "1.53.2",
18+
"@theia/plugin-ext-vscode": "1.53.2",
19+
"@theia/preferences": "1.53.2",
20+
"@theia/terminal": "1.53.2",
21+
"@theia/workspace": "1.53.2",
2222
"arduino-ide-extension": "2.3.5"
2323
},
2424
"devDependencies": {
25-
"@theia/cli": "1.51.0",
25+
"@theia/cli": "1.53.2",
2626
"7zip-min": "^1.4.4",
2727
"chmodr": "^1.2.0",
2828
"compression-webpack-plugin": "^9.0.0",
2929
"copy-webpack-plugin": "^8.1.1",
3030
"dateformat": "^5.0.3",
31-
"electron": "^28.2.8",
31+
"electron": "^30.5.1",
3232
"electron-builder": "^24.6.4",
3333
"electron-notarize": "^1.1.1",
3434
"execa": "^7.1.1",

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"**/ip": "^2.0.1"
1818
},
1919
"devDependencies": {
20-
"@theia/cli": "1.51.0",
20+
"@theia/cli": "1.53.2",
2121
"@typescript-eslint/eslint-plugin": "^5.59.0",
2222
"@typescript-eslint/parser": "^5.59.0",
2323
"@xhmikosr/downloader": "^13.0.1",

0 commit comments

Comments
 (0)