diff --git a/api/package.json b/api/package.json
index e6130077..0aa0a872 100644
--- a/api/package.json
+++ b/api/package.json
@@ -3,10 +3,10 @@
"version": "0.0.0",
"private": true,
"dependencies": {
- "@redwoodjs-stripe/api": "^0.1.0-rc.14",
- "@redwoodjs/api": "5.4.3",
- "@redwoodjs/auth-dbauth-api": "5.4.3",
- "@redwoodjs/graphql-server": "5.4.3",
+ "@redwoodjs-stripe/api": "^1.0.7",
+ "@redwoodjs/api": "7.1.2",
+ "@redwoodjs/auth-dbauth-api": "7.1.2",
+ "@redwoodjs/graphql-server": "7.1.2",
"graphql-scalars": "1.22.2",
"nodemailer": "6.9.3",
"stripe": "12.18.0"
diff --git a/package.json b/package.json
index 5ac34917..8976522d 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
},
"devDependencies": {
"@playwright/test": "1.35.1",
- "@redwoodjs/core": "5.4.3",
+ "@redwoodjs/core": "7.1.2",
"enquirer": "2.3.6"
},
"eslintConfig": {
diff --git a/redwood.toml b/redwood.toml
index e45309af..52631b15 100644
--- a/redwood.toml
+++ b/redwood.toml
@@ -13,4 +13,4 @@
[api]
port = 8911
[browser]
- open = true
+ open = false
diff --git a/web/package.json b/web/package.json
index 87e8e453..70baf341 100644
--- a/web/package.json
+++ b/web/package.json
@@ -14,12 +14,12 @@
},
"dependencies": {
"@radix-ui/react-dialog": "1.0.5",
- "@redwoodjs-stripe/web": "^0.1.0-rc.14",
- "@redwoodjs/auth": "5.4.3",
- "@redwoodjs/auth-dbauth-web": "5.4.3",
- "@redwoodjs/forms": "5.4.3",
- "@redwoodjs/router": "5.4.3",
- "@redwoodjs/web": "5.4.3",
+ "@redwoodjs-stripe/web": "^1.0.7",
+ "@redwoodjs/auth": "7.1.2",
+ "@redwoodjs/auth-dbauth-web": "7.1.2",
+ "@redwoodjs/forms": "7.1.2",
+ "@redwoodjs/router": "7.1.2",
+ "@redwoodjs/web": "7.1.2",
"@stripe/stripe-js": "1.54.2",
"@xstate/immer": "0.3.3",
"@xstate/react": "3.2.2",
@@ -33,6 +33,7 @@
"xstate": "4.38.0"
},
"devDependencies": {
+ "@redwoodjs/vite": "7.1.2",
"@testing-library/user-event": "14.4.3"
}
}
diff --git a/web/src/components/Spinner/Spinner.js b/web/src/components/Spinner/Spinner.js
index c8c18b07..c7bc25c8 100644
--- a/web/src/components/Spinner/Spinner.js
+++ b/web/src/components/Spinner/Spinner.js
@@ -1,6 +1,6 @@
import styled, { keyframes } from 'styled-components'
-import SpinnerSVG from './spinner.svg'
+import SpinnerSVG from './SpinnerSVG'
const turn = keyframes`
from {
diff --git a/web/src/components/Spinner/SpinnerSVG.jsx b/web/src/components/Spinner/SpinnerSVG.jsx
new file mode 100644
index 00000000..c33ebe67
--- /dev/null
+++ b/web/src/components/Spinner/SpinnerSVG.jsx
@@ -0,0 +1,20 @@
+const SpinnerSVG = () => {
+ return (
+
+ )
+}
+
+export default SpinnerSVG
diff --git a/web/src/entry.client.jsx b/web/src/entry.client.jsx
new file mode 100644
index 00000000..ffee44f8
--- /dev/null
+++ b/web/src/entry.client.jsx
@@ -0,0 +1,17 @@
+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-client.html#hydrateroot
+ */
+const redwoodAppElement = document.getElementById('redwood-app')
+
+if (redwoodAppElement.children?.length > 0) {
+ hydrateRoot(redwoodAppElement, )
+} else {
+ const root = createRoot(redwoodAppElement)
+ root.render()
+}
diff --git a/web/src/pages/FatalErrorPage/FatalErrorPage.js b/web/src/pages/FatalErrorPage/FatalErrorPage.js
index b8576768..b2bb436f 100644
--- a/web/src/pages/FatalErrorPage/FatalErrorPage.js
+++ b/web/src/pages/FatalErrorPage/FatalErrorPage.js
@@ -5,13 +5,17 @@
// You can modify this page as you wish, but it is important to keep things simple to
// avoid the possibility that it will cause its own error. If it does, Redwood will
// still render a generic error page, but your users will prefer something a bit more
-// thoughtful. =)
+// thoughtful :)
-export default () => (
-
-