@indietabletop/appkit 5.0.0-0 → 5.0.0-2

package/lib/AuthCard/AuthCard.stories.ts

@@ -1,24 +1,20 @@
-import type { Meta, StoryObj } from "@storybook/react-vite";
 import { fn } from "storybook/test";
+import preview from "../../.storybook/preview.tsx";
 import { AuthCard } from "./AuthCard.tsx";
 
-const meta = {
+const meta = preview.meta({
   title: "Account/Auth Card",
   component: AuthCard,
   tags: ["autodocs"],
   args: {
     onLogout: fn(),
   },
-} satisfies Meta<typeof AuthCard>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
+});
 
 /**
  * The default case where elements are correctly separated with middots.
  */
-export const Authenticated: Story = {
+export const Authenticated = meta.story({
   args: {
     currentUser: {
       id: "martin",
@@ -26,13 +22,13 @@ export const Authenticated: Story = {
       isVerified: true,
     },
   },
-};
+});
 
 /**
  * The default case in which all steps of the flow succeed.
  */
-export const Anonymous: Story = {
+export const Anonymous = meta.story({
   args: {
     currentUser: null,
   },
-};
+});

package/lib/Letterhead/stories.tsx

@@ -1,5 +1,5 @@
 import { FormProvider } from "@ariakit/react";
-import type { Meta, StoryObj } from "@storybook/react-vite";
+import preview from "../../.storybook/preview.tsx";
 import {
   Letterhead,
   LetterheadHeading,
@@ -7,20 +7,16 @@ import {
   LetterheadSubmitButton,
 } from "./index.tsx";
 
-const meta = {
-  title: "Letterhead",
+const meta = preview.meta({
+  title: "Components/Letterhead",
   component: Letterhead,
   tags: ["autodocs"],
   args: {
     textAlign: "start",
   },
-} satisfies Meta<typeof Letterhead>;
+});
 
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {
+export const Default = meta.story({
   args: {
     children: (
       <>
@@ -42,4 +38,4 @@ export const Default: Story = {
       </>
     ),
   },
-};
+});

package/lib/LetterheadForm/LetterheadReadonlyTextField.stories.tsx

@@ -1,21 +1,17 @@
-import type { Meta, StoryObj } from "@storybook/react-vite";
+import preview from "../../.storybook/preview.tsx";
 import { LetterheadReadonlyTextField } from "./index.tsx";
 
-const meta = {
-  title: "ReadonlyTextField",
+const meta = preview.meta({
+  title: "Components/ReadonlyTextField",
   component: LetterheadReadonlyTextField,
   tags: ["autodocs"],
   args: {},
-} satisfies Meta<typeof LetterheadReadonlyTextField>;
+});
 
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {
+export const Default = meta.story({
   args: {
     label: "Email",
     value: "john@example.com",
     placeholder: "john@example.com",
   },
-};
+});

package/lib/LetterheadForm/LetterheadSubmitError.stories.tsx

@@ -1,23 +1,19 @@
-import type { Meta, StoryObj } from "@storybook/react-vite";
+import preview from "../../.storybook/preview.tsx";
 import { form } from "../storybook/decorators.tsx";
 import { LetterheadSubmitError } from "./index.tsx";
 
-const meta = {
-  title: "LetterheadSubmitError",
+const meta = preview.meta({
+  title: "Components/LetterheadSubmitError",
   component: LetterheadSubmitError,
   tags: ["autodocs"],
   args: {},
   decorators: [
     form({ defaultErrors: { submit: "This is an error message." } }),
   ],
-} satisfies Meta<typeof LetterheadSubmitError>;
+});
 
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {
+export const Default = meta.story({
   args: {
     name: "submit",
   },
-};
+});

package/lib/LetterheadForm/LetterheadTextField.stories.tsx

@@ -1,23 +1,19 @@
-import type { Meta, StoryObj } from "@storybook/react-vite";
+import preview from "../../.storybook/preview.tsx";
 import { form } from "../storybook/decorators.tsx";
 import { LetterheadTextField } from "./index.tsx";
 
-const meta = {
-  title: "FormTextField",
+const meta = preview.meta({
+  title: "Components/LetterheadTextField",
   component: LetterheadTextField,
   tags: ["autodocs"],
   args: {},
   decorators: [form()],
-} satisfies Meta<typeof LetterheadTextField>;
+});
 
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {
+export const Default = meta.story({
   args: {
     label: "Email",
     placeholder: "john@example.com",
     name: "foo",
   },
-};
+});

package/lib/MiddotSeparated/MiddotSeparated.stories.ts

@@ -1,32 +1,26 @@
-import type { Meta, StoryObj } from "@storybook/react-vite";
+import preview from "../../.storybook/preview.tsx";
 import { MiddotSeparated } from "./MiddotSeparated.tsx";
 
-type ComponentType = typeof MiddotSeparated;
-
-type Story = StoryObj<typeof meta>;
-
-const meta = {
+const meta = preview.meta({
   title: "Components/Middot Separated",
   component: MiddotSeparated,
   tags: ["autodocs"],
-} satisfies Meta<ComponentType>;
-
-export default meta;
+});
 
 /**
  * The default case in which all steps of the flow succeed.
  */
-export const Default: Story = {
+export const Default = meta.story({
   args: {
     children: ["Lorem", "Ipsum", " Dolor"],
   },
-};
+});
 
 /**
  * Edge case when it comes to handling children in React.
  */
-export const SingleElement: Story = {
+export const SingleElement = meta.story({
   args: {
     children: "Lorem",
   },
-};
+});

package/lib/QRCode/QRCode.stories.tsx

@@ -1,13 +1,9 @@
-import type { Meta, StoryObj } from "@storybook/react-vite";
 import { http, HttpResponse } from "msw";
+import preview from "../../.storybook/preview.tsx";
 import { Failure, Pending, Success } from "../async-op.ts";
 import { QRCode } from "./QRCode.tsx";
 
-type StoryMeta = Meta<typeof QRCode>;
-
-type Story = StoryObj<typeof meta>;
-
-const meta = {
+const meta = preview.meta({
   title: "Components/QR Code",
   component: QRCode,
   tags: ["autodocs"],
@@ -28,20 +24,18 @@ const meta = {
       },
     },
   },
-} satisfies StoryMeta;
-
-export default meta;
+});
 
-export const SuccessCase: Story = {};
+export const SuccessCase = meta.story({});
 
-export const PendingCase: Story = {
+export const PendingCase = meta.story({
   args: {
     url: new Pending(),
   },
-};
+});
 
-export const FailureCase: Story = {
+export const FailureCase = meta.story({
   args: {
     url: new Failure("Failed"),
   },
-};
+});

package/lib/SubscribeCard/LetterheadInfoCard.tsx

@@ -4,7 +4,7 @@ import {
   LetterheadParagraph,
 } from "../Letterhead/index.tsx";
 import * as css from "./style.css.ts";
-import type { ViewContent } from "./SubscribeCard.tsx";
+import type { ViewContent } from "./SubscribeByPledgeCard.tsx";
 
 export function LetterheadInfoCard(props: ViewContent) {
   return (

package/lib/SubscribeCard/SubscribeByEmailCard.stories.tsx

@@ -1,5 +1,5 @@
-import type { Meta, StoryObj } from "@storybook/react-vite";
 import { http, HttpResponse } from "msw";
+import preview from "../../.storybook/preview.tsx";
 import { LetterheadParagraph } from "../Letterhead/index.tsx";
 import { sleep } from "../sleep.ts";
 import { SubscribeByEmailCard } from "./SubscribeByEmailCard.tsx";
@@ -30,12 +30,8 @@ const handlers = {
   },
 };
 
-/**
- * Allows users to subscribe to ITC's newsletter using the email provided
- * in their pledge.
- */
-const meta = {
-  title: "Pages/Subscribe By Email Card",
+const meta = preview.meta({
+  title: "Newsletter/Subscribe By Email Card",
   component: SubscribeByEmailCard,
   tags: ["autodocs"],
   args: {
@@ -68,10 +64,6 @@ const meta = {
       },
     },
   },
-} satisfies Meta<typeof SubscribeByEmailCard>;
+});
 
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {};
+export const Default = meta.story({});

package/lib/SubscribeCard/SubscribeByEmailCard.tsx

@@ -149,6 +149,12 @@ type ViewContent = {
   description: ReactNode;
 };
 
+/**
+ * Allows users to sign up to the newsletter using an arbitrary email.
+ *
+ * Signups are verified using an one-time code, which is sent to the supplied
+ * email address.
+ */
 export function SubscribeByEmailCard(props: {
   content: Record<Exclude<SubscribeStep["type"], "SUBMIT_CODE">, ViewContent>;
 }) {

package/lib/SubscribeCard/{SubscribeCard.stories.tsx → SubscribeByPledgeCard.stories.tsx}

@@ -1,8 +1,8 @@
-import type { Meta, StoryObj } from "@storybook/react-vite";
 import { http, HttpResponse } from "msw";
+import preview from "../../.storybook/preview.tsx";
 import { LetterheadParagraph } from "../Letterhead/index.tsx";
 import { sleep } from "../sleep.ts";
-import { SubscribeCard } from "./SubscribeCard.tsx";
+import { SubscribeByPledgeCard } from "./SubscribeByPledgeCard.tsx";
 
 const pledge = {
   id: "1",
@@ -48,9 +48,9 @@ const subscribeByPledgeId = {
  * Allows users to subscribe to ITC's newsletter using the email provided
  * in their pledge.
  */
-const meta = {
-  title: "Pages/Subscribe Card",
-  component: SubscribeCard,
+const meta = preview.meta({
+  title: "Newsletter/Subscribe By Pledge Card",
+  component: SubscribeByPledgeCard,
   tags: ["autodocs"],
   args: {
     pledge,
@@ -101,24 +101,20 @@ const meta = {
       },
     },
   },
-} satisfies Meta<typeof SubscribeCard>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
+});
 
 /**
  * The default case, in which the user is not yet subscribed to ITC's newsletter
  * and the submission is successful.
  */
-export const Default: Story = {};
+export const Default = meta.story({});
 
 /**
  * Same like the default case, but the form submission fails. Errors are
  * differentiated using the `getSubmitFailureMessage` helper, so all the basics
  * should be covered, as this page doesn't have special cases.
  */
-export const FailureOnSubmit: Story = {
+export const FailureOnSubmit = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -126,12 +122,12 @@ export const FailureOnSubmit: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, the email address associated with this user account is
  * already subscribed to our newsletter.
  */
-export const AlreadySubscribed: Story = {
+export const AlreadySubscribed = meta.story({
   args: { pledge: { ...pledge, contactSubscribed: true } },
-};
+});

package/lib/SubscribeCard/{SubscribeCard.tsx → SubscribeByPledgeCard.tsx}

@@ -69,7 +69,15 @@ export type ViewContent = {
   description: ReactNode;
 };
 
-export function SubscribeCard(props: {
+/**
+ * Allows users to sign up to the newsletter using the email associated with
+ * their pledge ID.
+ *
+ * Emails are not verified using a one-time code, as the user has just
+ * implicitly verified their address by navigating to the page with the unique
+ * pledge ID.
+ */
+export function SubscribeByPledgeCard(props: {
   /**
    * The pledge data that will be used to determine whether the user should
    * be prompted for signup.
@@ -110,3 +118,10 @@ export function SubscribeCard(props: {
     }
   }
 }
+
+export {
+  /**
+   * @deprecated Use {@link SubscribeByPledgeCard}
+   */
+  SubscribeByPledgeCard as SubscribeCard,
+};

package/lib/account/CurrentUserFetcher.stories.tsx

@@ -1,6 +1,5 @@
-import { Story } from "@storybook/addon-docs/blocks";
-import type { Meta, StoryObj } from "@storybook/react-vite";
 import { http, HttpResponse } from "msw";
+import preview from "../../.storybook/preview.tsx";
 import { sleep } from "../sleep.ts";
 import type { CurrentUser, SessionInfo } from "../types.ts";
 import { CurrentUserFetcher } from "./CurrentUserFetcher.tsx";
@@ -162,7 +161,7 @@ function createMocks(options?: { responseSpeed?: number }) {
 
 const { data, handlers } = createMocks({ responseSpeed: 700 });
 
-const meta = {
+const meta = preview.meta({
   title: "Account/Current User Fetcher",
   component: CurrentUserFetcher,
   tags: ["autodocs"],
@@ -189,18 +188,14 @@ const meta = {
       },
     },
   },
-} satisfies Meta<typeof CurrentUserFetcher>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
+});
 
 /**
  * The default case, in which a local user is provided (so they have previously
  * logged in), and the current user request returns the same user as is
  * the local user (determined by the user id).
  */
-export const Default: Story = {
+export const Default = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -208,19 +203,19 @@ export const Default: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, no local user is provided and the component simply renders
  * its children. There should be no network request in this case.
  */
-export const NoLocalUser: Story = {};
+export const NoLocalUser = meta.story({});
 
 /**
  * In this case, the local user is provided and the current user request returns
  * error 401. The user should supply their credentials again.
  */
-export const SessionExpired: Story = {
+export const SessionExpired = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -228,7 +223,7 @@ export const SessionExpired: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, the local user is provided and the current user request returns
@@ -241,7 +236,7 @@ export const SessionExpired: Story = {
  * In practice this should be a rare case, but with unpleasant circumstances
  * if not handled correctly.
  */
-export const UserMismatch: Story = {
+export const UserMismatch = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -249,11 +244,11 @@ export const UserMismatch: Story = {
       },
     },
   },
-};
+});
 
 /**
  */
-export const UserUnverified: Story = {
+export const UserUnverified = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -264,7 +259,7 @@ export const UserUnverified: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, the local user is provided and the current user request returns
@@ -272,7 +267,7 @@ export const UserUnverified: Story = {
  *
  * This can happen if users delete their accounts but
  */
-export const UserNotFound: Story = {
+export const UserNotFound = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -280,13 +275,13 @@ export const UserNotFound: Story = {
       },
     },
   },
-};
+});
 
 /**
  * The proactive user session check has failed due to an error that doesn't
  * carry any special meaning.
  */
-export const UnknownFailure: Story = {
+export const UnknownFailure = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -294,4 +289,4 @@ export const UnknownFailure: Story = {
       },
     },
   },
-};
+});

