Merge branch 'dev' into fix-import-svg-from-node-modules

remix-run · Aug 8, 2023 · f9bd868 · f9bd868
2 parents 7b51abe + 23f27ef
commit f9bd868
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/.changeset/olive-lemons-marry.md b/.changeset/olive-lemons-marry.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+Use unique key for `script:ld+json` meta descriptors
diff --git a/contributors.yml b/contributors.yml
@@ -533,6 +533,7 @@
 - vorcigernix
 - wangbinyq
 - weavdale
+- wilcoschoneveld
 - willhack
 - willin
 - wizardlyhel

diff --git a/packages/remix-react/components.tsx b/packages/remix-react/components.tsx
@@ -606,21 +606,18 @@ export function Meta() {
         }
 
         if ("script:ld+json" in metaProps) {
-          let json: string | null = null;
           try {
-            json = JSON.stringify(metaProps["script:ld+json"]);
-          } catch (err) {}
-          return (
-            json != null && (
+            let json = JSON.stringify(metaProps["script:ld+json"]);
+            return (
               <script
-                key="script:ld+json"
+                key={`script:ld+json:${json}`}
                 type="application/ld+json"
-                dangerouslySetInnerHTML={{
-                  __html: JSON.stringify(metaProps["script:ld+json"]),
-                }}
+                dangerouslySetInnerHTML={{ __html: json }}
               />
-            )
-          );
+            );
+          } catch (err) {
+            return null;
+          }
         }
         return <meta key={JSON.stringify(metaProps)} {...metaProps} />;
       })}