Merge @/new/shared into @/base

web/apps/accounts/src/pages/passkeys/index.tsx

@@ -1,7 +1,7 @@
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { MenuItemDivider, MenuItemGroup } from "@/base/components/Menu";
+import { Titlebar } from "@/base/components/Titlebar";
 import log from "@/base/log";
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu";
-import { Titlebar } from "@/new/shared/components/Titlebar";
 import { ensure } from "@/utils/ensure";
 import { CenteredFlex } from "@ente/shared/components/Container";
 import DialogBoxV2 from "@ente/shared/components/DialogBoxV2";

web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipant.tsx

@@ -1,5 +1,5 @@
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { Titlebar } from "@/new/shared/components/Titlebar";
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { Titlebar } from "@/base/components/Titlebar";
 import { DialogProps, Stack } from "@mui/material";
 import { t } from "i18next";
 import { COLLECTION_ROLE, Collection } from "types/collection";

web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipantForm.tsx

@@ -2,7 +2,7 @@ import {
     MenuItemDivider,
     MenuItemGroup,
     MenuSectionTitle,
-} from "@/new/shared/components/Menu";
+} from "@/base/components/Menu";
 import { FlexWrapper } from "@ente/shared/components/Container";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import SubmitButton from "@ente/shared/components/SubmitButton";

web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageEmailShare.tsx

@@ -1,10 +1,10 @@
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
+import { EnteDrawer } from "@/base/components/EnteDrawer";
 import {
     MenuItemDivider,
     MenuItemGroup,
     MenuSectionTitle,
-} from "@/new/shared/components/Menu";
-import { Titlebar } from "@/new/shared/components/Titlebar";
+} from "@/base/components/Menu";
+import { Titlebar } from "@/base/components/Titlebar";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import Add from "@mui/icons-material/Add";
 import AdminPanelSettingsIcon from "@mui/icons-material/AdminPanelSettings";

web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageParticipant.tsx

@@ -1,7 +1,7 @@
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { MenuItemDivider, MenuItemGroup } from "@/base/components/Menu";
+import { Titlebar } from "@/base/components/Titlebar";
 import log from "@/base/log";
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu";
-import { Titlebar } from "@/new/shared/components/Titlebar";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import BlockIcon from "@mui/icons-material/Block";
 import DoneIcon from "@mui/icons-material/Done";

web/apps/photos/src/components/Collections/CollectionShare/emailShare/index.tsx

@@ -5,7 +5,7 @@ import {
     MenuItemDivider,
     MenuItemGroup,
     MenuSectionTitle,
-} from "@/new/shared/components/Menu";
+} from "@/base/components/Menu";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import AddIcon from "@mui/icons-material/Add";
 import ChevronRight from "@mui/icons-material/ChevronRight";

web/apps/photos/src/components/Collections/CollectionShare/index.tsx

@@ -1,5 +1,5 @@
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { Titlebar } from "@/new/shared/components/Titlebar";
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { Titlebar } from "@/base/components/Titlebar";
 import { DialogProps, Stack } from "@mui/material";
 import { CollectionSummaryType } from "constants/collection";
 import { t } from "i18next";

web/apps/photos/src/components/Collections/CollectionShare/publicShare/EnablePublicShareOptions.tsx

@@ -2,7 +2,7 @@ import {
     MenuItemDivider,
     MenuItemGroup,
     MenuSectionTitle,
-} from "@/new/shared/components/Menu";
+} from "@/base/components/Menu";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import DownloadSharp from "@mui/icons-material/DownloadSharp";
 import LinkIcon from "@mui/icons-material/Link";

web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/deviceLimit.tsx

@@ -1,6 +1,6 @@
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu";
-import { Titlebar } from "@/new/shared/components/Titlebar";
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { MenuItemDivider, MenuItemGroup } from "@/base/components/Menu";
+import { Titlebar } from "@/base/components/Titlebar";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import ChevronRight from "@mui/icons-material/ChevronRight";
 import { DialogProps, Stack } from "@mui/material";

web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/index.tsx

@@ -1,6 +1,6 @@
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu";
-import { Titlebar } from "@/new/shared/components/Titlebar";
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { MenuItemDivider, MenuItemGroup } from "@/base/components/Menu";
+import { Titlebar } from "@/base/components/Titlebar";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import ContentCopyIcon from "@mui/icons-material/ContentCopy";
 import RemoveCircleOutline from "@mui/icons-material/RemoveCircleOutline";

web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkExpiry.tsx

@@ -1,6 +1,6 @@
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu";
-import { Titlebar } from "@/new/shared/components/Titlebar";
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { MenuItemDivider, MenuItemGroup } from "@/base/components/Menu";
+import { Titlebar } from "@/base/components/Titlebar";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import { formatDateTime } from "@ente/shared/time/format";
 import ChevronRight from "@mui/icons-material/ChevronRight";

