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

[Scheduled] Update to the upstream

.github/workflows/check-theia-branch.yml

@@ -31,7 +31,7 @@ jobs:
     - uses: actions/setup-node@v1
       name: Configuring nodejs 12.x version
       with:
-        node-version: '12.x'
+        node-version: '14.x'
     - name: build
       run: |
         docker image prune -a -f

.github/workflows/happy-path-tests.yaml

@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-node@v1
         name: Configuring nodejs 12.x version
         with:
-          node-version: '12.x'
+          node-version: '14.x'
       - name: build
         run: |
           docker image prune -a -f

.github/workflows/next-build.yml

@@ -24,7 +24,7 @@ jobs:
     - uses: actions/setup-node@v1
       name: Configuring nodejs 12.x version
       with:
-        node-version: '12.x'
+        node-version: '14.x'
     - name: Login to docker.io
       uses: docker/login-action@v1
       with:

.github/workflows/pr-build.yml

@@ -25,7 +25,7 @@ jobs:
     - uses: actions/setup-node@v1
       name: Configuring nodejs 10.x version
       with:
-        node-version: '12.x'
+        node-version: '14.x'
     - name: build
       run: yarn
     - name: Test Coverage
@@ -41,7 +41,7 @@ jobs:
     - uses: actions/setup-node@v1
       name: Configuring nodejs 10.x version
       with:
-        node-version: '12.x'
+        node-version: '14.x'
     - name: build
       run: |
         docker image prune -a -f

.github/workflows/publish-built-in-extension-report.yaml

@@ -25,7 +25,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: '12'
+        node-version: '14.x'
     - name: Get current time
       uses: 1466587594/get-current-time@v1
       id: current-date-time

.github/workflows/release.yml

@@ -53,7 +53,7 @@ jobs:
     - uses: actions/setup-node@v1
       name: Configuring nodejs 12.x version
       with:
-        node-version: '12.x'
+        node-version: '14.x'
     - name: Login to docker.io
       uses: docker/login-action@v1
       with:

dockerfiles/theia-dev/docker/alpine/builder-image-from.dockerfile

@@ -1 +1 @@
-FROM node:12.20.1-alpine3.12
+FROM node:14.19.0-alpine3.15

dockerfiles/theia-dev/docker/ubi8/builder-image-from.dockerfile

@@ -1,2 +1,2 @@
-# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-12
-FROM registry.access.redhat.com/ubi8/nodejs-12:1-107
+# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-14
+FROM registry.access.redhat.com/ubi8/nodejs-14:1-63

dockerfiles/theia-endpoint-runtime-binary/Dockerfile

@@ -22,7 +22,7 @@ ENV PATH=${HOME}/.yarn/bin:${PATH}
 #{INCLUDE:docker/${BUILD_IMAGE_TARGET}/builder-nexe-setup.dockerfile}
 
 RUN /tmp/nexe/index.js -v && \
-    # Build remote binary with node runtime 12.x and che-theia node dependencies. nexe icludes to the binary only
+    # Build remote binary with node runtime 14.x and che-theia node dependencies. nexe icludes to the binary only
     # necessary dependencies.
     eval /tmp/nexe/index.js -i node_modules/@eclipse-che/theia-remote/lib/node/plugin-remote.js ${NEXE_FLAGS} -o ${HOME}/plugin-remote-endpoint
 

dockerfiles/theia-endpoint-runtime-binary/docker/alpine/builder-from.dockerfile

@@ -1,2 +1,2 @@
-FROM quay.io/eclipse/che-custom-nodejs-deasync:12.20.1 as custom-nodejs
+FROM quay.io/eclipse/che-custom-nodejs-deasync:14.19.0 as custom-nodejs
 FROM ${BUILD_ORGANIZATION}/${BUILD_PREFIX}-theia:${BUILD_TAG} as builder

dockerfiles/theia-endpoint-runtime-binary/docker/alpine/builder-setup.dockerfile

@@ -1,3 +1,3 @@
-ENV NEXE_FLAGS="--target 'alpine-x64-12' --temp /tmp/nexe-cache"
+ENV NEXE_FLAGS="--target 'alpine-x64-14' --temp /tmp/nexe-cache"
 
