Skip to content

Commit 53e4ddf

Browse files
authored
Merge pull request #915 from rocket-admin/backend_master_encryption_rework
update imports to include file extensions and upgrade NestJS dependencies
2 parents 9eb5c71 + ba4d6d5 commit 53e4ddf

File tree

4 files changed

+55
-119
lines changed

4 files changed

+55
-119
lines changed

backend/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
"@amplitude/node": "1.10.2",
3636
"@aws-sdk/lib-dynamodb": "^3.679.0",
3737
"@faker-js/faker": "^9.1.0",
38-
"@nestjs/common": "10.4.6",
38+
"@nestjs/common": "10.4.8",
3939
"@nestjs/config": "3.3.0",
40-
"@nestjs/core": "10.4.6",
41-
"@nestjs/microservices": "^10.4.6",
42-
"@nestjs/platform-express": "10.4.6",
40+
"@nestjs/core": "10.4.8",
41+
"@nestjs/microservices": "^10.4.8",
42+
"@nestjs/platform-express": "10.4.8",
4343
"@nestjs/schedule": "^4.1.1",
44-
"@nestjs/swagger": "^8.0.1",
44+
"@nestjs/swagger": "^8.0.7",
4545
"@nestjs/typeorm": "^10.0.2",
4646
"@nestjsx/crud": "4.6.2",
4747
"@rocketadmin/shared-code": "workspace:*",
@@ -98,9 +98,9 @@
9898
},
9999
"devDependencies": {
100100
"@ava/typescript": "4.1.0",
101-
"@nestjs/cli": "^10.4.5",
101+
"@nestjs/cli": "^10.4.8",
102102
"@nestjs/schematics": "10.2.3",
103-
"@nestjs/testing": "^10.4.6",
103+
"@nestjs/testing": "^10.4.8",
104104
"@types/bcrypt": "^5.0.2",
105105
"@types/body-parser": "^1.19.5",
106106
"@types/cookie-parser": "^1.4.7",

backend/src/entities/group/use-cases/find-all-users-in-group.use.case.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Inject, Injectable } from '@nestjs/common';
2-
import { UserEntity } from 'src/entities/user/user.entity';
2+
import { UserEntity } from 'src/entities/user/user.entity.js';
33
import AbstractUseCase from '../../../common/abstract-use.case.js';
44
import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
55
import { BaseType } from '../../../common/data-injection.tokens.js';

backend/src/entities/table-logs/repository/table-logs-custom-repository-extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { TableLogsEntity } from '../table-logs.entity.js';
66
import { buildCreatedLogRecord } from '../utils/build-created-log-record.js';
77
import { buildTableLogsEntity } from '../utils/build-table-logs-entity.js';
88
import { IFindLogsOptions, ITableLogsRepository } from './table-logs-repository.interface.js';
9-
import { ReadStream } from 'typeorm/platform/PlatformTools';
9+
import { ReadStream } from 'typeorm/platform/PlatformTools.js';
1010

