Merge remote-tracking branch 'origin/develop' into fix/image-previews

.gitlab-ci.yml

@@ -3,6 +3,9 @@ image: node:18
 variables:
   NODE_ENV: test
 
+default:
+  interruptible: true
+
 cache: &cache
   key:
     files:
@@ -25,7 +28,6 @@ deps:
   cache:
     <<: *cache
     policy: push
-  interruptible: true
 
 danger:
   stage: test
@@ -33,8 +35,10 @@ danger:
     # https://github.com/danger/danger-js/issues/1029#issuecomment-998915436
     - export CI_MERGE_REQUEST_IID=${CI_OPEN_MERGE_REQUESTS#*!}
     - npx danger ci
+  except:
+    variables:
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
   allow_failure: true
-  interruptible: true
 
 lint-js:
   stage: test
@@ -47,7 +51,6 @@ lint-js:
       - "**/*.tsx"
       - ".eslintignore"
       - ".eslintrc.js"
-  interruptible: true
 
 lint-sass:
   stage: test
@@ -57,7 +60,6 @@ lint-sass:
       - "**/*.scss"
       - "**/*.css"
       - ".stylelintrc.json"
-  interruptible: true
 
 jest:
   stage: test
@@ -80,27 +82,30 @@ jest:
       coverage_report:
         coverage_format: cobertura
         path: .coverage/cobertura-coverage.xml
-  interruptible: true
 
 nginx-test:
   stage: test
   image: nginx:latest
-  before_script: cp installation/mastodon.conf /etc/nginx/conf.d/default.conf
+  before_script:
+    - cp installation/mastodon.conf /etc/nginx/conf.d/default.conf
   script: nginx -t
   only:
     changes:
       - "installation/mastodon.conf"
-  interruptible: true
 
 build-production:
   stage: test
-  script: yarn build
+  script:
+    - yarn build
+    - yarn manage:translations en
+    # Fail if files got changed.
+    # https://stackoverflow.com/a/9066385
+    - git diff --quiet
   variables:
     NODE_ENV: production
   artifacts:
     paths:
      - static
-  interruptible: true
 
 docs-deploy:
   stage: deploy
@@ -110,22 +115,10 @@ docs-deploy:
   script:
     - curl -X POST -F"token=$CI_JOB_TOKEN" -F'ref=master' https://gitlab.com/api/v4/projects/15685485/trigger/pipeline
   only:
-    refs:
+    variables:
-      - develop
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
     changes:
       - "docs/**/*"
-  interruptible: true
-
-# Supposed to fail when translations are outdated, instead always passes
-#
-# i18n:
-#   stage: build
-#   script: yarn manage:translations
-#   variables:
-#     NODE_ENV: development
-#   before_script:
-#     - yarn
-#     - yarn build
 
 review:
   stage: deploy
@@ -135,7 +128,6 @@ review:
   script:
     - npx -y surge static $CI_COMMIT_REF_SLUG.git.soapbox.pub
   allow_failure: true
-  interruptible: true
 
 pages:
   stage: deploy
@@ -149,9 +141,8 @@ pages:
     paths:
     - public
   only:
-    refs:
+    variables:
-      - develop
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
-  interruptible: true
 
 docker:
   stage: deploy
@@ -166,6 +157,9 @@ docker:
     - docker build -t $CI_REGISTRY_IMAGE .
     - docker push $CI_REGISTRY_IMAGE
   only:
-    refs:
+    variables:
-      - develop
+      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
-  interruptible: true
+
+include:
+  - template: Jobs/Dependency-Scanning.gitlab-ci.yml
+  - template: Security/License-Scanning.gitlab-ci.yml

.gitlab/merge_request_templates/BeforeAndAfter.md

@@ -0,0 +1,8 @@
+## Summary
+<!-- Describe your changes in detail -->
+
+
+## Screenshots (if appropriate):
+| Before | After |
+| ------ | ----- |
+|        |       |

.vscode/extensions.json

@@ -3,6 +3,7 @@
         "dbaeumer.vscode-eslint",
         "bradlc.vscode-tailwindcss",
         "stylelint.vscode-stylelint",
-        "wix.vscode-import-cost"
+        "wix.vscode-import-cost",
+        "redhat.vscode-yaml"
     ]
 }

.vscode/settings.json

@@ -5,5 +5,15 @@
     "*.conf.template": "properties"
   },
   "files.eol": "\n",
-  "files.insertFinalNewline": false
+  "files.insertFinalNewline": false,
+  "json.schemas": [
+    {
+      "fileMatch": [".lintstagedrc.json"],
+      "url": "https://json.schemastore.org/lintstagedrc.schema.json"
+    },
+    {
+      "fileMatch": ["renovate.json"],
+      "url": "https://docs.renovatebot.com/renovate-schema.json"
+    }
+  ]
 }

CHANGELOG.md

@@ -4,7 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+- Compatibility: rudimentary support for Takahē.
+- UI: added backdrop blur behind modals.
+
+### Changed
+- Posts: letterbox images to 19:6 again.
+
+### Fixed
+- Layout: use accent color for "floating action button" (mobile compose button).
+- ServiceWorker: don't serve favicon, robots.txt, and others from ServiceWorker.
+- Datepicker: correctly default to the current year.
+- Scheduled posts: fix page crashing on deleting a scheduled post.
+
 ## [3.0.0] - 2022-12-25
+
 ### Added
 - Editing: ability to edit posts and view edit history (on Rebased, Pleroma, and Mastodon).
 - Events: ability to create, view, and comment on Events (on Rebased).

app/soapbox/actions/scheduled-statuses.ts

@@ -1,3 +1,5 @@
+import { getFeatures } from 'soapbox/utils/features';
+
 import api, { getLinks } from '../api';
 
 import type { AxiosError } from 'axios';
