h8570rg · h8570rg · Jan 23, 2025 · Jan 23, 2025 · Jan 23, 2025
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.lintstagedrc.js b/.lintstagedrc.js
@@ -1,5 +1,8 @@
 const path = require("path");
 
+// TODO: エラーで使えないのでpackage.jsonのpre-commitを変更している。
+// see https://github.com/eslint/eslint/issues/19322
+
 const buildEslintCommand = (filenames) =>
   `next lint --fix --file ${filenames
     .map((f) => path.relative(process.cwd(), f))

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,7 +4,7 @@
     "inbucket",
     "jankiroku",
     "nextjs",
-    "nextui",
+    "heroui",
     "oidc",
     "OPENAI",
     "orioledb",

diff --git a/README.md b/README.md
@@ -74,11 +74,11 @@ Supabase Studio URL: http://localhost:54323
 
 ## 用語一覧
 
-| コード | 意味 |
-| ---- | ---- |
-| user | ログインしているユーザー |
-| match | 成績表 |
-| game | 半荘 |
-| score | ポイント |
-| points | 点数 |
-| result | 収支 |
+| コード | 意味                     |
+| ------ | ------------------------ |
+| user   | ログインしているユーザー |
+| match  | 成績表                   |
+| game   | 半荘                     |
+| score  | ポイント                 |
+| points | 点数                     |
+| result | 収支                     |
diff --git a/app/(lp)/page.tsx b/app/(lp)/page.tsx
@@ -1,9 +1,4 @@
-import {
-  Navbar,
-  NavbarBrand,
-  NavbarContent,
-  NavbarItem,
-} from "@nextui-org/react";
+import { Navbar, NavbarBrand, NavbarContent, NavbarItem } from "@heroui/react";
 import Image from "next/image";
 import Link from "next/link";
 import { Button } from "@/components/Button";

diff --git a/app/(maintenance)/(routes)/maintenance/page.tsx b/app/(maintenance)/(routes)/maintenance/page.tsx
@@ -1,10 +1,6 @@
 "use client";
 
-import {
-  Navbar as NextUINavbar,
-  NavbarBrand,
-  NavbarContent,
-} from "@nextui-org/react";
+import { Navbar, NavbarBrand, NavbarContent } from "@heroui/react";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
@@ -18,15 +14,15 @@ export default function MaintenancePage() {
   const [isRefreshing, setIsRefreshing] = useState(false);
   return (
     <main className="relative flex min-h-screen flex-col">
-      <NextUINavbar position="static" className="absolute inset-x-0 top-0">
+      <Navbar position="static" className="absolute inset-x-0 top-0">
         <NavbarContent>
           <NavbarBrand>
             <Link color="foreground" href="/">
               <Logo className="text-large" />
             </Link>
           </NavbarBrand>
         </NavbarContent>
-      </NextUINavbar>
+      </Navbar>
       <div className="flex grow items-center justify-center px-4">
         <div className="flex flex-col items-center gap-4">
           <h1 className="text-center text-large">メンテナンス中</h1>

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -4,7 +4,7 @@ import { IconDefs } from "@/components/Icon";
 import { SERVICE_NAME } from "@/lib/config";
 import { fontClassNames } from "./fonts";
 import "./globals.css";
-import { NextUIProvider } from "./nextUiProvider";
+import { Providers } from "./providers";
 
 export const metadata: Metadata = {
   title: {
@@ -35,9 +35,9 @@ export default function RootLayout({
       </head>
       <body className="h-full font-rocknroll">
         <IconDefs />
-        <NextUIProvider>
+        <Providers>
           <div className="h-full bg-background text-foreground">{children}</div>
-        </NextUIProvider>
+        </Providers>
       </body>
     </html>
   );

diff --git a/app/nextUiProvider.tsx b/app/nextUiProvider.tsx
diff --git a/app/providers.tsx b/app/providers.tsx
@@ -0,0 +1,17 @@
+"use client";
+
+import { HeroUIProvider } from "@heroui/react";
+import { ThemeProvider as NextThemesProvider } from "next-themes";
+
+/**
+ * @see https://heroui.org/docs/frameworks/nextjs#tailwind-css-setup
+ */
+export function Providers({ children }: { children: React.ReactNode }) {
+  return (
+    <HeroUIProvider className="h-full">
+      <NextThemesProvider attribute="class" defaultTheme="system">
+        {children}
+      </NextThemesProvider>
+    </HeroUIProvider>
+  );
+}
diff --git a/components/Accordion/index.tsx b/components/Accordion/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Accordion, AccordionItem } from "@nextui-org/react";
+export { Accordion, AccordionItem } from "@heroui/react";
diff --git a/components/Alert/index.tsx b/components/Alert/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Alert } from "@nextui-org/react";
+export { Alert } from "@heroui/react";
diff --git a/components/Avatar/index.tsx b/components/Avatar/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Avatar, AvatarGroup } from "@nextui-org/react";
+export { Avatar, AvatarGroup } from "@heroui/react";
diff --git a/components/Button/index.tsx b/components/Button/index.tsx
@@ -1 +1 @@
-export { Button, ButtonGroup, type ButtonProps } from "@nextui-org/react";
+export { Button, ButtonGroup, type ButtonProps } from "@heroui/react";
diff --git a/components/Card/index.tsx b/components/Card/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Card, CardHeader, CardBody, CardFooter } from "@nextui-org/react";
+export { Card, CardHeader, CardBody, CardFooter } from "@heroui/react";
diff --git a/components/Chip/index.tsx b/components/Chip/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Chip } from "@nextui-org/react";
+export { Chip } from "@heroui/react";
diff --git a/components/Divider/index.tsx b/components/Divider/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Divider } from "@nextui-org/react";
+export { Divider } from "@heroui/react";
diff --git a/components/Dropdown/index.tsx b/components/Dropdown/index.tsx
@@ -6,4 +6,4 @@ export {
   DropdownMenu,
   DropdownSection,
   DropdownItem,
-} from "@nextui-org/react";
+} from "@heroui/react";
diff --git a/components/Input/index.tsx b/components/Input/index.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Input as NextUiInput, InputProps } from "@nextui-org/react";
+import { Input as HeroUiInput, InputProps } from "@heroui/react";
 import classNames from "classnames";
 import { forwardRef } from "react";
 
@@ -9,7 +9,7 @@ export const Input = forwardRef<
   Omit<InputProps, "isInvalid">
 >(function Input({ classNames: propsClassNames, ...props }, ref) {
   return (
-    <NextUiInput
+    <HeroUiInput
       classNames={{
         ...propsClassNames,
         input: classNames("text-medium", propsClassNames?.input), // ios safariで拡大されるのを防ぐ

diff --git a/components/Link/index.tsx b/components/Link/index.tsx
@@ -1,15 +1,15 @@
 "use client";
 
 import {
-  Link as NextUILink,
-  LinkProps as NextUILinkProps,
-} from "@nextui-org/react";
+  Link as HeroUiLink,
+  LinkProps as HeroUiLinkProps,
+} from "@heroui/react";
 import NextLink, { LinkProps as NextLinkProps } from "next/link";
 import { forwardRef } from "react";
 
 export const Link = forwardRef<
   HTMLAnchorElement,
-  NextLinkProps & NextUILinkProps
+  NextLinkProps & HeroUiLinkProps
 >(function Link(props, ref) {
-  return <NextUILink as={NextLink} ref={ref} {...props} />;
+  return <HeroUiLink as={NextLink} ref={ref} {...props} />;
 });
diff --git a/components/Listbox/index.tsx b/components/Listbox/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Listbox, ListboxItem, ListboxSection } from "@nextui-org/react";
+export { Listbox, ListboxItem, ListboxSection } from "@heroui/react";
diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx
@@ -1,15 +1,15 @@
 "use client";
 
-import { useDisclosure } from "@nextui-org/react";
+import { useDisclosure } from "@heroui/react";
 
-export type { ModalProps } from "@nextui-org/react";
+export type { ModalProps } from "@heroui/react";
 export {
   Modal,
   ModalContent,
   ModalHeader,
   ModalBody,
   ModalFooter,
-} from "@nextui-org/react";
+} from "@heroui/react";
 
 export type UseModalReturn = {
   isOpen: boolean;

diff --git a/components/Navbar/index.tsx b/components/Navbar/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Navbar, NavbarBrand, NavbarContent } from "@nextui-org/react";
+export { Navbar, NavbarBrand, NavbarContent } from "@heroui/react";
diff --git a/components/Popover/index.tsx b/components/Popover/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Popover, PopoverTrigger, PopoverContent } from "@nextui-org/react";
+export { Popover, PopoverTrigger, PopoverContent } from "@heroui/react";
diff --git a/components/Progress/index.tsx b/components/Progress/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Progress } from "@nextui-org/react";
+export { Progress } from "@heroui/react";
diff --git a/components/ScrollShadow/index.tsx b/components/ScrollShadow/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { ScrollShadow } from "@nextui-org/react";
+export { ScrollShadow } from "@heroui/react";
diff --git a/components/Select/index.tsx b/components/Select/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Select, SelectItem } from "@nextui-org/react";
+export { Select, SelectItem } from "@heroui/react";
diff --git a/components/Skeleton/index.tsx b/components/Skeleton/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Skeleton } from "@nextui-org/react";
+export { Skeleton } from "@heroui/react";
diff --git a/components/Slider/index.tsx b/components/Slider/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Slider } from "@nextui-org/react";
+export { Slider } from "@heroui/react";
diff --git a/components/Tabs/index.tsx b/components/Tabs/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Tab, Tabs } from "@nextui-org/react";
+export { Tab, Tabs } from "@heroui/react";
diff --git a/components/Tooltip/index.tsx b/components/Tooltip/index.tsx
@@ -1,3 +1,3 @@
 "use client";
 
-export { Tooltip } from "@nextui-org/react";
+export { Tooltip } from "@heroui/react";
diff --git a/components/User/index.tsx b/components/User/index.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { User as NextUiUser, UserProps } from "@nextui-org/react";
+import { User as HeroUiUser, UserProps } from "@heroui/react";
 import { Skeleton } from "@/components/Skeleton";
 
 export function User({
@@ -26,7 +26,7 @@ export function User({
     );
   }
   return (
-    <NextUiUser
+    <HeroUiUser
       name={name}
       description={displayId && `@${displayId}`}
       avatarProps={{

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -1,25 +1,13 @@
-import path from "node:path";
-import { fileURLToPath } from "node:url";
 import js from "@eslint/js";
 import tseslint from "typescript-eslint";
 import tailwind from "eslint-plugin-tailwindcss";
 import eslintConfigPrettier from "eslint-config-prettier";
 import { FlatCompat } from "@eslint/eslintrc";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
 const compat = new FlatCompat({
-  baseDirectory: __dirname,
-  recommendedConfig: js.configs.recommended,
-  allConfig: js.configs.all,
+  baseDirectory: import.meta.dirname,
 });
-// [...compat.extends(
-//     "eslint:recommended",
-//     "plugin:@typescript-eslint/recommended",
-//     "next/core-web-vitals",
-//     "plugin:tailwindcss/recommended",
-//     "prettier",
-// ),
+
 export default tseslint.config(
   {
     ignores: ["lib/database.types.ts"],
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export { Button, ButtonGroup, type ButtonProps } from "@nextui-org/react";
		export { Button, ButtonGroup, type ButtonProps } from "@heroui/react";