Merge remote-tracking branch 'origin' into feature/modify-meeting-to-…

…unittest

.techtrain/manifests/station07.json

@@ -8,4 +8,4 @@
       "specFile": "./tests/station07.test.tsx"
     }
   ]
-}
+}

README.md

@@ -8,8 +8,8 @@ Railway では Git で自分が取り組んだ内容を記録するときに、
 
 ### 必要なツール
 
-1. Node.js( 14.* ) [ 12.* ,  16.* では動作しません]
-2. Yarn
+1. Node.js（v14.17.0以降; v16以降を推奨します）
+2. Yarn (v1)
 
 上記 2 つをインストールする必要があります。
 [HTML/CSS/JavaScript Railway](https://github.com/TechBowl-japan/html-stations) に取り組み済みで、初期設定が済んでいれば、必要なツールについてはインストール済みです。

package.json

@@ -9,53 +9,53 @@
   "dependencies": {
     "@testing-library/react": "^12.1.4",
     "jest-transform-css": "^3.0.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.8",
-    "@babel/core": "^7.16.7",
-    "@babel/eslint-parser": "^7.16.5",
-    "@babel/preset-env": "^7.16.8",
+    "@babel/cli": "^7.17.6",
+    "@babel/core": "^7.17.8",
+    "@babel/eslint-parser": "^7.17.0",
+    "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
-    "@techtrain/cli-railway": "^0.1.10",
-    "@types/jest": "^27.4.0",
-    "@types/react": "^17.0.38",
-    "@types/react-dom": "^17.0.11",
+    "@techtrain/cli-railway": "^0.1.11",
+    "@types/jest": "^27.4.1",
+    "@types/react": "^17.0.43",
+    "@types/react-dom": "^17.0.14",
     "@types/react-test-renderer": "^17.0.1",
-    "autoprefixer": "^10.4.2",
-    "babel-jest": "^27.4.6",
-    "babel-loader": "^8.2.3",
+    "autoprefixer": "^10.4.4",
+    "babel-jest": "^27.5.1",
+    "babel-loader": "^8.2.4",
     "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
-    "browserslist": "^4.19.1",
+    "browserslist": "^4.20.2",
     "cross-env": "^7.0.3",
-    "css-loader": "^6.5.1",
-    "eslint": "^8.6.0",
-    "eslint-config-prettier": "^8.3.0",
+    "css-loader": "^6.7.1",
+    "eslint": "^8.12.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-webpack": "^0.13.2",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.28.0",
-    "eslint-plugin-react-hooks": "^4.3.0",
+    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-react-hooks": "^4.4.0",
     "html-webpack-plugin": "^5.5.0",
-    "jest": "^27.4.7",
+    "jest": "^27.5.1",
     "jest-css-modules": "^2.1.0",
-    "postcss": "^8.4.5",
+    "postcss": "^8.4.12",
     "postcss-loader": "^6.2.1",
-    "postcss-preset-env": "^7.2.3",
-    "prettier": "^2.5.1",
+    "postcss-preset-env": "^7.4.3",
+    "prettier": "^2.6.1",
     "react-refresh": "^0.11.0",
-    "react-test-renderer": "^17.0.2",
+    "react-test-renderer": "^18.0.0",
     "simple-git-hooks": "^2.7.0",
     "style-loader": "^3.3.1",
-    "ts-jest": "^27.1.2",
-    "ts-loader": "^9.2.6",
-    "typescript": "^4.5.4",
-    "webpack": "^5.66.0",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.7.3"
+    "ts-jest": "^27.1.4",
+    "ts-loader": "^9.2.8",
+    "typescript": "^4.6.3",
+    "webpack": "^5.70.0",
+    "webpack-cli": "^4.9.2",
+    "webpack-dev-server": "^4.7.4"
   },
   "scripts": {
     "dev": "webpack serve",

src/index.js

@@ -1,6 +1,7 @@
 import * as React from 'react'
-import * as ReactDOM from 'react-dom'
+import * as ReactDOM from 'react-dom/client'
 import { App } from './App'
 
 const root = document.getElementById('root')
-ReactDOM.render(<App />, root)
+const reactRoot = ReactDOM.createRoot(root)
+reactRoot.render(<App />)

tests/station11.test.tsx

@@ -3,10 +3,6 @@ import { act } from 'react-test-renderer'
 import { fetchMock } from './mock/fetch'
 import { createAsync } from './utils/createAsync'
 
-// TODO: ここのテストがあっているかを確認して修正を行う
-// TODO: クリアしてほしい基準を決定→たたきを大木へ送る
-// →問題文からみて決定する。もし現状の基準が難しそうなら、問題文自体を変更して構わない
-
 const { App } = require('../src/App') as { App: React.ComponentType<{}> }
 const { DogListContainer } = require('../src/DogListContainer') as {
   DogListContainer: React.ComponentType<{}>