package/lib/account/CurrentUserFetcher.tsx

@@ -34,6 +34,10 @@ export function CurrentUserFetcher(props: CurrentUserFetcherProps) {
     // We only want to fetch the current user if they exist in the store, i.e.
     // they have logged into the app previously.
     performFetch: !!localUser,
+
+    // If we are performing a fetch, we want to make sure that it is up to date
+    // every time the user focuses the window.
+    revalidateOnFocus: true,
   });
 
   if (result.isFailure && result.failure.type === "API_ERROR") {

package/lib/account/JoinCard.stories.tsx

@@ -1,6 +1,5 @@
-import { Story } from "@storybook/addon-docs/blocks";
-import type { Meta, StoryObj } from "@storybook/react-vite";
 import { http, HttpResponse } from "msw";
+import preview from "../../.storybook/preview.tsx";
 import { sleep } from "../sleep.ts";
 import type { CurrentUser, SessionInfo } from "../types.ts";
 import { JoinCard } from "./JoinCard.tsx";
@@ -135,7 +134,7 @@ function createMocks(options?: { responseSpeed?: number }) {
 
 const { data, handlers } = createMocks({ responseSpeed: 700 });
 
-const meta = {
+const meta = preview.meta({
   title: "Account/Join Card",
   component: JoinCard,
   tags: ["autodocs"],
@@ -152,22 +151,18 @@ const meta = {
       },
     },
   },
-} satisfies Meta<typeof JoinCard>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
+});
 
 /**
  * The default case in which all steps of the flow succeed.
  */