web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/publicCollect.tsx

@@ -1,4 +1,4 @@
-import { MenuItemGroup, MenuSectionTitle } from "@/new/shared/components/Menu";
+import { MenuItemGroup, MenuSectionTitle } from "@/base/components/Menu";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import { Stack } from "@mui/material";
 import { t } from "i18next";

web/apps/photos/src/components/Collections/CollectionShare/publicShare/managePublicShare.tsx

@@ -1,4 +1,4 @@
-import { MenuItemDivider, MenuItemGroup } from "@/new/shared/components/Menu";
+import { MenuItemDivider, MenuItemGroup } from "@/base/components/Menu";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 import ContentCopyIcon from "@mui/icons-material/ContentCopyOutlined";

web/apps/photos/src/components/Collections/CollectionShare/sharingDetails.tsx

@@ -2,7 +2,7 @@ import {
     MenuItemDivider,
     MenuItemGroup,
     MenuSectionTitle,
-} from "@/new/shared/components/Menu";
+} from "@/base/components/Menu";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import AdminPanelSettingsIcon from "@mui/icons-material/AdminPanelSettings";
 import ModeEditIcon from "@mui/icons-material/ModeEdit";

web/apps/photos/src/components/PhotoViewer/FileInfo/ExifData.tsx

@@ -1,4 +1,4 @@
-import { Titlebar } from "@/new/shared/components/Titlebar";
+import { Titlebar } from "@/base/components/Titlebar";
 import CopyButton from "@ente/shared/components/CodeBlock/CopyButton";
 import { formatDateTimeFull } from "@ente/shared/time/format";
 import { Box, Stack, styled, Typography } from "@mui/material";

web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx

@@ -1,8 +1,8 @@
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { Titlebar } from "@/base/components/Titlebar";
 import { UnidentifiedFaces } from "@/new/photos/components/PeopleList";
 import { isMLEnabled } from "@/new/photos/services/ml";
 import { EnteFile } from "@/new/photos/types/file";
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { Titlebar } from "@/new/shared/components/Titlebar";
 import CopyButton from "@ente/shared/components/CodeBlock/CopyButton";
 import { FlexWrapper } from "@ente/shared/components/Container";
 import EnteSpinner from "@ente/shared/components/EnteSpinner";

web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/ColoursMenu.tsx

@@ -1,4 +1,4 @@
-import { MenuItemGroup, MenuSectionTitle } from "@/new/shared/components/Menu";
+import { MenuItemGroup, MenuSectionTitle } from "@/base/components/Menu";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import { Box, Slider } from "@mui/material";
 import { t } from "i18next";

web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/CropMenu.tsx

@@ -1,4 +1,4 @@
-import { MenuItemGroup, MenuSectionTitle } from "@/new/shared/components/Menu";
+import { MenuItemGroup, MenuSectionTitle } from "@/base/components/Menu";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import CropIcon from "@mui/icons-material/Crop";
 import { t } from "i18next";

web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/TransformMenu.tsx

@@ -1,9 +1,9 @@
-import log from "@/base/log";
 import {
     MenuItemDivider,
     MenuItemGroup,
     MenuSectionTitle,
-} from "@/new/shared/components/Menu";
+} from "@/base/components/Menu";
+import log from "@/base/log";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import Crop169Icon from "@mui/icons-material/Crop169";
 import Crop32Icon from "@mui/icons-material/Crop32";

web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx

