Use parallel-prettier for lint

2022-03-22 13:45:34 -07:00 · 2022-03-22 13:45:34 -07:00 · 356f123092
parent 67702254fb
commit 356f123092
11 changed files with 817 additions and 562 deletions
--- a/package.json
+++ b/package.json
@ -42,8 +42,8 @@
    "lint": "run-s --print-label lint-prettier check:types eslint",
    "lint-deps": "node ts/util/lint/linter.js",
    "lint-license-comments": "ts-node ts/util/lint/license_comments.ts",
-    "lint-prettier": "prettier --check .",
-    "format": "prettier --write .",
+    "lint-prettier": "pprettier --check '**/*.{ts,tsx,d.ts,js,json,html,scss,md,yml,yaml}'",
+    "format": "pprettier --write '**/*.{ts,tsx,d.ts,js,json,html,scss,md,yml,yaml}'",
    "transpile": "run-p check:types build:esbuild",
    "check:types": "tsc --noEmit",
    "clean-transpile-once": "rimraf app/**/*.js app/*.js ts/**/*.js ts/*.js tsconfig.tsbuildinfo",
@ -187,6 +187,7 @@
    "@babel/preset-typescript": "7.16.0",
    "@chanzuckerberg/axe-storybook-testing": "3.0.2",
    "@electron/fuses": "1.5.0",
+    "@mixer/parallel-prettier": "2.0.1",
    "@signalapp/mock-server": "1.2.0",
    "@storybook/addon-actions": "5.1.11",
    "@storybook/addon-knobs": "5.1.11",
@ -282,7 +283,7 @@
    "nyc": "11.4.1",
    "patch-package": "6.4.7",
    "playwright": "1.17.1",
-    "prettier": "2.4.1",
+    "prettier": "2.6.0",
    "sass": "1.49.7",
    "sass-loader": "10.2.0",
    "sinon": "11.1.1",
--- a/ts/components/AddGroupMemberErrorDialog.tsx
+++ b/ts/components/AddGroupMemberErrorDialog.tsx
@ -28,35 +28,33 @@ type PropsType = {
  onClose: () => void;
 } & PropsDataType;

