Merge branch 'main' of https://github.com/RedisInsight/RedisInsight into be/bugfix/RI-4661_cloud_recommendation

Author: AmirAllayarovSofteq

.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

.eslintrc.js

@@ -1,17 +1,63 @@
 module.exports = {
   root: true,
+  env: {
+    node: true,
+  },
   extends: ['airbnb-typescript'],
   plugins: ['@typescript-eslint'],
   parser: '@typescript-eslint/parser',
   rules: {
-    'max-len': ['warn', 120],
+    semi: ['error', 'never'],
+    quotes: [2, 'single', { avoidEscape: true }],
+    'max-len': ['error', { ignoreComments: true, ignoreStrings: true, ignoreRegExpLiterals: true, code: 120 }],
     'class-methods-use-this': 'off',
     'import/no-extraneous-dependencies': 'off', // temporary disabled
+    '@typescript-eslint/semi': ['error', 'never'],
+    'object-curly-newline': 'off',
+    'import/prefer-default-export': 'off',
+    '@typescript-eslint/comma-dangle': 'off',
+    'implicit-arrow-linebreak': 'off',
+    'import/order': [
+      1,
+      {
+        groups: [
+          'external',
+          'builtin',
+          'internal',
+          'sibling',
+          'parent',
+          'index',
+        ],
+        pathGroups: [
+          {
+            pattern: 'desktopSrc/**',
+            group: 'internal',
+            position: 'after'
+          },
+          {
+            pattern: 'uiSrc/**',
+            group: 'internal',
+            position: 'after'
+          },
+          {
+            pattern: 'apiSrc/**',
+            group: 'internal',
+            position: 'after'
+          },
+        ],
+        warnOnUnassignedImports: true,
+        pathGroupsExcludedImportTypes: ['builtin']
+      },
+    ],
   },
   parserOptions: {
     project: './tsconfig.json',
+    ecmaVersion: 2020,
+    sourceType: 'module',
+    createDefaultProgram: true,
   },
   ignorePatterns: [
     'redisinsight/ui',
+    'redisinsight/api',
   ],
-};
+}

.gitignore

@@ -56,6 +56,9 @@ dll
 main.js
 main.js.map
 vendor
+redisinsight/main.js.LICENSE.txt
+redisinsight/main.prod.js.LICENSE.txt
+
 
 # E2E tests report
 /tests/e2e/report

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/paths.js

@@ -1,11 +1,13 @@
-import path from 'path';
 import webpack from 'webpack';
-import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
+import TsconfigPathsPlugins from 'tsconfig-paths-webpack-plugin';
+import webpackPaths from './webpack.paths';
 import { dependencies as externals } from '../redisinsight/package.json';
 
-export default {
+const configuration: webpack.Configuration =  {
   externals: [...Object.keys(externals || {})],
 
+  stats: 'errors-only',
+
   module: {
     rules: [
       {
@@ -22,28 +24,22 @@ export default {
   },
 
   output: {
-    path: path.join(__dirname, '..'),
-    // commonjs2 https://github.com/webpack/webpack/issues/1114
-    libraryTarget: 'commonjs2',
+    path: webpackPaths.riPath,
+    // https://github.com/webpack/webpack/issues/1114
+    library: {
+      type: 'commonjs2',
+    },
   },
 
   resolve: {
     extensions: ['.js', '.jsx', '.json', '.ts', '.tsx', '.scss'],
-    plugins: [
-      new TsconfigPathsPlugin({
-        configFile: path.join(__dirname, '..', 'tsconfig.json'),
-      }),
-    ],
-    alias: {
-      src: path.resolve(__dirname, '../redisinsight/api/src'),
-      apiSrc: path.resolve(__dirname, '../redisinsight/api/src'),
-      uiSrc: path.resolve(__dirname, '../redisinsight/ui/src'),
-    },
-    modules: [path.join(__dirname, '../redisinsight/api'), 'node_modules'],
+    modules: [webpackPaths.apiPath, 'node_modules'],
+    plugins: [new TsconfigPathsPlugins()],
   },
 
   plugins: [
     new webpack.EnvironmentPlugin({
+      NODE_ENV: 'production',
     }),
 
     new webpack.IgnorePlugin({
@@ -81,3 +77,5 @@ export default {
     }),
   ],
 };
+
+export default configuration;

configs/webpack.config.base.js renamed to configs/webpack.config.base.ts

@@ -2,4 +2,4 @@
 /* eslint import/no-unresolved: off, import/no-self-import: off */
 require('@babel/register');
 
-module.exports = require('./webpack.config.renderer.dev.babel').default;
+module.exports = require('./webpack.config.renderer.dev').default;

configs/webpack.config.eslint.js

@@ -1,11 +1,12 @@
 import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
-import { toString } from 'lodash'
+import { toString } from 'lodash';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import baseConfig from './webpack.config.base';
 import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
 import { version } from '../redisinsight/package.json';
+import webpackPaths from './webpack.paths';
 
 DeleteSourceMaps();
 
@@ -23,19 +24,17 @@ export default merge(baseConfig, {
 
   target: 'electron-main',
 
-  entry: './redisinsight/main.dev.ts',
-
-  resolve: {
-    alias: {
-      ['apiSrc']: path.resolve(__dirname, '../redisinsight/api/src'),
-      ['src']: path.resolve(__dirname, '../redisinsight/api/src'),
-    },
-    extensions: ['.tsx', '.ts', '.js', '.jsx'],
+  entry: {
+    main: path.join(webpackPaths.desktopPath, 'index.ts'),
+    preload: path.join(webpackPaths.desktopPath, 'preload.ts'),
   },
 
   output: {
-    path: path.join(__dirname, '../redisinsight'),
-    filename: 'main.prod.js',
+    path: webpackPaths.distMainPath,
+    filename: '[name].js',
+    library: {
+      type: 'umd',
+    },
   },
 
   // optimization: {
@@ -46,10 +45,6 @@ export default merge(baseConfig, {
   //   ],
   // },
 
-  // alias: {
-  //   'apiSrc': path.resolve(__dirname, '../redisinsight/api/src/')
-  // },
-
   plugins: [
     new BundleAnalyzerPlugin({
       analyzerMode: process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
@@ -75,6 +70,10 @@ export default merge(baseConfig, {
         ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
         : toString(30 * 1000), // 30 sec
     }),
+
+    new webpack.DefinePlugin({
+      'process.type': '"browser"',
+    }),
   ],
 
   /**

configs/webpack.config.main.prod.babel.js renamed to configs/webpack.config.main.prod.ts

@@ -1,8 +1,8 @@
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
+import { toString } from 'lodash';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
-import { toString } from 'lodash'
-import mainProdConfig from './webpack.config.main.prod.babel';
+import mainProdConfig from './webpack.config.main.prod';
 import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
 import { version } from '../redisinsight/package.json';