Skip to content

Commit ce13cd5

Browse files
Merge pull request #3960 from RedisInsight/be/feature/api-packages-the-rest
fix the rest of the modules + electron
2 parents 5715ed8 + 2837da7 commit ce13cd5

File tree

5 files changed

+61
-37
lines changed

5 files changed

+61
-37
lines changed

configs/webpack.config.base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const configuration: webpack.Configuration = {
6161
// 'reflect-metadata',
6262
// 'swagger-ui-express',
6363
// 'class-transformer',
64-
// 'class-transformer/storage',
64+
'class-transformer/storage',
6565
// '@nestjs/websockets',
6666
// '@nestjs/core/adapters/http-adapter',
6767
// '@nestjs/core/helpers/router-method-factory',

redisinsight/api/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"@nestjs/platform-express/express": "^4.21.1",
5050
"@nestjs/platform-socket.io/socket.io": "^4.8.0",
5151
"@nestjs/cli/**/braces": "^3.0.3",
52+
"@okta/okta-auth-js/**/jsonpath-plus": "^10.0.0",
5253
"**/semver": "^7.5.2",
5354
"winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0"
5455
},
@@ -62,7 +63,7 @@
6263
"@nestjs/swagger": "^7.4.2",
6364
"@nestjs/typeorm": "^10.0.2",
6465
"@nestjs/websockets": "^10.4.4",
65-
"@okta/okta-auth-js": "^7.3.0",
66+
"@okta/okta-auth-js": "^7.8.0",
6667
"@segment/analytics-node": "^2.1.3",
6768
"adm-zip": "^0.5.9",
6869
"axios": "^1.7.4",

redisinsight/api/yarn.lock

Lines changed: 52 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,14 @@
447447
dependencies:
448448
"@babel/helper-plugin-utils" "^7.25.7"
449449

450-
"@babel/runtime@^7.12.5", "@babel/runtime@^7.16.0", "@babel/runtime@^7.6.2":
450+
451+
version "7.22.10"
452+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.10.tgz#ae3e9631fd947cb7e3610d3e9d8fef5f76696682"
453+
integrity sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==
454+
dependencies:
455+
regenerator-runtime "^0.14.0"
456+
457+
"@babel/runtime@^7.12.5":
451458
version "7.22.5"
452459
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
453460
integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
@@ -1027,6 +1034,16 @@
10271034
"@jridgewell/resolve-uri" "3.1.0"
10281035
"@jridgewell/sourcemap-codec" "1.4.14"
10291036

1037+
"@jsep-plugin/assignment@^1.2.1":
1038+
version "1.2.1"
1039+
resolved "https://registry.yarnpkg.com/@jsep-plugin/assignment/-/assignment-1.2.1.tgz#07277bdd7862451a865d391e2142efba33f46c9b"
1040+
integrity sha512-gaHqbubTi29aZpVbBlECRpmdia+L5/lh2BwtIJTmtxdbecEyyX/ejAOg7eQDGNvGOUmPY7Z2Yxdy9ioyH/VJeA==
1041+
1042+
"@jsep-plugin/regex@^1.0.3":
1043+
version "1.0.3"
1044+
resolved "https://registry.yarnpkg.com/@jsep-plugin/regex/-/regex-1.0.3.tgz#3aeaa2e5fa45d89de116aeafbfa41c95935b7f6d"
1045+
integrity sha512-XfZgry4DwEZvSFtS/6Y+R48D7qJYJK6R9/yJFyUFHCIUMEEHuJ4X95TDgJp5QkmzfLYvapMPzskV5HpIDrREug==
1046+
10301047
"@ljharb/through@^2.3.12":
10311048
version "2.3.13"
10321049
resolved "https://registry.yarnpkg.com/@ljharb/through/-/through-2.3.13.tgz#b7e4766e0b65aa82e529be945ab078de79874edc"
@@ -1232,16 +1249,16 @@
12321249
consola "^2.15.0"
12331250
node-fetch "^2.6.1"
12341251

