update node to 18.17.1 (#18525)

* update node to 18.17.1

* use new dev image

* fix webpack in supervisor-frontend

* bump webpack to 5.88.2 in dashboard

* streamline webpack versions

* Fix craco config

* streamline eslint versions

* Update eslint config and disable for now

* Enable eslint again

* Update vscode-jsonrpc for browser implementation

* Polyfill setimmeadiate

* Remove NODE_OPTIONS env var from supervisor front end scripts

* Fix css

* Fix css 2

* Fix checkboxchecked

* Add comment

* Fix yarn.lock

---------

Co-authored-by: Jean Pierre <[email protected]>

Author: AlexTugarev

.github/actions/delete-preview/Dockerfile

@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

.github/actions/deploy-gitpod/Dockerfile

@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

.github/actions/deploy-monitoring-satellite/Dockerfile

@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

.github/actions/preview-create/Dockerfile

@@ -1,4 +1,4 @@
-FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

.github/workflows/build.yml

@@ -97,7 +97,7 @@ jobs:
       cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
     outputs:
       previewctl_hash: ${{ steps.build.outputs.previewctl_hash }}
     steps:
@@ -156,7 +156,7 @@ jobs:
         ports:
           - 6379:6379
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
       env:
         DB_HOST: "mysql"
         DB_PORT: "23306"
@@ -396,7 +396,7 @@ jobs:
       - create-runner
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
     if: needs.configuration.outputs.with_integration_tests != ''
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && github.run_id || github.sha }}-integration-test

.github/workflows/code-nightly.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ needs.create-runner.outputs.label }}
     needs: [create-runner]
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup-environment

.github/workflows/ide-integration-tests.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ needs.create-runner.outputs.label }}
     needs: [create-runner]
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
     outputs:
       name: ${{ steps.configuration.outputs.name }}
       version: ${{ steps.configuration.outputs.version }}
@@ -100,7 +100,7 @@ jobs:
     needs: [configuration, infrastructure, create-runner]
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
       volumes:
         - /var/tmp:/var/tmp
         - /tmp:/tmp

.github/workflows/lacework-inline-scanner.yml

@@ -51,7 +51,7 @@ jobs:
     needs: [configuration,create-runner]
     if: ${{ needs.configuration.outputs.skip == 'false' }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
     steps:
       # Most of this is taken over from the Build workflow/preview-env-check-regressions workflow
       - uses: actions/checkout@v3

.github/workflows/preview-env-check-regressions.yml

@@ -85,7 +85,7 @@ jobs:
     if: ${{ needs.configuration.outputs.skip == 'false' }}
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
       volumes:
         - /var/tmp:/var/tmp
         - /tmp:/tmp

.github/workflows/preview-env-gc.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ needs.create-runner.outputs.label }}
     needs: [create-runner]
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
     outputs:
       names: ${{ steps.set-matrix.outputs.names }}
       count: ${{ steps.set-matrix.outputs.count }}

.github/workflows/workspace-integration-tests.yml

@@ -45,7 +45,7 @@ jobs:
     runs-on: ${{ needs.create-runner.outputs.label }}
     needs: [create-runner]
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
     outputs:
       name: ${{ steps.configuration.outputs.name }}
       version: ${{ steps.configuration.outputs.version }}
@@ -135,7 +135,7 @@ jobs:
     needs: [configuration, infrastructure, create-runner]
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
     steps:
       - uses: actions/checkout@v3
       - id: auth
@@ -166,7 +166,7 @@ jobs:
     if: inputs.skip_delete != 'true' && always()
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
     steps:
       - uses: actions/checkout@v3
       - name: Delete preview environment

.gitpod.yml

@@ -1,4 +1,4 @@
-image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-oci-tool-gha.14121
+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
 workspaceLocation: gitpod/gitpod-ws.code-workspace
 checkoutLocation: gitpod
 ports:

components/dashboard/.eslintrc.js

