Merge pull request #143 from PizzaFactory/prp-update-to-the-upstream

[Scheduled] Update to the upstream
PizzaFactory · Mar 13, 2022 · 1017fb6 · 1017fb6
2 parents 5b45873 + 2df22b6
commit 1017fb6
Show file tree

Hide file tree

Showing 33 changed files with 84 additions and 380 deletions.
diff --git a/extensions/che-theia-hosted-plugin-manager-extension/package.json b/extensions/che-theia-hosted-plugin-manager-extension/package.json
@@ -10,9 +10,9 @@
   ],
   "dependencies": {
     "inversify": "^5.0.1",
-    "@theia/core": "next",
-    "@theia/plugin-dev": "next",
-    "@theia/plugin-ext": "next",
+    "@theia/core": "1.18.0-next.120",
+    "@theia/plugin-dev": "1.18.0-next.120",
+    "@theia/plugin-ext": "1.18.0-next.120",
     "@eclipse-che/theia-remote-api": "^0.0.1"
   },
   "devDependencies": {

diff --git a/extensions/eclipse-che-theia-about/package.json b/extensions/eclipse-che-theia-about/package.json
@@ -7,8 +7,8 @@
   "description": "Eclipse Che - Theia About menu",
   "dependencies": {
     "inversify": "^5.0.1",
-    "@theia/core": "next",
-    "@theia/mini-browser": "next",
+    "@theia/core": "1.18.0-next.120",
+    "@theia/mini-browser": "1.18.0-next.120",
     "@eclipse-che/theia-plugin-ext": "^0.0.1",
     "react": "^16.8.0"
   },

diff --git a/extensions/eclipse-che-theia-activity-tracker/package.json b/extensions/eclipse-che-theia-activity-tracker/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "inversify": "^5.0.1",
     "@eclipse-che/theia-remote-api": "^0.0.1",
-    "@theia/core": "next",
+    "@theia/core": "1.18.0-next.120",
     "@eclipse-che/theia-plugin-ext": "^0.0.1"
   },
   "devDependencies": {

diff --git a/extensions/eclipse-che-theia-cli-endpoint/package.json b/extensions/eclipse-che-theia-cli-endpoint/package.json
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "inversify": "^5.0.1",
-    "@theia/core": "next",
+    "@theia/core": "1.18.0-next.120",
     "@eclipse-che/theia-messaging": "0.0.1"
   },
   "devDependencies": {

diff --git a/extensions/eclipse-che-theia-credentials/package.json b/extensions/eclipse-che-theia-credentials/package.json
@@ -7,7 +7,7 @@
   "description": "Eclipse Che - Theia credentials",
   "dependencies": {
     "inversify": "^5.0.1",
-    "@theia/core": "next",
+    "@theia/core": "1.18.0-next.120",
     "@kubernetes/client-node": "^0.12.1",
     "@eclipse-che/theia-remote-impl-che-server": "0.0.1"
   },

diff --git a/extensions/eclipse-che-theia-dashboard/package.json b/extensions/eclipse-che-theia-dashboard/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "inversify": "^5.0.1",
     "@eclipse-che/api": "latest",
-    "@theia/core": "next",
-    "@theia/plugin-ext": "next",
+    "@theia/core": "1.18.0-next.120",
+    "@theia/plugin-ext": "1.18.0-next.120",
     "@eclipse-che/theia-remote-api": "^0.0.1"
   },
   "devDependencies": {

diff --git a/extensions/eclipse-che-theia-file-sync-tracker/package.json b/extensions/eclipse-che-theia-file-sync-tracker/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "inversify": "^5.0.1",
     "reconnecting-websocket": "^4.4.0",
-    "@theia/core": "next",
+    "@theia/core": "1.18.0-next.120",
     "@eclipse-che/theia-remote-api": "^0.0.1"
   },
   "devDependencies": {

diff --git a/extensions/eclipse-che-theia-git-provisioner/package.json b/extensions/eclipse-che-theia-git-provisioner/package.json
@@ -16,8 +16,8 @@
     "fs-extra": "7.0.1",
     "@eclipse-che/theia-remote-api": "^0.0.1",
     "@eclipse-che/theia-plugin-ext": "^0.0.1",
-    "@theia/core": "next",
-    "@theia/preferences": "next",
+    "@theia/core": "1.18.0-next.120",
+    "@theia/preferences": "1.18.0-next.120",
     "ini": "^1.3.5",
     "nsfw": "^2.1.2",
     "@eclipse-che/theia-user-preferences-synchronizer": "0.0.1"

diff --git a/extensions/eclipse-che-theia-logging/package.json b/extensions/eclipse-che-theia-logging/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "moment": "^2.21.0",
-    "@theia/core": "next",
+    "@theia/core": "1.18.0-next.120",
     "inversify": "^5.0.1"
   },
   "license": "EPL-2.0",

