Merge pull request #243 from h8570rg/develop

Prd

.github/workflows/ci.yaml

@@ -6,13 +6,13 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env: 
       GOOGLE_CLIENT_ID: "dummy"
       GOOGLE_SECRET: "dummy"
       OPENAI_API_KEY: "dummy"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: supabase/setup-cli@v1
 

.github/workflows/production.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     env:
       SUPABASE_ACCESS_TOKEN: ${{ secrets.SUPABASE_ACCESS_TOKEN }}
@@ -19,7 +19,7 @@ jobs:
       OPENAI_API_KEY: "dummy"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: supabase/setup-cli@v1
 

.github/workflows/staging.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     env:
       SUPABASE_ACCESS_TOKEN: ${{ secrets.SUPABASE_ACCESS_TOKEN }}
@@ -19,7 +19,7 @@ jobs:
       OPENAI_API_KEY: "dummy"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: supabase/setup-cli@v1
 

.vscode/settings.json

@@ -13,7 +13,7 @@
     "rockn",
     "signup",
     "svgr",
-    "toastify",
+    "tseslint",
     "workos"
   ]
 }

app/(auth)/(routes)/login/(components)/LoginForm/actions.ts

@@ -40,7 +40,7 @@ export async function signInEmail(
 
   const { email, password } = validatedFields.data;
 
-  const supabase = createClient();
+  const supabase = await createClient();
 
   const { error } = await supabase.auth.signInWithPassword({
     email,
@@ -63,7 +63,7 @@ export async function signInEmail(
  * @see https://supabase.com/docs/guides/auth/server-side/oauth-with-pkce-flow-for-ssr?queryGroups=environment&environment=server
  */
 export async function signInWithGoogle() {
-  const supabase = createClient();
+  const supabase = await createClient();
   const { data } = await supabase.auth.signInWithOAuth({
     provider: "google",
     options: {
@@ -77,7 +77,7 @@ export async function signInWithGoogle() {
 }
 
 export async function signInAnonymously() {
-  const supabase = createClient();
+  const supabase = await createClient();
   await supabase.auth.signInAnonymously();
 
   redirect("/matches");

app/(auth)/(routes)/login/(components)/LoginForm/index.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { useFormState } from "react-dom";
+import { useActionState } from "react";
 import { Button } from "@/components/Button";
 import { Input } from "@/components/Input";
 import { signInEmail } from "./actions";
@@ -9,7 +9,7 @@ import { signInEmail } from "./actions";
  * @see https://supabase.com/docs/guides/auth/server-side/nextjs
  */
 export function LoginForm({ className }: { className?: string }) {
-  const [state, formAction] = useFormState(signInEmail, {});
+  const [state, formAction] = useActionState(signInEmail, {});
 
   return (
     <form className={className} action={formAction} noValidate>

app/(auth)/(routes)/login/(components)/SocialProviders/index.tsx

@@ -15,7 +15,9 @@ export function SocialProviders({ className }: { className?: string }) {
       );
       return;
     }
-    signInWithGoogle();
+    signInWithGoogle().catch((e) => {
+      throw e;
+    });
   };
 
   return (
@@ -25,7 +27,7 @@ export function SocialProviders({ className }: { className?: string }) {
           fullWidth
           className="flex items-center justify-center gap-3"
           variant="bordered"
-          onClick={handleGoogleClick}
+          onPress={handleGoogleClick}
         >
           <GoogleIcon className="w-5" />
           <span>Google でログイン</span>
@@ -35,7 +37,7 @@ export function SocialProviders({ className }: { className?: string }) {
         <Button
           fullWidth
           variant="bordered"
-          onClick={() => alert("開発中です、しばらくお待ちください")}
+          onPress={() => alert("開発中です、しばらくお待ちください")}
         >
           <span>ログインせずに始める</span>
         </Button>

app/(auth)/(routes)/register/(components)/RegisterForm/actions.ts

@@ -38,7 +38,7 @@ export async function updateProfile(
 
   const { name, displayId } = validatedFields.data;
 
-  const { updateUserProfile } = serverServices();
+  const { updateUserProfile } = await serverServices();
 
   const result = await updateUserProfile({
     name,
@@ -62,7 +62,7 @@ export async function updateProfile(
 }
 
 export async function signOut() {
-  const supabase = createClient();
+  const supabase = await createClient();
 
   await supabase.auth.signOut();
 

app/(auth)/(routes)/register/(components)/RegisterForm/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import classNames from "classnames";
-import { useFormState } from "react-dom";
+import { useActionState } from "react";
 import { Button } from "@/components/Button";
 import { Input } from "@/components/Input";
 import {
@@ -18,7 +18,7 @@ export function RegisterForm({
   className?: string;
   userId: string;
 }) {
-  const [state, formAction] = useFormState(
+  const [state, formAction] = useActionState(
     updateProfile.bind(null, userId),
     {},
   );

app/(auth)/(routes)/register/page.tsx

@@ -10,7 +10,7 @@ export const metadata: Metadata = {
 };
 
 export default async function RegisterPage() {
-  const { getUserProfile } = serverServices();
+  const { getUserProfile } = await serverServices();
   const user = await getUserProfile();
 
   if (user.name && user.displayId) {

app/(auth)/(routes)/sign-up/(components)/SignUpForm/actions.ts

@@ -39,7 +39,7 @@ export async function signUp(
 
   const { email, password } = validatedFields.data;
 
-  const supabase = createClient();
+  const supabase = await createClient();
 
   const { error } = await supabase.auth.signUp({
     email,

app/(auth)/(routes)/sign-up/(components)/SignUpForm/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import classNames from "classnames";
-import { useFormState } from "react-dom";
+import { useActionState } from "react";
 import { Button } from "@/components/Button";
 import { Input } from "@/components/Input";
 import { signUp } from "./actions";
@@ -10,7 +10,7 @@ import { signUp } from "./actions";
  * @see https://supabase.com/docs/guides/auth/server-side/nextjs
  */
 export function SignUpForm({ className }: { className?: string }) {
-  const [state, formAction] = useFormState(signUp, {});
+  const [state, formAction] = useActionState(signUp, {});
 
   return (
     <form

app/(main)/(components)/Navbar/Avatar/Menu/actions.ts → app/(main)/(components)/Appbar/Avatar/Menu/actions.ts

@@ -5,7 +5,7 @@ import { redirect } from "next/navigation";
 import { createClient } from "@/lib/utils/supabase/server";
 
 export async function signOut() {
-  const supabase = createClient();
+  const supabase = await createClient();
 
   await supabase.auth.signOut();
 

app/(main)/(components)/Navbar/Avatar/Menu/index.tsx → app/(main)/(components)/Appbar/Avatar/Menu/index.tsx

@@ -4,7 +4,7 @@ import { useRouter } from "next/navigation";
 import { DropdownMenu, DropdownItem } from "@/components/Dropdown";
 import { signOut } from "./actions";
 
-export function NavbarAvatarMenu({
+export function AppbarAvatarMenu({
   name,
   displayId,
 }: {
@@ -20,7 +20,9 @@ export function NavbarAvatarMenu({
         router.push("/friends");
         break;
       case "signOut":
-        signOut();
+        signOut().catch((e) => {
+          throw e;
+        });
         break;
     }
   }

app/(main)/(components)/Navbar/Avatar/index.tsx → app/(main)/(components)/Appbar/Avatar/index.tsx

@@ -2,10 +2,10 @@ import { redirect } from "next/navigation";
 import { Avatar } from "@/components/Avatar";
 import { Dropdown, DropdownTrigger } from "@/components/Dropdown";
 import { serverServices } from "@/lib/services/server";
-import { NavbarAvatarMenu } from "./Menu";
+import { AppbarAvatarMenu } from "./Menu";
 
-export async function NavbarAvatar() {
-  const { getUserProfile } = serverServices();
+export async function AppbarAvatar() {
+  const { getUserProfile } = await serverServices();
   const [profile] = await Promise.all([getUserProfile()]);
 
   // TODO: isUnregisteredで扱う。ts制御
@@ -18,7 +18,7 @@ export async function NavbarAvatar() {
       <DropdownTrigger>
         <Avatar as="button" className="transition-transform" size="sm" />
       </DropdownTrigger>
-      <NavbarAvatarMenu name={profile.name} displayId={profile.displayId} />
+      <AppbarAvatarMenu name={profile.name} displayId={profile.displayId} />
     </Dropdown>
   );
 }

app/(main)/(components)/Navbar/index.tsx → app/(main)/(components)/Appbar/index.tsx

@@ -1,17 +1,13 @@
-import {
-  Navbar as NextUINavbar,
-  NavbarBrand,
-  NavbarContent,
-} from "@nextui-org/react";
 import { Suspense } from "react";
 import { Link } from "@/components/Link";
 import Logo from "@/components/Logo";
+import { Navbar, NavbarBrand, NavbarContent } from "@/components/Navbar";
 import { Skeleton } from "@/components/Skeleton";
-import { NavbarAvatar } from "./Avatar";
+import { AppbarAvatar } from "./Avatar";
 
-export default function Navbar() {
+export default function Appbar() {
   return (
-    <NextUINavbar shouldHideOnScroll>
+    <Navbar shouldHideOnScroll>
       <NavbarContent>
         <NavbarBrand>
           <Link color="foreground" href="/matches">
@@ -21,9 +17,9 @@ export default function Navbar() {
       </NavbarContent>
       <NavbarContent as="div" justify="end">
         <Suspense fallback={<Skeleton className="size-8 rounded-full" />}>
-          <NavbarAvatar />
+          <AppbarAvatar />
         </Suspense>
       </NavbarContent>
-    </NextUINavbar>
+    </Navbar>
   );
 }

app/(main)/(components)/ReleaseNotesModal/index.tsx → app/(main)/(components)/ReleaseNotes/ReleaseNotesModal/index.tsx

@@ -31,11 +31,16 @@ function isVersionGreater(v1: string, v2: string) {
 }
 
 function setLastVersion() {
-  localStorage.setItem("lastVersion", packageJson.version);
+  if (typeof window !== "undefined") {
+    window.localStorage.setItem("lastVersion", packageJson.version);
+  }
 }
 
 function ReleaseNotesModal() {
-  const lastVersion = localStorage.getItem("lastVersion");
+  const lastVersion =
+    typeof window !== "undefined"
+      ? window.localStorage.getItem("lastVersion")
+      : undefined;
 
   const newVersions = Object.entries(versionComponents).filter(([v]) =>
     lastVersion ? isVersionGreater(v, lastVersion) : v === "0.1.0",

app/(main)/(components)/ReleaseNotes/index.tsx

@@ -0,0 +1,11 @@
+"use client";
+
+import dynamic from "next/dynamic";
+
+const ReleaseNotesModal = dynamic(() => import("./ReleaseNotesModal"), {
+  ssr: false,
+});
+
+export function ReleaseNotes() {
+  return <ReleaseNotesModal />;
+}

app/(main)/(routes)/friends/(components)/AddButton/actions.ts

@@ -5,7 +5,7 @@ import { redirect } from "next/navigation";
 import { serverServices } from "@/lib/services/server";
 
 export async function addFriends(profileId: string) {
-  const { addFriends } = serverServices();
+  const { addFriends } = await serverServices();
 
   await addFriends({ profileId });
 

app/(main)/(routes)/friends/(components)/AddButton/index.tsx

@@ -43,7 +43,7 @@ export function AddButton() {
 
   return (
     <>
-      <Button variant="light" isIconOnly onClick={addModal.onOpen}>
+      <Button variant="light" isIconOnly onPress={addModal.onOpen}>
         <Icon name="personAdd" className="size-5 fill-current" />
       </Button>
       <Modal
@@ -101,7 +101,7 @@ export function AddButton() {
                           color="primary"
                           size="sm"
                           type="submit"
-                          onClick={handleAdd}
+                          onPress={handleAdd}
                         >
                           追加
                         </Button>

app/(main)/(routes)/friends/(components)/FriendMenu/actions.ts

@@ -4,7 +4,7 @@ import { revalidatePath } from "next/cache";
 import { serverServices } from "@/lib/services/server";
 
 export async function deleteFriends(profileId: string) {
-  const { deleteFriends } = serverServices();
+  const { deleteFriends } = await serverServices();
 
   await deleteFriends({ profileId });
 

app/(main)/(routes)/friends/(components)/FriendMenu/index.tsx

@@ -13,7 +13,9 @@ import { deleteFriends } from "./actions";
 export function FriendMenu({ profileId }: { profileId: string }) {
   function handleAction(key: unknown) {
     if (key === "delete") {
-      deleteFriends(profileId);
+      deleteFriends(profileId).catch((e) => {
+        throw e;
+      });
     }
   }
 

app/(main)/(routes)/friends/page.tsx

@@ -4,7 +4,7 @@ import { AddButton } from "./(components)/AddButton";
 import { FriendMenu } from "./(components)/FriendMenu";
 
 export default async function FriendsPage() {
-  const { getFriends } = serverServices();
+  const { getFriends } = await serverServices();
 
   const friends = await getFriends();
 

app/(main)/(routes)/matches/(components)/CreateMatchButton/actions.ts

@@ -73,7 +73,7 @@ export async function createMatch(
 
   const { incline, customIncline, ...restData } = validatedFields.data;
 
-  const { createMatch } = serverServices();
+  const { createMatch } = await serverServices();
 
   const { id } = await createMatch({
     incline: incline === "custom" ? customIncline : incline,