[Glitch] Update devDependencies (non-major)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

app/javascript/flavours/glitch/api_types/notifications.ts

@@ -102,8 +102,7 @@ export interface ApiAccountWarningJSON {
   appeal: unknown;
 }
 
-interface ModerationWarningNotificationGroupJSON
+interface ModerationWarningNotificationGroupJSON extends BaseNotificationGroupJSON {
-  extends BaseNotificationGroupJSON {
   type: 'moderation_warning';
   moderation_warning: ApiAccountWarningJSON;
 }
@@ -123,14 +122,12 @@ export interface ApiAccountRelationshipSeveranceEventJSON {
   created_at: string;
 }
 
-interface AccountRelationshipSeveranceNotificationGroupJSON
+interface AccountRelationshipSeveranceNotificationGroupJSON extends BaseNotificationGroupJSON {
-  extends BaseNotificationGroupJSON {
   type: 'severed_relationships';
   event: ApiAccountRelationshipSeveranceEventJSON;
 }
 
-interface AccountRelationshipSeveranceNotificationJSON
+interface AccountRelationshipSeveranceNotificationJSON extends BaseNotificationJSON {
-  extends BaseNotificationJSON {
   type: 'severed_relationships';
   event: ApiAccountRelationshipSeveranceEventJSON;
 }

app/javascript/flavours/glitch/components/button/index.tsx

@@ -5,8 +5,10 @@ import classNames from 'classnames';
 
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 
-interface BaseProps
+interface BaseProps extends Omit<
-  extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
+  React.ButtonHTMLAttributes<HTMLButtonElement>,
+  'children'
+> {
   block?: boolean;
   secondary?: boolean;
   plain?: boolean;

app/javascript/flavours/glitch/components/dropdown_menu.tsx

@@ -309,7 +309,7 @@ interface DropdownProps<Item extends object | null = MenuItem> {
   renderItem?: RenderItemFn<Item>;
   renderHeader?: RenderHeaderFn<Item>;
   onOpen?: // Must use a union type for the full function as a union with void is not allowed.
-  | ((event: React.MouseEvent | React.KeyboardEvent) => void)
+    | ((event: React.MouseEvent | React.KeyboardEvent) => void)
     | ((event: React.MouseEvent | React.KeyboardEvent) => boolean);
   onItemClick?: ItemClickFn<Item>;
 }

app/javascript/flavours/glitch/entrypoints/admin.tsx

@@ -256,9 +256,8 @@ async function mountReactComponent(element: Element) {
 
   const componentProps = JSON.parse(stringProps) as object;
 
-  const { default: AdminComponent } = await import(
+  const { default: AdminComponent } =
-    '@/flavours/glitch/containers/admin_component'
+    await import('@/flavours/glitch/containers/admin_component');
-  );
 
   const { default: Component } = (await import(
     `@/flavours/glitch/components/admin/${componentName}.jsx`

app/javascript/flavours/glitch/main.tsx

@@ -55,9 +55,8 @@ function main() {
         'Notification' in window &&
         Notification.permission === 'granted'
       ) {
-        const registerPushNotifications = await import(
+        const registerPushNotifications =
-          'flavours/glitch/actions/push_notifications'
+          await import('flavours/glitch/actions/push_notifications');
-        );
 
         store.dispatch(registerPushNotifications.register());
       }

app/javascript/flavours/glitch/models/account.ts

@@ -42,10 +42,9 @@ const AccountRoleFactory = ImmutableRecord<AccountRoleShape>({
 });
 
 // Account
-export interface AccountShape
+export interface AccountShape extends Required<
-  extends Required<
+  Omit<ApiAccountJSON, 'emojis' | 'fields' | 'roles' | 'moved' | 'url'>
-    Omit<ApiAccountJSON, 'emojis' | 'fields' | 'roles' | 'moved' | 'url'>
+> {
-  > {
   emojis: ImmutableList<CustomEmoji>;
   fields: ImmutableList<AccountField>;
   roles: ImmutableList<AccountRole>;

app/javascript/flavours/glitch/models/notification_group.ts

@@ -14,20 +14,24 @@ import type { ApiReportJSON } from 'flavours/glitch/api_types/reports';
 // This corresponds to the max length of `group.sampleAccountIds`
 export const NOTIFICATIONS_GROUP_MAX_AVATARS = 8;
 
-interface BaseNotificationGroup
+interface BaseNotificationGroup extends Omit<
-  extends Omit<BaseNotificationGroupJSON, 'sample_account_ids'> {
+  BaseNotificationGroupJSON,
+  'sample_account_ids'
+> {
   sampleAccountIds: string[];
   partial: boolean;
 }
 
-interface BaseNotificationWithStatus<Type extends NotificationWithStatusType>
+interface BaseNotificationWithStatus<
-  extends BaseNotificationGroup {
+  Type extends NotificationWithStatusType,
+> extends BaseNotificationGroup {
   type: Type;
   statusId: string | undefined;
 }
 
-interface BaseNotification<Type extends NotificationType>
+interface BaseNotification<
-  extends BaseNotificationGroup {
+  Type extends NotificationType,
+> extends BaseNotificationGroup {
   type: Type;
 }
 
@@ -53,26 +57,25 @@ export type AccountWarningAction =
   | 'sensitive'
   | 'silence'
   | 'suspend';
-export interface AccountWarning
+export interface AccountWarning extends Omit<
-  extends Omit<ApiAccountWarningJSON, 'target_account'> {
+  ApiAccountWarningJSON,
+  'target_account'
+> {
   targetAccountId: string;
 }
 
-export interface NotificationGroupModerationWarning
+export interface NotificationGroupModerationWarning extends BaseNotification<'moderation_warning'> {
-  extends BaseNotification<'moderation_warning'> {
   moderationWarning: AccountWarning;
 }
 
 type AccountRelationshipSeveranceEvent =
   ApiAccountRelationshipSeveranceEventJSON;
-export interface NotificationGroupSeveredRelationships
+export interface NotificationGroupSeveredRelationships extends BaseNotification<'severed_relationships'> {
-  extends BaseNotification<'severed_relationships'> {
   event: AccountRelationshipSeveranceEvent;
 }
 
 type AnnualReportEvent = ApiAnnualReportEventJSON;
-export interface NotificationGroupAnnualReport
+export interface NotificationGroupAnnualReport extends BaseNotification<'annual_report'> {
-  extends BaseNotification<'annual_report'> {
   annualReport: AnnualReportEvent;
 }
 
@@ -80,8 +83,7 @@ interface Report extends Omit<ApiReportJSON, 'target_account'> {
   targetAccountId: string;
 }
 
-export interface NotificationGroupAdminReport
+export interface NotificationGroupAdminReport extends BaseNotification<'admin.report'> {
-  extends BaseNotification<'admin.report'> {
   report: Report;
 }
 

app/javascript/flavours/glitch/models/notification_request.ts

@@ -1,7 +1,9 @@
 import type { ApiNotificationRequestJSON } from 'flavours/glitch/api_types/notifications';
 
-export interface NotificationRequest
+export interface NotificationRequest extends Omit<
-  extends Omit<ApiNotificationRequestJSON, 'account' | 'notifications_count'> {
+  ApiNotificationRequestJSON,
+  'account' | 'notifications_count'
+> {
   account_id: string;
   notifications_count: number;
 }

app/javascript/flavours/glitch/models/poll.ts

@@ -28,8 +28,10 @@ export function createPollOptionTranslationFromServerJSON(translation: {
   } as PollOptionTranslation;
 }
 
-export interface Poll
+export interface Poll extends Omit<
-  extends Omit<ApiPollJSON, 'emojis' | 'options' | 'own_votes'> {
+  ApiPollJSON,
+  'emojis' | 'options' | 'own_votes'
+> {
   emojis: CustomEmoji[];
   options: PollOption[];
   own_votes?: number[];