1111
export const tableLogsCustomRepositoryExtension: ITableLogsRepository = {
1212
async createLogRecord(logData: CreateLogRecordDs): Promise<CreatedLogRecordDs> {

yarn.lock

Lines changed: 46 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,9 +1814,9 @@ __metadata:
18141814
languageName: node
18151815
linkType: hard
18161816

1817-
"@nestjs/cli@npm:^10.4.5, @nestjs/cli@npm:^10.4.7":
1818-
version: 10.4.7
1819-
resolution: "@nestjs/cli@npm:10.4.7"
1817+
"@nestjs/cli@npm:^10.4.7, @nestjs/cli@npm:^10.4.8":
1818+
version: 10.4.8
1819+
resolution: "@nestjs/cli@npm:10.4.8"
18201820
dependencies:
18211821
"@angular-devkit/core": 17.3.11
18221822
"@angular-devkit/schematics": 17.3.11
@@ -1827,13 +1827,13 @@ __metadata:
18271827
cli-table3: 0.6.5
18281828
commander: 4.1.1
18291829
fork-ts-checker-webpack-plugin: 9.0.2
1830-
glob: 10.4.2
1830+
glob: 10.4.5
18311831
inquirer: 8.2.6
18321832
node-emoji: 1.11.0
18331833
ora: 5.4.1
18341834
tree-kill: 1.2.2
18351835
tsconfig-paths: 4.2.0
1836-
tsconfig-paths-webpack-plugin: 4.1.0
1836+
tsconfig-paths-webpack-plugin: 4.2.0
18371837
typescript: 5.6.3
18381838
webpack: 5.96.1
18391839
webpack-node-externals: 3.0.0
@@ -1847,13 +1847,13 @@ __metadata:
18471847
optional: true
18481848
bin:
18491849
nest: bin/nest.js
1850-
checksum: 53063443cf64a5fc9af50ab5b580e566d7a7c4dd78e4158808f5dd9d5833a54087f8c6a681a4649fefce03ee0ae93422d63642f27c709507b6a50faf600f7df3
1850+
checksum: 5e2e2cd06b2de50571ecfe8772a0ca7074fce945ea5d1fb8db54ad941d407b8ddd715eb35aca0c3d7797f60fb3a958b26d53af993d3781e65cc9e7cf42614a93
18511851
languageName: node
18521852
linkType: hard
18531853

1854-
"@nestjs/common@npm:10.4.6":
1855-
version: 10.4.6
1856-
resolution: "@nestjs/common@npm:10.4.6"
1854+
"@nestjs/common@npm:10.4.8, @nestjs/common@npm:^10.4.7":
1855+
version: 10.4.8
1856+
resolution: "@nestjs/common@npm:10.4.8"
18571857
dependencies:
18581858
iterare: 1.2.1
18591859
tslib: 2.7.0
@@ -1868,28 +1868,7 @@ __metadata:
18681868
optional: true
18691869
class-validator:
18701870
optional: true
1871-
checksum: 82478ce932867104af9a31b755af369bfb20931eb368874a22abfc553775e2c0fc3e55d07c8c948ab664a15f3ff6193bafb691658054b0b668a40a7e947033a2
1872-
languageName: node
1873-
linkType: hard
1874-
1875-
"@nestjs/common@npm:^10.4.7":
1876-
version: 10.4.7
1877-
resolution: "@nestjs/common@npm:10.4.7"
1878-
dependencies:
1879-
iterare: 1.2.1
1880-
tslib: 2.7.0
1881-
uid: 2.0.2
1882-
peerDependencies:
1883-
class-transformer: "*"
1884-
class-validator: "*"
1885-
reflect-metadata: ^0.1.12 || ^0.2.0
1886-
rxjs: ^7.1.0
1887-
peerDependenciesMeta:
1888-
class-transformer:
1889-
optional: true
1890-
class-validator:
1891-
optional: true
1892-
checksum: ab8d6a6dffbfda54e58f0036567d0670224bb014716cde6cf33d2b243b98f65387488d0a96023f68421194e541d9a75461efd4a8218cace9b3597297b9125c9f
1871+
checksum: 6f87c7d5a158f71e8ed49a5bea14e7e1e72b414af1220eb7e2b17007247cb667c0e07eefd493d4ca671b617c6a167a524d850e0d4ae70c645bb843e0ced1e8a2
18931872
languageName: node
18941873
linkType: hard
18951874

@@ -1907,37 +1886,9 @@ __metadata:
19071886
languageName: node
19081887
linkType: hard
19091888

1910-
"@nestjs/core@npm:10.4.6":
1911-
version: 10.4.6
1912-
resolution: "@nestjs/core@npm:10.4.6"
1913-
dependencies:
1914-
"@nuxtjs/opencollective": 0.3.2
1915-
fast-safe-stringify: 2.1.1
1916-
iterare: 1.2.1
1917-
path-to-regexp: 3.3.0
1918-
tslib: 2.7.0
1919-
uid: 2.0.2
1920-
peerDependencies:
1921-
"@nestjs/common": ^10.0.0
1922-
"@nestjs/microservices": ^10.0.0
1923-
"@nestjs/platform-express": ^10.0.0
1924-
"@nestjs/websockets": ^10.0.0
1925-
reflect-metadata: ^0.1.12 || ^0.2.0
1926-
rxjs: ^7.1.0
1927-
peerDependenciesMeta:
1928-
"@nestjs/microservices":
1929-
optional: true
1930-
"@nestjs/platform-express":
1931-
optional: true
1932-
"@nestjs/websockets":
1933-
optional: true
1934-
checksum: d7d6e8129c344c3b7d5b41a98846de64614587842dd84b3050438da738530bdbea211efa0a08c65c274d2616ffb560096ab019254710b355ff57d92432ccb0ab
1935-
languageName: node
1936-
linkType: hard
1937-
1938-
"@nestjs/core@npm:^10.4.7":
1939-
version: 10.4.7
1940-
resolution: "@nestjs/core@npm:10.4.7"
1889+
"@nestjs/core@npm:10.4.8, @nestjs/core@npm:^10.4.7":
1890+
version: 10.4.8
1891+
resolution: "@nestjs/core@npm:10.4.8"
19411892
dependencies:
19421893
"@nuxtjs/opencollective": 0.3.2
19431894
fast-safe-stringify: 2.1.1
@@ -1959,7 +1910,7 @@ __metadata:
19591910
optional: true
19601911
"@nestjs/websockets":
19611912
optional: true
1962-
checksum: 7e38384f513774aa2908143322a62b19b87c876e51a7a5a86d30bf9b5db688716c4e54eece747ccd8f7970158dc85e501e6b89808cd8197f3ab4a7bcc66b65ed
1913+
checksum: 2f3fc71b5305ef2bca739ad64a204e0ed4316896c7410c8b47f5f4cb65ea1f73e6eb9e0ef626e707258d269a69b4c8e4f953aa98e3df536410d33adc3be71b35
19631914
languageName: node
19641915
linkType: hard
19651916

@@ -1980,9 +1931,9 @@ __metadata:
19801931
languageName: node
19811932
linkType: hard
19821933

1983-
"@nestjs/microservices@npm:^10.4.6":
1984-
version: 10.4.7
1985-
resolution: "@nestjs/microservices@npm:10.4.7"
1934+
"@nestjs/microservices@npm:^10.4.8":
1935+
version: 10.4.8
1936+
resolution: "@nestjs/microservices@npm:10.4.8"
19861937
dependencies:
19871938
iterare: 1.2.1
19881939
tslib: 2.7.0
@@ -2019,13 +1970,13 @@ __metadata:
20191970
optional: true
20201971
nats:
20211972
optional: true
2022-
checksum: cb5ec0d5f8e4758d1e66744ed507ad075e73e06b615447356a53816737c4d5f8e3093696ec5a95c00fb4842f2eb61b69ec5fa81584d649dbd39f34cf0a3a9fd3
1973+
checksum: 184d2a4eca4640aeff70c1874f6ea6b05eae89aa43fb61b310baee6938c9212fa70d0a6c812e040c46be462a2d6451f8b637f13394de42ccfabd03ebf4cb25db
20231974
languageName: node
20241975
linkType: hard
20251976

2026-
"@nestjs/platform-express@npm:10.4.6":
2027-
version: 10.4.6
2028-
resolution: "@nestjs/platform-express@npm:10.4.6"
1977+
"@nestjs/platform-express@npm:10.4.8, @nestjs/platform-express@npm:^10.4.7":
1978+
version: 10.4.8
1979+
resolution: "@nestjs/platform-express@npm:10.4.8"
20291980
dependencies:
20301981
body-parser: 1.20.3
20311982
cors: 2.8.5
@@ -2035,23 +1986,7 @@ __metadata:
20351986
peerDependencies:
20361987
"@nestjs/common": ^10.0.0
20371988
"@nestjs/core": ^10.0.0
2038-
checksum: 64714543715c02b13e799cbd72fab02bd103bb57607aa544302d1dafdbbf2eec0f37a9d8d6556c55ddfe54017d3852113776ffd4abf796d560010049a67c57b4
2039-
languageName: node
2040-
linkType: hard
2041-
2042-
"@nestjs/platform-express@npm:^10.4.7":
2043-
version: 10.4.7
2044-
resolution: "@nestjs/platform-express@npm:10.4.7"
2045-
dependencies:
2046-
body-parser: 1.20.3
2047-
cors: 2.8.5
2048-
express: 4.21.1
2049-
multer: 1.4.4-lts.1
2050-
tslib: 2.7.0
2051-
peerDependencies:
2052-
"@nestjs/common": ^10.0.0
2053-
"@nestjs/core": ^10.0.0
2054-
checksum: f83247ed0c791226a9b42f2548b59858958bf6a4886f608a744cbd0bb46a13c4fa871a608e9929c107e3c9f3a9e2c0a939afbf64e0f881b7603eae7d9f01640a
1989+
checksum: 603166f9cd871d2b90fee71ea990547ce4fc9d65538ccacd3537667ed1f194b583d66f8b23c3ae8d249fb78b8ecd6a28929b22d055c2d2d7bf326aefc4d44295
20551990
languageName: node
20561991
linkType: hard
20571992

@@ -2097,9 +2032,9 @@ __metadata:
20972032
languageName: node
20982033
linkType: hard
20992034

2100-
"@nestjs/swagger@npm:^8.0.1":
2101-
version: 8.0.5
2102-
resolution: "@nestjs/swagger@npm:8.0.5"
2035+
"@nestjs/swagger@npm:^8.0.7":
2036+
version: 8.0.7
2037+
resolution: "@nestjs/swagger@npm:8.0.7"
21032038
dependencies:
21042039
"@microsoft/tsdoc": ^0.15.0
21052040
"@nestjs/mapped-types": 2.0.6
@@ -2121,13 +2056,13 @@ __metadata:
21212056
optional: true
21222057
class-validator:
21232058
optional: true
2124-
checksum: 98defc21905b5b9f48d68c61762890cb2c85f51a05f2341de49004ac6256b13bf3ed0e909b540f69b6c430f927d0c275b30e78b113be668f9f080c67c766cfcc
2059+
checksum: 7514401dddb2d776bf32a50e0ec17c7c5c7675d76b9bbb66c714946e7f2de84b8ca626fe9ea40f676f0f014020335e0480c8cd678221fc620109b2f882bcbd33
21252060
languageName: node
21262061
linkType: hard
21272062

2128-
"@nestjs/testing@npm:^10.4.6, @nestjs/testing@npm:^10.4.7":
2129-
version: 10.4.7
2130-
resolution: "@nestjs/testing@npm:10.4.7"
2063+
"@nestjs/testing@npm:^10.4.7, @nestjs/testing@npm:^10.4.8":
2064+
version: 10.4.8
2065+
resolution: "@nestjs/testing@npm:10.4.8"
21312066
dependencies:
21322067
tslib: 2.7.0
21332068
peerDependencies:
@@ -2140,7 +2075,7 @@ __metadata:
21402075
optional: true
21412076
"@nestjs/platform-express":
21422077
optional: true
2143-
checksum: 9091bc519b5f387a9ce45a697d3f839ceb75134e9258d85e9fc97a1e26beaf07329df157fdd48d8f7e1f37a3f9f2a9686d56f1211295c4061e791d06401d32b2
2078+
checksum: 57c17a5a806320def0cca8c663a6618f0c11436f9df1f4332e3046fad1dc56b73be9364aee47eda1c04dbf2b1fecec51d57140d0946b8a36fd2063abbe13f1cd
21442079
languageName: node
21452080
linkType: hard
21462081

@@ -4781,16 +4716,16 @@ __metadata:
47814716
"@ava/typescript": 4.1.0
47824717
"@aws-sdk/lib-dynamodb": ^3.679.0
47834718
"@faker-js/faker": ^9.1.0
4784-
"@nestjs/cli": ^10.4.5
4785-
"@nestjs/common": 10.4.6
4719+
"@nestjs/cli": ^10.4.8
4720+
"@nestjs/common": 10.4.8
47864721
"@nestjs/config": 3.3.0
4787-
"@nestjs/core": 10.4.6
4788-
"@nestjs/microservices": ^10.4.6
4789-
"@nestjs/platform-express": 10.4.6
4722+
"@nestjs/core": 10.4.8
4723+
"@nestjs/microservices": ^10.4.8
4724+
"@nestjs/platform-express": 10.4.8
47904725
"@nestjs/schedule": ^4.1.1
47914726
"@nestjs/schematics": 10.2.3
4792-
"@nestjs/swagger": ^8.0.1
4793-
"@nestjs/testing": ^10.4.6
4727+
"@nestjs/swagger": ^8.0.7
4728+
"@nestjs/testing": ^10.4.8
47944729
"@nestjs/typeorm": ^10.0.2
47954730
"@nestjsx/crud": 4.6.2
47964731
"@rocketadmin/shared-code": "workspace:*"
@@ -7662,9 +7597,9 @@ __metadata:
76627597
languageName: node
76637598
linkType: hard
76647599

7665-
"glob@npm:10.4.2, glob@npm:^10.2.2, glob@npm:^10.3.10":
7666-
version: 10.4.2
7667-
resolution: "glob@npm:10.4.2"
7600+
"glob@npm:10.4.5, glob@npm:^10.2.2, glob@npm:^10.3.10":
7601+
version: 10.4.5
7602+
resolution: "glob@npm:10.4.5"
76687603
dependencies:
76697604
foreground-child: ^3.1.0
76707605
jackspeak: ^3.1.2
@@ -7674,7 +7609,7 @@ __metadata:
76747609
path-scurry: ^1.11.1
76757610
bin:
76767611
glob: dist/esm/bin.mjs
7677-
checksum: bd7c0e30701136e936f414e5f6f82c7f04503f01df77408f177aa584927412f0bde0338e6ec541618cd21eacc57dde33e7b3c6c0a779cc1c6e6a0e14f3d15d9b
7612+
checksum: 0bc725de5e4862f9f387fd0f2b274baf16850dcd2714502ccf471ee401803997983e2c05590cb65f9675a3c6f2a58e7a53f9e365704108c6ad3cbf1d60934c4a
76787613
languageName: node
76797614
linkType: hard
76807615

@@ -12806,14 +12741,15 @@ __metadata:
1280612741
languageName: node
1280712742
linkType: hard
1280812743

12809-
"tsconfig-paths-webpack-plugin@npm:4.1.0":
12810-
version: 4.1.0
12811-
resolution: "tsconfig-paths-webpack-plugin@npm:4.1.0"
12744+
"tsconfig-paths-webpack-plugin@npm:4.2.0":
12745+
version: 4.2.0
12746+
resolution: "tsconfig-paths-webpack-plugin@npm:4.2.0"
1281212747
dependencies:
1281312748
chalk: ^4.1.0
1281412749
enhanced-resolve: ^5.7.0
12750+
tapable: ^2.2.1
1281512751
tsconfig-paths: ^4.1.2
12816-
checksum: f6e9a8a407e1a405b0f2531184296d9f033cb4fe5837282b757ab4a2f4cd82a3117e62c4b86d56c7d47749c7f1345aa438ec6417dbf64a0ec74a292fe9eae44d
12752+
checksum: b35e4da5fb4ee438267125f369220102a061824c1dd568cd84e9db2368b72581ec7b88db1a5fda180bba65ff7b7597b18561a24f1db9c9a85fdc803bea122aa6
1281712753
languageName: node
1281812754
linkType: hard
1281912755

0 commit comments

Comments
 (0)