@goodfellow-cms/next 0.9.0 → 0.10.0

package/bin/goodfellow-next.js

@@ -11,16 +11,26 @@
 // content is kept in a repository of its own.
 // `goodfellow-next import wordpress <file or address> [--dry-run]` imports a WordPress site, as `goodfellow import` does.
 // `goodfellow-next import markdown <folder> [--dry-run]` imports a folder of Markdown files, as `goodfellow import` does.
-// `goodfellow-next export wordpress [file]` writes the site as a WordPress export file, as `goodfellow export` does.
+// `goodfellow-next export wordpress [file]` writes the site as a WordPress export file, and `goodfellow-next export
+// markdown [folder] [--scheduled] [--links site|files]` as a folder of Markdown files, as `goodfellow export` does.
+// `goodfellow-next export site [file]` and `goodfellow-next import site <zip or folder>` move content between
+// Goodfellow sites, as `goodfellow export site` and `goodfellow import site` do.
 // `goodfellow-next blocks add <item> [--registry <folder>] [--native <app>]` makes a block of a shadcn item, as
 // `goodfellow blocks add` does, and with --native its version for an Expo app.
 // `goodfellow-next admin add <address>|check|remove` sets the admin address, and `goodfellow-next broker use <address>|remove`
-// the token broker, in goodfellow.config.tsx, as `goodfellow admin` and `goodfellow broker` do.
+// the token broker, and `goodfellow-next sign-in service <address>|client-id <id>|remove` how editors sign in, in
+// goodfellow.config.tsx, as `goodfellow admin`, `goodfellow broker` and `goodfellow sign-in` do.
 import { existsSync, readFileSync } from "node:fs";
 import { rm } from "node:fs/promises";
 import { join, relative, resolve } from "node:path";
 import { parseArgs } from "node:util";
