chore: use [email protected]

Signed-off-by: Akos Kitta <[email protected]>

arduino-ide-extension/package.json

@@ -24,27 +24,28 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.8.14",
-    "@theia/application-package": "1.41.0",
-    "@theia/core": "1.41.0",
-    "@theia/debug": "1.41.0",
-    "@theia/editor": "1.41.0",
-    "@theia/electron": "1.41.0",
-    "@theia/filesystem": "1.41.0",
-    "@theia/keymaps": "1.41.0",
-    "@theia/markers": "1.41.0",
-    "@theia/messages": "1.41.0",
-    "@theia/monaco": "1.41.0",
+    "@theia/application-package": "1.46.1",
+    "@theia/core": "1.46.1",
+    "@theia/debug": "1.46.1",
+    "@theia/editor": "1.46.1",
+    "@theia/electron": "1.46.1",
+    "@theia/filesystem": "1.46.1",
+    "@theia/keymaps": "1.46.1",
+    "@theia/markers": "1.46.1",
+    "@theia/messages": "1.46.1",
+    "@theia/monaco": "1.46.1",
     "@theia/monaco-editor-core": "1.72.3",
-    "@theia/navigator": "1.41.0",
-    "@theia/outline-view": "1.41.0",
-    "@theia/output": "1.41.0",
-    "@theia/plugin-ext": "1.41.0",
-    "@theia/preferences": "1.41.0",
-    "@theia/scm": "1.41.0",
-    "@theia/search-in-workspace": "1.41.0",
-    "@theia/terminal": "1.41.0",
-    "@theia/typehierarchy": "1.41.0",
-    "@theia/workspace": "1.41.0",
+    "@theia/navigator": "1.46.1",
+    "@theia/outline-view": "1.46.1",
+    "@theia/output": "1.46.1",
+    "@theia/plugin-ext": "1.46.1",
+    "@theia/preferences": "1.46.1",
+    "@theia/scm": "1.46.1",
+    "@theia/search-in-workspace": "1.46.1",
+    "@theia/terminal": "1.46.1",
+    "@theia/test": "1.46.1",
+    "@theia/typehierarchy": "1.46.1",
+    "@theia/workspace": "1.46.1",
     "@tippyjs/react": "^4.2.5",
     "@types/auth0-js": "^9.21.3",
     "@types/btoa": "^1.2.3",

arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -1,7 +1,7 @@
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import {
   TabBarToolbarContribution,

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

@@ -5,10 +5,8 @@ import { CommandContribution } from '@theia/core/lib/common/command';
 import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
 import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider';
-import {
-  FrontendApplicationContribution,
-  FrontendApplication as TheiaFrontendApplication,
-} from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplication as TheiaFrontendApplication } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import { LibraryListWidget } from './library/library-list-widget';
 import { ArduinoFrontendContribution } from './arduino-frontend-contribution';
 import {
@@ -266,7 +264,7 @@ import {
   IDEUpdaterDialog,
   IDEUpdaterDialogProps,
 } from './dialogs/ide-updater/ide-updater-dialog';
-import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-provider';
+import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-source';
 import { MonitorModel } from './monitor-model';
 import { MonitorManagerProxyClientImpl } from './monitor-manager-proxy-client-impl';
 import { EditorManager as TheiaEditorManager } from '@theia/editor/lib/browser/editor-manager';
@@ -286,10 +284,6 @@ import { PreferenceTreeGenerator } from './theia/preferences/preference-tree-gen
 import { PreferenceTreeGenerator as TheiaPreferenceTreeGenerator } from '@theia/preferences/lib/browser/util/preference-tree-generator';
 import { AboutDialog } from './theia/core/about-dialog';
 import { AboutDialog as TheiaAboutDialog } from '@theia/core/lib/browser/about-dialog';
-import {
-  SurveyNotificationService,
-  SurveyNotificationServicePath,
-} from '../common/protocol/survey-service';
 import { WindowContribution } from './theia/core/window-contribution';
 import { WindowContribution as TheiaWindowContribution } from '@theia/core/lib/browser/window-contribution';
 import { CoreErrorHandler } from './contributions/core-error-handler';
@@ -372,6 +366,8 @@ import { DebugSessionWidget } from '@theia/debug/lib/browser/view/debug-session-
 import { DebugConfigurationWidget } from './theia/debug/debug-configuration-widget';
 import { DebugConfigurationWidget as TheiaDebugConfigurationWidget } from '@theia/debug/lib/browser/view/debug-configuration-widget';
 import { DebugToolBar } from '@theia/debug/lib/browser/view/debug-toolbar-widget';
+import { TestViewContribution as TheiaTestViewContribution } from '@theia/test/lib/browser/view/test-view-contribution';
+import { TestViewContribution } from './theia/test/test-view-contribution';
 
 // Hack to fix copy/cut/paste issue after electron version update in Theia.
 // https://github.com/eclipse-theia/theia/issues/12487
@@ -552,15 +548,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     WorkspaceVariableContribution
   );
 
