diff --git a/.env b/.env index ba76007..bd10d16 100644 --- a/.env +++ b/.env @@ -12,7 +12,7 @@ SERVER_HOST = 0.0.0.0 # 服务域名 SERVER_URL = http://127.0.0.1 # 接口地址 -SERVER_OPENAPI_URL = /openapi +SERVER_OPENAPI_URL = /api # ======================================================================================== # 数据库配置 @@ -20,7 +20,7 @@ SERVER_OPENAPI_URL = /openapi # 数据库类型 DB_TYPE = sqlite # sqlite数据库地址 -DB_SQLITE_PATH = ./database/db.sqlite +DB_SQLITE_PATH = ./content/database/db.sqlite # mysql数据库地址 DB_MYSQL_HOST = 127.0.0.1 # mysql数据库端口 @@ -36,9 +36,9 @@ DB_MYSQL_DATABASE = test1 # 上传和静态文件配置 # ======================================================================================== # 上传文件目录 -UPLOAD_DIR = ./uploads +UPLOAD_DIR = ./content/uploads # 静态文件目录 -STATIC_DIR = ./public +STATIC_DIR = ./content/html # ======================================================================================== # 分页配置 diff --git a/database/db.sqlite b/content/database/db.sqlite similarity index 100% rename from database/db.sqlite rename to content/database/db.sqlite diff --git a/public/favicon.ico b/content/html/favicon.ico similarity index 100% rename from public/favicon.ico rename to content/html/favicon.ico diff --git a/public/index.css b/content/html/index.css similarity index 100% rename from public/index.css rename to content/html/index.css diff --git a/public/index.html b/content/html/index.html similarity index 100% rename from public/index.html rename to content/html/index.html diff --git a/package.json b/package.json index 2b0bafb..6a10af2 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "test:cov": "jest --coverage", "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "test:e2e": "jest --config ./test/jest-e2e.json", - "orm": "typeorm-ts-node-esm -d ./src/features/typeorm/datasource/index.ts" + "orm": "typeorm-ts-node-esm -d ./src/database/datasource/index.ts" }, "prettier": { "printWidth": 120, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a86da13..4ec658c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,3 +1,4 @@ +<<<<<<< HEAD lockfileVersion: 5.4 specifiers: @@ -123,11 +124,197 @@ devDependencies: 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) + '@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) + '@nestjs/platform-express': + specifier: ^9.0.0 + version: 9.0.0(@nestjs/common@9.0.0)(@nestjs/core@9.0.0) + reflect-metadata: + specifier: ^0.1.13 + version: 0.1.13 + rimraf: + specifier: ^3.0.2 + version: 3.0.2 + rxjs: + specifier: ^7.2.0 + version: 7.2.0 + +devDependencies: + '@nestjs/cli': + specifier: ^9.0.0 + version: 9.0.0 + '@nestjs/config': + specifier: ^2.3.1 + version: 2.3.1(@nestjs/common@9.0.0)(reflect-metadata@0.1.13)(rxjs@7.2.0) + '@nestjs/devtools-integration': + specifier: ^0.1.4 + version: 0.1.4(@nestjs/common@9.0.0)(@nestjs/core@9.0.0)(reflect-metadata@0.1.13) + '@nestjs/jwt': + specifier: ^10.0.3 + version: 10.0.3(@nestjs/common@9.0.0) + '@nestjs/passport': + specifier: ^9.0.3 + version: 9.0.3(@nestjs/common@9.0.0)(passport@0.6.0) + '@nestjs/schematics': + specifier: ^9.0.0 + version: 9.0.0(chokidar@3.5.3)(typescript@4.7.4) + '@nestjs/serve-static': + specifier: ^3.0.1 + version: 3.0.1(@nestjs/common@9.0.0)(@nestjs/core@9.0.0) + '@nestjs/swagger': + specifier: ^6.3.0 + version: 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) + '@nestjs/testing': + specifier: ^9.0.0 + version: 9.0.0(@nestjs/common@9.0.0)(@nestjs/core@9.0.0)(@nestjs/platform-express@9.0.0) + '@nestjs/typeorm': + specifier: ^9.0.1 + version: 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) + '@types/express': + specifier: ^4.17.13 + version: 4.17.13 + '@types/jest': + specifier: 28.1.4 + version: 28.1.4 + '@types/lodash': + specifier: ^4.14.192 + version: 4.14.192 + '@types/lodash-es': + specifier: ^4.17.7 + version: 4.17.7 + '@types/mockjs': + specifier: ^1.0.7 + version: 1.0.7 + '@types/multer': + specifier: ^1.4.7 + version: 1.4.7 + '@types/node': + specifier: ^16.0.0 + version: 16.0.0 + '@types/supertest': + specifier: ^2.0.11 + version: 2.0.11 + '@types/uuid': + specifier: ^9.0.1 + version: 9.0.1 + '@typescript-eslint/eslint-plugin': + specifier: ^5.0.0 + version: 5.0.0(@typescript-eslint/parser@5.0.0)(eslint@8.0.1)(typescript@4.3.5) + '@typescript-eslint/parser': + specifier: ^5.0.0 + version: 5.0.0(eslint@8.0.1)(typescript@4.3.5) + class-transformer: + specifier: ^0.5.1 + version: 0.5.1 + class-validator: + specifier: ^0.14.0 + version: 0.14.0 + dayjs: + specifier: ^1.11.7 + version: 1.11.7 + dotenv: + specifier: ^16.0.3 + version: 16.0.3 + eslint: + specifier: ^8.0.1 + version: 8.0.1 + eslint-config-prettier: + specifier: ^8.3.0 + version: 8.3.0(eslint@8.0.1) + eslint-plugin-prettier: + specifier: ^4.0.0 + version: 4.0.0(eslint-config-prettier@8.3.0)(eslint@8.0.1)(prettier@2.3.2) + jest: + specifier: 28.1.2 + version: 28.1.2(@types/node@16.0.0)(ts-node@10.0.0) + lodash: + specifier: ^4.17.21 + version: 4.17.21 + lodash-es: + specifier: ^4.17.21 + version: 4.17.21 + mockjs: + specifier: ^1.1.0 + version: 1.1.0 + multer: + specifier: 1.4.5-lts.1 + version: 1.4.5-lts.1 + mysql2: + specifier: ^3.2.0 + version: 3.2.0 + nanoid: + specifier: ^4.0.1 + version: 4.0.1 + passport: + specifier: ^0.6.0 + version: 0.6.0 + passport-jwt: + specifier: ^4.0.1 + version: 4.0.1 + passport-local: + specifier: ^1.0.0 + version: 1.0.0 + prettier: + specifier: ^2.3.2 + version: 2.3.2 + source-map-support: + specifier: ^0.5.20 + version: 0.5.20 + sqlite3: + specifier: ^5.1.6 + version: 5.1.6 + supertest: + specifier: ^6.1.3 + version: 6.1.3 + ts-jest: + specifier: 28.0.5 + version: 28.0.5(@babel/core@7.22.9)(jest@28.1.2)(typescript@4.3.5) + ts-loader: + specifier: ^9.2.3 + version: 9.2.3(typescript@4.3.5)(webpack@5.0.0) + ts-node: + specifier: ^10.0.0 + version: 10.0.0(@types/node@16.0.0)(typescript@4.3.5) + tsconfig-paths: + specifier: 4.0.0 + 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) + typeorm-naming-strategies: + specifier: ^4.1.0 + version: 4.1.0(typeorm@0.3.12) + typescript: + specifier: ^4.3.5 + version: 4.3.5 + uuid: + specifier: ^9.0.0 + version: 9.0.0 + webpack: + specifier: '5' + version: 5.0.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: @@ -135,15 +322,22 @@ 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 @@ -179,10 +373,32 @@ packages: 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 + jsonc-parser: 3.0.0 + rxjs: 6.6.7 + source-map: 0.7.3 + dev: true + + /@angular-devkit/schematics-cli@14.0.5(chokidar@3.5.3): + resolution: {integrity: sha512-S+u0KjglyI3jEZWwIuBvFjEwY3Zk5lCWfhet+95sFKJEjEYgF4Fuk8Mau/9cr55hIcpZqTQUvyxnS/VDoj4WLg==} + engines: {node: ^14.15.0 || >=16.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} + hasBin: true + dependencies: + '@angular-devkit/core': 14.0.5(chokidar@3.5.3) + '@angular-devkit/schematics': 14.0.5(chokidar@3.5.3) + ansi-colors: 4.1.1 + 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'} @@ -192,10 +408,22 @@ packages: 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'} + dependencies: + '@angular-devkit/core': 14.0.5(chokidar@3.5.3) + jsonc-parser: 3.0.0 + 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'} @@ -210,12 +438,16 @@ packages: 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'} @@ -223,29 +455,56 @@ packages: /@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'} + dev: true + + /@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 @@ -254,12 +513,18 @@ 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 @@ -269,11 +534,26 @@ packages: 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 + browserslist: 4.21.10 + lru-cache: 5.1.1 + semver: 6.3.1 + 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: @@ -281,29 +561,48 @@ 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'} + peerDependencies: + '@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 @@ -312,40 +611,69 @@ packages: 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: @@ -356,7 +684,11 @@ 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: @@ -365,7 +697,11 @@ 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 @@ -373,133 +709,245 @@ 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: @@ -508,12 +956,20 @@ 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 @@ -526,7 +982,11 @@ 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: @@ -535,17 +995,26 @@ 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'} @@ -570,11 +1039,19 @@ packages: /@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 @@ -585,6 +1062,7 @@ 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} @@ -597,6 +1075,14 @@ packages: /@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 @@ -606,6 +1092,7 @@ packages: - supports-color dev: true +<<<<<<< HEAD /@humanwhocodes/module-importer/1.0.1: resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} engines: {node: '>=12.22'} @@ -616,6 +1103,13 @@ packages: 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: @@ -626,24 +1120,40 @@ 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: @@ -657,14 +1167,22 @@ 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 @@ -686,24 +1204,40 @@ 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: @@ -713,19 +1247,31 @@ 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: @@ -736,7 +1282,11 @@ 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: @@ -751,7 +1301,11 @@ 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 @@ -759,9 +1313,15 @@ 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 @@ -774,14 +1334,22 @@ 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: @@ -790,7 +1358,11 @@ 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: @@ -800,7 +1372,11 @@ 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: @@ -810,11 +1386,19 @@ 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 @@ -833,19 +1417,31 @@ 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: @@ -854,28 +1450,41 @@ 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 @@ -885,12 +1494,24 @@ packages: dev: true /@jridgewell/trace-mapping/0.3.18: +======= + /@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: +>>>>>>> 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: @@ -907,6 +1528,13 @@ packages: 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 @@ -920,6 +1548,7 @@ 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'} @@ -946,11 +1575,40 @@ packages: tsconfig-paths-webpack-plugin: 4.0.1 typescript: 4.9.5 webpack: 5.82.1 +======= + /@nestjs/cli@9.0.0: + resolution: {integrity: sha512-xT5uOoIEcaB/Fn6UeF7atfKqKiEEsTeRKPiM55p+e5H9WVw8FC2r4ceZgaINJbsw0QWskVj/ZQadMo6dA6hXxw==} + engines: {node: '>= 12.9.0'} + hasBin: true + dependencies: + '@angular-devkit/core': 14.0.5(chokidar@3.5.3) + '@angular-devkit/schematics': 14.0.5(chokidar@3.5.3) + '@angular-devkit/schematics-cli': 14.0.5(chokidar@3.5.3) + '@nestjs/schematics': 9.0.0(chokidar@3.5.3)(typescript@4.7.4) + chalk: 3.0.0 + chokidar: 3.5.3 + cli-table3: 0.6.2 + commander: 4.1.1 + fork-ts-checker-webpack-plugin: 7.2.11(typescript@4.7.4)(webpack@5.73.0) + inquirer: 7.3.3 + node-emoji: 1.11.0 + ora: 5.4.1 + os-name: 4.0.1 + rimraf: 3.0.2 + shelljs: 0.8.5 + source-map-support: 0.5.21 + tree-kill: 1.2.2 + tsconfig-paths: 3.14.1 + 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 @@ -958,6 +1616,16 @@ packages: 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): + resolution: {integrity: sha512-dyAd48ux/eFYj1uEnQAisSVWq54ttEfeHJBDljvAc6hXbBNHTzZfq/fUH6DmlK29WdGXNMVabCjfduwX2EPquQ==} + peerDependencies: + cache-manager: '*' +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 class-transformer: '*' class-validator: '*' reflect-metadata: ^0.1.12 @@ -974,17 +1642,27 @@ packages: 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 @@ -996,6 +1674,19 @@ packages: /@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) + dotenv: 16.0.3 + dotenv-expand: 10.0.0 + lodash: 4.17.21 + reflect-metadata: 0.1.13 + rxjs: 7.2.0 + uuid: 9.0.0 + dev: true + + /@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 @@ -1012,6 +1703,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 @@ -1034,6 +1726,31 @@ packages: 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/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 + iterare: 1.2.1 + object-hash: 3.0.0 + path-to-regexp: 3.2.0 + reflect-metadata: 0.1.13 + rxjs: 7.2.0 + tslib: 2.4.0 + uuid: 8.3.2 + transitivePeerDependencies: + - encoding + + /@nestjs/devtools-integration@0.1.4(@nestjs/common@9.0.0)(@nestjs/core@9.0.0)(reflect-metadata@0.1.13): + resolution: {integrity: sha512-jAKTrpc+Ilrb7CFV1ZuG9b4OYVlFPHUXna2H8BrmxKResyqnzlzR/YIUr8zJE7p15MipAjiVaLHHyEL0C9OYGA==} + peerDependencies: + '@nestjs/common': ^9.3.7 + '@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/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 @@ -1041,6 +1758,7 @@ packages: - encoding dev: true +<<<<<<< HEAD /@nestjs/jwt/10.1.0_@nestjs+common@9.4.3: resolution: {integrity: sha512-iLwCGS25ybUxGS7i5j/Mwuyzvp/WxJftHlm8aLEBv5GV92apz6L1QVjxLdZrqXbzo++C8gdJauhzil8qitY+6w==} peerDependencies: @@ -1052,6 +1770,19 @@ packages: 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) + '@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 @@ -1064,28 +1795,46 @@ 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 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) + 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 @@ -1106,10 +1855,34 @@ packages: 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/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 + express: 4.18.1 + multer: 1.4.4-lts.1 + tslib: 2.4.0 + transitivePeerDependencies: + - supports-color + + /@nestjs/schematics@9.0.0(chokidar@3.5.3)(typescript@4.7.4): + resolution: {integrity: sha512-l4AReqX597iKyAXVN9WsrLQ1NDY0G15s7x8dHpwM0+3MOFoEKZMvqeiFrfVMqbwuMiTvXTuLcoMdlKuz7qtrDg==} + peerDependencies: + typescript: ^4.3.5 + dependencies: + '@angular-devkit/core': 14.0.5(chokidar@3.5.3) + '@angular-devkit/schematics': 14.0.5(chokidar@3.5.3) + fs-extra: 10.1.0 + 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: @@ -1125,6 +1898,9 @@ packages: 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 @@ -1140,12 +1916,21 @@ 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/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 @@ -1162,9 +1947,15 @@ 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/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 @@ -1174,8 +1965,13 @@ 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 @@ -1187,6 +1983,7 @@ 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 @@ -1194,6 +1991,15 @@ packages: 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/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 @@ -1202,6 +2008,7 @@ 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 @@ -1216,6 +2023,17 @@ packages: 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/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) + uuid: 8.3.2 + dev: true + + /@nodelib/fs.scandir@2.1.5: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} dependencies: @@ -1223,12 +2041,20 @@ 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: @@ -1236,15 +2062,24 @@ 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 @@ -1252,9 +2087,14 @@ 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 @@ -1265,32 +2105,53 @@ packages: transitivePeerDependencies: - encoding +<<<<<<< HEAD /@sinclair/typebox/0.24.51: resolution: {integrity: sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==} 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 @@ -1308,6 +2169,25 @@ packages: dev: true /@types/babel__core/7.20.1: +======= + /@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: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==} dependencies: '@babel/parser': 7.22.7 @@ -1317,25 +2197,38 @@ 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: @@ -1375,13 +2268,63 @@ packages: resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==} dependencies: '@types/node': 16.18.38 +======= + /@types/body-parser@1.19.2: + resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} + dependencies: + '@types/connect': 3.4.35 + '@types/node': 16.0.0 + dev: true + + /@types/connect@3.4.35: + resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} + dependencies: + '@types/node': 16.0.0 + 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.1 + '@types/estree': 0.0.45 + dev: true + + /@types/eslint@8.44.1: + resolution: {integrity: sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==} + dependencies: + '@types/estree': 0.0.45 + '@types/json-schema': 7.0.12 + dev: true + + /@types/estree@0.0.45: + resolution: {integrity: sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==} + dev: true + + /@types/estree@0.0.51: + resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==} + dev: true + + /@types/express-serve-static-core@4.17.35: + 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 @@ -1389,6 +2332,7 @@ packages: '@types/serve-static': 1.15.2 dev: true +<<<<<<< HEAD /@types/graceful-fs/4.1.6: resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==} dependencies: @@ -1404,24 +2348,50 @@ packages: dev: true /@types/istanbul-lib-report/3.0.0: +======= + /@types/graceful-fs@4.1.6: + resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==} + dependencies: + '@types/node': 16.0.0 + 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: +>>>>>>> 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 @@ -1492,10 +2462,83 @@ packages: dev: true /@types/serve-static/1.15.2: +======= + /@types/json-schema@7.0.12: + resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==} + dev: true + + /@types/json5@0.0.29: + resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} + dev: true + + /@types/jsonwebtoken@9.0.1: + resolution: {integrity: sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==} + dependencies: + '@types/node': 16.0.0 + dev: true + + /@types/lodash-es@4.17.7: + resolution: {integrity: sha512-z0ptr6UI10VlU6l5MYhGwS4mC8DZyYer2mCoyysZtSF7p26zOX8UpbrV0YpNYLGS8K4PUFIyEr62IMFFjveSiQ==} + dependencies: + '@types/lodash': 4.14.192 + dev: true + + /@types/lodash@4.14.192: + resolution: {integrity: sha512-km+Vyn3BYm5ytMO13k9KTp27O75rbQ0NFw+U//g+PX7VZyjCioXaRFisqSIJRECljcTv73G3i6BpglNGHgUQ5A==} + 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.13 + dev: true + + /@types/node@16.0.0: + resolution: {integrity: sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg==} + 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/send@0.17.1: + resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} + dependencies: + '@types/mime': 1.3.2 + '@types/node': 16.0.0 + 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 @@ -1512,10 +2555,29 @@ packages: /@types/supertest/2.0.12: resolution: {integrity: sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ==} +======= + '@types/node': 16.0.0 + 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.0.0 + dev: true + + /@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==} dev: true @@ -1528,13 +2590,32 @@ packages: dev: true /@types/yargs/17.0.24: +======= + /@types/uuid@9.0.1: + resolution: {integrity: sha512-rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA==} + dev: true + + /@types/validator@13.9.0: + resolution: {integrity: sha512-NclP0IbzHj/4tJZKFqKh8E7kZdgss+MCUYV9G+TLltFfDA4lFgE4PKPpDIyS2FlcdANIfSx273emkupvChigbw==} + + /@types/yargs-parser@21.0.0: + resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} + 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 @@ -1544,6 +2625,7 @@ 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 @@ -1557,10 +2639,24 @@ packages: 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 + debug: 4.3.4 + eslint: 8.0.1 + functional-red-black-tree: 1.0.1 + ignore: 5.2.4 + regexpp: 3.2.0 + 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} @@ -1650,11 +2746,27 @@ packages: 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} + peerDependencies: + eslint: '*' + dependencies: + '@types/json-schema': 7.0.12 + '@typescript-eslint/scope-manager': 5.0.0 + '@typescript-eslint/types': 5.0.0 + '@typescript-eslint/typescript-estree': 5.0.0(typescript@4.3.5) + 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} @@ -1705,16 +2817,183 @@ packages: /@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} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/scope-manager': 5.0.0 + '@typescript-eslint/types': 5.0.0 + '@typescript-eslint/typescript-estree': 5.0.0(typescript@4.3.5) + debug: 4.3.4 + eslint: 8.0.1 + typescript: 4.3.5 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/scope-manager@5.0.0: + resolution: {integrity: sha512-5RFjdA/ain/MDUHYXdF173btOKncIrLuBmA9s6FJhzDrRAyVSA+70BHg0/MW6TE+UiKVyRtX91XpVS0gVNwVDQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + '@typescript-eslint/types': 5.0.0 + '@typescript-eslint/visitor-keys': 5.0.0 + dev: true + + /@typescript-eslint/types@5.0.0: + resolution: {integrity: sha512-dU/pKBUpehdEqYuvkojmlv0FtHuZnLXFBn16zsDmlFF3LXkOpkAQ2vrKc3BidIIve9EMH2zfTlxqw9XM0fFN5w==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + + /@typescript-eslint/typescript-estree@5.0.0(typescript@4.3.5): + resolution: {integrity: sha512-V/6w+PPQMhinWKSn+fCiX5jwvd1vRBm7AX7SJQXEGQtwtBvjMPjaU3YTQ1ik2UF1u96X7tsB96HMnulG3eLi9Q==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 5.0.0 + '@typescript-eslint/visitor-keys': 5.0.0 + debug: 4.3.4 + globby: 11.1.0 + is-glob: 4.0.3 + semver: 7.5.4 + tsutils: 3.21.0(typescript@4.3.5) + typescript: 4.3.5 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/visitor-keys@5.0.0: + resolution: {integrity: sha512-yRyd2++o/IrJdyHuYMxyFyBhU762MRHQ/bAGQeTnN3pGikfh+nEmM61XTqaDH1XDp53afZ+waXrk0ZvenoZ6xw==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + '@typescript-eslint/types': 5.0.0 + eslint-visitor-keys: 3.4.2 + dev: true + + /@webassemblyjs/ast@1.11.1: + resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==} + dependencies: + '@webassemblyjs/helper-numbers': 1.11.1 + '@webassemblyjs/helper-wasm-bytecode': 1.11.1 + dev: true + + /@webassemblyjs/ast@1.9.0: + resolution: {integrity: sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==} + dependencies: + '@webassemblyjs/helper-module-context': 1.9.0 + '@webassemblyjs/helper-wasm-bytecode': 1.9.0 + '@webassemblyjs/wast-parser': 1.9.0 + dev: true + + /@webassemblyjs/floating-point-hex-parser@1.11.1: + resolution: {integrity: sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==} + dev: true + + /@webassemblyjs/floating-point-hex-parser@1.9.0: + resolution: {integrity: sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==} + dev: true + + /@webassemblyjs/helper-api-error@1.11.1: + resolution: {integrity: sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==} + dev: true + + /@webassemblyjs/helper-api-error@1.9.0: + resolution: {integrity: sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==} + dev: true + + /@webassemblyjs/helper-buffer@1.11.1: + resolution: {integrity: sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==} + dev: true + + /@webassemblyjs/helper-buffer@1.9.0: + resolution: {integrity: sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==} + dev: true + + /@webassemblyjs/helper-code-frame@1.9.0: + resolution: {integrity: sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==} + dependencies: + '@webassemblyjs/wast-printer': 1.9.0 + dev: true + + /@webassemblyjs/helper-fsm@1.9.0: + resolution: {integrity: sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==} + dev: true + + /@webassemblyjs/helper-module-context@1.9.0: + resolution: {integrity: sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==} + dependencies: + '@webassemblyjs/ast': 1.9.0 + dev: true + + /@webassemblyjs/helper-numbers@1.11.1: + resolution: {integrity: sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==} + dependencies: + '@webassemblyjs/floating-point-hex-parser': 1.11.1 + '@webassemblyjs/helper-api-error': 1.11.1 + '@xtuc/long': 4.2.2 + dev: true + + /@webassemblyjs/helper-wasm-bytecode@1.11.1: + resolution: {integrity: sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==} + dev: true + + /@webassemblyjs/helper-wasm-bytecode@1.9.0: + resolution: {integrity: sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==} + dev: true + + /@webassemblyjs/helper-wasm-section@1.11.1: + resolution: {integrity: sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==} + dependencies: + '@webassemblyjs/ast': 1.11.1 + '@webassemblyjs/helper-buffer': 1.11.1 + '@webassemblyjs/helper-wasm-bytecode': 1.11.1 + '@webassemblyjs/wasm-gen': 1.11.1 + dev: true + + /@webassemblyjs/helper-wasm-section@1.9.0: + resolution: {integrity: sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==} + dependencies: + '@webassemblyjs/ast': 1.9.0 + '@webassemblyjs/helper-buffer': 1.9.0 + '@webassemblyjs/helper-wasm-bytecode': 1.9.0 + '@webassemblyjs/wasm-gen': 1.9.0 + dev: true + + /@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: + '@xtuc/ieee754': 1.2.0 + dev: true + + /@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 @@ -1782,13 +3061,158 @@ packages: dev: true /accepts/1.3.8: +======= + /@webassemblyjs/leb128@1.9.0: + resolution: {integrity: sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==} + dependencies: + '@xtuc/long': 4.2.2 + dev: true + + /@webassemblyjs/utf8@1.11.1: + resolution: {integrity: sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==} + dev: true + + /@webassemblyjs/utf8@1.9.0: + resolution: {integrity: sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==} + dev: true + + /@webassemblyjs/wasm-edit@1.11.1: + resolution: {integrity: sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==} + dependencies: + '@webassemblyjs/ast': 1.11.1 + '@webassemblyjs/helper-buffer': 1.11.1 + '@webassemblyjs/helper-wasm-bytecode': 1.11.1 + '@webassemblyjs/helper-wasm-section': 1.11.1 + '@webassemblyjs/wasm-gen': 1.11.1 + '@webassemblyjs/wasm-opt': 1.11.1 + '@webassemblyjs/wasm-parser': 1.11.1 + '@webassemblyjs/wast-printer': 1.11.1 + dev: true + + /@webassemblyjs/wasm-edit@1.9.0: + resolution: {integrity: sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==} + dependencies: + '@webassemblyjs/ast': 1.9.0 + '@webassemblyjs/helper-buffer': 1.9.0 + '@webassemblyjs/helper-wasm-bytecode': 1.9.0 + '@webassemblyjs/helper-wasm-section': 1.9.0 + '@webassemblyjs/wasm-gen': 1.9.0 + '@webassemblyjs/wasm-opt': 1.9.0 + '@webassemblyjs/wasm-parser': 1.9.0 + '@webassemblyjs/wast-printer': 1.9.0 + dev: true + + /@webassemblyjs/wasm-gen@1.11.1: + resolution: {integrity: sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==} + dependencies: + '@webassemblyjs/ast': 1.11.1 + '@webassemblyjs/helper-wasm-bytecode': 1.11.1 + '@webassemblyjs/ieee754': 1.11.1 + '@webassemblyjs/leb128': 1.11.1 + '@webassemblyjs/utf8': 1.11.1 + dev: true + + /@webassemblyjs/wasm-gen@1.9.0: + resolution: {integrity: sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==} + dependencies: + '@webassemblyjs/ast': 1.9.0 + '@webassemblyjs/helper-wasm-bytecode': 1.9.0 + '@webassemblyjs/ieee754': 1.9.0 + '@webassemblyjs/leb128': 1.9.0 + '@webassemblyjs/utf8': 1.9.0 + dev: true + + /@webassemblyjs/wasm-opt@1.11.1: + resolution: {integrity: sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==} + dependencies: + '@webassemblyjs/ast': 1.11.1 + '@webassemblyjs/helper-buffer': 1.11.1 + '@webassemblyjs/wasm-gen': 1.11.1 + '@webassemblyjs/wasm-parser': 1.11.1 + dev: true + + /@webassemblyjs/wasm-opt@1.9.0: + resolution: {integrity: sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==} + dependencies: + '@webassemblyjs/ast': 1.9.0 + '@webassemblyjs/helper-buffer': 1.9.0 + '@webassemblyjs/wasm-gen': 1.9.0 + '@webassemblyjs/wasm-parser': 1.9.0 + dev: true + + /@webassemblyjs/wasm-parser@1.11.1: + resolution: {integrity: sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==} + dependencies: + '@webassemblyjs/ast': 1.11.1 + '@webassemblyjs/helper-api-error': 1.11.1 + '@webassemblyjs/helper-wasm-bytecode': 1.11.1 + '@webassemblyjs/ieee754': 1.11.1 + '@webassemblyjs/leb128': 1.11.1 + '@webassemblyjs/utf8': 1.11.1 + dev: true + + /@webassemblyjs/wasm-parser@1.9.0: + resolution: {integrity: sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==} + dependencies: + '@webassemblyjs/ast': 1.9.0 + '@webassemblyjs/helper-api-error': 1.9.0 + '@webassemblyjs/helper-wasm-bytecode': 1.9.0 + '@webassemblyjs/ieee754': 1.9.0 + '@webassemblyjs/leb128': 1.9.0 + '@webassemblyjs/utf8': 1.9.0 + dev: true + + /@webassemblyjs/wast-parser@1.9.0: + resolution: {integrity: sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==} + dependencies: + '@webassemblyjs/ast': 1.9.0 + '@webassemblyjs/floating-point-hex-parser': 1.9.0 + '@webassemblyjs/helper-api-error': 1.9.0 + '@webassemblyjs/helper-code-frame': 1.9.0 + '@webassemblyjs/helper-fsm': 1.9.0 + '@xtuc/long': 4.2.2 + dev: true + + /@webassemblyjs/wast-printer@1.11.1: + resolution: {integrity: sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==} + dependencies: + '@webassemblyjs/ast': 1.11.1 + '@xtuc/long': 4.2.2 + dev: true + + /@webassemblyjs/wast-printer@1.9.0: + resolution: {integrity: sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==} + dependencies: + '@webassemblyjs/ast': 1.9.0 + '@webassemblyjs/wast-parser': 1.9.0 + '@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: +>>>>>>> 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 @@ -1796,7 +3220,11 @@ 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 @@ -1804,18 +3232,26 @@ 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: @@ -1824,7 +3260,11 @@ 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: @@ -1836,25 +3276,44 @@ 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 @@ -1862,7 +3321,11 @@ 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 @@ -1871,8 +3334,13 @@ 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 @@ -1880,46 +3348,83 @@ 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: @@ -1927,11 +3432,16 @@ 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==} @@ -1940,6 +3450,16 @@ packages: dev: true /are-we-there-yet/2.0.0: +======= + /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: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==} engines: {node: '>=10'} dependencies: @@ -1947,7 +3467,11 @@ 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: @@ -1956,16 +3480,25 @@ 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 @@ -1974,10 +3507,21 @@ packages: 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 + + /array-flatten@1.1.1: + 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==} dev: true @@ -1987,16 +3531,31 @@ packages: 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 @@ -2004,7 +3563,11 @@ 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: @@ -2017,7 +3580,11 @@ 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: @@ -2027,11 +3594,16 @@ 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 @@ -2048,11 +3620,30 @@ packages: 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) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.9) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.9) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.9) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.9) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.9) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.9) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.9) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.9) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.9) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.9) + 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 @@ -2066,11 +3657,30 @@ packages: 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) + 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: +>>>>>>> 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 @@ -2078,8 +3688,13 @@ 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 @@ -2090,13 +3705,18 @@ 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} @@ -2117,24 +3737,36 @@ packages: - 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} @@ -2147,18 +3779,37 @@ packages: 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} + hasBin: true + dependencies: + caniuse-lite: 1.0.30001518 + electron-to-chromium: 1.4.480 + node-releases: 2.0.13 + update-browserslist-db: 1.0.11(browserslist@4.21.10) + 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 @@ -2167,30 +3818,56 @@ packages: 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 + + /buffer-from@1.1.2: + 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: @@ -2215,34 +3892,59 @@ packages: transitivePeerDependencies: - bluebird dev: true +<<<<<<< HEAD optional: true /call-bind/1.0.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: @@ -2251,23 +3953,47 @@ 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'} + dependencies: + ansi-styles: 4.3.0 + supports-color: 7.2.0 + 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: @@ -2282,21 +4008,34 @@ 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 @@ -2318,13 +4057,39 @@ packages: optional: true /cli-cursor/3.1.0: +======= + /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.9.0 + libphonenumber-js: 1.10.38 + validator: 13.9.0 + + /clean-stack@2.2.0: + resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} + engines: {node: '>=6'} + 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 @@ -2337,13 +4102,22 @@ 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 @@ -2351,12 +4125,20 @@ 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 @@ -2364,7 +4146,11 @@ 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: @@ -2373,32 +4159,53 @@ 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: +======= + /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 @@ -2407,31 +4214,58 @@ packages: 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 + + /color-name@1.1.4: + resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + + /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: +======= + /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 @@ -2440,6 +4274,20 @@ packages: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} /concat-stream/1.6.2: +======= + /commondir@1.0.1: + resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==} + dev: true + + /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: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==} engines: {'0': node >= 0.8} dependencies: @@ -2448,6 +4296,7 @@ packages: readable-stream: 2.3.8 typedarray: 0.0.6 +<<<<<<< HEAD /consola/2.15.3: resolution: {integrity: sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==} @@ -2456,11 +4305,22 @@ packages: dev: true /content-disposition/0.5.4: +======= + /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: +>>>>>>> 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'} @@ -2484,13 +4344,42 @@ packages: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} /cors/2.8.5: +======= + /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: +>>>>>>> 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: @@ -2501,11 +4390,19 @@ 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: @@ -2514,18 +4411,30 @@ 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: '*' @@ -2535,7 +4444,11 @@ 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: @@ -2547,6 +4460,7 @@ packages: ms: 2.1.2 dev: true +<<<<<<< HEAD /dedent/0.7.0: resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==} dev: true @@ -2556,30 +4470,58 @@ packages: dev: true /deepmerge/4.3.1: +======= + /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: +>>>>>>> 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'} @@ -2594,10 +4536,27 @@ packages: dev: true /detect-newline/3.1.0: +======= + /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.2: + resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==} + engines: {node: '>=8'} + 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: @@ -2606,34 +4565,54 @@ packages: 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'} @@ -2645,11 +4624,20 @@ packages: 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==} @@ -2658,10 +4646,21 @@ packages: dev: true /emittery/0.10.2: +======= + /ee-first@1.1.1: + resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} + + /electron-to-chromium@1.4.480: + resolution: {integrity: sha512-IXTgg+bITkQv/FLP9FjX6f9KFCs5hQWeh5uNSKxB9mqYj/JXhHDbu+ekS43LVvbkL3eW6/oZy4+r9Om6lan1Uw==} + 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: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} dev: true @@ -2671,6 +4670,17 @@ packages: engines: {node: '>= 0.8'} /encoding/0.1.13: +======= + /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: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==} requiresBuild: true dependencies: @@ -2678,13 +4688,21 @@ 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: @@ -2692,62 +4710,119 @@ 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'} + dependencies: + ansi-colors: 4.1.3 + strip-ansi: 6.0.1 + 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: '*' @@ -2756,6 +4831,7 @@ 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 @@ -2763,6 +4839,15 @@ packages: 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 + prettier-linter-helpers: 1.0.0 + dev: true + + /eslint-scope@5.1.1: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} engines: {node: '>=8.0.0'} dependencies: @@ -2770,14 +4855,20 @@ 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} @@ -2795,19 +4886,58 @@ packages: '@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} + peerDependencies: + eslint: '>=5' + dependencies: + eslint: 8.0.1 + eslint-visitor-keys: 2.1.0 + dev: true + + /eslint-visitor-keys@2.1.0: + resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==} + engines: {node: '>=10'} + dev: true + + /eslint-visitor-keys@3.4.2: + resolution: {integrity: sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + + /eslint@8.0.1: + resolution: {integrity: sha512-LsgcwZgQ72vZ+SMp4K6pAnk2yFDWL7Ti4pJaRvsZ0Hsw2h8ZjUIW38a9AFn2cZXdBMlScMFYYgsSp4ttFI/0bA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + hasBin: true + 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 @@ -2817,6 +4947,15 @@ packages: 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 + ignore: 4.0.6 + 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 @@ -2824,13 +4963,24 @@ 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 + strip-ansi: 6.0.1 + 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} @@ -2841,50 +4991,94 @@ packages: 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} + dependencies: + acorn: 8.10.0 + acorn-jsx: 5.3.2(acorn@8.10.0) + eslint-visitor-keys: 3.4.2 + 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: @@ -2899,7 +5093,11 @@ 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: @@ -2914,12 +5112,20 @@ 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: @@ -2930,13 +5136,22 @@ 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 @@ -2955,7 +5170,11 @@ 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 @@ -2968,7 +5187,11 @@ 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: @@ -2977,6 +5200,7 @@ packages: tmp: 0.0.33 dev: true +<<<<<<< HEAD /fast-deep-equal/3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} dev: true @@ -2987,6 +5211,18 @@ packages: /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 + + /fast-diff@1.3.0: + resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} + dev: true + + /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 @@ -2996,6 +5232,7 @@ packages: micromatch: 4.0.5 dev: true +<<<<<<< HEAD /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} dev: true @@ -3008,39 +5245,73 @@ packages: 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 + + /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: +>>>>>>> 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: +======= + /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: +======= + /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: @@ -3054,7 +5325,20 @@ 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'} + dependencies: + commondir: 1.0.1 + make-dir: 3.1.0 + pkg-dir: 4.2.0 + dev: true + + /find-up@4.1.0: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} dependencies: @@ -3062,6 +5346,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'} @@ -3071,6 +5356,9 @@ packages: 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: @@ -3078,6 +5366,7 @@ packages: rimraf: 3.0.2 dev: true +<<<<<<< HEAD /flatted/3.2.7: resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} dev: true @@ -3088,6 +5377,22 @@ packages: peerDependencies: typescript: '>3.6.0' webpack: ^5.11.0 +======= + /flatted@3.2.7: + resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} + dev: true + + /fork-ts-checker-webpack-plugin@7.2.11(typescript@4.7.4)(webpack@5.73.0): + resolution: {integrity: sha512-2e5+NyTUTE1Xq4fWo7KFEQblCaIvvINQwUX3jRmEGlgCTc1Ecqw/975EfQrQ0GEraxJTnp8KB9d/c8hlCHUMJA==} + engines: {node: '>=12.13.0', yarn: '>=1.0.0'} + peerDependencies: + typescript: '>3.6.0' + vue-template-compiler: '*' + webpack: ^5.11.0 + peerDependenciesMeta: + vue-template-compiler: + optional: true +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 dependencies: '@babel/code-frame': 7.22.5 chalk: 4.1.2 @@ -3097,6 +5402,7 @@ 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 @@ -3107,6 +5413,17 @@ packages: /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 + typescript: 4.7.4 + webpack: 5.73.0 + dev: true + + /form-data@3.0.1: + resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==} +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>= 6'} dependencies: asynckit: 0.4.0 @@ -3114,6 +5431,7 @@ packages: mime-types: 2.1.35 dev: true +<<<<<<< HEAD /formidable/2.1.2: resolution: {integrity: sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==} dependencies: @@ -3132,6 +5450,22 @@ packages: 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' + 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: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} engines: {node: '>=12'} dependencies: @@ -3140,13 +5474,18 @@ 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 @@ -3155,6 +5494,16 @@ packages: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} /fsevents/2.3.2: +======= + /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: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] @@ -3162,10 +5511,21 @@ 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==} + + /functional-red-black-tree@1.0.1: + resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==} + dev: true + + /gauge@3.0.2: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==} engines: {node: '>=10'} dependencies: @@ -3180,7 +5540,11 @@ 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: @@ -3195,23 +5559,39 @@ 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: +======= + /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 @@ -3219,42 +5599,70 @@ 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 @@ -3264,7 +5672,11 @@ 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: @@ -3275,6 +5687,7 @@ packages: once: 1.4.0 dev: true +<<<<<<< HEAD /glob/9.3.5: resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==} engines: {node: '>=16 || 14 >=14.17'} @@ -3286,29 +5699,45 @@ packages: 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 @@ -3318,10 +5747,18 @@ packages: 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'} @@ -3339,11 +5776,31 @@ packages: dev: true /has/1.0.3: +======= + /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: +>>>>>>> 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'} @@ -3358,11 +5815,26 @@ packages: dev: true /http-cache-semantics/4.1.1: +======= + /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: +>>>>>>> 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: @@ -3372,7 +5844,11 @@ 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: @@ -3384,7 +5860,11 @@ 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: @@ -3394,46 +5874,83 @@ 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 + + /ignore@4.0.6: + resolution: {integrity: sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==} + engines: {node: '>= 4'} + 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: @@ -3441,7 +5958,11 @@ 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 @@ -3450,11 +5971,16 @@ 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'} @@ -3467,15 +5993,53 @@ packages: optional: true /inflight/1.0.6: +======= + /indent-string@4.0.0: + resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} + engines: {node: '>=8'} + dev: true + + /infer-owner@1.0.4: + resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==} + 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==} + + /inquirer@7.3.3: + resolution: {integrity: sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==} + engines: {node: '>=8.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 + run-async: 2.4.1 + rxjs: 6.6.7 + string-width: 4.2.3 + strip-ansi: 6.0.1 + through: 2.3.8 + dev: true + + /inquirer@8.2.4: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==} engines: {node: '>=12.0.0'} dependencies: @@ -3496,6 +6060,7 @@ 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'} @@ -3518,15 +6083,23 @@ packages: 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'} @@ -3536,55 +6109,99 @@ packages: 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'} + + /is-arrayish@0.2.1: + resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} + 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'} @@ -3595,15 +6212,27 @@ packages: 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==} @@ -3612,10 +6241,21 @@ packages: dev: true /istanbul-lib-coverage/3.2.0: +======= + /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: +>>>>>>> 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'} @@ -3625,10 +6265,22 @@ packages: '@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'} + dependencies: + '@babel/core': 7.22.9 + '@babel/parser': 7.22.7 + '@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'} @@ -3639,6 +6291,18 @@ packages: dev: true /istanbul-lib-source-maps/4.0.1: +======= + /istanbul-lib-report@3.0.1: + resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==} + engines: {node: '>=10'} + dependencies: + istanbul-lib-coverage: 3.2.0 + make-dir: 4.0.0 + supports-color: 7.2.0 + dev: true + + /istanbul-lib-source-maps@4.0.1: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} engines: {node: '>=10'} dependencies: @@ -3649,6 +6313,7 @@ packages: - supports-color dev: true +<<<<<<< HEAD /istanbul-reports/3.1.5: resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==} engines: {node: '>=8'} @@ -3662,6 +6327,21 @@ packages: engines: {node: '>=6'} /jest-changed-files/28.1.3: +======= + /istanbul-reports@3.1.6: + resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==} + engines: {node: '>=8'} + dependencies: + html-escaper: 2.0.2 + istanbul-lib-report: 3.0.1 + dev: true + + /iterare@1.2.1: + resolution: {integrity: sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==} + 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: @@ -3669,7 +6349,11 @@ 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: @@ -3677,7 +6361,11 @@ 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 @@ -3696,7 +6384,11 @@ 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 @@ -3706,14 +6398,22 @@ 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 @@ -3724,7 +6424,11 @@ 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: @@ -3736,11 +6440,19 @@ 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 @@ -3759,12 +6471,20 @@ 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: @@ -3774,14 +6494,22 @@ 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: @@ -3792,30 +6520,50 @@ 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 @@ -3828,7 +6576,11 @@ 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: @@ -3836,7 +6588,11 @@ 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: @@ -3846,7 +6602,11 @@ 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: @@ -3861,15 +6621,26 @@ 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: @@ -3881,12 +6652,20 @@ 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: @@ -3896,14 +6675,22 @@ 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 @@ -3911,7 +6698,11 @@ 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: @@ -3920,7 +6711,11 @@ 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 @@ -3940,7 +6735,11 @@ 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: @@ -3970,6 +6769,7 @@ 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} @@ -3977,6 +6777,15 @@ packages: '@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} + dependencies: + '@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 @@ -3984,7 +6793,11 @@ 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 @@ -4001,19 +6814,31 @@ 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: @@ -4025,13 +6850,21 @@ 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 @@ -4039,25 +6872,54 @@ 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'} + dependencies: + '@types/node': 16.0.0 + merge-stream: 2.0.0 + supports-color: 7.2.0 + dev: true + + /jest-worker@27.5.1: + resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} + 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 @@ -4067,21 +6929,36 @@ 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: @@ -4089,19 +6966,28 @@ 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 @@ -4119,16 +7005,54 @@ packages: dev: true /json5/2.2.3: +======= + /json-parse-better-errors@1.0.2: + resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==} + dev: true + + /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@1.0.2: + resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==} + hasBin: true + dependencies: + minimist: 1.2.8 + 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 @@ -4136,7 +7060,11 @@ 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: @@ -4146,7 +7074,11 @@ 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: @@ -4156,7 +7088,11 @@ 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 @@ -4164,24 +7100,40 @@ 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: +======= + /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: @@ -4189,6 +7141,7 @@ packages: type-check: 0.4.0 dev: true +<<<<<<< HEAD /libphonenumber-js/1.10.37: resolution: {integrity: sha512-Z10PCaOCiAxbUxLyR31DNeeNugSVP6iv/m7UrSKS5JHziEMApJtgku4e9Q69pzzSC9LnQiM09sqsGf2ticZnMw==} @@ -4197,17 +7150,32 @@ packages: dev: true /loader-runner/4.3.0: +======= + /libphonenumber-js@1.10.38: + resolution: {integrity: sha512-4NjVXVUmpZ9Zsqq6FXa2+MKI+KAI3tOqA0pxXgXGluhpj4ge5didmbWJpMBqGB3AVGv1SnEtKdGTbxjSEG1kCQ==} + + /lines-and-columns@1.2.4: + resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + 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'} @@ -4232,6 +7200,25 @@ packages: dev: true /log-symbols/4.1.0: +======= + /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: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} engines: {node: '>=10'} dependencies: @@ -4239,6 +7226,7 @@ packages: is-unicode-supported: 0.1.0 dev: true +<<<<<<< HEAD /long/5.2.3: resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==} dev: true @@ -4249,33 +7237,53 @@ packages: 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 /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'} @@ -4295,6 +7303,34 @@ packages: dev: true /make-fetch-happen/9.1.0: +======= + /magic-string@0.26.1: + resolution: {integrity: sha512-ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg==} + engines: {node: '>=12'} + dependencies: + sourcemap-codec: 1.4.8 + dev: true + + /make-dir@3.1.0: + resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} + engines: {node: '>=8'} + dependencies: + semver: 6.3.1 + dev: true + + /make-dir@4.0.0: + resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} + engines: {node: '>=10'} + dependencies: + semver: 7.5.4 + dev: true + + /make-error@1.3.6: + resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} + dev: true + + /make-fetch-happen@9.1.0: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==} engines: {node: '>= 10'} dependencies: @@ -4320,23 +7356,36 @@ 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==} @@ -4345,15 +7394,33 @@ packages: dev: true /merge2/1.4.1: +======= + /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: +>>>>>>> 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: @@ -4361,44 +7428,73 @@ 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'} @@ -4410,14 +7506,25 @@ packages: 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: @@ -4429,23 +7536,37 @@ 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: @@ -4453,29 +7574,41 @@ 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: @@ -4483,31 +7616,48 @@ 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==} @@ -4519,6 +7669,19 @@ packages: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} /multer/1.4.4-lts.1: +======= + /ms@2.0.0: + resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} + + /ms@2.1.2: + resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} + dev: true + + /ms@2.1.3: + 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: @@ -4530,7 +7693,11 @@ 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: @@ -4543,25 +7710,42 @@ 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 @@ -4569,19 +7753,29 @@ 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 @@ -4607,12 +7801,35 @@ packages: dev: true /node-emoji/1.11.0: +======= + /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-addon-api@4.3.0: + resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==} + 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: @@ -4623,7 +7840,11 @@ 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 @@ -4645,6 +7866,7 @@ packages: dev: true optional: true +<<<<<<< HEAD /node-int64/0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} dev: true @@ -4654,6 +7876,17 @@ packages: dev: true /nopt/5.0.0: +======= + /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: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==} engines: {node: '>=6'} hasBin: true @@ -4661,19 +7894,31 @@ 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 @@ -4682,7 +7927,11 @@ 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: @@ -4693,6 +7942,7 @@ packages: dev: true optional: true +<<<<<<< HEAD /object-assign/4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} @@ -4701,24 +7951,50 @@ packages: 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@3.0.0: + resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} + engines: {node: '>= 6'} + + /object-inspect@1.12.3: + 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: +======= + /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: @@ -4730,7 +8006,11 @@ 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: @@ -4745,7 +8025,11 @@ 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: @@ -4753,32 +8037,49 @@ 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'} @@ -4787,26 +8088,42 @@ packages: 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: @@ -4816,12 +8133,17 @@ 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 @@ -4835,25 +8157,52 @@ packages: engines: {node: '>= 0.8'} /passport-jwt/4.0.1: +======= + /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: +>>>>>>> 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: @@ -4862,20 +8211,33 @@ 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 @@ -4899,10 +8261,28 @@ packages: 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 + + /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: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} dev: true +<<<<<<< HEAD /pause/0.0.1: resolution: {integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==} dev: true @@ -4912,46 +8292,86 @@ packages: dev: true /picomatch/2.3.1: +======= + /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: +>>>>>>> 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: @@ -4961,10 +8381,22 @@ 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==} + + /progress@2.0.3: + resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} + engines: {node: '>=0.4.0'} + dev: true + + /promise-inflight@1.0.1: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==} peerDependencies: bluebird: '*' @@ -4972,9 +8404,14 @@ 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: @@ -4983,7 +8420,11 @@ 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: @@ -4991,53 +8432,90 @@ 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: @@ -5046,6 +8524,7 @@ 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'} @@ -5060,6 +8539,13 @@ packages: 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 @@ -5070,7 +8556,11 @@ 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: @@ -5079,20 +8569,29 @@ 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==} @@ -5101,38 +8600,77 @@ packages: dev: true /require-directory/2.1.1: +======= + /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==} + dev: true + + /regexpp@3.2.0: + resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==} + engines: {node: '>=8'} + 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: @@ -5141,7 +8679,11 @@ 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: @@ -5149,23 +8691,36 @@ 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'} @@ -5175,16 +8730,24 @@ packages: 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: @@ -5200,11 +8763,46 @@ packages: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} /schema-utils/3.3.0: +======= + /rxjs@6.6.7: + resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==} + engines: {npm: '>=2.0.0'} + dependencies: + tslib: 1.14.1 + dev: true + + /rxjs@7.2.0: + resolution: {integrity: sha512-aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw==} + dependencies: + tslib: 2.1.0 + + /rxjs@7.8.1: + resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} + dependencies: + tslib: 2.6.1 + dev: true + + /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==} + + /sax@1.2.4: + resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==} + 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 @@ -5214,6 +8812,17 @@ packages: dev: true /semver/7.5.4: +======= + ajv-keywords: 3.5.2(ajv@6.12.6) + dev: true + + /semver@6.3.1: + resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} + hasBin: true + dev: true + + /semver@7.5.4: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} engines: {node: '>=10'} hasBin: true @@ -5221,7 +8830,11 @@ 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: @@ -5241,17 +8854,35 @@ 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 + + /serialize-javascript@5.0.1: + resolution: {integrity: sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==} + dependencies: + randombytes: 2.1.0 + 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: @@ -5262,6 +8893,7 @@ packages: transitivePeerDependencies: - supports-color +<<<<<<< HEAD /set-blocking/2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} dev: true @@ -5270,6 +8902,16 @@ packages: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} /sha.js/2.4.11: +======= + /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: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==} hasBin: true dependencies: @@ -5277,19 +8919,31 @@ 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 @@ -5299,13 +8953,18 @@ 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 @@ -5315,17 +8974,36 @@ packages: dev: true /slash/3.0.0: +======= + /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: +>>>>>>> 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: @@ -5337,7 +9015,11 @@ 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: @@ -5346,25 +9028,49 @@ 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: + buffer-from: 1.1.2 + source-map: 0.6.1 + 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'} @@ -5375,13 +9081,34 @@ packages: dev: true /sqlite3/5.1.6: +======= + /source-map@0.7.3: + resolution: {integrity: sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==} + engines: {node: '>= 8'} + dev: true + + /sourcemap-codec@1.4.8: + resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==} + deprecated: Please use @jridgewell/sourcemap-codec instead + dev: true + + /sprintf-js@1.0.3: + resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} + 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: @@ -5392,26 +9119,40 @@ 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-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'} @@ -5421,6 +9162,17 @@ packages: 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'} + + /streamsearch@1.1.0: + resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==} + engines: {node: '>=10.0.0'} + + /string-length@4.0.2: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==} engines: {node: '>=10'} dependencies: @@ -5428,7 +9180,11 @@ 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: @@ -5437,93 +9193,162 @@ 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: @@ -5531,26 +9356,46 @@ 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: @@ -5562,7 +9407,11 @@ 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: @@ -5570,7 +9419,31 @@ 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'} + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + dependencies: + cacache: 15.3.0 + find-cache-dir: 3.3.2 + jest-worker: 26.6.2 + p-limit: 3.1.0 + schema-utils: 3.3.0 + serialize-javascript: 5.0.1 + source-map: 0.6.1 + terser: 5.19.2 + webpack: 5.0.0 + webpack-sources: 1.4.3 + transitivePeerDependencies: + - bluebird + 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: @@ -5590,6 +9463,7 @@ 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 @@ -5620,16 +9494,31 @@ packages: /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: @@ -5638,50 +9527,83 @@ packages: minimatch: 3.1.2 dev: true +<<<<<<< HEAD /text-table/0.2.0: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} 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'} @@ -5690,11 +9612,25 @@ packages: 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'} + + /tr46@0.0.3: + 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: +======= + /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 @@ -5712,20 +9648,36 @@ 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: '*' @@ -5735,6 +9687,7 @@ 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 @@ -5745,6 +9698,19 @@ packages: peerDependencies: '@swc/core': '>=1.2.50' '@swc/wasm': '>=1.2.50' +======= + typescript: 4.3.5 + webpack: 5.0.0 + dev: true + + /ts-node@10.0.0(@types/node@16.0.0)(typescript@4.3.5): + resolution: {integrity: sha512-ROWeOIUvfFbPZkoDis0L/55Fk+6gFQNZwwKPLinacRl6tsxstTF1DbAcLKkovwnpKMVvOMHP1TIbnwXwtLg1gg==} + engines: {node: '>=12.0.0'} + hasBin: true + peerDependencies: + '@swc/core': '>=1.2.45' + '@swc/wasm': '>=1.2.45' +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 '@types/node': '*' typescript: '>=2.7' peerDependenciesMeta: @@ -5753,18 +9719,26 @@ 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 @@ -5780,6 +9754,31 @@ packages: dev: true /tsconfig-paths/4.0.0: +======= + source-map-support: 0.5.20 + typescript: 4.3.5 + yn: 3.1.1 + dev: true + + /tsconfig-paths-webpack-plugin@3.5.2: + resolution: {integrity: sha512-EhnfjHbzm5IYI9YPNVIxx1moxMI4bpHD2e0zTXeDNQcwjjRaGepP7IhTHJkyDBG0CAOoxRfe7jCG630Ou+C6Pw==} + dependencies: + chalk: 4.1.2 + enhanced-resolve: 5.15.0 + tsconfig-paths: 3.14.1 + dev: true + + /tsconfig-paths@3.14.1: + resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==} + dependencies: + '@types/json5': 0.0.29 + json5: 1.0.2 + minimist: 1.2.8 + strip-bom: 3.0.0 + dev: true + + /tsconfig-paths@4.0.0: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==} dependencies: json5: 2.2.3 @@ -5787,6 +9786,7 @@ 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'} @@ -5807,57 +9807,112 @@ packages: 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 + + /tslib@2.1.0: + resolution: {integrity: sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==} + + /tslib@2.4.0: + resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} + + /tslib@2.6.1: + resolution: {integrity: sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==} + 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 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): + resolution: {integrity: sha512-sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA==} +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 engines: {node: '>= 12.9.0'} hasBin: true peerDependencies: @@ -5866,8 +9921,13 @@ 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 @@ -5921,6 +9981,7 @@ 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 @@ -5931,17 +9992,37 @@ packages: 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 + reflect-metadata: 0.1.13 + sha.js: 2.4.11 + sqlite3: 5.1.6 + ts-node: 10.0.0(@types/node@16.0.0)(typescript@4.3.5) + 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'} @@ -5949,45 +10030,81 @@ packages: '@lukeed/csprng': 1.1.0 /unique-filename/1.1.1: +======= + /typescript@4.7.4: + resolution: {integrity: sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==} + engines: {node: '>=4.2.0'} + hasBin: true + 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==} @@ -6001,15 +10118,37 @@ packages: dev: true /uuid/9.0.0: +======= + /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 + + /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: @@ -6018,6 +10157,7 @@ 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'} @@ -6027,12 +10167,27 @@ packages: 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'} + + /vary@1.1.2: + resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} + 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: @@ -6040,27 +10195,62 @@ 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: + source-list-map: 2.0.1 + source-map: 0.6.1 + dev: true + + /webpack-sources@2.3.1: + resolution: {integrity: sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==} + engines: {node: '>=10.13.0'} + dependencies: + source-list-map: 2.0.1 + source-map: 0.6.1 + 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: @@ -6070,6 +10260,7 @@ 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 @@ -6080,6 +10271,56 @@ packages: 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 + '@webassemblyjs/wasm-edit': 1.9.0 + '@webassemblyjs/wasm-parser': 1.9.0 + acorn: 8.10.0 + browserslist: 4.21.10 + chrome-trace-event: 1.0.3 + enhanced-resolve: 5.15.0 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-better-errors: 1.0.2 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + pkg-dir: 4.2.0 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 4.2.3(webpack@5.0.0) + watchpack: 2.4.0 + webpack-sources: 2.3.1 + transitivePeerDependencies: + - bluebird + dev: true + + /webpack@5.73.0: + resolution: {integrity: sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==} + engines: {node: '>=10.13.0'} + hasBin: true + peerDependencies: + webpack-cli: '*' + peerDependenciesMeta: + webpack-cli: + optional: true + dependencies: + '@types/eslint-scope': 3.7.4 + '@types/estree': 0.0.51 + '@webassemblyjs/ast': 1.11.1 + '@webassemblyjs/wasm-edit': 1.11.1 + '@webassemblyjs/wasm-parser': 1.11.1 + acorn: 8.10.0 + acorn-import-assertions: 1.9.0(acorn@8.10.0) + browserslist: 4.21.10 + 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 @@ -6090,7 +10331,11 @@ 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: @@ -6099,6 +10344,7 @@ packages: - uglify-js dev: true +<<<<<<< HEAD /webpack/5.88.1: resolution: {integrity: sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ==} engines: {node: '>=10.13.0'} @@ -6140,12 +10386,19 @@ packages: 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 @@ -6153,20 +10406,32 @@ 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: +======= + /wrap-ansi@7.0.0: +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} engines: {node: '>=10'} dependencies: @@ -6175,10 +10440,17 @@ 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: @@ -6186,15 +10458,37 @@ 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'} + dependencies: + sax: 1.2.4 + xmlbuilder: 11.0.1 + dev: true + + /xmlbuilder@11.0.1: + resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==} + engines: {node: '>=4.0'} + dev: true + + /xtend@4.0.2: + resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} + 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 @@ -6204,21 +10498,49 @@ packages: dev: true /yaml/1.10.2: +======= + /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: +>>>>>>> 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: @@ -6231,7 +10553,11 @@ 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: @@ -6244,12 +10570,20 @@ 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 ed47f61..745ef7c 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -1,61 +1,71 @@ -import { ClassSerializerInterceptor, Global, Module } from '@nestjs/common'; -import { APP_FILTER, APP_GUARD, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core'; +import { Module } from '@nestjs/common'; import { PostModule } from '@/modules/post'; import { RoleModule } from '@/modules/role'; import { UploadModule } from '@/modules/upload'; import { PermissionModule } from '@/modules/permission'; -import { PermissionGuard } from '@/features/permission/permission.guard'; import { ConfigModule } from '@/config'; -import { LoggerInterceptor, LoggerModule } from '@/features/logger'; -import { ServeStaticModule } from '@/features/static'; -import { BaseModule } from '@/features/base'; -import { AllExecptionFilter, HttpExecptionFilter } from '@/features/exception'; -import { ResponseInterceptor } from '@/features/response'; -import { TypeormModule } from '@/features/typeorm'; -import { validationPipeFactory, ValidationExecptionFilter } from '@/features/validation'; -import { JwtModule } from '@nestjs/jwt'; -import { AuthModule, JwtGuard } from '@/modules/auth'; +import { LoggerModule } from '@/common/logger'; +import { ServeStaticModule } from '@/common/static'; +import { DatabaseModule } from '@/database'; +import { ValidationModule } from '@/common/validation'; +import { AuthModule } from '@/modules/auth'; import { UserModule } from '@/modules/user'; +import { ResponseModule } from '@/common/response'; +import { SerializationModule } from '@/common/serialization'; -@Global() @Module({ imports: [ /** - * 配置模块(全局)，提供ConfigService类 + * 配置模块(全局) + * @description 加载.env配置文件 */ ConfigModule, /** - * 日志模块(全局)，提供LoggerService类 + * 日志模块(全局) + * @description 用于记录日志 */ LoggerModule, /** - * 静态资源(全局)，/upload和/web + * 静态资源(全局) + * @description 为静态页面/上传文件提供服务 */ ServeStaticModule, /** - * 基础模块(全局)，提供基础服务 + * 序列化模块 + * @description 序列化响应结果/异常结果，移除/替换字段 */ - BaseModule, + SerializationModule, + /** + * 响应模块 + * @description 包装响应结果/异常结果 + */ + ResponseModule, + /** + * 校验模块 + * @description 校验请求参数，抛出异常时按响应模块的格式包装 + */ + ValidationModule, /** * 数据库ORM + * @description 用于连接数据库 */ - TypeormModule, + DatabaseModule, /** * 用户模块 */ UserModule, /** - * 账户模块 + * 登陆模块 */ AuthModule, - /** - * JWT模块 - */ - JwtModule, /** * 角色模块 */ RoleModule, + /** + * 权限模块 + */ + PermissionModule, /** * 上传模块 */ @@ -64,82 +74,6 @@ import { UserModule } from '@/modules/user'; * 文章模块 */ PostModule, - /** - * 权限模块 - */ - PermissionModule, - ], - providers: [ - /** - * 全局序列化拦截器 - * @description 由于中间件的洋葱机制，需放在响应拦截器之前，否则无法检测到实例类型 - */ - { - provide: APP_INTERCEPTOR, - useClass: ClassSerializerInterceptor, - }, - /** - * 全局响应拦截器 - * @description 将返回值统一包装成{code, message, data, meta}格式 - */ - { - provide: APP_INTERCEPTOR, - useClass: ResponseInterceptor, - }, - /** - * 全局日志拦截器 - * @description 将请求和响应日志打印到控制台 - */ - { - provide: APP_INTERCEPTOR, - useClass: LoggerInterceptor, - }, - /** - * 全局异常过滤器 - * @description 将异常统一包装成{code, message, data, meta}格式 - */ - { - provide: APP_FILTER, - useClass: AllExecptionFilter, - }, - /** - * 全局HTTP异常过滤器 - * @description 将HTTP异常统一包装成{code, message, data, meta}格式 - */ - { - provide: APP_FILTER, - useClass: HttpExecptionFilter, - }, - /** - * 全局验证管道 - * @description 校验和转换输入数据 - */ - { - provide: APP_PIPE, - useFactory: validationPipeFactory, - }, - /** - * 全局验证异常过滤器 - * @description 将验证异常统一包装成{code, message, data, meta}格式 - */ - { - provide: APP_FILTER, - useClass: ValidationExecptionFilter, - }, - /** - * 全局JWT守卫(校验是否登陆) - */ - { - provide: APP_GUARD, - useClass: JwtGuard, - }, - /** - * 全局权限守卫(校验是否有权限) - */ - { - provide: APP_GUARD, - useClass: PermissionGuard, - }, ], }) export class AppModule {} diff --git a/src/features/base/base.controller.ts b/src/common/base/base.controller.ts similarity index 58% rename from src/features/base/base.controller.ts rename to src/common/base/base.controller.ts index 75e2272..aec6464 100644 --- a/src/features/base/base.controller.ts +++ b/src/common/base/base.controller.ts @@ -1,8 +1,9 @@ import { Inject } from '@nestjs/common'; import { LoggerService } from '../logger'; +import { ConfigService } from '@/config'; /** - * 基础控制器 + * 控制器基类 */ export class BaseController { /** @@ -10,4 +11,10 @@ export class BaseController { */ @Inject(LoggerService) readonly logger: LoggerService; + + /** + * 配置服务 + */ + @Inject(ConfigService) + readonly config: ConfigService; } diff --git a/src/common/base/base.module.ts b/src/common/base/base.module.ts new file mode 100644 index 0000000..828d0ec --- /dev/null +++ b/src/common/base/base.module.ts @@ -0,0 +1,4 @@ +import { Module } from '@nestjs/common'; + +@Module({}) +export class BaseModule {} diff --git a/src/common/base/base.service.ts b/src/common/base/base.service.ts new file mode 100644 index 0000000..28afe61 --- /dev/null +++ b/src/common/base/base.service.ts @@ -0,0 +1,23 @@ +import { Inject } from '@nestjs/common'; +import { ConfigService } from '@/config'; + +/** + * 服务基类 + */ +export class BaseService { + /** + * 配置服务 + */ + @Inject(ConfigService) + protected readonly config: ConfigService; + + /** + * 格式化分页参数 + */ + formatPagination(page = this.config.defaultPage, size = this.config.defaultPageSize) { + return { + skip: (page - 1) * size, + take: size, + }; + } +} diff --git a/src/features/base/index.ts b/src/common/base/index.ts similarity index 100% rename from src/features/base/index.ts rename to src/common/base/index.ts diff --git a/src/features/logger/index.ts b/src/common/logger/index.ts similarity index 100% rename from src/features/logger/index.ts rename to src/common/logger/index.ts diff --git a/src/features/logger/logger.interceptor.ts b/src/common/logger/logger.interceptor.ts similarity index 100% rename from src/features/logger/logger.interceptor.ts rename to src/common/logger/logger.interceptor.ts diff --git a/src/common/logger/logger.module.ts b/src/common/logger/logger.module.ts new file mode 100644 index 0000000..439ba11 --- /dev/null +++ b/src/common/logger/logger.module.ts @@ -0,0 +1,21 @@ +import { Global, Module } from '@nestjs/common'; +import { LoggerService } from './logger.service'; +import { APP_INTERCEPTOR } from '@nestjs/core'; +import { LoggerInterceptor } from './logger.interceptor'; + +/** + * 日志模块 + * @description 包含全局拦截器 + */ +@Global() +@Module({ + providers: [ + LoggerService, + { + provide: APP_INTERCEPTOR, + useClass: LoggerInterceptor, + }, + ], + exports: [LoggerService], +}) +export class LoggerModule {} diff --git a/src/features/logger/logger.service.ts b/src/common/logger/logger.service.ts similarity index 100% rename from src/features/logger/logger.service.ts rename to src/common/logger/logger.service.ts diff --git a/src/features/exception/http.filter.ts b/src/common/response/http.filter.ts similarity index 92% rename from src/features/exception/http.filter.ts rename to src/common/response/http.filter.ts index ee3338b..817d801 100644 --- a/src/features/exception/http.filter.ts +++ b/src/common/response/http.filter.ts @@ -1,6 +1,6 @@ import { ArgumentsHost, Catch, ExceptionFilter, HttpException } from '@nestjs/common'; import { Response as _Response } from 'express'; -import { Response } from '../response'; +import { Response } from './response'; @Catch(HttpException) export class HttpExecptionFilter implements ExceptionFilter { diff --git a/src/features/response/index.ts b/src/common/response/index.ts similarity index 50% rename from src/features/response/index.ts rename to src/common/response/index.ts index 943eeb4..f3aea3d 100644 --- a/src/features/response/index.ts +++ b/src/common/response/index.ts @@ -2,3 +2,7 @@ export * from './response'; export * from './response.code'; export * from './response.decorator'; export * from './response.interceptor'; +export * from './response.module'; +export * from './pagination.dto'; +export * from './http.filter'; +export * from './notcaptured.filter'; diff --git a/src/features/exception/all.filter.ts b/src/common/response/notcaptured.filter.ts similarity index 86% rename from src/features/exception/all.filter.ts rename to src/common/response/notcaptured.filter.ts index e05f2c1..89bd2f1 100644 --- a/src/features/exception/all.filter.ts +++ b/src/common/response/notcaptured.filter.ts @@ -1,6 +1,7 @@ import { ArgumentsHost, Catch, ExceptionFilter, HttpStatus } from '@nestjs/common'; import { Response as _Response } from 'express'; -import { Response, ResponseCode } from '../response'; +import { Response } from './response'; +import { ResponseCode } from './response.code'; @Catch() export class AllExecptionFilter implements ExceptionFilter { diff --git a/src/features/pagination/pagination.dto.ts b/src/common/response/pagination.dto.ts similarity index 81% rename from src/features/pagination/pagination.dto.ts rename to src/common/response/pagination.dto.ts index a56e9a1..3593193 100644 --- a/src/features/pagination/pagination.dto.ts +++ b/src/common/response/pagination.dto.ts @@ -1,11 +1,15 @@ import { Transform } from 'class-transformer'; import { IsNumber, IsOptional, Min } from 'class-validator'; +/** + * 分页 DTO + * @example { page: 1, size: 10 } + */ export class PaginationDto { /** * 页码 + * @example 1 */ - // @IsNumber() @IsOptional() @IsNumber() @Min(1) @@ -14,6 +18,7 @@ export class PaginationDto { /** * 每页条数 + * @example 10 */ @IsOptional() @IsNumber() diff --git a/src/features/response/response.code.ts b/src/common/response/response.code.ts similarity index 100% rename from src/features/response/response.code.ts rename to src/common/response/response.code.ts diff --git a/src/features/response/response.decorator.ts b/src/common/response/response.decorator.ts similarity index 100% rename from src/features/response/response.decorator.ts rename to src/common/response/response.decorator.ts diff --git a/src/features/response/response.interceptor.ts b/src/common/response/response.interceptor.ts similarity index 85% rename from src/features/response/response.interceptor.ts rename to src/common/response/response.interceptor.ts index 04fa355..fe7a01f 100644 --- a/src/features/response/response.interceptor.ts +++ b/src/common/response/response.interceptor.ts @@ -4,12 +4,11 @@ import { Observable, map } from 'rxjs'; import { Response } from './response'; import { RESPONSE_KEY, Respond } from './response.decorator'; import { Request } from 'express'; -import { ConfigService } from '@nestjs/config'; -import { Config } from '@/config'; +import { ConfigService } from '@/config'; @Injectable() export class ResponseInterceptor implements NestInterceptor { - constructor(private reflector: Reflector, private configService: ConfigService) {} + constructor(private reflector: Reflector, private config: ConfigService) {} intercept(context: ExecutionContext, next: CallHandler): Observable { const controller = context.getClass(); @@ -24,8 +23,8 @@ export class ResponseInterceptor implements NestInterceptor { const request = context.switchToHttp().getRequest(); const [list, total] = data; if (request.query.meta) { - const page = Number(request.query.page || this.configService.get('DEFAULT_PAGE', 1)); - const size = Number(request.query.size || this.configService.get('DEFAULT_SIZE', 10)); + const page = Number(request.query.page || this.config.defaultPage); + const size = Number(request.query.size || this.config.defaultPageSize); return Response.success({ data: list, meta: { diff --git a/src/common/response/response.module.ts b/src/common/response/response.module.ts new file mode 100644 index 0000000..0a20768 --- /dev/null +++ b/src/common/response/response.module.ts @@ -0,0 +1,39 @@ +import { Module } from '@nestjs/common'; +import { APP_FILTER, APP_INTERCEPTOR } from '@nestjs/core'; +import { AllExecptionFilter } from './notcaptured.filter'; +import { HttpExecptionFilter } from './http.filter'; +import { ResponseInterceptor } from './response.interceptor'; + +/** + * 响应模块 + * @description 包含全局异常/HTTP异常/响应结果拦截器 + */ +@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, + }, + ], +}) +export class ResponseModule {} diff --git a/src/features/response/response.ts b/src/common/response/response.ts similarity index 89% rename from src/features/response/response.ts rename to src/common/response/response.ts index cf01a07..cf64072 100644 --- a/src/features/response/response.ts +++ b/src/common/response/response.ts @@ -9,20 +9,14 @@ export class Response { * 状态码 * @example 2000 */ - @ApiProperty({ - type: 'number', - example: 2000, - }) + @ApiProperty({ type: 'number', example: 2000 }) code?: ResponseCode; /** * 响应消息 * @example '请求成功' */ - @ApiProperty({ - type: 'string', - example: '请求成功', - }) + @ApiProperty({ type: 'string', example: '请求成功' }) message?: string; /** @@ -40,6 +34,7 @@ export class Response { /** * 数据总数 + * @example 100 */ total?: number; diff --git a/src/common/serialization/index.ts b/src/common/serialization/index.ts new file mode 100644 index 0000000..389b256 --- /dev/null +++ b/src/common/serialization/index.ts @@ -0,0 +1 @@ +export * from './serialization.module'; diff --git a/src/common/serialization/serialization.module.ts b/src/common/serialization/serialization.module.ts new file mode 100644 index 0000000..feea81d --- /dev/null +++ b/src/common/serialization/serialization.module.ts @@ -0,0 +1,20 @@ +import { ClassSerializerInterceptor, Module } from '@nestjs/common'; +import { APP_INTERCEPTOR } from '@nestjs/core'; + +/** + * 序列化模块 + * @description 包含全局序列化拦截器 + */ +@Module({ + providers: [ + /** + * 全局序列化拦截器 + * @description 由于中间件的洋葱机制，需放在响应拦截器之前，否则无法检测到实例类型 + */ + { + provide: APP_INTERCEPTOR, + useClass: ClassSerializerInterceptor, + }, + ], +}) +export class SerializationModule {} diff --git a/src/common/static/index.ts b/src/common/static/index.ts new file mode 100644 index 0000000..9892839 --- /dev/null +++ b/src/common/static/index.ts @@ -0,0 +1 @@ +export * from './static.module'; diff --git a/src/common/static/static.module.ts b/src/common/static/static.module.ts new file mode 100644 index 0000000..5db8123 --- /dev/null +++ b/src/common/static/static.module.ts @@ -0,0 +1,21 @@ +import { ConfigService } from '@/config'; +import { ServeStaticModule as _ServeStaticModule } from '@nestjs/serve-static'; + +/** + * 静态资源模块 + * @see https://docs.nestjs.com/techniques/mvc#serve-static + */ +export const ServeStaticModule = _ServeStaticModule.forRootAsync({ + useFactory: (config: ConfigService) => { + return [ + { + rootPath: config.uploadDir, + serveRoot: config.uploadPrefix, + }, + { + rootPath: config.staticDir, + }, + ]; + }, + inject: [ConfigService], +}); diff --git a/src/common/swagger/index.ts b/src/common/swagger/index.ts new file mode 100644 index 0000000..0d9e11d --- /dev/null +++ b/src/common/swagger/index.ts @@ -0,0 +1,36 @@ +import { INestApplication } from '@nestjs/common'; +import { ConfigService } from '@/config'; +import { DocumentBuilder, SwaggerDocumentOptions, SwaggerModule } from '@nestjs/swagger'; +import { addResponseWrapper } from './util'; + +/** + * 初始化Swagger + * @param app 应用实例 + */ +export const initSwagger = (app: INestApplication) => { + const config = app.get(ConfigService); + const docConfig = new DocumentBuilder() + .setTitle(`${config.title}接口文档`) + .setVersion('1.0') + .setDescription('Openapi 3.0文档') + .setExternalDoc('JSON数据', `${config.apiDocPrefix}.json`) + .addTag('user', '用户管理') + .addTag('auth', '认证管理') + .addTag('role', '角色管理') + .addTag('permission', '权限管理') + .addTag('post', '文章管理') + .addTag('upload', '文件上传') + .build(); + const options: SwaggerDocumentOptions = { + operationIdFactory(controllerKey, methodKey) { + return `${controllerKey}_${methodKey}`; + }, + }; + const document = addResponseWrapper(SwaggerModule.createDocument(app, docConfig, options)); + SwaggerModule.setup(config.apiDocPrefix, app, document, { + jsonDocumentUrl: `${config.apiDocPrefix}.json`, + yamlDocumentUrl: `${config.apiDocPrefix}.yaml`, + customfavIcon: '/favicon.ico', + customSiteTitle: `接口文档 | ${config.subtitle}`, + }); +}; diff --git a/src/common/swagger/util.ts b/src/common/swagger/util.ts new file mode 100644 index 0000000..6643162 --- /dev/null +++ b/src/common/swagger/util.ts @@ -0,0 +1,69 @@ +import { OpenAPIObject } from '@nestjs/swagger'; + +/** + * 为所有接口添加统一的返回数据结构 + * @param doc OPENAPI文档对象 + * @example + * ```json + * { + * "code": 2000, + * "message": "请求成功", + * "data": [] + * } + * ``` + * @returns + */ +export function addResponseWrapper(doc: OpenAPIObject) { + for (const path of Object.keys(doc.paths)) { + const pathItem = doc.paths[path]; + if (!pathItem) { + continue; + } + for (const method of Object.keys(pathItem)) { + const responses = doc.paths[path][method].responses; + if (!responses) { + continue; + } + for (const status of Object.keys(responses)) { + const json = responses[status].content?.['application/json']; + if (!json) { + continue; + } + const schema = json.schema; + json.schema = { + allOf: [ + { + $ref: '#/components/schemas/Response', + }, + { + type: 'object', + properties: { + data: schema, + }, + }, + ], + }; + } + } + } + + doc.components.schemas.Response = { + type: 'object', + properties: { + code: { + type: 'integer', + description: '状态码', + example: 2000, + format: 'int32', + }, + message: { + type: 'string', + description: '提示信息', + example: '请求成功', + }, + }, + required: ['code', 'message'], + }; + + return doc; +} diff --git a/src/features/validation/index.ts b/src/common/validation/index.ts similarity index 74% rename from src/features/validation/index.ts rename to src/common/validation/index.ts index dc57334..f07e65a 100644 --- a/src/features/validation/index.ts +++ b/src/common/validation/index.ts @@ -1,3 +1,4 @@ export * from './validation.error'; export * from './validation.filter'; export * from './validation.pipe'; +export * from './validation.module'; diff --git a/src/features/validation/validation.error.ts b/src/common/validation/validation.error.ts similarity index 100% rename from src/features/validation/validation.error.ts rename to src/common/validation/validation.error.ts diff --git a/src/features/validation/validation.filter.ts b/src/common/validation/validation.filter.ts similarity index 76% rename from src/features/validation/validation.filter.ts rename to src/common/validation/validation.filter.ts index d1f6319..e5544da 100644 --- a/src/features/validation/validation.filter.ts +++ b/src/common/validation/validation.filter.ts @@ -1,4 +1,4 @@ -import { ArgumentsHost, Catch, ExceptionFilter } from '@nestjs/common'; +import { ArgumentsHost, Catch, ExceptionFilter, HttpStatus } from '@nestjs/common'; import { Response } from 'express'; import { ResponseCode } from '../response'; import { AppValidationError } from './validation.error'; @@ -11,6 +11,6 @@ export class ValidationExecptionFilter implements ExceptionFilter { const code = ResponseCode.PARAM_ERROR; const message = exception.message; const data = exception.messages; - response.status(400).json({ code, message, data }); + response.status(HttpStatus.BAD_REQUEST).json({ code, message, data }); } } diff --git a/src/common/validation/validation.module.ts b/src/common/validation/validation.module.ts new file mode 100644 index 0000000..b68e548 --- /dev/null +++ b/src/common/validation/validation.module.ts @@ -0,0 +1,30 @@ +import { Module } from '@nestjs/common'; +import { APP_FILTER, APP_PIPE } from '@nestjs/core'; +import { validationPipeFactory } from './validation.pipe'; +import { ValidationExecptionFilter } from './validation.filter'; + +/** + * 校验模块 + * @description 包含全局验证管道和全局验证异常过滤器 + */ +@Module({ + providers: [ + /** + * 全局验证管道 + * @description 校验和转换输入数据 + */ + { + provide: APP_PIPE, + useFactory: validationPipeFactory, + }, + /** + * 全局验证异常过滤器 + * @description 将验证异常统一包装成{code, message, data, meta}格式 + */ + { + provide: APP_FILTER, + useClass: ValidationExecptionFilter, + }, + ], +}) +export class ValidationModule {} diff --git a/src/features/validation/validation.pipe.ts b/src/common/validation/validation.pipe.ts similarity index 100% rename from src/features/validation/validation.pipe.ts rename to src/common/validation/validation.pipe.ts diff --git a/src/config/config.interface.ts b/src/config/config.interface.ts deleted file mode 100644 index 69f384c..0000000 --- a/src/config/config.interface.ts +++ /dev/null @@ -1,54 +0,0 @@ -export interface Config { - /** - * 服务器端口 - */ - SERVER_PORT: number; - /** - * 服务器地址 - */ - SERVER_HOST: string; - /** - * OPENAPI 地址 - */ - SERVER_OPENAPI_URL: string; - /** - * 应用名称 - */ - APP_TITLE: string; - /** - * 应用副标题 - */ - APP_SUBTITLE: string; - /** - * 数据库类型 - */ - DB_TYPE: string; - /** - * SQLite 数据库文件路径 - */ - DB_SQLITE_PATH: string; - /** - * 上传文件目录 - */ - UPLOAD_DIR: string; - /** - * 上传文件 URL - */ - UPLOAD_URL: string; - /** - * 静态文件目录 - */ - STATIC_DIR: string; - /** - * 默认分页 - */ - DEFAULT_PAGE: number; - /** - * 默认分页大小 - */ - DEFAULT_SIZE: number; - /** - * JWT 密钥 - */ - JWT_SECRET: string; -} diff --git a/src/config/config.module.ts b/src/config/config.module.ts index 60b586b..1592a0d 100644 --- a/src/config/config.module.ts +++ b/src/config/config.module.ts @@ -1,6 +1,19 @@ +import { Global, Module } from '@nestjs/common'; import { ConfigModule as _ConfigModule } from '@nestjs/config'; +import { ConfigService } from './config.service'; -export const ConfigModule = _ConfigModule.forRoot({ - envFilePath: ['.env.development', '.env.local', '.env'], - isGlobal: true, -}); +/** + * 配置模块 + * @description 基于 `@nestjs/config` 封装，提供更便捷且类型安全的配置读取方式 + */ +@Global() +@Module({ + imports: [ + _ConfigModule.forRoot({ + envFilePath: ['.env.development.locale', '.env.development', '.env.local', '.env'], + }), + ], + providers: [ConfigService], + exports: [ConfigService], +}) +export class ConfigModule {} diff --git a/src/config/config.service.ts b/src/config/config.service.ts new file mode 100644 index 0000000..09702a8 --- /dev/null +++ b/src/config/config.service.ts @@ -0,0 +1,156 @@ +import { Injectable } from '@nestjs/common'; +import { ConfigService as _ConfigService } from '@nestjs/config'; + +@Injectable() +export class ConfigService { + constructor( + /** + * `@nestjs/config` 的 ConfigService实例 + */ + public config: _ConfigService, + ) {} + + /** + * 保留原有的get方法 + */ + get(...args: [string, any]) { + return this.config.get(...args); + } + + /** + * 标题 + * @default 'Appnify' + */ + get title(): string { + return this.config.get('TITLE', 'Appnify'); + } + + /** + * 是否启用CORS(跨域) + * @default true + */ + get cors(): boolean { + return this.config.get('CORS', true); + } + + /** + * 副标题 + * @default 'Appnify' + */ + get subtitle(): string { + return this.config.get('SUBTITLE', 'Appnify'); + } + + /** + * API前缀 + * @default '/api' + */ + get apiPrefix(): string { + return this.config.get('API_PREFIX', '/api'); + } + + /** + * API默认版本 + * @default '1' + */ + get apiVersion(): string { + return this.config.get('API_VERSION', '1'); + } + + /** + * API文档前缀 + * @default '/openapi' + */ + get apiDocPrefix(): string { + const prefix = this.config.get('API_DOC_PREFIX', '/openapi'); + return prefix.startsWith('/') ? prefix : `/${prefix}`; + } + + /** + * 运行端口 + * @default 3030 + */ + get port(): number { + return Number(this.config.get('SERVER_PORT', 3030)); + } + + /** + * 运行地址 + * @default '0:0:0:0' + */ + get host(): string { + return this.config.get('SERVER_HOST', '0:0:0:0'); + } + + /** + * 数据库类型 + * @default 'sqlite' + */ + get dbType(): 'sqlite' | 'mysql' | 'mongodb' { + return this.config.get('DB_TYPE', 'sqlite'); + } + + /** + * SQLite数据库文件路径 + * @default './content/db.sqlite' + */ + get dbSqlitePath(): string { + return this.config.get('DB_SQLITE_PATH', './content/db.sqlite'); + } + + /** + * 上传文件目录 + * @default './content/uploads' + */ + get uploadDir(): string { + return this.config.get('UPLOAD_DIR', './content/uploads'); + } + + /** + * 上传文件URL前缀 + * @default '/uploads' + */ + get uploadPrefix(): string { + return this.config.get('UPLOAD_URL', '/uploads'); + } + + /** + * 静态文件目录 + * @default './content/static' + */ + get staticDir(): string { + return this.config.get('STATIC_DIR', './content/static'); + } + + /** + * 默认页码 + * @default 1 + */ + get defaultPage(): number { + return Number(this.config.get('DEFAULT_PAGE_NUMBER', 1)); + } + + /** + * 默认分页大小 + * @default 10 + */ + get defaultPageSize(): number { + return Number(this.config.get('DEFAULT_PAGE_SIZE', 10)); + } + + /** + * JWT密钥 + * @default 'todo' + */ + get jwtSecret(): string { + return this.config.get('JWT_SECRET', 'todo'); + } + + /** + * 日志保存目录 + * @default './content/logs' + */ + get logDir(): string { + return this.config.get('LOG_DIR', './content/logs'); + } +} diff --git a/src/config/index.ts b/src/config/index.ts index 3889da5..4bb549e 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -1,2 +1,2 @@ export * from './config.module'; -export * from './config.interface'; +export * from './config.service'; diff --git a/src/constants/env.ts b/src/constants/env.ts deleted file mode 100644 index 78d5d0b..0000000 --- a/src/constants/env.ts +++ /dev/null @@ -1,17 +0,0 @@ -/** - * 环境变量枚举 - */ -export enum envKeys { - /** - * 服务器地址 - */ - SERVER_HOST = 'SERVER_HOST', - /** - * 服务器端口 - */ - SERVER_PORT = 'SERVER_PORT', - /** - * 上传文件夹 - */ - UPLOAD_DIR = 'UPLOAD_DIR', -} diff --git a/src/constants/index.ts b/src/constants/index.ts deleted file mode 100644 index c1532d6..0000000 --- a/src/constants/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './env'; diff --git a/src/database/database.module.ts b/src/database/database.module.ts new file mode 100644 index 0000000..4a4f65b --- /dev/null +++ b/src/database/database.module.ts @@ -0,0 +1,24 @@ +import { TypeOrmModule } from '@nestjs/typeorm'; +import { ConfigService } from '@/config'; +import { SnakeNamingStrategy } from 'typeorm-naming-strategies'; + +/** + * 数据库模块 + * @description 基于 `typeorm` 封装 + */ +export const DatabaseModule = TypeOrmModule.forRootAsync({ + useFactory: (config: ConfigService) => { + if (config.dbType === 'sqlite') { + return { + type: config.dbType, + database: config.dbSqlitePath, + synchronize: true, + autoLoadEntities: true, + namingStrategy: new SnakeNamingStrategy(), + }; + } + if (config.dbType === 'mysql') { + } + }, + inject: [ConfigService], +}); diff --git a/src/database/datasource/index.ts b/src/database/datasource/index.ts new file mode 100644 index 0000000..4da42c4 --- /dev/null +++ b/src/database/datasource/index.ts @@ -0,0 +1,16 @@ +import { DataSource } from 'typeorm'; +import { SnakeNamingStrategy } from 'typeorm-naming-strategies'; +import { CreateUsersTable1682693329275 } from '../migrations/1682693329275-CreateUsersTable'; +import { MockPosts1685026010848 } from '../migrations/1685026010848-MockPosts'; + +/** + * 用于生成迁移文件 + */ +export default new DataSource({ + type: 'sqlite', + database: 'database/db.sqlite', + logging: false, + namingStrategy: new SnakeNamingStrategy(), + entities: ['src/**/*.entity.ts'], + migrations: [CreateUsersTable1682693329275, MockPosts1685026010848], +}); diff --git a/src/features/typeorm/entities/base.ts b/src/database/entities/base.ts similarity index 92% rename from src/features/typeorm/entities/base.ts rename to src/database/entities/base.ts index 962a626..d7cc7c3 100644 --- a/src/features/typeorm/entities/base.ts +++ b/src/database/entities/base.ts @@ -2,9 +2,10 @@ import { Exclude } from 'class-transformer'; import { Column, CreateDateColumn, DeleteDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'; /** - * 基础实体, 查询时默认按照id倒序 + * 基础实体 + * @description 所有实体都应该继承该类 */ -@Entity({ orderBy: { id: 'DESC' } }) +@Entity() export class BaseEntity { /** * 自增ID diff --git a/src/database/index.ts b/src/database/index.ts new file mode 100644 index 0000000..f345e6e --- /dev/null +++ b/src/database/index.ts @@ -0,0 +1,3 @@ +export * from './datasource'; +export * from './entities/base'; +export * from './database.module'; diff --git a/src/features/typeorm/migrations/1682693329275-CreateUsersTable.ts b/src/database/migrations/1682693329275-CreateUsersTable.ts similarity index 100% rename from src/features/typeorm/migrations/1682693329275-CreateUsersTable.ts rename to src/database/migrations/1682693329275-CreateUsersTable.ts diff --git a/src/features/typeorm/migrations/1685026010848-MockPosts.ts b/src/database/migrations/1685026010848-MockPosts.ts similarity index 100% rename from src/features/typeorm/migrations/1685026010848-MockPosts.ts rename to src/database/migrations/1685026010848-MockPosts.ts diff --git a/src/features/base/base.module.ts b/src/features/base/base.module.ts deleted file mode 100644 index 979f4a2..0000000 --- a/src/features/base/base.module.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Global, Module } from '@nestjs/common'; -import { LoggerService } from '../logger'; - -@Global() -@Module({ - providers: [LoggerService], -}) -export class BaseModule {} diff --git a/src/features/base/base.service.ts b/src/features/base/base.service.ts deleted file mode 100644 index 5d1def0..0000000 --- a/src/features/base/base.service.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Inject } from '@nestjs/common'; -import { ConfigService } from '@nestjs/config'; -import { Config } from '@/config'; - -export class BaseService { - @Inject(ConfigService) - protected readonly configService: ConfigService; - - /** - * 格式化分页参数 - */ - formatPagination(page?: number, size?: number) { - const _page = page || this.configService.get('DEFAULT_PAGE', 1); - const _size = size || this.configService.get('DEFAULT_SIZE', 10); - return { - skip: (_page - 1) * _size, - take: _size, - }; - } -} diff --git a/src/features/exception/index.ts b/src/features/exception/index.ts deleted file mode 100644 index 7354575..0000000 --- a/src/features/exception/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './all.filter'; -export * from './http.filter'; diff --git a/src/features/logger/logger.module.ts b/src/features/logger/logger.module.ts deleted file mode 100644 index 191271d..0000000 --- a/src/features/logger/logger.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Global, Module } from '@nestjs/common'; -import { LoggerService } from './logger.service'; - -@Global() -@Module({ - providers: [LoggerService], - exports: [LoggerService], -}) -export class LoggerModule {} diff --git a/src/features/pagination/index.ts b/src/features/pagination/index.ts deleted file mode 100644 index 8f40f7f..0000000 --- a/src/features/pagination/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './pagination'; -export * from './pagination.dto'; diff --git a/src/features/pagination/pagination.ts b/src/features/pagination/pagination.ts deleted file mode 100644 index df8410a..0000000 --- a/src/features/pagination/pagination.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { Response, ResponseCode } from '../response'; - -interface Options { - page: number; - size: number; - [key: string]: any; -} - -type WrapOptions = { - page: number; - size: number; - total: number; - data: T[]; -}; - -export const defaultPage = 1; - -export const defaultSize = 10; - -/** - * 分页工具类 - */ -export class Pagination { - /** - * 包装响应结果 - */ - static wrap(options: WrapOptions) { - const { page = defaultPage, size = defaultSize, total, data } = options; - return Response.create({ - code: ResponseCode.SUCESS, - message: '请求成功', - data, - meta: { page, size, total }, - }); - } - /** - * 将分页参数转换为typeorm查询参数 - */ - static optionize(options: Options) { - const { page = defaultPage, size: take = defaultSize, ...where } = options || {}; - const skip = (page - 1) * take; - return { skip, take, where }; - } -} diff --git a/src/features/serialization/index.ts b/src/features/serialization/index.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/features/static/index.ts b/src/features/static/index.ts deleted file mode 100644 index 8c69676..0000000 --- a/src/features/static/index.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { ConfigService } from '@nestjs/config'; -import { ServeStaticModule as _ServeStaticModule } from '@nestjs/serve-static'; -import { Config } from '@/config'; - -export const ServeStaticModule = _ServeStaticModule.forRootAsync({ - useFactory: (configService: ConfigService) => { - return [ - { - rootPath: configService.get('UPLOAD_DIR', 'uploads'), - serveRoot: configService.get('UPLOAD_URL', '/uploads'), - }, - { - rootPath: configService.get('STATIC_DIR', 'public'), - }, - ]; - }, - inject: [ConfigService], -}); diff --git a/src/features/swagger/index.ts b/src/features/swagger/index.ts deleted file mode 100644 index 593051a..0000000 --- a/src/features/swagger/index.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { INestApplication } from '@nestjs/common'; -import { ConfigService } from '@nestjs/config'; -import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger'; -import { Config } from '@/config'; - -export const initSwagger = (app: INestApplication) => { - const configService = app.get(ConfigService); - const openapiUrl = configService.get('SERVER_OPENAPI_URL', 'openapi'); - const appTitle = configService.get('APP_TITLE', 'Apptify'); - const appSubtitle = configService.get('APP_SUBTITLE', 'Apptify'); - const config = new DocumentBuilder() - .setTitle(`${appTitle}接口文档`) - .setVersion('1.0') - .setDescription('Openapi 3.0文档') - .setExternalDoc('JSON数据', `${openapiUrl}.json`) - .addTag('user', '用户管理') - .addTag('auth', '认证管理') - .addTag('role', '角色管理') - .addTag('permission', '权限管理') - .addTag('post', '文章管理') - .addTag('upload', '文件上传') - .build(); - const document = SwaggerModule.createDocument(app, config); - SwaggerModule.setup(openapiUrl, app, document, { - jsonDocumentUrl: `${openapiUrl}.json`, - yamlDocumentUrl: `${openapiUrl}.yaml`, - customfavIcon: '/favicon.ico', - customSiteTitle: `接口文档 | ${appSubtitle}`, - }); -}; diff --git a/src/features/typeorm/datasource/index.ts b/src/features/typeorm/datasource/index.ts deleted file mode 100644 index e87ab9c..0000000 --- a/src/features/typeorm/datasource/index.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { TypeOrmModuleOptions } from '@nestjs/typeorm'; -import { DataSource, DataSourceOptions } from 'typeorm'; -import { SnakeNamingStrategy } from 'typeorm-naming-strategies'; -import { CreateUsersTable1682693329275 } from '../migrations/1682693329275-CreateUsersTable'; -import { MockPosts1685026010848 } from '../migrations/1685026010848-MockPosts'; - -/** - * 基本配置 - */ -export const baseConfig: DataSourceOptions = { - type: 'sqlite', - database: 'database/db.sqlite', - logging: false, - namingStrategy: new SnakeNamingStrategy(), -}; - -/** - * 用于运行时连接数据库 - */ -export const ormConfig: TypeOrmModuleOptions = { - ...baseConfig, - synchronize: true, - autoLoadEntities: true, - logging: false, -}; - -/** - * 用于生成迁移文件 - */ -export const cliConfig: DataSourceOptions = { - ...baseConfig, - entities: ['src/**/*.entity.ts'], - migrations: [CreateUsersTable1682693329275, MockPosts1685026010848], -}; - -/** - * 用于生成迁移文件 - */ -export default new DataSource(cliConfig); diff --git a/src/features/typeorm/index.ts b/src/features/typeorm/index.ts deleted file mode 100644 index 0177a7b..0000000 --- a/src/features/typeorm/index.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { TypeOrmModule } from '@nestjs/typeorm'; -import { ormConfig } from './datasource'; -import { ConfigService } from '@nestjs/config'; -import { SnakeNamingStrategy } from 'typeorm-naming-strategies'; -import { Config } from '@/config'; -export * from './datasource'; -export * from './entities/base'; - -/** - * 连接数据库 - */ -export const TypeormModule = TypeOrmModule.forRootAsync({ - useFactory: (configService: ConfigService) => { - const type = configService.get('DB_TYPE', 'sqlite'); - if (type === 'sqlite') { - const database = configService.get('DB_SQLITE_PATH', 'database/db.sqlite'); - return { - type, - database, - synchronize: true, - autoLoadEntities: true, - namingStrategy: new SnakeNamingStrategy(), - }; - } - if (type === 'mysql') { - } - return ormConfig; - }, - inject: [ConfigService], -}); diff --git a/src/main.ts b/src/main.ts index c2317fe..a172c01 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,17 +1,21 @@ import { VersioningType } from '@nestjs/common'; import { NestFactory } from '@nestjs/core'; -import { initSwagger } from '@/features/swagger'; -import { LoggerService } from '@/features/logger'; +import { initSwagger } from '@/common/swagger'; +import { LoggerService } from '@/common/logger'; +import { ConfigService } from '@/config'; import { AppModule } from './app.module'; async function bootstrap() { - const { SERVER_HOST, SERVER_PORT } = process.env; /** * 创建应用 */ const app = await NestFactory.create(AppModule, { bufferLogs: false }); /** - * 使用全局日志 + * 获取配置服务 + */ + const config = app.get(ConfigService); + /** + * 获取日志服务 */ const logger = app.get(LoggerService); /** @@ -25,11 +29,11 @@ async function bootstrap() { /** * API前缀 */ - app.setGlobalPrefix('/api'); + app.setGlobalPrefix(config.apiPrefix); /** * 接口版本 */ - app.enableVersioning({ type: VersioningType.URI, defaultVersion: '1' }); + app.enableVersioning({ type: VersioningType.URI, defaultVersion: config.apiVersion }); /** * 接口文档(swagger) */ @@ -37,7 +41,7 @@ async function bootstrap() { /** * 监听端口 */ - await app.listen(SERVER_PORT, SERVER_HOST); + await app.listen(config.port, config.host); /** * 输出项目运行URL */ @@ -45,7 +49,7 @@ async function bootstrap() { /** * 输出接口文档URL */ - logger.log(`OpenapiDocs is running at ${await app.getUrl()}/openapi`, 'NestApplication'); + logger.log(`OpenapiDocs is running at ${await app.getUrl()}${config.apiDocPrefix}`, 'NestApplication'); } bootstrap(); diff --git a/src/modules/auth/auth.module.ts b/src/modules/auth/auth.module.ts index fd21799..ed7653e 100644 --- a/src/modules/auth/auth.module.ts +++ b/src/modules/auth/auth.module.ts @@ -2,12 +2,19 @@ import { Module } from '@nestjs/common'; import { UserModule } from '../user'; import { AuthController } from './auth.controller'; import { AuthService } from './auth.service'; -import { JwtModule } from './jwt'; +import { JwtGuard, JwtModule } from './jwt'; +import { APP_GUARD } from '@nestjs/core'; @Module({ controllers: [AuthController], imports: [UserModule, JwtModule], - providers: [AuthService], + providers: [ + AuthService, + { + provide: APP_GUARD, + useClass: JwtGuard, + }, + ], exports: [AuthService], }) export class AuthModule {} diff --git a/src/modules/auth/jwt/jwt-guard.ts b/src/modules/auth/jwt/jwt-guard.ts index 9123dbd..a40e997 100644 --- a/src/modules/auth/jwt/jwt-guard.ts +++ b/src/modules/auth/jwt/jwt-guard.ts @@ -3,17 +3,17 @@ import { Reflector } from '@nestjs/core'; import { Request } from 'express'; import { PUBLICK_KEY } from './jwt-decorator'; import { JwtService } from '@nestjs/jwt'; -import { ConfigService } from '@nestjs/config'; +import { ConfigService } from '@/config'; @Injectable() export class JwtGuard implements CanActivate { - constructor(private reflector: Reflector, private jwtService: JwtService, private configService: ConfigService) {} + constructor(private reflector: Reflector, private jwtService: JwtService, private config: ConfigService) {} async canActivate(context: ExecutionContext): Promise { const request = context.switchToHttp().getRequest(); const token = this.extractTokenFromHeader(request); if (token) { - const secret = this.configService.get('JWT_SECRET'); + const secret = this.config.jwtSecret; const user = await this.jwtService.verifyAsync(token, { secret }); request['user'] = user; } diff --git a/src/modules/auth/jwt/jwt-module.ts b/src/modules/auth/jwt/jwt-module.ts index 48ecbb6..b9a3ffd 100644 --- a/src/modules/auth/jwt/jwt-module.ts +++ b/src/modules/auth/jwt/jwt-module.ts @@ -1,11 +1,10 @@ -import { Config } from '@/config'; -import { ConfigService } from '@nestjs/config'; +import { ConfigService } from '@/config'; import { JwtModule as _JwtModule } from '@nestjs/jwt'; export const JwtModule = _JwtModule.registerAsync({ - useFactory: (configService: ConfigService) => { + useFactory: (config: ConfigService) => { return { - secret: configService.get('JWT_SECRET', 'todo'), + secret: config.jwtSecret, signOptions: { expiresIn: '60000s', }, diff --git a/src/modules/permission/entities/permission.entity.ts b/src/modules/permission/entities/permission.entity.ts index 30e793b..34440b0 100644 --- a/src/modules/permission/entities/permission.entity.ts +++ b/src/modules/permission/entities/permission.entity.ts @@ -1,4 +1,4 @@ -import { BaseEntity } from '@/features/typeorm'; +import { BaseEntity } from '@/database'; import { Role } from '@/modules/role/entities/role.entity'; import { Column, Entity, ManyToMany } from 'typeorm'; diff --git a/src/modules/permission/index.ts b/src/modules/permission/index.ts index 0fd49eb..da68c36 100644 --- a/src/modules/permission/index.ts +++ b/src/modules/permission/index.ts @@ -4,3 +4,5 @@ export * from './entities/permission.entity'; export * from './permission.controller'; export * from './permission.module'; export * from './permission.service'; +export * from './permission.decorator'; +export * from './permission.guard'; diff --git a/src/modules/permission/permission.controller.ts b/src/modules/permission/permission.controller.ts index a311d28..89b2f17 100644 --- a/src/modules/permission/permission.controller.ts +++ b/src/modules/permission/permission.controller.ts @@ -3,7 +3,7 @@ import { PermissionService } from './permission.service'; import { CreatePermissionDto } from './dto/create-permission.dto'; import { UpdatePermissionDto } from './dto/update-permission.dto'; import { ApiOperation, ApiTags } from '@nestjs/swagger'; -import { Respond } from '@/features/response'; +import { Respond } from '@/common/response'; @ApiTags('permission') @Controller('permissions') diff --git a/src/features/permission/permission.decorator.ts b/src/modules/permission/permission.decorator.ts similarity index 86% rename from src/features/permission/permission.decorator.ts rename to src/modules/permission/permission.decorator.ts index 6aa2b9f..d603f06 100644 --- a/src/features/permission/permission.decorator.ts +++ b/src/modules/permission/permission.decorator.ts @@ -29,6 +29,6 @@ export const enum PermissionEnum { * @param permissions * @returns */ -export function Permission(...permissions: PermissionEnum[]) { +export function NeedPermission(...permissions: PermissionEnum[]) { return SetMetadata(PERMISSION_KEY, permissions); } diff --git a/src/features/permission/permission.guard.ts b/src/modules/permission/permission.guard.ts similarity index 80% rename from src/features/permission/permission.guard.ts rename to src/modules/permission/permission.guard.ts index b5495f5..8afb82c 100644 --- a/src/features/permission/permission.guard.ts +++ b/src/modules/permission/permission.guard.ts @@ -1,11 +1,11 @@ -import { CanActivate, ExecutionContext, Injectable, UnauthorizedException } from '@nestjs/common'; +import { CanActivate, ExecutionContext, Inject, Injectable, UnauthorizedException, forwardRef } from '@nestjs/common'; import { Reflector } from '@nestjs/core'; import { PERMISSION_KEY } from './permission.decorator'; import { UserService } from '@/modules/user'; @Injectable() export class PermissionGuard implements CanActivate { - constructor(private reflector: Reflector, private userService: UserService) {} + constructor(private reflector: Reflector, @Inject(forwardRef(() => UserService)) private userService: UserService) {} async canActivate(context: ExecutionContext): Promise { const controller = context.getClass(); @@ -21,7 +21,6 @@ export class PermissionGuard implements CanActivate { const userPermissions = await this.userService.findUserPermissions(user.id); const hasPermission = permissions.every((permission) => userPermissions.includes(permission)); if (!hasPermission) { - console.log(userPermissions, permissions); throw new UnauthorizedException('权限不足'); } return true; diff --git a/src/modules/permission/permission.module.ts b/src/modules/permission/permission.module.ts index 7997ccb..e9af880 100644 --- a/src/modules/permission/permission.module.ts +++ b/src/modules/permission/permission.module.ts @@ -1,12 +1,21 @@ -import { Module } from '@nestjs/common'; +import { Module, forwardRef } from '@nestjs/common'; import { PermissionService } from './permission.service'; import { PermissionController } from './permission.controller'; import { TypeOrmModule } from '@nestjs/typeorm'; import { Permission } from './entities/permission.entity'; +import { APP_GUARD } from '@nestjs/core'; +import { PermissionGuard } from './permission.guard'; +import { UserModule } from '../user'; @Module({ - imports: [TypeOrmModule.forFeature([Permission])], + imports: [TypeOrmModule.forFeature([Permission]), forwardRef(() => UserModule)], controllers: [PermissionController], - providers: [PermissionService], + providers: [ + PermissionService, + { + provide: APP_GUARD, + useClass: PermissionGuard, + }, + ], }) export class PermissionModule {} diff --git a/src/modules/permission/permission.service.ts b/src/modules/permission/permission.service.ts index ebc4309..eeb5a14 100644 --- a/src/modules/permission/permission.service.ts +++ b/src/modules/permission/permission.service.ts @@ -23,8 +23,13 @@ export class PermissionService { return `This action returns a #${id} permission`; } +<<<<<<< HEAD async update(id: number, updatePermissionDto: UpdatePermissionDto) { await this.permissionRepository.update(id, updatePermissionDto); +======= + update(id: number, updatePermissionDto: UpdatePermissionDto) { + return this.permissionRepository.update(id, updatePermissionDto); +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 } remove(id: number) { diff --git a/src/modules/post/entities/post.entity.ts b/src/modules/post/entities/post.entity.ts index 71d5eee..7734f86 100644 --- a/src/modules/post/entities/post.entity.ts +++ b/src/modules/post/entities/post.entity.ts @@ -1,4 +1,4 @@ -import { BaseEntity } from '@/features/typeorm'; +import { BaseEntity } from '@/database'; import { User } from 'src/modules/user'; import { Column, Entity, ManyToMany } from 'typeorm'; diff --git a/src/modules/post/post.service.ts b/src/modules/post/post.service.ts index 61a0dbe..494d484 100644 --- a/src/modules/post/post.service.ts +++ b/src/modules/post/post.service.ts @@ -1,26 +1,33 @@ import { Injectable } from '@nestjs/common'; import { CreatePostDto } from './dto/create-post.dto'; import { UpdatePostDto } from './dto/update-post.dto'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Post } from './entities/post.entity'; +import { Repository } from 'typeorm'; @Injectable() export class PostService { - create(createPostDto: CreatePostDto) { - return 'This action adds a new post'; + constructor(@InjectRepository(Post) private postRepository: Repository) {} + + async create(createPostDto: CreatePostDto) { + const post = this.postRepository.create(createPostDto); + await this.postRepository.save(post); + return post.id; } findAll() { - return `This action returns all post`; + return this.postRepository.findAndCount(); } findOne(id: number) { - return `This action returns a #${id} post`; + return this.postRepository.findOne({ where: { id } }); } update(id: number, updatePostDto: UpdatePostDto) { - return `This action updates a #${id} post`; + return this.postRepository.update(id, updatePostDto); } remove(id: number) { - return `This action removes a #${id} post`; + return this.postRepository.softDelete(id); } } diff --git a/src/modules/role/entities/role.entity.ts b/src/modules/role/entities/role.entity.ts index 57d4084..44ed513 100644 --- a/src/modules/role/entities/role.entity.ts +++ b/src/modules/role/entities/role.entity.ts @@ -1,4 +1,4 @@ -import { BaseEntity } from '@/features/typeorm'; +import { BaseEntity } from '@/database'; import { Permission } from '@/modules/permission/entities/permission.entity'; import { User } from 'src/modules/user'; import { Column, Entity, JoinTable, ManyToMany } from 'typeorm'; diff --git a/src/modules/role/role.controller.ts b/src/modules/role/role.controller.ts index cfe207d..d298fbf 100644 --- a/src/modules/role/role.controller.ts +++ b/src/modules/role/role.controller.ts @@ -3,7 +3,7 @@ import { ApiOperation, ApiTags } from '@nestjs/swagger'; import { CreateRoleDto } from './dto/create-role.dto'; import { UpdateRoleDto } from './dto/update-role.dto'; import { RoleService } from './role.service'; -import { Respond } from '@/features/response'; +import { Respond } from '@/common/response'; @ApiTags('role') @Controller('roles') diff --git a/src/modules/role/role.service.ts b/src/modules/role/role.service.ts index e933427..d8443d5 100644 --- a/src/modules/role/role.service.ts +++ b/src/modules/role/role.service.ts @@ -26,11 +26,16 @@ export class RoleService { return `This action returns a #${id} role`; } +<<<<<<< HEAD async update(id: number, updateRoleDto: UpdateRoleDto) { if (updateRoleDto.permissions) { delete updateRoleDto.permissions; } await this.roleRepository.update(id, updateRoleDto); +======= + update(id: number, updateRoleDto: UpdateRoleDto) { + return this.roleRepository.update(id, updateRoleDto); +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 } remove(id: number) { diff --git a/src/modules/upload/dto/create-upload.dto.ts b/src/modules/upload/dto/create-upload.dto.ts index b9ec6cd..cf80dc1 100644 --- a/src/modules/upload/dto/create-upload.dto.ts +++ b/src/modules/upload/dto/create-upload.dto.ts @@ -1 +1,6 @@ -export class CreateUploadDto {} +import { ApiProperty } from '@nestjs/swagger'; + +export class CreateUploadDto { + @ApiProperty({ type: 'string', format: 'binary' }) + file: any; +} diff --git a/src/modules/upload/entities/upload.entity.ts b/src/modules/upload/entities/upload.entity.ts index 406c261..000d6d2 100644 --- a/src/modules/upload/entities/upload.entity.ts +++ b/src/modules/upload/entities/upload.entity.ts @@ -1,4 +1,4 @@ -import { BaseEntity } from '@/features/typeorm'; +import { BaseEntity } from '@/database'; import { Column, Entity } from 'typeorm'; @Entity() diff --git a/src/modules/upload/upload.controller.ts b/src/modules/upload/upload.controller.ts index f695ad9..58968ed 100644 --- a/src/modules/upload/upload.controller.ts +++ b/src/modules/upload/upload.controller.ts @@ -1,8 +1,9 @@ import { Controller, Delete, Get, Param, Patch, Post, UploadedFile, UseInterceptors } from '@nestjs/common'; -import { ApiOperation, ApiTags } from '@nestjs/swagger'; +import { ApiBody, ApiConsumes, ApiOperation, ApiTags } from '@nestjs/swagger'; import { UploadService } from './upload.service'; import { FileInterceptor } from '@nestjs/platform-express'; -import { Respond } from '@/features/response'; +import { Respond } from '@/common/response'; +import { CreateUploadDto } from './dto/create-upload.dto'; @ApiTags('upload') @Controller('upload') @@ -12,6 +13,8 @@ export class UploadController { @Post() @UseInterceptors(FileInterceptor('file')) @ApiOperation({ summary: '上传文件', operationId: 'upload' }) + @ApiConsumes('multipart/form-data') + @ApiBody({ description: '文件', type: CreateUploadDto }) create(@UploadedFile() file: Express.Multer.File) { return this.uploadService.create(file); } diff --git a/src/modules/upload/upload.module.ts b/src/modules/upload/upload.module.ts index 431fe28..2ca83ce 100644 --- a/src/modules/upload/upload.module.ts +++ b/src/modules/upload/upload.module.ts @@ -2,7 +2,7 @@ import { Module } from '@nestjs/common'; import { UploadController } from './upload.controller'; import { UploadService } from './upload.service'; import { MulterModule } from '@nestjs/platform-express'; -import { ConfigService } from '@nestjs/config'; +import { ConfigService } from '@/config'; import dayjs from 'dayjs'; import { join, parse } from 'path'; import { diskStorage } from 'multer'; @@ -13,8 +13,8 @@ import { Upload } from './entities/upload.entity'; imports: [ TypeOrmModule.forFeature([Upload]), MulterModule.registerAsync({ - useFactory: async (configService) => { - const dest = configService.get('UPLOAD_FOLDER', './public/upload'); + useFactory: async (config: ConfigService) => { + const dest = config.uploadDir; const storage = diskStorage({ destination: join(dest), filename: (req, file, cb) => { diff --git a/src/modules/user/dto/find-user.dto.ts b/src/modules/user/dto/find-user.dto.ts index 98e5dec..c2ef4a3 100644 --- a/src/modules/user/dto/find-user.dto.ts +++ b/src/modules/user/dto/find-user.dto.ts @@ -1,8 +1,16 @@ import { PaginationDto } from '@/features/pagination'; import { IntersectionType } from '@nestjs/swagger'; import { IsOptional, IsString } from 'class-validator'; +<<<<<<< HEAD +======= +import { PaginationDto } from '@/common/response'; +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 export class FindUserDto extends IntersectionType(PaginationDto) { + /** + * 用户昵称 + * @example '绝弹' + */ @IsOptional() @IsString() nickname?: string; diff --git a/src/modules/user/dto/index.ts b/src/modules/user/dto/index.ts deleted file mode 100644 index 9375b1b..0000000 --- a/src/modules/user/dto/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './create-user.dto'; -export * from './update-user.dto'; diff --git a/src/modules/user/entities/index.ts b/src/modules/user/entities/index.ts deleted file mode 100644 index e4aa507..0000000 --- a/src/modules/user/entities/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './user.entity'; diff --git a/src/modules/user/entities/user.entity.ts b/src/modules/user/entities/user.entity.ts index fd33b2d..1b41fe4 100644 --- a/src/modules/user/entities/user.entity.ts +++ b/src/modules/user/entities/user.entity.ts @@ -1,6 +1,6 @@ import { ApiHideProperty } from '@nestjs/swagger'; import { Exclude } from 'class-transformer'; -import { BaseEntity } from '@/features/typeorm'; +import { BaseEntity } from '@/database'; import { Post } from '@/modules/post'; import { Role } from '@/modules/role'; import { Column, Entity, JoinTable, ManyToMany } from 'typeorm'; @@ -61,6 +61,7 @@ export class User extends BaseEntity { /** * 用户角色 */ + @ApiHideProperty() @ManyToMany(() => Role, (role) => role.user) @JoinTable() roles: Role[]; diff --git a/src/modules/user/index.ts b/src/modules/user/index.ts index c79ecff..7b31d0e 100644 --- a/src/modules/user/index.ts +++ b/src/modules/user/index.ts @@ -1,5 +1,6 @@ -export * from './dto'; -export * from './entities'; +export * from './dto/create-user.dto'; +export * from './dto/update-user.dto'; +export * from './entities/user.entity'; export * from './user.controller'; export * from './user.module'; export * from './user.service'; diff --git a/src/modules/user/user.controller.ts b/src/modules/user/user.controller.ts index bcfc600..c6ede92 100644 --- a/src/modules/user/user.controller.ts +++ b/src/modules/user/user.controller.ts @@ -2,10 +2,20 @@ import { BaseController } from '@/features/base'; import { Respond } from '@/features/response'; import { Body, Controller, Delete, Get, Param, Patch, Post, Query, Version } from '@nestjs/common'; import { ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger'; +<<<<<<< HEAD import { CreateUserDto, UpdateUserDto } from './dto'; +======= +import { Respond } from '@/common/response'; +import { BaseController } from '@/common/base'; +import { CreateUserDto } from './dto/create-user.dto'; +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 import { FindUserDto } from './dto/find-user.dto'; -import { User } from './entities'; +import { User } from './entities/user.entity'; import { UserService } from './user.service'; +<<<<<<< HEAD +======= +import { UpdateUserDto } from './dto/update-user.dto'; +>>>>>>> 1a32173fc73bbb94906f9ffde5874d47f6dfdad8 @ApiTags('user') @Controller('users') @@ -15,7 +25,7 @@ export class UserController extends BaseController { } @Post() - @ApiOperation({ summary: '创建用户', operationId: 'addUser' }) + @ApiOperation({ description: '创建用户', operationId: 'addUser' }) create(@Body() createUserDto: CreateUserDto) { return this.userService.create(createUserDto); } @@ -23,26 +33,26 @@ export class UserController extends BaseController { @Get() @Respond(Respond.PAGINATION) @ApiOkResponse({ isArray: true, type: User }) - @ApiOperation({ summary: '批量查询', operationId: 'getUsers' }) + @ApiOperation({ description: '批量查询用户', operationId: 'getUsers' }) async findMany(@Query() query: FindUserDto) { return this.userService.findMany(query); } - @Version('2') @Get(':id') - @ApiOperation({ summary: '查询用户', operationId: 'getUserv2' }) + @Version('2') + @ApiOperation({ description: '查询用户', operationId: 'getUserv2' }) findOne(@Param('id') id: number) { return this.userService.findOne(+id); } @Patch(':id') - @ApiOperation({ summary: '更新用户', operationId: 'setUser' }) + @ApiOperation({ description: '更新用户', operationId: 'updateUser' }) update(@Param('id') id: number, @Body() updateUserDto: UpdateUserDto) { return this.userService.update(+id, updateUserDto); } @Delete(':id') - @ApiOperation({ summary: '删除用户', operationId: 'delUser' }) + @ApiOperation({ description: '删除用户', operationId: 'deleteUser' }) remove(@Param('id') id: number) { return this.userService.remove(+id); } diff --git a/src/modules/user/user.module.ts b/src/modules/user/user.module.ts index fc5c29f..79b9575 100644 --- a/src/modules/user/user.module.ts +++ b/src/modules/user/user.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { User } from './entities'; +import { User } from './entities/user.entity'; import { UserController } from './user.controller'; import { UserService } from './user.service'; diff --git a/src/modules/user/user.service.ts b/src/modules/user/user.service.ts index 3e2634b..e116bb4 100644 --- a/src/modules/user/user.service.ts +++ b/src/modules/user/user.service.ts @@ -1,10 +1,11 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Like, Repository } from 'typeorm'; -import { CreateUserDto, UpdateUserDto } from './dto'; import { FindUserDto } from './dto/find-user.dto'; -import { User } from './entities'; -import { BaseService } from '@/features/base'; +import { User } from './entities/user.entity'; +import { BaseService } from '@/common/base'; +import { CreateUserDto } from './dto/create-user.dto'; +import { UpdateUserDto } from './dto/update-user.dto'; @Injectable() export class UserService extends BaseService { @@ -36,7 +37,6 @@ export class UserService extends BaseService { where: { nickname: nickname && Like(`%${nickname}%`), }, - relations: ['roles'], }); } diff --git a/src/types/env.d.ts b/src/types/env.d.ts index 4d0b5ae..97630b3 100644 --- a/src/types/env.d.ts +++ b/src/types/env.d.ts @@ -1,24 +1,5 @@ declare namespace NodeJS { interface ProcessEnv { - /** - * 运行端口 - */ - SERVER_PORT: number; - /** - * 运行IP - */ - SERVER_HOST: string; - /** - * 项目根目录路径 - */ - ROOT_PATH: string; - /** - * 环境变量 - */ NODE_ENV: 'development' | 'production' | 'test'; - /** - * 上传文件夹 - */ - UPLOAD_DIR: string; } } diff --git a/tsconfig.json b/tsconfig.json index ed2a986..27f9535 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ "removeComments": true, "emitDecoratorMetadata": true, "experimentalDecorators": true, - "target": "es2017", + "target": "ESNext", "sourceMap": true, "outDir": "./dist", "baseUrl": "./",