theia 1.13.0

fstasi · fstasi · commit 4ec001305240 · 2021-09-02T14:45:19.000+02:00
diff --git a/arduino-ide-extension/package.json b/arduino-ide-extension/package.json
@@ -19,21 +19,21 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.1.1",
-    "@theia/application-package": "next",
-    "@theia/core": "next",
-    "@theia/editor": "next",
-    "@theia/filesystem": "next",
-    "@theia/git": "next",
-    "@theia/keymaps": "next",
-    "@theia/markers": "next",
-    "@theia/monaco": "next",
-    "@theia/navigator": "next",
-    "@theia/outline-view": "next",
-    "@theia/output": "next",
-    "@theia/preferences": "next",
-    "@theia/search-in-workspace": "next",
-    "@theia/terminal": "next",
-    "@theia/workspace": "next",
+    "@theia/application-package": "1.13.0",
+    "@theia/core": "1.13.0",
+    "@theia/editor": "1.13.0",
+    "@theia/filesystem": "1.13.0",
+    "@theia/git": "1.13.0",
+    "@theia/keymaps": "1.13.0",
+    "@theia/markers": "1.13.0",
+    "@theia/monaco": "1.13.0",
+    "@theia/navigator": "1.13.0",
+    "@theia/outline-view": "1.13.0",
+    "@theia/output": "1.13.0",
+    "@theia/preferences": "1.13.0",
+    "@theia/search-in-workspace": "1.13.0",
+    "@theia/terminal": "1.13.0",
+    "@theia/workspace": "1.13.0",
     "@tippyjs/react": "^4.2.5",
     "@types/atob": "^2.1.2",
     "@types/auth0-js": "^9.14.0",
