Merge pull request #18032 from ethereum/jsonld-organization

refactor(jsonld): mv ethereum orgs to organizations.ts namespace

Author: pettinarip

app/[locale]/page-jsonld.tsx

@@ -4,13 +4,8 @@ import { Lang } from "@/lib/types"
 
 import PageJsonLD from "@/components/PageJsonLD"
 
-import { normalizeUrlForJsonLd } from "@/lib/utils/url"
-
-import {
-  ETHEREUM_ORG_WEBSITE,
-  ORGANIZATION,
-  REFERENCE,
-} from "@/lib/jsonld/constants"
+import { ETHEREUM_ORG_WEBSITE, REFERENCE } from "@/lib/jsonld/constants"
+import { KNOWN_ORGANIZATIONS } from "@/lib/jsonld/organizations"
 
 export default async function IndexPageJsonLD({
   locale,
@@ -19,16 +14,13 @@ export default async function IndexPageJsonLD({
 }) {
   const t = await getTranslations("page-index")
 
-  const url = normalizeUrlForJsonLd(locale, `/`)
-
   const jsonLd = {
     "@context": "https://schema.org",
     "@graph": [
-      ORGANIZATION.ETHEREUM_FOUNDATION,
-      ORGANIZATION.ETHEREUM_COMMUNITY,
+      KNOWN_ORGANIZATIONS["ethereum-foundation"],
+      KNOWN_ORGANIZATIONS["ethereum-community"],
       {
         ...ETHEREUM_ORG_WEBSITE,
-        url: url,
         description: t("page-index-meta-description"),
         educationalUse: "Self-Paced",
         keywords:

src/lib/jsonld/constants.ts

@@ -3,6 +3,8 @@
  * These can be imported and reused across page-jsonld.tsx files
  */
 
+import { KNOWN_ORGANIZATIONS } from "./organizations"
+
 export const REFERENCE = {
   /**
    * Reference to Ethereum Foundation organization (for use when the full object is already defined elsewhere)
@@ -18,37 +20,6 @@ export const REFERENCE = {
   ETHEREUM_ORG_WEBSITE: { "@id": "https://ethereum.org/#website" },
 } as const
 
-export const ORGANIZATION = {
-  /**
-   * Ethereum Foundation organization definition
-   * Can be used as publisher, maintainer, author, etc.
-   */
-  ETHEREUM_FOUNDATION: {
-    "@type": "Organization" as const,
-    name: "Ethereum Foundation",
-    url: "https://ethereum.foundation",
-    ownershipFundingInfo: "https://ethereum.foundation/ef",
-    logo: "https://ethereum.org/images/ef-logo.png",
-    sameAs: [
-      "https://www.wikidata.org/wiki/Q114736857",
-      "https://www.crunchbase.com/organization/ethereum",
-      "https://x.com/ethereumfndn",
-      "https://www.linkedin.com/company/ethereum-foundation",
-    ],
-    ...REFERENCE.ETHEREUM_FOUNDATION,
-  },
-  /**
-   * Ethereum Community contributor organization
-   */
-  ETHEREUM_COMMUNITY: {
-    "@type": "Organization" as const,
-    name: "Ethereum Community",
-    url: "https://github.com/ethereum/ethereum-org-website/graphs/contributors",
-    description: "A global collective of open-source contributors.",
-    ...REFERENCE.ETHEREUM_COMMUNITY,
-  },
-}
-
 /**
  * ethereum.org WebSite entity
  * Anchors the site in the knowledge graph. Every page's JSON-LD graph
@@ -69,7 +40,7 @@ export const ETHEREUM_ORG_WEBSITE = {
  * same graph.
  */
 export const BASE_GRAPH_NODES = [
-  ORGANIZATION.ETHEREUM_FOUNDATION,
-  ORGANIZATION.ETHEREUM_COMMUNITY,
+  KNOWN_ORGANIZATIONS["ethereum-foundation"],
+  KNOWN_ORGANIZATIONS["ethereum-community"],
   ETHEREUM_ORG_WEBSITE,
 ]

src/lib/jsonld/organizations.ts

@@ -1,3 +1,5 @@
+import { REFERENCE } from "./constants"
+
 /**
  * Known Organization profiles for JSON-LD attribution
  *
@@ -6,6 +8,39 @@
  * (e.g. podcasts, video channels, events).
  */
 export const KNOWN_ORGANIZATIONS = {
+  /**
+   * Ethereum Foundation organization definition
+   * Can be used as publisher, maintainer, author, etc.
+   */
+  "ethereum-foundation": {
+    "@type": "Organization" as const,
+    name: "Ethereum Foundation",
+    url: "https://ethereum.foundation",
+    ownershipFundingInfo: "https://ethereum.foundation/ef",
+    logo: "https://ethereum.org/images/ef-logo.png",
+    sameAs: [
+      "https://www.wikidata.org/wiki/Q114736857",
+      "https://www.crunchbase.com/organization/ethereum",
+      "https://x.com/ethereumfndn",
+      "https://www.linkedin.com/company/ethereum-foundation",
+    ],
+    ...REFERENCE.ETHEREUM_FOUNDATION,
+  },
+
+  /**
+   * Ethereum Community contributor organization
+   */
+  "ethereum-community": {
+    "@type": "Organization" as const,
+    name: "Ethereum Community",
+    url: "https://github.com/ethereum/ethereum-org-website/graphs/contributors",
+    description: "A global collective of open-source contributors.",
+    ...REFERENCE.ETHEREUM_COMMUNITY,
+  },
+
+  /**
+   * Other known organizations
+   */
   bankless: {
     "@type": "Organization" as const,
     "@id": "https://ethereum.org/#bankless",

src/lib/jsonld/types.ts

@@ -1,9 +1,8 @@
-import { ORGANIZATION } from "./constants"
 import { KNOWN_ORGANIZATIONS } from "./organizations"
 import { KNOWN_PERSONS } from "./persons"
 
 export type KnownEntity =
   | (typeof KNOWN_PERSONS)[keyof typeof KNOWN_PERSONS]
   | (typeof KNOWN_ORGANIZATIONS)[keyof typeof KNOWN_ORGANIZATIONS]
-  | typeof ORGANIZATION.ETHEREUM_FOUNDATION
-  | typeof ORGANIZATION.ETHEREUM_COMMUNITY
+  | (typeof KNOWN_ORGANIZATIONS)["ethereum-foundation"]
+  | (typeof KNOWN_ORGANIZATIONS)["ethereum-community"]

src/lib/jsonld/utils.ts

@@ -1,6 +1,6 @@
 import * as Sentry from "@sentry/nextjs"
 
-import { ORGANIZATION, REFERENCE } from "./constants"
+import { REFERENCE } from "./constants"
 import { KNOWN_ORGANIZATIONS } from "./organizations"
 import { KNOWN_PERSONS } from "./persons"
 import type { KnownEntity } from "./types"
@@ -49,8 +49,8 @@ function buildEntityAliases(): Record<string, KnownEntity> {
   }
 
   const entries: Array<[string | null, KnownEntity]> = [
-    [null, ORGANIZATION.ETHEREUM_FOUNDATION],
-    [null, ORGANIZATION.ETHEREUM_COMMUNITY],
+    [null, KNOWN_ORGANIZATIONS["ethereum-foundation"]],
+    [null, KNOWN_ORGANIZATIONS["ethereum-community"]],
     ...Object.entries(KNOWN_PERSONS),
     ...Object.entries(KNOWN_ORGANIZATIONS),
   ]