Merge pull request #62 from toririm/chore/fmt

[chore] fmt

.eslintrc.cjs

@@ -72,6 +72,12 @@ module.exports = {
         "plugin:import/recommended",
         "plugin:import/typescript",
       ],
+      rules: {
+        "@typescript-eslint/consistent-type-imports": [
+          "warn",
+          { prefer: "type-imports", fixStyle: "inline-type-imports" },
+        ],
+      },
     },
 
     // Node

README.md

@@ -1 +1,10 @@
 # cafeore-2024 POSシステム
+
+## コマンド
+
+| コマンド                        | 説明                                                              |
+| ------------------------------- | ----------------------------------------------------------------- |
+| `bun install --frozen-lockfile` | 依存パッケージのインストールには基本的にこれを使ってください      |
+| `bun dev`                       | 開発環境の立ち上げ。ホットリロードに対応しています                |
+| `bun lint`                      | ESLintの実行。`--fix`オプションをつけることで、自動修正もできます |
+| `bun fmt`                       | Prettierの実行                                                    |

app/components/ui/alert-dialog.tsx

@@ -1,8 +1,8 @@
-import * as React from "react";
 import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
+import * as React from "react";
 
-import { cn } from "~/lib/utils";
 import { buttonVariants } from "~/components/ui/button";
+import { cn } from "~/lib/utils";
 
 const AlertDialog = AlertDialogPrimitive.Root;
 

app/components/ui/label.tsx

@@ -1,6 +1,6 @@
-import * as React from "react";
 import * as LabelPrimitive from "@radix-ui/react-label";
 import { cva, type VariantProps } from "class-variance-authority";
+import * as React from "react";
 
 import { cn } from "~/lib/utils";
 

app/components/ui/radio-group.tsx

@@ -1,6 +1,6 @@
-import * as React from "react";
 import * as RadioGroupPrimitive from "@radix-ui/react-radio-group";
 import { Circle } from "lucide-react";
+import * as React from "react";
 
 import { cn } from "~/lib/utils";
 

app/firebase/converter.ts

@@ -1,11 +1,11 @@
 import {
+  Timestamp,
   type DocumentData,
   type QueryDocumentSnapshot,
   type SnapshotOptions,
-  Timestamp,
 } from "firebase/firestore";
 import _ from "lodash";
