Merge branch 'main' into delete-package-lock

Author: aster-void

.github/workflows/ci.yml

@@ -86,7 +86,7 @@ jobs:
       - uses: actions/setup-node@v3
       - uses: oven-sh/setup-bun@v2
       - run: make prepare-deploy-web
-      - run: test `ls web/dist | wc -l` != 0
+      - run: test `ls web/out | wc -l` != 0
 
   deploy-test-server:
     name: Deploy Test (server)

Makefile

@@ -6,8 +6,6 @@ setup:
 	if [ ! `command -v bun` ]; then echo 'ERR: Bun is required!'; exit 1; fi
 	make sync
 	bunx husky
-	cd web; if [ ! -f .env ]; then cp ./.env.sample ./.env ; fi
-	cd server; if [ ! -f .env.dev ]; then cp ./.env.sample ./.env.dev ; fi
 	@echo "auto setup is done. now do:"
 	@echo "- edit server/.env.dev"
 	@echo "- edit web/.env"

web/api/chat/chat.ts

@@ -9,13 +9,13 @@ import type {
   SharedRoom,
   UpdateRoom,
   UserID,
-} from "../../../common/types";
-import { ErrUnauthorized, credFetch } from "../../firebase/auth/lib";
+} from "~/common/types";
+import { ErrUnauthorized, credFetch } from "~/firebase/auth/lib";
 import endpoints from "../internal/endpoints";
 
 /* TODO
-import { UserID } from "../common/types";
-import type { User } from "../common/types";
+import { UserID } from "~/common/types";
+import type { User } from "~/common/types";
 */
 
 //// DM グループチャット 共通////

web/api/chat/hooks.ts

@@ -3,11 +3,11 @@
 import { useCallback } from "react";
 import { z } from "zod";
 // import { useCallback, useEffect, useState } from "react";
-import type { Message, RoomOverview } from "../../../common/types";
-import { MessageSchema, RoomOverviewSchema } from "../../../common/zod/schemas";
-import { type Hook, useCustomizedSWR } from "../../hooks/useCustomizedSWR";
+import type { Message, RoomOverview } from "~/common/types";
+import { MessageSchema, RoomOverviewSchema } from "~/common/zod/schemas";
+import { type Hook, useCustomizedSWR } from "~/hooks/useCustomizedSWR";
 import type { UserID } from "../internal/endpoints";
-// import type { Hook } from "../share/types";
+// import type { Hook } from "~/share/types";
 import * as chat from "./chat";
 
 const OverviewListSchema = z.array(RoomOverviewSchema);

web/api/course.hook.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import type { Course } from "../../common/types";
-import { CourseSchema } from "../../common/zod/schemas";
-import { type Hook, useCustomizedSWR } from "../hooks/useCustomizedSWR";
+import type { Course } from "~/common/types";
+import { CourseSchema } from "~/common/zod/schemas";
+import { type Hook, useCustomizedSWR } from "~/hooks/useCustomizedSWR";
 import { getMyCourses } from "./course";
 
 const CourseListSchema = z.array(CourseSchema);

web/api/course.ts

@@ -1,5 +1,5 @@
-import type { Course, CourseID, Day } from "../../common/types";
-import { credFetch } from "../firebase/auth/lib";
+import type { Course, CourseID, Day } from "~/common/types";
+import { credFetch } from "~/firebase/auth/lib";
 import endpoints from "./internal/endpoints";
 
 // TODO: migrate to safe functions

web/api/internal/endpoints.ts

@@ -1,5 +1,5 @@
-import type { CourseID, Day, GUID } from "../../../common/types";
-import type { MessageID, ShareRoomID } from "../../../common/types";
+import type { CourseID, Day, GUID } from "~/common/types";
+import type { MessageID, ShareRoomID } from "~/common/types";
 
 export const origin: string | null = process.env.NEXT_PUBLIC_API_ENDPOINT ?? "";
 if (!origin) throw new Error("process.env.NEXT_PUBLIC_API_ENDPOINT not found!");

web/api/internal/fetch-func.ts

@@ -1,4 +1,4 @@
-import { Err, Ok, type Result } from "../../../common/lib/result";
+import { Err, Ok, type Result } from "~/common/lib/result";
 
 export async function safeFetch(
   path: string,
@@ -15,7 +15,7 @@ export async function safeFetch(
   }
 }
 
-import { getIdToken } from "../../firebase/auth/lib";
+import { getIdToken } from "~/firebase/auth/lib";
 import endpoints from "./endpoints";
 
 type URL = string;

web/api/match.ts

@@ -1,4 +1,4 @@
-import { credFetch } from "../firebase/auth/lib";
+import { credFetch } from "~/firebase/auth/lib";
 import endpoints from "./internal/endpoints";
 import type { UserID } from "./internal/endpoints";
 

web/api/request.ts

@@ -1,4 +1,4 @@
-import { credFetch } from "../firebase/auth/lib";
+import { credFetch } from "~/firebase/auth/lib";
 import endpoints, { type UserID } from "./internal/endpoints";
 
 //指定したユーザにリクエストを送る