@rr0/cms 0.3.61 → 0.3.62

package/dist/CMSGenerator.d.ts

@@ -25,17 +25,32 @@ export interface CMSGeneratorOptions {
     };
     siteBaseUrl: string;
     /**
-     * A file holding the part of `netlify.toml` that is NOT derived from `.htaccess` — what a host
-     * needs that Apache cannot say: a redirect carrying its own status or `force`, one to an absolute
-     * URL on another domain, a header scoped to anything narrower than the whole site, a build or
-     * plugin section.
+     * Where the redirects read out of `.htaccess` are written, and in which of Netlify's two formats.
      *
-     * Without it those lines have nowhere to live but the generated file itself, where every full
-     * build wipes them — which is exactly how this site's `ufoathome.org` redirects and its CORS
-     * headers disappeared twice. See ssg-api's HtAccessReplaceCommand for the mechanism; naming a file
-     * that is not there fails the build rather than dropping it in silence.
+     * Defaults to a `netlify.toml` at the repository root, which is what this has always produced.
+     *
+     * The `redirects` format writes Netlify's plainer `_redirects` instead, and the reason to choose
+     * it is WHERE it can be put. `netlify.toml` is read from the CLONE, before any build command runs,
+     * so a site built by Netlify from git must keep it in version control — a generated file, tracked,
+     * inviting exactly the hand-edit that overwrites itself. `_redirects` and `_headers` are read from
+     * the DEPLOYED directory, so they can be build output like everything else and never need to be
+     * committed at all.
+     *
+     * `preambleFile` holds whatever the `.htaccess` cannot say and is emitted ahead of the generated
+     * lines: a redirect carrying its own status or `force` (`301!` in the plain format), one from an
+     * absolute URL on another domain. Without it those lines have nowhere to live but the generated
+     * file itself, where every full build wipes them — which is exactly how one site's `ufoathome.org`
+     * redirects and its CORS headers disappeared twice. See ssg-api's HtAccessReplaceCommand; naming a
+     * file that is not there fails the build rather than dropping it in silence.
+     *
+     * Headers have no generator because `.htaccess` here carries no `Header` directive worth
+     * translating: in the plain format they are simply a static `_headers` file among the copies.
      */
-    netlifyPreambleFile?: string;
+    netlify?: {
+        format: "toml" | "redirects";
+        outputPath: string;
+        preambleFile?: string;
+    };
     timeFormat: Intl.DateTimeFormatOptions;
     directoryPages: string[];
     ufoCaseDirectoryFile: string;

package/dist/CMSGenerator.js

@@ -5,7 +5,7 @@ import { CaseDirectoryStep, CaseFactory, CaseService } from "./science/crypto/uf
 import { cities, CityService, CmsOrganizationFactory, countries, departments, DepartmentService, OrganizationService, regions, RegionService } from "./org/index.js";
 import { RR0ContextImpl } from "./RR0Context.js";
 import { HtmlTable } from "./util/index.js";
-import { ClassDomReplaceCommand, CopyStep, DomReplaceCommand, HtAccessToNetlifyConfigReplaceCommand, HtmlFileContents, Ssg, SsiIncludeReplaceCommand } from "ssg-api";
+import { ClassDomReplaceCommand, CopyStep, DomReplaceCommand, HtAccessToNetlifyConfigReplaceCommand, HtAccessToNetlifyRedirectsReplaceCommand, HtmlFileContents, Ssg, SsiIncludeReplaceCommand } from "ssg-api";
 import { AuthorReplaceCommand, PeopleDirectoryStepFactory, PeopleReplacerFactory } from "./people/index.js";
 import { PersistentSourceRegistry, SourceFileCounter, SourceIndexStep, SourceRenderer, SourceReplacer, SourceReplacerFactory } from "./source/index.js";
 import { NoteFileCounter, NoteRenderer, NoteReplacer, NoteReplacerFactory } from "./note/index.js";
@@ -75,6 +75,7 @@ export class CMSGenerator {
         this.timeService = new TimeService(dataService, timeOptions);
     }
     async generate(args) {
+        var _a;
         const timeContext = new TimeContext();
         const context = new RR0ContextImpl(this.options.locale, timeContext, this.config, undefined, undefined, undefined, this);
         context.setVar("mapsApiKey", this.options.googleMapsApiKey);
@@ -134,12 +135,15 @@ export class CMSGenerator {
                 return HtmlTable.create(obj, headers);
             }
         }();
+        const netlify = (_a = this.options.netlify) !== null && _a !== void 0 ? _a : { format: "toml", outputPath: "netlify.toml" };
         const htAccessToNetlifyConfig = {
             replacements: [
-                new HtAccessToNetlifyConfigReplaceCommand(this.options.siteBaseUrl, this.options.netlifyPreambleFile)
+                netlify.format === "redirects"
+                    ? new HtAccessToNetlifyRedirectsReplaceCommand(this.options.siteBaseUrl, netlify.preambleFile)
+                    : new HtAccessToNetlifyConfigReplaceCommand(this.options.siteBaseUrl, netlify.preambleFile)
             ],
             roots: [".htaccess"],
-            getOutputPath: (_context) => "netlify.toml"
+            getOutputPath: (_context) => netlify.outputPath
         };
         const contentRoots = this.options.contentRoots;
         const contentStepOptions = {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@rr0/cms",
   "type": "module",
   "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
-  "version": "0.3.61",
+  "version": "0.3.62",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",