12.63.0

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

locales/de-DE.yml

@@ -33,6 +33,9 @@ addUser: "Benutzer hinzufügen"
 favorite: "Zu Favoriten hinzufügen"
 favorites: "Favoriten"
 unfavorite: "Aus Favoriten entfernen"
+favorited: "Zu Favoriten hinzugefügt."
+alreadyFavorited: "Bereits zu den Favoriten hinzugefügt."
+cantFavorite: "Hinzufügen zu Favoriten fehlgeschlagen."
 pin: "Anheften"
 unpin: "Lösen"
 copyContent: "Inhalt kopieren"
@@ -87,6 +90,9 @@ followRequestPending: "Ausstehende Follow-Anfrage"
 enterEmoji: "Gib ein Emoji ein"
 renote: "Renote"
 unrenote: "Renote zurücknehmen"
+renoted: "Renote getätigt."
+cantRenote: "Renote dieses Beitrags nicht möglich."
+cantReRenote: "Renote einer Renote nicht möglich."
 quote: "Zitieren"
 pinnedNote: "Angepinnte Notiz"
 you: "Du"
@@ -655,6 +661,8 @@ useSystemFont: "Standardschriftart des Systems verwenden"
 clips: "Clips"
 experimentalFeatures: "Experimentelle Funktionalitäten"
 developer: "Entwickler"
+makeExplorable: "Benutzerkonto in \"Erkunden\" sichtbar machen"
+makeExplorableDescription: "Wenn diese Option deaktiviert ist, ist dein Benutzerkonto nicht im \"Erkunden\"-Bereich sichtbar."
 _aboutMisskey:
   about: "Misskey ist Open-Source-Software die von syuilo seit 2014 entwickelt wird."
   contributors: "Hauptmitwirkende"
@@ -974,6 +982,7 @@ _widgets:
   digitalClock: "Digitaluhr"
   federation: "Föderation"
   postForm: "Neue Notiz anfertigen"
+  slideshow: "Diashow"
 _cw:
   hide: "Ausblenden"
   show: "Mehr anzeigen"

locales/en-US.yml

@@ -33,6 +33,9 @@ addUser: "Add a user"
 favorite: "Favorite"
 favorites: "Favorites"
 unfavorite: "Unfavorite"
+favorited: "Added to favorites."
+alreadyFavorited: "Already added to favorites."
+cantFavorite: "Couldn't add to favorites."
 pin: "Pin to profile"
 unpin: "Unpin from profile"
 copyContent: "Copy contents"
@@ -87,6 +90,9 @@ followRequestPending: "Pending follow request"
 enterEmoji: "Enter an emoji"
 renote: "Renote"
 unrenote: "Unrenote"
+renoted: "Renoted."
+cantRenote: "This post can't be renoted."
+cantReRenote: "A renote can't be renoted."
 quote: "Quote"
 pinnedNote: "Pinned note"
 you: "You"
@@ -655,6 +661,8 @@ useSystemFont: "Use the system's default font"
 clips: "Clips"
 experimentalFeatures: "Experimental features"
 developer: "Developer"
+makeExplorable: "Make account visible in \"Explore\""
+makeExplorableDescription: "If you turn this off, your account will not show up in the \"Explore\" section."
 _aboutMisskey:
   about: "Misskey is open-source software being developed by syuilo since 2014."
   contributors: "Main contributors"
@@ -974,6 +982,7 @@ _widgets:
   digitalClock: "Digital clock"
   federation: "Federation"
   postForm: "Compose a note"
+  slideshow: "Slideshow"
 _cw:
   hide: "Hide"
   show: "Load more"

locales/ja-JP.yml

@@ -33,6 +33,9 @@ addUser: "ユーザーを追加"
 favorite: "お気に入り"
 favorites: "お気に入り"
 unfavorite: "お気に入り解除"
+favorited: "お気に入りに登録しました。"
+alreadyFavorited: "既にお気に入りに登録されています。"
+cantFavorite: "お気に入りに登録できませんでした。"
 pin: "ピン留め"
 unpin: "ピン留め解除"
 copyContent: "内容をコピー"
@@ -87,6 +90,9 @@ followRequestPending: "フォロー許可待ち"
 enterEmoji: "絵文字を入力"
 renote: "Renote"
 unrenote: "Renote解除"
+renoted: "Renoteしました。"
+cantRenote: "この投稿はRenoteできません。"
+cantReRenote: "RenoteをRenoteすることはできません。"
 quote: "引用"
 pinnedNote: "ピン留めされたノート"
 you: "あなた"
@@ -655,6 +661,9 @@ useSystemFont: "システムのデフォルトのフォントを使う"
 clips: "クリップ"
 experimentalFeatures: "実験的機能"
 developer: "開発者"
+makeExplorable: "アカウントを見つけやすくする"
+makeExplorableDescription: "オフにすると、「みつける」にアカウントが載らなくなります。"
+showGapBetweenNotesInTimeline: "タイムラインのノートを離して表示"
 
 _aboutMisskey:
   about: "Misskeyはsyuiloによって2014年から開発されている、オープンソースのソフトウェアです。"
@@ -995,6 +1004,7 @@ _widgets:
   digitalClock: "デジタル時計"
   federation: "連合"
   postForm: "投稿フォーム"
+  slideshow: "スライドショー"
 
 _cw:
   hide: "隠す"

locales/ru-RU.yml

@@ -95,6 +95,7 @@ sensitive: "Содержимое не для всех"
 add: "Добавить"
 reaction: "Реакции"
 reactionSettingDescription: "Подберите, что будет у вас в палитре реакций"
+reactionSettingDescription2: "Расставляйте перетаскиванием, удаляйте нажатием, добавляйте кнопкой «+»."
 rememberNoteVisibility: "Запоминать видимость заметок"
 attachCancel: "Удалить вложение"
 markAsSensitive: "Отметить как «не для всех»"
@@ -319,6 +320,7 @@ pinnedUsers: "Прикреплённый пользователь"
 pinnedUsersDescription: "Перечислите по одному имени пользователя в строке. Пользователи, перечисленные здесь, будут привязаны к закладке \"Изучение\"."
 pinnedPages: "Закрепленные страницы"
 pinnedPagesDescription: "Если хотите закрепить страницы на главной сайта, сюда можно добавить пути к ним, каждый в отдельной строке."
+pinnedClipId: "Идентификатор закреплённой памятки"
 pinnedNotes: "Закреплённая заметка"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Включить hCaptcha"
@@ -972,6 +974,7 @@ _widgets:
   digitalClock: "Цифровые часы"
   federation: "Федерация"
   postForm: "Форма отправки"
+  slideshow: "Показ слайдов"
 _cw:
   hide: "Спрятать"
   show: "Показать еще"

locales/uk-UA.yml

@@ -82,7 +82,7 @@ defaultNoteVisibility: "Видимість за замовчуванням"
 follow: "Підписка"
 followRequest: "Запит на підписку"
 followRequests: "Запити на підписку"
-unfollow: "Відписатися"
+unfollow: "Відписатись"
 followRequestPending: "Очікуючі запити на підписку"
 enterEmoji: "Введіть емодзі"
 renote: "Поширити"
@@ -143,7 +143,7 @@ recipient: "Кому"
 annotation: "Коментар"
 federation: "Федіверс"
 instances: "Інстанс"
-registeredAt: "Приєднався(-лась)"
+registeredAt: "Приєднався(лась)"
 latestRequestSentAt: "Останній запит надіслано"
 latestRequestReceivedAt: "Останній запит прийнято"
 latestStatus: "Останній статус"
@@ -239,7 +239,7 @@ activity: "Активність"
 images: "Зображення"
 birthday: "День народження"
 yearsOld: "{age} років"
-registeredDate: "Приєднався(-лась)"
+registeredDate: "Приєднався(лась)"
 location: "Локація"
 theme: "Тема"
 themeForLightMode: "Світла тема"
@@ -717,6 +717,8 @@ _wordMute:
   hard: "Жорстко"
   mutedNotes: "Заблоковані нотатки"
 _theme:
+  defaultValue: "Значення за замовчуванням"
+  func: "Функції"
   keys:
     accent: "Акцент"
     bg: "Фон"
@@ -776,6 +778,7 @@ _widgets:
   timeline: "Стрічка"
   activity: "Активність"
   federation: "Федіверс"
+  postForm: "Створення нотатки"
 _cw:
   show: "Показати більше"
 _poll:
@@ -797,54 +800,338 @@ _exportOrImport:
 _timelines:
   home: "Домівка"
 _rooms:
+  chooseImage: "Виберіть зображення"
+  roomType: "Тип кімнати"
+  carpetColor: "Колір килима"
   _roomType:
-    default: "За умовчанням"
+    default: "За замовчуванням"
+    washitsu: "В японському стилі"
   _furnitures:
+    milk: "Пакет молока"
+    bed: "Ліжко"
+    low-table: "Журнальний стіл"
+    desk: "Письмовий стіл"
+    chair: "Стілець"
+    chair2: "Стілець 2"
+    fan: "Вентилятор"
+    pc: "Комп’ютер"
+    plant: "Кімнатна рослина"
+    plant2: "Кімнатна рослина 2"
+    eraser: "Ластик"
+    pencil: "Олівець"
+    pudding: "Пудинг"
+    cardboard-box: "Картонна коробка"
+    cardboard-box2: "Картонна коробка 2"
+    cardboard-box3: "Картонна коробка 3"
+    book: "Книга"
+    book2: "Книга 2"
+    piano: "Піаніно"
+    server: "Сервер"
+    moon: "Місяць"
+    corkboard: "Коркова дошка"
+    mousepad: "Килимок для миші"
     monitor: "Монітор"
+    keyboard: "Клавіатура"
+    carpet-stripe: "Смугастий килим"
+    mat: "Мат"
+    doll-ai: "Лялька Аі-тян"
+    banknote: "Пачка грошей"
 _pages:
+  newPage: "Створити сторінку"
+  editPage: "Редагувати сторінку"
+  readPage: "Перегляд вихідного коду"
+  created: "Сторінка успішно створена."
+  updated: "Сторінка успішно оновлена."
+  deleted: "Сторінку видалено"
+  pageSetting: "Налаштування сторінки"
+  nameAlreadyExists: "Вказана адреса сторінки вже існує."
+  invalidNameTitle: "Вказана адреса сторінки неприпустима."
+  invalidNameText: "Переконайтеся, що не залишили порожнім."
+  editThisPage: "Редагувати цю сторінку"
+  viewSource: "Переглянути вихідний код"
+  viewPage: "Переглянути свої сторінки"
+  like: "Вподобати"
+  unlike: "Не вподобати"
+  my: "Мої сторінки"
+  liked: "Вподобані сторінки"
   featured: "Популярні"
+  inspector: "Інспектор"
+  contents: "Вміст"
+  variables: "Змінні"
+  title: "Заголовок"
+  url: "URL сторінки"
+  summary: "Короткий зміст"
+  alignCenter: "Рівняти елементи по центру"
+  hideTitleWhenPinned: "Приховати заголовок сторінки при закріпленні в профілі"
+  font: "Шрифт"
+  fontSerif: "Serif"
+  fontSansSerif: "Sans serif"
+  eyeCatchingImageSet: "Встановити привабливе зображення"
+  eyeCatchingImageRemove: "Видалити привабливе зображення"
+  chooseBlock: "Додати блок"
+  selectType: "Виберіть тип"
+  enterVariableName: "Введіть назву для змінної"
+  contentBlocks: "Контент"
+  inputBlocks: "Ввід"
+  specialBlocks: "Особливе"
   blocks:
+    text: "Текст"
+    textarea: "Текстова область"
+    section: "Розділ"
     image: "Зображення"
