create-bearminion 1.4.0 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # create-bearminion
 
+## 1.5.0
+
+### Patch Changes
+
+- 8a428e7: Sitewide JSON-LD. `site.seo.jsonLd` is optional (up to 10 blocks, 50 KB, so no migration) and the default template emits its blocks on every page. A page's own `seo.jsonLd` still replaces only the generated `WebPage` block, and a block with the same `@id` is emitted once, the page's first. With the conventional ids `<url>/#organization` and `<url>/#website` in the site's blocks, the generated `WebPage` gets `isPartOf` and `publisher` as `@id` references. The Site tab has a Structured data group with an Edit JSON-LD dialog and a Generate button that fills an `Organization` and a `WebSite` from the site name, address and language, replacing blocks with the same `@id`. The logo is added only for a full https address. A warning shows while the site address is still `example.com`. `siteJsonLdIds`, `mergeJsonLd`, `hasJsonLdId`, `generateSiteJsonLd`, `upsertJsonLd` and `isPlaceholderSiteUrl` are exported; themes that emit JSON-LD should use `mergeJsonLd` (see the theme docs).
+
 ## 1.4.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-bearminion",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Create a BearMinion site: an Astro website you edit by clicking on it.",
   "license": "MIT",
   "author": "Jakub Lange",
@@ -46,7 +46,7 @@
     "@types/node": "^22.19.0",
     "tsdown": "0.23.1",
     "typescript": "~5.9.3",
-    "vitest": "^5.0.4"
+    "vitest": "^5.0.5"
   },
   "scripts": {
     "build": "tsdown",

package/template/README.md

@@ -184,7 +184,7 @@ The site's own images (`logo.png`, `favicon.png`, `og.png`, `hero.png`) live in
 
 ## SEO and sitemap
 
-`Seo.astro` reads the page `seo` object and the site defaults in `site.json`. The document title is `seo.titleTemplate` with `%s` replaced by the page SEO title. Description falls back to the site description. The canonical URL is `seo.canonical` when set, otherwise the page path joined to `site.url`. Robots is `noindex` or `index`, plus `nofollow` or `follow`. Open Graph, Twitter, and WebPage JSON-LD use the same title, description, and image. A page that sets `seo.jsonLd` gets those blocks instead of the generated WebPage block, one script tag per block. `site.analytics.head` and `site.analytics.bodyEnd` are emitted by `Base.astro` in production builds only, behind the [cookie banner](#cookie-banner) unless it is switched off.
+`Seo.astro` reads the page `seo` object and the site defaults in `site.json`. The document title is `seo.titleTemplate` with `%s` replaced by the page SEO title. Description falls back to the site description. The canonical URL is `seo.canonical` when set, otherwise the page path joined to `site.url`. Robots is `noindex` or `index`, plus `nofollow` or `follow`. Open Graph, Twitter, and WebPage JSON-LD use the same title, description, and image. Every block in `site.seo.jsonLd` (usually an `Organization` and a `WebSite`) is emitted on every page, and the generated WebPage then points at them by `@id`. A page that sets `seo.jsonLd` gets those blocks instead of the generated WebPage block only, never instead of the site's. A block with the same `@id` is emitted once, the page's copy winning. One script tag per block. `site.analytics.head` and `site.analytics.bodyEnd` are emitted by `Base.astro` in production builds only, behind the [cookie banner](#cookie-banner) unless it is switched off.
 
 `astro.config.ts` sets `site` from `site.json` and adds `@astrojs/sitemap`. The filter keeps content pages whose `seo.noindex` is false. `content/pages/preview.json` is the sample noindex page: it is built, it emits `noindex`, and it is absent from the sitemap. `src/pages/robots.txt.ts` points crawlers at `sitemap-index.xml`.
 

package/template/package.json

@@ -18,8 +18,8 @@
     "@fontsource/instrument-serif": "^5.3.0",
     "@fontsource/jetbrains-mono": "^5.3.0",
     "@tailwindcss/vite": "^4.1.12",
-    "astro": "^7.3.8",
-    "bearminion": "^1.4.0",
+    "astro": "^7.4.1",
+    "bearminion": "^1.5.0",
     "class-variance-authority": "^0.7.1",
     "sharp": "^0.35.5",
     "tailwind-merge": "^3.7.0",
@@ -27,8 +27,8 @@
     "zod": "^4.6.7"
   },
   "devDependencies": {
-    "@astrojs/check": "^0.9.5",
-    "@storybook-astro/framework": "^1.12.0",
+    "@astrojs/check": "^0.9.11",
+    "@storybook-astro/framework": "^1.13.0",
     "@storybook/builder-vite": "^10.6.2",
     "@types/node": "^22.19.0",
     "storybook": "^10.6.2",

package/template/src/components/seo/Seo.astro

@@ -1,5 +1,5 @@
 ---
-import type { Page } from 'bearminion'
+import { hasJsonLdId, mergeJsonLd, siteJsonLdIds, type Page } from 'bearminion'
 import type { Site } from '../organisms/site-definition'
 import { isRemote, resolveLocalAsset } from '../../lib/assets'
 
@@ -31,19 +31,21 @@ const robots = [page.seo.noindex ? 'noindex' : 'index', page.seo.nofollow ? 'nof
 const ogImageSrc = page.seo.ogImage ?? site.seo.ogImage
 const ogImage = ogImageSrc ? absoluteImage(ogImageSrc) : undefined
 
-const jsonLd = {
+// Blocks from site.seo.jsonLd go on every page. When the site describes itself, the generated WebPage points at those blocks.
+const siteBlocks = site.seo.jsonLd ?? []
+const ids = siteJsonLdIds(site.url)
+const webPage = {
   '@context': 'https://schema.org',
   '@type': 'WebPage',
   name: title,
   description,
   url: canonical,
   ...(ogImage ? { image: ogImage } : {}),
-  isPartOf: {
-    '@type': 'WebSite',
-    name: site.name,
-    url: site.url,
-  },
+  isPartOf: hasJsonLdId(siteBlocks, ids.website) ? { '@id': ids.website } : { '@type': 'WebSite', name: site.name, url: site.url },
+  ...(hasJsonLdId(siteBlocks, ids.organization) ? { publisher: { '@id': ids.organization } } : {}),
 }
+// A page's own JSON-LD replaces only the generated WebPage. Blocks with the same @id are emitted once, the page's first.
+const blocks = mergeJsonLd(siteBlocks, page.seo.jsonLd ?? [webPage])
 ---
 
 <title>{title}</title>
@@ -60,9 +62,9 @@ const jsonLd = {
 <meta name="twitter:title" content={title} />
 <meta name="twitter:description" content={description} />
 {ogImage && <meta name="twitter:image" content={ogImage} />}
-{/* Custom JSON-LD replaces the generated WebPage block. `<` is escaped so a value cannot close the script tag. */}
+{/* `<` is escaped so a value cannot close the script tag. */}
 {
-  (page.seo.jsonLd ?? [jsonLd]).map((block) => (
+  blocks.map((block) => (
     <script type="application/ld+json" set:html={JSON.stringify(block).replace(/</g, '\\u003c')} />
   ))
 }