Skip to content

Commit 4c2b652

Browse files
vlad-dargelvlad-dargel
authored
Merge pull request #3668 from RedisInsight/release/2.54.0
Release/2.54.0 to latest
2 parents ebf8ff5 + d19c765 commit 4c2b652

File tree

174 files changed

+5986
-964
lines changed

Some content is hidden

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

174 files changed

+5986
-964
lines changed

‎.circleci/build/build.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:18.18-alpine
1+
FROM node:20.14-alpine
22

33
# runtime args and environment variables
44
ARG DIST=Redis-Insight.tar.gz

‎.circleci/build/release-docker.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
HELP="Args:
5-
-v - Semver (2.52.0)
5+
-v - Semver (2.54.0)
66
-d - Build image repository (Ex: -d redisinsight)
77
-r - Target repository (Ex: -r redis/redisinsight)
88
"

‎.circleci/config.yml‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ aliases:
176176

177177
orbs:
178178
win: circleci/[email protected]
179-
node: circleci/node@5.0.2
179+
node: circleci/node@5.2.0
180180
aws: circleci/[email protected]
181181

182182
executors:
@@ -189,7 +189,7 @@ executors:
189189
docker_layer_caching: true
190190
docker-node:
191191
docker:
192-
- image: cimg/node:18.15.0
192+
- image: cimg/node:20.15
193193
docker:
194194
docker:
195195
- image: cibuilds/docker:19.03.5
@@ -387,7 +387,8 @@ jobs:
387387
steps:
388388
- checkout
389389
- node/install:
390-
node-version: '18.15.0'
390+
install-yarn: true
391+
node-version: '20.15'
391392
- attach_workspace:
392393
at: .
393394
- run: sudo apt-get install net-tools
@@ -443,8 +444,8 @@ jobs:
443444
at: .
444445
- run:
445446
command: |
446-
nvm install 18.15.0
447-
nvm use 18.15.0
447+
nvm install 20.15
448+
nvm use 20.15
448449
npm install --global yarn
449450
- run:
450451
command: |
@@ -614,7 +615,8 @@ jobs:
614615
steps:
615616
- checkout
616617
- node/install:
617-
node-version: '18.15.0'
618+
install-yarn: true
619+
node-version: '20.15'
618620
- attach_workspace:
619621
at: .
620622
- run:
@@ -675,7 +677,7 @@ jobs:
675677
- release/*-linux.yml
676678
macosx:
677679
executor: macos
678-
resource_class: macos.x86.medium.gen2
680+
resource_class: macos.m1.medium.gen1
679681
parameters:
680682
env:
681683
description: Build environment (stage || prod)
@@ -693,7 +695,7 @@ jobs:
693695
steps:
694696
- checkout
695697
- node/install:
696-
node-version: '18.15.0'
698+
node-version: '20.15'
697699
- attach_workspace:
698700
at: .
699701
- run:
@@ -705,6 +707,7 @@ jobs:
705707
command: |
706708
yarn install
707709
yarn --cwd redisinsight/api/ install
710+
yarn --cwd redisinsight/ install
708711
yarn build:statics
709712
no_output_timeout: 15m
710713
- run:
@@ -792,14 +795,17 @@ jobs:
792795
- run:
793796
name: Build windows exe
794797
command: |
795-
nvm install 18.15.0
796-
nvm use 18.15.0
798+
nvm install 20.15
799+
nvm use 20.15
797800
npm install --global yarn
798801
799802
# set ALL_REDIS_COMMANDS=$(curl $ALL_REDIS_COMMANDS_RAW_URL)
803+
# install dependencies
800804
yarn install
801805
yarn --cwd redisinsight/api/ install
806+
yarn --cwd redisinsight/ install
802807
yarn build:statics:win
808+
803809
if [ << parameters.env >> == 'prod' ]; then
804810
yarn package:prod
805811
rm -rf release/win-unpacked
@@ -884,7 +890,8 @@ jobs:
884890
steps:
885891
- checkout
886892
- node/install:
887-
node-version: '18.15.0'
893+
install-yarn: true
894+
node-version: '20.15'
888895
- run:
889896
name: Install dependencies
890897
command: |

‎.snyk‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Snyk (https://snyk.io) policy file
2+
exclude:
3+
global:
4+
- __mocks__/**
5+
- tests
6+
- redisinsight/api/test/**
7+
- "*.spec.ts"
8+
- "*.spec.tsx"

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# the best way to minimize the number of node_module restores and build steps
77
# while still keeping the final image small.
88

9-
FROM node:18.18-alpine as build
9+
FROM node:20.14-alpine as build
1010

1111
# update apk repository and install build dependencies
1212
RUN apk update && apk add --no-cache --virtual .gyp \
@@ -39,7 +39,7 @@ RUN yarn --cwd ./redisinsight/api install --production
3939
COPY ./redisinsight/api/.yarnclean.prod ./redisinsight/api/.yarnclean
4040
RUN yarn --cwd ./redisinsight/api autoclean --force
4141

42-
FROM node:18.18-alpine
42+
FROM 20.14-alpine
4343

4444
# runtime args and environment variables
4545
ARG NODE_ENV=production

‎api.Dockerfile‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎electron-builder.json‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"node_modules",
88
"package.json"
99
],
10-
"afterSign": "electron-builder-notarize",
1110
"artifactName": "Redis-Insight-${os}-${arch}.${ext}",
1211
"compression": "normal",
1312
"asarUnpack": [
@@ -32,6 +31,9 @@
3231
"arch": ["x64", "arm64"]
3332
}
3433
],
34+
"notarize": {
35+
"teamId": "UUK47G4BAZ"
36+
},
3537
"type": "distribution",
3638
"hardenedRuntime": true,
3739
"darkModeSupport": true,
@@ -50,14 +52,10 @@
5052
"asarUnpack": ["node_modules"],
5153
"provisioningProfile": "embedded.provisionprofile",
5254
"binaries": [
53-
"Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
54-
"Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
55-
"Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
56-
"Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
55+
"Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/build/Release/node_sqlite3.node",
56+
"Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/build/Release/node_sqlite3.node",
5757
"Contents/Resources/app-arm64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
58-
"Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
59-
"Contents/Resources/app-arm64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node",
60-
"Contents/Resources/app-x64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node"
58+
"Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node"
6159
],
6260
"artifactName": "Redis-Insight-${os}-${arch}-mas.${ext}"
6361
},
@@ -70,14 +68,10 @@
7068
"asarUnpack": ["node_modules"],
7169
"provisioningProfile": "dev.provisionprofile",
7270
"binaries": [
73-
"Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
74-
"Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
75-
"Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
76-
"Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
71+
"Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/build/Release/node_sqlite3.node",
72+
"Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/build/Release/node_sqlite3.node",
7773
"Contents/Resources/app-arm64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
78-
"Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
79-
"Contents/Resources/app-arm64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node",
80-
"Contents/Resources/app-x64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node"
74+
"Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node"
8175
],
8276
"artifactName": "Redis-Insight-${os}-${arch}-masDev.${ext}"
8377
},

‎package.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
"resolutions": {
8181
"**/trim": "0.0.3",
8282
"word-wrap": "1.2.4",
83-
"electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5",
8483
"**/semver": "^7.5.2",
8584
"rawproto/protobufjs": "^7.2.5"
8685
},
@@ -140,9 +139,9 @@
140139
"css-minimizer-webpack-plugin": "^6.0.0",
141140
"csv-parser": "^3.0.0",
142141
"csv-stringify": "^6.4.0",
143-
"electron": "25.8.4",
144-
"electron-builder": "^23.6.0",
145-
"electron-builder-notarize": "^1.5.1",
142+
"electron": "31.0.2",
143+
"electron-builder": "^24.13.3",
144+
"electron-builder-notarize": "^1.5.2",
146145
"electron-debug": "^3.2.0",
147146
"electron-devtools-installer": "^3.2.0",
148147
"esbuild-plugin-react-virtualized": "^1.0.4",

