Merge branch 'staging' into develop

Author: gregrickaby

.github/dependabot.yml

@@ -1,6 +1,6 @@
 version: 2
 updates:
-  - package-ecosystem: "npm"
-    directory: "/"
+  - package-ecosystem: 'npm'
+    directory: '/'
     schedule:
-      interval: "daily"
+      interval: 'daily'

.github/workflows/chromatic.yml

@@ -1,6 +1,6 @@
 # .github/workflows/chromatic.yml
 # name of our action
-name: "Chromatic Deployment"
+name: 'Chromatic Deployment'
 # the event that will trigger the action
 on: push
 

components/atoms/VideoEmbed/VideoEmbed.js

@@ -1,7 +1,7 @@
+import RichText from '@/components/atoms/RichText'
 import cn from 'classnames'
 import PropTypes from 'prop-types'
 import React from 'react'
-import RichText from '@/components/atoms/RichText'
 import styles from './VideoEmbed.module.css'
 
 /**
@@ -20,6 +20,7 @@ export default function VideoEmbed({className, url, type, caption}) {
    * Create URL embed for YouTube or Vimeo videos.
    *
    * @param {string} url The video URL.
+   * @return {string}    Formatted video URL.
    */
   function createVideoUrl(url) {
     if (!url) {

components/blocks/Gutenberg/BlockEmbed/BlockEmbed.js

@@ -33,24 +33,24 @@ export default function BlockEmbed({
     if (providerNameSlug === 'twitter') {
       setLoadTweet(1)
     }
-  })
+  }, [providerNameSlug])
+
+  if (!url) {
+    return
+  }
 
   return (
     <>
-      {!!url && (
-        <>
-          {!!loadTweet && (
-            <Tweet className={className} url={url} caption={caption} />
-          )}
-          {!!supportedVideoTypes.includes(providerNameSlug) && (
-            <VideoEmbed
-              className={className}
-              url={url}
-              caption={caption}
-              type={providerNameSlug}
-            />
-          )}
-        </>
+      {!!loadTweet && (
+        <Tweet className={className} url={url} caption={caption} />
+      )}
+      {!!supportedVideoTypes.includes(providerNameSlug) && (
+        <VideoEmbed
+          className={className}
+          url={url}
+          caption={caption}
+          type={providerNameSlug}
+        />
       )}
     </>
   )