@@ -6,7 +6,7 @@
 
 module.exports = {
     root: true,
-    extends: ["react-app"],
+    extends: ["react-app", "react-app/jest"],
     rules: {
         "import/no-anonymous-default-export": "error",
         "react/jsx-no-constructed-context-values": "error",

components/dashboard/craco.config.js

@@ -4,11 +4,47 @@
  * See License.AGPL.txt in the project root for license information.
  */
 const { when } = require("@craco/craco");
+const webpack = require("webpack");
 
 module.exports = {
     style: {
         postcss: {
-            plugins: [require("tailwindcss"), require("autoprefixer")],
+            mode: "file",
+        },
+    },
+    eslint: {
+        mode: "file",
+    },
+    webpack: {
+        configure: {
+            resolve: {
+                fallback: {
+                    crypto: require.resolve("crypto-browserify"),
+                    stream: require.resolve("stream-browserify"),
+                    url: require.resolve("url"),
+                    util: require.resolve("util"),
+                    net: false,
+                    path: false,
+                    fs: false,
+                    os: false,
+                },
+            },
+            module: {
+                rules: [
+                    {
+                        test: /\.m?js$/,
+                        resolve: {
+                            fullySpecified: false,
+                        },
+                    },
+                ],
+            },
+            plugins: [
+                new webpack.ProvidePlugin({
+                    process: "process/browser",
+                    Buffer: ["buffer", "Buffer"],
+                }),
+            ],
         },
     },
     ...when(process.env.GP_DEV_HOST && process.env.GP_DEV_COOKIE, () => ({

components/dashboard/package.json

@@ -39,12 +39,19 @@
     "react-router-dom": "^5.2.0",
     "validator": "^13.9.0",
     "xterm": "^4.11.0",
-    "xterm-addon-fit": "^0.5.0"
+    "xterm-addon-fit": "^0.5.0",
+    "crypto-browserify": "3.12.0",
+    "stream-browserify": "^2.0.1",
+    "url": "^0.11.1",
+    "util": "^0.11.1",
+    "buffer": "^4.3.0",
+    "process": "^0.11.10",
+    "setimmediate": "^1.0.5"
   },
   "devDependencies": {
-    "@craco/craco": "^6.1.2",
-    "@tailwindcss/forms": "^0.3.2",
-    "@tailwindcss/postcss7-compat": "^2.2.4",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@craco/craco": "^7.1.0",
+    "@tailwindcss/forms": "^0.5.5",
     "@testing-library/jest-dom": "^5.11.10",
     "@testing-library/react": "^11.2.6",
     "@testing-library/user-event": "^12.1.10",
@@ -58,18 +65,19 @@
     "@types/react-portal": "^4.0.4",
     "@types/react-router": "^5.1.13",
     "@types/react-router-dom": "^5.1.7",
+    "@types/setimmediate": "^1.0.2",
     "@types/uuid": "^8.3.1",
     "@types/validator": "^13.7.12",
-    "@typescript-eslint/eslint-plugin": "^4.21.0",
-    "@typescript-eslint/parser": "^4.21.0",
+    "@typescript-eslint/eslint-plugin": "^5.5.0",
+    "@typescript-eslint/parser": "^5.5.0",
     "@useorbital/client-types": "^1.6.0",
-    "autoprefixer": "^9.8.6",
-    "eslint": "^7.24.0",
-    "eslint-config-react-app": "^6.0.0",
-    "postcss": "^7.0.36",
-    "react-scripts": "^4.0.3",
+    "autoprefixer": "^10.4.15",
+    "eslint": "^8.47.0",
+    "eslint-config-react-app": "^7.0.1",
+    "postcss": "^8.4.28",
+    "react-scripts": "^5.0.1",
     "tailwind-underline-utils": "^1.1.2",
-    "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.4",
+    "tailwindcss": "^3.3.3",
     "tailwindcss-filters": "^3.0.0",
     "typescript": "~4.4.2",
     "web-vitals": "^1.1.1"
@@ -89,12 +97,6 @@
     "build",
     "public"
   ],
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
   "browserslist": {
     "production": [
       ">0.2%",

components/dashboard/postcss.config.js

@@ -4,9 +4,13 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-module.exports = {
+/** @type {import('postcss-load-config').Config} */
+const config = {
     plugins: {
+        "postcss-import": {},
         tailwindcss: {},
         autoprefixer: {},
     },
 };
+
+module.exports = config;

components/dashboard/src/components/forms/CheckboxInputField.tsx

@@ -70,7 +70,7 @@ export const CheckboxInputField: FC<CheckboxInputFieldProps> = ({
                         "h-4 w-4 mt-0.5 rounded cursor-pointer border-2 dark:filter-invert",
                         "focus:ring-2 ring-blue-400",
                         "border-gray-600 dark:border-gray-900 bg-transparent",
-                        { "bg-gray-600 dark:bg-gray-900": checked },
+                        "checked:bg-gray-600 dark:checked:bg-gray-900",
                     )}
                     id={elementId}
                     checked={checked}

components/dashboard/src/components/modal.css

@@ -4,6 +4,10 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
 @layer components {
     .gp-modal-footer-alert {
         margin-top: -1px;

components/dashboard/src/components/org-icon/styles.css

@@ -4,6 +4,9 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
 
 @layer components {
     .bg-gradient-1 {

components/dashboard/src/dedicated-setup/styles.css

@@ -4,6 +4,10 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
 @layer components {
     .honeycomb-bg {
         background: url("../icons/honeycomb-bg.svg") no-repeat top -115px right -160px;

components/dashboard/src/index.tsx

@@ -4,6 +4,7 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
+import "setimmediate"; // important!, required by vscode-jsonrpc
 import dayjs from "dayjs";
 import duration from "dayjs/plugin/duration";
 import relativeTime from "dayjs/plugin/relativeTime";

components/dashboard/tailwind.config.js

@@ -9,7 +9,7 @@ const colors = require("tailwindcss/colors");
 
 module.exports = {
     jit: true,
-    purge: ["./public/**/*.html", "./src/**/*.{js,ts,tsx}"],
+    content: ["./public/**/*.html", "./src/**/*.{js,ts,tsx}"],
     important: true,
     darkMode: "class",
     theme: {

components/gitpod-db/leeway.Dockerfile

@@ -2,16 +2,16 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License.AGPL.txt in the project root for license information.
 
-FROM node:16.13.0-slim as builder
+FROM node:18.17.1-slim as builder
 COPY components-gitpod-db--migrations /installer/
 WORKDIR /app
 RUN /installer/install.sh
 
-FROM node:16.13.0 as proxy
+FROM node:18.17.1 as proxy
 RUN wget https://storage.googleapis.com/cloudsql-proxy/v1.23.0/cloud_sql_proxy.linux.amd64 -O /bin/cloud_sql_proxy \
  && chmod +x /bin/cloud_sql_proxy
 
-FROM node:16.13.0-slim
+FROM node:18.17.1-slim
 ENV NODE_OPTIONS=--unhandled-rejections=warn
 COPY migrate.sh /app/migrate.sh
 COPY migrate_gcp.sh /app/migrate_gcp.sh

components/gitpod-db/package.json

@@ -41,10 +41,10 @@
     "@types/mocha": "^2.2.45",
     "@types/mysql": "^2.15.0",
     "@types/uuid": "^8.3.1",
-    "@typescript-eslint/eslint-plugin": "^4.5.0",
-    "@typescript-eslint/parser": "^4.5.0",
+    "@typescript-eslint/eslint-plugin": "^5.5.0",
+    "@typescript-eslint/parser": "^5.5.0",
     "chai": "^4.2.0",
-    "eslint": "^7.11.0",
+    "eslint": "^8.47.0",
     "mocha": "^4.1.0",
     "rimraf": "^2.6.1",
     "ts-node": "^10.4.0",

components/gitpod-protocol/package.json

@@ -24,11 +24,11 @@
         "@types/random-number-csprng": "^1.0.0",
         "@types/uuid": "^8.3.1",
         "@types/ws": "^5.1.2",
-        "@typescript-eslint/eslint-plugin": "^4.5.0",
-        "@typescript-eslint/parser": "^4.5.0",
+        "@typescript-eslint/eslint-plugin": "^5.5.0",
+        "@typescript-eslint/parser": "^5.5.0",
         "chai": "^4.3.4",
         "chai-subset": "^1.6.0",
-        "eslint": "^7.11.0",
+        "eslint": "^8.47.0",
         "mocha": "^5.0.0",
         "rimraf": "^2.6.2",
         "ts-node": "^10.4.0",
@@ -68,8 +68,6 @@
         "reflect-metadata": "^0.1.13",
         "uuid": "^8.3.2",
         "vscode-jsonrpc": "^5.0.1",
-        "vscode-languageserver-protocol": "3.17.0",
-        "vscode-languageserver-types": "3.17.0",
         "vscode-uri": "^3.0.3",
         "vscode-ws-jsonrpc": "^0.2.0",
         "ws": "^7.4.6"