Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

chore(deps):update-prettier-to-3.9.9

Aswin Asok858f26a4ef92
diff --git a/.github/checks/change-approval/rust.mjs b/.github/checks/change-approval/rust.mjs
index 285fcffa8c..84d921b698 100644
--- a/.github/checks/change-approval/rust.mjs
+++ b/.github/checks/change-approval/rust.mjs
@@ -29,7 +29,7 @@ function rustPolicy(source) {
if (token === "/*") {
const comments = /\/\*|\*\//g;
comments.lastIndex = lexer.lastIndex;
- for (let depth = 1; depth; ) {
+ for (let depth = 1; depth;) {
const comment = comments.exec(source);
if (!comment) throw new Error("Unclosed Rust comment");
depth += comment[0] === "/*" ? 1 : -1;
diff --git a/rust/checks/lint-exceptions/check.mjs b/rust/checks/lint-exceptions/check.mjs
index 1e939b03b3..71f35e2c06 100644
--- a/rust/checks/lint-exceptions/check.mjs
+++ b/rust/checks/lint-exceptions/check.mjs
@@ -202,7 +202,7 @@ function tokenize(source) {
if (text === "/*") {
const comments = /\/\*|\*\//g;
comments.lastIndex = lexer.lastIndex;
- for (let depth = 1; depth; ) {
+ for (let depth = 1; depth;) {
const comment = comments.exec(source);
if (!comment) throw new Error("Unclosed Rust comment");
depth += comment[0] === "/*" ? 1 : -1;
diff --git a/web/apps/accounts/src/pages/family.tsx b/web/apps/accounts/src/pages/family.tsx
index 3eed08008f..8ab66582ef 100644
--- a/web/apps/accounts/src/pages/family.tsx
+++ b/web/apps/accounts/src/pages/family.tsx
@@ -15,12 +15,7 @@ import { useRouter } from "next/router";
import React, { useCallback, useEffect, useRef, useState } from "react";
type Phase =
- | "loading"
- | "ready"
- | "accepting"
- | "accepted"
- | "invalid"
- | "failed";
+ "loading" | "ready" | "accepting" | "accepted" | "invalid" | "failed";
const Page: React.FC = () => {
const router = useRouter();
diff --git a/web/apps/accounts/src/pages/passkeys/verify.tsx b/web/apps/accounts/src/pages/passkeys/verify.tsx
index 53f9e37227..d956b044c2 100644
--- a/web/apps/accounts/src/pages/passkeys/verify.tsx
+++ b/web/apps/accounts/src/pages/passkeys/verify.tsx
@@ -469,9 +469,7 @@ const RedirectingApp: React.FC<RedirectingAppProps> = ({ onRetry }) => (
);
type LockerErrorCode =
- | "LOCKER_REGISTRATION_DISABLED"
- | "LOCKER_ROLLOUT_LIMIT"
- | undefined;
+ "LOCKER_REGISTRATION_DISABLED" | "LOCKER_ROLLOUT_LIMIT" | undefined;
interface LockerErrorPayload {
code: string;
diff --git a/web/apps/accounts/src/pages/recover-account.tsx b/web/apps/accounts/src/pages/recover-account.tsx
index 54503289cd..d529643d47 100644
--- a/web/apps/accounts/src/pages/recover-account.tsx
+++ b/web/apps/accounts/src/pages/recover-account.tsx
@@ -23,10 +23,7 @@ type Phase =
| "failed";
type AccountRecoveryErrorPhase =
- | "invalid"
- | "expired"
- | "emailInUse"
- | "unavailable";
+ "invalid" | "expired" | "emailInUse" | "unavailable";
const accountRecoveryErrorPhases: Record<
AccountRecoveryErrorCode,
diff --git a/web/apps/albums/src/public-album/upload/pipeline/index.ts b/web/apps/albums/src/public-album/upload/pipeline/index.ts
index 2fc795c016..9205f25fe5 100644
--- a/web/apps/albums/src/public-album/upload/pipeline/index.ts
+++ b/web/apps/albums/src/public-album/upload/pipeline/index.ts
@@ -43,11 +43,7 @@ export type UploadableUploadItem = ClusteredUploadItem & {
};
export type UploadPhase =
- | "preparing"
- | "readingMetadata"
- | "uploading"
- | "cancelling"
- | "done";
+ "preparing" | "readingMetadata" | "uploading" | "cancelling" | "done";
export type UploadResult =
| { type: "unsupported" }
diff --git a/web/apps/ensu/src/components/chat/ChatComposer.tsx b/web/apps/ensu/src/components/chat/ChatComposer.tsx
index 436be46e00..9768b26c56 100644
--- a/web/apps/ensu/src/components/chat/ChatComposer.tsx
+++ b/web/apps/ensu/src/components/chat/ChatComposer.tsx
@@ -41,12 +41,7 @@ interface ImageAttachment {
}
type SuggestedModelStatus =
- | "checking"
- | "missing"
- | "preloading"
- | "downloading"
- | "ready"
- | "error";
+ "checking" | "missing" | "preloading" | "downloading" | "ready" | "error";
export type ChatComposerHandle = ChatInputHandle;
diff --git a/web/apps/ensu/src/components/chat/ChatDialogs.tsx b/web/apps/ensu/src/components/chat/ChatDialogs.tsx
index 96915e93b1..c03fe4ecc9 100644
--- a/web/apps/ensu/src/components/chat/ChatDialogs.tsx
+++ b/web/apps/ensu/src/components/chat/ChatDialogs.tsx
@@ -58,12 +58,7 @@ interface SuggestedModel {
}
type ModelGateStatus =
- | "checking"
- | "missing"
- | "preloading"
- | "downloading"
- | "ready"
- | "error";
+ "checking" | "missing" | "preloading" | "downloading" | "ready" | "error";
type SxEntry = Exclude<SxProps<Theme>, readonly unknown[]>;
diff --git a/web/apps/ensu/src/components/chat/ChatSidebar.tsx b/web/apps/ensu/src/components/chat/ChatSidebar.tsx
index db56c83d92..cd93c17000 100644
--- a/web/apps/ensu/src/components/chat/ChatSidebar.tsx
+++ b/web/apps/ensu/src/components/chat/ChatSidebar.tsx
@@ -503,12 +503,7 @@ const SessionSearchInput = memo(
);
type SessionGroupLabel =
- | "TODAY"
- | "YESTERDAY"
- | "THIS WEEK"
- | "LAST WEEK"
- | "THIS MONTH"
- | "OLDER";
+ "TODAY" | "YESTERDAY" | "THIS WEEK" | "LAST WEEK" | "THIS MONTH" | "OLDER";
const groupSessionsByDate = (sessions: ChatSession[]) => {
const now = new Date();
diff --git a/web/apps/ensu/src/services/chat/store.ts b/web/apps/ensu/src/services/chat/store.ts
index 6573b6450a..6644e69023 100644
--- a/web/apps/ensu/src/services/chat/store.ts
+++ b/web/apps/ensu/src/services/chat/store.ts
@@ -189,8 +189,7 @@ const createIndexedDbChatDb = (
): ChatDbLike => ({
get: async (name, key) => {
const entry = (await db.get(name, key)) as
- | ChatDbSchema[typeof name]
- | undefined;
+ ChatDbSchema[typeof name] | undefined;
if (!entry) return undefined;
return cloneStoreEntry(name, entry);
},
@@ -210,8 +209,7 @@ const createIndexedDbChatDb = (
): ChatObjectStore<K> => ({
get: async (key) => {
const entry = (await tx.objectStore(name).get(key)) as
- | ChatDbSchema[K]
- | undefined;
+ ChatDbSchema[K] | undefined;
if (!entry) return undefined;
return cloneStoreEntry(name, entry);
},
diff --git a/web/apps/ensu/src/services/notes-lifecycle.ts b/web/apps/ensu/src/services/notes-lifecycle.ts
index 114ea887fd..fd0b53f0d7 100644
--- a/web/apps/ensu/src/services/notes-lifecycle.ts
+++ b/web/apps/ensu/src/services/notes-lifecycle.ts
@@ -9,19 +9,14 @@ interface NotesIndexCompletion {
type NotesIndexActivity = "starting" | "queued" | "failed" | null;
export type NotesCollectionActivity =
- | "starting"
- | "waitingForGeneration"
- | "waitingForModel"
- | "failed"
- | null;
+ "starting" | "waitingForGeneration" | "waitingForModel" | "failed" | null;
export interface NotesCollectionView extends NotesCollection {
activity: NotesCollectionActivity;
}
type NotesRemovalStart =
- | { kind: "wait" }
- | { kind: "start"; queuedForce?: boolean };
+ { kind: "wait" } | { kind: "start"; queuedForce?: boolean };
export class NotesLifecycleController {
private readonly active = new Set<string>();
diff --git a/web/apps/ensu/src/services/notes.ts b/web/apps/ensu/src/services/notes.ts
index d6edceb580..53b49458ae 100644
--- a/web/apps/ensu/src/services/notes.ts
+++ b/web/apps/ensu/src/services/notes.ts
@@ -5,12 +5,7 @@ export interface NotesCollection {
id: string;
label: string;
status:
- | "indexing"
- | "updating"
- | "ready"
- | "pending"
- | "unavailable"
- | "error";
+ "indexing" | "updating" | "ready" | "pending" | "unavailable" | "error";
indexingProgress: number | null;
indexedDocumentCount: number;
lastUpdatedAtMs: number | null;
diff --git a/web/apps/ensu/src/services/whats-new.ts b/web/apps/ensu/src/services/whats-new.ts
index 783641966a..a6be6433e8 100644
--- a/web/apps/ensu/src/services/whats-new.ts
+++ b/web/apps/ensu/src/services/whats-new.ts
@@ -13,8 +13,7 @@ export interface PendingDesktopWhatsNew {
}
export const getPendingDesktopWhatsNew = ():
- | PendingDesktopWhatsNew
- | undefined => {
+ PendingDesktopWhatsNew | undefined => {
if (!isTauriRuntime()) return undefined;
const seenVersion = readSeenVersion();
diff --git a/web/apps/locker/src/components/sidebar/LockerAccountDrawer.tsx b/web/apps/locker/src/components/sidebar/LockerAccountDrawer.tsx
index 6d8236cef9..f663e7eb2e 100644
--- a/web/apps/locker/src/components/sidebar/LockerAccountDrawer.tsx
+++ b/web/apps/locker/src/components/sidebar/LockerAccountDrawer.tsx
@@ -16,9 +16,7 @@ import {
} from "./LockerSidebarShell";
type AuthenticatedAccountAction =
- | "recoveryKey"
- | "changePassword"
- | "changeEmail";
+ "recoveryKey" | "changePassword" | "changeEmail";
export const LockerAccountDrawer: React.FC<
LockerNestedSidebarDrawerVisibilityProps
diff --git a/web/apps/locker/src/services/locker-limits.ts b/web/apps/locker/src/services/locker-limits.ts
index 881b522d74..5e3e431ee1 100644
--- a/web/apps/locker/src/services/locker-limits.ts
+++ b/web/apps/locker/src/services/locker-limits.ts
@@ -20,9 +20,7 @@ interface LockerUploadAllowance {
}
type LockerUploadPreflightFailureReason =
- | "fileCountLimit"
- | "fileTooLarge"
- | "storageLimit";
+ "fileCountLimit" | "fileTooLarge" | "storageLimit";
export interface LockerUploadPreflightFailure {
reason: LockerUploadPreflightFailureReason;
diff --git a/web/apps/locker/src/services/sync/decrypt.ts b/web/apps/locker/src/services/sync/decrypt.ts
index 807e3f3b4d..edac7fe602 100644
--- a/web/apps/locker/src/services/sync/decrypt.ts
+++ b/web/apps/locker/src/services/sync/decrypt.ts
@@ -425,8 +425,7 @@ const decryptFileToLockerItem = async (
}
const info = pubMagicMetadata?.info as
- | { type?: string; data?: Record<string, unknown> }
- | undefined;
+ { type?: string; data?: Record<string, unknown> } | undefined;
const infoType =
typeof info?.type === "string"
diff --git a/web/apps/locker/src/types.ts b/web/apps/locker/src/types.ts
index 8d029410d3..bac7c53a8a 100644
--- a/web/apps/locker/src/types.ts
+++ b/web/apps/locker/src/types.ts
@@ -8,10 +8,7 @@ export type LockerItemType =
| "file";
export type LockerCollectionParticipantRole =
- | "VIEWER"
- | "COLLABORATOR"
- | "ADMIN"
- | "OWNER";
+ "VIEWER" | "COLLABORATOR" | "ADMIN" | "OWNER";
export interface LockerCollectionParticipant {
id: number;
diff --git a/web/apps/photos/src/components/CollectionSelector.tsx b/web/apps/photos/src/components/CollectionSelector.tsx
index 8ee164b974..3986b42d1f 100644
--- a/web/apps/photos/src/components/CollectionSelector.tsx
+++ b/web/apps/photos/src/components/CollectionSelector.tsx
@@ -47,11 +47,7 @@ import { t } from "i18next";
import React, { useCallback, useEffect, useMemo, useState } from "react";
type CollectionSelectorAction =
- | "upload"
- | "add"
- | "move"
- | "restore"
- | "unhide";
+ "upload" | "add" | "move" | "restore" | "unhide";
export interface CollectionSelectorAttributes {
action: CollectionSelectorAction;
diff --git a/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx b/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx
index 2ce1c196e2..5cda77490c 100644
--- a/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx
+++ b/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx
@@ -297,9 +297,9 @@ export const GalleryBarAndListHeader: React.FC<
<CollectionShare
{...collectionShareVisibilityProps}
onClose={closeCollectionShare}
- collectionSummary={
- toShowCollectionSummaries.get(activeCollectionID!)!
- }
+ collectionSummary={toShowCollectionSummaries.get(
+ activeCollectionID!,
+ )!}
collection={activeCollection}
intent={collectionShareIntent}
{...{
diff --git a/web/apps/photos/src/components/FileList.tsx b/web/apps/photos/src/components/FileList.tsx
index a517951b88..cbbd0cd132 100644
--- a/web/apps/photos/src/components/FileList.tsx
+++ b/web/apps/photos/src/components/FileList.tsx
@@ -549,9 +549,7 @@ export const FileList: React.FC<FileListProps> = ({
? { mode: "people" as const, personID: activePersonID }
: {
mode: (mode ?? "albums") as
- | "albums"
- | "hidden-albums"
- | "archive-albums",
+ "albums" | "hidden-albums" | "archive-albums",
collectionID: activeCollectionID,
};
setSelected({
diff --git a/web/apps/photos/src/components/gallery/reducer.ts b/web/apps/photos/src/components/gallery/reducer.ts
index 7dbd5822ae..326f519c67 100644
--- a/web/apps/photos/src/components/gallery/reducer.ts
+++ b/web/apps/photos/src/components/gallery/reducer.ts
@@ -47,10 +47,7 @@ import React, { useReducer } from "react";
// TODO: Deprecated(?). Use GalleryView instead. Deprecated if it can be used in
// all cases where the bar mode was in use.
export type GalleryBarMode =
- | "albums"
- | "hidden-albums"
- | "archive-albums"
- | "people";
+ "albums" | "hidden-albums" | "archive-albums" | "people";
type GalleryView =
| {
diff --git a/web/apps/photos/src/components/sidebar/ReferralSettings.tsx b/web/apps/photos/src/components/sidebar/ReferralSettings.tsx
index 1605e36851..c45723df0d 100644
--- a/web/apps/photos/src/components/sidebar/ReferralSettings.tsx
+++ b/web/apps/photos/src/components/sidebar/ReferralSettings.tsx
@@ -49,11 +49,7 @@ import { t } from "i18next";
import React, { useCallback, useEffect, useRef, useState } from "react";
type ReferralScreen =
- | "main"
- | "apply-refreshing"
- | "apply-refresh-error"
- | "success"
- | "details";
+ "main" | "apply-refreshing" | "apply-refresh-error" | "success" | "details";
type Loadable<T> =
| { status: "loading" }
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index ed17c45ed8..8860944961 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -762,9 +762,7 @@ const Page: React.FC = () => {
? { mode: "people", personID: activePersonID }
: {
mode: barMode as
- | "albums"
- | "hidden-albums"
- | "archive-albums",
+ "albums" | "hidden-albums" | "archive-albums",
collectionID: activeCollectionID!,
},
};
@@ -791,9 +789,7 @@ const Page: React.FC = () => {
? { mode: "people", personID: activePersonID }
: {
mode: barMode as
- | "albums"
- | "hidden-albums"
- | "archive-albums",
+ "albums" | "hidden-albums" | "archive-albums",
collectionID: activeCollectionID!,
},
};
diff --git a/web/apps/photos/src/services/watch.ts b/web/apps/photos/src/services/watch.ts
index a6d32ca69b..001e7d6d80 100644
--- a/web/apps/photos/src/services/watch.ts
+++ b/web/apps/photos/src/services/watch.ts
@@ -28,8 +28,7 @@ class FolderWatcher {
private unUploadableFilePaths = new Set<string>();
private upload:
- | ((collectionName: string, filePaths: string[]) => void)
- | undefined;
+ ((collectionName: string, filePaths: string[]) => void) | undefined;
private onTriggerRemotePull: (() => void) | undefined;
private debouncedRunNextEvent: () => void;
diff --git a/web/apps/photos/src/utils/people-sort.ts b/web/apps/photos/src/utils/people-sort.ts
index c3050c5e4f..cc87c9ad84 100644
--- a/web/apps/photos/src/utils/people-sort.ts
+++ b/web/apps/photos/src/utils/people-sort.ts
@@ -1,10 +1,7 @@
import type { Person } from "ente-new/photos/services/ml/people";
export type PeopleSortBy =
- | "count-desc"
- | "count-asc"
- | "name-asc"
- | "name-desc";
+ "count-desc" | "count-asc" | "name-asc" | "name-desc";
export const sortPeople = (people: Person[], sortBy: PeopleSortBy): Person[] =>
[...people].sort(personComparator(sortBy));
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsx
index ee23d8dbdd..03e7b9d6c8 100644
--- a/web/apps/space/src/components/FileViewer.tsx
+++ b/web/apps/space/src/components/FileViewer.tsx
@@ -1188,8 +1188,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
let closedByReact = false;
let pswp: PhotoSwipe | undefined;
let swipeStart:
- | { x: number; y: number; photoIndex: number }
- | undefined;
+ { x: number; y: number; photoIndex: number } | undefined;
let postDragOffset = 0;
const resetPostDrag = () => {
diff --git a/web/apps/space/src/components/PostComposer.tsx b/web/apps/space/src/components/PostComposer.tsx
index 5e3f9a7474..8e7686143b 100644
--- a/web/apps/space/src/components/PostComposer.tsx
+++ b/web/apps/space/src/components/PostComposer.tsx
@@ -261,12 +261,9 @@ const SpacePostComposer: React.FC<{
exportsRef.current.get(draft.id) == job
)
exportsRef.current.delete(draft.id);
- if (
- !(
- error instanceof DOMException &&
- error.name == "AbortError"
- )
- )
+ if (!(
+ error instanceof DOMException && error.name == "AbortError"
+ ))
log.warn("Failed to prepare draft video", error);
});
}
diff --git a/web/apps/space/src/screens/MessagesScreen.tsx b/web/apps/space/src/screens/MessagesScreen.tsx
index acc9be20c7..cb91e31727 100644
--- a/web/apps/space/src/screens/MessagesScreen.tsx
+++ b/web/apps/space/src/screens/MessagesScreen.tsx
@@ -2331,8 +2331,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
>
{(() => {
let lastTimeSeparatorMessage:
- | SpaceMessage
- | undefined;
+ SpaceMessage | undefined;
return visibleMessages.map(
(message, index) => {
diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsx
index c1eb5c1ec2..4a24e751c3 100644
--- a/web/apps/space/src/screens/ProfileScreen.tsx
+++ b/web/apps/space/src/screens/ProfileScreen.tsx
@@ -566,9 +566,9 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
setIsInviteLinkCopied(true);
}
} catch (error) {
- if (
- !(error instanceof DOMException && error.name == "AbortError")
- ) {
+ if (!(
+ error instanceof DOMException && error.name == "AbortError"
+ )) {
log.warn("Failed to share Space invite link", error);
}
}
diff --git a/web/apps/space/src/services/invite.ts b/web/apps/space/src/services/invite.ts
index e76d51e20f..84281f6925 100644
--- a/web/apps/space/src/services/invite.ts
+++ b/web/apps/space/src/services/invite.ts
@@ -90,8 +90,7 @@ export const savePendingSpaceInviteIntent = (intent: SpaceInviteIntent) => {
};
export const savedPendingSpaceInviteIntent = ():
- | SpaceInviteIntent
- | undefined => {
+ SpaceInviteIntent | undefined => {
const intent = sessionStorage.getItem(pendingSpaceInviteIntentKey);
return intent == "like" || intent == "reply" ? intent : undefined;
};
diff --git a/web/apps/space/src/services/login.ts b/web/apps/space/src/services/login.ts
index 2735e9359c..0e85c05956 100644
--- a/web/apps/space/src/services/login.ts
+++ b/web/apps/space/src/services/login.ts
@@ -67,8 +67,7 @@ export type SpaceLoginResult =
};
export type SpaceLoginPasskeyStatusResult =
- | SpaceLoginResult
- | { status: "pending" };
+ SpaceLoginResult | { status: "pending" };
let pendingSpaceLoginCredentials: SpaceLoginInput | undefined;
diff --git a/web/apps/space/src/services/profile.ts b/web/apps/space/src/services/profile.ts
index 64edeccf3a..3a6a429f17 100644
--- a/web/apps/space/src/services/profile.ts
+++ b/web/apps/space/src/services/profile.ts
@@ -96,23 +96,18 @@ const currentSpaceContextConfig = async () => {
};
let currentSpaceContext:
- | { cacheKey: string; ctx: SpaceAccountCtxHandle }
- | undefined;
+ { cacheKey: string; ctx: SpaceAccountCtxHandle } | undefined;
let pendingCurrentSpaceContext:
- | { cacheKey: string; promise: Promise<SpaceAccountCtxHandle> }
- | undefined;
+ { cacheKey: string; promise: Promise<SpaceAccountCtxHandle> } | undefined;
let currentOwnedSpace:
- | { cacheKey: string; space: SpaceKeyResponse }
- | undefined;
+ { cacheKey: string; space: SpaceKeyResponse } | undefined;
let pendingCurrentOwnedSpace:
| { cacheKey: string; promise: Promise<SpaceKeyResponse | undefined> }
| undefined;
let currentSpaceProfile:
- | { cacheKey: string; profile: SetupProfile | null }
- | undefined;
+ { cacheKey: string; profile: SetupProfile | null } | undefined;
let pendingCurrentSpaceProfile:
- | { cacheKey: string; promise: Promise<SetupProfile | null> }
- | undefined;
+ { cacheKey: string; promise: Promise<SetupProfile | null> } | undefined;
let currentSpaceContextGeneration = 0;
const cloneSetupProfile = (profile: SetupProfile | null) =>
diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.ts
index 68dfd7bbe5..43a2f3c417 100644
--- a/web/apps/space/src/services/space.ts
+++ b/web/apps/space/src/services/space.ts
@@ -1307,8 +1307,7 @@ export const createCurrentMediaPost = async ({
return session.postId;
} catch (error) {
const uploadError = error as
- | (Error & { status?: number; code?: string })
- | undefined;
+ (Error & { status?: number; code?: string }) | undefined;
logToDisk(
`[error] Space post upload failed ${JSON.stringify({ requestId: session.requestId, stage, itemIndex, itemCount: images.length, bytes, status: uploadError?.status, code: uploadError?.code, name: uploadError?.name, message: uploadError?.message, stack: uploadError?.stack })}`.replaceAll(
spaceId,
diff --git a/web/apps/space/src/services/web-push.ts b/web/apps/space/src/services/web-push.ts
index 7e97ba1658..1da1284046 100644
--- a/web/apps/space/src/services/web-push.ts
+++ b/web/apps/space/src/services/web-push.ts
@@ -38,11 +38,7 @@ interface SubscriptionDetails {
}
export type SpaceWebPushState =
- | "denied"
- | "recovery"
- | "subscribed"
- | "unavailable"
- | "unsubscribed";
+ "denied" | "recovery" | "subscribed" | "unavailable" | "unsubscribed";
let pendingPreparation: Promise<PreparedSpaceWebPush | undefined> | undefined;
let pendingDatabase: Promise<IDBDatabase> | undefined;
diff --git a/web/apps/space/src/utils/home-feed.ts b/web/apps/space/src/utils/home-feed.ts
index 19208b8491..48f517029d 100644
--- a/web/apps/space/src/utils/home-feed.ts
+++ b/web/apps/space/src/utils/home-feed.ts
@@ -25,29 +25,25 @@ export const homeFeedEntries = (
),
);
const entries: HomeFeedEntry[] = [
- ...localFeedPosts.map(
- (item): HomeFeedEntry => ({
- identity:
- item.status == "posted" || item.status == "ready"
- ? `post:${item.post.postId}`
- : item.postId
- ? `post:${item.postId}`
- : `local:${item.id}`,
- item,
- kind: "local",
- renderKey: `local:${item.id}`,
- }),
- ),
+ ...localFeedPosts.map((item): HomeFeedEntry => ({
+ identity:
+ item.status == "posted" || item.status == "ready"
+ ? `post:${item.post.postId}`
+ : item.postId
+ ? `post:${item.postId}`
+ : `local:${item.id}`,
+ item,
+ kind: "local",
+ renderKey: `local:${item.id}`,
+ })),
...feedItems
.filter((item) => !localResolvedPostIds.has(item.postId))
- .map(
- (item): HomeFeedEntry => ({
- identity: `post:${item.postId}`,
- item,
- kind: "remote",
- renderKey: `post:${item.postId}`,
- }),
- ),
+ .map((item): HomeFeedEntry => ({
+ identity: `post:${item.postId}`,
+ item,
+ kind: "remote",
+ renderKey: `post:${item.postId}`,
+ })),
];
const latest: HomeFeedEntry[] = [];
const history: SpacePost[] = [];
diff --git a/web/apps/space/src/utils/route-transitions.tsx b/web/apps/space/src/utils/route-transitions.tsx
index cee7bad0d6..d8ee5db2b4 100644
--- a/web/apps/space/src/utils/route-transitions.tsx
+++ b/web/apps/space/src/utils/route-transitions.tsx
@@ -56,8 +56,7 @@ const initializeRouteHistory = (router: NextRouter) => {
__N: boolean;
};
const navigation = performance.getEntriesByType("navigation")[0] as
- | PerformanceNavigationTiming
- | undefined;
+ PerformanceNavigationTiming | undefined;
if (navigation?.type == "reload") {
try {
const saved = JSON.parse(
diff --git a/web/package-lock.json b/web/package-lock.json
index e601e91c41..cd869da6fb 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -16,7 +16,7 @@
"concurrently": "10.0.5",
"eslint": "10.11.0",
"knip": "6.31.0",
- "prettier": "3.8.3",
+ "prettier": "3.9.9",
"typescript": "6.0.3"
}
},
@@ -9444,9 +9444,9 @@
}
},
"node_modules/prettier": {
- "version": "3.8.3",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz",
- "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
+ "version": "3.9.9",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.9.tgz",
+ "integrity": "sha512-Z/CJHIkdujO/OtN7nXUii0Rf3VT5SRuhjBA82Xvu2XhBUgX3nhP67T0LHceBdQLex7OOFGTox+Q5Yg8Jk2Qivg==",
"dev": true,
"license": "MIT",
"bin": {
@@ -11937,7 +11937,7 @@
"eslint-plugin-react": "7.37.5",
"eslint-plugin-react-hooks": "7.1.1",
"eslint-plugin-react-refresh": "0.5.7",
- "prettier": "3.8.3",
+ "prettier": "3.9.9",
"prettier-plugin-organize-imports": "4.3.0",
"prettier-plugin-packagejson": "3.0.2",
"typescript": "6.0.3",
diff --git a/web/package.json b/web/package.json
index 75ff81de7a..3758502b8d 100644
--- a/web/package.json
+++ b/web/package.json
@@ -72,7 +72,7 @@
"concurrently": "10.0.5",
"eslint": "10.11.0",
"knip": "6.31.0",
- "prettier": "3.8.3",
+ "prettier": "3.9.9",
"typescript": "6.0.3"
},
"packageManager": "[email protected]"
diff --git a/web/packages/base/components/utils/theme.ts b/web/packages/base/components/utils/theme.ts
index 2d33568f9c..c446e0c14f 100644
--- a/web/packages/base/components/utils/theme.ts
+++ b/web/packages/base/components/utils/theme.ts
@@ -629,14 +629,12 @@ const getComponents = (appName: AppName): Components => {
?.styleOverrides ?? {}) as Record<string, unknown>;
const muiIconButtonRootStyleOverrides =
(muiIconButtonStyleOverrides.root as
- | Record<string, unknown>
- | undefined) ?? {};
+ Record<string, unknown> | undefined) ?? {};
const muiInputBaseStyleOverrides = (components.MuiInputBase
?.styleOverrides ?? {}) as Record<string, unknown>;
const muiInputBaseFormControlStyleOverrides =
(muiInputBaseStyleOverrides.formControl as
- | Record<string, unknown>
- | undefined) ?? {};
+ Record<string, unknown> | undefined) ?? {};
const muiDialogTitleStyleOverrides = (components.MuiDialogTitle
?.styleOverrides ?? {}) as Record<string, unknown>;
const muiDialogContentStyleOverrides = (components.MuiDialogContent
@@ -692,8 +690,7 @@ const getComponents = (appName: AppName): Components => {
...components.MuiFilledInput?.styleOverrides,
root: {
...(components.MuiFilledInput?.styleOverrides?.root as
- | Record<string, unknown>
- | undefined),
+ Record<string, unknown> | undefined),
borderRadius: "16px",
},
},
@@ -704,8 +701,7 @@ const getComponents = (appName: AppName): Components => {
...muiDialogTitleStyleOverrides,
root: {
...(muiDialogTitleStyleOverrides.root as
- | Record<string, unknown>
- | undefined),
+ Record<string, unknown> | undefined),
paddingBottom: "12px",
},
},
@@ -716,8 +712,7 @@ const getComponents = (appName: AppName): Components => {
...muiDialogContentStyleOverrides,
root: {
...(muiDialogContentStyleOverrides.root as
- | Record<string, unknown>
- | undefined),
+ Record<string, unknown> | undefined),
paddingTop: "8px",
},
},
diff --git a/web/packages/build-config/package.json b/web/packages/build-config/package.json
index b53b711451..54b7c19b2a 100644
--- a/web/packages/build-config/package.json
+++ b/web/packages/build-config/package.json
@@ -10,7 +10,7 @@
"eslint-plugin-react": "7.37.5",
"eslint-plugin-react-hooks": "7.1.1",
"eslint-plugin-react-refresh": "0.5.7",
- "prettier": "3.8.3",
+ "prettier": "3.9.9",
"prettier-plugin-organize-imports": "4.3.0",
"prettier-plugin-packagejson": "3.0.2",
"typescript": "6.0.3",
diff --git a/web/packages/contacts/legacy/components/ActionButton.tsx b/web/packages/contacts/legacy/components/ActionButton.tsx
index 838a5dd32b..d022b266b1 100644
--- a/web/packages/contacts/legacy/components/ActionButton.tsx
+++ b/web/packages/contacts/legacy/components/ActionButton.tsx
@@ -4,11 +4,7 @@ import { isSxArray } from "ente-base/components/utils/sx";
import React from "react";
type ActionButtonType =
- | "primary"
- | "secondary"
- | "critical"
- | "tertiaryCritical"
- | "link";
+ "primary" | "secondary" | "critical" | "tertiaryCritical" | "link";
interface ActionButtonProps extends Omit<ButtonProps, "color" | "variant"> {
buttonType: ActionButtonType;
diff --git a/web/packages/contacts/legacy/types.ts b/web/packages/contacts/legacy/types.ts
index bccd0b4313..f531dabc0f 100644
--- a/web/packages/contacts/legacy/types.ts
+++ b/web/packages/contacts/legacy/types.ts
@@ -7,11 +7,7 @@ export interface LegacyContactRecord {
user: LegacyUser;
emergencyContact: LegacyUser;
state:
- | "INVITED"
- | "REVOKED"
- | "ACCEPTED"
- | "CONTACT_LEFT"
- | "CONTACT_DENIED";
+ "INVITED" | "REVOKED" | "ACCEPTED" | "CONTACT_LEFT" | "CONTACT_DENIED";
recoveryNoticeInDays: number;
}
diff --git a/web/packages/gallery/components/viewer/download-progress.ts b/web/packages/gallery/components/viewer/download-progress.ts
index 2e5e4b9156..8028f7b4d4 100644
--- a/web/packages/gallery/components/viewer/download-progress.ts
+++ b/web/packages/gallery/components/viewer/download-progress.ts
@@ -2,10 +2,7 @@ import type { FileDownloadProgress } from "ente-gallery/services/download-core";
import type { ItemData } from "./data-source-core";
type DownloadProgressPhase =
- | "preparing"
- | "downloading"
- | "decrypting"
- | "failed";
+ "preparing" | "downloading" | "decrypting" | "failed";
export interface DownloadProgressState {
phase: DownloadProgressPhase;
diff --git a/web/packages/gallery/components/viewer/photoswipe-core.ts b/web/packages/gallery/components/viewer/photoswipe-core.ts
index 99bfec6c83..bbc1e40eeb 100644
--- a/web/packages/gallery/components/viewer/photoswipe-core.ts
+++ b/web/packages/gallery/components/viewer/photoswipe-core.ts
@@ -67,11 +67,7 @@ export interface FileViewerPhotoSwipeDelegate<
shouldIgnoreKeyboardEvent: (event: KeyboardEvent) => boolean;
performKeyAction: (
action:
- | "delete"
- | "toggle-archive"
- | "copy"
- | "toggle-fullscreen"
- | "help",
+ "delete" | "toggle-archive" | "copy" | "toggle-fullscreen" | "help",
) => void;
}
@@ -310,8 +306,7 @@ export class FileViewerPhotoSwipe<
let livePhotoPlayInitial = true;
let livePhotoPlayInitialEndedEvent:
- | { listener: () => void; video: HTMLVideoElement }
- | undefined;
+ { listener: () => void; video: HTMLVideoElement } | undefined;
let livePhotoMute = true;
@@ -463,8 +458,7 @@ export class FileViewerPhotoSwipe<
};
let fullscreenUIControlsHideTimer:
- | ReturnType<typeof setTimeout>
- | undefined;
+ ReturnType<typeof setTimeout> | undefined;
let areFullscreenUIControlsHiddenByShortcut = false;
diff --git a/web/packages/gallery/services/upload/index.ts b/web/packages/gallery/services/upload/index.ts
index 57b9acea9e..406e0b58b6 100644
--- a/web/packages/gallery/services/upload/index.ts
+++ b/web/packages/gallery/services/upload/index.ts
@@ -225,11 +225,7 @@ export const toPathOrZipEntry = (fsUploadItem: FileSystemUploadItem) =>
: fsUploadItem.path;
export type UploadPhase =
- | "preparing"
- | "readingMetadata"
- | "uploading"
- | "cancelling"
- | "done";
+ "preparing" | "readingMetadata" | "uploading" | "cancelling" | "done";
export type UploadResult =
| { type: "unsupported" }
diff --git a/web/packages/new/photos/services/app-lock.ts b/web/packages/new/photos/services/app-lock.ts
index 32f1f23353..42b8e991f3 100644
--- a/web/packages/new/photos/services/app-lock.ts
+++ b/web/packages/new/photos/services/app-lock.ts
@@ -724,9 +724,7 @@ export const attemptUnlock = async (input: string): Promise<UnlockResult> => {
};
export type ReauthenticateWithAppLockResult =
- | "authenticated"
- | "cancelled"
- | "fallback";
+ "authenticated" | "cancelled" | "fallback";
export const reauthenticateWithAppLock =
async (): Promise<ReauthenticateWithAppLockResult> => {
diff --git a/web/packages/new/photos/services/ml/clip.ts b/web/packages/new/photos/services/ml/clip.ts
index 7ea304ebc4..049dfb0bfa 100644
--- a/web/packages/new/photos/services/ml/clip.ts
+++ b/web/packages/new/photos/services/ml/clip.ts
@@ -38,8 +38,7 @@ export const _clipMatches = async (
};
let _cachedCLIPIndexes:
- | { fileID: number; embedding: Float32Array }[]
- | undefined;
+ { fileID: number; embedding: Float32Array }[] | undefined;
// Reusing Float32Arrays avoids conversion inside every search.
const cachedOrReadCLIPIndexes = async () =>
diff --git a/web/packages/new/photos/services/search/worker.ts b/web/packages/new/photos/services/search/worker.ts
index a6a032e7b7..89a7506695 100644
--- a/web/packages/new/photos/services/search/worker.ts
+++ b/web/packages/new/photos/services/search/worker.ts
@@ -371,20 +371,16 @@ const locationSuggestions = (
.filter((c) => !matchingLocationTagLNames.has(c.name.toLowerCase()));
return [
- matchingLocationTags.map(
- (locationTag): SearchSuggestion => ({
- type: "location",
- locationTag,
- label: locationTag.name,
- }),
- ),
- matchingCities.map(
- (city): SearchSuggestion => ({
- type: "city",
- city,
- label: city.name,
- }),
- ),
+ matchingLocationTags.map((locationTag): SearchSuggestion => ({
+ type: "location",
+ locationTag,
+ label: locationTag.name,
+ })),
+ matchingCities.map((city): SearchSuggestion => ({
+ type: "city",
+ city,
+ label: city.name,
+ })),
].flat();
};