Skip to content

Commit 6e92a4f

Browse files
vlad-dargelvlad-dargel
authored
Merge pull request #1760 from RedisInsight/main
Merge main into release/2.20.0
2 parents 14d5c80 + 071d704 commit 6e92a4f

File tree

342 files changed

+19075
-1466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

342 files changed

+19075
-1466
lines changed

‎.circleci/config.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,8 @@ jobs:
519519
runtime/org.freedesktop.Platform/x86_64/20.08 \
520520
org.electronjs.Electron2.BaseApp/x86_64/20.08
521521
522-
yarn --cwd redisinsight/api/ install
522+
yarn --cwd redisinsight/api/ install --ignore-optional
523+
yarn --cwd redisinsight/ install --ignore-optional
523524
yarn install
524525
yarn build:statics
525526
no_output_timeout: 15m
@@ -724,8 +725,11 @@ jobs:
724725
name: publish
725726
command: |
726727
rm release/._* ||:
728+
chmod +x .circleci/redisstack/sum_sha256.sh
729+
.circleci/redisstack/sum_sha256.sh
727730
applicationVersion=$(jq -r '.version' redisinsight/package.json)
728-
aws s3 cp release/ s3://${AWS_BUCKET_NAME_TEST}/public/rs-ri-builds/${CIRCLE_BUILD_NUM} --recursive --exclude "*.json"
731+
732+
aws s3 cp release/ s3://${AWS_BUCKET_NAME_TEST}/public/rs-ri-builds/${CIRCLE_BUILD_NUM} --recursive
729733
730734
release-aws-private:
731735
executor: linux-executor
@@ -743,9 +747,11 @@ jobs:
743747
- run:
744748
name: publish
745749
command: |
750+
chmod +x .circleci/redisstack/sum_sha256.sh
751+
.circleci/redisstack/sum_sha256.sh
746752
applicationVersion=$(jq -r '.version' redisinsight/package.json)
747753
748-
aws s3 cp release/ s3://${AWS_BUCKET_NAME}/private/${applicationVersion} --recursive --exclude "*.json"
754+
aws s3 cp release/ s3://${AWS_BUCKET_NAME}/private/${applicationVersion} --recursive
749755
750756
publish-prod-aws:
751757
executor: linux-executor

‎.circleci/redisstack/sum_sha256.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
set -e
3+
4+
cd ./release/redisstack
5+
6+
for f in *.tar.gz; do
7+
sha256sum "$f" > "$f.sha256"
8+
done

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.idea
33
.vscode
44
.circleci
5+
.docker
56

67
coverage
78
dll

‎configs/webpack.config.main.prod.babel.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import path from 'path';
22
import webpack from 'webpack';
33
import { merge } from 'webpack-merge';
4+
import { toString } from 'lodash'
45
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
56
import baseConfig from './webpack.config.base';
67
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
@@ -69,6 +70,9 @@ export default merge(baseConfig, {
6970
APP_VERSION: version,
7071
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
7172
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
73+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
74+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
75+
: toString(30 * 1000), // 30 sec
7276
}),
7377
],
7478

‎configs/webpack.config.main.stage.babel.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import webpack from 'webpack';
22
import { merge } from 'webpack-merge';
33
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
4+
import { toString } from 'lodash'
45
import mainProdConfig from './webpack.config.main.prod.babel';
56
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
67
import { version } from '../redisinsight/package.json';
@@ -29,6 +30,9 @@ export default merge(mainProdConfig, {
2930
APP_VERSION: version,
3031
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
3132
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
33+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
34+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
35+
: toString(30 * 1000), // 30 sec
3236
}),
3337
],
3438
});

‎configs/webpack.config.renderer.dev.babel.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import path from 'path';
22
import webpack from 'webpack';
33
import { merge } from 'webpack-merge';
44
import { spawn } from 'child_process';
5+
import { toString } from 'lodash'
56
import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
67
import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin';
78
import baseConfig from './webpack.config.base';
@@ -215,6 +216,9 @@ export default merge(baseConfig, {
215216
APP_VERSION: version,
216217
SEGMENT_WRITE_KEY:
217218
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
219+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
220+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
221+
: toString(30 * 1000), // 30 sec
218222
}),
219223

220224
new webpack.LoaderOptionsPlugin({

‎configs/webpack.config.renderer.dev.dll.babel.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import webpack from 'webpack';
22
import path from 'path';
33
import { merge } from 'webpack-merge';
4+
import { toString } from 'lodash'
45
import baseConfig from './webpack.config.base';
56
import { dependencies } from '../package.json';
67
import { dependencies as dependenciesApi } from '../redisinsight/package.json';
@@ -54,7 +55,10 @@ export default merge(baseConfig, {
5455
SCAN_TREE_COUNT_DEFAULT: '10000',
5556
PIPELINE_COUNT_DEFAULT: '5',
5657
SEGMENT_WRITE_KEY:
57-
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
58+
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
59+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
60+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
61+
: toString(30 * 1000), // 30 sec
5862
}),
5963

6064
new webpack.LoaderOptionsPlugin({

‎configs/webpack.config.renderer.prod.babel.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import path from 'path';
22
import webpack from 'webpack';
3+
import { toString } from 'lodash'
34
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
45
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
56
import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
@@ -200,7 +201,10 @@ export default merge(baseConfig, {
200201
SCAN_TREE_COUNT_DEFAULT: '10000',
201202
PIPELINE_COUNT_DEFAULT: '5',
202203
SEGMENT_WRITE_KEY:
203-
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
204+
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
205+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
206+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
207+
: toString(30 * 1000), // 30 sec
204208
}),
205209

206210
new MiniCssExtractPlugin({

‎configs/webpack.config.renderer.stage.babel.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import webpack from 'webpack';
22
import { merge } from 'webpack-merge';
3+
import { toString } from 'lodash'
34
import baseConfig from './webpack.config.base';
45
import rendererProdConfig from './webpack.config.renderer.prod.babel';
56
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
@@ -23,6 +24,9 @@ export default merge(baseConfig, {
2324
SCAN_COUNT_MEMORY_ANALYSES: '10000',
2425
SEGMENT_WRITE_KEY:
2526
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
27+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
28+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
29+
: toString(30 * 1000), // 30 sec
2630
}),
2731
],
2832
});

‎configs/webpack.config.web.dev.babel.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import path from 'path';
99
import webpack from 'webpack';
1010
import { merge } from 'webpack-merge';
1111
import ip from 'ip';
12+
import { toString } from 'lodash'
1213
import commonConfig from './webpack.config.web.common.babel';
1314

1415
function employCache(loaders) {
@@ -209,6 +210,9 @@ export default merge(commonConfig, {
209210
SCAN_TREE_COUNT_DEFAULT: '10000',
210211
SEGMENT_WRITE_KEY:
211212
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
213+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
214+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
215+
: toString(30 * 1000),
212216
}),
213217

214218
new webpack.LoaderOptionsPlugin({

0 commit comments

Comments
 (0)