diff --git a/extensions/eclipse-che-theia-messaging/package.json b/extensions/eclipse-che-theia-messaging/package.json
@@ -9,7 +9,7 @@
     "inversify": "^5.0.1",
     "@eclipse-che/theia-remote-api": "^0.0.1",
     "ws": "^7.1.2",
-    "@theia/core": "next",
+    "@theia/core": "1.18.0-next.120",
     "@eclipse-che/theia-plugin-ext": "^0.0.1"
   },
   "devDependencies": {

diff --git a/extensions/eclipse-che-theia-mini-browser/package.json b/extensions/eclipse-che-theia-mini-browser/package.json
@@ -7,8 +7,8 @@
   "description": "Customizations of Theia mini-browser for Eclipse Che",
   "dependencies": {
     "inversify": "^5.0.1",
-    "@theia/core": "next",
-    "@theia/mini-browser": "next",
+    "@theia/core": "1.18.0-next.120",
+    "@theia/mini-browser": "1.18.0-next.120",
     "@eclipse-che/theia-remote-api": "^0.0.1",
     "@eclipse-che/theia-plugin-ext": "^0.0.1"
   },

diff --git a/extensions/eclipse-che-theia-plugin-ext/package.json b/extensions/eclipse-che-theia-plugin-ext/package.json
@@ -20,16 +20,16 @@
     "@phosphor/widgets": "1",
     "@phosphor/commands": "1",
     "vscode-languageserver-types": "^3.15.1",
-    "@theia/variable-resolver": "next",
+    "@theia/variable-resolver": "1.18.0-next.120",
     "@eclipse-che/plugin": "0.0.1",
-    "@theia/terminal": "next",
-    "@theia/core": "next",
-    "@theia/debug": "next",
-    "@theia/filesystem": "next",
-    "@theia/task": "next",
-    "@theia/mini-browser": "next",
-    "@theia/plugin-ext": "next",
-    "@theia/application-package": "next",
+    "@theia/terminal": "1.18.0-next.120",
+    "@theia/core": "1.18.0-next.120",
+    "@theia/debug": "1.18.0-next.120",
+    "@theia/filesystem": "1.18.0-next.120",
+    "@theia/task": "1.18.0-next.120",
+    "@theia/mini-browser": "1.18.0-next.120",
+    "@theia/plugin-ext": "1.18.0-next.120",
+    "@theia/application-package": "1.18.0-next.120",
     "axios": "0.21.2",
     "tunnel": "0.0.6",
     "vscode-uri": "2.1.1",

diff --git a/extensions/eclipse-che-theia-plugin-remote/package.json b/extensions/eclipse-che-theia-plugin-remote/package.json
@@ -14,10 +14,10 @@
     "fs-extra": "7.0.1",
     "reflect-metadata": "^0.1.13",
     "ws": "^5.1.2",
-    "@theia/filesystem": "next",
-    "@theia/core": "next",
-    "@theia/plugin-ext": "next",
-    "@theia/plugin-ext-vscode": "next",
+    "@theia/filesystem": "1.18.0-next.120",
+    "@theia/core": "1.18.0-next.120",
+    "@theia/plugin-ext": "1.18.0-next.120",
+    "@theia/plugin-ext-vscode": "1.18.0-next.120",
     "deasync": "^0.1.19",
     "vscode-uri": "2.1.1",
     "@eclipse-che/theia-plugin-ext": "^0.0.1"

diff --git a/extensions/eclipse-che-theia-preferences-provider-extension/package.json b/extensions/eclipse-che-theia-preferences-provider-extension/package.json
@@ -11,13 +11,13 @@
   ],
   "dependencies": {
     "inversify": "^5.0.1",
-    "@theia/application-package": "next",
+    "@theia/application-package": "1.18.0-next.120",
     "@eclipse-che/theia-remote-api": "^0.0.1",
     "@eclipse-che/api": "latest",
     "@eclipse-che/theia-plugin-ext": "^0.0.1",
-    "@theia/core": "next",
-    "@theia/preferences": "next",
-    "@theia/workspace": "next"
+    "@theia/core": "1.18.0-next.120",
+    "@theia/preferences": "1.18.0-next.120",
+    "@theia/workspace": "1.18.0-next.120"
   },
   "devDependencies": {
     "ts-jest": "27.0.7",

diff --git a/extensions/eclipse-che-theia-remote-api/package.json b/extensions/eclipse-che-theia-remote-api/package.json
@@ -13,7 +13,7 @@
   ],
   "dependencies": {
     "@kubernetes/client-node": "^0.12.1",
-    "@theia/core": "next",
+    "@theia/core": "1.18.0-next.120",
     "js-yaml": "3.13.1",
     "inversify": "^5.0.1"
   },