-export const Success: Story = {};
+export const Success = meta.story({});
 
 /**
  * In this case, the initial step fails because the email address is associated
  * with an existing user.
  */
-export const EmailTakenOnJoin: Story = {
+export const EmailTakenOnJoin = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -175,13 +170,13 @@ export const EmailTakenOnJoin: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, the initial step fails for a reason that doesn't have any
  * special handling in this location. E.g. network error, server error, etc.
  */
-export const UnknownFailureOnJoin: Story = {
+export const UnknownFailureOnJoin = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -189,13 +184,13 @@ export const UnknownFailureOnJoin: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, the verify step fails because the token has expired,
  * or is incorrect.
  */
-export const NotFoundOrExpiredOnVerify: Story = {
+export const NotFoundOrExpiredOnVerify = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -203,13 +198,13 @@ export const NotFoundOrExpiredOnVerify: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, the verify step fails for a reason that doesn't have any
  * special handling in this location. E.g. network error, server error, etc.
  */
-export const UnknownFailureOnVerify: Story = {
+export const UnknownFailureOnVerify = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -217,14 +212,14 @@ export const UnknownFailureOnVerify: Story = {
       },
     },
   },
-};
+});
 
 /**
  * The proactive user-session check returns a user account.
  *
  * The user can continue to use the app, or log out.
  */