1235-
"@okta/okta-auth-js@^7.3.0":
1236-
version "7.3.0"
1237-
resolved "https://registry.yarnpkg.com/@okta/okta-auth-js/-/okta-auth-js-7.3.0.tgz#79a4392ab157960cf6d72811447279edd9f74589"
1238-
integrity sha512-9/e+sMs5PBFPiujoZRzhEaO9s7XPGzUk/Ongrlwo8EAnC6/oSO/qodlSlJy2ehNZmexdESOgkebmxF8WuKItSA==
1252+
"@okta/okta-auth-js@^7.8.0":
1253+
version "7.8.0"
1254+
resolved "https://registry.yarnpkg.com/@okta/okta-auth-js/-/okta-auth-js-7.8.0.tgz#1ab69c47cbf6fd7f3ce9f6caed2e05685f5bb22d"
1255+
integrity sha512-yFjv0wD9T5GYcFg6zzQ0M/WGdq2IMoaI/SK/0s9AqazZ6ILv6eyZq47L2nJJ7xld5DBFUhVewnD6BS3Ee7Im1A==
12391256
dependencies:
12401257
"@babel/runtime" "^7.12.5"
12411258
"@peculiar/webcrypto" "^1.4.0"
12421259
Base64 "1.1.0"
12431260
atob "^2.1.2"
1244-
broadcast-channel "~4.17.0"
1261+
broadcast-channel "~5.3.0"
12451262
btoa "^1.2.1"
12461263
core-js "^3.6.5"
12471264
cross-fetch "^3.1.5"
@@ -2379,16 +2396,15 @@ braces@^3.0.3, braces@~3.0.2:
23792396
dependencies:
23802397
fill-range "^7.1.1"
23812398

2382-
broadcast-channel@~4.17.0:
2383-
version "4.17.0"
2384-
resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-4.17.0.tgz#599d44674b09a4e2e07af6da5d03b45ca8bffd11"
2385-
integrity sha512-r2GSQMNgZv7eAsbdsu9xofSjc3J2diCQTPkSuyVhLBfx8fylLCVhi5KheuhuAQBJNd4pxqUyz9U6rvdnt7GZng==
2399+
broadcast-channel@~5.3.0:
2400+
version "5.3.0"
2401+
resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-5.3.0.tgz#9d9e55fb8db2a1dbbe436ae6d51382a354e76fc3"
2402+
integrity sha512-0PmDYc/iUGZ4QbnCnV7u+WleygiS1bZ4oV6t4rANXYtSgEFtGhB5jimJPLOVpPtce61FVxrH8CYylfO5g7OLKw==
23862403
dependencies:
2387-
"@babel/runtime" "^7.16.0"
2404+
"@babel/runtime" "7.22.10"
23882405
oblivious-set "1.1.1"
23892406
p-queue "6.6.2"
2390-
rimraf "3.0.2"
2391-
unload "2.3.1"
2407+
unload "2.4.1"
23922408

23932409
browser-or-node@^2.1.1:
23942410
version "2.1.1"
@@ -3264,11 +3280,6 @@ detect-newline@^3.0.0:
32643280
resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
32653281
integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
32663282

3267-
3268-
version "2.1.0"
3269-
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
3270-
integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
3271-
32723283
detect-port@^1.5.1:
32733284
version "1.5.1"
32743285
resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.5.1.tgz#451ca9b6eaf20451acb0799b8ab40dff7718727b"
@@ -5589,6 +5600,11 @@ [email protected]:
55895600
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
55905601
integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
55915602

5603+
jsep@^1.3.9:
5604+
version "1.3.9"
5605+
resolved "https://registry.yarnpkg.com/jsep/-/jsep-1.3.9.tgz#8ce42df80ee9c1b39e52d0dd062a465342f35440"
5606+
integrity sha512-i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw==
5607+
55925608
jsesc@^2.5.1:
55935609
version "2.5.2"
55945610
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -5660,10 +5676,14 @@ jsonfile@^6.0.1:
56605676
optionalDependencies:
56615677
graceful-fs "^4.1.6"
56625678