@@ -1,13 +1,13 @@
-import { nameAndExtension } from "@/base/file";
-import log from "@/base/log";
-import downloadManager from "@/new/photos/services/download";
-import { EnteFile } from "@/new/photos/types/file";
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
+import { EnteDrawer } from "@/base/components/EnteDrawer";
 import {
     MenuItemDivider,
     MenuItemGroup,
     MenuSectionTitle,
-} from "@/new/shared/components/Menu";
+} from "@/base/components/Menu";
+import { nameAndExtension } from "@/base/file";
+import log from "@/base/log";
+import downloadManager from "@/new/photos/services/download";
+import { EnteFile } from "@/new/photos/types/file";
 import { ensure } from "@/utils/ensure";
 import {
     CenteredFlex,

web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx

@@ -1,10 +1,10 @@
 import { isDesktop } from "@/base/app";
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { MenuItemGroup, MenuSectionTitle } from "@/base/components/Menu";
+import { Titlebar } from "@/base/components/Titlebar";
 import { pt } from "@/base/i18n";
 import { MLSettingsBeta } from "@/new/photos/components/MLSettingsBeta";
 import { canEnableML } from "@/new/photos/services/ml";
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { MenuItemGroup, MenuSectionTitle } from "@/new/shared/components/Menu";
-import { Titlebar } from "@/new/shared/components/Titlebar";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import ChevronRight from "@mui/icons-material/ChevronRight";
 import ScienceIcon from "@mui/icons-material/Science";

web/apps/photos/src/components/Sidebar/MapSetting.tsx

@@ -1,7 +1,7 @@
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { MenuItemGroup } from "@/base/components/Menu";
+import { Titlebar } from "@/base/components/Titlebar";
 import log from "@/base/log";
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { MenuItemGroup } from "@/new/shared/components/Menu";
-import { Titlebar } from "@/new/shared/components/Titlebar";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import {
     Box,

web/apps/photos/src/components/Sidebar/Preferences.tsx

@@ -1,3 +1,6 @@
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { MenuItemGroup, MenuSectionTitle } from "@/base/components/Menu";
+import { Titlebar } from "@/base/components/Titlebar";
 import {
     getLocaleInUse,
     pt,
@@ -7,9 +10,6 @@ import {
 } from "@/base/i18n";
 import { MLSettings } from "@/new/photos/components/MLSettings";
 import { isMLSupported } from "@/new/photos/services/ml";
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { MenuItemGroup, MenuSectionTitle } from "@/new/shared/components/Menu";
-import { Titlebar } from "@/new/shared/components/Titlebar";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import ChevronRight from "@mui/icons-material/ChevronRight";
 import ScienceIcon from "@mui/icons-material/Science";

web/apps/photos/src/components/Sidebar/index.tsx

@@ -1,9 +1,9 @@
 import { openAccountsManagePasskeysPage } from "@/accounts/services/passkey";
+import { EnteDrawer } from "@/base/components/EnteDrawer";
 import log from "@/base/log";
 import { savedLogs } from "@/base/log-web";
 import { customAPIHost } from "@/base/origins";
 import { initiateEmail, openURL } from "@/new/photos/utils/web";
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
 import { SpaceBetweenFlex } from "@ente/shared/components/Container";
 import { EnteLogo } from "@ente/shared/components/EnteLogo";
 import EnteSpinner from "@ente/shared/components/EnteSpinner";

web/packages/base/tsconfig.json

@@ -1,4 +1,12 @@
 {
     "extends": "@/build-config/tsconfig-next.json",
-    "include": ["."]
+    "compilerOptions": {
+        /* MUI doesn't work with exactOptionalPropertyTypes yet. */
+        "exactOptionalPropertyTypes": false
+    },
+    "include": [
+        ".",
+        "../base/global-electron.d.ts",
+        "../shared/themes/mui-theme.d.ts"
+    ]
 }

web/packages/new/README.md

@@ -1,9 +1,9 @@
 ## @/new
 
 This package only exists so that we can write code that works with TypeScript
-strict mode. This provides a gradual way of migrating the existing code in the
-old packages to strict mode. Once there is sufficient gravity here, we can flip
-the switch on the original packages and move these back to where they came from.
+strict mode. This provides a gradual way of migrating the existing apps code to
+strict mode. Once there is sufficient gravity here, we can flip the switch and
+move these back to where they came from.
 
 ### Packaging
 

web/packages/new/photos/components/MLSettings.tsx

@@ -1,3 +1,6 @@
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { MenuItemGroup } from "@/base/components/Menu";
+import { Titlebar } from "@/base/components/Titlebar";
 import { pt } from "@/base/i18n";
 import log from "@/base/log";
 import {
@@ -7,9 +10,6 @@ import {
     mlStatusSubscribe,
     type MLStatus,
 } from "@/new/photos/services/ml";
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { MenuItemGroup } from "@/new/shared/components/Menu";
-import { Titlebar } from "@/new/shared/components/Titlebar";
 import EnteSpinner from "@ente/shared/components/EnteSpinner";
 import { EnteMenuItem } from "@ente/shared/components/Menu/EnteMenuItem";
 import {

web/packages/new/photos/components/MLSettingsBeta.tsx

@@ -1,6 +1,6 @@
+import { EnteDrawer } from "@/base/components/EnteDrawer";
+import { Titlebar } from "@/base/components/Titlebar";
 import { pt, ut } from "@/base/i18n";
-import { EnteDrawer } from "@/new/shared/components/EnteDrawer";
-import { Titlebar } from "@/new/shared/components/Titlebar";
 import { Box, Stack, Typography, type DialogProps } from "@mui/material";
 import React from "react";
 

web/packages/new/photos/services/ml/embedding.ts

@@ -1,11 +1,8 @@
+import { decryptFileMetadata, encryptFileMetadata } from "@/base/crypto/ente";
 import { authenticatedRequestHeaders, ensureOk } from "@/base/http";
 import log from "@/base/log";
 import { apiURL } from "@/base/origins";
 import type { EnteFile } from "@/new/photos/types/file";
-import {
-    decryptFileMetadata,
-    encryptFileMetadata,
-} from "@/new/shared/crypto/ente";
 import { nullToUndefined } from "@/utils/transform";
 import { z } from "zod";
 import { type RemoteCLIPIndex } from "./clip";