-export const AlreadyLoggedIn: Story = {
+export const AlreadyLoggedIn = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -232,12 +227,12 @@ export const AlreadyLoggedIn: Story = {
       },
     },
   },
-};
+});
 
 /**
  * The proactive user session check has failed due to connection issues.
  */
-export const NoConnection: Story = {
+export const NoConnection = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -245,13 +240,13 @@ export const NoConnection: Story = {
       },
     },
   },
-};
+});
 
 /**
  * The proactive user session check has failed due to an error that doesn't
  * carry any special meaning.
  */
-export const UnknownFailure: Story = {
+export const UnknownFailure = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -259,4 +254,4 @@ export const UnknownFailure: Story = {
       },
     },
   },
-};
+});

package/lib/account/LoginCard.stories.tsx

@@ -1,7 +1,6 @@
-import { Story } from "@storybook/addon-docs/blocks";
-import type { Meta, StoryObj } from "@storybook/react-vite";
 import { http, HttpResponse } from "msw";
 import { fn } from "storybook/test";
+import preview from "../../.storybook/preview.tsx";
 import { sleep } from "../sleep.ts";
 import type { CurrentUser, SessionInfo } from "../types.ts";
 import { LoginCard } from "./LoginCard.tsx";
@@ -123,7 +122,7 @@ function createMocks(options?: { responseSpeed?: number }) {
 
 const { data, handlers } = createMocks({ responseSpeed: 700 });
 
-const meta = {
+const meta = preview.meta({
   title: "Account/Login Card",
   component: LoginCard,
   tags: ["autodocs"],
@@ -139,17 +138,13 @@ const meta = {
       },
     },
   },
-} satisfies Meta<typeof LoginCard>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
+});
 
 /**
  * The majority case where no user is stored locally, proactive user session
  * check returns 401, and subsequently correct credentials are provided.
  */
