Merge branch 'staging' into develop

Author: gregrickaby

components/common/Layout.js

@@ -34,7 +34,7 @@ export default function Layout({children, seo, hasJsonLd}) {
         <BlogJsonLd
           url={seo?.canonical}
           title={seo?.title}
-          images={[seo?.opengraphImage.sourceUrl]}
+          images={[seo?.opengraphImage?.sourceUrl]}
           datePublished={seo?.opengraphPublishedTime}
           dateModified={seo?.opengraphModifiedTime}
           authorName={seo?.opengraphAuthor}

components/molecules/Form/Form.js

@@ -1,8 +1,8 @@
+import cn from 'classnames'
+import {Form as FormikForm, Formik} from 'formik'
+import PropTypes from 'prop-types'
 import React from 'react'
-import {Formik, Form as FormikForm} from 'formik'
 import styles from './Form.module.css'
-import PropTypes from 'prop-types'
-import cn from 'classnames'
 
 /**
  * Render Form component.
@@ -46,7 +46,7 @@ export default function Form({
 }
 
 Form.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  children: PropTypes.any,
   className: PropTypes.string,
   formDefaults: PropTypes.object,
   id: PropTypes.string,

package-lock.json

@@ -53,7 +53,7 @@
     "eslint": "^7.20.0",
     "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsdoc": "^32.0.1",
+    "eslint-plugin-jsdoc": "^32.0.2",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-react": "^7.22.0",