Merge branch 'main' into 235-lecture5-add-additional-problem

.yarnrc.yml

@@ -11,4 +11,4 @@ plugins:
     path: .yarn/plugins/plugin-auto-install.cjs
     spec: 'https://github.com/WillBooster/yarn-plugin-auto-install/releases/download/v2.0.1/index.cjs'
 
-yarnPath: .yarn/releases/yarn-4.5.3.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

package.json

@@ -48,16 +48,16 @@
     "@emotion/styled": "11.14.0",
     "@prisma/client": "6.1.0",
     "@rvf/set-get": "7.0.0",
-    "@tanstack/react-query": "5.62.11",
-    "@trpc/client": "11.0.0-rc.666",
-    "@trpc/next": "11.0.0-rc.666",
-    "@trpc/react-query": "11.0.0-rc.666",
-    "@trpc/server": "11.0.0-rc.666",
+    "@tanstack/react-query": "5.62.15",
+    "@trpc/client": "11.0.0-rc.682",
+    "@trpc/next": "11.0.0-rc.682",
+    "@trpc/react-query": "11.0.0-rc.682",
+    "@trpc/server": "11.0.0-rc.682",
     "@willbooster/shared-lib": "5.2.7",
     "@willbooster/shared-lib-react": "3.2.15",
     "@willbooster/wb": "8.0.18",
     "at-decorators": "3.0.3",
-    "build-ts": "13.1.8",
+    "build-ts": "13.1.9",
     "dayjs": "1.11.13",
     "dotenv-cli": "8.0.0",
     "fast-deep-equal": "3.1.3",
@@ -88,24 +88,24 @@
     "usehooks-ts": "3.1.0",
     "uuid": "11.0.3",
     "zod": "3.24.1",
-    "zod-form-data": "2.0.4"
+    "zod-form-data": "2.0.5"
   },
   "devDependencies": {
     "@chakra-ui/cli": "2.5.6",
     "@types/eslint": "9.6.1",
     "@types/jsonwebtoken": "9.0.7",
     "@types/micromatch": "4.0.9",
-    "@types/node": "22.10.2",
+    "@types/node": "22.10.5",
     "@types/react-dom": "19.0.2",
     "@types/react-syntax-highlighter": "15.5.13",
     "@types/seedrandom": "3.0.8",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.18.2",
-    "@typescript-eslint/parser": "8.18.2",
+    "@typescript-eslint/eslint-plugin": "8.19.0",
+    "@typescript-eslint/parser": "8.19.0",
     "@willbooster/eslint-config-next": "1.2.1",
     "@willbooster/prettier-config": "9.1.3",
     "babel-plugin-react-compiler": "19.0.0-beta-201e55d-20241215",
-    "concurrently": "9.1.1",
+    "concurrently": "9.1.2",
     "conventional-changelog-conventionalcommits": "8.0.0",
     "eslint": "8.57.0",
     "eslint-config-next": "15.1.3",
@@ -118,18 +118,18 @@
     "eslint-plugin-sort-destructure-keys": "2.0.0",
     "eslint-plugin-unicorn": "56.0.1",
     "husky": "9.1.7",
-    "lint-staged": "15.2.11",
+    "lint-staged": "15.3.0",
     "micromatch": "4.0.8",
     "open-cli": "8.0.0",
     "pinst": "3.0.0",
     "prettier": "3.4.2",
-    "semantic-release": "24.2.0",
+    "semantic-release": "24.2.1",
     "sort-package-json": "2.12.0",
     "typescript": "5.7.2",
     "vitest": "2.1.8",
     "wait-on": "8.0.1"
   },
-  "packageManager": "yarn@4.5.3",
+  "packageManager": "yarn@4.6.0",
   "publishConfig": {
     "access": "public"
   },

prisma/calculateScores.ts

@@ -5,11 +5,13 @@ import { writeFileSync } from 'node:fs';
 import { PrismaClient } from '@prisma/client';
 import SuperTokensNode from 'supertokens-node';
 
-import { ensureSuperTokensInit } from '../src/infrastructures/supertokens/backendConfig';
-import { courseIdToLectureIndexToProblemIds } from '../src/problems/problemData';
+import { ensureSuperTokensInit } from '@/infrastructures/supertokens/backendConfig';
+import { courseIdToLectureIndexToProblemIds } from '@/problems/problemData';
 
 const prisma = new PrismaClient();
 
+// 1/3 9:30まで一発正解の採点考慮
+
 const deadLines = {
   tuBeginner1: [
     new Date('2024-10-17T11:59:59+09:00'), // 1st: 10/17

src/app/(withAuth)/courses/[courseId]/lectures/[lectureId]/problems/[problemId]/BoardEditor.tsx

@@ -104,7 +104,7 @@ export const BoardEditor = forwardRef<TurtleGraphicsHandle, TurtleGraphicsProps>
   const findIncorrectLocationsAndHintText = (): [string[], string] => {
     const locations: string[] = [];
     let hintText = '';
-    if (!fastDeepEqual(currentTraceItem.turtles, turtles)) {
+    if (!fastDeepEqual(new Set(currentTraceItem.turtles), new Set(turtles))) {
       locations.push('亀');
     }
     if (!fastDeepEqual(parseBoard(currentTraceItem.board), board)) {