diff --git a/arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts b/arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts
@@ -210,8 +210,6 @@ import { SearchInWorkspaceResultTreeWidget as TheiaSearchInWorkspaceResultTreeWi
 import { SearchInWorkspaceResultTreeWidget } from './theia/search-in-workspace/search-in-workspace-result-tree-widget';
 import { MonacoEditorProvider } from './theia/monaco/monaco-editor-provider';
 import { MonacoEditorProvider as TheiaMonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
-import { DebugEditorModel } from './theia/debug/debug-editor-model';
-import { DebugEditorModelFactory } from '@theia/debug/lib/browser/editor/debug-editor-model';
 import { StorageWrapper } from './storage-wrapper';
 import { NotificationManager } from './theia/messages/notifications-manager';
 import { NotificationManager as TheiaNotificationManager } from '@theia/messages/lib/browser/notifications-manager';
@@ -667,16 +665,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(DebugConfigurationManager).toSelf().inSingletonScope();
   rebind(TheiaDebugConfigurationManager).toService(DebugConfigurationManager);
 
-  // Patch for the debug hover: https://github.com/eclipse-theia/theia/pull/9256/
-  rebind(DebugEditorModelFactory)
-    .toDynamicValue(
-      ({ container }) =>
-        <DebugEditorModelFactory>(
-          ((editor) => DebugEditorModel.createModel(container, editor))
-        )
-    )
-    .inSingletonScope();
-
   // Preferences
   bindArduinoPreferences(bind);
 
diff --git a/arduino-ide-extension/src/browser/theia/debug/debug-editor-model.ts b/arduino-ide-extension/src/browser/theia/debug/debug-editor-model.ts
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
@@ -154,7 +154,9 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
           try {
             // If we forked the process for the clusters, we need to manually terminate it.
             // See: https://github.com/eclipse-theia/theia/issues/835
-            process.kill(backendProcess.pid);
+            if (backendProcess.pid) {
+              process.kill(backendProcess.pid);
+            }
           } catch (e) {
             if (e.code === 'ESRCH') {
               console.log(
diff --git a/arduino-ide-extension/tsconfig.json b/arduino-ide-extension/tsconfig.json
@@ -26,7 +26,7 @@
     "src"
   ],
   "files": [
-    "../node_modules/@theia/core/src/typings/nsfw/index.d.ts",
+    "../node_modules/nsfw/index.d.ts",
     "../node_modules/@theia/monaco/src/typings/monaco/index.d.ts"
   ]
 }
diff --git a/browser-app/package.json b/browser-app/package.json
@@ -4,25 +4,25 @@
   "version": "2.0.0-beta.11",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@theia/core": "next",
-    "@theia/debug": "next",
-    "@theia/editor": "next",
-    "@theia/file-search": "next",
-    "@theia/filesystem": "next",
-    "@theia/keymaps": "next",
-    "@theia/messages": "next",
-    "@theia/monaco": "next",
-    "@theia/navigator": "next",
-    "@theia/plugin-ext": "next",
-    "@theia/plugin-ext-vscode": "next",
-    "@theia/preferences": "next",
-    "@theia/process": "next",
-    "@theia/terminal": "next",
-    "@theia/workspace": "next",
+    "@theia/core": "1.13.0",
+    "@theia/debug": "1.13.0",
+    "@theia/editor": "1.13.0",
+    "@theia/file-search": "1.13.0",
+    "@theia/filesystem": "1.13.0",
+    "@theia/keymaps": "1.13.0",
+    "@theia/messages": "1.13.0",
+    "@theia/monaco": "1.13.0",
+    "@theia/navigator": "1.13.0",
+    "@theia/plugin-ext": "1.13.0",
+    "@theia/plugin-ext-vscode": "1.13.0",
+    "@theia/preferences": "1.13.0",
+    "@theia/process": "1.13.0",
+    "@theia/terminal": "1.13.0",
+    "@theia/workspace": "1.13.0",
     "arduino-ide-extension": "2.0.0-beta.11"
   },
   "devDependencies": {
-    "@theia/cli": "next"
+    "@theia/cli": "1.13.0"
   },
   "scripts": {
     "prepare": "theia build --mode development",
diff --git a/electron-app/package.json b/electron-app/package.json
@@ -5,26 +5,26 @@
   "license": "AGPL-3.0-or-later",
   "main": "src-gen/frontend/electron-main.js",
   "dependencies": {
-    "@theia/core": "next",
-    "@theia/debug": "next",
-    "@theia/editor": "next",
-    "@theia/electron": "next",
-    "@theia/file-search": "next",
-    "@theia/filesystem": "next",
-    "@theia/keymaps": "next",
-    "@theia/messages": "next",
-    "@theia/monaco": "next",
-    "@theia/navigator": "next",
-    "@theia/plugin-ext": "next",
-    "@theia/plugin-ext-vscode": "next",
-    "@theia/preferences": "next",
-    "@theia/process": "next",
-    "@theia/terminal": "next",
-    "@theia/workspace": "next",
+    "@theia/core": "1.13.0",
+    "@theia/debug": "1.13.0",
+    "@theia/editor": "1.13.0",
+    "@theia/electron": "1.13.0",
+    "@theia/file-search": "1.13.0",
+    "@theia/filesystem": "1.13.0",
+    "@theia/keymaps": "1.13.0",
+    "@theia/messages": "1.13.0",
+    "@theia/monaco": "1.13.0",
+    "@theia/navigator": "1.13.0",
+    "@theia/plugin-ext": "1.13.0",
+    "@theia/plugin-ext-vscode": "1.13.0",
+    "@theia/preferences": "1.13.0",
+    "@theia/process": "1.13.0",
+    "@theia/terminal": "1.13.0",
+    "@theia/workspace": "1.13.0",
     "arduino-ide-extension": "2.0.0-beta.11"
   },
   "devDependencies": {
-    "@theia/cli": "next"
+    "@theia/cli": "1.13.0"
   },
   "scripts": {
     "prepare": "theia build --mode development",
diff --git a/electron/build/template-package.json b/electron/build/template-package.json
@@ -9,7 +9,7 @@
     "node-log-rotate": "^0.1.5"
   },
   "devDependencies": {
-    "@theia/cli": "next",
+    "@theia/cli": "1.13.0",
     "cross-env": "^7.0.2",
     "electron-builder": "22.7.0",
     "electron-notarize": "^0.3.0",
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "node": ">=12.14.1 <13"
   },
   "devDependencies": {
-    "@theia/cli": "next",
+    "@theia/cli": "1.13.0",
     "@typescript-eslint/eslint-plugin": "^4.27.0",
     "@typescript-eslint/parser": "^4.27.0",
     "cross-env": "^7.0.2",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"src"`
`27`	`27`	`],`
`28`	`28`	`"files": [`
`29`		`- "../node_modules/@theia/core/src/typings/nsfw/index.d.ts",`
	`29`	`+ "../node_modules/nsfw/index.d.ts",`
`30`	`30`	`"../node_modules/@theia/monaco/src/typings/monaco/index.d.ts"`
`31`	`31`	`]`
`32`	`32`	`}`