-COPY --from=custom-nodejs /alpine-x64-12 /tmp/nexe-cache/alpine-x64-12
+COPY --from=custom-nodejs /alpine-x64-14 /tmp/nexe-cache/alpine-x64-14

dockerfiles/theia-endpoint-runtime-binary/docker/ubi8/builder-from.dockerfile

@@ -1,2 +1,2 @@
-FROM quay.io/eclipse/che-custom-nodejs-deasync:12.20.1 as custom-nodejs
+FROM quay.io/eclipse/che-custom-nodejs-deasync:14.19.0 as custom-nodejs
 FROM ${BUILD_ORGANIZATION}/${BUILD_PREFIX}-theia:${BUILD_TAG} as builder

dockerfiles/theia-endpoint-runtime-binary/docker/ubi8/builder-setup.dockerfile

@@ -1,5 +1,5 @@
-ENV NEXE_FLAGS="--target 'alpine-x64-12' --temp /tmp/nexe-cache"
+ENV NEXE_FLAGS="--target 'alpine-x64-14' --temp /tmp/nexe-cache"
 
-COPY --from=custom-nodejs /alpine-x64-12 /tmp/nexe-cache/alpine-x64-12
+COPY --from=custom-nodejs /alpine-x64-14 /tmp/nexe-cache/alpine-x64-14
 
 USER root

dockerfiles/theia-endpoint-runtime-binary/docker/ubi8/runtime-from.dockerfile

@@ -1,5 +1,5 @@
 # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
-FROM registry.access.redhat.com/ubi8-minimal:8.5-230 as runtime
+FROM registry.access.redhat.com/ubi8-minimal:8.5-230.1645809059 as runtime
 USER 0
 RUN microdnf -y install yum python38 python38-pyyaml jq && python3 --version && \
     yum -y -q update && \

dockerfiles/theia-endpoint-runtime-binary/test.Dockerfile

@@ -9,7 +9,7 @@
 #   Red Hat, Inc. - initial API and implementation
 
 # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
-FROM registry.access.redhat.com/ubi8-minimal:8.5-230 as runtime
+FROM registry.access.redhat.com/ubi8-minimal:8.5-230.1645809059 as runtime
 
 RUN microdnf install -y python38 jq && pip3 install yq
 COPY /src/ /tests/src

dockerfiles/theia/docker/alpine/build-result-from.dockerfile

@@ -1 +1 @@
-FROM node:12.20.1-alpine3.12 as build-result
+FROM node:14.19.0-alpine3.15 as build-result

dockerfiles/theia/docker/alpine/runtime-from.dockerfile

@@ -1 +1 @@
-FROM node:12.20.1-alpine3.12 as runtime
+FROM node:14.19.0-alpine3.15 as runtime

dockerfiles/theia/docker/ubi8/build-result-from.dockerfile

@@ -1,3 +1,3 @@
-# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-12
-FROM registry.access.redhat.com/ubi8/nodejs-12:1-107 as build-result
+# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-14
+FROM registry.access.redhat.com/ubi8/nodejs-14:1-63 as build-result
 USER root

dockerfiles/theia/docker/ubi8/runtime-from.dockerfile

@@ -1,2 +1,2 @@
-# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-12
-FROM registry.access.redhat.com/ubi8/nodejs-12:1-107 as runtime
+# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-14
+FROM registry.access.redhat.com/ubi8/nodejs-14:1-63 as runtime

generator/src/init.ts

@@ -101,6 +101,10 @@ export class Init {
                 }
             })
         );
+        // make theia minimum version nodejs 12 or higher
+        if (theiaPackage.engines) {
+            theiaPackage.engines.node = '>=12.14.1';
+        }
         // grab all prettier, eslint stuff
         theiaPackage.prettier = prettierConfiguration;
         theiaPackage.importSort = importSortConfiguration;

package.json

@@ -2,7 +2,7 @@
   "name": "root",
   "private": true,
   "engines": {
-    "node": ">=10.11.0 <13"
+    "node": ">=12.14.1"
   },
   "devDependencies": {
     "@types/jest": "27.0.2",