+    button: "Кнопка"
+    if: "Якщо"
+    _if:
+      variable: "Змінні"
+    post: "Створення нотатки"
+    _post:
+      text: "Вміст"
+    textInput: "Введення тексту"
+    _textInput:
+      name: "Ім'я змінної"
+      text: "Назва"
+      default: "Значення за замовчуванням"
+    textareaInput: "Багаторядкове введення тексту"
+    _textareaInput:
+      name: "Ім'я змінної"
+      text: "Назва"
+      default: "Значення за замовчуванням"
+    numberInput: "Числове введення"
+    _numberInput:
+      name: "Ім'я змінної"
+      text: "Назва"
+      default: "Значення за замовчуванням"
+    _canvas:
+      width: "Ширина"
+      height: "Висота"
+    note: "Вбудована нотатка"
+    _note:
+      id: "Ідентифікатор нотатки"
+      idDescription: "Також можна вказати посилання на нотатку"
+      detailed: "Детальний вигляд"
+    switch: "Перемикач"
+    _switch:
+      name: "Ім'я змінної"
+      text: "Назва"
+      default: "Значення за замовчуванням"
+    counter: "Лічильник"
+    _counter:
+      name: "Ім'я змінної"
+      text: "Назва"
+      inc: "Збільшити на"
+    _button:
+      text: "Напис"
+      _action:
+        _dialog:
+          content: "Вміст"
+        resetRandom: "Скидання генератора випадковості"
+        pushEvent: "Надіслати подію"
+        _pushEvent:
+          event: "Назві події"
+          message: "Повідомлення для відображення при активації"
+          variable: "Змінна для надсилання"
+          no-variable: "Відсутньо"
+        callAiScript: "Виклик AiScript"
+        _callAiScript:
+          functionName: "Ім'я функції"
+    radioButton: "Вибір"
+    _radioButton:
+      name: "Ім'я змінної"
+      title: "Напис"
+      values: "Варіанти, розділені розривами рядків"
+      default: "Значення за замовчуванням"
   script:
     categories:
+      flow: "Керування потоком"
+      logical: "Логічні операції"
+      operation: "Обчислення"
+      comparison: "Порівняння"
+      random: "Випадковість"
+      value: "Значення"
+      fn: "Функції"
+      text: "Дії з текстом"
+      convert: "Перетворення"
       list: "Списки"
     blocks:
+      text: "Текст"
+      multiLineText: "Текст (багаторядковий)"
+      textList: "Текстовий список"
+      strLen: "Довжина тексту"
+      _strLen:
+        arg1: "Текст"
+      _strPick:
+        arg1: "Текст"
+      strReplace: "Заміна тексту"
+      _strReplace:
+        arg1: "Текст"
+        arg2: "Текст, який потрібно замінити"
+        arg3: "Заміняти на"
+      strReverse: "Перевернути текст"
+      _strReverse:
+        arg1: "Текст"
+      join: "Конкатенація тексту"
       _join:
         arg1: "Списки"
+        arg2: "Розділювач"
+      add: "Додати"
+      _add:
+        arg1: "A"
+        arg2: "B"
+      subtract: "Відняти"
+      _subtract:
+        arg1: "A"
+        arg2: "B"
+      multiply: "Помножити"
+      _multiply:
+        arg1: "A"
+        arg2: "B"
+      divide: "Поділити"
+      _divide:
+        arg1: "A"
+        arg2: "B"
+      mod: "Остача"
+      _mod:
+        arg1: "A"
+        arg2: "B"
+      round: "Десяткове округлення"
+      _round:
+        arg1: "Число"
+      eq: "A дорівнює B"
+      _eq:
+        arg1: "A"
+        arg2: "B"
+      notEq: "A не дорівнює B"
+      _notEq:
+        arg1: "A"
+        arg2: "B"
+      and: "А І Б"
+      _and:
+        arg1: "A"
+        arg2: "B"
+      or: "A АБО B"
+      _or:
+        arg1: "A"
+        arg2: "B"
+      lt: "< A менше, ніж B"
+      _lt:
+        arg1: "A"
+        arg2: "B"
+      gt: "> A більше, ніж B"
+      _gt:
+        arg1: "A"
+        arg2: "B"
+      ltEq: "<= A менше або дорівнює B"
+      _ltEq:
+        arg1: "A"
+        arg2: "B"
+      gtEq: ">= A більше або дорівнює B"
+      _gtEq:
+        arg1: "A"
+        arg2: "B"
+      if: "Умова"
+      _if:
+        arg1: "Якщо"
+        arg2: "Якщо так"
+        arg3: "Якщо ні"
+      not: "НЕ"
+      _not:
+        arg1: "НЕ"
+      random: "Випадково"
+      _random:
+        arg1: "Імовірність"
+      rannum: "Випадкове число"
+      _rannum:
+        arg1: "Мінімальне значення"
+        arg2: "Максимальне значення"
+      randomPick: "Випадковий вибір зі списку"
       _randomPick:
         arg1: "Списки"
+      dailyRandom: "Випадково (триває добу)"
+      _dailyRandom:
+        arg1: "Імовірність"
+      dailyRannum: "Випадкове число (триває добу)"
+      _dailyRannum:
+        arg1: "Мінімальне значення"
+        arg2: "Максимальне значення"
+      dailyRandomPick: "Випадково вибрати зі списку (триває добу)"
       _dailyRandomPick:
         arg1: "Списки"
+      seedRandom: "Випадковість (з насінням)"
+      _seedRandom:
+        arg1: "Насіння"
+        arg2: "Імовірність"
+      seedRannum: "Випадкове число (з насінням)"
+      _seedRannum:
+        arg1: "Насіння"
+        arg2: "Мінімальне значення"
+        arg3: "Максимальне значення"
+      seedRandomPick: "Випадково вибрати зі списку (з насінням)"
       _seedRandomPick:
+        arg1: "Насіння"
         arg2: "Списки"
+      DRPWPM: "Випадково вибрати зі зваженого списку (триває добу)"
+      _DRPWPM:
+        arg1: "Текстовий список"
+      pick: "Вибір зі списку"
       _pick:
         arg1: "Списки"
+        arg2: "Позиція"
+      listLen: "Отримати довжину списку"
       _listLen:
         arg1: "Списки"
+      number: "Число"
+      stringToNumber: "Текст на число"
+      _stringToNumber:
+        arg1: "Текст"
+      numberToString: "Число на текст"
+      _numberToString:
+        arg1: "Число"
+      splitStrByLine: "Розбиття тексту на рядки"
+      _splitStrByLine:
+        arg1: "Текст"
+      ref: "Змінні"
+      aiScriptVar: "Змінна AiScript"
+      fn: "Функції"
       _fn:
-        arg1: "Вихід"
+        arg1: "Вивід"
+      for: "Повторення"
+      _for:
+        arg1: "Кількість повторень"
+        arg2: "Дія"
     types:
+      string: "Текст"
+      number: "Число"
+      boolean: "Прапорець"
       array: "Списки"
+      stringArray: "Текстовий список"
 _relayStatus:
   requesting: "Очікує затвердження"
   accepted: "Затверджено"
   rejected: "Відхилено"
 _notification:
+  fileUploaded: "Файл успішно завантажено"
+  youGotMention: "{name} згадує вас"
+  youGotReply: "{name} відповідає"
   youGotQuote: "{name} цитує вас"
   youRenoted: "{name} поширює"
+  youGotPoll: "{name} бере участь в опитуванні"
   youGotMessagingMessageFromUser: "Повідомлення від {name}"
   youGotMessagingMessageFromGroup: "Нове повідомлення в групі {name}"
   youWereFollowed: "Новий підписник"
+  youReceivedFollowRequest: "Ви отримали запит на підписку"
+  yourFollowRequestAccepted: "Запит на підписку прийнято"
   youWereInvitedToGroup: "Запрошення до групи"
   _types:
+    all: "Все"
     follow: "Підписки"
     mention: "Згадка"
-    renote: "Поширити"
+    reply: "Відповіді"
-    quote: "Цитата"
+    renote: "Поширення"
+    quote: "Цитування"
     reaction: "Реакції"
     pollVote: "Опитування"
-    receiveFollowRequest: "Запит на підписку"
+    receiveFollowRequest: "Запити на підписку"
-    followRequestAccepted: "Прийнята підписка"
+    followRequestAccepted: "Прийняті підписки"
     groupInvited: "Запрошення до груп"
     app: "Сповіщення від додатків"
 _deck:

locales/zh-CN.yml

@@ -974,6 +974,7 @@ _widgets:
   digitalClock: "数字时钟"
   federation: "联邦宇宙"
   postForm: "投稿窗口"
+  slideshow: "幻灯片展示"
 _cw:
   hide: "隐藏"
   show: "查看更多"

migration/1607353487793-isExplorable.ts

