#RI-5411 - Optimize builds

Author: egor-zalenski

.gitignore

@@ -70,6 +70,7 @@ vendor
 redisinsight/main.js.LICENSE.txt
 redisinsight/main.prod.js.LICENSE.txt
 licenses
+redisinsight/ui/src/packages/common/index*
 
 
 # E2E tests report

redisinsight/ui/src/packages/redisgraph/src/styles/styles.less renamed to redisinsight/ui/src/packages/redisgraph/src/styles/styles.scss

@@ -1,6 +1,4 @@
 @charset "UTF-8";
-// @import (less) "_dark_theme.less";
-// @import (less) "_light_theme.less";
 
 * {
   margin: 0px;

redisinsight/ui/src/packages/redistimeseries-app/src/main.tsx

@@ -4,7 +4,7 @@ import { render } from 'react-dom'
 import { appendIconComponentCache } from '@elastic/eui/es/components/icon/icon'
 import { icon as EuiIconArrowRight } from '@elastic/eui/es/components/icon/assets/arrow_right'
 import App from './App'
-import './styles/styles.less'
+import './styles/styles.scss'
 import result from '../mockData/resultTimeSeries.json'
 
 appendIconComponentCache({

redisinsight/ui/src/packages/redistimeseries-app/src/styles/styles.less renamed to redisinsight/ui/src/packages/redistimeseries-app/src/styles/styles.scss

@@ -12,7 +12,7 @@ import { icon as EuiIconReportingApp } from '@elastic/eui/es/components/icon/ass
 import { icon as EuiIconArrowUp } from '@elastic/eui/es/components/icon/assets/arrow_up'
 import { icon as EuiIconArrowDown } from '@elastic/eui/es/components/icon/assets/arrow_down'
 import { App } from './App'
-import './styles/styles.less'
+import './styles/styles.scss'
 import result from '../mockData/resultExplain.json'
 
 interface Props {

redisinsight/ui/src/packages/ri-explain/src/main.tsx

@@ -95,7 +95,7 @@ class Lexer {
     }
     this.Position = this.ReadPosition++
   }
-  
+
   PeekChar() {
     if (this.ReadPosition >= this.Input.length) {
       return null
@@ -158,7 +158,7 @@ class Lexer {
 
   ReadNumber(): string {
     let str = ''
-    while (this.C !== undefined && (isDigit(this.C) || this.C === '.') && parseFloat(str + this.C) != NaN) {
+    while (this.C !== undefined && (isDigit(this.C) || this.C === '.') && !Number.isNaN(parseFloat(str + this.C))) {
       str = str + this.C
       this.ReadChar()
     }
@@ -477,7 +477,7 @@ class Parser {
 
   constructor(l: Lexer) {
     this.L = l
-    
+
     this.Errors = []
     this.CurrentToken = new Token(TokenType.INIT, '')
     this.PeekToken = new Token(TokenType.INIT, '')
@@ -821,7 +821,7 @@ class Parser {
     this.nextToken()// read off RBRACE
 
     // assertToken(TokenType.NEW_LINE, this.CurrentToken?.T)
-    // 
+    //
     // this.nextToken() // read off new line
 
     return new NumericExpr(left !== 'inf' ? parseFloat(left) : Infinity, lsign, identifier, rsign, right !== 'inf' ? parseFloat(right) : Infinity)
@@ -833,7 +833,7 @@ function Parse(data: string): SearchExpr {
   const l = new Lexer(data)
 
   let p = new Parser(l)
-  
+
   const t = p.CurrentToken.T;
 
   if (p.CurrentToken?.T === TokenType.NUMERIC) {
@@ -1114,7 +1114,7 @@ export function ParseGraphV2(output: string[]) {
   let children: EntityInfo[] = []
 
   let pairs: [number, number][] = []
-    
+
   let s: number | null = null, e: number | null = null
   let i = 1
 

redisinsight/ui/src/packages/ri-explain/src/parser.ts

@@ -1,6 +1,4 @@
 @charset "UTF-8";
-// @import "_dark_theme.less";
-// @import "_light_theme.less";
 
 * {
   margin: 0px;

redisinsight/ui/src/packages/ri-explain/src/styles/styles.less renamed to redisinsight/ui/src/packages/ri-explain/src/styles/styles.scss

@@ -13,45 +13,61 @@ xcopy ".\redisinsight\ui\src\assets\fonts\inconsolata" ".\vendor\fonts\" /s /e /
 if not exist %PLUGINS_VENDOR_DIR% mkdir %PLUGINS_VENDOR_DIR%
 xcopy ".\vendor\." "%PLUGINS_VENDOR_DIR%" /s /e /y
 
-::  Build all plugins and common libraries
+:: Install developing tools for plugins
 set REDISEARCH_DIR=".\redisinsight\ui\src\packages"
-call yarn --cwd "%REDISEARCH_DIR%" build
+call yarn --cwd "%REDISEARCH_DIR%"
 
-:: Copy redisearch plugin
+:: Install plugins dependencies
 set REDISEARCH_DIR=".\redisinsight\ui\src\packages\redisearch"
 call yarn --cwd "%REDISEARCH_DIR%"
+
+set REDISGRAPH_DIR=".\redisinsight\ui\src\packages\redisgraph"
+call yarn --cwd "%REDISGRAPH_DIR%"
+
+set REDISTIMESERSIES_DIR=".\redisinsight\ui\src\packages\redistimeseries-app"
+call yarn --cwd "%REDISTIMESERSIES_DIR%"
+
+set RI_EXPLIAIN_DIR=".\redisinsight\ui\src\packages\ri-explain"
+call yarn --cwd "%RI_EXPLIAIN_DIR%"
+
+set CLIENTS_LIST_DIR=".\redisinsight\ui\src\packages\clients-list"
+call yarn --cwd "%CLIENTS_LIST_DIR%"
+
+::  Build all plugins and common libraries
+call yarn --cwd "%REDISEARCH_DIR%" build
+
+:: Copy common libraries to plugins
+set COMMON_DIR=".\redisinsight\ui\src\packages\common"
+if not exist "%PLUGINS_DIR%\common" mkdir "%PLUGINS_DIR%\common"
+xcopy /E /Y "%COMMON_DIR%\index*.js" "%PLUGINS_DIR%\common"
+copy "%COMMON_DIR%\package.json" "%PLUGINS_DIR%\common\"
+
+
+:: Copy redisearch plugin
 if not exist "%PLUGINS_DIR%\redisearch" mkdir "%PLUGINS_DIR%\redisearch"
 if not exist "%PLUGINS_DIR%\redisearch\dist" mkdir "%PLUGINS_DIR%\redisearch\dist"
 xcopy "%REDISEARCH_DIR%\dist" "%PLUGINS_DIR%\redisearch\dist\" /s /e /y
 copy "%REDISEARCH_DIR%\package.json" "%PLUGINS_DIR%\redisearch\"
 
 :: Copy redisgraph plugin
-set REDISGRAPH_DIR=".\redisinsight\ui\src\packages\redisgraph"
-call yarn --cwd "%REDISGRAPH_DIR%"
 if not exist "%PLUGINS_DIR%\redisgraph" mkdir "%PLUGINS_DIR%\redisgraph"
 if not exist "%PLUGINS_DIR%\redisgraph\dist" mkdir "%PLUGINS_DIR%\redisgraph\dist"
 xcopy "%REDISGRAPH_DIR%\dist" "%PLUGINS_DIR%\redisgraph\dist\" /s /e /y
 copy "%REDISGRAPH_DIR%\package.json" "%PLUGINS_DIR%\redisgraph\"
 
 :: Copy redistimeseries plugin
-set REDISTIMESERSIES_DIR=".\redisinsight\ui\src\packages\redistimeseries-app"
-call yarn --cwd "%REDISTIMESERSIES_DIR%"
 if not exist "%PLUGINS_DIR%\redistimeseries-app" mkdir "%PLUGINS_DIR%\redistimeseries-app"
 if not exist "%PLUGINS_DIR%\redistimeseries-app\dist" mkdir "%PLUGINS_DIR%\redistimeseries-app\dist"
 xcopy "%REDISTIMESERSIES_DIR%\dist" "%PLUGINS_DIR%\redistimeseries-app\dist\" /s /e /y
 copy "%REDISTIMESERSIES_DIR%\package.json" "%PLUGINS_DIR%\redistimeseries-app\"
 
 :: Copy ri-explain plugin
-set RI_EXPLIAIN_DIR=".\redisinsight\ui\src\packages\ri-explain"
-call yarn --cwd "%RI_EXPLIAIN_DIR%"
 if not exist "%PLUGINS_DIR%\ri-explain" mkdir "%PLUGINS_DIR%\ri-explain"
 if not exist "%PLUGINS_DIR%\ri-explain\dist" mkdir "%PLUGINS_DIR%\ri-explain\dist"
 xcopy "%RI_EXPLIAIN_DIR%\dist" "%PLUGINS_DIR%\ri-explain\dist\" /s /e /y
 copy "%RI_EXPLIAIN_DIR%\package.json" "%PLUGINS_DIR%\ri-explain\"
 
 :: Copy clients-list and json plugin
-set CLIENTS_LIST_DIR=".\redisinsight\ui\src\packages\clients-list"
-call yarn --cwd "%CLIENTS_LIST_DIR%"
 if not exist "%PLUGINS_DIR%\clients-list" mkdir "%PLUGINS_DIR%\clients-list"
 if not exist "%PLUGINS_DIR%\clients-list\dist" mkdir "%PLUGINS_DIR%\clients-list\dist"
 xcopy "%CLIENTS_LIST_DIR%\dist" "%PLUGINS_DIR%\clients-list\dist\" /s /e /y

scripts/build-statics.cmd

@@ -17,8 +17,27 @@ mkdir -p "${PLUGINS_VENDOR_DIR}"
 cp -R "./vendor/." "${PLUGINS_VENDOR_DIR}"
 
 
-# Build all plugins and common libraries
+# Install developing tools for plugins
 PACKAGES_DIR="./redisinsight/ui/src/packages"
+yarn --cwd "${PACKAGES_DIR}"
+
+# Install plugins dependencies
+REDISEARCH_DIR="./redisinsight/ui/src/packages/redisearch"
+yarn --cwd "${REDISEARCH_DIR}"
+
+REDISGRAPH_DIR="./redisinsight/ui/src/packages/redisgraph"
+yarn --cwd "${REDISGRAPH_DIR}"
+
+REDISTIMESERIES_DIR="./redisinsight/ui/src/packages/redistimeseries-app"
+yarn --cwd "${REDISTIMESERIES_DIR}"
+
+RI_EXPLIAIN_DIR="./redisinsight/ui/src/packages/ri-explain"
+yarn --cwd "${RI_EXPLIAIN_DIR}"
+
+CLIENTS_LIST_DIR="./redisinsight/ui/src/packages/clients-list"
+yarn --cwd "${CLIENTS_LIST_DIR}"
+
+# Build all plugins and common libraries
 yarn --cwd "${PACKAGES_DIR}" build
 
 # Copy common libraries to plugins
@@ -29,41 +48,31 @@ if [ $pluginsOnlyInstall != 1 ]; then
 fi
 
 # Copy redisearch plugin
-REDISEARCH_DIR="./redisinsight/ui/src/packages/redisearch"
-yarn --cwd "${REDISEARCH_DIR}"
 if [ $pluginsOnlyInstall != 1 ]; then
   mkdir -p "${PLUGINS_DIR}/redisearch"
   cp -R "${REDISEARCH_DIR}/dist" "${REDISEARCH_DIR}/package.json" "${PLUGINS_DIR}/redisearch"
 fi
 
 
 # Copy redisgraph plugin
-REDISGRAPH_DIR="./redisinsight/ui/src/packages/redisgraph"
-yarn --cwd "${REDISGRAPH_DIR}"
 if [ $pluginsOnlyInstall != 1 ]; then
   mkdir -p "${PLUGINS_DIR}/redisgraph"
   cp -R "${REDISGRAPH_DIR}/dist" "${REDISGRAPH_DIR}/package.json" "${PLUGINS_DIR}/redisgraph"
 fi
 
 # Copy timeseries plugin
-REDISTIMESERIES_DIR="./redisinsight/ui/src/packages/redistimeseries-app"
-yarn --cwd "${REDISTIMESERIES_DIR}"
 if [ $pluginsOnlyInstall != 1 ]; then
   mkdir -p "${PLUGINS_DIR}/redistimeseries-app"
   cp -R "${REDISTIMESERIES_DIR}/dist" "${REDISTIMESERIES_DIR}/package.json" "${PLUGINS_DIR}/redistimeseries-app"
 fi
 
 # Copy ri-explain plugin
-RI_EXPLIAIN_DIR="./redisinsight/ui/src/packages/ri-explain"
-yarn --cwd "${RI_EXPLIAIN_DIR}"
 if [ $pluginsOnlyInstall != 1 ]; then
   mkdir -p "${PLUGINS_DIR}/ri-explain"
   cp -R "${RI_EXPLIAIN_DIR}/dist" "${RI_EXPLIAIN_DIR}/package.json" "${PLUGINS_DIR}/ri-explain"
 fi
 
 # Copy clients-list and json plugins
-CLIENTS_LIST_DIR="./redisinsight/ui/src/packages/clients-list"
-yarn --cwd "${CLIENTS_LIST_DIR}"
 if [ $pluginsOnlyInstall != 1 ]; then
   mkdir -p "${PLUGINS_DIR}/clients-list"
   cp -R "${CLIENTS_LIST_DIR}/dist" "${CLIENTS_LIST_DIR}/package.json" "${PLUGINS_DIR}/clients-list"