Skip to content

feat: use [email protected] #2654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 28, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: use [email protected]
Remove `EditorCommandContribution` override, since  https://redirect.github.com/eclipse-theia/theia/pull/13683 fixed the unwanted save on startup
  • Loading branch information
giacomocusinato committed Mar 28, 2025
commit 0fdbe70717f2775391e1fe5dd61f872f46bc8a5e
44 changes: 22 additions & 22 deletions arduino-ide-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@
},
"dependencies": {
"@grpc/grpc-js": "^1.8.14",
"@theia/application-package": "1.48.3",
"@theia/core": "1.48.3",
"@theia/debug": "1.48.3",
"@theia/editor": "1.48.3",
"@theia/electron": "1.48.3",
"@theia/filesystem": "1.48.3",
"@theia/keymaps": "1.48.3",
"@theia/markers": "1.48.3",
"@theia/messages": "1.48.3",
"@theia/monaco": "1.48.3",
"@theia/application-package": "1.50.1",
"@theia/core": "1.50.1",
"@theia/debug": "1.50.1",
"@theia/editor": "1.50.1",
"@theia/electron": "1.50.1",
"@theia/filesystem": "1.50.1",
"@theia/keymaps": "1.50.1",
"@theia/markers": "1.50.1",
"@theia/messages": "1.50.1",
"@theia/monaco": "1.50.1",
"@theia/monaco-editor-core": "1.83.101",
"@theia/navigator": "1.48.3",
"@theia/outline-view": "1.48.3",
"@theia/output": "1.48.3",
"@theia/plugin-ext": "1.48.3",
"@theia/plugin-ext-vscode": "1.48.3",
"@theia/preferences": "1.48.3",
"@theia/scm": "1.48.3",
"@theia/search-in-workspace": "1.48.3",
"@theia/terminal": "1.48.3",
"@theia/test": "1.48.3",
"@theia/typehierarchy": "1.48.3",
"@theia/workspace": "1.48.3",
"@theia/navigator": "1.50.1",
"@theia/outline-view": "1.50.1",
"@theia/output": "1.50.1",
"@theia/plugin-ext": "1.50.1",
"@theia/plugin-ext-vscode": "1.50.1",
"@theia/preferences": "1.50.1",
"@theia/scm": "1.50.1",
"@theia/search-in-workspace": "1.50.1",
"@theia/terminal": "1.50.1",
"@theia/test": "1.50.1",
"@theia/typehierarchy": "1.50.1",
"@theia/workspace": "1.50.1",
"@tippyjs/react": "^4.2.5",
"@types/auth0-js": "^9.21.3",
"@types/btoa": "^1.2.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ import {
ArduinoDaemonPath,
ArduinoDaemon,
} from '../common/protocol/arduino-daemon';
import { EditorCommandContribution as TheiaEditorCommandContribution } from '@theia/editor/lib/browser';
import {
FrontendConnectionStatusService,
ApplicationConnectionStatusContribution,
Expand Down Expand Up @@ -184,7 +183,6 @@ import {
import { About } from './contributions/about';
import { IconThemeService } from '@theia/core/lib/browser/icon-theme-service';
import { TabBarRenderer } from './theia/core/tab-bars';
import { EditorCommandContribution } from './theia/editor/editor-command';
import { NavigatorTabBarDecorator as TheiaNavigatorTabBarDecorator } from '@theia/navigator/lib/browser/navigator-tab-bar-decorator';
import { NavigatorTabBarDecorator } from './theia/navigator/navigator-tab-bar-decorator';
import { Debug, DebugDisabledStatusMessageSource } from './contributions/debug';
Expand Down Expand Up @@ -843,13 +841,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
);
});

// Workaround for https://github.com/eclipse-theia/theia/issues/8722
// Do not trigger a save on IDE startup if `"editor.autoSave": "on"` was set as a preference.
// Note: `"editor.autoSave" was renamed to `"files.autoSave" and `"on"` was replaced with three
// different cases, but we treat `!== 'off'` as auto save enabled. (https://github.com/eclipse-theia/theia/issues/10812)
bind(EditorCommandContribution).toSelf().inSingletonScope();
rebind(TheiaEditorCommandContribution).toService(EditorCommandContribution);

// Silent the badge decoration in the Explorer view.
bind(NavigatorTabBarDecorator).toSelf().inSingletonScope();
rebind(TheiaNavigatorTabBarDecorator).toService(NavigatorTabBarDecorator);
Expand Down
21 changes: 0 additions & 21 deletions arduino-ide-extension/src/browser/theia/editor/editor-command.ts

This file was deleted.

32 changes: 16 additions & 16 deletions electron-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@
"license": "AGPL-3.0-or-later",
"main": "./src-gen/backend/electron-main.js",
"dependencies": {
"@theia/core": "1.48.3",
"@theia/debug": "1.48.3",
"@theia/editor": "1.48.3",
"@theia/electron": "1.48.3",
"@theia/filesystem": "1.48.3",
"@theia/keymaps": "1.48.3",
"@theia/messages": "1.48.3",
"@theia/monaco": "1.48.3",
"@theia/navigator": "1.48.3",
"@theia/plugin-ext": "1.48.3",
"@theia/plugin-ext-vscode": "1.48.3",
"@theia/preferences": "1.48.3",
"@theia/terminal": "1.48.3",
"@theia/workspace": "1.48.3",
"@theia/core": "1.50.1",
"@theia/debug": "1.50.1",
"@theia/editor": "1.50.1",
"@theia/electron": "1.50.1",
"@theia/filesystem": "1.50.1",
"@theia/keymaps": "1.50.1",
"@theia/messages": "1.50.1",
"@theia/monaco": "1.50.1",
"@theia/navigator": "1.50.1",
"@theia/plugin-ext": "1.50.1",
"@theia/plugin-ext-vscode": "1.50.1",
"@theia/preferences": "1.50.1",
"@theia/terminal": "1.50.1",
"@theia/workspace": "1.50.1",
"arduino-ide-extension": "2.3.5"
},
"devDependencies": {
"@theia/cli": "1.48.3",
"@theia/cli": "1.50.1",
"7zip-min": "^1.4.4",
"chmodr": "^1.2.0",
"compression-webpack-plugin": "^9.0.0",
"copy-webpack-plugin": "^8.1.1",
"dateformat": "^5.0.3",
"electron": "^27.3.1",
"electron": "^28.2.8",
"electron-builder": "^24.6.4",
"electron-notarize": "^1.1.1",
"execa": "^7.1.1",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"**/ip": "^2.0.1"
},
"devDependencies": {
"@theia/cli": "1.48.3",
"@theia/cli": "1.50.1",
"@typescript-eslint/eslint-plugin": "^5.59.0",
"@typescript-eslint/parser": "^5.59.0",
"@xhmikosr/downloader": "^13.0.1",
Expand Down
Loading