@anthusai/papyrus 1.0.0-next.40 → 1.0.0-next.41

package/infra/amplify-app-shell.js

@@ -7,6 +7,18 @@ import { isStagingEnabled, resolveRedirectSubDomainPrefix, resolveCmsHostName, r
 function environmentVariables(variables) {
     return Object.entries(variables).map(([name, value]) => ({ name, value }));
 }
+function readerCustomHeaders(rules) {
+    if (!rules)
+        return undefined;
+    const lines = ["customHeaders:"];
+    for (const rule of rules) {
+        lines.push(`  - pattern: ${JSON.stringify(rule.pattern)}`, "    headers:");
+        for (const [key, value] of Object.entries(rule.headers)) {
+            lines.push(`      - key: ${JSON.stringify(key)}`, `        value: ${JSON.stringify(value)}`);
+        }
+    }
+    return lines.join("\n") + "\n";
+}
 /**
  * Provisions the Amplify *app shell* of a Papyrus publication from its
  * site.json:
@@ -282,7 +294,11 @@ export class AmplifyAppShellStack extends Stack {
             platform: "WEB",
             iamServiceRole: readerServiceRole.roleArn,
             buildSpec: readerBuildSpec(config),
-            customRules: [{ source: "/<*>", target: "/404.html", status: "404-200" }],
+            customRules: [
+                ...(reader.redirects ?? []),
+                { source: "/<*>", target: "/404.html", status: "404-200" },
+            ],
+            customHeaders: readerCustomHeaders(reader.customHeaders),
         });
         const readerBranch = new amplify.CfnBranch(this, "ReaderBranch", {
             appId: readerApp.attrAppId,
@@ -299,7 +315,7 @@ export class AmplifyAppShellStack extends Stack {
             const readerDomain = new amplify.CfnDomain(this, "ReaderDomain", {
                 appId: readerApp.attrAppId,
                 domainName: reader.domainName,
-                subDomainSettings: [{ branchName: readerBranchName, prefix: "" }],
+                subDomainSettings: (reader.domainPrefixes ?? [""]).map((prefix) => ({ branchName: readerBranchName, prefix })),
             });
             readerDomain.addResourceDependency(readerBranch);
         }

package/infra/amplify-app-shell.ts

@@ -4,12 +4,24 @@ import * as iam from "aws-cdk-lib/aws-iam";
 import * as amplify from "aws-cdk-lib/aws-amplify";
 import { GITHUB_OIDC_PROVIDER_HOST } from "./github-oidc-provider";
 import { cmsProductionBuildSpec, cmsStagingBuildSpec, readerBuildSpec } from "./build-specs";
-import { AmplifyAppShellSiteConfig, isStagingEnabled, resolveRedirectSubDomainPrefix, resolveCmsHostName, resolveRevalidateSecretParameterName, resolveStackName, resolveStagingDomainName, resolveStoragePreviewPrefix } from "./site-config";
+import { AmplifyAppShellSiteConfig, ReaderCustomHeaderRule, isStagingEnabled, resolveRedirectSubDomainPrefix, resolveCmsHostName, resolveRevalidateSecretParameterName, resolveStackName, resolveStagingDomainName, resolveStoragePreviewPrefix } from "./site-config";
 
 function environmentVariables(variables: Record<string, string>): amplify.CfnBranch.EnvironmentVariableProperty[] {
   return Object.entries(variables).map(([name, value]) => ({ name, value }));
 }
 
+function readerCustomHeaders(rules: ReaderCustomHeaderRule[] | undefined): string | undefined {
+  if (!rules) return undefined;
+  const lines = ["customHeaders:"];
+  for (const rule of rules) {
+    lines.push(`  - pattern: ${JSON.stringify(rule.pattern)}`, "    headers:");
+    for (const [key, value] of Object.entries(rule.headers)) {
+      lines.push(`      - key: ${JSON.stringify(key)}`, `        value: ${JSON.stringify(value)}`);
+    }
+  }
+  return lines.join("\n") + "\n";
+}
+
 /**
  * Provisions the Amplify *app shell* of a Papyrus publication from its
  * site.json:
@@ -333,7 +345,11 @@ export class AmplifyAppShellStack extends Stack {
       platform: "WEB",
       iamServiceRole: readerServiceRole.roleArn,
       buildSpec: readerBuildSpec(config),
-      customRules: [{ source: "/<*>", target: "/404.html", status: "404-200" }],
+      customRules: [
+        ...(reader.redirects ?? []),
+        { source: "/<*>", target: "/404.html", status: "404-200" },
+      ],
+      customHeaders: readerCustomHeaders(reader.customHeaders),
     });
 
     const readerBranch = new amplify.CfnBranch(this, "ReaderBranch", {
@@ -352,7 +368,7 @@ export class AmplifyAppShellStack extends Stack {
       const readerDomain = new amplify.CfnDomain(this, "ReaderDomain", {
         appId: readerApp.attrAppId,
         domainName: reader.domainName,
-        subDomainSettings: [{ branchName: readerBranchName, prefix: "" }],
+        subDomainSettings: (reader.domainPrefixes ?? [""]).map((prefix) => ({ branchName: readerBranchName, prefix })),
       });
       readerDomain.addResourceDependency(readerBranch);
     }

package/infra/build-specs.js

@@ -82,7 +82,8 @@ export function readerBuildSpec(config) {
         "version: 1",
         ...frontendSection([
             ...pythonProvisioningCommands(config),
-            "papyrus ops content export-published --auth guest --out content-export --clean",
+            ...(readerConfig.preBuildCommands ?? []),
+            ...(readerConfig.skipContentExport ? [] : ["papyrus ops content export-published --auth guest --out content-export --clean"]),
         ], [readerConfig.buildCommand], readerConfig.baseDirectory, [".uv-cache/**/*"]),
     ].join("\n") + "\n";
 }