5663-
jsonpath-plus@^6.0.1:
5664-
version "6.0.1"
5665-
resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-6.0.1.tgz#9a3e16cedadfab07a3d8dc4e8cd5df4ed8f49c4d"
5666-
integrity sha512-EvGovdvau6FyLexFH2OeXfIITlgIbgZoAZe3usiySeaIDm5QS+A10DKNpaPBBqqRSZr2HN6HVNXxtwUAr2apEw==
5679+
jsonpath-plus@^10.0.0, jsonpath-plus@^6.0.1:
5680+
version "10.0.0"
5681+
resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-10.0.0.tgz#7a747d47e20a27867dbbc80b57fd554788b91474"
5682+
integrity sha512-v7j76HGp/ibKlXYeZ7UrfCLSNDaBWuJMA0GaMjA4sZJtCtY89qgPyToDDcl2zdeHh4B5q/B3g2pQdW76fOg/dA==
5683+
dependencies:
5684+
"@jsep-plugin/assignment" "^1.2.1"
5685+
"@jsep-plugin/regex" "^1.0.3"
5686+
jsep "^1.3.9"
56675687

56685688
jsonwebtoken@^9.0.2:
56695689
version "9.0.2"
@@ -7220,6 +7240,11 @@ regenerator-runtime@^0.13.11:
72207240
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
72217241
integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
72227242

7243+
regenerator-runtime@^0.14.0:
7244+
version "0.14.1"
7245+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
7246+
integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
7247+
72237248
regexp.prototype.flags@^1.4.3:
72247249
version "1.5.0"
72257250
resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
@@ -7319,7 +7344,7 @@ reusify@^1.0.4:
73197344
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
73207345
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
73217346

7322-
rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
7347+
rimraf@^3.0.0, rimraf@^3.0.2:
73237348
version "3.0.2"
73247349
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
73257350
integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -8491,13 +8516,10 @@ universalify@^2.0.0:
84918516
resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
84928517
integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
84938518

8494-
8495-
version "2.3.1"
8496-
resolved "https://registry.yarnpkg.com/unload/-/unload-2.3.1.tgz#9d16862d372a5ce5cb630ad1309c2fd6e35dacfe"
8497-
integrity sha512-MUZEiDqvAN9AIDRbbBnVYVvfcR6DrjCqeU2YQMmliFZl9uaBUjTkhuDQkBiyAy8ad5bx1TXVbqZ3gg7namsWjA==
8498-
dependencies:
8499-
"@babel/runtime" "^7.6.2"
8500-
detect-node "2.1.0"
8519+
8520+
version "2.4.1"
8521+
resolved "https://registry.yarnpkg.com/unload/-/unload-2.4.1.tgz#b0c5b7fb44e17fcbf50dcb8fb53929c59dd226a5"
8522+
integrity sha512-IViSAm8Z3sRBYA+9wc0fLQmU9Nrxb16rcDmIiR6Y9LJSZzI7QY5QsDhqPpKOjAn0O9/kfK1TfNEMMAGPTIraPw==
85018523

85028524
[email protected], unpipe@~1.0.0:
85038525
version "1.0.0"

redisinsight/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"postinstall": "npx patch-package"
1616
},
1717
"resolutions": {
18-
"**/semver": "^7.5.2"
18+
"**/semver": "^7.5.2",
19+
"sqlite3/**/tar": "^6.2.1"
1920
},
2021
"dependencies": {
2122
"keytar": "^7.9.0",

redisinsight/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -876,10 +876,10 @@ tar-stream@^2.1.4:
876876
inherits "^2.0.3"
877877
readable-stream "^3.1.1"
878878

879-
tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
880-
version "6.2.0"
881-
resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
882-
integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
879+
tar@^6.0.2, tar@^6.1.11, tar@^6.1.2, tar@^6.2.1:
880+
version "6.2.1"
881+
resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
882+
integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
883883
dependencies:
884884
chownr "^2.0.0"
885885
fs-minipass "^2.0.0"

0 commit comments

Comments
 (0)