-export const Default: Story = {
+export const Default = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -158,13 +153,13 @@ export const Default: Story = {
       },
     },
   },
-};
+});
 
 /**
  * Similar to the default case, but invalid credentials are provided to when
  * attempting to create a new session.
  */
-export const InvalidCredentialsOnSubmit: Story = {
+export const InvalidCredentialsOnSubmit = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -173,13 +168,13 @@ export const InvalidCredentialsOnSubmit: Story = {
       },
     },
   },
-};
+});
 
 /**
  * Similar to the default case, but when credentials are provided, an account
  * email is used that is not currently in the database.
  */
-export const UserNotFoundOnSubmit: Story = {
+export const UserNotFoundOnSubmit = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -188,13 +183,13 @@ export const UserNotFoundOnSubmit: Story = {
       },
     },
   },
-};
+});
 
 /**
  * Similar to the default case, but the session creation call returns an error
  * that doesn't have a specific meaning in the context of the login page.
  */
-export const UnknownFailureOnSubmit: Story = {
+export const UnknownFailureOnSubmit = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -203,12 +198,12 @@ export const UnknownFailureOnSubmit: Story = {
       },
     },
   },
-};
+});
 
 /**
  * A case when user is stored locally, but their server session has expired.
  */
-export const ReauthenticateSession: Story = {
+export const ReauthenticateSession = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -217,7 +212,7 @@ export const ReauthenticateSession: Story = {
       },
     },
   },
-};
+});
 
 /**
  * The user is already stored in the app, and proactive user-session check
@@ -225,7 +220,7 @@ export const ReauthenticateSession: Story = {
  *
  * The user is directed to app without any further steps.
  */
-export const AlreadyLoggedIn: Story = {
+export const AlreadyLoggedIn = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -233,14 +228,14 @@ export const AlreadyLoggedIn: Story = {
       },
     },
   },
-};
+});
 
 /**
  * A user is provided, and proactive user session check returns a different
  * user. This can happen when different users log into separate apps with
  * different credentials.
  */
-export const UserMismatch: Story = {
+export const UserMismatch = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -248,14 +243,14 @@ export const UserMismatch: Story = {
       },
     },
   },
