create-goodfellow 0.1.0 → 0.2.0

package/templates/parish/content/pages/index.json

@@ -257,7 +257,7 @@
                 "className": "",
                 "collection": "events",
                 "columns": "3",
-                "dateField": "date",
+                "dateField": "when",
                 "emptyText": "Nothing on the calendar right now. Check back soon.",
                 "imageField": "image",
                 "layout": "cards",
@@ -280,42 +280,6 @@
           "backgroundImage": "",
           "className": "",
           "content": [
-            {
-              "type": "Flex",
-              "props": {
-                "id": "Flex-news",
-                "align": "center",
-                "className": "mb-8",
-                "direction": "row",
-                "gap": "md",
-                "items": [
-                  {
-                    "type": "Heading",
-                    "props": {
-                      "id": "Heading-news",
-                      "align": "left",
-                      "className": "",
-                      "level": "h2",
-                      "text": "Parish news"
-                    }
-                  },
-                  {
-                    "type": "Button",
-                    "props": {
-                      "id": "Button-news",
-                      "className": "",
-                      "href": "/news",
-                      "label": "All news",
-                      "newTab": false,
-                      "size": "md",
-                      "variant": "outline"
-                    }
-                  }
-                ],
-                "justify": "between",
-                "wrap": true
-              }
-            },
             {
               "type": "CollectionList",
               "props": {
@@ -325,9 +289,12 @@
                 "columns": "3",
                 "dateField": "date",
                 "emptyText": "No news yet.",
+                "heading": "Parish news",
                 "imageField": "image",
                 "layout": "list",
                 "limit": 3,
+                "moreHref": "/news",
+                "moreLabel": "All news",
                 "order": "newest",
                 "show": "all",
                 "summaryField": "summary"

package/templates/parish/content/pages/news.json

@@ -24,16 +24,29 @@
               "type": "CollectionList",
               "props": {
                 "id": "CollectionList-news",
+                "allLabel": "All news",
+                "choicePages": "topics",
                 "className": "mt-8",
                 "collection": "news",
                 "columns": "3",
                 "dateField": "date",
                 "emptyText": "No news yet.",
+                "filterField": "",
+                "filterValue": "",
+                "heading": "",
                 "imageField": "image",
                 "layout": "cards",
-                "limit": 0,
+                "limit": 6,
+                "moreHref": "",
+                "moreLabel": "",
+                "nextLabel": "Older",
                 "order": "default",
+                "pageTitle": "Page {number}",
+                "pagesLabel": "More news",
+                "paginate": true,
+                "previousLabel": "Newer",
                 "show": "all",
+                "sortField": "",
                 "summaryField": "summary"
               }
             }

package/templates/parish/content/site.json

@@ -30,6 +30,7 @@
     },
     "radius": "0.5rem"
   },
+  "timeZone": "America/New_York",
   "title": "St. Joseph Parish",
   "titleTemplate": "%s | St. Joseph Parish"
 }

package/templates/parish/vercel.ts

