diff --git a/.github/workflows/web-crowdin-sync.yml b/.github/workflows/web-crowdin-sync.yml index d4a83e3bea..f81e27c352 100644 --- a/.github/workflows/web-crowdin-sync.yml +++ b/.github/workflows/web-crowdin-sync.yml @@ -5,7 +5,7 @@ on: branches: [main] paths: # Run workflow when web's en-US/translation.json is changed - - "web/packages/next/locales/en-US/translation.json" + - "web/packages/base/locales/en-US/translation.json" # Or the workflow itself is changed - ".github/workflows/web-crowdin.yml" schedule: diff --git a/desktop/src/preload.ts b/desktop/src/preload.ts index be11c2d8d4..72f20a2802 100644 --- a/desktop/src/preload.ts +++ b/desktop/src/preload.ts @@ -31,9 +31,9 @@ * and when changing one of them, remember to see if the other two also need * changing: * - * - [renderer] web/packages/next/types/electron.ts contains docs - * - [preload] desktop/src/preload.ts ↕︎ - * - [main] desktop/src/main/ipc.ts contains impl + * - [renderer] web/packages/base/types/ipc.ts contains docs + * - [preload] desktop/src/preload.ts ↕︎ + * - [main] desktop/src/main/ipc.ts contains impl */ import { contextBridge, ipcRenderer, webUtils } from "electron/renderer"; diff --git a/web/apps/accounts/next.config.js b/web/apps/accounts/next.config.js index 81a64d7ddf..5b4c97eaea 100644 --- a/web/apps/accounts/next.config.js +++ b/web/apps/accounts/next.config.js @@ -1 +1 @@ -module.exports = require("@/next/next.config.base.js"); +module.exports = require("@/base/next.config.base.js"); diff --git a/web/apps/accounts/package.json b/web/apps/accounts/package.json index 32c00418b5..279c86a264 100644 --- a/web/apps/accounts/package.json +++ b/web/apps/accounts/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@/accounts": "*", - "@/next": "*", + "@/base": "*", "@ente/shared": "*" }, "devDependencies": { diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx index 2cf427b918..681376fb40 100644 --- a/web/apps/accounts/src/pages/_app.tsx +++ b/web/apps/accounts/src/pages/_app.tsx @@ -1,8 +1,8 @@ -import { staticAppTitle } from "@/next/app"; -import { CustomHead } from "@/next/components/Head"; -import { setupI18n } from "@/next/i18n"; -import { disableDiskLogs } from "@/next/log"; -import { logUnhandledErrorsAndRejections } from "@/next/log-web"; +import { staticAppTitle } from "@/base/app"; +import { CustomHead } from "@/base/components/Head"; +import { setupI18n } from "@/base/i18n"; +import { disableDiskLogs } from "@/base/log"; +import { logUnhandledErrorsAndRejections } from "@/base/log-web"; import { Overlay } from "@ente/shared/components/Container"; import DialogBoxV2 from "@ente/shared/components/DialogBoxV2"; import type { DialogBoxAttributesV2 } from "@ente/shared/components/DialogBoxV2/types"; diff --git a/web/apps/accounts/src/pages/passkeys/index.tsx b/web/apps/accounts/src/pages/passkeys/index.tsx index 1ca210d5f6..530002830b 100644 --- a/web/apps/accounts/src/pages/passkeys/index.tsx +++ b/web/apps/accounts/src/pages/passkeys/index.tsx @@ -1,7 +1,7 @@ +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 log from "@/next/log"; import { ensure } from "@/utils/ensure"; import { CenteredFlex } from "@ente/shared/components/Container"; import DialogBoxV2 from "@ente/shared/components/DialogBoxV2"; diff --git a/web/apps/accounts/src/pages/passkeys/verify.tsx b/web/apps/accounts/src/pages/passkeys/verify.tsx index c9ea3289d9..2ee11e1d29 100644 --- a/web/apps/accounts/src/pages/passkeys/verify.tsx +++ b/web/apps/accounts/src/pages/passkeys/verify.tsx @@ -1,5 +1,5 @@ -import log from "@/next/log"; -import type { TwoFactorAuthorizationResponse } from "@/next/types/credentials"; +import log from "@/base/log"; +import type { TwoFactorAuthorizationResponse } from "@/base/types/credentials"; import { ensure } from "@/utils/ensure"; import { nullToUndefined } from "@/utils/transform"; import { VerticallyCentered } from "@ente/shared/components/Container"; diff --git a/web/apps/accounts/src/services/passkey.ts b/web/apps/accounts/src/services/passkey.ts index 8f2f15b6d2..2dfecaa3b8 100644 --- a/web/apps/accounts/src/services/passkey.ts +++ b/web/apps/accounts/src/services/passkey.ts @@ -1,8 +1,8 @@ -import { clientPackageName } from "@/next/app"; -import { isDevBuild } from "@/next/env"; -import { clientPackageHeader, ensureOk, HTTPError } from "@/next/http"; -import { apiURL } from "@/next/origins"; -import { TwoFactorAuthorizationResponse } from "@/next/types/credentials"; +import { clientPackageName } from "@/base/app"; +import { isDevBuild } from "@/base/env"; +import { clientPackageHeader, ensureOk, HTTPError } from "@/base/http"; +import { apiURL } from "@/base/origins"; +import { TwoFactorAuthorizationResponse } from "@/base/types/credentials"; import { ensure } from "@/utils/ensure"; import { nullToUndefined } from "@/utils/transform"; import { diff --git a/web/apps/accounts/tsconfig.json b/web/apps/accounts/tsconfig.json index 3c203ac714..f961946f4b 100644 --- a/web/apps/accounts/tsconfig.json +++ b/web/apps/accounts/tsconfig.json @@ -9,7 +9,7 @@ "include": [ "src", "next-env.d.ts", - "../../packages/next/global-electron.d.ts", + "../../packages/base/global-electron.d.ts", "../../packages/shared/themes/mui-theme.d.ts" ] } diff --git a/web/apps/auth/next.config.js b/web/apps/auth/next.config.js index 81a64d7ddf..5b4c97eaea 100644 --- a/web/apps/auth/next.config.js +++ b/web/apps/auth/next.config.js @@ -1 +1 @@ -module.exports = require("@/next/next.config.base.js"); +module.exports = require("@/base/next.config.base.js"); diff --git a/web/apps/auth/package.json b/web/apps/auth/package.json index 1da1cfae3d..f43932ccdb 100644 --- a/web/apps/auth/package.json +++ b/web/apps/auth/package.json @@ -4,8 +4,8 @@ "private": true, "dependencies": { "@/accounts": "*", + "@/base": "*", "@/build-config": "*", - "@/next": "*", "@ente/eslint-config": "*", "@ente/shared": "*", "jssha": "~3.3.1", diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx index 8317918741..bea72d79df 100644 --- a/web/apps/auth/src/pages/_app.tsx +++ b/web/apps/auth/src/pages/_app.tsx @@ -1,12 +1,12 @@ import { accountLogout } from "@/accounts/services/logout"; import type { AccountsContextT } from "@/accounts/types/context"; -import { clientPackageName, staticAppTitle } from "@/next/app"; -import { CustomHead } from "@/next/components/Head"; -import { setupI18n } from "@/next/i18n"; +import { clientPackageName, staticAppTitle } from "@/base/app"; +import { CustomHead } from "@/base/components/Head"; +import { setupI18n } from "@/base/i18n"; import { logStartupBanner, logUnhandledErrorsAndRejections, -} from "@/next/log-web"; +} from "@/base/log-web"; import { ensure } from "@/utils/ensure"; import { Overlay } from "@ente/shared/components/Container"; import DialogBoxV2 from "@ente/shared/components/DialogBoxV2"; diff --git a/web/apps/auth/src/services/remote.ts b/web/apps/auth/src/services/remote.ts index 28f3589b8e..f9061110d9 100644 --- a/web/apps/auth/src/services/remote.ts +++ b/web/apps/auth/src/services/remote.ts @@ -1,5 +1,5 @@ -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; +import log from "@/base/log"; +import { apiURL } from "@/base/origins"; import ComlinkCryptoWorker from "@ente/shared/crypto"; import { ApiError, CustomError } from "@ente/shared/error"; import HTTPService from "@ente/shared/network/HTTPService"; diff --git a/web/apps/auth/tsconfig.json b/web/apps/auth/tsconfig.json index 3c203ac714..f961946f4b 100644 --- a/web/apps/auth/tsconfig.json +++ b/web/apps/auth/tsconfig.json @@ -9,7 +9,7 @@ "include": [ "src", "next-env.d.ts", - "../../packages/next/global-electron.d.ts", + "../../packages/base/global-electron.d.ts", "../../packages/shared/themes/mui-theme.d.ts" ] } diff --git a/web/apps/cast/next.config.js b/web/apps/cast/next.config.js index 81a64d7ddf..5b4c97eaea 100644 --- a/web/apps/cast/next.config.js +++ b/web/apps/cast/next.config.js @@ -1 +1 @@ -module.exports = require("@/next/next.config.base.js"); +module.exports = require("@/base/next.config.base.js"); diff --git a/web/apps/cast/package.json b/web/apps/cast/package.json index c2444cead7..5dc3a1fa0f 100644 --- a/web/apps/cast/package.json +++ b/web/apps/cast/package.json @@ -4,8 +4,8 @@ "private": true, "dependencies": { "@/accounts": "*", + "@/base": "*", "@/media": "*", - "@/next": "*", "@ente/eslint-config": "*", "@ente/shared": "*" }, diff --git a/web/apps/cast/src/pages/_app.tsx b/web/apps/cast/src/pages/_app.tsx index ecb3166969..4324431b61 100644 --- a/web/apps/cast/src/pages/_app.tsx +++ b/web/apps/cast/src/pages/_app.tsx @@ -1,7 +1,7 @@ -import { staticAppTitle } from "@/next/app"; -import { CustomHead } from "@/next/components/Head"; -import { disableDiskLogs } from "@/next/log"; -import { logUnhandledErrorsAndRejections } from "@/next/log-web"; +import { staticAppTitle } from "@/base/app"; +import { CustomHead } from "@/base/components/Head"; +import { disableDiskLogs } from "@/base/log"; +import { logUnhandledErrorsAndRejections } from "@/base/log-web"; import { getTheme } from "@ente/shared/themes"; import { THEME_COLOR } from "@ente/shared/themes/constants"; import { CssBaseline, ThemeProvider } from "@mui/material"; diff --git a/web/apps/cast/src/pages/index.tsx b/web/apps/cast/src/pages/index.tsx index 6a27c0d391..ad031f863b 100644 --- a/web/apps/cast/src/pages/index.tsx +++ b/web/apps/cast/src/pages/index.tsx @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import EnteSpinner from "@ente/shared/components/EnteSpinner"; import { styled } from "@mui/material"; import { PairingCode } from "components/PairingCode"; diff --git a/web/apps/cast/src/pages/slideshow.tsx b/web/apps/cast/src/pages/slideshow.tsx index 0915c42392..7dba6c8fd5 100644 --- a/web/apps/cast/src/pages/slideshow.tsx +++ b/web/apps/cast/src/pages/slideshow.tsx @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import { ensure } from "@/utils/ensure"; import { styled } from "@mui/material"; import { FilledCircleCheck } from "components/FilledCircleCheck"; diff --git a/web/apps/cast/src/services/chromecast.ts b/web/apps/cast/src/services/chromecast.ts index b4d79e6f69..0ddbce4cf5 100644 --- a/web/apps/cast/src/services/chromecast.ts +++ b/web/apps/cast/src/services/chromecast.ts @@ -1,6 +1,6 @@ /// -import log from "@/next/log"; +import log from "@/base/log"; export type Cast = typeof cast; diff --git a/web/apps/cast/src/services/detect-type.ts b/web/apps/cast/src/services/detect-type.ts index bbee910290..23469997fa 100644 --- a/web/apps/cast/src/services/detect-type.ts +++ b/web/apps/cast/src/services/detect-type.ts @@ -1,5 +1,5 @@ +import { lowercaseExtension } from "@/base/file"; import { KnownFileTypeInfos } from "@/media/file-type"; -import { lowercaseExtension } from "@/next/file"; import FileType from "file-type"; /** diff --git a/web/apps/cast/src/services/pair.ts b/web/apps/cast/src/services/pair.ts index 1c0124595b..b5646698cc 100644 --- a/web/apps/cast/src/services/pair.ts +++ b/web/apps/cast/src/services/pair.ts @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import { wait } from "@/utils/promise"; import { boxSealOpen, diff --git a/web/apps/cast/src/services/render.ts b/web/apps/cast/src/services/render.ts index 7c9ea8e2c3..0a352ad4cb 100644 --- a/web/apps/cast/src/services/render.ts +++ b/web/apps/cast/src/services/render.ts @@ -5,6 +5,9 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ +import { nameAndExtension } from "@/base/file"; +import log from "@/base/log"; +import { apiURL, customAPIOrigin } from "@/base/origins"; import { FILE_TYPE } from "@/media/file-type"; import { isHEICExtension, needsJPEGConversion } from "@/media/formats"; import { heicToJPEG } from "@/media/heic-convert"; @@ -15,9 +18,6 @@ import type { FileMagicMetadata, FilePublicMagicMetadata, } from "@/new/photos/types/file"; -import { nameAndExtension } from "@/next/file"; -import log from "@/next/log"; -import { apiURL, customAPIOrigin } from "@/next/origins"; import { shuffled } from "@/utils/array"; import { ensure } from "@/utils/ensure"; import { wait } from "@/utils/promise"; diff --git a/web/apps/cast/tsconfig.json b/web/apps/cast/tsconfig.json index 3c203ac714..f961946f4b 100644 --- a/web/apps/cast/tsconfig.json +++ b/web/apps/cast/tsconfig.json @@ -9,7 +9,7 @@ "include": [ "src", "next-env.d.ts", - "../../packages/next/global-electron.d.ts", + "../../packages/base/global-electron.d.ts", "../../packages/shared/themes/mui-theme.d.ts" ] } diff --git a/web/apps/photos/next.config.js b/web/apps/photos/next.config.js index 81a64d7ddf..5b4c97eaea 100644 --- a/web/apps/photos/next.config.js +++ b/web/apps/photos/next.config.js @@ -1 +1 @@ -module.exports = require("@/next/next.config.base.js"); +module.exports = require("@/base/next.config.base.js"); diff --git a/web/apps/photos/package.json b/web/apps/photos/package.json index f3fb32245e..8909c48836 100644 --- a/web/apps/photos/package.json +++ b/web/apps/photos/package.json @@ -4,9 +4,9 @@ "private": true, "dependencies": { "@/accounts": "*", + "@/base": "*", "@/media": "*", "@/new": "*", - "@/next": "*", "@date-io/date-fns": "^2.14.0", "@ente/eslint-config": "*", "@ente/shared": "*", diff --git a/web/apps/photos/src/components/AuthenticateUserModal.tsx b/web/apps/photos/src/components/AuthenticateUserModal.tsx index de25ad676b..8f53879b25 100644 --- a/web/apps/photos/src/components/AuthenticateUserModal.tsx +++ b/web/apps/photos/src/components/AuthenticateUserModal.tsx @@ -1,5 +1,5 @@ import { checkSessionValidity } from "@/accounts/services/session"; -import log from "@/next/log"; +import log from "@/base/log"; import DialogBoxV2 from "@ente/shared/components/DialogBoxV2"; import type { DialogBoxAttributesV2 } from "@ente/shared/components/DialogBoxV2/types"; import VerifyMasterPasswordForm, { diff --git a/web/apps/photos/src/components/Collections/CollectionOptions/AlbumCastDialog.tsx b/web/apps/photos/src/components/Collections/CollectionOptions/AlbumCastDialog.tsx index c56917dbf4..f9d83bd099 100644 --- a/web/apps/photos/src/components/Collections/CollectionOptions/AlbumCastDialog.tsx +++ b/web/apps/photos/src/components/Collections/CollectionOptions/AlbumCastDialog.tsx @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import { VerticallyCentered } from "@ente/shared/components/Container"; import DialogBoxV2 from "@ente/shared/components/DialogBoxV2"; import EnteButton from "@ente/shared/components/EnteButton"; diff --git a/web/apps/photos/src/components/Collections/CollectionOptions/index.tsx b/web/apps/photos/src/components/Collections/CollectionOptions/index.tsx index 5d03331918..fffdd215e1 100644 --- a/web/apps/photos/src/components/Collections/CollectionOptions/index.tsx +++ b/web/apps/photos/src/components/Collections/CollectionOptions/index.tsx @@ -1,5 +1,5 @@ +import log from "@/base/log"; import { VISIBILITY_STATE } from "@/new/photos/types/magicMetadata"; -import log from "@/next/log"; import { HorizontalFlex } from "@ente/shared/components/Container"; import OverflowMenu from "@ente/shared/components/OverflowMenu/menu"; import MoreHoriz from "@mui/icons-material/MoreHoriz"; 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 fd8421ed5d..7122b3f6ed 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 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 log from "@/next/log"; 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/DeleteAccountModal.tsx b/web/apps/photos/src/components/DeleteAccountModal.tsx index ca0dbfeeb8..c12b3932d2 100644 --- a/web/apps/photos/src/components/DeleteAccountModal.tsx +++ b/web/apps/photos/src/components/DeleteAccountModal.tsx @@ -1,5 +1,5 @@ +import log from "@/base/log"; import { initiateEmail } from "@/new/photos/utils/web"; -import log from "@/next/log"; import DialogBoxV2 from "@ente/shared/components/DialogBoxV2"; import EnteButton from "@ente/shared/components/EnteButton"; import { Button, Link, Stack } from "@mui/material"; diff --git a/web/apps/photos/src/components/Directory/index.tsx b/web/apps/photos/src/components/Directory/index.tsx index 2fc4be58ea..37b8e84f5a 100644 --- a/web/apps/photos/src/components/Directory/index.tsx +++ b/web/apps/photos/src/components/Directory/index.tsx @@ -1,5 +1,5 @@ -import { ensureElectron } from "@/next/electron"; -import log from "@/next/log"; +import { ensureElectron } from "@/base/electron"; +import log from "@/base/log"; import LinkButton from "@ente/shared/components/LinkButton"; import { Tooltip, styled } from "@mui/material"; diff --git a/web/apps/photos/src/components/ExportModal.tsx b/web/apps/photos/src/components/ExportModal.tsx index b225bfc1a2..556c37f100 100644 --- a/web/apps/photos/src/components/ExportModal.tsx +++ b/web/apps/photos/src/components/ExportModal.tsx @@ -1,5 +1,5 @@ +import log from "@/base/log"; import { EnteFile } from "@/new/photos/types/file"; -import log from "@/next/log"; import ChangeDirectoryOption from "@ente/shared/components/ChangeDirectoryOption"; import { SpaceBetweenFlex, diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx index a6f8606a08..b8f5e333b7 100644 --- a/web/apps/photos/src/components/PhotoFrame.tsx +++ b/web/apps/photos/src/components/PhotoFrame.tsx @@ -1,8 +1,8 @@ +import log from "@/base/log"; import { FILE_TYPE } from "@/media/file-type"; import DownloadManager from "@/new/photos/services/download"; import type { LivePhotoSourceURL, SourceURLs } from "@/new/photos/types/file"; import { EnteFile } from "@/new/photos/types/file"; -import log from "@/next/log"; import { PHOTOS_PAGES } from "@ente/shared/constants/pages"; import { CustomError } from "@ente/shared/error"; import useMemoSingleThreaded from "@ente/shared/hooks/useMemoSingleThreaded"; diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo/MapBox.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo/MapBox.tsx index c4d552fbc9..e21fc32738 100644 --- a/web/apps/photos/src/components/PhotoViewer/FileInfo/MapBox.tsx +++ b/web/apps/photos/src/components/PhotoViewer/FileInfo/MapBox.tsx @@ -1,4 +1,4 @@ -import { haveWindow } from "@/next/env"; +import { haveWindow } from "@/base/env"; import { styled } from "@mui/material"; import { useEffect, useRef } from "react"; import { MapButton } from "./MapButton"; diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderCaption.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderCaption.tsx index 2eddc5fd33..0535f20836 100644 --- a/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderCaption.tsx +++ b/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderCaption.tsx @@ -1,5 +1,5 @@ +import log from "@/base/log"; import { EnteFile } from "@/new/photos/types/file"; -import log from "@/next/log"; import { FlexWrapper } from "@ente/shared/components/Container"; import Close from "@mui/icons-material/Close"; import Done from "@mui/icons-material/Done"; diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderCreationTime.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderCreationTime.tsx index 85be6a3c1a..83d7554ac3 100644 --- a/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderCreationTime.tsx +++ b/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderCreationTime.tsx @@ -1,5 +1,5 @@ +import log from "@/base/log"; import { EnteFile } from "@/new/photos/types/file"; -import log from "@/next/log"; import { FlexWrapper } from "@ente/shared/components/Container"; import { formatDate, formatTime } from "@ente/shared/time/format"; import CalendarTodayIcon from "@mui/icons-material/CalendarToday"; diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderFileName.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderFileName.tsx index b4a932b9aa..e9443c84c1 100644 --- a/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderFileName.tsx +++ b/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderFileName.tsx @@ -1,8 +1,8 @@ +import { nameAndExtension } from "@/base/file"; +import log from "@/base/log"; import { FILE_TYPE } from "@/media/file-type"; import { EnteFile } from "@/new/photos/types/file"; import { formattedByteSize } from "@/new/photos/utils/units"; -import { nameAndExtension } from "@/next/file"; -import log from "@/next/log"; import { FlexWrapper } from "@ente/shared/components/Container"; import PhotoOutlined from "@mui/icons-material/PhotoOutlined"; import VideocamOutlined from "@mui/icons-material/VideocamOutlined"; diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/TransformMenu.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/TransformMenu.tsx index 9c578c0261..0e04c08b0a 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"; -import log from "@/next/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 94002c664f..d09bac5463 100644 --- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx +++ b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx @@ -1,3 +1,5 @@ +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"; @@ -6,8 +8,6 @@ import { MenuItemGroup, MenuSectionTitle, } from "@/new/shared/components/Menu"; -import { nameAndExtension } from "@/next/file"; -import log from "@/next/log"; import { ensure } from "@/utils/ensure"; import { CenteredFlex, diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx index 9d29c4a3b0..1c16a7a773 100644 --- a/web/apps/photos/src/components/PhotoViewer/index.tsx +++ b/web/apps/photos/src/components/PhotoViewer/index.tsx @@ -1,5 +1,5 @@ +import log from "@/base/log"; import { EnteFile } from "@/new/photos/types/file"; -import log from "@/next/log"; import Photoswipe from "photoswipe"; import PhotoswipeUIDefault from "photoswipe/dist/photoswipe-ui-default"; import { useContext, useEffect, useMemo, useRef, useState } from "react"; @@ -13,13 +13,13 @@ import { getFileFromURL, } from "utils/file"; +import { isDesktop } from "@/base/app"; +import { lowercaseExtension } from "@/base/file"; import { FILE_TYPE } from "@/media/file-type"; import { isHEICExtension, needsJPEGConversion } from "@/media/formats"; import downloadManager from "@/new/photos/services/download"; import type { LoadedLivePhotoSourceURL } from "@/new/photos/types/file"; import { detectFileTypeInfo } from "@/new/photos/utils/detect-type"; -import { isDesktop } from "@/next/app"; -import { lowercaseExtension } from "@/next/file"; import { FlexWrapper } from "@ente/shared/components/Container"; import EnteSpinner from "@ente/shared/components/EnteSpinner"; import AlbumOutlined from "@mui/icons-material/AlbumOutlined"; diff --git a/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx b/web/apps/photos/src/components/Sidebar/AdvancedSettings.tsx index 5dfd95b30c..148ddfed2b 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 { 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 { isDesktop } from "@/next/app"; -import { pt } from "@/next/i18n"; 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 60d71dca66..4735b00bed 100644 --- a/web/apps/photos/src/components/Sidebar/MapSetting.tsx +++ b/web/apps/photos/src/components/Sidebar/MapSetting.tsx @@ -1,7 +1,7 @@ +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 log from "@/next/log"; 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 5aa7fd9ed5..ff91a86cff 100644 --- a/web/apps/photos/src/components/Sidebar/Preferences.tsx +++ b/web/apps/photos/src/components/Sidebar/Preferences.tsx @@ -1,15 +1,15 @@ -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 { getLocaleInUse, pt, setLocaleInUse, supportedLocales, type SupportedLocale, -} from "@/next/i18n"; +} 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 9108d29d2e..64c625f1b6 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 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 log from "@/next/log"; -import { savedLogs } from "@/next/log-web"; -import { customAPIHost } from "@/next/origins"; 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/apps/photos/src/components/Upload/CollectionMappingChoiceModal.tsx b/web/apps/photos/src/components/Upload/CollectionMappingChoiceModal.tsx index 433f4a3b84..509f665ecf 100644 --- a/web/apps/photos/src/components/Upload/CollectionMappingChoiceModal.tsx +++ b/web/apps/photos/src/components/Upload/CollectionMappingChoiceModal.tsx @@ -1,4 +1,4 @@ -import type { CollectionMapping } from "@/next/types/ipc"; +import type { CollectionMapping } from "@/base/types/ipc"; import { CenteredFlex, SpaceBetweenFlex, diff --git a/web/apps/photos/src/components/Upload/Uploader.tsx b/web/apps/photos/src/components/Upload/Uploader.tsx index 3604bef2ad..b6f9598643 100644 --- a/web/apps/photos/src/components/Upload/Uploader.tsx +++ b/web/apps/photos/src/components/Upload/Uploader.tsx @@ -1,12 +1,12 @@ +import { basename } from "@/base/file"; +import log from "@/base/log"; +import type { CollectionMapping, Electron, ZipItem } from "@/base/types/ipc"; import { exportMetadataDirectoryName } from "@/new/photos/services/export"; import type { FileAndPath, UploadItem, } from "@/new/photos/services/upload/types"; import { UPLOAD_STAGES } from "@/new/photos/services/upload/types"; -import { basename } from "@/next/file"; -import log from "@/next/log"; -import type { CollectionMapping, Electron, ZipItem } from "@/next/types/ipc"; import { firstNonEmpty } from "@/utils/array"; import { ensure } from "@/utils/ensure"; import { CustomError } from "@ente/shared/error"; diff --git a/web/apps/photos/src/components/WatchFolder.tsx b/web/apps/photos/src/components/WatchFolder.tsx index 2bcf49b058..5543a6ce13 100644 --- a/web/apps/photos/src/components/WatchFolder.tsx +++ b/web/apps/photos/src/components/WatchFolder.tsx @@ -1,6 +1,6 @@ -import { ensureElectron } from "@/next/electron"; -import { basename, dirname } from "@/next/file"; -import type { CollectionMapping, FolderWatch } from "@/next/types/ipc"; +import { ensureElectron } from "@/base/electron"; +import { basename, dirname } from "@/base/file"; +import type { CollectionMapping, FolderWatch } from "@/base/types/ipc"; import { ensure } from "@/utils/ensure"; import { FlexWrapper, diff --git a/web/apps/photos/src/components/pages/gallery/Avatar.tsx b/web/apps/photos/src/components/pages/gallery/Avatar.tsx index 12d61a34df..b007cd3941 100644 --- a/web/apps/photos/src/components/pages/gallery/Avatar.tsx +++ b/web/apps/photos/src/components/pages/gallery/Avatar.tsx @@ -1,5 +1,5 @@ +import log from "@/base/log"; import { EnteFile } from "@/new/photos/types/file"; -import log from "@/next/log"; import { styled } from "@mui/material"; import { useTheme } from "@mui/material/styles"; import { GalleryContext } from "pages/gallery"; diff --git a/web/apps/photos/src/components/pages/gallery/PlanSelector/card.tsx b/web/apps/photos/src/components/pages/gallery/PlanSelector/card.tsx index 17f0b6e6e7..22c3185a72 100644 --- a/web/apps/photos/src/components/pages/gallery/PlanSelector/card.tsx +++ b/web/apps/photos/src/components/pages/gallery/PlanSelector/card.tsx @@ -1,5 +1,5 @@ +import log from "@/base/log"; import { bytesInGB } from "@/new/photos/utils/units"; -import log from "@/next/log"; import { SpaceBetweenFlex } from "@ente/shared/components/Container"; import { SUPPORT_EMAIL } from "@ente/shared/constants/urls"; import Close from "@mui/icons-material/Close"; diff --git a/web/apps/photos/src/components/pages/gallery/PreviewCard.tsx b/web/apps/photos/src/components/pages/gallery/PreviewCard.tsx index 6a5e8128bb..da0da57d31 100644 --- a/web/apps/photos/src/components/pages/gallery/PreviewCard.tsx +++ b/web/apps/photos/src/components/pages/gallery/PreviewCard.tsx @@ -1,7 +1,7 @@ +import log from "@/base/log"; import { FILE_TYPE } from "@/media/file-type"; import DownloadManager from "@/new/photos/services/download"; import { EnteFile } from "@/new/photos/types/file"; -import log from "@/next/log"; import { Overlay } from "@ente/shared/components/Container"; import { CustomError } from "@ente/shared/error"; import useLongPress from "@ente/shared/hooks/useLongPress"; diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx index 423ad78d6c..df4875cfb1 100644 --- a/web/apps/photos/src/pages/_app.tsx +++ b/web/apps/photos/src/pages/_app.tsx @@ -1,15 +1,15 @@ import type { AccountsContextT } from "@/accounts/types/context"; -import DownloadManager from "@/new/photos/services/download"; -import { initML, isMLSupported } from "@/new/photos/services/ml"; -import { clientPackageName, staticAppTitle } from "@/next/app"; -import { CustomHead } from "@/next/components/Head"; -import { setupI18n } from "@/next/i18n"; -import log from "@/next/log"; +import { clientPackageName, staticAppTitle } from "@/base/app"; +import { CustomHead } from "@/base/components/Head"; +import { setupI18n } from "@/base/i18n"; +import log from "@/base/log"; import { logStartupBanner, logUnhandledErrorsAndRejections, -} from "@/next/log-web"; -import { AppUpdate } from "@/next/types/ipc"; +} from "@/base/log-web"; +import { AppUpdate } from "@/base/types/ipc"; +import DownloadManager from "@/new/photos/services/download"; +import { initML, isMLSupported } from "@/new/photos/services/ml"; import { ensure } from "@/utils/ensure"; import { Overlay } from "@ente/shared/components/Container"; import DialogBox from "@ente/shared/components/DialogBox"; diff --git a/web/apps/photos/src/pages/gallery/index.tsx b/web/apps/photos/src/pages/gallery/index.tsx index bc5994ada1..5eba843bc4 100644 --- a/web/apps/photos/src/pages/gallery/index.tsx +++ b/web/apps/photos/src/pages/gallery/index.tsx @@ -1,3 +1,4 @@ +import log from "@/base/log"; import { WhatsNew } from "@/new/photos/components/WhatsNew"; import { shouldShowWhatsNew } from "@/new/photos/services/changelog"; import downloadManager from "@/new/photos/services/download"; @@ -7,7 +8,6 @@ import { } from "@/new/photos/services/files"; import { EnteFile } from "@/new/photos/types/file"; import { mergeMetadata } from "@/new/photos/utils/file"; -import log from "@/next/log"; import { CenteredFlex } from "@ente/shared/components/Container"; import EnteSpinner from "@ente/shared/components/EnteSpinner"; import { PHOTOS_PAGES as PAGES } from "@ente/shared/constants/pages"; diff --git a/web/apps/photos/src/pages/index.tsx b/web/apps/photos/src/pages/index.tsx index f5e7817bc6..1708b1c137 100644 --- a/web/apps/photos/src/pages/index.tsx +++ b/web/apps/photos/src/pages/index.tsx @@ -1,8 +1,8 @@ import { Login } from "@/accounts/components/Login"; import { SignUp } from "@/accounts/components/SignUp"; +import log from "@/base/log"; +import { albumsAppOrigin, customAPIHost } from "@/base/origins"; import { DevSettings } from "@/new/photos/components/DevSettings"; -import log from "@/next/log"; -import { albumsAppOrigin, customAPIHost } from "@/next/origins"; import { EnteLogo } from "@ente/shared/components/EnteLogo"; import EnteSpinner from "@ente/shared/components/EnteSpinner"; import { PHOTOS_PAGES as PAGES } from "@ente/shared/constants/pages"; diff --git a/web/apps/photos/src/pages/shared-albums/index.tsx b/web/apps/photos/src/pages/shared-albums/index.tsx index b4786e1798..7adcbbf77a 100644 --- a/web/apps/photos/src/pages/shared-albums/index.tsx +++ b/web/apps/photos/src/pages/shared-albums/index.tsx @@ -1,7 +1,7 @@ +import log from "@/base/log"; import downloadManager from "@/new/photos/services/download"; import { EnteFile } from "@/new/photos/types/file"; import { mergeMetadata } from "@/new/photos/utils/file"; -import log from "@/next/log"; import { CenteredFlex, SpaceBetweenFlex, diff --git a/web/apps/photos/src/services/billingService.ts b/web/apps/photos/src/services/billingService.ts index b25a10c872..f6a8f853b7 100644 --- a/web/apps/photos/src/services/billingService.ts +++ b/web/apps/photos/src/services/billingService.ts @@ -1,5 +1,5 @@ -import log from "@/next/log"; -import { apiURL, paymentsAppOrigin } from "@/next/origins"; +import log from "@/base/log"; +import { apiURL, paymentsAppOrigin } from "@/base/origins"; import HTTPService from "@ente/shared/network/HTTPService"; import { LS_KEYS, diff --git a/web/apps/photos/src/services/collectionService.ts b/web/apps/photos/src/services/collectionService.ts index ebb50c3299..336742b0f2 100644 --- a/web/apps/photos/src/services/collectionService.ts +++ b/web/apps/photos/src/services/collectionService.ts @@ -1,3 +1,5 @@ +import log from "@/base/log"; +import { apiURL } from "@/base/origins"; import { getLocalFiles } from "@/new/photos/services/files"; import { EnteFile } from "@/new/photos/types/file"; import { @@ -6,8 +8,6 @@ import { UpdateMagicMetadataRequest, VISIBILITY_STATE, } from "@/new/photos/types/magicMetadata"; -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; import ComlinkCryptoWorker from "@ente/shared/crypto"; import { CustomError } from "@ente/shared/error"; import HTTPService from "@ente/shared/network/HTTPService"; diff --git a/web/apps/photos/src/services/deduplicationService.ts b/web/apps/photos/src/services/deduplicationService.ts index 613289c883..20a558c5e2 100644 --- a/web/apps/photos/src/services/deduplicationService.ts +++ b/web/apps/photos/src/services/deduplicationService.ts @@ -1,9 +1,9 @@ +import log from "@/base/log"; +import { apiURL } from "@/base/origins"; import { hasFileHash } from "@/media/file"; import { FILE_TYPE } from "@/media/file-type"; import type { Metadata } from "@/media/types/file"; import { EnteFile } from "@/new/photos/types/file"; -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; import HTTPService from "@ente/shared/network/HTTPService"; import { getToken } from "@ente/shared/storage/localStorage/helpers"; diff --git a/web/apps/photos/src/services/entityService.ts b/web/apps/photos/src/services/entityService.ts index 8a8f5322a7..1e418aa2c6 100644 --- a/web/apps/photos/src/services/entityService.ts +++ b/web/apps/photos/src/services/entityService.ts @@ -1,5 +1,5 @@ -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; +import log from "@/base/log"; +import { apiURL } from "@/base/origins"; import ComlinkCryptoWorker from "@ente/shared/crypto"; import HTTPService from "@ente/shared/network/HTTPService"; import localForage from "@ente/shared/storage/localForage"; diff --git a/web/apps/photos/src/services/exif.ts b/web/apps/photos/src/services/exif.ts index d483dec745..cd4ca289d6 100644 --- a/web/apps/photos/src/services/exif.ts +++ b/web/apps/photos/src/services/exif.ts @@ -1,10 +1,10 @@ +import log from "@/base/log"; import { type FileTypeInfo } from "@/media/file-type"; import { NULL_LOCATION } from "@/new/photos/services/upload/types"; import type { Location, ParsedExtractedMetadata, } from "@/new/photos/types/metadata"; -import log from "@/next/log"; import { validateAndGetCreationUnixTimeInMicroSeconds } from "@ente/shared/time"; import exifr from "exifr"; import piexif from "piexifjs"; diff --git a/web/apps/photos/src/services/export/index.ts b/web/apps/photos/src/services/export/index.ts index 80f866312e..4a10585fa6 100644 --- a/web/apps/photos/src/services/export/index.ts +++ b/web/apps/photos/src/services/export/index.ts @@ -1,3 +1,5 @@ +import { ensureElectron } from "@/base/electron"; +import log from "@/base/log"; import { FILE_TYPE } from "@/media/file-type"; import { decodeLivePhoto } from "@/media/live-photo"; import type { Metadata } from "@/media/types/file"; @@ -11,8 +13,6 @@ import { EnteFile } from "@/new/photos/types/file"; import { mergeMetadata } from "@/new/photos/utils/file"; import { safeDirectoryName, safeFileName } from "@/new/photos/utils/native-fs"; import { writeStream } from "@/new/photos/utils/native-stream"; -import { ensureElectron } from "@/next/electron"; -import log from "@/next/log"; import { wait } from "@/utils/promise"; import { CustomError } from "@ente/shared/error"; import { Events, eventBus } from "@ente/shared/events"; diff --git a/web/apps/photos/src/services/export/migration.ts b/web/apps/photos/src/services/export/migration.ts index 1dfbe49d60..978319c48f 100644 --- a/web/apps/photos/src/services/export/migration.ts +++ b/web/apps/photos/src/services/export/migration.ts @@ -1,3 +1,6 @@ +import { ensureElectron } from "@/base/electron"; +import { nameAndExtension } from "@/base/file"; +import log from "@/base/log"; import { FILE_TYPE } from "@/media/file-type"; import { decodeLivePhoto } from "@/media/live-photo"; import downloadManager from "@/new/photos/services/download"; @@ -10,9 +13,6 @@ import { safeFileName, sanitizeFilename, } from "@/new/photos/utils/native-fs"; -import { ensureElectron } from "@/next/electron"; -import { nameAndExtension } from "@/next/file"; -import log from "@/next/log"; import { wait } from "@/utils/promise"; import { LS_KEYS, getData } from "@ente/shared/storage/localStorage"; import type { User } from "@ente/shared/user/types"; diff --git a/web/apps/photos/src/services/fileService.ts b/web/apps/photos/src/services/fileService.ts index 14ad8ddfaa..a42701eca8 100644 --- a/web/apps/photos/src/services/fileService.ts +++ b/web/apps/photos/src/services/fileService.ts @@ -1,3 +1,5 @@ +import log from "@/base/log"; +import { apiURL } from "@/base/origins"; import { getLocalFiles, setLocalFiles } from "@/new/photos/services/files"; import { EncryptedEnteFile, @@ -8,8 +10,6 @@ import { } from "@/new/photos/types/file"; import { BulkUpdateMagicMetadataRequest } from "@/new/photos/types/magicMetadata"; import { mergeMetadata } from "@/new/photos/utils/file"; -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; import ComlinkCryptoWorker from "@ente/shared/crypto"; import HTTPService from "@ente/shared/network/HTTPService"; import { getToken } from "@ente/shared/storage/localStorage/helpers"; diff --git a/web/apps/photos/src/services/fix-exif.ts b/web/apps/photos/src/services/fix-exif.ts index fc504ea622..a0a8539eb8 100644 --- a/web/apps/photos/src/services/fix-exif.ts +++ b/web/apps/photos/src/services/fix-exif.ts @@ -1,8 +1,8 @@ +import log from "@/base/log"; import { FILE_TYPE } from "@/media/file-type"; import downloadManager from "@/new/photos/services/download"; import { EnteFile } from "@/new/photos/types/file"; import { detectFileTypeInfo } from "@/new/photos/utils/detect-type"; -import log from "@/next/log"; import { validateAndGetCreationUnixTimeInMicroSeconds } from "@ente/shared/time"; import type { FixOption } from "components/FixCreationTime"; import { diff --git a/web/apps/photos/src/services/locationSearchService.ts b/web/apps/photos/src/services/locationSearchService.ts index 07c805bac0..d28e8190da 100644 --- a/web/apps/photos/src/services/locationSearchService.ts +++ b/web/apps/photos/src/services/locationSearchService.ts @@ -1,5 +1,5 @@ +import log from "@/base/log"; import type { Location } from "@/new/photos/types/metadata"; -import log from "@/next/log"; import type { LocationTagData } from "types/entity"; export interface City { diff --git a/web/apps/photos/src/services/logout.ts b/web/apps/photos/src/services/logout.ts index 4acc0927d3..9722757689 100644 --- a/web/apps/photos/src/services/logout.ts +++ b/web/apps/photos/src/services/logout.ts @@ -1,8 +1,8 @@ import { accountLogout } from "@/accounts/services/logout"; +import log from "@/base/log"; import DownloadManager from "@/new/photos/services/download"; import { clearFeatureFlagSessionState } from "@/new/photos/services/feature-flags"; import { logoutML, terminateMLWorker } from "@/new/photos/services/ml"; -import log from "@/next/log"; import exportService from "./export"; /** diff --git a/web/apps/photos/src/services/publicCollectionService.ts b/web/apps/photos/src/services/publicCollectionService.ts index e680f6c490..9c1bed78df 100644 --- a/web/apps/photos/src/services/publicCollectionService.ts +++ b/web/apps/photos/src/services/publicCollectionService.ts @@ -1,7 +1,7 @@ +import log from "@/base/log"; +import { apiURL } from "@/base/origins"; import { EncryptedEnteFile, EnteFile } from "@/new/photos/types/file"; import { mergeMetadata } from "@/new/photos/utils/file"; -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; import ComlinkCryptoWorker from "@ente/shared/crypto"; import { CustomError, parseSharingErrorCodes } from "@ente/shared/error"; import HTTPService from "@ente/shared/network/HTTPService"; diff --git a/web/apps/photos/src/services/searchService.ts b/web/apps/photos/src/services/searchService.ts index b424893b4e..94587d40b1 100644 --- a/web/apps/photos/src/services/searchService.ts +++ b/web/apps/photos/src/services/searchService.ts @@ -1,3 +1,6 @@ +import { isDesktop } from "@/base/app"; +import { ensureElectron } from "@/base/electron"; +import log from "@/base/log"; import { FILE_TYPE } from "@/media/file-type"; import { isMLEnabled, @@ -7,9 +10,6 @@ import { import { clipMatches } from "@/new/photos/services/ml/clip"; import type { Person } from "@/new/photos/services/ml/people"; import { EnteFile } from "@/new/photos/types/file"; -import { isDesktop } from "@/next/app"; -import { ensureElectron } from "@/next/electron"; -import log from "@/next/log"; import * as chrono from "chrono-node"; import { t } from "i18next"; import { Collection } from "types/collection"; diff --git a/web/apps/photos/src/services/trashService.ts b/web/apps/photos/src/services/trashService.ts index b3762be3bf..73d2f2a44f 100644 --- a/web/apps/photos/src/services/trashService.ts +++ b/web/apps/photos/src/services/trashService.ts @@ -1,11 +1,11 @@ +import log from "@/base/log"; +import { apiURL } from "@/base/origins"; import { getLocalTrash, getTrashedFiles, TRASH, } from "@/new/photos/services/files"; import { EncryptedTrashItem, Trash } from "@/new/photos/types/file"; -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; import HTTPService from "@ente/shared/network/HTTPService"; import localForage from "@ente/shared/storage/localForage"; import { getToken } from "@ente/shared/storage/localStorage/helpers"; diff --git a/web/apps/photos/src/services/upload/date.ts b/web/apps/photos/src/services/upload/date.ts index 89934e37ce..d70e00b5ef 100644 --- a/web/apps/photos/src/services/upload/date.ts +++ b/web/apps/photos/src/services/upload/date.ts @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import { validateAndGetCreationUnixTimeInMicroSeconds } from "@ente/shared/time"; /** diff --git a/web/apps/photos/src/services/upload/publicUploadHttpClient.ts b/web/apps/photos/src/services/upload/publicUploadHttpClient.ts index 063d645173..2b983bd8a2 100644 --- a/web/apps/photos/src/services/upload/publicUploadHttpClient.ts +++ b/web/apps/photos/src/services/upload/publicUploadHttpClient.ts @@ -1,6 +1,6 @@ +import log from "@/base/log"; +import { apiURL } from "@/base/origins"; import { EnteFile } from "@/new/photos/types/file"; -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; import { CustomError, handleUploadError } from "@ente/shared/error"; import HTTPService from "@ente/shared/network/HTTPService"; import { retryHTTPCall } from "./uploadHttpClient"; diff --git a/web/apps/photos/src/services/upload/takeout.ts b/web/apps/photos/src/services/upload/takeout.ts index e0b1307ed9..cdb2880d8f 100644 --- a/web/apps/photos/src/services/upload/takeout.ts +++ b/web/apps/photos/src/services/upload/takeout.ts @@ -1,12 +1,12 @@ /** @file Dealing with the JSON metadata in Google Takeouts */ +import { ensureElectron } from "@/base/electron"; +import { nameAndExtension } from "@/base/file"; +import log from "@/base/log"; import type { UploadItem } from "@/new/photos/services/upload/types"; import { NULL_LOCATION } from "@/new/photos/services/upload/types"; import type { Location } from "@/new/photos/types/metadata"; import { readStream } from "@/new/photos/utils/native-stream"; -import { ensureElectron } from "@/next/electron"; -import { nameAndExtension } from "@/next/file"; -import log from "@/next/log"; export interface ParsedMetadataJSON { creationTime: number; diff --git a/web/apps/photos/src/services/upload/thumbnail.ts b/web/apps/photos/src/services/upload/thumbnail.ts index 255bc68ca3..6c3f769ad8 100644 --- a/web/apps/photos/src/services/upload/thumbnail.ts +++ b/web/apps/photos/src/services/upload/thumbnail.ts @@ -1,3 +1,5 @@ +import log from "@/base/log"; +import { type Electron } from "@/base/types/ipc"; import { FILE_TYPE, type FileTypeInfo } from "@/media/file-type"; import { heicToJPEG } from "@/media/heic-convert"; import { scaledImageDimensions } from "@/media/image"; @@ -6,8 +8,6 @@ import { toDataOrPathOrZipEntry, type DesktopUploadItem, } from "@/new/photos/services/upload/types"; -import log from "@/next/log"; -import { type Electron } from "@/next/types/ipc"; import { ensure } from "@/utils/ensure"; import { withTimeout } from "@/utils/promise"; diff --git a/web/apps/photos/src/services/upload/uploadHttpClient.ts b/web/apps/photos/src/services/upload/uploadHttpClient.ts index 3f9bafb6a7..0eb115d660 100644 --- a/web/apps/photos/src/services/upload/uploadHttpClient.ts +++ b/web/apps/photos/src/services/upload/uploadHttpClient.ts @@ -1,6 +1,6 @@ +import log from "@/base/log"; +import { apiURL, uploaderOrigin } from "@/base/origins"; import { EnteFile } from "@/new/photos/types/file"; -import log from "@/next/log"; -import { apiURL, uploaderOrigin } from "@/next/origins"; import { wait } from "@/utils/promise"; import { CustomError, handleUploadError } from "@ente/shared/error"; import HTTPService from "@ente/shared/network/HTTPService"; diff --git a/web/apps/photos/src/services/upload/uploadManager.ts b/web/apps/photos/src/services/upload/uploadManager.ts index f5feeda6ff..53846150b9 100644 --- a/web/apps/photos/src/services/upload/uploadManager.ts +++ b/web/apps/photos/src/services/upload/uploadManager.ts @@ -1,3 +1,8 @@ +import { ensureElectron } from "@/base/electron"; +import { lowercaseExtension, nameAndExtension } from "@/base/file"; +import log from "@/base/log"; +import type { Electron } from "@/base/types/ipc"; +import { ComlinkWorker } from "@/base/worker/comlink-worker"; import { FILE_TYPE } from "@/media/file-type"; import { potentialFileTypeFromExtension } from "@/media/live-photo"; import { getLocalFiles } from "@/new/photos/services/files"; @@ -9,11 +14,6 @@ import { UPLOAD_STAGES, } from "@/new/photos/services/upload/types"; import { EncryptedEnteFile, EnteFile } from "@/new/photos/types/file"; -import { ensureElectron } from "@/next/electron"; -import { lowercaseExtension, nameAndExtension } from "@/next/file"; -import log from "@/next/log"; -import type { Electron } from "@/next/types/ipc"; -import { ComlinkWorker } from "@/next/worker/comlink-worker"; import { ensure } from "@/utils/ensure"; import { wait } from "@/utils/promise"; import { getDedicatedCryptoWorker } from "@ente/shared/crypto"; diff --git a/web/apps/photos/src/services/upload/uploadService.ts b/web/apps/photos/src/services/upload/uploadService.ts index 846c2d6f59..f2bdb11ab8 100644 --- a/web/apps/photos/src/services/upload/uploadService.ts +++ b/web/apps/photos/src/services/upload/uploadService.ts @@ -1,3 +1,7 @@ +import { ensureElectron } from "@/base/electron"; +import { basename } from "@/base/file"; +import log from "@/base/log"; +import { CustomErrorMessage } from "@/base/types/ipc"; import { hasFileHash } from "@/media/file"; import { FILE_TYPE, type FileTypeInfo } from "@/media/file-type"; import { encodeLivePhoto } from "@/media/live-photo"; @@ -21,10 +25,6 @@ import { EncryptedMagicMetadata } from "@/new/photos/types/magicMetadata"; import type { ParsedExtractedMetadata } from "@/new/photos/types/metadata"; import { detectFileTypeInfoFromChunk } from "@/new/photos/utils/detect-type"; import { readStream } from "@/new/photos/utils/native-stream"; -import { ensureElectron } from "@/next/electron"; -import { basename } from "@/next/file"; -import log from "@/next/log"; -import { CustomErrorMessage } from "@/next/types/ipc"; import { ensure } from "@/utils/ensure"; import { DedicatedCryptoWorker } from "@ente/shared/crypto/internal/crypto.worker"; import type { B64EncryptionResult } from "@ente/shared/crypto/internal/libsodium"; diff --git a/web/apps/photos/src/services/userService.ts b/web/apps/photos/src/services/userService.ts index 4c6e17e826..3a27470fe2 100644 --- a/web/apps/photos/src/services/userService.ts +++ b/web/apps/photos/src/services/userService.ts @@ -1,6 +1,6 @@ import { putAttributes } from "@/accounts/api/user"; -import log from "@/next/log"; -import { apiURL, customAPIOrigin, familyAppOrigin } from "@/next/origins"; +import log from "@/base/log"; +import { apiURL, customAPIOrigin, familyAppOrigin } from "@/base/origins"; import { ApiError } from "@ente/shared/error"; import HTTPService from "@ente/shared/network/HTTPService"; import { LS_KEYS, getData } from "@ente/shared/storage/localStorage"; diff --git a/web/apps/photos/src/services/watch.ts b/web/apps/photos/src/services/watch.ts index fd381e278c..bbac30cae7 100644 --- a/web/apps/photos/src/services/watch.ts +++ b/web/apps/photos/src/services/watch.ts @@ -3,17 +3,17 @@ * watch folders functionality. */ -import { getLocalFiles } from "@/new/photos/services/files"; -import { UPLOAD_RESULT } from "@/new/photos/services/upload/types"; -import { EncryptedEnteFile } from "@/new/photos/types/file"; -import { ensureElectron } from "@/next/electron"; -import { basename, dirname } from "@/next/file"; -import log from "@/next/log"; +import { ensureElectron } from "@/base/electron"; +import { basename, dirname } from "@/base/file"; +import log from "@/base/log"; import type { CollectionMapping, FolderWatch, FolderWatchSyncedFile, -} from "@/next/types/ipc"; +} from "@/base/types/ipc"; +import { getLocalFiles } from "@/new/photos/services/files"; +import { UPLOAD_RESULT } from "@/new/photos/services/upload/types"; +import { EncryptedEnteFile } from "@/new/photos/types/file"; import { ensureString } from "@/utils/ensure"; import debounce from "debounce"; import uploadManager, { diff --git a/web/apps/photos/src/utils/billing/index.ts b/web/apps/photos/src/utils/billing/index.ts index 2afe4f395f..bb9fdfbd70 100644 --- a/web/apps/photos/src/utils/billing/index.ts +++ b/web/apps/photos/src/utils/billing/index.ts @@ -1,5 +1,5 @@ +import log from "@/base/log"; import { openURL } from "@/new/photos/utils/web"; -import log from "@/next/log"; import { SetDialogBoxAttributes } from "@ente/shared/components/DialogBox/types"; import { LS_KEYS, getData } from "@ente/shared/storage/localStorage"; import { REDIRECTS, getRedirectURL } from "constants/redirects"; diff --git a/web/apps/photos/src/utils/collection/index.ts b/web/apps/photos/src/utils/collection/index.ts index d6081567f3..1510f49e69 100644 --- a/web/apps/photos/src/utils/collection/index.ts +++ b/web/apps/photos/src/utils/collection/index.ts @@ -1,9 +1,9 @@ +import { ensureElectron } from "@/base/electron"; +import log from "@/base/log"; import { getAllLocalFiles, getLocalFiles } from "@/new/photos/services/files"; import { EnteFile } from "@/new/photos/types/file"; import { SUB_TYPE, VISIBILITY_STATE } from "@/new/photos/types/magicMetadata"; import { safeDirectoryName } from "@/new/photos/utils/native-fs"; -import { ensureElectron } from "@/next/electron"; -import log from "@/next/log"; import { CustomError } from "@ente/shared/error"; import { LS_KEYS, getData } from "@ente/shared/storage/localStorage"; import { getUnixTimeInMicroSecondsWithDelta } from "@ente/shared/time"; diff --git a/web/apps/photos/src/utils/comlink/ComlinkSearchWorker.ts b/web/apps/photos/src/utils/comlink/ComlinkSearchWorker.ts index 51c924b5ae..7ba6a67bf3 100644 --- a/web/apps/photos/src/utils/comlink/ComlinkSearchWorker.ts +++ b/web/apps/photos/src/utils/comlink/ComlinkSearchWorker.ts @@ -1,5 +1,5 @@ -import { haveWindow } from "@/next/env"; -import { ComlinkWorker } from "@/next/worker/comlink-worker"; +import { haveWindow } from "@/base/env"; +import { ComlinkWorker } from "@/base/worker/comlink-worker"; import type { Remote } from "comlink"; import { type DedicatedSearchWorker } from "worker/search.worker"; diff --git a/web/apps/photos/src/utils/file/index.ts b/web/apps/photos/src/utils/file/index.ts index 5ae7ace527..363361307a 100644 --- a/web/apps/photos/src/utils/file/index.ts +++ b/web/apps/photos/src/utils/file/index.ts @@ -1,3 +1,6 @@ +import { lowercaseExtension } from "@/base/file"; +import log from "@/base/log"; +import { type Electron } from "@/base/types/ipc"; import { FILE_TYPE } from "@/media/file-type"; import { decodeLivePhoto } from "@/media/live-photo"; import DownloadManager from "@/new/photos/services/download"; @@ -15,9 +18,6 @@ import { detectFileTypeInfo } from "@/new/photos/utils/detect-type"; import { mergeMetadata } from "@/new/photos/utils/file"; import { safeFileName } from "@/new/photos/utils/native-fs"; import { writeStream } from "@/new/photos/utils/native-stream"; -import { lowercaseExtension } from "@/next/file"; -import log from "@/next/log"; -import { type Electron } from "@/next/types/ipc"; import { withTimeout } from "@/utils/promise"; import ComlinkCryptoWorker from "@ente/shared/crypto"; import { LS_KEYS, getData } from "@ente/shared/storage/localStorage"; diff --git a/web/apps/photos/src/utils/photoFrame/index.ts b/web/apps/photos/src/utils/photoFrame/index.ts index 8049d8ba01..4a7f589a81 100644 --- a/web/apps/photos/src/utils/photoFrame/index.ts +++ b/web/apps/photos/src/utils/photoFrame/index.ts @@ -1,7 +1,7 @@ +import log from "@/base/log"; import { FILE_TYPE } from "@/media/file-type"; import type { LivePhotoSourceURL, SourceURLs } from "@/new/photos/types/file"; import { EnteFile } from "@/new/photos/types/file"; -import log from "@/next/log"; import { SetSelectedState } from "types/gallery"; export async function playVideo(livePhotoVideo, livePhotoImage) { diff --git a/web/apps/photos/src/utils/ui/index.tsx b/web/apps/photos/src/utils/ui/index.tsx index f8c0d6cb12..c2254754e2 100644 --- a/web/apps/photos/src/utils/ui/index.tsx +++ b/web/apps/photos/src/utils/ui/index.tsx @@ -1,6 +1,6 @@ +import { ensureElectron } from "@/base/electron"; +import { AppUpdate } from "@/base/types/ipc"; import { openURL } from "@/new/photos/utils/web"; -import { ensureElectron } from "@/next/electron"; -import { AppUpdate } from "@/next/types/ipc"; import { DialogBoxAttributes } from "@ente/shared/components/DialogBox/types"; import AutoAwesomeOutlinedIcon from "@mui/icons-material/AutoAwesomeOutlined"; import InfoOutlined from "@mui/icons-material/InfoRounded"; diff --git a/web/apps/photos/src/utils/user/family.ts b/web/apps/photos/src/utils/user/family.ts index c3420b41ac..68d17ece07 100644 --- a/web/apps/photos/src/utils/user/family.ts +++ b/web/apps/photos/src/utils/user/family.ts @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import { LS_KEYS, getData } from "@ente/shared/storage/localStorage"; import type { User } from "@ente/shared/user/types"; import { FamilyData, FamilyMember } from "types/user"; diff --git a/web/apps/photos/tsconfig.json b/web/apps/photos/tsconfig.json index cfe85e6d70..413a12c6c1 100644 --- a/web/apps/photos/tsconfig.json +++ b/web/apps/photos/tsconfig.json @@ -22,7 +22,7 @@ "**/*.tsx", "**/*.js", "../../packages/shared/themes/mui-theme.d.ts", - "../../packages/next/global-electron.d.ts" + "../../packages/base/global-electron.d.ts" ], "exclude": ["node_modules", "out", ".next", "thirdparty"] } diff --git a/web/crowdin.yml b/web/crowdin.yml index b7ae68bc6d..369f4a179e 100644 --- a/web/crowdin.yml +++ b/web/crowdin.yml @@ -1,5 +1,5 @@ api_token_env: CROWDIN_PERSONAL_TOKEN files: - - source: /packages/next/locales/en-US/translation.json - translation: /packages/next/locales/%locale%/translation.json + - source: /packages/base/locales/en-US/translation.json + translation: /packages/base/locales/%locale%/translation.json diff --git a/web/docs/translations.md b/web/docs/translations.md index e48b343633..aec15da07c 100644 --- a/web/docs/translations.md +++ b/web/docs/translations.md @@ -4,7 +4,7 @@ We use Crowdin for translations, and the `i18next` library to load these at runtime. Within our project we have the _source_ strings - these are the key value pairs -in the `packages/next/locales/en-US/translation.json` file. +in the `packages/base/locales/en-US/translation.json` file. Volunteers can add a new _translation_ in their language corresponding to each such source key-value to our @@ -25,7 +25,7 @@ from Crowdin, but these two should be no-ops. ## Adding a new string -- Add a new entry in `packages/next/locales/en-US/translation.json` (the +- Add a new entry in `packages/base/locales/en-US/translation.json` (the **source `translation.json`**). - Use the new key in code with the `t` function (`import { t } from "i18next"`). diff --git a/web/packages/accounts/api/srp.ts b/web/packages/accounts/api/srp.ts index 8c6496eae8..7259e8c5ac 100644 --- a/web/packages/accounts/api/srp.ts +++ b/web/packages/accounts/api/srp.ts @@ -1,5 +1,5 @@ -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; +import log from "@/base/log"; +import { apiURL } from "@/base/origins"; import { ApiError, CustomError } from "@ente/shared/error"; import HTTPService from "@ente/shared/network/HTTPService"; import { HttpStatusCode } from "axios"; diff --git a/web/packages/accounts/api/user.ts b/web/packages/accounts/api/user.ts index f77e14480d..9e22a5ab68 100644 --- a/web/packages/accounts/api/user.ts +++ b/web/packages/accounts/api/user.ts @@ -5,8 +5,8 @@ import type { TwoFactorVerificationResponse, UserVerificationResponse, } from "@/accounts/types/user"; -import { appName } from "@/next/app"; -import { apiURL } from "@/next/origins"; +import { appName } from "@/base/app"; +import { apiURL } from "@/base/origins"; import type { B64EncryptionResult } from "@ente/shared/crypto/internal/libsodium"; import { ApiError, CustomError } from "@ente/shared/error"; import HTTPService from "@ente/shared/network/HTTPService"; diff --git a/web/packages/accounts/components/Login.tsx b/web/packages/accounts/components/Login.tsx index 206729a5b7..380ebf66f1 100644 --- a/web/packages/accounts/components/Login.tsx +++ b/web/packages/accounts/components/Login.tsx @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import FormPaperFooter from "@ente/shared/components/Form/FormPaper/Footer"; import FormPaperTitle from "@ente/shared/components/Form/FormPaper/Title"; import LinkButton from "@ente/shared/components/LinkButton"; diff --git a/web/packages/accounts/components/SignUp.tsx b/web/packages/accounts/components/SignUp.tsx index f485032579..19c1bbc33b 100644 --- a/web/packages/accounts/components/SignUp.tsx +++ b/web/packages/accounts/components/SignUp.tsx @@ -3,7 +3,7 @@ import { PasswordStrengthHint } from "@/accounts/components/PasswordStrength"; import { PAGES } from "@/accounts/constants/pages"; import { isWeakPassword } from "@/accounts/utils"; import { generateKeyAndSRPAttributes } from "@/accounts/utils/srp"; -import log from "@/next/log"; +import log from "@/base/log"; import { LS_KEYS, setLSUser } from "@ente/shared//storage/localStorage"; import { VerticallyCentered } from "@ente/shared/components/Container"; import FormPaperFooter from "@ente/shared/components/Form/FormPaper/Footer"; diff --git a/web/packages/accounts/package.json b/web/packages/accounts/package.json index d121d5b8fd..574276df1a 100644 --- a/web/packages/accounts/package.json +++ b/web/packages/accounts/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@/next": "*", + "@/base": "*", "@ente/eslint-config": "*", "@ente/shared": "*" } diff --git a/web/packages/accounts/pages/credentials.tsx b/web/packages/accounts/pages/credentials.tsx index 3cb1311d29..daf0879223 100644 --- a/web/packages/accounts/pages/credentials.tsx +++ b/web/packages/accounts/pages/credentials.tsx @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import { ensure } from "@/utils/ensure"; import { VerticallyCentered } from "@ente/shared/components/Container"; import EnteSpinner from "@ente/shared/components/EnteSpinner"; diff --git a/web/packages/accounts/pages/generate.tsx b/web/packages/accounts/pages/generate.tsx index 3f224bc893..f08063f459 100644 --- a/web/packages/accounts/pages/generate.tsx +++ b/web/packages/accounts/pages/generate.tsx @@ -5,7 +5,7 @@ import SetPasswordForm, { import { PAGES } from "@/accounts/constants/pages"; import { configureSRP } from "@/accounts/services/srp"; import { generateKeyAndSRPAttributes } from "@/accounts/utils/srp"; -import log from "@/next/log"; +import log from "@/base/log"; import { ensure } from "@/utils/ensure"; import { VerticallyCentered } from "@ente/shared/components/Container"; import EnteSpinner from "@ente/shared/components/EnteSpinner"; diff --git a/web/packages/accounts/pages/login.tsx b/web/packages/accounts/pages/login.tsx index 3acc87dc2c..40e52ef603 100644 --- a/web/packages/accounts/pages/login.tsx +++ b/web/packages/accounts/pages/login.tsx @@ -1,4 +1,4 @@ -import { customAPIHost } from "@/next/origins"; +import { customAPIHost } from "@/base/origins"; import { VerticallyCentered } from "@ente/shared/components/Container"; import EnteSpinner from "@ente/shared/components/EnteSpinner"; import FormPaper from "@ente/shared/components/Form/FormPaper"; diff --git a/web/packages/accounts/pages/passkeys/finish.tsx b/web/packages/accounts/pages/passkeys/finish.tsx index bebd5893c5..1b73aca1d7 100644 --- a/web/packages/accounts/pages/passkeys/finish.tsx +++ b/web/packages/accounts/pages/passkeys/finish.tsx @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import { nullToUndefined } from "@/utils/transform"; import { VerticallyCentered } from "@ente/shared/components/Container"; import EnteSpinner from "@ente/shared/components/EnteSpinner"; diff --git a/web/packages/accounts/pages/recover.tsx b/web/packages/accounts/pages/recover.tsx index 1c95249d20..a3d10da2f3 100644 --- a/web/packages/accounts/pages/recover.tsx +++ b/web/packages/accounts/pages/recover.tsx @@ -1,6 +1,6 @@ import { sendOtt } from "@/accounts/api/user"; import { PAGES } from "@/accounts/constants/pages"; -import log from "@/next/log"; +import log from "@/base/log"; import { ensure } from "@/utils/ensure"; import { VerticallyCentered } from "@ente/shared/components/Container"; import FormPaper from "@ente/shared/components/Form/FormPaper"; diff --git a/web/packages/accounts/pages/signup.tsx b/web/packages/accounts/pages/signup.tsx index fe95875b1f..7b6d17795f 100644 --- a/web/packages/accounts/pages/signup.tsx +++ b/web/packages/accounts/pages/signup.tsx @@ -1,5 +1,5 @@ import { PAGES } from "@/accounts/constants/pages"; -import { customAPIHost } from "@/next/origins"; +import { customAPIHost } from "@/base/origins"; import { LS_KEYS, getData } from "@ente/shared//storage/localStorage"; import { VerticallyCentered } from "@ente/shared/components/Container"; import EnteSpinner from "@ente/shared/components/EnteSpinner"; diff --git a/web/packages/accounts/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx index 61bf37f745..a80c58b550 100644 --- a/web/packages/accounts/pages/two-factor/recover.tsx +++ b/web/packages/accounts/pages/two-factor/recover.tsx @@ -5,7 +5,7 @@ import { } from "@/accounts/api/user"; import { PAGES } from "@/accounts/constants/pages"; import type { AccountsContextT } from "@/accounts/types/context"; -import log from "@/next/log"; +import log from "@/base/log"; import { ensure } from "@/utils/ensure"; import { VerticallyCentered } from "@ente/shared/components/Container"; import type { DialogBoxAttributesV2 } from "@ente/shared/components/DialogBoxV2/types"; diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx index 6fbe83bba8..9a4bf01782 100644 --- a/web/packages/accounts/pages/two-factor/setup.tsx +++ b/web/packages/accounts/pages/two-factor/setup.tsx @@ -4,7 +4,7 @@ import VerifyTwoFactor, { } from "@/accounts/components/two-factor/VerifyForm"; import { TwoFactorSetup } from "@/accounts/components/two-factor/setup"; import type { TwoFactorSecret } from "@/accounts/types/user"; -import log from "@/next/log"; +import log from "@/base/log"; import { ensure } from "@/utils/ensure"; import { VerticallyCentered } from "@ente/shared/components/Container"; import LinkButton from "@ente/shared/components/LinkButton"; diff --git a/web/packages/accounts/services/logout.ts b/web/packages/accounts/services/logout.ts index 21999e2bb8..eef4fca6ee 100644 --- a/web/packages/accounts/services/logout.ts +++ b/web/packages/accounts/services/logout.ts @@ -1,6 +1,6 @@ -import { clearBlobCaches } from "@/next/blob-cache"; -import { clearKVDB } from "@/next/kv"; -import log from "@/next/log"; +import { clearBlobCaches } from "@/base/blob-cache"; +import { clearKVDB } from "@/base/kv"; +import log from "@/base/log"; import InMemoryStore from "@ente/shared/storage/InMemoryStore"; import localForage from "@ente/shared/storage/localForage"; import { clearData } from "@ente/shared/storage/localStorage"; diff --git a/web/packages/accounts/services/passkey.ts b/web/packages/accounts/services/passkey.ts index d7f3622dfb..2fd605b551 100644 --- a/web/packages/accounts/services/passkey.ts +++ b/web/packages/accounts/services/passkey.ts @@ -1,8 +1,8 @@ -import { clientPackageName, isDesktop } from "@/next/app"; -import { clientPackageHeader, HTTPError } from "@/next/http"; -import log from "@/next/log"; -import { accountsAppOrigin, apiURL } from "@/next/origins"; -import { TwoFactorAuthorizationResponse } from "@/next/types/credentials"; +import { clientPackageName, isDesktop } from "@/base/app"; +import { clientPackageHeader, HTTPError } from "@/base/http"; +import log from "@/base/log"; +import { accountsAppOrigin, apiURL } from "@/base/origins"; +import { TwoFactorAuthorizationResponse } from "@/base/types/credentials"; import { ensure } from "@/utils/ensure"; import ComlinkCryptoWorker from "@ente/shared/crypto"; import { getRecoveryKey } from "@ente/shared/crypto/helpers"; diff --git a/web/packages/accounts/services/redirect.ts b/web/packages/accounts/services/redirect.ts index 88e4b78677..b451be6146 100644 --- a/web/packages/accounts/services/redirect.ts +++ b/web/packages/accounts/services/redirect.ts @@ -1,4 +1,4 @@ -import { appName } from "@/next/app"; +import { appName } from "@/base/app"; import { AUTH_PAGES, PHOTOS_PAGES } from "@ente/shared/constants/pages"; /** diff --git a/web/packages/accounts/services/session.ts b/web/packages/accounts/services/session.ts index 019940e807..f8d63eeeb5 100644 --- a/web/packages/accounts/services/session.ts +++ b/web/packages/accounts/services/session.ts @@ -1,6 +1,6 @@ -import { authenticatedRequestHeaders, HTTPError } from "@/next/http"; -import { ensureLocalUser } from "@/next/local-user"; -import { apiURL } from "@/next/origins"; +import { authenticatedRequestHeaders, HTTPError } from "@/base/http"; +import { ensureLocalUser } from "@/base/local-user"; +import { apiURL } from "@/base/origins"; import { ensure } from "@/utils/ensure"; import { getData, LS_KEYS } from "@ente/shared/storage/localStorage"; import type { KeyAttributes } from "@ente/shared/user/types"; diff --git a/web/packages/accounts/services/srp.ts b/web/packages/accounts/services/srp.ts index f453757444..9ac814de82 100644 --- a/web/packages/accounts/services/srp.ts +++ b/web/packages/accounts/services/srp.ts @@ -1,5 +1,5 @@ import type { UserVerificationResponse } from "@/accounts/types/user"; -import log from "@/next/log"; +import log from "@/base/log"; import ComlinkCryptoWorker from "@ente/shared/crypto"; import { generateLoginSubKey } from "@ente/shared/crypto/helpers"; import InMemoryStore, { MS_KEYS } from "@ente/shared/storage/InMemoryStore"; diff --git a/web/packages/accounts/tsconfig.json b/web/packages/accounts/tsconfig.json index ccb7b626d1..6cc3516dd9 100644 --- a/web/packages/accounts/tsconfig.json +++ b/web/packages/accounts/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ ".", - "../next/global-electron.d.ts", + "../base/global-electron.d.ts", "../shared/themes/mui-theme.d.ts" ] } diff --git a/web/packages/next/.eslintrc.js b/web/packages/base/.eslintrc.js similarity index 100% rename from web/packages/next/.eslintrc.js rename to web/packages/base/.eslintrc.js diff --git a/web/packages/base/README.md b/web/packages/base/README.md new file mode 100644 index 0000000000..1c40f3bcd0 --- /dev/null +++ b/web/packages/base/README.md @@ -0,0 +1,14 @@ +## @/base + +A base UI layer package for sharing code between our production apps. + +This is a higher layer package than `@/utils` (which is framework agnostic). +This package is meant for sharing code between our Next.js apps that use React +and MUI. Both the photos and auth apps use it. + +Our smaller, Vite based apps, e.g. payments, don't use this. + +### Packaging + +This (internal) package exports a React TypeScript library. We rely on the +importing project to transpile and bundle it. diff --git a/web/packages/next/app.ts b/web/packages/base/app.ts similarity index 100% rename from web/packages/next/app.ts rename to web/packages/base/app.ts diff --git a/web/packages/next/blob-cache.ts b/web/packages/base/blob-cache.ts similarity index 100% rename from web/packages/next/blob-cache.ts rename to web/packages/base/blob-cache.ts diff --git a/web/packages/next/components/Head.tsx b/web/packages/base/components/Head.tsx similarity index 100% rename from web/packages/next/components/Head.tsx rename to web/packages/base/components/Head.tsx diff --git a/web/packages/next/electron.ts b/web/packages/base/electron.ts similarity index 100% rename from web/packages/next/electron.ts rename to web/packages/base/electron.ts diff --git a/web/packages/next/env.ts b/web/packages/base/env.ts similarity index 100% rename from web/packages/next/env.ts rename to web/packages/base/env.ts diff --git a/web/packages/next/file.ts b/web/packages/base/file.ts similarity index 100% rename from web/packages/next/file.ts rename to web/packages/base/file.ts diff --git a/web/packages/next/global-electron.d.ts b/web/packages/base/global-electron.d.ts similarity index 100% rename from web/packages/next/global-electron.d.ts rename to web/packages/base/global-electron.d.ts diff --git a/web/packages/next/http.ts b/web/packages/base/http.ts similarity index 100% rename from web/packages/next/http.ts rename to web/packages/base/http.ts diff --git a/web/packages/next/i18n.ts b/web/packages/base/i18n.ts similarity index 99% rename from web/packages/next/i18n.ts rename to web/packages/base/i18n.ts index d168d3db43..a0ea9f62d5 100644 --- a/web/packages/next/i18n.ts +++ b/web/packages/base/i18n.ts @@ -1,5 +1,5 @@ -import { isDevBuild } from "@/next/env"; -import log from "@/next/log"; +import { isDevBuild } from "@/base/env"; +import log from "@/base/log"; import { includes } from "@/utils/type-guards"; import { getUserLocales } from "get-user-locale"; import i18n from "i18next"; diff --git a/web/packages/next/kv.ts b/web/packages/base/kv.ts similarity index 100% rename from web/packages/next/kv.ts rename to web/packages/base/kv.ts diff --git a/web/packages/next/local-user.ts b/web/packages/base/local-user.ts similarity index 100% rename from web/packages/next/local-user.ts rename to web/packages/base/local-user.ts diff --git a/web/packages/next/locales/ar-SA/translation.json b/web/packages/base/locales/ar-SA/translation.json similarity index 100% rename from web/packages/next/locales/ar-SA/translation.json rename to web/packages/base/locales/ar-SA/translation.json diff --git a/web/packages/next/locales/bg-BG/translation.json b/web/packages/base/locales/bg-BG/translation.json similarity index 100% rename from web/packages/next/locales/bg-BG/translation.json rename to web/packages/base/locales/bg-BG/translation.json diff --git a/web/packages/next/locales/ca-ES/translation.json b/web/packages/base/locales/ca-ES/translation.json similarity index 100% rename from web/packages/next/locales/ca-ES/translation.json rename to web/packages/base/locales/ca-ES/translation.json diff --git a/web/packages/next/locales/de-DE/translation.json b/web/packages/base/locales/de-DE/translation.json similarity index 100% rename from web/packages/next/locales/de-DE/translation.json rename to web/packages/base/locales/de-DE/translation.json diff --git a/web/packages/next/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.json similarity index 100% rename from web/packages/next/locales/en-US/translation.json rename to web/packages/base/locales/en-US/translation.json diff --git a/web/packages/next/locales/es-ES/translation.json b/web/packages/base/locales/es-ES/translation.json similarity index 100% rename from web/packages/next/locales/es-ES/translation.json rename to web/packages/base/locales/es-ES/translation.json diff --git a/web/packages/next/locales/fa-IR/translation.json b/web/packages/base/locales/fa-IR/translation.json similarity index 100% rename from web/packages/next/locales/fa-IR/translation.json rename to web/packages/base/locales/fa-IR/translation.json diff --git a/web/packages/next/locales/fi-FI/translation.json b/web/packages/base/locales/fi-FI/translation.json similarity index 100% rename from web/packages/next/locales/fi-FI/translation.json rename to web/packages/base/locales/fi-FI/translation.json diff --git a/web/packages/next/locales/fr-FR/translation.json b/web/packages/base/locales/fr-FR/translation.json similarity index 100% rename from web/packages/next/locales/fr-FR/translation.json rename to web/packages/base/locales/fr-FR/translation.json diff --git a/web/packages/next/locales/gu-IN/translation.json b/web/packages/base/locales/gu-IN/translation.json similarity index 100% rename from web/packages/next/locales/gu-IN/translation.json rename to web/packages/base/locales/gu-IN/translation.json diff --git a/web/packages/next/locales/hi-IN/translation.json b/web/packages/base/locales/hi-IN/translation.json similarity index 100% rename from web/packages/next/locales/hi-IN/translation.json rename to web/packages/base/locales/hi-IN/translation.json diff --git a/web/packages/next/locales/id-ID/translation.json b/web/packages/base/locales/id-ID/translation.json similarity index 100% rename from web/packages/next/locales/id-ID/translation.json rename to web/packages/base/locales/id-ID/translation.json diff --git a/web/packages/next/locales/is-IS/translation.json b/web/packages/base/locales/is-IS/translation.json similarity index 100% rename from web/packages/next/locales/is-IS/translation.json rename to web/packages/base/locales/is-IS/translation.json diff --git a/web/packages/next/locales/it-IT/translation.json b/web/packages/base/locales/it-IT/translation.json similarity index 100% rename from web/packages/next/locales/it-IT/translation.json rename to web/packages/base/locales/it-IT/translation.json diff --git a/web/packages/next/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.json similarity index 100% rename from web/packages/next/locales/ja-JP/translation.json rename to web/packages/base/locales/ja-JP/translation.json diff --git a/web/packages/next/locales/ko-KR/translation.json b/web/packages/base/locales/ko-KR/translation.json similarity index 100% rename from web/packages/next/locales/ko-KR/translation.json rename to web/packages/base/locales/ko-KR/translation.json diff --git a/web/packages/next/locales/nl-NL/translation.json b/web/packages/base/locales/nl-NL/translation.json similarity index 100% rename from web/packages/next/locales/nl-NL/translation.json rename to web/packages/base/locales/nl-NL/translation.json diff --git a/web/packages/next/locales/pl-PL/translation.json b/web/packages/base/locales/pl-PL/translation.json similarity index 100% rename from web/packages/next/locales/pl-PL/translation.json rename to web/packages/base/locales/pl-PL/translation.json diff --git a/web/packages/next/locales/pt-BR/translation.json b/web/packages/base/locales/pt-BR/translation.json similarity index 100% rename from web/packages/next/locales/pt-BR/translation.json rename to web/packages/base/locales/pt-BR/translation.json diff --git a/web/packages/next/locales/pt-PT/translation.json b/web/packages/base/locales/pt-PT/translation.json similarity index 100% rename from web/packages/next/locales/pt-PT/translation.json rename to web/packages/base/locales/pt-PT/translation.json diff --git a/web/packages/next/locales/ru-RU/translation.json b/web/packages/base/locales/ru-RU/translation.json similarity index 100% rename from web/packages/next/locales/ru-RU/translation.json rename to web/packages/base/locales/ru-RU/translation.json diff --git a/web/packages/next/locales/sv-SE/translation.json b/web/packages/base/locales/sv-SE/translation.json similarity index 100% rename from web/packages/next/locales/sv-SE/translation.json rename to web/packages/base/locales/sv-SE/translation.json diff --git a/web/packages/next/locales/te-IN/translation.json b/web/packages/base/locales/te-IN/translation.json similarity index 100% rename from web/packages/next/locales/te-IN/translation.json rename to web/packages/base/locales/te-IN/translation.json diff --git a/web/packages/next/locales/th-TH/translation.json b/web/packages/base/locales/th-TH/translation.json similarity index 100% rename from web/packages/next/locales/th-TH/translation.json rename to web/packages/base/locales/th-TH/translation.json diff --git a/web/packages/next/locales/ti-ER/translation.json b/web/packages/base/locales/ti-ER/translation.json similarity index 100% rename from web/packages/next/locales/ti-ER/translation.json rename to web/packages/base/locales/ti-ER/translation.json diff --git a/web/packages/next/locales/tr-TR/translation.json b/web/packages/base/locales/tr-TR/translation.json similarity index 100% rename from web/packages/next/locales/tr-TR/translation.json rename to web/packages/base/locales/tr-TR/translation.json diff --git a/web/packages/next/locales/zh-CN/translation.json b/web/packages/base/locales/zh-CN/translation.json similarity index 100% rename from web/packages/next/locales/zh-CN/translation.json rename to web/packages/base/locales/zh-CN/translation.json diff --git a/web/packages/next/log-web.ts b/web/packages/base/log-web.ts similarity index 98% rename from web/packages/next/log-web.ts rename to web/packages/base/log-web.ts index fb8364eac0..6ff6ed0a04 100644 --- a/web/packages/next/log-web.ts +++ b/web/packages/base/log-web.ts @@ -1,5 +1,5 @@ -import { isDevBuild } from "@/next/env"; -import log from "@/next/log"; +import { isDevBuild } from "@/base/env"; +import log from "@/base/log"; import { appName, appNames } from "./app"; /** diff --git a/web/packages/next/log.ts b/web/packages/base/log.ts similarity index 99% rename from web/packages/next/log.ts rename to web/packages/base/log.ts index ffd0650817..10ad52bd3d 100644 --- a/web/packages/next/log.ts +++ b/web/packages/base/log.ts @@ -1,4 +1,4 @@ -import { inWorker } from "@/next/env"; +import { inWorker } from "@/base/env"; import { isDevBuild } from "./env"; import { logToDisk as webLogToDisk } from "./log-web"; import { workerBridge } from "./worker/worker-bridge"; diff --git a/web/packages/next/next.config.base.js b/web/packages/base/next.config.base.js similarity index 98% rename from web/packages/next/next.config.base.js rename to web/packages/base/next.config.base.js index ae8d66dcc5..a7637a32a8 100644 --- a/web/packages/next/next.config.base.js +++ b/web/packages/base/next.config.base.js @@ -88,7 +88,7 @@ const nextConfig = { emotion: true, }, // Use Next.js to transpile our internal packages before bundling them. - transpilePackages: ["@/next", "@/utils", "@/new"], + transpilePackages: ["@/base", "@/utils", "@/new"], // Add environment variables to the JavaScript bundle. They will be // available as `process.env.varName` to our code. diff --git a/web/packages/next/origins.ts b/web/packages/base/origins.ts similarity index 98% rename from web/packages/next/origins.ts rename to web/packages/base/origins.ts index 874c0a6aec..8c39396fb2 100644 --- a/web/packages/next/origins.ts +++ b/web/packages/base/origins.ts @@ -1,4 +1,4 @@ -import { getKV, setKV } from "@/next/kv"; +import { getKV, setKV } from "@/base/kv"; import { inWorker } from "./env"; /** diff --git a/web/packages/next/package.json b/web/packages/base/package.json similarity index 96% rename from web/packages/next/package.json rename to web/packages/base/package.json index 0f0d8e5343..86f21d8fdf 100644 --- a/web/packages/next/package.json +++ b/web/packages/base/package.json @@ -1,5 +1,5 @@ { - "name": "@/next", + "name": "@/base", "version": "0.0.0", "private": true, "dependencies": { diff --git a/web/packages/next/tsconfig.json b/web/packages/base/tsconfig.json similarity index 100% rename from web/packages/next/tsconfig.json rename to web/packages/base/tsconfig.json diff --git a/web/packages/next/types/credentials.ts b/web/packages/base/types/credentials.ts similarity index 100% rename from web/packages/next/types/credentials.ts rename to web/packages/base/types/credentials.ts diff --git a/web/packages/next/types/ipc.ts b/web/packages/base/types/ipc.ts similarity index 100% rename from web/packages/next/types/ipc.ts rename to web/packages/base/types/ipc.ts diff --git a/web/packages/next/worker/comlink-worker.ts b/web/packages/base/worker/comlink-worker.ts similarity index 96% rename from web/packages/next/worker/comlink-worker.ts rename to web/packages/base/worker/comlink-worker.ts index bfc49064c8..4562805b3b 100644 --- a/web/packages/next/worker/comlink-worker.ts +++ b/web/packages/base/worker/comlink-worker.ts @@ -1,5 +1,5 @@ -import { ensureElectron } from "@/next/electron"; -import log, { logToDisk } from "@/next/log"; +import { ensureElectron } from "@/base/electron"; +import log, { logToDisk } from "@/base/log"; import { expose, wrap, type Remote } from "comlink"; /** diff --git a/web/packages/next/worker/worker-bridge.ts b/web/packages/base/worker/worker-bridge.ts similarity index 100% rename from web/packages/next/worker/worker-bridge.ts rename to web/packages/base/worker/worker-bridge.ts diff --git a/web/packages/eslint-config/index.js b/web/packages/eslint-config/index.js index 41da4b9ce3..b810bd4242 100644 --- a/web/packages/eslint-config/index.js +++ b/web/packages/eslint-config/index.js @@ -51,7 +51,7 @@ module.exports = { "@typescript-eslint/no-unnecessary-type-assertion": "off", "react-hooks/rules-of-hooks": "off", "react-hooks/exhaustive-deps": "off", - "@next/next/no-img-element": "off", + "@next/base/no-img-element": "off", "@typescript-eslint/no-unsafe-argument": "off", "jsx-a11y/alt-text": "off", // Temporarily turn these off to allow existing code. diff --git a/web/packages/media/heic-convert.ts b/web/packages/media/heic-convert.ts index 434e7ba553..0b44983c09 100644 --- a/web/packages/media/heic-convert.ts +++ b/web/packages/media/heic-convert.ts @@ -1,4 +1,4 @@ -import { ComlinkWorker } from "@/next/worker/comlink-worker"; +import { ComlinkWorker } from "@/base/worker/comlink-worker"; import { wait } from "@/utils/promise"; import type { HEICConvertWorker } from "./heic-convert.worker"; diff --git a/web/packages/media/live-photo.ts b/web/packages/media/live-photo.ts index 35a186a418..e272f5038a 100644 --- a/web/packages/media/live-photo.ts +++ b/web/packages/media/live-photo.ts @@ -2,7 +2,7 @@ import { fileNameFromComponents, lowercaseExtension, nameAndExtension, -} from "@/next/file"; +} from "@/base/file"; import JSZip from "jszip"; import { FILE_TYPE } from "./file-type"; diff --git a/web/packages/media/package.json b/web/packages/media/package.json index bf71ed37b2..eb5d9640da 100644 --- a/web/packages/media/package.json +++ b/web/packages/media/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@/next": "*", + "@/base": "*", "file-type": "16.5.4", "heic-convert": "^2.1", "jszip": "^3.10" diff --git a/web/packages/media/tsconfig.json b/web/packages/media/tsconfig.json index 01e2dc60cd..b2a1203623 100644 --- a/web/packages/media/tsconfig.json +++ b/web/packages/media/tsconfig.json @@ -1,4 +1,4 @@ { "extends": "@/build-config/tsconfig-next.json", - "include": [".", "../../packages/next/global-electron.d.ts"] + "include": [".", "../../packages/base/global-electron.d.ts"] } diff --git a/web/packages/new/package.json b/web/packages/new/package.json index eeb6507c45..863d49207c 100644 --- a/web/packages/new/package.json +++ b/web/packages/new/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@/next": "*", + "@/base": "*", "@/utils": "*", "@ente/shared": "*", "formik": "^2.4", diff --git a/web/packages/new/photos/components/DevSettings.tsx b/web/packages/new/photos/components/DevSettings.tsx index 7919314068..36afc370d8 100644 --- a/web/packages/new/photos/components/DevSettings.tsx +++ b/web/packages/new/photos/components/DevSettings.tsx @@ -1,6 +1,6 @@ -import { ensureOk } from "@/next/http"; -import { getKV, removeKV, setKV } from "@/next/kv"; -import log from "@/next/log"; +import { ensureOk } from "@/base/http"; +import { getKV, removeKV, setKV } from "@/base/kv"; +import log from "@/base/log"; import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined"; import { Dialog, diff --git a/web/packages/new/photos/components/MLSettings.tsx b/web/packages/new/photos/components/MLSettings.tsx index 6086bad0a1..27c7df8229 100644 --- a/web/packages/new/photos/components/MLSettings.tsx +++ b/web/packages/new/photos/components/MLSettings.tsx @@ -1,3 +1,5 @@ +import { pt } from "@/base/i18n"; +import log from "@/base/log"; import { disableML, enableML, @@ -8,8 +10,6 @@ import { import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { MenuItemGroup } from "@/new/shared/components/Menu"; import { Titlebar } from "@/new/shared/components/Titlebar"; -import { pt } from "@/next/i18n"; -import log from "@/next/log"; 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 8e50a6119a..5fe6ebc701 100644 --- a/web/packages/new/photos/components/MLSettingsBeta.tsx +++ b/web/packages/new/photos/components/MLSettingsBeta.tsx @@ -1,6 +1,6 @@ +import { pt, ut } from "@/base/i18n"; import { EnteDrawer } from "@/new/shared/components/EnteDrawer"; import { Titlebar } from "@/new/shared/components/Titlebar"; -import { pt, ut } from "@/next/i18n"; import { Box, Stack, Typography, type DialogProps } from "@mui/material"; import React from "react"; diff --git a/web/packages/new/photos/components/PeopleList.tsx b/web/packages/new/photos/components/PeopleList.tsx index 5c13aa9c55..960687d7c2 100644 --- a/web/packages/new/photos/components/PeopleList.tsx +++ b/web/packages/new/photos/components/PeopleList.tsx @@ -1,10 +1,10 @@ +import { blobCache } from "@/base/blob-cache"; import { regenerateFaceCropsIfNeeded, unidentifiedFaceIDs, } from "@/new/photos/services/ml"; import type { Person } from "@/new/photos/services/ml/people"; import type { EnteFile } from "@/new/photos/types/file"; -import { blobCache } from "@/next/blob-cache"; import { Skeleton, Typography, styled } from "@mui/material"; import { t } from "i18next"; import React, { useEffect, useState } from "react"; diff --git a/web/packages/new/photos/components/WhatsNew.tsx b/web/packages/new/photos/components/WhatsNew.tsx index e0840ce9ab..693c409e3d 100644 --- a/web/packages/new/photos/components/WhatsNew.tsx +++ b/web/packages/new/photos/components/WhatsNew.tsx @@ -1,5 +1,5 @@ -import { ensureElectron } from "@/next/electron"; -import { ut } from "@/next/i18n"; +import { ensureElectron } from "@/base/electron"; +import { ut } from "@/base/i18n"; import ArrowForward from "@mui/icons-material/ArrowForward"; import { Box, diff --git a/web/packages/new/photos/services/changelog.ts b/web/packages/new/photos/services/changelog.ts index 8382c13513..b543d8a6f1 100644 --- a/web/packages/new/photos/services/changelog.ts +++ b/web/packages/new/photos/services/changelog.ts @@ -1,4 +1,4 @@ -import type { Electron } from "@/next/types/ipc"; +import type { Electron } from "@/base/types/ipc"; /** * The current changelog version. diff --git a/web/packages/new/photos/services/download.ts b/web/packages/new/photos/services/download.ts index b35d9a87da..68ba56a728 100644 --- a/web/packages/new/photos/services/download.ts +++ b/web/packages/new/photos/services/download.ts @@ -1,6 +1,10 @@ // TODO: Remove this override /* eslint-disable @typescript-eslint/no-empty-function */ +import { isDesktop } from "@/base/app"; +import { blobCache, type BlobCache } from "@/base/blob-cache"; +import log from "@/base/log"; +import { customAPIOrigin } from "@/base/origins"; import { FILE_TYPE } from "@/media/file-type"; import { decodeLivePhoto } from "@/media/live-photo"; import * as ffmpeg from "@/new/photos/services/ffmpeg"; @@ -10,10 +14,6 @@ import type { SourceURLs, } from "@/new/photos/types/file"; import { renderableImageBlob } from "@/new/photos/utils/file"; -import { isDesktop } from "@/next/app"; -import { blobCache, type BlobCache } from "@/next/blob-cache"; -import log from "@/next/log"; -import { customAPIOrigin } from "@/next/origins"; import { ensure } from "@/utils/ensure"; import ComlinkCryptoWorker from "@ente/shared/crypto"; import { DedicatedCryptoWorker } from "@ente/shared/crypto/internal/crypto.worker"; diff --git a/web/packages/new/photos/services/feature-flags.ts b/web/packages/new/photos/services/feature-flags.ts index f13e29333a..fb48086d46 100644 --- a/web/packages/new/photos/services/feature-flags.ts +++ b/web/packages/new/photos/services/feature-flags.ts @@ -1,8 +1,8 @@ -import { isDevBuild } from "@/next/env"; -import { authenticatedRequestHeaders, ensureOk } from "@/next/http"; -import { localUser } from "@/next/local-user"; -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; +import { isDevBuild } from "@/base/env"; +import { authenticatedRequestHeaders, ensureOk } from "@/base/http"; +import { localUser } from "@/base/local-user"; +import log from "@/base/log"; +import { apiURL } from "@/base/origins"; import { nullToUndefined } from "@/utils/transform"; import { z } from "zod"; diff --git a/web/packages/new/photos/services/ffmpeg/index.ts b/web/packages/new/photos/services/ffmpeg/index.ts index 02913ed797..71612f2314 100644 --- a/web/packages/new/photos/services/ffmpeg/index.ts +++ b/web/packages/new/photos/services/ffmpeg/index.ts @@ -1,3 +1,6 @@ +import { ensureElectron } from "@/base/electron"; +import type { Electron } from "@/base/types/ipc"; +import { ComlinkWorker } from "@/base/worker/comlink-worker"; import { NULL_LOCATION, toDataOrPathOrZipEntry, @@ -10,9 +13,6 @@ import { readConvertToMP4Stream, writeConvertToMP4Stream, } from "@/new/photos/utils/native-stream"; -import { ensureElectron } from "@/next/electron"; -import type { Electron } from "@/next/types/ipc"; -import { ComlinkWorker } from "@/next/worker/comlink-worker"; import { validateAndGetCreationUnixTimeInMicroSeconds } from "@ente/shared/time"; import type { Remote } from "comlink"; import { diff --git a/web/packages/new/photos/services/ffmpeg/worker.ts b/web/packages/new/photos/services/ffmpeg/worker.ts index e5c01c7e91..c8bdabb7a0 100644 --- a/web/packages/new/photos/services/ffmpeg/worker.ts +++ b/web/packages/new/photos/services/ffmpeg/worker.ts @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import { ensure } from "@/utils/ensure"; import QueueProcessor from "@ente/shared/utils/queueProcessor"; import { expose } from "comlink"; diff --git a/web/packages/new/photos/services/files.ts b/web/packages/new/photos/services/files.ts index ddb24488df..873dc5db59 100644 --- a/web/packages/new/photos/services/files.ts +++ b/web/packages/new/photos/services/files.ts @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import { Events, eventBus } from "@ente/shared/events"; import localForage from "@ente/shared/storage/localForage"; import { type EnteFile, type Trash } from "../types/file"; diff --git a/web/packages/new/photos/services/ml/blob.ts b/web/packages/new/photos/services/ml/blob.ts index 39f4caba4a..e05f723763 100644 --- a/web/packages/new/photos/services/ml/blob.ts +++ b/web/packages/new/photos/services/ml/blob.ts @@ -1,6 +1,6 @@ +import { basename } from "@/base/file"; import { FILE_TYPE } from "@/media/file-type"; import { decodeLivePhoto } from "@/media/live-photo"; -import { basename } from "@/next/file"; import { ensure } from "@/utils/ensure"; import type { EnteFile } from "../../types/file"; import { renderableImageBlob } from "../../utils/file"; diff --git a/web/packages/new/photos/services/ml/clip.ts b/web/packages/new/photos/services/ml/clip.ts index e0bf6eecd4..eecf7e2209 100644 --- a/web/packages/new/photos/services/ml/clip.ts +++ b/web/packages/new/photos/services/ml/clip.ts @@ -1,4 +1,4 @@ -import type { Electron } from "@/next/types/ipc"; +import type { Electron } from "@/base/types/ipc"; import type { ImageBitmapAndData } from "./blob"; import { clipIndexes } from "./db"; import { pixelRGBBicubic } from "./image"; diff --git a/web/packages/new/photos/services/ml/crop.ts b/web/packages/new/photos/services/ml/crop.ts index 5a626e0d50..04fe0f09f6 100644 --- a/web/packages/new/photos/services/ml/crop.ts +++ b/web/packages/new/photos/services/ml/crop.ts @@ -1,4 +1,4 @@ -import { blobCache } from "@/next/blob-cache"; +import { blobCache } from "@/base/blob-cache"; import { ensure } from "@/utils/ensure"; import type { EnteFile } from "../../types/file"; import { renderableEnteFileBlob } from "./blob"; diff --git a/web/packages/new/photos/services/ml/db.ts b/web/packages/new/photos/services/ml/db.ts index 7bc4857b76..a648aa8f06 100644 --- a/web/packages/new/photos/services/ml/db.ts +++ b/web/packages/new/photos/services/ml/db.ts @@ -1,5 +1,5 @@ -import { removeKV } from "@/next/kv"; -import log from "@/next/log"; +import { removeKV } from "@/base/kv"; +import log from "@/base/log"; import localForage from "@ente/shared/storage/localForage"; import { deleteDB, openDB, type DBSchema } from "idb"; import type { LocalCLIPIndex } from "./clip"; diff --git a/web/packages/new/photos/services/ml/embedding.ts b/web/packages/new/photos/services/ml/embedding.ts index 4e452a4c61..a144093ee3 100644 --- a/web/packages/new/photos/services/ml/embedding.ts +++ b/web/packages/new/photos/services/ml/embedding.ts @@ -1,11 +1,11 @@ +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 { authenticatedRequestHeaders, ensureOk } from "@/next/http"; -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; import { nullToUndefined } from "@/utils/transform"; import { z } from "zod"; import { type RemoteCLIPIndex } from "./clip"; diff --git a/web/packages/new/photos/services/ml/index.ts b/web/packages/new/photos/services/ml/index.ts index 1be9f1f700..1b019bd4cf 100644 --- a/web/packages/new/photos/services/ml/index.ts +++ b/web/packages/new/photos/services/ml/index.ts @@ -2,13 +2,13 @@ * @file Main thread interface to the ML subsystem. */ +import { isDesktop } from "@/base/app"; +import { blobCache } from "@/base/blob-cache"; +import { ensureElectron } from "@/base/electron"; +import log from "@/base/log"; +import { ComlinkWorker } from "@/base/worker/comlink-worker"; import { FILE_TYPE } from "@/media/file-type"; import type { EnteFile } from "@/new/photos/types/file"; -import { isDesktop } from "@/next/app"; -import { blobCache } from "@/next/blob-cache"; -import { ensureElectron } from "@/next/electron"; -import log from "@/next/log"; -import { ComlinkWorker } from "@/next/worker/comlink-worker"; import { throttled } from "@/utils/promise"; import { proxy } from "comlink"; import { isBetaUser, isInternalUser } from "../feature-flags"; diff --git a/web/packages/new/photos/services/ml/worker.ts b/web/packages/new/photos/services/ml/worker.ts index bd0860b95d..4254b3a8c6 100644 --- a/web/packages/new/photos/services/ml/worker.ts +++ b/web/packages/new/photos/services/ml/worker.ts @@ -1,10 +1,10 @@ +import { clientPackageName } from "@/base/app"; +import { isHTTP4xxError } from "@/base/http"; +import { getKVN } from "@/base/kv"; +import { ensureAuthToken } from "@/base/local-user"; +import log from "@/base/log"; import type { EnteFile } from "@/new/photos/types/file"; import { fileLogID } from "@/new/photos/utils/file"; -import { clientPackageName } from "@/next/app"; -import { isHTTP4xxError } from "@/next/http"; -import { getKVN } from "@/next/kv"; -import { ensureAuthToken } from "@/next/local-user"; -import log from "@/next/log"; import { ensure } from "@/utils/ensure"; import { wait } from "@/utils/promise"; import { expose } from "comlink"; diff --git a/web/packages/new/photos/services/remote-store.ts b/web/packages/new/photos/services/remote-store.ts index 621db2c630..875f0dd3bc 100644 --- a/web/packages/new/photos/services/remote-store.ts +++ b/web/packages/new/photos/services/remote-store.ts @@ -1,5 +1,5 @@ -import { authenticatedRequestHeaders, ensureOk } from "@/next/http"; -import { apiURL } from "@/next/origins"; +import { authenticatedRequestHeaders, ensureOk } from "@/base/http"; +import { apiURL } from "@/base/origins"; import { z } from "zod"; /** diff --git a/web/packages/new/photos/services/upload/types.ts b/web/packages/new/photos/services/upload/types.ts index f11ba90961..d8d8517803 100644 --- a/web/packages/new/photos/services/upload/types.ts +++ b/web/packages/new/photos/services/upload/types.ts @@ -1,4 +1,4 @@ -import type { ZipItem } from "@/next/types/ipc"; +import type { ZipItem } from "@/base/types/ipc"; import type { Location } from "../../types/metadata"; /** diff --git a/web/packages/new/photos/utils/detect-type.ts b/web/packages/new/photos/utils/detect-type.ts index e7447587d6..902540065c 100644 --- a/web/packages/new/photos/utils/detect-type.ts +++ b/web/packages/new/photos/utils/detect-type.ts @@ -1,10 +1,10 @@ +import { lowercaseExtension } from "@/base/file"; import { FILE_TYPE, KnownFileTypeInfos, KnownNonMediaFileExtensions, type FileTypeInfo, } from "@/media/file-type"; -import { lowercaseExtension } from "@/next/file"; import { CustomError } from "@ente/shared/error"; import FileType from "file-type"; diff --git a/web/packages/new/photos/utils/file.ts b/web/packages/new/photos/utils/file.ts index 8e878f9e8c..a19218ec6b 100644 --- a/web/packages/new/photos/utils/file.ts +++ b/web/packages/new/photos/utils/file.ts @@ -1,9 +1,9 @@ +import { isDesktop } from "@/base/app"; +import log from "@/base/log"; +import { CustomErrorMessage } from "@/base/types/ipc"; +import { workerBridge } from "@/base/worker/worker-bridge"; import { hasPartialBrowserSupport, needsJPEGConversion } from "@/media/formats"; import { heicToJPEG } from "@/media/heic-convert"; -import { isDesktop } from "@/next/app"; -import log from "@/next/log"; -import { CustomErrorMessage } from "@/next/types/ipc"; -import { workerBridge } from "@/next/worker/worker-bridge"; import type { EnteFile } from "../types/file"; import { detectFileTypeInfo } from "./detect-type"; diff --git a/web/packages/new/photos/utils/native-fs.ts b/web/packages/new/photos/utils/native-fs.ts index 666efc4fca..ce7a16bb58 100644 --- a/web/packages/new/photos/utils/native-fs.ts +++ b/web/packages/new/photos/utils/native-fs.ts @@ -5,11 +5,11 @@ * written for use by the code that runs in our desktop app. */ +import { nameAndExtension } from "@/base/file"; import { exportMetadataDirectoryName, exportTrashDirectoryName, } from "@/new/photos/services/export"; -import { nameAndExtension } from "@/next/file"; import sanitize from "sanitize-filename"; /** diff --git a/web/packages/new/photos/utils/native-stream.ts b/web/packages/new/photos/utils/native-stream.ts index 0475f070db..6f61656597 100644 --- a/web/packages/new/photos/utils/native-stream.ts +++ b/web/packages/new/photos/utils/native-stream.ts @@ -6,7 +6,7 @@ * See: [Note: IPC streams]. */ -import type { Electron, ZipItem } from "@/next/types/ipc"; +import type { Electron, ZipItem } from "@/base/types/ipc"; import type { MLWorkerElectron } from "../services/ml/worker-types"; /** diff --git a/web/packages/new/tsconfig.json b/web/packages/new/tsconfig.json index 1e10008cd4..76f2742dcf 100644 --- a/web/packages/new/tsconfig.json +++ b/web/packages/new/tsconfig.json @@ -6,7 +6,7 @@ }, "include": [ ".", - "../next/global-electron.d.ts", + "../base/global-electron.d.ts", "../shared/themes/mui-theme.d.ts" ] } diff --git a/web/packages/next/README.md b/web/packages/next/README.md deleted file mode 100644 index 01abfa42c1..0000000000 --- a/web/packages/next/README.md +++ /dev/null @@ -1,8 +0,0 @@ -## @/next - -A base UI layer package for sharing code between our Next.js apps. - -### Packaging - -This (internal) package exports a React TypeScript library. We rely on the -importing project to transpile and bundle it. diff --git a/web/packages/shared/README.md b/web/packages/shared/README.md index ba92b46f16..e319cf54ec 100644 --- a/web/packages/shared/README.md +++ b/web/packages/shared/README.md @@ -1,3 +1,3 @@ Deprecated in favor of [@/utils](../utils/README.md) and -[@/next](../next/README.md). Don't add new code here - we'll slowly be migrating +[@/base](../base/README.md). Don't add new code here - we'll slowly be migrating existing code from here to those two packages. diff --git a/web/packages/shared/components/LoginComponents.tsx b/web/packages/shared/components/LoginComponents.tsx index 478aea9db7..aee15ec011 100644 --- a/web/packages/shared/components/LoginComponents.tsx +++ b/web/packages/shared/components/LoginComponents.tsx @@ -3,8 +3,8 @@ import { passkeySessionExpiredErrorMessage, saveCredentialsAndNavigateTo, } from "@/accounts/services/passkey"; -import log from "@/next/log"; -import { customAPIHost } from "@/next/origins"; +import log from "@/base/log"; +import { customAPIHost } from "@/base/origins"; import EnteButton from "@ente/shared/components/EnteButton"; import { CircularProgress, Stack, Typography, styled } from "@mui/material"; import { t } from "i18next"; diff --git a/web/packages/shared/components/VerifyMasterPasswordForm.tsx b/web/packages/shared/components/VerifyMasterPasswordForm.tsx index 5d9300818e..a1849d8f7e 100644 --- a/web/packages/shared/components/VerifyMasterPasswordForm.tsx +++ b/web/packages/shared/components/VerifyMasterPasswordForm.tsx @@ -1,5 +1,5 @@ import type { SRPAttributes } from "@/accounts/types/srp"; -import log from "@/next/log"; +import log from "@/base/log"; import { Input, type ButtonProps } from "@mui/material"; import { t } from "i18next"; import SingleInputForm, { diff --git a/web/packages/shared/crypto/helpers.ts b/web/packages/shared/crypto/helpers.ts index 4168abb7f6..6c1d944d1e 100644 --- a/web/packages/shared/crypto/helpers.ts +++ b/web/packages/shared/crypto/helpers.ts @@ -1,5 +1,5 @@ import { setRecoveryKey } from "@/accounts/api/user"; -import log from "@/next/log"; +import log from "@/base/log"; import { LS_KEYS, getData, diff --git a/web/packages/shared/crypto/index.ts b/web/packages/shared/crypto/index.ts index c471e84a12..ed3d47e155 100644 --- a/web/packages/shared/crypto/index.ts +++ b/web/packages/shared/crypto/index.ts @@ -1,4 +1,4 @@ -import { ComlinkWorker } from "@/next/worker/comlink-worker"; +import { ComlinkWorker } from "@/base/worker/comlink-worker"; import type { Remote } from "comlink"; import { type DedicatedCryptoWorker } from "./internal/crypto.worker"; diff --git a/web/packages/shared/network/HTTPService.ts b/web/packages/shared/network/HTTPService.ts index 5ca1a893cb..b14ed8209e 100644 --- a/web/packages/shared/network/HTTPService.ts +++ b/web/packages/shared/network/HTTPService.ts @@ -1,4 +1,4 @@ -import log from "@/next/log"; +import log from "@/base/log"; import axios, { type AxiosRequestConfig, type AxiosResponse } from "axios"; import { ApiError, CustomError, isApiErrorResponse } from "../error"; diff --git a/web/packages/shared/network/cast.ts b/web/packages/shared/network/cast.ts index 6f9c1d54b6..b1b1ae7099 100644 --- a/web/packages/shared/network/cast.ts +++ b/web/packages/shared/network/cast.ts @@ -1,5 +1,5 @@ -import log from "@/next/log"; -import { apiURL } from "@/next/origins"; +import log from "@/base/log"; +import { apiURL } from "@/base/origins"; import { ApiError } from "../error"; import { getToken } from "../storage/localStorage/helpers"; import HTTPService from "./HTTPService"; diff --git a/web/packages/shared/package.json b/web/packages/shared/package.json index 807fdd7e69..6e268322a5 100644 --- a/web/packages/shared/package.json +++ b/web/packages/shared/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@/next": "*", + "@/base": "*", "@ente/eslint-config": "*", "axios": "^1.6.7" } diff --git a/web/packages/shared/storage/localForage.ts b/web/packages/shared/storage/localForage.ts index a3bb4442d0..6ff85325a8 100644 --- a/web/packages/shared/storage/localForage.ts +++ b/web/packages/shared/storage/localForage.ts @@ -1,4 +1,4 @@ -import { haveWindow } from "@/next/env"; +import { haveWindow } from "@/base/env"; import localForage from "localforage"; diff --git a/web/packages/shared/storage/localStorage/index.ts b/web/packages/shared/storage/localStorage/index.ts index d4b0351da2..99dd51edc1 100644 --- a/web/packages/shared/storage/localStorage/index.ts +++ b/web/packages/shared/storage/localStorage/index.ts @@ -1,5 +1,5 @@ -import { removeKV, setKV } from "@/next/kv"; -import log from "@/next/log"; +import { removeKV, setKV } from "@/base/kv"; +import log from "@/base/log"; export enum LS_KEYS { USER = "user", @@ -15,7 +15,7 @@ export enum LS_KEYS { USER_DETAILS = "userDetails", COLLECTION_SORT_BY = "collectionSortBy", THEME = "theme", - // Moved to the new wrapper @/next/local-storage + // Moved to the new wrapper @/base/local-storage // LOCALE = 'locale', MAP_ENABLED = "mapEnabled", SRP_SETUP_ATTRIBUTES = "srpSetupAttributes", diff --git a/web/packages/shared/tsconfig.json b/web/packages/shared/tsconfig.json index 1419b29874..8a31d251d0 100644 --- a/web/packages/shared/tsconfig.json +++ b/web/packages/shared/tsconfig.json @@ -17,7 +17,7 @@ "**/*.tsx", "**/*.js", "themes/mui-theme.d.ts", - "../next/log-web.ts", - "../next/global-electron.d.ts" + "../base/log-web.ts", + "../base/global-electron.d.ts" ] }