-};
+});
 
 /**
  * During the proactive user session check, the user is reportd as not found.
  * This means that the tokens are still valid, but the user DB entity is gone.
  * This can happen if a user closed their account.
  */
-export const UserNotFound: Story = {
+export const UserNotFound = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -263,12 +258,12 @@ export const UserNotFound: Story = {
       },
     },
   },
-};
+});
 
 /**
  * The proactive user session check has failed due to connection issues.
  */
-export const NoConnection: Story = {
+export const NoConnection = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -276,13 +271,13 @@ export const NoConnection: Story = {
       },
     },
   },
-};
+});
 
 /**
  * The proactive user session check has failed due to an error that doesn't
  * carry any special meaning.
  */
-export const UnknownFailure: Story = {
+export const UnknownFailure = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -290,4 +285,4 @@ export const UnknownFailure: Story = {
       },
     },
   },
-};
+});

package/lib/account/PasswordResetCard.stories.tsx

@@ -1,6 +1,5 @@
-import { Story } from "@storybook/addon-docs/blocks";
-import type { Meta, StoryObj } from "@storybook/react-vite";
 import { http, HttpResponse } from "msw";
+import preview from "../../.storybook/preview.tsx";
 import { sleep } from "../sleep.ts";
 import type { CurrentUser, SessionInfo } from "../types.ts";
 import { PasswordResetCard } from "./PasswordResetCard.tsx";
@@ -132,7 +131,7 @@ function createMocks(options?: { responseSpeed?: number }) {
 
 const { data, handlers } = createMocks({ responseSpeed: 700 });
 
-const meta = {
+const meta = preview.meta({
   title: "Account/Password Reset Page",
   component: PasswordResetCard,
   tags: ["autodocs"],
@@ -147,22 +146,18 @@ const meta = {
       },
     },
   },
-} satisfies Meta<typeof PasswordResetCard>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
+});
 
 /**
  * The default case in which all steps of the flow succeed.
  */
-export const Success: Story = {};
+export const Success = meta.story({});
 
 /**
  * In this case, the initial step fails because the email address was not
  * found in our database.
  */
-export const UserNotFoundOnRequestCode: Story = {
+export const UserNotFoundOnRequestCode = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -170,13 +165,13 @@ export const UserNotFoundOnRequestCode: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, the initial step fails for a reason that doesn't have any
  * special handling in this location. E.g. network error, server error, etc.
  */
-export const UnknownFailureOnRequestCode: Story = {
+export const UnknownFailureOnRequestCode = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -184,13 +179,13 @@ export const UnknownFailureOnRequestCode: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, the check code step fails because the token has expired,
  * or is incorrect.
  */
-export const NotFoundOrExpiredOnCheckCode: Story = {
+export const NotFoundOrExpiredOnCheckCode = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -198,13 +193,13 @@ export const NotFoundOrExpiredOnCheckCode: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, the check step fails for a reason that doesn't have any
  * special handling in this location. E.g. network error, server error, etc.
  */
-export const UnknownFailureOnCheckCode: Story = {
+export const UnknownFailureOnCheckCode = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -212,7 +207,7 @@ export const UnknownFailureOnCheckCode: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, the final set password step fails because the token has
@@ -222,7 +217,7 @@ export const UnknownFailureOnCheckCode: Story = {
  * because the user has gotten through the check step, that would require
  * some very strange set of circumstances.
  */
-export const NotFoundOrExpiredOnSetPassword: Story = {
+export const NotFoundOrExpiredOnSetPassword = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -230,13 +225,13 @@ export const NotFoundOrExpiredOnSetPassword: Story = {
       },
     },
   },
-};
+});
 
 /**
  * In this case, the set password step fails for a reason that doesn't have any
  * special handling in this location. E.g. network error, server error, etc.
  */
-export const UnknownFailureOnSetPassword: Story = {
+export const UnknownFailureOnSetPassword = meta.story({
   parameters: {
     msw: {
       handlers: {
@@ -244,4 +239,4 @@ export const UnknownFailureOnSetPassword: Story = {
       },
     },
   },
-};
+});

package/lib/account/useFetchCurrentUser.tsx

@@ -10,8 +10,18 @@ export function useFetchCurrentUser(options?: {
    * @default true
    */
   performFetch?: boolean;
+
+  /**
+   * Fetch new data every time the window is focused.
+   *
+   * Note that `performFetch` has to be enabled for this option to have an
+   * effect — we are not revalidating when there is no fetch to do!
+   *
+   * @default false
+   */
+  revalidateOnFocus?: boolean;
 }) {
-  const { performFetch = true } = options ?? {};
+  const { performFetch = true, revalidateOnFocus = false } = options ?? {};
   const client = useClient();
   const [latestAttemptTs, setLatestAttemptTs] = useState(Date.now());
 
@@ -31,12 +41,14 @@ export function useFetchCurrentUser(options?: {
       // Invoke the fetch action
       fetchUserAndStoreResult();
 
-      // Set up listeners for data revalidation
-      window.addEventListener("focus", fetchUserAndStoreResult);
+      if (revalidateOnFocus) {
+        const controller = new AbortController();
+        window.addEventListener("focus", fetchUserAndStoreResult, controller);
 
-      return () => {
-        window.removeEventListener("focus", fetchUserAndStoreResult);
-      };
+        return () => {
+          controller.abort();
+        };
+      }
     }
   }, [client, latestAttemptTs, performFetch]);
 

package/lib/client.ts

@@ -545,7 +545,7 @@ export class IndieTabletopClient {
     });
 
     return await this.fetch(
-      `/v1/me/data?${params}`,
+      `/v1/me/game-data?${params}`,
       unknown() as Struct<UserGameData, null>,
     );
   }