@@ -0,0 +1,65 @@
+// Vercel's settings for this site, which Vercel reads when it builds the site.
+//
+// Vercel also sends the redirects from Site Settings → Redirects (content/redirects.json) itself,
+// so visitors go straight to the new address. Like the pages the build writes at old addresses
+// for other hosts, a redirect from an address a page has is left out: pages always win.
+// This file uses only Node's own modules, since Vercel may read it before installing packages.
+import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+
+export const config = {
+  framework: null,
+  installCommand: "npm ci",
+  buildCommand: "npx goodfellow build",
+  outputDirectory: "dist",
+  redirects: redirects(),
+};
+
+interface Redirect {
+  from: string;
+  to: string;
+}
+
+function readJson(file: string): Record<string, unknown> | undefined {
+  return existsSync(file) ? JSON.parse(readFileSync(file, "utf8")) : undefined;
+}
+
+/** Every file in a folder and its folders, as paths inside it. */
+function filesIn(dir: string): string[] {
+  if (!existsSync(dir)) return [];
+  return readdirSync(dir, { recursive: true, encoding: "utf8" }).map((file) => file.split("\\").join("/"));
+}
+
+/** The addresses that have pages: `content/pages/about.json` is /about, and each collection item has its own. */
+function pageAddresses(): Set<string> {
+  const addresses = new Set<string>();
+  for (const file of filesIn("content/pages")) {
+    if (file.endsWith(".json")) addresses.add(`/${file.slice(0, -".json".length)}`.replace(/\/?index$/, "") || "/");
+  }
+  for (const id of filesIn("content/collections").filter((file) => file.endsWith("/_collection.json"))) {
+    const folder = id.slice(0, -"/_collection.json".length);
+    const pattern = readJson(join("content/collections", id))?.path;
+    if (typeof pattern !== "string") continue;
+    for (const file of readdirSync(join("content/collections", folder))) {
+      const slug = /^(.+)\.(json|md)$/.exec(file)?.[1];
+      if (slug && file !== "_collection.json") addresses.add(pattern.replace("{slug}", slug).replace(/\/+$/, ""));
+    }
+  }
+  return addresses;
+}
+
+/** An address as Vercel matches it, with the characters its patterns use escaped. */
+function source(path: string): string {
+  return encodeURI(path).replace(/[()[\]{}+*?:!]/g, "\\$&");
+}
+
+function redirects() {
+  const list = (readJson("content/redirects.json")?.redirects ?? []) as Redirect[];
+  const pages = pageAddresses();
+  return list.flatMap(({ from, to }) => {
+    const path = from.replace(/\/+$/, "");
+    if (pages.has(path)) return [];
+    // With and without a trailing slash, as the other hosts serve the page there.
+    return [path, `${path}/`].map((address) => ({ source: source(address), destination: to, permanent: true }));
+  });
+}

package/templates/registry/custom-html.json

@@ -24,7 +24,7 @@
   "meta": {
     "goodfellow": {
       "category": "Advanced",
-      "version": "0.1.0"
+      "version": "0.2.0"
     }
   },
   "dependencies": []

package/templates/registry/registry.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://ui.shadcn.com/schema/registry.json",
   "name": "goodfellow",
-  "homepage": "https://github.com/chartung17/goodfellow-cms",
+  "homepage": "https://github.com/goodfellow-cms/goodfellow-cms",
   "items": [
     {
       "name": "shadcn-hero",
@@ -21,7 +21,7 @@
         "goodfellow": {
           "category": "Page sections",
           "recommended": true,
-          "version": "0.1.0"
+          "version": "0.2.0"
         }
       },
       "dependencies": []
@@ -45,7 +45,7 @@
         "goodfellow": {
           "category": "Page sections",
           "recommended": true,
-          "version": "0.1.0"
+          "version": "0.2.0"
         }
       },
       "dependencies": []
@@ -69,7 +69,7 @@
         "goodfellow": {
           "category": "Page sections",
           "recommended": true,
-          "version": "0.1.0"
+          "version": "0.2.0"
         }
       },
       "dependencies": []
@@ -92,7 +92,7 @@
         "goodfellow": {
           "category": "Page sections",
           "recommended": true,
-          "version": "0.1.0"
+          "version": "0.2.0"
         }
       },
       "dependencies": []
@@ -119,7 +119,7 @@
       "meta": {
         "goodfellow": {
           "category": "Page sections",
-          "version": "0.1.0"
+          "version": "0.2.0"
         }
       }
     },
@@ -144,7 +144,7 @@
         "goodfellow": {
           "category": "Page sections",
           "recommended": true,
-          "version": "0.1.0"
+          "version": "0.2.0"
         }
       }
     },
@@ -170,7 +170,7 @@
       "meta": {
         "goodfellow": {
           "category": "Advanced",
-          "version": "0.1.0"
+          "version": "0.2.0"
         }
       },
       "dependencies": []
