@anthusai/papyrus 1.0.0-next.15 → 1.0.0-next.17

package/app/[year]/[month]/[day]/edition-route-page.tsx

@@ -1,4 +1,5 @@
 import { notFound, redirect } from "next/navigation";
+import { siteServesNextReaderRoutes } from "../../../../lib/reader-static-params";
 import { getSiteRenderer } from "../../../../lib/site-renderer";
 import type { PresentationTarget } from "../../../../renderers/pretext";
 import { loadCachedEditionContent } from "../../../../lib/cached-content-repository";
@@ -22,6 +23,7 @@ export async function EditionRoutePage({
   lockedPresentation,
   target = { kind: "edition" },
 }: EditionRoutePageProps) {
+  if (!siteServesNextReaderRoutes()) notFound();
   const route = parseEditionDateRoute({ year, month, day });
   if (!route) notFound();
   if (!route.isCanonical) redirect(route.canonicalPath);

package/app/articles/[slug]/page.tsx

@@ -1,7 +1,7 @@
 import { notFound } from "next/navigation";
 import { getSiteRenderer } from "../../../lib/site-renderer";
 import { getCachedArticle } from "../../../lib/cached-content-repository";
-import { generateArticleStaticParams } from "../../../lib/reader-static-params";
+import { generateArticleStaticParams, siteServesNextReaderRoutes } from "../../../lib/reader-static-params";
 import { SITE_BRAND } from "../../../lib/site-brand";
 
 // Keep in sync with READER_REVALIDATE_SECONDS in lib/reader-route-config.ts
@@ -16,6 +16,7 @@ type ArticlePageProps = {
 };
 
 export async function generateMetadata({ params }: ArticlePageProps) {
+  if (!siteServesNextReaderRoutes()) return {};
   const { slug } = await params;
   const article = await getCachedArticle(slug);
   if (!article) return {};
@@ -26,6 +27,7 @@ export async function generateMetadata({ params }: ArticlePageProps) {
 }
 
 export default async function ArticlePage({ params }: ArticlePageProps) {
+  if (!siteServesNextReaderRoutes()) notFound();
   const { slug } = await params;
   const article = await getCachedArticle(slug);
   if (!article) notFound();

package/infra/amplify-app-shell.js

@@ -262,7 +262,10 @@ export class AmplifyAppShellStack extends Stack {
             const readerDomain = new amplify.CfnDomain(this, "ReaderDomain", {
                 appId: readerApp.attrAppId,
                 domainName: reader.domainName,
-                subDomainSettings: [{ branchName: readerBranchName, prefix: "" }],
+                subDomainSettings: [
+                    { branchName: readerBranchName, prefix: "" },
+                    ...(reader.includeWww ? [{ branchName: readerBranchName, prefix: "www" }] : []),
+                ],
             });
             readerDomain.addResourceDependency(readerBranch);
         }

package/infra/amplify-app-shell.ts

@@ -312,7 +312,10 @@ export class AmplifyAppShellStack extends Stack {
       const readerDomain = new amplify.CfnDomain(this, "ReaderDomain", {
         appId: readerApp.attrAppId,
         domainName: reader.domainName,
-        subDomainSettings: [{ branchName: readerBranchName, prefix: "" }],
+        subDomainSettings: [
+          { branchName: readerBranchName, prefix: "" },
+          ...(reader.includeWww ? [{ branchName: readerBranchName, prefix: "www" }] : []),
+        ],
       });
       readerDomain.addResourceDependency(readerBranch);
     }

package/infra/site-config.js

@@ -121,10 +121,17 @@ 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", "includeWww", "branchName", "buildCommand", "baseDirectory", "environment"], "reader");
+        if (readerRecord.includeWww !== undefined && typeof readerRecord.includeWww !== "boolean") {
+            fail("reader.includeWww", `must be a boolean, got ${JSON.stringify(readerRecord.includeWww)}`);
+        }
+        if (readerRecord.includeWww !== undefined && readerRecord.domainName === undefined) {
+            fail("reader.includeWww", "requires reader.domainName");
+        }
         reader = {
             appName: optionalString(readerRecord.appName, "reader.appName", APP_NAME_PATTERN),
             domainName: optionalString(readerRecord.domainName, "reader.domainName", HOST_NAME_PATTERN, "host name"),
+            includeWww: readerRecord.includeWww,
             branchName: optionalString(readerRecord.branchName, "reader.branchName", BRANCH_NAME_PATTERN),
             buildCommand: requireString(readerRecord.buildCommand, "reader.buildCommand"),
             baseDirectory: requireString(readerRecord.baseDirectory, "reader.baseDirectory"),

package/infra/site-config.ts

@@ -17,6 +17,7 @@ export type AmplifyAppShellSiteConfig = {
   reader?: {
     appName?: string;
     domainName?: string;
+    includeWww?: boolean;
     branchName?: string;
     buildCommand: string;
     baseDirectory: string;
@@ -175,10 +176,17 @@ 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", "includeWww", "branchName", "buildCommand", "baseDirectory", "environment"], "reader");
+    if (readerRecord.includeWww !== undefined && typeof readerRecord.includeWww !== "boolean") {
+      fail("reader.includeWww", `must be a boolean, got ${JSON.stringify(readerRecord.includeWww)}`);
+    }
+    if (readerRecord.includeWww !== undefined && readerRecord.domainName === undefined) {
+      fail("reader.includeWww", "requires reader.domainName");
+    }
     reader = {
       appName: optionalString(readerRecord.appName, "reader.appName", APP_NAME_PATTERN),
       domainName: optionalString(readerRecord.domainName, "reader.domainName", HOST_NAME_PATTERN, "host name"),
+      includeWww: readerRecord.includeWww as boolean | undefined,
       branchName: optionalString(readerRecord.branchName, "reader.branchName", BRANCH_NAME_PATTERN),
       buildCommand: requireString(readerRecord.buildCommand, "reader.buildCommand"),
       baseDirectory: requireString(readerRecord.baseDirectory, "reader.baseDirectory"),

package/lib/reader-static-params.ts

@@ -1,4 +1,10 @@
 import { graphqlContentRepository } from "./graphql-content-repository";
+import { SITE_BRAND } from "./site-brand";
+import type { RendererConfig } from "./renderer-config";
+
+export function siteServesNextReaderRoutes(rendererKind: RendererConfig["kind"] = SITE_BRAND.renderer.kind): boolean {
+  return rendererKind !== "markus";
+}
 
 const MONTH_NAMES = [
   "january",
@@ -23,6 +29,7 @@ type EditionDateStaticParam = {
 
 export async function generateEditionDateStaticParams(): Promise<EditionDateStaticParam[]> {
   if (process.env.NODE_ENV === "development") return [];
+  if (!siteServesNextReaderRoutes()) return [];
 
   const { editions } = await graphqlContentRepository.listPublishedEditions({ limit: 100 });
   const params: EditionDateStaticParam[] = [];
@@ -35,6 +42,7 @@ export async function generateEditionDateStaticParams(): Promise<EditionDateStat
 
 export async function generateArticleStaticParams(): Promise<Array<{ slug: string }>> {
   if (process.env.NODE_ENV === "development") return [];
+  if (!siteServesNextReaderRoutes()) return [];
 
   const slugs = await graphqlContentRepository.listArticleSlugs();
   return slugs.map((slug) => ({ slug }));

package/package.json

@@ -277,7 +277,7 @@
       "optional": true
     }
   },
-  "version": "1.0.0-next.15",
+  "version": "1.0.0-next.17",
   "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.15",
+  "version": "1.0.0-next.17",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",