crash fixes

components/u/AvatarWithInfo.tsx

@@ -15,7 +15,7 @@ import TwitterAvatar from "components/common/TwitterAvatar";
 import UserAvatar from "components/common/UserAvatar";
 import WeaponImage from "components/common/WeaponImage";
 import { countries, getEmojiFlag } from "countries-list";
-import useUser, { useMyTheme } from "hooks/common";
+import { useMyTheme, useUser } from "hooks/common";
 import { getFullUsername } from "lib/strings";
 import Image from "next/image";
 import { GetUserByIdentifierData } from "prisma/queries/getUserByIdentifier";

package-lock.json

@@ -1370,9 +1370,9 @@
       "integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw=="
     },
     "@hookform/resolvers": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-1.3.2.tgz",
-      "integrity": "sha512-OumtsPsGqBcsMXGUkM7IGDO55+ZmruF3u3D7eDYDK4HpYQcp4Q5QeqQtQr/BLD1wgTiB4YLvcboRXrITuJOwdA=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-1.3.0.tgz",
+      "integrity": "sha512-NF+KJYDiFjnGAqhM92vG5kFJFCZFFjO5VxcByf06o6FrG7BEta5NDBhqVsIAMSfMNsn1kWfSKX1TkDT21xq9Hg=="
     },
     "@jest/types": {
       "version": "26.6.2",

package.json

@@ -21,7 +21,7 @@
     "@chakra-ui/theme-tools": "^1.0.3",
     "@emotion/react": "^11.1.4",
     "@emotion/styled": "^11.0.0",
-    "@hookform/resolvers": "1.3.2",
+    "@hookform/resolvers": "1.3.0",
     "@lingui/react": "^3.4.0",
     "@prisma/client": "^2.15.0",
     "@sendou/react-sketch": "^0.5.2",

pages/api/builds/index.ts

@@ -1,6 +1,6 @@
 import { Ability } from "@prisma/client";
+import { getMySession } from "lib/api";
 import { GANBA_DISCORD_ID } from "lib/constants";
-import { getMySession } from "lib/getMySession";
 import { getWeaponNormalized } from "lib/lists/weapons";
 import { buildSchema } from "lib/validators/build";
 import { NextApiRequest, NextApiResponse } from "next";

pages/api/freeagents/index.ts

@@ -1,4 +1,4 @@
-import { getMySession } from "lib/getMySession";
+import { getMySession } from "lib/api";
 import { freeAgentPostSchema } from "lib/validators/fapost";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";

pages/api/freeagents/like.ts

@@ -1,4 +1,4 @@
-import { getMySession } from "lib/getMySession";
+import { getMySession } from "lib/api";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";
 

pages/api/me/profile.ts

@@ -1,4 +1,4 @@
-import { getMySession } from "lib/getMySession";
+import { getMySession } from "lib/api";
 import { profileSchemaBackend } from "lib/validators/profile";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";

pages/api/play/teams/index.ts

@@ -1,4 +1,4 @@
-import { getMySession } from "lib/getMySession";
+import { getMySession } from "lib/api";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";
 import { getAllLadderRegisteredTeams } from "prisma/queries/getAllLadderRegisteredTeams";

pages/api/play/teams/join.ts

@@ -1,5 +1,5 @@
+import { getMySession } from "lib/api";
 import { LADDER_ROSTER_LIMIT } from "lib/constants";
-import { getMySession } from "lib/getMySession";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";
 

pages/api/play/teams/leave.ts

@@ -1,4 +1,4 @@
-import { getMySession } from "lib/getMySession";
+import { getMySession } from "lib/api";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";
 

pages/api/sr/records/[id].ts

@@ -1,5 +1,5 @@
+import { getMySession } from "lib/api";
 import { SALMON_RUN_ADMIN_DISCORD_IDS } from "lib/constants";
-import { getMySession } from "lib/getMySession";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";
 

pages/api/sr/records/index.ts

@@ -1,5 +1,5 @@
+import { getMySession } from "lib/api";
 import { SALMON_RUN_ADMIN_DISCORD_IDS } from "lib/constants";
-import { getMySession } from "lib/getMySession";
 import { salmonRunRecordSchema } from "lib/validators/salmonRunRecord";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";

pages/api/teams/[id].ts

@@ -1,4 +1,4 @@
-import { getMySession } from "lib/getMySession";
+import { getMySession } from "lib/api";
 import { NextApiRequest, NextApiResponse } from "next";
 import { getTeam, GetTeamData } from "prisma/queries/getTeam";
 

pages/api/teams/code.ts

@@ -1,4 +1,4 @@
-import { getMySession } from "lib/getMySession";
+import { getMySession } from "lib/api";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";
 import { v4 as uuidv4 } from "uuid";

pages/api/teams/index.ts

@@ -1,4 +1,4 @@
-import { getMySession } from "lib/getMySession";
+import { getMySession } from "lib/api";
 import { makeNameUrlFriendly } from "lib/makeNameUrlFriendly";
 import { teamSchema } from "lib/validators/team";
 import { NextApiRequest, NextApiResponse } from "next";

pages/api/teams/join.ts

@@ -1,5 +1,5 @@
+import { getMySession } from "lib/api";
 import { TEAM_ROSTER_LIMIT } from "lib/constants";
-import { getMySession } from "lib/getMySession";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";
 

pages/api/teams/kick.ts

@@ -1,4 +1,4 @@
-import { getMySession } from "lib/getMySession";
+import { getMySession } from "lib/api";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";
 

pages/api/teams/leave.ts

@@ -1,4 +1,4 @@
-import { getMySession } from "lib/getMySession";
+import { getMySession } from "lib/api";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";
 

pages/api/teams/owner.ts

@@ -1,4 +1,4 @@
-import { getMySession } from "lib/getMySession";
+import { getMySession } from "lib/api";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";
 

pages/api/users/[id]/player.ts

@@ -1,5 +1,5 @@
+import { getMySession } from "lib/api";
 import { ADMIN_DISCORD_ID } from "lib/constants";
-import { getMySession } from "lib/getMySession";
 import { getWeaponNormalized } from "lib/lists/weapons";
 import { NextApiRequest, NextApiResponse } from "next";
 import prisma from "prisma/client";

pages/freeagents.tsx

@@ -27,7 +27,7 @@ import UserAvatar from "components/common/UserAvatar";
 import WeaponImage from "components/common/WeaponImage";
 import FAModal from "components/freeagents/FAModal";
 import { countries, getEmojiFlag } from "countries-list";
-import useUser, { useMyTheme } from "hooks/common";
+import { useMyTheme, useUser } from "hooks/common";
 import { useFreeAgents } from "hooks/freeagents";
 import { sendData } from "lib/postData";
 import { Unpacked } from "lib/types";

pages/t/[team].tsx

@@ -28,7 +28,7 @@ import WeaponImage from "components/common/WeaponImage";
 import TeamManagementModal from "components/t/TeamManagementModal";
 import TeamProfileModal from "components/t/TeamProfileModal";
 import { countries, getEmojiFlag } from "countries-list";
-import useUser, { useMyTheme } from "hooks/common";
+import { useMyTheme, useUser } from "hooks/common";
 import { getToastOptions } from "lib/getToastOptions";
 import { sendData } from "lib/postData";
 import { GetStaticPaths, GetStaticProps } from "next";

pages/t/index.tsx

@@ -20,7 +20,7 @@ import SubTextCollapse from "components/common/SubTextCollapse";
 import TwitterAvatar from "components/common/TwitterAvatar";
 import CreateNewTeamModal from "components/t/CreateNewTeamModal";
 import { countries, getEmojiFlag } from "countries-list";
-import useUser, { useMyTheme } from "hooks/common";
+import { useMyTheme, useUser } from "hooks/common";
 import { GetStaticProps } from "next";
 import Image from "next/image";
 import { getAllTeams, GetAllTeamsData } from "prisma/queries/getAllTeams";

tsconfig.json

@@ -2,7 +2,6 @@
   "compilerOptions": {
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext", "ES2020"],
-    "types": ["cypress"],
     "allowJs": false,
     "skipLibCheck": true,
     "strict": true,