From 90e2852a82d505a9e1ff896d443684bc221d0b27 Mon Sep 17 00:00:00 2001 From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com> Date: Thu, 18 Jan 2024 16:31:53 +0800 Subject: [PATCH] remove some unused package --- package.json | 4 +--- src/models/ActivityInfo.ts | 2 -- src/models/ActivityUser.ts | 2 -- src/models/Base.ts | 8 ++------ yarn.lock | 33 +++++++++------------------------ 5 files changed, 12 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index b550ace..f59069d 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "@fastify/formbody": "^7.4.0", "@fastify/helmet": "^10.1.0", "@fastify/jwt": "^6.7.1", - "@typegoose/auto-increment": "^0.4.1", "@typegoose/typegoose": "^7.4.6", "bson": "^4.0.4", "dotenv": "^16.0.3", @@ -29,7 +28,6 @@ "fastify-xml-body-parser": "^2.2.0", "mongodb-extended-json": "^1.11.1", "mongoose": "5.10.3", - "mongoose-findorcreate": "^3.0.0", "node-schedule": "^2.0.0", "siwe": "^2.1.4", "tracer": "^1.1.6", @@ -37,7 +35,7 @@ }, "devDependencies": { "@types/dotenv": "^8.2.0", - "@types/node": "^14.14.20", + "@types/node": "16", "@types/node-schedule": "^2.1.0", "@types/redis": "^2.8.28", "@typescript-eslint/eslint-plugin": "^6.19.0", diff --git a/src/models/ActivityInfo.ts b/src/models/ActivityInfo.ts index 1af0adc..c6f8d70 100644 --- a/src/models/ActivityInfo.ts +++ b/src/models/ActivityInfo.ts @@ -1,7 +1,5 @@ import { getModelForClass, modelOptions, mongoose, prop, Severity } from '@typegoose/typegoose' import { dbconn } from 'decorators/dbconn' -// @ts-ignore -import findOrCreate from 'mongoose-findorcreate' import { Base, TimeStamps } from '@typegoose/typegoose/lib/defaultClasses' import { BaseModule } from './Base' diff --git a/src/models/ActivityUser.ts b/src/models/ActivityUser.ts index 93a52a5..c44dcb8 100644 --- a/src/models/ActivityUser.ts +++ b/src/models/ActivityUser.ts @@ -9,8 +9,6 @@ import { Severity, } from '@typegoose/typegoose' import { dbconn } from 'decorators/dbconn' -// @ts-ignore -import findOrCreate from 'mongoose-findorcreate' import { Base, TimeStamps } from '@typegoose/typegoose/lib/defaultClasses' import { BaseModule } from './Base' import { convert } from 'zutils/utils/number.util' diff --git a/src/models/Base.ts b/src/models/Base.ts index 225cc7c..1235e88 100644 --- a/src/models/Base.ts +++ b/src/models/Base.ts @@ -1,9 +1,6 @@ -import { FindOrCreate } from '@typegoose/typegoose/lib/defaultClasses' import { checkJson } from '../decorators/nojson' -import { plugin, ReturnModelType } from '@typegoose/typegoose' +import { ReturnModelType } from '@typegoose/typegoose' -// @ts-ignore -import findOrCreate from 'mongoose-findorcreate' import { Connection } from 'mongoose' import { ObjectId } from 'bson' import { isTrue } from 'zutils/utils/string.util' @@ -12,8 +9,7 @@ import { AnyParamConstructor } from '@typegoose/typegoose/lib/types' const jsonExcludeKeys = ['updatedAt', '__v'] const saveExcludeKeys = ['createdAt', 'updatedAt', '__v', '_id'] -@plugin(findOrCreate) -export abstract class BaseModule extends FindOrCreate { +export abstract class BaseModule { static db: Connection public updateFromReq(data: any) { diff --git a/yarn.lock b/yarn.lock index b2ff97a..ae1e16d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -652,16 +652,6 @@ resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz" integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== -"@typegoose/auto-increment@^0.4.1": - version "0.4.1" - resolved "https://registry.npmjs.org/@typegoose/auto-increment/-/auto-increment-0.4.1.tgz" - integrity sha512-ya+TkXUufhyRKFVt/UVVGSO+BnMB0/KQk9dOyKWoGKvSFGEJlGAaug4zABtbh3OyqoPaJ74OSoJTKJ+/r+wdoA== - dependencies: - "@types/lodash" "^4.14.149" - lodash "^4.17.15" - loglevel "^1.6.7" - tslib "^1.11.1" - "@typegoose/typegoose@^7.4.6": version "7.6.3" resolved "https://registry.npmjs.org/@typegoose/typegoose/-/typegoose-7.6.3.tgz" @@ -726,11 +716,6 @@ dependencies: "@types/node" "*" -"@types/lodash@^4.14.149": - version "4.14.194" - resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.194.tgz" - integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g== - "@types/node-schedule@^2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/@types/node-schedule/-/node-schedule-2.1.0.tgz" @@ -738,11 +723,16 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@^14.14.20": +"@types/node@*": version "14.18.42" resolved "https://registry.npmjs.org/@types/node/-/node-14.18.42.tgz" integrity sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg== +"@types/node@16": + version "16.18.71" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.71.tgz#305a955ab99353d4b8a9e9b6b6682ed6cbc186cc" + integrity sha512-ARO+458bNJQeNEFuPyT6W+q9ULotmsQzhV3XABsFSxEvRMUYENcBsNAHWYPlahU+UHa5gCVwyKT1Z3f1Wwr26Q== + "@types/node@^12.12.6": version "12.20.55" resolved "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz" @@ -3045,12 +3035,12 @@ lodash.transform@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" integrity sha512-LO37ZnhmBVx0GvOU/caQuipEh4GN82TcWv3yHlebGDgOxbxiwwzW5Pcx2AcvpIv2WmvmSMoC492yQFNhy/l/UQ== -lodash@^4.17.15, lodash@^4.17.20: +lodash@^4.17.20: version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -loglevel@^1.6.7, loglevel@^1.7.0: +loglevel@^1.7.0: version "1.8.1" resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz" integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg== @@ -3289,11 +3279,6 @@ mongodb@3.6.1: optionalDependencies: saslprep "^1.0.0" -mongoose-findorcreate@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/mongoose-findorcreate/-/mongoose-findorcreate-3.0.0.tgz" - integrity sha512-kQhDe5XDj6tMv8kq1wjK+hITGIGUl60rj8oGLupF9poNsqIDkAJBXudZKcCdSyBZ7p6DLK2+0jSBthrb26tSYQ== - mongoose-legacy-pluralize@1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz" @@ -4513,7 +4498,7 @@ tsconfig@^7.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tslib@^1.11.1, tslib@^1.13.0, tslib@^1.8.1: +tslib@^1.13.0, tslib@^1.8.1: version "1.14.1" resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==