Merge branch 'main' into feature/RI-5413-enhance-web-builds

Author: vlad-dargel

.circleci/build/build.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.18-alpine
+FROM node:20.14-alpine
 
 # runtime args and environment variables
 ARG DIST=Redis-Insight.tar.gz

.circleci/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.50.0)
+-v - Semver (2.52.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

.circleci/config.yml

@@ -176,7 +176,7 @@ aliases:
 
 orbs:
   win: circleci/[email protected]
-  node: circleci/node@5.0.2
+  node: circleci/node@5.2.0
   aws: circleci/[email protected]
 
 executors:
@@ -189,7 +189,7 @@ executors:
       docker_layer_caching: true
   docker-node:
     docker:
-      - image: cimg/node:18.15.0
+      - image: cimg/node:20.15
   docker:
     docker:
       - image: cibuilds/docker:19.03.5
@@ -387,14 +387,24 @@ jobs:
     steps:
       - checkout
       - node/install:
-          node-version: '18.15.0'
+          install-yarn: true
+          node-version: '20.15'
       - attach_workspace:
           at: .
       - run: sudo apt-get install net-tools
       - run:
-          name: Clone mocked RDI server
+          name: Install WM
+          command: sudo apt install fluxbox
+      - run:
+          name: Run X11
           command: |
-            git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
+            Xvfb :99 -screen 0 1920x1080x24 &
+            sleep 3
+            fluxbox &
+      # - run:
+      #     name: Clone mocked RDI server
+      #     command: |
+      #       git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
       - run:
           name: .AppImage tests
           command: |
@@ -434,8 +444,8 @@ jobs:
           at: .
       - run:
           command: |
-            nvm install 18.15.0
-            nvm use 18.15.0
+            nvm install 20.15
+            nvm use 20.15
             npm install --global yarn
       - run:
           command: |
@@ -487,10 +497,10 @@ jobs:
                 name: Load built docker image from workspace
                 command: |
                   docker image load -i /tmp/release/docker/docker-linux-alpine.amd64.tar
-            - run:
-                name: Clone mocked RDI server
-                command: |
-                  git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
+            # - run:
+            #     name: Clone mocked RDI server
+            #     command: |
+            #       git clone https://[email protected]/RedisInsight/RDI_server_mocked.git tests/e2e/rte/rdi
             - run:
                 name: Run tests
                 command: |
@@ -605,7 +615,8 @@ jobs:
     steps:
       - checkout
       - node/install:
-          node-version: '18.15.0'
+          install-yarn: true
+          node-version: '20.15'
       - attach_workspace:
           at: .
       - run:
@@ -666,7 +677,7 @@ jobs:
             - release/*-linux.yml
   macosx:
     executor: macos
-    resource_class: macos.x86.medium.gen2
+    resource_class: macos.m1.medium.gen1
     parameters:
       env:
         description: Build environment (stage || prod)
@@ -684,7 +695,7 @@ jobs:
     steps:
       - checkout
       - node/install:
-          node-version: '18.15.0'
+          node-version: '20.15'
       - attach_workspace:
           at: .
       - run:
@@ -783,8 +794,8 @@ jobs:
       - run:
           name: Build windows exe
           command: |
-            nvm install 18.15.0
-            nvm use 18.15.0
+            nvm install 20.15
+            nvm use 20.15
             npm install --global yarn
 
             # set ALL_REDIS_COMMANDS=$(curl $ALL_REDIS_COMMANDS_RAW_URL)
@@ -875,7 +886,8 @@ jobs:
     steps:
       - checkout
       - node/install:
-          node-version: '18.15.0'
+          install-yarn: true
+          node-version: '20.15'
       - run:
           name: Install dependencies
           command: |

Dockerfile

@@ -6,7 +6,7 @@
 # the best way to minimize the number of node_module restores and build steps
 # while still keeping the final image small.
 
-FROM node:18.18-alpine as build
+FROM node:20.14-alpine as build
 
 # update apk repository and install build dependencies
 RUN apk update && apk add --no-cache --virtual .gyp \
@@ -39,7 +39,7 @@ RUN yarn --cwd ./redisinsight/api install --production
 COPY ./redisinsight/api/.yarnclean.prod ./redisinsight/api/.yarnclean
 RUN yarn --cwd ./redisinsight/api autoclean --force
 
-FROM node:18.18-alpine
+FROM 20.14-alpine
 
 # runtime args and environment variables
 ARG NODE_ENV=production

api.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.15.0-alpine as build
+FROM node:20.14-alpine as build
 
 RUN apk update && apk add bash libsecret dbus-x11 gnome-keyring
 RUN dbus-uuidgen > /var/lib/dbus/machine-id
@@ -19,7 +19,7 @@ RUN yarn install --production
 RUN cp .yarnclean.prod .yarnclean && yarn autoclean --force
 
 # Production image
-FROM node:18.15.0-alpine as production
+FROM node:20.14-alpine as production
 
 RUN apk update && apk add bash libsecret dbus-x11 gnome-keyring
 RUN dbus-uuidgen > /var/lib/dbus/machine-id

electron-builder.json

@@ -7,7 +7,6 @@
     "node_modules",
     "package.json"
   ],
-  "afterSign": "electron-builder-notarize",
   "artifactName": "Redis-Insight-${os}-${arch}.${ext}",
   "compression": "normal",
   "asarUnpack": [
@@ -32,6 +31,9 @@
         "arch": ["x64", "arm64"]
       }
     ],
+    "notarize": {
+      "teamId": "UUK47G4BAZ"
+    },
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
@@ -53,9 +55,7 @@
       "Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/build/Release/node_sqlite3.node",
       "Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/build/Release/node_sqlite3.node",
       "Contents/Resources/app-arm64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
-      "Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
-      "Contents/Resources/app-arm64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node",
-      "Contents/Resources/app-x64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node"
+      "Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node"
     ],
     "artifactName": "Redis-Insight-${os}-${arch}-mas.${ext}"
   },
@@ -71,9 +71,7 @@
       "Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/build/Release/node_sqlite3.node",
       "Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/build/Release/node_sqlite3.node",
       "Contents/Resources/app-arm64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
-      "Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
-      "Contents/Resources/app-arm64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node",
-      "Contents/Resources/app-x64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node"
+      "Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node"
     ],
     "artifactName": "Redis-Insight-${os}-${arch}-masDev.${ext}"
   },

package.json

@@ -80,7 +80,6 @@
   "resolutions": {
     "**/trim": "0.0.3",
     "word-wrap": "1.2.4",
-    "electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5",
     "**/semver": "^7.5.2",
     "rawproto/protobufjs": "^7.2.5"
   },
