Merge pull request #1295 from pankona/update-react

Update React, React-DOM, and @types/react
pankona · Jan 18, 2025 · b914fd2 · b914fd2
2 parents 7f4d82f + 1525980
commit b914fd2
Show file tree

Hide file tree

Showing 6 changed files with 1,269 additions and 1,813 deletions.
diff --git a/dprint.json b/dprint.json
@@ -1,12 +1,8 @@
 {
-  "typescript": {
-  },
-  "json": {
-  },
-  "markdown": {
-  },
-  "yaml": {
-  },
+  "typescript": {},
+  "json": {},
+  "markdown": {},
+  "yaml": {},
   "excludes": [
     "**/node_modules",
     "**/*-lock.json",

diff --git a/hashira-web/package.json b/hashira-web/package.json
@@ -16,8 +16,6 @@
   "devDependencies": {
     "@types/babel__core": "^7.20.3",
     "@types/node": "~18.18.14",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
     "@types/styled-components": "^5.1.34",
     "@types/uuid": "^10.0.0",
     "@vitejs/plugin-react": "^4.3.4",
@@ -32,9 +30,11 @@
     "vite": "^4.5.5"
   },
   "dependencies": {
+    "@types/react": "^19.0.7",
+    "@types/react-dom": "^19.0.3",
     "firebase": "^11.1.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "uuid": "^11.0.3"
   },
   "resolutions": {

diff --git a/hashira-web/src/TaskInput.tsx b/hashira-web/src/TaskInput.tsx
@@ -7,7 +7,7 @@ const StyledInputForm = styled.form`
   display: flex;
 `;
 
-const TaskInput: React.VFC<{
+const TaskInput: React.FC<{
   onSubmitTasks: (tasks: string[]) => Promise<void>;
   disabled: boolean;
 }> = ({ onSubmitTasks, disabled }) => {

diff --git a/hashira-web/src/TaskList.tsx b/hashira-web/src/TaskList.tsx
@@ -51,7 +51,7 @@ const StyledArrow = styled.div`
   font-size: 12px;
 `;
 
-export const TaskList: React.VFC<{
+export const TaskList: React.FC<{
   place: typeof firebase.Places[number];
   tasksAndPriorities: firebase.TasksAndPriorities;
   checkedTasks: { [key: string]: boolean };
@@ -111,7 +111,7 @@ export const TaskList: React.VFC<{
 
   const convertTasksAndPrioritiesToJSXElement = (
     tasksAndPriorities: firebase.TasksAndPriorities,
-  ): JSX.Element[] => {
+  ): React.ReactElement[] => {
     if (!tasksAndPriorities["Priority"][place]) {
       return noItem;
     }

diff --git a/hashira-web/tsconfig.json b/hashira-web/tsconfig.json
@@ -6,17 +6,19 @@
     "esModuleInterop": true,
     "lib": [
       "DOM",
+      "DOM.Iterable",
       "ES2022"
     ],
     "strict": true,
-    "jsx": "react-jsx",
+    "jsx": "react-jsx", // ここを元に戻す
     "skipLibCheck": true,
     "allowJs": true,
     "isolatedModules": true,
     "noImplicitAny": true,
     "strictNullChecks": true,
     "types": [
       "react",
+      "react-dom",
       "styled-components"
     ]
   },