From bde114ad13dbad5cca9444cb7ff9dd75dd4737fd Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 12 Aug 2021 11:28:51 +0900 Subject: [PATCH 01/53] Update node --- .node-version | 2 +- CHANGELOG.md | 14 ++++++++++++++ Dockerfile | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.node-version b/.node-version index e27f7a8bf6..971a6537e5 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v16.2.0 +v16.6.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e530f9306..d9219d8fc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ + + +## 12.86.1 (2021/08/12) + +### Improvements +- Docker: Node.jsを16.6.2に + ## 12.86.0 (2021/08/11) ### Improvements diff --git a/Dockerfile b/Dockerfile index c090839e7d..db879b6dbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.2.0-alpine3.13 AS base +FROM node:16.6.2-alpine3.13 AS base ENV NODE_ENV=production From ef3710fdc2c0151d21b4a8c0f142d813f3e75747 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 12 Aug 2021 11:33:00 +0900 Subject: [PATCH 02/53] Update deps --- CHANGELOG.md | 1 + package.json | 78 ++-- yarn.lock | 1026 +++++++++++++++++++++++--------------------------- 3 files changed, 507 insertions(+), 598 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9219d8fc6..7112ec5d48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ### Improvements - Docker: Node.jsを16.6.2に +- 依存関係の更新 ## 12.86.0 (2021/08/11) diff --git a/package.json b/package.json index 93517177cb..8c0d423108 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@sinonjs/fake-timers": "7.1.2", "@syuilo/aiscript": "0.11.1", "@types/bcryptjs": "2.4.2", - "@types/bull": "3.15.2", + "@types/bull": "3.15.3", "@types/cbor": "6.0.0", "@types/dateformat": "3.0.1", "@types/escape-regexp": "0.0.0", @@ -57,8 +57,8 @@ "@types/jsonld": "1.5.6", "@types/katex": "0.11.1", "@types/koa": "2.13.4", - "@types/koa-bodyparser": "4.3.2", - "@types/koa-cors": "0.0.1", + "@types/koa-bodyparser": "4.3.3", + "@types/koa-cors": "0.0.2", "@types/koa-favicon": "2.0.21", "@types/koa-logger": "3.1.1", "@types/koa-mount": "4.0.0", @@ -68,10 +68,10 @@ "@types/koa__multer": "2.0.3", "@types/koa__router": "8.0.7", "@types/markdown-it": "12.0.3", - "@types/matter-js": "0.17.3", + "@types/matter-js": "0.17.5", "@types/mocha": "8.2.3", - "@types/node": "16.3.3", - "@types/node-fetch": "2.5.11", + "@types/node": "16.6.0", + "@types/node-fetch": "2.5.12", "@types/nodemailer": "6.4.4", "@types/nprogress": "0.2.0", "@types/oauth": "0.9.1", @@ -88,7 +88,7 @@ "@types/request-stats": "3.0.0", "@types/rimraf": "3.0.1", "@types/seedrandom": "2.4.28", - "@types/sharp": "0.28.4", + "@types/sharp": "0.28.5", "@types/sinonjs__fake-timers": "6.0.3", "@types/speakeasy": "2.0.6", "@types/throttle-debounce": "2.1.0", @@ -98,40 +98,40 @@ "@types/web-push": "3.3.2", "@types/webpack": "5.28.0", "@types/webpack-stream": "3.2.12", - "@types/websocket": "1.0.3", - "@types/ws": "7.4.6", - "@typescript-eslint/parser": "4.28.3", - "@vue/compiler-sfc": "3.2.1", + "@types/websocket": "1.0.4", + "@types/ws": "7.4.7", + "@typescript-eslint/parser": "4.29.1", + "@vue/compiler-sfc": "3.2.2", "abort-controller": "3.0.0", - "apexcharts": "3.27.2", + "apexcharts": "3.27.3", "autobind-decorator": "2.4.0", "autosize": "4.0.4", "autwh": "0.1.0", - "aws-sdk": "2.948.0", + "aws-sdk": "2.966.0", "bcryptjs": "2.4.3", "blurhash": "1.1.3", "broadcast-channel": "3.7.0", "bull": "3.26.0", "cafy": "15.2.1", - "cbor": "7.0.6", - "chalk": "4.1.1", + "cbor": "8.0.0", + "chalk": "4.1.2", "chart.js": "2.9.4", "cli-highlight": "2.1.11", "commander": "7.2.0", "concurrently": "6.2.0", "content-disposition": "0.5.3", - "core-js": "3.15.2", + "core-js": "3.16.1", "crc-32": "1.2.0", - "css-loader": "6.0.0", - "cssnano": "5.0.6", + "css-loader": "6.2.0", + "cssnano": "5.0.7", "dateformat": "4.5.1", "diskusage": "1.1.3", "escape-regexp": "0.0.1", - "eslint": "7.30.0", - "eslint-plugin-vue": "7.13.0", + "eslint": "7.32.0", + "eslint-plugin-vue": "7.16.0", "eventemitter3": "4.0.7", "feed": "4.2.2", - "file-type": "16.5.1", + "file-type": "16.5.3", "fluent-ffmpeg": "2.1.2", "glob": "7.1.7", "got": "11.8.2", @@ -146,17 +146,17 @@ "http-proxy-agent": "4.0.1", "http-signature": "1.3.5", "https-proxy-agent": "5.0.0", - "idb-keyval": "5.0.6", + "idb-keyval": "5.1.3", "insert-text-at-cursor": "0.3.0", "is-root": "2.1.0", "is-svg": "4.3.1", "js-yaml": "4.1.0", - "jsdom": "16.6.0", + "jsdom": "16.7.0", "json5": "2.2.0", "json5-loader": "4.0.1", "jsonld": "5.2.0", "jsrsasign": "8.0.20", - "katex": "0.13.11", + "katex": "0.13.13", "koa": "2.13.1", "koa-bodyparser": "4.3.0", "koa-favicon": "2.1.0", @@ -168,7 +168,7 @@ "koa-views": "7.0.1", "langmap": "0.0.16", "lookup-dns-cache": "2.1.0", - "markdown-it": "12.1.0", + "markdown-it": "12.2.0", "markdown-it-anchor": "7.1.0", "matter-js": "0.17.1", "mfm-js": "0.19.0", @@ -176,7 +176,7 @@ "mocha": "8.4.0", "moji": "0.5.1", "ms": "2.1.3", - "multer": "1.4.2", + "multer": "1.4.3", "nested-property": "4.0.0", "node-fetch": "2.6.1", "nodemailer": "6.6.3", @@ -185,7 +185,7 @@ "parse5": "6.0.1", "pg": "8.6.0", "portscanner": "2.2.0", - "postcss": "8.3.5", + "postcss": "8.3.6", "postcss-loader": "6.1.1", "prismjs": "1.24.1", "probe-image-size": "7.2.1", @@ -202,32 +202,32 @@ "redis": "3.1.2", "redis-lock": "0.1.4", "reflect-metadata": "0.1.13", - "regenerator-runtime": "0.13.7", + "regenerator-runtime": "0.13.9", "rename": "1.0.4", "request-stats": "3.0.0", "require-all": "3.0.0", "rimraf": "3.0.2", "rndstr": "1.0.0", "s-age": "1.1.2", - "sass": "1.35.2", + "sass": "1.37.5", "sass-loader": "12.1.0", "seedrandom": "3.0.5", "sharp": "0.28.3", "speakeasy": "2.0.0", "stringz": "2.1.0", - "style-loader": "3.1.0", - "summaly": "2.4.0", + "style-loader": "3.2.1", + "summaly": "2.4.1", "syslog-pro": "1.0.0", - "systeminformation": "5.7.7", + "systeminformation": "5.8.0", "syuilo-password-strength": "0.0.1", "textarea-caret": "3.1.0", "three": "0.117.1", "throttle-debounce": "3.0.1", "tinycolor2": "1.4.2", "tmp": "0.2.1", - "ts-loader": "9.2.3", - "ts-node": "10.1.0", - "tsc-alias": "1.3.7", + "ts-loader": "9.2.5", + "ts-node": "10.2.0", + "tsc-alias": "1.3.8", "tsconfig-paths": "3.10.1", "tslint": "6.1.3", "tslint-sonarts": "1.9.0", @@ -237,8 +237,8 @@ "ulid": "2.3.0", "uuid": "8.3.2", "v-debounce": "0.1.2", - "vanilla-tilt": "1.7.0", - "vue": "3.2.1", + "vanilla-tilt": "1.7.1", + "vue": "3.2.2", "vue-color": "2.8.1", "vue-json-pretty": "1.8.1", "vue-loader": "16.3.1", @@ -248,10 +248,10 @@ "vue-svg-loader": "0.17.0-beta.2", "vuedraggable": "4.0.1", "web-push": "3.4.5", - "webpack": "5.45.1", + "webpack": "5.50.0", "webpack-cli": "4.7.2", "websocket": "1.0.34", - "ws": "7.5.3", + "ws": "8.1.0", "xev": "2.0.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 131892cd2c..6d0d12fa3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -200,6 +200,18 @@ "@babel/helper-validator-identifier" "^7.14.5" to-fast-properties "^2.0.0" +"@cspotcode/source-map-consumer@0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" + integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg== + +"@cspotcode/source-map-support@0.6.1": + version "0.6.1" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.6.1.tgz#118511f316e2e87ee4294761868e254d3da47960" + integrity sha512-DX3Z+T5dt1ockmPdobJS/FAsQPW4V4SrWEhD2iYQT2Cb2tQsiMnYxrcUH9By/Z3B+v0S5LMBkQtV/XOBbpLEOg== + dependencies: + "@cspotcode/source-map-consumer" "0.8.0" + "@cto.af/textdecoder@^0.0.0": version "0.0.0" resolved "https://registry.yarnpkg.com/@cto.af/textdecoder/-/textdecoder-0.0.0.tgz#e1e8d84c936c30a0f4619971f19ca41941af9fdc" @@ -230,10 +242,10 @@ pump "^3.0.0" secure-json-parse "^2.1.0" -"@eslint/eslintrc@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" - integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== +"@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -457,10 +469,10 @@ dependencies: defer-to-connect "^2.0.0" -"@tokenizer/token@^0.1.0", "@tokenizer/token@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.1.1.tgz#f0d92c12f87079ddfd1b29f614758b9696bc29e3" - integrity sha512-XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w== +"@tokenizer/token@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276" + integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A== "@tootallnate/once@1": version "1.1.2" @@ -487,10 +499,10 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.0.tgz#5bd046e508b1ee90bc091766758838741fdefd6e" integrity sha512-RKkL8eTdPv6t5EHgFKIVQgsDapugbuOptNd9OOunN/HAkzmmTnZELx1kNCK0rSdUYGmiFMM3rRQMAWiyp023LQ== -"@tsconfig/node16@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.1.tgz#a6ca6a9a0ff366af433f42f5f0e124794ff6b8f1" - integrity sha512-FTgBI767POY/lKNDNbIzgAX6miIDBs6NTCbdlDb8TrWovHsSvaVIZDlTqym29C6UqhzwcJx4CYr+AlrMywA0cA== +"@tsconfig/node16@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" + integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== "@types/accepts@*": version "1.3.5" @@ -517,10 +529,10 @@ "@types/connect" "*" "@types/node" "*" -"@types/bull@3.15.2": - version "3.15.2" - resolved "https://registry.yarnpkg.com/@types/bull/-/bull-3.15.2.tgz#b824b0b4fc8d1d9294a20973f6ceedcba1a7f3e8" - integrity sha512-uMQ7u/4GxY2bSTMd4P2yLkyqu3GoKbwTCDkMHJJ2g9OkiMq0Vxw+C7lF4w+oNkwZzZ2k4Kw76Ncxjd6GMnc+CA== +"@types/bull@3.15.3": + version "3.15.3" + resolved "https://registry.yarnpkg.com/@types/bull/-/bull-3.15.3.tgz#c55a7644465547bd77d70a1c80f10aadf58d5dd5" + integrity sha512-JL+c8TmfaZVZn5H+tzgt867eHfm408HV1/wS5+sjQnJ3ULxpw5/GwLl6sX6Gmcrte4VTFm+Jz8U0Wy4QVgC4dg== dependencies: "@types/ioredis" "*" @@ -546,7 +558,7 @@ resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.16.tgz#f09cc36e18d28274f942e7201147cce34d97e8c8" integrity sha512-vI5iOAsez9+roLS3M3+Xx7w+WRuDtSmF8bQkrbcIJ2sC1PcDgVoA0WGpa+bIrJ+y8zqY2oi//fUctkxtIcXJCw== -"@types/cheerio@^0.22.10": +"@types/cheerio@0.22.18": version "0.22.18" resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.18.tgz#19018dceae691509901e339d63edf1e935978fe6" integrity sha512-Fq7R3fINAPSdUEhOyjG4iVxgHrOnqDJbY0/BUuiN0pvD/rfmZWekVZnv+vcs8TtpA2XF50uv50LaE4EnpEL/Hw== @@ -585,11 +597,6 @@ resolved "https://registry.yarnpkg.com/@types/dateformat/-/dateformat-3.0.1.tgz#98d747a2e5e9a56070c6bf14e27bff56204e34cc" integrity sha512-KlPPdikagvL6ELjWsljbyDIPzNCeliYkqRpI+zea99vBBbCIA5JNshZAwQKTON139c87y9qvTFVgkFd14rtS4g== -"@types/debug@^4.1.5": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" - integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== - "@types/escape-regexp@0.0.0": version "0.0.0" resolved "https://registry.yarnpkg.com/@types/escape-regexp/-/escape-regexp-0.0.0.tgz#bff0225f9ef30d0dbdbe0e2a24283ee5342990c3" @@ -791,10 +798,10 @@ dependencies: "@types/node" "*" -"@types/koa-bodyparser@4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@types/koa-bodyparser/-/koa-bodyparser-4.3.2.tgz#ccedc381adeb81e05cbdffb5d2df2bd99a7e7de9" - integrity sha512-fjNPSs3qNs/sKVT6O6VdF+RTBd5HLlFtFmAZxWGiOPwCm7+/jhia462Ni30XmCM2ziUbfx2pa79NkHDBI0TgAQ== +"@types/koa-bodyparser@4.3.3": + version "4.3.3" + resolved "https://registry.yarnpkg.com/@types/koa-bodyparser/-/koa-bodyparser-4.3.3.tgz#9c7d4295576bc863d550002f732f1c57dd88cc58" + integrity sha512-/ileIpXsy1fFEzgZhZ07eZH8rAVL7jwuk/kaoVEfauO6s80g2LIDIJKEyDbuAL9S/BWflKzEC0PHD6aXkmaSbw== dependencies: "@types/koa" "*" @@ -805,10 +812,10 @@ dependencies: "@types/koa" "*" -"@types/koa-cors@0.0.1": - version "0.0.1" - resolved "https://registry.yarnpkg.com/@types/koa-cors/-/koa-cors-0.0.1.tgz#5c681704938acf45ce871fdb1ca084dc57dd4f97" - integrity sha512-pSpsfmXQ2pf6h8Jv3S5bKL4OmlcUW29mIcdhB7lb6kduoMNwKF7Ztf7kup2Z8Cst6BwfjnDx+/J9vsvS/jpCbA== +"@types/koa-cors@0.0.2": + version "0.0.2" + resolved "https://registry.yarnpkg.com/@types/koa-cors/-/koa-cors-0.0.2.tgz#369c753fb383640f225579c70a4f9a286b4931b7" + integrity sha512-uNaDY26HUVO+2C6arK8ZFODs9mBjYprD8mlvkVe2bYdX9wzEeKtycVXPafXpUkePhMh4sffIMkhRDyedokG/QA== dependencies: "@types/koa" "*" @@ -910,10 +917,10 @@ "@types/linkify-it" "*" "@types/mdurl" "*" -"@types/matter-js@0.17.3": - version "0.17.3" - resolved "https://registry.yarnpkg.com/@types/matter-js/-/matter-js-0.17.3.tgz#86f6bd1fe7e3652703532057ab1c910e33ec4e60" - integrity sha512-FWT8dQTDGEKgQ4K8pbg9a1g98lS6jzleVkBjeindpt+7M72+UfS3bU75g1kuborNg1rr2g+KaU7qoZpdi3WS0w== +"@types/matter-js@0.17.5": + version "0.17.5" + resolved "https://registry.yarnpkg.com/@types/matter-js/-/matter-js-0.17.5.tgz#b7ddd422cf5980f01531dfed60fc11682a1adbb9" + integrity sha512-s4j6htb+NZNQyo2jP96uZ93aPn0fCw0RP1YnEDmKkIKpOVxvNWdEEPPj3U+9xezp3eQChvWOwHcR815rEBWexA== "@types/mdurl@*": version "1.0.2" @@ -935,10 +942,10 @@ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.3.tgz#bbeb55fbc73f28ea6de601fbfa4613f58d785323" integrity sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw== -"@types/node-fetch@2.5.11": - version "2.5.11" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.11.tgz#ce22a2e65fc8999f4dbdb7ddbbcf187d755169e4" - integrity sha512-2upCKaqVZETDRb8A2VTaRymqFBEgH8u6yr96b/u3+1uQEPDRo3mJLEiPk7vdXBHRtjwkjqzFYMJXrt0Z9QsYjQ== +"@types/node-fetch@2.5.12": + version "2.5.12" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66" + integrity sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw== dependencies: "@types/node" "*" form-data "^3.0.0" @@ -948,10 +955,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055" integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g== -"@types/node@16.3.3": - version "16.3.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.3.3.tgz#0c30adff37bbbc7a50eb9b58fae2a504d0d88038" - integrity sha512-8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ== +"@types/node@16.6.0": + version "16.6.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.6.0.tgz#0d5685f85066f94e97f19e8a67fe003c5fadacc4" + integrity sha512-OyiZPohMMjZEYqcVo/UJ04GyAxXOJEZO/FpzyXxcH4r/ArrVoXHf4MbUrkLp0Tz7/p1mMKpo5zJ6ZHl8XBNthQ== "@types/node@^14.11.8": version "14.14.44" @@ -1096,6 +1103,11 @@ "@types/glob" "*" "@types/node" "*" +"@types/rsvp@^4.0.4": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.4.tgz#55e93e7054027f1ad4b4ebc1e60e59eb091e2d32" + integrity sha512-J3Ol++HCC7/hwZhanDvggFYU/GtxHxE/e7cGRWxR04BF7Tt3TqJZ84BkzQgDxmX0uu8IagiyfmfoUlBACh2Ilg== + "@types/seedrandom@2.4.28": version "2.4.28" resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.28.tgz#9ce8fa048c1e8c85cb71d7fe4d704e000226036f" @@ -1109,10 +1121,10 @@ "@types/express-serve-static-core" "*" "@types/mime" "*" -"@types/sharp@0.28.4": - version "0.28.4" - resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.28.4.tgz#7afdcf979069ddc68a915603fdaa412ada93f833" - integrity sha512-vfz+RlJU5FgXyyf9w8wc+JwwT8MFI98NZr0272umQegrggAQhTwwb8pKZn0PTtd+j0crXkZDWw5ABG/i6Lu/Lw== +"@types/sharp@0.28.5": + version "0.28.5" + resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.28.5.tgz#2095c304e24c310945d6ece7a9fd44b34272c93f" + integrity sha512-+RYU1NdKeDtTMau6HBbcVUCWjMiDydW4nRIGnOviwRxZxjJy0LqRdx0+YdxBKHcSlUWIYhD1XtiGQsUtInsjBQ== dependencies: "@types/node" "*" @@ -1244,17 +1256,17 @@ "@types/webpack-sources" "*" source-map "^0.6.0" -"@types/websocket@1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.3.tgz#49e09f939afd0ccdee4f7108d4712ec9feb0f153" - integrity sha512-ZdoTSwmDsKR7l1I8fpfQtmTI/hUwlOvE3q0iyJsp4tXU0MkdrYowimDzwxjhQvxU4qjhHLd3a6ig0OXRbLgIdw== +"@types/websocket@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.4.tgz#1dc497280d8049a5450854dd698ee7e6ea9e60b8" + integrity sha512-qn1LkcFEKK8RPp459jkjzsfpbsx36BBt3oC3pITYtkoBw/aVX+EZFa5j3ThCRTNpLFvIMr5dSTD4RaMdilIOpA== dependencies: "@types/node" "*" -"@types/ws@7.4.6": - version "7.4.6" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.6.tgz#c4320845e43d45a7129bb32905e28781c71c1fff" - integrity sha512-ijZ1vzRawI7QoWnTNL8KpHixd2b2XVb9I9HAqI3triPsh1EC0xH0Eg6w2O3TKbDCgiNNlJqfrof6j4T2I+l9vw== +"@types/ws@7.4.7": + version "7.4.7" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702" + integrity sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww== dependencies: "@types/node" "*" @@ -1263,48 +1275,48 @@ resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.2.tgz#808c9fa7e4517274ed555fa158f2de4b4f468e71" integrity sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg== -"@typescript-eslint/parser@4.28.3": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.3.tgz#95f1d475c08268edffdcb2779993c488b6434b44" - integrity sha512-ZyWEn34bJexn/JNYvLQab0Mo5e+qqQNhknxmc8azgNd4XqspVYR5oHq9O11fLwdZMRcj4by15ghSlIEq+H5ltQ== +"@typescript-eslint/parser@4.29.1": + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.1.tgz#17dfbb45c9032ffa0fe15881d20fbc2a4bdeb02d" + integrity sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg== dependencies: - "@typescript-eslint/scope-manager" "4.28.3" - "@typescript-eslint/types" "4.28.3" - "@typescript-eslint/typescript-estree" "4.28.3" + "@typescript-eslint/scope-manager" "4.29.1" + "@typescript-eslint/types" "4.29.1" + "@typescript-eslint/typescript-estree" "4.29.1" debug "^4.3.1" -"@typescript-eslint/scope-manager@4.28.3": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.3.tgz#c32ad4491b3726db1ba34030b59ea922c214e371" - integrity sha512-/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ== +"@typescript-eslint/scope-manager@4.29.1": + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz#f25da25bc6512812efa2ce5ebd36619d68e61358" + integrity sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A== dependencies: - "@typescript-eslint/types" "4.28.3" - "@typescript-eslint/visitor-keys" "4.28.3" + "@typescript-eslint/types" "4.29.1" + "@typescript-eslint/visitor-keys" "4.29.1" -"@typescript-eslint/types@4.28.3": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.3.tgz#8fffd436a3bada422c2c1da56060a0566a9506c7" - integrity sha512-kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA== +"@typescript-eslint/types@4.29.1": + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5" + integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA== -"@typescript-eslint/typescript-estree@4.28.3": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz#253d7088100b2a38aefe3c8dd7bd1f8232ec46fb" - integrity sha512-YAb1JED41kJsqCQt1NcnX5ZdTA93vKFCMP4lQYG6CFxd0VzDJcKttRlMrlG+1qiWAw8+zowmHU1H0OzjWJzR2w== +"@typescript-eslint/typescript-estree@4.29.1": + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz#7b32a25ff8e51f2671ccc6b26cdbee3b1e6c5e7f" + integrity sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw== dependencies: - "@typescript-eslint/types" "4.28.3" - "@typescript-eslint/visitor-keys" "4.28.3" + "@typescript-eslint/types" "4.29.1" + "@typescript-eslint/visitor-keys" "4.29.1" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/visitor-keys@4.28.3": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz#26ac91e84b23529968361045829da80a4e5251c4" - integrity sha512-ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg== +"@typescript-eslint/visitor-keys@4.29.1": + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz#0615be8b55721f5e854f3ee99f1a714f2d093e5d" + integrity sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag== dependencies: - "@typescript-eslint/types" "4.28.3" + "@typescript-eslint/types" "4.29.1" eslint-visitor-keys "^2.0.0" "@ungap/promise-all-settled@1.1.2": @@ -1312,37 +1324,37 @@ resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== -"@vue/compiler-core@3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.1.tgz#8e13232f7aef8e308fb2d4a10571a5640257064b" - integrity sha512-UEJf2ZGww5wGVdrWIXIZo04KdJFGPmI2bHRUsBZ3AdyCAqJ5ykRXKOBn1OR1hvA2YzimudOEyHM+DpbBv91Kww== +"@vue/compiler-core@3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.2.tgz#8d3e29f129579ed9b14f48af735fd8d95f248504" + integrity sha512-QhCI0ZU5nAR0LMcLgzW3v75374tIrHGp8XG5CzJS7Nsy+iuignbE4MZ2XJfh5TGIrtpuzfWA4eTIfukZf/cRdg== dependencies: "@babel/parser" "^7.12.0" "@babel/types" "^7.12.0" - "@vue/shared" "3.2.1" + "@vue/shared" "3.2.2" estree-walker "^2.0.1" source-map "^0.6.1" -"@vue/compiler-dom@3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.1.tgz#5cc68873f1928c7b9aee8c8a2846f7f362cb1ab9" - integrity sha512-tXg8tkPb3j54zNfWqoao9T1JI41yWPz8TROzmif/QNNA46eq8/SRuRsBd36i47GWaz7mh+yg3vOJ87/YBjcMyQ== +"@vue/compiler-dom@3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.2.tgz#26e198498746c53047c3744d26fc95e670692ab7" + integrity sha512-ggcc+NV/ENIE0Uc3TxVE/sKrhYVpLepMAAmEiQ047332mbKOvUkowz4TTFZ+YkgOIuBOPP0XpCxmCMg7p874mA== dependencies: - "@vue/compiler-core" "3.2.1" - "@vue/shared" "3.2.1" + "@vue/compiler-core" "3.2.2" + "@vue/shared" "3.2.2" -"@vue/compiler-sfc@3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.1.tgz#7809b298cf0fbce62a2c628b7dfc1e82dd9a3a9b" - integrity sha512-fVLdme5RZVkBt+jxv2LCSRM72o4FX7BR2eu2FpjjEi1kEtUMKBDnjKwGWy7TyhTju0t0CocctyoM+G56vH7NpQ== +"@vue/compiler-sfc@3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.2.tgz#5b7b13b07689be8e4880d856f72d1be500785be9" + integrity sha512-hrtqpQ5L6IPn5v7yVRo7uvLcQxv0z1+KBjZBWMBOcrXz4t+PKUxU/SWd6Tl9T8FDmYlunzKUh6lcx+2CLo6f5A== dependencies: "@babel/parser" "^7.13.9" "@babel/types" "^7.13.0" "@types/estree" "^0.0.48" - "@vue/compiler-core" "3.2.1" - "@vue/compiler-dom" "3.2.1" - "@vue/compiler-ssr" "3.2.1" - "@vue/shared" "3.2.1" + "@vue/compiler-core" "3.2.2" + "@vue/compiler-dom" "3.2.2" + "@vue/compiler-ssr" "3.2.2" + "@vue/shared" "3.2.2" consolidate "^0.16.0" estree-walker "^2.0.1" hash-sum "^2.0.0" @@ -1354,42 +1366,42 @@ postcss-selector-parser "^6.0.4" source-map "^0.6.1" -"@vue/compiler-ssr@3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.1.tgz#f900762f83482e44e9260c2322e3d332c711826c" - integrity sha512-6YAOtQunuEyYlVSjK1F7a7BXi7rxVfiTiJ0Ro7eq0q0MNCFV9Z+sN68lfa/E4ABVb0ledEY/Rt8kL23nwCoTCQ== +"@vue/compiler-ssr@3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.2.tgz#633bb8e01f00a969c35ca12db32be7fe4c7185a9" + integrity sha512-rVl1agMFhdEN3Go0bCriXo+3cysxKIuRP0yh1Wd8ysRrKfAmokyDhUA8PrGSq2Ymj/LdZTh+4OKfj3p2+C+hlA== dependencies: - "@vue/compiler-dom" "3.2.1" - "@vue/shared" "3.2.1" + "@vue/compiler-dom" "3.2.2" + "@vue/shared" "3.2.2" -"@vue/reactivity@3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.1.tgz#0e71d4ee00b0d0ca6a6141966c30b68b3f685002" - integrity sha512-4Lja2KmyiKvuraDed6dXK2A6+r/7x7xGDA7vVR2Aqc8hQVu0+FWeVX+IBfiVOSpbZXFlHLNmCBFkbuWLQSlgxg== +"@vue/reactivity@3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.2.tgz#d37011a68395e038a3cf5256af52d48c591b06b6" + integrity sha512-IHjhtmrhK6dzacj/EnLQDWOaA3HuzzVk6w84qgV8EpS4uWGIJXiRalMRg6XvGW2ykJvIl3pLsF0aBFlTMRiLOA== dependencies: - "@vue/shared" "3.2.1" + "@vue/shared" "3.2.2" -"@vue/runtime-core@3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.1.tgz#39641110b2f84fdda3b80b86830827b7b5ef041a" - integrity sha512-IsgelRM/5hYeRhz5+ECi66XvYDdjG2t4lARjHvCXw5s9Q4N6uIbjLMwtLzAWRxYf3/y258BrD+ehxAi943ScJg== +"@vue/runtime-core@3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.2.tgz#b9a7250783de19dd8dd6febf008084b0f9144586" + integrity sha512-/aUk1+GO/VPX0oVxhbzSWE1zrf3/wGCsO1ALNisVokYftKqfqLDjbJHE6mrI2hx3MiuwbHrWjJClkGUVTIOPEQ== dependencies: - "@vue/reactivity" "3.2.1" - "@vue/shared" "3.2.1" + "@vue/reactivity" "3.2.2" + "@vue/shared" "3.2.2" -"@vue/runtime-dom@3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.1.tgz#087cf36f40ad0869712c4154693c620e478061a8" - integrity sha512-bUAHUSe49A5wYdHQ8wsLU1CMPXaG2fRuv2661mx/6Q9+20QxglT3ss8ZeL6AVRu16JNJMcdvTTsNpbnMbVc/lQ== +"@vue/runtime-dom@3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.2.tgz#6d0da23ed1cfc702477f4b8c5dc4f9335c94e119" + integrity sha512-1Le/NpCfawCOfePfJezvWUF+oCVLU8N+IHN4oFDOxRe6/PgHNJ+yT+YdxFifBfI+TIAoXI/9PsnqzmJZV+xsmw== dependencies: - "@vue/runtime-core" "3.2.1" - "@vue/shared" "3.2.1" + "@vue/runtime-core" "3.2.2" + "@vue/shared" "3.2.2" csstype "^2.6.8" -"@vue/shared@3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.1.tgz#1f1fe26fe0334404cce10740b5ffb2654f1281aa" - integrity sha512-INN92dVBNgd0TW9BqfQQKx/HWGCHhUUbAV5EZ5FgSCiEdwuZsJbGt1mdnaD9IxGhpiyOjP2ClxGG8SFp7ELcWg== +"@vue/shared@3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.2.tgz#6104185ebd57af5a14ac51c1f491b2205fc24054" + integrity sha512-dvYb318tk9uOzHtSaT3WII/HscQSIRzoCZ5GyxEb3JlkEXASpAUAQwKnvSe2CudnF8XHFRTB7VITWSnWNLZUtA== "@webassemblyjs/ast@1.11.0": version "1.11.0" @@ -1693,6 +1705,11 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" +acorn-import-assertions@^1.7.6: + version "1.7.6" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78" + integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA== + acorn-jsx@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" @@ -1708,6 +1725,11 @@ acorn-walk@^7.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e" integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ== +acorn-walk@^8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.1.1.tgz#3ddab7f84e4a7e2313f6c414c5b7dac85f4e3ebc" + integrity sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w== + acorn@^7.1.1, acorn@^7.4.0: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" @@ -1867,10 +1889,10 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -apexcharts@3.27.2: - version "3.27.2" - resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.27.2.tgz#95598439158c7d2aa0ef3909606a935c891bb621" - integrity sha512-FjW0OW6Oq9kbWJiF6wIZEsMNNHme6WNv3eh+p4azuWVELNY/LigXU+01s4TP+Obplhy6byV9bw9x7GhrbN2YsQ== +apexcharts@3.27.3: + version "3.27.3" + resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.27.3.tgz#1b921ac64dea2f28a2b1aad4b396b38464223849" + integrity sha512-1ZrqiQT0VahkqW0kVjf5QVURYGaHMlGN08BoIZG2c2U/gY2AtnEoFN4r9q4d/pYYYKvI9AyLBHq0otzcVGrHAw== dependencies: svg.draggable.js "^2.2.2" svg.easing.js "^2.0.0" @@ -2085,13 +2107,18 @@ async@>=0.2.9: resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== -async@^2.6.0, async@^2.6.2: +async@^2.6.0: version "2.6.3" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== dependencies: lodash "^4.17.14" +async@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8" + integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -2131,10 +2158,10 @@ autwh@0.1.0: dependencies: oauth "0.9.15" -aws-sdk@2.948.0: - version "2.948.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.948.0.tgz#0c974c351af97dbc66dbd96bd6c20928baf10415" - integrity sha512-UJaCwccNaNNFtbhlvg+BmcaVWNI7RPonZA16nca0s3O+UnHm5y5H/nN6XpuJp+NUrxrLgTFaztPvjmBp5q6p+g== +aws-sdk@2.966.0: + version "2.966.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.966.0.tgz#2e929cee510666bab43936e8726774af4a3a20dc" + integrity sha512-gxfur+ofp3WGRHecc1nlKKlrI5iiYET824/3YHjSlKsLhG1biz+hhMpz1xjA7M4cdzjuWdmGoy01CBqghet7Mg== dependencies: buffer "4.9.2" events "1.1.1" @@ -2661,13 +2688,12 @@ cbor@*: "@cto.af/textdecoder" "^0.0.0" nofilter "^2.0.3" -cbor@7.0.6: - version "7.0.6" - resolved "https://registry.yarnpkg.com/cbor/-/cbor-7.0.6.tgz#ce47d1d5f946760f199f848dbbcfe762cf492fd6" - integrity sha512-rgt2RFogHGDLFU5r0kSfyeBc+de55DwYHP73KxKsQxsR5b0CYuQPH6AnJaXByiohpLdjQqj/K0SFcOV+dXdhSA== +cbor@8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/cbor/-/cbor-8.0.0.tgz#51657d26a99a6a1866f8c3258e948576eb17d709" + integrity sha512-nMmaLWbj7+bC6MsApKRIig8h+yjgNLhPLXaCelq5+C7mpWsHgIcseZSdvgexSY5uE1Q3m2uPvIDZwSdxdo7qig== dependencies: - "@cto.af/textdecoder" "^0.0.0" - nofilter "^2.0.3" + nofilter "^3.0.2" chai@4.3.4: version "4.3.4" @@ -2689,10 +2715,10 @@ chalk@4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== +chalk@4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -2765,27 +2791,27 @@ check-error@^1.0.2: resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= -cheerio-httpcli@0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/cheerio-httpcli/-/cheerio-httpcli-0.7.4.tgz#f72e23e6af6c5cc250e7ced325f2a601cdbdb63d" - integrity sha512-D2Chqfwdu0xQ/xcX8zxB14I+mT+J5TO9yJlXczcV35clYLKaRnrweAjNrAayyE1fRKTk5JNzN0yhZpVdNP/aXQ== +cheerio-httpcli@0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/cheerio-httpcli/-/cheerio-httpcli-0.8.2.tgz#0189bda71c8bd2852de78e154291e2288184fbf2" + integrity sha512-grIzTwQg/nE7Oy6VvL19pf0UlM6wiluy/AOpXfQLVFrSi21F8wnO3dLchtaH2hfMF6jz68ot0/ngyQQVrp2VTw== dependencies: - "@types/cheerio" "^0.22.10" - async "^2.6.2" + "@types/cheerio" "0.22.18" + "@types/rsvp" "^4.0.4" + async "^3.2.0" cheerio "^0.22.0" - colors "^1.3.3" + colors "^1.4.0" foreach "^2.0.5" he "^1.2.0" - iconv-lite "^0.4.24" - import-fresh "^3.0.0" - jschardet "^2.1.0" + iconv-lite "^0.6.3" + import-fresh "^3.3.0" + jschardet "^3.0.0" object-assign "^4.1.1" - os-locale "^3.1.0" + os-locale "^5.0.0" prettyjson "^1.2.1" - request "^2.88.0" - rsvp "^4.8.4" - spawn-sync "^2.0.0" - tough-cookie "^3.0.1" + request "^2.88.2" + rsvp "^4.8.5" + tough-cookie "^2.5.0" type-of "^2.0.1" valid-url "^1.0.9" @@ -3121,7 +3147,7 @@ colormin@^1.0.5: css-color-names "0.0.4" has "^1.0.1" -colors@^1.1.2, colors@^1.3.3: +colors@^1.1.2, colors@^1.3.3, colors@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== @@ -3265,14 +3291,6 @@ convert-source-map@^1.5.0: dependencies: safe-buffer "~5.1.1" -cookies@~0.7.1: - version "0.7.3" - resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.7.3.tgz#7912ce21fbf2e8c2da70cf1c3f351aecf59dadfa" - integrity sha512-+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A== - dependencies: - depd "~1.1.2" - keygrip "~1.0.3" - cookies@~0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90" @@ -3307,10 +3325,10 @@ core-js-compat@^3.14.0: browserslist "^4.16.6" semver "7.0.0" -core-js@3.15.2: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" - integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q== +core-js@3.16.1: + version "3.16.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.1.tgz#f4485ce5c9f3c6a7cb18fa80488e08d362097249" + integrity sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw== core-util-is@1.0.2, core-util-is@^1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -3356,18 +3374,7 @@ cross-env@7.0.3: dependencies: cross-spawn "^7.0.1" -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -3393,10 +3400,10 @@ css-declaration-sorter@^6.0.3: dependencies: timsort "^0.3.0" -css-loader@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.0.0.tgz#e3f9131229df43e081876f434dc2f4605be9d5ae" - integrity sha512-xi3iTbHekvk5dWWdqfQKNsEm2g3Vr20uRwHzfXF+pHsaFGMuxTrqR1y8PY+st5G7wqid4/pBSiaqZsO6iaGN5g== +css-loader@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.2.0.tgz#9663d9443841de957a3cb9bcea2eda65b3377071" + integrity sha512-/rvHfYRjIpymZblf49w8jYcRo2y9gj6rV8UroHGmBxKrIyGLokpycyKzp9OkitvqT29ZSpzJ0Ic7SpnJX3sC8g== dependencies: icss-utils "^5.1.0" postcss "^8.2.15" @@ -3527,14 +3534,15 @@ cssnano-utils@^2.0.1: resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2" integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ== -cssnano@5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.6.tgz#2a91ad34c6521ae31eab3da9c90108ea3093535d" - integrity sha512-NiaLH/7yqGksFGsFNvSRe2IV/qmEBAeDE64dYeD8OBrgp6lE8YoMeQJMtsv5ijo6MPyhuoOvFhI94reahBRDkw== +cssnano@5.0.7: + version "5.0.7" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.7.tgz#e81894bdf31aa01a0ca3d1d0eee47be18f7f3012" + integrity sha512-7C0tbb298hef3rq+TtBbMuezBQ9VrFtrQEsPNuBKNVgWny/67vdRsnq8EoNu7TRjAHURgYvWlRIpCUmcMZkRzw== dependencies: - cosmiconfig "^7.0.0" cssnano-preset-default "^5.1.3" is-resolvable "^1.1.0" + lilconfig "^2.0.3" + yaml "^1.10.2" cssnano@^3.0.0: version "3.10.0" @@ -3664,13 +3672,6 @@ debug@2, debug@^2.2.0, debug@^2.3.3, debug@^2.5.2: dependencies: ms "2.0.0" -debug@3.1.0, debug@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - debug@4, debug@4.3.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" @@ -3678,6 +3679,13 @@ debug@4, debug@4.3.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: dependencies: ms "2.1.2" +debug@4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -3685,6 +3693,13 @@ debug@^3.2.6: dependencies: ms "^2.1.1" +debug@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + debuglog@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -4160,11 +4175,6 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -error-inject@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37" - integrity sha1-4rPZG1Su1nLzCdlQ0VSFD6EdTzc= - es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5: version "1.17.5" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" @@ -4279,15 +4289,15 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-plugin-vue@7.13.0: - version "7.13.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.13.0.tgz#6f3d232bf1fcd0428353b0d581ebaca1c5dbc17a" - integrity sha512-u0+jL8h2MshRuMTCLslktxRsPTjlENNcNufhgHu01N982DmHVdeFniyMPoVLLRjACQOwdz3FdlsgYGBMBG+AKg== +eslint-plugin-vue@7.16.0: + version "7.16.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.16.0.tgz#7fe9fea039a190b108319c1380adf543ef57707d" + integrity sha512-0E2dVvVC7I2Xm1HXyx+ZwPj9CNX4NJjs4K4r+GVsHWyt5Pew3JLD4fI7A91b2jeL0TXE7LlszrwLSTJU9eqehw== dependencies: eslint-utils "^2.1.0" natural-compare "^1.4.0" - semver "^7.3.2" - vue-eslint-parser "^7.8.0" + semver "^6.3.0" + vue-eslint-parser "^7.10.0" eslint-scope@5.1.1, eslint-scope@^5.1.1: version "5.1.1" @@ -4314,13 +4324,13 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@7.30.0: - version "7.30.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.30.0.tgz#6d34ab51aaa56112fd97166226c9a97f505474f8" - integrity sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg== +eslint@7.32.0: + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.2" + "@eslint/eslintrc" "^0.4.3" "@humanwhocodes/config-array" "^0.5.0" ajv "^6.10.0" chalk "^4.0.0" @@ -4452,18 +4462,20 @@ events@^3.2.0: resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== +execa@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" + integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" execa@^5.0.0: version "5.0.0" @@ -4644,14 +4656,14 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -file-type@16.5.1: - version "16.5.1" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.5.1.tgz#dd697dc5c3a2f4db63af746f38a6322e5e7bc6a5" - integrity sha512-Pi1G43smrCy82Q3be3sfKaeS5uHdfj905dP88YqhroG6TYbVY2ljTdDXeXqa6Cn5nOk6znOjWM2uZptA8vH/qQ== +file-type@16.5.3: + version "16.5.3" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.5.3.tgz#474b7e88c74724046abb505e9b8ed4db30c4fc06" + integrity sha512-uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A== dependencies: readable-web-to-node-stream "^3.0.0" - strtok3 "^6.0.3" - token-types "^2.0.0" + strtok3 "^6.2.4" + token-types "^4.1.1" fill-range@^4.0.0: version "4.0.0" @@ -4943,14 +4955,7 @@ get-port@^5.1.1: resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193" integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ== -get-stream@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - -get-stream@^5.1.0: +get-stream@^5.0.0, get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== @@ -5243,7 +5248,7 @@ har-schema@^2.0.0: resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= -har-validator@~5.1.0, har-validator@~5.1.3: +har-validator@~5.1.3: version "5.1.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== @@ -5414,10 +5419,10 @@ html-encoding-sniffer@^2.0.1: dependencies: whatwg-encoding "^1.0.5" -html-entities@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" - integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8= +html-entities@2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" + integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ== html-minifier@4.0.0: version "4.0.0" @@ -5535,6 +5540,11 @@ https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: agent-base "6" debug "4" +human-signals@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" + integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== + human-signals@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" @@ -5552,7 +5562,7 @@ humanize-number@0.0.2: resolved "https://registry.yarnpkg.com/humanize-number/-/humanize-number-0.0.2.tgz#11c0af6a471643633588588048f1799541489c18" integrity sha1-EcCvakcWQ2M1iFiASPF5lUFInBg= -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -5566,6 +5576,13 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" +iconv-lite@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + icss-replace-symbols@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" @@ -5576,12 +5593,14 @@ icss-utils@^5.0.0, icss-utils@^5.1.0: resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== -idb-keyval@5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-5.0.6.tgz#62fe4a6703fb5ec86661f41330c94fda65e6d0e6" - integrity sha512-6lJuVbwyo82mKSH6Wq2eHkt9LcbwHAelMIcMe0tP4p20Pod7tTxq9zf0ge2n/YDfMOpDryerfmmYyuQiaFaKOg== +idb-keyval@5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-5.1.3.tgz#6ef5dff371897c23f144322dc6374eadd6a345d9" + integrity sha512-N9HbCK/FaXSRVI+k6Xq4QgWxbcZRUv+SfG1y7HJ28JdV8yEJu6k+C/YLea7npGckX2DQJeEVuMc4bKOBeU/2LQ== + dependencies: + safari-14-idb-fix "^1.0.4" -ieee754@1.1.13, ieee754@^1.1.13, ieee754@^1.1.4: +ieee754@1.1.13, ieee754@^1.1.4: version "1.1.13" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== @@ -5614,6 +5633,14 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" +import-fresh@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + import-local@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" @@ -5695,10 +5722,10 @@ invert-kv@^1.0.0: resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= -invert-kv@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" - integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== +invert-kv@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-3.0.1.tgz#a93c7a3d4386a1dc8325b97da9bb1620c0282523" + integrity sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw== ioredis@^4.27.0: version "4.27.6" @@ -5716,11 +5743,6 @@ ioredis@^4.27.0: redis-parser "^3.0.0" standard-as-callback "^2.1.0" -ip-regex@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" - integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= - ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" @@ -6001,11 +6023,6 @@ is-root@2.1.0: resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= - is-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" @@ -6216,15 +6233,15 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jschardet@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.1.1.tgz#af6f8fd0b3b0f5d46a8fd9614a4fce490575c184" - integrity sha512-pA5qG9Zwm8CBpGlK/lo2GE9jPxwqRgMV7Lzc/1iaPccw6v4Rhj8Zg2BTyrdmHmxlJojnbLupLeRnaPLsq03x6Q== +jschardet@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-3.0.0.tgz#898d2332e45ebabbdb6bf2feece9feea9a99e882" + integrity sha512-lJH6tJ77V8Nzd5QWRkFYCLc13a3vADkh3r/Fi8HupZGWk2OVVDfnZP8V/VgQgZ+lzW0kG2UGb5hFgt3V3ndotQ== -jsdom@16.6.0: - version "16.6.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac" - integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg== +jsdom@16.7.0: + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== dependencies: abab "^2.0.5" acorn "^8.2.4" @@ -6251,7 +6268,7 @@ jsdom@16.6.0: whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" whatwg-url "^8.5.0" - ws "^7.4.5" + ws "^7.4.6" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -6384,18 +6401,13 @@ jws@^4.0.0: jwa "^2.0.0" safe-buffer "^5.0.1" -katex@0.13.11: - version "0.13.11" - resolved "https://registry.yarnpkg.com/katex/-/katex-0.13.11.tgz#66138ebf173f25ef130cd3a3ea3ea1d12a3f1362" - integrity sha512-yJBHVIgwlAaapzlbvTpVF/ZOs8UkTj/sd46Fl8+qAf2/UiituPYVeapVD8ADZtqyRg/qNWUKt7gJoyYVWLrcXw== +katex@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/katex/-/katex-0.13.13.tgz#15a796e95516869bc6d483443b58b2df872ee40f" + integrity sha512-cCMcil4jwMm7behpXGiQfXJA29sko/Gd/26iCsr53Dv5Jn2iHbHyEb14dm9uVrIijUXx6Zz1WhlFhHE6DckvkQ== dependencies: commander "^6.0.0" -keygrip@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.3.tgz#399d709f0aed2bab0a059e0cdd3a5023a053e1dc" - integrity sha512-/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g== - keygrip@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226" @@ -6474,11 +6486,6 @@ koa-favicon@2.1.0: dependencies: mz "^2.7.0" -koa-is-json@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/koa-is-json/-/koa-is-json-1.0.0.tgz#273c07edcdcb8df6a2c1ab7d59ee76491451ec14" - integrity sha1-JzwH7c3Ljfaiwat9We52SRRR7BQ= - koa-json-body@5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/koa-json-body/-/koa-json-body-5.3.0.tgz#64aad3f400adfb81df54b63f7a5eb38bad62d980" @@ -6564,36 +6571,6 @@ koa@2.13.1: type-is "^1.6.16" vary "^1.1.2" -koa@2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/koa/-/koa-2.8.1.tgz#98e13b267ab8a1868f015a4b41b5a52e31457ce5" - integrity sha512-iCgjRkntcVud5amnioi+79r7TPVhKPfCY8UzL9GjyU+nIWTE9xsqyrJ6kib3InT9JYRyUu9Y67i5apCjf997TQ== - dependencies: - accepts "^1.3.5" - cache-content-type "^1.0.0" - content-disposition "~0.5.2" - content-type "^1.0.4" - cookies "~0.7.1" - debug "~3.1.0" - delegates "^1.0.0" - depd "^1.1.2" - destroy "^1.0.4" - error-inject "^1.0.0" - escape-html "^1.0.3" - fresh "~0.5.2" - http-assert "^1.3.0" - http-errors "^1.6.3" - is-generator-function "^1.0.7" - koa-compose "^4.1.0" - koa-convert "^1.2.0" - koa-is-json "^1.0.0" - on-finished "^2.3.0" - only "~0.0.2" - parseurl "^1.3.2" - statuses "^1.5.0" - type-is "^1.6.16" - vary "^1.1.2" - ky-universal@^0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/ky-universal/-/ky-universal-0.8.2.tgz#edc398d54cf495d7d6830aa1ab69559a3cc7f824" @@ -6634,12 +6611,12 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -lcid@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" - integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== +lcid@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-3.1.1.tgz#9030ec479a058fc36b5e8243ebaac8b6ac582fd0" + integrity sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg== dependencies: - invert-kv "^2.0.0" + invert-kv "^3.0.0" lead@^1.0.0: version "1.0.0" @@ -6678,6 +6655,11 @@ liftoff@^3.1.0: rechoir "^0.6.2" resolve "^1.1.7" +lilconfig@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz#68f3005e921dafbd2a2afb48379986aa6d2579fd" + integrity sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg== + lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" @@ -6861,7 +6843,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0: +lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -6969,7 +6951,7 @@ make-iterator@^1.0.0: dependencies: kind-of "^6.0.2" -map-age-cleaner@^0.1.1: +map-age-cleaner@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== @@ -6998,10 +6980,10 @@ markdown-it-anchor@7.1.0: resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-7.1.0.tgz#30fb21497bf59e83ff4d1ddc052d821962e2489e" integrity sha512-loQggrwsIkkP7TOrESvmYkV2ikbQNNKhHcWyqC7/C2CmfHl1tkUizJJU8C5aGgg7J6oXVQJx17gk7i47tNn/lQ== -markdown-it@12.1.0: - version "12.1.0" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.1.0.tgz#7ad572caddd336bd27a68d20e86bac1fafe8fb20" - integrity sha512-7temG6IFOOxfU0SgzhqR+vr2diuMhyO5uUIEZ3C5NbXhqC9uFUHoU41USYuDFoZRsaY7BEIEei874Z20VMLF6A== +markdown-it@12.2.0: + version "12.2.0" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.2.0.tgz#091f720fd5db206f80de7a8d1f1a7035fd0d38db" + integrity sha512-Wjws+uCrVQRqOoJvze4HCqkKl1AsSh95iFAeQDwnyfxM09divCBSXlDR1uTvyUP3Grzpn4Ru8GeCxYPM8vkCQg== dependencies: argparse "^2.0.1" entities "~2.1.0" @@ -7059,14 +7041,14 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -mem@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" - integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== +mem@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/mem/-/mem-5.1.1.tgz#7059b67bf9ac2c924c9f1cff7155a064394adfb3" + integrity sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw== dependencies: - map-age-cleaner "^0.1.1" - mimic-fn "^2.0.0" - p-is-promise "^2.0.0" + map-age-cleaner "^0.1.3" + mimic-fn "^2.1.0" + p-is-promise "^2.1.0" merge-source-map@^1.1.0: version "1.1.0" @@ -7146,7 +7128,7 @@ mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.27, mime-types@~2.1.19, dependencies: mime-db "1.44.0" -mimic-fn@^2.0.0, mimic-fn@^2.1.0: +mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== @@ -7271,7 +7253,7 @@ mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1: +mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -7348,15 +7330,15 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multer@1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.2.tgz#2f1f4d12dbaeeba74cb37e623f234bf4d3d2057a" - integrity sha512-xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg== +multer@1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.3.tgz#4db352d6992e028ac0eacf7be45c6efd0264297b" + integrity sha512-np0YLKncuZoTzufbkM6wEKp68EhWJXcU6fq6QqrSwkckd2LlMgd1UqhUJLj6NS/5sZ8dE8LYDWslsltJznnXlg== dependencies: append-field "^1.0.0" busboy "^0.2.11" concat-stream "^1.5.2" - mkdirp "^0.5.1" + mkdirp "^0.5.4" object-assign "^4.1.1" on-finished "^2.3.0" type-is "^1.6.4" @@ -7459,11 +7441,6 @@ next-tick@~1.0.0: resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - no-case@^2.2.0: version "2.3.2" resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" @@ -7539,6 +7516,11 @@ nofilter@^2.0.3: dependencies: "@cto.af/textdecoder" "^0.0.0" +nofilter@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-3.0.3.tgz#3ff3b142efdccb403434ccae4a0c2c835cb9b522" + integrity sha512-TN/MCrQmXQk5DyUJ8TGUq1Il8rv4fTsjddLmMopV006QP8DMkglmGgYfQKD5620vXLRXfr8iGI6ZZ4/ZWld2cQ== + noop-logger@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" @@ -7613,14 +7595,7 @@ now-and-later@^2.0.0: dependencies: once "^1.3.2" -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - -npm-run-path@^4.0.1: +npm-run-path@^4.0.0, npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -7797,7 +7772,7 @@ once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: dependencies: wrappy "1" -onetime@^5.1.2: +onetime@^5.1.0, onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== @@ -7857,14 +7832,14 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" -os-locale@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" - integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== +os-locale@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-5.0.0.tgz#6d26c1d95b6597c5d5317bf5fba37eccec3672e0" + integrity sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA== dependencies: - execa "^1.0.0" - lcid "^2.0.0" - mem "^4.0.0" + execa "^4.0.0" + lcid "^3.0.0" + mem "^5.0.0" os-tmpdir@^1.0.0: version "1.0.2" @@ -7899,7 +7874,7 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= -p-is-promise@^2.0.0: +p-is-promise@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== @@ -8097,11 +8072,6 @@ path-is-absolute@1.0.1, path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" @@ -8148,10 +8118,10 @@ pathval@^1.1.1: resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== -peek-readable@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.0.tgz#250b08b7de09db8573d7fd8ea475215bbff14348" - integrity sha512-KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA== +peek-readable@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.0.1.tgz#9a045f291db254111c3412c1ce4fec27ddd4d202" + integrity sha512-7qmhptnR0WMSpxT5rMHG9bW/mYSR1uqaPFj2MHvT+y/aOUu6msJijpKt5SkTDKySwg65OWG2JwTMBlgcbwMHrQ== performance-now@^2.1.0: version "2.1.0" @@ -8794,10 +8764,10 @@ postcss-zindex@^2.0.1: postcss "^5.0.4" uniqs "^2.0.0" -postcss@8.3.5: - version "8.3.5" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709" - integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA== +postcss@8.3.6: + version "8.3.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea" + integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A== dependencies: colorette "^1.2.2" nanoid "^3.1.23" @@ -8988,7 +8958,7 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= -psl@^1.1.24, psl@^1.1.28, psl@^1.1.33: +psl@^1.1.28, psl@^1.1.33: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== @@ -9131,11 +9101,6 @@ punycode@2.1.1, punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= - pureimage@0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/pureimage/-/pureimage-0.3.2.tgz#3cae06abaf2735e806c089bcbd188e3c7926bf2e" @@ -9402,7 +9367,12 @@ reflect-metadata@0.1.13, reflect-metadata@^0.1.13: resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== -regenerator-runtime@0.13.7, regenerator-runtime@^0.13.4: +regenerator-runtime@0.13.9: + version "0.13.9" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== + +regenerator-runtime@^0.13.4: version "0.13.7" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== @@ -9487,19 +9457,19 @@ replacestream@^4.0.3: object-assign "^4.0.1" readable-stream "^2.0.2" -request-promise-core@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346" - integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag== +request-promise-core@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" + integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== dependencies: - lodash "^4.17.11" + lodash "^4.17.19" -request-promise-native@1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59" - integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w== +request-promise-native@1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" + integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== dependencies: - request-promise-core "1.1.2" + request-promise-core "1.1.4" stealthy-require "^1.1.1" tough-cookie "^2.3.3" @@ -9511,33 +9481,7 @@ request-stats@3.0.0: http-headers "^3.0.1" once "^1.4.0" -request@2.88.0: - version "2.88.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" - integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.0" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.4.3" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - -request@^2.88.0: +request@2.88.2, request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -9563,11 +9507,6 @@ request@^2.88.0: tunnel-agent "^0.6.0" uuid "^3.3.2" -require-all@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/require-all/-/require-all-2.2.0.tgz#b4420c233ac0282d0ff49b277fb880a8b5de0894" - integrity sha1-tEIMIzrAKC0P9Jsnf7iAqLXeCJQ= - require-all@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/require-all/-/require-all-3.0.0.tgz#473d49704be310115ce124f77383b1ebd8671312" @@ -9718,7 +9657,7 @@ rr@0.1.0: resolved "https://registry.yarnpkg.com/rr/-/rr-0.1.0.tgz#a18ec25ec94a67c35f210bb3a85d17914e79cd1e" integrity sha1-oY7CXslKZ8NfIQuzqF0XkU55zR4= -rsvp@^4.8.4: +rsvp@^4.8.5: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== @@ -9740,6 +9679,11 @@ s-age@1.1.2: resolved "https://registry.yarnpkg.com/s-age/-/s-age-1.1.2.tgz#c0cf15233ccc93f41de92ea42c36d957977d1ea2" integrity sha512-aSN2TlF39WLoZA/6cgYSJZhKt63kJ4EaadejPWjWY9/h4rksIqvfWY3gfd+3uAegSM1IXsA9aWeEhJtkxkFQtA== +safari-14-idb-fix@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/safari-14-idb-fix/-/safari-14-idb-fix-1.0.4.tgz#5c68ba63e2a8ae0d89a0aa1e13fe89e3aef7da19" + integrity sha512-4+Y2baQdgJpzu84d0QjySl70Kyygzf0pepVg8NVg4NnQEPpfC91fAn0baNvtStlCjUUxxiu0BOMiafa98fRRuA== + safe-buffer@*: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -9775,10 +9719,10 @@ sass-loader@12.1.0: klona "^2.0.4" neo-async "^2.6.2" -sass@1.35.2: - version "1.35.2" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.2.tgz#b732314fcdaf7ef8d0f1698698adc378043cb821" - integrity sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw== +sass@1.37.5: + version "1.37.5" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.37.5.tgz#f6838351f7cc814c4fcfe1d9a20e0cabbd1e7b3c" + integrity sha512-Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA== dependencies: chokidar ">=3.0.0 <4.0.0" @@ -9839,7 +9783,7 @@ semver-greatest-satisfied-range@^1.1.0: dependencies: sver-compat "^1.5.0" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -9941,13 +9885,6 @@ sharp@0.28.3: tar-fs "^2.1.1" tunnel-agent "^0.6.0" -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -9955,11 +9892,6 @@ shebang-command@^2.0.0: dependencies: shebang-regex "^3.0.0" -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - shebang-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" @@ -10102,7 +10034,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.17, source-map-support@~0.5.19: +source-map-support@~0.5.19: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== @@ -10145,11 +10077,6 @@ spawn-command@^0.0.2-1: resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0" integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A= -spawn-sync@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-2.0.0.tgz#3af5ba4b73cc5dc8a41d3747eede71e98d949555" - integrity sha512-AGXIhH/XZVinFewojYTsG8uapHX2e7MjtFbmibvK9qqG4qGd9b6jelU1sTkCA0RVGHvN9exJYTBVbF1Ls2f69g== - spdx-correct@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" @@ -10424,11 +10351,6 @@ strip-bom@^3.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= - strip-final-newline@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" @@ -10444,20 +10366,18 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -strtok3@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.3.tgz#bc81e225c19a909eab86538ff3348c4b3b0553d3" - integrity sha512-/3RaYN9rW5WEYNHSvn081CgL4HziT027hfi5tsksbPfeWxi3BSLb8tolZDzpYU3I78/0ZqRiFpMDAqN2t4YShA== +strtok3@^6.2.4: + version "6.2.4" + resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.2.4.tgz#302aea64c0fa25d12a0385069ba66253fdc38a81" + integrity sha512-GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw== dependencies: - "@tokenizer/token" "^0.1.1" - "@types/debug" "^4.1.5" - debug "^4.1.1" - peek-readable "^3.1.0" + "@tokenizer/token" "^0.3.0" + peek-readable "^4.0.1" -style-loader@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.1.0.tgz#e52a22ca2fd1f54c03f2c3e69b10182e68120908" - integrity sha512-HYVvBMX3RX7zx71pquZV6EcnPN7Deba+zQteSxCLqt3bxYRphmeMr+2mZMrIZjZ7IMa6aOUhNGn8cXGvWMjClw== +style-loader@3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.2.1.tgz#63cb920ec145c8669e9a50e92961452a1ef5dcde" + integrity sha512-1k9ZosJCRFaRbY6hH49JFlRB0fVSbmnyq1iTPjNxUmGVjBNEmwrrHPenhlp+Lgo51BojHSf6pl2FcqYaN3PfVg== stylehacks@^5.0.1: version "5.0.1" @@ -10467,19 +10387,19 @@ stylehacks@^5.0.1: browserslist "^4.16.0" postcss-selector-parser "^6.0.4" -summaly@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/summaly/-/summaly-2.4.0.tgz#2054c91097d331b8aea838c88022bc1f23520cbe" - integrity sha512-dSXmg6WIk6kxzTfnBEwpMs42q0YI/bBbzU+vFKTd4DMBgH/UKWJCbqHIfrdaxA1I0CocNjXKCj38mglfM82kAg== +summaly@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/summaly/-/summaly-2.4.1.tgz#d2a8fa6bad10c1651eb0b849aab3009e87216a3d" + integrity sha512-1gETEQXqK5RD7yIGgdGeTwGL1uh+uj14u99atzNLNmvsxwdtZbPvDHZBPXkAW0cqsd8teoBJln5Dh1QeAhvGIg== dependencies: - cheerio-httpcli "0.7.4" - debug "3.1.0" + cheerio-httpcli "0.8.2" + debug "4.3.2" escape-regexp "0.0.1" - html-entities "1.2.1" - koa "2.8.1" - request "2.88.0" - request-promise-native "1.0.7" - require-all "2.2.0" + html-entities "2.3.2" + koa "2.13.1" + request "2.88.2" + request-promise-native "1.0.9" + require-all "3.0.0" trace-redirect "1.0.6" supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.0: @@ -10635,10 +10555,10 @@ syslog-pro@1.0.0: dependencies: moment "^2.22.2" -systeminformation@5.7.7: - version "5.7.7" - resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.7.7.tgz#f39d2ec4c72820aa97efd6f32021e455f20d1e61" - integrity sha512-aQ7MBeVI2MKPYOi3YJAoZ45JVlRkBA7IXoqGgtVBamvtE0I6JLOyJzD/VVc9pnMXDb3yqaMwssAjhwtJax4/Rw== +systeminformation@5.8.0: + version "5.8.0" + resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.8.0.tgz#43e6d0918d7d42c65e53e36059f0849354ab2873" + integrity sha512-l4drbK2PtNynGKblaShY9hDLW/gg1zxUq2+Yk4gTyd6a2JUvFyTGP8PhHV9iOh+MzS25PQa8W1t0kvcIvr9n7Q== syuilo-password-strength@0.0.1: version "0.0.1" @@ -10935,15 +10855,15 @@ token-stream@1.0.0: resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4" integrity sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ= -token-types@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/token-types/-/token-types-2.0.0.tgz#b23618af744818299c6fbf125e0fdad98bab7e85" - integrity sha512-WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw== +token-types@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/token-types/-/token-types-4.1.1.tgz#ef9e8c8e2e0ded9f1b3f8dbaa46a3228b113ba1a" + integrity sha512-hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w== dependencies: - "@tokenizer/token" "^0.1.0" - ieee754 "^1.1.13" + "@tokenizer/token" "^0.3.0" + ieee754 "^1.2.1" -tough-cookie@^2.3.3, tough-cookie@~2.5.0: +tough-cookie@^2.3.3, tough-cookie@^2.5.0, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -10951,15 +10871,6 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -tough-cookie@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" - integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== - dependencies: - ip-regex "^2.1.0" - psl "^1.1.28" - punycode "^2.1.1" - tough-cookie@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" @@ -10969,14 +10880,6 @@ tough-cookie@^4.0.0: punycode "^2.1.1" universalify "^0.1.2" -tough-cookie@~2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" - integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== - dependencies: - psl "^1.1.24" - punycode "^1.4.1" - tr46@^2.0.0, tr46@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" @@ -10994,36 +10897,38 @@ tree-kill@^1.2.2: resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== -ts-loader@9.2.3: - version "9.2.3" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.3.tgz#dc3b6362a4d4382493cd4f138d345f419656de68" - integrity sha512-sEyWiU3JMHBL55CIeC4iqJQadI0U70A5af0kvgbNLHVNz2ACztQg0j/9x10bjjIht8WfFYLKfn4L6tkZ+pu+8Q== +ts-loader@9.2.5: + version "9.2.5" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.5.tgz#127733a5e9243bf6dafcb8aa3b8a266d8041dca9" + integrity sha512-al/ATFEffybdRMUIr5zMEWQdVnCGMUA9d3fXJ8dBVvBlzytPvIszoG9kZoR+94k6/i293RnVOXwMaWbXhNy9pQ== dependencies: chalk "^4.1.0" enhanced-resolve "^5.0.0" micromatch "^4.0.0" semver "^7.3.4" -ts-node@10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.1.0.tgz#e656d8ad3b61106938a867f69c39a8ba6efc966e" - integrity sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA== +ts-node@10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.2.0.tgz#f1e88249a00e26aa95e9a93c50f70241a8a1c4bb" + integrity sha512-FstYHtQz6isj8rBtYMN4bZdnXN1vq4HCbqn9vdNQcInRqtB86PePJQIxE6es0PhxKWhj2PHuwbG40H+bxkZPmg== dependencies: + "@cspotcode/source-map-support" "0.6.1" "@tsconfig/node10" "^1.0.7" "@tsconfig/node12" "^1.0.7" "@tsconfig/node14" "^1.0.0" - "@tsconfig/node16" "^1.0.1" + "@tsconfig/node16" "^1.0.2" + acorn "^8.4.1" + acorn-walk "^8.1.1" arg "^4.1.0" create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" - source-map-support "^0.5.17" yn "3.1.1" -tsc-alias@1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/tsc-alias/-/tsc-alias-1.3.7.tgz#b088a35d30fad9b34b5c4f1efaf59fcd2982dc0a" - integrity sha512-Q/WcSjhbehLB2pTKuK6QC+R0m/bLXwhXoITec5zb4PEkaLv1X2GHdLb0HagLJVa3QWPKNsbp7NZex8WE0EbX3A== +tsc-alias@1.3.8: + version "1.3.8" + resolved "https://registry.yarnpkg.com/tsc-alias/-/tsc-alias-1.3.8.tgz#8dc670cf217b04a4f3f9e1c56def9cfda1f7759d" + integrity sha512-Ss0jjDjq5inr6ZJEw0IAS3/UxWMLgq4/tsH/yAbXJQHL5yccX+uaU5e2jSYy4VUsxWdZjKXFsUwcslk/4BWfgA== dependencies: "@jfonx/console-utils" "^1.0.3" "@jfonx/file-utils" "^3.0.1" @@ -11443,10 +11348,10 @@ value-or-function@^3.0.0: resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM= -vanilla-tilt@1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/vanilla-tilt/-/vanilla-tilt-1.7.0.tgz#4e6d3c6442c6fa2b45c958c9c2013f31686ab461" - integrity sha512-u9yUhpSasFeqQCuiTon+RSb0aHzcj9stvWVXQIswzKL5oG491lkYk7U1GmhOAEZt7yPT6EiYZRJhIh2MFBncOA== +vanilla-tilt@1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/vanilla-tilt/-/vanilla-tilt-1.7.1.tgz#4f5f3a29707551f532e3766bc0062023c3eec186" + integrity sha512-S3qZcTqMEVthgdnxhOW1BDcXJ0kCzrhF/zQYPTwtRMeETn9DW3BEvQrfAMsMN02mi3TMytWR+ODuNrcfO7OGWw== vary@^1.1.2: version "1.1.2" @@ -11537,10 +11442,10 @@ vue-color@2.8.1: material-colors "^1.0.0" tinycolor2 "^1.1.2" -vue-eslint-parser@^7.8.0: - version "7.8.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.8.0.tgz#43850bf856c9a69d62c0e12769609c338423684b" - integrity sha512-ehmmrLZNYLUoKayvVW8l8HyPQIfuYZHiJoQLRP3dapDlTU7bGs4tqIKVGdAEpMuXS/b4R/PImCt7Tkj4UhX1SQ== +vue-eslint-parser@^7.10.0: + version "7.10.0" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.10.0.tgz#ea4e4b10fd10aa35c8a79ac783488d8abcd29be8" + integrity sha512-7tc/ewS9Vq9Bn741pvpg8op2fWJPH3k32aL+jcIcWGCTzh/zXSdh7pZ5FV3W2aJancP9+ftPAv292zY5T5IPCg== dependencies: debug "^4.1.1" eslint-scope "^5.1.1" @@ -11591,14 +11496,14 @@ vue-svg-loader@0.17.0-beta.2: semver "^7.3.2" svgo "^1.3.2" -vue@3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.1.tgz#30dde152f2fdad0669ea9854d5a90a00ef96974b" - integrity sha512-0jhXluF5mzTAK5bXw/8yq4McvsI8HwEWI4cnQwJeN8NYGRbwh9wwuE4FNv1Kej9pxBB5ajTNsWr0M6DPs5EJZg== +vue@3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.2.tgz#11715cb71a02baefd0f6e6552dc623680eb1bf32" + integrity sha512-D/LuzAV30CgNJYGyNheE/VUs5N4toL2IgmS6c9qeOxvyh0xyn4exyRqizpXIrsvfx34zG9x5gCI2tdRHCGvF9w== dependencies: - "@vue/compiler-dom" "3.2.1" - "@vue/runtime-dom" "3.2.1" - "@vue/shared" "3.2.1" + "@vue/compiler-dom" "3.2.2" + "@vue/runtime-dom" "3.2.2" + "@vue/shared" "3.2.2" vuedraggable@4.0.1: version "4.0.1" @@ -11702,18 +11607,15 @@ webpack-sources@^2.1.1: source-list-map "^2.0.1" source-map "^0.6.1" -webpack-sources@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa" - integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ== - dependencies: - source-list-map "^2.0.1" - source-map "^0.6.1" +webpack-sources@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d" + integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw== -webpack@5.45.1: - version "5.45.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.45.1.tgz#d78dcbeda18a872dc62b0455d3ed3dcfd1c886bb" - integrity sha512-68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ== +webpack@5.50.0: + version "5.50.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.50.0.tgz#5562d75902a749eb4d75131f5627eac3a3192527" + integrity sha512-hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50" @@ -11721,6 +11623,7 @@ webpack@5.45.1: "@webassemblyjs/wasm-edit" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" acorn "^8.4.1" + acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" enhanced-resolve "^5.8.0" @@ -11737,7 +11640,7 @@ webpack@5.45.1: tapable "^2.1.1" terser-webpack-plugin "^5.1.3" watchpack "^2.2.0" - webpack-sources "^2.3.0" + webpack-sources "^3.2.0" webpack@^5: version "5.33.2" @@ -11832,7 +11735,7 @@ which@2.0.2, which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" -which@^1.1.1, which@^1.2.14, which@^1.2.9: +which@^1.1.1, which@^1.2.14: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -11923,16 +11826,16 @@ write-json-file@^2.3.0: sort-keys "^2.0.0" write-file-atomic "^2.0.0" -ws@7.5.3: +ws@8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.1.0.tgz#75e5ec608f66d3d3934ec6dbc4ebc8a34a68638c" + integrity sha512-0UWlCD2s3RSclw8FN+D0zDTUyMO+1kHwJQQJzkgUh16S8d3NYON0AKCEQPffE0ez4JyRFu76QDA9KR5bOG/7jw== + +ws@^7.4.6: version "7.5.3" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== -ws@^7.4.5: - version "7.4.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" - integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== - xev@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/xev/-/xev-2.0.1.tgz#24484173a22115bc8a990ef5d4d5129695b827a7" @@ -12031,6 +11934,11 @@ yaml@^1.10.0: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== +yaml@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + yargonaut@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/yargonaut/-/yargonaut-1.1.4.tgz#c64f56432c7465271221f53f5cc517890c3d6e0c" From f231f02329cb7f8687a375c549ea6e7a8875640c Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 12 Aug 2021 11:38:21 +0900 Subject: [PATCH 03/53] Update vue-loader --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c0d423108..c7e55a9999 100644 --- a/package.json +++ b/package.json @@ -241,7 +241,7 @@ "vue": "3.2.2", "vue-color": "2.8.1", "vue-json-pretty": "1.8.1", - "vue-loader": "16.3.1", + "vue-loader": "16.5.0", "vue-prism-editor": "2.0.0-alpha.2", "vue-router": "4.0.5", "vue-style-loader": "4.1.3", From 555954c71e5a1dda7834e49c5ceeb177f485ba5f Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 12 Aug 2021 11:48:06 +0900 Subject: [PATCH 04/53] Improve about-misskey page --- CHANGELOG.md | 1 + locales/ja-JP.yml | 1 + src/client/pages/about-misskey.vue | 18 +++--------------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31098ab4ca..71253df363 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ## 12.86.1 (2021/08/12) ### Improvements +- about-misskeyページにドキュメントへのリンクを追加 - Docker: Node.jsを16.6.2に - 依存関係の更新 diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 9b03c20cd1..be4792401b 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -772,6 +772,7 @@ searchResult: "検索結果" hashtags: "ハッシュタグ" troubleshooting: "トラブルシューティング" useBlurEffect: "UIにぼかし効果を使用" +learnMore: "詳しく" _docs: continueReading: "続きを読む" diff --git a/src/client/pages/about-misskey.vue b/src/client/pages/about-misskey.vue index f7b9245fcc..a324ebce5c 100644 --- a/src/client/pages/about-misskey.vue +++ b/src/client/pages/about-misskey.vue @@ -4,14 +4,14 @@
- +
Misskey
v{{ version }}
-
- {{ $ts._aboutMisskey.about }} +
+ {{ $ts._aboutMisskey.about }}
{{ $ts.learnMore }}
@@ -54,7 +54,6 @@ + + diff --git a/src/client/init.ts b/src/client/init.ts index 95aa18862c..2feeaf0ce1 100644 --- a/src/client/init.ts +++ b/src/client/init.ts @@ -7,6 +7,7 @@ import '@client/style.scss'; import * as Sentry from '@sentry/browser'; import { Integrations } from '@sentry/tracing'; import { computed, createApp, watch, markRaw } from 'vue'; +import compareVersions from 'compare-versions'; import widgets from '@client/widgets'; import directives from '@client/directives'; @@ -206,8 +207,9 @@ if (lastVersion !== version) { // テーマリビルドするため localStorage.removeItem('theme'); - // TODO: バージョンが新しくなった時だけダイアログ出す - //popup(); + if (lastVersion != null && compareVersions(version, lastVersion) === 1) { + popup(import('@client/components/updated.vue'), {}, {}, 'closed'); + } } // NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため) diff --git a/yarn.lock b/yarn.lock index a51decac74..d074b77d8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3364,6 +3364,11 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +compare-versions@3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" + integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== + component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" From f05f7c920ecc5028d00737f2c789a80c90e66b0d Mon Sep 17 00:00:00 2001 From: Johann150 Date: Sat, 14 Aug 2021 11:11:47 +0200 Subject: [PATCH 14/53] fix: truncate user information if it is too long (#7629) * truncate user information if it is too long Some AP software allows for user names or summaries to be very long. Misskey can not handle this and the profile page can not be opened and no activities from such users can be seen. Instead, the user name and summary are cut off after the maximum length so misskey can still process the activities of the profile. Co-authored-by: Toast * fix code style Co-authored-by: Toast Co-authored-by: syuilo --- src/remote/activitypub/models/person.ts | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index 829b4878f8..2270e05e3b 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -31,6 +31,9 @@ import { normalizeForSearch } from '@/misc/normalize-for-search'; const logger = apLogger; +const nameLength = 128; +const summaryLength = 2048; + /** * Validate and convert to actor object * @param x Fetched object @@ -52,11 +55,23 @@ function validateActor(x: IObject, uri: string): IActor { if (e) throw new Error(`invalid Actor: ${name} ${e.message}`); }; + const truncate = (input: string | undefined, size: number) => { + if (!input || input.length <= size) { + return input; + } else { + return input.substring(0, size); + } + }; + validate('id', x.id, $.str.min(1)); validate('inbox', x.inbox, $.str.min(1)); validate('preferredUsername', x.preferredUsername, $.str.min(1).max(128).match(/^\w([\w-.]*\w)?$/)); - validate('name', x.name, $.optional.nullable.str.max(128)); - validate('summary', x.summary, $.optional.nullable.str.max(2048)); + + // These fields are only informational, and some AP software allows these + // fields to be very long. If they are too long, we cut them off. This way + // we can at least see these users and their activities. + validate('name', truncate(x.name, nameLength), $.optional.nullable.str); + validate('summary', truncate(x.summary, summaryLength), $.optional.nullable.str); const idHost = toPuny(new URL(x.id!).hostname); if (idHost !== expectHost) { From 4de30aa47eec9823d833d2f375352afd2ca9d7fe Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Aug 2021 18:13:41 +0900 Subject: [PATCH 15/53] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da90a5c077..838137d6b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Misskey更新時にダイアログを表示するように ### Bugfixes +- ActivityPub: 長いユーザーの名前や自己紹介の対応 ## 12.87.0 (2021/08/12) From a8c56afd0f9054656e9c95169ab60b4321cfb2d6 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Aug 2021 18:19:25 +0900 Subject: [PATCH 16/53] add sound --- assets/client/sounds/syuilo/queue-jammed.mp3 | Bin 0 -> 351466 bytes src/client/pages/settings/sounds.vue | 1 + 2 files changed, 1 insertion(+) create mode 100644 assets/client/sounds/syuilo/queue-jammed.mp3 diff --git a/assets/client/sounds/syuilo/queue-jammed.mp3 b/assets/client/sounds/syuilo/queue-jammed.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..99e0c437feab80ebbd7df326a18b1d61d2ce7178 GIT binary patch literal 351466 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 Date: Sat, 14 Aug 2021 18:36:22 +0900 Subject: [PATCH 17/53] =?UTF-8?q?feat(client):=20=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=96=E3=82=AD=E3=83=A5=E3=83=BC=E3=82=A6=E3=82=A3=E3=82=B8?= =?UTF-8?q?=E3=82=A7=E3=83=83=E3=83=88=E3=81=AB=E8=AD=A6=E5=A0=B1=E9=9F=B3?= =?UTF-8?q?=E3=82=92=E9=B3=B4=E3=82=89=E3=81=99=E8=A8=AD=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/client/scripts/sound.ts | 26 ++++++++++++++++++-------- src/client/widgets/job-queue.vue | 10 ++++++++++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 838137d6b1..ef3b99a341 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ### Improvements - Misskey更新時にダイアログを表示するように +- ジョブキューウィジェットに警報音を鳴らす設定を追加 ### Bugfixes - ActivityPub: 長いユーザーの名前や自己紹介の対応 diff --git a/src/client/scripts/sound.ts b/src/client/scripts/sound.ts index d3422bfff2..c51fa8f215 100644 --- a/src/client/scripts/sound.ts +++ b/src/client/scripts/sound.ts @@ -2,6 +2,23 @@ import { ColdDeviceStorage } from '@client/store'; const cache = new Map(); +export function getAudio(file: string, useCache = true): HTMLAudioElement { + let audio: HTMLAudioElement; + if (useCache && cache.has(file)) { + audio = cache.get(file); + } else { + audio = new Audio(`/static-assets/client/sounds/${file}.mp3`); + if (useCache) cache.set(file, audio); + } + return audio; +} + +export function setVolume(audio: HTMLAudioElement, volume: number): HTMLAudioElement { + const masterVolume = ColdDeviceStorage.get('sound_masterVolume'); + audio.volume = masterVolume - ((1 - volume) * masterVolume); + return audio; +} + export function play(type: string) { const sound = ColdDeviceStorage.get('sound_' + type as any); if (sound.type == null) return; @@ -12,13 +29,6 @@ export function playFile(file: string, volume: number) { const masterVolume = ColdDeviceStorage.get('sound_masterVolume'); if (masterVolume === 0) return; - let audio: HTMLAudioElement; - if (cache.has(file)) { - audio = cache.get(file); - } else { - audio = new Audio(`/static-assets/client/sounds/${file}.mp3`); - cache.set(file, audio); - } - audio.volume = masterVolume - ((1 - volume) * masterVolume); + const audio = setVolume(getAudio(file), volume); audio.play(); } diff --git a/src/client/widgets/job-queue.vue b/src/client/widgets/job-queue.vue index beb80f7faf..327d8ede6d 100644 --- a/src/client/widgets/job-queue.vue +++ b/src/client/widgets/job-queue.vue @@ -50,6 +50,7 @@ import { defineComponent, markRaw } from 'vue'; import define from './define'; import * as os from '@client/os'; import number from '@client/filters/number'; +import * as sound from '@client/scripts/sound'; const widget = define({ name: 'jobQueue', @@ -58,6 +59,10 @@ const widget = define({ type: 'boolean', default: false, }, + sound: { + type: 'boolean', + default: false, + }, }) }); @@ -79,6 +84,7 @@ export default defineComponent({ delayed: 0, }, prev: {}, + sound: sound.setVolume(sound.getAudio('syuilo/queue-jammed'), 1) }; }, created() { @@ -107,6 +113,10 @@ export default defineComponent({ this[domain].active = stats[domain].active; this[domain].waiting = stats[domain].waiting; this[domain].delayed = stats[domain].delayed; + + if (this[domain].waiting > 0 && this.props.sound && this.sound.paused) { + this.sound.play(); + } } }, From d3b4b70bfc4b86ba283b46b4fb95954450854190 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Aug 2021 22:35:15 +0900 Subject: [PATCH 18/53] :art: --- CHANGELOG.md | 1 + src/client/components/date-separated-list.vue | 4 ++-- src/client/components/notes.vue | 12 +++++++++--- src/client/pages/api-console.vue | 2 +- src/client/pages/timeline.vue | 8 +++++--- src/client/ui/universal.vue | 9 +++++++-- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef3b99a341..33657e99a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ### Improvements - Misskey更新時にダイアログを表示するように - ジョブキューウィジェットに警報音を鳴らす設定を追加 +‐ UIデザインの調整 ### Bugfixes - ActivityPub: 長いユーザーの名前や自己紹介の対応 diff --git a/src/client/components/date-separated-list.vue b/src/client/components/date-separated-list.vue index 7a4cc5ef98..fa0b6d669c 100644 --- a/src/client/components/date-separated-list.vue +++ b/src/client/components/date-separated-list.vue @@ -93,13 +93,13 @@ export default defineComponent({ }); return h(this.$store.state.animation ? TransitionGroup : 'div', this.$store.state.animation ? { - class: 'sqadhkmv' + (this.noGap ? ' noGap _block' : ''), + class: 'sqadhkmv' + (this.noGap ? ' noGap' : ''), name: 'list', tag: 'div', 'data-direction': this.direction, 'data-reversed': this.reversed ? 'true' : 'false', } : { - class: 'sqadhkmv' + (this.noGap ? ' noGap _block' : ''), + class: 'sqadhkmv' + (this.noGap ? ' noGap' : ''), }, { default: renderChildren }); diff --git a/src/client/components/notes.vue b/src/client/components/notes.vue index e90102921a..560441ba67 100644 --- a/src/client/components/notes.vue +++ b/src/client/components/notes.vue @@ -9,7 +9,7 @@
{{ $ts.noNotes }}
-
+
@@ -17,8 +17,8 @@
- - + +
@@ -108,4 +108,10 @@ export default defineComponent({ .fade-leave-to { opacity: 0; } + +.giivymft { + > .notes { + background: var(--panel); + } +} diff --git a/src/client/pages/api-console.vue b/src/client/pages/api-console.vue index adae17658c..c6d459fd6d 100644 --- a/src/client/pages/api-console.vue +++ b/src/client/pages/api-console.vue @@ -1,7 +1,7 @@