Upgrade to v5 and run codemods (#165)

* Upgrade to v5 and run codemods * Update pw reset user setup to store hash token * Pretty stuff up * Update to 5.3
CodingZeal · Jun 9, 2023 · b6c86a7 · b6c86a7
1 parent acba9ae
commit b6c86a7
Show file tree

Hide file tree

Showing 9 changed files with 4,113 additions and 3,770 deletions.
diff --git a/README.md b/README.md
@@ -243,6 +243,8 @@ yarn test:watch # <api|web>
 # see ./scripts/playwright.ts for more info
 yarn test:e2e <--init|--debug|--reset|--playwright>
 
+# run a individual test
+yarn test:e2e --debug --playwright test reset-password.spec.ts -c web/playwright.config.ts
 ```
 
 ---

diff --git a/api/package.json b/api/package.json
@@ -3,10 +3,10 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "4.1.2",
-    "@redwoodjs/api-server": "4.1.2",
-    "@redwoodjs/auth-dbauth-api": "4.1.2",
-    "@redwoodjs/graphql-server": "4.1.2",
+    "@redwoodjs/api": "5.3.0",
+    "@redwoodjs/api-server": "5.3.0",
+    "@redwoodjs/auth-dbauth-api": "5.3.0",
+    "@redwoodjs/graphql-server": "5.3.0",
     "nodemailer": "^6.8.0"
   },
   "devDependencies": {

diff --git a/documentation/schema/ERD.svg b/documentation/schema/ERD.svg
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@mermaid-js/mermaid-cli": "^9.3.0",
-    "@redwoodjs/auth-dbauth-setup": "4.1.2",
+    "@redwoodjs/auth-dbauth-setup": "5.3.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.8.1",
     "prisma-erd-generator": "^1.2.4",
@@ -22,7 +22,7 @@
     "root": true
   },
   "engines": {
-    "node": ">=14.19 <=16.x",
+    "node": "=18.x",
     "yarn": ">=1.15"
   },
   "prisma": {
@@ -60,7 +60,7 @@
     "schema:format": "npx prisma format"
   },
   "dependencies": {
-    "@redwoodjs/core": "4.1.2",
+    "@redwoodjs/core": "5.3.0",
     "pm2": "^5.2.2",
     "react-use": "^17.4.0"
   }

diff --git a/web/package.json b/web/package.json
@@ -13,17 +13,17 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/auth": "4.1.2",
-    "@redwoodjs/auth-dbauth-web": "4.1.2",
-    "@redwoodjs/forms": "4.1.2",
-    "@redwoodjs/router": "4.1.2",
-    "@redwoodjs/vite": "4.1.2",
-    "@redwoodjs/web": "4.1.2",
+    "@redwoodjs/auth": "5.3.0",
+    "@redwoodjs/auth-dbauth-web": "5.3.0",
+    "@redwoodjs/forms": "5.3.0",
+    "@redwoodjs/router": "5.3.0",
+    "@redwoodjs/vite": "5.3.0",
+    "@redwoodjs/web": "5.3.0",
     "@simplewebauthn/browser": "^7.0.0",
     "date-fns": "^2.29.3",
     "prop-types": "15.8.1",
-    "react": "17.0.2",
-    "react-dom": "17.0.2"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.28.1",

diff --git a/web/src/entry-client.jsx b/web/src/entry-client.jsx
@@ -1,16 +1,17 @@
-import ReactDOM from 'react-dom'
+import { hydrateRoot, createRoot } from 'react-dom/client'
 
 import App from './App'
 /**
  * When `#redwood-app` isn't empty then it's very likely that you're using
  * prerendering. So React attaches event listeners to the existing markup
  * rather than replacing it.
- * https://reactjs.org/docs/react-dom.html#hydrate
+ * https://reactjs.org/docs/react-dom-client.html#hydrateroot
  */
-const rootElement = document.getElementById('redwood-app')
+const redwoodAppElement = document.getElementById('redwood-app')
 
-if (rootElement.children?.length > 0) {
-  ReactDOM.hydrate(<App />, rootElement)
+if (redwoodAppElement.children?.length > 0) {
+  hydrateRoot(redwoodAppElement, <App />)
 } else {
-  ReactDOM.render(<App />, rootElement)
+  const root = createRoot(redwoodAppElement)
+  root.render(<App />)
 }
diff --git a/web/src/index.html b/web/src/index.html
@@ -7,9 +7,6 @@
   </head>
 
   <body>
-    <div id="redwood-app">
-      <!-- Please keep the line below for prerender support. -->
-      <%= prerenderPlaceholder %>
-    </div>
+    <div id="redwood-app"></div>
   </body>
 </html>
diff --git a/web/tests/reset-password.spec.ts b/web/tests/reset-password.spec.ts
@@ -5,9 +5,10 @@ import { MockUserEntity } from './entities/user.entity'
 test.beforeAll(async () => {
   await MockUserEntity.upsert({
     email: 'snap@crackle.pop',
-    resetToken: 'waffleCrisp',
+    resetToken:
+      '013ce53f5abe360066909e76d37ef32111da99e13591db3ac4aa3857f5a20abf',
     resetTokenExpiresAt: new Date(new Date().getTime() + 24 * 60 * 60 * 1000),
-    verifyToken: 'cheerios',
+    verifyToken: 'waffleCrisp',
   })
 })