Merge pull request #2220 from RedisInsight/build/feature/RI-4505_Node_18

#RI-4505 - Update Electron and nodeJS versions

Author: vlad-dargel

.circleci/config.yml

@@ -183,7 +183,7 @@ jobs:
   # Test jobs
   unit-tests-ui:
     docker:
-      - image: cimg/node:16.15.1
+      - image: cimg/node:18.15.0
     steps:
       - checkout
       - restore_cache:
@@ -227,7 +227,7 @@ jobs:
             - ./node_modules
   unit-tests-api:
     docker:
-      - image: cimg/node:16.15.1
+      - image: cimg/node:18.15.0
     steps:
       - checkout
       - restore_cache:
@@ -385,7 +385,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: choco install nodejs --version=16.15.1
+      - run: choco install nodejs --version=18.15.0
       - run:
           command: |
             cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
@@ -534,7 +534,7 @@ jobs:
     steps:
       - checkout
       - node/install:
-          node-version: '16.15.1'
+          node-version: '18.15.0'
       - attach_workspace:
           at: .
       - run:
@@ -599,7 +599,7 @@ jobs:
             - release/redisstack
   macosx:
     macos:
-      xcode: 14.3.0
+      xcode: 14.2.0
     resource_class: macos.x86.medium.gen2
     parameters:
       env:
@@ -610,7 +610,7 @@ jobs:
     steps:
       - checkout
       - node/install:
-          node-version: '16.15.1'
+          node-version: '18.15.0'
       - attach_workspace:
           at: .
       - run:
@@ -684,7 +684,7 @@ jobs:
       - run:
           name: Build windows exe
           command: |
-            choco install nodejs --version=16.15.1
+            choco install nodejs --version=18.15.0
             # set ALL_REDIS_COMMANDS=$(curl $ALL_REDIS_COMMANDS_RAW_URL)
             yarn install
             yarn --cwd redisinsight/api/ install

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.15.1-alpine as front
+FROM node:18.15.0-alpine as front
 RUN apk update
 RUN apk add --no-cache --virtual .gyp \
         python3 \
@@ -20,7 +20,7 @@ ENV SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
 RUN yarn build:web
 RUN yarn build:statics
 
-FROM node:16.15.1-alpine as back
+FROM node:18.15.0-alpine as back
 WORKDIR /usr/src/app
 COPY redisinsight/api/package.json redisinsight/api/yarn.lock ./
 RUN yarn install
@@ -29,7 +29,7 @@ COPY --from=front /usr/src/app/redisinsight/api/static ./static
 COPY --from=front /usr/src/app/redisinsight/api/defaults ./defaults
 RUN yarn run build:prod
 
-FROM node:16.15.1-slim
+FROM node:18.15.0-slim
 # Set up mDNS functionality, to play well with Redis Enterprise
 # clusters on the network.
 RUN set -ex \

api.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.15.1-alpine as build
+FROM node:18.15.0-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:16.15.1-alpine as production
+FROM node:18.15.0-alpine as production
 
 RUN apk update && apk add bash libsecret dbus-x11 gnome-keyring
 RUN dbus-uuidgen > /var/lib/dbus/machine-id

configs/webpack.config.renderer.prod.ts

@@ -12,6 +12,9 @@ import { version } from '../redisinsight/package.json';
 DeleteSourceMaps();
 
 const htmlPagesNames = ['splash.ejs', 'index.ejs']
+const apiUrl = process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY
+  ? 'https://localhost'
+  : 'http://localhost'
 
 const devtoolsConfig =
   process.env.DEBUG_PROD === 'true'
