create-m5kdev 0.33.0 → 0.35.0

package/templates/minimal-app/apps/expo/metro.config.js.tpl

@@ -1,16 +1,16 @@
-const { getDefaultConfig } = require("expo/metro-config");
-const { withUniwindConfig } = require("uniwind/metro");
-const path = require("node:path");
-
-const config = getDefaultConfig(__dirname);
-const workspaceRoot = path.resolve(__dirname, "../../..");
-
-config.watchFolders = [workspaceRoot];
-config.resolver.nodeModulesPaths = [
-  path.resolve(__dirname, "node_modules"),
-  path.resolve(workspaceRoot, "node_modules"),
-];
-
-module.exports = withUniwindConfig(config, {
-  cssEntryFile: "./src/global.css",
-});
+const { getDefaultConfig } = require("expo/metro-config");
+const { withUniwindConfig } = require("uniwind/metro");
+const path = require("node:path");
+
+const config = getDefaultConfig(__dirname);
+const workspaceRoot = path.resolve(__dirname, "../../..");
+
+config.watchFolders = [workspaceRoot];
+config.resolver.nodeModulesPaths = [
+  path.resolve(__dirname, "node_modules"),
+  path.resolve(workspaceRoot, "node_modules"),
+];
+
+module.exports = withUniwindConfig(config, {
+  cssEntryFile: "./src/global.css",
+});

package/templates/minimal-app/apps/expo/src/app/_layout.tsx.tpl

@@ -1,31 +1,31 @@
-import { AppConfigProvider } from "@m5kdev/frontend/modules/app/components/AppConfigProvider";
-import { AuthProvider } from "@m5kdev/frontend/modules/auth/components/AuthProvider";
-import { Stack } from "expo-router";
-import { HeroUINativeProvider } from "heroui-native";
-import { APP_NAME } from "{{PACKAGE_SCOPE}}/shared/modules/app/app.constants";
-import type { JSX } from "react";
-import { GestureHandlerRootView } from "react-native-gesture-handler";
-import { LoadingScreen } from "../components/LoadingScreen";
-import { appUrl, serverUrl } from "../config";
-
-import "../global.css";
-
-export default function RootLayout(): JSX.Element {
-  return (
-    <GestureHandlerRootView style={{ flex: 1 }}>
-      <HeroUINativeProvider>
-        <AppConfigProvider
-          config={{
-            appName: APP_NAME,
-            appUrl,
-            serverUrl,
-          }}
-        >
-          <AuthProvider loader={<LoadingScreen />}>
-            <Stack screenOptions={{ headerShown: false }} />
-          </AuthProvider>
-        </AppConfigProvider>
-      </HeroUINativeProvider>
-    </GestureHandlerRootView>
-  );
-}
+import { AppConfigProvider } from "@m5kdev/frontend/modules/app/components/AppConfigProvider";
+import { AuthProvider } from "@m5kdev/frontend/modules/auth/components/AuthProvider";
+import { APP_NAME } from "{{PACKAGE_SCOPE}}/shared/modules/app/app.constants";
+import { Stack } from "expo-router";
+import { HeroUINativeProvider } from "heroui-native";
+import type { JSX } from "react";
+import { GestureHandlerRootView } from "react-native-gesture-handler";
+import { LoadingScreen } from "../components/LoadingScreen";
+import { appUrl, serverUrl } from "../config";
+
+import "../global.css";
+
+export default function RootLayout(): JSX.Element {
+  return (
+    <GestureHandlerRootView style={{ flex: 1 }}>
+      <HeroUINativeProvider>
+        <AppConfigProvider
+          config={{
+            appName: APP_NAME,
+            appUrl,
+            serverUrl,
+          }}
+        >
+          <AuthProvider loader={<LoadingScreen />}>
+            <Stack screenOptions={{ headerShown: false }} />
+          </AuthProvider>
+        </AppConfigProvider>
+      </HeroUINativeProvider>
+    </GestureHandlerRootView>
+  );
+}

package/templates/minimal-app/apps/expo/src/app/claim-account.tsx.tpl

