Merge remote-tracking branch 'eclipse/main' into alignment-with-upstream-1-101

Author: RomanNikitenko

.rebase/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.
 
+#### @sbouchet
+https://github.com/che-incubator/che-code/pull/563
+
+- code/package.json
+---
+
+#### @sbouchet
+https://github.com/che-incubator/che-code/pull/566
+
+- code/remote/package.json
+---
 
 #### @sbouchet
 https://github.com/che-incubator/che-code/pull/561

.rebase/add/code/remote/package.json

@@ -7,6 +7,9 @@
     "overrides": {
         "prebuild-install": {
             "tar-fs": "2.1.3"
+        },
+        "request": {
+            "form-data": "2.5.5"
         }
     }
 }

.rebase/override/code/package.json

@@ -2,6 +2,7 @@
     "name": "che-code",
     "bin": "out/vs/server/main.js",
     "devDependencies": {
-      "@vscode/l10n-dev": "0.0.18"
+      "@vscode/l10n-dev": "0.0.18",
+      "@vscode/gulp-electron": "^1.38.2"
     }
 }

code/extensions/che-api/package-lock.json

@@ -50,7 +50,10 @@
     "webpack-node-externals": "^3.0.0"
   },
   "overrides": {
-    "jsonpath-plus": "10.1.0"
+    "jsonpath-plus": "10.1.0",
+    "request": {
+      "form-data": "2.5.5"
+    }
   },
   "repository": {
     "type": "git",