[web] Misc minor tsc improvements (#2352)

2024-07-02 21:43:26 +05:30
parent eee9a32b9a dbe3e9a7d8
commit 0814fd42d1
71 changed files with 120 additions and 133 deletions
--- a/web/apps/accounts/package.json
+++ b/web/apps/accounts/package.json
@@ -3,8 +3,8 @@
    "version": "0.0.0",
    "private": true,
    "dependencies": {
+        "@/accounts": "*",
        "@/next": "*",
-        "@ente/accounts": "*",
        "@ente/shared": "*"
    },
    "devDependencies": {
--- a/web/apps/accounts/tsconfig.json
+++ b/web/apps/accounts/tsconfig.json
@@ -1,13 +1,14 @@
 {
    "extends": "@/build-config/tsconfig-next.json",
    "compilerOptions": {
-        /* Set the base directory from which to resolve bare module names */
+        /* Set the base directory from which to resolve bare module names. */
        "baseUrl": "./src",
        /* MUI doesn't work with exactOptionalPropertyTypes yet. */
        "exactOptionalPropertyTypes": false
    },
    "include": [
        "src",
+        "next-env.d.ts",
        "../../packages/next/global-electron.d.ts",
        "../../packages/shared/themes/mui-theme.d.ts"
    ]
--- a/web/apps/auth/package.json
+++ b/web/apps/auth/package.json
@@ -3,9 +3,9 @@
    "version": "0.0.0",
    "private": true,
    "dependencies": {
+        "@/accounts": "*",
        "@/build-config": "*",
        "@/next": "*",
-        "@ente/accounts": "*",
        "@ente/eslint-config": "*",
        "@ente/shared": "*",
        "jssha": "~3.3.1",
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -1,3 +1,5 @@
+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";
@@ -6,8 +8,6 @@ import {
    logUnhandledErrorsAndRejections,
 } from "@/next/log-web";
 import { ensure } from "@/utils/ensure";
-import { accountLogout } from "@ente/accounts/services/logout";
-import type { AccountsContextT } from "@ente/accounts/types/context";
 import { Overlay } from "@ente/shared/components/Container";
 import DialogBoxV2 from "@ente/shared/components/DialogBoxV2";
 import type { DialogBoxAttributesV2 } from "@ente/shared/components/DialogBoxV2/types";
--- a/web/apps/auth/src/pages/change-email.tsx
+++ b/web/apps/auth/src/pages/change-email.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/change-email";
+import Page_ from "@/accounts/pages/change-email";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/auth/src/pages/change-password.tsx
+++ b/web/apps/auth/src/pages/change-password.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/change-password";
+import Page_ from "@/accounts/pages/change-password";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/auth/src/pages/credentials.tsx
+++ b/web/apps/auth/src/pages/credentials.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/credentials";
+import Page_ from "@/accounts/pages/credentials";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/auth/src/pages/generate.tsx
+++ b/web/apps/auth/src/pages/generate.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/generate";
+import Page_ from "@/accounts/pages/generate";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/auth/src/pages/login.tsx
+++ b/web/apps/auth/src/pages/login.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/login";
+import Page_ from "@/accounts/pages/login";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/auth/src/pages/passkeys/finish.tsx
+++ b/web/apps/auth/src/pages/passkeys/finish.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/passkeys/finish";
+import Page_ from "@/accounts/pages/passkeys/finish";
 import { useAppContext } from "../_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/auth/src/pages/passkeys/recover.tsx
+++ b/web/apps/auth/src/pages/passkeys/recover.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/two-factor/recover";
+import Page_ from "@/accounts/pages/two-factor/recover";
 import { useAppContext } from "../_app";

 const Page = () => (
--- a/web/apps/auth/src/pages/recover.tsx
+++ b/web/apps/auth/src/pages/recover.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/recover";
+import Page_ from "@/accounts/pages/recover";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/auth/src/pages/signup.tsx
+++ b/web/apps/auth/src/pages/signup.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/signup";
+import Page_ from "@/accounts/pages/signup";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/auth/src/pages/two-factor/recover.tsx
+++ b/web/apps/auth/src/pages/two-factor/recover.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/two-factor/recover";
+import Page_ from "@/accounts/pages/two-factor/recover";
 import { useAppContext } from "../_app";

 const Page = () => <Page_ appContext={useAppContext()} twoFactorType="totp" />;
--- a/web/apps/auth/src/pages/two-factor/setup.tsx
+++ b/web/apps/auth/src/pages/two-factor/setup.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/two-factor/setup";
+import Page_ from "@/accounts/pages/two-factor/setup";
 import { useAppContext } from "../_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/auth/src/pages/two-factor/verify.tsx
+++ b/web/apps/auth/src/pages/two-factor/verify.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/two-factor/verify";
+import Page_ from "@/accounts/pages/two-factor/verify";
 import { useAppContext } from "../_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/auth/src/pages/verify.tsx
+++ b/web/apps/auth/src/pages/verify.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/verify";
+import Page_ from "@/accounts/pages/verify";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/auth/src/services/steam.ts
+++ b/web/apps/auth/src/services/steam.ts
@@ -31,12 +31,12 @@ export class Steam {
        const digest = sha1HMACDigest(this.secret.buffer, uintToArray(counter));

        // Same calculation as regular HOTP.
-        const offset = digest[digest.length - 1] & 15;
+        const offset = digest[digest.length - 1]! & 15;
        let otp =
-            ((digest[offset] & 127) << 24) |
-            ((digest[offset + 1] & 255) << 16) |
-            ((digest[offset + 2] & 255) << 8) |
-            (digest[offset + 3] & 255);
+            ((digest[offset]! & 127) << 24) |
+            ((digest[offset + 1]! & 255) << 16) |
+            ((digest[offset + 2]! & 255) << 8) |
+            (digest[offset + 3]! & 255);

        // However, instead of using this as the OTP, use it to index into
        // the steam OTP alphabet.
--- a/web/apps/auth/tsconfig.json
+++ b/web/apps/auth/tsconfig.json
@@ -1,14 +1,9 @@
 {
    "extends": "@/build-config/tsconfig-next.json",
    "compilerOptions": {
-        /* Set the base directory from which to resolve bare module names */
+        /* Set the base directory from which to resolve bare module names. */
        "baseUrl": "./src",
-
-        /* This is hard to enforce in certain cases where we do a lot of array
-           indexing, e.g. image/ML ops, and TS doesn't currently have a way to
-           disable this for blocks of code. */
-        "noUncheckedIndexedAccess": false,
-        /* MUI doesn't play great with exactOptionalPropertyTypes currently. */
+        /* MUI doesn't work with exactOptionalPropertyTypes yet. */
        "exactOptionalPropertyTypes": false
    },
    "include": [
--- a/web/apps/cast/package.json
+++ b/web/apps/cast/package.json
@@ -3,9 +3,9 @@
    "version": "0.0.0",
    "private": true,
    "dependencies": {
+        "@/accounts": "*",
        "@/media": "*",
        "@/next": "*",
-        "@ente/accounts": "*",
        "@ente/eslint-config": "*",
        "@ente/shared": "*"
    },
--- a/web/apps/cast/tsconfig.json
+++ b/web/apps/cast/tsconfig.json
@@ -8,6 +8,7 @@
    },
    "include": [
        "src",
+        "next-env.d.ts",
        "../../packages/next/global-electron.d.ts",
        "../../packages/shared/themes/mui-theme.d.ts"
    ]
--- a/web/apps/photos/package.json
+++ b/web/apps/photos/package.json
@@ -3,11 +3,11 @@
    "version": "0.0.0",
    "private": true,
    "dependencies": {
+        "@/accounts": "*",
        "@/media": "*",
        "@/new": "*",
        "@/next": "*",
        "@date-io/date-fns": "^2.14.0",
-        "@ente/accounts": "*",
        "@ente/eslint-config": "*",
        "@ente/shared": "*",
        "@mui/x-date-pickers": "^5.0.0-alpha.6",
--- 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 { checkSessionValidity } from "@ente/accounts/services/session";
 import DialogBoxV2 from "@ente/shared/components/DialogBoxV2";
 import type { DialogBoxAttributesV2 } from "@ente/shared/components/DialogBoxV2/types";
 import VerifyMasterPasswordForm, {
--- a/web/apps/photos/src/components/Sidebar/index.tsx
+++ b/web/apps/photos/src/components/Sidebar/index.tsx
@@ -1,7 +1,7 @@
+import { openAccountsManagePasskeysPage } from "@/accounts/services/passkey";
 import log from "@/next/log";
 import { savedLogs } from "@/next/log-web";
 import { customAPIHost } from "@/next/origins";
-import { openAccountsManagePasskeysPage } from "@ente/accounts/services/passkey";
 import { SpaceBetweenFlex } from "@ente/shared/components/Container";
 import { EnteLogo } from "@ente/shared/components/EnteLogo";
 import EnteSpinner from "@ente/shared/components/EnteSpinner";
--- a/web/apps/photos/src/components/TwoFactor/Modal/Manage.tsx
+++ b/web/apps/photos/src/components/TwoFactor/Modal/Manage.tsx
@@ -1,7 +1,7 @@
 import { t } from "i18next";
 import { useContext } from "react";

-import { disableTwoFactor } from "@ente/accounts/api/user";
+import { disableTwoFactor } from "@/accounts/api/user";
 import { PHOTOS_PAGES as PAGES } from "@ente/shared/constants/pages";
 import { LS_KEYS, getData, setLSUser } from "@ente/shared/storage/localStorage";
 import { Button, Grid } from "@mui/material";
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -1,3 +1,4 @@
+import type { AccountsContextT } from "@/accounts/types/context";
 import DownloadManager from "@/new/photos/services/download";
 import {
    isFaceIndexingEnabled,
@@ -14,7 +15,6 @@ import {
 } from "@/next/log-web";
 import { AppUpdate } from "@/next/types/ipc";
 import { ensure } from "@/utils/ensure";
-import type { AccountsContextT } from "@ente/accounts/types/context";
 import { Overlay } from "@ente/shared/components/Container";
 import DialogBox from "@ente/shared/components/DialogBox";
 import {
--- a/web/apps/photos/src/pages/change-email.tsx
+++ b/web/apps/photos/src/pages/change-email.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/change-email";
+import Page_ from "@/accounts/pages/change-email";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/photos/src/pages/change-password.tsx
+++ b/web/apps/photos/src/pages/change-password.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/change-password";
+import Page_ from "@/accounts/pages/change-password";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/photos/src/pages/credentials.tsx
+++ b/web/apps/photos/src/pages/credentials.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/credentials";
+import Page_ from "@/accounts/pages/credentials";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/photos/src/pages/generate.tsx
+++ b/web/apps/photos/src/pages/generate.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/generate";
+import Page_ from "@/accounts/pages/generate";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- 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 { DevSettings } from "@/new/photos/components/DevSettings";
 import log from "@/next/log";
 import { albumsAppOrigin, customAPIHost } from "@/next/origins";
-import { Login } from "@ente/accounts/components/Login";
-import { SignUp } from "@ente/accounts/components/SignUp";
 import { EnteLogo } from "@ente/shared/components/EnteLogo";
 import EnteSpinner from "@ente/shared/components/EnteSpinner";
 import { PHOTOS_PAGES as PAGES } from "@ente/shared/constants/pages";
--- a/web/apps/photos/src/pages/login.tsx
+++ b/web/apps/photos/src/pages/login.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/login";
+import Page_ from "@/accounts/pages/login";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/photos/src/pages/passkeys/finish.tsx
+++ b/web/apps/photos/src/pages/passkeys/finish.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/passkeys/finish";
+import Page_ from "@/accounts/pages/passkeys/finish";
 import { useAppContext } from "../_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/photos/src/pages/passkeys/recover.tsx
+++ b/web/apps/photos/src/pages/passkeys/recover.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/two-factor/recover";
+import Page_ from "@/accounts/pages/two-factor/recover";
 import { useAppContext } from "../_app";

 const Page = () => (
--- a/web/apps/photos/src/pages/recover.tsx
+++ b/web/apps/photos/src/pages/recover.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/recover";
+import Page_ from "@/accounts/pages/recover";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/photos/src/pages/signup.tsx
+++ b/web/apps/photos/src/pages/signup.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/signup";
+import Page_ from "@/accounts/pages/signup";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/photos/src/pages/two-factor/recover.tsx
+++ b/web/apps/photos/src/pages/two-factor/recover.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/two-factor/recover";
+import Page_ from "@/accounts/pages/two-factor/recover";
 import { useAppContext } from "../_app";

 const Page = () => <Page_ appContext={useAppContext()} twoFactorType="totp" />;
--- a/web/apps/photos/src/pages/two-factor/setup.tsx
+++ b/web/apps/photos/src/pages/two-factor/setup.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/two-factor/setup";
+import Page_ from "@/accounts/pages/two-factor/setup";
 import { useAppContext } from "../_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/photos/src/pages/two-factor/verify.tsx
+++ b/web/apps/photos/src/pages/two-factor/verify.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/two-factor/verify";
+import Page_ from "@/accounts/pages/two-factor/verify";
 import { useAppContext } from "../_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/photos/src/pages/verify.tsx
+++ b/web/apps/photos/src/pages/verify.tsx
@@ -1,4 +1,4 @@
-import Page_ from "@ente/accounts/pages/verify";
+import Page_ from "@/accounts/pages/verify";
 import { useAppContext } from "./_app";

 const Page = () => <Page_ appContext={useAppContext()} />;
--- a/web/apps/photos/src/services/logout.ts
+++ b/web/apps/photos/src/services/logout.ts
@@ -1,10 +1,10 @@
+import { accountLogout } from "@/accounts/services/logout";
 import DownloadManager from "@/new/photos/services/download";
 import { clearFeatureFlagSessionState } from "@/new/photos/services/feature-flags";
 import { terminateMLWorker } from "@/new/photos/services/ml";
 import { clearFaceDB } from "@/new/photos/services/ml/db";
 import mlWorkManager from "@/new/photos/services/ml/mlWorkManager";
 import log from "@/next/log";
-import { accountLogout } from "@ente/accounts/services/logout";
 import { clipService } from "services/clip-service";
 import exportService from "./export";

--- 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 { putAttributes } from "@ente/accounts/api/user";
 import { ApiError } from "@ente/shared/error";
 import HTTPService from "@ente/shared/network/HTTPService";
 import { LS_KEYS, getData } from "@ente/shared/storage/localStorage";
--- a/web/packages/accounts/README.md
+++ b/web/packages/accounts/README.md
@@ -1,4 +1,4 @@
-## @ente/accounts
+## @/accounts

 A package for sharing the pages involved in the signup/login flow.

--- a/web/packages/accounts/api/srp.ts
+++ b/web/packages/accounts/api/srp.ts
@@ -1,5 +1,8 @@
 import log from "@/next/log";
 import { apiURL } from "@/next/origins";
+import { ApiError, CustomError } from "@ente/shared/error";
+import HTTPService from "@ente/shared/network/HTTPService";
+import { HttpStatusCode } from "axios";
 import type {
    CompleteSRPSetupRequest,
    CompleteSRPSetupResponse,
@@ -11,10 +14,7 @@ import type {
    SetupSRPResponse,
    UpdateSRPAndKeysRequest,
    UpdateSRPAndKeysResponse,
-} from "@ente/accounts/types/srp";
-import { ApiError, CustomError } from "@ente/shared/error";
-import HTTPService from "@ente/shared/network/HTTPService";
-import { HttpStatusCode } from "axios";
+} from "../types/srp";

 export const getSRPAttributes = async (
    email: string,
--- a/web/packages/accounts/api/user.ts
+++ b/web/packages/accounts/api/user.ts
@@ -1,12 +1,12 @@
-import { appName } from "@/next/app";
-import { apiURL } from "@/next/origins";
 import type {
    RecoveryKey,
    TwoFactorRecoveryResponse,
    TwoFactorSecret,
    TwoFactorVerificationResponse,
    UserVerificationResponse,
-} from "@ente/accounts/types/user";
+} from "@/accounts/types/user";
+import { appName } from "@/next/app";
+import { apiURL } from "@/next/origins";
 import type { B64EncryptionResult } from "@ente/shared/crypto/internal/libsodium";
 import { ApiError, CustomError } from "@ente/shared/error";
 import HTTPService from "@ente/shared/network/HTTPService";
--- a/web/packages/accounts/components/PasswordStrength.tsx
+++ b/web/packages/accounts/components/PasswordStrength.tsx
@@ -1,4 +1,4 @@
-import { estimatePasswordStrength } from "@ente/accounts/utils";
+import { estimatePasswordStrength } from "@/accounts/utils";
 import { FlexWrapper } from "@ente/shared/components/Container";
 import { Typography } from "@mui/material";
 import { t } from "i18next";
--- a/web/packages/accounts/components/SetPasswordForm.tsx
+++ b/web/packages/accounts/components/SetPasswordForm.tsx
@@ -1,4 +1,4 @@
-import { isWeakPassword } from "@ente/accounts/utils";
+import { isWeakPassword } from "@/accounts/utils";
 import ShowHidePassword from "@ente/shared/components/Form/ShowHidePassword";
 import SubmitButton from "@ente/shared/components/SubmitButton";
 import { Box, Input, TextField, Typography } from "@mui/material";
--- a/web/packages/accounts/components/SignUp.tsx
+++ b/web/packages/accounts/components/SignUp.tsx
@@ -1,9 +1,9 @@
+import { sendOtt } from "@/accounts/api/user";
+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 { sendOtt } from "@ente/accounts/api/user";
-import { PasswordStrengthHint } from "@ente/accounts/components/PasswordStrength";
-import { PAGES } from "@ente/accounts/constants/pages";
-import { isWeakPassword } from "@ente/accounts/utils";
-import { generateKeyAndSRPAttributes } from "@ente/accounts/utils/srp";
 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";
--- a/web/packages/accounts/components/two-factor/VerifyForm.tsx
+++ b/web/packages/accounts/components/two-factor/VerifyForm.tsx
@@ -1,5 +1,5 @@
+import InvalidInputMessage from "@/accounts/components/two-factor/InvalidInputMessage";
 import { wait } from "@/utils/promise";
-import InvalidInputMessage from "@ente/accounts/components/two-factor/InvalidInputMessage";
 import {
    CenteredFlex,
    VerticallyCentered,
--- a/web/packages/accounts/components/two-factor/setup/ManualMode.tsx
+++ b/web/packages/accounts/components/two-factor/setup/ManualMode.tsx
@@ -1,4 +1,4 @@
-import type { TwoFactorSecret } from "@ente/accounts/types/user";
+import type { TwoFactorSecret } from "@/accounts/types/user";
 import CodeBlock from "@ente/shared/components/CodeBlock";
 import { Typography } from "@mui/material";
 import { t } from "i18next";
--- a/web/packages/accounts/components/two-factor/setup/QRMode.tsx
+++ b/web/packages/accounts/components/two-factor/setup/QRMode.tsx
@@ -1,4 +1,4 @@
-import type { TwoFactorSecret } from "@ente/accounts/types/user";
+import type { TwoFactorSecret } from "@/accounts/types/user";
 import EnteSpinner from "@ente/shared/components/EnteSpinner";
 import { t } from "i18next";

--- a/web/packages/accounts/components/two-factor/setup/index.tsx
+++ b/web/packages/accounts/components/two-factor/setup/index.tsx
@@ -1,7 +1,7 @@
-import SetupManualMode from "@ente/accounts/components/two-factor/setup/ManualMode";
-import SetupQRMode from "@ente/accounts/components/two-factor/setup/QRMode";
-import { SetupMode } from "@ente/accounts/pages/two-factor/setup";
-import type { TwoFactorSecret } from "@ente/accounts/types/user";
+import SetupManualMode from "@/accounts/components/two-factor/setup/ManualMode";
+import SetupQRMode from "@/accounts/components/two-factor/setup/QRMode";
+import { SetupMode } from "@/accounts/pages/two-factor/setup";
+import type { TwoFactorSecret } from "@/accounts/types/user";
 import { VerticallyCentered } from "@ente/shared/components/Container";
 import { useState } from "react";

--- a/web/packages/accounts/package.json
+++ b/web/packages/accounts/package.json
@@ -1,11 +1,10 @@
 {
-    "name": "@ente/accounts",
+    "name": "@/accounts",
    "version": "0.0.0",
    "private": true,
    "dependencies": {
        "@/next": "*",
        "@ente/eslint-config": "*",
        "@ente/shared": "*"
-    },
-    "devDependencies": {}
+    }
 }
--- a/web/packages/accounts/pages/change-email.tsx
+++ b/web/packages/accounts/pages/change-email.tsx
@@ -1,7 +1,7 @@
+import { changeEmail, sendOTTForEmailChange } from "@/accounts/api/user";
+import { PAGES } from "@/accounts/constants/pages";
 import { ensure } from "@/utils/ensure";
 import { wait } from "@/utils/promise";
-import { changeEmail, sendOTTForEmailChange } from "@ente/accounts/api/user";
-import { PAGES } from "@ente/accounts/constants/pages";
 import { VerticallyCentered } from "@ente/shared/components/Container";
 import FormPaper from "@ente/shared/components/Form/FormPaper";
 import FormPaperFooter from "@ente/shared/components/Form/FormPaper/Footer";
--- a/web/packages/accounts/pages/change-password.tsx
+++ b/web/packages/accounts/pages/change-password.tsx
@@ -1,22 +1,19 @@
-import { ensure } from "@/utils/ensure";
 import {
    getSRPAttributes,
    startSRPSetup,
    updateSRPAndKeys,
-} from "@ente/accounts/api/srp";
+} from "@/accounts/api/srp";
 import SetPasswordForm, {
    type SetPasswordFormProps,
-} from "@ente/accounts/components/SetPasswordForm";
-import { PAGES } from "@ente/accounts/constants/pages";
+} from "@/accounts/components/SetPasswordForm";
+import { PAGES } from "@/accounts/constants/pages";
 import {
    generateSRPClient,
    generateSRPSetupAttributes,
-} from "@ente/accounts/services/srp";
-import type { UpdatedKey } from "@ente/accounts/types/user";
-import {
-    convertBase64ToBuffer,
-    convertBufferToBase64,
-} from "@ente/accounts/utils";
+} from "@/accounts/services/srp";
+import type { UpdatedKey } from "@/accounts/types/user";
+import { convertBase64ToBuffer, convertBufferToBase64 } from "@/accounts/utils";
+import { ensure } from "@/utils/ensure";
 import { VerticallyCentered } from "@ente/shared/components/Container";
 import FormPaper from "@ente/shared/components/Form/FormPaper";
 import FormPaperFooter from "@ente/shared/components/Form/FormPaper/Footer";
--- a/web/packages/accounts/pages/generate.tsx
+++ b/web/packages/accounts/pages/generate.tsx
@@ -1,12 +1,12 @@
-import log from "@/next/log";
-import { ensure } from "@/utils/ensure";
-import { putAttributes } from "@ente/accounts/api/user";
+import { putAttributes } from "@/accounts/api/user";
 import SetPasswordForm, {
    type SetPasswordFormProps,
-} from "@ente/accounts/components/SetPasswordForm";
-import { PAGES } from "@ente/accounts/constants/pages";
-import { configureSRP } from "@ente/accounts/services/srp";
-import { generateKeyAndSRPAttributes } from "@ente/accounts/utils/srp";
+} from "@/accounts/components/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 { ensure } from "@/utils/ensure";
 import { VerticallyCentered } from "@ente/shared/components/Container";
 import EnteSpinner from "@ente/shared/components/EnteSpinner";
 import FormPaper from "@ente/shared/components/Form/FormPaper";
--- a/web/packages/accounts/pages/recover.tsx
+++ b/web/packages/accounts/pages/recover.tsx
@@ -1,7 +1,7 @@
+import { sendOtt } from "@/accounts/api/user";
+import { PAGES } from "@/accounts/constants/pages";
 import log from "@/next/log";
 import { ensure } from "@/utils/ensure";
-import { sendOtt } from "@ente/accounts/api/user";
-import { PAGES } from "@ente/accounts/constants/pages";
 import { VerticallyCentered } from "@ente/shared/components/Container";
 import FormPaper from "@ente/shared/components/Form/FormPaper";
 import FormPaperFooter from "@ente/shared/components/Form/FormPaper/Footer";
--- 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 { PAGES } from "@ente/accounts/constants/pages";
 import { LS_KEYS, getData } from "@ente/shared//storage/localStorage";
 import { VerticallyCentered } from "@ente/shared/components/Container";
 import EnteSpinner from "@ente/shared/components/EnteSpinner";
--- a/web/packages/accounts/pages/two-factor/recover.tsx
+++ b/web/packages/accounts/pages/two-factor/recover.tsx
@@ -1,12 +1,12 @@
-import log from "@/next/log";
-import { ensure } from "@/utils/ensure";
 import {
    recoverTwoFactor,
    removeTwoFactor,
    type TwoFactorType,
-} from "@ente/accounts/api/user";
-import { PAGES } from "@ente/accounts/constants/pages";
-import type { AccountsContextT } from "@ente/accounts/types/context";
+} from "@/accounts/api/user";
+import { PAGES } from "@/accounts/constants/pages";
+import type { AccountsContextT } from "@/accounts/types/context";
+import log from "@/next/log";
+import { ensure } from "@/utils/ensure";
 import { VerticallyCentered } from "@ente/shared/components/Container";
 import type { DialogBoxAttributesV2 } from "@ente/shared/components/DialogBoxV2/types";
 import FormPaper from "@ente/shared/components/Form/FormPaper";
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -1,11 +1,11 @@
-import log from "@/next/log";
-import { ensure } from "@/utils/ensure";
-import { enableTwoFactor, setupTwoFactor } from "@ente/accounts/api/user";
+import { enableTwoFactor, setupTwoFactor } from "@/accounts/api/user";
 import VerifyTwoFactor, {
    type VerifyTwoFactorCallback,
-} from "@ente/accounts/components/two-factor/VerifyForm";
-import { TwoFactorSetup } from "@ente/accounts/components/two-factor/setup";
-import type { TwoFactorSecret } from "@ente/accounts/types/user";
+} 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 { ensure } from "@/utils/ensure";
 import { VerticallyCentered } from "@ente/shared/components/Container";
 import LinkButton from "@ente/shared/components/LinkButton";
 import { encryptWithRecoveryKey } from "@ente/shared/crypto/helpers";
--- a/web/packages/accounts/pages/two-factor/verify.tsx
+++ b/web/packages/accounts/pages/two-factor/verify.tsx
@@ -1,9 +1,9 @@
-import { ensure } from "@/utils/ensure";
-import { verifyTwoFactor } from "@ente/accounts/api/user";
+import { verifyTwoFactor } from "@/accounts/api/user";
 import VerifyTwoFactor, {
    type VerifyTwoFactorCallback,
-} from "@ente/accounts/components/two-factor/VerifyForm";
-import { PAGES } from "@ente/accounts/constants/pages";
+} from "@/accounts/components/two-factor/VerifyForm";
+import { PAGES } from "@/accounts/constants/pages";
+import { ensure } from "@/utils/ensure";
 import { VerticallyCentered } from "@ente/shared/components/Container";
 import FormPaper from "@ente/shared/components/Form/FormPaper";
 import FormPaperFooter from "@ente/shared/components/Form/FormPaper/Footer";
--- a/web/packages/accounts/pages/verify.tsx
+++ b/web/packages/accounts/pages/verify.tsx
@@ -1,5 +1,5 @@
+import type { UserVerificationResponse } from "@/accounts/types/user";
 import { ensure } from "@/utils/ensure";
-import type { UserVerificationResponse } from "@ente/accounts/types/user";
 import { VerticallyCentered } from "@ente/shared/components/Container";
 import EnteSpinner from "@ente/shared/components/EnteSpinner";
 import FormPaper from "@ente/shared/components/Form/FormPaper";
--- 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 type { UserVerificationResponse } from "@ente/accounts/types/user";
 import ComlinkCryptoWorker from "@ente/shared/crypto";
 import { generateLoginSubKey } from "@ente/shared/crypto/helpers";
 import InMemoryStore, { MS_KEYS } from "@ente/shared/storage/InMemoryStore";
--- a/web/packages/accounts/tsconfig.json
+++ b/web/packages/accounts/tsconfig.json
@@ -1,9 +1,7 @@
 {
    "extends": "@/build-config/tsconfig-next.json",
    "compilerOptions": {
-        /* TODO(MR): Enable this */
-        "noUncheckedIndexedAccess": false,
-        /* MUI doesn't play great with exactOptionalPropertyTypes currently. */
+        /* MUI doesn't work with exactOptionalPropertyTypes yet. */
        "exactOptionalPropertyTypes": false
    },
    "include": [
--- a/web/packages/accounts/types/page.ts
+++ b/web/packages/accounts/types/page.ts
@@ -1,4 +1,4 @@
-import type { AccountsContextT } from "@ente/accounts/types/context";
+import type { AccountsContextT } from "./context";

 /**
 * The default type for pages exposed by this package.
--- a/web/packages/accounts/types/srp.ts
+++ b/web/packages/accounts/types/srp.ts
@@ -1,7 +1,4 @@
-import type {
-    UpdatedKey,
-    UserVerificationResponse,
-} from "@ente/accounts/types/user";
+import type { UpdatedKey, UserVerificationResponse } from "./user";

 export interface SRPAttributes {
    srpUserID: string;
--- a/web/packages/shared/components/LoginComponents.tsx
+++ b/web/packages/shared/components/LoginComponents.tsx
@@ -1,10 +1,10 @@
-import log from "@/next/log";
-import { customAPIHost } from "@/next/origins";
 import {
    checkPasskeyVerificationStatus,
    passkeySessionExpiredErrorMessage,
    saveCredentialsAndNavigateTo,
-} from "@ente/accounts/services/passkey";
+} from "@/accounts/services/passkey";
+import log from "@/next/log";
+import { customAPIHost } from "@/next/origins";
 import EnteButton from "@ente/shared/components/EnteButton";
 import { CircularProgress, Stack, Typography, styled } from "@mui/material";
 import { t } from "i18next";
--- 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 type { SRPAttributes } from "@ente/accounts/types/srp";
 import { Input, type ButtonProps } from "@mui/material";
 import { t } from "i18next";
 import SingleInputForm, {
--- 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 { setRecoveryKey } from "@ente/accounts/api/user";
 import {
    LS_KEYS,
    getData,
--- a/web/packages/shared/next/pages/404.tsx
+++ b/web/packages/shared/next/pages/404.tsx
@@ -1,4 +1,4 @@
-import { PAGES } from "@ente/accounts/constants/pages";
+import { PAGES } from "@/accounts/constants/pages";
 import { useRouter } from "next/router";
 import { useEffect } from "react";

--- a/web/tsconfig.base.json
+++ b/web/tsconfig.base.json
@@ -22,8 +22,7 @@
        "target": "es2021",
        "paths": {
            "@ente/eslint-config/*": ["./packages/eslint-config/*"],
-            "@ente/shared/*": ["./packages/shared/*"],
-            "@ente/accounts/*": ["./packages/accounts/*"]
+            "@ente/shared/*": ["./packages/shared/*"]
        }
    },
    "exclude": ["**/node_modules", "**/.*/"]