@@ -1,151 +1,151 @@
-import { useAppConfig } from "@m5kdev/frontend/modules/app/hooks/useAppConfig";
-import { useSession } from "@m5kdev/frontend/modules/auth/hooks/useSession";
-import { Button } from "heroui-native";
-import { useEffect, useState } from "react";
-import { View } from "react-native";
-import { AuthScaffold } from "../components/AuthScaffold";
-import { FormTextField } from "../components/FormTextField";
-import { StatusText } from "../components/StatusText";
-import { trpcClient } from "../lib/trpc";
-
-export default function ClaimAccountScreen() {
-  const { serverUrl } = useAppConfig();
-  const { data: session, registerSession } = useSession();
-  const [email, setEmail] = useState("");
-  const [password, setPassword] = useState("");
-  const [status, setStatus] = useState<string | null>("Loading claim status...");
-  const [statusTone, setStatusTone] = useState<"default" | "error" | "success">("default");
-  const [hasClaim, setHasClaim] = useState(false);
-  const [isClaimed, setIsClaimed] = useState(false);
-  const [isBusy, setIsBusy] = useState(false);
-
-  useEffect(() => {
-    if (session?.user.email) {
-      setEmail(session.user.email);
-    }
-  }, [session?.user.email]);
-
-  useEffect(() => {
-    let cancelled = false;
-
-    if (isClaimed) {
-      return;
-    }
-
-    if (!session?.user) {
-      setStatusTone("error");
-      setStatus("You need to sign in with your magic link before claiming this account.");
-      setHasClaim(false);
-      return;
-    }
-
-    trpcClient.auth.getMyAccountClaimStatus
-      .query()
-      .then((claim) => {
-        if (cancelled) return;
-        setHasClaim(Boolean(claim));
-        setStatusTone(claim ? "success" : "error");
-        setStatus(claim ? "Claim your account" : "No pending account claim was found.");
-        if (claim?.claimedEmail) {
-          setEmail(claim.claimedEmail);
-        }
-      })
-      .catch((error) => {
-        if (cancelled) return;
-        setHasClaim(false);
-        setStatusTone("error");
-        setStatus(error instanceof Error ? error.message : "Unable to load claim status");
-      });
-
-    return () => {
-      cancelled = true;
-    };
-  }, [isClaimed, session?.user]);
-
-  const saveEmail = async () => {
-    setIsBusy(true);
-    setStatus(null);
-    try {
-      await trpcClient.auth.setMyAccountClaimEmail.mutate({ email });
-      registerSession();
-      setStatusTone("success");
-      setStatus("Email updated");
-    } catch (error) {
-      setStatusTone("error");
-      setStatus(error instanceof Error ? error.message : "Unable to update email");
-    } finally {
-      setIsBusy(false);
-    }
-  };
-
-  const setPasswordAndClaim = async () => {
-    setIsBusy(true);
-    setStatus(null);
-    try {
-      const response = await fetch(`${serverUrl}/api/auth/set-password`, {
-        method: "POST",
-        credentials: "include",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          newPassword: password,
-        }),
-      });
-      const payload = (await response.json().catch(() => ({}))) as { message?: string };
-      if (!response.ok) {
-        throw new Error(payload.message ?? "Unable to set password");
-      }
-
-      await trpcClient.auth.acceptMyAccountClaim.mutate();
-      setIsClaimed(true);
-      registerSession();
-      setStatusTone("success");
-      setStatus("Password set. Account claimed.");
-    } catch (error) {
-      setStatusTone("error");
-      setStatus(error instanceof Error ? error.message : "Unable to claim account");
-    } finally {
-      setIsBusy(false);
-    }
-  };
-
-  return (
-    <AuthScaffold
-      title="Claim your account"
-      description="Set permanent credentials for a provisioned account."
-    >
-      <View className="gap-4">
-        <FormTextField
-          label="Email"
-          testID="claim-email"
-          value={email}
-          onChangeText={setEmail}
-          keyboardType="email-address"
-          editable={hasClaim && !isBusy}
-        />
-        <Button testID="claim-email-submit" onPress={saveEmail} isDisabled={!hasClaim || isBusy}>
-          Save Email
-        </Button>
-        <FormTextField
-          label="Set password"
-          testID="claim-password"
-          value={password}
-          onChangeText={setPassword}
-          secureTextEntry
-          editable={hasClaim && !isBusy}
-        />
-        <Button
-          testID="claim-password-submit"
-          onPress={setPasswordAndClaim}
-          isDisabled={!hasClaim || !password || isBusy}
-        >
-          Set Password and Claim
-        </Button>
-        <StatusText testID="claim-status" tone={statusTone}>
-          {status}
-        </StatusText>
-      </View>
-    </AuthScaffold>
-  );
-}
+import { useAppConfig } from "@m5kdev/frontend/modules/app/hooks/useAppConfig";
+import { useSession } from "@m5kdev/frontend/modules/auth/hooks/useSession";
+import { Button } from "heroui-native";
+import { useEffect, useState } from "react";
+import { View } from "react-native";
+import { AuthScaffold } from "../components/AuthScaffold";
+import { FormTextField } from "../components/FormTextField";
+import { StatusText } from "../components/StatusText";
+import { trpcClient } from "../lib/trpc";
+
+export default function ClaimAccountScreen() {
+  const { serverUrl } = useAppConfig();
+  const { data: session, registerSession } = useSession();
+  const [email, setEmail] = useState("");
+  const [password, setPassword] = useState("");
+  const [status, setStatus] = useState<string | null>("Loading claim status...");
+  const [statusTone, setStatusTone] = useState<"default" | "error" | "success">("default");
+  const [hasClaim, setHasClaim] = useState(false);
+  const [isClaimed, setIsClaimed] = useState(false);
+  const [isBusy, setIsBusy] = useState(false);
+
+  useEffect(() => {
+    if (session?.user.email) {
+      setEmail(session.user.email);
+    }
+  }, [session?.user.email]);
+
+  useEffect(() => {
+    let cancelled = false;
+
+    if (isClaimed) {
+      return;
+    }
+
+    if (!session?.user) {
+      setStatusTone("error");
+      setStatus("You need to sign in with your magic link before claiming this account.");
+      setHasClaim(false);
+      return;
+    }
+
+    trpcClient.auth.getMyAccountClaimStatus
+      .query()
+      .then((claim) => {
+        if (cancelled) return;
+        setHasClaim(Boolean(claim));
+        setStatusTone(claim ? "success" : "error");
+        setStatus(claim ? "Claim your account" : "No pending account claim was found.");
+        if (claim?.claimedEmail) {
+          setEmail(claim.claimedEmail);
+        }
+      })
+      .catch((error) => {
+        if (cancelled) return;
+        setHasClaim(false);
+        setStatusTone("error");
+        setStatus(error instanceof Error ? error.message : "Unable to load claim status");
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [isClaimed, session?.user]);
+
+  const saveEmail = async () => {
+    setIsBusy(true);
+    setStatus(null);
+    try {
+      await trpcClient.auth.setMyAccountClaimEmail.mutate({ email });
+      registerSession();
+      setStatusTone("success");
+      setStatus("Email updated");
+    } catch (error) {
+      setStatusTone("error");
+      setStatus(error instanceof Error ? error.message : "Unable to update email");
+    } finally {
+      setIsBusy(false);
+    }
+  };
+
+  const setPasswordAndClaim = async () => {
+    setIsBusy(true);
+    setStatus(null);
+    try {
+      const response = await fetch(`${serverUrl}/api/auth/set-password`, {
+        method: "POST",
+        credentials: "include",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          newPassword: password,
+        }),
+      });
+      const payload = (await response.json().catch(() => ({}))) as { message?: string };
+      if (!response.ok) {
+        throw new Error(payload.message ?? "Unable to set password");
+      }
+
+      await trpcClient.auth.acceptMyAccountClaim.mutate();
+      setIsClaimed(true);
+      registerSession();
+      setStatusTone("success");
+      setStatus("Password set. Account claimed.");
+    } catch (error) {
+      setStatusTone("error");
+      setStatus(error instanceof Error ? error.message : "Unable to claim account");
+    } finally {
+      setIsBusy(false);
+    }
+  };
+
+  return (
+    <AuthScaffold
+      title="Claim your account"
+      description="Set permanent credentials for a provisioned account."
+    >
+      <View className="gap-4">
+        <FormTextField
+          label="Email"
+          testID="claim-email"
+          value={email}
+          onChangeText={setEmail}
+          keyboardType="email-address"
+          editable={hasClaim && !isBusy}
+        />
+        <Button testID="claim-email-submit" onPress={saveEmail} isDisabled={!hasClaim || isBusy}>
+          Save Email
+        </Button>
+        <FormTextField
+          label="Set password"
+          testID="claim-password"
+          value={password}
+          onChangeText={setPassword}
+          secureTextEntry
+          editable={hasClaim && !isBusy}
+        />
+        <Button
+          testID="claim-password-submit"
+          onPress={setPasswordAndClaim}
+          isDisabled={!hasClaim || !password || isBusy}
+        >
+          Set Password and Claim
+        </Button>
+        <StatusText testID="claim-status" tone={statusTone}>
+          {status}
+        </StatusText>
+      </View>
+    </AuthScaffold>
+  );
+}

package/templates/minimal-app/apps/expo/src/app/forgot-password.tsx.tpl

@@ -1,53 +1,53 @@
-import { useAuthClient } from "@m5kdev/frontend/modules/auth/hooks/useAuthClient";
-import { Button } from "heroui-native";
-import { useState } from "react";
-import { View } from "react-native";
-import { AuthScaffold } from "../components/AuthScaffold";
-import { FormTextField } from "../components/FormTextField";
-import { StatusText } from "../components/StatusText";
-
-export default function ForgotPasswordScreen() {
-  const authClient = useAuthClient();
-  const [email, setEmail] = useState("");
-  const [status, setStatus] = useState<string | null>(null);
-  const [tone, setTone] = useState<"error" | "success">("success");
-  const [isBusy, setIsBusy] = useState(false);
-
-  const submit = async () => {
-    setIsBusy(true);
-    setStatus(null);
-    try {
-      await authClient.requestPasswordReset({
-        email,
-        redirectTo: "/reset-password",
-      });
-      setTone("success");
-      setStatus("Password reset email sent");
-    } catch (error) {
-      setTone("error");
-      setStatus(error instanceof Error ? error.message : "Failed to request password reset");
-    } finally {
-      setIsBusy(false);
-    }
-  };
-
-  return (
-    <AuthScaffold title="Reset password">
-      <View className="gap-4">
-        <FormTextField
-          label="Email"
-          testID="forgot-password-email"
-          value={email}
-          onChangeText={setEmail}
-          keyboardType="email-address"
-        />
-        <StatusText testID="auth-status" tone={tone}>
-          {status}
-        </StatusText>
-        <Button testID="forgot-password-submit" onPress={submit} isDisabled={isBusy}>
-          Reset password
-        </Button>
-      </View>
-    </AuthScaffold>
-  );
-}
+import { useAuthClient } from "@m5kdev/frontend/modules/auth/hooks/useAuthClient";
+import { Button } from "heroui-native";
+import { useState } from "react";
+import { View } from "react-native";
+import { AuthScaffold } from "../components/AuthScaffold";
+import { FormTextField } from "../components/FormTextField";
+import { StatusText } from "../components/StatusText";
+
+export default function ForgotPasswordScreen() {
+  const authClient = useAuthClient();
+  const [email, setEmail] = useState("");
+  const [status, setStatus] = useState<string | null>(null);
+  const [tone, setTone] = useState<"error" | "success">("success");
+  const [isBusy, setIsBusy] = useState(false);
+
+  const submit = async () => {
+    setIsBusy(true);
+    setStatus(null);
+    try {
+      await authClient.requestPasswordReset({
+        email,
+        redirectTo: "/reset-password",
+      });
+      setTone("success");
+      setStatus("Password reset email sent");
+    } catch (error) {
+      setTone("error");
+      setStatus(error instanceof Error ? error.message : "Failed to request password reset");
+    } finally {
+      setIsBusy(false);
+    }
+  };
+
+  return (
+    <AuthScaffold title="Reset password">
+      <View className="gap-4">
+        <FormTextField
+          label="Email"
+          testID="forgot-password-email"
+          value={email}
+          onChangeText={setEmail}
+          keyboardType="email-address"
+        />
+        <StatusText testID="auth-status" tone={tone}>
+          {status}
+        </StatusText>
+        <Button testID="forgot-password-submit" onPress={submit} isDisabled={isBusy}>
+          Reset password
+        </Button>
+      </View>
+    </AuthScaffold>
+  );
+}

package/templates/minimal-app/apps/expo/src/app/index.tsx.tpl

@@ -1,8 +1,8 @@
-import { useSession } from "@m5kdev/frontend/modules/auth/hooks/useSession";
-import { Redirect } from "expo-router";
-
-export default function IndexScreen() {
-  const { data: session } = useSession();
-
-  return <Redirect href={session ? "/posts" : "/login"} />;
-}
+import { useSession } from "@m5kdev/frontend/modules/auth/hooks/useSession";
+import { Redirect } from "expo-router";
+
+export default function IndexScreen() {
+  const { data: session } = useSession();
+
+  return <Redirect href={session ? "/posts" : "/login"} />;
+}