-import { buildNotes, CLOUDFLARE_REDIRECTS_LIMIT, configAdmin, formatUpdateResult } from "@goodfellow-cms/core";
+import {
+  buildNotes,
+  CLOUDFLARE_REDIRECTS_LIMIT,
+  configAdmin,
+  formatUpdateResult,
+  SiteImportError,
+} from "@goodfellow-cms/core";
 import { reportSiteProblems } from "@goodfellow-cms/core/accessibility";
 import {
   AdminSetupError,
@@ -29,22 +39,32 @@ import {
   checkEarlyTheme,
   checkSiteAdminAddress,
   contentRepositoryProblem,
+  exportMarkdown,
+  exportSite,
   exportWordPress,
   formatAdminResult,
   formatAdminText,
+  formatMarkdownExport,
   formatMarkdownImport,
+  formatSiteExport,
+  formatSiteImport,
   formatWordPressExport,
   formatWordPressImport,
   importMarkdown,
+  importSite,
   importWordPress,
+  MarkdownExportError,
   MarkdownFolderError,
   markdownFolderChoices,
   nightlyCheck,
   reportDue,
   reportNightly,
+  SignInSetupError,
+  SiteTransferError,
   scheduleDue,
   setAdminAddress,
   setBrokerAddress,
+  setSignIn,
   setUpContentRepository,
   update,
   writeAdminText,
@@ -62,6 +82,7 @@ import {
   exportTrailingSlash,
   fixSegmentFiles,
   guardExport,
+  loadTaskConfig,
   NEXT_SITE_FILES,
   nextDistDir,
   writeBuildRecordFile,
@@ -212,9 +233,24 @@ if (command === "content") {
     }
   }
 }
-if (command === "admin" || command === "broker") {
+if (command === "admin" || command === "broker" || command === "sign-in") {
   const [action, argument] = process.argv.slice(3);
   try {
+    if (
+      command === "sign-in" &&
+      (((action === "service" || action === "client-id") && argument) || action === "remove")
+    ) {
+      const { host, value } = await setSignIn(".", action === "remove" ? undefined : argument);
+      const name = host === "github" ? "GitHub" : host === "gitlab" ? "GitLab" : "Bitbucket";
+      console.log(
+        !value
+          ? "Editors sign in with a token once the site has rebuilt with goodfellow.config.tsx."
+          : host === "github"
+            ? `Editors can choose Sign in with GitHub, through ${value}, once the site has rebuilt with goodfellow.config.tsx.`
+            : `Editors can choose Sign in with ${name} once the site has rebuilt with goodfellow.config.tsx.`,
+      );
+      process.exit(0);
+    }
     if (command === "admin" && ((action === "add" && argument) || action === "check" || action === "remove")) {
       const result =
         action === "check"
@@ -234,7 +270,9 @@ if (command === "admin" || command === "broker") {
       process.exit(0);
     }
   } catch (error) {
-    if (!(error instanceof AdminSetupError || error instanceof BrokerSetupError)) throw error;
+    if (!(error instanceof AdminSetupError || error instanceof BrokerSetupError || error instanceof SignInSetupError)) {
+      throw error;
+    }
     console.error(error.message);
     process.exit(1);
   }
@@ -252,10 +290,44 @@ if (command === "import") {
       drafts: { type: "boolean" },
       menu: { type: "boolean" },
       "keep-fields": { type: "boolean" },
+      take: { type: "string" },
+      replace: { type: "boolean" },
+      menus: { type: "boolean" },
+      settings: { type: "boolean" },
+      layout: { type: "boolean" },
+      redirects: { type: "boolean" },
+      "without-missing-blocks": { type: "boolean" },
     },
   });
   const [kind, from] = positionals;
   const problem = contentRepositoryProblem(".");
+  if (kind === "site" && from && !problem) {
+    if (values.take !== undefined && values.take !== "site" && values.take !== "export") {
+      console.error('Say "--take site" or "--take export".');
+      process.exit(1);
+    }
+    try {
+      const config = await loadTaskConfig(resolve("."));
+      const result = await importSite(".", from, {
+        blocks: Object.keys(config.blocks),
+        replace: values.replace,
+        menus: values.menus,
+        settings: values.settings,
+        layout: values.layout,
+        redirects: values.redirects,
+        withoutMissingBlocks: values["without-missing-blocks"],
+        ...(values.take && { take: values.take }),
+        dryRun: values["dry-run"],
+        log: (line) => console.log(line),
+      });
+      console.log(formatSiteImport(result));
+      process.exit(0);
+    } catch (error) {
+      if (!(error instanceof SiteTransferError || error instanceof SiteImportError)) throw error;
+      console.error(error.message);
+      process.exit(1);
+    }
+  }
   if (kind === "markdown" && from && !problem) {
     try {
       const result = await importMarkdown(".", from, {
@@ -293,7 +365,12 @@ if (command === "import") {
   }
 }
 if (command === "export") {
-  const [kind, file] = process.argv.slice(3);
+  const { positionals, values } = parseArgs({
+    args: process.argv.slice(3),
+    allowPositionals: true,
+    options: { scheduled: { type: "boolean" }, links: { type: "string" } },
+  });
+  const [kind, file] = positionals;
   const problem = contentRepositoryProblem(".");
   if (problem) {
     console.error(problem);
@@ -303,6 +380,34 @@ if (command === "export") {
     console.log(formatWordPressExport(await exportWordPress(".", file)));
     process.exit(0);
   }
+  if (kind === "site") {
+    try {
+      console.log(formatSiteExport(await exportSite(".", file)));
+      process.exit(0);
+    } catch (error) {
+      if (!(error instanceof SiteTransferError)) throw error;
+      console.error(error.message);
+      process.exit(1);
+    }
+  }
+  if (kind === "markdown") {
+    if (values.links !== undefined && values.links !== "site" && values.links !== "files") {
+      console.error('Say "--links site" or "--links files".');
+      process.exit(1);
+    }
+    try {
+      const result = await exportMarkdown(".", file, {
+        scheduled: values.scheduled === true,
+        ...(values.links && { links: values.links }),
+      });
+      console.log(formatMarkdownExport(result));
+      process.exit(0);
+    } catch (error) {
+      if (!(error instanceof MarkdownExportError)) throw error;
+      console.error(error.message);
+      process.exit(1);
+    }
+  }
 }
 if (command === "blocks") {
   const { positionals, values } = parseArgs({
@@ -343,9 +448,14 @@ if (command !== "finish" && command !== "index") {
       "       goodfellow-next import markdown <folder> [--dry-run] [--pages <folder>] [--collection <folder>]",
       "                                        [--replace-home] [--replace-pages] [--drafts] [--menu] [--keep-fields]",
       "       goodfellow-next export wordpress [file]",
+      "       goodfellow-next export markdown [folder] [--scheduled] [--links site|files]",
+      "       goodfellow-next export site [file]",
+      "       goodfellow-next import site <zip or folder> [--dry-run] [--take site|export] [--replace]",
+      "                                        [--menus] [--settings] [--layout] [--redirects] [--without-missing-blocks]",
       "       goodfellow-next blocks add <item> [--registry <folder>] [--native <app>]",
       "       goodfellow-next admin add <address> | check | remove",
       "       goodfellow-next broker use <address> | remove",
+      "       goodfellow-next sign-in service <address> | client-id <id> | remove",
       "",
       "finish  Gets the exported site in folder (default: out) ready to publish: puts the files",
       "        Next.js uses to load pages ahead where browsers look for them, writes calendar files",
@@ -373,9 +483,15 @@ if (command !== "finish" && command !== "index") {
       "        this site, from its export file (Tools → Export) or its address. With --dry-run,",
       "        says what it would bring across and changes nothing. import markdown brings a folder",
       "        of Markdown files in: the files at the top as pages, each folder as a collection,",
-      "        unless --pages or --collection names it (. for the top).",
+      "        unless --pages or --collection names it (. for the top). import site brings another",
+      "        Goodfellow site's export in: its pages, items, synced blocks and media, keeping this",
+      "        site's version of what both have unless --take export; --menus, --settings, --layout",
+      "        and --redirects bring those too, and --replace makes this site's content the export's.",
       "export  Writes this site as a WordPress export file (default: named after the site),",
-      "        which WordPress imports with Tools → Import → WordPress.",
+      "        which WordPress imports with Tools → Import → WordPress, or as a folder of Markdown",
+      "        files, for Hugo, Jekyll, Eleventy, Astro and notes apps (--scheduled also exports what",
+      "        isn't shown yet, as drafts; --links files links to the files rather than the addresses).",
+      "        export site writes this site's content and media as a zip for another Goodfellow site.",
       "blocks  Installs a shadcn registry item (button, @acme/hero, or an item's address) with",
       "        shadcn's own CLI, makes a block of its component, with fields from its props, and",
       "        says what it couldn't do. With --registry, writes the block into the block registry",
@@ -386,6 +502,9 @@ if (command !== "finish" && command !== "index") {
       "        it, then starts the admin panel only there; remove stops using it.",
       "broker  The site's token broker in goodfellow.config.tsx: use signs editors in there once",
       "        it's online; remove stops using it.",
+      "sign-in How editors sign in, in goodfellow.config.tsx: service names a GitHub site's sign-in",
+      "        service, client-id a GitLab site's OAuth application's ID or a Bitbucket site's OAuth",
+      "        consumer's Key; remove takes either out.",
     ].join("\n"),
   );
   process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodfellow-cms/next",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Goodfellow CMS pages and the admin panel in a Next.js site.",
   "keywords": [
     "goodfellow",
@@ -67,24 +67,24 @@
     "dist"
   ],
   "dependencies": {
-    "@goodfellow-cms/ai": "0.9.0",
-    "@goodfellow-cms/core": "0.9.0",
-    "@goodfellow-cms/react": "0.9.0",
+    "@goodfellow-cms/ai": "0.10.0",
+    "@goodfellow-cms/core": "0.10.0",
+    "@goodfellow-cms/react": "0.10.0",
     "rolldown": "1.2.12",
     "sharp": "0.35.5"
   },
   "peerDependencies": {
-    "@goodfellow-cms/admin": "0.9.0",
+    "@goodfellow-cms/admin": "0.10.0",
     "@puckeditor/core": "0.23.0",
     "next": "^16.0.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@goodfellow-cms/admin": "0.9.0",
-    "@goodfellow-cms/bitbucket": "0.9.0",
-    "@goodfellow-cms/github": "0.9.0",
-    "@goodfellow-cms/gitlab": "0.9.0",
+    "@goodfellow-cms/admin": "0.10.0",
+    "@goodfellow-cms/bitbucket": "0.10.0",
+    "@goodfellow-cms/github": "0.10.0",
+    "@goodfellow-cms/gitlab": "0.10.0",
     "@puckeditor/core": "0.23.0",
     "@tailwindcss/browser": "4.3.3",
     "@types/react": "^19.2.0",