diff --git a/.env b/.env index bd10d16..9d7993a 100644 --- a/.env +++ b/.env @@ -36,7 +36,7 @@ DB_MYSQL_DATABASE = test1 # 上传和静态文件配置 # ======================================================================================== # 上传文件目录 -UPLOAD_DIR = ./content/uploads +UPLOAD_DIR = ./content/upload # 静态文件目录 STATIC_DIR = ./content/html diff --git a/.gitignore b/.gitignore index 22f55ad..5e88d0b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ lerna-debug.log* # OS .DS_Store +*.local # Tests /coverage diff --git a/content/database/db.sqlite b/content/database/db.sqlite index 44c96c4..c01e16e 100644 Binary files a/content/database/db.sqlite and b/content/database/db.sqlite differ diff --git a/content/upload/2023/08/1691026156738.png b/content/upload/2023/08/1691026156738.png new file mode 100644 index 0000000..39a207f Binary files /dev/null and b/content/upload/2023/08/1691026156738.png differ diff --git a/content/upload/2023/08/1691027380393.png b/content/upload/2023/08/1691027380393.png new file mode 100644 index 0000000..39a207f Binary files /dev/null and b/content/upload/2023/08/1691027380393.png differ diff --git a/content/upload/2023/08/1691027423903.png b/content/upload/2023/08/1691027423903.png new file mode 100644 index 0000000..39a207f Binary files /dev/null and b/content/upload/2023/08/1691027423903.png differ diff --git a/content/upload/2023/08/1691027512803.png b/content/upload/2023/08/1691027512803.png new file mode 100644 index 0000000..39a207f Binary files /dev/null and b/content/upload/2023/08/1691027512803.png differ diff --git a/content/upload/2023/08/1691042314040.png b/content/upload/2023/08/1691042314040.png new file mode 100644 index 0000000..39a207f Binary files /dev/null and b/content/upload/2023/08/1691042314040.png differ diff --git a/content/upload/2023/08/1691042351640.png b/content/upload/2023/08/1691042351640.png new file mode 100644 index 0000000..39a207f Binary files /dev/null and b/content/upload/2023/08/1691042351640.png differ diff --git a/content/upload/2023/08/1691042427124.png b/content/upload/2023/08/1691042427124.png new file mode 100644 index 0000000..39a207f Binary files /dev/null and b/content/upload/2023/08/1691042427124.png differ diff --git a/package.json b/package.json index 6a10af2..b38fda4 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "rxjs": "^7.2.0" }, "devDependencies": { + "@nestjs/cache-manager": "^2.1.0", "@nestjs/cli": "^9.0.0", "@nestjs/config": "^2.3.1", "@nestjs/devtools-integration": "^0.1.4", @@ -54,10 +55,13 @@ "@types/mockjs": "^1.0.7", "@types/multer": "^1.4.7", "@types/node": "^16.0.0", + "@types/nodemailer": "^6.4.9", "@types/supertest": "^2.0.11", "@types/uuid": "^9.0.1", "@typescript-eslint/eslint-plugin": "^5.0.0", "@typescript-eslint/parser": "^5.0.0", + "cache-manager": "^5.2.3", + "cache-manager-redis-store": "^3.0.1", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "dayjs": "^1.11.7", @@ -72,10 +76,12 @@ "multer": "1.4.5-lts.1", "mysql2": "^3.2.0", "nanoid": "^4.0.1", + "nodemailer": "^6.9.4", "passport": "^0.6.0", "passport-jwt": "^4.0.1", "passport-local": "^1.0.0", "prettier": "^2.3.2", + "redis": "^4.6.7", "source-map-support": "^0.5.20", "sqlite3": "^5.1.6", "supertest": "^6.1.3", @@ -87,7 +93,9 @@ "typeorm-naming-strategies": "^4.1.0", "typescript": "^4.3.5", "uuid": "^9.0.0", - "webpack": "5" + "webpack": "5", + "winston": "^3.10.0", + "winston-daily-rotate-file": "^4.7.1" }, "jest": { "moduleFileExtensions": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ec658c..6604f64 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,136 +1,9 @@ -<<<<<<< HEAD -lockfileVersion: 5.4 - -specifiers: - '@nestjs/cli': ^9.0.0 - '@nestjs/common': ^9.0.0 - '@nestjs/config': ^2.3.1 - '@nestjs/core': ^9.0.0 - '@nestjs/devtools-integration': ^0.1.4 - '@nestjs/jwt': ^10.0.3 - '@nestjs/passport': ^9.0.3 - '@nestjs/platform-express': ^9.0.0 - '@nestjs/schematics': ^9.0.0 - '@nestjs/serve-static': ^3.0.1 - '@nestjs/swagger': ^6.3.0 - '@nestjs/testing': ^9.0.0 - '@nestjs/typeorm': ^9.0.1 - '@types/express': ^4.17.13 - '@types/jest': 28.1.4 - '@types/lodash': ^4.14.192 - '@types/lodash-es': ^4.17.7 - '@types/mockjs': ^1.0.7 - '@types/multer': ^1.4.7 - '@types/node': ^16.0.0 - '@types/supertest': ^2.0.11 - '@types/uuid': ^9.0.1 - '@typescript-eslint/eslint-plugin': ^5.0.0 - '@typescript-eslint/parser': ^5.0.0 - class-transformer: ^0.5.1 - class-validator: ^0.14.0 - dayjs: ^1.11.7 - dotenv: ^16.0.3 - eslint: ^8.0.1 - eslint-config-prettier: ^8.3.0 - eslint-plugin-prettier: ^4.0.0 - jest: 28.1.2 - lodash: ^4.17.21 - lodash-es: ^4.17.21 - mockjs: ^1.1.0 - multer: 1.4.5-lts.1 - mysql2: ^3.2.0 - nanoid: ^4.0.1 - passport: ^0.6.0 - passport-jwt: ^4.0.1 - passport-local: ^1.0.0 - prettier: ^2.3.2 - reflect-metadata: ^0.1.13 - rimraf: ^3.0.2 - rxjs: ^7.2.0 - source-map-support: ^0.5.20 - sqlite3: ^5.1.6 - supertest: ^6.1.3 - ts-jest: 28.0.5 - ts-loader: ^9.2.3 - ts-node: ^10.0.0 - tsconfig-paths: 4.0.0 - typeorm: ^0.3.12 - typeorm-naming-strategies: ^4.1.0 - typescript: ^4.3.5 - uuid: ^9.0.0 - webpack: '5' - -dependencies: - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy - '@nestjs/core': 9.4.3_c4fgdp752ib7dsgrlnt7fswfce - '@nestjs/platform-express': 9.4.3_vw2vky2jc6gkm6gj7lzrgmojyi - reflect-metadata: 0.1.13 - rimraf: 3.0.2 - rxjs: 7.8.1 - -devDependencies: - '@nestjs/cli': 9.5.0 - '@nestjs/config': 2.3.4_7u4l2qzmnego2xuu7pwg7mz5xy - '@nestjs/devtools-integration': 0.1.5_rjmpvsq4jzhua44mzzdoty2seu - '@nestjs/jwt': 10.1.0_@nestjs+common@9.4.3 - '@nestjs/passport': 9.0.3_swdehgqxw2nt4jhhnqbb6yp354 - '@nestjs/schematics': 9.2.0_typescript@4.9.5 - '@nestjs/serve-static': 3.0.1_vw2vky2jc6gkm6gj7lzrgmojyi - '@nestjs/swagger': 6.3.0_ff6xh7k6m3kcxhzayktinvhdx4 - '@nestjs/testing': 9.4.3_c2suh6ay6qzrduk6sfgpcvxpvi - '@nestjs/typeorm': 9.0.1_nktyjm3hkn2boz7s6l2p266t2u - '@types/express': 4.17.17 - '@types/jest': 28.1.4 - '@types/lodash': 4.14.195 - '@types/lodash-es': 4.17.7 - '@types/mockjs': 1.0.7 - '@types/multer': 1.4.7 - '@types/node': 16.18.38 - '@types/supertest': 2.0.12 - '@types/uuid': 9.0.2 - '@typescript-eslint/eslint-plugin': 5.61.0_tiwiljqgmizmat2g4tqcn7wxxu - '@typescript-eslint/parser': 5.61.0_c6scop6gobf6637sntyzfiffg4 - class-transformer: 0.5.1 - class-validator: 0.14.0 - dayjs: 1.11.9 - dotenv: 16.3.1 - eslint: 8.44.0 - eslint-config-prettier: 8.8.0_eslint@8.44.0 - eslint-plugin-prettier: 4.2.1_qkgbdr345imkz5woyd5e5k6xse - jest: 28.1.2_734c4vwpoc3zmfagshlprrefne - lodash: 4.17.21 - lodash-es: 4.17.21 - mockjs: 1.1.0 - multer: 1.4.5-lts.1 - mysql2: 3.5.1 - nanoid: 4.0.2 - passport: 0.6.0 - passport-jwt: 4.0.1 - passport-local: 1.0.0 - prettier: 2.8.8 - source-map-support: 0.5.21 - sqlite3: 5.1.6 - supertest: 6.3.3 - ts-jest: 28.0.5_rv5warumbl7utqrnn4zdksbofm - ts-loader: 9.4.4_dhumxs7xcapy5ah5ryvaq7oilu - ts-node: 10.9.1_npeoqfxwgl5njwqojmpesqhar4 - tsconfig-paths: 4.0.0 - typeorm: 0.3.17_ucsizvblneazg3mzm3rghga4yy - typeorm-naming-strategies: 4.1.0_typeorm@0.3.17 - typescript: 4.9.5 - uuid: 9.0.0 - webpack: 5.88.1 - -packages: - - /@aashutoshrathi/word-wrap/1.2.6: -======= lockfileVersion: '6.0' dependencies: '@nestjs/common': specifier: ^9.0.0 - version: 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + version: 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@nestjs/core': specifier: ^9.0.0 version: 9.0.0(@nestjs/common@9.0.0)(@nestjs/platform-express@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) @@ -148,6 +21,9 @@ dependencies: version: 7.2.0 devDependencies: + '@nestjs/cache-manager': + specifier: ^2.1.0 + version: 2.1.0(@nestjs/common@9.0.0)(@nestjs/core@9.0.0)(cache-manager@5.2.3)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@nestjs/cli': specifier: ^9.0.0 version: 9.0.0 @@ -199,6 +75,9 @@ devDependencies: '@types/node': specifier: ^16.0.0 version: 16.0.0 + '@types/nodemailer': + specifier: ^6.4.9 + version: 6.4.9 '@types/supertest': specifier: ^2.0.11 version: 2.0.11 @@ -211,6 +90,12 @@ devDependencies: '@typescript-eslint/parser': specifier: ^5.0.0 version: 5.0.0(eslint@8.0.1)(typescript@4.3.5) + cache-manager: + specifier: ^5.2.3 + version: 5.2.3 + cache-manager-redis-store: + specifier: ^3.0.1 + version: 3.0.1 class-transformer: specifier: ^0.5.1 version: 0.5.1 @@ -253,6 +138,9 @@ devDependencies: nanoid: specifier: ^4.0.1 version: 4.0.1 + nodemailer: + specifier: ^6.9.4 + version: 6.9.4 passport: specifier: ^0.6.0 version: 0.6.0 @@ -265,6 +153,9 @@ devDependencies: prettier: specifier: ^2.3.2 version: 2.3.2 + redis: + specifier: ^4.6.7 + version: 4.6.7 source-map-support: specifier: ^0.5.20 version: 0.5.20 @@ -288,7 +179,7 @@ devDependencies: version: 4.0.0 typeorm: specifier: ^0.3.12 - version: 0.3.12(mysql2@3.2.0)(sqlite3@5.1.6)(ts-node@10.0.0) + version: 0.3.12(mysql2@3.2.0)(redis@4.6.7)(sqlite3@5.1.6)(ts-node@10.0.0) typeorm-naming-strategies: specifier: ^4.1.0 version: 4.1.0(typeorm@0.3.12) @@ -301,20 +192,21 @@ devDependencies: webpack: specifier: '5' version: 5.0.0 + winston: + specifier: ^3.10.0 + version: 3.10.0 + winston-daily-rotate-file: + specifier: ^4.7.1 + version: 4.7.1(winston@3.10.0) packages: /@aashutoshrathi/word-wrap@1.2.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} engines: {node: '>=0.10.0'} dev: true -<<<<<<< HEAD - /@ampproject/remapping/2.2.1: -======= /@ampproject/remapping@2.2.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} engines: {node: '>=6.0.0'} dependencies: @@ -322,58 +214,15 @@ packages: '@jridgewell/trace-mapping': 0.3.18 dev: true -<<<<<<< HEAD - /@angular-devkit/core/16.0.1: - resolution: {integrity: sha512-2uz98IqkKJlgnHbWQ7VeL4pb+snGAZXIama2KXi+k9GsRntdcw+udX8rL3G9SdUGUF+m6+147Y1oRBMHsO/v4w==} - engines: {node: ^16.14.0 || >=18.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} -======= /@angular-devkit/core@14.0.5(chokidar@3.5.3): resolution: {integrity: sha512-/CUGi6QLwh79FvsOY7M+1LQL3asZsbQW/WBd5f1iu5y7TLNqCwo+wOb0ZXLDNPw45vYBxFajtt3ob3U7qx3jNg==} engines: {node: ^14.15.0 || >=16.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 peerDependencies: chokidar: ^3.5.2 peerDependenciesMeta: chokidar: optional: true dependencies: -<<<<<<< HEAD - ajv: 8.12.0 - ajv-formats: 2.1.1 - jsonc-parser: 3.2.0 - rxjs: 7.8.1 - source-map: 0.7.4 - dev: true - - /@angular-devkit/core/16.0.1_chokidar@3.5.3: - resolution: {integrity: sha512-2uz98IqkKJlgnHbWQ7VeL4pb+snGAZXIama2KXi+k9GsRntdcw+udX8rL3G9SdUGUF+m6+147Y1oRBMHsO/v4w==} - engines: {node: ^16.14.0 || >=18.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - peerDependencies: - chokidar: ^3.5.2 - peerDependenciesMeta: - chokidar: - optional: true - dependencies: - ajv: 8.12.0 - ajv-formats: 2.1.1 - chokidar: 3.5.3 - jsonc-parser: 3.2.0 - rxjs: 7.8.1 - source-map: 0.7.4 - dev: true - - /@angular-devkit/schematics-cli/16.0.1_chokidar@3.5.3: - resolution: {integrity: sha512-6KLA125dpgd6oJGtiO2JpZAb92uOG3njQGIt7NFcuQGW/5GO7J41vMXH9cBAfdtbV8SIggSmR/cIEE9ijfj6YQ==} - engines: {node: ^16.14.0 || >=18.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - hasBin: true - dependencies: - '@angular-devkit/core': 16.0.1_chokidar@3.5.3 - '@angular-devkit/schematics': 16.0.1_chokidar@3.5.3 - ansi-colors: 4.1.3 - inquirer: 8.2.4 - symbol-observable: 4.0.0 - yargs-parser: 21.1.1 -======= ajv: 8.11.0 ajv-formats: 2.1.1(ajv@8.11.0) chokidar: 3.5.3 @@ -393,22 +242,10 @@ packages: inquirer: 8.2.4 symbol-observable: 4.0.0 yargs-parser: 21.0.1 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 transitivePeerDependencies: - chokidar dev: true -<<<<<<< HEAD - /@angular-devkit/schematics/16.0.1: - resolution: {integrity: sha512-A9D0LTYmiqiBa90GKcSuWb7hUouGIbm/AHbJbjL85WLLRbQA2PwKl7P5Mpd6nS/ZC0kfG4VQY3VOaDvb3qpI9g==} - engines: {node: ^16.14.0 || >=18.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - dependencies: - '@angular-devkit/core': 16.0.1 - jsonc-parser: 3.2.0 - magic-string: 0.30.0 - ora: 5.4.1 - rxjs: 7.8.1 -======= /@angular-devkit/schematics@14.0.5(chokidar@3.5.3): resolution: {integrity: sha512-sufxITBkn2MvgEREt9JQ3QCKHS+sue1WsVzLE+TWqG5MC/RPk0f9tQ5VoHk6ZTzDKUvOtSoc7G+n0RscQsyp5g==} engines: {node: ^14.15.0 || >=16.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} @@ -418,44 +255,17 @@ packages: magic-string: 0.26.1 ora: 5.4.1 rxjs: 6.6.7 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 transitivePeerDependencies: - chokidar dev: true -<<<<<<< HEAD - /@angular-devkit/schematics/16.0.1_chokidar@3.5.3: - resolution: {integrity: sha512-A9D0LTYmiqiBa90GKcSuWb7hUouGIbm/AHbJbjL85WLLRbQA2PwKl7P5Mpd6nS/ZC0kfG4VQY3VOaDvb3qpI9g==} - engines: {node: ^16.14.0 || >=18.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - dependencies: - '@angular-devkit/core': 16.0.1_chokidar@3.5.3 - jsonc-parser: 3.2.0 - magic-string: 0.30.0 - ora: 5.4.1 - rxjs: 7.8.1 - transitivePeerDependencies: - - chokidar - dev: true - - /@babel/code-frame/7.22.5: -======= /@babel/code-frame@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/highlight': 7.22.5 dev: true -<<<<<<< HEAD - /@babel/compat-data/7.22.6: - resolution: {integrity: sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg==} - engines: {node: '>=6.9.0'} - dev: true - - /@babel/core/7.22.8: - resolution: {integrity: sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw==} -======= /@babel/compat-data@7.22.9: resolution: {integrity: sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==} engines: {node: '>=6.9.0'} @@ -463,48 +273,29 @@ packages: /@babel/core@7.22.9: resolution: {integrity: sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.1 '@babel/code-frame': 7.22.5 -<<<<<<< HEAD - '@babel/generator': 7.22.7 - '@babel/helper-compilation-targets': 7.22.6_@babel+core@7.22.8 - '@babel/helper-module-transforms': 7.22.5 -======= '@babel/generator': 7.22.9 '@babel/helper-compilation-targets': 7.22.9(@babel/core@7.22.9) '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.9) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 '@babel/helpers': 7.22.6 '@babel/parser': 7.22.7 '@babel/template': 7.22.5 '@babel/traverse': 7.22.8 '@babel/types': 7.22.5 -<<<<<<< HEAD - '@nicolo-ribaudo/semver-v6': 6.3.3 -======= ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 convert-source-map: 1.9.0 debug: 4.3.4 gensync: 1.0.0-beta.2 json5: 2.2.3 -<<<<<<< HEAD -======= semver: 6.3.1 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 transitivePeerDependencies: - supports-color dev: true -<<<<<<< HEAD - /@babel/generator/7.22.7: - resolution: {integrity: sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==} -======= /@babel/generator@7.22.9: resolution: {integrity: sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.5 @@ -513,28 +304,12 @@ packages: jsesc: 2.5.2 dev: true -<<<<<<< HEAD - /@babel/helper-compilation-targets/7.22.6_@babel+core@7.22.8: - resolution: {integrity: sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA==} -======= /@babel/helper-compilation-targets@7.22.9(@babel/core@7.22.9): resolution: {integrity: sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: -<<<<<<< HEAD - '@babel/compat-data': 7.22.6 - '@babel/core': 7.22.8 - '@babel/helper-validator-option': 7.22.5 - '@nicolo-ribaudo/semver-v6': 6.3.3 - browserslist: 4.21.9 - lru-cache: 5.1.1 - dev: true - - /@babel/helper-environment-visitor/7.22.5: -======= '@babel/compat-data': 7.22.9 '@babel/core': 7.22.9 '@babel/helper-validator-option': 7.22.5 @@ -544,16 +319,11 @@ packages: dev: true /@babel/helper-environment-visitor@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==} engines: {node: '>=6.9.0'} dev: true -<<<<<<< HEAD - /@babel/helper-function-name/7.22.5: -======= /@babel/helper-function-name@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==} engines: {node: '>=6.9.0'} dependencies: @@ -561,34 +331,20 @@ packages: '@babel/types': 7.22.5 dev: true -<<<<<<< HEAD - /@babel/helper-hoist-variables/7.22.5: -======= /@babel/helper-hoist-variables@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.5 dev: true -<<<<<<< HEAD - /@babel/helper-module-imports/7.22.5: -======= /@babel/helper-module-imports@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.5 dev: true -<<<<<<< HEAD - /@babel/helper-module-transforms/7.22.5: - resolution: {integrity: sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==} - engines: {node: '>=6.9.0'} - dependencies: -======= /@babel/helper-module-transforms@7.22.9(@babel/core@7.22.9): resolution: {integrity: sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==} engines: {node: '>=6.9.0'} @@ -596,84 +352,48 @@ packages: '@babel/core': ^7.0.0 dependencies: '@babel/core': 7.22.9 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-module-imports': 7.22.5 '@babel/helper-simple-access': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 '@babel/helper-validator-identifier': 7.22.5 -<<<<<<< HEAD - '@babel/template': 7.22.5 - '@babel/traverse': 7.22.8 - '@babel/types': 7.22.5 - transitivePeerDependencies: - - supports-color - dev: true - - /@babel/helper-plugin-utils/7.22.5: -======= dev: true /@babel/helper-plugin-utils@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==} engines: {node: '>=6.9.0'} dev: true -<<<<<<< HEAD - /@babel/helper-simple-access/7.22.5: -======= /@babel/helper-simple-access@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.5 dev: true -<<<<<<< HEAD - /@babel/helper-split-export-declaration/7.22.6: -======= /@babel/helper-split-export-declaration@7.22.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.5 dev: true -<<<<<<< HEAD - /@babel/helper-string-parser/7.22.5: -======= /@babel/helper-string-parser@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==} engines: {node: '>=6.9.0'} dev: true -<<<<<<< HEAD - /@babel/helper-validator-identifier/7.22.5: -======= /@babel/helper-validator-identifier@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==} engines: {node: '>=6.9.0'} dev: true -<<<<<<< HEAD - /@babel/helper-validator-option/7.22.5: -======= /@babel/helper-validator-option@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==} engines: {node: '>=6.9.0'} dev: true -<<<<<<< HEAD - /@babel/helpers/7.22.6: -======= /@babel/helpers@7.22.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==} engines: {node: '>=6.9.0'} dependencies: @@ -684,11 +404,7 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /@babel/highlight/7.22.5: -======= /@babel/highlight@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==} engines: {node: '>=6.9.0'} dependencies: @@ -697,11 +413,7 @@ packages: js-tokens: 4.0.0 dev: true -<<<<<<< HEAD - /@babel/parser/7.22.7: -======= /@babel/parser@7.22.7: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==} engines: {node: '>=6.0.0'} hasBin: true @@ -709,245 +421,133 @@ packages: '@babel/types': 7.22.5 dev: true -<<<<<<< HEAD - /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.22.8: -======= /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/plugin-syntax-typescript/7.22.5_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - - /@babel/runtime/7.22.6: -======= '@babel/core': 7.22.9 '@babel/helper-plugin-utils': 7.22.5 dev: true /@babel/runtime@7.22.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.13.11 dev: true -<<<<<<< HEAD - /@babel/template/7.22.5: -======= /@babel/template@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==} engines: {node: '>=6.9.0'} dependencies: @@ -956,20 +556,12 @@ packages: '@babel/types': 7.22.5 dev: true -<<<<<<< HEAD - /@babel/traverse/7.22.8: -======= /@babel/traverse@7.22.8: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.22.5 -<<<<<<< HEAD - '@babel/generator': 7.22.7 -======= '@babel/generator': 7.22.9 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-function-name': 7.22.5 '@babel/helper-hoist-variables': 7.22.5 @@ -982,11 +574,7 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /@babel/types/7.22.5: -======= /@babel/types@7.22.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==} engines: {node: '>=6.9.0'} dependencies: @@ -995,63 +583,31 @@ packages: to-fast-properties: 2.0.0 dev: true -<<<<<<< HEAD - /@bcoe/v8-coverage/0.2.3: - resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} - dev: true - - /@colors/colors/1.5.0: -======= /@bcoe/v8-coverage@0.2.3: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true /@colors/colors@1.5.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} engines: {node: '>=0.1.90'} requiresBuild: true dev: true - optional: true -<<<<<<< HEAD - /@cspotcode/source-map-support/0.8.1: - resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} - engines: {node: '>=12'} + /@dabh/diagnostics@2.0.3: + resolution: {integrity: sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==} dependencies: - '@jridgewell/trace-mapping': 0.3.9 + colorspace: 1.1.4 + enabled: 2.0.0 + kuler: 2.0.0 dev: true - /@eslint-community/eslint-utils/4.4.0_eslint@8.44.0: - resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 - dependencies: - eslint: 8.44.0 - eslint-visitor-keys: 3.4.1 - dev: true - - /@eslint-community/regexpp/4.5.1: - resolution: {integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==} - engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - dev: true - - /@eslint/eslintrc/2.1.0: - resolution: {integrity: sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==} -======= /@eslint/eslintrc@1.4.1: resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 debug: 4.3.4 -<<<<<<< HEAD - espree: 9.6.0 -======= espree: 9.6.1 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 globals: 13.20.0 ignore: 5.2.4 import-fresh: 3.3.0 @@ -1062,27 +618,12 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /@eslint/js/8.44.0: - resolution: {integrity: sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dev: true - - /@gar/promisify/1.1.3: - resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==} - dev: true - optional: true - - /@humanwhocodes/config-array/0.11.10: - resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==} -======= /@gar/promisify@1.1.3: resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==} dev: true /@humanwhocodes/config-array@0.6.0: resolution: {integrity: sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 1.2.1 @@ -1092,24 +633,11 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /@humanwhocodes/module-importer/1.0.1: - resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} - engines: {node: '>=12.22'} - dev: true - - /@humanwhocodes/object-schema/1.2.1: - resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} - dev: true - - /@istanbuljs/load-nyc-config/1.1.0: -======= /@humanwhocodes/object-schema@1.2.1: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true /@istanbuljs/load-nyc-config@1.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==} engines: {node: '>=8'} dependencies: @@ -1120,40 +648,24 @@ packages: resolve-from: 5.0.0 dev: true -<<<<<<< HEAD - /@istanbuljs/schema/0.1.3: -======= /@istanbuljs/schema@0.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /@jest/console/28.1.3: -======= /@jest/console@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 -<<<<<<< HEAD - '@types/node': 16.18.38 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 chalk: 4.1.2 jest-message-util: 28.1.3 jest-util: 28.1.3 slash: 3.0.0 dev: true -<<<<<<< HEAD - /@jest/core/28.1.3_ts-node@10.9.1: -======= /@jest/core@28.1.3(ts-node@10.0.0): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -1167,22 +679,14 @@ packages: '@jest/test-result': 28.1.3 '@jest/transform': 28.1.3 '@jest/types': 28.1.3 -<<<<<<< HEAD - '@types/node': 16.18.38 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.8.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 28.1.3 -<<<<<<< HEAD - jest-config: 28.1.3_734c4vwpoc3zmfagshlprrefne -======= jest-config: 28.1.3(@types/node@16.0.0)(ts-node@10.0.0) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 jest-haste-map: 28.1.3 jest-message-util: 28.1.3 jest-regex-util: 28.0.2 @@ -1204,40 +708,24 @@ packages: - ts-node dev: true -<<<<<<< HEAD - /@jest/environment/28.1.3: -======= /@jest/environment@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/fake-timers': 28.1.3 '@jest/types': 28.1.3 -<<<<<<< HEAD - '@types/node': 16.18.38 - jest-mock: 28.1.3 - dev: true - - /@jest/expect-utils/28.1.3: -======= '@types/node': 16.0.0 jest-mock: 28.1.3 dev: true /@jest/expect-utils@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: jest-get-type: 28.0.2 dev: true -<<<<<<< HEAD - /@jest/expect/28.1.3: -======= /@jest/expect@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -1247,31 +735,19 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /@jest/fake-timers/28.1.3: -======= /@jest/fake-timers@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 '@sinonjs/fake-timers': 9.1.2 -<<<<<<< HEAD - '@types/node': 16.18.38 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 jest-message-util: 28.1.3 jest-mock: 28.1.3 jest-util: 28.1.3 dev: true -<<<<<<< HEAD - /@jest/globals/28.1.3: -======= /@jest/globals@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -1282,11 +758,7 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /@jest/reporters/28.1.3: -======= /@jest/reporters@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -1301,11 +773,7 @@ packages: '@jest/transform': 28.1.3 '@jest/types': 28.1.3 '@jridgewell/trace-mapping': 0.3.18 -<<<<<<< HEAD - '@types/node': 16.18.38 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 chalk: 4.1.2 collect-v8-coverage: 1.0.2 exit: 0.1.2 @@ -1313,15 +781,9 @@ packages: graceful-fs: 4.2.11 istanbul-lib-coverage: 3.2.0 istanbul-lib-instrument: 5.2.1 -<<<<<<< HEAD - istanbul-lib-report: 3.0.0 - istanbul-lib-source-maps: 4.0.1 - istanbul-reports: 3.1.5 -======= istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 4.0.1 istanbul-reports: 3.1.6 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 jest-message-util: 28.1.3 jest-util: 28.1.3 jest-worker: 28.1.3 @@ -1334,22 +796,14 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /@jest/schemas/28.1.3: -======= /@jest/schemas@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@sinclair/typebox': 0.24.51 dev: true -<<<<<<< HEAD - /@jest/source-map/28.1.2: -======= /@jest/source-map@28.1.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -1358,11 +812,7 @@ packages: graceful-fs: 4.2.11 dev: true -<<<<<<< HEAD - /@jest/test-result/28.1.3: -======= /@jest/test-result@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -1372,11 +822,7 @@ packages: collect-v8-coverage: 1.0.2 dev: true -<<<<<<< HEAD - /@jest/test-sequencer/28.1.3: -======= /@jest/test-sequencer@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -1386,19 +832,11 @@ packages: slash: 3.0.0 dev: true -<<<<<<< HEAD - /@jest/transform/28.1.3: - resolution: {integrity: sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==} - engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} - dependencies: - '@babel/core': 7.22.8 -======= /@jest/transform@28.1.3: resolution: {integrity: sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@babel/core': 7.22.9 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 '@jest/types': 28.1.3 '@jridgewell/trace-mapping': 0.3.18 babel-plugin-istanbul: 6.1.1 @@ -1417,31 +855,19 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /@jest/types/28.1.3: -======= /@jest/types@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/schemas': 28.1.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 -<<<<<<< HEAD - '@types/node': 16.18.38 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 '@types/yargs': 17.0.24 chalk: 4.1.2 dev: true -<<<<<<< HEAD - /@jridgewell/gen-mapping/0.3.3: -======= /@jridgewell/gen-mapping@0.3.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} engines: {node: '>=6.0.0'} dependencies: @@ -1450,51 +876,23 @@ packages: '@jridgewell/trace-mapping': 0.3.18 dev: true -<<<<<<< HEAD - /@jridgewell/resolve-uri/3.1.0: -======= /@jridgewell/resolve-uri@3.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} engines: {node: '>=6.0.0'} dev: true -<<<<<<< HEAD - /@jridgewell/resolve-uri/3.1.1: - resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} - engines: {node: '>=6.0.0'} - dev: true - - /@jridgewell/set-array/1.1.2: -======= /@jridgewell/set-array@1.1.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} engines: {node: '>=6.0.0'} dev: true -<<<<<<< HEAD - /@jridgewell/source-map/0.3.5: -======= /@jridgewell/source-map@0.3.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==} dependencies: '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.18 dev: true -<<<<<<< HEAD - /@jridgewell/sourcemap-codec/1.4.14: - resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} - dev: true - - /@jridgewell/sourcemap-codec/1.4.15: - resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - dev: true - - /@jridgewell/trace-mapping/0.3.18: -======= /@jridgewell/sourcemap-codec@1.4.14: resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} dev: true @@ -1504,37 +902,17 @@ packages: dev: true /@jridgewell/trace-mapping@0.3.18: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==} dependencies: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.14 dev: true -<<<<<<< HEAD - /@jridgewell/trace-mapping/0.3.9: - resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} - dependencies: - '@jridgewell/resolve-uri': 3.1.1 - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - - /@lukeed/csprng/1.1.0: - resolution: {integrity: sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==} - engines: {node: '>=8'} - - /@mapbox/node-pre-gyp/1.0.10: - resolution: {integrity: sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==} - hasBin: true - dependencies: - detect-libc: 2.0.1 -======= /@mapbox/node-pre-gyp@1.0.11: resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} hasBin: true dependencies: detect-libc: 2.0.2 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 https-proxy-agent: 5.0.1 make-dir: 3.1.0 node-fetch: 2.6.12 @@ -1548,34 +926,22 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /@nestjs/cli/9.5.0: - resolution: {integrity: sha512-Z7q+3vNsQSG2d2r2Hl/OOj5EpfjVx3OfnJ9+KuAsOdw1sKLm7+Zc6KbhMFTd/eIvfx82ww3Nk72xdmfPYCulWA==} - engines: {node: '>= 12.9.0'} - hasBin: true + /@nestjs/cache-manager@2.1.0(@nestjs/common@9.0.0)(@nestjs/core@9.0.0)(cache-manager@5.2.3)(reflect-metadata@0.1.13)(rxjs@7.2.0): + resolution: {integrity: sha512-9kep3a8Mq5cMuXN/anGhSYc0P48CRBXk5wyJJRBFxhNkCH8AIzZF4CASGVDIEMmm3OjVcEUHojjyJwCODS17Qw==} + peerDependencies: + '@nestjs/common': ^9.0.0 || ^10.0.0 + '@nestjs/core': ^9.0.0 || ^10.0.0 + cache-manager: <=5 + reflect-metadata: ^0.1.12 + rxjs: ^7.0.0 dependencies: - '@angular-devkit/core': 16.0.1_chokidar@3.5.3 - '@angular-devkit/schematics': 16.0.1_chokidar@3.5.3 - '@angular-devkit/schematics-cli': 16.0.1_chokidar@3.5.3 - '@nestjs/schematics': 9.2.0_n7i3t5jmyrdrkypb5pvfihcmg4 - chalk: 4.1.2 - chokidar: 3.5.3 - cli-table3: 0.6.3 - commander: 4.1.1 - fork-ts-checker-webpack-plugin: 8.0.0_hybrf64lftnf5l2xwgg7goi2iu - inquirer: 8.2.5 - node-emoji: 1.11.0 - ora: 5.4.1 - os-name: 4.0.1 - rimraf: 4.4.1 - shelljs: 0.8.5 - source-map-support: 0.5.21 - tree-kill: 1.2.2 - tsconfig-paths: 4.2.0 - tsconfig-paths-webpack-plugin: 4.0.1 - typescript: 4.9.5 - webpack: 5.82.1 -======= + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/core': 9.0.0(@nestjs/common@9.0.0)(@nestjs/platform-express@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + cache-manager: 5.2.3 + reflect-metadata: 0.1.13 + rxjs: 7.2.0 + dev: true + /@nestjs/cli@9.0.0: resolution: {integrity: sha512-xT5uOoIEcaB/Fn6UeF7atfKqKiEEsTeRKPiM55p+e5H9WVw8FC2r4ceZgaINJbsw0QWskVj/ZQadMo6dA6hXxw==} engines: {node: '>= 12.9.0'} @@ -1602,30 +968,19 @@ packages: tsconfig-paths-webpack-plugin: 3.5.2 typescript: 4.7.4 webpack: 5.73.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 webpack-node-externals: 3.0.0 transitivePeerDependencies: - '@swc/core' - esbuild - uglify-js -<<<<<<< HEAD - - webpack-cli - dev: true - - /@nestjs/common/9.4.3_j3td4gnlgk75ora6o6suo62byy: - resolution: {integrity: sha512-Gd6D4IaYj01o14Bwv81ukidn4w3bPHCblMUq+SmUmWLyosK+XQmInCS09SbDDZyL8jy86PngtBLTdhJ2bXSUig==} - peerDependencies: - cache-manager: <=5 -======= - vue-template-compiler - webpack-cli dev: true - /@nestjs/common@9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0): + /@nestjs/common@9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0): resolution: {integrity: sha512-dyAd48ux/eFYj1uEnQAisSVWq54ttEfeHJBDljvAc6hXbBNHTzZfq/fUH6DmlK29WdGXNMVabCjfduwX2EPquQ==} peerDependencies: cache-manager: '*' ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 class-transformer: '*' class-validator: '*' reflect-metadata: ^0.1.12 @@ -1638,44 +993,23 @@ packages: class-validator: optional: true dependencies: + cache-manager: 5.2.3 class-transformer: 0.5.1 class-validator: 0.14.0 iterare: 1.2.1 reflect-metadata: 0.1.13 -<<<<<<< HEAD - rxjs: 7.8.1 - tslib: 2.5.3 - uid: 2.0.2 - - /@nestjs/config/2.3.4_7u4l2qzmnego2xuu7pwg7mz5xy: - resolution: {integrity: sha512-IGdSF+0F9MJO6dCRTEahdxPz4iVijjtolcFBxnY+2QYM3bXYQvAgzskGZi+WkAFJN/VzR3TEp60gN5sI74GxPA==} -======= rxjs: 7.2.0 tslib: 2.4.0 uuid: 8.3.2 /@nestjs/config@2.3.1(@nestjs/common@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0): resolution: {integrity: sha512-Ckzel0NZ9CWhNsLfE1hxfDuxJuEbhQvGxSlmZ1/X8awjRmAA/g3kT6M1+MO1SHj1wMtPyUfd9WpwkiqFbiwQgA==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 peerDependencies: '@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0 reflect-metadata: ^0.1.13 rxjs: ^6.0.0 || ^7.2.0 dependencies: -<<<<<<< HEAD - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy - dotenv: 16.1.4 - dotenv-expand: 10.0.0 - lodash: 4.17.21 - reflect-metadata: 0.1.13 - rxjs: 7.8.1 - uuid: 9.0.0 - dev: true - - /@nestjs/core/9.4.3_c4fgdp752ib7dsgrlnt7fswfce: - resolution: {integrity: sha512-Qi63+wi55Jh4sDyaj5Hhx2jOpKqT386aeo+VOKsxnd+Ql9VvkO/FjmuwBGUyzkJt29ENYc+P0Sx/k5LtstNpPQ==} -======= - '@nestjs/common': 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) dotenv: 16.0.3 dotenv-expand: 10.0.0 lodash: 4.17.21 @@ -1686,7 +1020,6 @@ packages: /@nestjs/core@9.0.0(@nestjs/common@9.0.0)(@nestjs/platform-express@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0): resolution: {integrity: sha512-Ib25JrYQf5ICro19FBytoMpMQicanC4HG3goPBSqsolu+AhVzSU0OhDwmmiDy3aHgmheFnNEEdUH+Gh5Rm2cNw==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 requiresBuild: true peerDependencies: '@nestjs/common': ^9.0.0 @@ -1703,31 +1036,7 @@ packages: '@nestjs/websockets': optional: true dependencies: -<<<<<<< HEAD - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy - '@nestjs/platform-express': 9.4.3_vw2vky2jc6gkm6gj7lzrgmojyi - '@nuxtjs/opencollective': 0.3.2 - fast-safe-stringify: 2.1.1 - iterare: 1.2.1 - path-to-regexp: 3.2.0 - reflect-metadata: 0.1.13 - rxjs: 7.8.1 - tslib: 2.5.3 - uid: 2.0.2 - transitivePeerDependencies: - - encoding - - /@nestjs/devtools-integration/0.1.5_rjmpvsq4jzhua44mzzdoty2seu: - resolution: {integrity: sha512-iwxvfxa3kzOulG/Fje82Ww80OVsA8rzYR+UAEKrdGExRRGQRGQ0+bHfG0XLlPG3XIuM5J2MRMo7x1bN8ZIs9Gg==} - peerDependencies: - '@nestjs/common': ^9.3.7 || ^10.0.0 - '@nestjs/core': ^9.3.7 || ^10.0.0 - reflect-metadata: ^0.1.12 - dependencies: - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy - '@nestjs/core': 9.4.3_c4fgdp752ib7dsgrlnt7fswfce -======= - '@nestjs/common': 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@nestjs/platform-express': 9.0.0(@nestjs/common@9.0.0)(@nestjs/core@9.0.0) '@nuxtjs/opencollective': 0.3.2 fast-safe-stringify: 2.1.1 @@ -1748,9 +1057,8 @@ packages: '@nestjs/core': ^9.3.7 reflect-metadata: ^0.1.12 dependencies: - '@nestjs/common': 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@nestjs/core': 9.0.0(@nestjs/common@9.0.0)(@nestjs/platform-express@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 chalk: 4.1.2 node-fetch: 2.6.12 reflect-metadata: 0.1.13 @@ -1758,31 +1066,17 @@ packages: - encoding dev: true -<<<<<<< HEAD - /@nestjs/jwt/10.1.0_@nestjs+common@9.4.3: - resolution: {integrity: sha512-iLwCGS25ybUxGS7i5j/Mwuyzvp/WxJftHlm8aLEBv5GV92apz6L1QVjxLdZrqXbzo++C8gdJauhzil8qitY+6w==} - peerDependencies: - '@nestjs/common': ^8.0.0 || ^9.0.0 || ^10.0.0 - dependencies: - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy - '@types/jsonwebtoken': 9.0.2 - jsonwebtoken: 9.0.0 - dev: true - - /@nestjs/mapped-types/1.2.2_i7luks5ses66diusqohyeqc2yi: -======= /@nestjs/jwt@10.0.3(@nestjs/common@9.0.0): resolution: {integrity: sha512-WO8MI3uEMOFKpbO+SAg6l4aRCr+9KvaL+raFMZaXuEUDphXek6pqdox+4tex9242pNSJUA0trfAMaiy/yVrXQg==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 dependencies: - '@nestjs/common': 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@types/jsonwebtoken': 9.0.1 jsonwebtoken: 9.0.0 dev: true /@nestjs/mapped-types@1.2.2(@nestjs/common@9.0.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-3dHxLXs3M0GPiriAcCFFJQHoDFUuzTD5w6JDhE7TyfT89YKpe6tcCCIqOZWdXmt9AZjjK30RkHRSFF+QEnWFQg==} peerDependencies: '@nestjs/common': ^7.0.8 || ^8.0.0 || ^9.0.0 @@ -1795,68 +1089,29 @@ packages: class-validator: optional: true dependencies: -<<<<<<< HEAD - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy -======= - '@nestjs/common': 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) class-transformer: 0.5.1 class-validator: 0.14.0 reflect-metadata: 0.1.13 dev: true -<<<<<<< HEAD - /@nestjs/passport/9.0.3_swdehgqxw2nt4jhhnqbb6yp354: -======= /@nestjs/passport@9.0.3(@nestjs/common@9.0.0)(passport@0.6.0): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-HplSJaimEAz1IOZEu+pdJHHJhQyBOPAYWXYHfAPQvRqWtw4FJF1VXl1Qtk9dcXQX1eKytDtH+qBzNQc19GWNEg==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 passport: ^0.4.0 || ^0.5.0 || ^0.6.0 dependencies: -<<<<<<< HEAD - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy - passport: 0.6.0 - dev: true - - /@nestjs/platform-express/9.4.3_vw2vky2jc6gkm6gj7lzrgmojyi: - resolution: {integrity: sha512-FpdczWoRSC0zz2dNL9u2AQLXKXRVtq4HgHklAhbL59X0uy+mcxhlSThG7DHzDMkoSnuuHY8ojDVf7mDxk+GtCw==} -======= - '@nestjs/common': 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) passport: 0.6.0 dev: true /@nestjs/platform-express@9.0.0(@nestjs/common@9.0.0)(@nestjs/core@9.0.0): resolution: {integrity: sha512-5W5KeYHKKQe4/H7DcPViIObC9nO74P8wnLZUpk4HCUUuFZIzPpUu9v+RAg7c/jGrbdyjfg3VKODCUKFo6PBfmg==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 peerDependencies: '@nestjs/common': ^9.0.0 '@nestjs/core': ^9.0.0 dependencies: -<<<<<<< HEAD - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy - '@nestjs/core': 9.4.3_c4fgdp752ib7dsgrlnt7fswfce - body-parser: 1.20.2 - cors: 2.8.5 - express: 4.18.2 - multer: 1.4.4-lts.1 - tslib: 2.5.3 - transitivePeerDependencies: - - supports-color - - /@nestjs/schematics/9.2.0_n7i3t5jmyrdrkypb5pvfihcmg4: - resolution: {integrity: sha512-wHpNJDPzM6XtZUOB3gW0J6mkFCSJilzCM3XrHI1o0C8vZmFE1snbmkIXNyoi1eV0Nxh1BMymcgz5vIMJgQtTqw==} - peerDependencies: - typescript: '>=4.3.5' - dependencies: - '@angular-devkit/core': 16.0.1_chokidar@3.5.3 - '@angular-devkit/schematics': 16.0.1_chokidar@3.5.3 - jsonc-parser: 3.2.0 - pluralize: 8.0.0 - typescript: 4.9.5 -======= - '@nestjs/common': 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@nestjs/core': 9.0.0(@nestjs/common@9.0.0)(@nestjs/platform-express@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) body-parser: 1.20.0 cors: 2.8.5 @@ -1877,30 +1132,11 @@ packages: jsonc-parser: 3.0.0 pluralize: 8.0.0 typescript: 4.7.4 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 transitivePeerDependencies: - chokidar dev: true -<<<<<<< HEAD - /@nestjs/schematics/9.2.0_typescript@4.9.5: - resolution: {integrity: sha512-wHpNJDPzM6XtZUOB3gW0J6mkFCSJilzCM3XrHI1o0C8vZmFE1snbmkIXNyoi1eV0Nxh1BMymcgz5vIMJgQtTqw==} - peerDependencies: - typescript: '>=4.3.5' - dependencies: - '@angular-devkit/core': 16.0.1 - '@angular-devkit/schematics': 16.0.1 - jsonc-parser: 3.2.0 - pluralize: 8.0.0 - typescript: 4.9.5 - transitivePeerDependencies: - - chokidar - dev: true - - /@nestjs/serve-static/3.0.1_vw2vky2jc6gkm6gj7lzrgmojyi: -======= /@nestjs/serve-static@3.0.1(@nestjs/common@9.0.0)(@nestjs/core@9.0.0): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-i766UJPYOqvQ2BbRKh0/+Mmq5NkJnmKcShjWV1i5qpXyeM0KDZTn0n7g7ykWq/3LbQgjpMzrhYtGv35GX7GVQw==} peerDependencies: '@fastify/static': ^6.5.0 @@ -1916,21 +1152,12 @@ packages: fastify: optional: true dependencies: -<<<<<<< HEAD - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy - '@nestjs/core': 9.4.3_c4fgdp752ib7dsgrlnt7fswfce - path-to-regexp: 0.2.5 - dev: true - - /@nestjs/swagger/6.3.0_ff6xh7k6m3kcxhzayktinvhdx4: -======= - '@nestjs/common': 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@nestjs/core': 9.0.0(@nestjs/common@9.0.0)(@nestjs/platform-express@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) path-to-regexp: 0.2.5 dev: true /@nestjs/swagger@6.3.0(@nestjs/common@9.0.0)(@nestjs/core@9.0.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Gnig189oa1tD+h0BYIfUwhp/wvvmTn6iO3csR2E4rQrDTgCxSxZDlNdfZo3AC+Rmf8u0KX4ZAX1RZN1qXTtC7A==} peerDependencies: '@fastify/static': ^6.0.0 @@ -1947,15 +1174,9 @@ packages: class-validator: optional: true dependencies: -<<<<<<< HEAD - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy - '@nestjs/core': 9.4.3_c4fgdp752ib7dsgrlnt7fswfce - '@nestjs/mapped-types': 1.2.2_i7luks5ses66diusqohyeqc2yi -======= - '@nestjs/common': 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@nestjs/core': 9.0.0(@nestjs/common@9.0.0)(@nestjs/platform-express@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@nestjs/mapped-types': 1.2.2(@nestjs/common@9.0.0)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 class-transformer: 0.5.1 class-validator: 0.14.0 js-yaml: 4.1.0 @@ -1965,13 +1186,8 @@ packages: swagger-ui-dist: 4.18.2 dev: true -<<<<<<< HEAD - /@nestjs/testing/9.4.3_c2suh6ay6qzrduk6sfgpcvxpvi: - resolution: {integrity: sha512-LDT8Ai2eKnTzvnPaJwWOK03qTaFap5uHHsJCv6dL0uKWk6hyF9jms8DjyVaGsaujCaXDG8izl1mDEER0OmxaZA==} -======= /@nestjs/testing@9.0.0(@nestjs/common@9.0.0)(@nestjs/core@9.0.0)(@nestjs/platform-express@9.0.0): resolution: {integrity: sha512-lBBzZvJWaYutYC1wOEKf4KOis/wxudBX0pVLZxzHmtbkeC2EQgQCbyKA88m1R9QeYTt9CmVMg4eyb+WeOADZiQ==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 peerDependencies: '@nestjs/common': ^9.0.0 '@nestjs/core': ^9.0.0 @@ -1983,23 +1199,13 @@ packages: '@nestjs/platform-express': optional: true dependencies: -<<<<<<< HEAD - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy - '@nestjs/core': 9.4.3_c4fgdp752ib7dsgrlnt7fswfce - '@nestjs/platform-express': 9.4.3_vw2vky2jc6gkm6gj7lzrgmojyi - tslib: 2.5.3 - dev: true - - /@nestjs/typeorm/9.0.1_nktyjm3hkn2boz7s6l2p266t2u: -======= - '@nestjs/common': 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@nestjs/core': 9.0.0(@nestjs/common@9.0.0)(@nestjs/platform-express@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@nestjs/platform-express': 9.0.0(@nestjs/common@9.0.0)(@nestjs/core@9.0.0) tslib: 2.4.0 dev: true /@nestjs/typeorm@9.0.1(@nestjs/common@9.0.0)(@nestjs/core@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0)(typeorm@0.3.12): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-A2BgLIPsMtmMI0bPKEf4bmzgFPsnvHqNBx3KkvaJ7hJrBQy0OqYOb+Rr06ifblKWDWS2tUPNrAFQbZjtk3PI+g==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 @@ -2008,32 +1214,15 @@ packages: rxjs: ^7.2.0 typeorm: ^0.3.0 dependencies: -<<<<<<< HEAD - '@nestjs/common': 9.4.3_j3td4gnlgk75ora6o6suo62byy - '@nestjs/core': 9.4.3_c4fgdp752ib7dsgrlnt7fswfce - reflect-metadata: 0.1.13 - rxjs: 7.8.1 - typeorm: 0.3.17_ucsizvblneazg3mzm3rghga4yy - uuid: 8.3.2 - dev: true - - /@nicolo-ribaudo/semver-v6/6.3.3: - resolution: {integrity: sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==} - hasBin: true - dev: true - - /@nodelib/fs.scandir/2.1.5: -======= - '@nestjs/common': 9.0.0(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/common': 9.0.0(cache-manager@5.2.3)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) '@nestjs/core': 9.0.0(@nestjs/common@9.0.0)(@nestjs/platform-express@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) reflect-metadata: 0.1.13 rxjs: 7.2.0 - typeorm: 0.3.12(mysql2@3.2.0)(sqlite3@5.1.6)(ts-node@10.0.0) + typeorm: 0.3.12(mysql2@3.2.0)(redis@4.6.7)(sqlite3@5.1.6)(ts-node@10.0.0) uuid: 8.3.2 dev: true /@nodelib/fs.scandir@2.1.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} dependencies: @@ -2041,20 +1230,12 @@ packages: run-parallel: 1.2.0 dev: true -<<<<<<< HEAD - /@nodelib/fs.stat/2.0.5: -======= /@nodelib/fs.stat@2.0.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} engines: {node: '>= 8'} dev: true -<<<<<<< HEAD - /@nodelib/fs.walk/1.2.8: -======= /@nodelib/fs.walk@1.2.8: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} dependencies: @@ -2062,24 +1243,14 @@ packages: fastq: 1.15.0 dev: true -<<<<<<< HEAD - /@npmcli/fs/1.1.1: -======= /@npmcli/fs@1.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==} dependencies: '@gar/promisify': 1.1.3 semver: 7.5.4 dev: true -<<<<<<< HEAD - optional: true - - /@npmcli/move-file/1.1.2: -======= /@npmcli/move-file@1.1.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==} engines: {node: '>=10'} deprecated: This functionality has been moved to @npmcli/fs @@ -2087,14 +1258,8 @@ packages: mkdirp: 1.0.4 rimraf: 3.0.2 dev: true -<<<<<<< HEAD - optional: true - - /@nuxtjs/opencollective/0.3.2: -======= /@nuxtjs/opencollective@0.3.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==} engines: {node: '>=8.0.0', npm: '>=5.0.0'} hasBin: true @@ -2105,71 +1270,81 @@ packages: transitivePeerDependencies: - encoding -<<<<<<< HEAD - /@sinclair/typebox/0.24.51: - resolution: {integrity: sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==} + /@redis/bloom@1.2.0(@redis/client@1.5.8): + resolution: {integrity: sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==} + peerDependencies: + '@redis/client': ^1.0.0 + dependencies: + '@redis/client': 1.5.8 + dev: true + + /@redis/client@1.5.8: + resolution: {integrity: sha512-xzElwHIO6rBAqzPeVnCzgvrnBEcFL1P0w8P65VNLRkdVW8rOE58f52hdj0BDgmsdOm4f1EoXPZtH4Fh7M/qUpw==} + engines: {node: '>=14'} + dependencies: + cluster-key-slot: 1.1.2 + generic-pool: 3.9.0 + yallist: 4.0.0 + dev: true + + /@redis/graph@1.1.0(@redis/client@1.5.8): + resolution: {integrity: sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==} + peerDependencies: + '@redis/client': ^1.0.0 + dependencies: + '@redis/client': 1.5.8 + dev: true + + /@redis/json@1.0.4(@redis/client@1.5.8): + resolution: {integrity: sha512-LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw==} + peerDependencies: + '@redis/client': ^1.0.0 + dependencies: + '@redis/client': 1.5.8 + dev: true + + /@redis/search@1.1.3(@redis/client@1.5.8): + resolution: {integrity: sha512-4Dg1JjvCevdiCBTZqjhKkGoC5/BcB7k9j99kdMnaXFXg8x4eyOIVg9487CMv7/BUVkFLZCaIh8ead9mU15DNng==} + peerDependencies: + '@redis/client': ^1.0.0 + dependencies: + '@redis/client': 1.5.8 + dev: true + + /@redis/time-series@1.0.4(@redis/client@1.5.8): + resolution: {integrity: sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==} + peerDependencies: + '@redis/client': ^1.0.0 + dependencies: + '@redis/client': 1.5.8 dev: true - /@sinonjs/commons/1.8.6: -======= /@sinclair/typebox@0.24.51: resolution: {integrity: sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==} dev: true /@sinonjs/commons@1.8.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==} dependencies: type-detect: 4.0.8 dev: true -<<<<<<< HEAD - /@sinonjs/fake-timers/9.1.2: -======= /@sinonjs/fake-timers@9.1.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==} dependencies: '@sinonjs/commons': 1.8.6 dev: true -<<<<<<< HEAD - /@sqltools/formatter/1.2.5: - resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==} - dev: true - - /@tootallnate/once/1.1.2: -======= /@sqltools/formatter@1.2.5: resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==} dev: true /@tootallnate/once@1.1.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==} engines: {node: '>= 6'} dev: true optional: true -<<<<<<< HEAD - /@tsconfig/node10/1.0.9: - resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==} - dev: true - - /@tsconfig/node12/1.0.11: - resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==} - dev: true - - /@tsconfig/node14/1.0.3: - resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==} - dev: true - - /@tsconfig/node16/1.0.4: - resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==} - dev: true - - /@types/babel__core/7.20.1: -======= /@tsconfig/node10@1.0.9: resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==} dev: true @@ -2187,7 +1362,6 @@ packages: dev: true /@types/babel__core@7.20.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==} dependencies: '@babel/parser': 7.22.7 @@ -2197,78 +1371,25 @@ packages: '@types/babel__traverse': 7.20.1 dev: true -<<<<<<< HEAD - /@types/babel__generator/7.6.4: -======= /@types/babel__generator@7.6.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==} dependencies: '@babel/types': 7.22.5 dev: true -<<<<<<< HEAD - /@types/babel__template/7.4.1: -======= /@types/babel__template@7.4.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==} dependencies: '@babel/parser': 7.22.7 '@babel/types': 7.22.5 dev: true -<<<<<<< HEAD - /@types/babel__traverse/7.20.1: -======= /@types/babel__traverse@7.20.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==} dependencies: '@babel/types': 7.22.5 dev: true -<<<<<<< HEAD - /@types/body-parser/1.19.2: - resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} - dependencies: - '@types/connect': 3.4.35 - '@types/node': 16.18.38 - dev: true - - /@types/connect/3.4.35: - resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} - dependencies: - '@types/node': 16.18.38 - dev: true - - /@types/cookiejar/2.1.2: - resolution: {integrity: sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==} - dev: true - - /@types/eslint-scope/3.7.4: - resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==} - dependencies: - '@types/eslint': 8.44.0 - '@types/estree': 1.0.1 - dev: true - - /@types/eslint/8.44.0: - resolution: {integrity: sha512-gsF+c/0XOguWgaOgvFs+xnnRqt9GwgTvIks36WpE6ueeI4KCEHHd8K/CKHqhOqrJKsYH8m27kRzQEvWXAwXUTw==} - dependencies: - '@types/estree': 1.0.1 - '@types/json-schema': 7.0.12 - dev: true - - /@types/estree/1.0.1: - resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==} - dev: true - - /@types/express-serve-static-core/4.17.35: - resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==} - dependencies: - '@types/node': 16.18.38 -======= /@types/body-parser@1.19.2: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: @@ -2312,19 +1433,13 @@ packages: resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==} dependencies: '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 '@types/send': 0.17.1 dev: true -<<<<<<< HEAD - /@types/express/4.17.17: - resolution: {integrity: sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==} -======= /@types/express@4.17.13: resolution: {integrity: sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 dependencies: '@types/body-parser': 1.19.2 '@types/express-serve-static-core': 4.17.35 @@ -2332,23 +1447,6 @@ packages: '@types/serve-static': 1.15.2 dev: true -<<<<<<< HEAD - /@types/graceful-fs/4.1.6: - resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==} - dependencies: - '@types/node': 16.18.38 - dev: true - - /@types/http-errors/2.0.1: - resolution: {integrity: sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==} - dev: true - - /@types/istanbul-lib-coverage/2.0.4: - resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==} - dev: true - - /@types/istanbul-lib-report/3.0.0: -======= /@types/graceful-fs@4.1.6: resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==} dependencies: @@ -2364,105 +1462,24 @@ packages: dev: true /@types/istanbul-lib-report@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==} dependencies: '@types/istanbul-lib-coverage': 2.0.4 dev: true -<<<<<<< HEAD - /@types/istanbul-reports/3.0.1: -======= /@types/istanbul-reports@3.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==} dependencies: '@types/istanbul-lib-report': 3.0.0 dev: true -<<<<<<< HEAD - /@types/jest/28.1.4: -======= /@types/jest@28.1.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-telv6G5N7zRJiLcI3Rs3o+ipZ28EnE+7EvF0pSrt2pZOMnAVI/f+6/LucDxOvcBcTeTL3JMF744BbVQAVBUQRA==} dependencies: jest-matcher-utils: 28.1.3 pretty-format: 28.1.3 dev: true -<<<<<<< HEAD - /@types/json-schema/7.0.12: - resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==} - dev: true - - /@types/jsonwebtoken/9.0.2: - resolution: {integrity: sha512-drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q==} - dependencies: - '@types/node': 16.18.38 - dev: true - - /@types/lodash-es/4.17.7: - resolution: {integrity: sha512-z0ptr6UI10VlU6l5MYhGwS4mC8DZyYer2mCoyysZtSF7p26zOX8UpbrV0YpNYLGS8K4PUFIyEr62IMFFjveSiQ==} - dependencies: - '@types/lodash': 4.14.195 - dev: true - - /@types/lodash/4.14.195: - resolution: {integrity: sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==} - dev: true - - /@types/mime/1.3.2: - resolution: {integrity: sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==} - dev: true - - /@types/mime/3.0.1: - resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==} - dev: true - - /@types/mockjs/1.0.7: - resolution: {integrity: sha512-OCxXz6hEaJOVpRwuJMiVY5a6LtJcih+br9gwB/Q8ooOBikvk5FpBQ31OlNimXo3EqKha1Z7PFBni+q9m+8NCWg==} - dev: true - - /@types/multer/1.4.7: - resolution: {integrity: sha512-/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==} - dependencies: - '@types/express': 4.17.17 - dev: true - - /@types/node/16.18.38: - resolution: {integrity: sha512-6sfo1qTulpVbkxECP+AVrHV9OoJqhzCsfTNp5NIG+enM4HyM3HvZCO798WShIXBN0+QtDIcutJCjsVYnQP5rIQ==} - dev: true - - /@types/parse-json/4.0.0: - resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} - dev: true - - /@types/prettier/2.7.3: - resolution: {integrity: sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==} - dev: true - - /@types/qs/6.9.7: - resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==} - dev: true - - /@types/range-parser/1.2.4: - resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==} - dev: true - - /@types/semver/7.5.0: - resolution: {integrity: sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==} - dev: true - - /@types/send/0.17.1: - resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} - dependencies: - '@types/mime': 1.3.2 - '@types/node': 16.18.38 - dev: true - - /@types/serve-static/1.15.2: -======= /@types/json-schema@7.0.12: resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==} dev: true @@ -2509,6 +1526,12 @@ packages: resolution: {integrity: sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg==} dev: true + /@types/nodemailer@6.4.9: + resolution: {integrity: sha512-XYG8Gv+sHjaOtUpiuytahMy2mM3rectgroNbs6R3djZEKmPNiIJwe9KqOJBGzKKnNZNKvnuvmugBgpq3w/S0ig==} + dependencies: + '@types/node': 16.0.0 + dev: true + /@types/parse-json@4.0.0: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} dev: true @@ -2533,29 +1556,10 @@ packages: dev: true /@types/serve-static@1.15.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==} dependencies: '@types/http-errors': 2.0.1 '@types/mime': 3.0.1 -<<<<<<< HEAD - '@types/node': 16.18.38 - dev: true - - /@types/stack-utils/2.0.1: - resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} - dev: true - - /@types/superagent/4.1.18: - resolution: {integrity: sha512-LOWgpacIV8GHhrsQU+QMZuomfqXiqzz3ILLkCtKx3Us6AmomFViuzKT9D693QTKgyut2oCytMG8/efOop+DB+w==} - dependencies: - '@types/cookiejar': 2.1.2 - '@types/node': 16.18.38 - dev: true - - /@types/supertest/2.0.12: - resolution: {integrity: sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ==} -======= '@types/node': 16.0.0 dev: true @@ -2572,25 +1576,14 @@ packages: /@types/supertest@2.0.11: resolution: {integrity: sha512-uci4Esokrw9qGb9bvhhSVEjd6rkny/dk5PK/Qz4yxKiyppEI+dOPlNrZBahE3i+PoKFYyDxChVXZ/ysS/nrm1Q==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 dependencies: '@types/superagent': 4.1.18 dev: true -<<<<<<< HEAD - /@types/uuid/9.0.2: - resolution: {integrity: sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ==} + /@types/triple-beam@1.3.2: + resolution: {integrity: sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g==} dev: true - /@types/validator/13.7.17: - resolution: {integrity: sha512-aqayTNmeWrZcvnG2MG9eGYI6b7S5fl+yKgPs6bAjOTwPS316R5SxBGKvtSExfyoJU7pIeHJfsHI0Ji41RVMkvQ==} - - /@types/yargs-parser/21.0.0: - resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} - dev: true - - /@types/yargs/17.0.24: -======= /@types/uuid@9.0.1: resolution: {integrity: sha512-rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA==} dev: true @@ -2603,19 +1596,13 @@ packages: dev: true /@types/yargs@17.0.24: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==} dependencies: '@types/yargs-parser': 21.0.0 dev: true -<<<<<<< HEAD - /@typescript-eslint/eslint-plugin/5.61.0_tiwiljqgmizmat2g4tqcn7wxxu: - resolution: {integrity: sha512-A5l/eUAug103qtkwccSCxn8ZRwT+7RXWkFECdA4Cvl1dOlDUgTpAOfSEElZn2uSUxhdDpnCdetrf0jvU4qrL+g==} -======= /@typescript-eslint/eslint-plugin@5.0.0(@typescript-eslint/parser@5.0.0)(eslint@8.0.1)(typescript@4.3.5): resolution: {integrity: sha512-T6V6fCD2U0YesOedvydTnrNtsC8E+c2QzpawIpDdlaObX0OX5dLo7tLU5c64FhTZvA1Xrdim+cXDI7NPsVx8Cg==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -2625,21 +1612,6 @@ packages: typescript: optional: true dependencies: -<<<<<<< HEAD - '@eslint-community/regexpp': 4.5.1 - '@typescript-eslint/parser': 5.61.0_c6scop6gobf6637sntyzfiffg4 - '@typescript-eslint/scope-manager': 5.61.0 - '@typescript-eslint/type-utils': 5.61.0_c6scop6gobf6637sntyzfiffg4 - '@typescript-eslint/utils': 5.61.0_c6scop6gobf6637sntyzfiffg4 - debug: 4.3.4 - eslint: 8.44.0 - graphemer: 1.4.0 - ignore: 5.2.4 - natural-compare-lite: 1.4.0 - semver: 7.5.4 - tsutils: 3.21.0_typescript@4.9.5 - typescript: 4.9.5 -======= '@typescript-eslint/experimental-utils': 5.0.0(eslint@8.0.1)(typescript@4.3.5) '@typescript-eslint/parser': 5.0.0(eslint@8.0.1)(typescript@4.3.5) '@typescript-eslint/scope-manager': 5.0.0 @@ -2651,102 +1623,10 @@ packages: semver: 7.5.4 tsutils: 3.21.0(typescript@4.3.5) typescript: 4.3.5 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 transitivePeerDependencies: - supports-color dev: true -<<<<<<< HEAD - /@typescript-eslint/parser/5.61.0_c6scop6gobf6637sntyzfiffg4: - resolution: {integrity: sha512-yGr4Sgyh8uO6fSi9hw3jAFXNBHbCtKKFMdX2IkT3ZqpKmtAq3lHS4ixB/COFuAIJpwl9/AqF7j72ZDWYKmIfvg==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/scope-manager': 5.61.0 - '@typescript-eslint/types': 5.61.0 - '@typescript-eslint/typescript-estree': 5.61.0_typescript@4.9.5 - debug: 4.3.4 - eslint: 8.44.0 - typescript: 4.9.5 - transitivePeerDependencies: - - supports-color - dev: true - - /@typescript-eslint/scope-manager/5.61.0: - resolution: {integrity: sha512-W8VoMjoSg7f7nqAROEmTt6LoBpn81AegP7uKhhW5KzYlehs8VV0ZW0fIDVbcZRcaP3aPSW+JZFua+ysQN+m/Nw==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dependencies: - '@typescript-eslint/types': 5.61.0 - '@typescript-eslint/visitor-keys': 5.61.0 - dev: true - - /@typescript-eslint/type-utils/5.61.0_c6scop6gobf6637sntyzfiffg4: - resolution: {integrity: sha512-kk8u//r+oVK2Aj3ph/26XdH0pbAkC2RiSjUYhKD+PExemG4XSjpGFeyZ/QM8lBOa7O8aGOU+/yEbMJgQv/DnCg==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - eslint: '*' - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/typescript-estree': 5.61.0_typescript@4.9.5 - '@typescript-eslint/utils': 5.61.0_c6scop6gobf6637sntyzfiffg4 - debug: 4.3.4 - eslint: 8.44.0 - tsutils: 3.21.0_typescript@4.9.5 - typescript: 4.9.5 - transitivePeerDependencies: - - supports-color - dev: true - - /@typescript-eslint/types/5.61.0: - resolution: {integrity: sha512-ldyueo58KjngXpzloHUog/h9REmHl59G1b3a5Sng1GfBo14BkS3ZbMEb3693gnP1k//97lh7bKsp6/V/0v1veQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dev: true - - /@typescript-eslint/typescript-estree/5.61.0_typescript@4.9.5: - resolution: {integrity: sha512-Fud90PxONnnLZ36oR5ClJBLTLfU4pIWBmnvGwTbEa2cXIqj70AEDEmOmpkFComjBZ/037ueKrOdHuYmSFVD7Rw==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/types': 5.61.0 - '@typescript-eslint/visitor-keys': 5.61.0 - debug: 4.3.4 - globby: 11.1.0 - is-glob: 4.0.3 - semver: 7.5.4 - tsutils: 3.21.0_typescript@4.9.5 - typescript: 4.9.5 - transitivePeerDependencies: - - supports-color - dev: true - - /@typescript-eslint/utils/5.61.0_c6scop6gobf6637sntyzfiffg4: - resolution: {integrity: sha512-mV6O+6VgQmVE6+xzlA91xifndPW9ElFW8vbSF0xCT/czPXVhwDewKila1jOyRwa9AE19zKnrr7Cg5S3pJVrTWQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - dependencies: - '@eslint-community/eslint-utils': 4.4.0_eslint@8.44.0 - '@types/json-schema': 7.0.12 - '@types/semver': 7.5.0 - '@typescript-eslint/scope-manager': 5.61.0 - '@typescript-eslint/types': 5.61.0 - '@typescript-eslint/typescript-estree': 5.61.0_typescript@4.9.5 - eslint: 8.44.0 - eslint-scope: 5.1.1 - semver: 7.5.4 -======= /@typescript-eslint/experimental-utils@5.0.0(eslint@8.0.1)(typescript@4.3.5): resolution: {integrity: sha512-Dnp4dFIsZcPawD6CT1p5NibNUQyGSEz80sULJZkyhyna8AEqArmfwMwJPbmKzWVo4PabqNVzHYlzmcdLQWk+pg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -2760,64 +1640,11 @@ packages: eslint: 8.0.1 eslint-scope: 5.1.1 eslint-utils: 3.0.0(eslint@8.0.1) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 transitivePeerDependencies: - supports-color - typescript dev: true -<<<<<<< HEAD - /@typescript-eslint/visitor-keys/5.61.0: - resolution: {integrity: sha512-50XQ5VdbWrX06mQXhy93WywSFZZGsv3EOjq+lqp6WC2t+j3mb6A9xYVdrRxafvK88vg9k9u+CT4l6D8PEatjKg==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dependencies: - '@typescript-eslint/types': 5.61.0 - eslint-visitor-keys: 3.4.1 - dev: true - - /@webassemblyjs/ast/1.11.6: - resolution: {integrity: sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==} - dependencies: - '@webassemblyjs/helper-numbers': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - dev: true - - /@webassemblyjs/floating-point-hex-parser/1.11.6: - resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==} - dev: true - - /@webassemblyjs/helper-api-error/1.11.6: - resolution: {integrity: sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==} - dev: true - - /@webassemblyjs/helper-buffer/1.11.6: - resolution: {integrity: sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==} - dev: true - - /@webassemblyjs/helper-numbers/1.11.6: - resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==} - dependencies: - '@webassemblyjs/floating-point-hex-parser': 1.11.6 - '@webassemblyjs/helper-api-error': 1.11.6 - '@xtuc/long': 4.2.2 - dev: true - - /@webassemblyjs/helper-wasm-bytecode/1.11.6: - resolution: {integrity: sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==} - dev: true - - /@webassemblyjs/helper-wasm-section/1.11.6: - resolution: {integrity: sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==} - dependencies: - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/helper-buffer': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/wasm-gen': 1.11.6 - dev: true - - /@webassemblyjs/ieee754/1.11.6: - resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==} -======= /@typescript-eslint/parser@5.0.0(eslint@8.0.1)(typescript@4.3.5): resolution: {integrity: sha512-B6D5rmmQ14I1fdzs71eL3DAuvnPHTY/t7rQABrL9BLnx/H51Un8ox1xqYAchs0/V2trcoyxB1lMJLlrwrJCDgw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -2971,15 +1798,10 @@ packages: /@webassemblyjs/ieee754@1.11.1: resolution: {integrity: sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 dependencies: '@xtuc/ieee754': 1.2.0 dev: true -<<<<<<< HEAD - /@webassemblyjs/leb128/1.11.6: - resolution: {integrity: sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==} -======= /@webassemblyjs/ieee754@1.9.0: resolution: {integrity: sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==} dependencies: @@ -2988,80 +1810,10 @@ packages: /@webassemblyjs/leb128@1.11.1: resolution: {integrity: sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 dependencies: '@xtuc/long': 4.2.2 dev: true -<<<<<<< HEAD - /@webassemblyjs/utf8/1.11.6: - resolution: {integrity: sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==} - dev: true - - /@webassemblyjs/wasm-edit/1.11.6: - resolution: {integrity: sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==} - dependencies: - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/helper-buffer': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/helper-wasm-section': 1.11.6 - '@webassemblyjs/wasm-gen': 1.11.6 - '@webassemblyjs/wasm-opt': 1.11.6 - '@webassemblyjs/wasm-parser': 1.11.6 - '@webassemblyjs/wast-printer': 1.11.6 - dev: true - - /@webassemblyjs/wasm-gen/1.11.6: - resolution: {integrity: sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==} - dependencies: - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/ieee754': 1.11.6 - '@webassemblyjs/leb128': 1.11.6 - '@webassemblyjs/utf8': 1.11.6 - dev: true - - /@webassemblyjs/wasm-opt/1.11.6: - resolution: {integrity: sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==} - dependencies: - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/helper-buffer': 1.11.6 - '@webassemblyjs/wasm-gen': 1.11.6 - '@webassemblyjs/wasm-parser': 1.11.6 - dev: true - - /@webassemblyjs/wasm-parser/1.11.6: - resolution: {integrity: sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==} - dependencies: - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/helper-api-error': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/ieee754': 1.11.6 - '@webassemblyjs/leb128': 1.11.6 - '@webassemblyjs/utf8': 1.11.6 - dev: true - - /@webassemblyjs/wast-printer/1.11.6: - resolution: {integrity: sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==} - dependencies: - '@webassemblyjs/ast': 1.11.6 - '@xtuc/long': 4.2.2 - dev: true - - /@xtuc/ieee754/1.2.0: - resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} - dev: true - - /@xtuc/long/4.2.2: - resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} - dev: true - - /abbrev/1.1.1: - resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} - dev: true - - /accepts/1.3.8: -======= /@webassemblyjs/leb128@1.9.0: resolution: {integrity: sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==} dependencies: @@ -3201,18 +1953,13 @@ packages: dev: true /accepts@1.3.8: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} engines: {node: '>= 0.6'} dependencies: mime-types: 2.1.35 negotiator: 0.6.3 -<<<<<<< HEAD - /acorn-import-assertions/1.9.0_acorn@8.10.0: -======= /acorn-import-assertions@1.9.0(acorn@8.10.0): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==} peerDependencies: acorn: ^8 @@ -3220,11 +1967,7 @@ packages: acorn: 8.10.0 dev: true -<<<<<<< HEAD - /acorn-jsx/5.3.2_acorn@8.10.0: -======= /acorn-jsx@5.3.2(acorn@8.10.0): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -3232,26 +1975,13 @@ packages: acorn: 8.10.0 dev: true -<<<<<<< HEAD - /acorn-walk/8.2.0: - resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==} - engines: {node: '>=0.4.0'} - dev: true - - /acorn/8.10.0: -======= /acorn@8.10.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} engines: {node: '>=0.4.0'} hasBin: true dev: true -<<<<<<< HEAD - /agent-base/6.0.2: -======= /agent-base@6.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} dependencies: @@ -3260,11 +1990,7 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /agentkeepalive/4.3.0: -======= /agentkeepalive@4.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==} engines: {node: '>= 8.0.0'} dependencies: @@ -3276,44 +2002,26 @@ packages: dev: true optional: true -<<<<<<< HEAD - /aggregate-error/3.1.0: -======= /aggregate-error@3.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==} engines: {node: '>=8'} dependencies: clean-stack: 2.2.0 indent-string: 4.0.0 dev: true -<<<<<<< HEAD - optional: true - - /ajv-formats/2.1.1: - resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} -======= /ajv-formats@2.1.1(ajv@8.11.0): resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} peerDependencies: ajv: ^8.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 peerDependenciesMeta: ajv: optional: true dependencies: -<<<<<<< HEAD - ajv: 8.12.0 - dev: true - - /ajv-keywords/3.5.2_ajv@6.12.6: -======= ajv: 8.11.0 dev: true /ajv-keywords@3.5.2(ajv@6.12.6): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} peerDependencies: ajv: ^6.9.1 @@ -3321,11 +2029,7 @@ packages: ajv: 6.12.6 dev: true -<<<<<<< HEAD - /ajv/6.12.6: -======= /ajv@6.12.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: fast-deep-equal: 3.1.3 @@ -3334,13 +2038,8 @@ packages: uri-js: 4.4.1 dev: true -<<<<<<< HEAD - /ajv/8.12.0: - resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==} -======= /ajv@8.11.0: resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 dependencies: fast-deep-equal: 3.1.3 json-schema-traverse: 1.0.0 @@ -3348,83 +2047,51 @@ packages: uri-js: 4.4.1 dev: true -<<<<<<< HEAD - /ansi-colors/4.1.3: -======= /ansi-colors@4.1.1: resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==} engines: {node: '>=6'} dev: true /ansi-colors@4.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /ansi-escapes/4.3.2: -======= /ansi-escapes@4.3.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==} engines: {node: '>=8'} dependencies: type-fest: 0.21.3 dev: true -<<<<<<< HEAD - /ansi-regex/5.0.1: -======= /ansi-regex@5.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /ansi-styles/3.2.1: -======= /ansi-styles@3.2.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} engines: {node: '>=4'} dependencies: color-convert: 1.9.3 dev: true -<<<<<<< HEAD - /ansi-styles/4.3.0: -======= /ansi-styles@4.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} dependencies: color-convert: 2.0.1 -<<<<<<< HEAD - /ansi-styles/5.2.0: -======= /ansi-styles@5.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /any-promise/1.3.0: - resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} - dev: true - - /anymatch/3.1.3: -======= /any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} dev: true /anymatch@3.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} engines: {node: '>= 8'} dependencies: @@ -3432,25 +2099,11 @@ packages: picomatch: 2.3.1 dev: true -<<<<<<< HEAD - /app-root-path/3.1.0: -======= /app-root-path@3.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==} engines: {node: '>= 6.0.0'} dev: true -<<<<<<< HEAD - /append-field/1.0.0: - resolution: {integrity: sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==} - - /aproba/2.0.0: - resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} - dev: true - - /are-we-there-yet/2.0.0: -======= /append-field@1.0.0: resolution: {integrity: sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==} @@ -3459,7 +2112,6 @@ packages: dev: true /are-we-there-yet@2.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==} engines: {node: '>=10'} dependencies: @@ -3467,11 +2119,7 @@ packages: readable-stream: 3.6.2 dev: true -<<<<<<< HEAD - /are-we-there-yet/3.0.1: -======= /are-we-there-yet@3.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} dependencies: @@ -3480,34 +2128,16 @@ packages: dev: true optional: true -<<<<<<< HEAD - /arg/4.1.3: - resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} - dev: true - - /argparse/1.0.10: -======= /arg@4.1.3: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} dev: true /argparse@1.0.10: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} dependencies: sprintf-js: 1.0.3 dev: true -<<<<<<< HEAD - /argparse/2.0.1: - resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} - dev: true - - /array-flatten/1.1.1: - resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==} - - /array-union/2.1.0: -======= /argparse@2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} dev: true @@ -3516,46 +2146,29 @@ packages: resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==} /array-union@2.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /asap/2.0.6: - resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==} + /async@3.2.4: + resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==} dev: true - /asynckit/0.4.0: - resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - dev: true - - /babel-jest/28.1.3_@babel+core@7.22.8: -======= /asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} dev: true /babel-jest@28.1.3(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: '@babel/core': ^7.8.0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@jest/transform': 28.1.3 - '@types/babel__core': 7.20.1 - babel-plugin-istanbul: 6.1.1 - babel-preset-jest: 28.1.3_@babel+core@7.22.8 -======= '@babel/core': 7.22.9 '@jest/transform': 28.1.3 '@types/babel__core': 7.20.1 babel-plugin-istanbul: 6.1.1 babel-preset-jest: 28.1.3(@babel/core@7.22.9) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 chalk: 4.1.2 graceful-fs: 4.2.11 slash: 3.0.0 @@ -3563,11 +2176,7 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /babel-plugin-istanbul/6.1.1: -======= /babel-plugin-istanbul@6.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==} engines: {node: '>=8'} dependencies: @@ -3580,11 +2189,7 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /babel-plugin-jest-hoist/28.1.3: -======= /babel-plugin-jest-hoist@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -3594,33 +2199,11 @@ packages: '@types/babel__traverse': 7.20.1 dev: true -<<<<<<< HEAD - /babel-preset-current-node-syntax/1.0.1_@babel+core@7.22.8: -======= /babel-preset-current-node-syntax@1.0.1(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} peerDependencies: '@babel/core': ^7.0.0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.22.8 - '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.22.8 - '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.22.8 - '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.22.8 - '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.22.8 - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.22.8 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.22.8 - '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.22.8 - '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.22.8 - '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.22.8 - '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.22.8 - '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.22.8 - dev: true - - /babel-preset-jest/28.1.3_@babel+core@7.22.8: -======= '@babel/core': 7.22.9 '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.9) '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.22.9) @@ -3637,27 +2220,11 @@ packages: dev: true /babel-preset-jest@28.1.3(@babel/core@7.22.9): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: '@babel/core': ^7.0.0 dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - babel-plugin-jest-hoist: 28.1.3 - babel-preset-current-node-syntax: 1.0.1_@babel+core@7.22.8 - dev: true - - /balanced-match/1.0.2: - resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - - /base64-js/1.5.1: - resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - dev: true - - /binary-extensions/2.2.0: -======= '@babel/core': 7.22.9 babel-plugin-jest-hoist: 28.1.3 babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.9) @@ -3671,16 +2238,11 @@ packages: dev: true /binary-extensions@2.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /bl/4.1.0: -======= /bl@4.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} dependencies: buffer: 5.7.1 @@ -3688,13 +2250,8 @@ packages: readable-stream: 3.6.2 dev: true -<<<<<<< HEAD - /body-parser/1.20.1: - resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==} -======= /body-parser@1.20.0: resolution: {integrity: sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} dependencies: bytes: 3.1.2 @@ -3705,81 +2262,32 @@ packages: http-errors: 2.0.0 iconv-lite: 0.4.24 on-finished: 2.4.1 -<<<<<<< HEAD - qs: 6.11.0 -======= qs: 6.10.3 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 raw-body: 2.5.1 type-is: 1.6.18 unpipe: 1.0.0 transitivePeerDependencies: - supports-color -<<<<<<< HEAD - /body-parser/1.20.2: - resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==} - engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} - dependencies: - bytes: 3.1.2 - content-type: 1.0.5 - debug: 2.6.9 - depd: 2.0.0 - destroy: 1.2.0 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - on-finished: 2.4.1 - qs: 6.11.0 - raw-body: 2.5.2 - type-is: 1.6.18 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color - - /brace-expansion/1.1.11: -======= /brace-expansion@1.1.11: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} dependencies: balanced-match: 1.0.2 concat-map: 0.0.1 -<<<<<<< HEAD - /brace-expansion/2.0.1: -======= /brace-expansion@2.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} dependencies: balanced-match: 1.0.2 dev: true -<<<<<<< HEAD - /braces/3.0.2: -======= /braces@3.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} engines: {node: '>=8'} dependencies: fill-range: 7.0.1 dev: true -<<<<<<< HEAD - /browserslist/4.21.9: - resolution: {integrity: sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==} - engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} - hasBin: true - dependencies: - caniuse-lite: 1.0.30001514 - electron-to-chromium: 1.4.454 - node-releases: 2.0.13 - update-browserslist-db: 1.0.11_browserslist@4.21.9 - dev: true - - /bs-logger/0.2.6: -======= /browserslist@4.21.10: resolution: {integrity: sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -3792,33 +2300,18 @@ packages: dev: true /bs-logger@0.2.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==} engines: {node: '>= 6'} dependencies: fast-json-stable-stringify: 2.1.0 dev: true -<<<<<<< HEAD - /bser/2.1.1: -======= /bser@2.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==} dependencies: node-int64: 0.4.0 dev: true -<<<<<<< HEAD - /buffer-equal-constant-time/1.0.1: - resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==} - dev: true - - /buffer-from/1.1.2: - resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} - - /buffer/5.7.1: -======= /buffer-equal-constant-time@1.0.1: resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==} dev: true @@ -3827,47 +2320,30 @@ packages: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} /buffer@5.7.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} dependencies: base64-js: 1.5.1 ieee754: 1.2.1 dev: true -<<<<<<< HEAD - /buffer/6.0.3: -======= /buffer@6.0.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==} dependencies: base64-js: 1.5.1 ieee754: 1.2.1 dev: true -<<<<<<< HEAD - /busboy/1.6.0: -======= /busboy@1.6.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==} engines: {node: '>=10.16.0'} dependencies: streamsearch: 1.1.0 -<<<<<<< HEAD - /bytes/3.1.2: - resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} - engines: {node: '>= 0.8'} - - /cacache/15.3.0: -======= /bytes@3.1.2: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} /cacache@15.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==} engines: {node: '>= 10'} dependencies: @@ -3892,59 +2368,46 @@ packages: transitivePeerDependencies: - bluebird dev: true -<<<<<<< HEAD - optional: true - /call-bind/1.0.2: -======= + /cache-manager-redis-store@3.0.1: + resolution: {integrity: sha512-o560kw+dFqusC9lQJhcm6L2F2fMKobJ5af+FoR2PdnMVdpQ3f3Bz6qzvObTGyvoazQJxjQNWgMQeChP4vRTuXQ==} + engines: {node: '>= 16.18.0'} + dependencies: + redis: 4.6.7 + dev: true + + /cache-manager@5.2.3: + resolution: {integrity: sha512-9OErI8fksFkxAMJ8Mco0aiZSdphyd90HcKiOMJQncSlU1yq/9lHHxrT8PDayxrmr9IIIZPOAEfXuGSD7g29uog==} + dependencies: + lodash.clonedeep: 4.5.0 + lru-cache: 9.1.2 /call-bind@1.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} dependencies: function-bind: 1.1.1 get-intrinsic: 1.2.1 -<<<<<<< HEAD - /callsites/3.1.0: -======= /callsites@3.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /camelcase/5.3.1: -======= /camelcase@5.3.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /camelcase/6.3.0: -======= /camelcase@6.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /caniuse-lite/1.0.30001514: - resolution: {integrity: sha512-ENcIpYBmwAAOm/V2cXgM7rZUrKKaqisZl4ZAI520FIkqGXUxJjmaIssbRW5HVVR5tyV6ygTLIm15aU8LUmQSaQ==} - dev: true - - /chalk/2.4.2: -======= /caniuse-lite@1.0.30001518: resolution: {integrity: sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==} dev: true /chalk@2.4.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} engines: {node: '>=4'} dependencies: @@ -3953,9 +2416,6 @@ packages: supports-color: 5.5.0 dev: true -<<<<<<< HEAD - /chalk/4.1.2: -======= /chalk@3.0.0: resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==} engines: {node: '>=8'} @@ -3965,35 +2425,22 @@ packages: dev: true /chalk@4.1.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} engines: {node: '>=10'} dependencies: ansi-styles: 4.3.0 supports-color: 7.2.0 -<<<<<<< HEAD - /char-regex/1.0.2: -======= /char-regex@1.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /chardet/0.7.0: - resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} - dev: true - - /chokidar/3.5.3: -======= /chardet@0.7.0: resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} dev: true /chokidar@3.5.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} engines: {node: '>= 8.10.0'} dependencies: @@ -4008,56 +2455,21 @@ packages: fsevents: 2.3.2 dev: true -<<<<<<< HEAD - /chownr/2.0.0: -======= /chownr@2.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /chrome-trace-event/1.0.3: -======= /chrome-trace-event@1.0.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} engines: {node: '>=6.0'} dev: true -<<<<<<< HEAD - /ci-info/3.8.0: -======= /ci-info@3.8.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /cjs-module-lexer/1.2.3: - resolution: {integrity: sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==} - dev: true - - /class-transformer/0.5.1: - resolution: {integrity: sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==} - - /class-validator/0.14.0: - resolution: {integrity: sha512-ct3ltplN8I9fOwUd8GrP8UQixwff129BkEtuWDKL5W45cQuLd19xqmTLu5ge78YDm/fdje6FMt0hGOhl0lii3A==} - dependencies: - '@types/validator': 13.7.17 - libphonenumber-js: 1.10.37 - validator: 13.9.0 - - /clean-stack/2.2.0: - resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} - engines: {node: '>=6'} - dev: true - optional: true - - /cli-cursor/3.1.0: -======= /cjs-module-lexer@1.2.3: resolution: {integrity: sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==} dev: true @@ -4078,18 +2490,13 @@ packages: dev: true /cli-cursor@3.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==} engines: {node: '>=8'} dependencies: restore-cursor: 3.1.0 dev: true -<<<<<<< HEAD - /cli-highlight/2.1.11: -======= /cli-highlight@2.1.11: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==} engines: {node: '>=8.0.0', npm: '>=5.0.0'} hasBin: true @@ -4102,22 +2509,13 @@ packages: yargs: 16.2.0 dev: true -<<<<<<< HEAD - /cli-spinners/2.9.0: -======= /cli-spinners@2.9.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /cli-table3/0.6.3: - resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==} -======= /cli-table3@0.6.2: resolution: {integrity: sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: 10.* || >= 12.*} dependencies: string-width: 4.2.3 @@ -4125,20 +2523,12 @@ packages: '@colors/colors': 1.5.0 dev: true -<<<<<<< HEAD - /cli-width/3.0.0: -======= /cli-width@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==} engines: {node: '>= 10'} dev: true -<<<<<<< HEAD - /cliui/7.0.4: -======= /cliui@7.0.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} dependencies: string-width: 4.2.3 @@ -4146,11 +2536,7 @@ packages: wrap-ansi: 7.0.0 dev: true -<<<<<<< HEAD - /cliui/8.0.1: -======= /cliui@8.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} dependencies: @@ -4159,62 +2545,37 @@ packages: wrap-ansi: 7.0.0 dev: true -<<<<<<< HEAD - /clone/1.0.4: -======= /clone@1.0.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==} engines: {node: '>=0.8'} dev: true -<<<<<<< HEAD - /co/4.6.0: -======= + /cluster-key-slot@1.1.2: + resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==} + engines: {node: '>=0.10.0'} + dev: true + /co@4.6.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==} engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} dev: true -<<<<<<< HEAD - /collect-v8-coverage/1.0.2: - resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==} - dev: true - - /color-convert/1.9.3: -======= /collect-v8-coverage@1.0.2: resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==} dev: true /color-convert@1.9.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} dependencies: color-name: 1.1.3 dev: true -<<<<<<< HEAD - /color-convert/2.0.1: -======= /color-convert@2.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} dependencies: color-name: 1.1.4 -<<<<<<< HEAD - /color-name/1.1.3: - resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} - dev: true - - /color-name/1.1.4: - resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - - /color-support/1.1.3: -======= /color-name@1.1.3: resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} dev: true @@ -4222,59 +2583,53 @@ packages: /color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + /color-string@1.9.1: + resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==} + dependencies: + color-name: 1.1.4 + simple-swizzle: 0.2.2 + dev: true + /color-support@1.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} hasBin: true dev: true -<<<<<<< HEAD - /combined-stream/1.0.8: -======= + /color@3.2.1: + resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==} + dependencies: + color-convert: 1.9.3 + color-string: 1.9.1 + dev: true + + /colorspace@1.1.4: + resolution: {integrity: sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==} + dependencies: + color: 3.2.1 + text-hex: 1.0.0 + dev: true + /combined-stream@1.0.8: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} engines: {node: '>= 0.8'} dependencies: delayed-stream: 1.0.0 dev: true -<<<<<<< HEAD - /commander/11.0.0: -======= /commander@11.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==} engines: {node: '>=16'} dev: true -<<<<<<< HEAD - /commander/2.20.3: - resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} - dev: true - - /commander/4.1.1: -======= /commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} dev: true /commander@4.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} engines: {node: '>= 6'} dev: true -<<<<<<< HEAD - /component-emitter/1.3.0: - resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==} - dev: true - - /concat-map/0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - - /concat-stream/1.6.2: -======= /commondir@1.0.1: resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==} dev: true @@ -4287,7 +2642,6 @@ packages: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} /concat-stream@1.6.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==} engines: {'0': node >= 0.8} dependencies: @@ -4296,16 +2650,6 @@ packages: readable-stream: 2.3.8 typedarray: 0.0.6 -<<<<<<< HEAD - /consola/2.15.3: - resolution: {integrity: sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==} - - /console-control-strings/1.1.0: - resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} - dev: true - - /content-disposition/0.5.4: -======= /consola@2.15.3: resolution: {integrity: sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==} @@ -4314,37 +2658,11 @@ packages: dev: true /content-disposition@0.5.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} engines: {node: '>= 0.6'} dependencies: safe-buffer: 5.2.1 -<<<<<<< HEAD - /content-type/1.0.5: - resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} - engines: {node: '>= 0.6'} - - /convert-source-map/1.9.0: - resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} - dev: true - - /cookie-signature/1.0.6: - resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} - - /cookie/0.5.0: - resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} - engines: {node: '>= 0.6'} - - /cookiejar/2.1.4: - resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==} - dev: true - - /core-util-is/1.0.3: - resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} - - /cors/2.8.5: -======= /content-type@1.0.5: resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} engines: {node: '>= 0.6'} @@ -4368,18 +2686,13 @@ packages: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} /cors@2.8.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==} engines: {node: '>= 0.10'} dependencies: object-assign: 4.1.1 vary: 1.1.2 -<<<<<<< HEAD - /cosmiconfig/7.1.0: -======= /cosmiconfig@7.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==} engines: {node: '>=10'} dependencies: @@ -4390,19 +2703,11 @@ packages: yaml: 1.10.2 dev: true -<<<<<<< HEAD - /create-require/1.1.1: - resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} - dev: true - - /cross-spawn/7.0.3: -======= /create-require@1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} dev: true /cross-spawn@7.0.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} dependencies: @@ -4411,30 +2716,18 @@ packages: which: 2.0.2 dev: true -<<<<<<< HEAD - /date-fns/2.30.0: -======= /date-fns@2.30.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} dependencies: '@babel/runtime': 7.22.6 dev: true -<<<<<<< HEAD - /dayjs/1.11.9: - resolution: {integrity: sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==} - dev: true - - /debug/2.6.9: -======= /dayjs@1.11.7: resolution: {integrity: sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==} dev: true /debug@2.6.9: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} peerDependencies: supports-color: '*' @@ -4444,11 +2737,7 @@ packages: dependencies: ms: 2.0.0 -<<<<<<< HEAD - /debug/4.3.4: -======= /debug@4.3.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} peerDependencies: @@ -4460,17 +2749,6 @@ packages: ms: 2.1.2 dev: true -<<<<<<< HEAD - /dedent/0.7.0: - resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==} - dev: true - - /deep-is/0.1.4: - resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} - dev: true - - /deepmerge/4.3.1: -======= /dedent@0.7.0: resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==} dev: true @@ -4480,63 +2758,30 @@ packages: dev: true /deepmerge@4.3.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} dev: true -<<<<<<< HEAD - /defaults/1.0.4: -======= /defaults@1.0.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==} dependencies: clone: 1.0.4 dev: true -<<<<<<< HEAD - /delayed-stream/1.0.0: -======= /delayed-stream@1.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} dev: true -<<<<<<< HEAD - /delegates/1.0.0: - resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} - dev: true - - /denque/2.1.0: -======= /delegates@1.0.0: resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} dev: true /denque@2.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==} engines: {node: '>=0.10'} dev: true -<<<<<<< HEAD - /depd/2.0.0: - resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} - engines: {node: '>= 0.8'} - - /destroy/1.2.0: - resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} - engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} - - /detect-libc/2.0.1: - resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==} - engines: {node: '>=8'} - dev: true - - /detect-newline/3.1.0: -======= /depd@2.0.0: resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} engines: {node: '>= 0.8'} @@ -4551,102 +2796,50 @@ packages: dev: true /detect-newline@3.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /dezalgo/1.0.4: - resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==} - dependencies: - asap: 2.0.6 - wrappy: 1.0.2 - dev: true - - /diff-sequences/28.1.1: -======= /diff-sequences@28.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dev: true -<<<<<<< HEAD - /diff/4.0.2: -======= /diff@4.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} dev: true -<<<<<<< HEAD - /dir-glob/3.0.1: -======= /dir-glob@3.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} dependencies: path-type: 4.0.0 dev: true -<<<<<<< HEAD - /doctrine/3.0.0: -======= /doctrine@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} engines: {node: '>=6.0.0'} dependencies: esutils: 2.0.3 dev: true -<<<<<<< HEAD - /dotenv-expand/10.0.0: -======= /dotenv-expand@10.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==} engines: {node: '>=12'} dev: true -<<<<<<< HEAD - /dotenv/16.1.4: - resolution: {integrity: sha512-m55RtE8AsPeJBpOIFKihEmqUcoVncQIwo7x9U8ZwLEZw9ZpXboz2c+rvog+jUaJvVrZ5kBOeYQBX5+8Aa/OZQw==} - engines: {node: '>=12'} - dev: true - - /dotenv/16.3.1: - resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==} - engines: {node: '>=12'} - dev: true - - /ecdsa-sig-formatter/1.0.11: -======= /dotenv@16.0.3: resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==} engines: {node: '>=12'} dev: true /ecdsa-sig-formatter@1.0.11: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==} dependencies: safe-buffer: 5.2.1 dev: true -<<<<<<< HEAD - /ee-first/1.1.1: - resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - - /electron-to-chromium/1.4.454: - resolution: {integrity: sha512-pmf1rbAStw8UEQ0sr2cdJtWl48ZMuPD9Sto8HVQOq9vx9j2WgDEN6lYoaqFvqEHYOmGA9oRGn7LqWI9ta0YugQ==} - dev: true - - /emittery/0.10.2: -======= /ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} @@ -4655,24 +2848,16 @@ packages: dev: true /emittery@0.10.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==} engines: {node: '>=12'} dev: true -<<<<<<< HEAD - /emoji-regex/8.0.0: + /emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} dev: true - /encodeurl/1.0.2: - resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} - engines: {node: '>= 0.8'} - - /encoding/0.1.13: -======= - /emoji-regex@8.0.0: - resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} + /enabled@2.0.0: + resolution: {integrity: sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==} dev: true /encodeurl@1.0.2: @@ -4680,7 +2865,6 @@ packages: engines: {node: '>= 0.8'} /encoding@0.1.13: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==} requiresBuild: true dependencies: @@ -4688,21 +2872,13 @@ packages: dev: true optional: true -<<<<<<< HEAD - /end-of-stream/1.4.4: -======= /end-of-stream@1.4.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} dependencies: once: 1.4.0 dev: true -<<<<<<< HEAD - /enhanced-resolve/5.15.0: -======= /enhanced-resolve@5.15.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==} engines: {node: '>=10.13.0'} dependencies: @@ -4710,9 +2886,6 @@ packages: tapable: 2.2.1 dev: true -<<<<<<< HEAD - /env-paths/2.2.1: -======= /enquirer@2.4.1: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} engines: {node: '>=8.6'} @@ -4722,107 +2895,61 @@ packages: dev: true /env-paths@2.2.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} engines: {node: '>=6'} dev: true optional: true -<<<<<<< HEAD - /err-code/2.0.3: -======= /err-code@2.0.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==} dev: true optional: true -<<<<<<< HEAD - /error-ex/1.3.2: -======= /error-ex@1.3.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} dependencies: is-arrayish: 0.2.1 dev: true -<<<<<<< HEAD - /es-module-lexer/1.3.0: - resolution: {integrity: sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==} - dev: true - - /escalade/3.1.1: -======= /es-module-lexer@0.9.3: resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==} dev: true /escalade@3.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /escape-html/1.0.3: - resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==} - - /escape-string-regexp/1.0.5: -======= /escape-html@1.0.3: resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==} /escape-string-regexp@1.0.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} dev: true -<<<<<<< HEAD - /escape-string-regexp/2.0.0: -======= /escape-string-regexp@2.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /escape-string-regexp/4.0.0: -======= /escape-string-regexp@4.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /eslint-config-prettier/8.8.0_eslint@8.44.0: - resolution: {integrity: sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==} -======= /eslint-config-prettier@8.3.0(eslint@8.0.1): resolution: {integrity: sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: -<<<<<<< HEAD - eslint: 8.44.0 - dev: true - - /eslint-plugin-prettier/4.2.1_qkgbdr345imkz5woyd5e5k6xse: - resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} - engines: {node: '>=12.0.0'} -======= eslint: 8.0.1 dev: true /eslint-plugin-prettier@4.0.0(eslint-config-prettier@8.3.0)(eslint@8.0.1)(prettier@2.3.2): resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==} engines: {node: '>=6.0.0'} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 peerDependencies: eslint: '>=7.28.0' eslint-config-prettier: '*' @@ -4831,15 +2958,6 @@ packages: eslint-config-prettier: optional: true dependencies: -<<<<<<< HEAD - eslint: 8.44.0 - eslint-config-prettier: 8.8.0_eslint@8.44.0 - prettier: 2.8.8 - prettier-linter-helpers: 1.0.0 - dev: true - - /eslint-scope/5.1.1: -======= eslint: 8.0.1 eslint-config-prettier: 8.3.0(eslint@8.0.1) prettier: 2.3.2 @@ -4847,7 +2965,6 @@ packages: dev: true /eslint-scope@5.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} engines: {node: '>=8.0.0'} dependencies: @@ -4855,38 +2972,14 @@ packages: estraverse: 4.3.0 dev: true -<<<<<<< HEAD - /eslint-scope/7.2.0: - resolution: {integrity: sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==} -======= /eslint-scope@6.0.0: resolution: {integrity: sha512-uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: esrecurse: 4.3.0 estraverse: 5.3.0 dev: true -<<<<<<< HEAD - /eslint-visitor-keys/3.4.1: - resolution: {integrity: sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dev: true - - /eslint/8.44.0: - resolution: {integrity: sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - hasBin: true - dependencies: - '@eslint-community/eslint-utils': 4.4.0_eslint@8.44.0 - '@eslint-community/regexpp': 4.5.1 - '@eslint/eslintrc': 2.1.0 - '@eslint/js': 8.44.0 - '@humanwhocodes/config-array': 0.11.10 - '@humanwhocodes/module-importer': 1.0.1 - '@nodelib/fs.walk': 1.2.8 -======= /eslint-utils@3.0.0(eslint@8.0.1): resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} @@ -4914,40 +3007,21 @@ packages: dependencies: '@eslint/eslintrc': 1.4.1 '@humanwhocodes/config-array': 0.6.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 debug: 4.3.4 doctrine: 3.0.0 -<<<<<<< HEAD - escape-string-regexp: 4.0.0 - eslint-scope: 7.2.0 - eslint-visitor-keys: 3.4.1 - espree: 9.6.0 -======= enquirer: 2.4.1 escape-string-regexp: 4.0.0 eslint-scope: 6.0.0 eslint-utils: 3.0.0(eslint@8.0.1) eslint-visitor-keys: 3.4.2 espree: 9.6.1 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 esquery: 1.5.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 file-entry-cache: 6.0.1 -<<<<<<< HEAD - find-up: 5.0.0 - glob-parent: 6.0.2 - globals: 13.20.0 - graphemer: 1.4.0 - ignore: 5.2.4 - import-fresh: 3.3.0 - imurmurhash: 0.1.4 - is-glob: 4.0.3 - is-path-inside: 3.0.3 -======= functional-red-black-tree: 1.0.1 glob-parent: 6.0.2 globals: 13.20.0 @@ -4955,7 +3029,6 @@ packages: import-fresh: 3.3.0 imurmurhash: 0.1.4 is-glob: 4.0.3 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 js-yaml: 4.1.0 json-stable-stringify-without-jsonify: 1.0.1 levn: 0.4.1 @@ -4963,11 +3036,6 @@ packages: minimatch: 3.1.2 natural-compare: 1.4.0 optionator: 0.9.3 -<<<<<<< HEAD - strip-ansi: 6.0.1 - strip-json-comments: 3.1.1 - text-table: 0.2.0 -======= progress: 2.0.3 regexpp: 3.2.0 semver: 7.5.4 @@ -4975,23 +3043,10 @@ packages: strip-json-comments: 3.1.1 text-table: 0.2.0 v8-compile-cache: 2.3.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 transitivePeerDependencies: - supports-color dev: true -<<<<<<< HEAD - /espree/9.6.0: - resolution: {integrity: sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dependencies: - acorn: 8.10.0 - acorn-jsx: 5.3.2_acorn@8.10.0 - eslint-visitor-keys: 3.4.1 - dev: true - - /esprima/4.0.1: -======= /espree@9.6.1: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -5002,83 +3057,50 @@ packages: dev: true /esprima@4.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} engines: {node: '>=4'} hasBin: true dev: true -<<<<<<< HEAD - /esquery/1.5.0: -======= /esquery@1.5.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==} engines: {node: '>=0.10'} dependencies: estraverse: 5.3.0 dev: true -<<<<<<< HEAD - /esrecurse/4.3.0: -======= /esrecurse@4.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} engines: {node: '>=4.0'} dependencies: estraverse: 5.3.0 dev: true -<<<<<<< HEAD - /estraverse/4.3.0: -======= /estraverse@4.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} engines: {node: '>=4.0'} dev: true -<<<<<<< HEAD - /estraverse/5.3.0: -======= /estraverse@5.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} engines: {node: '>=4.0'} dev: true -<<<<<<< HEAD - /esutils/2.0.3: -======= /esutils@2.0.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} dev: true -<<<<<<< HEAD - /etag/1.8.1: - resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==} - engines: {node: '>= 0.6'} - - /events/3.3.0: -======= /etag@1.8.1: resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==} engines: {node: '>= 0.6'} /events@3.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==} engines: {node: '>=0.8.x'} dev: true -<<<<<<< HEAD - /execa/4.1.0: -======= /execa@4.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==} engines: {node: '>=10'} dependencies: @@ -5093,11 +3115,7 @@ packages: strip-final-newline: 2.0.0 dev: true -<<<<<<< HEAD - /execa/5.1.1: -======= /execa@5.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} engines: {node: '>=10'} dependencies: @@ -5112,20 +3130,12 @@ packages: strip-final-newline: 2.0.0 dev: true -<<<<<<< HEAD - /exit/0.1.2: -======= /exit@0.1.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==} engines: {node: '>= 0.8.0'} dev: true -<<<<<<< HEAD - /expect/28.1.3: -======= /expect@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -5136,22 +3146,13 @@ packages: jest-util: 28.1.3 dev: true -<<<<<<< HEAD - /express/4.18.2: - resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==} -======= /express@4.18.1: resolution: {integrity: sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>= 0.10.0'} dependencies: accepts: 1.3.8 array-flatten: 1.1.1 -<<<<<<< HEAD - body-parser: 1.20.1 -======= body-parser: 1.20.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 content-disposition: 0.5.4 content-type: 1.0.5 cookie: 0.5.0 @@ -5170,11 +3171,7 @@ packages: parseurl: 1.3.3 path-to-regexp: 0.1.7 proxy-addr: 2.0.7 -<<<<<<< HEAD - qs: 6.11.0 -======= qs: 6.10.3 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 range-parser: 1.2.1 safe-buffer: 5.2.1 send: 0.18.0 @@ -5187,11 +3184,7 @@ packages: transitivePeerDependencies: - supports-color -<<<<<<< HEAD - /external-editor/3.1.0: -======= /external-editor@3.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==} engines: {node: '>=4'} dependencies: @@ -5200,18 +3193,6 @@ packages: tmp: 0.0.33 dev: true -<<<<<<< HEAD - /fast-deep-equal/3.1.3: - resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - dev: true - - /fast-diff/1.3.0: - resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} - dev: true - - /fast-glob/3.3.0: - resolution: {integrity: sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==} -======= /fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} dev: true @@ -5222,7 +3203,6 @@ packages: /fast-glob@3.3.1: resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>=8.6.0'} dependencies: '@nodelib/fs.stat': 2.0.5 @@ -5232,20 +3212,6 @@ packages: micromatch: 4.0.5 dev: true -<<<<<<< HEAD - /fast-json-stable-stringify/2.1.0: - resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - dev: true - - /fast-levenshtein/2.0.6: - resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} - dev: true - - /fast-safe-stringify/2.1.1: - resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==} - - /fastq/1.15.0: -======= /fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} dev: true @@ -5258,60 +3224,49 @@ packages: resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==} /fastq@1.15.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} dependencies: reusify: 1.0.4 dev: true -<<<<<<< HEAD - /fb-watchman/2.0.2: -======= /fb-watchman@2.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==} dependencies: bser: 2.1.1 dev: true -<<<<<<< HEAD - /figures/3.2.0: -======= + /fecha@4.2.3: + resolution: {integrity: sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==} + dev: true + /figures@3.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==} engines: {node: '>=8'} dependencies: escape-string-regexp: 1.0.5 dev: true -<<<<<<< HEAD - /file-entry-cache/6.0.1: -======= /file-entry-cache@6.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} engines: {node: ^10.12.0 || >=12.0.0} dependencies: flat-cache: 3.0.4 dev: true -<<<<<<< HEAD - /fill-range/7.0.1: -======= + /file-stream-rotator@0.6.1: + resolution: {integrity: sha512-u+dBid4PvZw17PmDeRcNOtCP9CCK/9lRN2w+r1xIS7yOL9JFrIBKTvrYsxT4P0pGtThYTn++QS5ChHaUov3+zQ==} + dependencies: + moment: 2.29.4 + dev: true + /fill-range@7.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} dependencies: to-regex-range: 5.0.1 dev: true -<<<<<<< HEAD - /finalhandler/1.2.0: -======= /finalhandler@1.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} engines: {node: '>= 0.8'} dependencies: @@ -5325,9 +3280,6 @@ packages: transitivePeerDependencies: - supports-color -<<<<<<< HEAD - /find-up/4.1.0: -======= /find-cache-dir@3.3.2: resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==} engines: {node: '>=8'} @@ -5338,7 +3290,6 @@ packages: dev: true /find-up@4.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} dependencies: @@ -5346,19 +3297,7 @@ packages: path-exists: 4.0.0 dev: true -<<<<<<< HEAD - /find-up/5.0.0: - resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} - engines: {node: '>=10'} - dependencies: - locate-path: 6.0.0 - path-exists: 4.0.0 - dev: true - - /flat-cache/3.0.4: -======= /flat-cache@3.0.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==} engines: {node: ^10.12.0 || >=12.0.0} dependencies: @@ -5366,20 +3305,12 @@ packages: rimraf: 3.0.2 dev: true -<<<<<<< HEAD - /flatted/3.2.7: + /flatted@3.2.7: resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} dev: true - /fork-ts-checker-webpack-plugin/8.0.0_hybrf64lftnf5l2xwgg7goi2iu: - resolution: {integrity: sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==} - engines: {node: '>=12.13.0', yarn: '>=1.0.0'} - peerDependencies: - typescript: '>3.6.0' - webpack: ^5.11.0 -======= - /flatted@3.2.7: - resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} + /fn.name@1.1.0: + resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==} dev: true /fork-ts-checker-webpack-plugin@7.2.11(typescript@4.7.4)(webpack@5.73.0): @@ -5392,7 +3323,6 @@ packages: peerDependenciesMeta: vue-template-compiler: optional: true ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 dependencies: '@babel/code-frame': 7.22.5 chalk: 4.1.2 @@ -5402,18 +3332,6 @@ packages: fs-extra: 10.1.0 memfs: 3.5.3 minimatch: 3.1.2 -<<<<<<< HEAD - node-abort-controller: 3.1.1 - schema-utils: 3.3.0 - semver: 7.5.4 - tapable: 2.2.1 - typescript: 4.9.5 - webpack: 5.82.1 - dev: true - - /form-data/4.0.0: - resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==} -======= schema-utils: 3.3.0 semver: 7.5.4 tapable: 2.2.1 @@ -5423,7 +3341,6 @@ packages: /form-data@3.0.1: resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>= 6'} dependencies: asynckit: 0.4.0 @@ -5431,26 +3348,6 @@ packages: mime-types: 2.1.35 dev: true -<<<<<<< HEAD - /formidable/2.1.2: - resolution: {integrity: sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==} - dependencies: - dezalgo: 1.0.4 - hexoid: 1.0.0 - once: 1.4.0 - qs: 6.11.2 - dev: true - - /forwarded/0.2.0: - resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} - engines: {node: '>= 0.6'} - - /fresh/0.5.2: - resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} - engines: {node: '>= 0.6'} - - /fs-extra/10.1.0: -======= /formidable@1.2.6: resolution: {integrity: sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==} deprecated: 'Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau' @@ -5465,7 +3362,6 @@ packages: engines: {node: '>= 0.6'} /fs-extra@10.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} engines: {node: '>=12'} dependencies: @@ -5474,27 +3370,13 @@ packages: universalify: 2.0.0 dev: true -<<<<<<< HEAD - /fs-minipass/2.1.0: -======= /fs-minipass@2.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} engines: {node: '>= 8'} dependencies: minipass: 3.3.6 dev: true -<<<<<<< HEAD - /fs-monkey/1.0.4: - resolution: {integrity: sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==} - dev: true - - /fs.realpath/1.0.0: - resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - - /fsevents/2.3.2: -======= /fs-monkey@1.0.4: resolution: {integrity: sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==} dev: true @@ -5503,7 +3385,6 @@ packages: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} /fsevents@2.3.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] @@ -5511,12 +3392,6 @@ packages: dev: true optional: true -<<<<<<< HEAD - /function-bind/1.1.1: - resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} - - /gauge/3.0.2: -======= /function-bind@1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} @@ -5525,7 +3400,6 @@ packages: dev: true /gauge@3.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==} engines: {node: '>=10'} dependencies: @@ -5540,11 +3414,7 @@ packages: wide-align: 1.1.5 dev: true -<<<<<<< HEAD - /gauge/4.0.4: -======= /gauge@4.0.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} dependencies: @@ -5559,39 +3429,28 @@ packages: dev: true optional: true -<<<<<<< HEAD - /generate-function/2.3.1: -======= /generate-function@2.3.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==} dependencies: is-property: 1.0.2 dev: true -<<<<<<< HEAD - /gensync/1.0.0-beta.2: -======= + /generic-pool@3.9.0: + resolution: {integrity: sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==} + engines: {node: '>= 4'} + dev: true + /gensync@1.0.0-beta.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} dev: true -<<<<<<< HEAD - /get-caller-file/2.0.5: -======= /get-caller-file@2.0.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} dev: true -<<<<<<< HEAD - /get-intrinsic/1.2.1: -======= /get-intrinsic@1.2.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==} dependencies: function-bind: 1.1.1 @@ -5599,70 +3458,42 @@ packages: has-proto: 1.0.1 has-symbols: 1.0.3 -<<<<<<< HEAD - /get-package-type/0.1.0: -======= /get-package-type@0.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==} engines: {node: '>=8.0.0'} dev: true -<<<<<<< HEAD - /get-stream/5.2.0: -======= /get-stream@5.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} engines: {node: '>=8'} dependencies: pump: 3.0.0 dev: true -<<<<<<< HEAD - /get-stream/6.0.1: -======= /get-stream@6.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /glob-parent/5.1.2: -======= /glob-parent@5.1.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} dependencies: is-glob: 4.0.3 dev: true -<<<<<<< HEAD - /glob-parent/6.0.2: -======= /glob-parent@6.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} engines: {node: '>=10.13.0'} dependencies: is-glob: 4.0.3 dev: true -<<<<<<< HEAD - /glob-to-regexp/0.4.1: - resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} - dev: true - - /glob/7.2.3: -======= /glob-to-regexp@0.4.1: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} dev: true /glob@7.2.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} dependencies: fs.realpath: 1.0.0 @@ -5672,11 +3503,7 @@ packages: once: 1.4.0 path-is-absolute: 1.0.1 -<<<<<<< HEAD - /glob/8.1.0: -======= /glob@8.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} engines: {node: '>=12'} dependencies: @@ -5687,96 +3514,39 @@ packages: once: 1.4.0 dev: true -<<<<<<< HEAD - /glob/9.3.5: - resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - fs.realpath: 1.0.0 - minimatch: 8.0.4 - minipass: 4.2.8 - path-scurry: 1.10.1 - dev: true - - /globals/11.12.0: -======= /globals@11.12.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} engines: {node: '>=4'} dev: true -<<<<<<< HEAD - /globals/13.20.0: -======= /globals@13.20.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==} engines: {node: '>=8'} dependencies: type-fest: 0.20.2 dev: true -<<<<<<< HEAD - /globby/11.1.0: -======= /globby@11.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} engines: {node: '>=10'} dependencies: array-union: 2.1.0 dir-glob: 3.0.1 -<<<<<<< HEAD - fast-glob: 3.3.0 -======= fast-glob: 3.3.1 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 ignore: 5.2.4 merge2: 1.4.1 slash: 3.0.0 dev: true -<<<<<<< HEAD - /graceful-fs/4.2.11: - resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - dev: true - - /graphemer/1.4.0: - resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} - dev: true - - /has-flag/3.0.0: -======= /graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} dev: true /has-flag@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} engines: {node: '>=4'} dev: true -<<<<<<< HEAD - /has-flag/4.0.0: - resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} - engines: {node: '>=8'} - - /has-proto/1.0.1: - resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==} - engines: {node: '>= 0.4'} - - /has-symbols/1.0.3: - resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} - engines: {node: '>= 0.4'} - - /has-unicode/2.0.1: - resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} - dev: true - - /has/1.0.3: -======= /has-flag@4.0.0: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} @@ -5794,28 +3564,11 @@ packages: dev: true /has@1.0.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} engines: {node: '>= 0.4.0'} dependencies: function-bind: 1.1.1 -<<<<<<< HEAD - /hexoid/1.0.0: - resolution: {integrity: sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==} - engines: {node: '>=8'} - dev: true - - /highlight.js/10.7.3: - resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==} - dev: true - - /html-escaper/2.0.2: - resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} - dev: true - - /http-cache-semantics/4.1.1: -======= /highlight.js@10.7.3: resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==} dev: true @@ -5825,16 +3578,11 @@ packages: dev: true /http-cache-semantics@4.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==} dev: true optional: true -<<<<<<< HEAD - /http-errors/2.0.0: -======= /http-errors@2.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} engines: {node: '>= 0.8'} dependencies: @@ -5844,11 +3592,7 @@ packages: statuses: 2.0.1 toidentifier: 1.0.1 -<<<<<<< HEAD - /http-proxy-agent/4.0.1: -======= /http-proxy-agent@4.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==} engines: {node: '>= 6'} dependencies: @@ -5860,11 +3604,7 @@ packages: dev: true optional: true -<<<<<<< HEAD - /https-proxy-agent/5.0.1: -======= /https-proxy-agent@5.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} dependencies: @@ -5874,63 +3614,36 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /human-signals/1.1.1: -======= /human-signals@1.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==} engines: {node: '>=8.12.0'} dev: true -<<<<<<< HEAD - /human-signals/2.1.0: -======= /human-signals@2.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} dev: true -<<<<<<< HEAD - /humanize-ms/1.2.1: -======= /humanize-ms@1.2.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==} dependencies: ms: 2.1.3 dev: true optional: true -<<<<<<< HEAD - /iconv-lite/0.4.24: -======= /iconv-lite@0.4.24: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} dependencies: safer-buffer: 2.1.2 -<<<<<<< HEAD - /iconv-lite/0.6.3: -======= /iconv-lite@0.6.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} engines: {node: '>=0.10.0'} dependencies: safer-buffer: 2.1.2 dev: true -<<<<<<< HEAD - /ieee754/1.2.1: - resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} - dev: true - - /ignore/5.2.4: -======= /ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} dev: true @@ -5941,16 +3654,11 @@ packages: dev: true /ignore@5.2.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} engines: {node: '>= 4'} dev: true -<<<<<<< HEAD - /import-fresh/3.3.0: -======= /import-fresh@3.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} engines: {node: '>=6'} dependencies: @@ -5958,11 +3666,7 @@ packages: resolve-from: 4.0.0 dev: true -<<<<<<< HEAD - /import-local/3.1.0: -======= /import-local@3.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==} engines: {node: '>=8'} hasBin: true @@ -5971,29 +3675,11 @@ packages: resolve-cwd: 3.0.0 dev: true -<<<<<<< HEAD - /imurmurhash/0.1.4: -======= /imurmurhash@0.1.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} dev: true -<<<<<<< HEAD - /indent-string/4.0.0: - resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} - engines: {node: '>=8'} - dev: true - optional: true - - /infer-owner/1.0.4: - resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==} - dev: true - optional: true - - /inflight/1.0.6: -======= /indent-string@4.0.0: resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} engines: {node: '>=8'} @@ -6004,18 +3690,11 @@ packages: dev: true /inflight@1.0.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} dependencies: once: 1.4.0 wrappy: 1.0.2 -<<<<<<< HEAD - /inherits/2.0.4: - resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - - /inquirer/8.2.4: -======= /inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} @@ -6039,7 +3718,6 @@ packages: dev: true /inquirer@8.2.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==} engines: {node: '>=12.0.0'} dependencies: @@ -6060,56 +3738,16 @@ packages: wrap-ansi: 7.0.0 dev: true -<<<<<<< HEAD - /inquirer/8.2.5: - resolution: {integrity: sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==} - engines: {node: '>=12.0.0'} - dependencies: - ansi-escapes: 4.3.2 - chalk: 4.1.2 - cli-cursor: 3.1.0 - cli-width: 3.0.0 - external-editor: 3.1.0 - figures: 3.2.0 - lodash: 4.17.21 - mute-stream: 0.0.8 - ora: 5.4.1 - run-async: 2.4.1 - rxjs: 7.8.1 - string-width: 4.2.3 - strip-ansi: 6.0.1 - through: 2.3.8 - wrap-ansi: 7.0.0 - dev: true - - /interpret/1.4.0: -======= /interpret@1.4.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==} engines: {node: '>= 0.10'} dev: true -<<<<<<< HEAD - /ip/2.0.0: -======= /ip@2.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==} dev: true optional: true -<<<<<<< HEAD - /ipaddr.js/1.9.1: - resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} - engines: {node: '>= 0.10'} - - /is-arrayish/0.2.1: - resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} - dev: true - - /is-binary-path/2.1.0: -======= /ipaddr.js@1.9.1: resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} engines: {node: '>= 0.10'} @@ -6118,130 +3756,74 @@ packages: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} dev: true + /is-arrayish@0.3.2: + resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==} + dev: true + /is-binary-path@2.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} dependencies: binary-extensions: 2.2.0 dev: true -<<<<<<< HEAD - /is-core-module/2.12.1: -======= /is-core-module@2.12.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==} dependencies: has: 1.0.3 dev: true -<<<<<<< HEAD - /is-extglob/2.1.1: -======= /is-extglob@2.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} dev: true -<<<<<<< HEAD - /is-fullwidth-code-point/3.0.0: -======= /is-fullwidth-code-point@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /is-generator-fn/2.1.0: -======= /is-generator-fn@2.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /is-glob/4.0.3: -======= /is-glob@4.0.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} dependencies: is-extglob: 2.1.1 dev: true -<<<<<<< HEAD - /is-interactive/1.0.0: -======= /is-interactive@1.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /is-lambda/1.0.1: -======= /is-lambda@1.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==} dev: true optional: true -<<<<<<< HEAD - /is-number/7.0.0: -======= /is-number@7.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} dev: true -<<<<<<< HEAD - /is-path-inside/3.0.3: - resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} - engines: {node: '>=8'} - dev: true - - /is-property/1.0.2: - resolution: {integrity: sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==} - dev: true - - /is-stream/2.0.1: -======= /is-property@1.0.2: resolution: {integrity: sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==} dev: true /is-stream@2.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /is-unicode-supported/0.1.0: -======= /is-unicode-supported@0.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /isarray/1.0.0: - resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} - - /isexe/2.0.0: - resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - dev: true - - /istanbul-lib-coverage/3.2.0: -======= /isarray@1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} @@ -6250,22 +3832,10 @@ packages: dev: true /istanbul-lib-coverage@3.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /istanbul-lib-instrument/5.2.1: - resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==} - engines: {node: '>=8'} - dependencies: - '@babel/core': 7.22.8 - '@babel/parser': 7.22.7 - '@istanbuljs/schema': 0.1.3 - istanbul-lib-coverage: 3.2.0 - semver: 6.3.0 -======= /istanbul-lib-instrument@5.2.1: resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==} engines: {node: '>=8'} @@ -6275,23 +3845,10 @@ packages: '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 6.3.1 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 transitivePeerDependencies: - supports-color dev: true -<<<<<<< HEAD - /istanbul-lib-report/3.0.0: - resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==} - engines: {node: '>=8'} - dependencies: - istanbul-lib-coverage: 3.2.0 - make-dir: 3.1.0 - supports-color: 7.2.0 - dev: true - - /istanbul-lib-source-maps/4.0.1: -======= /istanbul-lib-report@3.0.1: resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==} engines: {node: '>=10'} @@ -6302,7 +3859,6 @@ packages: dev: true /istanbul-lib-source-maps@4.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} engines: {node: '>=10'} dependencies: @@ -6313,21 +3869,6 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /istanbul-reports/3.1.5: - resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==} - engines: {node: '>=8'} - dependencies: - html-escaper: 2.0.2 - istanbul-lib-report: 3.0.0 - dev: true - - /iterare/1.2.1: - resolution: {integrity: sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==} - engines: {node: '>=6'} - - /jest-changed-files/28.1.3: -======= /istanbul-reports@3.1.6: resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==} engines: {node: '>=8'} @@ -6341,7 +3882,6 @@ packages: engines: {node: '>=6'} /jest-changed-files@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -6349,11 +3889,7 @@ packages: p-limit: 3.1.0 dev: true -<<<<<<< HEAD - /jest-circus/28.1.3: -======= /jest-circus@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -6361,11 +3897,7 @@ packages: '@jest/expect': 28.1.3 '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 -<<<<<<< HEAD - '@types/node': 16.18.38 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 @@ -6384,11 +3916,7 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /jest-cli/28.1.3_734c4vwpoc3zmfagshlprrefne: -======= /jest-cli@28.1.3(@types/node@16.0.0)(ts-node@10.0.0): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} hasBin: true @@ -6398,22 +3926,14 @@ packages: node-notifier: optional: true dependencies: -<<<<<<< HEAD - '@jest/core': 28.1.3_ts-node@10.9.1 -======= '@jest/core': 28.1.3(ts-node@10.0.0) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 import-local: 3.1.0 -<<<<<<< HEAD - jest-config: 28.1.3_734c4vwpoc3zmfagshlprrefne -======= jest-config: 28.1.3(@types/node@16.0.0)(ts-node@10.0.0) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 jest-util: 28.1.3 jest-validate: 28.1.3 prompts: 2.4.2 @@ -6424,11 +3944,7 @@ packages: - ts-node dev: true -<<<<<<< HEAD - /jest-config/28.1.3_734c4vwpoc3zmfagshlprrefne: -======= /jest-config@28.1.3(@types/node@16.0.0)(ts-node@10.0.0): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -6440,19 +3956,11 @@ packages: ts-node: optional: true dependencies: -<<<<<<< HEAD - '@babel/core': 7.22.8 - '@jest/test-sequencer': 28.1.3 - '@jest/types': 28.1.3 - '@types/node': 16.18.38 - babel-jest: 28.1.3_@babel+core@7.22.8 -======= '@babel/core': 7.22.9 '@jest/test-sequencer': 28.1.3 '@jest/types': 28.1.3 '@types/node': 16.0.0 babel-jest: 28.1.3(@babel/core@7.22.9) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 chalk: 4.1.2 ci-info: 3.8.0 deepmerge: 4.3.1 @@ -6471,20 +3979,12 @@ packages: pretty-format: 28.1.3 slash: 3.0.0 strip-json-comments: 3.1.1 -<<<<<<< HEAD - ts-node: 10.9.1_npeoqfxwgl5njwqojmpesqhar4 -======= ts-node: 10.0.0(@types/node@16.0.0)(typescript@4.3.5) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 transitivePeerDependencies: - supports-color dev: true -<<<<<<< HEAD - /jest-diff/28.1.3: -======= /jest-diff@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -6494,22 +3994,14 @@ packages: pretty-format: 28.1.3 dev: true -<<<<<<< HEAD - /jest-docblock/28.1.1: -======= /jest-docblock@28.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: detect-newline: 3.1.0 dev: true -<<<<<<< HEAD - /jest-each/28.1.3: -======= /jest-each@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -6520,50 +4012,30 @@ packages: pretty-format: 28.1.3 dev: true -<<<<<<< HEAD - /jest-environment-node/28.1.3: -======= /jest-environment-node@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/environment': 28.1.3 '@jest/fake-timers': 28.1.3 '@jest/types': 28.1.3 -<<<<<<< HEAD - '@types/node': 16.18.38 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 jest-mock: 28.1.3 jest-util: 28.1.3 dev: true -<<<<<<< HEAD - /jest-get-type/28.0.2: -======= /jest-get-type@28.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dev: true -<<<<<<< HEAD - /jest-haste-map/28.1.3: -======= /jest-haste-map@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 '@types/graceful-fs': 4.1.6 -<<<<<<< HEAD - '@types/node': 16.18.38 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -6576,11 +4048,7 @@ packages: fsevents: 2.3.2 dev: true -<<<<<<< HEAD - /jest-leak-detector/28.1.3: -======= /jest-leak-detector@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -6588,11 +4056,7 @@ packages: pretty-format: 28.1.3 dev: true -<<<<<<< HEAD - /jest-matcher-utils/28.1.3: -======= /jest-matcher-utils@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -6602,11 +4066,7 @@ packages: pretty-format: 28.1.3 dev: true -<<<<<<< HEAD - /jest-message-util/28.1.3: -======= /jest-message-util@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -6621,26 +4081,15 @@ packages: stack-utils: 2.0.6 dev: true -<<<<<<< HEAD - /jest-mock/28.1.3: -======= /jest-mock@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 -<<<<<<< HEAD - '@types/node': 16.18.38 - dev: true - - /jest-pnp-resolver/1.2.3_jest-resolve@28.1.3: -======= '@types/node': 16.0.0 dev: true /jest-pnp-resolver@1.2.3(jest-resolve@28.1.3): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==} engines: {node: '>=6'} peerDependencies: @@ -6652,20 +4101,12 @@ packages: jest-resolve: 28.1.3 dev: true -<<<<<<< HEAD - /jest-regex-util/28.0.2: -======= /jest-regex-util@28.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dev: true -<<<<<<< HEAD - /jest-resolve-dependencies/28.1.3: -======= /jest-resolve-dependencies@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -6675,22 +4116,14 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /jest-resolve/28.1.3: -======= /jest-resolve@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: chalk: 4.1.2 graceful-fs: 4.2.11 jest-haste-map: 28.1.3 -<<<<<<< HEAD - jest-pnp-resolver: 1.2.3_jest-resolve@28.1.3 -======= jest-pnp-resolver: 1.2.3(jest-resolve@28.1.3) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 jest-util: 28.1.3 jest-validate: 28.1.3 resolve: 1.22.2 @@ -6698,11 +4131,7 @@ packages: slash: 3.0.0 dev: true -<<<<<<< HEAD - /jest-runner/28.1.3: -======= /jest-runner@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -6711,11 +4140,7 @@ packages: '@jest/test-result': 28.1.3 '@jest/transform': 28.1.3 '@jest/types': 28.1.3 -<<<<<<< HEAD - '@types/node': 16.18.38 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 chalk: 4.1.2 emittery: 0.10.2 graceful-fs: 4.2.11 @@ -6735,11 +4160,7 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /jest-runtime/28.1.3: -======= /jest-runtime@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -6769,15 +4190,6 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /jest-snapshot/28.1.3: - resolution: {integrity: sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==} - engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} - dependencies: - '@babel/core': 7.22.8 - '@babel/generator': 7.22.7 - '@babel/plugin-syntax-typescript': 7.22.5_@babel+core@7.22.8 -======= /jest-snapshot@28.1.3: resolution: {integrity: sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} @@ -6785,7 +4197,6 @@ packages: '@babel/core': 7.22.9 '@babel/generator': 7.22.9 '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.9) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 '@babel/traverse': 7.22.8 '@babel/types': 7.22.5 '@jest/expect-utils': 28.1.3 @@ -6793,11 +4204,7 @@ packages: '@jest/types': 28.1.3 '@types/babel__traverse': 7.20.1 '@types/prettier': 2.7.3 -<<<<<<< HEAD - babel-preset-current-node-syntax: 1.0.1_@babel+core@7.22.8 -======= babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.9) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 chalk: 4.1.2 expect: 28.1.3 graceful-fs: 4.2.11 @@ -6814,31 +4221,19 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /jest-util/28.1.3: -======= /jest-util@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 -<<<<<<< HEAD - '@types/node': 16.18.38 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 picomatch: 2.3.1 dev: true -<<<<<<< HEAD - /jest-validate/28.1.3: -======= /jest-validate@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -6850,21 +4245,13 @@ packages: pretty-format: 28.1.3 dev: true -<<<<<<< HEAD - /jest-watcher/28.1.3: -======= /jest-watcher@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 -<<<<<<< HEAD - '@types/node': 16.18.38 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.10.2 @@ -6872,13 +4259,6 @@ packages: string-length: 4.0.2 dev: true -<<<<<<< HEAD - /jest-worker/27.5.1: - resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} - engines: {node: '>= 10.13.0'} - dependencies: - '@types/node': 16.18.38 -======= /jest-worker@26.6.2: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} @@ -6893,33 +4273,20 @@ packages: engines: {node: '>= 10.13.0'} dependencies: '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true -<<<<<<< HEAD - /jest-worker/28.1.3: - resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==} - engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} - dependencies: - '@types/node': 16.18.38 -======= /jest-worker@28.1.3: resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true -<<<<<<< HEAD - /jest/28.1.2_734c4vwpoc3zmfagshlprrefne: -======= /jest@28.1.2(@types/node@16.0.0)(ts-node@10.0.0): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Tuf05DwLeCh2cfWCQbcz9UxldoDyiR1E9Igaei5khjonKncYdc6LDfynKCEWozK0oLE3GD+xKAo2u8x/0s6GOg==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} hasBin: true @@ -6929,36 +4296,21 @@ packages: node-notifier: optional: true dependencies: -<<<<<<< HEAD - '@jest/core': 28.1.3_ts-node@10.9.1 - '@jest/types': 28.1.3 - import-local: 3.1.0 - jest-cli: 28.1.3_734c4vwpoc3zmfagshlprrefne -======= '@jest/core': 28.1.3(ts-node@10.0.0) '@jest/types': 28.1.3 import-local: 3.1.0 jest-cli: 28.1.3(@types/node@16.0.0)(ts-node@10.0.0) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 transitivePeerDependencies: - '@types/node' - supports-color - ts-node dev: true -<<<<<<< HEAD - /js-tokens/4.0.0: - resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - dev: true - - /js-yaml/3.14.1: -======= /js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} dev: true /js-yaml@3.14.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true dependencies: @@ -6966,46 +4318,19 @@ packages: esprima: 4.0.1 dev: true -<<<<<<< HEAD - /js-yaml/4.1.0: -======= /js-yaml@4.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} hasBin: true dependencies: argparse: 2.0.1 dev: true -<<<<<<< HEAD - /jsesc/2.5.2: -======= /jsesc@2.5.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} engines: {node: '>=4'} hasBin: true dev: true -<<<<<<< HEAD - /json-parse-even-better-errors/2.3.1: - resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} - dev: true - - /json-schema-traverse/0.4.1: - resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - dev: true - - /json-schema-traverse/1.0.0: - resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} - dev: true - - /json-stable-stringify-without-jsonify/1.0.1: - resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - dev: true - - /json5/2.2.3: -======= /json-parse-better-errors@1.0.2: resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==} dev: true @@ -7034,25 +4359,16 @@ packages: dev: true /json5@2.2.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} engines: {node: '>=6'} hasBin: true dev: true -<<<<<<< HEAD - /jsonc-parser/3.2.0: - resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} - dev: true - - /jsonfile/6.1.0: -======= /jsonc-parser@3.0.0: resolution: {integrity: sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==} dev: true /jsonfile@6.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==} dependencies: universalify: 2.0.0 @@ -7060,11 +4376,7 @@ packages: graceful-fs: 4.2.11 dev: true -<<<<<<< HEAD - /jsonwebtoken/9.0.0: -======= /jsonwebtoken@9.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==} engines: {node: '>=12', npm: '>=6'} dependencies: @@ -7074,11 +4386,7 @@ packages: semver: 7.5.4 dev: true -<<<<<<< HEAD - /jsonwebtoken/9.0.1: -======= /jsonwebtoken@9.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-K8wx7eJ5TPvEjuiVSkv167EVboBDv9PZdDoF7BgeQnBLVvZWW9clr2PsQHVJDTKaEIH5JBIwHujGcHp7GgI2eg==} engines: {node: '>=12', npm: '>=6'} dependencies: @@ -7088,11 +4396,7 @@ packages: semver: 7.5.4 dev: true -<<<<<<< HEAD - /jwa/1.4.1: -======= /jwa@1.4.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==} dependencies: buffer-equal-constant-time: 1.0.1 @@ -7100,40 +4404,28 @@ packages: safe-buffer: 5.2.1 dev: true -<<<<<<< HEAD - /jws/3.2.2: -======= /jws@3.2.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==} dependencies: jwa: 1.4.1 safe-buffer: 5.2.1 dev: true -<<<<<<< HEAD - /kleur/3.0.3: -======= /kleur@3.0.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /leven/3.1.0: -======= + /kuler@2.0.0: + resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==} + dev: true + /leven@3.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /levn/0.4.1: -======= /levn@0.4.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} dependencies: @@ -7141,16 +4433,6 @@ packages: type-check: 0.4.0 dev: true -<<<<<<< HEAD - /libphonenumber-js/1.10.37: - resolution: {integrity: sha512-Z10PCaOCiAxbUxLyR31DNeeNugSVP6iv/m7UrSKS5JHziEMApJtgku4e9Q69pzzSC9LnQiM09sqsGf2ticZnMw==} - - /lines-and-columns/1.2.4: - resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} - dev: true - - /loader-runner/4.3.0: -======= /libphonenumber-js@1.10.38: resolution: {integrity: sha512-4NjVXVUmpZ9Zsqq6FXa2+MKI+KAI3tOqA0pxXgXGluhpj4ge5didmbWJpMBqGB3AVGv1SnEtKdGTbxjSEG1kCQ==} @@ -7159,52 +4441,24 @@ packages: dev: true /loader-runner@4.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==} engines: {node: '>=6.11.5'} dev: true -<<<<<<< HEAD - /locate-path/5.0.0: -======= /locate-path@5.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} engines: {node: '>=8'} dependencies: p-locate: 4.1.0 dev: true -<<<<<<< HEAD - /locate-path/6.0.0: - resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} - engines: {node: '>=10'} - dependencies: - p-locate: 5.0.0 - dev: true - - /lodash-es/4.17.21: - resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} - dev: true - - /lodash.memoize/4.1.2: - resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==} - dev: true - - /lodash.merge/4.6.2: - resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} - dev: true - - /lodash/4.17.21: - resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - dev: true - - /log-symbols/4.1.0: -======= /lodash-es@4.17.21: resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} dev: true + /lodash.clonedeep@4.5.0: + resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==} + /lodash.memoize@4.1.2: resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==} dev: true @@ -7218,7 +4472,6 @@ packages: dev: true /log-symbols@4.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} engines: {node: '>=10'} dependencies: @@ -7226,84 +4479,48 @@ packages: is-unicode-supported: 0.1.0 dev: true -<<<<<<< HEAD - /long/5.2.3: - resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==} + /logform@2.5.1: + resolution: {integrity: sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg==} + dependencies: + '@colors/colors': 1.5.0 + '@types/triple-beam': 1.3.2 + fecha: 4.2.3 + ms: 2.1.3 + safe-stable-stringify: 2.4.3 + triple-beam: 1.4.1 dev: true - /lru-cache/10.0.0: - resolution: {integrity: sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==} - engines: {node: 14 || >=16.14} - dev: true - - /lru-cache/5.1.1: -======= /long@5.2.3: resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==} dev: true /lru-cache@5.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} dependencies: yallist: 3.1.1 dev: true -<<<<<<< HEAD - /lru-cache/6.0.0: -======= /lru-cache@6.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} dependencies: yallist: 4.0.0 dev: true -<<<<<<< HEAD - /lru-cache/7.18.3: -======= /lru-cache@7.18.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==} engines: {node: '>=12'} dev: true -<<<<<<< HEAD - /lru-cache/8.0.5: - resolution: {integrity: sha512-MhWWlVnuab1RG5/zMRRcVGXZLCXrZTgfwMikgzCegsPnG62yDQo5JnqKkrK4jO5iKqDAZGItAqN5CtKBCBWRUA==} - engines: {node: '>=16.14'} - dev: true + /lru-cache@9.1.2: + resolution: {integrity: sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==} + engines: {node: 14 || >=16.14} - /macos-release/2.5.1: -======= /macos-release@2.5.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /magic-string/0.30.0: - resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - - /make-dir/3.1.0: - resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} - engines: {node: '>=8'} - dependencies: - semver: 6.3.0 - dev: true - - /make-error/1.3.6: - resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} - dev: true - - /make-fetch-happen/9.1.0: -======= /magic-string@0.26.1: resolution: {integrity: sha512-ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg==} engines: {node: '>=12'} @@ -7330,7 +4547,6 @@ packages: dev: true /make-fetch-happen@9.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==} engines: {node: '>= 10'} dependencies: @@ -7356,45 +4572,23 @@ packages: dev: true optional: true -<<<<<<< HEAD - /makeerror/1.0.12: -======= /makeerror@1.0.12: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==} dependencies: tmpl: 1.0.5 dev: true -<<<<<<< HEAD - /media-typer/0.3.0: - resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} - engines: {node: '>= 0.6'} - - /memfs/3.5.3: -======= /media-typer@0.3.0: resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} engines: {node: '>= 0.6'} /memfs@3.5.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==} engines: {node: '>= 4.0.0'} dependencies: fs-monkey: 1.0.4 dev: true -<<<<<<< HEAD - /merge-descriptors/1.0.1: - resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} - - /merge-stream/2.0.0: - resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} - dev: true - - /merge2/1.4.1: -======= /merge-descriptors@1.0.1: resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} @@ -7403,24 +4597,15 @@ packages: dev: true /merge2@1.4.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} dev: true -<<<<<<< HEAD - /methods/1.1.2: - resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} - engines: {node: '>= 0.6'} - - /micromatch/4.0.5: -======= /methods@1.1.2: resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} engines: {node: '>= 0.6'} /micromatch@4.0.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} engines: {node: '>=8.6'} dependencies: @@ -7428,103 +4613,55 @@ packages: picomatch: 2.3.1 dev: true -<<<<<<< HEAD - /mime-db/1.52.0: - resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} - engines: {node: '>= 0.6'} - - /mime-types/2.1.35: -======= /mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} /mime-types@2.1.35: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} dependencies: mime-db: 1.52.0 -<<<<<<< HEAD - /mime/1.6.0: -======= /mime@1.6.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==} engines: {node: '>=4'} hasBin: true -<<<<<<< HEAD - /mime/2.6.0: -======= /mime@2.6.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==} engines: {node: '>=4.0.0'} hasBin: true dev: true -<<<<<<< HEAD - /mimic-fn/2.1.0: -======= /mimic-fn@2.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /minimatch/3.1.2: -======= /minimatch@3.1.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: brace-expansion: 1.1.11 -<<<<<<< HEAD - /minimatch/5.1.6: -======= /minimatch@5.1.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} engines: {node: '>=10'} dependencies: brace-expansion: 2.0.1 dev: true -<<<<<<< HEAD - /minimatch/8.0.4: - resolution: {integrity: sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - brace-expansion: 2.0.1 - dev: true - - /minimist/1.2.8: - resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - - /minipass-collect/1.0.2: -======= /minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} /minipass-collect@1.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==} engines: {node: '>= 8'} dependencies: minipass: 3.3.6 dev: true -<<<<<<< HEAD - optional: true - - /minipass-fetch/1.4.1: -======= /minipass-fetch@1.4.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==} engines: {node: '>=8'} dependencies: @@ -7536,37 +4673,21 @@ packages: dev: true optional: true -<<<<<<< HEAD - /minipass-flush/1.0.5: -======= /minipass-flush@1.0.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==} engines: {node: '>= 8'} dependencies: minipass: 3.3.6 dev: true -<<<<<<< HEAD - optional: true - - /minipass-pipeline/1.2.4: -======= /minipass-pipeline@1.2.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==} engines: {node: '>=8'} dependencies: minipass: 3.3.6 dev: true -<<<<<<< HEAD - optional: true - - /minipass-sized/1.0.3: -======= /minipass-sized@1.0.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==} engines: {node: '>=8'} dependencies: @@ -7574,41 +4695,19 @@ packages: dev: true optional: true -<<<<<<< HEAD - /minipass/3.3.6: -======= /minipass@3.3.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} engines: {node: '>=8'} dependencies: yallist: 4.0.0 dev: true -<<<<<<< HEAD - /minipass/4.2.8: - resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==} - engines: {node: '>=8'} - dev: true - - /minipass/5.0.0: -======= /minipass@5.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /minipass/7.0.1: - resolution: {integrity: sha512-NQ8MCKimInjVlaIqx51RKJJB7mINVkLTJbsZKmto4UAAOC/CWXES8PGaOgoBZyqoUsUA/U3DToGK7GJkkHbjJw==} - engines: {node: '>=16 || 14 >=14.17'} - dev: true - - /minizlib/2.1.2: -======= /minizlib@2.1.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} dependencies: @@ -7616,60 +4715,35 @@ packages: yallist: 4.0.0 dev: true -<<<<<<< HEAD - /mkdirp/0.5.6: -======= /mkdirp@0.5.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} hasBin: true dependencies: minimist: 1.2.8 -<<<<<<< HEAD - /mkdirp/1.0.4: -======= /mkdirp@1.0.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} engines: {node: '>=10'} hasBin: true dev: true -<<<<<<< HEAD - /mkdirp/2.1.6: -======= /mkdirp@2.1.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==} engines: {node: '>=10'} hasBin: true dev: true -<<<<<<< HEAD - /mockjs/1.1.0: -======= /mockjs@1.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==} hasBin: true dependencies: commander: 11.0.0 dev: true -<<<<<<< HEAD - /ms/2.0.0: - resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} - - /ms/2.1.2: - resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} + /moment@2.29.4: + resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==} dev: true - /ms/2.1.3: - resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - - /multer/1.4.4-lts.1: -======= /ms@2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} @@ -7681,7 +4755,6 @@ packages: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} /multer@1.4.4-lts.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-WeSGziVj6+Z2/MwQo3GvqzgR+9Uc+qt8SwHKh3gvNPiISKfsMfG4SvCOFYlxxgkXt7yIV2i1yczehm0EOKIxIg==} engines: {node: '>= 6.0.0'} dependencies: @@ -7693,11 +4766,7 @@ packages: type-is: 1.6.18 xtend: 4.0.2 -<<<<<<< HEAD - /multer/1.4.5-lts.1: -======= /multer@1.4.5-lts.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==} engines: {node: '>= 6.0.0'} dependencies: @@ -7710,42 +4779,25 @@ packages: xtend: 4.0.2 dev: true -<<<<<<< HEAD - /mute-stream/0.0.8: - resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==} - dev: true - - /mysql2/3.5.1: - resolution: {integrity: sha512-RyaeUBqMiFR1ivk78JToPz0MhwN/sUWCKwPZszbXaFNZ6wmP/EJNPDU6gbZkF+qtLjr3sULQb0Y7JuFrNblnDg==} -======= /mute-stream@0.0.8: resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==} dev: true /mysql2@3.2.0: resolution: {integrity: sha512-0Vn6a9WSrq6fWwvPgrvIwnOCldiEcgbzapVRDAtDZ4cMTxN7pnGqCTx8EG32S/NYXl6AXkdO+9hV1tSIi/LigA==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>= 8.0'} dependencies: denque: 2.1.0 generate-function: 2.3.1 iconv-lite: 0.6.3 long: 5.2.3 -<<<<<<< HEAD - lru-cache: 8.0.5 -======= lru-cache: 7.18.3 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 named-placeholders: 1.1.3 seq-queue: 0.0.5 sqlstring: 2.3.3 dev: true -<<<<<<< HEAD - /mz/2.7.0: -======= /mz@2.7.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} dependencies: any-promise: 1.3.0 @@ -7753,55 +4805,19 @@ packages: thenify-all: 1.6.0 dev: true -<<<<<<< HEAD - /named-placeholders/1.1.3: -======= /named-placeholders@1.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==} engines: {node: '>=12.0.0'} dependencies: lru-cache: 7.18.3 dev: true -<<<<<<< HEAD - /nanoid/4.0.2: - resolution: {integrity: sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==} -======= /nanoid@4.0.1: resolution: {integrity: sha512-udKGtCCUafD3nQtJg9wBhRP3KMbPglUsgV5JVsXhvyBs/oefqb4sqMEhKBBgqZncYowu58p1prsZQBYvAj/Gww==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: ^14 || ^16 || >=18} hasBin: true dev: true -<<<<<<< HEAD - /natural-compare-lite/1.4.0: - resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==} - dev: true - - /natural-compare/1.4.0: - resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} - dev: true - - /negotiator/0.6.3: - resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} - engines: {node: '>= 0.6'} - - /neo-async/2.6.2: - resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - dev: true - - /node-abort-controller/3.1.1: - resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==} - dev: true - - /node-addon-api/4.3.0: - resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==} - dev: true - - /node-emoji/1.11.0: -======= /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true @@ -7819,17 +4835,12 @@ packages: dev: true /node-emoji@1.11.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==} dependencies: lodash: 4.17.21 dev: true -<<<<<<< HEAD - /node-fetch/2.6.12: -======= /node-fetch@2.6.12: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==} engines: {node: 4.x || >=6.0.0} peerDependencies: @@ -7840,11 +4851,7 @@ packages: dependencies: whatwg-url: 5.0.0 -<<<<<<< HEAD - /node-gyp/8.4.1: -======= /node-gyp@8.4.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==} engines: {node: '>= 10.12.0'} hasBin: true @@ -7866,17 +4873,6 @@ packages: dev: true optional: true -<<<<<<< HEAD - /node-int64/0.4.0: - resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} - dev: true - - /node-releases/2.0.13: - resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==} - dev: true - - /nopt/5.0.0: -======= /node-int64@0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} dev: true @@ -7885,8 +4881,12 @@ packages: resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==} dev: true + /nodemailer@6.9.4: + resolution: {integrity: sha512-CXjQvrQZV4+6X5wP6ZIgdehJamI63MFoYFGGPtHudWym9qaEHDNdPzaj5bfMCvxG1vhAileSWW90q7nL0N36mA==} + engines: {node: '>=6.0.0'} + dev: true + /nopt@5.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==} engines: {node: '>=6'} hasBin: true @@ -7894,31 +4894,19 @@ packages: abbrev: 1.1.1 dev: true -<<<<<<< HEAD - /normalize-path/3.0.0: -======= /normalize-path@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} dev: true -<<<<<<< HEAD - /npm-run-path/4.0.1: -======= /npm-run-path@4.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} engines: {node: '>=8'} dependencies: path-key: 3.1.1 dev: true -<<<<<<< HEAD - /npmlog/5.0.1: -======= /npmlog@5.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==} dependencies: are-we-there-yet: 2.0.0 @@ -7927,11 +4915,7 @@ packages: set-blocking: 2.0.0 dev: true -<<<<<<< HEAD - /npmlog/6.0.2: -======= /npmlog@6.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} dependencies: @@ -7942,20 +4926,15 @@ packages: dev: true optional: true -<<<<<<< HEAD - /object-assign/4.1.1: - resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} - engines: {node: '>=0.10.0'} - - /object-inspect/1.12.3: - resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==} - - /on-finished/2.4.1: -======= /object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} + /object-hash@2.2.0: + resolution: {integrity: sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==} + engines: {node: '>= 6'} + dev: true + /object-hash@3.0.0: resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} engines: {node: '>= 6'} @@ -7964,37 +4943,30 @@ packages: resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==} /on-finished@2.4.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} engines: {node: '>= 0.8'} dependencies: ee-first: 1.1.1 -<<<<<<< HEAD - /once/1.4.0: -======= /once@1.4.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} dependencies: wrappy: 1.0.2 -<<<<<<< HEAD - /onetime/5.1.2: -======= + /one-time@1.0.0: + resolution: {integrity: sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==} + dependencies: + fn.name: 1.1.0 + dev: true + /onetime@5.1.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} dependencies: mimic-fn: 2.1.0 dev: true -<<<<<<< HEAD - /optionator/0.9.3: -======= /optionator@0.9.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} engines: {node: '>= 0.8.0'} dependencies: @@ -8006,11 +4978,7 @@ packages: type-check: 0.4.0 dev: true -<<<<<<< HEAD - /ora/5.4.1: -======= /ora@5.4.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==} engines: {node: '>=10'} dependencies: @@ -8025,11 +4993,7 @@ packages: wcwidth: 1.0.1 dev: true -<<<<<<< HEAD - /os-name/4.0.1: -======= /os-name@4.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==} engines: {node: '>=10'} dependencies: @@ -8037,93 +5001,52 @@ packages: windows-release: 4.0.0 dev: true -<<<<<<< HEAD - /os-tmpdir/1.0.2: -======= /os-tmpdir@1.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} engines: {node: '>=0.10.0'} dev: true -<<<<<<< HEAD - /p-limit/2.3.0: -======= /p-limit@2.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} engines: {node: '>=6'} dependencies: p-try: 2.2.0 dev: true -<<<<<<< HEAD - /p-limit/3.1.0: -======= /p-limit@3.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} dependencies: yocto-queue: 0.1.0 dev: true -<<<<<<< HEAD - /p-locate/4.1.0: -======= /p-locate@4.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} engines: {node: '>=8'} dependencies: p-limit: 2.3.0 dev: true -<<<<<<< HEAD - /p-locate/5.0.0: - resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} - engines: {node: '>=10'} - dependencies: - p-limit: 3.1.0 - dev: true - - /p-map/4.0.0: -======= /p-map@4.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==} engines: {node: '>=10'} dependencies: aggregate-error: 3.1.0 dev: true -<<<<<<< HEAD - optional: true - - /p-try/2.2.0: -======= /p-try@2.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /parent-module/1.0.1: -======= /parent-module@1.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} dependencies: callsites: 3.1.0 dev: true -<<<<<<< HEAD - /parse-json/5.2.0: -======= /parse-json@5.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: @@ -8133,31 +5056,12 @@ packages: lines-and-columns: 1.2.4 dev: true -<<<<<<< HEAD - /parse5-htmlparser2-tree-adapter/6.0.1: -======= /parse5-htmlparser2-tree-adapter@6.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==} dependencies: parse5: 6.0.1 dev: true -<<<<<<< HEAD - /parse5/5.1.1: - resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==} - dev: true - - /parse5/6.0.1: - resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==} - dev: true - - /parseurl/1.3.3: - resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} - engines: {node: '>= 0.8'} - - /passport-jwt/4.0.1: -======= /parse5@5.1.1: resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==} dev: true @@ -8171,38 +5075,25 @@ packages: engines: {node: '>= 0.8'} /passport-jwt@4.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-UCKMDYhNuGOBE9/9Ycuoyh7vP6jpeTp/+sfMJl7nLff/t6dps+iaeE0hhNkKN8/HZHcJ7lCdOyDxHdDoxoSvdQ==} dependencies: jsonwebtoken: 9.0.1 passport-strategy: 1.0.0 dev: true -<<<<<<< HEAD - /passport-local/1.0.0: -======= /passport-local@1.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-9wCE6qKznvf9mQYYbgJ3sVOHmCWoUNMVFoZzNoznmISbhnNNPhN9xfY3sLmScHMetEJeoY7CXwfhCe7argfQow==} engines: {node: '>= 0.4.0'} dependencies: passport-strategy: 1.0.0 dev: true -<<<<<<< HEAD - /passport-strategy/1.0.0: -======= /passport-strategy@1.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==} engines: {node: '>= 0.4.0'} dev: true -<<<<<<< HEAD - /passport/0.6.0: -======= /passport@0.6.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==} engines: {node: '>= 0.4.0'} dependencies: @@ -8211,57 +5102,20 @@ packages: utils-merge: 1.0.1 dev: true -<<<<<<< HEAD - /path-exists/4.0.0: -======= /path-exists@4.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /path-is-absolute/1.0.1: - resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} - engines: {node: '>=0.10.0'} - - /path-key/3.1.1: -======= /path-is-absolute@1.0.1: resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} engines: {node: '>=0.10.0'} /path-key@3.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /path-parse/1.0.7: - resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - dev: true - - /path-scurry/1.10.1: - resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - lru-cache: 10.0.0 - minipass: 7.0.1 - dev: true - - /path-to-regexp/0.1.7: - resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} - - /path-to-regexp/0.2.5: - resolution: {integrity: sha512-l6qtdDPIkmAmzEO6egquYDfqQGPMRNGjYtrU13HAXb3YSRrt7HSb1sJY0pKp6o2bAa86tSB6iwaW2JbthPKr7Q==} - dev: true - - /path-to-regexp/3.2.0: - resolution: {integrity: sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==} - - /path-type/4.0.0: -======= /path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: true @@ -8277,22 +5131,10 @@ packages: resolution: {integrity: sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==} /path-type@4.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /pause/0.0.1: - resolution: {integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==} - dev: true - - /picocolors/1.0.0: - resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} - dev: true - - /picomatch/2.3.1: -======= /pause@0.0.1: resolution: {integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==} dev: true @@ -8302,76 +5144,46 @@ packages: dev: true /picomatch@2.3.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} dev: true -<<<<<<< HEAD - /pirates/4.0.6: -======= /pirates@4.0.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} dev: true -<<<<<<< HEAD - /pkg-dir/4.2.0: -======= /pkg-dir@4.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} dependencies: find-up: 4.1.0 dev: true -<<<<<<< HEAD - /pluralize/8.0.0: -======= /pluralize@8.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==} engines: {node: '>=4'} dev: true -<<<<<<< HEAD - /prelude-ls/1.2.1: -======= /prelude-ls@1.2.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} dev: true -<<<<<<< HEAD - /prettier-linter-helpers/1.0.0: -======= /prettier-linter-helpers@1.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} engines: {node: '>=6.0.0'} dependencies: fast-diff: 1.3.0 dev: true -<<<<<<< HEAD - /prettier/2.8.8: - resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} -======= /prettier@2.3.2: resolution: {integrity: sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>=10.13.0'} hasBin: true dev: true -<<<<<<< HEAD - /pretty-format/28.1.3: -======= /pretty-format@28.1.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: @@ -8381,12 +5193,6 @@ packages: react-is: 18.2.0 dev: true -<<<<<<< HEAD - /process-nextick-args/2.0.1: - resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} - - /promise-inflight/1.0.1: -======= /process-nextick-args@2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} @@ -8396,7 +5202,6 @@ packages: dev: true /promise-inflight@1.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==} peerDependencies: bluebird: '*' @@ -8404,14 +5209,8 @@ packages: bluebird: optional: true dev: true -<<<<<<< HEAD - optional: true - - /promise-retry/2.0.1: -======= /promise-retry@2.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==} engines: {node: '>=10'} dependencies: @@ -8420,11 +5219,7 @@ packages: dev: true optional: true -<<<<<<< HEAD - /prompts/2.4.2: -======= /prompts@2.4.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} engines: {node: '>= 6'} dependencies: @@ -8432,90 +5227,53 @@ packages: sisteransi: 1.0.5 dev: true -<<<<<<< HEAD - /proxy-addr/2.0.7: -======= /proxy-addr@2.0.7: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} engines: {node: '>= 0.10'} dependencies: forwarded: 0.2.0 ipaddr.js: 1.9.1 -<<<<<<< HEAD - /pump/3.0.0: -======= /pump@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} dependencies: end-of-stream: 1.4.4 once: 1.4.0 dev: true -<<<<<<< HEAD - /punycode/2.3.0: -======= /punycode@2.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /qs/6.11.0: - resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} -======= /qs@6.10.3: resolution: {integrity: sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>=0.6'} dependencies: side-channel: 1.0.4 -<<<<<<< HEAD - /qs/6.11.2: -======= /qs@6.11.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==} engines: {node: '>=0.6'} dependencies: side-channel: 1.0.4 dev: true -<<<<<<< HEAD - /queue-microtask/1.2.3: - resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - dev: true - - /randombytes/2.1.0: -======= /queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: true /randombytes@2.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==} dependencies: safe-buffer: 5.2.1 dev: true -<<<<<<< HEAD - /range-parser/1.2.1: - resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} - engines: {node: '>= 0.6'} - - /raw-body/2.5.1: -======= /range-parser@1.2.1: resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} engines: {node: '>= 0.6'} /raw-body@2.5.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==} engines: {node: '>= 0.8'} dependencies: @@ -8524,28 +5282,11 @@ packages: iconv-lite: 0.4.24 unpipe: 1.0.0 -<<<<<<< HEAD - /raw-body/2.5.2: - resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==} - engines: {node: '>= 0.8'} - dependencies: - bytes: 3.1.2 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - unpipe: 1.0.0 - - /react-is/18.2.0: - resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} - dev: true - - /readable-stream/2.3.8: -======= /react-is@18.2.0: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} dev: true /readable-stream@2.3.8: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==} dependencies: core-util-is: 1.0.3 @@ -8556,11 +5297,7 @@ packages: string_decoder: 1.1.1 util-deprecate: 1.0.2 -<<<<<<< HEAD - /readable-stream/3.6.2: -======= /readable-stream@3.6.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} engines: {node: '>= 6'} dependencies: @@ -8569,38 +5306,31 @@ packages: util-deprecate: 1.0.2 dev: true -<<<<<<< HEAD - /readdirp/3.6.0: -======= /readdirp@3.6.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} dependencies: picomatch: 2.3.1 dev: true -<<<<<<< HEAD - /rechoir/0.6.2: -======= /rechoir@0.6.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==} engines: {node: '>= 0.10'} dependencies: resolve: 1.22.2 dev: true -<<<<<<< HEAD - /reflect-metadata/0.1.13: - resolution: {integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==} - - /regenerator-runtime/0.13.11: - resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} + /redis@4.6.7: + resolution: {integrity: sha512-KrkuNJNpCwRm5vFJh0tteMxW8SaUzkm5fBH7eL5hd/D0fAkzvapxbfGPP/r+4JAXdQuX7nebsBkBqA2RHB7Usw==} + dependencies: + '@redis/bloom': 1.2.0(@redis/client@1.5.8) + '@redis/client': 1.5.8 + '@redis/graph': 1.1.0(@redis/client@1.5.8) + '@redis/json': 1.0.4(@redis/client@1.5.8) + '@redis/search': 1.1.3(@redis/client@1.5.8) + '@redis/time-series': 1.0.4(@redis/client@1.5.8) dev: true - /require-directory/2.1.1: -======= /reflect-metadata@0.1.13: resolution: {integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==} @@ -8614,63 +5344,38 @@ packages: dev: true /require-directory@2.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} engines: {node: '>=0.10.0'} dev: true -<<<<<<< HEAD - /require-from-string/2.0.2: -======= /require-from-string@2.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} dev: true -<<<<<<< HEAD - /resolve-cwd/3.0.0: -======= /resolve-cwd@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==} engines: {node: '>=8'} dependencies: resolve-from: 5.0.0 dev: true -<<<<<<< HEAD - /resolve-from/4.0.0: -======= /resolve-from@4.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} engines: {node: '>=4'} dev: true -<<<<<<< HEAD - /resolve-from/5.0.0: -======= /resolve-from@5.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /resolve.exports/1.1.1: -======= /resolve.exports@1.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /resolve/1.22.2: -======= /resolve@1.22.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==} hasBin: true dependencies: @@ -8679,11 +5384,7 @@ packages: supports-preserve-symlinks-flag: 1.0.0 dev: true -<<<<<<< HEAD - /restore-cursor/3.1.0: -======= /restore-cursor@3.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==} engines: {node: '>=8'} dependencies: @@ -8691,79 +5392,34 @@ packages: signal-exit: 3.0.7 dev: true -<<<<<<< HEAD - /retry/0.12.0: -======= /retry@0.12.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==} engines: {node: '>= 4'} dev: true optional: true -<<<<<<< HEAD - /reusify/1.0.4: -======= /reusify@1.0.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} dev: true -<<<<<<< HEAD - /rimraf/3.0.2: -======= /rimraf@3.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} hasBin: true dependencies: glob: 7.2.3 -<<<<<<< HEAD - /rimraf/4.4.1: - resolution: {integrity: sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==} - engines: {node: '>=14'} - hasBin: true - dependencies: - glob: 9.3.5 - dev: true - - /run-async/2.4.1: -======= /run-async@2.4.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==} engines: {node: '>=0.12.0'} dev: true -<<<<<<< HEAD - /run-parallel/1.2.0: -======= /run-parallel@1.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: queue-microtask: 1.2.3 dev: true -<<<<<<< HEAD - /rxjs/7.8.1: - resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} - dependencies: - tslib: 2.6.0 - - /safe-buffer/5.1.2: - resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} - - /safe-buffer/5.2.1: - resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} - - /safer-buffer/2.1.2: - resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - - /schema-utils/3.3.0: -======= /rxjs@6.6.7: resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==} engines: {npm: '>=2.0.0'} @@ -8788,6 +5444,11 @@ packages: /safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} + /safe-stable-stringify@2.4.3: + resolution: {integrity: sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==} + engines: {node: '>=10'} + dev: true + /safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} @@ -8796,23 +5457,11 @@ packages: dev: true /schema-utils@3.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==} engines: {node: '>= 10.13.0'} dependencies: '@types/json-schema': 7.0.12 ajv: 6.12.6 -<<<<<<< HEAD - ajv-keywords: 3.5.2_ajv@6.12.6 - dev: true - - /semver/6.3.0: - resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} - hasBin: true - dev: true - - /semver/7.5.4: -======= ajv-keywords: 3.5.2(ajv@6.12.6) dev: true @@ -8822,7 +5471,6 @@ packages: dev: true /semver@7.5.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} engines: {node: '>=10'} hasBin: true @@ -8830,11 +5478,7 @@ packages: lru-cache: 6.0.0 dev: true -<<<<<<< HEAD - /send/0.18.0: -======= /send@0.18.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} engines: {node: '>= 0.8.0'} dependencies: @@ -8854,13 +5498,6 @@ packages: transitivePeerDependencies: - supports-color -<<<<<<< HEAD - /seq-queue/0.0.5: - resolution: {integrity: sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==} - dev: true - - /serialize-javascript/6.0.1: -======= /seq-queue@0.0.5: resolution: {integrity: sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==} dev: true @@ -8872,17 +5509,12 @@ packages: dev: true /serialize-javascript@6.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==} dependencies: randombytes: 2.1.0 dev: true -<<<<<<< HEAD - /serve-static/1.15.0: -======= /serve-static@1.15.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==} engines: {node: '>= 0.8.0'} dependencies: @@ -8893,16 +5525,6 @@ packages: transitivePeerDependencies: - supports-color -<<<<<<< HEAD - /set-blocking/2.0.0: - resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} - dev: true - - /setprototypeof/1.2.0: - resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} - - /sha.js/2.4.11: -======= /set-blocking@2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} dev: true @@ -8911,7 +5533,6 @@ packages: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} /sha.js@2.4.11: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==} hasBin: true dependencies: @@ -8919,31 +5540,19 @@ packages: safe-buffer: 5.2.1 dev: true -<<<<<<< HEAD - /shebang-command/2.0.0: -======= /shebang-command@2.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} dependencies: shebang-regex: 3.0.0 dev: true -<<<<<<< HEAD - /shebang-regex/3.0.0: -======= /shebang-regex@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /shelljs/0.8.5: -======= /shelljs@0.8.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==} engines: {node: '>=4'} hasBin: true @@ -8953,57 +5562,39 @@ packages: rechoir: 0.6.2 dev: true -<<<<<<< HEAD - /side-channel/1.0.4: -======= /side-channel@1.0.4: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} dependencies: call-bind: 1.0.2 get-intrinsic: 1.2.1 object-inspect: 1.12.3 -<<<<<<< HEAD - /signal-exit/3.0.7: - resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} - dev: true - - /sisteransi/1.0.5: - resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} - dev: true - - /slash/3.0.0: -======= /signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} dev: true + /simple-swizzle@0.2.2: + resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} + dependencies: + is-arrayish: 0.3.2 + dev: true + /sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} dev: true /slash@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /smart-buffer/4.2.0: -======= /smart-buffer@4.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} dev: true optional: true -<<<<<<< HEAD - /socks-proxy-agent/6.2.1: -======= /socks-proxy-agent@6.2.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==} engines: {node: '>= 10'} dependencies: @@ -9015,11 +5606,7 @@ packages: dev: true optional: true -<<<<<<< HEAD - /socks/2.7.1: -======= /socks@2.7.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==} engines: {node: '>= 10.13.0', npm: '>= 3.0.0'} dependencies: @@ -9028,24 +5615,17 @@ packages: dev: true optional: true -<<<<<<< HEAD - /source-map-support/0.5.13: -======= /source-list-map@2.0.1: resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==} dev: true /source-map-support@0.5.13: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==} dependencies: buffer-from: 1.1.2 source-map: 0.6.1 dev: true -<<<<<<< HEAD - /source-map-support/0.5.21: -======= /source-map-support@0.5.20: resolution: {integrity: sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==} dependencies: @@ -9054,34 +5634,17 @@ packages: dev: true /source-map-support@0.5.21: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} dependencies: buffer-from: 1.1.2 source-map: 0.6.1 dev: true -<<<<<<< HEAD - /source-map/0.6.1: -======= /source-map@0.6.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} engines: {node: '>=0.10.0'} dev: true -<<<<<<< HEAD - /source-map/0.7.4: - resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} - engines: {node: '>= 8'} - dev: true - - /sprintf-js/1.0.3: - resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} - dev: true - - /sqlite3/5.1.6: -======= /source-map@0.7.3: resolution: {integrity: sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==} engines: {node: '>= 8'} @@ -9097,18 +5660,13 @@ packages: dev: true /sqlite3@5.1.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==} requiresBuild: true peerDependenciesMeta: node-gyp: optional: true dependencies: -<<<<<<< HEAD - '@mapbox/node-pre-gyp': 1.0.10 -======= '@mapbox/node-pre-gyp': 1.0.11 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 node-addon-api: 4.3.0 tar: 6.1.15 optionalDependencies: @@ -9119,50 +5677,29 @@ packages: - supports-color dev: true -<<<<<<< HEAD - /sqlstring/2.3.3: -======= /sqlstring@2.3.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==} engines: {node: '>= 0.6'} dev: true -<<<<<<< HEAD - /ssri/8.0.1: -======= /ssri@8.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==} engines: {node: '>= 8'} dependencies: minipass: 3.3.6 dev: true -<<<<<<< HEAD - optional: true - /stack-utils/2.0.6: -======= + /stack-trace@0.0.10: + resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==} + dev: true /stack-utils@2.0.6: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==} engines: {node: '>=10'} dependencies: escape-string-regexp: 2.0.0 dev: true -<<<<<<< HEAD - /statuses/2.0.1: - resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} - engines: {node: '>= 0.8'} - - /streamsearch/1.1.0: - resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==} - engines: {node: '>=10.0.0'} - - /string-length/4.0.2: -======= /statuses@2.0.1: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} engines: {node: '>= 0.8'} @@ -9172,7 +5709,6 @@ packages: engines: {node: '>=10.0.0'} /string-length@4.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==} engines: {node: '>=10'} dependencies: @@ -9180,11 +5716,7 @@ packages: strip-ansi: 6.0.1 dev: true -<<<<<<< HEAD - /string-width/4.2.3: -======= /string-width@4.2.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} dependencies: @@ -9193,162 +5725,95 @@ packages: strip-ansi: 6.0.1 dev: true -<<<<<<< HEAD - /string_decoder/1.1.1: -======= /string_decoder@1.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} dependencies: safe-buffer: 5.1.2 -<<<<<<< HEAD - /string_decoder/1.3.0: -======= /string_decoder@1.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==} dependencies: safe-buffer: 5.2.1 dev: true -<<<<<<< HEAD - /strip-ansi/6.0.1: -======= /strip-ansi@6.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} dependencies: ansi-regex: 5.0.1 dev: true -<<<<<<< HEAD - /strip-bom/3.0.0: -======= /strip-bom@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} engines: {node: '>=4'} dev: true -<<<<<<< HEAD - /strip-bom/4.0.0: -======= /strip-bom@4.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /strip-final-newline/2.0.0: -======= /strip-final-newline@2.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /strip-json-comments/3.1.1: -======= /strip-json-comments@3.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} dev: true -<<<<<<< HEAD - /superagent/8.0.9: - resolution: {integrity: sha512-4C7Bh5pyHTvU33KpZgwrNKh/VQnvgtCSqPRfJAUdmrtSYePVzVg4E4OzsrbkhJj9O7SO6Bnv75K/F8XVZT8YHA==} - engines: {node: '>=6.4.0 <13 || >=14'} -======= /superagent@6.1.0: resolution: {integrity: sha512-OUDHEssirmplo3F+1HWKUrUjvnQuA+nZI6i/JJBdXb5eq9IyEQwPyPpqND+SSsxf6TygpBEkUjISVRN4/VOpeg==} engines: {node: '>= 7.0.0'} deprecated: Please upgrade to v7.0.2+ of superagent. We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing. See the releases tab for more information at . ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 dependencies: component-emitter: 1.3.0 cookiejar: 2.1.4 debug: 4.3.4 fast-safe-stringify: 2.1.1 -<<<<<<< HEAD - form-data: 4.0.0 - formidable: 2.1.2 - methods: 1.1.2 - mime: 2.6.0 - qs: 6.11.2 -======= form-data: 3.0.1 formidable: 1.2.6 methods: 1.1.2 mime: 2.6.0 qs: 6.11.2 readable-stream: 3.6.2 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 semver: 7.5.4 transitivePeerDependencies: - supports-color dev: true -<<<<<<< HEAD - /supertest/6.3.3: - resolution: {integrity: sha512-EMCG6G8gDu5qEqRQ3JjjPs6+FYT1a7Hv5ApHvtSghmOFJYtsU5S+pSb6Y2EUeCEY3CmEL3mmQ8YWlPOzQomabA==} - engines: {node: '>=6.4.0'} - dependencies: - methods: 1.1.2 - superagent: 8.0.9 -======= /supertest@6.1.3: resolution: {integrity: sha512-v2NVRyP73XDewKb65adz+yug1XMtmvij63qIWHZzSX8tp6wiq6xBLUy4SUAd2NII6wIipOmHT/FD9eicpJwdgQ==} engines: {node: '>=6.0.0'} dependencies: methods: 1.1.2 superagent: 6.1.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 transitivePeerDependencies: - supports-color dev: true -<<<<<<< HEAD - /supports-color/5.5.0: -======= /supports-color@5.5.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'} dependencies: has-flag: 3.0.0 dev: true -<<<<<<< HEAD - /supports-color/7.2.0: -======= /supports-color@7.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} dependencies: has-flag: 4.0.0 -<<<<<<< HEAD - /supports-color/8.1.1: -======= /supports-color@8.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} engines: {node: '>=10'} dependencies: has-flag: 4.0.0 dev: true -<<<<<<< HEAD - /supports-hyperlinks/2.3.0: -======= /supports-hyperlinks@2.3.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==} engines: {node: '>=8'} dependencies: @@ -9356,46 +5821,26 @@ packages: supports-color: 7.2.0 dev: true -<<<<<<< HEAD - /supports-preserve-symlinks-flag/1.0.0: -======= /supports-preserve-symlinks-flag@1.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} dev: true -<<<<<<< HEAD - /swagger-ui-dist/4.18.2: - resolution: {integrity: sha512-oVBoBl9Dg+VJw8uRWDxlyUyHoNEDC0c1ysT6+Boy6CTgr2rUcLcfPon4RvxgS2/taNW6O0+US+Z/dlAsWFjOAQ==} - dev: true - - /symbol-observable/4.0.0: -======= /swagger-ui-dist@4.18.2: resolution: {integrity: sha512-oVBoBl9Dg+VJw8uRWDxlyUyHoNEDC0c1ysT6+Boy6CTgr2rUcLcfPon4RvxgS2/taNW6O0+US+Z/dlAsWFjOAQ==} dev: true /symbol-observable@4.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==} engines: {node: '>=0.10'} dev: true -<<<<<<< HEAD - /tapable/2.2.1: -======= /tapable@2.2.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /tar/6.1.15: -======= /tar@6.1.15: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==} engines: {node: '>=10'} dependencies: @@ -9407,11 +5852,7 @@ packages: yallist: 4.0.0 dev: true -<<<<<<< HEAD - /terminal-link/2.1.1: -======= /terminal-link@2.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==} engines: {node: '>=8'} dependencies: @@ -9419,9 +5860,6 @@ packages: supports-hyperlinks: 2.3.0 dev: true -<<<<<<< HEAD - /terser-webpack-plugin/5.3.9_webpack@5.82.1: -======= /terser-webpack-plugin@4.2.3(webpack@5.0.0): resolution: {integrity: sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==} engines: {node: '>= 10.13.0'} @@ -9443,7 +5881,6 @@ packages: dev: true /terser-webpack-plugin@5.3.9(webpack@5.73.0): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -9463,62 +5900,22 @@ packages: jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.1 -<<<<<<< HEAD - terser: 5.18.2 - webpack: 5.82.1 - dev: true - - /terser-webpack-plugin/5.3.9_webpack@5.88.1: - resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} - engines: {node: '>= 10.13.0'} - peerDependencies: - '@swc/core': '*' - esbuild: '*' - uglify-js: '*' - webpack: ^5.1.0 - peerDependenciesMeta: - '@swc/core': - optional: true - esbuild: - optional: true - uglify-js: - optional: true - dependencies: - '@jridgewell/trace-mapping': 0.3.18 - jest-worker: 27.5.1 - schema-utils: 3.3.0 - serialize-javascript: 6.0.1 - terser: 5.18.2 - webpack: 5.88.1 - dev: true - - /terser/5.18.2: - resolution: {integrity: sha512-Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w==} -======= terser: 5.19.2 webpack: 5.73.0 dev: true /terser@5.19.2: resolution: {integrity: sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>=10'} hasBin: true dependencies: '@jridgewell/source-map': 0.3.5 acorn: 8.10.0 commander: 2.20.3 -<<<<<<< HEAD - source-map-support: 0.5.21 - dev: true - - /test-exclude/6.0.0: -======= source-map-support: 0.5.20 dev: true /test-exclude@6.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==} engines: {node: '>=8'} dependencies: @@ -9527,92 +5924,54 @@ packages: minimatch: 3.1.2 dev: true -<<<<<<< HEAD - /text-table/0.2.0: - resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} + /text-hex@1.0.0: + resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==} dev: true - /thenify-all/1.6.0: -======= /text-table@0.2.0: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} dev: true /thenify-all@1.6.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} engines: {node: '>=0.8'} dependencies: thenify: 3.3.1 dev: true -<<<<<<< HEAD - /thenify/3.3.1: -======= /thenify@3.3.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} dependencies: any-promise: 1.3.0 dev: true -<<<<<<< HEAD - /through/2.3.8: - resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} - dev: true - - /tmp/0.0.33: -======= /through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} dev: true /tmp@0.0.33: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} dependencies: os-tmpdir: 1.0.2 dev: true -<<<<<<< HEAD - /tmpl/1.0.5: - resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==} - dev: true - - /to-fast-properties/2.0.0: -======= /tmpl@1.0.5: resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==} dev: true /to-fast-properties@2.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} engines: {node: '>=4'} dev: true -<<<<<<< HEAD - /to-regex-range/5.0.1: -======= /to-regex-range@5.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} dependencies: is-number: 7.0.0 dev: true -<<<<<<< HEAD - /toidentifier/1.0.1: - resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} - engines: {node: '>=0.6'} - - /tr46/0.0.3: - resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - - /tree-kill/1.2.2: -======= /toidentifier@1.0.1: resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} engines: {node: '>=0.6'} @@ -9621,16 +5980,16 @@ packages: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} /tree-kill@1.2.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true dev: true -<<<<<<< HEAD - /ts-jest/28.0.5_rv5warumbl7utqrnn4zdksbofm: -======= + /triple-beam@1.4.1: + resolution: {integrity: sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==} + engines: {node: '>= 14.0.0'} + dev: true + /ts-jest@28.0.5(@babel/core@7.22.9)(jest@28.1.2)(typescript@4.3.5): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} hasBin: true @@ -9648,36 +6007,21 @@ packages: esbuild: optional: true dependencies: -<<<<<<< HEAD - bs-logger: 0.2.6 - fast-json-stable-stringify: 2.1.0 - jest: 28.1.2_734c4vwpoc3zmfagshlprrefne -======= '@babel/core': 7.22.9 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 jest: 28.1.2(@types/node@16.0.0)(ts-node@10.0.0) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 jest-util: 28.1.3 json5: 2.2.3 lodash.memoize: 4.1.2 make-error: 1.3.6 semver: 7.5.4 -<<<<<<< HEAD - typescript: 4.9.5 - yargs-parser: 21.1.1 - dev: true - - /ts-loader/9.4.4_dhumxs7xcapy5ah5ryvaq7oilu: - resolution: {integrity: sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==} -======= typescript: 4.3.5 yargs-parser: 21.1.1 dev: true /ts-loader@9.2.3(typescript@4.3.5)(webpack@5.0.0): resolution: {integrity: sha512-sEyWiU3JMHBL55CIeC4iqJQadI0U70A5af0kvgbNLHVNz2ACztQg0j/9x10bjjIht8WfFYLKfn4L6tkZ+pu+8Q==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>=12.0.0'} peerDependencies: typescript: '*' @@ -9687,18 +6031,6 @@ packages: enhanced-resolve: 5.15.0 micromatch: 4.0.5 semver: 7.5.4 -<<<<<<< HEAD - typescript: 4.9.5 - webpack: 5.88.1 - dev: true - - /ts-node/10.9.1_npeoqfxwgl5njwqojmpesqhar4: - resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} - hasBin: true - peerDependencies: - '@swc/core': '>=1.2.50' - '@swc/wasm': '>=1.2.50' -======= typescript: 4.3.5 webpack: 5.0.0 dev: true @@ -9710,7 +6042,6 @@ packages: peerDependencies: '@swc/core': '>=1.2.45' '@swc/wasm': '>=1.2.45' ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 '@types/node': '*' typescript: '>=2.7' peerDependenciesMeta: @@ -9719,42 +6050,15 @@ packages: '@swc/wasm': optional: true dependencies: -<<<<<<< HEAD - '@cspotcode/source-map-support': 0.8.1 -======= ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 '@tsconfig/node10': 1.0.9 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 -<<<<<<< HEAD - '@types/node': 16.18.38 - acorn: 8.10.0 - acorn-walk: 8.2.0 -======= '@types/node': 16.0.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 -<<<<<<< HEAD - typescript: 4.9.5 - v8-compile-cache-lib: 3.0.1 - yn: 3.1.1 - dev: true - - /tsconfig-paths-webpack-plugin/4.0.1: - resolution: {integrity: sha512-m5//KzLoKmqu2MVix+dgLKq70MnFi8YL8sdzQZ6DblmCdfuq/y3OqvJd5vMndg2KEVCOeNz8Es4WVZhYInteLw==} - engines: {node: '>=10.13.0'} - dependencies: - chalk: 4.1.2 - enhanced-resolve: 5.15.0 - tsconfig-paths: 4.2.0 - dev: true - - /tsconfig-paths/4.0.0: -======= source-map-support: 0.5.20 typescript: 4.3.5 yn: 3.1.1 @@ -9778,7 +6082,6 @@ packages: dev: true /tsconfig-paths@4.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==} dependencies: json5: 2.2.3 @@ -9786,28 +6089,6 @@ packages: strip-bom: 3.0.0 dev: true -<<<<<<< HEAD - /tsconfig-paths/4.2.0: - resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==} - engines: {node: '>=6'} - dependencies: - json5: 2.2.3 - minimist: 1.2.8 - strip-bom: 3.0.0 - dev: true - - /tslib/1.14.1: - resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} - dev: true - - /tslib/2.5.3: - resolution: {integrity: sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==} - - /tslib/2.6.0: - resolution: {integrity: sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==} - - /tsutils/3.21.0_typescript@4.9.5: -======= /tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} dev: true @@ -9823,96 +6104,57 @@ packages: dev: true /tsutils@3.21.0(typescript@4.3.5): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 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 -<<<<<<< HEAD - typescript: 4.9.5 - dev: true - - /type-check/0.4.0: -======= typescript: 4.3.5 dev: true /type-check@0.4.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} dependencies: prelude-ls: 1.2.1 dev: true -<<<<<<< HEAD - /type-detect/4.0.8: -======= /type-detect@4.0.8: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} engines: {node: '>=4'} dev: true -<<<<<<< HEAD - /type-fest/0.20.2: -======= /type-fest@0.20.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /type-fest/0.21.3: -======= /type-fest@0.21.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /type-is/1.6.18: -======= /type-is@1.6.18: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} dependencies: media-typer: 0.3.0 mime-types: 2.1.35 -<<<<<<< HEAD - /typedarray/0.0.6: - resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} - - /typeorm-naming-strategies/4.1.0_typeorm@0.3.17: -======= /typedarray@0.0.6: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} /typeorm-naming-strategies@4.1.0(typeorm@0.3.12): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-vPekJXzZOTZrdDvTl1YoM+w+sUIfQHG4kZTpbFYoTsufyv9NIBRe4Q+PdzhEAFA2std3D9LZHEb1EjE9zhRpiQ==} peerDependencies: typeorm: ^0.2.0 || ^0.3.0 dependencies: -<<<<<<< HEAD - typeorm: 0.3.17_ucsizvblneazg3mzm3rghga4yy + typeorm: 0.3.12(mysql2@3.2.0)(redis@4.6.7)(sqlite3@5.1.6)(ts-node@10.0.0) dev: true - /typeorm/0.3.17_ucsizvblneazg3mzm3rghga4yy: - resolution: {integrity: sha512-UDjUEwIQalO9tWw9O2A4GU+sT3oyoUXheHJy4ft+RFdnRdQctdQ34L9SqE2p7LdwzafHx1maxT+bqXON+Qnmig==} -======= - typeorm: 0.3.12(mysql2@3.2.0)(sqlite3@5.1.6)(ts-node@10.0.0) - dev: true - - /typeorm@0.3.12(mysql2@3.2.0)(sqlite3@5.1.6)(ts-node@10.0.0): + /typeorm@0.3.12(mysql2@3.2.0)(redis@4.6.7)(sqlite3@5.1.6)(ts-node@10.0.0): resolution: {integrity: sha512-sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>= 12.9.0'} hasBin: true peerDependencies: @@ -9921,13 +6163,8 @@ packages: better-sqlite3: ^7.1.2 || ^8.0.0 hdb-pool: ^0.1.6 ioredis: ^5.0.4 -<<<<<<< HEAD - mongodb: ^5.2.0 - mssql: ^9.1.1 -======= mongodb: ^3.6.0 mssql: ^7.3.0 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 mysql2: ^2.2.5 || ^3.0.1 oracledb: ^5.1.0 pg: ^8.5.1 @@ -9981,23 +6218,12 @@ packages: cli-highlight: 2.1.11 date-fns: 2.30.0 debug: 4.3.4 -<<<<<<< HEAD - dotenv: 16.3.1 - glob: 8.1.0 - mkdirp: 2.1.6 - mysql2: 3.5.1 - reflect-metadata: 0.1.13 - sha.js: 2.4.11 - sqlite3: 5.1.6 - ts-node: 10.9.1_npeoqfxwgl5njwqojmpesqhar4 - tslib: 2.6.0 - uuid: 9.0.0 -======= dotenv: 16.0.3 glob: 8.1.0 js-yaml: 4.1.0 mkdirp: 2.1.6 mysql2: 3.2.0 + redis: 4.6.7 reflect-metadata: 0.1.13 sha.js: 2.4.11 sqlite3: 5.1.6 @@ -10005,32 +6231,17 @@ packages: tslib: 2.6.1 uuid: 9.0.0 xml2js: 0.4.23 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 yargs: 17.7.2 transitivePeerDependencies: - supports-color dev: true -<<<<<<< HEAD - /typescript/4.9.5: - resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} -======= /typescript@4.3.5: resolution: {integrity: sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>=4.2.0'} hasBin: true dev: true -<<<<<<< HEAD - /uid/2.0.2: - resolution: {integrity: sha512-u3xV3X7uzvi5b1MncmZo3i2Aw222Zk1keqLA1YkHldREkAhAqi65wuPfe7lHx8H/Wzy+8CE7S7uS3jekIM5s8g==} - engines: {node: '>=8'} - dependencies: - '@lukeed/csprng': 1.1.0 - - /unique-filename/1.1.1: -======= /typescript@4.7.4: resolution: {integrity: sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==} engines: {node: '>=4.2.0'} @@ -10038,87 +6249,43 @@ packages: dev: true /unique-filename@1.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==} dependencies: unique-slug: 2.0.2 dev: true -<<<<<<< HEAD - optional: true - - /unique-slug/2.0.2: -======= /unique-slug@2.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==} dependencies: imurmurhash: 0.1.4 dev: true -<<<<<<< HEAD - optional: true - - /universalify/2.0.0: -======= /universalify@2.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==} engines: {node: '>= 10.0.0'} dev: true -<<<<<<< HEAD - /unpipe/1.0.0: - resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} - engines: {node: '>= 0.8'} - - /update-browserslist-db/1.0.11_browserslist@4.21.9: -======= /unpipe@1.0.0: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} /update-browserslist-db@1.0.11(browserslist@4.21.10): ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: -<<<<<<< HEAD - browserslist: 4.21.9 -======= browserslist: 4.21.10 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 escalade: 3.1.1 picocolors: 1.0.0 dev: true -<<<<<<< HEAD - /uri-js/4.4.1: -======= /uri-js@4.4.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.3.0 dev: true -<<<<<<< HEAD - /util-deprecate/1.0.2: - resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - - /utils-merge/1.0.1: - resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} - engines: {node: '>= 0.4.0'} - - /uuid/8.3.2: - resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} - hasBin: true - dev: true - - /uuid/9.0.0: -======= /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -10131,24 +6298,15 @@ packages: hasBin: true /uuid@9.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==} hasBin: true dev: true -<<<<<<< HEAD - /v8-compile-cache-lib/3.0.1: - resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} - dev: true - - /v8-to-istanbul/9.1.0: -======= /v8-compile-cache@2.3.0: resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==} dev: true /v8-to-istanbul@9.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==} engines: {node: '>=10.12.0'} dependencies: @@ -10157,17 +6315,6 @@ packages: convert-source-map: 1.9.0 dev: true -<<<<<<< HEAD - /validator/13.9.0: - resolution: {integrity: sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==} - engines: {node: '>= 0.10'} - - /vary/1.1.2: - resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} - engines: {node: '>= 0.8'} - - /walker/1.0.8: -======= /validator@13.9.0: resolution: {integrity: sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==} engines: {node: '>= 0.10'} @@ -10177,17 +6324,12 @@ packages: engines: {node: '>= 0.8'} /walker@1.0.8: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==} dependencies: makeerror: 1.0.12 dev: true -<<<<<<< HEAD - /watchpack/2.4.0: -======= /watchpack@2.4.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==} engines: {node: '>=10.13.0'} dependencies: @@ -10195,34 +6337,20 @@ packages: graceful-fs: 4.2.11 dev: true -<<<<<<< HEAD - /wcwidth/1.0.1: -======= /wcwidth@1.0.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: defaults: 1.0.4 dev: true -<<<<<<< HEAD - /webidl-conversions/3.0.1: - resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} - - /webpack-node-externals/3.0.0: -======= /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} /webpack-node-externals@3.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /webpack-sources/3.2.3: -======= /webpack-sources@1.4.3: resolution: {integrity: sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==} dependencies: @@ -10239,18 +6367,12 @@ packages: dev: true /webpack-sources@3.2.3: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} dev: true -<<<<<<< HEAD - /webpack/5.82.1: - resolution: {integrity: sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==} -======= /webpack@5.0.0: resolution: {integrity: sha512-OK+Q9xGgda3idw/DgCf75XsVFxRLPu48qPwygqI3W9ls5sDdKif5Ay4SM/1UVob0w4juJy14Zv9nNv0WeyV0aA==} ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>=10.13.0'} hasBin: true peerDependencies: @@ -10260,18 +6382,6 @@ packages: optional: true dependencies: '@types/eslint-scope': 3.7.4 -<<<<<<< HEAD - '@types/estree': 1.0.1 - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/wasm-edit': 1.11.6 - '@webassemblyjs/wasm-parser': 1.11.6 - acorn: 8.10.0 - acorn-import-assertions: 1.9.0_acorn@8.10.0 - browserslist: 4.21.9 - chrome-trace-event: 1.0.3 - enhanced-resolve: 5.15.0 - es-module-lexer: 1.3.0 -======= '@types/estree': 0.0.45 '@webassemblyjs/ast': 1.9.0 '@webassemblyjs/helper-module-context': 1.9.0 @@ -10320,7 +6430,6 @@ packages: chrome-trace-event: 1.0.3 enhanced-resolve: 5.15.0 es-module-lexer: 0.9.3 ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 eslint-scope: 5.1.1 events: 3.3.0 glob-to-regexp: 0.4.1 @@ -10331,11 +6440,7 @@ packages: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 -<<<<<<< HEAD - terser-webpack-plugin: 5.3.9_webpack@5.82.1 -======= terser-webpack-plugin: 5.3.9(webpack@5.73.0) ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 watchpack: 2.4.0 webpack-sources: 3.2.3 transitivePeerDependencies: @@ -10344,61 +6449,13 @@ packages: - uglify-js dev: true -<<<<<<< HEAD - /webpack/5.88.1: - resolution: {integrity: sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==} - engines: {node: '>=10.13.0'} - hasBin: true - peerDependencies: - webpack-cli: '*' - peerDependenciesMeta: - webpack-cli: - optional: true - dependencies: - '@types/eslint-scope': 3.7.4 - '@types/estree': 1.0.1 - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/wasm-edit': 1.11.6 - '@webassemblyjs/wasm-parser': 1.11.6 - acorn: 8.10.0 - acorn-import-assertions: 1.9.0_acorn@8.10.0 - browserslist: 4.21.9 - chrome-trace-event: 1.0.3 - enhanced-resolve: 5.15.0 - es-module-lexer: 1.3.0 - eslint-scope: 5.1.1 - events: 3.3.0 - glob-to-regexp: 0.4.1 - graceful-fs: 4.2.11 - json-parse-even-better-errors: 2.3.1 - loader-runner: 4.3.0 - mime-types: 2.1.35 - neo-async: 2.6.2 - schema-utils: 3.3.0 - tapable: 2.2.1 - terser-webpack-plugin: 5.3.9_webpack@5.88.1 - watchpack: 2.4.0 - webpack-sources: 3.2.3 - transitivePeerDependencies: - - '@swc/core' - - esbuild - - uglify-js - dev: true - - /whatwg-url/5.0.0: -======= /whatwg-url@5.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 -<<<<<<< HEAD - /which/2.0.2: -======= /which@2.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} hasBin: true @@ -10406,32 +6463,59 @@ packages: isexe: 2.0.0 dev: true -<<<<<<< HEAD - /wide-align/1.1.5: -======= /wide-align@1.1.5: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} dependencies: string-width: 4.2.3 dev: true -<<<<<<< HEAD - /windows-release/4.0.0: -======= /windows-release@4.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==} engines: {node: '>=10'} dependencies: execa: 4.1.0 dev: true -<<<<<<< HEAD - /wrap-ansi/7.0.0: -======= + /winston-daily-rotate-file@4.7.1(winston@3.10.0): + resolution: {integrity: sha512-7LGPiYGBPNyGHLn9z33i96zx/bd71pjBn9tqQzO3I4Tayv94WPmBNwKC7CO1wPHdP9uvu+Md/1nr6VSH9h0iaA==} + engines: {node: '>=8'} + peerDependencies: + winston: ^3 + dependencies: + file-stream-rotator: 0.6.1 + object-hash: 2.2.0 + triple-beam: 1.4.1 + winston: 3.10.0 + winston-transport: 4.5.0 + dev: true + + /winston-transport@4.5.0: + resolution: {integrity: sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==} + engines: {node: '>= 6.4.0'} + dependencies: + logform: 2.5.1 + readable-stream: 3.6.2 + triple-beam: 1.4.1 + dev: true + + /winston@3.10.0: + resolution: {integrity: sha512-nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g==} + engines: {node: '>= 12.0.0'} + dependencies: + '@colors/colors': 1.5.0 + '@dabh/diagnostics': 2.0.3 + async: 3.2.4 + is-stream: 2.0.1 + logform: 2.5.1 + one-time: 1.0.0 + readable-stream: 3.6.2 + safe-stable-stringify: 2.4.3 + stack-trace: 0.0.10 + triple-beam: 1.4.1 + winston-transport: 4.5.0 + dev: true + /wrap-ansi@7.0.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} engines: {node: '>=10'} dependencies: @@ -10440,17 +6524,10 @@ packages: strip-ansi: 6.0.1 dev: true -<<<<<<< HEAD - /wrappy/1.0.2: - resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - - /write-file-atomic/4.0.2: -======= /wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} /write-file-atomic@4.0.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} dependencies: @@ -10458,13 +6535,6 @@ packages: signal-exit: 3.0.7 dev: true -<<<<<<< HEAD - /xtend/4.0.2: - resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} - engines: {node: '>=0.4'} - - /y18n/5.0.8: -======= /xml2js@0.4.23: resolution: {integrity: sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==} engines: {node: '>=4.0.0'} @@ -10483,22 +6553,10 @@ packages: engines: {node: '>=0.4'} /y18n@5.0.8: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /yallist/3.1.1: - resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} - dev: true - - /yallist/4.0.0: - resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - dev: true - - /yaml/1.10.2: -======= /yallist@3.1.1: resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} dev: true @@ -10508,39 +6566,26 @@ packages: dev: true /yaml@1.10.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} dev: true -<<<<<<< HEAD - /yargs-parser/20.2.9: -======= /yargs-parser@20.2.9: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} engines: {node: '>=10'} dev: true -<<<<<<< HEAD - /yargs-parser/21.1.1: -======= /yargs-parser@21.0.1: resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==} engines: {node: '>=12'} dev: true /yargs-parser@21.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} dev: true -<<<<<<< HEAD - /yargs/16.2.0: -======= /yargs@16.2.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==} engines: {node: '>=10'} dependencies: @@ -10553,11 +6598,7 @@ packages: yargs-parser: 20.2.9 dev: true -<<<<<<< HEAD - /yargs/17.7.2: -======= /yargs@17.7.2: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} engines: {node: '>=12'} dependencies: @@ -10570,20 +6611,12 @@ packages: yargs-parser: 21.1.1 dev: true -<<<<<<< HEAD - /yn/3.1.1: -======= /yn@3.1.1: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==} engines: {node: '>=6'} dev: true -<<<<<<< HEAD - /yocto-queue/0.1.0: -======= /yocto-queue@0.1.0: ->>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} dev: true diff --git a/src/app.module.ts b/src/app.module.ts index 745ef7c..4a6dd08 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -12,6 +12,7 @@ import { AuthModule } from '@/modules/auth'; import { UserModule } from '@/modules/user'; import { ResponseModule } from '@/common/response'; import { SerializationModule } from '@/common/serialization'; +import { CacheModule } from './common/cache'; @Module({ imports: [ @@ -25,6 +26,11 @@ import { SerializationModule } from '@/common/serialization'; * @description 用于记录日志 */ LoggerModule, + /** + * 缓存模块 + * @description 用于缓存数据 + */ + CacheModule, /** * 静态资源(全局) * @description 为静态页面/上传文件提供服务 diff --git a/src/common/base/base.service.ts b/src/common/base/base.service.ts index ea080e6..228b742 100644 --- a/src/common/base/base.service.ts +++ b/src/common/base/base.service.ts @@ -14,13 +14,13 @@ export class BaseService { /** * 格式化分页参数 */ - formatPagination(page = this.config.defaultPage, size = this.config.defaultPageSize) { - if (size == 0) { + formatPagination(page = this.config.defaultPage, size = this.config.defaultPageSize, supportFull = false) { + if (size == 0 && supportFull) { return {}; } return { skip: (page - 1) * size, - take: size, + take: size == 0 ? this.config.defaultPageSize : size, }; } } diff --git a/src/common/cache/cache.controller.ts b/src/common/cache/cache.controller.ts new file mode 100644 index 0000000..a989a33 --- /dev/null +++ b/src/common/cache/cache.controller.ts @@ -0,0 +1,7 @@ +import { Controller } from '@nestjs/common'; +import { CacheService } from './cache.service'; + +@Controller('cache') +export class CacheController { + constructor(private readonly cacheService: CacheService) {} +} diff --git a/src/common/cache/cache.module.ts b/src/common/cache/cache.module.ts new file mode 100644 index 0000000..b54184e --- /dev/null +++ b/src/common/cache/cache.module.ts @@ -0,0 +1,30 @@ +import { Module } from '@nestjs/common'; +import { CacheService } from './cache.service'; +import { CacheController } from './cache.controller'; +import { CacheModule as _CacheModule } from '@nestjs/cache-manager'; +import { ConfigService } from '@/config'; +import { redisStore } from 'cache-manager-redis-store'; + +@Module({ + imports: [ + _CacheModule.registerAsync({ + inject: [ConfigService], + useFactory: (config: ConfigService) => { + const { host, port } = config.redis; + return { + // store: () => + // redisStore({ + // commandsQueueMaxLength: 1000, + // socket: { host, port }, + // }) as any, + db: 0, + ttl: 600, + }; + }, + }), + ], + controllers: [CacheController], + providers: [CacheService], + exports: [CacheService], +}) +export class CacheModule {} diff --git a/src/common/cache/cache.service.ts b/src/common/cache/cache.service.ts new file mode 100644 index 0000000..22bd031 --- /dev/null +++ b/src/common/cache/cache.service.ts @@ -0,0 +1,16 @@ +import { CACHE_MANAGER } from '@nestjs/cache-manager'; +import { Inject, Injectable } from '@nestjs/common'; +import { Cache } from 'cache-manager'; + +@Injectable() +export class CacheService { + constructor(@Inject(CACHE_MANAGER) private cache: Cache) {} + + get(key: string) { + return this.cache.get(key); + } + + set(key: string, value: any, ttl?: number) { + return this.cache.set(key, value, ttl); + } +} diff --git a/src/common/cache/index.ts b/src/common/cache/index.ts new file mode 100644 index 0000000..b3adf00 --- /dev/null +++ b/src/common/cache/index.ts @@ -0,0 +1,3 @@ +export * from './cache.module'; +export * from './cache.service'; +export * from './cache.controller'; diff --git a/src/common/logger/logger.service.ts b/src/common/logger/logger.service.ts index 37d138f..bedcbc1 100644 --- a/src/common/logger/logger.service.ts +++ b/src/common/logger/logger.service.ts @@ -1,9 +1,58 @@ -import { ConsoleLogger, Injectable } from '@nestjs/common'; +import { Injectable, ConsoleLogger } from '@nestjs/common'; import { dayjs } from '@/libs'; +import { ConfigService } from '@/config'; +import { Logger, createLogger, format, transports } from 'winston'; +import 'winston-daily-rotate-file'; @Injectable() export class LoggerService extends ConsoleLogger { + /** + * Winston实例 + */ + protected logger: Logger; + + /** + * 构造函数 + */ + constructor(private config: ConfigService) { + super(); + const { combine, timestamp, printf } = format; + const printLine = printf(({ level, message, timestamp, context }: any) => { + return `[Nest] ${process.pid} ${timestamp} ${level} [${context || this.context}]: ${message}`; + }); + this.logger = createLogger({ + format: combine(timestamp({ format: dayjs.DATETIME }), printLine), + transports: [ + new transports.DailyRotateFile({ + level: 'info', + dirname: this.config.logDir, + filename: '%DATE%.info.log', + datePattern: 'YYYY-MM-DD', + zippedArchive: true, + maxSize: '20m', + maxFiles: '14d', + format: combine(timestamp({ format: dayjs.DATETIME }), printLine), + }), + ], + }); + } + + /** + * 重写获取时间戳方法 + */ protected getTimestamp(): string { return dayjs().format(); } + + /** + * Info级别日志 + */ + log(message: unknown, context?: unknown, ...rest: unknown[]) { + super.log(message, context); + this.logger.info({ + message, + context: context || this.context, + ...rest, + }); + } } diff --git a/src/common/mail/index.ts b/src/common/mail/index.ts new file mode 100644 index 0000000..91fd6cb --- /dev/null +++ b/src/common/mail/index.ts @@ -0,0 +1,3 @@ +export * from './mail.controller'; +export * from './mail.module'; +export * from './mail.service'; diff --git a/src/common/mail/mail.controller.ts b/src/common/mail/mail.controller.ts new file mode 100644 index 0000000..51f7f83 --- /dev/null +++ b/src/common/mail/mail.controller.ts @@ -0,0 +1,7 @@ +import { Controller } from '@nestjs/common'; +import { MailService } from './mail.service'; + +@Controller('mail') +export class MailController { + constructor(private readonly mailService: MailService) {} +} diff --git a/src/common/mail/mail.module.ts b/src/common/mail/mail.module.ts new file mode 100644 index 0000000..fdab9e9 --- /dev/null +++ b/src/common/mail/mail.module.ts @@ -0,0 +1,9 @@ +import { Module } from '@nestjs/common'; +import { MailService } from './mail.service'; +import { MailController } from './mail.controller'; + +@Module({ + controllers: [MailController], + providers: [MailService], +}) +export class MailModule {} diff --git a/src/common/mail/mail.service.ts b/src/common/mail/mail.service.ts new file mode 100644 index 0000000..6bbd940 --- /dev/null +++ b/src/common/mail/mail.service.ts @@ -0,0 +1,38 @@ +import { ConfigService } from '@/config'; +import { Injectable } from '@nestjs/common'; +import nodemailer from 'nodemailer'; + +@Injectable() +export class MailService { + /** + * NodeMailer实例 + */ + protected mailer: nodemailer.Transporter; + + /** + * 构造函数 + */ + constructor(private config: ConfigService) { + const { host, port, user, pass } = this.config.smtp; + this.mailer = nodemailer.createTransport({ + host, + port, + auth: { user, pass }, + }); + } + + /** + * 发送邮件 + * @param to 目标邮箱 + * @param subject 主题 + * @param html 内容 + */ + sendMail(to: string, subject: string, html: string) { + return this.mailer.sendMail({ + from: `${this.config.title} <${this.config.smtp.user}>`, + to, + subject, + html, + }); + } +} diff --git a/src/common/response/notcaptured.filter.ts b/src/common/response/notcaptured.filter.ts index 89bd2f1..846e106 100644 --- a/src/common/response/notcaptured.filter.ts +++ b/src/common/response/notcaptured.filter.ts @@ -1,16 +1,20 @@ import { ArgumentsHost, Catch, ExceptionFilter, HttpStatus } from '@nestjs/common'; -import { Response as _Response } from 'express'; +import { Request, Response as _Response } from 'express'; import { Response } from './response'; import { ResponseCode } from './response.code'; +import { LoggerService } from '../logger'; @Catch() export class AllExecptionFilter implements ExceptionFilter { + constructor(private logger: LoggerService) {} + catch(exception: Error, host: ArgumentsHost) { const ctx = host.switchToHttp(); + const request = ctx.getRequest(); const response = ctx.getResponse<_Response>(); const message = exception.message; const code = ResponseCode.UNKNOWN_ERROR; - console.log(exception); + this.logger.error(exception, `${request.method} ${request.url}`); response.status(HttpStatus.INTERNAL_SERVER_ERROR).json(Response.create({ code, message, data: null })); } } diff --git a/src/common/response/pagination.dto.ts b/src/common/response/pagination.dto.ts index 842f973..0dd17b8 100644 --- a/src/common/response/pagination.dto.ts +++ b/src/common/response/pagination.dto.ts @@ -3,7 +3,13 @@ import { IsNumber, IsOptional, Min } from 'class-validator'; /** * 分页 DTO - * @example { page: 1, size: 10 } + * @example + * ``` + * { + * page: 1, + * size: 10 + * } + * ``` */ export class PaginationDto { /** diff --git a/src/common/response/response.code.ts b/src/common/response/response.code.ts index 699ba0c..0fbc4c8 100644 --- a/src/common/response/response.code.ts +++ b/src/common/response/response.code.ts @@ -13,7 +13,7 @@ export enum ResponseCode { /** * 参数错误 */ - PARAM_ERROR = 4001, + PARAM_ERROR = 4005, /** * 服务端未知错误 */ @@ -21,5 +21,5 @@ export enum ResponseCode { /** * 未授权 */ - UNAUTHORIZED = 4003, + UNAUTHORIZED = 4001, } diff --git a/src/common/response/response.interceptor.ts b/src/common/response/response.interceptor.ts index fe7a01f..df12ba7 100644 --- a/src/common/response/response.interceptor.ts +++ b/src/common/response/response.interceptor.ts @@ -27,11 +27,7 @@ export class ResponseInterceptor implements NestInterceptor { const size = Number(request.query.size || this.config.defaultPageSize); return Response.success({ data: list, - meta: { - page, - size, - total, - }, + meta: { page, size, total }, }); } return Response.success({ data: list, total }); diff --git a/src/common/response/response.module.ts b/src/common/response/response.module.ts index 0a20768..ca8cf8f 100644 --- a/src/common/response/response.module.ts +++ b/src/common/response/response.module.ts @@ -10,26 +10,14 @@ import { ResponseInterceptor } from './response.interceptor'; */ @Module({ providers: [ - /** - * 全局异常过滤器 - * @description 将异常统一包装成{code, message, data, meta}格式 - */ { provide: APP_FILTER, useClass: AllExecptionFilter, }, - /** - * 全局HTTP异常过滤器 - * @description 将HTTP异常统一包装成{code, message, data, meta}格式 - */ { provide: APP_FILTER, useClass: HttpExecptionFilter, }, - /** - * 全局响应拦截器 - * @description 将返回值统一包装成{code, message, data, meta}格式 - */ { provide: APP_INTERCEPTOR, useClass: ResponseInterceptor, diff --git a/src/common/swagger/index.ts b/src/common/swagger/index.ts index 0d9e11d..934eb49 100644 --- a/src/common/swagger/index.ts +++ b/src/common/swagger/index.ts @@ -20,6 +20,7 @@ export const initSwagger = (app: INestApplication) => { .addTag('permission', '权限管理') .addTag('post', '文章管理') .addTag('upload', '文件上传') + .addBearerAuth() .build(); const options: SwaggerDocumentOptions = { operationIdFactory(controllerKey, methodKey) { diff --git a/src/common/validation/validation.error.ts b/src/common/validation/validation.error.ts index 9b0cfbe..11f2340 100644 --- a/src/common/validation/validation.error.ts +++ b/src/common/validation/validation.error.ts @@ -1,12 +1,5 @@ -export class AppValidationError extends Error { - messages: string[] = []; - - constructor(message: string) { - super(message); - this.name = 'ValidationError'; - } - - setMessages(errors: string[]) { - this.messages = errors; +export class ValidationError extends Error { + constructor(public messages: string[]) { + super('参数错误'); } } diff --git a/src/common/validation/validation.filter.ts b/src/common/validation/validation.filter.ts index e5544da..0fac536 100644 --- a/src/common/validation/validation.filter.ts +++ b/src/common/validation/validation.filter.ts @@ -1,11 +1,11 @@ import { ArgumentsHost, Catch, ExceptionFilter, HttpStatus } from '@nestjs/common'; import { Response } from 'express'; import { ResponseCode } from '../response'; -import { AppValidationError } from './validation.error'; +import { ValidationError } from './validation.error'; -@Catch(AppValidationError) +@Catch(ValidationError) export class ValidationExecptionFilter implements ExceptionFilter { - catch(exception: AppValidationError, host: ArgumentsHost) { + catch(exception: ValidationError, host: ArgumentsHost) { const ctx = host.switchToHttp(); const response = ctx.getResponse(); const code = ResponseCode.PARAM_ERROR; diff --git a/src/common/validation/validation.pipe.ts b/src/common/validation/validation.pipe.ts index f60f0f2..a5e87e7 100644 --- a/src/common/validation/validation.pipe.ts +++ b/src/common/validation/validation.pipe.ts @@ -1,7 +1,7 @@ import { ValidationPipe } from '@nestjs/common'; -import { AppValidationError } from './validation.error'; +import { ValidationError } from './validation.error'; -const MessageMap = { +const map = { isString: '必须为字符串', isNumber: '必须为数字', isBoolean: '必须为布尔值', @@ -27,16 +27,14 @@ export const validationPipeFactory = () => { transform: true, whitelist: true, exceptionFactory: (errors) => { - const error = new AppValidationError('参数错误'); const messages: string[] = []; for (const error of errors) { const { property, constraints } = error; - Object.keys(constraints).forEach((key) => { - messages.push(MessageMap[key] ? `参数(${property})${MessageMap[key]}` : constraints[key]); - }); + for (const [key, val] of Object.entries(constraints)) { + messages.push(map[key] ? `参数(${property})${map[key]}` : val); + } } - error.setMessages(messages); - return error; + return new ValidationError(messages); }, }); }; diff --git a/src/config/config.service.ts b/src/config/config.service.ts index 09702a8..0c40322 100644 --- a/src/config/config.service.ts +++ b/src/config/config.service.ts @@ -100,10 +100,10 @@ export class ConfigService { /** * 上传文件目录 - * @default './content/uploads' + * @default './content/upload' */ get uploadDir(): string { - return this.config.get('UPLOAD_DIR', './content/uploads'); + return this.config.get('UPLOAD_DIR', './content/upload'); } /** @@ -153,4 +153,25 @@ export class ConfigService { get logDir(): string { return this.config.get('LOG_DIR', './content/logs'); } + + /** + * SMTP配置 + */ + get smtp() { + const host: string = this.config.get('SMTP_HOST'); + const port = Number(this.config.get('SMTP_PORT')); + const user: string = this.config.get('SMTP_USER'); + const pass: string = this.config.get('SMTP_PASS'); + return { host, port, user, pass }; + } + + /** + * Redis配置 + */ + get redis() { + const host: string = this.config.get('REDIS_HOST', 'localhost'); + const port = Number(this.config.get('REDIS_PORT', 6379)); + const pass: string = this.config.get('REDIS_PASS', ''); + return { host, port, pass }; + } } diff --git a/src/modules/auth/jwt/jwt-guard.ts b/src/modules/auth/jwt/jwt-guard.ts index a40e997..d64fa77 100644 --- a/src/modules/auth/jwt/jwt-guard.ts +++ b/src/modules/auth/jwt/jwt-guard.ts @@ -15,14 +15,14 @@ export class JwtGuard implements CanActivate { if (token) { const secret = this.config.jwtSecret; const user = await this.jwtService.verifyAsync(token, { secret }); - request['user'] = user; + request.user = user; } - const metadata = [context.getClass(), context.getHandler()]; - const isPublic = this.reflector.getAllAndOverride(PUBLICK_KEY, metadata); - if (isPublic === undefined || isPublic) { + const targets = [context.getClass(), context.getHandler()]; + const isPublic = this.reflector.getAllAndOverride(PUBLICK_KEY, targets); + if (isPublic) { return true; } - if (isPublic !== false && request.method.toLowerCase() === 'GET') { + if (isPublic === undefined && request.method.toUpperCase() === 'GET') { return true; } if (!token) { diff --git a/src/modules/upload/upload.controller.ts b/src/modules/upload/upload.controller.ts index c11489b..95890bc 100644 --- a/src/modules/upload/upload.controller.ts +++ b/src/modules/upload/upload.controller.ts @@ -1,9 +1,10 @@ import { Respond } from '@/common/response'; -import { Controller, Delete, Get, Param, Patch, Post, UploadedFile, UseInterceptors } from '@nestjs/common'; +import { Controller, Delete, Get, Ip, Param, Patch, Post, Req, UploadedFile, UseInterceptors } from '@nestjs/common'; import { FileInterceptor } from '@nestjs/platform-express'; import { ApiBody, ApiConsumes, ApiOperation, ApiTags } from '@nestjs/swagger'; import { CreateUploadDto } from './dto/create-upload.dto'; import { UploadService } from './upload.service'; +import { Request } from 'express'; @ApiTags('upload') @Controller('upload') @@ -14,8 +15,9 @@ export class UploadController { @UseInterceptors(FileInterceptor('file')) @ApiConsumes('multipart/form-data') @ApiBody({ description: '要上传的文件', type: CreateUploadDto }) - @ApiOperation({ description: '上传文件', operationId: 'upload' }) - create(@UploadedFile() file: Express.Multer.File) { + @ApiOperation({ description: '上传文件', operationId: 'addFile' }) + create(@UploadedFile() file: Express.Multer.File, @Req() req: Request, @Ip() ip: string) { + console.log(`ip: ${ip}, req: ${JSON.stringify(req.user)}`); return this.uploadService.create(file); } @@ -27,19 +29,19 @@ export class UploadController { } @Get(':id') - @ApiOperation({ description: '查询', operationId: 'getUpload' }) + @ApiOperation({ description: '查询', operationId: 'getFile' }) findOne(@Param('id') id: string) { return this.uploadService.findOne(+id); } @Patch(':id') - @ApiOperation({ description: '更新', operationId: 'updateUpload' }) + @ApiOperation({ description: '更新', operationId: 'updateFile' }) update() { return this.uploadService.update(); } @Delete(':id') - @ApiOperation({ description: '删除', operationId: 'delUpload' }) + @ApiOperation({ description: '删除', operationId: 'delFile' }) remove(@Param('id') id: string) { return this.uploadService.remove(+id); } diff --git a/src/modules/upload/upload.module.ts b/src/modules/upload/upload.module.ts index 19741c1..4b73637 100644 --- a/src/modules/upload/upload.module.ts +++ b/src/modules/upload/upload.module.ts @@ -6,17 +6,28 @@ import { diskStorage } from 'multer'; import { Upload } from './entities/upload.entity'; import { UploadController } from './upload.controller'; import { UploadService } from './upload.service'; +import { extname, join } from 'path'; +import { existsSync, mkdirSync } from 'fs'; @Module({ imports: [ TypeOrmModule.forFeature([Upload]), MulterModule.registerAsync({ - useFactory: async (config: ConfigService) => { + useFactory: (config: ConfigService) => { return { storage: diskStorage({ - destination: config.uploadDir, - filename: (req, file, cb) => { - cb(null, file.originalname); + destination: (req, file, next) => { + const date = new Date(); + const year = date.getFullYear(); + const month = date.getMonth() + 1; + const dest = join(config.uploadDir, year.toString(), month.toString().padStart(2, '0')); + if (!existsSync(dest)) { + mkdirSync(dest, { recursive: true }); + } + next(null, dest); + }, + filename: (req, file, next) => { + next(null, Date.now() + extname(file.originalname)); }, }), }; diff --git a/src/modules/upload/upload.service.ts b/src/modules/upload/upload.service.ts index c59b20e..a9851f5 100644 --- a/src/modules/upload/upload.service.ts +++ b/src/modules/upload/upload.service.ts @@ -1,21 +1,32 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { parse } from 'path'; +import { extname, posix, sep, relative } from 'path'; import { Repository } from 'typeorm'; import { Upload } from './entities/upload.entity'; +import { BaseService } from '@/common/base'; @Injectable() -export class UploadService { - constructor(@InjectRepository(Upload) private readonly uploadRepository: Repository) {} +export class UploadService extends BaseService { + constructor(@InjectRepository(Upload) private readonly uploadRepository: Repository) { + super(); + } + /** + * 保存文件信息 + * @param file 文件信息 + * @returns + */ async create(file: Express.Multer.File) { + const path = relative(this.config.uploadDir, file.path).split(sep).join(posix.sep); + const uploadPrefix = this.config.uploadPrefix; + const uploadUrl = `${uploadPrefix}/${path}`; const upload = this.uploadRepository.create({ name: file.originalname, mimetype: file.mimetype, size: file.size, hash: file.filename, - path: file.path, - extension: parse(file.originalname).ext, + path: uploadUrl, + extension: extname(file.originalname), }); await this.uploadRepository.save(upload); return upload.id; @@ -26,7 +37,7 @@ export class UploadService { } findOne(id: number) { - return `This action returns a #${id} upload`; + return this.uploadRepository.findOne({ where: { id } }); } update() { @@ -34,6 +45,6 @@ export class UploadService { } remove(id: number) { - return `This action removes a #${id} upload`; + return this.uploadRepository.softDelete(id); } } diff --git a/src/modules/user/entities/user.entity.ts b/src/modules/user/entities/user.entity.ts index 1b41fe4..bcb9fa7 100644 --- a/src/modules/user/entities/user.entity.ts +++ b/src/modules/user/entities/user.entity.ts @@ -3,7 +3,7 @@ import { Exclude } from 'class-transformer'; import { BaseEntity } from '@/database'; import { Post } from '@/modules/post'; import { Role } from '@/modules/role'; -import { Column, Entity, JoinTable, ManyToMany } from 'typeorm'; +import { Column, Entity, JoinTable, ManyToMany, RelationId } from 'typeorm'; @Entity({ orderBy: { id: 'DESC' } }) export class User extends BaseEntity { @@ -65,4 +65,7 @@ export class User extends BaseEntity { @ManyToMany(() => Role, (role) => role.user) @JoinTable() roles: Role[]; + + @RelationId('roles') + roleIds: number[]; } diff --git a/src/modules/user/user.controller.ts b/src/modules/user/user.controller.ts index e629e0f..f1546a0 100644 --- a/src/modules/user/user.controller.ts +++ b/src/modules/user/user.controller.ts @@ -31,7 +31,7 @@ export class UserController extends BaseController { @Get(':id') @Version('2') - @ApiOperation({ description: '查询用户', operationId: 'getUserv2' }) + @ApiOperation({ deprecated: true, description: '查询用户', operationId: 'getUserv2' }) findOne(@Param('id') id: number) { return this.userService.findOne(+id); } diff --git a/src/modules/user/user.service.ts b/src/modules/user/user.service.ts index 65a1464..aab8d10 100644 --- a/src/modules/user/user.service.ts +++ b/src/modules/user/user.service.ts @@ -31,7 +31,7 @@ export class UserService extends BaseService { async findMany(findUserdto: FindUserDto) { const { nickname: _nickname, page, size } = findUserdto; const nickname = _nickname && Like(`%${_nickname}%`); - const { skip, take } = this.formatPagination(page, size); + const { skip, take } = this.formatPagination(page, size, true); return this.userRepository.findAndCount({ skip, take, where: { nickname } }); } @@ -39,7 +39,7 @@ export class UserService extends BaseService { * 根据id查找用户 */ findOne(idOrOptions: number | Partial) { - const where = typeof idOrOptions === 'number' ? { id: idOrOptions } : idOrOptions; + const where = typeof idOrOptions === 'number' ? { id: idOrOptions } : (idOrOptions as any); return this.userRepository.findOne({ where }); } diff --git a/src/types/env.d.ts b/src/types/env.d.ts index 97630b3..68adb6f 100644 --- a/src/types/env.d.ts +++ b/src/types/env.d.ts @@ -1,5 +1,16 @@ +import 'express'; + declare namespace NodeJS { interface ProcessEnv { NODE_ENV: 'development' | 'production' | 'test'; } } + +declare module 'express' { + interface Request { + user?: { + id: number; + username: string; + }; + } +}