package/infra/build-specs.ts

@@ -126,7 +126,8 @@ export function readerBuildSpec(config: AmplifyAppShellSiteConfig): string {
     ...frontendSection(
       [
         ...pythonProvisioningCommands(config),
-        "papyrus ops content export-published --auth guest --out content-export --clean",
+        ...(readerConfig.preBuildCommands ?? []),
+        ...(readerConfig.skipContentExport ? [] : ["papyrus ops content export-published --auth guest --out content-export --clean"]),
       ],
       [readerConfig.buildCommand],
       readerConfig.baseDirectory,

package/infra/site-config.js

@@ -1,3 +1,4 @@
+export const READER_REDIRECT_STATUSES = ["301", "302", "200", "404", "404-200"];
 export const DEFAULT_CI_BRANCHES = ["main", "staging"];
 const SITE_ID_PATTERN = /^[a-z][a-z0-9]*(-[a-z0-9]+)*$/;
 const REPOSITORY_PATTERN = /^https:\/\/github\.com\/[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/;
@@ -78,6 +79,63 @@ function parseRedirects(value) {
         return { source, status };
     });
 }
+function parseReaderDomainPrefixes(value) {
+    if (value === undefined)
+        return undefined;
+    if (!Array.isArray(value) || value.length === 0)
+        fail("reader.domainPrefixes", "must be a non-empty array");
+    const prefixes = value.map((entry, index) => {
+        const field = `reader.domainPrefixes[${index}]`;
+        if (entry === "")
+            return "";
+        return requireString(entry, field, DOMAIN_PREFIX_PATTERN, 'single DNS label, or "" for the apex');
+    });
+    if (new Set(prefixes).size !== prefixes.length)
+        fail("reader.domainPrefixes", "must not repeat a prefix");
+    return prefixes;
+}
+function parseReaderRedirects(value) {
+    if (value === undefined)
+        return undefined;
+    if (!Array.isArray(value) || value.length === 0)
+        fail("reader.redirects", "must be a non-empty array");
+    return value.map((entry, index) => {
+        const field = `reader.redirects[${index}]`;
+        const record = requireObject(entry, field);
+        rejectUnknownKeys(record, ["source", "target", "status"], field);
+        const status = record.status ?? "301";
+        if (typeof status !== "string" || !READER_REDIRECT_STATUSES.includes(status)) {
+            fail(`${field}.status`, `must be one of ${READER_REDIRECT_STATUSES.join(", ")}, got ${JSON.stringify(status)}`);
+        }
+        return {
+            source: requireString(record.source, `${field}.source`),
+            target: requireString(record.target, `${field}.target`),
+            status: status,
+        };
+    });
+}
+function parseReaderCustomHeaders(value) {
+    if (value === undefined)
+        return undefined;
+    if (!Array.isArray(value) || value.length === 0)
+        fail("reader.customHeaders", "must be a non-empty array");
+    return value.map((entry, index) => {
+        const field = `reader.customHeaders[${index}]`;
+        const record = requireObject(entry, field);
+        rejectUnknownKeys(record, ["pattern", "headers"], field);
+        const headers = requireStringRecord(record.headers, `${field}.headers`);
+        if (Object.keys(headers).length === 0)
+            fail(`${field}.headers`, "must not be empty");
+        return { pattern: requireString(record.pattern, `${field}.pattern`), headers };
+    });
+}
+function parseReaderPreBuildCommands(value) {
+    if (value === undefined)
+        return undefined;
+    if (!Array.isArray(value) || value.length === 0)
+        fail("reader.preBuildCommands", "must be a non-empty array of commands");
+    return value.map((command, index) => requireString(command, `reader.preBuildCommands[${index}]`));
+}
 export function resolveRedirectSubDomainPrefix(rootDomain, source) {
     return source === rootDomain ? "" : source.slice(0, -rootDomain.length - 1);
 }
@@ -203,7 +261,10 @@ export function parseSiteConfig(raw) {
         if (frontend !== "markus-static")
             fail("reader", `is only allowed when frontend is "markus-static"`);
         const readerRecord = requireObject(record.reader, "reader");
-        rejectUnknownKeys(readerRecord, ["appName", "domainName", "branchName", "buildCommand", "baseDirectory", "environment"], "reader");
+        rejectUnknownKeys(readerRecord, ["appName", "domainName", "domainPrefixes", "branchName", "buildCommand", "baseDirectory", "environment", "redirects", "customHeaders", "preBuildCommands", "skipContentExport"], "reader");
+        if (readerRecord.skipContentExport !== undefined && typeof readerRecord.skipContentExport !== "boolean") {
+            fail("reader.skipContentExport", `must be a boolean, got ${JSON.stringify(readerRecord.skipContentExport)}`);
+        }
         reader = {
             appName: optionalString(readerRecord.appName, "reader.appName", APP_NAME_PATTERN),
             domainName: optionalString(readerRecord.domainName, "reader.domainName", HOST_NAME_PATTERN, "host name"),
@@ -211,7 +272,14 @@ export function parseSiteConfig(raw) {
             buildCommand: requireString(readerRecord.buildCommand, "reader.buildCommand"),
             baseDirectory: requireString(readerRecord.baseDirectory, "reader.baseDirectory"),
             environment: readerRecord.environment === undefined ? undefined : requireStringRecord(readerRecord.environment, "reader.environment"),
+            domainPrefixes: parseReaderDomainPrefixes(readerRecord.domainPrefixes),
+            redirects: parseReaderRedirects(readerRecord.redirects),
+            customHeaders: parseReaderCustomHeaders(readerRecord.customHeaders),
+            preBuildCommands: parseReaderPreBuildCommands(readerRecord.preBuildCommands),
+            skipContentExport: readerRecord.skipContentExport,
         };
+        if (reader.domainPrefixes && !reader.domainName)
+            fail("reader.domainPrefixes", "requires reader.domainName");
     }
     else if (frontend === "markus-static") {
         fail("reader", `is required when frontend is "markus-static"`);

package/infra/site-config.ts

@@ -3,6 +3,21 @@ export type CmsRedirect = {
   status: 301 | 302;
 };
 
+export type ReaderRedirectStatus = "301" | "302" | "200" | "404" | "404-200";
+
+export type ReaderRedirect = {
+  source: string;
+  target: string;
+  status: ReaderRedirectStatus;
+};
+
+export type ReaderCustomHeaderRule = {
+  pattern: string;
+  headers: Record<string, string>;
+};
+
+export const READER_REDIRECT_STATUSES: ReaderRedirectStatus[] = ["301", "302", "200", "404", "404-200"];
+
 export type AmplifyAppShellSiteConfig = {
   siteId: string;
   repository: string;
@@ -26,10 +41,15 @@ export type AmplifyAppShellSiteConfig = {
   reader?: {
     appName?: string;
     domainName?: string;
+    domainPrefixes?: string[];
     branchName?: string;
     buildCommand: string;
     baseDirectory: string;
     environment?: Record<string, string>;
+    redirects?: ReaderRedirect[];
+    customHeaders?: ReaderCustomHeaderRule[];
+    preBuildCommands?: string[];
+    skipContentExport?: boolean;
   };
   papyrusVersion: string;
   storagePreviewPrefix?: string;
@@ -126,6 +146,56 @@ function parseRedirects(value: unknown): CmsRedirect[] | undefined {
   });
 }
 
+function parseReaderDomainPrefixes(value: unknown): string[] | undefined {
+  if (value === undefined) return undefined;
+  if (!Array.isArray(value) || value.length === 0) fail("reader.domainPrefixes", "must be a non-empty array");
+  const prefixes = (value as unknown[]).map((entry, index) => {
+    const field = `reader.domainPrefixes[${index}]`;
+    if (entry === "") return "";
+    return requireString(entry, field, DOMAIN_PREFIX_PATTERN, 'single DNS label, or "" for the apex');
+  });
+  if (new Set(prefixes).size !== prefixes.length) fail("reader.domainPrefixes", "must not repeat a prefix");
+  return prefixes;
+}
+
+function parseReaderRedirects(value: unknown): ReaderRedirect[] | undefined {
+  if (value === undefined) return undefined;
+  if (!Array.isArray(value) || value.length === 0) fail("reader.redirects", "must be a non-empty array");
+  return (value as unknown[]).map((entry, index) => {
+    const field = `reader.redirects[${index}]`;
+    const record = requireObject(entry, field);
+    rejectUnknownKeys(record, ["source", "target", "status"], field);
+    const status = record.status ?? "301";
+    if (typeof status !== "string" || !READER_REDIRECT_STATUSES.includes(status as ReaderRedirectStatus)) {
+      fail(`${field}.status`, `must be one of ${READER_REDIRECT_STATUSES.join(", ")}, got ${JSON.stringify(status)}`);
+    }
+    return {
+      source: requireString(record.source, `${field}.source`),
+      target: requireString(record.target, `${field}.target`),
+      status: status as ReaderRedirectStatus,
+    };
+  });
+}
+
+function parseReaderCustomHeaders(value: unknown): ReaderCustomHeaderRule[] | undefined {
+  if (value === undefined) return undefined;
+  if (!Array.isArray(value) || value.length === 0) fail("reader.customHeaders", "must be a non-empty array");
+  return (value as unknown[]).map((entry, index) => {
+    const field = `reader.customHeaders[${index}]`;
+    const record = requireObject(entry, field);
+    rejectUnknownKeys(record, ["pattern", "headers"], field);
+    const headers = requireStringRecord(record.headers, `${field}.headers`);
+    if (Object.keys(headers).length === 0) fail(`${field}.headers`, "must not be empty");
+    return { pattern: requireString(record.pattern, `${field}.pattern`), headers };
+  });
+}
+
+function parseReaderPreBuildCommands(value: unknown): string[] | undefined {
+  if (value === undefined) return undefined;
+  if (!Array.isArray(value) || value.length === 0) fail("reader.preBuildCommands", "must be a non-empty array of commands");
+  return (value as unknown[]).map((command, index) => requireString(command, `reader.preBuildCommands[${index}]`));
+}
+
 export function resolveRedirectSubDomainPrefix(rootDomain: string, source: string): string {
   return source === rootDomain ? "" : source.slice(0, -rootDomain.length - 1);
 }
@@ -264,7 +334,10 @@ export function parseSiteConfig(raw: unknown): AmplifyAppShellSiteConfig {
   if (record.reader !== undefined) {
     if (frontend !== "markus-static") fail("reader", `is only allowed when frontend is "markus-static"`);
     const readerRecord = requireObject(record.reader, "reader");
-    rejectUnknownKeys(readerRecord, ["appName", "domainName", "branchName", "buildCommand", "baseDirectory", "environment"], "reader");
+    rejectUnknownKeys(readerRecord, ["appName", "domainName", "domainPrefixes", "branchName", "buildCommand", "baseDirectory", "environment", "redirects", "customHeaders", "preBuildCommands", "skipContentExport"], "reader");
+    if (readerRecord.skipContentExport !== undefined && typeof readerRecord.skipContentExport !== "boolean") {
+      fail("reader.skipContentExport", `must be a boolean, got ${JSON.stringify(readerRecord.skipContentExport)}`);
+    }
     reader = {
       appName: optionalString(readerRecord.appName, "reader.appName", APP_NAME_PATTERN),
       domainName: optionalString(readerRecord.domainName, "reader.domainName", HOST_NAME_PATTERN, "host name"),
@@ -272,7 +345,13 @@ export function parseSiteConfig(raw: unknown): AmplifyAppShellSiteConfig {
       buildCommand: requireString(readerRecord.buildCommand, "reader.buildCommand"),
       baseDirectory: requireString(readerRecord.baseDirectory, "reader.baseDirectory"),
       environment: readerRecord.environment === undefined ? undefined : requireStringRecord(readerRecord.environment, "reader.environment"),
+      domainPrefixes: parseReaderDomainPrefixes(readerRecord.domainPrefixes),
+      redirects: parseReaderRedirects(readerRecord.redirects),
+      customHeaders: parseReaderCustomHeaders(readerRecord.customHeaders),
+      preBuildCommands: parseReaderPreBuildCommands(readerRecord.preBuildCommands),
+      skipContentExport: readerRecord.skipContentExport as boolean | undefined,
     };
+    if (reader.domainPrefixes && !reader.domainName) fail("reader.domainPrefixes", "requires reader.domainName");
   } else if (frontend === "markus-static") {
     fail("reader", `is required when frontend is "markus-static"`);
   }

package/package.json

@@ -302,7 +302,7 @@
       "optional": true
     }
   },
-  "version": "1.0.0-next.40",
+  "version": "1.0.0-next.41",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-sdk/client-cognito-identity-provider": "3.1045.0",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-next.40",
+  "version": "1.0.0-next.41",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",