Skip to content

Commit 65e0d38

Browse files
vlad-dargelvlad-dargel
authored
Merge pull request #3229 from RedisInsight/bugfix/RI-5597-dependabot-alerts-2024-04
RI-5597: Fix Dependabot alerts
2 parents ae82d66 + 66b78d3 commit 65e0d38

File tree

20 files changed

+687
-727
lines changed

20 files changed

+687
-727
lines changed

‎package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@
8282
"word-wrap": "1.2.4",
8383
"electron-builder/app-builder-lib/@electron/universal/dir-compare/minimatch": "^3.0.5",
8484
"**/semver": "^7.5.2",
85-
"rawproto/protobufjs": "^7.2.5",
86-
"**/follow-redirects": "^1.15.4"
85+
"rawproto/protobufjs": "^7.2.5"
8786
},
8887
"devDependencies": {
8988
"@babel/preset-env": "^7.23.2",

‎redisinsight/api/package.json‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@
4545
"winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0"
4646
},
4747
"dependencies": {
48-
"@nestjs/common": "^9.0.11",
49-
"@nestjs/core": "^9.0.11",
50-
"@nestjs/event-emitter": "^1.3.1",
51-
"@nestjs/platform-express": "^9.0.11",
52-
"@nestjs/platform-socket.io": "^9.0.11",
48+
"@nestjs/common": "^10.3.7",
49+
"@nestjs/core": "^10.3.7",
50+
"@nestjs/event-emitter": "^2.0.4",
51+
"@nestjs/platform-express": "^10.3.7",
52+
"@nestjs/platform-socket.io": "^10.3.7",
5353
"@nestjs/serve-static": "^3.0.0",
54-
"@nestjs/swagger": "^6.1.2",
54+
"@nestjs/swagger": "^7.3.1",
5555
"@nestjs/typeorm": "^9.0.1",
56-
"@nestjs/websockets": "^9.0.11",
56+
"@nestjs/websockets": "^10.3.7",
5757
"@okta/okta-auth-js": "^7.3.0",
5858
"adm-zip": "^0.5.9",
5959
"analytics-node": "^4.0.1",
@@ -73,7 +73,6 @@
7373
"is-glob": "^4.0.1",
7474
"keytar": "^7.9.0",
7575
"lodash": "^4.17.20",
76-
"nest-router": "^1.0.9",
7776
"nest-winston": "^1.4.0",
7877
"nestjs-form-data": "^1.8.7",
7978
"node-version-compare": "^1.0.3",

‎redisinsight/api/src/app.module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
MiddlewareConsumer, Module, NestModule, OnModuleInit,
44
} from '@nestjs/common';
55
import { ServeStaticModule } from '@nestjs/serve-static';
6-
import { RouterModule } from 'nest-router';
6+
import { RouterModule } from '@nestjs/core';
77
import { join } from 'path';
88
import config, { Config } from 'src/utils/config';
99
import { PluginModule } from 'src/modules/plugin/plugin.module';
@@ -40,7 +40,7 @@ const PATH_CONFIG = config.get('dir_path') as Config['dir_path'];
4040
imports: [
4141
LocalDatabaseModule,
4242
CoreModule,
43-
RouterModule.forRoutes(routes),
43+
RouterModule.register(routes),
4444
AutodiscoveryModule,
4545
RedisEnterpriseModule,
4646
CloudModule.register(),

‎redisinsight/api/src/app.routes.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { Routes } from 'nest-router';
21
import { CliModule } from 'src/modules/cli/cli.module';
32
import { WorkbenchModule } from 'src/modules/workbench/workbench.module';
43
import { SlowLogModule } from 'src/modules/slow-log/slow-log.module';
@@ -9,7 +8,7 @@ import { TriggeredFunctionsModule } from 'src/modules/triggered-functions/trigge
98
import { BulkActionsModule } from 'src/modules/bulk-actions/bulk-actions.module';
109
import { DatabaseRecommendationModule } from 'src/modules/database-recommendation/database-recommendation.module';
1110

12-
export const routes: Routes = [
11+
export const routes = [
1312
{
1413
path: '/databases',
1514
children: [

‎redisinsight/api/src/modules/browser/browser-history/browser-history.module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DynamicModule, Global, Module } from '@nestjs/common';
2-
import { RouterModule } from 'nest-router';
2+
import { RouterModule } from '@nestjs/core';
33
import { BrowserHistoryService } from 'src/modules/browser/browser-history/browser-history.service';
44
import { BrowserHistoryController } from 'src/modules/browser/browser-history/browser-history.controller';
55
import { BrowserHistoryProvider } from 'src/modules/browser/browser-history/providers/browser-history.provider';
@@ -11,7 +11,7 @@ export class BrowserHistoryModule {
1111
return {
1212
module: BrowserHistoryModule,
1313
imports: [
14-
RouterModule.forRoutes([{
14+
RouterModule.register([{
1515
path: route,
1616
module: BrowserHistoryModule,
1717
}]),

‎redisinsight/api/src/modules/browser/hash/hash.module.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
MiddlewareConsumer,
44
Module,
55
} from '@nestjs/common';
6-
import { RouterModule } from 'nest-router';
6+
import { RouterModule } from '@nestjs/core';
77
import { RedisConnectionMiddleware } from 'src/middleware/redis-connection.middleware';
88
import { HashService } from 'src/modules/browser/hash/hash.service';
99
import { HashController } from 'src/modules/browser/hash/hash.controller';
@@ -14,7 +14,7 @@ export class HashModule {
1414
return {
1515
module: HashModule,
1616
imports: [
17-
RouterModule.forRoutes([{
17+
RouterModule.register([{
1818
path: route,
1919
module: HashModule,
2020
}]),
@@ -27,6 +27,6 @@ export class HashModule {
2727
configure(consumer: MiddlewareConsumer): any {
2828
consumer
2929
.apply(RedisConnectionMiddleware)
30-
.forRoutes(RouterModule.resolvePath(HashController));
30+
.forRoutes(HashController);
3131
}
3232
}

‎redisinsight/api/src/modules/browser/keys/keys.module.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
MiddlewareConsumer,
44
Module,
55
} from '@nestjs/common';
6-
import { RouterModule } from 'nest-router';
6+
import { RouterModule } from '@nestjs/core';
77
import { RedisConnectionMiddleware } from 'src/middleware/redis-connection.middleware';
88
import { KeysController } from 'src/modules/browser/keys/keys.controller';
99
import { StandaloneScannerStrategy } from 'src/modules/browser/keys/scanner/strategies/standalone.scanner.strategy';
@@ -30,7 +30,7 @@ export class KeysModule {
3030
return {
3131
module: KeysModule,
3232
imports: [
33-
RouterModule.forRoutes([{
33+
RouterModule.register([{
3434
path: route,
3535
module: KeysModule,
3636
}]),
@@ -63,6 +63,6 @@ export class KeysModule {
6363
configure(consumer: MiddlewareConsumer): any {
6464
consumer
6565
.apply(RedisConnectionMiddleware)
66-
.forRoutes(RouterModule.resolvePath(KeysController));
66+
.forRoutes(KeysController);
6767
}
6868
}

‎redisinsight/api/src/modules/browser/list/list.module.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
MiddlewareConsumer,
44
Module,
55
} from '@nestjs/common';
6-
import { RouterModule } from 'nest-router';
6+
import { RouterModule } from '@nestjs/core';
77
import { RedisConnectionMiddleware } from 'src/middleware/redis-connection.middleware';
88
import { ListService } from 'src/modules/browser/list/list.service';
99
import { ListController } from 'src/modules/browser/list/list.controller';
@@ -14,7 +14,7 @@ export class ListModule {
1414
return {
1515
module: ListModule,
1616
imports: [
17-
RouterModule.forRoutes([{
17+
RouterModule.register([{
1818
path: route,
1919
module: ListModule,
2020
}]),
@@ -27,6 +27,6 @@ export class ListModule {
2727
configure(consumer: MiddlewareConsumer): any {
2828
consumer
2929
.apply(RedisConnectionMiddleware)
30-
.forRoutes(RouterModule.resolvePath(ListController));
30+
.forRoutes(ListController);
3131
}
3232
}

‎redisinsight/api/src/modules/browser/redisearch/redisearch.module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DynamicModule, Module } from '@nestjs/common';
2-
import { RouterModule } from 'nest-router';
2+
import { RouterModule } from '@nestjs/core';
33
import { RedisearchService } from 'src/modules/browser/redisearch/redisearch.service';
44
import { RedisearchController } from 'src/modules/browser/redisearch/redisearch.controller';
55

@@ -9,7 +9,7 @@ export class RedisearchModule {
99
return {
1010
module: RedisearchModule,
1111
imports: [
12-
RouterModule.forRoutes([{
12+
RouterModule.register([{
1313
path: route,
1414
module: RedisearchModule,
1515
}]),

‎redisinsight/api/src/modules/browser/rejson-rl/rejson-rl.module.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
MiddlewareConsumer,
44
Module,
55
} from '@nestjs/common';
6-
import { RouterModule } from 'nest-router';
6+
import { RouterModule } from '@nestjs/core';
77
import { RedisConnectionMiddleware } from 'src/middleware/redis-connection.middleware';
88
import { RejsonRlController } from 'src/modules/browser/rejson-rl/rejson-rl.controller';
99
import { RejsonRlService } from 'src/modules/browser/rejson-rl/rejson-rl.service';
@@ -14,7 +14,7 @@ export class RejsonRlModule {
1414
return {
1515
module: RejsonRlModule,
1616
imports: [
17-
RouterModule.forRoutes([{
17+
RouterModule.register([{
1818
path: route,
1919
module: RejsonRlModule,
2020
}]),
@@ -27,6 +27,6 @@ export class RejsonRlModule {
2727
configure(consumer: MiddlewareConsumer): any {
2828
consumer
2929
.apply(RedisConnectionMiddleware)
30-
.forRoutes(RouterModule.resolvePath(RejsonRlController));
30+
.forRoutes(RejsonRlController);
3131
}
3232
}

0 commit comments

Comments
 (0)