Move error check to static props fn

Author: ravewebdev

api/wordpress/_global/getPostTypeStaticProps.js

@@ -45,13 +45,22 @@ export default async function getPostTypeStaticProps(
     slug
   )
 
+  const props = {
+    post,
+    error,
+    errorMessage
+  }
+
+  // Custom handling for homepage.
+  if (error) {
+    // Fallback to empty props if homepage not set in WP.
+    props.post = null
+    props.error = false
+  }
+
   // Merge in query results as Apollo state.
   return addApolloState(apolloClient, {
-    props: {
-      post,
-      error,
-      errorMessage
-    },
+    props,
     revalidate: 60 * 5
   })
 }

pages/index.js

@@ -48,16 +48,7 @@ export default function HomePage({post}) {
  * @return {Object}                      Post props.
  */
 export async function getStaticProps() {
-  const props = await getPostTypeStaticProps({slug: '/'}, postType)
-
-  return !props.props.error
-    ? props
-    : // Fallback to empty props if homepage not set in WP.
-      {
-        props: {
-          post: null
-        }
-      }
+  return await getPostTypeStaticProps({slug: '/'}, postType)
 }
 
 HomePage.propTypes = {