Upgrade redwood to version 0.26.0

2021-02-28 20:30:59 +11:00
parent 682993fa48
commit 2391f29eab
8 changed files with 752 additions and 191 deletions
--- a/api/package.json
+++ b/api/package.json
@@ -3,7 +3,7 @@
  "version": "0.0.0",
  "private": true,
  "dependencies": {
-    "@redwoodjs/api": "^0.25.0",
+    "@redwoodjs/api": "^0.26.2",
    "cloudinary": "^1.23.0"
  }
 }
--- a/package.json
+++ b/package.json
@@ -6,10 +6,9 @@
      "web"
    ]
  },
-  "scripts": {
-  },
+  "scripts": {},
  "devDependencies": {
-    "@redwoodjs/core": "^0.25.0"
+    "@redwoodjs/core": "^0.26.2"
  },
  "eslintConfig": {
    "extends": "@redwoodjs/eslint-config"
--- a/web/package.json
+++ b/web/package.json
@@ -14,10 +14,10 @@
  },
  "dependencies": {
    "@material-ui/core": "^4.11.0",
-    "@redwoodjs/auth": "^0.25.0",
-    "@redwoodjs/forms": "^0.25.0",
-    "@redwoodjs/router": "^0.25.0",
-    "@redwoodjs/web": "^0.25.0",
+    "@redwoodjs/auth": "^0.26.2",
+    "@redwoodjs/forms": "^0.26.2",
+    "@redwoodjs/router": "^0.26.2",
+    "@redwoodjs/web": "^0.26.2",
    "cloudinary-react": "^1.6.7",
    "controlkit": "^0.1.9",
    "get-active-classes": "^0.0.11",
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -1,7 +1,6 @@
 import { AuthProvider } from '@redwoodjs/auth'
 import GoTrue from 'gotrue-js'

-import ReactDOM from 'react-dom'
 import { FatalErrorBoundary } from '@redwoodjs/web'
 import { RedwoodApolloProvider } from '@redwoodjs/web/apollo'
 import FatalErrorPage from 'src/pages/FatalErrorPage'
@@ -19,13 +18,14 @@ const goTrueClient = new GoTrue({
  setCookie: true,
 })

-ReactDOM.render(
+const App = () => (
  <FatalErrorBoundary page={FatalErrorPage}>
    <AuthProvider client={goTrueClient} type="goTrue">
      <RedwoodApolloProvider>
        <Routes />
      </RedwoodApolloProvider>
    </AuthProvider>
-  </FatalErrorBoundary>,
-  document.getElementById('redwood-app')
+  </FatalErrorBoundary>
 )
+
+export default App
--- a/web/src/Routes.js
+++ b/web/src/Routes.js
@@ -36,7 +36,7 @@ const Routes = () => {
      <Route path="/policies/code-of-conduct" page={CodeOfConductPage} name="codeOfConduct" />
      <Route path="/account-recovery/update-password" page={UpdatePasswordPage} name="updatePassword" />
      <Route path="/account-recovery" page={AccountRecoveryPage} name="accountRecovery" />
-      <Route path="/" page={HomePage} name="home" />
+      <Route path="/" page={HomePage} name="home" prerender />
      <Route notfound page={NotFoundPage} />

      {/* Ownership enforced routes */}
--- a/web/src/index.html
+++ b/web/src/index.html
@@ -26,7 +26,9 @@
    </script>
  </head>
  <body>
-    <div id="redwood-app"></div>
+    <div id="redwood-app">
+      <%= prerenderPlaceholder %>
+    </div>
    <div
      id="cascade-container"
      style="opacity: 0; overflow: hidden; height: 0"
--- a/web/src/layouts/MainLayout/MainLayout.js
+++ b/web/src/layouts/MainLayout/MainLayout.js
@@ -9,6 +9,7 @@ import Footer from 'src/components/Footer'
 import { useLocation } from '@redwoodjs/router'
 import LoginModal from 'src/components/LoginModal'
 import ReactGA from 'react-ga'
+import { isBrowser } from '@redwoodjs/prerender/browserUtils'

 import Svg from 'src/components/Svg'
 import ImageUploader from 'src/components/ImageUploader'
@@ -63,7 +64,10 @@ const MainLayout = ({ children, shouldRemoveFooterInIde }) => {
      previousSubmission = newSubmission
    }
  }, [pathname, params])
-  const hash = window.location.hash
+  let hash
+  if (isBrowser) {
+    hash = window.location.hash
+  }
  useEffect(() => {
    const [key, token] = hash.slice(1).split('=')
    if (key === 'confirmation_token') {
--- a/yarn.lock
+++ b/yarn.lock