fix: downgrade ts version

Signed-off-by: Innei <tukon479@gmail.com>
This commit is contained in:
Innei
2022-08-27 16:39:27 +08:00
parent fe5ec2bb16
commit 9f086cd146
4 changed files with 56 additions and 74 deletions

View File

@@ -179,14 +179,14 @@
"ts-jest": "28.0.8",
"ts-node": "10.9.1",
"tsconfig-paths": "4.1.0",
"typescript": "4.8.2"
"typescript": "4.7.2"
},
"optionalDependencies": {
"mongodb-memory-server": "8.9.0",
"redis-memory-server": "0.5.0"
},
"resolutions": {
"typescript": "4.8.2",
"typescript": "4.7.2",
"ioredis": "5.2.3",
"webpack": "5.74.0",
"semver": "7.3.7"

104
pnpm-lock.yaml generated
View File

@@ -1,7 +1,7 @@
lockfileVersion: 5.4
overrides:
typescript: 4.8.2
typescript: 4.7.2
ioredis: 5.2.3
webpack: 5.74.0
semver: 7.3.7
@@ -117,7 +117,7 @@ specifiers:
ts-jest: 28.0.8
ts-node: 10.9.1
tsconfig-paths: 4.1.0
typescript: 4.8.2
typescript: 4.7.2
ua-parser-js: 1.0.2
vm2: 3.9.10
wildcard-match: 5.1.2
@@ -208,7 +208,7 @@ devDependencies:
'@innei/eslint-config-ts': 0.9.4
'@innei/prettier': 0.9.4
'@nestjs/cli': 9.1.1
'@nestjs/schematics': 9.0.1_typescript@4.8.2
'@nestjs/schematics': 9.0.1_typescript@4.7.2
'@nestjs/testing': 9.0.11_khr6mt6ojlxbw7bo55fknouh34
'@types/babel__core': 7.1.19
'@types/bcrypt': 5.0.0
@@ -241,10 +241,10 @@ devDependencies:
prettier: 2.7.1
rimraf: 3.0.2
socket.io: 4.5.1
ts-jest: 28.0.8_aqclllrwqhdrf37c5pjob7flby
ts-node: 10.9.1_o7liyg2j45tnaks7f56gkfbn7y
ts-jest: 28.0.8_tgq2dpb7nkff53gtdyjea6jgxy
ts-node: 10.9.1_xiqmlmqsqgnd7owjwvasyosubi
tsconfig-paths: 4.1.0
typescript: 4.8.2
typescript: 4.7.2
packages:
@@ -1053,13 +1053,13 @@ packages:
/@innei/eslint-config-ts/0.9.4:
resolution: {integrity: sha512-T52M6omBVNP6CbRN0sWNf8TjEEocuPTSN+FnVUY7c1P8JfgOTH9PFOG8fEt59UZLxZEIjy26pHGDqATv9inGVA==}
dependencies:
'@typescript-eslint/eslint-plugin': 5.30.7_4kgehhvxgrxdvptdn2db7re534
'@typescript-eslint/parser': 5.35.1_shit3uhl6a7megkzgoz6xssnfa
'@typescript-eslint/eslint-plugin': 5.30.7_avllfqkj7335zpdhprikuvgmy4
'@typescript-eslint/parser': 5.35.1_bhttdz2kviaiqdfc2p3x7ygkuy
eslint: 8.22.0
eslint-config-prettier: 8.5.0_eslint@8.22.0
eslint-plugin-import: 2.26.0_lewfh47l4outvz5ytnjtm3tbm4
eslint-plugin-unused-imports: 2.0.0_cnyok6eqhc7pvpsv2isp55njsi
typescript: 4.8.2
typescript: 4.7.2
transitivePeerDependencies:
- eslint-import-resolver-typescript
- eslint-import-resolver-webpack
@@ -1407,12 +1407,12 @@ packages:
'@angular-devkit/core': 14.2.0_chokidar@3.5.3
'@angular-devkit/schematics': 14.2.0_chokidar@3.5.3
'@angular-devkit/schematics-cli': 14.2.0_chokidar@3.5.3
'@nestjs/schematics': 9.0.1_whhyl7r7sm4vygdnh5naaknfkm
'@nestjs/schematics': 9.0.1_zhwytrehgp24cigumz5pb4xnou
chalk: 3.0.0
chokidar: 3.5.3
cli-table3: 0.6.2
commander: 4.1.1
fork-ts-checker-webpack-plugin: 7.2.13_frxmcuunqqqeqipt45cd6rjuvu
fork-ts-checker-webpack-plugin: 7.2.13_fglgylnl2zxeyhdksezqmluszi
inquirer: 7.3.3
node-emoji: 1.11.0
ora: 5.4.1
@@ -1423,7 +1423,7 @@ packages:
tree-kill: 1.2.2
tsconfig-paths: 4.1.0
tsconfig-paths-webpack-plugin: 4.0.0
typescript: 4.8.2
typescript: 4.7.2
webpack: 5.74.0
webpack-node-externals: 3.0.0
transitivePeerDependencies:
@@ -1581,7 +1581,7 @@ packages:
uuid: 8.3.2
dev: false
/@nestjs/schematics/9.0.1_typescript@4.8.2:
/@nestjs/schematics/9.0.1_typescript@4.7.2:
resolution: {integrity: sha512-QU7GbnQvADFXdumcdADmv4vil3bhnYl2IFHWKieRt0MgIhghgBxIB7kDKWhswcuZ0kZztVbyYjo9aCrlf62fcw==}
peerDependencies:
typescript: ^4.3.5
@@ -1591,12 +1591,12 @@ packages:
fs-extra: 10.1.0
jsonc-parser: 3.0.0
pluralize: 8.0.0
typescript: 4.8.2
typescript: 4.7.2
transitivePeerDependencies:
- chokidar
dev: true
/@nestjs/schematics/9.0.1_whhyl7r7sm4vygdnh5naaknfkm:
/@nestjs/schematics/9.0.1_zhwytrehgp24cigumz5pb4xnou:
resolution: {integrity: sha512-QU7GbnQvADFXdumcdADmv4vil3bhnYl2IFHWKieRt0MgIhghgBxIB7kDKWhswcuZ0kZztVbyYjo9aCrlf62fcw==}
peerDependencies:
typescript: ^4.3.5
@@ -1606,7 +1606,7 @@ packages:
fs-extra: 10.1.0
jsonc-parser: 3.0.0
pluralize: 8.0.0
typescript: 4.8.2
typescript: 4.7.2
transitivePeerDependencies:
- chokidar
dev: true
@@ -2057,7 +2057,7 @@ packages:
dev: false
optional: true
/@typescript-eslint/eslint-plugin/5.30.7_4kgehhvxgrxdvptdn2db7re534:
/@typescript-eslint/eslint-plugin/5.30.7_avllfqkj7335zpdhprikuvgmy4:
resolution: {integrity: sha512-l4L6Do+tfeM2OK0GJsU7TUcM/1oN/N25xHm3Jb4z3OiDU4Lj8dIuxX9LpVMS9riSXQs42D1ieX7b85/r16H9Fw==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -2068,23 +2068,23 @@ packages:
typescript:
optional: true
dependencies:
'@typescript-eslint/parser': 5.35.1_shit3uhl6a7megkzgoz6xssnfa
'@typescript-eslint/parser': 5.35.1_bhttdz2kviaiqdfc2p3x7ygkuy
'@typescript-eslint/scope-manager': 5.30.7
'@typescript-eslint/type-utils': 5.30.7_shit3uhl6a7megkzgoz6xssnfa
'@typescript-eslint/utils': 5.30.7_shit3uhl6a7megkzgoz6xssnfa
'@typescript-eslint/type-utils': 5.30.7_bhttdz2kviaiqdfc2p3x7ygkuy
'@typescript-eslint/utils': 5.30.7_bhttdz2kviaiqdfc2p3x7ygkuy
debug: 4.3.4
eslint: 8.22.0
functional-red-black-tree: 1.0.1
ignore: 5.2.0
regexpp: 3.2.0
semver: 7.3.7
tsutils: 3.21.0_typescript@4.8.2
typescript: 4.8.2
tsutils: 3.21.0_typescript@4.7.2
typescript: 4.7.2
transitivePeerDependencies:
- supports-color
dev: true
/@typescript-eslint/parser/5.35.1_shit3uhl6a7megkzgoz6xssnfa:
/@typescript-eslint/parser/5.35.1_bhttdz2kviaiqdfc2p3x7ygkuy:
resolution: {integrity: sha512-XL2TBTSrh3yWAsMYpKseBYTVpvudNf69rPOWXWVBI08My2JVT5jR66eTt4IgQFHA/giiKJW5dUD4x/ZviCKyGg==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -2096,10 +2096,10 @@ packages:
dependencies:
'@typescript-eslint/scope-manager': 5.35.1
'@typescript-eslint/types': 5.35.1
'@typescript-eslint/typescript-estree': 5.35.1_typescript@4.8.2
'@typescript-eslint/typescript-estree': 5.35.1_typescript@4.7.2
debug: 4.3.4
eslint: 8.22.0
typescript: 4.8.2
typescript: 4.7.2
transitivePeerDependencies:
- supports-color
dev: true
@@ -2120,7 +2120,7 @@ packages:
'@typescript-eslint/visitor-keys': 5.35.1
dev: true
/@typescript-eslint/type-utils/5.30.7_shit3uhl6a7megkzgoz6xssnfa:
/@typescript-eslint/type-utils/5.30.7_bhttdz2kviaiqdfc2p3x7ygkuy:
resolution: {integrity: sha512-nD5qAE2aJX/YLyKMvOU5jvJyku4QN5XBVsoTynFrjQZaDgDV6i7QHFiYCx10wvn7hFvfuqIRNBtsgaLe0DbWhw==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -2130,11 +2130,11 @@ packages:
typescript:
optional: true
dependencies:
'@typescript-eslint/utils': 5.30.7_shit3uhl6a7megkzgoz6xssnfa
'@typescript-eslint/utils': 5.30.7_bhttdz2kviaiqdfc2p3x7ygkuy
debug: 4.3.4
eslint: 8.22.0
tsutils: 3.21.0_typescript@4.8.2
typescript: 4.8.2
tsutils: 3.21.0_typescript@4.7.2
typescript: 4.7.2
transitivePeerDependencies:
- supports-color
dev: true
@@ -2149,7 +2149,7 @@ packages:
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
dev: true
/@typescript-eslint/typescript-estree/5.30.7_typescript@4.8.2:
/@typescript-eslint/typescript-estree/5.30.7_typescript@4.7.2:
resolution: {integrity: sha512-tNslqXI1ZdmXXrHER83TJ8OTYl4epUzJC0aj2i4DMDT4iU+UqLT3EJeGQvJ17BMbm31x5scSwo3hPM0nqQ1AEA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -2164,13 +2164,13 @@ packages:
globby: 11.1.0
is-glob: 4.0.3
semver: 7.3.7
tsutils: 3.21.0_typescript@4.8.2
typescript: 4.8.2
tsutils: 3.21.0_typescript@4.7.2
typescript: 4.7.2
transitivePeerDependencies:
- supports-color
dev: true
/@typescript-eslint/typescript-estree/5.35.1_typescript@4.8.2:
/@typescript-eslint/typescript-estree/5.35.1_typescript@4.7.2:
resolution: {integrity: sha512-JUqE1+VRTGyoXlDWWjm6MdfpBYVq+hixytrv1oyjYIBEOZhBCwtpp5ZSvBt4wIA1MKWlnaC2UXl2XmYGC3BoQA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -2185,13 +2185,13 @@ packages:
globby: 11.1.0
is-glob: 4.0.3
semver: 7.3.7
tsutils: 3.21.0_typescript@4.8.2
typescript: 4.8.2
tsutils: 3.21.0_typescript@4.7.2
typescript: 4.7.2
transitivePeerDependencies:
- supports-color
dev: true
/@typescript-eslint/utils/5.30.7_shit3uhl6a7megkzgoz6xssnfa:
/@typescript-eslint/utils/5.30.7_bhttdz2kviaiqdfc2p3x7ygkuy:
resolution: {integrity: sha512-Z3pHdbFw+ftZiGUnm1GZhkJgVqsDL5CYW2yj+TB2mfXDFOMqtbzQi2dNJIyPqPbx9mv2kUxS1gU+r2gKlKi1rQ==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@@ -2200,7 +2200,7 @@ packages:
'@types/json-schema': 7.0.11
'@typescript-eslint/scope-manager': 5.30.7
'@typescript-eslint/types': 5.30.7
'@typescript-eslint/typescript-estree': 5.30.7_typescript@4.8.2
'@typescript-eslint/typescript-estree': 5.30.7_typescript@4.7.2
eslint: 8.22.0
eslint-scope: 5.1.1
eslint-utils: 3.0.0_eslint@8.22.0
@@ -3689,7 +3689,7 @@ packages:
eslint-import-resolver-webpack:
optional: true
dependencies:
'@typescript-eslint/parser': 5.35.1_shit3uhl6a7megkzgoz6xssnfa
'@typescript-eslint/parser': 5.35.1_bhttdz2kviaiqdfc2p3x7ygkuy
debug: 3.2.7
eslint: 8.22.0
eslint-import-resolver-node: 0.3.6
@@ -3707,7 +3707,7 @@ packages:
'@typescript-eslint/parser':
optional: true
dependencies:
'@typescript-eslint/parser': 5.35.1_shit3uhl6a7megkzgoz6xssnfa
'@typescript-eslint/parser': 5.35.1_bhttdz2kviaiqdfc2p3x7ygkuy
array-includes: 3.1.5
array.prototype.flat: 1.3.0
debug: 2.6.9
@@ -3738,7 +3738,7 @@ packages:
'@typescript-eslint/eslint-plugin':
optional: true
dependencies:
'@typescript-eslint/eslint-plugin': 5.30.7_4kgehhvxgrxdvptdn2db7re534
'@typescript-eslint/eslint-plugin': 5.30.7_avllfqkj7335zpdhprikuvgmy4
eslint: 8.22.0
eslint-rule-composer: 0.3.0
dev: true
@@ -4204,7 +4204,7 @@ packages:
resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
dev: false
/fork-ts-checker-webpack-plugin/7.2.13_frxmcuunqqqeqipt45cd6rjuvu:
/fork-ts-checker-webpack-plugin/7.2.13_fglgylnl2zxeyhdksezqmluszi:
resolution: {integrity: sha512-fR3WRkOb4bQdWB/y7ssDUlVdrclvwtyCUIHCfivAoYxq9dF7XfrDKbMdZIfwJ7hxIAqkYSGeU7lLJE6xrxIBdg==}
engines: {node: '>=12.13.0', yarn: '>=1.0.0'}
peerDependencies:
@@ -4227,7 +4227,7 @@ packages:
schema-utils: 3.1.1
semver: 7.3.7
tapable: 2.2.1
typescript: 4.8.2
typescript: 4.7.2
webpack: 5.74.0
dev: true
@@ -5119,7 +5119,7 @@ packages:
pretty-format: 29.0.1
slash: 3.0.0
strip-json-comments: 3.1.1
ts-node: 10.9.1_o7liyg2j45tnaks7f56gkfbn7y
ts-node: 10.9.1_xiqmlmqsqgnd7owjwvasyosubi
transitivePeerDependencies:
- supports-color
dev: true
@@ -5159,7 +5159,7 @@ packages:
pretty-format: 29.0.1
slash: 3.0.0
strip-json-comments: 3.1.1
ts-node: 10.9.1_o7liyg2j45tnaks7f56gkfbn7y
ts-node: 10.9.1_xiqmlmqsqgnd7owjwvasyosubi
transitivePeerDependencies:
- supports-color
dev: true
@@ -7681,7 +7681,7 @@ packages:
hasBin: true
dev: true
/ts-jest/28.0.8_aqclllrwqhdrf37c5pjob7flby:
/ts-jest/28.0.8_tgq2dpb7nkff53gtdyjea6jgxy:
resolution: {integrity: sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==}
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
hasBin: true
@@ -7711,11 +7711,11 @@ packages:
lodash.memoize: 4.1.2
make-error: 1.3.6
semver: 7.3.7
typescript: 4.8.2
typescript: 4.7.2
yargs-parser: 21.0.1
dev: true
/ts-node/10.9.1_o7liyg2j45tnaks7f56gkfbn7y:
/ts-node/10.9.1_xiqmlmqsqgnd7owjwvasyosubi:
resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
hasBin: true
peerDependencies:
@@ -7741,7 +7741,7 @@ packages:
create-require: 1.1.1
diff: 4.0.2
make-error: 1.3.6
typescript: 4.8.2
typescript: 4.7.2
v8-compile-cache-lib: 3.0.1
yn: 3.1.1
dev: true
@@ -7780,14 +7780,14 @@ packages:
/tslib/2.4.0:
resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
/tsutils/3.21.0_typescript@4.8.2:
/tsutils/3.21.0_typescript@4.7.2:
resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
engines: {node: '>= 6'}
peerDependencies:
typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
dependencies:
tslib: 1.14.1
typescript: 4.8.2
typescript: 4.7.2
dev: true
/tunnel-agent/0.6.0:
@@ -7831,8 +7831,8 @@ packages:
engines: {node: '>=12.20'}
dev: false
/typescript/4.8.2:
resolution: {integrity: sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==}
/typescript/4.7.2:
resolution: {integrity: sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==}
engines: {node: '>=4.2.0'}
hasBin: true
dev: true

View File

@@ -1,13 +1,4 @@
/*
* @Author: Innei
* @Date: 2020-08-02 12:53:38
* @LastEditTime: 2020-08-02 13:17:33
* @LastEditors: Innei
* @FilePath: /mx-server/src/common/decorators/isBooleanOrString.ts
* @Coding with Love
*/
import { ValidationOptions } from 'class-validator'
import { isString } from 'class-validator'
import { ValidationOptions, isString } from 'class-validator'
import { isBoolean, merge } from 'lodash'
import { validatorFactory } from './simpleValidatorFactory'

View File

@@ -1,13 +1,4 @@
/*
* @Author: Innei
* @Date: 2021-02-04 15:17:04
* @LastEditTime: 2021-02-04 15:18:08
* @LastEditors: Innei
* @FilePath: /server/shared/utils/validator-decorators/isMongoIdOrInt.ts
* @Mark: Coding with Love
*/
import { ValidationOptions } from 'class-validator'
import { isInt, isMongoId } from 'class-validator'
import { ValidationOptions, isInt, isMongoId } from 'class-validator'
import { merge } from 'lodash'
import { validatorFactory } from './simpleValidatorFactory'