‎redisinsight/api/.jest.setup.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'reflect-metadata';
12
// Workaround for @Type test coverage
23
jest.mock("class-transformer", () => {
34
return {

‎redisinsight/api/config/default.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,15 @@ export default {
7676
tlsKey: process.env.RI_SERVER_TLS_KEY,
7777
staticContent: !!process.env.RI_SERVE_STATICS || true,
7878
buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
79-
appVersion: process.env.RI_APP_VERSION || '2.52.0',
79+
appVersion: process.env.RI_APP_VERSION || '2.54.0',
8080
requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
8181
excludeRoutes: [],
8282
excludeAuthRoutes: [],
8383
},
84+
encryption: {
85+
encryptionIV: process.env.RI_ENCRYPTION_IV || Buffer.alloc(16, 0),
86+
encryptionAlgorithm: process.env.RI_ENCRYPTION_ALGORYTHM || 'aes-256-cbc',
87+
},
8488
sockets: {
8589
cors: process.env.RI_SOCKETS_CORS ? process.env.RI_SOCKETS_CORS === 'true' : false,
8690
serveClient: process.env.RI_SOCKETS_SERVE_CLIENT ? process.env.RI_SOCKETS_SERVE_CLIENT === 'true' : false,
@@ -100,6 +104,7 @@ export default {
100104
retryTimes: parseInt(process.env.RI_CLIENTS_RETRY_TIMES, 10) || 3,
101105
retryDelay: parseInt(process.env.RI_CLIENTS_RETRY_DELAY, 10) || 500,
102106
maxRetriesPerRequest: parseInt(process.env.RI_CLIENTS_MAX_RETRIES_PER_REQUEST, 10) || 1,
107+
maxRedirections: parseInt(process.env.RI_CLIENTS_MAX_REDIRECTIONS, 10) || 3,
103108
slotsRefreshTimeout: parseInt(process.env.RI_CLIENTS_SLOTS_REQUEST_TIMEOUT, 10) || 5000,
104109
},
105110
redis_scan: {
@@ -140,7 +145,7 @@ export default {
140145
},
141146
content: {
142147
updateUrl: process.env.RI_CONTENT_UPDATE_URL
143-
|| 'https://github.com/RedisInsight/Statics/releases/download/2.42',
148+
|| 'https://github.com/RedisInsight/Statics/releases/download/2.54',
144149
zip: process.env.RI_CONTENT_ZIP || dataZipFileName,
145150
buildInfo: process.env.RI_CONTENT_INFO || buildInfoFileName,
146151
devMode: !!process.env.RI_CONTENT_PATH,

0 commit comments

Comments
 (0)