@@ -18,10 +20,17 @@ const SCHEDULED_STATUS_CANCEL_FAIL    = 'SCHEDULED_STATUS_CANCEL_FAIL';
 
 const fetchScheduledStatuses = () =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    if (getState().status_lists.get('scheduled_statuses')?.isLoading) {
+    const state = getState();
+
+    if (state.status_lists.get('scheduled_statuses')?.isLoading) {
       return;
     }
 
+    const instance = state.instance;
+    const features = getFeatures(instance);
+
+    if (!features.scheduledStatuses) return;
+
     dispatch(fetchScheduledStatusesRequest());
 
     api(getState).get('/api/v1/scheduled_statuses').then(response => {

app/soapbox/actions/trending-statuses.ts

@@ -17,6 +17,8 @@ const fetchTrendingStatuses = () =>
     const instance = state.instance;
     const features = getFeatures(instance);
 
+    if (!features.trendingStatuses && !features.trendingTruths) return;
+
     dispatch({ type: TRENDING_STATUSES_FETCH_REQUEST });
     return api(getState).get(features.trendingTruths ? '/api/v1/truth/trending/truths' : '/api/v1/trends/statuses').then(({ data: statuses }) => {
       dispatch(importFetchedStatuses(statuses));

app/soapbox/api/index.ts

@@ -62,7 +62,6 @@ export const baseClient = (accessToken?: string | null, baseURL: string = ''): A
     headers: Object.assign(accessToken ? {
       'Authorization': `Bearer ${accessToken}`,
     } : {}),
-
     transformResponse: [maybeParseJSON],
   });
 };

app/soapbox/components/autosuggest-account-input.tsx

@@ -53,8 +53,7 @@ const AutosuggestAccountInput: React.FC<IAutosuggestAccountInput> = ({
         setAccountIds(ImmutableOrderedSet(accountIds));
       })
       .catch(noOp);
-
+  }, 900, { leading: false, trailing: true }), [limit]);
-  }, 900, { leading: true, trailing: true }), [limit]);
 
   const handleChange: React.ChangeEventHandler<HTMLInputElement> = e => {
     refreshCancelToken();

app/soapbox/components/media-gallery.tsx

@@ -295,7 +295,7 @@ const MediaGallery: React.FC<IMediaGallery> = (props) => {
     const aspectRatio = media.getIn([0, 'meta', 'original', 'aspect']) as number | undefined;
 
     const getHeight = () => {
-      if (!aspectRatio) return w;
+      if (!aspectRatio) return w * 9 / 16;
       if (isPanoramic(aspectRatio)) return Math.floor(w / maximumAspectRatio);
       if (isPortrait(aspectRatio)) return Math.floor(w / minimumAspectRatio);
       return Math.floor(w / aspectRatio);

app/soapbox/components/modal-root.tsx

@@ -241,7 +241,7 @@ const ModalRoot: React.FC<IModalRoot> = ({ children, onCancel, onClose, type })
       <div
         role='presentation'
         id='modal-overlay'
-        className='fixed inset-0 bg-gray-500/90 dark:bg-gray-700/90'
+        className='fixed inset-0 bg-gray-500/90 dark:bg-gray-700/90 backdrop-blur'
         onClick={handleOnClose}
       />
 

app/soapbox/components/sidebar-menu.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable jsx-a11y/interactive-supports-focus */
 import classNames from 'clsx';
 import React from 'react';
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
@@ -136,218 +137,234 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
 
   return (
     <div
-      className={classNames('sidebar-menu__root', {
-        'sidebar-menu__root--visible': sidebarOpen,
-      })}
       aria-expanded={sidebarOpen}
+      className={
+        classNames({
+          'z-[1000]': sidebarOpen,
+          hidden: !sidebarOpen,
+        })
+      }
     >
       <div
-        className={classNames({
+        className='fixed inset-0 bg-gray-500/90 dark:bg-gray-700/90'
-          'fixed inset-0 bg-gray-500/90 dark:bg-gray-700/90 z-1000': true,
-          'hidden': !sidebarOpen,
-        })}
         role='button'
         onClick={handleClose}
-      >
+      />
-        <IconButton
-          title={intl.formatMessage(messages.close)}
-          onClick={handleClose}
-          src={require('@tabler/icons/x.svg')}
-          ref={closeButtonRef}
-          iconClassName='h-6 w-6'
-          className='fixed top-5 right-5 text-gray-600 dark:text-gray-400 hover:text-gray-600 dark:hover:text-gray-300'
-        />
-      </div>
 
-      <div className='sidebar-menu'>
+      <div className='fixed inset-0 z-[1000] flex'>
-        <div className='relative overflow-y-scroll overflow-auto h-full w-full'>
+        <div
-          <div className='p-4'>
+          className={
-            <Stack space={4}>
+            classNames({
-              <Link to={`/@${account.acct}`} onClick={onClose}>
+              'flex flex-col flex-1 bg-white dark:bg-primary-900 -translate-x-full rtl:translate-x-full w-full max-w-xs': true,
-                <Account account={account} showProfileHoverCard={false} withLinkToProfile={false} />
+              '!translate-x-0': sidebarOpen,
-              </Link>
+            })
-
+          }
-              <ProfileStats
+        >
-                account={account}
+          <IconButton
-                onClickHandler={handleClose}
+            title={intl.formatMessage(messages.close)}
-              />
+            onClick={handleClose}
+            src={require('@tabler/icons/x.svg')}
+            ref={closeButtonRef}
+            iconClassName='h-6 w-6'
+            className='absolute top-0 right-0 -mr-11 mt-2 text-gray-600 dark:text-gray-400 hover:text-gray-600 dark:hover:text-gray-300'
+          />
 
+          <div className='relative overflow-y-scroll overflow-auto h-full w-full'>
+            <div className='p-4'>
               <Stack space={4}>
-                <Divider />
+                <Link to={`/@${account.acct}`} onClick={onClose}>
+                  <Account account={account} showProfileHoverCard={false} withLinkToProfile={false} />
+                </Link>
 
-                <SidebarLink
+                <ProfileStats
-                  to={`/@${account.acct}`}
+                  account={account}
-                  icon={require('@tabler/icons/user.svg')}
+                  onClickHandler={handleClose}
-                  text={intl.formatMessage(messages.profile)}
-                  onClick={onClose}
                 />
 
-                {(account.locked || followRequestsCount > 0) && (
+                <Stack space={4}>
-                  <SidebarLink
-                    to='/follow_requests'
-                    icon={require('@tabler/icons/user-plus.svg')}
-                    text={intl.formatMessage(messages.followRequests)}
-                    onClick={onClose}
-                  />
-                )}
-
-                {features.bookmarks && (
-                  <SidebarLink
-                    to='/bookmarks'
-                    icon={require('@tabler/icons/bookmark.svg')}
-                    text={intl.formatMessage(messages.bookmarks)}
-                    onClick={onClose}
-                  />
-                )}
-
-                {features.lists && (
-                  <SidebarLink
-                    to='/lists'
-                    icon={require('@tabler/icons/list.svg')}
-                    text={intl.formatMessage(messages.lists)}
-                    onClick={onClose}
-                  />
-                )}
-
-                {features.events && (
-                  <SidebarLink
-                    to='/events'
-                    icon={require('@tabler/icons/calendar-event.svg')}
-                    text={intl.formatMessage(messages.events)}
-                    onClick={onClose}
-                  />
-                )}
-
-                {settings.get('isDeveloper') && (
-                  <SidebarLink
-                    to='/developers'
-                    icon={require('@tabler/icons/code.svg')}
-                    text={intl.formatMessage(messages.developers)}
-                    onClick={onClose}
-                  />
-                )}
-
-                {features.publicTimeline && <>
                   <Divider />
 
                   <SidebarLink
-                    to='/timeline/local'
+                    to={`/@${account.acct}`}
-                    icon={features.federating ? require('@tabler/icons/affiliate.svg') : require('@tabler/icons/world.svg')}
+                    icon={require('@tabler/icons/user.svg')}
-                    text={features.federating ? <FormattedMessage id='tabs_bar.local' defaultMessage='Local' /> : <FormattedMessage id='tabs_bar.all' defaultMessage='All' />}
+                    text={intl.formatMessage(messages.profile)}
+                    onClick={onClose}
+                  />
+
+                  {(account.locked || followRequestsCount > 0) && (
+                    <SidebarLink
+                      to='/follow_requests'
+                      icon={require('@tabler/icons/user-plus.svg')}
+                      text={intl.formatMessage(messages.followRequests)}
+                      onClick={onClose}
+                    />
+                  )}
+
+                  {features.bookmarks && (
+                    <SidebarLink
+                      to='/bookmarks'
+                      icon={require('@tabler/icons/bookmark.svg')}
+                      text={intl.formatMessage(messages.bookmarks)}
+                      onClick={onClose}
+                    />
+                  )}
+
+                  {features.lists && (
+                    <SidebarLink
+                      to='/lists'
+                      icon={require('@tabler/icons/list.svg')}
+                      text={intl.formatMessage(messages.lists)}
+                      onClick={onClose}
+                    />
+                  )}
+
+                  {features.events && (
+                    <SidebarLink
+                      to='/events'
+                      icon={require('@tabler/icons/calendar-event.svg')}
+                      text={intl.formatMessage(messages.events)}
+                      onClick={onClose}
+                    />
+                  )}
+
+                  {settings.get('isDeveloper') && (
+                    <SidebarLink
+                      to='/developers'
+                      icon={require('@tabler/icons/code.svg')}
+                      text={intl.formatMessage(messages.developers)}
+                      onClick={onClose}
+                    />
+                  )}
+
+                  {features.publicTimeline && <>
+                    <Divider />
+
+                    <SidebarLink
+                      to='/timeline/local'
+                      icon={features.federating ? require('@tabler/icons/affiliate.svg') : require('@tabler/icons/world.svg')}
+                      text={features.federating ? <FormattedMessage id='tabs_bar.local' defaultMessage='Local' /> : <FormattedMessage id='tabs_bar.all' defaultMessage='All' />}
+                      onClick={onClose}
+                    />
+
+                    {features.federating && (
+                      <SidebarLink
+                        to='/timeline/fediverse'
+                        icon={require('@tabler/icons/topology-star-ring-3.svg')}
+                        text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
+                        onClick={onClose}
+                      />
+                    )}
+                  </>}
+
+                  <Divider />
+
+                  <SidebarLink
+                    to='/blocks'
+                    icon={require('@tabler/icons/ban.svg')}
+                    text={intl.formatMessage(messages.blocks)}
+                    onClick={onClose}
+                  />
+
+                  <SidebarLink
+                    to='/mutes'
+                    icon={require('@tabler/icons/circle-x.svg')}
+                    text={intl.formatMessage(messages.mutes)}
+                    onClick={onClose}
+                  />
+
+                  <SidebarLink
+                    to='/settings/preferences'
+                    icon={require('@tabler/icons/settings.svg')}
+                    text={intl.formatMessage(messages.preferences)}
                     onClick={onClose}
                   />
 
                   {features.federating && (
                     <SidebarLink
-                      to='/timeline/fediverse'
+                      to='/domain_blocks'
-                      icon={require('@tabler/icons/topology-star-ring-3.svg')}
+                      icon={require('@tabler/icons/ban.svg')}
-                      text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
+                      text={intl.formatMessage(messages.domainBlocks)}
                       onClick={onClose}
                     />
                   )}
-                </>}
 
-                <Divider />
+                  {features.filters && (
-
+                    <SidebarLink
-                <SidebarLink
+                      to='/filters'
-                  to='/blocks'
+                      icon={require('@tabler/icons/filter.svg')}
-                  icon={require('@tabler/icons/ban.svg')}
+                      text={intl.formatMessage(messages.filters)}
-                  text={intl.formatMessage(messages.blocks)}
+                      onClick={onClose}
-                  onClick={onClose}
+                    />
-                />
-
-                <SidebarLink
-                  to='/mutes'
-                  icon={require('@tabler/icons/circle-x.svg')}
-                  text={intl.formatMessage(messages.mutes)}
-                  onClick={onClose}
-                />
-
-                <SidebarLink
-                  to='/settings/preferences'
-                  icon={require('@tabler/icons/settings.svg')}
-                  text={intl.formatMessage(messages.preferences)}
-                  onClick={onClose}
-                />
-
-                {features.federating && (
-                  <SidebarLink
-                    to='/domain_blocks'
-                    icon={require('@tabler/icons/ban.svg')}
-                    text={intl.formatMessage(messages.domainBlocks)}
-                    onClick={onClose}
-                  />
-                )}
-
-                {features.filters && (
-                  <SidebarLink
-                    to='/filters'
-                    icon={require('@tabler/icons/filter.svg')}
-                    text={intl.formatMessage(messages.filters)}
-                    onClick={onClose}
-                  />
-                )}
-
-                {account.admin && (
-                  <SidebarLink
-                    to='/soapbox/config'
-                    icon={require('@tabler/icons/settings.svg')}
-                    text={intl.formatMessage(messages.soapboxConfig)}
-                    onClick={onClose}
-                  />
-                )}
-
-                {features.import && (
-                  <SidebarLink
-                    to='/settings/import'
-                    icon={require('@tabler/icons/cloud-upload.svg')}
-                    text={intl.formatMessage(messages.importData)}
-                    onClick={onClose}
-                  />
-                )}
-
-                <Divider />
-
-                <SidebarLink
-                  to='/logout'
-                  icon={require('@tabler/icons/logout.svg')}
-                  text={intl.formatMessage(messages.logout)}
-                  onClick={onClickLogOut}
-                />
-
-                <Divider />
-
-                <Stack space={4}>
-                  <button type='button' onClick={handleSwitcherClick} className='py-1'>
-                    <HStack alignItems='center' justifyContent='between'>
-                      <Text tag='span'>
-                        <FormattedMessage id='profile_dropdown.switch_account' defaultMessage='Switch accounts' />
-                      </Text>
-
-                      <Icon
-                        src={require('@tabler/icons/chevron-down.svg')}
-                        className={classNames('w-4 h-4 text-gray-900 dark:text-gray-100 transition-transform', {
-                          'rotate-180': switcher,
-                        })}
-                      />
-                    </HStack>
-                  </button>
-
-                  {switcher && (
-                    <div className='border-t-2 border-gray-100 dark:border-gray-800 border-solid'>
-                      {otherAccounts.map(account => renderAccount(account))}
-
-                      <NavLink className='flex items-center py-2 space-x-1' to='/login/add' onClick={handleClose}>
-                        <Icon className='text-primary-500 w-4 h-4' src={require('@tabler/icons/plus.svg')} />
-                        <Text size='sm' weight='medium'>{intl.formatMessage(messages.addAccount)}</Text>
-                      </NavLink>
-                    </div>
                   )}
+
+                  {account.admin && (
+                    <SidebarLink
+                      to='/soapbox/config'
+                      icon={require('@tabler/icons/settings.svg')}
+                      text={intl.formatMessage(messages.soapboxConfig)}
+                      onClick={onClose}
+                    />
+                  )}
+
+                  {features.import && (
+                    <SidebarLink
+                      to='/settings/import'
+                      icon={require('@tabler/icons/cloud-upload.svg')}
+                      text={intl.formatMessage(messages.importData)}
+                      onClick={onClose}
+                    />
+                  )}
+
+                  <Divider />
+
+                  <SidebarLink
+                    to='/logout'
+                    icon={require('@tabler/icons/logout.svg')}
+                    text={intl.formatMessage(messages.logout)}
+                    onClick={onClickLogOut}
+                  />
+
+                  <Divider />
+
+                  <Stack space={4}>
+                    <button type='button' onClick={handleSwitcherClick} className='py-1'>
+                      <HStack alignItems='center' justifyContent='between'>
+                        <Text tag='span'>
+                          <FormattedMessage id='profile_dropdown.switch_account' defaultMessage='Switch accounts' />
+                        </Text>
+
+                        <Icon
+                          src={require('@tabler/icons/chevron-down.svg')}
+                          className={classNames('w-4 h-4 text-gray-900 dark:text-gray-100 transition-transform', {
+                            'rotate-180': switcher,
+                          })}
+                        />
+                      </HStack>
+                    </button>
+
+                    {switcher && (
+                      <div className='border-t-2 border-gray-100 dark:border-gray-800 border-solid'>
+                        {otherAccounts.map(account => renderAccount(account))}
+
+                        <NavLink className='flex items-center py-2 space-x-1' to='/login/add' onClick={handleClose}>
+                          <Icon className='text-primary-500 w-4 h-4' src={require('@tabler/icons/plus.svg')} />
+                          <Text size='sm' weight='medium'>{intl.formatMessage(messages.addAccount)}</Text>
+                        </NavLink>
+                      </div>
+                    )}
+                  </Stack>
                 </Stack>
               </Stack>
-            </Stack>
+            </div>
           </div>
         </div>
+
+        {/* Dummy element to keep Close Icon visible */}
+        <div
+          aria-hidden
+          className='w-14 flex-shrink-0'
+          onClick={handleClose}
+        />
       </div>
     </div>
   );

app/soapbox/components/ui/datepicker/datepicker.tsx

@@ -20,7 +20,7 @@ const Datepicker = ({ onChange }: IDatepicker) => {
 
   const [month, setMonth] = useState<number>(new Date().getMonth());
   const [day, setDay] = useState<number>(new Date().getDate());
-  const [year, setYear] = useState<number>(2022);
+  const [year, setYear] = useState<number>(new Date().getFullYear());
 
   const numberOfDays = useMemo(() => {
     return getDaysInMonth(month, year);

app/soapbox/components/ui/select/select.tsx

@@ -11,7 +11,7 @@ const Select = React.forwardRef<HTMLSelectElement, ISelect>((props, ref) => {
   return (
     <select
       ref={ref}
-      className={`w-full pl-3 pr-10 py-2 text-base border-gray-300 dark:border-gray-800 focus:outline-none focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-900 dark:text-gray-100 dark:ring-1 dark:ring-gray-800 dark:focus:ring-primary-500 dark:focus:border-primary-500 sm:text-sm rounded-md disabled:opacity-50 ${className}`}
+      className={`w-full pl-3 pr-10 py-2 text-base truncate border-gray-300 dark:border-gray-800 focus:outline-none focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-900 dark:text-gray-100 dark:ring-1 dark:ring-gray-800 dark:focus:ring-primary-500 dark:focus:border-primary-500 sm:text-sm rounded-md disabled:opacity-50 ${className}`}
       {...filteredProps}
     >
       {children}

app/soapbox/extra-polyfills.ts

@@ -2,6 +2,3 @@
 
 import 'intersection-observer';
 import 'requestidlecallback';
-import objectFitImages from 'object-fit-images';
-
-objectFitImages();

app/soapbox/features/account-gallery/index.tsx

@@ -95,7 +95,7 @@ const AccountGallery = () => {
       const media = (attachment.status as Status).media_attachments;
       const index = media.findIndex((x) => x.id === attachment.id);
 
-      dispatch(openModal('MEDIA', { media, index, status: attachment.status, account: attachment.account }));
+      dispatch(openModal('MEDIA', { media, index, status: attachment.status }));
     }
   };
 

app/soapbox/features/chats/components/chat-pane/__tests__/chat-pane.test.tsx

@@ -5,7 +5,7 @@ import { __stub } from 'soapbox/api';
 import { ChatContext } from 'soapbox/contexts/chat-context';
 import { StatProvider } from 'soapbox/contexts/stat-context';
 import chats from 'soapbox/jest/fixtures/chats.json';
-import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
+import { mockStore, render, rootState, screen, waitFor } from 'soapbox/jest/test-helpers';
 
 import ChatPane from '../chat-pane';
 
@@ -23,7 +23,12 @@ const renderComponentWithChatContext = (store = {}) => render(
 
 describe('<ChatPane />', () => {
   describe('when there are no chats', () => {
+    let store: ReturnType<typeof mockStore>;
+
     beforeEach(() => {
+      const state = rootState.setIn(['instance', 'version'], '2.7.2 (compatible; Pleroma 2.2.0)');
+      store = mockStore(state);
+
       __stub((mock) => {
         mock.onGet('/api/v1/pleroma/chats').reply(200, [], {
           link: null,
@@ -32,7 +37,7 @@ describe('<ChatPane />', () => {
     });
 
     it('renders the blankslate', async () => {
-      renderComponentWithChatContext();
+      renderComponentWithChatContext(store);
 
       await waitFor(() => {
         expect(screen.getByTestId('chat-pane-blankslate')).toBeInTheDocument();
@@ -57,4 +62,4 @@ describe('<ChatPane />', () => {
       });
     });
   });
-});
+});

app/soapbox/features/compose/components/__tests__/search.test.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 
 import { __stub } from 'soapbox/api';
 
-import { render, screen } from '../../../../jest/test-helpers';
+import { render, screen, waitFor } from '../../../../jest/test-helpers';
 import Search from '../search';
 
 describe('<Search />', () => {
@@ -22,7 +22,9 @@ describe('<Search />', () => {
 
     await user.type(screen.getByLabelText('Search'), '@jus');
 
-    expect(screen.getByLabelText('Search')).toHaveValue('@jus');
+    await waitFor(() => {
-    expect(screen.getByTestId('account')).toBeInTheDocument();
+      expect(screen.getByLabelText('Search')).toHaveValue('@jus');
+      expect(screen.getByTestId('account')).toBeInTheDocument();
+    });
   });
 });

app/soapbox/features/feed-filtering/__tests__/feed-carousel.test.tsx

@@ -8,7 +8,7 @@ import { render, screen, waitFor } from '../../../jest/test-helpers';
 import FeedCarousel from '../feed-carousel';
 
 jest.mock('../../../hooks/useDimensions', () => ({
-  useDimensions: () => [{ scrollWidth: 190 }, null, { width: 100 }],
+  useDimensions: () => [{ scrollWidth: 190 }, null, { width: 300 }],
 }));
 
 (window as any).ResizeObserver = class ResizeObserver {
@@ -21,27 +21,6 @@ jest.mock('../../../hooks/useDimensions', () => ({
 describe('<FeedCarousel />', () => {
   let store: any;
 
-  describe('with "carousel" disabled', () => {
-    beforeEach(() => {
-      store = {
-        instance: {
-          version: '2.7.2 (compatible; Pleroma 2.4.52-1337-g4779199e.gleasonator+soapbox)',
-          pleroma: ImmutableMap({
-            metadata: ImmutableMap({
-              features: [],
-            }),
-          }),
-        },
-      };
-    });
-
-    it('should render nothing', () => {
-      render(<FeedCarousel />, undefined, store);
-
-      expect(screen.queryAllByTestId('feed-carousel')).toHaveLength(0);
-    });
-  });
-
   describe('with "carousel" enabled', () => {
     beforeEach(() => {
       store = {
@@ -167,15 +146,15 @@ describe('<FeedCarousel />', () => {
         render(<FeedCarousel />, undefined, store);
 
         await waitFor(() => {
-          expect(screen.getByTestId('next-page')).toBeInTheDocument();
+          expect(screen.getByTestId('prev-page')).toHaveAttribute('disabled');
-          expect(screen.queryAllByTestId('prev-page')).toHaveLength(0);
+          expect(screen.getByTestId('next-page')).not.toHaveAttribute('disabled');
         });
 
         await user.click(screen.getByTestId('next-page'));
 
         await waitFor(() => {
-          expect(screen.getByTestId('prev-page')).toBeInTheDocument();
+          expect(screen.getByTestId('prev-page')).not.toHaveAttribute('disabled');
-          expect(screen.queryAllByTestId('next-page')).toHaveLength(0);
+          expect(screen.getByTestId('next-page')).toHaveAttribute('disabled');
         });
       });
     });

app/soapbox/features/feed-filtering/feed-carousel.tsx

@@ -1,5 +1,5 @@
 import classNames from 'clsx';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { replaceHomeTimeline } from 'soapbox/actions/timelines';
@@ -9,7 +9,10 @@ import { Avatar, useCarouselAvatars, useMarkAsSeen } from 'soapbox/queries/carou
 import { Card, HStack, Icon, Stack, Text } from '../../components/ui';
 import PlaceholderAvatar from '../placeholder/components/placeholder-avatar';
 
-const CarouselItem = ({ avatar, seen, onViewed }: { avatar: Avatar, seen: boolean, onViewed: (account_id: string) => void }) => {
+const CarouselItem = React.forwardRef((
+  { avatar, seen, onViewed, onPinned }: { avatar: Avatar, seen: boolean, onViewed: (account_id: string) => void, onPinned?: (avatar: null | Avatar) => void },
+  ref: any,
+) => {
   const dispatch = useAppDispatch();
 
   const markAsSeen = useMarkAsSeen();
@@ -28,7 +31,15 @@ const CarouselItem = ({ avatar, seen, onViewed }: { avatar: Avatar, seen: boolea
 
     if (isSelected) {
       dispatch(replaceHomeTimeline(null, { maxId: null }, () => setLoading(false)));
+
+      if (onPinned) {
+        onPinned(null);
+      }
     } else {
+      if (onPinned) {
+        onPinned(avatar);
+      }
+
       onViewed(avatar.account_id);
       markAsSeen.mutate(avatar.account_id);
       dispatch(replaceHomeTimeline(avatar.account_id, { maxId: null }, () => setLoading(false)));
@@ -37,14 +48,15 @@ const CarouselItem = ({ avatar, seen, onViewed }: { avatar: Avatar, seen: boolea
 
   return (
     <div
+      ref={ref}
       aria-disabled={isFetching}
       onClick={handleClick}
-      className='cursor-pointer'
+      className='cursor-pointer snap-start py-4'
       role='filter-feed-by-user'
       data-testid='carousel-item'
     >
-      <Stack className='w-16 h-auto' space={3}>
+      <Stack className='w-14 h-auto' space={3}>
-        <div className='block mx-auto relative w-14 h-14 rounded-full'>
+        <div className='block mx-auto relative w-12 h-12 rounded-full'>
           {isSelected && (
             <div className='absolute inset-0 bg-primary-600 bg-opacity-50 rounded-full flex items-center justify-center'>
               <Icon src={require('@tabler/icons/check.svg')} className='text-white h-6 w-6' />
@@ -54,7 +66,7 @@ const CarouselItem = ({ avatar, seen, onViewed }: { avatar: Avatar, seen: boolea
           <img
             src={avatar.account_avatar}
             className={classNames({
-              'w-14 h-14 min-w-[56px] rounded-full ring-2 ring-offset-4 dark:ring-offset-primary-900': true,
+              'w-12 h-12 min-w-[48px] rounded-full ring-2 ring-offset-4 dark:ring-offset-primary-900': true,
               'ring-transparent': !isSelected && seen,
               'ring-primary-600': isSelected,
               'ring-accent-500': !seen && !isSelected,
@@ -68,19 +80,30 @@ const CarouselItem = ({ avatar, seen, onViewed }: { avatar: Avatar, seen: boolea
       </Stack>
     </div>
   );
-};
+});
 
 const FeedCarousel = () => {
-  const { data: avatars, isFetching, isError } = useCarouselAvatars();
+  const { data: avatars, isFetching, isFetched, isError } = useCarouselAvatars();
 
-  const [cardRef, setCardRef, { width }] = useDimensions();
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const [_ref, setContainerRef, { width }] = useDimensions();
 
   const [seenAccountIds, setSeenAccountIds] = useState<string[]>([]);
   const [pageSize, setPageSize] = useState<number>(0);
   const [currentPage, setCurrentPage] = useState<number>(1);
+  const [pinnedAvatar, setPinnedAvatar] = useState<Avatar | null>(null);
+
+  const avatarsToList = useMemo(() => {
+    const list = avatars.filter((avatar) => avatar.account_id !== pinnedAvatar?.account_id);
+    if (pinnedAvatar) {
+      return [null, ...list];
+    }
+
+    return list;
+  }, [avatars, pinnedAvatar]);
 
   const numberOfPages = Math.ceil(avatars.length / pageSize);
-  const widthPerAvatar = (cardRef?.scrollWidth || 0) / avatars.length;
+  const widthPerAvatar = width / (Math.floor(width / 80));
 
   const hasNextPage = currentPage < numberOfPages && numberOfPages > 1;
   const hasPrevPage = currentPage > 1 && numberOfPages > 1;
@@ -118,67 +141,104 @@ const FeedCarousel = () => {
     );
   }
 
-  if (avatars.length === 0) {
+  if (isFetched && avatars.length === 0) {
     return null;
   }
 
   return (
-    <Card variant='rounded' size='lg' className='relative' data-testid='feed-carousel'>
+    <div
-      <div>
+      className='rounded-xl bg-white dark:bg-primary-900 shadow-lg dark:shadow-none overflow-hidden'
-        {hasPrevPage && (
+      data-testid='feed-carousel'
-          <div>
+    >
-            <div className='z-10 absolute left-5 top-1/2 -mt-4'>
+      <HStack alignItems='stretch'>
-              <button
+        <div className='z-10 rounded-l-xl bg-white dark:bg-gray-900 w-8 flex self-stretch items-center justify-center'>
-                data-testid='prev-page'
+          <button
-                onClick={handlePrevPage}
+            data-testid='prev-page'
-                className='bg-white/50 dark:bg-gray-900/50 backdrop-blur rounded-full h-8 w-8 flex items-center justify-center'
+            onClick={handlePrevPage}
-              >
+            className='h-7 w-7 flex items-center justify-center disabled:opacity-25 transition-opacity duration-500'
-                <Icon src={require('@tabler/icons/chevron-left.svg')} className='text-black dark:text-white h-6 w-6' />
+            disabled={!hasPrevPage}
-              </button>
+          >
-            </div>
+            <Icon src={require('@tabler/icons/chevron-left.svg')} className='text-black dark:text-white h-5 w-5' />
-          </div>
+          </button>
-        )}
+        </div>
 
-        <HStack
+        <div className='overflow-hidden relative'>
-          alignItems='center'
+          {pinnedAvatar ? (
-          space={8}
+            <div
-          className='z-0 flex transition-all duration-200 ease-linear scroll'
+              className='z-10 flex items-center justify-center absolute left-0 top-0 bottom-0 bg-white dark:bg-primary-900'
-          style={{ transform: `translateX(-${(currentPage - 1) * 100}%)` }}
+              style={{
-          ref={setCardRef}
+                width: widthPerAvatar,
-        >
+              }}
-          {isFetching ? (
+            >
-            new Array(pageSize).fill(0).map((_, idx) => (
-              <div className='w-16 text-center' key={idx}>
-                <PlaceholderAvatar size={56} withText />
-              </div>
-            ))
-          ) : (
-            avatars.map((avatar) => (
               <CarouselItem
-                key={avatar.account_id}
+                avatar={pinnedAvatar}
-                avatar={avatar}
+                seen={seenAccountIds?.includes(pinnedAvatar.account_id)}
-                seen={seenAccountIds?.includes(avatar.account_id)}
                 onViewed={markAsSeen}
+                onPinned={(avatar) => setPinnedAvatar(avatar)}
               />
-            ))
-          )}
-        </HStack>
-
-        {hasNextPage && (
-          <div>
-            <div className='z-10 absolute right-5 top-1/2 -mt-4'>
-              <button
-                data-testid='next-page'
-                onClick={handleNextPage}
-                className='bg-white/50 dark:bg-gray-900/50 backdrop-blur rounded-full h-8 w-8 flex items-center justify-center'
-              >
-                <Icon src={require('@tabler/icons/chevron-right.svg')} className='text-black dark:text-white h-6 w-6' />
-              </button>
             </div>
-          </div>
+          ) : null}
-        )}
+
-      </div>
+          <HStack
-    </Card>
+            alignItems='center'
+            style={{
+              transform: `translateX(-${(currentPage - 1) * 100}%)`,
+            }}
+            className='transition-all ease-out duration-500'
+            ref={setContainerRef}
+          >
+            {isFetching ? (
+              new Array(20).fill(0).map((_, idx) => (
+                <div className='flex flex-shrink-0 justify-center' style={{ width: widthPerAvatar }} key={idx}>
+                  <PlaceholderAvatar size={56} withText />
+                </div>
+              ))
+            ) : (
+              avatarsToList.map((avatar: any, index) => (
+                <div
+                  key={avatar?.account_id || index}
+                  className='flex flex-shrink-0 justify-center'
+                  style={{
+                    width: widthPerAvatar,
+                  }}
+                >
+                  {avatar === null ? (
+                    <Stack className='w-14 snap-start py-4 h-auto' space={3}>
+                      <div className='block mx-auto relative w-16 h-16 rounded-full'>
+                        <div className='w-16 h-16' />
+                      </div>
+                    </Stack>
+                  ) : (
+                    <CarouselItem
+                      avatar={avatar}
+                      seen={seenAccountIds?.includes(avatar.account_id)}
+                      onPinned={(avatar) => {
+                        setPinnedAvatar(null);
+                        setTimeout(() => {
+                          setPinnedAvatar(avatar);
+                        }, 1);
+                      }}
+                      onViewed={markAsSeen}
+                    />
+                  )}
+                </div>
+              ))
+            )}
+          </HStack>
+        </div>
+
+        <div className='z-10 rounded-r-xl bg-white dark:bg-gray-900 w-8 self-stretch flex items-center justify-center'>
+          <button
+            data-testid='next-page'
+            onClick={handleNextPage}
+            className='h-7 w-7 flex items-center justify-center disabled:opacity-25 transition-opacity duration-500'
+            disabled={!hasNextPage}
+          >
+            <Icon src={require('@tabler/icons/chevron-right.svg')} className='text-black dark:text-white h-5 w-5' />
+          </button>
+        </div>
+      </HStack>
+    </div>
   );
 };
 

app/soapbox/features/placeholder/components/placeholder-avatar.tsx

@@ -21,14 +21,14 @@ const PlaceholderAvatar: React.FC<IPlaceholderAvatar> = ({ size, withText = fals
   }, [size]);
 
   return (
-    <Stack space={3} className='animate-pulse text-center'>
+    <Stack space={2} className='animate-pulse text-center py-3'>
       <div
         className='block mx-auto rounded-full bg-primary-50 dark:bg-primary-800'
         style={style}
       />
 
       {withText && (
-        <div style={{ width: size, height: 20 }} className='rounded-full bg-primary-50 dark:bg-primary-800' />
+        <div style={{ width: size, height: 15 }} className='mx-auto rounded-full bg-primary-50 dark:bg-primary-800' />
       )}
     </Stack>
   );

app/soapbox/features/placeholder/components/placeholder-media-gallery.tsx

@@ -29,7 +29,7 @@ const PlaceholderMediaGallery: React.FC<IPlaceholderMediaGallery> = ({ media, de
     let itemsDimensions: Record<string, string>[] = [];
 
     if (size === 1) {
-      style.height = width;
+      style.height = width! * 9 / 16;
 
       itemsDimensions = [
         { w: '100%', h: '100%' },

app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx

@@ -20,7 +20,12 @@ interface IScheduledStatus {
 }
 
 const ScheduledStatus: React.FC<IScheduledStatus> = ({ statusId, ...other }) => {
-  const status = useAppSelector((state) => buildStatus(state, state.scheduled_statuses.get(statusId)!)) as StatusEntity;
+  const status = useAppSelector((state) => {
+    const scheduledStatus = state.scheduled_statuses.get(statusId);
+
+    if (!scheduledStatus) return null;
+    return buildStatus(state, scheduledStatus);
+  }) as StatusEntity | null;
 
   if (!status) return null;
 

app/soapbox/features/settings/index.tsx

@@ -52,7 +52,7 @@ const Settings = () => {
   const isMfaEnabled = mfa.getIn(['settings', 'totp']);
 
   useEffect(() => {
-    dispatch(fetchMfa());
+    if (features.security) dispatch(fetchMfa());
   }, [dispatch]);
 
   if (!account) return null;

app/soapbox/features/status/components/card.tsx

@@ -111,7 +111,7 @@ const Card: React.FC<ICard> = ({
 
     // Constrain to a sane limit
     // https://en.wikipedia.org/wiki/Aspect_ratio_(image)
-    return Math.min(Math.max(1, ratio), 4);
+    return Math.min(Math.max(9 / 16, ratio), 4);
   };
 
   const interactive = card.type !== 'link';

app/soapbox/features/ui/components/floating-action-button.tsx

@@ -27,7 +27,7 @@ const FloatingActionButton: React.FC<IFloatingActionButton> = () => {
       onClick={handleOpenComposeModal}
       className={clsx(
         'p-4 inline-flex items-center border font-medium rounded-full focus:outline-none focus:ring-2 focus:ring-offset-2 appearance-none transition-all',
-        'bg-primary-500 hover:bg-primary-400 dark:hover:bg-primary-600 border-transparent focus:bg-primary-500 text-gray-100 focus:ring-primary-300',
+        'border-transparent bg-secondary-500 hover:bg-secondary-400 focus:bg-secondary-500 text-gray-100 focus:ring-secondary-300',
       )}
       aria-label={intl.formatMessage(messages.publish)}
     >

app/soapbox/features/ui/components/modals/media-modal.tsx

@@ -13,7 +13,7 @@ import Video from 'soapbox/features/video';
 import ImageLoader from '../image-loader';
 
 import type { List as ImmutableList } from 'immutable';
-import type { Account, Attachment, Status } from 'soapbox/types/entities';
+import type { Attachment, Status } from 'soapbox/types/entities';
 
 const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
@@ -24,7 +24,6 @@ const messages = defineMessages({
 interface IMediaModal {
   media: ImmutableList<Attachment>,
   status?: Status,
-  account: Account,
   index: number,
   time?: number,
   onClose: () => void,
@@ -34,7 +33,6 @@ const MediaModal: React.FC<IMediaModal> = (props) => {
   const {
     media,
     status,
-    account,
     onClose,
     time = 0,
   } = props;
@@ -94,9 +92,9 @@ const MediaModal: React.FC<IMediaModal> = (props) => {
   };
 
   const handleStatusClick: React.MouseEventHandler = e => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+    if (status && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
-      history.push(`/@${account.acct}/posts/${status?.id}`);
+      history.push(`/@${status.getIn(['account', 'acct'])}/posts/${status?.id}`);
       onClose();
     }
   };
@@ -170,7 +168,7 @@ const MediaModal: React.FC<IMediaModal> = (props) => {
     const width  = (attachment.meta.getIn(['original', 'width']) || undefined) as number | undefined;
     const height = (attachment.meta.getIn(['original', 'height']) || undefined) as number | undefined;
 
-    const link = (status && account && (
+    const link = (status && (
       <a href={status.url} onClick={handleStatusClick}>
         <FormattedMessage id='lightbox.view_context' defaultMessage='View context' />
       </a>

app/soapbox/features/ui/components/profile-media-panel.tsx

@@ -31,7 +31,7 @@ const ProfileMediaPanel: React.FC<IProfileMediaPanel> = ({ account }) => {
       const media = attachment.getIn(['status', 'media_attachments']) as ImmutableList<Attachment>;
       const index = media.findIndex(x => x.id === attachment.id);
 
-      dispatch(openModal('MEDIA', { media, index, status: attachment.status, account: attachment.account }));
+      dispatch(openModal('MEDIA', { media, index, status: attachment.status }));
     }
   };
 

app/soapbox/load-polyfills.ts

@@ -28,15 +28,13 @@ function loadPolyfills() {
     window.Symbol
   );
 
-  // Latest version of Firefox and Safari do not have IntersectionObserver.
+  // Older versions of Firefox and Safari do not have IntersectionObserver.
-  // Edge does not have requestIdleCallback and object-fit CSS property.
   // This avoids shipping them all the polyfills.
   const needsExtraPolyfills = !(
     window.IntersectionObserver &&
     window.IntersectionObserverEntry &&
     'isIntersecting' in IntersectionObserverEntry.prototype &&
-    window.requestIdleCallback &&
+    window.requestIdleCallback
-    'object-fit' in (new Image()).style
   );
 
   return Promise.all([

app/soapbox/locales/en.json

@@ -110,12 +110,15 @@
   "admin.reports.empty_message": "There are no open reports. If a user gets reported, they will show up here.",
   "admin.reports.report_closed_message": "Report on @{name} was closed",
   "admin.reports.report_title": "Report on {acct}",
+  "admin.software.backend": "Backend",
+  "admin.software.frontend": "Frontend",
   "admin.statuses.actions.delete_status": "Delete post",
   "admin.statuses.actions.mark_status_not_sensitive": "Mark post not sensitive",
   "admin.statuses.actions.mark_status_sensitive": "Mark post sensitive",
   "admin.statuses.status_deleted_message": "Post by @{acct} was deleted",
   "admin.statuses.status_marked_message_not_sensitive": "Post by @{acct} was marked not sensitive",
   "admin.statuses.status_marked_message_sensitive": "Post by @{acct} was marked sensitive",
+  "admin.theme.title": "Theme",
   "admin.user_index.empty": "No users found.",
   "admin.user_index.search_input_placeholder": "Who are you looking for?",
   "admin.users.actions.deactivate_user": "Deactivate @{name}",
@@ -147,7 +150,6 @@
   "alert.unexpected.links.support": "Support",
   "alert.unexpected.message": "Something went wrong.",
   "alert.unexpected.return_home": "Return Home",
-  "alert.unexpected.title": "Oops!",
   "aliases.account.add": "Create alias",
   "aliases.account_label": "Old account:",
   "aliases.aliases_list_delete": "Unlink alias",
@@ -186,19 +188,78 @@
   "bundle_modal_error.message": "Something went wrong while loading this modal.",
   "bundle_modal_error.retry": "Try again",
   "card.back.label": "Back",
-  "chat_box.actions.send": "Send",
+  "chat.actions.send": "Send",
-  "chat_box.input.placeholder": "Send a message…",
+  "chat.failed_to_send": "Message failed to send.",
-  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat.input.placeholder": "Type a message",
-  "chat_panels.main_window.title": "Chats",
+  "chat.page_settings.accepting_messages.label": "Allow users to start a new chat with you",
-  "chat_window.close": "Close chat",
+  "chat.page_settings.play_sounds.label": "Play a sound when you receive a message",
+  "chat.page_settings.preferences": "Preferences",
+  "chat.page_settings.privacy": "Privacy",
+  "chat.page_settings.submit": "Save",
+  "chat.page_settings.title": "Message Settings",
+  "chat.retry": "Retry?",
+  "chat.welcome.accepting_messages.label": "Allow users to start a new chat with you",
+  "chat.welcome.notice": "You can change these settings later.",
+  "chat.welcome.submit": "Save & Continue",
+  "chat.welcome.subtitle": "Exchange direct messages with other users.",
+  "chat.welcome.title": "Welcome to {br} Chats!",
+  "chat_composer.unblock": "Unblock",
+  "chat_list_item.blocked_you": "This user has blocked you",
+  "chat_list_item.blocking": "You have blocked this user",
+  "chat_message_list.blocked": "You blocked this user",
+  "chat_message_list.blockedBy": "You are blocked by",
+  "chat_message_list.network_failure.action": "Try again",
+  "chat_message_list.network_failure.subtitle": "We encountered a network failure.",
+  "chat_message_list.network_failure.title": "Whoops!",
+  "chat_message_list_intro.actions.accept": "Accept",
+  "chat_message_list_intro.actions.leave_chat": "Leave chat",
+  "chat_message_list_intro.actions.message_lifespan": "Messages older than {day} days are deleted.",
+  "chat_message_list_intro.actions.report": "Report",
+  "chat_message_list_intro.intro": "wants to start a chat with you",
+  "chat_message_list_intro.leave_chat.confirm": "Leave Chat",
+  "chat_message_list_intro.leave_chat.heading": "Leave Chat",
+  "chat_message_list_intro.leave_chat.message": "Are you sure you want to leave this chat? Messages will be deleted for you and this chat will be removed from your inbox.",
+  "chat_search.blankslate.body": "Search for someone to chat with.",
+  "chat_search.blankslate.title": "Start a chat",
+  "chat_search.empty_results_blankslate.action": "Message someone",
+  "chat_search.empty_results_blankslate.body": "Try searching for another name.",
+  "chat_search.empty_results_blankslate.title": "No matches found",
+  "chat_search.title": "Messages",
+  "chat_settings.auto_delete.14days": "14 days",
+  "chat_settings.auto_delete.2minutes": "2 minutes",
+  "chat_settings.auto_delete.30days": "30 days",
+  "chat_settings.auto_delete.7days": "7 days",
+  "chat_settings.auto_delete.90days": "90 days",
+  "chat_settings.auto_delete.days": "{day} days",
+  "chat_settings.auto_delete.hint": "Sent messages will auto-delete after the time period selected",
+  "chat_settings.auto_delete.label": "Auto-delete messages",
+  "chat_settings.block.confirm": "Block",
+  "chat_settings.block.heading": "Block @{acct}",
+  "chat_settings.block.message": "Blocking will prevent this profile from direct messaging you and viewing your content. You can unblock later.",
+  "chat_settings.leave.confirm": "Leave Chat",
+  "chat_settings.leave.heading": "Leave Chat",
+  "chat_settings.leave.message": "Are you sure you want to leave this chat? Messages will be deleted for you and this chat will be removed from your inbox.",
+  "chat_settings.options.block_user": "Block @{acct}",
+  "chat_settings.options.leave_chat": "Leave Chat",
+  "chat_settings.options.report_user": "Report @{acct}",
+  "chat_settings.options.unblock_user": "Unblock @{acct}",
+  "chat_settings.title": "Chat Details",
+  "chat_settings.unblock.confirm": "Unblock",
+  "chat_settings.unblock.heading": "Unblock @{acct}",
+  "chat_settings.unblock.message": "Unblocking will allow this profile to direct message you and view your content.",
+  "chat_window.auto_delete_label": "Auto-delete after {day} days",
+  "chat_window.auto_delete_tooltip": "Chat messages are set to auto-delete after {day} days upon sending.",
+  "chats.actions.copy": "Copy",
   "chats.actions.delete": "Delete message",
+  "chats.actions.deleteForMe": "Delete for me",
   "chats.actions.more": "More",
   "chats.actions.report": "Report user",
-  "chats.attachment": "Attachment",
-  "chats.attachment_image": "Image",
-  "chats.audio_toggle_off": "Audio notification off",
-  "chats.audio_toggle_on": "Audio notification on",
   "chats.dividers.today": "Today",
+  "chats.main.blankslate.new_chat": "Message someone",
+  "chats.main.blankslate.subtitle": "Search for someone to chat with",
+  "chats.main.blankslate.title": "No messages yet",
+  "chats.main.blankslate_with_chats.subtitle": "Select from one of your open chats or create a new message.",
+  "chats.main.blankslate_with_chats.title": "Select a chat",
   "chats.search_placeholder": "Start a chat with…",
   "column.admin.awaiting_approval": "Awaiting Approval",
   "column.admin.dashboard": "Dashboard",
@@ -226,6 +287,9 @@
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Hidden domains",
   "column.edit_profile": "Edit profile",
+  "column.event_map": "Event location",
+  "column.event_participants": "Event participants",
+  "column.events": "Events",
   "column.export_data": "Export data",
   "column.familiar_followers": "People you know following {name}",
   "column.favourited_statuses": "Liked posts",
@@ -268,15 +332,14 @@
   "column.pins": "Pinned posts",
   "column.preferences": "Preferences",
   "column.public": "Federated timeline",
+  "column.quotes": "Post quotes",
   "column.reactions": "Reactions",
   "column.reblogs": "Reposts",
-  "column.remote": "Federated timeline",
   "column.scheduled_statuses": "Scheduled Posts",
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
   "column.test": "Test timeline",
-  "column_back_button.label": "Back",
   "column_forbidden.body": "You do not have permission to access this page.",
   "column_forbidden.title": "Forbidden",
   "common.cancel": "Cancel",
@@ -286,7 +349,33 @@
   "compose.edit_success": "Your post was edited",
   "compose.invalid_schedule": "You must schedule a post at least 5 minutes out.",
   "compose.submit_success": "Your post was sent!",
+  "compose_event.create": "Create",
+  "compose_event.edit_success": "Your event was edited",
+  "compose_event.fields.approval_required": "I want to approve participation requests manually",
+  "compose_event.fields.banner_label": "Event banner",
+  "compose_event.fields.description_hint": "Markdown syntax is supported",
+  "compose_event.fields.description_label": "Event description",
+  "compose_event.fields.description_placeholder": "Description",
+  "compose_event.fields.end_time_label": "Event end date",
+  "compose_event.fields.end_time_placeholder": "Event ends on…",
+  "compose_event.fields.has_end_time": "The event has end date",
+  "compose_event.fields.location_label": "Event location",
+  "compose_event.fields.name_label": "Event name",
+  "compose_event.fields.name_placeholder": "Name",
+  "compose_event.fields.start_time_label": "Event start date",
+  "compose_event.fields.start_time_placeholder": "Event begins on…",
+  "compose_event.participation_requests.authorize": "Authorize",
+  "compose_event.participation_requests.authorize_success": "User accepted",
+  "compose_event.participation_requests.reject": "Reject",
+  "compose_event.participation_requests.reject_success": "User rejected",
+  "compose_event.reset_location": "Reset location",
+  "compose_event.submit_success": "Your event was created",
+  "compose_event.tabs.edit": "Edit details",
+  "compose_event.tabs.pending": "Manage requests",
+  "compose_event.update": "Update",
+  "compose_event.upload_banner": "Upload event banner",
   "compose_form.direct_message_warning": "This post will only be sent to the mentioned users.",
+  "compose_form.event_placeholder": "Post to this event",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
@@ -342,15 +431,22 @@
   "confirmations.cancel_editing.confirm": "Cancel editing",
   "confirmations.cancel_editing.heading": "Cancel post editing",
   "confirmations.cancel_editing.message": "Are you sure you want to cancel editing this post? All changes will be lost.",
+  "confirmations.cancel_event_editing.heading": "Cancel event editing",
+  "confirmations.cancel_event_editing.message": "Are you sure you want to cancel editing this event? All changes will be lost.",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.heading": "Delete post",
   "confirmations.delete.message": "Are you sure you want to delete this post?",
+  "confirmations.delete_event.confirm": "Delete",
+  "confirmations.delete_event.heading": "Delete event",
+  "confirmations.delete_event.message": "Are you sure you want to delete this event?",
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.heading": "Delete list",
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
   "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.heading": "Block {domain}",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications.",
+  "confirmations.leave_event.confirm": "Leave event",
+  "confirmations.leave_event.message": "If you want to rejoin the event, the request will be manually reviewed again. Are you sure you want to proceed?",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.heading": "Mute @{name}",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
@@ -400,6 +496,7 @@
   "developers.navigation.network_error_label": "Network error",
   "developers.navigation.service_worker_label": "Service Worker",
   "developers.navigation.settings_store_label": "Settings store",
+  "developers.navigation.show_toast": "Trigger Toast",
   "developers.navigation.test_timeline_label": "Test timeline",
   "developers.settings_store.advanced": "Advanced settings",
   "developers.settings_store.hint": "It is possible to directly edit your user settings here. BE CAREFUL! Editing this section can break your account, and you will only be able to recover through the API.",
@@ -498,6 +595,8 @@
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
+  "empty_column.event_participant_requests": "There are no pending event participation requests.",
+  "empty_column.event_participants": "No one joined this event yet. When someone does, they will show up here.",
   "empty_column.favourited_statuses": "You don't have any liked posts yet. When you like one, it will show up here.",
   "empty_column.favourites": "No one has liked this post yet. When someone does, they will show up here.",
   "empty_column.filters": "You haven't created any muted words yet.",
@@ -514,12 +613,36 @@
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
   "empty_column.notifications_filtered": "You don't have any notifications of this type yet.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "empty_column.quotes": "This post has not been quoted yet.",
   "empty_column.remote": "There is nothing here! Manually follow users from {instance} to fill it up.",
   "empty_column.scheduled_statuses": "You don't have any scheduled statuses yet. When you add one, it will show up here.",
   "empty_column.search.accounts": "There are no people results for \"{term}\"",
   "empty_column.search.hashtags": "There are no hashtags results for \"{term}\"",
   "empty_column.search.statuses": "There are no posts results for \"{term}\"",
   "empty_column.test": "The test timeline is empty.",
+  "event.banner": "Event banner",
+  "event.copy": "Copy link to event",
+  "event.date": "Date",
+  "event.description": "Description",
+  "event.discussion.empty": "No one has commented this event yet. When someone does, they will appear here.",
+  "event.export_ics": "Export to your calendar",
+  "event.external": "View event on {domain}",
+  "event.join_state.accept": "Going",
+  "event.join_state.empty": "Participate",
+  "event.join_state.pending": "Pending",
+  "event.join_state.rejected": "Going",
+  "event.location": "Location",
+  "event.manage": "Manage",
+  "event.organized_by": "Organized by {name}",
+  "event.participants": "{count} {rawCount, plural, one {person} other {people}} going",
+  "event.show_on_map": "Show on map",
+  "event.website": "External links",
+  "event_map.navigate": "Navigate",
+  "events.create_event": "Create event",
+  "events.joined_events": "Joined events",
+  "events.joined_events.empty": "You haven't joined any event yet.",
+  "events.recent_events": "Recent events",
+  "events.recent_events.empty": "There are no public events yet.",
   "export_data.actions.export": "Export",
   "export_data.actions.export_blocks": "Export blocks",
   "export_data.actions.export_follows": "Export follows",
@@ -600,6 +723,12 @@
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "join_event.hint": "You can tell the organizer why do you want to participate in this event:",
+  "join_event.join": "Request join",
+  "join_event.placeholder": "Message to organizer",
+  "join_event.request_success": "Requested to join the event",
+  "join_event.success": "Joined the event",
+  "join_event.title": "Join event",
   "keyboard_shortcuts.back": "to navigate back",
   "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "to repost",
@@ -648,6 +777,7 @@
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
   "loading_indicator.label": "Loading…",
+  "location_search.placeholder": "Find an address",
   "login.fields.instance_label": "Instance",
   "login.fields.instance_placeholder": "example.com",
   "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
@@ -696,6 +826,8 @@
   "missing_description_modal.text": "You have not entered a description for all attachments. Continue anyway?",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
+  "modals.policy.submit": "Accept & Continue",
+  "modals.policy.updateTitle": "You’ve scored the latest version of {siteTitle}! Take a moment to review the exciting new things we’ve been working on.",
   "moderation_overlay.contact": "Contact",
   "moderation_overlay.hide": "Hide content",
   "moderation_overlay.show": "Show Content",
@@ -722,8 +854,10 @@
   "navigation_bar.compose": "Compose a post",
   "navigation_bar.compose_direct": "Direct message",
   "navigation_bar.compose_edit": "Edit post",
+  "navigation_bar.compose_event": "Manage event",
   "navigation_bar.compose_quote": "Quote post",
   "navigation_bar.compose_reply": "Reply to post",
+  "navigation_bar.create_event": "Create new event",
   "navigation_bar.domain_blocks": "Domain blocks",
   "navigation_bar.favourites": "Likes",
   "navigation_bar.filters": "Filters",
@@ -746,6 +880,9 @@
   "notification.others": " + {count} {count, plural, one {other} other {others}}",
   "notification.pleroma:chat_mention": "{name} sent you a message",
   "notification.pleroma:emoji_reaction": "{name} reacted to your post",
+  "notification.pleroma:event_reminder": "An event you are participating in starts soon",
+  "notification.pleroma:participation_accepted": "You were accepted to join the event",
+  "notification.pleroma:participation_request": "{name} wants to join your event",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} reposted your post",
   "notification.status": "{name} just posted",
@@ -819,6 +956,8 @@
   "preferences.fields.content_type_label": "Default post format",
   "preferences.fields.delete_modal_label": "Show confirmation dialog before deleting a post",
   "preferences.fields.demetricator_label": "Use Demetricator",
+  "preferences.fields.demo_hint": "Use the default Soapbox logo and color scheme. Useful for taking screenshots.",
+  "preferences.fields.demo_label": "Demo mode",
   "preferences.fields.display_media.default": "Hide posts marked as sensitive",
   "preferences.fields.display_media.hide_all": "Always hide posts",
   "preferences.fields.display_media.show_all": "Always show posts",
@@ -834,7 +973,6 @@
   "preferences.fields.underline_links_label": "Always underline links in posts",
   "preferences.fields.unfollow_modal_label": "Show confirmation dialog before unfollowing someone",
   "preferences.hints.demetricator": "Decrease social media anxiety by hiding all numbers from the site.",
-  "preferences.hints.feed": "In your home feed",
   "preferences.notifications.advanced": "Show all notification categories",
   "preferences.options.content_type_markdown": "Markdown",
   "preferences.options.content_type_plaintext": "Plain text",
@@ -907,6 +1045,8 @@
   "remote_instance.unpin_host": "Unpin {host}",
   "remote_interaction.account_placeholder": "Enter your username@domain you want to act from",
   "remote_interaction.divider": "or",
+  "remote_interaction.event_join": "Proceed to join",
+  "remote_interaction.event_join_title": "Join an event remotely",
   "remote_interaction.favourite": "Proceed to like",
   "remote_interaction.favourite_title": "Like a post remotely",
   "remote_interaction.follow": "Proceed to follow",
@@ -928,6 +1068,8 @@
   "reply_mentions.reply_empty": "Replying to post",
   "report.block": "Block {target}",
   "report.block_hint": "Do you also want to block this account?",
+  "report.chatMessage.context": "When reporting a user’s message, the five messages before and five messages after the one selected will be passed along to our moderation team for context.",
+  "report.chatMessage.title": "Report message",
   "report.confirmation.content": "If we find that this account is violating the {link} we will take further action on the matter.",
   "report.confirmation.title": "Thanks for submitting your report.",
   "report.done": "Done",
@@ -989,6 +1131,7 @@
   "settings.configure_mfa": "Configure MFA",
   "settings.delete_account": "Delete Account",
   "settings.edit_profile": "Edit Profile",
+  "settings.messages.label": "Allow users to start a new chat with you",
   "settings.other": "Other options",
   "settings.preferences": "Preferences",
   "settings.profile": "Profile",
@@ -1016,7 +1159,6 @@
   "sms_verification.sent.body": "We sent you a 6-digit code via SMS. Enter it below.",
   "sms_verification.sent.header": "Verification code",
   "sms_verification.success": "A verification code has been sent to your phone number.",
-  "toast.view": "View",
   "soapbox_config.authenticated_profile_hint": "Users must be logged-in to view replies and media on user profiles.",
   "soapbox_config.authenticated_profile_label": "Profiles require authentication",
   "soapbox_config.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
@@ -1029,9 +1171,8 @@
   "soapbox_config.display_fqn_label": "Display domain (eg @user@domain) for local accounts.",
   "soapbox_config.feed_injection_hint": "Inject the feed with additional content, such as suggested profiles.",
   "soapbox_config.feed_injection_label": "Feed injection",
-  "soapbox_config.fields.accent_color_label": "Accent color",
-  "soapbox_config.fields.brand_color_label": "Brand color",
   "soapbox_config.fields.crypto_addresses_label": "Cryptocurrency addresses",
+  "soapbox_config.fields.edit_theme_label": "Edit theme",
   "soapbox_config.fields.home_footer_fields_label": "Home footer items",
   "soapbox_config.fields.logo_label": "Logo",
   "soapbox_config.fields.promo_panel_fields_label": "Promo panel items",
@@ -1039,6 +1180,7 @@
   "soapbox_config.greentext_label": "Enable greentext support",
   "soapbox_config.headings.advanced": "Advanced",
   "soapbox_config.headings.cryptocurrency": "Cryptocurrency",
+  "soapbox_config.headings.events": "Events",
   "soapbox_config.headings.navigation": "Navigation",
   "soapbox_config.headings.options": "Options",
   "soapbox_config.headings.theme": "Theme",
@@ -1060,6 +1202,8 @@
   "soapbox_config.single_user_mode_label": "Single user mode",
   "soapbox_config.single_user_mode_profile_hint": "@handle",
   "soapbox_config.single_user_mode_profile_label": "Main user handle",
+  "soapbox_config.tile_server_attribution_label": "Map tiles attribution",
+  "soapbox_config.tile_server_label": "Map tile server",
   "soapbox_config.verified_can_edit_name_label": "Allow verified users to edit their own display name.",
   "sponsored.info.message": "{siteTitle} displays ads to help fund our service.",
   "sponsored.info.title": "Why am I seeing this ad?",
@@ -1081,6 +1225,7 @@
   "status.favourite": "Like",
   "status.filtered": "Filtered",
   "status.interactions.favourites": "{count, plural, one {Like} other {Likes}}",
+  "status.interactions.quotes": "{count, plural, one {Quote} other {Quotes}}",
   "status.interactions.reblogs": "{count, plural, one {Repost} other {Reposts}}",
   "status.load_more": "Load more",
   "status.mention": "Mention @{name}",
@@ -1139,7 +1284,6 @@
   "sw.update_text": "An update is available.",
   "sw.url": "Script URL",
   "tabs_bar.all": "All",
-  "tabs_bar.chats": "Chats",
   "tabs_bar.dashboard": "Dashboard",
   "tabs_bar.fediverse": "Fediverse",
   "tabs_bar.home": "Home",
@@ -1149,6 +1293,13 @@
   "tabs_bar.profile": "Profile",
   "tabs_bar.search": "Search",
   "tabs_bar.settings": "Settings",
+  "theme_editor.Reset": "Reset",
+  "theme_editor.export": "Export theme",
+  "theme_editor.import": "Import theme",
+  "theme_editor.import_success": "Theme was successfully imported!",
+  "theme_editor.restore": "Restore default theme",
+  "theme_editor.save": "Save theme",
+  "theme_editor.saved": "Theme updated!",
   "theme_toggle.dark": "Dark",
   "theme_toggle.light": "Light",
   "theme_toggle.system": "System",
@@ -1161,10 +1312,10 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
   "time_remaining.moments": "Moments remaining",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+  "toast.view": "View",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
   "trends.title": "Trends",
   "trendsPanel.viewAll": "View all",
-  "ui.beforeunload": "Your draft will be lost if you leave.",
   "unauthorized_modal.text": "You need to be logged in to do that.",
   "unauthorized_modal.title": "Sign up for {site_title}",
   "upload_area.title": "Drag & drop to upload",

app/soapbox/normalizers/instance.ts

@@ -112,6 +112,17 @@ const fixAkkoma = (instance: ImmutableMap<string, any>) => {
   }
 };
 
+/** Set Takahe version to a Pleroma-like string */
+const fixTakahe = (instance: ImmutableMap<string, any>) => {
+  const version: string = instance.get('version', '');
+
+  if (version.startsWith('takahe/')) {
+    return instance.set('version', `0.0.0 (compatible; Takahe ${version.slice(7)})`);
+  } else {
+    return instance;
+  }
+};
+
 // Normalize instance (Pleroma, Mastodon, etc.) to Mastodon's format
 export const normalizeInstance = (instance: Record<string, any>) => {
   return InstanceRecord(
@@ -131,6 +142,7 @@ export const normalizeInstance = (instance: Record<string, any>) => {
 
       // Normalize version
       normalizeVersion(instance);
+      fixTakahe(instance);
       fixAkkoma(instance);
 
       // Merge defaults

app/soapbox/queries/__tests__/chats.test.ts

@@ -178,7 +178,8 @@ describe('useChats', () => {
 
   describe('with a successful request', () => {
     beforeEach(() => {
-      store = mockStore(rootState);
+      const state = rootState.setIn(['instance', 'version'], '2.7.2 (compatible; Pleroma 2.2.0)');
+      store = mockStore(state);
 
       __stub((mock) => {
         mock.onGet('/api/v1/pleroma/chats')
@@ -378,4 +379,4 @@ describe('useChatActions', () => {
       expect((nextQueryData as any).message_expiration).toBe(1200);
     });
   });
-});
+});

app/soapbox/queries/chats.ts

@@ -157,6 +157,7 @@ const useChats = (search?: string) => {
 
   const queryInfo = useInfiniteQuery(ChatKeys.chatSearch(search), ({ pageParam }) => getChats(pageParam), {
     keepPreviousData: true,
+    enabled: features.chats,
     getNextPageParam: (config) => {
       if (config.hasMore) {
         return { link: config.link };

app/soapbox/reducers/compose.ts

@@ -455,7 +455,7 @@ export default function compose(state = initialState, action: AnyAction) {
     case COMPOSE_POLL_REMOVE:
       return updateCompose(state, action.id, compose => compose.set('poll', null));
     case COMPOSE_SCHEDULE_ADD:
-      return updateCompose(state, action.id, compose => compose.set('schedule', new Date()));
+      return updateCompose(state, action.id, compose => compose.set('schedule', new Date(Date.now() + 10 * 60 * 1000)));
     case COMPOSE_SCHEDULE_SET:
       return updateCompose(state, action.id, compose => compose.set('schedule', action.date));
     case COMPOSE_SCHEDULE_REMOVE:

app/soapbox/reducers/status-lists.ts

@@ -12,6 +12,7 @@ import {
   STATUS_QUOTES_FETCH_REQUEST,
   STATUS_QUOTES_FETCH_SUCCESS,
 } from 'soapbox/actions/status-quotes';
+import { STATUS_CREATE_SUCCESS } from 'soapbox/actions/statuses';
 
 import {
   BOOKMARKED_STATUSES_FETCH_REQUEST,
@@ -66,7 +67,7 @@ import {
 } from '../actions/scheduled-statuses';
 
 import type { AnyAction } from 'redux';
-import type { Status as StatusEntity } from 'soapbox/types/entities';
+import type { APIEntity } from 'soapbox/types/entities';
 
 export const StatusListRecord = ImmutableRecord({
   next: null as string | null,
@@ -77,8 +78,6 @@ export const StatusListRecord = ImmutableRecord({
 
 type State = ImmutableMap<string, StatusList>;
 type StatusList = ReturnType<typeof StatusListRecord>;
-type Status = string | StatusEntity;
-type Statuses = Array<string | StatusEntity>;
 
 const initialState: State = ImmutableMap({
   favourites: StatusListRecord(),
@@ -89,15 +88,15 @@ const initialState: State = ImmutableMap({
   joined_events: StatusListRecord(),
 });
 
-const getStatusId = (status: string | StatusEntity) => typeof status === 'string' ? status : status.id;
+const getStatusId = (status: string | APIEntity) => typeof status === 'string' ? status : status.id;
 
-const getStatusIds = (statuses: Statuses = []) => (
+const getStatusIds = (statuses: APIEntity[] = []) => (
   ImmutableOrderedSet(statuses.map(getStatusId))
 );
 
 const setLoading = (state: State, listType: string, loading: boolean) => state.setIn([listType, 'isLoading'], loading);
 
-const normalizeList = (state: State, listType: string, statuses: Statuses, next: string | null) => {
+const normalizeList = (state: State, listType: string, statuses: APIEntity[], next: string | null) => {
   return state.update(listType, StatusListRecord(), listMap => listMap.withMutations(map => {
     map.set('next', next);
     map.set('loaded', true);
@@ -106,7 +105,7 @@ const normalizeList = (state: State, listType: string, statuses: Statuses, next:
   }));
 };
 
-const appendToList = (state: State, listType: string, statuses: Statuses, next: string | null) => {
+const appendToList = (state: State, listType: string, statuses: APIEntity[], next: string | null) => {
   const newIds = getStatusIds(statuses);
 
   return state.update(listType, StatusListRecord(), listMap => listMap.withMutations(map => {
@@ -116,18 +115,23 @@ const appendToList = (state: State, listType: string, statuses: Statuses, next:
   }));
 };
 
-const prependOneToList = (state: State, listType: string, status: Status) => {
+const prependOneToList = (state: State, listType: string, status: APIEntity) => {
   const statusId = getStatusId(status);
   return state.updateIn([listType, 'items'], ImmutableOrderedSet(), items => {
     return ImmutableOrderedSet([statusId]).union(items as ImmutableOrderedSet<string>);
   });
 };
 
-const removeOneFromList = (state: State, listType: string, status: Status) => {
+const removeOneFromList = (state: State, listType: string, status: APIEntity) => {
   const statusId = getStatusId(status);
   return state.updateIn([listType, 'items'], ImmutableOrderedSet(), items => (items as ImmutableOrderedSet<string>).delete(statusId));
 };
 
+const maybeAppendScheduledStatus = (state: State, status: APIEntity) => {
+  if (!status.scheduled_at) return state;
+  return prependOneToList(state, 'scheduled_statuses', getStatusId(status));
+};
+
 export default function statusLists(state = initialState, action: AnyAction) {
   switch (action.type) {
     case FAVOURITED_STATUSES_FETCH_REQUEST:
@@ -209,6 +213,8 @@ export default function statusLists(state = initialState, action: AnyAction) {
       return setLoading(state, 'joined_events', false);
     case JOINED_EVENTS_FETCH_SUCCESS:
       return normalizeList(state, 'joined_events', action.statuses, action.next);
+    case STATUS_CREATE_SUCCESS:
+      return maybeAppendScheduledStatus(state, action.status);
     default:
       return state;
   }

app/soapbox/utils/features.ts

@@ -64,6 +64,12 @@ export const GLITCH = 'glitch';
  */
 export const AKKOMA = 'akkoma';
 
+/**
+ * Takahē, backend with support for serving multiple domains.
+ * @see {@link https://jointakahe.org/}
+ */
+export const TAKAHE = 'Takahe';
+
 /** Parse features for the given instance */
 const getInstanceFeatures = (instance: Instance) => {
   const v = parseVersion(instance.version);
@@ -288,6 +294,7 @@ const getInstanceFeatures = (instance: Instance) => {
       v.software === MASTODON && gte(v.compatVersion, '2.6.0'),
       v.software === PLEROMA && gte(v.version, '0.9.9'),
       v.software === PIXELFED,
+      v.software === TAKAHE,
     ]),
 
     /**
@@ -299,6 +306,14 @@ const getInstanceFeatures = (instance: Instance) => {
       v.software === PLEROMA && gte(v.version, '0.9.9'),
     ]),
 
+    editProfile: any([
+      v.software === MASTODON,
+      v.software === MITRA,
+      v.software === PIXELFED,
+      v.software === PLEROMA,
+      v.software === TRUTHSOCIAL,
+    ]),
+
     editStatuses: any([
       v.software === MASTODON && gte(v.version, '3.5.0'),
       features.includes('editing'),
@@ -574,6 +589,7 @@ const getInstanceFeatures = (instance: Instance) => {
     publicTimeline: any([
       v.software === MASTODON,
       v.software === PLEROMA,
+      v.software === TAKAHE,
     ]),
 
     /**

app/soapbox/utils/media-aspect-ratio.ts

@@ -1,4 +1,4 @@
-export const minimumAspectRatio = 1; // Square
+export const minimumAspectRatio = 9 / 16; // Portrait phone
 export const maximumAspectRatio = 10; // Generous min-height
 
 export const isPanoramic = (ar: number) => {

app/styles/application.scss

@@ -34,7 +34,6 @@
 @import 'components/modal';
 @import 'components/account-header';
 @import 'components/compose-form';
-@import 'components/sidebar-menu';
 @import 'components/emoji-reacts';
 @import 'components/status';
 @import 'components/reply-mentions';

app/styles/components/sidebar-menu.scss

@@ -1,17 +0,0 @@
-.sidebar-menu {
-  @apply flex inset-0 fixed flex-col w-80 bg-white dark:bg-primary-900 transition-all ease-linear -translate-x-80 rtl:translate-x-80 z-1000;
-
-  @media (max-width: 400px) {
-    @apply w-[90vw] -translate-x-[90vw] rtl:translate-x-[90vw];
-  }
-
-  hr {
-    @apply border-gray-200 dark:border-gray-700;
-  }
-}
-
-.sidebar-menu__root--visible {
-  .sidebar-menu {
-    transform: translateX(0);
-  }
-}

jsdoc.conf.js

@@ -1,31 +0,0 @@
-'use strict';
-
-const { join } = require('path');
-
-const {
-  FE_BUILD_DIR,
-  FE_SUBDIRECTORY,
-} = require(join(__dirname, 'app', 'soapbox', 'build-config'));
-
-module.exports = {
-  plugins: [],
-  recurseDepth: 10,
-  opts: {
-    destination: join(__dirname, FE_BUILD_DIR, FE_SUBDIRECTORY, 'jsdoc'),
-    recurse: true,
-  },
-  source: {
-    include: join(__dirname, 'app'),
-    includePattern: '.+\\.js(doc|x)?$',
-    excludePattern: '(^|\\/|\\\\)_',
-  },
-  sourceType: 'module',
-  tags: {
-    allowUnknownTags: true,
-    dictionaries: ['jsdoc', 'closure'],
-  },
-  templates: {
-    cleverLinks: false,
-    monospaceLinks: false,
-  },
-};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "soapbox",
   "displayName": "Soapbox",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Soapbox frontend for the Fediverse.",
   "homepage": "https://soapbox.pub/",
   "repository": {
@@ -19,8 +19,8 @@
     "start": "npx webpack-dev-server",
     "dev": "${npm_execpath} run start",
     "build": "npx webpack",
-    "jsdoc": "npx jsdoc -c jsdoc.conf.js",
+    "audit:fix": "npx yarn-audit-fix",
-    "manage:translations": "npx ts-node ./translationRunner.ts",
+    "manage:translations": "npx ts-node ./scripts/translationRunner.ts",
     "test": "npx cross-env NODE_ENV=test npx jest",
     "test:coverage": "${npm_execpath} run test --coverage",
     "test:all": "${npm_execpath} run test:coverage && ${npm_execpath} run lint",
@@ -79,12 +79,11 @@
     "@types/leaflet": "^1.8.0",
     "@types/lodash": "^4.14.180",
     "@types/object-assign": "^4.0.30",
-    "@types/object-fit-images": "^3.2.3",
     "@types/qrcode.react": "^1.0.2",
     "@types/react-color": "^3.0.6",
     "@types/react-datepicker": "^4.4.2",
     "@types/react-helmet": "^6.1.5",
-    "@types/react-motion": "^0.0.32",
+    "@types/react-motion": "^0.0.33",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-sparklines": "^1.7.2",
     "@types/react-swipeable-views": "^0.13.1",
@@ -119,9 +118,8 @@
     "cssnano": "^5.1.10",
     "detect-passive-events": "^2.0.0",
     "dotenv": "^8.0.0",
-    "emoji-datasource": "5.0.0",
+    "emoji-datasource": "5.0.1",
     "emoji-mart": "npm:emoji-mart-lazyload",
-    "entities": "^3.0.1",
     "es6-symbol": "^3.1.1",
     "escape-html": "^1.0.3",
     "exif-js": "^2.3.0",
@@ -139,7 +137,6 @@
     "intl-messageformat-parser": "^6.0.0",
     "intl-pluralrules": "^1.3.1",
     "is-nan": "^1.2.1",
-    "jsdoc": "~3.6.7",
     "leaflet": "^1.8.0",
     "libphonenumber-js": "^1.10.8",
     "line-awesome": "^1.3.0",
@@ -149,12 +146,10 @@
     "marky": "^1.2.4",
     "mini-css-extract-plugin": "^2.6.0",
     "object-assign": "^4.1.1",
-    "object-fit-images": "^3.2.3",
     "object.values": "^1.1.0",
     "path-browserify": "^1.0.1",
     "postcss": "^8.4.14",
     "postcss-loader": "^7.0.0",
-    "postcss-object-fit-images": "^1.1.2",
     "process": "^0.11.10",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.1",
@@ -208,7 +203,7 @@
     "webpack": "^5.72.1",
     "webpack-assets-manifest": "^5.1.0",
     "webpack-bundle-analyzer": "^4.5.0",
-    "webpack-cli": "^4.9.2",
+    "webpack-cli": "^5.0.0",
     "webpack-deadcode-plugin": "^0.1.16",
     "webpack-merge": "^5.8.0",
     "wicg-inert": "^3.1.1"
@@ -232,11 +227,11 @@
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-react": "^7.25.1",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "fake-indexeddb": "^3.1.7",
+    "fake-indexeddb": "^4.0.0",
     "husky": "^7.0.2",
     "jest": "^28.1.2",
     "jest-environment-jsdom": "^28.1.2",
-    "jest-junit": "^14.0.0",
+    "jest-junit": "^15.0.0",
     "lint-staged": ">=10",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",
@@ -246,6 +241,9 @@
     "tailwindcss": "^3.2.1",
     "ts-jest": "^28.0.5",
     "webpack-dev-server": "^4.9.1",
-    "yargs": "^16.0.3"
+    "yargs": "^17.6.2"
+  },
+  "resolutions": {
+    "loader-utils": "^2.0.3"
   }
 }

postcss.config.js

@@ -2,7 +2,6 @@ module.exports = ({ env }) => ({
   plugins: {
     tailwindcss: {},
     autoprefixer: {},
-    'postcss-object-fit-images': {},
     cssnano: env === 'production' ? {} : false,
   },
 });

renovate.json

@@ -1,7 +1,10 @@
 {
   "extends": [
     "config:base",
-    ":preserveSemverRanges",
+    ":preserveSemverRanges"
-    ":githubComToken(fJRNKBmV/ypoAx23PI8I+uTGJ22iSA6DERwiz1WGtXHC/imZV0mOyLfNOfVznOq3QbU9FTbuilgq3XfRQzRVMXx2eTe3ZkzzdH3loqfr2m/mt+9/PQygfkcAOJCQ4BE5Mlhfzxt9miBeG9jvm546oBXNjP39W+j4cdOnppBSMrhh2iofEOjXR41GCPDxCcdnr7RGDtWUCtrIYGyoJm2ypUrkRTUFexVAJy8Q7knX2ACZfzP9j+Uol22SEsU/WRZkvIEp60TqPlgvCFld7LECk2BYnDz9qTcSKF1GhfAsgGleSog9Tyfxow+rH1tB4cMxI5qZP0DTmAf+8fNYSgiKDA==)"
+  ],
-  ]
+  "lockFileMaintenance": {
+    "enabled": true
+  },
+  "rebaseWhen": "conflicted"
 }

scripts/translationRunner.ts

@@ -3,6 +3,7 @@ import path from 'path';
 
 import * as parser from 'intl-messageformat-parser';
 import manageTranslations, { readMessageFiles, ExtractedDescriptor } from 'react-intl-translations-manager';
+import yargs from 'yargs';
 
 type Validator = (language: string) => void;
 
@@ -13,7 +14,7 @@ interface LanguageResult {
 
 const RFC5646_REGEXP = /^[a-z]{2,3}(?:-(?:x|[A-Za-z]{2,4}))*$/;
 
-const rootDirectory = path.resolve(__dirname);
+const rootDirectory = path.resolve(__dirname, '..');
 const translationsDirectory = path.resolve(rootDirectory, 'app', 'soapbox', 'locales');
 const messagesDirectory = path.resolve(rootDirectory, 'build', 'messages');
 const availableLanguages = fs.readdirSync(translationsDirectory).reduce((languages, filename) => {
@@ -68,14 +69,15 @@ Available languages:
 ${availableLanguages.join(', ')}
 `;
 
-const { argv } = require('yargs')
+const argv = yargs
   .usage(usage)
   .option('f', {
     alias: 'force',
     default: false,
     describe: 'force using the provided languages. create files if not exists.',
     type: 'boolean',
-  });
+  })
+  .parseSync();
 
 // check if message directory exists
 if (!fs.existsSync(messagesDirectory)) {
@@ -87,7 +89,7 @@ Try to run "yarn build" first`);
 }
 
 // determine the languages list
-const languages: string[] = (argv._.length > 0) ? argv._ : availableLanguages;
+const languages: string[] = (argv._.length > 0) ? argv._.map(String) : availableLanguages;
 
 const validators: Validator[] = [
   testRFC5646,
@@ -105,7 +107,7 @@ manageTranslations({
   messagesDirectory,
   translationsDirectory,
   detectDuplicateIds: false,
-  singleMessagesFile: true,
+  singleMessagesFile: false,
   languages,
   jsonOptions: {
     trailingNewline: true,

webpack/production.ts

@@ -131,6 +131,12 @@ const configuration: Configuration = {
             '/socket',
             '/static',
             '/unsubscribe',
+            '/images',
+            '/favicon.ico',
+            '/favicon.png',
+            '/apple-touch-icon.png',
+            '/browserconfig.xml',
+            '/robots.txt',
           ];
 
           if (backendRoutes.some(path => pathname.startsWith(path)) || pathname.endsWith('/embed')) {

yarn.lock

@@ -491,7 +491,7 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef"
   integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==
 
-"@babel/parser@^7.7.0", "@babel/parser@^7.9.4":
+"@babel/parser@^7.7.0":
   version "7.15.6"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.6.tgz#043b9aa3c303c0722e5377fef9197f4cf1796549"
   integrity sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==
@@ -2707,11 +2707,6 @@
   resolved "https://registry.yarnpkg.com/@types/object-assign/-/object-assign-4.0.30.tgz#8949371d5a99f4381ee0f1df0a9b7a187e07e652"
   integrity sha1-iUk3HVqZ9Dge4PHfCpt6GH4H5lI=
 
-"@types/object-fit-images@^3.2.3":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@types/object-fit-images/-/object-fit-images-3.2.3.tgz#aa17a1cb4ac113ba81ce62f901177c9ccd5194f5"
-  integrity sha512-kpBPy4HIzbM1o3v+DJrK4V5NgUpcUg/ayzjixOVHQNukpdEUYDIaeDrnYJUSemQXWX5mKeEnxDRU1nACAWYnvg==
-
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -2781,10 +2776,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-motion@^0.0.32":
+"@types/react-motion@^0.0.33":
-  version "0.0.32"
+  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@types/react-motion/-/react-motion-0.0.32.tgz#c7355cca054664f1aeadd7388f6890e9355e1783"
+  resolved "https://registry.yarnpkg.com/@types/react-motion/-/react-motion-0.0.33.tgz#c156c400ace995584990344cc0239e41f411f425"
-  integrity sha512-xePjDdhy6/6AX3CUQCeQ2GSF0RwF+lXSpUSrm8tmdUXRf5Ps/dULwouTJ8YHhDvX7WlwYRKZjHXatadz/x3HXA==
+  integrity sha512-R9grd4EwdDBcKKq7Zhszd8ukyy2BLKN6ooNI0V39nUl/sui+m7VI94cdebYemBteoPHmO7J7BZk+cIf+Xnk4TA==
   dependencies:
     "@types/react" "*"
 
@@ -3235,22 +3230,20 @@
     "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.1.1":
+"@webpack-cli/configtest@^2.0.1":
-  version "1.1.1"
+  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f"
-  integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==
+  integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==
 
-"@webpack-cli/info@^1.4.1":
+"@webpack-cli/info@^2.0.1":
-  version "1.4.1"
+  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0"
-  integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==
+  integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==
-  dependencies:
-    envinfo "^7.7.3"
 
-"@webpack-cli/serve@^1.6.1":
+"@webpack-cli/serve@^2.0.1":
-  version "1.6.1"
+  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8"
-  integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==
+  integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -3440,21 +3433,11 @@ ansi-html-community@^0.0.8:
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
 ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -3881,11 +3864,6 @@ before-after-hook@^2.2.0:
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
   integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
 
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -3896,11 +3874,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bluebird@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
 blurhash@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.5.tgz#3034104cd5dce5a3e5caa871ae2f0f1f2d0ab566"
@@ -4112,43 +4085,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001254, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001254, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297, caniuse-lite@^1.0.30001304, caniuse-lite@^1.0.30001317, caniuse-lite@^1.0.30001332, caniuse-lite@^1.0.30001366:
-  version "1.0.30001320"
+  version "1.0.30001441"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz"
-  integrity sha512-MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA==
+  integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==
-
-caniuse-lite@^1.0.30001304, caniuse-lite@^1.0.30001366:
-  version "1.0.30001368"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001368.tgz#c5c06381c6051cd863c45021475434e81936f713"
-  integrity sha512-wgfRYa9DenEomLG/SdWgQxpIyvdtH3NW8Vq+tB6AwR9e56iOIcu1im5F/wNdDf04XlKHXqIx4N8Jo0PemeBenQ==
-
-caniuse-lite@^1.0.30001317:
-  version "1.0.30001325"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz#2b4ad19b77aa36f61f2eaf72e636d7481d55e606"
-  integrity sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ==
-
-caniuse-lite@^1.0.30001332:
-  version "1.0.30001344"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001344.tgz#8a1e7fdc4db9c2ec79a05e9fd68eb93a761888bb"
-  integrity sha512-0ZFjnlCaXNOAYcV7i+TtdKBp0L/3XEU2MF/x6Du1lrh+SRX4IfzIVL4HNJg5pB2PmFb8rszIGyOvsZnqqRoc2g==
-
-catharsis@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121"
-  integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==
-  dependencies:
-    lodash "^4.17.15"
-
-chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
 
 chalk@^2.0.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.2:
   version "2.4.2"
@@ -4305,6 +4245,15 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -4392,7 +4341,7 @@ commander@^2.18.0, commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^7.0.0, commander@^7.2.0:
+commander@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
@@ -4402,6 +4351,11 @@ commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+commander@^9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
+  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
+
 comment-parser@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
@@ -4506,11 +4460,6 @@ core-js@^3.16.2:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.5.tgz#1f82b0de5eece800827a2f59d597509c67650475"
   integrity sha512-7Vh11tujtAZy82da4duVreQysIoO2EvVrur7y6IzZkH1IHPSekuDi8Vuw1+YKjkbfWLRD7Nc9ICQ/sIUDutcyg==
 
-core-js@^3.4:
-  version "3.22.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.2.tgz#3ea0a245b0895fa39d1faa15fe75d91ade504a01"
-  integrity sha512-Z5I2vzDnEIqO2YhELVMFcL1An2CIsFe9Q7byZhs8c/QxummxZlAHw33TUHbIte987LkisOgL0LwQ1P9D6VISnA==
-
 core-js@^3.8.2:
   version "3.23.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.1.tgz#9f9a9255115f62c512db56d567f636da32ca0b78"
@@ -4563,38 +4512,6 @@ css-declaration-sorter@^6.2.2:
   resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz#bfd2f6f50002d6a3ae779a87d3a0c5d5b10e0f02"
   integrity sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==
 
-css-font-size-keywords@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz#854875ace9aca6a8d2ee0d345a44aae9bb6db6cb"
-  integrity sha1-hUh1rOmspqjS7g00WkSq6btttss=
-
-css-font-stretch-keywords@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz#50cee9b9ba031fb5c952d4723139f1e107b54b10"
-  integrity sha1-UM7puboDH7XJUtRyMTnx4Qe1SxA=
-
-css-font-style-keywords@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz#5c3532813f63b4a1de954d13cea86ab4333409e4"
-  integrity sha1-XDUygT9jtKHelU0TzqhqtDM0CeQ=
-
-css-font-weight-keywords@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz#9bc04671ac85bc724b574ef5d3ac96b0d604fd97"
-  integrity sha1-m8BGcayFvHJLV07106yWsNYE/Zc=
-
-css-global-keywords@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/css-global-keywords/-/css-global-keywords-1.0.1.tgz#72a9aea72796d019b1d2a3252de4e5aaa37e4a69"
-  integrity sha1-cqmupyeW0Bmx0qMlLeTlqqN+Smk=
-
-css-list-helpers@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/css-list-helpers/-/css-list-helpers-1.0.1.tgz#fff57192202db83240c41686f919e449a7024f7d"
-  integrity sha1-//VxkiAtuDJAxBaG+RnkSacCT30=
-  dependencies:
-    tcomb "^2.5.0"
-
 css-loader@^6.7.1:
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.1.tgz#e98106f154f6e1baf3fc3bc455cb9981c1d5fd2e"
@@ -4620,11 +4537,6 @@ css-select@^4.1.3:
     domutils "^2.6.0"
     nth-check "^2.0.0"
 
-css-system-font-keywords@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz#85c6f086aba4eb32c571a3086affc434b84823ed"
-  integrity sha1-hcbwhquk6zLFcaMIav/ENLhII+0=
-
 css-tree@^1.1.2, css-tree@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
@@ -4859,9 +4771,9 @@ decimal.js@^10.3.1:
   integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
+  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 dedent@^0.7.0:
   version "0.7.0"
@@ -5190,10 +5102,10 @@ emittery@^0.10.2:
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
   integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
 
-emoji-datasource@5.0.0:
+emoji-datasource@5.0.1:
-  version "5.0.0"
+  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-5.0.0.tgz#1522fdba3c52223a1cf5a1c1fc282935400eaa06"
+  resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-5.0.1.tgz#31eaaff7caa6640929327b4f4ff66f2bf313df0a"
-  integrity sha512-LuvLWFnxznTH++GytEzpzOPUo1SB+6CUFqIlVETJJ3x9fpyMCKFfyqberbhMLOpT1qcNe+km+zoyBeUSC3u5Rw==
+  integrity sha512-RXokuCv4o8RFLiigN1skAdZwJuJWqtBvcK3GVKpvAL/7BeH95enmKsli7cG8YZ85RTjyEe3+GAdpJJOV43KLKQ==
 
 "emoji-mart@npm:emoji-mart-lazyload":
   version "3.0.1-j"
@@ -5214,11 +5126,6 @@ emoji-regex@^9.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -5277,16 +5184,6 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
-entities@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
-  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
-
-entities@~2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
-  integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
-
 envinfo@^7.7.3:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
@@ -5440,7 +5337,7 @@ escape-html@^1.0.3, escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -5846,12 +5743,12 @@ extension-port-stream@^2.0.1:
   dependencies:
     webextension-polyfill-ts "^0.22.0"
 
-fake-indexeddb@^3.1.7:
+fake-indexeddb@^4.0.0:
-  version "3.1.7"
+  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-3.1.7.tgz#d9efbeade113c15efbe862e4598a4b0a1797ed9f"
+  resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-4.0.1.tgz#09bb2468e21d0832b2177e894765fb109edac8fb"
-  integrity sha512-CUGeCzCOVjmeKi2C0pcvSh6NDU6uQIaS+7YyR++tO/atJJujkBYVhDvfePdz/U8bD33BMVWirsr1MKczfAqbjA==
+  integrity sha512-hFRyPmvEZILYgdcLBxVdHLik4Tj3gDTu/g7s9ZDOiU3sTNiGx+vEu1ri/AMsFJUZ/1sdRbAVrEcKndh3sViBcA==
   dependencies:
-    realistic-structured-clone "^2.0.1"
+    realistic-structured-clone "^3.0.0"
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
@@ -6028,9 +5925,9 @@ flatted@^3.1.0:
   integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
 
 follow-redirects@^1.0.0:
-  version "1.14.4"
+  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
 follow-redirects@^1.15.0:
   version "1.15.1"
@@ -6362,7 +6259,7 @@ goober@^2.1.10:
   resolved "https://registry.yarnpkg.com/goober/-/goober-2.1.11.tgz#bbd71f90d2df725397340f808dbe7acc3118e610"
   integrity sha512-5SS2lmxbhqH0u9ABEWq7WPU69a4i2pYcHeCxqaNq6Cw3mnrF0ghWNM4tEGid4dKy8XNIAUbuThuozDHHKJVh3A==
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
   integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
@@ -6389,13 +6286,6 @@ hard-rejection@^2.1.0:
   resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
   integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
 
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-bigints@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
@@ -6406,11 +6296,6 @@ has-bigints@^1.0.2:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
   integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
-
 has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
@@ -6817,10 +6702,10 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-interpret@^2.2.0:
+interpret@^3.1.1:
-  version "2.2.0"
+  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
-  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
+  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
 intersection-observer@^0.12.0:
   version "0.12.0"
@@ -7435,10 +7320,10 @@ jest-haste-map@^28.1.1:
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-junit@^14.0.0:
+jest-junit@^15.0.0:
-  version "14.0.0"
+  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-14.0.0.tgz#f69fc31bab32224848f443480c2c808fccb2a802"
+  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-15.0.0.tgz#a47544ab42e9f8fe7ada56306c218e09e52bd690"
-  integrity sha512-kALvBDegstTROfDGXH71UGD7k5g7593Y1wuX1wpWT+QTYcBbmtuGOA8UlAt56zo/B2eMIOcaOVEON3j0VXVa4g==
+  integrity sha512-Z5sVX0Ag3HZdMUnD5DFlG+1gciIFSy7yIVPhOdGUi8YJaI9iLvvBb530gtQL2CHmv0JJeiwRZenr0VrSR7frvg==
   dependencies:
     mkdirp "^1.0.4"
     strip-ansi "^6.0.1"
@@ -7679,11 +7564,6 @@ jest@^28.1.2:
     import-local "^3.0.2"
     jest-cli "^28.1.2"
 
-js-base64@^2.1.9:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
-  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -7697,38 +7577,11 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js2xmlparser@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.1.tgz#670ef71bc5661f089cc90481b99a05a1227ae3bd"
-  integrity sha512-KrPTolcw6RocpYjdC7pL7v62e55q7qOMHvLX1UCLc5AAS8qeJ6nukarEJAF2KL2PZxlbGueEbINqZR2bDe/gUw==
-  dependencies:
-    xmlcreate "^2.0.3"
-
 jsdoc-type-pratt-parser@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz#a4a56bdc6e82e5865ffd9febc5b1a227ff28e67e"
   integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==
 
-jsdoc@~3.6.7:
-  version "3.6.7"
-  resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-3.6.7.tgz#00431e376bed7f9de4716c6f15caa80e64492b89"
-  integrity sha512-sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw==
-  dependencies:
-    "@babel/parser" "^7.9.4"
-    bluebird "^3.7.2"
-    catharsis "^0.9.0"
-    escape-string-regexp "^2.0.0"
-    js2xmlparser "^4.0.1"
-    klaw "^3.0.0"
-    markdown-it "^10.0.0"
-    markdown-it-anchor "^5.2.7"
-    marked "^2.0.3"
-    mkdirp "^1.0.4"
-    requizzle "^0.2.3"
-    strip-json-comments "^3.1.0"
-    taffydb "2.6.2"
-    underscore "~1.13.1"
-
 jsdom@^19.0.0:
   version "19.0.0"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz#93e67c149fe26816d38a849ea30ac93677e16b6a"
@@ -7815,22 +7668,17 @@ json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
 json5@^1.0.1:
-  version "1.0.1"
+  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
 json5@^2.1.0, json5@^2.1.2, json5@^2.2.1:
-  version "2.2.1"
+  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+  integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==
 
 jsonfile@^4.0.0:
   version "4.0.0"
@@ -7918,13 +7766,6 @@ kind-of@^6.0.2, kind-of@^6.0.3:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klaw@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146"
-  integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==
-  dependencies:
-    graceful-fs "^4.1.9"
-
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -8033,13 +7874,6 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
-linkify-it@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
-  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
-  dependencies:
-    uc.micro "^1.0.1"
-
 lint-staged@>=10:
   version "11.1.2"
   resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.1.2.tgz#4dd78782ae43ee6ebf2969cad9af67a46b33cd90"
@@ -8078,20 +7912,10 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
-loader-utils@0.2.x:
+loader-utils@0.2.x, loader-utils@^2.0.0, loader-utils@^2.0.3:
-  version "0.2.17"
+  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
-  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-loader-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
-  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -8248,7 +8072,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0, lodash@^4.7.11:
+lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0, lodash@^4.7.11:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -8336,27 +8160,6 @@ mark-loader@^0.1.6:
   resolved "https://registry.yarnpkg.com/mark-loader/-/mark-loader-0.1.6.tgz#0abb477dca7421d70e20128ff6489f5cae8676d5"
   integrity sha1-CrtHfcp0IdcOIBKP9kifXK6GdtU=
 
-markdown-it-anchor@^5.2.7:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz#d549acd64856a8ecd1bea58365ef385effbac744"
-  integrity sha512-/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==
-
-markdown-it@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"
-  integrity sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==
-  dependencies:
-    argparse "^1.0.7"
-    entities "~2.0.0"
-    linkify-it "^2.0.0"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
-
-marked@^2.0.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.3.tgz#bd017cef6431724fd4b27e0657f5ceb14bff3753"
-  integrity sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==
-
 marky@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/marky/-/marky-1.2.4.tgz#d02bb4c08be2366687c778ecd2a328971ce23d7f"
@@ -8405,11 +8208,6 @@ mdn-data@2.0.14:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
-mdurl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -8565,14 +8363,7 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@^3.0.3:
+minimatch@^3.0.3, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^3.0.4:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -8588,21 +8379,16 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.2.0:
+minimist@^1.2.0, minimist@^1.2.6:
-  version "1.2.5"
+  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
 minimist@^1.2.5:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-minimist@^1.2.6:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
-
 mkdirp@^0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
@@ -8792,16 +8578,11 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
-object-assign@^4.0.1, object-assign@^4.1.1:
+object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-object-fit-images@^3.2.3:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/object-fit-images/-/object-fit-images-3.2.4.tgz#6c299d38fdf207746e5d2d46c2877f6f25d15b52"
-  integrity sha512-G+7LzpYfTfqUyrZlfrou/PLLLAPNC52FTy5y1CBywX+1/FkxIloOyQXBmZ3Zxa2AWO+lMF0JTuvqbr7G5e5CWg==
-
 object-hash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
@@ -9025,21 +8806,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-css-font@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/parse-css-font/-/parse-css-font-2.0.2.tgz#7b60b060705a25a9b90b7f0ed493e5823248a652"
-  integrity sha1-e2CwYHBaJam5C38O1JPlgjJIplI=
-  dependencies:
-    css-font-size-keywords "^1.0.0"
-    css-font-stretch-keywords "^1.0.1"
-    css-font-style-keywords "^1.0.1"
-    css-font-weight-keywords "^1.0.0"
-    css-global-keywords "^1.0.1"
-    css-list-helpers "^1.0.1"
-    css-system-font-keywords "^1.0.0"
-    tcomb "^2.5.0"
-    unquote "^1.1.0"
-
 parse-diff@^0.7.0:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/parse-diff/-/parse-diff-0.7.1.tgz#9b7a2451c3725baf2c87c831ba192d40ee2237d4"
@@ -9465,15 +9231,6 @@ postcss-normalize-whitespace@^5.1.1:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-object-fit-images@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-object-fit-images/-/postcss-object-fit-images-1.1.2.tgz#8b773043db14672ef6cd6f2cb1f0d8b26a9f573b"
-  integrity sha1-i3cwQ9sUZy72zW8ssfDYsmqfVzs=
-  dependencies:
-    parse-css-font "^2.0.2"
-    postcss "^5.0.16"
-    quote "^0.4.0"
-
 postcss-ordered-values@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz#0b41b610ba02906a3341e92cab01ff8ebc598adb"
@@ -9570,16 +9327,6 @@ 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@^5.0.16:
-  version "5.2.18"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
-  integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==
-  dependencies:
-    chalk "^1.1.3"
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.2.3"
-
 postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6:
   version "7.0.36"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
@@ -9760,11 +9507,6 @@ quick-lru@^5.1.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
   integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
 
-quote@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz#10839217f6c1362b89194044d29b233fd7f32f01"
-  integrity sha1-EIOSF/bBNiuJGUBE0psjP9fzLwE=
-
 raf@^3.1.0, raf@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
@@ -10208,22 +9950,21 @@ readline-sync@^1.4.9:
   resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b"
   integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==
 
-realistic-structured-clone@^2.0.1:
+realistic-structured-clone@^3.0.0:
-  version "2.0.4"
+  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/realistic-structured-clone/-/realistic-structured-clone-2.0.4.tgz#7eb4c2319fc3cb72f4c8d3c9e888b11647894b50"
+  resolved "https://registry.yarnpkg.com/realistic-structured-clone/-/realistic-structured-clone-3.0.0.tgz#7b518049ce2dad41ac32b421cd297075b00e3e35"
-  integrity sha512-lItAdBIFHUSe6fgztHPtmmWqKUgs+qhcYLi3wTRUl4OTB3Vb8aBVSjGfQZUvkmJCKoX3K9Wf7kyLp/F/208+7A==
+  integrity sha512-rOjh4nuWkAqf9PWu6JVpOWD4ndI+JHfgiZeMmujYcPi+fvILUu7g6l26TC1K5aBIp34nV+jE1cDO75EKOfHC5Q==
   dependencies:
-    core-js "^3.4"
     domexception "^1.0.1"
     typeson "^6.1.0"
     typeson-registry "^1.0.0-alpha.20"
 
-rechoir@^0.7.0:
+rechoir@^0.8.0:
-  version "0.7.1"
+  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
-  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
+  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
   dependencies:
-    resolve "^1.9.0"
+    resolve "^1.20.0"
 
 redent@^3.0.0:
   version "3.0.0"
@@ -10444,13 +10185,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-requizzle@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.3.tgz#4675c90aacafb2c036bd39ba2daa4a1cb777fded"
-  integrity sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==
-  dependencies:
-    lodash "^4.17.14"
-
 reselect@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
@@ -10502,7 +10236,7 @@ resolve@^1.1.7, resolve@^1.22.1:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.9.0:
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -10897,7 +10631,7 @@ source-map-support@^0.5.20, source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@^0.5.0, source-map@^0.5.6:
+source-map@^0.5.0:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -10912,11 +10646,6 @@ source-map@^0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
   integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
 
-source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -11118,13 +10847,6 @@ stringz@^2.0.0:
   dependencies:
     char-regex "^1.0.2"
 
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 strip-ansi@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
@@ -11273,18 +10995,6 @@ sugarss@^2.0.0:
   dependencies:
     postcss "^7.0.2"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-supports-color@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@^5.0.0, supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -11374,11 +11084,6 @@ table@^6.0.9, table@^6.6.0:
     string-width "^4.2.0"
     strip-ansi "^6.0.0"
 
-taffydb@2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz#7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"
-  integrity sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=
-
 tailwindcss@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.2.1.tgz#1bd828fff3172489962357f8d531c184080a6786"
@@ -11413,11 +11118,6 @@ tapable@^2.0, tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tcomb@^2.5.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
-  integrity sha1-ENYpWAQWaaXVNWe5pO6M3iKxwrA=
-
 terminal-link@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
@@ -11438,25 +11138,16 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.3:
     source-map "^0.6.1"
     terser "^5.7.2"
 
-terser@^5.10.0:
+terser@^5.10.0, terser@^5.7.2:
-  version "5.14.0"
+  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.0.tgz#eefeec9af5153f55798180ee2617f390bdd285e2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880"
-  integrity sha512-JC6qfIEkPBd9j1SMO3Pfn+A6w2kQV54tv+ABQLgZr7dA3k/DL/OBoYSWxzVpZev3J+bUHXfr55L8Mox7AaNo6g==
+  integrity "sha1-WvO8PQ8kJBx/sgJBmdXEYaEHWIA= sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw=="
   dependencies:
     "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-terser@^5.7.2:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.8.0.tgz#c6d352f91aed85cc6171ccb5e84655b77521d947"
-  integrity sha512-f0JH+6yMpneYcRJN314lZrSwu9eKkUFEHLN/kNy8ceh8gaRiLgFPJqrB9HsXjhEGdv4e/ekjTOFxIlL6xlma8A==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.20"
-
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -11755,11 +11446,6 @@ typeson@^6.0.0, typeson@^6.1.0:
   resolved "https://registry.yarnpkg.com/typeson/-/typeson-6.1.0.tgz#5b2a53705a5f58ff4d6f82f965917cabd0d7448b"
   integrity sha512-6FTtyGr8ldU0pfbvW/eOZrEtEkczHRUtduBnA90Jh9kMPCiFNnXIon3vF41N0S4tV1HHQt4Hk1j4srpESziCaA==
 
-uc.micro@^1.0.1, uc.micro@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-
 unbox-primitive@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
@@ -11780,11 +11466,6 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-underscore@~1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
-  integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
-
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -11867,11 +11548,6 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
-unquote@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
-  integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
-
 update-browserslist-db@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38"
@@ -12121,22 +11797,23 @@ webpack-bundle-analyzer@^4.5.0:
     sirv "^1.0.7"
     ws "^7.3.1"
 
-webpack-cli@^4.9.2:
+webpack-cli@^5.0.0:
-  version "4.9.2"
+  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a"
-  integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==
+  integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.1.1"
+    "@webpack-cli/configtest" "^2.0.1"
-    "@webpack-cli/info" "^1.4.1"
+    "@webpack-cli/info" "^2.0.1"
-    "@webpack-cli/serve" "^1.6.1"
+    "@webpack-cli/serve" "^2.0.1"
     colorette "^2.0.14"
-    commander "^7.0.0"
+    commander "^9.4.1"
-    execa "^5.0.0"
+    cross-spawn "^7.0.3"
+    envinfo "^7.7.3"
     fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
-    interpret "^2.2.0"
+    interpret "^3.1.1"
-    rechoir "^0.7.0"
+    rechoir "^0.8.0"
     webpack-merge "^5.7.3"
 
 webpack-deadcode-plugin@^0.1.16:
@@ -12456,11 +12133,6 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xmlcreate@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.3.tgz#df9ecd518fd3890ab3548e1b811d040614993497"
-  integrity sha512-HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ==
-
 xtend@^4.0.2, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -12481,7 +12153,7 @@ yaml@^1.10.0, yaml@^1.10.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@^20.2.2, yargs-parser@^20.2.3:
+yargs-parser@^20.2.3:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
@@ -12491,18 +12163,10 @@ yargs-parser@^21.0.0, yargs-parser@^21.0.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
   integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
 
-yargs@^16.0.3:
+yargs-parser@^21.1.1:
-  version "16.2.0"
+  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
 
 yargs@^17.3.1:
   version "17.5.1"
@@ -12517,6 +12181,19 @@ yargs@^17.3.1:
     y18n "^5.0.5"
     yargs-parser "^21.0.0"
 
+yargs@^17.6.2:
+  version "17.6.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541"
+  integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"