-  bind(SurveyNotificationService)
-    .toDynamicValue((context) => {
-      return ElectronIpcConnectionProvider.createProxy(
-        context.container,
-        SurveyNotificationServicePath
-      );
-    })
-    .inSingletonScope();
-
   // Layout and shell customizations.
   rebind(TheiaOutlineViewContribution)
     .to(OutlineViewContribution)
@@ -1082,4 +1069,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   rebind(TheiaTerminalFrontendContribution).toService(
     TerminalFrontendContribution
   );
+
+  // Hides the Test Explorer from the side-bar
+  bind(TestViewContribution).toSelf().inSingletonScope();
+  rebind(TheiaTestViewContribution).toService(TestViewContribution);
 });

arduino-ide-extension/src/browser/arduino-preferences.ts

@@ -260,14 +260,6 @@ const properties: ArduinoPreferenceSchemaProperties = {
     ),
     default: 'https://auth.arduino.cc/login#/register',
   },
-  'arduino.survey.notification': {
-    type: 'boolean',
-    description: nls.localize(
-      'arduino/preferences/survey.notification',
-      'True if users should be notified if a survey is available. True by default.'
-    ),
-    default: true,
-  },
   'arduino.cli.daemon.debug': {
     type: 'boolean',
     description: nls.localize(
@@ -333,7 +325,6 @@ export interface ArduinoConfiguration {
   'arduino.auth.domain': string;
   'arduino.auth.audience': string;
   'arduino.auth.registerUri': string;
-  'arduino.survey.notification': boolean;
   'arduino.cli.daemon.debug': boolean;
   'arduino.sketch.inoBlueprint': string;
   'arduino.checkForUpdates': boolean;

arduino-ide-extension/src/browser/auth/authentication-client-service.ts

@@ -3,7 +3,7 @@ import { Emitter } from '@theia/core/lib/common/event';
 import { JsonRpcProxy } from '@theia/core/lib/common/messaging/proxy-factory';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import {
   CommandRegistry,
   CommandContribution,

arduino-ide-extension/src/browser/boards/boards-auto-installer.ts

@@ -1,4 +1,4 @@
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { MessageType } from '@theia/core/lib/common/message-service-protocol';

arduino-ide-extension/src/browser/boards/boards-data-store.ts

@@ -1,4 +1,4 @@
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import { StorageService } from '@theia/core/lib/browser/storage-service';
 import type {

arduino-ide-extension/src/browser/boards/boards-service-provider.ts

@@ -1,4 +1,4 @@
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import { StorageService } from '@theia/core/lib/browser/storage-service';
 import {

arduino-ide-extension/src/browser/config/config-service-client.ts

@@ -1,4 +1,4 @@
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Emitter, Event } from '@theia/core/lib/common/event';

arduino-ide-extension/src/browser/contributions/close.ts

@@ -1,8 +1,6 @@
 import { Dialog } from '@theia/core/lib/browser/dialogs';
-import type {
-  FrontendApplication,
-  OnWillStopAction,
-} from '@theia/core/lib/browser/frontend-application';
+import type { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
+import type { OnWillStopAction } from '@theia/core/lib/browser/frontend-application-contribution';
 import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
 import { nls } from '@theia/core/lib/common/nls';
 import type { MaybePromise } from '@theia/core/lib/common/types';

arduino-ide-extension/src/browser/contributions/contribution.ts

@@ -1,8 +1,6 @@
 import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
-import {
-  FrontendApplication,
-  FrontendApplicationContribution,
-} from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import {
   KeybindingContribution,

arduino-ide-extension/src/browser/create/create-features.ts

@@ -1,4 +1,4 @@
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import URI from '@theia/core/lib/common/uri';

arduino-ide-extension/src/browser/create/create-fs-provider.ts

@@ -5,7 +5,7 @@ import {
   Disposable,
   DisposableCollection,
 } from '@theia/core/lib/common/disposable';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import {
   Stat,
   FileType,

arduino-ide-extension/src/browser/notification-center.ts

@@ -6,7 +6,7 @@ import {
 import { Emitter } from '@theia/core/lib/common/event';
 import { JsonRpcProxy } from '@theia/core/lib/common/messaging/proxy-factory';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import {
   IndexUpdateDidCompleteParams,
   IndexUpdateDidFailParams,

arduino-ide-extension/src/browser/sketches-service-client-impl.ts

@@ -9,7 +9,7 @@ import {
   Disposable,
   DisposableCollection,
 } from '@theia/core/lib/common/disposable';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import { Sketch, SketchesService } from '../common/protocol';
 import { ConfigServiceClient } from './config/config-service-client';
 import {
@@ -74,6 +74,7 @@ export class SketchesServiceClientImpl
     const sketchDirUri = this.configService.tryGetSketchDirUri();
     this.watchSketchbookDir(sketchDirUri);
     const refreshCurrentSketch = async () => {
+      await this.workspaceService.ready;
       const currentSketch = await this.loadCurrentSketch();
       const ideTempFolderUri = await this.getIdeTempFolderUriForSketch(
         currentSketch

arduino-ide-extension/src/browser/theia/core/common-frontend-contribution.ts

@@ -2,7 +2,7 @@ import {
   CommonCommands,
   CommonFrontendContribution as TheiaCommonFrontendContribution,
 } from '@theia/core/lib/browser/common-frontend-contribution';
-import type { OnWillStopAction } from '@theia/core/lib/browser/frontend-application';
+import type { OnWillStopAction } from '@theia/core/lib/browser/frontend-application-contribution';
 import type { KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
 import type { CommandRegistry } from '@theia/core/lib/common/command';
 import type { MenuModelRegistry } from '@theia/core/lib/common/menu';

arduino-ide-extension/src/browser/theia/core/connection-status-service.ts

@@ -1,10 +1,10 @@
 import {
-  ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution,
   ConnectionStatus,
+  ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution,
   FrontendConnectionStatusService as TheiaFrontendConnectionStatusService,
 } from '@theia/core/lib/browser/connection-status-service';
-import type { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
-import { WebSocketConnectionProvider } from '@theia/core/lib/browser/index';
+import type { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
+import { WebSocketConnectionSource } from '@theia/core/lib/browser/messaging/ws-connection-source';
 import { StatusBarAlignment } from '@theia/core/lib/browser/status-bar/status-bar';
 import { Disposable } from '@theia/core/lib/common/disposable';
 import { Emitter, Event } from '@theia/core/lib/common/event';
@@ -114,8 +114,8 @@ export class FrontendConnectionStatusService extends TheiaFrontendConnectionStat
   private readonly daemonPort: DaemonPort;
   @inject(IsOnline)
   private readonly isOnline: IsOnline;
-  @inject(WebSocketConnectionProvider)
-  private readonly connectionProvider: WebSocketConnectionProvider;
+  @inject(WebSocketConnectionSource)
+  private readonly connectionSource: WebSocketConnectionSource;
 
   @postConstruct()
   protected override init(): void {
@@ -128,7 +128,7 @@ export class FrontendConnectionStatusService extends TheiaFrontendConnectionStat
   }
 
   protected override async performPingRequest(): Promise<void> {
-    if (!this.connectionProvider['socket'].connected) {
+    if (!this.connectionSource['socket'].connected) {
       this.updateStatus(false);
       return;
     }
@@ -171,8 +171,8 @@ export class ApplicationConnectionStatusContribution extends TheiaApplicationCon
   private readonly notificationManager: NotificationManager;
   @inject(CreateFeatures)
   private readonly createFeatures: CreateFeatures;
-  @inject(WebSocketConnectionProvider)
-  private readonly connectionProvider: WebSocketConnectionProvider;
+  @inject(WebSocketConnectionSource)
+  private readonly connectionSource: WebSocketConnectionSource;
 
   private readonly offlineStatusDidChangeEmitter = new Emitter<
     OfflineConnectionStatus | undefined
@@ -202,7 +202,7 @@ export class ApplicationConnectionStatusContribution extends TheiaApplicationCon
     const params = <OfflineMessageParams>{
       port: this.daemonPort.port,
       online: this.isOnline.online,
-      backendConnected: this.connectionProvider['socket'].connected, // https://github.com/arduino/arduino-ide/issues/2081
+      backendConnected: this.connectionSource['socket'].connected, // https://github.com/arduino/arduino-ide/issues/2081
     };
     this._offlineStatus = offlineConnectionStatusType(params);
     const { text, tooltip } = offlineMessage(params);