From 4c7f99ebf988979227717df6408d37be18014be9 Mon Sep 17 00:00:00 2001
From: Chance Strickland <hi@chance.dev>
Date: Thu, 9 Mar 2023 06:09:32 -0800
Subject: [PATCH 1/7] chore: use charSet key

---
 packages/remix-react/components.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/remix-react/components.tsx b/packages/remix-react/components.tsx
index e05cce6d42d..b5c4c4255ac 100644
--- a/packages/remix-react/components.tsx
+++ b/packages/remix-react/components.tsx
@@ -601,7 +601,7 @@ function V1Meta() {
         }
 
         if (["charset", "charSet"].includes(name)) {
-          return <meta key="charset" charSet={value as string} />;
+          return <meta key="charSet" charSet={value as string} />;
         }
 
         if (name === "title") {
@@ -727,7 +727,7 @@ function V2Meta() {
           // to do that? Seems like a nice convenience IMO.
           return (
             <meta
-              key="charset"
+              key="charSet"
               charSet={metaProps.charSet || (metaProps as any).charset}
             />
           );

From d0ecf7ba5133e0d85d69627a6b53c4c8845d2601 Mon Sep 17 00:00:00 2001
From: Chance Strickland <hi@chance.dev>
Date: Thu, 9 Mar 2023 06:58:19 -0800
Subject: [PATCH 2/7] feat: add support for link tags and ld+json to v2 meta

---
 packages/remix-react/components.tsx           | 49 ++++++++++++++++---
 packages/remix-react/routeModules.ts          | 11 ++++-
 packages/remix-server-runtime/routeModules.ts | 11 ++++-
 3 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/packages/remix-react/components.tsx b/packages/remix-react/components.tsx
index b5c4c4255ac..08c559a13c3 100644
--- a/packages/remix-react/components.tsx
+++ b/packages/remix-react/components.tsx
@@ -718,18 +718,49 @@ function V2Meta() {
           return null;
         }
 
+        if ("tagName" in metaProps) {
+          let tagName = metaProps.tagName;
+          delete metaProps.tagName;
+          if (!isValidMetaTag(tagName)) {
+            console.warn(
+              `A meta object uses an invalid tagName: ${tagName}. Expected either 'link' or 'meta'`
+            );
+            return null;
+          }
+          let Comp = tagName;
+          return <Comp key={JSON.stringify(metaProps)} {...metaProps} />;
+        }
+
         if ("title" in metaProps) {
           return <title key="title">{String(metaProps.title)}</title>;
         }
 
-        if ("charSet" in metaProps || "charset" in metaProps) {
-          // TODO: We normalize this for the user in v1, but should we continue
-          // to do that? Seems like a nice convenience IMO.
+        if ("charset" in metaProps) {
+          metaProps.charSet ??= metaProps.charset;
+          delete metaProps.charset;
+        }
+
+        if ("charSet" in metaProps && metaProps.charSet != null) {
+          return typeof metaProps.charSet === "string" ? (
+            <meta key="charSet" charSet={metaProps.charSet} />
+          ) : null;
+        }
+
+        if ("script:ld+json" in metaProps) {
+          let json: string | null = null;
+          try {
+            json = JSON.stringify(metaProps["script:ld+json"]);
+          } catch (err) {}
           return (
-            <meta
-              key="charSet"
-              charSet={metaProps.charSet || (metaProps as any).charset}
-            />
+            json != null && (
+              <script
+                key="script:ld+json"
+                type="application/ld+json"
+                dangerouslySetInnerHTML={{
+                  __html: JSON.stringify(metaProps["script:ld+json"]),
+                }}
+              />
+            )
           );
         }
         return <meta key={JSON.stringify(metaProps)} {...metaProps} />;
@@ -738,6 +769,10 @@ function V2Meta() {
   );
 }
 
+function isValidMetaTag(tagName: unknown): tagName is "meta" | "link" {
+  return typeof tagName === "string" && /^(meta|link)$/.test(tagName);
+}
+
 export function Meta() {
   let { future } = useRemixContext();
   return future?.v2_meta ? <V2Meta /> : <V1Meta />;
diff --git a/packages/remix-react/routeModules.ts b/packages/remix-react/routeModules.ts
index 785add903db..85bae0568ee 100644
--- a/packages/remix-react/routeModules.ts
+++ b/packages/remix-react/routeModules.ts
@@ -120,7 +120,16 @@ export type V2_HtmlMetaDescriptor =
   | { name: string; content: string }
   | { property: string; content: string }
   | { httpEquiv: string; content: string }
-  | { [name: string]: string };
+  | { "script:ld+json": LdJsonObject }
+  | { tagName: "meta" | "link"; [name: string]: string }
+  | { [name: string]: unknown };
+
+type LdJsonObject = { [Key in string]: LdJsonValue } & {
+  [Key in string]?: LdJsonValue | undefined;
+};
+type LdJsonArray = LdJsonValue[] | readonly LdJsonValue[];
+type LdJsonPrimitive = string | number | boolean | null;
+type LdJsonValue = LdJsonPrimitive | LdJsonObject | LdJsonArray;
 
 /**
  * A React component that is rendered for a route.
diff --git a/packages/remix-server-runtime/routeModules.ts b/packages/remix-server-runtime/routeModules.ts
index 380b2549d1f..553d1060323 100644
--- a/packages/remix-server-runtime/routeModules.ts
+++ b/packages/remix-server-runtime/routeModules.ts
@@ -210,7 +210,16 @@ export type V2_HtmlMetaDescriptor =
   | { name: string; content: string }
   | { property: string; content: string }
   | { httpEquiv: string; content: string }
-  | { [name: string]: string };
+  | { "script:ld+json": LdJsonObject }
+  | { tagName: "meta" | "link"; [name: string]: string }
+  | { [name: string]: unknown };
+
+type LdJsonObject = { [Key in string]: LdJsonValue } & {
+  [Key in string]?: LdJsonValue | undefined;
+};
+type LdJsonArray = LdJsonValue[] | readonly LdJsonValue[];
+type LdJsonPrimitive = string | number | boolean | null;
+type LdJsonValue = LdJsonPrimitive | LdJsonObject | LdJsonArray;
 
 /**
  * A React component that is rendered for a route.

From c88d8a62437b8eecf7b8ee242a8912ed53be50f7 Mon Sep 17 00:00:00 2001
From: Chance Strickland <hi@chance.dev>
Date: Thu, 9 Mar 2023 14:09:35 -0800
Subject: [PATCH 3/7] add meta tests

---
 integration/meta-test.ts | 91 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 88 insertions(+), 3 deletions(-)

diff --git a/integration/meta-test.ts b/integration/meta-test.ts
index 5301a8f2870..bd4d162b6df 100644
--- a/integration/meta-test.ts
+++ b/integration/meta-test.ts
@@ -441,9 +441,9 @@ test.describe("v2_meta", () => {
         `,
 
         "app/routes/index.jsx": js`
-          export const meta = ({ data, matches }) => [
-            ...matches.map((match) => match.meta),
-          ];
+          export const meta = ({ data, matches }) =>
+            matches.flatMap((match) => match.meta);
+
           export default function Index() {
             return <div>This is the index file</div>;
           }
@@ -462,6 +462,59 @@ test.describe("v2_meta", () => {
           }
         `,
 
+        "app/routes/authors/$authorId.jsx": js`
+          import { json } from "@remix-run/node";
+
+          export async function loader({ params }) {
+            return json({
+              author: {
+                id: params.authorId,
+                name: "Sonny Day",
+                address: {
+                  streetAddress: "123 Sunset Cliffs Blvd",
+                  city: "San Diego",
+                  state: "CA",
+                  zip: "92107",
+                },
+                emails: [
+                  "sonnyday@fancymail.com",
+                  "surfergal@veryprofessional.org",
+                ],
+              },
+            });
+          }
+
+          export function meta({ data }) {
+            let { author } = data;
+            return [
+              { title: data.name + " Profile" },
+              {
+                tagName: "link",
+                rel: "canonical",
+                href: "https://website.com/authors/" + author.id,
+              },
+              {
+                "script:ld+json": {
+                  "@context": "http://schema.org",
+                  "@type": "Person",
+                  "name": author.name,
+                  "address": {
+                    "@type": "PostalAddress",
+                    "streetAddress": author.address.streetAddress,
+                    "addressLocality": author.address.city,
+                    "addressRegion": author.address.state,
+                    "postalCode": author.address.zip,
+                  },
+                  "email": author.emails,
+                },
+              },
+            ];
+          }
+          export default function AuthorBio() {
+            return <div>Bio here!</div>;
+          }
+        `,
+
         "app/routes/music.jsx": js`
           export function meta({ data, matches }) {
             let rootModule = matches.find(match => match.route.id === "root");
@@ -529,4 +582,36 @@ test.describe("v2_meta", () => {
     await app.goto("/");
     expect(await app.getHtml('meta[property="og:image"]')).toBeTruthy();
   });
+
+  test("{ 'script:ld+json': {} } adds a <script type='application/ld+json' />", async ({
+    page,
+  }) => {
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/authors/1");
+    let scriptTag = await app.getHtml('script[type="application/ld+json"]');
+    let scriptContents = scriptTag
+      .replace('<script type="application/ld+json">', "")
+      .replace("</script>", "")
+      .trim();
+
+    expect(JSON.parse(scriptContents)).toEqual({
+      "@context": "http://schema.org",
+      "@type": "Person",
+      name: "Sonny Day",
+      address: {
+        "@type": "PostalAddress",
+        streetAddress: "123 Sunset Cliffs Blvd",
+        addressLocality: "San Diego",
+        addressRegion: "CA",
+        postalCode: "92107",
+      },
+      email: ["sonnyday@fancymail.com", "surfergal@veryprofessional.org"],
+    });
+  });
+
+  test("{ tagName: 'link' } adds a <link />", async ({ page }) => {
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/authors/1");
+    expect(await app.getHtml('link[rel="canonical"]')).toBeTruthy();
+  });
 });

From 28676edf54a915b6d84ac059b2288cbddbe08236 Mon Sep 17 00:00:00 2001
From: Chance Strickland <hi@chance.dev>
Date: Thu, 9 Mar 2023 14:12:09 -0800
Subject: [PATCH 4/7] add changeset

---
 .changeset/silly-birds-turn.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/silly-birds-turn.md

diff --git a/.changeset/silly-birds-turn.md b/.changeset/silly-birds-turn.md
new file mode 100644
index 00000000000..71354a264c3
--- /dev/null
+++ b/.changeset/silly-birds-turn.md
@@ -0,0 +1,6 @@
+---
+"@remix-run/react": minor
+"@remix-run/server-runtime": patch
+---
+
+Add support for generating `<script type='application/ld+json' />` and meta-related `<link />` tags to docunent head in the route `meta` function when using the `v2_meta` future flag

From d9d030421f717a6ee017b5920684e07debadc2fd Mon Sep 17 00:00:00 2001
From: Chance Strickland <hi@chance.dev>
Date: Thu, 9 Mar 2023 14:12:36 -0800
Subject: [PATCH 5/7] rename changeset

---
 .changeset/{silly-birds-turn.md => meta-v2-enhancements.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .changeset/{silly-birds-turn.md => meta-v2-enhancements.md} (100%)

diff --git a/.changeset/silly-birds-turn.md b/.changeset/meta-v2-enhancements.md
similarity index 100%
rename from .changeset/silly-birds-turn.md
rename to .changeset/meta-v2-enhancements.md

From a0c40e8683fb8af2a33f61eaffd23f490fe09fa0 Mon Sep 17 00:00:00 2001
From: Chance Strickland <hi@chance.dev>
Date: Thu, 9 Mar 2023 14:16:59 -0800
Subject: [PATCH 6/7] reword changeset

---
 .changeset/meta-v2-enhancements.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/meta-v2-enhancements.md b/.changeset/meta-v2-enhancements.md
index 71354a264c3..08bc9d5e875 100644
--- a/.changeset/meta-v2-enhancements.md
+++ b/.changeset/meta-v2-enhancements.md
@@ -3,4 +3,4 @@
 "@remix-run/server-runtime": patch
 ---
 
-Add support for generating `<script type='application/ld+json' />` and meta-related `<link />` tags to docunent head in the route `meta` function when using the `v2_meta` future flag
+Add support for generating `<script type='application/ld+json' />` and meta-related `<link />` tags to document head via the route `meta` function when using the `v2_meta` future flag

From 6dedab6ec5b7dc7009697e5b991e9e4bbcd2d545 Mon Sep 17 00:00:00 2001
From: Chance Strickland <hi@chance.dev>
Date: Thu, 9 Mar 2023 15:53:41 -0800
Subject: [PATCH 7/7] update tests for flat route conventions

---
 integration/meta-test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/integration/meta-test.ts b/integration/meta-test.ts
index 1af74721eec..a3a2b4eb2bf 100644
--- a/integration/meta-test.ts
+++ b/integration/meta-test.ts
@@ -442,7 +442,7 @@ test.describe("v2_meta", () => {
           }
         `,
 
-        "app/routes/index.jsx": js`
+        "app/routes/_index.jsx": js`
           export const meta = ({ data, matches }) =>
             matches.flatMap((match) => match.meta);
 
@@ -464,7 +464,7 @@ test.describe("v2_meta", () => {
           }
         `,
 
-        "app/routes/authors/$authorId.jsx": js`
+        "app/routes/authors.$authorId.jsx": js`
           import { json } from "@remix-run/node";
 
           export async function loader({ params }) {