-import type { ZodSchema } from "zod";
+import { type ZodSchema } from "zod";
 
 export const converter = <T>(schema: ZodSchema<T>) => {
   return {

app/firebase/subscription.ts

@@ -1,6 +1,7 @@
 import { collection, onSnapshot, query } from "firebase/firestore";
-import type { SWRSubscription } from "swr/subscription";
+import { type SWRSubscription } from "swr/subscription";
 import { type ZodSchema } from "zod";
+
 import { converter } from "./converter";
 import { db } from "./firestore";
 

app/lib/utils.ts

@@ -1,4 +1,4 @@
-import { type ClassValue, clsx } from "clsx";
+import { clsx, type ClassValue } from "clsx";
 import { twMerge } from "tailwind-merge";
 
 export function cn(...inputs: ClassValue[]) {

app/models/order.test.ts

@@ -1,5 +1,6 @@
 import { expect, test } from "vitest";
-import { ItemWithId } from "./item";
+
+import { type ItemWithId } from "./item";
 import { OrderEntity } from "./order";
 
 test("order total auto calc", () => {

app/models/order.ts

@@ -1,5 +1,6 @@
 import { z } from "zod";
-import { Item, itemSchema } from "./item";
+
+import { itemSchema, type Item } from "./item";
 
 export const orderSchema = z.object({
   id: z.string().optional(), // Firestore のドキュメント ID

app/repositories/item.ts

@@ -7,11 +7,13 @@ import {
   getDocs,
   setDoc,
 } from "firebase/firestore";
+
 import { converter } from "~/firebase/converter";
 import { db } from "~/firebase/firestore";
 import { hasId } from "~/lib/typeguard";
 import { itemSchema } from "~/models/item";
-import { ItemRepository } from "./type";
+
+import { type ItemRepository } from "./type";
 
 export const itemRepository: ItemRepository = {
   save: async (item) => {

app/repositories/order.ts

@@ -7,11 +7,13 @@ import {
   getDocs,
   setDoc,
 } from "firebase/firestore";
+
 import { converter } from "~/firebase/converter";
 import { db } from "~/firebase/firestore";
 import { hasId } from "~/lib/typeguard";
-import { Order, orderSchema, OrderWithId } from "~/models/order";
-import { OrderRepository } from "./type";
+import { orderSchema, type Order, type OrderWithId } from "~/models/order";
+
+import { type OrderRepository } from "./type";
 
 export const orderRepository: OrderRepository = {
   save: async (order) => {

app/repositories/type.ts

@@ -1,6 +1,6 @@
-import { WithId } from "~/lib/typeguard";
-import { Item } from "~/models/item";
-import { Order } from "~/models/order";
+import { type WithId } from "~/lib/typeguard";
+import { type Item } from "~/models/item";
+import { type Order } from "~/models/order";
 
 export type BaseRepository<T extends { id?: unknown }> = {
   save(data: T): Promise<WithId<T>>;

app/root.tsx

@@ -5,6 +5,7 @@ import {
   Scripts,
   ScrollRestoration,
 } from "@remix-run/react";
+
 import "./tailwind.css";
 
 export function Layout({ children }: { children: React.ReactNode }) {

app/routes/_header._index.tsx

@@ -1,6 +1,6 @@
-import type { MetaFunction } from "@remix-run/node";
-import { useLoaderData } from "@remix-run/react";
+import { useLoaderData, type MetaFunction } from "@remix-run/react";
 import { collection, getDocs } from "firebase/firestore";
+
 import { Button } from "~/components/ui/button";
 import { converter } from "~/firebase/converter";
 import { db } from "~/firebase/firestore";

app/routes/_header.serve.tsx

@@ -1,5 +1,6 @@
-import type { MetaFunction } from "@remix-run/node";
+import { type MetaFunction } from "@remix-run/react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
+
 import { Button } from "~/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
 import { orderRepository } from "~/repositories/order";

app/routes/_header.tsx

@@ -1,4 +1,5 @@
 import { Outlet } from "@remix-run/react";
+
 import { OnlineStatus } from "~/components/online-status";
 
 export default function BaseHeader() {

app/routes/casher.tsx

@@ -1,5 +1,6 @@
 import { AlertDialogCancel } from "@radix-ui/react-alert-dialog";
 import { useState } from "react";
+
 import {
   AlertDialog,
   AlertDialogAction,
@@ -12,7 +13,7 @@ import {
 } from "~/components/ui/alert-dialog";
 import { Button } from "~/components/ui/button";
 import { Input } from "~/components/ui/input";
-import { Order } from "~/models/order";
+import { type Order } from "~/models/order";
 
 const mockOrder: Order = {
   orderId: 1,

app/routes/items/action.ts

@@ -1,7 +1,7 @@
 import { type ClientActionFunction } from "@remix-run/react";
-import { deleteItem } from "./actions/deleteItem";
 
 import { addItem } from "./actions/addItem";
+import { deleteItem } from "./actions/deleteItem";
 
 export const action: ClientActionFunction = async (args) => {
   const { request } = args;

app/routes/items/actions/addItem.ts

@@ -1,5 +1,5 @@
 import { parseWithZod } from "@conform-to/zod";
-import { type ClientActionFunction, json } from "@remix-run/react";
+import { json, type ClientActionFunction } from "@remix-run/react";
 
 import { itemSchema } from "~/models/item";
 import { itemRepository } from "~/repositories/item";

app/routes/items/actions/deleteItem.ts

@@ -1,6 +1,7 @@
 import { parseWithZod } from "@conform-to/zod";
 import { json, type ClientActionFunction } from "@remix-run/react";
 import { z } from "zod";
+
 import { itemRepository } from "~/repositories/item";
 
 export const deleteItem: ClientActionFunction = async ({ request }) => {

app/routes/items/route.tsx

@@ -1,7 +1,6 @@
 import { useForm } from "@conform-to/react";
 import { parseWithZod } from "@conform-to/zod";
-import type { MetaFunction } from "@remix-run/node";
-import { Form, useActionData } from "@remix-run/react";
+import { Form, useActionData, type MetaFunction } from "@remix-run/react";
 import useSWRSubscription from "swr/subscription";
 
 import { Button } from "~/components/ui/button";
@@ -11,7 +10,8 @@ import { RadioGroup, RadioGroupItem } from "~/components/ui/radio-group";
 import { collectionSub } from "~/firebase/subscription";
 import { itemSchema, itemtypes } from "~/models/item";
 
-import type { action as clientAction } from "./action";
+import { type action as clientAction } from "./action";
+
 export { action as clientAction } from "./action";
 
 export const meta: MetaFunction = () => {

app/routes/orders.tsx

@@ -1,13 +1,14 @@
 import {
-  ClientActionFunction,
-  ClientActionFunctionArgs,
   Form,
-  MetaFunction,
+  type ClientActionFunction,
+  type ClientActionFunctionArgs,
+  type MetaFunction,
 } from "@remix-run/react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
+
 import { Button } from "~/components/ui/button";
 import { Input } from "~/components/ui/input";
-import { Order } from "~/models/order";
+import { type Order } from "~/models/order";
 import { orderRepository } from "~/repositories/order";
 
 export const meta: MetaFunction = () => {

package.json

@@ -19,44 +19,43 @@
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-radio-group": "^1.2.0",
     "@radix-ui/react-slot": "^1.1.0",
-    "@remix-run/node": "^2.11.0",
-    "@remix-run/react": "^2.11.0",
+    "@remix-run/react": "^2.11.2",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
-    "firebase": "^10.7.2",
+    "firebase": "^10.13.1",
     "lodash": "^4.17.21",
     "lucide-react": "^0.424.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "remix-typedjson": "^0.4.1",
     "swr": "^2.2.5",
-    "tailwind-merge": "^2.4.0",
+    "tailwind-merge": "^2.5.2",
     "tailwindcss-animate": "^1.0.7",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
-    "@remix-run/dev": "^2.11.0",
+    "@remix-run/dev": "^2.11.2",
     "@types/lodash": "^4.17.7",
-    "@types/react": "^18.2.20",
-    "@types/react-dom": "^18.2.7",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
-    "autoprefixer": "^10.4.19",
-    "eslint": "^8.38.0",
+    "@types/react": "^18.3.5",
+    "@types/react-dom": "^18.3.0",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "autoprefixer": "^10.4.20",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "postcss": "^8.4.38",
+    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-jsx-a11y": "^6.10.0",
+    "eslint-plugin-react": "^7.35.2",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "postcss": "^8.4.45",
     "prettier": "^3.3.3",
     "prettier-plugin-tailwindcss": "^0.6.6",
-    "tailwindcss": "^3.4.4",
-    "typescript": "^5.1.6",
-    "vite": "^5.1.0",
-    "vite-tsconfig-paths": "^4.2.1",
+    "tailwindcss": "^3.4.10",
+    "typescript": "^5.5.4",
+    "vite": "^5.4.3",
+    "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^2.0.5"
   },
   "engines": {