From 88e05f63cd40f221d26fa8041de4640228a0ac38 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Thu, 18 Jul 2024 19:31:31 +0530 Subject: [PATCH] Merge @/new/shared into @/base --- web/apps/accounts/src/pages/passkeys/index.tsx | 6 +++--- .../CollectionShare/emailShare/AddParticipant.tsx | 4 ++-- .../emailShare/AddParticipantForm.tsx | 2 +- .../CollectionShare/emailShare/ManageEmailShare.tsx | 6 +++--- .../CollectionShare/emailShare/ManageParticipant.tsx | 6 +++--- .../Collections/CollectionShare/emailShare/index.tsx | 2 +- .../components/Collections/CollectionShare/index.tsx | 4 ++-- .../publicShare/EnablePublicShareOptions.tsx | 2 +- .../publicShare/manage/deviceLimit.tsx | 6 +++--- .../CollectionShare/publicShare/manage/index.tsx | 6 +++--- .../publicShare/manage/linkExpiry.tsx | 6 +++--- .../publicShare/manage/publicCollect.tsx | 2 +- .../publicShare/managePublicShare.tsx | 2 +- .../Collections/CollectionShare/sharingDetails.tsx | 2 +- .../src/components/PhotoViewer/FileInfo/ExifData.tsx | 2 +- .../src/components/PhotoViewer/FileInfo/index.tsx | 4 ++-- .../PhotoViewer/ImageEditorOverlay/ColoursMenu.tsx | 2 +- .../PhotoViewer/ImageEditorOverlay/CropMenu.tsx | 2 +- .../PhotoViewer/ImageEditorOverlay/TransformMenu.tsx | 4 ++-- .../PhotoViewer/ImageEditorOverlay/index.tsx | 12 ++++++------ .../src/components/Sidebar/AdvancedSettings.tsx | 6 +++--- .../photos/src/components/Sidebar/MapSetting.tsx | 6 +++--- .../photos/src/components/Sidebar/Preferences.tsx | 6 +++--- web/apps/photos/src/components/Sidebar/index.tsx | 2 +- .../{new/shared => base}/components/EnteDrawer.tsx | 0 .../{new/shared => base}/components/Menu.tsx | 0 .../{new/shared => base}/components/Titlebar.tsx | 0 web/packages/{new/shared => base}/crypto/ente.ts | 0 web/packages/base/tsconfig.json | 10 +++++++++- web/packages/new/README.md | 6 +++--- web/packages/new/photos/components/MLSettings.tsx | 6 +++--- .../new/photos/components/MLSettingsBeta.tsx | 4 ++-- web/packages/new/photos/services/ml/embedding.ts | 5 +---- 33 files changed, 69 insertions(+), 64 deletions(-) rename web/packages/{new/shared => base}/components/EnteDrawer.tsx (100%) rename web/packages/{new/shared => base}/components/Menu.tsx (100%) rename web/packages/{new/shared => base}/components/Titlebar.tsx (100%) rename web/packages/{new/shared => base}/crypto/ente.ts (100%) diff --git a/web/apps/accounts/src/pages/passkeys/index.tsx b/web/apps/accounts/src/pages/passkeys/index.tsx index 530002830b..fc45effc8c 100644 --- a/web/apps/accounts/src/pages/passkeys/index.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipant.tsx b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipant.tsx index 5d833642df..080d1c667a 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipant.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipantForm.tsx b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipantForm.tsx index 9bf36991d4..c5aae73e99 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipantForm.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageEmailShare.tsx b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageEmailShare.tsx index 972b11019e..c27c48c529 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageEmailShare.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageParticipant.tsx b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageParticipant.tsx index 7122b3f6ed..dac2329e18 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/ManageParticipant.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/index.tsx b/web/apps/photos/src/components/Collections/CollectionShare/emailShare/index.tsx index 768e91d5e1..8b6e08e2a7 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/emailShare/index.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/index.tsx b/web/apps/photos/src/components/Collections/CollectionShare/index.tsx index 0e675fcafa..e33d60f65d 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/index.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/EnablePublicShareOptions.tsx b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/EnablePublicShareOptions.tsx index e6a9baf3cc..3a1cea2a29 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/EnablePublicShareOptions.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/deviceLimit.tsx b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/deviceLimit.tsx index 4090b08ec1..0e5b769056 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/deviceLimit.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/index.tsx b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/index.tsx index 5cb996e86f..a8f2f96ca0 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/index.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkExpiry.tsx b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkExpiry.tsx index 6cafd68c3b..e2efaca504 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/linkExpiry.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/publicCollect.tsx b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/publicCollect.tsx index 4290cd349f..b97b6978c8 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/manage/publicCollect.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/managePublicShare.tsx b/web/apps/photos/src/components/Collections/CollectionShare/publicShare/managePublicShare.tsx index 1f723ae161..a5e7342c29 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/publicShare/managePublicShare.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Collections/CollectionShare/sharingDetails.tsx b/web/apps/photos/src/components/Collections/CollectionShare/sharingDetails.tsx index 25e3771fc1..ad2abd7f28 100644 --- a/web/apps/photos/src/components/Collections/CollectionShare/sharingDetails.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo/ExifData.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo/ExifData.tsx index d84aa106c3..5e5a93a102 100644 --- a/web/apps/photos/src/components/PhotoViewer/FileInfo/ExifData.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx index d486efb990..87db574144 100644 --- a/web/apps/photos/src/components/PhotoViewer/FileInfo/index.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/ColoursMenu.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/ColoursMenu.tsx index 7f7fcf5112..ef5faf36f2 100644 --- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/ColoursMenu.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/CropMenu.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/CropMenu.tsx index 923998b009..286b26a522 100644 --- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/CropMenu.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/TransformMenu.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/TransformMenu.tsx index 0e04c08b0a..354baeb751 100644 --- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/TransformMenu.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx index d09bac5463..4c7b443c68 100644 --- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx +++ b/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, diff --git a/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx b/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx index 148ddfed2b..5fdcd23852 100644 --- a/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Sidebar/MapSetting.tsx b/web/apps/photos/src/components/Sidebar/MapSetting.tsx index 4735b00bed..4add46cfd9 100644 --- a/web/apps/photos/src/components/Sidebar/MapSetting.tsx +++ b/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, diff --git a/web/apps/photos/src/components/Sidebar/Preferences.tsx b/web/apps/photos/src/components/Sidebar/Preferences.tsx index ff91a86cff..38cccf45de 100644 --- a/web/apps/photos/src/components/Sidebar/Preferences.tsx +++ b/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"; diff --git a/web/apps/photos/src/components/Sidebar/index.tsx b/web/apps/photos/src/components/Sidebar/index.tsx index 64c625f1b6..59a99569cc 100644 --- a/web/apps/photos/src/components/Sidebar/index.tsx +++ b/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"; diff --git a/web/packages/new/shared/components/EnteDrawer.tsx b/web/packages/base/components/EnteDrawer.tsx similarity index 100% rename from web/packages/new/shared/components/EnteDrawer.tsx rename to web/packages/base/components/EnteDrawer.tsx diff --git a/web/packages/new/shared/components/Menu.tsx b/web/packages/base/components/Menu.tsx similarity index 100% rename from web/packages/new/shared/components/Menu.tsx rename to web/packages/base/components/Menu.tsx diff --git a/web/packages/new/shared/components/Titlebar.tsx b/web/packages/base/components/Titlebar.tsx similarity index 100% rename from web/packages/new/shared/components/Titlebar.tsx rename to web/packages/base/components/Titlebar.tsx diff --git a/web/packages/new/shared/crypto/ente.ts b/web/packages/base/crypto/ente.ts similarity index 100% rename from web/packages/new/shared/crypto/ente.ts rename to web/packages/base/crypto/ente.ts diff --git a/web/packages/base/tsconfig.json b/web/packages/base/tsconfig.json index b39c0995b0..6cc3516dd9 100644 --- a/web/packages/base/tsconfig.json +++ b/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" + ] } diff --git a/web/packages/new/README.md b/web/packages/new/README.md index ee7dd46007..3367005b49 100644 --- a/web/packages/new/README.md +++ b/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 diff --git a/web/packages/new/photos/components/MLSettings.tsx b/web/packages/new/photos/components/MLSettings.tsx index 27c7df8229..662ebca94a 100644 --- a/web/packages/new/photos/components/MLSettings.tsx +++ b/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 { diff --git a/web/packages/new/photos/components/MLSettingsBeta.tsx b/web/packages/new/photos/components/MLSettingsBeta.tsx index 5fe6ebc701..db1b83da11 100644 --- a/web/packages/new/photos/components/MLSettingsBeta.tsx +++ b/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"; diff --git a/web/packages/new/photos/services/ml/embedding.ts b/web/packages/new/photos/services/ml/embedding.ts index a144093ee3..2ed43024a2 100644 --- a/web/packages/new/photos/services/ml/embedding.ts +++ b/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";