@@ -197,7 +197,7 @@
         "goodfellow": {
           "category": "Interactive",
           "recommended": true,
-          "version": "0.1.0"
+          "version": "0.2.0"
         }
       },
       "dependencies": []
@@ -224,7 +224,7 @@
         "goodfellow": {
           "category": "Interactive",
           "recommended": true,
-          "version": "0.1.0"
+          "version": "0.2.0"
         }
       },
       "dependencies": []
@@ -250,7 +250,7 @@
       "meta": {
         "goodfellow": {
           "category": "Interactive",
-          "version": "0.1.0"
+          "version": "0.2.0"
         }
       },
       "dependencies": []

package/templates/registry/shadcn-call-to-action.json

@@ -19,7 +19,7 @@
     "goodfellow": {
       "category": "Page sections",
       "recommended": true,
-      "version": "0.1.0"
+      "version": "0.2.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-cards.json

@@ -19,7 +19,7 @@
     "goodfellow": {
       "category": "Page sections",
       "recommended": true,
-      "version": "0.1.0"
+      "version": "0.2.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-carousel.json

@@ -22,7 +22,7 @@
   "meta": {
     "goodfellow": {
       "category": "Interactive",
-      "version": "0.1.0"
+      "version": "0.2.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-faq.json

@@ -23,7 +23,7 @@
     "goodfellow": {
       "category": "Interactive",
       "recommended": true,
-      "version": "0.1.0"
+      "version": "0.2.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-hero.json

@@ -18,7 +18,7 @@
     "goodfellow": {
       "category": "Page sections",
       "recommended": true,
-      "version": "0.1.0"
+      "version": "0.2.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-notice.json

@@ -21,7 +21,7 @@
     "goodfellow": {
       "category": "Page sections",
       "recommended": true,
-      "version": "0.1.0"
+      "version": "0.2.0"
     }
   }
 }

package/templates/registry/shadcn-pricing.json

@@ -22,7 +22,7 @@
   "meta": {
     "goodfellow": {
       "category": "Page sections",
-      "version": "0.1.0"
+      "version": "0.2.0"
     }
   }
 }

package/templates/registry/shadcn-tabs.json

@@ -23,7 +23,7 @@
     "goodfellow": {
       "category": "Interactive",
       "recommended": true,
-      "version": "0.1.0"
+      "version": "0.2.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-testimonials.json

@@ -18,7 +18,7 @@
     "goodfellow": {
       "category": "Page sections",
       "recommended": true,
-      "version": "0.1.0"
+      "version": "0.2.0"
     }
   },
   "dependencies": []

package/templates/starter/.github/workflows/deploy.yml

@@ -1,7 +1,10 @@
 # Builds the site and publishes it with GitHub Pages whenever the main branch
 # changes (including every Publish in the admin panel), and once a night so
-# date-based content stays current. In the repository's Settings → Pages, set
-# "Source" to "GitHub Actions". See README.md.
+# date-based content stays current. Each night it first installs Goodfellow's
+# newest fixes, and publishes them only if the site still builds with them,
+# unless content/updates.json turns automatic updates off.
+# In the repository's Settings → Pages, set "Source" to "GitHub Actions".
+# See README.md.
 name: Deploy to GitHub Pages
 
 on:
@@ -10,6 +13,11 @@ on:
   schedule:
     - cron: "17 4 * * *"
   workflow_dispatch:
+    inputs:
+      update:
+        description: "Update Goodfellow first: fixes, latest, or a release such as 0.5.0 (an older one goes back to it). Leave empty to only build."
+        required: false
+        default: ""
 
 permissions:
   contents: read
@@ -21,10 +29,36 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
+  update:
+    # Each night, and when the admin panel's Updates screen asks.
+    if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.update != '')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    outputs:
+      sha: ${{ steps.update.outputs.sha }}
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v5
+        with:
+          node-version: 22
+          cache: npm
+      - run: npm ci
+      - id: update
+        env:
+          TO: ${{ inputs.update || 'automatic' }}
+        run: npx goodfellow update --publish --to "$TO"
+
   build:
+    needs: update
+    # Also when there was no update to run, or it didn't work: the site is built either way.
+    if: ${{ !cancelled() }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+        with:
+          # The update's commit, when it published one.
+          ref: ${{ needs.update.outputs.sha || github.sha }}
       - uses: actions/setup-node@v5
         with:
           node-version: 22
@@ -40,6 +74,7 @@ jobs:
 
   deploy:
     needs: build
+    if: ${{ !cancelled() && needs.build.result == 'success' }}
     runs-on: ubuntu-latest
     environment:
       name: github-pages

package/templates/starter/.gitlab-ci.yml

@@ -1,6 +1,11 @@
 # Builds the site and publishes it with GitLab Pages whenever the default
-# branch changes (including every Publish in the admin panel). For nightly
-# rebuilds, add a schedule under Build → Pipeline schedules. See README.md.
+# branch changes (including every Publish in the admin panel). On scheduled
+# pipelines, which the admin panel's Updates screen sets up to run each night,
+# it first installs Goodfellow's newest fixes, unless content/updates.json turns
+# automatic updates off (or the release GOODFELLOW_UPDATE names), and publishes
+# them only if the site still builds with them. That
+# needs "Allow Git push requests to the repository" under Settings → CI/CD →
+# Job token permissions, which the Updates screen turns on. See README.md.
 pages:
   image: node:22
   cache:
@@ -9,6 +14,11 @@ pages:
     paths: [.npm/]
   script:
     - npm ci --cache .npm --prefer-offline
+    - |
+      if [ "$CI_PIPELINE_SOURCE" = "schedule" ] || [ -n "$GOODFELLOW_UPDATE" ]; then
+        git remote set-url origin "https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_FQDN:-$CI_SERVER_HOST}/${CI_PROJECT_PATH}.git"
+        npx goodfellow update --publish --to "${GOODFELLOW_UPDATE:-automatic}" || echo "The update wasn't published; building the site as it is."
+      fi
     # Pages may serve the site from a subfolder, such as https://group.gitlab.io/site/.
     - export GOODFELLOW_BASE="$(node -e 'console.log(new URL(process.env.CI_PAGES_URL).pathname)')"
     - npx goodfellow build

package/templates/starter/README.md

@@ -1,6 +1,6 @@
 # My site
 
-A website built with [Goodfellow](https://github.com/chartung17/goodfellow-cms). Pages are files in `content/`, edited in the admin panel at `/admin`, and published to a free static host.
+A website built with [Goodfellow](https://github.com/goodfellow-cms/goodfellow-cms). Pages are files in `content/`, edited in the admin panel at `/admin`, and published to a free static host.
 
 ## Working on the site
 
@@ -17,9 +17,9 @@ npm run preview  # serves dist/
 
 On your own computer, the admin panel saves straight to the files in `content/`.
 
-More blocks, such as an FAQ, tabs and a pricing table, can be added on the admin panel's **Blocks** screen, which publishes their code into `blocks/installed/` and the shadcn components they use into `components/ui/`. See [Blocks from block registries](https://github.com/chartung17/goodfellow-cms#blocks-from-block-registries).
+More blocks, such as an FAQ, tabs and a pricing table, can be added on the admin panel's **Blocks** screen, which publishes their code into `blocks/installed/` and the shadcn components they use into `components/ui/`. See [Add blocks](https://goodfellow-cms.github.io/goodfellow-cms/docs/add-blocks).
 
-To add blocks of your own, write React components and add them to `blocks` in `goodfellow.config.tsx`. Parts that respond to visitors, such as a button that shows more, go in a file starting with `"use client"`, and only pages that use them load JavaScript: see [Interactive blocks](https://github.com/chartung17/goodfellow-cms#interactive-blocks).
+To add blocks of your own, write React components and add them to `blocks` in `goodfellow.config.tsx`. Parts that respond to visitors, such as a button that shows more, go in a file starting with `"use client"`, and only pages that use them load JavaScript: see [Interactive blocks](https://goodfellow-cms.github.io/goodfellow-cms/docs/interactive-blocks).
 
 The News page and its stories are an example of a collection: a group of similar items that share one page design. Change it or delete it under **Collections** in the admin panel.
 
@@ -29,7 +29,14 @@ Setup takes four steps. It's done once, usually by whoever set up the site.
 
 ### 1. Store the site on GitHub or GitLab
 
-Create a repository and push this folder to it, including `package-lock.json`.
+Create an empty repository on GitHub or GitLab, without a README, and push this folder to it:
+
+```sh
+git remote add origin https://github.com/your-name/your-site.git   # unless origin is already set
+git push -u origin main
+```
+
+`create-goodfellow` makes the new site a git repository on the branch `main`, with everything, `package-lock.json` included, in its first commit, and sets `origin` when it's given the repository. Commit any changes since (`git add -A` and `git commit`) before pushing.
 
 ### 2. Tell Goodfellow where the site is stored
 
@@ -51,7 +58,7 @@ Also set the site's address under **Site settings → General → Site address**
 
 ### 3. Choose a host
 
-Each host's free plan has its own rules about business use. If the site is for a business, sells anything, shows ads, or is built or looked after by someone who's paid for it, check those rules first. As of October 2026, GitHub Pages and Vercel's free plan don't allow most of these, and GitLab Pages has no rule against them that we know of. See [Commercial sites](https://github.com/chartung17/goodfellow-cms#requirements-and-limits) in Goodfellow's README.
+Each host's free plan has its own rules about business use. If the site is for a business, sells anything, shows ads, or is built or looked after by someone who's paid for it, check those rules first. As of October 2026, GitHub Pages and Vercel's free plan don't allow most of these, and GitLab Pages has no rule against them that we know of. See [Hosts and business sites](https://goodfellow-cms.github.io/goodfellow-cms/docs/hosts) in Goodfellow's documentation.
 
 **GitHub Pages** (free for public repositories; not for online businesses or shops)
 
@@ -66,7 +73,7 @@ Each host's free plan has its own rules about business use. If the site is for a
 
 **Vercel** (works with GitHub and GitLab; the free plan is for non-commercial sites only)
 
-1. Import the repository in Vercel. `vercel.json` already has the right settings.
+1. Import the repository in Vercel. `vercel.ts` already has the right settings, and has Vercel send the site's redirects itself.
 2. For nightly rebuilds, create a deploy hook under **Settings → Git → Deploy Hooks**, and call it from a scheduled GitHub Action or GitLab pipeline schedule.
 
 Delete the setup files for the hosts you don't use.
@@ -94,7 +101,7 @@ Upload images and files on the admin panel's **Media** screen, or with the **Cho
 
 ## Writing with AI
 
-The admin panel's **AI** tab can draft pages, rewrite blocks and fill in news stories. Each editor picks an AI service there. Claude and some others need the editor's own API key and charge for use; there are free options, including copying the request into a chat app such as Claude.ai. To offer only some services, or to turn the assistant off, see `ai` in [Goodfellow's README](https://github.com/chartung17/goodfellow-cms#ai-services).
+The admin panel's **AI** tab can draft pages, rewrite blocks and fill in news stories. Each editor picks an AI service there. Claude and some others need the editor's own API key and charge for use; there are free options, including copying the request into a chat app such as Claude.ai. To offer only some services, or to turn the assistant off, see `ai` in [Configuration](https://goodfellow-cms.github.io/goodfellow-cms/docs/configuration).
 
 ## Publishing
 

package/templates/starter/vercel.ts

@@ -0,0 +1,65 @@
+// Vercel's settings for this site, which Vercel reads when it builds the site.
+//
+// Vercel also sends the redirects from Site Settings → Redirects (content/redirects.json) itself,
+// so visitors go straight to the new address. Like the pages the build writes at old addresses
+// for other hosts, a redirect from an address a page has is left out: pages always win.
+// This file uses only Node's own modules, since Vercel may read it before installing packages.
+import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+
+export const config = {
+  framework: null,
+  installCommand: "npm ci",
+  buildCommand: "npx goodfellow build",
+  outputDirectory: "dist",
+  redirects: redirects(),
+};
+
+interface Redirect {
+  from: string;
+  to: string;
+}
+
+function readJson(file: string): Record<string, unknown> | undefined {
+  return existsSync(file) ? JSON.parse(readFileSync(file, "utf8")) : undefined;
+}
+
+/** Every file in a folder and its folders, as paths inside it. */
+function filesIn(dir: string): string[] {
+  if (!existsSync(dir)) return [];
+  return readdirSync(dir, { recursive: true, encoding: "utf8" }).map((file) => file.split("\\").join("/"));
+}
+
+/** The addresses that have pages: `content/pages/about.json` is /about, and each collection item has its own. */
+function pageAddresses(): Set<string> {
+  const addresses = new Set<string>();
+  for (const file of filesIn("content/pages")) {
+    if (file.endsWith(".json")) addresses.add(`/${file.slice(0, -".json".length)}`.replace(/\/?index$/, "") || "/");
+  }
+  for (const id of filesIn("content/collections").filter((file) => file.endsWith("/_collection.json"))) {
+    const folder = id.slice(0, -"/_collection.json".length);
+    const pattern = readJson(join("content/collections", id))?.path;
+    if (typeof pattern !== "string") continue;
+    for (const file of readdirSync(join("content/collections", folder))) {
+      const slug = /^(.+)\.(json|md)$/.exec(file)?.[1];
+      if (slug && file !== "_collection.json") addresses.add(pattern.replace("{slug}", slug).replace(/\/+$/, ""));
+    }
+  }
+  return addresses;
+}
+
+/** An address as Vercel matches it, with the characters its patterns use escaped. */
+function source(path: string): string {
+  return encodeURI(path).replace(/[()[\]{}+*?:!]/g, "\\$&");
+}
+
+function redirects() {
+  const list = (readJson("content/redirects.json")?.redirects ?? []) as Redirect[];
+  const pages = pageAddresses();
+  return list.flatMap(({ from, to }) => {
+    const path = from.replace(/\/+$/, "");
+    if (pages.has(path)) return [];
+    // With and without a trailing slash, as the other hosts serve the page there.
+    return [path, `${path}/`].map((address) => ({ source: source(address), destination: to, permanent: true }));
+  });
+}

package/templates/versions.json

@@ -1,13 +1,13 @@
 {
-  "@goodfellow-cms/admin": "0.1.0",
-  "@goodfellow-cms/ai": "0.1.0",
-  "@goodfellow-cms/blocks": "0.1.0",
-  "goodfellow": "0.1.0",
-  "@goodfellow-cms/core": "0.1.0",
-  "create-goodfellow": "0.1.0",
-  "@goodfellow-cms/github": "0.1.0",
-  "@goodfellow-cms/gitlab": "0.1.0",
-  "@goodfellow-cms/next": "0.1.0",
-  "@goodfellow-cms/react": "0.1.0",
-  "@goodfellow-cms/registry": "0.1.0"
+  "@goodfellow-cms/admin": "0.2.0",
+  "@goodfellow-cms/ai": "0.2.0",
+  "@goodfellow-cms/blocks": "0.2.0",
+  "goodfellow": "0.2.0",
+  "@goodfellow-cms/core": "0.2.0",
+  "create-goodfellow": "0.2.0",
+  "@goodfellow-cms/github": "0.2.0",
+  "@goodfellow-cms/gitlab": "0.2.0",
+  "@goodfellow-cms/next": "0.2.0",
+  "@goodfellow-cms/react": "0.2.0",
+  "@goodfellow-cms/registry": "0.2.0"
 }