astro-theme-popular 0.3.0 → 0.4.0

package/README.md

@@ -21,6 +21,13 @@ export default defineConfig({
 });
 ```
 
+Disable any injected route group when your site replaces it (also the
+answer when you provide your own `/` or `/rss.xml`):
+
+```js
+popular({ routes: { speakers: false, venues: false } })
+```
+
 Your site keeps its own content (`src/content/`) and one typed config file
 (`popular.config.ts`); the theme injects the routes, layouts, styles and
 behavior. Adopt the content model in one line:

package/index.mjs

@@ -14,20 +14,29 @@
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-const PAGES = [
-  ['/', 'index.astro'],
-  ['/[slug]', '[slug].astro'],
-  ['/authors/[slug]', 'authors/[slug].astro'],
-  ['/blog/[...page]', 'blog/[...page].astro'],
-  ['/blog/[slug]', 'blog/[slug].astro'],
-  ['/events/[...page]', 'events/[...page].astro'],
-  ['/events/[slug]', 'events/[slug].astro'],
-  ['/organizers/[...page]', 'organizers/[...page].astro'],
-  ['/speakers/[slug]', 'speakers/[slug].astro'],
-  ['/venues/[slug]', 'venues/[slug].astro'],
-  ['/tags/[tag]/[...page]', 'tags/[tag]/[...page].astro'],
-  ['/rss.xml', 'rss.xml.js'],
-];
+/* Injected routes, grouped by opt-out key: popular({ routes: { speakers:
+   false } }) skips a group. Disabling is also the durable answer when your
+   site provides its own page at a theme path (`/`, `/rss.xml`): Astro is
+   deprecating silent route collisions. Slug routes use rest params so
+   folder-organized content ids (2019-pycon-us/cooper-lees) resolve. */
+const ROUTES = {
+  home: [['/', 'index.astro']],
+  pages: [['/[...slug]', '[slug].astro']],
+  authors: [['/authors/[...slug]', 'authors/[slug].astro']],
+  blog: [
+    ['/blog/[...page]', 'blog/[...page].astro'],
+    ['/blog/[...slug]', 'blog/[slug].astro'],
+  ],
+  events: [
+    ['/events/[...page]', 'events/[...page].astro'],
+    ['/events/[...slug]', 'events/[slug].astro'],
+  ],
+  organizers: [['/organizers/[...page]', 'organizers/[...page].astro']],
+  speakers: [['/speakers/[...slug]', 'speakers/[slug].astro']],
+  venues: [['/venues/[...slug]', 'venues/[slug].astro']],
+  tags: [['/tags/[tag]/[...page]', 'tags/[tag]/[...page].astro']],
+  rss: [['/rss.xml', 'rss.xml.js']],
+};
 
 export default function popular(options = {}) {
   const configFile = options.configFile ?? './popular.config.ts';
@@ -68,12 +77,15 @@ export default function popular(options = {}) {
             'copy-code',
           ].map((s) => `import 'astro-theme-popular/scripts/${s}.js';`).join('\n'),
         );
-        for (const [pattern, entry] of PAGES) {
-          injectRoute({
-            pattern,
-            entrypoint: `astro-theme-popular/pages/${entry}`,
-            prerender: true,
-          });
+        for (const [key, routes] of Object.entries(ROUTES)) {
+          if (options.routes?.[key] === false) continue;
+          for (const [pattern, entry] of routes) {
+            injectRoute({
+              pattern,
+              entrypoint: `astro-theme-popular/pages/${entry}`,
+              prerender: true,
+            });
+          }
         }
       },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-theme-popular",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Popular: a warm, community-first Astro theme for meetups, clubs and fan communities. Ships as an Astro integration.",
   "type": "module",
   "license": "MIT",

package/src/components/EventRow.astro

@@ -1,21 +1,21 @@
 ---
 import { SITE, STRINGS } from 'popular:config';
 import type { CollectionEntry } from 'astro:content';
-import { getCollection } from 'astro:content';
+import { safeCollection } from '../lib/collections';
 
 interface Props { event: CollectionEntry<'events'> }
 const { event } = Astro.props;
 const d = event.data;
 
 /* Venue: a venueRef to the venues collection wins over the flat fields. */
-const venuePage = d.venueRef ? (await getCollection('venues')).find((v) => v.id === d.venueRef) : undefined;
+const venuePage = d.venueRef ? (await safeCollection('venues')).find((v) => v.id === d.venueRef) : undefined;
 if (d.venueRef && !venuePage) console.warn(`events/${event.id}: venueRef "${d.venueRef}" matches no venue page`);
 const venueName = venuePage?.data.title ?? d.venue;
 const venueAddress = venuePage?.data.address ?? (venuePage ? undefined : d.address);
 const tbd = d.venueWanted || !venueName;
 
 /* Speaker line: resolved speaker-profile names, falling back to the string. */
-const allSpeakers = d.speakers.length ? await getCollection('speakers') : [];
+const allSpeakers = d.speakers.length ? await safeCollection('speakers') : [];
 const names = d.speakers.map((slug) => {
   const found = allSpeakers.find((s) => s.id === slug);
   if (!found) console.warn(`events/${event.id}: speaker "${slug}" matches no speaker page`);

package/src/components/PostCard.astro

@@ -2,14 +2,14 @@
 import { SITE } from 'popular:config';
 import { tagSlug } from '../lib/slugs';
 import type { CollectionEntry } from 'astro:content';
-import { getCollection } from 'astro:content';
+import { safeCollection } from '../lib/collections';
 
 interface Props { post: CollectionEntry<'blog'> }
 const { post } = Astro.props;
 const d = post.data;
 const href = `/blog/${post.id}/`;
 const month = d.date.toLocaleDateString(SITE.locale, { month: 'short', year: 'numeric' });
-const allAuthors = await getCollection('authors');
+const allAuthors = await safeCollection('authors');
 const names = [
   ...d.authors.map((slug) => allAuthors.find((a) => a.id === slug)?.data.title ?? slug),
   ...d.guestAuthors.map((g) => g.name),

package/src/lib/collections.ts

@@ -0,0 +1,14 @@
+import { getCollection } from 'astro:content';
+
+/* Collection access that tolerates an adopter who never defined (or has no
+   entries in) a collection: returns [] instead of undefined. Sites that
+   replace part of the content model should also disable the matching
+   injected route (popular({ routes: { venues: false } })), which silences
+   Astro's missing-collection warning entirely. */
+export async function safeCollection(name: string): Promise<any[]> {
+  try {
+    return ((await getCollection(name as any)) as any[]) ?? [];
+  } catch {
+    return [];
+  }
+}

package/src/pages/[slug].astro

@@ -2,13 +2,14 @@
 import { STRINGS } from 'popular:config';
 /** Root-level content pages: prose pages (about, code-of-conduct, get-involved)
  *  and docs pages (handbook, runbooks, rendered with a scroll-spy TOC). */
-import { getCollection, render } from 'astro:content';
+import { render } from 'astro:content';
+import { safeCollection } from '../lib/collections';
 import BaseLayout from '../layouts/BaseLayout.astro';
 import PageHero from '../components/PageHero.astro';
 
 export async function getStaticPaths() {
-  const pages = await getCollection('pages');
-  const docs = await getCollection('docs');
+  const pages = await safeCollection('pages');
+  const docs = await safeCollection('docs');
   return [
     ...pages.map((entry) => ({ params: { slug: entry.id }, props: { entry, kind: 'page' } })),
     ...docs.map((entry) => ({ params: { slug: entry.id }, props: { entry, kind: 'doc' } })),
@@ -21,7 +22,7 @@ const { Content, headings } = await render(entry);
 /* Current page's h2/h3 links nest under its sidebar entry, in document
    order, mirroring the Hugo theme's docs/single.html. */
 const sections = headings.filter((h) => h.depth === 2 || h.depth === 3);
-const allDocs = (await getCollection('docs')).sort(
+const allDocs = (await safeCollection('docs')).sort(
   (a, b) => (a.data.weight ?? 100) - (b.data.weight ?? 100)
 );
 ---

package/src/pages/authors/[slug].astro

@@ -1,19 +1,20 @@
 ---
 import { STRINGS } from 'popular:config';
-import { getCollection, render } from 'astro:content';
+import { render } from 'astro:content';
+import { safeCollection } from '../../lib/collections';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import PageHero from '../../components/PageHero.astro';
 import AuthorBox from '../../components/AuthorBox.astro';
 import PostCard from '../../components/PostCard.astro';
 
 export async function getStaticPaths() {
-  const authors = await getCollection('authors');
+  const authors = await safeCollection('authors');
   return authors.map((entry) => ({ params: { slug: entry.id }, props: { entry } }));
 }
 
 const { entry } = Astro.props;
 const { Content } = await render(entry);
-const posts = (await getCollection('blog'))
+const posts = (await safeCollection('blog'))
   .filter((p) => !p.data.draft && p.data.authors.includes(entry.id))
   .sort((a, b) => +b.data.date - +a.data.date);
 ---

package/src/pages/blog/[...page].astro

@@ -1,5 +1,5 @@
 ---
-import { getCollection } from 'astro:content';
+import { safeCollection } from '../../lib/collections';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import PageHero from '../../components/PageHero.astro';
 import PostCard from '../../components/PostCard.astro';
@@ -10,7 +10,7 @@ import { SECTIONS, STRINGS, PAGINATION } from 'popular:config';
    paginator URLs. /blog/<slug> still goes to [slug].astro: named params
    take priority over rest params. */
 export async function getStaticPaths() {
-  const posts = (await getCollection('blog')).filter((p) => !p.data.draft).sort((a, b) => +b.data.date - +a.data.date);
+  const posts = (await safeCollection('blog')).filter((p) => !p.data.draft).sort((a, b) => +b.data.date - +a.data.date);
   const size = PAGINATION.pageSize;
   const total = Math.max(1, Math.ceil(posts.length / size));
   const tags = [...new Set(posts.flatMap((p) => p.data.tags))];

package/src/pages/blog/[slug].astro

@@ -1,12 +1,13 @@
 ---
-import { getCollection, render } from 'astro:content';
+import { render } from 'astro:content';
+import { safeCollection } from '../../lib/collections';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import AuthorBox from '../../components/AuthorBox.astro';
 import { SUPPORT, SITE, STRINGS } from 'popular:config';
 import { tagSlug } from '../../lib/slugs';
 
 export async function getStaticPaths() {
-  const posts = (await getCollection('blog')).filter((p) => !p.data.draft);
+  const posts = (await safeCollection('blog')).filter((p) => !p.data.draft);
   /* PARITY.md pins the ordering: date desc, then title, then id, matching
      Hugo's section order (posts must not set weight). next = newer. */
   const cmp = (x: string, y: string) => (x < y ? -1 : x > y ? 1 : 0);
@@ -24,7 +25,7 @@ const d = post.data;
 const { Content } = await render(post);
 const dateStr = d.date.toLocaleDateString(SITE.locale, { month: 'short', day: 'numeric', year: 'numeric' });
 
-const allAuthors = await getCollection('authors');
+const allAuthors = await safeCollection('authors');
 const resolved = d.authors.map((slug) => allAuthors.find((a) => a.id === slug)).filter(Boolean);
 const bylineNames = [
   ...d.authors.map((slug) => allAuthors.find((a) => a.id === slug)?.data.title ?? slug),

package/src/pages/events/[...page].astro

@@ -1,5 +1,5 @@
 ---
-import { getCollection } from 'astro:content';
+import { safeCollection } from '../../lib/collections';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import PageHero from '../../components/PageHero.astro';
 import EventRow from '../../components/EventRow.astro';
@@ -11,7 +11,7 @@ import { SECTIONS, STRINGS, PAGINATION } from 'popular:config';
    full, mirroring layouts/events/list.html on the Hugo side. */
 export async function getStaticPaths() {
   const now = new Date();
-  const all = (await getCollection('events')).filter((e) => !e.data.draft);
+  const all = (await safeCollection('events')).filter((e) => !e.data.draft);
   const upcoming = all.filter((e) => e.data.date >= now).sort((a, b) => +a.data.date - +b.data.date);
   const past = all.filter((e) => e.data.date < now).sort((a, b) => +b.data.date - +a.data.date);
   const size = PAGINATION.pageSize;

package/src/pages/events/[slug].astro

@@ -1,11 +1,12 @@
 ---
 import { SITE, STRINGS } from 'popular:config';
-import { getCollection, render } from 'astro:content';
+import { render } from 'astro:content';
+import { safeCollection } from '../../lib/collections';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import AuthorBox from '../../components/AuthorBox.astro';
 
 export async function getStaticPaths() {
-  const events = (await getCollection('events')).filter((e) => !e.data.draft);
+  const events = (await safeCollection('events')).filter((e) => !e.data.draft);
   return events.map((event) => ({ params: { slug: event.id }, props: { event } }));
 }
 
@@ -16,12 +17,12 @@ const dateStr = d.date.toLocaleDateString(SITE.locale, { weekday: 'long', month:
 
 /* Venue: a venueRef to the venues collection wins over the flat fields;
    its arrival notes are inherited unless the event sets venueNotes. */
-const venuePage = d.venueRef ? (await getCollection('venues')).find((v) => v.id === d.venueRef) : undefined;
+const venuePage = d.venueRef ? (await safeCollection('venues')).find((v) => v.id === d.venueRef) : undefined;
 if (d.venueRef && !venuePage) throw new Error(`events/${event.id}: venueRef "${d.venueRef}" matches no venue page`);
 const venueNotes = d.venueNotes ?? venuePage?.data.notes;
 
 /* Speaker profile cards, resolved from the speakers collection. */
-const allSpeakers = await getCollection('speakers');
+const allSpeakers = await safeCollection('speakers');
 const speakerEntries = d.speakers.map((slug) => {
   const entry = allSpeakers.find((s) => s.id === slug);
   if (!entry) throw new Error(`events/${event.id}: speaker "${slug}" matches no speaker page`);

package/src/pages/index.astro

@@ -1,23 +1,23 @@
 ---
-import { getCollection } from 'astro:content';
+import { safeCollection } from '../lib/collections';
 import BaseLayout from '../layouts/BaseLayout.astro';
 import PostCard from '../components/PostCard.astro';
 import OrganizerCard from '../components/OrganizerCard.astro';
 import { HOME, SITE, STRINGS } from 'popular:config';
 
 const now = new Date();
-const events = (await getCollection('events')).filter((e) => !e.data.draft);
+const events = (await safeCollection('events')).filter((e) => !e.data.draft);
 const upcoming = events.filter((e) => e.data.date >= now).sort((a, b) => +a.data.date - +b.data.date);
 const next = upcoming[0];
 
-const posts = (await getCollection('blog')).filter((p) => !p.data.draft).sort((a, b) => +b.data.date - +a.data.date).slice(0, 3);
+const posts = (await safeCollection('blog')).filter((p) => !p.data.draft).sort((a, b) => +b.data.date - +a.data.date).slice(0, 3);
 /* value = "@pastEventCount" renders the live number of past events,
    rounded down to a "70+" style once there are ten or more (Hugo parity). */
 const pastCount = events.filter((e) => e.data.date < now).length;
 const statValue = (v: string) =>
   v === '@pastEventCount' ? (pastCount >= 10 ? `${Math.floor(pastCount / 10) * 10}+` : String(pastCount)) : v;
-const nextVenue = next?.data.venueRef ? (await getCollection('venues')).find((v) => v.id === next.data.venueRef)?.data.title : undefined;
-const organizers = (await getCollection('organizers')).sort((a, b) => a.data.weight - b.data.weight);
+const nextVenue = next?.data.venueRef ? (await safeCollection('venues')).find((v) => v.id === next.data.venueRef)?.data.title : undefined;
+const organizers = (await safeCollection('organizers')).sort((a, b) => a.data.weight - b.data.weight);
 
 const h = HOME;
 ---

package/src/pages/organizers/[...page].astro

@@ -1,5 +1,5 @@
 ---
-import { getCollection } from 'astro:content';
+import { safeCollection } from '../../lib/collections';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import PageHero from '../../components/PageHero.astro';
 import OrganizerCard from '../../components/OrganizerCard.astro';
@@ -9,7 +9,7 @@ import { SECTIONS, PAGINATION } from 'popular:config';
 /* One route serves /organizers/ and /organizers/page/N/, matching the Hugo
    theme's paginator URLs. */
 export async function getStaticPaths() {
-  const organizers = (await getCollection('organizers')).sort((a, b) => a.data.weight - b.data.weight);
+  const organizers = (await safeCollection('organizers')).sort((a, b) => a.data.weight - b.data.weight);
   const size = PAGINATION.pageSize;
   const total = Math.max(1, Math.ceil(organizers.length / size));
   return Array.from({ length: total }, (_, i) => ({

package/src/pages/rss.xml.js

@@ -1,14 +1,14 @@
 import rss from '@astrojs/rss';
-import { getCollection } from 'astro:content';
+import { safeCollection } from '../lib/collections';
 import { SITE } from 'popular:config';
 
 const escapeXml = (s) => s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
 export async function GET(context) {
-  const posts = (await getCollection('blog'))
+  const posts = (await safeCollection('blog'))
     .filter((p) => !p.data.draft)
     .sort((a, b) => +b.data.date - +a.data.date);
-  const allAuthors = await getCollection('authors');
+  const allAuthors = await safeCollection('authors');
   return rss({
     title: SITE.title,
     description: SITE.description,

package/src/pages/speakers/[slug].astro

@@ -1,19 +1,20 @@
 ---
 import { STRINGS } from 'popular:config';
-import { getCollection, render } from 'astro:content';
+import { render } from 'astro:content';
+import { safeCollection } from '../../lib/collections';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import PageHero from '../../components/PageHero.astro';
 import AuthorBox from '../../components/AuthorBox.astro';
 import EventRow from '../../components/EventRow.astro';
 
 export async function getStaticPaths() {
-  const speakers = await getCollection('speakers');
+  const speakers = await safeCollection('speakers');
   return speakers.map((entry) => ({ params: { slug: entry.id }, props: { entry } }));
 }
 
 const { entry } = Astro.props;
 const { Content } = await render(entry);
-const events = (await getCollection('events'))
+const events = (await safeCollection('events'))
   .filter((e) => !e.data.draft && e.data.speakers.includes(entry.id))
   .sort((a, b) => +b.data.date - +a.data.date);
 ---

package/src/pages/tags/[tag]/[...page].astro

@@ -1,7 +1,7 @@
 ---
 import { STRINGS, PAGINATION } from 'popular:config';
 import { tagSlug } from '../../../lib/slugs';
-import { getCollection } from 'astro:content';
+import { safeCollection } from '../../../lib/collections';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
 import PageHero from '../../../components/PageHero.astro';
 import PostCard from '../../../components/PostCard.astro';
@@ -11,7 +11,7 @@ import Pagination from '../../../components/Pagination.astro';
    theme's paginated term pages. URLs use the Hugo-compatible slug; the page
    displays the tag's first-seen spelling. */
 export async function getStaticPaths() {
-  const posts = (await getCollection('blog')).filter((p) => !p.data.draft);
+  const posts = (await safeCollection('blog')).filter((p) => !p.data.draft);
   const labels = new Map(); // slug -> first-seen tag spelling
   for (const p of posts) for (const t of p.data.tags) {
     const slug = tagSlug(t);

package/src/pages/venues/[slug].astro

@@ -1,19 +1,20 @@
 ---
 import { STRINGS } from 'popular:config';
-import { getCollection, render } from 'astro:content';
+import { render } from 'astro:content';
+import { safeCollection } from '../../lib/collections';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import PageHero from '../../components/PageHero.astro';
 import EventRow from '../../components/EventRow.astro';
 
 export async function getStaticPaths() {
-  const venues = await getCollection('venues');
+  const venues = await safeCollection('venues');
   return venues.map((entry) => ({ params: { slug: entry.id }, props: { entry } }));
 }
 
 const { entry } = Astro.props;
 const d = entry.data;
 const { Content } = await render(entry);
-const events = (await getCollection('events'))
+const events = (await safeCollection('events'))
   .filter((e) => !e.data.draft && e.data.venueRef === entry.id)
   .sort((a, b) => +b.data.date - +a.data.date);
 ---