diff --git a/.github/workflows/cloudhal-update.yml b/.github/workflows/cloudhal-update.yml index 3984dda..bd756b8 100644 --- a/.github/workflows/cloudhal-update.yml +++ b/.github/workflows/cloudhal-update.yml @@ -42,7 +42,7 @@ jobs: uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0 - name: Merge a patch release if: steps.meta.outputs.update-type == 'version-update:semver-patch' - run: gh pr merge "$PR" --merge --repo "$GITHUB_REPOSITORY" + run: gh pr merge "$PR" --auto --merge --repo "$GITHUB_REPOSITORY" env: PR: ${{ github.event.pull_request.html_url }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/src/components/EntryList.astro b/src/components/EntryList.astro index fde201e..702fa45 100644 --- a/src/components/EntryList.astro +++ b/src/components/EntryList.astro @@ -41,7 +41,7 @@ const cover = (e: ContentEntry) => { )}
- {e.title} + {e.title} {e.summary &&

{e.summary}

} {e.publishedAt && } diff --git a/src/pages/[...path].astro b/src/pages/[...path].astro index 4348507..4197951 100644 --- a/src/pages/[...path].astro +++ b/src/pages/[...path].astro @@ -55,7 +55,7 @@ import { themeVariables } from "@cloudhal/astro-renderer/theme-settings"; import type { ContentEntry } from "@cloudhal/core-contracts"; /** * One route for the whole graph (RFC-0002 §7 order): a Page answers at its `path`; an article at - * `//`; a category or tag archive at `/[/page/]`. Anything + * its collection's permalink (`//` by default, RFC-0038); a category or tag archive at `/[/page/]`. Anything * else asks the site's redirects (301 with the query kept), then answers 410 for a retired term * or 404. Term feeds live next door in `[...path]/rss.xml.ts`. The header renders the `primary` * menu, or the derived header without one; a `footer` menu replaces the footer links (RFC-0003). @@ -161,7 +161,9 @@ const isMenu = route.kind === "not-found" && path === "/menu"; // Reader comments (RFC-0007): tags the response `cloudhal-comments-` and reads the thread; // `?comments=` past the last page is a miss. const comments = - route.kind === "entry" ? await loadComments(config, Astro, route.entry, { locale }) : undefined; + route.kind === "entry" + ? await loadComments(config, Astro, route.entry, { locale, site }) + : undefined; // A miss (RFC-0033 §4) answers 404 in the request's locale: the site's page at `/404` (its // translation, or the original under `default-with-notice`), else the theme's NotFound below. // The authored page answers 404 at its own path too. @@ -199,6 +201,8 @@ const media: MediaContext = { icons: { weight: String(site.theme.config?.iconWeight ?? "regular"), set: iconSet }, // RFC-0028: one placeholder allowance for the whole page. budget: placeholderBudget(), + // RFC-0038: entry links follow the site's collection permalinks. + permalinks: site, }; const t = strings(locale, site.theme.config?.strings); const index = route.kind === "archive" ? route.index : await loadTaxonomyIndex(source, locale);