@anthusai/papyrus 2.0.0-next.60 → 2.0.0-next.62

package/amplify/plugins/newsletter/config.js

@@ -17,6 +17,7 @@ const THEME_STYLE_KEYS = [
 ];
 const THEME_KEYS = [
     "accent", "text", "background", ...THEME_STYLE_KEYS, "logoUrl", "wordmarkImageUrl", "wordmarkAlt", "wordmarkWidth", "wordmarkHeight",
+    "footerWordmarkWidth",
 ];
 const KNOWN_KEYS = new Set([
     "name", "siteId", "siteOrigin", "basePath", "computeRoleArn", "sendingDomain", "fromAddress", "fromName", "instantAlerts", "theme", "lists",
@@ -140,6 +141,15 @@ function resolveTheme(raw) {
     else if (theme.wordmarkWidth !== undefined || theme.wordmarkHeight !== undefined) {
         fail("theme.wordmarkWidth and theme.wordmarkHeight need theme.wordmarkImageUrl");
     }
+    if (theme.footerWordmarkWidth !== undefined) {
+        if (theme.wordmarkImageUrl === undefined)
+            fail("theme.footerWordmarkWidth needs theme.wordmarkImageUrl");
+        const width = theme.footerWordmarkWidth;
+        if (typeof width !== "number" || !Number.isInteger(width) || width < 1 || width > 400) {
+            fail("theme.footerWordmarkWidth must be a whole number of pixels from 1 to 400");
+        }
+        resolved.footerWordmarkWidth = width;
+    }
     if (theme.wordmarkAlt !== undefined) {
         const alt = text(theme.wordmarkAlt, "theme.wordmarkAlt", 200);
         if (/[\u0000-\u001f\u007f]/.test(alt))

package/amplify/plugins/newsletter/config.ts

@@ -37,6 +37,8 @@ export type NewsletterTheme = {
   wordmarkAlt?: string;
   wordmarkWidth?: number;
   wordmarkHeight?: number;
+  /** Draws the footer's wordmark at this width in pixels (1 to 400), smaller than the header's; the height keeps the aspect ratio. */
+  footerWordmarkWidth?: number;
   labelFont?: string;
 };
 
@@ -46,6 +48,7 @@ const THEME_STYLE_KEYS = [
 ] as const;
 const THEME_KEYS = [
   "accent", "text", "background", ...THEME_STYLE_KEYS, "logoUrl", "wordmarkImageUrl", "wordmarkAlt", "wordmarkWidth", "wordmarkHeight",
+  "footerWordmarkWidth",
 ];
 
 export type NewsletterRule = { sections?: string[]; tags?: string[]; types?: string[] };
@@ -205,6 +208,14 @@ function resolveTheme(raw: unknown): NewsletterTheme {
   } else if (theme.wordmarkWidth !== undefined || theme.wordmarkHeight !== undefined) {
     fail("theme.wordmarkWidth and theme.wordmarkHeight need theme.wordmarkImageUrl");
   }
+  if (theme.footerWordmarkWidth !== undefined) {
+    if (theme.wordmarkImageUrl === undefined) fail("theme.footerWordmarkWidth needs theme.wordmarkImageUrl");
+    const width = theme.footerWordmarkWidth;
+    if (typeof width !== "number" || !Number.isInteger(width) || width < 1 || width > 400) {
+      fail("theme.footerWordmarkWidth must be a whole number of pixels from 1 to 400");
+    }
+    resolved.footerWordmarkWidth = width;
+  }
   if (theme.wordmarkAlt !== undefined) {
     const alt = text(theme.wordmarkAlt, "theme.wordmarkAlt", 200);
     if (/[\u0000-\u001f\u007f]/.test(alt)) fail("theme.wordmarkAlt must not contain control characters");

package/lib/newsletter-api.ts

@@ -238,6 +238,14 @@ function call(options: NewsletterApiOptions, functionName: string, event: Newsle
   return (options.invoke ?? invokeNewsletterLambda)(functionName, event);
 }
 
+/**
+ * Next answers HEAD by running the route's GET export, but leaves `request.method` as "HEAD". A check for `=== "GET"` therefore
+ * sends a mail scanner's HEAD down the POST path. Every read-only branch asks this instead, so HEAD redirects exactly like GET.
+ */
+function isReadRequest(request: Pick<NextRequest, "method">): boolean {
+  return request.method === "GET" || request.method === "HEAD";
+}
+
 function textResponse(body: string, status: number): NextResponse {
   return new NextResponse(body, { status, headers: { ...NO_STORE, "content-type": "text/plain; charset=utf-8" } });
 }
@@ -266,7 +274,7 @@ export async function handleNewsletterConfirm(request: NextRequest, options: New
   if (!plugin) return notFoundPage();
   const to = redirector(request, environment, plugin);
   if ("response" in to) return to.response;
-  if (request.method === "GET") {
+  if (isReadRequest(request)) {
     const token = manageTokenFrom(request.nextUrl.searchParams.get("t"));
     return token ? to.go("confirm", { token }, 302) : to.go("expired", {}, 302);
   }
@@ -304,7 +312,7 @@ export async function handleNewsletterUnsubscribe(request: NextRequest, options:
   const to = redirector(request, environment, plugin);
   if ("response" in to) return to.response;
   const query = request.nextUrl.searchParams;
-  if (request.method === "GET") {
+  if (isReadRequest(request)) {
     const token = manageTokenFrom(query.get("t"));
     const listId = listParameter(query.get("l"));
     return token ? to.go("unsubscribe", { token, ...(listId ? { list: listId } : {}) }, 302) : to.go("expired", {}, 302);
@@ -344,7 +352,7 @@ export async function handleNewsletterPreferences(request: NextRequest, options:
   if (!plugin) return notFoundPage();
   const to = redirector(request, environment, plugin);
   if ("response" in to) return to.response;
-  if (request.method === "GET") {
+  if (isReadRequest(request)) {
     const token = manageTokenFrom(request.nextUrl.searchParams.get("t"));
     return token ? to.go("preferences", { token }, 302) : to.go("expired", {}, 302);
   }

package/package.json

@@ -433,7 +433,7 @@
       "optional": true
     }
   },
-  "version": "2.0.0-next.60",
+  "version": "2.0.0-next.62",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-crypto/sha256-js": "5.2.0",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0-next.60",
+  "version": "2.0.0-next.62",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",