From c7e166d7cbcb63518f1f2d24e9a5d8e04fbfbd54 Mon Sep 17 00:00:00 2001 From: HectorxH Date: Thu, 25 Apr 2024 16:21:35 -0400 Subject: [PATCH 1/3] Revert "Test update" --- .env.example | 10 - .gitignore | 2 - package-lock.json | 1169 ++++++----------- package.json | 6 +- public/favicon.ico | Bin 0 -> 4286 bytes public/icon.png | Bin 1245 -> 0 bytes public/index.html | 2 +- src/app/filter/domain/Filter.ts | 68 - src/app/filter/domain/Filter.types.ts | 33 - src/app/target/domain/Target.ts | 7 +- src/app/target/domain/Target.types.ts | 15 - src/app/target/infrastructure/TargetParser.ts | 12 +- .../infrastructure/TargetService.types.ts | 4 - .../__tests__/TargetService.mock.ts | 16 - .../__tests__/TargetService.spec.ts | 41 - src/app/watchlist/domain/Watchlist.types.ts | 12 - .../infrastructure/WatchlistParser.ts | 10 - .../infrastructure/WatchlistService.ts | 21 - .../infrastructure/WatchlistService.types.ts | 9 - .../__tests__/WatchlistService.mock.ts | 41 - .../use_case/EditTargetsWatchlist.ts | 29 - src/shared/http/HttpService.mock.ts | 16 +- src/shared/http/HttpService.ts | 12 +- src/shared/http/mocks/target.mocks.ts | 8 - src/shared/types/filter.types.ts | 17 - src/ui/app.container.ts | 2 - src/ui/components/watchlist/FormFilter.vue | 295 ----- src/ui/components/watchlist/MyWatchlists.vue | 16 +- src/ui/components/watchlist/TargetList.vue | 380 +----- .../watchlist/__tests__/TargetList.spec.ts | 16 - src/ui/store/singleWatchlist/actions.ts | 36 - .../store/targets/__tests__/actions.spec.ts | 12 +- .../store/targets/__tests__/mutations.spec.ts | 4 - src/ui/store/targets/actions.ts | 32 +- src/ui/store/targets/mutations.ts | 1 - src/ui/store/targets/state.ts | 2 - 36 files changed, 499 insertions(+), 1857 deletions(-) delete mode 100644 .env.example create mode 100644 public/favicon.ico delete mode 100644 public/icon.png delete mode 100644 src/app/filter/domain/Filter.ts delete mode 100644 src/app/filter/domain/Filter.types.ts delete mode 100644 src/app/watchlist/use_case/EditTargetsWatchlist.ts delete mode 100644 src/shared/types/filter.types.ts delete mode 100644 src/ui/components/watchlist/FormFilter.vue diff --git a/.env.example b/.env.example deleted file mode 100644 index 06ea7b9..0000000 --- a/.env.example +++ /dev/null @@ -1,10 +0,0 @@ -NODE_ENV=development - -VUE_APP_APP_TITLE="ALeRCE Watchlist - Dev Build" -VUE_APP_USER_API="http://localhost:8000" -VUE_APP_GOOGLE_REDIRECT_URI="" -VUE_APP_FORCE_HTTPS=false - -AWS_BUCKET_NAME="" -AWS_ACCESS_KEY_ID="" -AWS_SECRET_ACCESS_KEY="" \ No newline at end of file diff --git a/.gitignore b/.gitignore index cc19055..0732740 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,3 @@ pnpm-debug.log* /.log /coverage .dir-locals.el - -.env diff --git a/package-lock.json b/package-lock.json index 2e535d7..8974702 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.0", "dependencies": { "@mdi/font": "^5.9.55", + "@types/papaparse": "5.2.6", "axios": "^0.21.1", "core-js": "^3.6.5", "inversify-props": "^2.2.6", @@ -24,8 +25,7 @@ "vuex": "^3.4.0" }, "devDependencies": { - "@types/jest": "^24.9.1", - "@types/papaparse": "5.2.6", + "@types/jest": "^24.0.19", "@typescript-eslint/eslint-plugin": "^4.18.0", "@typescript-eslint/parser": "^4.18.0", "@vue/cli-plugin-babel": "~4.5.0", @@ -126,10 +126,9 @@ } }, "node_modules/@babel/cli/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -143,13 +142,11 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.24.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", - "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/highlight": "^7.24.2", - "picocolors": "^1.0.0" + "@babel/highlight": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -193,23 +190,20 @@ } }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/generator": { - "version": "7.24.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz", - "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==", + "version": "7.20.7", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.24.0", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", + "@babel/types": "^7.20.7", + "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, "engines": { @@ -217,14 +211,13 @@ } }, "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "version": "0.3.2", "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/set-array": "^1.2.1", + "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" + "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { "node": ">=6.0.0" @@ -280,10 +273,9 @@ } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -346,19 +338,17 @@ } }, "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "version": "7.18.9", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -375,25 +365,23 @@ } }, "node_modules/@babel/helper-function-name": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", - "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "version": "7.19.0", "dev": true, + "license": "MIT", "dependencies": { - "@babel/template": "^7.22.15", - "@babel/types": "^7.23.0" + "@babel/template": "^7.18.10", + "@babel/types": "^7.19.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -514,31 +502,28 @@ } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", - "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", + "version": "7.19.4", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "version": "7.19.1", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -579,24 +564,21 @@ } }, "node_modules/@babel/highlight": { - "version": "7.24.2", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz", - "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.20", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "@babel/helper-validator-identifier": "^7.18.6", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.24.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz", - "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==", + "version": "7.20.7", + "license": "MIT", "bin": { "parser": "bin/babel-parser.js" }, @@ -1486,10 +1468,9 @@ } }, "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -1700,10 +1681,9 @@ } }, "node_modules/@babel/preset-env/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -1735,34 +1715,32 @@ } }, "node_modules/@babel/template": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", - "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", + "version": "7.20.7", "dev": true, + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.24.0", - "@babel/types": "^7.24.0" + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz", - "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.24.1", - "@babel/generator": "^7.24.1", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.24.1", - "@babel/types": "^7.24.0", - "debug": "^4.3.1", + "version": "7.20.12", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.20.7", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.19.0", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "debug": "^4.1.0", "globals": "^11.1.0" }, "engines": { @@ -1770,13 +1748,12 @@ } }, "node_modules/@babel/types": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", - "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", + "version": "7.20.7", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.23.4", - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-validator-identifier": "^7.19.1", "to-fast-properties": "^2.0.0" }, "engines": { @@ -2357,10 +2334,9 @@ } }, "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "version": "1.1.2", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -2371,13 +2347,12 @@ "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "version": "0.3.17", "dev": true, + "license": "MIT", "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "node_modules/@mdi/font": { @@ -2653,9 +2628,8 @@ }, "node_modules/@types/jest": { "version": "24.9.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz", - "integrity": "sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==", "dev": true, + "license": "MIT", "dependencies": { "jest-diff": "^24.3.0" } @@ -2682,7 +2656,6 @@ }, "node_modules/@types/node": { "version": "18.11.18", - "dev": true, "license": "MIT" }, "node_modules/@types/normalize-package-data": { @@ -2692,7 +2665,6 @@ }, "node_modules/@types/papaparse": { "version": "5.2.6", - "dev": true, "license": "MIT", "dependencies": { "@types/node": "*" @@ -3059,10 +3031,9 @@ } }, "node_modules/@vue/babel-preset-app/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -4240,10 +4211,9 @@ } }, "node_modules/@vue/cli-shared-utils/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -4927,21 +4897,20 @@ } }, "node_modules/asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", + "version": "5.4.1", "dev": true, + "license": "MIT", "dependencies": { "bn.js": "^4.0.0", "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" } }, "node_modules/asn1.js/node_modules/bn.js": { "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/assert": { "version": "1.5.0", @@ -5086,11 +5055,9 @@ } }, "node_modules/aws-sdk": { - "version": "2.1591.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1591.0.tgz", - "integrity": "sha512-9HbejaKZM89OK4YpE5TpjJItAtU1xhsFvy2p9qZN7nEpfx3G0FpepaW2fdpHu51gFeUn1+g0XUwekyq2N/Xagw==", + "version": "2.1291.0", "dev": true, - "hasInstallScript": true, + "license": "Apache-2.0", "dependencies": { "buffer": "4.9.2", "events": "1.1.1", @@ -5101,7 +5068,7 @@ "url": "0.10.3", "util": "^0.12.4", "uuid": "8.0.0", - "xml2js": "0.6.2" + "xml2js": "0.4.19" }, "engines": { "node": ">= 10.0.0" @@ -5429,10 +5396,9 @@ } }, "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -5741,13 +5707,12 @@ "license": "MIT" }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.1", "dev": true, + "license": "MIT", "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.5", + "content-type": "~1.0.4", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -5755,7 +5720,7 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", - "raw-body": "2.5.2", + "raw-body": "2.5.1", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -5766,24 +5731,21 @@ }, "node_modules/body-parser/node_modules/debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/body-parser/node_modules/qs": { "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.4" }, @@ -5904,37 +5866,32 @@ } }, "node_modules/browserify-sign": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz", - "integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==", + "version": "4.2.1", "dev": true, + "license": "ISC", "dependencies": { - "bn.js": "^5.2.1", - "browserify-rsa": "^4.1.0", + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.5", - "hash-base": "~3.0", + "elliptic": "^6.5.3", "inherits": "^2.0.4", - "parse-asn1": "^5.1.7", - "readable-stream": "^2.3.8", - "safe-buffer": "^5.2.1" - }, - "engines": { - "node": ">= 0.12" + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" } }, - "node_modules/browserify-sign/node_modules/hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==", + "node_modules/browserify-sign/node_modules/readable-stream": { + "version": "3.6.0", "dev": true, + "license": "MIT", "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" }, "engines": { - "node": ">=4" + "node": ">= 6" } }, "node_modules/browserify-zlib": { @@ -6036,9 +5993,8 @@ }, "node_modules/bytes": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -6321,20 +6277,6 @@ "fsevents": "~2.3.2" } }, - "node_modules/chokidar/node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/chownr": { "version": "1.1.4", "dev": true, @@ -6903,10 +6845,9 @@ } }, "node_modules/content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "version": "1.0.4", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -6917,10 +6858,9 @@ "license": "MIT" }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.5.0", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -7186,10 +7126,9 @@ } }, "node_modules/copy-webpack-plugin/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -7299,10 +7238,9 @@ } }, "node_modules/cross-spawn/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -7464,10 +7402,9 @@ } }, "node_modules/css-loader/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -8455,10 +8392,9 @@ } }, "node_modules/editorconfig/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -8488,10 +8424,9 @@ "license": "ISC" }, "node_modules/elliptic": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz", - "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==", + "version": "6.5.4", "dev": true, + "license": "MIT", "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", @@ -8870,10 +8805,9 @@ } }, "node_modules/eslint-plugin-vue/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -8965,10 +8899,9 @@ } }, "node_modules/eslint/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -9253,17 +9186,16 @@ } }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.18.2", "dev": true, + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.1", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.5.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -9742,15 +9674,14 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "version": "1.15.2", "funding": [ { "type": "individual", "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -10017,10 +9948,9 @@ } }, "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -10128,25 +10058,6 @@ "dev": true, "license": "ISC" }, - "node_modules/fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "bindings": "^1.5.0", - "nan": "^2.12.1" - }, - "engines": { - "node": ">= 4.0" - } - }, "node_modules/function-bind": { "version": "1.1.1", "dev": true, @@ -11339,10 +11250,9 @@ } }, "node_modules/ip": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", - "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==", - "dev": true + "version": "1.1.8", + "dev": true, + "license": "MIT" }, "node_modules/ip-regex": { "version": "2.1.0", @@ -11925,10 +11835,9 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -11959,10 +11868,9 @@ } }, "node_modules/istanbul-lib-report/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -12006,10 +11914,9 @@ } }, "node_modules/istanbul-lib-source-maps/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -12058,51 +11965,6 @@ "node": ">= 6" } }, - "node_modules/jest-cli": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz", - "integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==", - "dev": true, - "dependencies": { - "@jest/core": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "exit": "^0.1.2", - "import-local": "^2.0.0", - "is-ci": "^2.0.0", - "jest-config": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "prompts": "^2.0.1", - "realpath-native": "^1.1.0", - "yargs": "^13.3.0" - }, - "bin": { - "jest": "bin/jest.js" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/jest-cli/node_modules/ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", - "dev": true - }, - "node_modules/jest-cli/node_modules/is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "dev": true, - "dependencies": { - "ci-info": "^2.0.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, "node_modules/jest-config": { "version": "24.9.0", "dev": true, @@ -12983,10 +12845,9 @@ } }, "node_modules/jest-snapshot/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -13151,6 +13012,48 @@ "node": ">=6" } }, + "node_modules/jest/node_modules/ci-info": { + "version": "2.0.0", + "dev": true, + "license": "MIT" + }, + "node_modules/jest/node_modules/is-ci": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "ci-info": "^2.0.0" + }, + "bin": { + "is-ci": "bin.js" + } + }, + "node_modules/jest/node_modules/jest-cli": { + "version": "24.9.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/core": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "import-local": "^2.0.0", + "is-ci": "^2.0.0", + "jest-config": "^24.9.0", + "jest-util": "^24.9.0", + "jest-validate": "^24.9.0", + "prompts": "^2.0.1", + "realpath-native": "^1.1.0", + "yargs": "^13.3.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/jmespath": { "version": "0.16.0", "dev": true, @@ -13709,10 +13612,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -13766,9 +13668,8 @@ }, "node_modules/media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -14119,23 +14020,9 @@ "thenify-all": "^1.0.0" } }, - "node_modules/nan": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz", - "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==", - "dev": true, - "optional": true - }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], + "version": "3.3.4", + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -14298,10 +14185,9 @@ } }, "node_modules/node-notifier/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -14337,10 +14223,9 @@ } }, "node_modules/normalize-package-data/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -14843,33 +14728,15 @@ } }, "node_modules/parse-asn1": { - "version": "5.1.7", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz", - "integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==", - "dev": true, - "dependencies": { - "asn1.js": "^4.10.1", - "browserify-aes": "^1.2.0", - "evp_bytestokey": "^1.0.3", - "hash-base": "~3.0", - "pbkdf2": "^3.1.2", - "safe-buffer": "^5.2.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/parse-asn1/node_modules/hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==", + "version": "5.1.6", "dev": true, + "license": "ISC", "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": ">=4" + "asn1.js": "^5.2.0", + "browserify-aes": "^1.0.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" } }, "node_modules/parse-json": { @@ -15107,9 +14974,7 @@ } }, "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.21", "funding": [ { "type": "opencollective", @@ -15118,16 +14983,13 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "nanoid": "^3.3.7", + "nanoid": "^3.3.4", "picocolors": "^1.0.0", - "source-map-js": "^1.2.0" + "source-map-js": "^1.0.2" }, "engines": { "node": "^10 || ^12 || >=14" @@ -16748,10 +16610,9 @@ } }, "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "version": "2.5.1", "dev": true, + "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -16868,10 +16729,9 @@ } }, "node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "version": "2.3.7", "dev": true, + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -17738,10 +17598,9 @@ } }, "node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "version": "7.3.8", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -18284,9 +18143,8 @@ } }, "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.0.2", + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -19023,10 +18881,9 @@ } }, "node_modules/terser-webpack-plugin/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -19311,10 +19168,9 @@ } }, "node_modules/ts-jest/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -19370,10 +19226,9 @@ } }, "node_modules/ts-loader/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -19437,10 +19292,9 @@ } }, "node_modules/tslint/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -19512,9 +19366,8 @@ }, "node_modules/type-is": { "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, + "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -19972,10 +19825,9 @@ } }, "node_modules/vue-cli-plugin-s3-deploy": { - "version": "4.0.0-rc4", - "resolved": "https://registry.npmjs.org/vue-cli-plugin-s3-deploy/-/vue-cli-plugin-s3-deploy-4.0.0-rc4.tgz", - "integrity": "sha512-8N7pyRnQVIt1GKYHuJvDQGBKnJZfRCiJxmFMKw0cEqO7Z/qpajIEP5gwaEqvrmmyen1+5GGJY7YksqoSYUylZg==", + "version": "4.0.0-rc3", "dev": true, + "license": "MIT", "dependencies": { "@babel/cli": "^7.1.2", "@babel/core": "^7.1.2", @@ -20253,10 +20105,9 @@ } }, "node_modules/vue-cli-plugin-s3-deploy/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -20344,10 +20195,9 @@ } }, "node_modules/vue-eslint-parser/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -20389,10 +20239,9 @@ } }, "node_modules/vue-loader": { - "version": "15.11.1", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz", - "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==", + "version": "15.10.1", "dev": true, + "license": "MIT", "dependencies": { "@vue/component-compiler-utils": "^3.1.0", "hash-sum": "^1.0.2", @@ -20408,9 +20257,6 @@ "cache-loader": { "optional": true }, - "prettier": { - "optional": true - }, "vue-template-compiler": { "optional": true } @@ -21425,10 +21271,9 @@ } }, "node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -21761,10 +21606,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "version": "1.2.3", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -21875,23 +21719,18 @@ "license": "Apache-2.0" }, "node_modules/xml2js": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz", - "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==", + "version": "0.4.19", "dev": true, + "license": "MIT", "dependencies": { "sax": ">=0.6.0", - "xmlbuilder": "~11.0.0" - }, - "engines": { - "node": ">=4.0.0" + "xmlbuilder": "~9.0.1" } }, "node_modules/xmlbuilder": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", - "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", + "version": "9.0.7", "dev": true, + "license": "MIT", "engines": { "node": ">=4.0" } @@ -22160,9 +21999,7 @@ } }, "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true }, "slash": { @@ -22172,13 +22009,10 @@ } }, "@babel/code-frame": { - "version": "7.24.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", - "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/highlight": "^7.24.2", - "picocolors": "^1.0.0" + "@babel/highlight": "^7.18.6" } }, "@babel/compat-data": { @@ -22207,34 +22041,27 @@ }, "dependencies": { "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } }, "@babel/generator": { - "version": "7.24.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz", - "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==", + "version": "7.20.7", "dev": true, "requires": { - "@babel/types": "^7.24.0", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", + "@babel/types": "^7.20.7", + "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, "dependencies": { "@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "version": "0.3.2", "dev": true, "requires": { - "@jridgewell/set-array": "^1.2.1", + "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" + "@jridgewell/trace-mapping": "^0.3.9" } } } @@ -22273,9 +22100,7 @@ } }, "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true }, "yallist": { @@ -22319,17 +22144,13 @@ }, "dependencies": { "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } }, "@babel/helper-environment-visitor": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "version": "7.18.9", "dev": true }, "@babel/helper-explode-assignable-expression": { @@ -22340,22 +22161,18 @@ } }, "@babel/helper-function-name": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", - "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "version": "7.19.0", "dev": true, "requires": { - "@babel/template": "^7.22.15", - "@babel/types": "^7.23.0" + "@babel/template": "^7.18.10", + "@babel/types": "^7.19.0" } }, "@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.18.6" } }, "@babel/helper-member-expression-to-functions": { @@ -22434,24 +22251,18 @@ } }, "@babel/helper-split-export-declaration": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.18.6" } }, "@babel/helper-string-parser": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", - "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", + "version": "7.19.4", "dev": true }, "@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "version": "7.19.1", "dev": true }, "@babel/helper-validator-option": { @@ -22478,21 +22289,16 @@ } }, "@babel/highlight": { - "version": "7.24.2", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz", - "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.22.20", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "@babel/helper-validator-identifier": "^7.18.6", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.24.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz", - "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==" + "version": "7.20.7" }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { "version": "7.18.6", @@ -22982,9 +22788,7 @@ }, "dependencies": { "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } @@ -23136,9 +22940,7 @@ }, "dependencies": { "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } @@ -23162,42 +22964,36 @@ } }, "@babel/template": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", - "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", + "version": "7.20.7", "dev": true, "requires": { - "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.24.0", - "@babel/types": "^7.24.0" + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7" } }, "@babel/traverse": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz", - "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.24.1", - "@babel/generator": "^7.24.1", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.24.1", - "@babel/types": "^7.24.0", - "debug": "^4.3.1", + "version": "7.20.12", + "dev": true, + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.20.7", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.19.0", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "debug": "^4.1.0", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", - "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", + "version": "7.20.7", "dev": true, "requires": { - "@babel/helper-string-parser": "^7.23.4", - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-validator-identifier": "^7.19.1", "to-fast-properties": "^2.0.0" } }, @@ -23631,9 +23427,7 @@ "dev": true }, "@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "version": "1.1.2", "dev": true }, "@jridgewell/sourcemap-codec": { @@ -23641,13 +23435,11 @@ "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "version": "0.3.17", "dev": true, "requires": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "@mdi/font": { @@ -23857,8 +23649,6 @@ }, "@types/jest": { "version": "24.9.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz", - "integrity": "sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==", "dev": true, "requires": { "jest-diff": "^24.3.0" @@ -23881,8 +23671,7 @@ "dev": true }, "@types/node": { - "version": "18.11.18", - "dev": true + "version": "18.11.18" }, "@types/normalize-package-data": { "version": "2.4.1", @@ -23890,7 +23679,6 @@ }, "@types/papaparse": { "version": "5.2.6", - "dev": true, "requires": { "@types/node": "*" } @@ -24133,9 +23921,7 @@ }, "dependencies": { "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } @@ -24970,9 +24756,7 @@ } }, "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true }, "yallist": { @@ -25465,20 +25249,17 @@ } }, "asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", + "version": "5.4.1", "dev": true, "requires": { "bn.js": "^4.0.0", "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" }, "dependencies": { "bn.js": { "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", "dev": true } } @@ -25576,9 +25357,7 @@ "dev": true }, "aws-sdk": { - "version": "2.1591.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1591.0.tgz", - "integrity": "sha512-9HbejaKZM89OK4YpE5TpjJItAtU1xhsFvy2p9qZN7nEpfx3G0FpepaW2fdpHu51gFeUn1+g0XUwekyq2N/Xagw==", + "version": "2.1291.0", "dev": true, "requires": { "buffer": "4.9.2", @@ -25590,7 +25369,7 @@ "url": "0.10.3", "util": "^0.12.4", "uuid": "8.0.0", - "xml2js": "0.6.2" + "xml2js": "0.4.19" }, "dependencies": { "events": { @@ -25810,9 +25589,7 @@ }, "dependencies": { "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } @@ -26037,13 +25814,11 @@ "dev": true }, "body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.1", "dev": true, "requires": { "bytes": "3.1.2", - "content-type": "~1.0.5", + "content-type": "~1.0.4", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -26051,15 +25826,13 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", - "raw-body": "2.5.2", + "raw-body": "2.5.1", "type-is": "~1.6.18", "unpipe": "1.0.0" }, "dependencies": { "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { "ms": "2.0.0" @@ -26067,14 +25840,10 @@ }, "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, "qs": { "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", "dev": true, "requires": { "side-channel": "^1.0.4" @@ -26180,31 +25949,27 @@ } }, "browserify-sign": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz", - "integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==", + "version": "4.2.1", "dev": true, "requires": { - "bn.js": "^5.2.1", - "browserify-rsa": "^4.1.0", + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.5", - "hash-base": "~3.0", + "elliptic": "^6.5.3", "inherits": "^2.0.4", - "parse-asn1": "^5.1.7", - "readable-stream": "^2.3.8", - "safe-buffer": "^5.2.1" + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" }, "dependencies": { - "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==", + "readable-stream": { + "version": "3.6.0", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } } } @@ -26275,8 +26040,6 @@ }, "bytes": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true }, "cacache": { @@ -26468,15 +26231,6 @@ "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" - }, - "dependencies": { - "fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "optional": true - } } }, "chownr": { @@ -26873,9 +26627,7 @@ } }, "content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "version": "1.0.4", "dev": true }, "convert-source-map": { @@ -26883,9 +26635,7 @@ "dev": true }, "cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.5.0", "dev": true }, "cookie-signature": { @@ -27068,9 +26818,7 @@ } }, "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true }, "slash": { @@ -27154,9 +26902,7 @@ }, "dependencies": { "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true } } @@ -27266,9 +27012,7 @@ } }, "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } @@ -27941,9 +27685,7 @@ } }, "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true }, "yallist": { @@ -27965,9 +27707,7 @@ "dev": true }, "elliptic": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz", - "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==", + "version": "6.5.4", "dev": true, "requires": { "bn.js": "^4.11.9", @@ -28206,9 +27946,7 @@ "dev": true }, "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true }, "strip-ansi": { @@ -28281,9 +28019,7 @@ }, "dependencies": { "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true } } @@ -28474,17 +28210,15 @@ } }, "express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.18.2", "dev": true, "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.1", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.5.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -28829,9 +28563,7 @@ } }, "follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==" + "version": "1.15.2" }, "for-each": { "version": "0.3.3", @@ -28942,9 +28674,7 @@ } }, "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true }, "to-regex-range": { @@ -29096,17 +28826,6 @@ "version": "1.0.0", "dev": true }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "dev": true, - "optional": true, - "requires": { - "bindings": "^1.5.0", - "nan": "^2.12.1" - } - }, "function-bind": { "version": "1.1.1", "dev": true @@ -29884,9 +29603,7 @@ } }, "ip": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", - "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==", + "version": "1.1.8", "dev": true }, "ip-regex": { @@ -30230,9 +29947,7 @@ }, "dependencies": { "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } @@ -30255,9 +29970,7 @@ } }, "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true }, "supports-color": { @@ -30289,9 +30002,7 @@ } }, "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true } } @@ -30313,55 +30024,49 @@ "requires": { "import-local": "^2.0.0", "jest-cli": "^24.9.0" - } - }, - "jest-changed-files": { - "version": "24.9.0", - "dev": true, - "requires": { - "@jest/types": "^24.9.0", - "execa": "^1.0.0", - "throat": "^4.0.0" - } - }, - "jest-cli": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz", - "integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==", - "dev": true, - "requires": { - "@jest/core": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "exit": "^0.1.2", - "import-local": "^2.0.0", - "is-ci": "^2.0.0", - "jest-config": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "prompts": "^2.0.1", - "realpath-native": "^1.1.0", - "yargs": "^13.3.0" }, "dependencies": { "ci-info": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", "dev": true }, "is-ci": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", "dev": true, "requires": { "ci-info": "^2.0.0" } + }, + "jest-cli": { + "version": "24.9.0", + "dev": true, + "requires": { + "@jest/core": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "import-local": "^2.0.0", + "is-ci": "^2.0.0", + "jest-config": "^24.9.0", + "jest-util": "^24.9.0", + "jest-validate": "^24.9.0", + "prompts": "^2.0.1", + "realpath-native": "^1.1.0", + "yargs": "^13.3.0" + } } } }, + "jest-changed-files": { + "version": "24.9.0", + "dev": true, + "requires": { + "@jest/types": "^24.9.0", + "execa": "^1.0.0", + "throat": "^4.0.0" + } + }, "jest-config": { "version": "24.9.0", "dev": true, @@ -31019,9 +30724,7 @@ }, "dependencies": { "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } @@ -31535,9 +31238,7 @@ }, "dependencies": { "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } @@ -31579,8 +31280,6 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "dev": true }, "memfs": { @@ -31824,17 +31523,8 @@ "thenify-all": "^1.0.0" } }, - "nan": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz", - "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==", - "dev": true, - "optional": true - }, "nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==" + "version": "3.3.4" }, "nanomatch": { "version": "1.2.13", @@ -31961,9 +31651,7 @@ }, "dependencies": { "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true } } @@ -31990,9 +31678,7 @@ }, "dependencies": { "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true } } @@ -32309,29 +31995,14 @@ } }, "parse-asn1": { - "version": "5.1.7", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz", - "integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==", + "version": "5.1.6", "dev": true, "requires": { - "asn1.js": "^4.10.1", - "browserify-aes": "^1.2.0", - "evp_bytestokey": "^1.0.3", - "hash-base": "~3.0", - "pbkdf2": "^3.1.2", - "safe-buffer": "^5.2.1" - }, - "dependencies": { - "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - } + "asn1.js": "^5.2.0", + "browserify-aes": "^1.0.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" } }, "parse-json": { @@ -32487,13 +32158,11 @@ "dev": true }, "postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.21", "requires": { - "nanoid": "^3.3.7", + "nanoid": "^3.3.4", "picocolors": "^1.0.0", - "source-map-js": "^1.2.0" + "source-map-js": "^1.0.2" } }, "postcss-calc": { @@ -33600,9 +33269,7 @@ "dev": true }, "raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "version": "2.5.1", "dev": true, "requires": { "bytes": "3.1.2", @@ -33682,9 +33349,7 @@ } }, "readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "version": "2.3.7", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -34247,9 +33912,7 @@ } }, "semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "version": "7.3.8", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -34644,9 +34307,7 @@ "version": "0.6.1" }, "source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==" + "version": "1.0.2" }, "source-map-resolve": { "version": "0.5.3", @@ -35160,9 +34821,7 @@ } }, "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true } } @@ -35363,9 +35022,7 @@ "dev": true }, "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true }, "yargs-parser": { @@ -35405,9 +35062,7 @@ } }, "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } @@ -35450,9 +35105,7 @@ }, "dependencies": { "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "version": "5.7.1", "dev": true }, "tsutils": { @@ -35499,8 +35152,6 @@ }, "type-is": { "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, "requires": { "media-typer": "0.3.0", @@ -35818,9 +35469,7 @@ } }, "vue-cli-plugin-s3-deploy": { - "version": "4.0.0-rc4", - "resolved": "https://registry.npmjs.org/vue-cli-plugin-s3-deploy/-/vue-cli-plugin-s3-deploy-4.0.0-rc4.tgz", - "integrity": "sha512-8N7pyRnQVIt1GKYHuJvDQGBKnJZfRCiJxmFMKw0cEqO7Z/qpajIEP5gwaEqvrmmyen1+5GGJY7YksqoSYUylZg==", + "version": "4.0.0-rc3", "dev": true, "requires": { "@babel/cli": "^7.1.2", @@ -36035,9 +35684,7 @@ "dev": true }, "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true }, "slash": { @@ -36089,9 +35736,7 @@ "dev": true }, "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true } } @@ -36124,9 +35769,7 @@ } }, "vue-loader": { - "version": "15.11.1", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz", - "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==", + "version": "15.10.1", "dev": true, "requires": { "@vue/component-compiler-utils": "^3.1.0", @@ -36970,9 +36613,7 @@ } }, "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", "dev": true }, "strip-ansi": { @@ -37097,9 +36738,7 @@ } }, "word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "version": "1.2.3", "dev": true }, "worker-farm": { @@ -37183,19 +36822,15 @@ "dev": true }, "xml2js": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz", - "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==", + "version": "0.4.19", "dev": true, "requires": { "sax": ">=0.6.0", - "xmlbuilder": "~11.0.0" + "xmlbuilder": "~9.0.1" } }, "xmlbuilder": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", - "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", + "version": "9.0.7", "dev": true }, "xmlchars": { diff --git a/package.json b/package.json index 4cb490b..e5b75e4 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ }, "dependencies": { "@mdi/font": "^5.9.55", + "@types/papaparse": "5.2.6", "axios": "^0.21.1", "core-js": "^3.6.5", "inversify-props": "^2.2.6", @@ -28,8 +29,7 @@ "vuex": "^3.4.0" }, "devDependencies": { - "@types/jest": "^24.9.1", - "@types/papaparse": "5.2.6", + "@types/jest": "^24.0.19", "@typescript-eslint/eslint-plugin": "^4.18.0", "@typescript-eslint/parser": "^4.18.0", "@vue/cli-plugin-babel": "~4.5.0", @@ -55,4 +55,4 @@ "vue-template-compiler": "^2.6.11", "vuetify-loader": "^1.7.0" } -} \ No newline at end of file +} diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..df36fcfb72584e00488330b560ebcf34a41c64c2 GIT binary patch literal 4286 zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56 zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei z@g6Xq-pDoPl=MANPiR7%172VA%r)kevtV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp= zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8 zx!=3<4seY*%=OlbCbcae?5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3 z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD zsW0Ab)ZK@0cIW%W7z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6 z={Xwx{TKxD#iCLfl2vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S literal 0 HcmV?d00001 diff --git a/public/icon.png b/public/icon.png deleted file mode 100644 index b370d67021be8dece6926b3e9a467a925fd1e225..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1245 zcmV<31S0#1P)=_C;xD#TK<}nXYd)EMj9s z>1Zay4p3t!Oib%w2@ywYPQ;@Yx};>|Gu0^ z%y6CESMs}a9sP*^j96R0u`y`uH)rlzNo6KH?g1ymDKj1zKA`rmzit^jlH`#^P0fb< zxCwaBz)#D|N>3g*fN^DIZYAYvVh96cLvd*QL|yE_WI6i!cC~(VI3Er_>g(6nrDe&& z-tLw=jy@K&^h+8_+jBV^9v)4eGx=H|S`3(y|iSZix4lM(ri@a1KKL(OixrDboG~d`h%mW6Ym2Jd$2(ir0u-6l2)UG?vdf z?SZPl7K(H0+uo(8m&>w8l;IYpzDlr;MB3(#Y6VqFTu$H*#B?pw;!KDw+1S43kel)> zV)1H({H9pkw;~h@6=ym$ofb(cMS|bqOoDu;lj|t;id-Va7ZU2*NL3R!h8~_lZd@f~ zoeW_qz>h;xUND(jEy+D3aE;vBAhZVZ8K=ICtcp`uw0L=@glSuENaYzaULeVXGKfos$ zE!jJCupXA{pMLzu!&&s(4Zv(NnF#1Bx#k1d0jgQF2&g>@dnLOmD{-0vMxt{t;Lv_# z;ZQ{Ooq&@)E1i0%=mkkM07hC7;3OLMLYM*QC%{4A7!#{V93<7Oh&?7n_w;;Oc72}Z z-%9*|q?1<6C%nf@A6*K# z68ew5T`fCGuIc8|mr76v;N8e^^F>4__83(uM+aSEM8DGq0Tp9pIb(8MZ`aVB09P=U zI!n%#bLQN06lAA_%BfAGMqMT0H3FAAaGN>T%D9DwOC-K-#uG?RamTJ;TIuGGO{*Gj zQPyuroxz7J*cotjSn<$spM+Ts?uNu5E+&1Dt_lFRl57yP7}6p$HhJQ!h|m~;)qT5G zzX|h&Gf$fOqR4@so|bnA0JZbmYU$c4#H$QpGl-iZobJE^5-&p-B<&!iYC)GtcsdvI zTT4FrU~hNpm34&;8zF4!>1pZyTMqRb&L;4XD_(C5j}h1$m^~X2YTa33)C7S)2NXYw z%3lO(Sp?P?wa~zo`RfBA6kytZ=z-Jc-2CiA!qR5O6R00so?Au$tz1iX=;xFssR z0*30|uGSm=SFm;SHa1DV4#0bKJb@I5o{Uo26m$Do=5qlx5}fVQU7zi0c?F>U_aOi* zU;cdfvVU*|<>vu58NducBLFgj+Z26knwEXv*?HamBiTOzFK|$DjGOaS00000NkvXX Hu0mjft#C9& diff --git a/public/index.html b/public/index.html index 695e472..79c4efc 100644 --- a/public/index.html +++ b/public/index.html @@ -4,7 +4,7 @@ - + <%= htmlWebpackPlugin.options.title %> diff --git a/src/app/filter/domain/Filter.ts b/src/app/filter/domain/Filter.ts deleted file mode 100644 index 15341d8..0000000 --- a/src/app/filter/domain/Filter.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { - ConstantOperation, - IConstantFilterParams, - IWatchlistSingleFilter, - IWatchlistFilter, -} from "@/app/filter/domain/Filter.types"; - -export type Step = "sorting_hat"; -const _steps: Step[] = ["sorting_hat"]; - -export type Field = "mag" | "fid"; -const _fieldMapping: Record = { - mag: "sorting_hat", - fid: "sorting_hat", -}; - -export type FilterFields = Partial>; - -export class WatchlistFilter implements IWatchlistFilter { - fields: FilterFields; - filters: IWatchlistSingleFilter[]; - - constructor(filter: IWatchlistFilter) { - this.fields = filter.fields; - this.filters = filter.filters; - } - - static mergeFields(fieldsList: FilterFields[]): FilterFields { - const result: FilterFields = {}; - for (let i = 0; i < _steps.length; i++) { - const fields_set: Set = new Set(); - fieldsList.forEach((fields) => { - fields[_steps[i]]!.forEach((field) => fields_set.add(field)); - }); - result[_steps[i]] = Array.from(fields_set); - } - return result; - } - static mergeMany(filters: IWatchlistFilter[]): WatchlistFilter { - const result: IWatchlistFilter = { fields: {}, filters: [] }; - result.fields = this.mergeFields(filters.map((filter) => filter.fields)); - filters.forEach((filter) => result.filters.concat(filter.filters)); - - return new WatchlistFilter(result); - } -} - -export class ConstantFilterParams implements IConstantFilterParams { - field: Field; - constant: number; - op: ConstantOperation; - - constructor(params: IConstantFilterParams) { - this.field = params.field; - this.constant = params.constant; - this.op = params.op; - } - - getFilterFields(): FilterFields { - const fields: FilterFields = {}; - - const step = _fieldMapping[this.field]; - if (fields[step] === undefined) fields[step] = []; - fields[step]!.push(this.field); - - return fields; - } -} diff --git a/src/app/filter/domain/Filter.types.ts b/src/app/filter/domain/Filter.types.ts deleted file mode 100644 index 221e88b..0000000 --- a/src/app/filter/domain/Filter.types.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Field, FilterFields } from "./Filter"; - -export type FilterType = "constant" | "and" | "or" | ""; - -export interface IWatchlistSingleFilter { - type: FilterType; - params: IFilterParams; -} - -export interface IWatchlistFilter { - fields: FilterFields; - filters: IWatchlistSingleFilter[]; -} - -export type ConstantOperation = - | "eq" - | "less" - | "less eq" - | "greater" - | "greater eq"; - -export interface IConstantFilterParams extends IFilterParams { - field: Field; - constant: number; - op: ConstantOperation; -} - -export interface ILogicFilterParams extends IFilterParams { - filters: IWatchlistSingleFilter[]; -} - -// eslint-disable-next-line @typescript-eslint/no-empty-interface -export interface IFilterParams {} diff --git a/src/app/target/domain/Target.ts b/src/app/target/domain/Target.ts index 33d8f6d..7fd1d94 100644 --- a/src/app/target/domain/Target.ts +++ b/src/app/target/domain/Target.ts @@ -1,4 +1,3 @@ -import { IWatchlistFilter } from "@/app/filter/domain/Filter.types"; import { ITargetData } from "./Target.types"; export class Target implements ITargetData { @@ -10,8 +9,6 @@ export class Target implements ITargetData { dec: number; nMatches: number | null; lastMatch: string; - filter: IWatchlistFilter; - constructor(data: ITargetData) { this.id = data.id; this.url = data.url; @@ -21,7 +18,6 @@ export class Target implements ITargetData { this.dec = data.dec; this.nMatches = data.nMatches; this.lastMatch = data.lastMatch; - this.filter = data.filter; } validate(): boolean { return ( @@ -29,8 +25,7 @@ export class Target implements ITargetData { this.name != undefined && this.radius != undefined && this.ra != undefined && - this.dec != undefined && - this.filter != undefined + this.dec != undefined ); } } diff --git a/src/app/target/domain/Target.types.ts b/src/app/target/domain/Target.types.ts index cddd910..f8ca395 100644 --- a/src/app/target/domain/Target.types.ts +++ b/src/app/target/domain/Target.types.ts @@ -1,4 +1,3 @@ -import { IWatchlistFilter } from "@/app/filter/domain/Filter.types"; import { ParseError } from "@/shared/error/ParseError"; import { HttpError } from "@/shared/http"; import { Result } from "neverthrow"; @@ -12,20 +11,6 @@ export interface ITargetData { dec: number; nMatches: number | null; lastMatch: string; - filter: IWatchlistFilter; -} - -export interface ITargetDisplay { - id: number; - url: string; - name: string; - radius: number; - ra: number; - dec: number; - nMatches: number | null; - lastMatch: string; - filter: IWatchlistFilter; - filter_str: string; } export interface ITargetList { diff --git a/src/app/target/infrastructure/TargetParser.ts b/src/app/target/infrastructure/TargetParser.ts index 3e30d64..5d4d8aa 100644 --- a/src/app/target/infrastructure/TargetParser.ts +++ b/src/app/target/infrastructure/TargetParser.ts @@ -19,15 +19,13 @@ export class TargetParser { radius: response.radius, dec: response.dec, ra: response.ra, - filter: response.filter, nMatches: "n_matches" in response ? response.n_matches : 0, lastMatch: "last_match" in response ? response.last_match : "", }); - if (target.validate()) return ok(target); - else return err(new Error("Target not valid")); - } catch (e) { - return err(new ParseError((e as Error).message)); + else throw new Error("Target not valid"); + } catch (error) { + return err(new ParseError(error.message)); } } @@ -35,8 +33,8 @@ export class TargetParser { try { const csvFile = new Blob([response], { type: "text/csv" }); return ok(csvFile); - } catch (e) { - return err(new ParseError((e as Error).message)); + } catch (error) { + return err(new ParseError(error.message)); } } } diff --git a/src/app/target/infrastructure/TargetService.types.ts b/src/app/target/infrastructure/TargetService.types.ts index 009173f..c3d8f73 100644 --- a/src/app/target/infrastructure/TargetService.types.ts +++ b/src/app/target/infrastructure/TargetService.types.ts @@ -1,5 +1,3 @@ -import { IWatchlistFilter } from "@/app/filter/domain/Filter.types"; - export interface TargetListApiResponse { id: number; url: string; @@ -7,7 +5,6 @@ export interface TargetListApiResponse { radius: number; ra: number; dec: number; - filter: IWatchlistFilter; n_matches: number; last_match: string; } @@ -25,7 +22,6 @@ export interface TargetEditApiResponse { radius: number; ra: number; dec: number; - filter: IWatchlistFilter; } // eslint-disable-next-line @typescript-eslint/no-empty-interface diff --git a/src/app/target/infrastructure/__tests__/TargetService.mock.ts b/src/app/target/infrastructure/__tests__/TargetService.mock.ts index 133e367..c0138a0 100644 --- a/src/app/target/infrastructure/__tests__/TargetService.mock.ts +++ b/src/app/target/infrastructure/__tests__/TargetService.mock.ts @@ -11,9 +11,6 @@ import { ITargetRepository, } from "../../domain/Target.types"; -import { IWatchlistFilter, IWatchlistSingleFilter } from "@/app/filter/domain/Filter.types"; -import { FilterFields } from "@/app/filter/domain/Filter"; - const targetArray: ITargetData[] = [ { id: 1, @@ -22,10 +19,6 @@ const targetArray: ITargetData[] = [ radius: 1.0, ra: 1.0, dec: 1.0, - filter: { - fields: {}, - filters: [], - }, nMatches: 0, lastMatch: new Date().toISOString(), }, @@ -36,10 +29,6 @@ const targetArray: ITargetData[] = [ radius: 1.0, ra: 1.0, dec: 1.0, - filter: { - fields: {}, - filters: [], - }, nMatches: 0, lastMatch: new Date().toISOString(), }, @@ -94,11 +83,6 @@ export class MockTargetService implements ITargetRepository { ra: 10, dec: 20, radius: 30, - filter: { - fields:{} as FilterFields, - filters:[] as IWatchlistSingleFilter[] - }, - } as ITargetData) ); }); diff --git a/src/app/target/infrastructure/__tests__/TargetService.spec.ts b/src/app/target/infrastructure/__tests__/TargetService.spec.ts index fc2b024..e65ba48 100644 --- a/src/app/target/infrastructure/__tests__/TargetService.spec.ts +++ b/src/app/target/infrastructure/__tests__/TargetService.spec.ts @@ -9,14 +9,6 @@ import { cid, container, mockSingleton, resetContainer } from "inversify-props"; import { ITargetData, ITargetRepository } from "../../domain/Target.types"; import { Target } from "../../domain/Target"; import { ParseError } from "@/shared/error/ParseError"; -import { - ConstantOperation, - FilterType, - IFilterParams, - IWatchlistFilter, - IWatchlistSingleFilter, -} from "@/app/filter/domain/Filter.types"; -import { Field, FilterFields } from "@/app/filter/domain/Filter"; beforeEach(() => { resetContainer(); @@ -43,10 +35,6 @@ describe("TargetService", () => { radius: 1, ra: 10, dec: 20, - filter: { - fields: {}, - filters: [], - }, nMatches: 5, lastMatch: new Date(10, 10, 10).toISOString(), }), @@ -57,10 +45,6 @@ describe("TargetService", () => { radius: 2, ra: 20, dec: 20, - filter: { - fields: {}, - filters: [], - }, nMatches: 2, lastMatch: new Date(10, 10, 10).toISOString(), }), @@ -187,10 +171,6 @@ describe("TargetService", () => { ra: 10, dec: 20, radius: 30, - filter: { - fields: {} as FilterFields, - filters: [] as IWatchlistSingleFilter[], - }, } as ITargetData, watchlist: 1, }); @@ -236,19 +216,6 @@ describe("TargetService", () => { ra: 10, dec: 20, radius: 30, - filter: { - fields: { sorting_hat: ["mag"] } as FilterFields, - filters: [ - { - type: "" as FilterType, - params: { - field: "mag" as Field, - constant: 1 as number, - op: "eq" as ConstantOperation, - } as IFilterParams, - }, - ] as IWatchlistSingleFilter[], - } as IWatchlistFilter, } as ITargetData, watchlist: 1, }); @@ -311,10 +278,6 @@ describe("TargetService", () => { radius: 1, ra: 10, dec: 20, - filter: { - fields: {}, - filters: [], - }, nMatches: 5, lastMatch: new Date(10, 10, 10).toISOString(), }), @@ -325,10 +288,6 @@ describe("TargetService", () => { radius: 2, ra: 20, dec: 20, - filter: { - fields: {}, - filters: [], - }, nMatches: 2, lastMatch: new Date(10, 10, 10).toISOString(), }), diff --git a/src/app/watchlist/domain/Watchlist.types.ts b/src/app/watchlist/domain/Watchlist.types.ts index 971a79e..ae1598e 100644 --- a/src/app/watchlist/domain/Watchlist.types.ts +++ b/src/app/watchlist/domain/Watchlist.types.ts @@ -21,15 +21,6 @@ export interface IWatchlistList { prev: string; } -export interface OneFilter { - filters: { - type: string; - url: string; - watchlist_id: number; - params: any; - }[]; -} - export interface IWatchlistRepository { getAllWatchlists( params?: any @@ -49,7 +40,4 @@ export interface IWatchlistRepository { editWatchlist( params: any ): Promise>; - editTargetsWatchlist( - params: any - ): Promise>; } diff --git a/src/app/watchlist/infrastructure/WatchlistParser.ts b/src/app/watchlist/infrastructure/WatchlistParser.ts index a44ee70..8626b0b 100644 --- a/src/app/watchlist/infrastructure/WatchlistParser.ts +++ b/src/app/watchlist/infrastructure/WatchlistParser.ts @@ -55,13 +55,3 @@ export class WatchlistCreateApiParser { } } } - -export class watchlistApiTargetParser { - parseNewTargets(response: any) { - try { - return ok(response); - } catch (error) { - return err(new ParseError(error.message)); - } - } -} diff --git a/src/app/watchlist/infrastructure/WatchlistService.ts b/src/app/watchlist/infrastructure/WatchlistService.ts index d25929d..3ace240 100644 --- a/src/app/watchlist/infrastructure/WatchlistService.ts +++ b/src/app/watchlist/infrastructure/WatchlistService.ts @@ -5,7 +5,6 @@ import { IWatchlistData, IWatchlistList, IWatchlistRepository, - OneFilter, } from "../domain"; import { inject } from "inversify-props"; import { @@ -18,21 +17,17 @@ import { import { WatchlistApiParser, WatchlistCreateApiParser, - watchlistApiTargetParser, } from "./WatchlistParser"; import { UsersApiService } from "@/shared/http/UsersApiService"; -import { FilterType, IWatchlistFilter } from "@/app/filter/domain/Filter.types"; export class WatchlistService implements IWatchlistRepository { httpService: IHttpService; parser: WatchlistApiParser; parserCreate: WatchlistCreateApiParser; - parserTargetsUpdate: watchlistApiTargetParser; constructor(@inject() usersApiService: UsersApiService) { this.parser = new WatchlistApiParser(); this.parserCreate = new WatchlistCreateApiParser(); - this.parserTargetsUpdate = new watchlistApiTargetParser(); this.httpService = usersApiService; } @@ -155,20 +150,4 @@ export class WatchlistService implements IWatchlistRepository { { parseTo } ); } - - async editTargetsWatchlist(params: { - type: FilterType; - filter: IWatchlistFilter; - watchlist_id: number; - url: string; - }): Promise> { - const parseTo = (response: WatchlistApiResponse) => { - return ok(response); - }; - - return this.httpService.put( - { url: params.url, data: { filter: params.filter } }, - { parseTo } - ); - } } diff --git a/src/app/watchlist/infrastructure/WatchlistService.types.ts b/src/app/watchlist/infrastructure/WatchlistService.types.ts index c7ccb86..e9d9686 100644 --- a/src/app/watchlist/infrastructure/WatchlistService.types.ts +++ b/src/app/watchlist/infrastructure/WatchlistService.types.ts @@ -1,5 +1,3 @@ -import { FilterType, IFilterParams } from "@/app/filter/domain/Filter.types"; - export interface WatchlistRequestModel { title: string; owner: string; @@ -66,10 +64,3 @@ export interface EditWatchlistRequestModel { title: string; notification_rate: string; } - -export interface EditTargetsOneWatchlist { - filters: { - type: FilterType; - params: IFilterParams; - }[]; -} diff --git a/src/app/watchlist/infrastructure/__tests__/WatchlistService.mock.ts b/src/app/watchlist/infrastructure/__tests__/WatchlistService.mock.ts index d2d016a..d63bbf9 100644 --- a/src/app/watchlist/infrastructure/__tests__/WatchlistService.mock.ts +++ b/src/app/watchlist/infrastructure/__tests__/WatchlistService.mock.ts @@ -6,7 +6,6 @@ import { IWatchlistData, IWatchlistList, IWatchlistRepository, - OneFilter, } from "../../domain"; import { CreateWatchlistRequestModel } from "../WatchlistService.types"; @@ -257,44 +256,4 @@ export class MockWatchlistService implements IWatchlistRepository { resolve(err(new ParseError("Parse Error"))); }); } - editTargetsWatchlist( - params: any - ): Promise> { - if (this.actionType === "ok") { - return new Promise((resolve) => { - resolve( - ok({ - filters: [ - { - type: "constant", - url: "test", - watchlist_id: 1, // Assuming watchlist_id should be a number - params: {}, - }, - ], - } as OneFilter) - ); - }); - } else if ( - this.actionType === "error" || - this.actionType === "serverError" - ) { - return new Promise((resolve) => { - resolve(err(new HttpError(500, {}, "Server Error"))); - }); - } else if (this.actionType === "clientError") { - return new Promise((resolve) => { - resolve( - err(new HttpError(400, { detail: "not found" }, "Client Error")) - ); - }); - } else if (this.actionType === "timeout") { - return new Promise((resolve) => { - resolve(err(new HttpError(502, {}, "Gateway Timeout"))); - }); - } - return new Promise((resolve) => { - resolve(err(new ParseError("Parse Error"))); - }); - } } diff --git a/src/app/watchlist/use_case/EditTargetsWatchlist.ts b/src/app/watchlist/use_case/EditTargetsWatchlist.ts deleted file mode 100644 index 36ef016..0000000 --- a/src/app/watchlist/use_case/EditTargetsWatchlist.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { isHttpError } from "@/shared/http"; -import { - Callbacks, - UseCaseInteractor, -} from "@/shared/usecase/UseCaseInteractor.types"; -import { inject } from "inversify-props"; -import { IWatchlistRepository } from "../domain"; - -export class EditTargetsWatchlist implements UseCaseInteractor { - @inject() watchlistService!: IWatchlistRepository; - async execute(params: any, callbacks: Callbacks): Promise { - const result = await this.watchlistService.editTargetsWatchlist(params); - result - .map((watchlists) => { - callbacks.respondWithSuccess(watchlists); - }) - .mapErr((error) => { - if (isHttpError(error)) { - if (error.isClientError()) { - callbacks.respondWithClientError(error); - } else { - callbacks.respondWithServerError(error); - } - } else { - callbacks.respondWithParseError(error); - } - }); - } -} diff --git a/src/shared/http/HttpService.mock.ts b/src/shared/http/HttpService.mock.ts index 6307a1b..a54ac49 100644 --- a/src/shared/http/HttpService.mock.ts +++ b/src/shared/http/HttpService.mock.ts @@ -13,9 +13,6 @@ import { mockCreateWatchlistResponse, mockSingleWatchlist, } from "./mocks/watchlist.mocks"; -import { IWatchlistSingleFilter } from "@/app/filter/domain/Filter.types"; -import { FilterFields } from "@/app/filter/domain/Filter"; - export type TestActions = | "ok" @@ -110,10 +107,6 @@ export class MockUserApi extends HttpService { radius: 0.008055555555555555, ra: 0.960746, dec: -11.47467, - filter: { - fields:{} as FilterFields, - filters:[] as IWatchlistSingleFilter[] - }, }; return [200, JSON.stringify(response)]; }); @@ -124,10 +117,6 @@ export class MockUserApi extends HttpService { radius: 0.008055555555555555, ra: 0.960746, dec: -11.47467, - filter: { - fields:{} as FilterFields, - filters:[] as IWatchlistSingleFilter[] - }, }; return [201, JSON.stringify(response)]; }); @@ -226,10 +215,11 @@ export class MockUserApi extends HttpService { return [200, JSON.stringify(response)]; }); this.mock.onPut(/\/watchlists\/\w+\/targets\/\w+/).reply((_config: any) => { - return [200, JSON.stringify("{")]; + const response = {}; + return [200, JSON.stringify(response)]; }); this.mock.onPost(/\/watchlists\/\w+\/targets\//).reply(() => { - return [200, JSON.stringify("{")]; + return [200, JSON.stringify({})]; }); this.mock.onGet("users/social/o/google-oauth2").reply(() => { return [200, JSON.stringify({ unknown_field: "unknown_value" })]; diff --git a/src/shared/http/HttpService.ts b/src/shared/http/HttpService.ts index 776a117..1943884 100644 --- a/src/shared/http/HttpService.ts +++ b/src/shared/http/HttpService.ts @@ -1,13 +1,13 @@ import axios, { - AxiosError, AxiosInstance, - AxiosRequestConfig, AxiosResponse, + AxiosRequestConfig, + AxiosError, } from "axios"; -import { unmanaged } from "inversify"; import { err, ok, Result } from "neverthrow"; import { ParseError } from "../error/ParseError"; import { HttpError } from "./HttpError"; +import { unmanaged } from "inversify"; type IHttpRequest = { url: string; @@ -53,10 +53,8 @@ export class HttpService implements IHttpService { } else { this.axiosService = axios.create({ baseURL: baseUrl, - headers: { - "Content-Type": "application/json", - }, - withCredentials: process.env.NODE_ENV !== "development", + headers: { "Content-Type": "application/json" }, + withCredentials: true, }); } this._initializeRequestInterceptor(); diff --git a/src/shared/http/mocks/target.mocks.ts b/src/shared/http/mocks/target.mocks.ts index cf74559..175332d 100644 --- a/src/shared/http/mocks/target.mocks.ts +++ b/src/shared/http/mocks/target.mocks.ts @@ -11,10 +11,6 @@ export const mockTargetsByWatchlist = { ra: 10, dec: 20, n_matches: 5, - filter: { - fields: {}, - filters: [], - }, last_match: new Date(10, 10, 10).toISOString(), }, { @@ -25,10 +21,6 @@ export const mockTargetsByWatchlist = { ra: 20, dec: 20, n_matches: 2, - filter: { - fields: {}, - filters: [], - }, last_match: new Date(10, 10, 10).toISOString(), }, ], diff --git a/src/shared/types/filter.types.ts b/src/shared/types/filter.types.ts deleted file mode 100644 index 525a7a2..0000000 --- a/src/shared/types/filter.types.ts +++ /dev/null @@ -1,17 +0,0 @@ -export interface WatchlistFilter { - fields: Record; - filters: { - type: string; - params: FilterParams; - }[]; -} - - -// eslint-disable-next-line @typescript-eslint/no-empty-interface -export interface FilterParams {} - -export interface ConstantFilterParams extends FilterParams { - field: string; - constant: number; - op: "less" | "less eq" | "greater" | "greater eq"; -} diff --git a/src/ui/app.container.ts b/src/ui/app.container.ts index ddfaec5..1723700 100644 --- a/src/ui/app.container.ts +++ b/src/ui/app.container.ts @@ -31,7 +31,6 @@ import { EditWatchlist } from "@/app/watchlist/use_case/EditWatchlist"; import { GetGoogleUrl } from "@/app/user/use_case/GetGoogleUrl"; import { GoogleLogin } from "@/app/user/use_case/GoogleLogin"; import { DownloadTargetsCsv } from "@/app/target/use_case/DownloadTargetsCsv"; -import { EditTargetsWatchlist } from "@/app/watchlist/use_case/EditTargetsWatchlist"; export function containerBuilder(): void { container.addSingleton(UsersApiService); @@ -46,7 +45,6 @@ export function containerBuilder(): void { container.addSingleton(CreateWatchlist); container.addSingleton(SelectWatchlist); container.addSingleton(DeleteWatchlist); - container.addSingleton(EditTargetsWatchlist); container.addSingleton(EditWatchlist); container.addSingleton(TargetService); container.addSingleton(GetTargets); diff --git a/src/ui/components/watchlist/FormFilter.vue b/src/ui/components/watchlist/FormFilter.vue deleted file mode 100644 index b5179ee..0000000 --- a/src/ui/components/watchlist/FormFilter.vue +++ /dev/null @@ -1,295 +0,0 @@ - - - - - diff --git a/src/ui/components/watchlist/MyWatchlists.vue b/src/ui/components/watchlist/MyWatchlists.vue index 64686bc..cd6526b 100644 --- a/src/ui/components/watchlist/MyWatchlists.vue +++ b/src/ui/components/watchlist/MyWatchlists.vue @@ -18,15 +18,13 @@ - - - mdi-delete - - + + mdi-delete + diff --git a/src/ui/components/watchlist/TargetList.vue b/src/ui/components/watchlist/TargetList.vue index 8a874fc..d1a5e90 100644 --- a/src/ui/components/watchlist/TargetList.vue +++ b/src/ui/components/watchlist/TargetList.vue @@ -2,7 +2,7 @@ - - Set Filters - - - - + + diff --git a/src/ui/components/watchlist/MyWatchlists.vue b/src/ui/components/watchlist/MyWatchlists.vue index cd6526b..64686bc 100644 --- a/src/ui/components/watchlist/MyWatchlists.vue +++ b/src/ui/components/watchlist/MyWatchlists.vue @@ -18,13 +18,15 @@ - - mdi-delete - + + + mdi-delete + + diff --git a/src/ui/components/watchlist/TargetList.vue b/src/ui/components/watchlist/TargetList.vue index d1a5e90..8a874fc 100644 --- a/src/ui/components/watchlist/TargetList.vue +++ b/src/ui/components/watchlist/TargetList.vue @@ -2,7 +2,7 @@ + + Set Filters + + + +