fix: don't throw on undefined video / image

talentlessguy · Jul 30, 2021 · a0ee8fe · a0ee8fe
1 parent 87a446c
commit a0ee8fe
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 102 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-ogp",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "The ultimate React OpenGraph component",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -42,13 +42,13 @@
   },
   "homepage": "https://github.com/talentlessguy/react-ogp#readme",
   "devDependencies": {
-    "@rollup/plugin-typescript": "^8.2.1",
-    "@types/react": "^17.0.4",
+    "@rollup/plugin-typescript": "^8.2.4",
+    "@types/react": "^17.0.15",
     "react": "^17.0.2",
-    "rollup": "^2.46.0",
+    "rollup": "^2.55.1",
     "rollup-plugin-terser": "^7.0.2",
-    "tslib": "^2.2.0",
-    "typescript": "^4.2.4"
+    "tslib": "^2.3.0",
+    "typescript": "^4.3.5"
   },
   "peerDependencies": {
     "react": ">=16"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/index.tsx b/src/index.tsx
@@ -187,42 +187,44 @@ export const OGP = ({
           <meta name="profile:gender" content={profile.gender} />
         </>
       )}
-      {typeof video === 'string' ? (
-        <meta name="og:video" content={video} />
-      ) : (
-        <>
-          <meta
-            property="og:video:secure_url"
-            content={video.url.includes('http://') ? video.url.replace('http://', 'https://') : video.url}
-          />
-          <meta property="og:video:width" content={video.width.toString()} />
-          <meta property="og:video:height" content={video.height.toString()} />
-          <meta name="og:video:url" content={video.url} />
-          <meta property="og:video:type" content={video.type || 'video/mp4'} />
-        </>
-      )}
+      {video &&
+        (typeof video === 'string' ? (
+          <meta name="og:video" content={video} />
+        ) : (
+          <>
+            <meta
+              property="og:video:secure_url"
+              content={video.url.includes('http://') ? video.url.replace('http://', 'https://') : video.url}
+            />
+            <meta property="og:video:width" content={video.width.toString()} />
+            <meta property="og:video:height" content={video.height.toString()} />
+            <meta name="og:video:url" content={video.url} />
+            <meta property="og:video:type" content={video.type || 'video/mp4'} />
+          </>
+        ))}
       <meta name="og:locale" content={locale} />
       <meta name="og:title" content={title} />
-      {typeof image === 'string' ? (
-        <>
-          <meta name="og:image" content={image} />
-          <meta
-            property="og:image:secure_url"
-            content={image.includes('http://') ? image.replace('http://', 'https://') : image}
-          />
-        </>
-      ) : (
-        <>
-          <meta
-            property="og:image:secure_url"
-            content={image.url.includes('http://') ? image.url.replace('http://', 'https://') : image.url}
-          />
-          <meta property="og:image:width" content={image.width.toString()} />
-          <meta property="og:image:height" content={image.height.toString()} />
-          <meta name="og:image:url" content={image.url} />
-          <meta property="og:image:type" content={image.type || 'image/jpeg'} />
-        </>
-      )}
+      {image &&
+        (typeof image === 'string' ? (
+          <>
+            <meta name="og:image" content={image} />
+            <meta
+              property="og:image:secure_url"
+              content={image.includes('http://') ? image.replace('http://', 'https://') : image}
+            />
+          </>
+        ) : (
+          <>
+            <meta
+              property="og:image:secure_url"
+              content={image.url.includes('http://') ? image.url.replace('http://', 'https://') : image.url}
+            />
+            <meta property="og:image:width" content={image.width.toString()} />
+            <meta property="og:image:height" content={image.height.toString()} />
+            <meta name="og:image:url" content={image.url} />
+            <meta property="og:image:type" content={image.type || 'image/jpeg'} />
+          </>
+        ))}
 
       <meta name="og:url" content={url} />
       <meta property="og:site_name" content={siteName} />