-export const AddGroupMemberErrorDialog: FunctionComponent<PropsType> =
-  props => {
-    const { i18n, onClose } = props;
+export const AddGroupMemberErrorDialog: FunctionComponent<
+  PropsType
+> = props => {
+  const { i18n, onClose } = props;

-    let title: string;
-    let body: ReactNode;
-    switch (props.mode) {
-      case AddGroupMemberErrorDialogMode.MaximumGroupSize: {
-        const { maximumNumberOfContacts } = props;
-        title = i18n('chooseGroupMembers__maximum-group-size__title');
-        body = i18n('chooseGroupMembers__maximum-group-size__body', [
-          maximumNumberOfContacts.toString(),
-        ]);
-        break;
-      }
-      case AddGroupMemberErrorDialogMode.RecommendedMaximumGroupSize: {
-        const { recommendedMaximumNumberOfContacts } = props;
-        title = i18n(
-          'chooseGroupMembers__maximum-recommended-group-size__title'
-        );
-        body = i18n(
-          'chooseGroupMembers__maximum-recommended-group-size__body',
-          [recommendedMaximumNumberOfContacts.toString()]
-        );
-        break;
-      }
-      default:
-        throw missingCaseError(props);
+  let title: string;
+  let body: ReactNode;
+  switch (props.mode) {
+    case AddGroupMemberErrorDialogMode.MaximumGroupSize: {
+      const { maximumNumberOfContacts } = props;
+      title = i18n('chooseGroupMembers__maximum-group-size__title');
+      body = i18n('chooseGroupMembers__maximum-group-size__body', [
+        maximumNumberOfContacts.toString(),
+      ]);
+      break;
    }
+    case AddGroupMemberErrorDialogMode.RecommendedMaximumGroupSize: {
+      const { recommendedMaximumNumberOfContacts } = props;
+      title = i18n('chooseGroupMembers__maximum-recommended-group-size__title');
+      body = i18n('chooseGroupMembers__maximum-recommended-group-size__body', [
+        recommendedMaximumNumberOfContacts.toString(),
+      ]);
+      break;
+    }
+    default:
+      throw missingCaseError(props);
+  }

-    return <Alert body={body} i18n={i18n} onClose={onClose} title={title} />;
-  };
+  return <Alert body={body} i18n={i18n} onClose={onClose} title={title} />;
+};
--- a/ts/components/CompositionUpload.tsx
+++ b/ts/components/CompositionUpload.tsx
@ -52,20 +52,21 @@ export const CompositionUpload = forwardRef<HTMLInputElement, PropsType>(
      AttachmentToastType | undefined
    >();

-    const onFileInputChange: ChangeEventHandler<HTMLInputElement> =
-      async event => {
-        const files = event.target.files || [];
+    const onFileInputChange: ChangeEventHandler<
+      HTMLInputElement
+    > = async event => {
+      const files = event.target.files || [];

-        await processAttachments({
-          addAttachment,
-          addPendingAttachment,
-          conversationId,
-          files: Array.from(files),
-          draftAttachments,
-          onShowToast: setToastType,
-          removeAttachment,
-        });
-      };
+      await processAttachments({
+        addAttachment,
+        addPendingAttachment,
+        conversationId,
+        files: Array.from(files),
+        draftAttachments,
+        onShowToast: setToastType,
+        removeAttachment,
+      });
+    };

    function closeToast() {
      setToastType(undefined);
--- a/ts/components/NewlyCreatedGroupInvitedContactsDialog.tsx
+++ b/ts/components/NewlyCreatedGroupInvitedContactsDialog.tsx
@ -20,73 +20,70 @@ type PropsType = {
  theme: ThemeType;
 };

-export const NewlyCreatedGroupInvitedContactsDialog: FunctionComponent<PropsType> =
-  ({ contacts, getPreferredBadge, i18n, onClose, theme }) => {
-    let title: string;
-    let body: ReactNode;
-    if (contacts.length === 1) {
-      const contact = contacts[0];
+export const NewlyCreatedGroupInvitedContactsDialog: FunctionComponent<
+  PropsType
+> = ({ contacts, getPreferredBadge, i18n, onClose, theme }) => {
+  let title: string;
+  let body: ReactNode;
+  if (contacts.length === 1) {
+    const contact = contacts[0];

-      title = i18n('NewlyCreatedGroupInvitedContactsDialog--title--one');
-      body = (
-        <>
-          <GroupDialog.Paragraph>
-            <Intl
-              i18n={i18n}
-              id="NewlyCreatedGroupInvitedContactsDialog--body--user-paragraph--one"
-              components={[<ContactName title={contact.title} />]}
-            />
-          </GroupDialog.Paragraph>
-          <GroupDialog.Paragraph>
-            {i18n(
-              'NewlyCreatedGroupInvitedContactsDialog--body--info-paragraph'
-            )}
-          </GroupDialog.Paragraph>
-        </>
-      );
-    } else {
-      title = i18n('NewlyCreatedGroupInvitedContactsDialog--title--many', [
-        contacts.length.toString(),
-      ]);
-      body = (
-        <>
-          <GroupDialog.Paragraph>
-            {i18n(
-              'NewlyCreatedGroupInvitedContactsDialog--body--user-paragraph--many'
-            )}
-          </GroupDialog.Paragraph>
-          <GroupDialog.Paragraph>
-            {i18n(
-              'NewlyCreatedGroupInvitedContactsDialog--body--info-paragraph'
-            )}
-          </GroupDialog.Paragraph>
-          <GroupDialog.Contacts
-            contacts={contacts}
-            getPreferredBadge={getPreferredBadge}
+    title = i18n('NewlyCreatedGroupInvitedContactsDialog--title--one');
+    body = (
+      <>
+        <GroupDialog.Paragraph>
+          <Intl
            i18n={i18n}
-            theme={theme}
+            id="NewlyCreatedGroupInvitedContactsDialog--body--user-paragraph--one"
+            components={[<ContactName title={contact.title} />]}
          />
-        </>
-      );
-    }
-
-    return (
-      <GroupDialog
-        i18n={i18n}
-        onClickPrimaryButton={onClose}
-        primaryButtonText={i18n('Confirmation--confirm')}
-        secondaryButtonText={i18n(
-          'NewlyCreatedGroupInvitedContactsDialog--body--learn-more'
-        )}
-        onClickSecondaryButton={() => {
-          openLinkInWebBrowser(
-            'https://support.signal.org/hc/articles/360007319331-Group-chats'
-          );
-        }}
-        onClose={onClose}
-        title={title}
-      >
-        {body}
-      </GroupDialog>
+        </GroupDialog.Paragraph>
+        <GroupDialog.Paragraph>
+          {i18n('NewlyCreatedGroupInvitedContactsDialog--body--info-paragraph')}
+        </GroupDialog.Paragraph>
+      </>
    );
-  };
+  } else {
+    title = i18n('NewlyCreatedGroupInvitedContactsDialog--title--many', [
+      contacts.length.toString(),
+    ]);
+    body = (
+      <>
+        <GroupDialog.Paragraph>
+          {i18n(
+            'NewlyCreatedGroupInvitedContactsDialog--body--user-paragraph--many'
+          )}
+        </GroupDialog.Paragraph>
+        <GroupDialog.Paragraph>
+          {i18n('NewlyCreatedGroupInvitedContactsDialog--body--info-paragraph')}
+        </GroupDialog.Paragraph>
+        <GroupDialog.Contacts
+          contacts={contacts}
+          getPreferredBadge={getPreferredBadge}
+          i18n={i18n}
+          theme={theme}
+        />
+      </>
+    );
+  }
+
+  return (
+    <GroupDialog
+      i18n={i18n}
+      onClickPrimaryButton={onClose}
+      primaryButtonText={i18n('Confirmation--confirm')}
+      secondaryButtonText={i18n(
+        'NewlyCreatedGroupInvitedContactsDialog--body--learn-more'
+      )}
+      onClickSecondaryButton={() => {
+        openLinkInWebBrowser(
+          'https://support.signal.org/hc/articles/360007319331-Group-chats'
+        );
+      }}
+      onClose={onClose}
+      title={title}
+    >
+      {body}
+    </GroupDialog>
+  );
+};
--- a/ts/components/conversation/ContactSpoofingReviewDialog.tsx
+++ b/ts/components/conversation/ContactSpoofingReviewDialog.tsx
@ -60,305 +60,302 @@ enum ConfirmationStateType {
  ConfirmingGroupRemoval,
 }

-export const ContactSpoofingReviewDialog: FunctionComponent<PropsType> =
-  props => {
-    const {
-      getPreferredBadge,
-      i18n,
-      onBlock,
-      onBlockAndReportSpam,
-      onClose,
-      onDelete,
-      onShowContactModal,
-      onUnblock,
-      removeMember,
-      theme,
-    } = props;
+export const ContactSpoofingReviewDialog: FunctionComponent<
+  PropsType
+> = props => {
+  const {
+    getPreferredBadge,
+    i18n,
+    onBlock,
+    onBlockAndReportSpam,
+    onClose,
+    onDelete,
+    onShowContactModal,
+    onUnblock,
+    removeMember,
+    theme,
+  } = props;

-    const [confirmationState, setConfirmationState] = useState<
-      | undefined
-      | {
-          type: ConfirmationStateType.ConfirmingGroupRemoval;
-          affectedConversation: ConversationType;
-          group: ConversationType;
-        }
-      | {
-          type:
-            | ConfirmationStateType.ConfirmingDelete
-            | ConfirmationStateType.ConfirmingBlock;
-          affectedConversation: ConversationType;
-        }
-    >();
-
-    if (confirmationState) {
-      const { type, affectedConversation } = confirmationState;
-      switch (type) {
-        case ConfirmationStateType.ConfirmingDelete:
-        case ConfirmationStateType.ConfirmingBlock:
-          return (
-            <MessageRequestActionsConfirmation
-              i18n={i18n}
-              onBlock={() => {
-                onBlock(affectedConversation.id);
-              }}
-              onBlockAndReportSpam={() => {
-                onBlockAndReportSpam(affectedConversation.id);
-              }}
-              onUnblock={() => {
-                onUnblock(affectedConversation.id);
-              }}
-              onDelete={() => {
-                onDelete(affectedConversation.id);
-              }}
-              title={affectedConversation.title}
-              conversationType="direct"
-              state={
-                type === ConfirmationStateType.ConfirmingDelete
-                  ? MessageRequestState.deleting
-                  : MessageRequestState.blocking
-              }
-              onChangeState={messageRequestState => {
-                switch (messageRequestState) {
-                  case MessageRequestState.blocking:
-                    setConfirmationState({
-                      type: ConfirmationStateType.ConfirmingBlock,
-                      affectedConversation,
-                    });
-                    break;
-                  case MessageRequestState.deleting:
-                    setConfirmationState({
-                      type: ConfirmationStateType.ConfirmingDelete,
-                      affectedConversation,
-                    });
-                    break;
-                  case MessageRequestState.unblocking:
-                    assert(
-                      false,
-                      'Got unexpected MessageRequestState.unblocking state. Clearing confiration state'
-                    );
-                    setConfirmationState(undefined);
-                    break;
-                  case MessageRequestState.default:
-                    setConfirmationState(undefined);
-                    break;
-                  default:
-                    throw missingCaseError(messageRequestState);
-                }
-              }}
-            />
-          );
-        case ConfirmationStateType.ConfirmingGroupRemoval: {
-          const { group } = confirmationState;
-          return (
-            <RemoveGroupMemberConfirmationDialog
-              conversation={affectedConversation}
-              group={group}
-              i18n={i18n}
-              onClose={() => {
-                setConfirmationState(undefined);
-              }}
-              onRemove={() => {
-                removeMember(affectedConversation.id);
-              }}
-            />
-          );
-        }
-        default:
-          throw missingCaseError(type);
+  const [confirmationState, setConfirmationState] = useState<
+    | undefined
+    | {
+        type: ConfirmationStateType.ConfirmingGroupRemoval;
+        affectedConversation: ConversationType;
+        group: ConversationType;
      }
+    | {
+        type:
+          | ConfirmationStateType.ConfirmingDelete
+          | ConfirmationStateType.ConfirmingBlock;
+        affectedConversation: ConversationType;
+      }
+  >();
+
+  if (confirmationState) {
+    const { type, affectedConversation } = confirmationState;
+    switch (type) {
+      case ConfirmationStateType.ConfirmingDelete:
+      case ConfirmationStateType.ConfirmingBlock:
+        return (
+          <MessageRequestActionsConfirmation
+            i18n={i18n}
+            onBlock={() => {
+              onBlock(affectedConversation.id);
+            }}
+            onBlockAndReportSpam={() => {
+              onBlockAndReportSpam(affectedConversation.id);
+            }}
+            onUnblock={() => {
+              onUnblock(affectedConversation.id);
+            }}
+            onDelete={() => {
+              onDelete(affectedConversation.id);
+            }}
+            title={affectedConversation.title}
+            conversationType="direct"
+            state={
+              type === ConfirmationStateType.ConfirmingDelete
+                ? MessageRequestState.deleting
+                : MessageRequestState.blocking
+            }
+            onChangeState={messageRequestState => {
+              switch (messageRequestState) {
+                case MessageRequestState.blocking:
+                  setConfirmationState({
+                    type: ConfirmationStateType.ConfirmingBlock,
+                    affectedConversation,
+                  });
+                  break;
+                case MessageRequestState.deleting:
+                  setConfirmationState({
+                    type: ConfirmationStateType.ConfirmingDelete,
+                    affectedConversation,
+                  });
+                  break;
+                case MessageRequestState.unblocking:
+                  assert(
+                    false,
+                    'Got unexpected MessageRequestState.unblocking state. Clearing confiration state'
+                  );
+                  setConfirmationState(undefined);
+                  break;
+                case MessageRequestState.default:
+                  setConfirmationState(undefined);
+                  break;
+                default:
+                  throw missingCaseError(messageRequestState);
+              }
+            }}
+          />
+        );
+      case ConfirmationStateType.ConfirmingGroupRemoval: {
+        const { group } = confirmationState;
+        return (
+          <RemoveGroupMemberConfirmationDialog
+            conversation={affectedConversation}
+            group={group}
+            i18n={i18n}
+            onClose={() => {
+              setConfirmationState(undefined);
+            }}
+            onRemove={() => {
+              removeMember(affectedConversation.id);
+            }}
+          />
+        );
+      }
+      default:
+        throw missingCaseError(type);
    }
+  }

-    let title: string;
-    let contents: ReactChild;
+  let title: string;
+  let contents: ReactChild;

-    switch (props.type) {
-      case ContactSpoofingType.DirectConversationWithSameTitle: {
-        const { possiblyUnsafeConversation, safeConversation } = props;
-        assert(
-          possiblyUnsafeConversation.type === 'direct',
-          '<ContactSpoofingReviewDialog> expected a direct conversation for the "possibly unsafe" conversation'
-        );
-        assert(
-          safeConversation.type === 'direct',
-          '<ContactSpoofingReviewDialog> expected a direct conversation for the "safe" conversation'
-        );
+  switch (props.type) {
+    case ContactSpoofingType.DirectConversationWithSameTitle: {
+      const { possiblyUnsafeConversation, safeConversation } = props;
+      assert(
+        possiblyUnsafeConversation.type === 'direct',
+        '<ContactSpoofingReviewDialog> expected a direct conversation for the "possibly unsafe" conversation'
+      );
+      assert(
+        safeConversation.type === 'direct',
+        '<ContactSpoofingReviewDialog> expected a direct conversation for the "safe" conversation'
+      );

-        title = i18n('ContactSpoofingReviewDialog__title');
-        contents = (
-          <>
-            <p>{i18n('ContactSpoofingReviewDialog__description')}</p>
-            <h2>
-              {i18n('ContactSpoofingReviewDialog__possibly-unsafe-title')}
-            </h2>
-            <ContactSpoofingReviewDialogPerson
-              conversation={possiblyUnsafeConversation}
-              getPreferredBadge={getPreferredBadge}
-              i18n={i18n}
-              theme={theme}
-            >
-              <div className="module-ContactSpoofingReviewDialog__buttons">
+      title = i18n('ContactSpoofingReviewDialog__title');
+      contents = (
+        <>
+          <p>{i18n('ContactSpoofingReviewDialog__description')}</p>
+          <h2>{i18n('ContactSpoofingReviewDialog__possibly-unsafe-title')}</h2>
+          <ContactSpoofingReviewDialogPerson
+            conversation={possiblyUnsafeConversation}
+            getPreferredBadge={getPreferredBadge}
+            i18n={i18n}
+            theme={theme}
+          >
+            <div className="module-ContactSpoofingReviewDialog__buttons">
+              <Button
+                variant={ButtonVariant.SecondaryDestructive}
+                onClick={() => {
+                  setConfirmationState({
+                    type: ConfirmationStateType.ConfirmingDelete,
+                    affectedConversation: possiblyUnsafeConversation,
+                  });
+                }}
+              >
+                {i18n('MessageRequests--delete')}
+              </Button>
+              <Button
+                variant={ButtonVariant.SecondaryDestructive}
+                onClick={() => {
+                  setConfirmationState({
+                    type: ConfirmationStateType.ConfirmingBlock,
+                    affectedConversation: possiblyUnsafeConversation,
+                  });
+                }}
+              >
+                {i18n('MessageRequests--block')}
+              </Button>
+            </div>
+          </ContactSpoofingReviewDialogPerson>
+          <hr />
+          <h2>{i18n('ContactSpoofingReviewDialog__safe-title')}</h2>
+          <ContactSpoofingReviewDialogPerson
+            conversation={safeConversation}
+            getPreferredBadge={getPreferredBadge}
+            i18n={i18n}
+            onClick={() => {
+              onShowContactModal(safeConversation.id);
+            }}
+            theme={theme}
+          />
+        </>
+      );
+      break;
+    }
+    case ContactSpoofingType.MultipleGroupMembersWithSameTitle: {
+      const { group, collisionInfoByTitle } = props;
+
+      const unsortedConversationInfos = concat(
+        // This empty array exists to appease Lodash's type definitions.
+        [],
+        ...Object.values(collisionInfoByTitle)
+      );
+      const conversationInfos = orderBy(unsortedConversationInfos, [
+        // We normally use an `Intl.Collator` to sort by title. We do this instead, as
+        //   we only really care about stability (not perfect ordering).
+        'title',
+        'id',
+      ]);
+
+      title = i18n('ContactSpoofingReviewDialog__group__title');
+      contents = (
+        <>
+          <p>
+            {i18n('ContactSpoofingReviewDialog__group__description', [
+              conversationInfos.length.toString(),
+            ])}
+          </p>
+          <h2>{i18n('ContactSpoofingReviewDialog__group__members-header')}</h2>
+          {conversationInfos.map((conversationInfo, index) => {
+            let button: ReactNode;
+            if (group.areWeAdmin) {
+              button = (
                <Button
-                  variant={ButtonVariant.SecondaryDestructive}
+                  variant={ButtonVariant.SecondaryAffirmative}
                  onClick={() => {
                    setConfirmationState({
-                      type: ConfirmationStateType.ConfirmingDelete,
-                      affectedConversation: possiblyUnsafeConversation,
+                      type: ConfirmationStateType.ConfirmingGroupRemoval,
+                      affectedConversation: conversationInfo.conversation,
+                      group,
                    });
                  }}
                >
-                  {i18n('MessageRequests--delete')}
+                  {i18n('RemoveGroupMemberConfirmation__remove-button')}
                </Button>
+              );
+            } else if (conversationInfo.conversation.isBlocked) {
+              button = (
+                <Button
+                  variant={ButtonVariant.SecondaryAffirmative}
+                  onClick={() => {
+                    onUnblock(conversationInfo.conversation.id);
+                  }}
+                >
+                  {i18n('MessageRequests--unblock')}
+                </Button>
+              );
+            } else if (!isInSystemContacts(conversationInfo.conversation)) {
+              button = (
                <Button
                  variant={ButtonVariant.SecondaryDestructive}
                  onClick={() => {
                    setConfirmationState({
                      type: ConfirmationStateType.ConfirmingBlock,
-                      affectedConversation: possiblyUnsafeConversation,
+                      affectedConversation: conversationInfo.conversation,
                    });
                  }}
                >
                  {i18n('MessageRequests--block')}
                </Button>
-              </div>
-            </ContactSpoofingReviewDialogPerson>
-            <hr />
-            <h2>{i18n('ContactSpoofingReviewDialog__safe-title')}</h2>
-            <ContactSpoofingReviewDialogPerson
-              conversation={safeConversation}
-              getPreferredBadge={getPreferredBadge}
-              i18n={i18n}
-              onClick={() => {
-                onShowContactModal(safeConversation.id);
-              }}
-              theme={theme}
-            />
-          </>
-        );
-        break;
-      }
-      case ContactSpoofingType.MultipleGroupMembersWithSameTitle: {
-        const { group, collisionInfoByTitle } = props;
-
-        const unsortedConversationInfos = concat(
-          // This empty array exists to appease Lodash's type definitions.
-          [],
-          ...Object.values(collisionInfoByTitle)
-        );
-        const conversationInfos = orderBy(unsortedConversationInfos, [
-          // We normally use an `Intl.Collator` to sort by title. We do this instead, as
-          //   we only really care about stability (not perfect ordering).
-          'title',
-          'id',
-        ]);
-
-        title = i18n('ContactSpoofingReviewDialog__group__title');
-        contents = (
-          <>
-            <p>
-              {i18n('ContactSpoofingReviewDialog__group__description', [
-                conversationInfos.length.toString(),
-              ])}
-            </p>
-            <h2>
-              {i18n('ContactSpoofingReviewDialog__group__members-header')}
-            </h2>
-            {conversationInfos.map((conversationInfo, index) => {
-              let button: ReactNode;
-              if (group.areWeAdmin) {
-                button = (
-                  <Button
-                    variant={ButtonVariant.SecondaryAffirmative}
-                    onClick={() => {
-                      setConfirmationState({
-                        type: ConfirmationStateType.ConfirmingGroupRemoval,
-                        affectedConversation: conversationInfo.conversation,
-                        group,
-                      });
-                    }}
-                  >
-                    {i18n('RemoveGroupMemberConfirmation__remove-button')}
-                  </Button>
-                );
-              } else if (conversationInfo.conversation.isBlocked) {
-                button = (
-                  <Button
-                    variant={ButtonVariant.SecondaryAffirmative}
-                    onClick={() => {
-                      onUnblock(conversationInfo.conversation.id);
-                    }}
-                  >
-                    {i18n('MessageRequests--unblock')}
-                  </Button>
-                );
-              } else if (!isInSystemContacts(conversationInfo.conversation)) {
-                button = (
-                  <Button
-                    variant={ButtonVariant.SecondaryDestructive}
-                    onClick={() => {
-                      setConfirmationState({
-                        type: ConfirmationStateType.ConfirmingBlock,
-                        affectedConversation: conversationInfo.conversation,
-                      });
-                    }}
-                  >
-                    {i18n('MessageRequests--block')}
-                  </Button>
-                );
-              }
-
-              const { oldName } = conversationInfo;
-              const newName =
-                conversationInfo.conversation.profileName ||
-                conversationInfo.conversation.title;
-
-              return (
-                <>
-                  {index !== 0 && <hr />}
-                  <ContactSpoofingReviewDialogPerson
-                    key={conversationInfo.conversation.id}
-                    conversation={conversationInfo.conversation}
-                    getPreferredBadge={getPreferredBadge}
-                    i18n={i18n}
-                    theme={theme}
-                  >
-                    {Boolean(oldName) && oldName !== newName && (
-                      <div className="module-ContactSpoofingReviewDialogPerson__info__property module-ContactSpoofingReviewDialogPerson__info__property--callout">
-                        <Intl
-                          i18n={i18n}
-                          id="ContactSpoofingReviewDialog__group__name-change-info"
-                          components={{
-                            oldName: <Emojify text={oldName} />,
-                            newName: <Emojify text={newName} />,
-                          }}
-                        />
-                      </div>
-                    )}
-                    {button && (
-                      <div className="module-ContactSpoofingReviewDialog__buttons">
-                        {button}
-                      </div>
-                    )}
-                  </ContactSpoofingReviewDialogPerson>
-                </>
              );
-            })}
-          </>
-        );
-        break;
-      }
-      default:
-        throw missingCaseError(props);
-    }
+            }

-    return (
-      <Modal
-        hasXButton
-        i18n={i18n}
-        moduleClassName="module-ContactSpoofingReviewDialog"
-        onClose={onClose}
-        title={title}
-      >
-        {contents}
-      </Modal>
-    );
-  };
+            const { oldName } = conversationInfo;
+            const newName =
+              conversationInfo.conversation.profileName ||
+              conversationInfo.conversation.title;
+
+            return (
+              <>
+                {index !== 0 && <hr />}
+                <ContactSpoofingReviewDialogPerson
+                  key={conversationInfo.conversation.id}
+                  conversation={conversationInfo.conversation}
+                  getPreferredBadge={getPreferredBadge}
+                  i18n={i18n}
+                  theme={theme}
+                >
+                  {Boolean(oldName) && oldName !== newName && (
+                    <div className="module-ContactSpoofingReviewDialogPerson__info__property module-ContactSpoofingReviewDialogPerson__info__property--callout">
+                      <Intl
+                        i18n={i18n}
+                        id="ContactSpoofingReviewDialog__group__name-change-info"
+                        components={{
+                          oldName: <Emojify text={oldName} />,
+                          newName: <Emojify text={newName} />,
+                        }}
+                      />
+                    </div>
+                  )}
+                  {button && (
+                    <div className="module-ContactSpoofingReviewDialog__buttons">
+                      {button}
+                    </div>
+                  )}
+                </ContactSpoofingReviewDialogPerson>
+              </>
+            );
+          })}
+        </>
+      );
+      break;
+    }
+    default:
+      throw missingCaseError(props);
+  }
+
+  return (
+    <Modal
+      hasXButton
+      i18n={i18n}
+      moduleClassName="module-ContactSpoofingReviewDialog"
+      onClose={onClose}
+      title={title}
+    >
+      {contents}
+    </Modal>
+  );
+};
--- a/ts/components/conversation/ContactSpoofingReviewDialogPerson.tsx
+++ b/ts/components/conversation/ContactSpoofingReviewDialogPerson.tsx
@ -22,58 +22,59 @@ type PropsType = {
  theme: ThemeType;
 };

-export const ContactSpoofingReviewDialogPerson: FunctionComponent<PropsType> =
-  ({ children, conversation, getPreferredBadge, i18n, onClick, theme }) => {
-    assert(
-      conversation.type === 'direct',
-      '<ContactSpoofingReviewDialogPerson> expected a direct conversation'
-    );
+export const ContactSpoofingReviewDialogPerson: FunctionComponent<
+  PropsType
+> = ({ children, conversation, getPreferredBadge, i18n, onClick, theme }) => {
+  assert(
+    conversation.type === 'direct',
+    '<ContactSpoofingReviewDialogPerson> expected a direct conversation'
+  );

-    const contents = (
-      <>
-        <Avatar
-          {...conversation}
-          badge={getPreferredBadge(conversation.badges)}
-          conversationType={conversation.type}
-          size={AvatarSize.FIFTY_TWO}
-          className="module-ContactSpoofingReviewDialogPerson__avatar"
-          i18n={i18n}
-          theme={theme}
+  const contents = (
+    <>
+      <Avatar
+        {...conversation}
+        badge={getPreferredBadge(conversation.badges)}
+        conversationType={conversation.type}
+        size={AvatarSize.FIFTY_TWO}
+        className="module-ContactSpoofingReviewDialogPerson__avatar"
+        i18n={i18n}
+        theme={theme}
+      />
+      <div className="module-ContactSpoofingReviewDialogPerson__info">
+        <ContactName
+          module="module-ContactSpoofingReviewDialogPerson__info__contact-name"
+          title={conversation.title}
        />
-        <div className="module-ContactSpoofingReviewDialogPerson__info">
-          <ContactName
-            module="module-ContactSpoofingReviewDialogPerson__info__contact-name"
-            title={conversation.title}
-          />
-          {conversation.phoneNumber ? (
-            <div className="module-ContactSpoofingReviewDialogPerson__info__property">
-              {conversation.phoneNumber}
-            </div>
-          ) : null}
+        {conversation.phoneNumber ? (
          <div className="module-ContactSpoofingReviewDialogPerson__info__property">
-            <SharedGroupNames
-              i18n={i18n}
-              sharedGroupNames={conversation.sharedGroupNames || []}
-            />
+            {conversation.phoneNumber}
          </div>
-          {children}
+        ) : null}
+        <div className="module-ContactSpoofingReviewDialogPerson__info__property">
+          <SharedGroupNames
+            i18n={i18n}
+            sharedGroupNames={conversation.sharedGroupNames || []}
+          />
        </div>
-      </>
-    );
-
-    if (onClick) {
-      return (
-        <button
-          type="button"
-          className="module-ContactSpoofingReviewDialogPerson"
-          onClick={onClick}
-        >
-          {contents}
-        </button>
-      );
-    }
+        {children}
+      </div>
+    </>
+  );

+  if (onClick) {
    return (
-      <div className="module-ContactSpoofingReviewDialogPerson">{contents}</div>
+      <button
+        type="button"
+        className="module-ContactSpoofingReviewDialogPerson"
+        onClick={onClick}
+      >
+        {contents}
+      </button>
    );
-  };
+  }
+
+  return (
+    <div className="module-ContactSpoofingReviewDialogPerson">{contents}</div>
+  );
+};
--- a/ts/components/conversation/RemoveGroupMemberConfirmationDialog.tsx
+++ b/ts/components/conversation/RemoveGroupMemberConfirmationDialog.tsx
@ -20,34 +20,35 @@ type PropsType = {
  onRemove: () => void;
 };

-export const RemoveGroupMemberConfirmationDialog: FunctionComponent<PropsType> =
-  ({ conversation, group, i18n, onClose, onRemove }) => {
-    const descriptionKey = isAccessControlEnabled(
-      group.accessControlAddFromInviteLink
-    )
-      ? 'RemoveGroupMemberConfirmation__description__with-link'
-      : 'RemoveGroupMemberConfirmation__description';
+export const RemoveGroupMemberConfirmationDialog: FunctionComponent<
+  PropsType
+> = ({ conversation, group, i18n, onClose, onRemove }) => {
+  const descriptionKey = isAccessControlEnabled(
+    group.accessControlAddFromInviteLink
+  )
+    ? 'RemoveGroupMemberConfirmation__description__with-link'
+    : 'RemoveGroupMemberConfirmation__description';

-    return (
-      <ConfirmationDialog
-        actions={[
-          {
-            action: onRemove,
-            text: i18n('RemoveGroupMemberConfirmation__remove-button'),
-            style: 'negative',
-          },
-        ]}
-        i18n={i18n}
-        onClose={onClose}
-        title={
-          <Intl
-            i18n={i18n}
-            id={descriptionKey}
-            components={{
-              name: <ContactName title={conversation.title} />,
-            }}
-          />
-        }
-      />
-    );
-  };
+  return (
+    <ConfirmationDialog
+      actions={[
+        {
+          action: onRemove,
+          text: i18n('RemoveGroupMemberConfirmation__remove-button'),
+          style: 'negative',
+        },
+      ]}
+      i18n={i18n}
+      onClose={onClose}
+      title={
+        <Intl
+          i18n={i18n}
+          id={descriptionKey}
+          components={{
+            name: <ContactName title={conversation.title} />,
+          }}
+        />
+      }
+    />
+  );
+};
--- a/ts/components/conversation/conversation-details/ConversationNotificationsSettings.tsx
+++ b/ts/components/conversation/conversation-details/ConversationNotificationsSettings.tsx
@ -25,103 +25,100 @@ type PropsType = {
  setMuteExpiration: (muteExpiresAt: undefined | number) => unknown;
 };

-export const ConversationNotificationsSettings: FunctionComponent<PropsType> =
-  ({
-    conversationType,
-    dontNotifyForMentionsIfMuted,
-    i18n,
-    muteExpiresAt,
-    setMuteExpiration,
-    setDontNotifyForMentionsIfMuted,
-  }) => {
-    const muteOptions = useMemo(
-      () => [
-        ...(isMuted(muteExpiresAt)
-          ? []
-          : [
-              {
-                disabled: true,
-                text: i18n('notMuted'),
-                value: -1,
-              },
-            ]),
-        ...getMuteOptions(muteExpiresAt, i18n).map(
-          ({ disabled, name, value }) => ({
-            disabled,
-            text: name,
-            value,
-          })
-        ),
-      ],
-      [i18n, muteExpiresAt]
+export const ConversationNotificationsSettings: FunctionComponent<
+  PropsType
+> = ({
+  conversationType,
+  dontNotifyForMentionsIfMuted,
+  i18n,
+  muteExpiresAt,
+  setMuteExpiration,
+  setDontNotifyForMentionsIfMuted,
+}) => {
+  const muteOptions = useMemo(
+    () => [
+      ...(isMuted(muteExpiresAt)
+        ? []
+        : [
+            {
+              disabled: true,
+              text: i18n('notMuted'),
+              value: -1,
+            },
+          ]),
+      ...getMuteOptions(muteExpiresAt, i18n).map(
+        ({ disabled, name, value }) => ({
+          disabled,
+          text: name,
+          value,
+        })
+      ),
+    ],
+    [i18n, muteExpiresAt]
+  );
+
+  const onMuteChange = (rawValue: string) => {
+    const ms = parseIntOrThrow(
+      rawValue,
+      'NotificationSettings: mute ms was not an integer'
    );
+    setMuteExpiration(ms);
+  };

-    const onMuteChange = (rawValue: string) => {
-      const ms = parseIntOrThrow(
-        rawValue,
-        'NotificationSettings: mute ms was not an integer'
-      );
-      setMuteExpiration(ms);
-    };
+  const onChangeDontNotifyForMentionsIfMuted = (rawValue: string) => {
+    setDontNotifyForMentionsIfMuted(rawValue === 'yes');
+  };

-    const onChangeDontNotifyForMentionsIfMuted = (rawValue: string) => {
-      setDontNotifyForMentionsIfMuted(rawValue === 'yes');
-    };
-
-    return (
-      <div className="conversation-details-panel">
-        <PanelSection>
+  return (
+    <div className="conversation-details-panel">
+      <PanelSection>
+        <PanelRow
+          icon={
+            <ConversationDetailsIcon
+              ariaLabel={i18n('muteNotificationsTitle')}
+              icon={IconType.mute}
+            />
+          }
+          label={i18n('muteNotificationsTitle')}
+          right={
+            <Select options={muteOptions} onChange={onMuteChange} value={-1} />
+          }
+        />
+        {conversationType === 'group' && (
          <PanelRow
            icon={
              <ConversationDetailsIcon
-                ariaLabel={i18n('muteNotificationsTitle')}
-                icon={IconType.mute}
+                ariaLabel={i18n(
+                  'ConversationNotificationsSettings__mentions__label'
+                )}
+                icon={IconType.mention}
              />
            }
-            label={i18n('muteNotificationsTitle')}
+            label={i18n('ConversationNotificationsSettings__mentions__label')}
+            info={i18n('ConversationNotificationsSettings__mentions__info')}
            right={
              <Select
-                options={muteOptions}
-                onChange={onMuteChange}
-                value={-1}
+                options={[
+                  {
+                    text: i18n(
+                      'ConversationNotificationsSettings__mentions__select__always-notify'
+                    ),
+                    value: 'no',
+                  },
+                  {
+                    text: i18n(
+                      'ConversationNotificationsSettings__mentions__select__dont-notify-for-mentions-if-muted'
+                    ),
+                    value: 'yes',
+                  },
+                ]}
+                onChange={onChangeDontNotifyForMentionsIfMuted}
+                value={dontNotifyForMentionsIfMuted ? 'yes' : 'no'}
              />
            }
          />
-          {conversationType === 'group' && (
-            <PanelRow
-              icon={
-                <ConversationDetailsIcon
-                  ariaLabel={i18n(
-                    'ConversationNotificationsSettings__mentions__label'
-                  )}
-                  icon={IconType.mention}
-                />
-              }
-              label={i18n('ConversationNotificationsSettings__mentions__label')}
-              info={i18n('ConversationNotificationsSettings__mentions__info')}
-              right={
-                <Select
-                  options={[
-                    {
-                      text: i18n(
-                        'ConversationNotificationsSettings__mentions__select__always-notify'
-                      ),
-                      value: 'no',
-                    },
-                    {
-                      text: i18n(
-                        'ConversationNotificationsSettings__mentions__select__dont-notify-for-mentions-if-muted'
-                      ),
-                      value: 'yes',
-                    },
-                  ]}
-                  onChange={onChangeDontNotifyForMentionsIfMuted}
-                  value={dontNotifyForMentionsIfMuted ? 'yes' : 'no'}
-                />
-              }
-            />
-          )}
-        </PanelSection>
-      </div>
-    );
-  };
+        )}
+      </PanelSection>
+    </div>
+  );
+};
--- a/ts/components/conversationList/SearchResultsLoadingFakeHeader.tsx
+++ b/ts/components/conversationList/SearchResultsLoadingFakeHeader.tsx
@ -6,5 +6,6 @@ import React from 'react';

 type PropsType = Record<string, never>;

-export const SearchResultsLoadingFakeHeader: FunctionComponent<PropsType> =
-  () => <div className="module-SearchResultsLoadingFakeHeader" />;
+export const SearchResultsLoadingFakeHeader: FunctionComponent<
+  PropsType
+> = () => <div className="module-SearchResultsLoadingFakeHeader" />;
--- a/ts/util/lint/exceptions.json
+++ b/ts/util/lint/exceptions.json
@ -188,6 +188,34 @@
    "reasonCategory": "falseMatch",
    "updated": "2022-02-11T21:58:24.827Z"
  },
+  {
+    "rule": "jQuery-wrap(",
+    "path": "node_modules/@mixer/parallel-prettier/node_modules/ansi-styles/index.js",
+    "line": "\t\t\tstyles[name] = wrap(identity, offset);",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-03-22T19:29:46.099Z"
+  },
+  {
+    "rule": "jQuery-wrap(",
+    "path": "node_modules/@mixer/parallel-prettier/node_modules/ansi-styles/index.js",
+    "line": "\t\t\tstyles[name] = wrap(suite[targetSpace], offset);",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-03-22T19:29:46.099Z"
+  },
+  {
+    "rule": "jQuery-wrap(",
+    "path": "node_modules/@mixer/parallel-prettier/node_modules/commander/index.js",
+    "line": "        return helper.wrap(fullText, helpWidth - itemIndentWidth, termWidth + itemSeparatorWidth);",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-03-22T19:29:46.099Z"
+  },
+  {
+    "rule": "jQuery-wrap(",
+    "path": "node_modules/@mixer/parallel-prettier/node_modules/commander/index.js",
+    "line": "  wrap(str, width, indent, minColumnWidth = 40) {",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-03-22T19:29:46.099Z"
+  },
  {
    "rule": "eval",
    "path": "node_modules/@protobufjs/inquire/index.js",
@ -4603,6 +4631,20 @@
    "reasonCategory": "falseMatch",
    "updated": "2020-09-14T16:19:54.461Z"
  },
+  {
+    "rule": "jQuery-wrap(",
+    "path": "node_modules/ora/node_modules/ansi-styles/index.js",
+    "line": "\t\t\tstyles[name] = wrap(identity, offset);",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-03-22T19:29:46.099Z"
+  },
+  {
+    "rule": "jQuery-wrap(",
+    "path": "node_modules/ora/node_modules/ansi-styles/index.js",
+    "line": "\t\t\tstyles[name] = wrap(suite[targetSpace], offset);",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-03-22T19:29:46.099Z"
+  },
  {
    "rule": "jQuery-load(",
    "path": "node_modules/pac-proxy-agent/node_modules/debug/src/browser.js",
@ -5314,6 +5356,13 @@
    "reasonCategory": "falseMatch",
    "updated": "2022-02-11T21:58:24.827Z"
  },
+  {
+    "rule": "jQuery-wrap(",
+    "path": "node_modules/pumpify/node_modules/duplexify/index.js",
+    "line": "  return new (stream.Readable)({objectMode:true, highWaterMark:16}).wrap(rs)",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-03-22T19:29:46.099Z"
+  },
  {
    "rule": "DOM-document.write(",
    "path": "node_modules/qrcode-generator/sample.js",
@ -6635,6 +6684,34 @@
    "reasonCategory": "falseMatch",
    "updated": "2021-01-20T22:42:00.662Z"
  },
+  {
+    "rule": "jQuery-append(",
+    "path": "node_modules/tar-stream/node_modules/bl/BufferList.js",
+    "line": "    this.append(buf)",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-03-22T19:29:46.099Z"
+  },
+  {
+    "rule": "jQuery-append(",
+    "path": "node_modules/tar-stream/node_modules/bl/BufferList.js",
+    "line": "    copy.append(this._bufs[i])",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-03-22T19:29:46.099Z"
+  },
+  {
+    "rule": "jQuery-append(",
+    "path": "node_modules/tar-stream/node_modules/bl/BufferList.js",
+    "line": "      this.append(buf[i])",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-03-22T19:29:46.099Z"
+  },
+  {
+    "rule": "jQuery-append(",
+    "path": "node_modules/tar-stream/node_modules/bl/BufferList.js",
+    "line": "      this.append(buf._bufs[i])",
+    "reasonCategory": "falseMatch",
+    "updated": "2022-03-22T19:29:46.099Z"
+  },
  {
    "rule": "DOM-innerHTML",
    "path": "node_modules/terser-webpack-plugin/node_modules/terser/dist/bundle.min.js",
--- a/yarn.lock
+++ b/yarn.lock
@ -1212,6 +1212,19 @@
    lodash "^4.17.15"
    tmp-promise "^3.0.2"

+"@mixer/parallel-prettier@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@mixer/parallel-prettier/-/parallel-prettier-2.0.1.tgz#fd69bb55e38b3c1dbb2f1a534ea1a0cd3fe34946"
+  integrity sha512-bx/rdOhJ2EOxQTm4cQQBsdbg+IwaQHh/ugIZMsWNEILXLJWQukCv+6fDUBZkoIk/zEoW45uIrCugARCuuDwrWw==
+  dependencies:
+    chalk "^4.1.0"
+    commander "^7.0.0"
+    glob-stream "^6.1.0"
+    ignore "^5.1.8"
+    ora "^5.3.0"
+    prettier "^2.0.4"
+    rxjs "^6.6.3"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@ -4045,6 +4058,15 @@ bl@^4.0.3:
    inherits "^2.0.4"
    readable-stream "^3.4.0"

+bl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 blob-util@2.0.2:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
@ -4746,6 +4768,11 @@ cli-cursor@^3.1.0:
  dependencies:
    restore-cursor "^3.1.0"

+cli-spinners@^2.5.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
+  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
+
 cli-table3@0.5.1:
  version "0.5.1"
  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
@ -4831,6 +4858,11 @@ clone-response@^1.0.2:
  dependencies:
    mimic-response "^1.0.0"

+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
 clone@^2.1.1:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
@ -5566,6 +5598,13 @@ default-require-extensions@^1.0.0:
  dependencies:
    strip-bom "^2.0.0"

+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
+
 defer-to-connect@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.0.2.tgz#4bae758a314b034ae33902b5aac25a8dd6a8633e"
@ -5921,6 +5960,16 @@ duplexify@^3.4.2, duplexify@^3.5.3:
    readable-stream "^2.0.0"
    stream-shift "^1.0.0"

+duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
 ecc-jsbn@~0.1.1:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@ -6935,7 +6984,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
    assign-symbols "^1.0.0"
    is-extendable "^1.0.1"

-extend@^3.0.2, extend@~3.0.2:
+extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"

@ -7766,6 +7815,22 @@ glob-parent@^3.1.0:
    is-glob "^3.1.0"
    path-dirname "^1.0.0"

+glob-stream@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
+  integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=
+  dependencies:
+    extend "^3.0.0"
+    glob "^7.1.1"
+    glob-parent "^3.1.0"
+    is-negated-glob "^1.0.0"
+    ordered-read-streams "^1.0.0"
+    pumpify "^1.3.5"
+    readable-stream "^2.1.5"
+    remove-trailing-separator "^1.0.1"
+    to-absolute-glob "^2.0.0"
+    unique-stream "^2.0.2"
+
 glob-to-regexp@^0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@ -8699,6 +8764,14 @@ is-absolute-url@^3.0.3:
  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==

+is-absolute@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
+  dependencies:
+    is-relative "^1.0.0"
+    is-windows "^1.0.1"
+
 is-accessor-descriptor@^0.1.6:
  version "0.1.6"
  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@ -8935,6 +9008,16 @@ is-installed-globally@^0.4.0:
    global-dirs "^3.0.0"
    is-path-inside "^3.0.2"

+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
+is-negated-glob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
+
 is-negative-zero@^2.0.1:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@ -9060,6 +9143,13 @@ is-regex@^1.0.4, is-regex@^1.1.4:
    call-bind "^1.0.2"
    has-tostringtag "^1.0.0"

+is-relative@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
+  dependencies:
+    is-unc-path "^1.0.0"
+
 is-root@2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
@ -9098,6 +9188,13 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"

+is-unc-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
+  dependencies:
+    unc-path-regex "^0.1.2"
+
 is-unicode-supported@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
@ -9119,7 +9216,7 @@ is-window@^1.0.2:
  resolved "https://registry.yarnpkg.com/is-window/-/is-window-1.0.2.tgz#2c896ca53db97de45d3c33133a65d8c9f563480d"
  integrity sha1-LIlspT25feRdPDMTOmXYyfVjSA0=

-is-windows@^1.0.0, is-windows@^1.0.2:
+is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"

@ -9683,7 +9780,7 @@ lodash@4.17.21, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

-log-symbols@4.1.0:
+log-symbols@4.1.0, log-symbols@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@ -10911,6 +11008,28 @@ optionator@^0.9.1:
    type-check "^0.4.0"
    word-wrap "^1.2.3"

+ora@^5.3.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
+  dependencies:
+    bl "^4.1.0"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.5.0"
+    is-interactive "^1.0.0"
+    is-unicode-supported "^0.1.0"
+    log-symbols "^4.1.0"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
+ordered-read-streams@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
+  integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=
+  dependencies:
+    readable-stream "^2.0.1"
+
 original@^1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@ -11717,10 +11836,10 @@ prettier-linter-helpers@^1.0.0:
  dependencies:
    fast-diff "^1.1.2"

-prettier@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
-  integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==
+prettier@2.6.0, prettier@^2.0.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4"
+  integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==

 pretty-error@^2.1.1:
  version "2.1.1"
@ -11934,6 +12053,15 @@ pumpify@^1.3.3:
    inherits "^2.0.3"
    pump "^2.0.0"

+pumpify@^1.3.5:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
 punycode@1.3.2:
  version "1.3.2"
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
@ -12564,7 +12692,7 @@ read-pkg@^3.0.0:
    normalize-package-data "^2.3.2"
    path-type "^3.0.0"

-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@~2.3.6:
  version "2.3.7"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@ -13136,6 +13264,13 @@ rxjs@^6.4.0:
  dependencies:
    tslib "^1.9.0"

+rxjs@^6.6.3:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.1:
  version "5.1.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@ -14371,6 +14506,14 @@ thenify@3.3.1, "thenify@>= 3.1.0 < 4":
  dependencies:
    any-promise "^1.0.0"

+through2-filter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
+  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
+  dependencies:
+    through2 "~2.0.0"
+    xtend "~4.0.0"
+
 through2@^2.0.0:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@ -14378,6 +14521,14 @@ through2@^2.0.0:
    readable-stream "^2.1.5"
    xtend "~4.0.1"

+through2@~2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
 through@^2.3.6:
  version "2.3.8"
  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@ -14442,6 +14593,14 @@ tmp@^0.2.0:
  dependencies:
    rimraf "^3.0.0"

+to-absolute-glob@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
+  integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=
+  dependencies:
+    is-absolute "^1.0.0"
+    is-negated-glob "^1.0.0"
+
 to-arraybuffer@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@ -14731,6 +14890,11 @@ unbox-primitive@^1.0.1:
    has-symbols "^1.0.2"
    which-boxed-primitive "^1.0.2"

+unc-path-regex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
+
 underscore@1.12.1, underscore@>=1.8.3:
  version "1.12.1"
  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e"
@ -14790,6 +14954,14 @@ unique-slug@^2.0.0:
  dependencies:
    imurmurhash "^0.1.4"

+unique-stream@^2.0.2:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
+  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
+  dependencies:
+    json-stable-stringify-without-jsonify "^1.0.1"
+    through2-filter "^3.0.0"
+
 unique-string@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@ -15033,6 +15205,13 @@ wbuf@^1.1.0, wbuf@^1.7.3:
  dependencies:
    minimalistic-assert "^1.0.0"

+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
 webidl-conversions@^3.0.0:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
@ -15425,6 +15604,11 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"

+xtend@~4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
 y18n@^3.2.1:
  version "3.2.2"
  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"