@@ -201,8 +204,8 @@ const configuration: webpack.Configuration = {
       'process.env.NODE_ENV': JSON.stringify('development'),
       'process.env.APP_ENV': JSON.stringify('electron'),
       'process.env.API_PREFIX': JSON.stringify('api'),
-      'process.env.BASE_API_URL': JSON.stringify('http://localhost'),
-      'process.env.RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
+      'process.env.BASE_API_URL': JSON.stringify(apiUrl),
+      'process.env.RESOURCES_BASE_URL': JSON.stringify(apiUrl),
       'process.env.SCAN_COUNT_DEFAULT': JSON.stringify('500'),
       'process.env.SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
       'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),

configs/webpack.config.renderer.stage.ts

@@ -7,6 +7,10 @@ import { version } from '../redisinsight/package.json';
 
 DeleteSourceMaps();
 
+const apiUrl = process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY
+  ? 'https://localhost'
+  : 'http://localhost'
+
 export default merge(baseConfig, {
   ...rendererProdConfig,
 
@@ -20,8 +24,8 @@ export default merge(baseConfig, {
       'process.env.NODE_ENV': JSON.stringify('staging'),
       'process.env.APP_ENV': JSON.stringify('electron'),
       'process.env.API_PREFIX': JSON.stringify('api'),
-      'process.env.BASE_API_URL': JSON.stringify('http://localhost'),
-      'process.env.RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
+      'process.env.BASE_API_URL': JSON.stringify(apiUrl),
+      'process.env.RESOURCES_BASE_URL': JSON.stringify(apiUrl),
       'process.env.SCAN_COUNT_DEFAULT': JSON.stringify('500'),
       'process.env.SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
       'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),

electron-builder.json

@@ -29,7 +29,7 @@
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
-    "bundleVersion": "10",
+    "bundleVersion": "20",
     "icon": "resources/icon.icns",
     "artifactName": "${productName}-${os}-${arch}.${ext}",
     "entitlements": "resources/entitlements.mac.plist",

package.json

@@ -79,7 +79,7 @@
   ],
   "homepage": "https://github.com/RedisInsight/RedisInsight#readme",
   "resolutions": {
-    "**/node-sass": "^6.0.1",
+    "**/node-sass": "^8.0.0",
     "**/trim": "0.0.3"
   },
   "devDependencies": {
@@ -155,7 +155,7 @@
     "cross-env": "^7.0.2",
     "css-loader": "^5.0.1",
     "css-minimizer-webpack-plugin": "^2.0.0",
-    "electron": "19.0.7",
+    "electron": "25.1.1",
     "electron-builder": "^23.6.0",
     "electron-builder-notarize": "^1.5.1",
     "electron-debug": "^3.2.0",
@@ -187,14 +187,14 @@
     "moment": "^2.29.3",
     "monaco-editor-webpack-plugin": "^6.0.0",
     "msw": "^0.45.0",
-    "node-sass": "^6.0.1",
+    "node-sass": "^8.0.0",
     "opencollective-postinstall": "^2.0.3",
     "react-hot-loader": "^4.13.0",
     "react-refresh": "^0.9.0",
     "redux-mock-store": "^1.5.4",
     "regenerator-runtime": "^0.13.5",
     "rimraf": "^3.0.2",
-    "sass-loader": "^10.2.0",
+    "sass-loader": "^13.2.2",
     "skip-postinstall": "^1.0.0",
     "socket.io-mock": "^1.3.2",
     "source-map-support": "^0.5.19",

redisinsight/api/package.json

@@ -71,8 +71,8 @@
     "rxjs": "^7.5.6",
     "socket.io": "^4.4.0",
     "source-map-support": "^0.5.19",
-    "sqlite3": "^5.0.11",
-    "ssh2": "^1.11.0",
+    "sqlite3": "5.1.6",
+    "ssh2": "^1.14.0",
     "swagger-ui-express": "^4.1.4",
     "typeorm": "^0.3.9",
     "uuid": "^8.3.2",

redisinsight/api/src/modules/ssh/ssh-tunnel.provider.ts

@@ -22,7 +22,10 @@ export class SshTunnelProvider {
           reject(new UnableToCreateLocalServerException(e.message));
         });
 
-        detectPort(50000)
+        detectPort({
+          hostname: '127.0.0.1',
+          port: 50000,
+        })
           .then((port) => {
             server.listen({
               host: '127.0.0.1',

redisinsight/api/test/test-runs/cloud-st/docker-compose.yml

@@ -8,5 +8,5 @@ services:
       TEST_CLOUD_API_KEY: ${TEST_CLOUD_API_KEY}
       TEST_CLOUD_API_SECRET_KEY: ${TEST_CLOUD_API_SECRET_KEY}
   redis:
-    image: node:16.15.1-alpine
+    image: node:18.15.0-alpine
     entrypoint: [ "echo", "Dummy Service" ]