@@ -140,9 +139,9 @@
     "css-minimizer-webpack-plugin": "^6.0.0",
     "csv-parser": "^3.0.0",
     "csv-stringify": "^6.4.0",
-    "electron": "25.8.4",
-    "electron-builder": "^23.6.0",
-    "electron-builder-notarize": "^1.5.1",
+    "electron": "31.0.2",
+    "electron-builder": "^24.13.3",
+    "electron-builder-notarize": "^1.5.2",
     "electron-debug": "^3.2.0",
     "electron-devtools-installer": "^3.2.0",
     "esbuild-plugin-react-virtualized": "^1.0.4",

redisinsight/api/config/default.ts

@@ -76,7 +76,7 @@ export default {
     tlsKey: process.env.RI_SERVER_TLS_KEY,
     staticContent: !!process.env.RI_SERVE_STATICS || true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.50.0',
+    appVersion: process.env.RI_APP_VERSION || '2.52.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],

redisinsight/api/config/swagger.ts

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'Redis Insight Backend API',
     description: 'Redis Insight Backend API',
-    version: '2.50.0',
+    version: '2.52.0',
   },
   tags: [],
 };

redisinsight/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.50.0",
+  "version": "2.52.0",
   "description": "Redis Insight API",
   "private": true,
   "author": {