@@ -557,7 +557,7 @@ export class IndieTabletopClient {
     expectCurrentUserId: string | null | undefined;
   }) {
     return await this.fetch(
-      `/v1/me/data`,
+      `/v1/me/game-data`,
       unknown() as Struct<UserGameData, null>,
       {
         method: "PATCH",

package/lib/index.ts

@@ -23,7 +23,7 @@ export * from "./ReleaseInfo/index.tsx";
 export * from "./ServiceWorkerHandler.tsx";
 export * from "./ShareButton/ShareButton.tsx";
 export * from "./SubscribeCard/SubscribeByEmailCard.tsx";
-export * from "./SubscribeCard/SubscribeCard.tsx";
+export * from "./SubscribeCard/SubscribeByPledgeCard.tsx";
 
 // Hooks
 export * from "./RulesetResolver.ts";

package/lib/types/spacegits.ts

@@ -33,13 +33,17 @@ export function ref() {
   return object({ id: string() });
 }
 
+export function weaponRef() {
+  return assign(ref(), object({ count: number() }));
+}
+
 export function treatmentRef() {
   return assign(ref(), object({ locationId: string() }));
 }
 
 export function vehicleWeaponRef() {
   return assign(
-    ref(),
+    weaponRef(),
     object({ placement: enums(["FIXED", "PINTLE_MOUNTED"]) }),
   );
 }
@@ -53,7 +57,7 @@ export function gitData() {
     id: string(),
     type: ref(),
     name: string(),
-    weapons: array(ref()),
+    weapons: array(weaponRef()),
     gear: array(ref()),
     offenses: array(ref()),
     treatments: array(treatmentRef()),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indietabletop/appkit",
-  "version": "5.0.0-0",
+  "version": "5.0.0-2",
   "description": "A collection of modules used in apps built by Indie Tabletop Club",
   "private": false,
   "type": "module",
@@ -20,20 +20,23 @@
     "/lib"
   ],
   "author": "Artur Müller",
-  "repository": "github:indietabletop/appkit",
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/indietabletop/appkit.git"
+  },
+  "license": "UNLICENSED",
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0"
   },
   "devDependencies": {
-    "@storybook/addon-docs": "^9.1.10",
-    "@storybook/addon-links": "^9.1.10",
-    "@storybook/react-vite": "^9.1.10",
+    "@storybook/addon-docs": "^10.0.4",
+    "@storybook/addon-links": "^10.0.4",
+    "@storybook/react-vite": "^10.0.4",
     "@types/react": "^19.1.8",
     "msw": "^2.11.2",
     "msw-storybook-addon": "^2.0.5",
     "np": "^10.1.0",
-    "storybook": "^9.1.10",
+    "storybook": "^10.0.4",
     "typescript": "^5.8.2",
     "vite": "^6.3.5",
     "vitest": "^3.2.4"