diff --git a/extensions/eclipse-che-theia-remote-impl-che-server/package.json b/extensions/eclipse-che-theia-remote-impl-che-server/package.json
@@ -16,7 +16,7 @@
     "inversify": "^5.0.1",
     "request": "2.88.2",
     "tunnel": "0.0.6",
-    "@theia/core": "next",
+    "@theia/core": "1.18.0-next.120",
     "fs-extra": "7.0.1",
     "js-yaml": "3.13.1",
     "@eclipse-che/workspace-telemetry-client": "latest",

diff --git a/extensions/eclipse-che-theia-remote-impl-k8s/package.json b/extensions/eclipse-che-theia-remote-impl-k8s/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "tunnel": "0.0.6",
     "inversify": "^5.0.1",
-    "@theia/core": "next",
+    "@theia/core": "1.18.0-next.120",
     "fs-extra": "7.0.1",
     "js-yaml": "3.13.1",
     "axios": "0.21.2",

diff --git a/extensions/eclipse-che-theia-terminal/package.json b/extensions/eclipse-che-theia-terminal/package.json
@@ -20,10 +20,10 @@
   ],
   "dependencies": {
     "inversify": "^5.0.1",
-    "@theia/output": "next",
-    "@theia/core": "next",
+    "@theia/output": "1.18.0-next.120",
+    "@theia/core": "1.18.0-next.120",
     "vscode-jsonrpc": "^5.0.0",
-    "@theia/terminal": "next",
+    "@theia/terminal": "1.18.0-next.120",
     "xterm": "^4.11.0",
     "@phosphor/widgets": "1",
     "reconnecting-websocket": "^4.2.0",

diff --git a/extensions/eclipse-che-theia-user-preferences/package.json b/extensions/eclipse-che-theia-user-preferences/package.json
@@ -15,11 +15,11 @@
     "inversify": "^5.0.1",
     "fs-extra": "7.0.1",
     "@eclipse-che/theia-remote-api": "^0.0.1",
-    "@theia/core": "next",
-    "@theia/filesystem": "next",
-    "@theia/workspace": "next",
+    "@theia/core": "1.18.0-next.120",
+    "@theia/filesystem": "1.18.0-next.120",
+    "@theia/workspace": "1.18.0-next.120",
     "nsfw": "^2.1.2",
-    "@theia/preferences": "next",
+    "@theia/preferences": "1.18.0-next.120",
     "@eclipse-che/theia-plugin-ext": "^0.0.1",
     "@kubernetes/client-node": "^0.12.1",
     "@eclipse-che/theia-remote-impl-che-server": "0.0.1"

diff --git a/extensions/eclipse-che-theia-workspace/package.json b/extensions/eclipse-che-theia-workspace/package.json
@@ -12,11 +12,11 @@
     "inversify": "^5.0.1",
     "fs-extra": "7.0.1",
     "moment": "2.24.0",
-    "@theia/filesystem": "next",
-    "@theia/navigator": "next",
-    "@theia/core": "next",
+    "@theia/filesystem": "1.18.0-next.120",
+    "@theia/navigator": "1.18.0-next.120",
+    "@theia/core": "1.18.0-next.120",
     "@eclipse-che/api": "latest",
-    "@theia/workspace": "next",
+    "@theia/workspace": "1.18.0-next.120",
     "@eclipse-che/theia-remote-api": "^0.0.1",
     "js-yaml": "3.13.1",
     "react": "^16.8.0"

diff --git a/make-release.sh b/make-release.sh
@@ -97,7 +97,7 @@ apply_files_edits () {
 
     # set the variables for building the images
     sed_in_place -e "s/IMAGE_TAG=\"..*\"/IMAGE_TAG=\"latest\"/" build.include
-    if [ -z "${BUILD_INCLUDE_THEIA_COMMIT_SHA}"]; then
+    if [ -z "${BUILD_INCLUDE_THEIA_COMMIT_SHA}" ]; then
       BUILD_INCLUDE_THEIA_COMMIT_SHA=$(curl -sSL https://registry.npmjs.org/@theia/core/"${THEIA_VERSION}" | jq -r '.gitHead')
       sed_in_place -e "s/^THEIA_COMMIT_SHA=$/THEIA_COMMIT_SHA=\"${BUILD_INCLUDE_THEIA_COMMIT_SHA}\"/" build.include
     fi
@@ -126,7 +126,9 @@ apply_files_edits () {
       sed_in_place -r -e "s/(\"@eclipse-che\/api\": )(\"latest\")/\1\"$API_DTO_VERSION\"/" ${PACKAGE_JSON}
     done
 
-    sed_in_place -e '$ a RUN cd ${HOME} \&\& tar zcf ${HOME}/theia-source-code.tgz theia-source-code' dockerfiles/theia/docker/ubi8/builder-clone-theia.dockerfile
+    if [[ $(grep 'RUN cd ${HOME} && tar zcf ${HOME}/theia-source-code.tgz theia-source-code' dockerfiles/theia/docker/ubi8/builder-clone-theia.dockerfile || true) != "" ]]; then
+      sed_in_place -e '$ a RUN cd ${HOME} \&\& tar zcf ${HOME}/theia-source-code.tgz theia-source-code' dockerfiles/theia/docker/ubi8/builder-clone-theia.dockerfile
+    fi
   fi
 }
 

diff --git a/plugins/containers-plugin/package.json b/plugins/containers-plugin/package.json
@@ -33,7 +33,7 @@
     }
   },
   "devDependencies": {
-    "@theia/plugin": "next",
+    "@theia/plugin": "1.18.0-next.120",
     "@theia/plugin-packager": "latest",
     "@eclipse-che/plugin": "0.0.1",
     "ts-jest": "27.0.7",

diff --git a/plugins/ext-plugin/package.json b/plugins/ext-plugin/package.json
@@ -16,7 +16,7 @@
   "dependencies": {},
   "devDependencies": {
     "@eclipse-che/plugin": "latest",
-    "@theia/plugin": "next",
+    "@theia/plugin": "1.18.0-next.120",
     "@theia/plugin-packager": "latest",
     "ts-jest": "27.0.7",
     "jest": "27.3.1"

diff --git a/plugins/github-auth-plugin/package.json b/plugins/github-auth-plugin/package.json
@@ -17,7 +17,7 @@
     "uuid": "^3.1.0"
   },
   "devDependencies": {
-    "@theia/plugin": "next",
+    "@theia/plugin": "1.22.0-next.27+c56aa230fe5",
     "@theia/plugin-packager": "latest",
     "@eclipse-che/plugin": "0.0.1",
     "ts-jest": "27.0.7",

diff --git a/plugins/ports-plugin/package.json b/plugins/ports-plugin/package.json
@@ -108,7 +108,7 @@
   "dependencies": {},
   "devDependencies": {
     "@eclipse-che/plugin": "0.0.1",
-    "@theia/plugin": "next",
+    "@theia/plugin": "1.18.0-next.120",
     "@theia/plugin-packager": "latest",
     "ts-jest": "27.0.7",
     "jest": "27.3.1"

diff --git a/plugins/recommendations-plugin/package.json b/plugins/recommendations-plugin/package.json
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "@eclipse-che/plugin": "0.0.1",
-    "@theia/plugin": "next",
+    "@theia/plugin": "1.18.0-next.120",
     "inversify": "^5.0.1",
     "reflect-metadata": "^0.1.13"
   },

diff --git a/plugins/resource-monitor-plugin/package.json b/plugins/resource-monitor-plugin/package.json
@@ -16,7 +16,7 @@
   "devDependencies": {
     "@eclipse-che/plugin": "0.0.1",
     "@theia/plugin-packager": "latest",
-    "@theia/plugin": "next",
+    "@theia/plugin": "1.18.0-next.120",
     "ts-jest": "27.0.7",
     "jest": "27.3.1"
   },

diff --git a/plugins/ssh-plugin/package.json b/plugins/ssh-plugin/package.json
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@eclipse-che/plugin": "0.0.1",
-    "@theia/plugin": "next",
+    "@theia/plugin": "1.18.0-next.120",
     "@theia/plugin-packager": "latest",
     "ts-jest": "27.0.7",
     "jest": "27.3.1"

diff --git a/plugins/task-plugin/package.json b/plugins/task-plugin/package.json
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@eclipse-che/plugin": "0.0.1",
-    "@theia/plugin": "next",
+    "@theia/plugin": "1.18.0-next.120",
     "@theia/plugin-packager": "latest",
     "ts-jest": "27.0.7",
     "jest": "27.3.1"

diff --git a/plugins/telemetry-plugin/package.json b/plugins/telemetry-plugin/package.json
@@ -14,7 +14,7 @@
     "*"
   ],
   "devDependencies": {
-    "@theia/plugin": "next",
+    "@theia/plugin": "1.18.0-next.120",
     "@theia/plugin-packager": "latest",
     "@eclipse-che/plugin": "0.0.1",
     "ts-jest": "27.0.7",

diff --git a/plugins/welcome-plugin/package.json b/plugins/welcome-plugin/package.json
@@ -31,7 +31,7 @@
     "@fortawesome/fontawesome-free": "5.6.3"
   },
   "devDependencies": {
-    "@theia/plugin": "next",
+    "@theia/plugin": "1.18.0-next.120",
     "@theia/plugin-packager": "latest",
     "@eclipse-che/plugin": "0.0.1",
     "ts-jest": "27.0.7",

diff --git a/plugins/workspace-plugin/package.json b/plugins/workspace-plugin/package.json
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@eclipse-che/plugin": "0.0.1",
-    "@theia/plugin": "next",
+    "@theia/plugin": "1.18.0-next.120",
     "@theia/plugin-packager": "latest",
     "ts-jest": "27.0.7",
     "jest": "27.3.1"