@@ -0,0 +1,18 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class isExplorable1607353487793 implements MigrationInterface {
+    name = 'isExplorable1607353487793'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user" ADD "isExplorable" boolean NOT NULL DEFAULT true`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isExplorable" IS 'Whether the User is explorable.'`);
+        await queryRunner.query(`CREATE INDEX "IDX_d5a1b83c7cab66f167e6888188" ON "user" ("isExplorable") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_d5a1b83c7cab66f167e6888188"`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."isExplorable" IS 'Whether the User is explorable.'`);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isExplorable"`);
+    }
+
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.62.0",
+	"version": "12.63.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -62,7 +62,7 @@
 		"@types/jsdom": "16.2.5",
 		"@types/jsonld": "1.5.1",
 		"@types/katex": "0.11.0",
-		"@types/koa": "2.11.3",
+		"@types/koa": "2.11.6",
 		"@types/koa-bodyparser": "4.3.0",
 		"@types/koa-cors": "0.0.0",
 		"@types/koa-favicon": "2.0.19",
@@ -70,18 +70,19 @@
 		"@types/koa-mount": "4.0.0",
 		"@types/koa-send": "4.1.2",
 		"@types/koa-views": "2.0.4",
-		"@types/koa__cors": "3.0.1",
+		"@types/koa__cors": "3.0.2",
 		"@types/koa__multer": "2.0.2",
 		"@types/koa__router": "8.0.2",
 		"@types/markdown-it": "10.0.3",
+		"@types/matter-js": "0.14.8",
 		"@types/mocha": "7.0.2",
-		"@types/node": "14.0.22",
+		"@types/node": "14.14.11",
 		"@types/node-fetch": "2.5.7",
 		"@types/nodemailer": "6.4.0",
 		"@types/nprogress": "0.2.0",
 		"@types/oauth": "0.9.1",
 		"@types/parse5": "5.0.3",
-		"@types/parsimmon": "1.10.5",
+		"@types/parsimmon": "1.10.6",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.3.5",
@@ -92,7 +93,7 @@
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "3.0.0",
 		"@types/seedrandom": "2.4.28",
-		"@types/sharp": "0.26.0",
+		"@types/sharp": "0.26.1",
 		"@types/sinonjs__fake-timers": "6.0.1",
 		"@types/speakeasy": "2.0.5",
 		"@types/tinycolor2": "1.4.2",
@@ -106,14 +107,14 @@
 		"@typescript-eslint/parser": "4.6.1",
 		"@vue/compiler-sfc": "3.0.3",
 		"abort-controller": "3.0.0",
-		"apexcharts": "3.22.2",
+		"apexcharts": "3.22.3",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.787.0",
+		"aws-sdk": "2.806.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.3",
-		"bull": "3.18.1",
+		"bull": "3.20.0",
 		"cafy": "15.2.1",
 		"cbor": "5.1.0",
 		"chalk": "4.1.0",
@@ -121,17 +122,17 @@
 		"cli-highlight": "2.1.9",
 		"commander": "4.1.1",
 		"content-disposition": "0.5.3",
-		"core-js": "3.7.0",
+		"core-js": "3.8.1",
 		"crc-32": "1.2.0",
 		"css-loader": "5.0.1",
 		"cssnano": "4.1.10",
-		"dateformat": "3.0.3",
+		"dateformat": "4.3.1",
 		"deep-entries": "3.1.0",
 		"diskusage": "1.1.3",
 		"double-ended-queue": "2.1.0-0",
 		"escape-regexp": "0.0.1",
-		"eslint": "7.14.0",
+		"eslint": "7.15.0",
-		"eslint-plugin-vue": "7.1.0",
+		"eslint-plugin-vue": "7.2.0",
 		"eventemitter3": "4.0.7",
 		"feed": "4.2.1",
 		"fibers": "5.0.0",
@@ -175,6 +176,7 @@
 		"lookup-dns-cache": "2.1.0",
 		"markdown-it": "11.0.1",
 		"markdown-it-anchor": "6.0.1",
+		"matter-js": "0.14.2",
 		"mocha": "8.2.1",
 		"moji": "0.5.1",
 		"ms": "2.1.2",
@@ -189,7 +191,7 @@
 		"parsimmon": "1.16.0",
 		"pg": "8.5.1",
 		"portscanner": "2.2.0",
-		"postcss": "8.1.14",
+		"postcss": "8.2.1",
 		"postcss-loader": "4.1.0",
 		"prismjs": "1.22.0",
 		"probe-image-size": "6.0.0",
@@ -223,18 +225,18 @@
 		"style-loader": "2.0.0",
 		"summaly": "2.4.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "4.30.7",
+		"systeminformation": "4.31.0",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
 		"three": "0.117.1",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
-		"ts-loader": "8.0.9",
+		"ts-loader": "8.0.11",
 		"ts-node": "9.1.0",
 		"tslint": "6.1.3",
 		"tslint-sonarts": "1.9.0",
 		"typeorm": "0.2.29",
-		"typescript": "4.0.5",
+		"typescript": "4.1.2",
 		"ulid": "2.3.0",
 		"url-loader": "4.1.1",
 		"uuid": "8.3.1",
@@ -246,20 +248,20 @@
 		"vue-json-pretty": "1.7.1",
 		"vue-loader": "16.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
-		"vue-router": "4.0.0-rc.6",
+		"vue-router": "4.0.1",
 		"vue-style-loader": "4.1.2",
 		"vuedraggable": "4.0.1",
 		"vuex": "4.0.0-rc.2",
 		"vuex-persistedstate": "3.1.0",
 		"web-push": "3.4.4",
-		"webpack": "5.9.0",
+		"webpack": "5.10.0",
 		"webpack-cli": "4.2.0",
-		"websocket": "1.0.32",
+		"websocket": "1.0.33",
-		"ws": "7.4.0",
+		"ws": "7.4.1",
 		"xev": "2.0.1"
 	},
 	"devDependencies": {
-		"@types/chai": "4.2.11",
+		"@types/chai": "4.2.14",
 		"@types/fluent-ffmpeg": "2.1.16",
 		"chai": "4.2.0",
 		"cross-env": "7.0.2"

src/client/@types/vue.d.ts

@@ -1,5 +1,5 @@
 declare module '*.vue' {
-	import { defineComponent } from 'vue';
+	import type { DefineComponent } from 'vue';
-	const component: ReturnType<typeof defineComponent>;
+	const component: DefineComponent<{}, {}, any>;
 	export default component;
 }

src/client/components/global/avatar.vue

@@ -11,7 +11,7 @@
 import { defineComponent } from 'vue';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
 import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash';
-import { acct, userPage } from '../filters/user';
+import { acct, userPage } from '@/filters/user';
 
 export default defineComponent({
 	props: {

src/client/components/global/emoji.vue

@@ -8,7 +8,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import { twemojiSvgBase } from '../../misc/twemoji-base';
+import { twemojiSvgBase } from '@/../misc/twemoji-base';
 
 export default defineComponent({
 	props: {

src/client/components/global/error.vue

@@ -11,7 +11,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
-import MkButton from './ui/button.vue';
+import MkButton from '@/components/ui/button.vue';
 
 export default defineComponent({
 	components: {

src/client/components/global/misskey-flavored-markdown.vue

@@ -4,7 +4,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import MfmCore from './mfm';
+import MfmCore from '@/components/mfm';
 
 export default defineComponent({
 	components: {

src/client/components/index.ts

@@ -1,16 +1,16 @@
 import { App } from 'vue';
 
-import mfm from './misskey-flavored-markdown.vue';
+import mfm from './global/misskey-flavored-markdown.vue';
-import a from './ui/a.vue';
+import a from './global/a.vue';
-import acct from './acct.vue';
+import acct from './global/acct.vue';
-import avatar from './avatar.vue';
+import avatar from './global/avatar.vue';
-import emoji from './emoji.vue';
+import emoji from './global/emoji.vue';
-import userName from './user-name.vue';
+import userName from './global/user-name.vue';
-import ellipsis from './ellipsis.vue';
+import ellipsis from './global/ellipsis.vue';
-import time from './time.vue';
+import time from './global/time.vue';
-import url from './url.vue';
+import url from './global/url.vue';
-import loading from './loading.vue';
+import loading from './global/loading.vue';
-import error from './error.vue';
+import error from './global/error.vue';
 
 export default function(app: App) {
 	app.component('Mfm', mfm);

src/client/components/mfm.ts

@@ -1,15 +1,15 @@
 import { VNode, defineComponent, h } from 'vue';
-import { MfmForest } from '../../mfm/prelude';
+import { MfmForest } from '@/../mfm/prelude';
-import { parse, parsePlain } from '../../mfm/parse';
+import { parse, parsePlain } from '@/../mfm/parse';
-import MkUrl from './url.vue';
+import MkUrl from '@/components/global/url.vue';
-import MkLink from './link.vue';
+import MkLink from '@/components/link.vue';
-import MkMention from './mention.vue';
+import MkMention from '@/components/mention.vue';
-import MkEmoji from './emoji.vue';
+import MkEmoji from '@/components/global/emoji.vue';
-import { concat } from '../../prelude/array';
+import { concat } from '@/../prelude/array';
-import MkFormula from './formula.vue';
+import MkFormula from '@/components/formula.vue';
-import MkCode from './code.vue';
+import MkCode from '@/components/code.vue';
-import MkGoogle from './google.vue';
+import MkGoogle from '@/components/google.vue';
-import MkA from './ui/a.vue';
+import MkA from '@/components/global/a.vue';
 import { host } from '@/config';
 
 export default defineComponent({

src/client/components/note.vue

@@ -490,8 +490,25 @@ export default defineComponent({
 		},
 
 		renoteDirectly() {
-			os.api('notes/create', {
+			os.apiWithDialog('notes/create', {
 				renoteId: this.appearNote.id
+			}, undefined, (res: any) => {
+				os.dialog({
+					type: 'success',
+					text: this.$t('renoted'),
+				});
+			}, (e: Error) => {
+				if (e.id === 'b5c90186-4ab0-49c8-9bba-a1f76c282ba4') {
+					os.dialog({
+						type: 'error',
+						text: this.$t('cantRenote'),
+					});
+				} else if (e.id === 'fd4cc33e-2a37-48dd-99cc-9b806eb2031a') {
+					os.dialog({
+						type: 'error',
+						text: this.$t('cantReRenote'),
+					});
+				}
 			});
 		},
 
@@ -533,6 +550,23 @@ export default defineComponent({
 			pleaseLogin();
 			os.apiWithDialog('notes/favorites/create', {
 				noteId: this.appearNote.id
+			}, undefined, (res: any) => {
+				os.dialog({
+					type: 'success',
+					text: this.$t('favorited'),
+				});
+			}, (e: Error) => {
+				if (e.id === 'a402c12b-34dd-41d2-97d8-4d2ffd96a1a6') {
+					os.dialog({
+						type: 'error',
+						text: this.$t('alreadyFavorited'),
+					});
+				} else if (e.id === '6dd26674-e060-4816-909a-45ba3f4da458') {
+					os.dialog({
+						type: 'error',
+						text: this.$t('cantFavorite'),
+					});
+				}
 			});
 		},
 

src/client/components/timeline.vue

@@ -1,5 +1,5 @@
 <template>
-<XNotes ref="tl" :pagination="pagination" @before="$emit('before')" @after="e => $emit('after', e)" @queue="$emit('queue', $event)"/>
+<XNotes :class="{ _noGap_: !$store.state.device.showGapBetweenNotesInTimeline }" ref="tl" :pagination="pagination" @before="$emit('before')" @after="e => $emit('after', e)" @queue="$emit('queue', $event)"/>
 </template>
 
 <script lang="ts">

src/client/pages/about-misskey.vue

@@ -1,50 +1,54 @@
 <template>
-<FormBase class="znqjceqz">
+<div style="overflow: hidden;">
-	<section class="_formItem">
+	<FormBase class="znqjceqz">
-		<div class="_formPanel" style="text-align: center; padding: 16px;">
+		<div id="debug"></div>
-			<img src="/assets/icons/512.png" alt="" style="display: block; width: 100px; margin: 0 auto; border-radius: 16px;" ref="icon"/>
+		<section class="_formItem about">
-			<div style="margin-top: 0.75em;">Misskey</div>
+			<div class="_formPanel panel" :class="{ playing: easterEggEngine != null }" ref="about">
-			<div style="opacity: 0.5;">v{{ version }}</div>
+				<img src="/assets/icons/512.png" alt="" class="icon" ref="icon" @load="iconLoaded" draggable="false"/>
-		</div>
+				<div class="misskey">Misskey</div>
-	</section>
+				<div class="version">v{{ version }}</div>
-	<section class="_formItem" style="text-align: center; padding: 0 16px;">
+				<span class="emoji" v-for="emoji in easterEggEmojis" :key="emoji.id" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :custom-emojis="$store.state.instance.meta.emojis" :is-reaction="false" :normal="true" :no-style="true"/></span>
-		{{ $t('_aboutMisskey.about') }}
+			</div>
-	</section>
+		</section>
-	<FormGroup>
+		<section class="_formItem" style="text-align: center; padding: 0 16px;" @click="gravity">
-		<FormLink to="https://github.com/syuilo/misskey" external>
+			{{ $t('_aboutMisskey.about') }}
-			<template #icon><Fa :icon="faCode"/></template>
+		</section>
-			{{ $t('_aboutMisskey.source') }}
+		<FormGroup>
-			<template #suffix>GitHub</template>
+			<FormLink to="https://github.com/syuilo/misskey" external>
-		</FormLink>
+				<template #icon><Fa :icon="faCode"/></template>
-		<FormLink to="https://crowdin.com/project/misskey" external>
+				{{ $t('_aboutMisskey.source') }}
-			<template #icon><Fa :icon="faLanguage"/></template>
+				<template #suffix>GitHub</template>
-			{{ $t('_aboutMisskey.translation') }}
+			</FormLink>
-			<template #suffix>Crowdin</template>
+			<FormLink to="https://crowdin.com/project/misskey" external>
-		</FormLink>
+				<template #icon><Fa :icon="faLanguage"/></template>
-		<FormLink to="https://www.patreon.com/syuilo" external>
+				{{ $t('_aboutMisskey.translation') }}
-			<template #icon><Fa :icon="faHandHoldingMedical"/></template>
+				<template #suffix>Crowdin</template>
-			{{ $t('_aboutMisskey.donate') }}
+			</FormLink>
-			<template #suffix>Patreon</template>
+			<FormLink to="https://www.patreon.com/syuilo" external>
-		</FormLink>
+				<template #icon><Fa :icon="faHandHoldingMedical"/></template>
-	</FormGroup>
+				{{ $t('_aboutMisskey.donate') }}
-	<FormGroup>
+				<template #suffix>Patreon</template>
-		<template #label>{{ $t('_aboutMisskey.contributors') }}</template>
+			</FormLink>
-		<FormLink to="https://github.com/syuilo" external>@syuilo</FormLink>
+		</FormGroup>
-		<FormLink to="https://github.com/AyaMorisawa" external>@AyaMorisawa</FormLink>
+		<FormGroup>
-		<FormLink to="https://github.com/mei23" external>@mei23</FormLink>
+			<template #label>{{ $t('_aboutMisskey.contributors') }}</template>
-		<FormLink to="https://github.com/acid-chicken" external>@acid-chicken</FormLink>
+			<FormLink to="https://github.com/syuilo" external>@syuilo</FormLink>
-		<FormLink to="https://github.com/tamaina" external>@tamaina</FormLink>
+			<FormLink to="https://github.com/AyaMorisawa" external>@AyaMorisawa</FormLink>
-		<FormLink to="https://github.com/rinsuki" external>@rinsuki</FormLink>
+			<FormLink to="https://github.com/mei23" external>@mei23</FormLink>
-		<FormLink to="https://github.com/Xeltica" external>@Xeltica</FormLink>
+			<FormLink to="https://github.com/acid-chicken" external>@acid-chicken</FormLink>
-		<FormLink to="https://github.com/u1-liquid" external>@u1-liquid</FormLink>
+			<FormLink to="https://github.com/tamaina" external>@tamaina</FormLink>
-		<template #caption><MkLink url="https://github.com/syuilo/misskey/graphs/contributors">{{ $t('_aboutMisskey.allContributors') }}</MkLink></template>
+			<FormLink to="https://github.com/rinsuki" external>@rinsuki</FormLink>
-	</FormGroup>
+			<FormLink to="https://github.com/Xeltica" external>@Xeltica</FormLink>
-	<FormGroup>
+			<FormLink to="https://github.com/u1-liquid" external>@u1-liquid</FormLink>
-		<template #label><Mfm text="[jelly ❤]"/> {{ $t('_aboutMisskey.patrons') }}</template>
+			<template #caption><MkLink url="https://github.com/syuilo/misskey/graphs/contributors">{{ $t('_aboutMisskey.allContributors') }}</MkLink></template>
-		<FormKeyValueView v-for="patron in patrons" :key="patron"><template #key>{{ patron }}</template></FormKeyValueView>
+		</FormGroup>
-		<template #caption>{{ $t('_aboutMisskey.morePatrons') }}</template>
+		<FormGroup>
-	</FormGroup>
+			<template #label><Mfm text="[jelly ❤]"/> {{ $t('_aboutMisskey.patrons') }}</template>
-</FormBase>
+			<FormKeyValueView v-for="patron in patrons" :key="patron"><template #key>{{ patron }}</template></FormKeyValueView>
+			<template #caption>{{ $t('_aboutMisskey.morePatrons') }}</template>
+		</FormGroup>
+	</FormBase>
+</div>
 </template>
 
 <script lang="ts">
@@ -57,6 +61,7 @@ import FormBase from '@/components/form/base.vue';
 import FormGroup from '@/components/form/group.vue';
 import FormKeyValueView from '@/components/form/key-value-view.vue';
 import MkLink from '@/components/link.vue';
+import { physics } from '@/scripts/physics.ts';
 import * as os from '@/os';
 
 const patrons = [
@@ -115,6 +120,9 @@ export default defineComponent({
 			},
 			version,
 			patrons,
+			easterEggReady: false,
+			easterEggEmojis: [],
+			easterEggEngine: null,
 			faInfoCircle, faCode, faLanguage, faHandHoldingMedical,
 		}
 	},
@@ -127,6 +135,38 @@ export default defineComponent({
 			speed: 1000,
 		});
 	},
+
+	beforeUnmount() {
+		if (this.easterEggEngine) {
+			this.easterEggEngine.stop();
+		}
+	},
+
+	methods: {
+		iconLoaded() {
+			const emojis = this.$store.state.settings.reactions;
+			const containerWidth = this.$refs.about.offsetWidth;
+			for (let i = 0; i < 32; i++) {
+				this.easterEggEmojis.push({
+					id: i.toString(),
+					top: -(128 + (Math.random() * 256)),
+					left: (Math.random() * containerWidth),
+					emoji: emojis[Math.floor(Math.random() * emojis.length)],
+				});
+			}
+
+			this.$nextTick(() => {
+				this.easterEggReady = true;
+			});
+		},
+
+		gravity() {
+			if (!this.easterEggReady) return;
+			this.easterEggReady = false;
+			this.$refs.icon.vanillaTilt.destroy();
+			this.easterEggEngine = physics(this.$refs.about);
+		}
+	}
 });
 </script>
 
@@ -135,5 +175,58 @@ export default defineComponent({
 	max-width: 800px;
 	box-sizing: border-box;
 	margin: 0 auto;
+
+	> .about {
+		> .panel {
+			position: relative;
+			text-align: center;
+			padding: 16px;
+
+			&.playing {
+				&, * {
+					user-select: none;
+				}
+
+				* {
+					will-change: transform;
+				}
+
+				> .emoji {
+					visibility: visible;
+				}
+			}
+
+			> .icon {
+				display: block;
+				width: 100px;
+				margin: 0 auto;
+				border-radius: 16px;
+			}
+
+			> .misskey {
+				margin: 0.75em auto 0 auto;
+				width: max-content;
+			}
+
+			> .version {
+				margin: 0 auto;
+				width: max-content;
+				opacity: 0.5;
+			}
+
+			> .emoji {
+				position: absolute;
+				top: 0;
+				left: 0;
+				visibility: hidden;
+
+				> .emoji {
+					pointer-events: none;
+					font-size: 24px;
+					width: 24px;
+				}
+			}
+		}
+	}
 }
 </style>

src/client/pages/instance/user-dialog.vue

@@ -24,7 +24,7 @@
 		</div>
 		<div class="_section">
 			<div class="_content">
-				<MkSwitch v-if="user.host == null && $store.state.i.isAdmin && (this.moderator || !user.isAdmin)" @update:value="toggleModerator" v-model:value="moderator">{{ $t('moderator') }}</MkSwitch>
+				<MkSwitch v-if="user.host == null && $store.state.i.isAdmin && (moderator || !user.isAdmin)" @update:value="toggleModerator" v-model:value="moderator">{{ $t('moderator') }}</MkSwitch>
 				<MkSwitch @update:value="toggleSilence" v-model:value="silenced">{{ $t('silence') }}</MkSwitch>
 				<MkSwitch @update:value="toggleSuspend" v-model:value="suspended">{{ $t('suspend') }}</MkSwitch>
 			</div>

src/client/pages/page-editor/page-editor.vue

@@ -342,12 +342,7 @@ export default defineComponent({
 		},
 
 		removeVariable(v) {
-			const i = this.variables.findIndex(x => x.name === v.name);
+			this.variables = this.variables.filter(x => x.name !== v.name);
-			const newValue = [
-				...this.variables.slice(0, i),
-				...this.variables.slice(i + 1)
-			];
-			this.variables = newValue;
 		},
 
 		getPageBlockList() {

src/client/pages/settings/general.vue

@@ -33,6 +33,7 @@
 		<FormSwitch v-model:value="disableAnimatedMfm">{{ $t('disableAnimatedMfm') }}</FormSwitch>
 		<FormSwitch v-model:value="reduceAnimation">{{ $t('reduceUiAnimation') }}</FormSwitch>
 		<FormSwitch v-model:value="useBlurEffectForModal">{{ $t('useBlurEffectForModal') }}</FormSwitch>
+		<FormSwitch v-model:value="showGapBetweenNotesInTimeline">{{ $t('showGapBetweenNotesInTimeline') }}</FormSwitch>
 		<FormSwitch v-model:value="loadRawImages">{{ $t('loadRawImages') }}</FormSwitch>
 		<FormSwitch v-model:value="disableShowingAnimatedImages">{{ $t('disableShowingAnimatedImages') }}</FormSwitch>
 		<FormSwitch v-model:value="useSystemFont">{{ $t('useSystemFont') }}</FormSwitch>
@@ -140,6 +141,11 @@ export default defineComponent({
 			set(value) { this.$store.commit('device/set', { key: 'useBlurEffectForModal', value: value }); }
 		},
 
+		showGapBetweenNotesInTimeline: {
+			get() { return this.$store.state.device.showGapBetweenNotesInTimeline; },
+			set(value) { this.$store.commit('device/set', { key: 'showGapBetweenNotesInTimeline', value: value }); }
+		},
+
 		disableAnimatedMfm: {
 			get() { return !this.$store.state.device.animatedMfm; },
 			set(value) { this.$store.commit('device/set', { key: 'animatedMfm', value: !value }); }

src/client/pages/settings/privacy.vue

@@ -9,6 +9,10 @@
 		{{ $t('noCrawle') }}
 		<template #desc>{{ $t('noCrawleDescription') }}</template>
 	</FormSwitch>
+	<FormSwitch v-model:value="isExplorable" @update:value="save()">
+		{{ $t('makeExplorable') }}
+		<template #desc>{{ $t('makeExplorableDescription') }}</template>
+	</FormSwitch>
 	<FormSwitch v-model:value="rememberNoteVisibility" @update:value="save()">{{ $t('rememberNoteVisibility') }}</FormSwitch>
 	<FormGroup v-if="!rememberNoteVisibility">
 		<template #label>{{ $t('defaultNoteVisibility') }}</template>
@@ -51,6 +55,7 @@ export default defineComponent({
 			isLocked: false,
 			autoAcceptFollowed: false,
 			noCrawle: false,
+			isExplorable: false,
 		}
 	},
 
@@ -75,6 +80,7 @@ export default defineComponent({
 		this.isLocked = this.$store.state.i.isLocked;
 		this.autoAcceptFollowed = this.$store.state.i.autoAcceptFollowed;
 		this.noCrawle = this.$store.state.i.noCrawle;
+		this.isExplorable = this.$store.state.i.isExplorable;
 	},
 
 	mounted() {
@@ -87,6 +93,7 @@ export default defineComponent({
 				isLocked: !!this.isLocked,
 				autoAcceptFollowed: !!this.autoAcceptFollowed,
 				noCrawle: !!this.noCrawle,
+				isExplorable: !!this.isExplorable,
 			});
 		}
 	}

src/client/scripts/physics.ts

@@ -0,0 +1,148 @@
+import * as Matter from 'matter-js';
+
+export function physics(container: HTMLElement) {
+	const containerWidth = container.offsetWidth;
+	const containerHeight = container.offsetHeight;
+	const containerCenterX = containerWidth / 2;
+
+	// サイズ固定化(要らないかも？)
+	container.style.position = 'relative';
+	container.style.boxSizing = 'border-box';
+	container.style.width = `${containerWidth}px`;
+	container.style.height = `${containerHeight}px`;
+
+	// create engine
+	const engine = Matter.Engine.create({
+		constraintIterations: 4,
+		positionIterations: 8,
+		velocityIterations: 8,
+	});
+
+	const world = engine.world;
+
+	// create renderer
+	const render = Matter.Render.create({
+		engine: engine,
+		//element: document.getElementById('debug'),
+		options: {
+			width: containerWidth,
+			height: containerHeight,
+			background: 'transparent', // transparent to hide
+			wireframeBackground: 'transparent', // transparent to hide
+		}
+	});
+
+	// Disable to hide debug
+	Matter.Render.run(render);
+
+	// create runner
+	const runner = Matter.Runner.create();
+	Matter.Runner.run(runner, engine);
+
+	const groundThickness = 1024;
+	const ground = Matter.Bodies.rectangle(containerCenterX, containerHeight + (groundThickness / 2), containerWidth, groundThickness, {
+		isStatic:     true,
+		restitution:  0.1,
+		friction:     2
+	});
+
+	//const wallRight = Matter.Bodies.rectangle(window.innerWidth+50, window.innerHeight/2, 100, window.innerHeight, wallopts);
+	//const wallLeft = Matter.Bodies.rectangle(-50, window.innerHeight/2, 100, window.innerHeight, wallopts);
+
+	Matter.World.add(world, [
+		ground,
+		//wallRight,
+		//wallLeft,
+	]);
+
+	const objEls = Array.from(container.children);
+	const objs = [];
+	for (const objEl of objEls) {
+		const left = objEl.dataset.physicsX ? parseInt(objEl.dataset.physicsX) : objEl.offsetLeft;
+		const top = objEl.dataset.physicsY ? parseInt(objEl.dataset.physicsY) : objEl.offsetTop;
+
+		let obj;
+		if (objEl.classList.contains('_physics_circle_')) {
+			obj = Matter.Bodies.circle(
+				left + (objEl.offsetWidth / 2),
+				top + (objEl.offsetHeight / 2),
+				Math.max(objEl.offsetWidth, objEl.offsetHeight) / 2,
+			);
+		} else {
+			const style = window.getComputedStyle(objEl);
+			obj = Matter.Bodies.rectangle(
+				left + (objEl.offsetWidth / 2),
+				top + (objEl.offsetHeight / 2),
+				objEl.offsetWidth,
+				objEl.offsetHeight,
+				{
+					chamfer: { radius: parseInt(style.borderRadius, 10) },
+				}
+			);
+		}
+		objEl.id = obj.id;
+		objs.push(obj);
+	}
+
+	Matter.World.add(engine.world, objs);
+
+	// Add mouse control
+
+	const mouse = Matter.Mouse.create(container);
+	const mouseConstraint = Matter.MouseConstraint.create(engine, {
+		mouse: mouse,
+		constraint: {
+			stiffness: 0.05,
+			render: {
+				visible: false
+			}
+		}
+	});
+
+	Matter.World.add(engine.world, mouseConstraint);
+
+	// keep the mouse in sync with rendering
+	render.mouse = mouse;
+
+	for (const objEl of objEls) {
+		objEl.style.position = `absolute`;
+		objEl.style.top = 0;
+		objEl.style.left = 0;
+		objEl.style.margin = 0;
+	}
+
+	window.requestAnimationFrame(update);
+
+	let stop = false;
+
+	function update() {
+		for (const objEl of objEls) {
+			const obj = objs.find(obj => obj.id.toString() === objEl.id.toString());
+			if (obj == null) continue;
+
+			const x = (obj.position.x - objEl.offsetWidth / 2);
+			const y = (obj.position.y - objEl.offsetHeight / 2);
+			const angle = obj.angle;
+			objEl.style.transform = `translate(${x}px, ${y}px) rotate(${angle}rad)`;
+		}
+
+		if (!stop) {
+			window.requestAnimationFrame(update);
+		}
+	}
+
+	// 奈落に落ちたオブジェクトは消す
+	const intervalId = setInterval(() => {
+		for (const obj of objs) {
+			if (obj.position.y > (containerHeight + 1024)) Matter.World.remove(world, obj);
+		}
+	}, 1000 * 10);
+
+	return {
+		stop: () => {
+			stop = true;
+			Matter.Runner.stop(runner);
+			clearInterval(intervalId);
+		}
+	};
+}

src/client/store.ts

@@ -80,6 +80,7 @@ export const defaultDeviceSettings = {
 	useFullReactionPicker: false,
 	reactionPickerWidth: 1,
 	reactionPickerHeight: 1,
+	showGapBetweenNotesInTimeline: true,
 	sidebarDisplay: 'full', // full, icon, hide
 	instanceTicker: 'remote', // none, remote, always
 	roomGraphicsQuality: 'medium',

src/client/style.scss

@@ -287,12 +287,24 @@ hr {
 	}
 }
 
-._close_ ._list_ > * {
+._noGap_ ._list_ {
+	@extend ._panel;
+
+	> * {
+		margin: 0 !important;
+		border: none;
+		border-bottom: solid 1px var(--divider);
+		border-radius: 0;
+		box-shadow: none;
+	}
+}
+
+._inContainer_ ._list_ > * {
+	margin: 0 !important;
 	border: none;
 	border-bottom: solid 1px var(--divider);
 	border-radius: 0;
 	box-shadow: none;
-	margin: 0 !important;
 }
 
 ._loadMore {

src/client/ui/deck/column.vue

@@ -1,6 +1,6 @@
 <template>
 <!-- sectionを利用しているのは、deck.vue側でcolumnに対してfirst-of-typeを効かせるため -->
-<section class="dnpfarvg _panel _narrow_" :class="{ paged: isMainColumn, naked, _close_: !isMainColumn, active, isStacked, draghover, dragging, dropready }"
+<section class="dnpfarvg _panel _narrow_" :class="{ paged: isMainColumn, naked, _inContainer_: !isMainColumn, active, isStacked, draghover, dragging, dropready }"
 	@dragover.prevent.stop="onDragover"
 	@dragleave="onDragleave"
 	@drop.prevent.stop="onDrop"

src/client/ui/default.widgets.vue

@@ -15,7 +15,7 @@
 						<span class="handle"><Fa :icon="faBars"/></span>{{ $t('_widgets.' + element.name) }}<button class="remove _button" @click="removeWidget(element)"><Fa :icon="faTimes"/></button>
 					</header>
 					<div @click="widgetFunc(element.id)">
-						<component class="_close_ _forceContainerFull_" :is="`mkw-${element.name}`" :widget="element" :ref="element.id" :setting-callback="setting => settings[element.id] = setting"/>
+						<component class="_inContainer_ _forceContainerFull_" :is="`mkw-${element.name}`" :widget="element" :ref="element.id" :setting-callback="setting => settings[element.id] = setting"/>
 					</div>
 				</div>
 			</template>
@@ -23,7 +23,7 @@
 		<button @click="editMode = false" class="_textButton" style="font-size: 0.9em;"><Fa :icon="faCheck"/> {{ $t('editWidgetsExit') }}</button>
 	</template>
 	<template v-else>
-		<component v-for="widget in widgets" class="_close_ _forceContainerFull_" :is="`mkw-${widget.name}`" :key="widget.id" :widget="widget"/>
+		<component v-for="widget in widgets" class="_inContainer_ _forceContainerFull_" :is="`mkw-${widget.name}`" :key="widget.id" :widget="widget"/>
 		<button @click="editMode = true" class="_textButton" style="font-size: 0.9em;"><Fa :icon="faPencilAlt"/> {{ $t('editWidgets') }}</button>
 	</template>
 </div>

src/client/ui/visitor/b.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="mk-app" :style="{ backgroundImage: root ? `url(${ $store.state.instance.meta.backgroundImageUrl })` : 'none' }">
-	<a href="https://github.com/syuilo/misskey" target="_blank" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:var(--panel); color:var(--fg); position: fixed; z-index: 10; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a>
+	<a v-if="root" href="https://github.com/syuilo/misskey" target="_blank" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:var(--panel); color:var(--fg); position: fixed; z-index: 10; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a>
 
 	<div class="side" v-if="!narrow">
 		<XKanban class="kanban" full :transparent="root" :powered-by="root"/>

src/client/ui/visitor/kanban.vue

@@ -228,6 +228,12 @@ export default defineComponent({
 						> .title {
 							font-weight: bold;
 						}
+
+						> .content {
+							> img {
+								max-width: 100%;
+							}
+						}
 					}
 				}
 			}

src/client/widgets/index.ts

@@ -13,6 +13,7 @@ export default function(app: App) {
 	app.component('MkwDigitalClock', defineAsyncComponent(() => import('./digital-clock.vue')));
 	app.component('MkwFederation', defineAsyncComponent(() => import('./federation.vue')));
 	app.component('MkwPostForm', defineAsyncComponent(() => import('./post-form.vue')));
+	app.component('MkwSlideshow', defineAsyncComponent(() => import('./slideshow.vue')));
 }
 
 export const widgets = [
@@ -28,4 +29,5 @@ export const widgets = [
 	'digitalClock',
 	'federation',
 	'postForm',
+	'slideshow',
 ];

src/client/widgets/slideshow.vue

@@ -0,0 +1,168 @@
+<template>
+<div class="kvausudm _panel">
+	<div @click="choose">
+		<p v-if="props.folderId == null">
+			<template v-if="isCustomizeMode">{{ $t('folder-customize-mode') }}</template>
+			<template v-else>{{ $t('folder') }}</template>
+		</p>
+		<p v-if="props.folderId != null && images.length === 0 && !fetching">{{ $t('no-image') }}</p>
+		<div ref="slideA" class="slide a"></div>
+		<div ref="slideB" class="slide b"></div>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import {  } from '@fortawesome/free-solid-svg-icons';
+import define from './define';
+import * as os from '@/os';
+
+const widget = define({
+	name: 'slideshow',
+	props: () => ({
+		height: {
+			type: 'number',
+			default: 300,
+		},
+		folderId: {
+			type: 'string',
+			default: null,
+			hidden: true,
+		},
+	})
+});
+
+export default defineComponent({
+	extends: widget,
+	data() {
+		return {
+			images: [],
+			fetching: true,
+			clock: null
+		};
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.applySize();
+		});
+
+		if (this.props.folderId != null) {
+			this.fetch();
+		}
+
+		this.clock = setInterval(this.change, 10000);
+	},
+	beforeUnmount() {
+		clearInterval(this.clock);
+	},
+	methods: {
+		applySize() {
+			let h;
+
+			if (this.props.size == 1) {
+				h = 250;
+			} else {
+				h = 170;
+			}
+
+			this.$el.style.height = `${h}px`;
+		},
+		resize() {
+			if (this.props.size == 1) {
+				this.props.size = 0;
+			} else {
+				this.props.size++;
+			}
+			this.save();
+
+			this.applySize();
+		},
+		change() {
+			if (this.images.length == 0) return;
+
+			const index = Math.floor(Math.random() * this.images.length);
+			const img = `url(${ this.images[index].url })`;
+
+			(this.$refs.slideB as any).style.backgroundImage = img;
+
+			this.$refs.slideB.classList.add('anime');
+			setTimeout(() => {
+				// 既にこのウィジェットがunmountされていたら要素がない
+				if ((this.$refs.slideA as any) == null) return;
+
+				(this.$refs.slideA as any).style.backgroundImage = img;
+
+				this.$refs.slideB.classList.remove('anime');
+			}, 1000);
+		},
+		fetch() {
+			this.fetching = true;
+
+			os.api('drive/files', {
+				folderId: this.props.folderId,
+				type: 'image/*',
+				limit: 100
+			}).then(images => {
+				this.images = images;
+				this.fetching = false;
+				(this.$refs.slideA as any).style.backgroundImage = '';
+				(this.$refs.slideB as any).style.backgroundImage = '';
+				this.change();
+			});
+		},
+		choose() {
+			os.selectDriveFolder(false).then(folder => {
+				if (folder == null) {
+					return;
+				}
+				this.props.folderId = folder.id;
+				this.save();
+				this.fetch();
+			});
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.kvausudm {
+	position: relative;
+
+	> div {
+		width: 100%;
+		height: 100%;
+		cursor: pointer;
+
+		> p {
+			display: block;
+			margin: 1em;
+			text-align: center;
+			color: #888;
+		}
+
+		> * {
+			pointer-events: none;
+		}
+
+		> .slide {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			background-size: cover;
+			background-position: center;
+
+			&.b {
+				opacity: 0;
+			}
+
+			&.anime {
+				transition: opacity 1s;
+				opacity: 1;
+			}
+		}
+	}
+}
+</style>

src/models/entities/user.ts

@@ -157,6 +157,13 @@ export class User {
 	})
 	public isModerator: boolean;
 
+	@Index()
+	@Column('boolean', {
+		default: true,
+		comment: 'Whether the User is explorable.'
+	})
+	public isExplorable: boolean;
+
 	@Column('varchar', {
 		length: 128, array: true, default: '{}'
 	})

src/models/repositories/user.ts

@@ -240,6 +240,7 @@ export class UserRepository extends Repository<User> {
 				carefulBot: profile!.carefulBot,
 				autoAcceptFollowed: profile!.autoAcceptFollowed,
 				noCrawle: profile!.noCrawle,
+				isExplorable: user.isExplorable,
 				hasUnreadSpecifiedNotes: NoteUnreads.count({
 					where: { userId: user.id, isSpecified: true },
 					take: 1

src/remote/activitypub/models/person.ts

@@ -153,6 +153,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 				lastFetchedAt: new Date(),
 				name: person.name,
 				isLocked: !!person.manuallyApprovesFollowers,
+				isExplorable: !!person.discoverable,
 				username: person.preferredUsername,
 				usernameLower: person.preferredUsername!.toLowerCase(),
 				host,
@@ -336,6 +337,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 		isBot: object.type === 'Service',
 		isCat: (person as any).isCat === true,
 		isLocked: !!person.manuallyApprovesFollowers,
+		isExplorable: !!person.discoverable,
 	} as Partial<User>;
 
 	if (avatar) {

src/remote/activitypub/renderer/index.ts

@@ -38,6 +38,7 @@ export const attachLdSignature = async (activity: any, user: ILocalUser): Promis
 		toot: 'http://joinmastodon.org/ns#',
 		Emoji: 'toot:Emoji',
 		featured: 'toot:featured',
+		discoverable: 'toot:discoverable',
 		// schema
 		schema: 'http://schema.org#',
 		PropertyValue: 'schema:PropertyValue',

src/remote/activitypub/renderer/person.ts

@@ -70,6 +70,7 @@ export async function renderPerson(user: ILocalUser) {
 		image: banner ? renderImage(banner) : null,
 		tag,
 		manuallyApprovesFollowers: user.isLocked,
+		discoverable: !!user.isExplorable,
 		publicKey: renderKey(user, keypair, `#main-key`),
 		isCat: user.isCat,
 		attachment: attachment.length ? attachment : undefined

src/remote/activitypub/type.ts

@@ -135,6 +135,7 @@ export interface IPerson extends IObject {
 	name?: string;
 	preferredUsername?: string;
 	manuallyApprovesFollowers?: boolean;
+	discoverable?: boolean;
 	inbox?: string;
 	sharedInbox?: string;	// 後方互換性のため
 	publicKey: {

src/server/api/endpoints/i/update.ts

@@ -92,6 +92,10 @@ export const meta = {
 			}
 		},
 
+		isExplorable: {
+			validator: $.optional.bool,
+		},
+
 		carefulBot: {
 			validator: $.optional.bool,
 			desc: {
@@ -208,6 +212,7 @@ export default define(meta, async (ps, user, token) => {
 	}
 	if (ps.mutingNotificationTypes !== undefined) profileUpdates.mutingNotificationTypes = ps.mutingNotificationTypes as typeof notificationTypes[number][];
 	if (typeof ps.isLocked === 'boolean') updates.isLocked = ps.isLocked;
+	if (typeof ps.isExplorable === 'boolean') updates.isExplorable = ps.isExplorable;
 	if (typeof ps.isBot === 'boolean') updates.isBot = ps.isBot;
 	if (typeof ps.carefulBot === 'boolean') profileUpdates.carefulBot = ps.carefulBot;
 	if (typeof ps.autoAcceptFollowed === 'boolean') profileUpdates.autoAcceptFollowed = ps.autoAcceptFollowed;

src/server/api/endpoints/meta.ts

@@ -142,6 +142,7 @@ export default define(meta, async (ps, me) => {
 		enableServiceWorker: instance.enableServiceWorker,
 
 		...(ps.detail ? {
+			pinnedPages: instance.pinnedPages,
 			pinnedClipId: instance.pinnedClipId,
 			cacheRemoteFiles: instance.cacheRemoteFiles,
 			proxyRemoteFiles: instance.proxyRemoteFiles,

src/server/api/endpoints/users.ts

@@ -64,12 +64,13 @@ export const meta = {
 
 export default define(meta, async (ps, me) => {
 	const query = Users.createQueryBuilder('user');
+	query.where('user.isExplorable = TRUE');
 
 	switch (ps.state) {
-		case 'admin': query.where('user.isAdmin = TRUE'); break;
+		case 'admin': query.andWhere('user.isAdmin = TRUE'); break;
-		case 'moderator': query.where('user.isModerator = TRUE'); break;
+		case 'moderator': query.andWhere('user.isModerator = TRUE'); break;
-		case 'adminOrModerator': query.where('user.isAdmin = TRUE OR isModerator = TRUE'); break;
+		case 'adminOrModerator': query.andWhere('user.isAdmin = TRUE OR isModerator = TRUE'); break;
-		case 'alive': query.where('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break;
+		case 'alive': query.andWhere('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break;
 	}
 
 	switch (ps.origin) {

src/server/api/endpoints/users/recommendation.ts

@@ -42,6 +42,7 @@ export const meta = {
 export default define(meta, async (ps, me) => {
 	const query = Users.createQueryBuilder('user')
 		.where('user.isLocked = FALSE')
+		.andWhere('user.isExplorable = TRUE')
 		.andWhere('user.host IS NULL')
 		.andWhere('user.updatedAt >= :date', { date: new Date(Date.now() - ms('7days')) })
 		.andWhere('user.id != :meId', { meId: me.id })

src/services/create-system-user.ts

@@ -34,6 +34,7 @@ export async function createSystemUser(username: string) {
 			token: secret,
 			isAdmin: false,
 			isLocked: true,
+			isExplorable: false,
 			isBot: true,
 		}));
 

vetur.config.js

@@ -0,0 +1,41 @@
+// vetur.config.js
+/** @type {import('vls').VeturConfig} */
+module.exports = {
+  // **optional** default: `{}`
+  // override vscode settings
+  // Notice: It only affects the settings used by Vetur.
+  settings: {
+    "vetur.useWorkspaceDependencies": true,
+    "vetur.experimental.templateInterpolationService": true
+  },
+  // **optional** default: `[{ root: './' }]`
+  // support monorepos
+  projects: [
+    {
+      // **required**
+      // Where is your project?
+      // It is relative to `vetur.config.js`.
+      root: './src/client',
+      // **optional** default: `'package.json'`
+      // Where is `package.json` in the project?
+      // We use it to determine the version of vue.
+      // It is relative to root property.
+      package: './package.json',
+      // **optional**
+      // Where is TypeScript config file in the project?
+      // It is relative to root property.
+      tsconfig: './src/client/tsconfig.json',
+      // **optional** default: `'./.vscode/vetur/snippets'`
+      // Where is vetur custom snippets folders?
+      snippetFolder: './.vscode/vetur/snippets',
+      // **optional** default: `[]`
+      // Register globally Vue component glob.
+      // If you set it, you can get completion by that components.
+      // It is relative to root property.
+      // Notice: It won't actually do it. You need to use `require.context` or `Vue.component`
+      globalComponents: [
+        './src/clients/components/global/*.vue'
+      ]
+    }
+  ]
+}

yarn.lock

@@ -9,7 +9,7 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.1":
+"@babel/helper-module-imports@^7.12.1":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
   integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
@@ -75,10 +75,10 @@
     pump "^3.0.0"
     secure-json-parse "^2.1.0"
 
-"@eslint/eslintrc@^0.2.1":
+"@eslint/eslintrc@^0.2.2":
-  version "0.2.1"
+  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"
-  integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==
+  integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.1.1"
@@ -192,23 +192,6 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
-"@rollup/plugin-babel@^5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz#20fc8f8864dc0eaa1c5578408459606808f72924"
-  integrity sha512-Jd7oqFR2dzZJ3NWANDyBjwTtX/lYbZpVcmkHrfQcpvawHs9E4c0nYk5U2mfZ6I/DZcIvy506KZJi54XK/jxH7A==
-  dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
-    "@rollup/pluginutils" "^3.1.0"
-
-"@rollup/pluginutils@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
-  integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
-  dependencies:
-    "@types/estree" "0.0.39"
-    estree-walker "^1.0.1"
-    picomatch "^2.2.2"
-
 "@sindresorhus/is@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.0.0.tgz#2ff674e9611b45b528896d820d3d7a812de2f0e4"
@@ -310,10 +293,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/chai@4.2.11":
+"@types/chai@4.2.14":
-  version "4.2.11"
+  version "4.2.14"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.11.tgz#d3614d6c5f500142358e6ed24e1bf16657536c50"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.14.tgz#44d2dd0b5de6185089375d976b4ec5caf6861193"
-  integrity sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==
+  integrity sha512-G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ==
 
 "@types/cheerio@^0.22.10":
   version "0.22.18"
@@ -390,11 +373,6 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884"
   integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==
 
-"@types/estree@0.0.39":
-  version "0.0.39"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
-  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
-
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -498,6 +476,11 @@
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a"
   integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==
 
+"@types/http-errors@*":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.0.tgz#682477dbbbd07cd032731cb3b0e7eaee3d026b69"
+  integrity sha512-2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA==
+
 "@types/ioredis@*":
   version "4.14.9"
   resolved "https://registry.yarnpkg.com/@types/ioredis/-/ioredis-4.14.9.tgz#774387d44d3ad60e1b849044b2b28b96e5813866"
@@ -612,23 +595,24 @@
   dependencies:
     "@types/koa" "*"
 
-"@types/koa@*", "@types/koa@2.11.3":
+"@types/koa@*", "@types/koa@2.11.6":
-  version "2.11.3"
+  version "2.11.6"
-  resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.11.3.tgz#540ece376581b12beadf9a417dd1731bc31c16ce"
+  resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.11.6.tgz#b7030caa6b44af801c2aea13ba77d74aff7484d5"
-  integrity sha512-ABxVkrNWa4O/Jp24EYI/hRNqEVRlhB9g09p48neQp4m3xL1TJtdWk2NyNQSMCU45ejeELMQZBYyfstyVvO2H3Q==
+  integrity sha512-BhyrMj06eQkk04C97fovEDQMpLpd2IxCB4ecitaXwOKGq78Wi2tooaDOWOFGajPk8IkQOAtMppApgSVkYe1F/A==
   dependencies:
     "@types/accepts" "*"
     "@types/content-disposition" "*"
     "@types/cookies" "*"
     "@types/http-assert" "*"
+    "@types/http-errors" "*"
     "@types/keygrip" "*"
     "@types/koa-compose" "*"
     "@types/node" "*"
 
-"@types/koa__cors@3.0.1":
+"@types/koa__cors@3.0.2":
-  version "3.0.1"
+  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/koa__cors/-/koa__cors-3.0.1.tgz#a8cf8535f0fe682c9421f1b9379837c585f8b66b"
+  resolved "https://registry.yarnpkg.com/@types/koa__cors/-/koa__cors-3.0.2.tgz#578917ffca964e98f5e9849996ae1eeda7c15704"
-  integrity sha512-loqZNXliley8kncc4wrX9KMqLGN6YfiaO3a3VFX+yVkkXJwOrZU4lipdudNjw5mFyC+5hd7h9075hQWcVVpeOg==
+  integrity sha512-gBetQR0DJ9JTG1YQoW33BADHCrDPJGiJUKUUcEPJwW1A2unzpIMhorEpXB6eMaaXTaqHLemcGnq3RmH9XaryRQ==
   dependencies:
     "@types/koa" "*"
 
@@ -661,6 +645,11 @@
     "@types/mdurl" "*"
     highlight.js "^9.7.0"
 
+"@types/matter-js@0.14.8":
+  version "0.14.8"
+  resolved "https://registry.yarnpkg.com/@types/matter-js/-/matter-js-0.14.8.tgz#387ed5f8f30a81b7c9685ad7b685b88ebf8bf275"
+  integrity sha512-7Vjbb7VfkKA062tMwbeAFI5dBzdzvMoYXf2/7ROygjGTmWg7KxGJLPl0Vlck5kpFQOjLzdDqhuN2TWkrX/co+Q==
+
 "@types/mdurl@*":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
@@ -689,10 +678,10 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@14.0.22":
+"@types/node@*", "@types/node@14.14.11":
-  version "14.0.22"
+  version "14.14.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.22.tgz#23ea4d88189cec7d58f9e6b66f786b215eb61bdc"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.11.tgz#fc25a4248a5e8d0837019b1d170146d07334abe0"
-  integrity sha512-emeGcJvdiZ4Z3ohbmw93E/64jRzUHAItSHt8nF7M4TGgQTiWqFVGB8KNpLGFmUHmHLvjvBgFwVlqNcq+VuGv9g==
+  integrity sha512-BJ97wAUuU3NUiUCp44xzUFquQEvnk1wu7q4CMEUYKJWjdkr0YWYDsm4RFtAvxYsNjLsKcrFt6RvK8r+mnzMbEQ==
 
 "@types/nodemailer@6.4.0":
   version "6.4.0"
@@ -723,10 +712,10 @@
   resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
   integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==
 
-"@types/parsimmon@1.10.5":
+"@types/parsimmon@1.10.6":
-  version "1.10.5"
+  version "1.10.6"
-  resolved "https://registry.yarnpkg.com/@types/parsimmon/-/parsimmon-1.10.5.tgz#2a0e4035bebc948a0484f1a8b55800cb1c10b2dd"
+  resolved "https://registry.yarnpkg.com/@types/parsimmon/-/parsimmon-1.10.6.tgz#8fcf95990514d2a7624aa5f630c13bf2427f9cdd"
-  integrity sha512-tUbXk1Yo74+5Hhn9Lar0XaWI55aCKtm7bV4sjnJ2Dqma/a5JmO0jmGdqAfC8rVqeDSVU5AugSOXdVYfc0HrKDg==
+  integrity sha512-FwAQwMRbkhx0J6YELkwIpciVzCcgEqXEbIrIn3a2P5d3kGEHQ3wVhlN3YdVepYP+bZzCYO6OjmD4o9TGOZ40rA==
 
 "@types/portscanner@2.1.0":
   version "2.1.0"
@@ -827,10 +816,10 @@
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
-"@types/sharp@0.26.0":
+"@types/sharp@0.26.1":
-  version "0.26.0"
+  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.26.0.tgz#2fa8419dbdaca8dd38f73888b27b207f188a8669"
+  resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.26.1.tgz#92f6b3e65fb02a54ac7027cea0d17cf64f0d2958"
-  integrity sha512-oJrR8eiwpL7qykn2IeFRduXM4za7z+7yOUEbKVtuDQ/F6htDLHYO6IbzhaJQHV5n6O3adIh4tJvtgPyLyyydqg==
+  integrity sha512-vOFcnP0+aQFDb+ToKVIj8ZV6xQ7pNYGGPeYweLHxyjoQUcIGj8iY9R3OVmJyRR5KUkb0Y4obBbMjoTrBXw6AQA==
   dependencies:
     "@types/node" "*"
 
@@ -1302,6 +1291,11 @@ acorn-jsx@^5.2.0:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
   integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
 
+acorn-jsx@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+
 acorn-walk@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
@@ -1453,12 +1447,11 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-apexcharts@3.22.2:
+apexcharts@3.22.3:
-  version "3.22.2"
+  version "3.22.3"
-  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.22.2.tgz#7656a54e4a69479e0737c05defcd542c8cc162c5"
+  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.22.3.tgz#a829c4500db8478069b80e227741830b77d89467"
-  integrity sha512-pR+cmApk7dhfYILBpe8RVb+FdLfVCt/RDWvAJO1F5feeSQ8lKDgFkRuVu9KOeEarHVXjUpnhLqHNMx7YaprK8A==
+  integrity sha512-ZRZWmAmSdyc+tFhHMZ10ZxbvSbomWe46izpi8yQj5cKLxuujw2XeXVQ0jxnPl9yE5Q7W2hAbDWStaouBN4mSuw==
   dependencies:
-    "@rollup/plugin-babel" "^5.2.1"
     svg.draggable.js "^2.2.2"
     svg.easing.js "^2.0.0"
     svg.filter.js "^2.0.2"
@@ -1696,10 +1689,10 @@ autwh@0.1.0:
   dependencies:
     oauth "0.9.15"
 
-aws-sdk@2.787.0:
+aws-sdk@2.806.0:
-  version "2.787.0"
+  version "2.806.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.787.0.tgz#4d8966d11c7dbe770de26632e552c97b2d91e340"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.806.0.tgz#5bd3ac07425ee34f5dc9dc40a38d78c49066a88f"
-  integrity sha512-3WlUdWqUB8Vhdvj/7TENr/7SEmQzxmnHxOJ8l2WjZbcMRSuI0/9Ym4p1TC3hf21VDVDhkdGlw60QqpZQ1qb+Mg==
+  integrity sha512-kCrGfZyzZiS56qblXEzznkTi64ZbzhQGlbyEjDI9cIUjX4dA9IyqvNWUdJvUQoZmiEnObbuXMVrv7blJzT8uhQ==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -1950,15 +1943,15 @@ builtin-modules@^1.1.1:
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
   integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
-bull@3.18.1:
+bull@3.20.0:
-  version "3.18.1"
+  version "3.20.0"
-  resolved "https://registry.yarnpkg.com/bull/-/bull-3.18.1.tgz#49eb8fd9844a3dc0a12a851b132e508890763a31"
+  resolved "https://registry.yarnpkg.com/bull/-/bull-3.20.0.tgz#ca394d623f13ade6cddb7481f630988bce2d4d09"
-  integrity sha512-g3gHFZ0qMo0wpecoNmd2W+F1Gj48l6phVCTdsQPKxDk1bB7kzD0nY5FAFnBFiaWxNmh5lb5X9TMB64uNXFKFDg==
+  integrity sha512-xXUfA2gLZLfIkWhxcZkAk6mHt+eG3o4arqz7HwCPVYuVjIp/pYTuhFd2iPXIQLxop7pJY4VIQ59fELdD/Y6f8w==
   dependencies:
     cron-parser "^2.13.0"
     debuglog "^1.0.0"
     get-port "^5.1.1"
-    ioredis "^4.14.1"
+    ioredis "4.18.0"
     lodash "^4.17.19"
     p-timeout "^3.2.0"
     promise.prototype.finally "^3.1.2"
@@ -2678,10 +2671,10 @@ copy-to@^2.0.1:
   resolved "https://registry.yarnpkg.com/copy-to/-/copy-to-2.0.1.tgz#2680fbb8068a48d08656b6098092bdafc906f4a5"
   integrity sha1-JoD7uAaKSNCGVrYJgJK9r8kG9KU=
 
-core-js@3.7.0:
+core-js@3.8.1:
-  version "3.7.0"
+  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz#b0a761a02488577afbf97179e4681bf49568520f"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47"
-  integrity sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==
+  integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -2975,10 +2968,10 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
-dateformat@3.0.3:
+dateformat@4.3.1:
-  version "3.0.3"
+  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.3.1.tgz#e010ca5915f0c7d47e5b4e4287dd5ecb41125a96"
-  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
+  integrity sha512-xhq1wI5BQ0TMJDvio0BLP8lNeYlhAvmh/7H52H9n6kfzqSmRpIhH5KEIjJ7onFEAh5CQVrAP2MAG8wZ6j0BKzQ==
 
 debug-fabulous@1.X:
   version "1.1.0"
@@ -3559,15 +3552,15 @@ escodegen@^1.14.1:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-plugin-vue@7.1.0:
+eslint-plugin-vue@7.2.0:
-  version "7.1.0"
+  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.1.0.tgz#832d83e4e1e480c7285b2bc3ff1076cd0dca7a5b"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.2.0.tgz#dd8323fe7ca28fe9377ce3f5f6cf17afe2686f2a"
-  integrity sha512-9dW7kj8/d2IkDdgNpvIhJdJ3XzU3x4PThXYMzWt49taktYnGyrTY6/bXCYZ/VtQKU9kXPntPrZ41+8Pw0Nxblg==
+  integrity sha512-4mt0yIv6rBDNtvis/g22a0ozJ12GfcdEzX77u0ICYjKlxOVtGrKGEvo0cbOObHaKDg9a9kJcoaNodqE4TPfS2A==
   dependencies:
     eslint-utils "^2.1.0"
     natural-compare "^1.4.0"
     semver "^7.3.2"
-    vue-eslint-parser "^7.1.1"
+    vue-eslint-parser "^7.2.0"
 
 eslint-scope@^5.0.0, eslint-scope@^5.1.1:
   version "5.1.1"
@@ -3594,13 +3587,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.14.0:
+eslint@7.15.0:
-  version "7.14.0"
+  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.14.0.tgz#2d2cac1d28174c510a97b377f122a5507958e344"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7"
-  integrity sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==
+  integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@eslint/eslintrc" "^0.2.1"
+    "@eslint/eslintrc" "^0.2.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -3610,10 +3603,10 @@ eslint@7.14.0:
     eslint-scope "^5.1.1"
     eslint-utils "^2.1.0"
     eslint-visitor-keys "^2.0.0"
-    espree "^7.3.0"
+    espree "^7.3.1"
     esquery "^1.2.0"
     esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
+    file-entry-cache "^6.0.0"
     functional-red-black-tree "^1.0.1"
     glob-parent "^5.0.0"
     globals "^12.1.0"
@@ -3646,13 +3639,13 @@ espree@^6.2.1:
     acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.1.0"
 
-espree@^7.3.0:
+espree@^7.3.0, espree@^7.3.1:
-  version "7.3.0"
+  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
   dependencies:
     acorn "^7.4.0"
-    acorn-jsx "^5.2.0"
+    acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
@@ -3689,11 +3682,6 @@ estraverse@^5.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
   integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
-estree-walker@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
-  integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
-
 estree-walker@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.1.tgz#f8e030fb21cefa183b44b7ad516b747434e7a3e0"
@@ -3904,12 +3892,12 @@ figlet@^1.1.1:
   resolved "https://registry.yarnpkg.com/figlet/-/figlet-1.3.0.tgz#c49e3d92907ba13bebadc7124f76ba71f1f32ef0"
   integrity sha512-f7A8aOJAfyehLJ7lQ6rEA8WJw7kOk3lfWRi5piSjkzbK5YkI5sqO8eiLHz1ehO+DM0QYB85i8VfA6XIGUbU1dg==
 
-file-entry-cache@^5.0.1:
+file-entry-cache@^6.0.0:
-  version "5.0.1"
+  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+  integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==
   dependencies:
-    flat-cache "^2.0.1"
+    flat-cache "^3.0.4"
 
 file-type@16.0.1:
   version "16.0.1"
@@ -3947,7 +3935,7 @@ find-cache-dir@^2.0.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-up@5.0.0:
+find-up@5.0.0, find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
   integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
@@ -4014,24 +4002,23 @@ flagged-respawn@^1.0.0:
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
   integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
 
-flat-cache@^2.0.1:
+flat-cache@^3.0.4:
-  version "2.0.1"
+  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
   dependencies:
-    flatted "^2.0.0"
+    flatted "^3.1.0"
-    rimraf "2.6.3"
+    rimraf "^3.0.2"
-    write "1.0.3"
 
 flat@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
-flatted@^2.0.0:
+flatted@^3.1.0:
-  version "2.0.2"
+  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+  integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==
 
 fluent-ffmpeg@2.1.2:
   version "2.1.2"
@@ -4870,9 +4857,9 @@ inherits@2.0.3:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.4, ini@~1.3.0:
-  version "1.3.5"
+  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
 
 insert-text-at-cursor@0.3.0:
   version "0.3.0"
@@ -4904,17 +4891,17 @@ invert-kv@^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==
 
-ioredis@^4.14.1:
+ioredis@4.18.0:
-  version "4.16.3"
+  version "4.18.0"
-  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.16.3.tgz#6a6b85830206fd98353b7ff8536521f17943be53"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.18.0.tgz#40785bb76d30b2a50698dd9bb8d8add2a88fbef7"
-  integrity sha512-Ejvcs2yW19Vq8AipvbtfcX3Ig8XG9EAyFOvGbhI/Q1QoVOK9ZdgY092kdOyOWIYBnPHjfjMJhU9qhsnp0i0K1w==
+  integrity sha512-wXlB60wD+ayJxbD7t+RFBanXinhHyYpfKUxTEEXNOpd0wb+nC8GLH2r7SaZ6sSBOxr8x6jDfBiuMaiK3bPYABw==
   dependencies:
     cluster-key-slot "^1.1.0"
     debug "^4.1.1"
     denque "^1.1.0"
     lodash.defaults "^4.2.0"
     lodash.flatten "^4.4.0"
-    redis-commands "1.5.0"
+    redis-commands "1.6.0"
     redis-errors "^1.2.0"
     redis-parser "^3.0.0"
     standard-as-callback "^2.0.1"
@@ -6116,6 +6103,11 @@ material-colors@^1.0.0:
   resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
   integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
 
+matter-js@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/matter-js/-/matter-js-0.14.2.tgz#8169af9e06fdc356ba9e72b49624eb329839883b"
+  integrity sha512-3ttVT8cJlQnGRjBa8MyVrGyvGmnmOkZ3YsyemIw+KwEEdVi70mo32FH1Eta2b3GfdDJFbMDRqyMQt4heNKBUEA==
+
 mdn-data@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
@@ -7188,7 +7180,7 @@ pgpass@1.x:
   dependencies:
     split "^1.0.0"
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.0.7, picomatch@^2.2.1, picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.0.7, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -7234,6 +7226,13 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
+pkg-dir@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
+  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
+  dependencies:
+    find-up "^5.0.0"
+
 plugin-error@1.0.1, plugin-error@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
@@ -7630,10 +7629,10 @@ postcss-value-parser@^4.1.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-postcss@8.1.14, postcss@^8.1.4:
+postcss@8.2.1, postcss@^8.1.4:
-  version "8.1.14"
+  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.1.14.tgz#77d6a5db2fdc0afa918e24af5323a53fb8727f2e"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.1.tgz#eabc5557c4558059b9d9e5b15bce7ffa9089c2a8"
-  integrity sha512-KatkyVPBKfENS+c3dpXJoDXnDD5UZs5exAnDksLqaRJPKwYphEPZt4N0m0i049v2/BtWVQibAhxW4ilXXcolpA==
+  integrity sha512-RhsqOOAQzTgh1UB/IZdca7F9WDb7SUCR2Vnv1x7DbvuuggQIpoDwjK+q0rzoPffhYvWNKX5JSwS4so4K3UC6vA==
   dependencies:
     colorette "^1.2.1"
     nanoid "^3.1.20"
@@ -8148,7 +8147,12 @@ reconnecting-websocket@4.4.0:
   resolved "https://registry.yarnpkg.com/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz#3b0e5b96ef119e78a03135865b8bb0af1b948783"
   integrity sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==
 
-redis-commands@1.5.0, redis-commands@^1.5.0:
+redis-commands@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.6.0.tgz#36d4ca42ae9ed29815cdb30ad9f97982eba1ce23"
+  integrity sha512-2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ==
+
+redis-commands@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.5.0.tgz#80d2e20698fe688f227127ff9e5164a7dd17e785"
   integrity sha512-6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==
@@ -8489,13 +8493,6 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -9334,10 +9331,10 @@ syslog-pro@1.0.0:
   dependencies:
     moment "^2.22.2"
 
-systeminformation@4.30.7:
+systeminformation@4.31.0:
-  version "4.30.7"
+  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-4.30.7.tgz#7e211875aada42abc8bb46cd6c652a274d7e78e0"
+  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-4.31.0.tgz#24da1f4ba904de8ac66e71be656fef0a234e1d72"
-  integrity sha512-tE8KlEje0DvdhNY/N9VR6au3+FUSvE11aFlYqWCzbUoA6mczZf9SN4ivHjZBupxvzEATUzFhuIbYLml8Y7TsEQ==
+  integrity sha512-j1eNsuHxpW00RpxSvLy2IJHXpH54TyzZGQRTSFM5flD+dl83qmZ7TWIPnVkACMgHFABkL95I4KTf6S7aRsGUWg==
 
 syuilo-password-strength@0.0.1:
   version "0.0.1"
@@ -9647,10 +9644,10 @@ trace-redirect@1.0.6:
   resolved "https://registry.yarnpkg.com/trace-redirect/-/trace-redirect-1.0.6.tgz#ac629b5bf8247d30dde5a35fe9811b811075b504"
   integrity sha512-UUfa1DjjU5flcjMdaFIiIEGDTyu2y/IiMjOX4uGXa7meKBS4vD4f2Uy/tken9Qkd4Jsm4sRsfZcIIPqrRVF3Mg==
 
-ts-loader@8.0.9:
+ts-loader@8.0.11:
-  version "8.0.9"
+  version "8.0.11"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.9.tgz#890fc25f49a99124268f4e738ed22d00f666dc37"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.11.tgz#35d58a65932caacb120426eea59eca841786c899"
-  integrity sha512-rQd+iIfz5z4HSVzhhRFP4M2OQ0QmihilWWauYvvowBfnRvr4DW+gqA2om70xp/07EQj1qBkLMWobnXsgmWMbmg==
+  integrity sha512-06X+mWA2JXoXJHYAesUUL4mHFYhnmyoCdQVMXofXF552Lzd4wNwSGg7unJpttqUP7ziaruM8d7u8LUB6I1sgzA==
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"
@@ -9818,10 +9815,10 @@ typeorm@0.2.29:
     yargonaut "^1.1.2"
     yargs "^16.0.3"
 
-typescript@4.0.5:
+typescript@4.1.2:
-  version "4.0.5"
+  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
-  integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==
+  integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
 
 typical@^5.0.0, typical@^5.2.0:
   version "5.2.0"
@@ -10007,7 +10004,7 @@ uuid@7.0.3:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
   integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
 
-uuid@8.3.1:
+uuid@8.3.1, uuid@^8.3.0:
   version "8.3.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
   integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
@@ -10017,11 +10014,6 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
-  integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
-
 v-debounce@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/v-debounce/-/v-debounce-0.1.2.tgz#cab75df7def2783215bf449ef85c69c2decf0a55"
@@ -10144,10 +10136,10 @@ vue-color@2.7.1:
     material-colors "^1.0.0"
     tinycolor2 "^1.1.2"
 
-vue-eslint-parser@^7.1.1:
+vue-eslint-parser@^7.2.0:
-  version "7.1.1"
+  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.1.1.tgz#c43c1c715ff50778b9a7e9a4e16921185f3425d3"
+  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.2.0.tgz#1e17ae94ca71e617025e05143c8ac5593aacb6ef"
-  integrity sha512-8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA==
+  integrity sha512-uVcQqe8sUNzdHGcRHMd2Z/hl6qEaWrAmglTKP92Fnq9TYU9un8xsyFgEdFJaXh/1rd7h8Aic1GaiQow5nVneow==
   dependencies:
     debug "^4.1.1"
     eslint-scope "^5.0.0"
@@ -10182,10 +10174,10 @@ vue-prism-editor@2.0.0-alpha.2:
   resolved "https://registry.yarnpkg.com/vue-prism-editor/-/vue-prism-editor-2.0.0-alpha.2.tgz#aa53a88efaaed628027cbb282c2b1d37fc7c5c69"
   integrity sha512-Gu42ba9nosrE+gJpnAEuEkDMqG9zSUysIR8SdXUw8MQKDjBnnNR9lHC18uOr/ICz7yrA/5c7jHJr9lpElODC7w==
 
-vue-router@4.0.0-rc.6:
+vue-router@4.0.1:
-  version "4.0.0-rc.6"
+  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.0-rc.6.tgz#8fa9e2d612c28ccf9b2bfa9421052932808ce24b"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.1.tgz#309240e50524b1e7d4e82e27f0a0fa25fe3d1d71"
-  integrity sha512-hVHC8A4/0yku1Z6+oUtX9odeHv78XwDI7putt1hd7os27P7mLabkjArN7f3TI3e/cz17MxAUz5Yp+m8ZE3sPsw==
+  integrity sha512-2C2nRxA2nCusgJyUpvcbd9Bnc9kACp/VLUCK4drXtgeRXHjQliZJcgjjP268vkGvvEKun9jjp8Ic1PpzUgbYKg==
 
 vue-style-loader@4.1.2:
   version "4.1.2"
@@ -10310,10 +10302,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.9.0:
+webpack@5.10.0:
-  version "5.9.0"
+  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.9.0.tgz#af2e9cf9d6c7867cdcf214ea3bb5eb77aece6895"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.0.tgz#6f77c31522a2c525152d9c344f9765d168b3df08"
-  integrity sha512-YnnqIV/uAS5ZrNpctSv378qV7HmbJ74DL+XfvMxzbX1bV9e7eeT6eEWU4wuUw33CNr/HspBh7R/xQlVjTEyAeA==
+  integrity sha512-P0bHAXmIz0zsNcHNLqFmLY1ZtrT+jtBr7FqpuDtA2o7GiHC+zBsfhgK7SmJ1HG7BAEb3G9JoMdSVi7mEDvG3Zg==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"
@@ -10333,17 +10325,17 @@ webpack@5.9.0:
     loader-runner "^4.1.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    pkg-dir "^4.2.0"
+    pkg-dir "^5.0.0"
     schema-utils "^3.0.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.0.3"
     watchpack "^2.0.0"
     webpack-sources "^2.1.1"
 
-websocket@1.0.32:
+websocket@1.0.33:
-  version "1.0.32"
+  version "1.0.33"
-  resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.32.tgz#1f16ddab3a21a2d929dec1687ab21cfdc6d3dbb1"
+  resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.33.tgz#407f763fc58e74a3fa41ca3ae5d78d3f5e3b82a5"
-  integrity sha512-i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q==
+  integrity sha512-XwNqM2rN5eh3G2CUQE3OHZj+0xfdH42+OFK6LdC2yqiC0YU8e5UK0nYre220T0IyyN031V/XOvtHvXozvJYFWA==
   dependencies:
     bufferutil "^4.0.1"
     debug "^2.2.0"
@@ -10506,17 +10498,10 @@ write-json-file@^2.3.0:
     sort-keys "^2.0.0"
     write-file-atomic "^2.0.0"
 
-write@1.0.3:
+ws@7.4.1, ws@^7.2.3:
-  version "1.0.3"
+  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==
-  dependencies:
-    mkdirp "^0.5.1"
-
-ws@7.4.0, ws@^7.2.3:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7"
-  integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==
 
 xev@2.0.1:
   version "2.0.1"