@ampless/runtime 0.2.0-alpha.8 → 1.0.0-alpha.13

package/dist/index.js

@@ -20,35 +20,20 @@ function createStorage(outputs) {
 // src/posts.ts
 import { cookies } from "next/headers";
 import { generateServerClientUsingCookies } from "@aws-amplify/adapter-nextjs/api";
-function decodeBody(value) {
-  if (typeof value !== "string") return value;
-  try {
-    return JSON.parse(value);
-  } catch {
-    return value;
-  }
-}
+import { decodeAwsJson } from "ampless";
 function decodeMetadata(value) {
   if (value === null || value === void 0) return void 0;
-  const parsed = typeof value === "string" ? safeJsonParse(value) : value;
+  const parsed = decodeAwsJson(value);
   return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : void 0;
 }
-function safeJsonParse(value) {
-  try {
-    return JSON.parse(value);
-  } catch {
-    return value;
-  }
-}
 function toCorePost(p) {
   return {
     postId: p.postId,
-    siteId: p.siteId,
     slug: p.slug,
     title: p.title,
     excerpt: p.excerpt ?? void 0,
     format: p.format ?? "markdown",
-    body: decodeBody(p.body),
+    body: decodeAwsJson(p.body),
     status: p.status ?? "draft",
     publishedAt: p.publishedAt ?? void 0,
     tags: (p.tags ?? []).filter((t) => typeof t === "string"),
@@ -66,7 +51,6 @@ function createPostsApi(outputs) {
   return {
     async listPublishedPosts(opts = {}) {
       const { data, errors } = await client.queries.listPublishedPosts({
-        siteId: opts.siteId ?? "default",
         from: opts.from,
         to: opts.to,
         limit: opts.limit ?? 20,
@@ -76,9 +60,8 @@ function createPostsApi(outputs) {
       const items = (data?.items ?? []).filter((p) => p !== null).map(toCorePost);
       return { items, nextToken: data?.nextToken ?? null };
     },
-    async getPublishedPost(slug, opts = {}) {
+    async getPublishedPost(slug) {
       const { data, errors } = await client.queries.getPublishedPost({
-        siteId: opts.siteId ?? "default",
         slug
       });
       if (errors) throw new Error(errors[0]?.message ?? "Failed to get post");
@@ -86,7 +69,6 @@ function createPostsApi(outputs) {
     },
     async listPostsByTag(tag, opts = {}) {
       const { data, errors } = await client.queries.listPostsByTag({
-        siteId: opts.siteId ?? "default",
         tag,
         limit: opts.limit ?? 20,
         nextToken: opts.nextToken
@@ -99,25 +81,27 @@ function createPostsApi(outputs) {
 }
 
 // src/site-settings.ts
-import { DEFAULT_SITE_ID, siteFor, unflattenSettings } from "ampless";
+import { unflattenSettings } from "ampless";
 function createSiteSettings(cmsConfig, storage) {
-  async function fetchRemote(siteId) {
+  async function fetchRemote() {
     if (!storage.isStorageConfigured()) return null;
     let url;
     try {
-      url = storage.publicAssetUrl(`public/site-settings/${siteId}.json`);
+      url = storage.publicAssetUrl("public/site-settings.json");
     } catch {
       return null;
     }
-    const res = await fetch(url, { next: { revalidate: 60, tags: [`site-settings:${siteId}`] } });
+    const res = await fetch(url, {
+      next: { revalidate: 60, tags: ["site-settings"] }
+    });
     if (!res.ok) return null;
     const flat = await res.json();
     return unflattenSettings(flat);
   }
   return {
-    async loadSiteSettings(siteId = DEFAULT_SITE_ID) {
-      const remote = await fetchRemote(siteId).catch(() => null);
-      const baseSite = siteFor(siteId, cmsConfig);
+    async loadSiteSettings() {
+      const remote = await fetchRemote().catch(() => null);
+      const baseSite = cmsConfig.site;
       return {
         site: {
           name: remote?.site?.name ?? baseSite.name,
@@ -142,15 +126,14 @@ function createSiteSettings(cmsConfig, storage) {
 }
 
 // src/seo.ts
-import { DEFAULT_SITE_ID as DEFAULT_SITE_ID2 } from "ampless";
 function isPlugin(p) {
   return typeof p === "object" && p !== null && "apiVersion" in p;
 }
 function createSeo(cmsConfig, settingsApi) {
   const plugins = (cmsConfig.plugins ?? []).filter(isPlugin);
   return {
-    async postMetadata(post, siteId = DEFAULT_SITE_ID2) {
-      const settings = await settingsApi.loadSiteSettings(siteId);
+    async postMetadata(post) {
+      const settings = await settingsApi.loadSiteSettings();
       const accum = {};
       for (const plugin of plugins) {
         if (!plugin.metadata) continue;
@@ -167,8 +150,8 @@ function createSeo(cmsConfig, settingsApi) {
       }
       return accum;
     },
-    async siteMetadata(siteId = DEFAULT_SITE_ID2) {
-      const settings = await settingsApi.loadSiteSettings(siteId);
+    async siteMetadata() {
+      const settings = await settingsApi.loadSiteSettings();
       const accum = {
         title: settings.site.name,
         description: settings.site.description
@@ -193,24 +176,25 @@ function createSeo(cmsConfig, settingsApi) {
 
 // src/theme-active.ts
 import { headers } from "next/headers";
-import { DEFAULT_SITE_ID as DEFAULT_SITE_ID3 } from "ampless";
 function createThemeActive(registry, storage) {
-  async function fetchActiveFromCache(siteId) {
+  async function fetchActiveFromCache() {
     if (!storage.isStorageConfigured()) return null;
     let url;
     try {
-      url = storage.publicAssetUrl(`public/site-settings/${siteId}.json`);
+      url = storage.publicAssetUrl("public/site-settings.json");
     } catch {
       return null;
     }
-    const res = await fetch(url, { next: { revalidate: 60, tags: [`site-settings:${siteId}`] } });
+    const res = await fetch(url, {
+      next: { revalidate: 60, tags: ["site-settings"] }
+    });
     if (!res.ok) return null;
     const flat = await res.json();
     const v = flat["theme.active"];
     return typeof v === "string" ? v : null;
   }
   return {
-    async resolveActiveTheme(siteId = DEFAULT_SITE_ID3) {
+    async resolveActiveTheme() {
       let previewOverride = null;
       try {
         const h = await headers();
@@ -221,7 +205,7 @@ function createThemeActive(registry, storage) {
         const mod2 = registry.themes[previewOverride];
         if (mod2) return { name: previewOverride, module: mod2 };
       }
-      const stored = await fetchActiveFromCache(siteId).catch(() => null);
+      const stored = await fetchActiveFromCache().catch(() => null);
       const name = stored && stored in registry.themes ? stored : registry.defaultTheme;
       const mod = registry.themes[name] ?? registry.themes[registry.defaultTheme];
       if (!mod) {
@@ -236,7 +220,6 @@ function createThemeActive(registry, storage) {
 
 // src/theme-config.ts
 import {
-  DEFAULT_SITE_ID as DEFAULT_SITE_ID4,
   resolveThemeValues,
   themeSettingKey
 } from "ampless";
@@ -247,23 +230,23 @@ function validateColorScheme(raw) {
   return DEFAULT_COLOR_SCHEME;
 }
 function createThemeConfig(themeActive, storage) {
-  async function fetchRemote(siteId) {
+  async function fetchRemote() {
     if (!storage.isStorageConfigured()) return null;
     let url;
     try {
-      url = storage.publicAssetUrl(`public/site-settings/${siteId}.json`);
+      url = storage.publicAssetUrl("public/site-settings.json");
     } catch {
       return null;
     }
-    const res = await fetch(url, { next: { revalidate: 60, tags: [`site-settings:${siteId}`] } });
+    const res = await fetch(url, { next: { revalidate: 60, tags: ["site-settings"] } });
     if (!res.ok) return null;
     return await res.json();
   }
   return {
-    async loadThemeConfig(siteId = DEFAULT_SITE_ID4) {
+    async loadThemeConfig() {
       const [active, flat] = await Promise.all([
-        themeActive.resolveActiveTheme(siteId),
-        fetchRemote(siteId).catch(() => null)
+        themeActive.resolveActiveTheme(),
+        fetchRemote().catch(() => null)
       ]);
       const manifest = active.module.manifest;
       const stored = {};
@@ -299,9 +282,17 @@ ${lines.join("\n")}
 }
 
 // src/rendering.ts
+import { marked } from "marked";
 function escape(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
+function textAlignStyle(attrs) {
+  const v = attrs?.textAlign;
+  if (v === "left" || v === "center" || v === "right" || v === "justify") {
+    return ` style="text-align: ${v}"`;
+  }
+  return "";
+}
 function renderTiptap(node) {
   if (node.type === "text") {
     let html = escape(node.text ?? "");
@@ -310,6 +301,8 @@ function renderTiptap(node) {
       else if (mark.type === "italic") html = `<em>${html}</em>`;
       else if (mark.type === "code") html = `<code>${html}</code>`;
       else if (mark.type === "strike") html = `<s>${html}</s>`;
+      else if (mark.type === "underline") html = `<u>${html}</u>`;
+      else if (mark.type === "highlight") html = `<mark>${html}</mark>`;
       else if (mark.type === "link") {
         const href = escape(String(mark.attrs?.href ?? "#"));
         html = `<a href="${href}" target="_blank" rel="noopener">${html}</a>`;
@@ -322,10 +315,10 @@ function renderTiptap(node) {
     case "doc":
       return children;
     case "paragraph":
-      return `<p>${children}</p>`;
+      return `<p${textAlignStyle(node.attrs)}>${children}</p>`;
     case "heading": {
       const level = Number(node.attrs?.level ?? 1);
-      return `<h${level}>${children}</h${level}>`;
+      return `<h${level}${textAlignStyle(node.attrs)}>${children}</h${level}>`;
     }
     case "bulletList":
       return `<ul>${children}</ul>`;
@@ -350,52 +343,39 @@ function renderTiptap(node) {
       const display = node.attrs?.display ? ` data-display="${escape(String(node.attrs.display))}"` : "";
       return `<img src="${src}" alt="${alt}"${title}${display} loading="lazy" />`;
     }
+    case "table":
+      return `<table class="tiptap-table"><tbody>${children}</tbody></table>`;
+    case "tableRow":
+      return `<tr>${children}</tr>`;
+    case "tableHeader":
+      return `<th${tableCellAttrs(node.attrs)}>${children}</th>`;
+    case "tableCell":
+      return `<td${tableCellAttrs(node.attrs)}>${children}</td>`;
+    case "taskList":
+      return `<ul data-type="taskList">${children}</ul>`;
+    case "taskItem": {
+      const checked = node.attrs?.checked === true ? "true" : "false";
+      return `<li data-type="taskItem" data-checked="${checked}">${children}</li>`;
+    }
     default:
       return children;
   }
 }
-function renderMarkdown(md) {
-  const lines = md.split("\n");
-  const out = [];
-  let i = 0;
-  while (i < lines.length) {
-    const line = lines[i] ?? "";
-    if (line.startsWith("# ")) {
-      out.push(`<h1>${escape(line.slice(2))}</h1>`);
-      i++;
-    } else if (line.startsWith("## ")) {
-      out.push(`<h2>${escape(line.slice(3))}</h2>`);
-      i++;
-    } else if (line.startsWith("```")) {
-      const lang = line.slice(3).trim();
-      const code = [];
-      i++;
-      while (i < lines.length && !(lines[i] ?? "").startsWith("```")) {
-        code.push(lines[i] ?? "");
-        i++;
-      }
-      i++;
-      out.push(
-        `<pre><code${lang ? ` class="language-${escape(lang)}"` : ""}>${escape(code.join("\n"))}</code></pre>`
-      );
-    } else if (line.startsWith("- ")) {
-      const items = [];
-      while (i < lines.length && (lines[i] ?? "").startsWith("- ")) {
-        items.push(`<li>${renderInlineMarkdown((lines[i] ?? "").slice(2))}</li>`);
-        i++;
-      }
-      out.push(`<ul>${items.join("")}</ul>`);
-    } else if (line.trim() === "") {
-      i++;
-    } else {
-      out.push(`<p>${renderInlineMarkdown(line)}</p>`);
-      i++;
-    }
+function tableCellAttrs(attrs) {
+  let out = "";
+  const colspan = Number(attrs?.colspan ?? 1);
+  if (colspan > 1) out += ` colspan="${colspan}"`;
+  const rowspan = Number(attrs?.rowspan ?? 1);
+  if (rowspan > 1) out += ` rowspan="${rowspan}"`;
+  const colwidth = attrs?.colwidth;
+  if (Array.isArray(colwidth) && colwidth.length > 0) {
+    const w = Number(colwidth[0]);
+    if (Number.isFinite(w) && w > 0) out += ` style="width: ${w}px"`;
   }
-  return out.join("\n");
+  return out;
 }
-function renderInlineMarkdown(text) {
-  return text.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/`([^`]+)`/g, "<code>$1</code>").replace(/\*\*([^*]+)\*\*/g, "<strong>$1</strong>");
+function renderMarkdown(md) {
+  return marked.parse(md, { gfm: true, breaks: false, async: false });
 }
 function renderBody(post) {
   if (post.format === "html") return String(post.body);
@@ -426,6 +406,8 @@ function tiptapNodeToMarkdown(node) {
       else if (mark.type === "italic") txt = `*${txt}*`;
       else if (mark.type === "code") txt = `\`${txt}\``;
       else if (mark.type === "strike") txt = `~~${txt}~~`;
+      else if (mark.type === "underline") txt = `<u>${txt}</u>`;
+      else if (mark.type === "highlight") txt = `<mark>${txt}</mark>`;
       else if (mark.type === "link") txt = `[${txt}](${String(mark.attrs?.href ?? "#")})`;
     }
     return txt;
@@ -463,12 +445,54 @@ function tiptapNodeToMarkdown(node) {
       const alt = String(node.attrs?.alt ?? "");
       return `![${alt}](${src})`;
     }
+    case "table":
+      return tiptapTableToMarkdown(node);
+    case "taskList":
+      return children + "\n";
+    case "taskItem": {
+      const checked = node.attrs?.checked === true ? "x" : " ";
+      const inner = children.replace(/\n+$/, "");
+      const [first, ...rest] = inner.split("\n");
+      const cont = rest.map((l) => l ? "  " + l : l).join("\n");
+      return `- [${checked}] ${first ?? ""}${cont ? "\n" + cont : ""}
+`;
+    }
     default:
       return children;
   }
 }
+function tiptapTableToMarkdown(node) {
+  const rows = node.content ?? [];
+  if (rows.length === 0) return "";
+  const renderedRows = [];
+  let headerIdx = -1;
+  for (let i = 0; i < rows.length; i++) {
+    const row = rows[i];
+    const cells = row.content ?? [];
+    const cellTexts = cells.map((c) => {
+      const inner = (c.content ?? []).map(tiptapNodeToMarkdown).join("");
+      return inner.replace(/\n+$/, "").replace(/\n/g, "<br>").replace(/\|/g, "\\|");
+    });
+    renderedRows.push(cellTexts);
+    if (headerIdx === -1 && cells.some((c) => c.type === "tableHeader")) headerIdx = i;
+  }
+  if (headerIdx === -1) headerIdx = 0;
+  const header = renderedRows[headerIdx] ?? [];
+  const body = renderedRows.filter((_, i) => i !== headerIdx);
+  const cols = header.length;
+  const headerLine = "| " + header.join(" | ") + " |";
+  const sepLine = "| " + Array.from({ length: cols }, () => "---").join(" | ") + " |";
+  const bodyLines = body.map((r) => {
+    const cells = Array.from({ length: cols }, (_, i) => r[i] ?? "");
+    return "| " + cells.join(" | ") + " |";
+  });
+  return "\n" + [headerLine, sepLine, ...bodyLines].join("\n") + "\n\n";
+}
 function htmlToMarkdown(html) {
   let md = html;
+  md = md.replace(/<table[^>]*>([\s\S]*?)<\/table>/gi, (_, inner) => {
+    return "\n" + convertHtmlTable(String(inner)) + "\n";
+  });
   md = md.replace(/<h([1-6])[^>]*>([\s\S]*?)<\/h\1>/gi, (_, level, text) => {
     return "\n" + "#".repeat(Number(level)) + " " + String(text).trim() + "\n\n";
   });
@@ -481,6 +505,9 @@ function htmlToMarkdown(html) {
   md = md.replace(/<blockquote[^>]*>([\s\S]*?)<\/blockquote>/gi, (_, content) => {
     return "\n" + String(content).trim().split("\n").map((l) => "> " + l).join("\n") + "\n\n";
   });
+  md = md.replace(/<ul[^>]*data-type="taskList"[^>]*>([\s\S]*?)<\/ul>/gi, (_, items) => {
+    return "\n" + convertHtmlTaskList(String(items)) + "\n";
+  });
   md = md.replace(/<ul[^>]*>([\s\S]*?)<\/ul>/gi, (_, items) => {
     return "\n" + String(items).replace(/<li[^>]*>([\s\S]*?)<\/li>/gi, "- $1\n") + "\n";
   });
@@ -500,11 +527,63 @@ function htmlToMarkdown(html) {
   md = md.replace(/<(em|i)>([\s\S]*?)<\/\1>/gi, "*$2*");
   md = md.replace(/<s>([\s\S]*?)<\/s>/gi, "~~$1~~");
   md = md.replace(/<code>([\s\S]*?)<\/code>/gi, "`$1`");
+  const PH_U_OPEN = "AMP_U_OPEN";
+  const PH_U_CLOSE = "AMP_U_CLOSE";
+  const PH_MARK_OPEN = "AMP_MARK_OPEN";
+  const PH_MARK_CLOSE = "AMP_MARK_CLOSE";
+  md = md.replace(/<u>([\s\S]*?)<\/u>/gi, `${PH_U_OPEN}$1${PH_U_CLOSE}`);
+  md = md.replace(/<mark>([\s\S]*?)<\/mark>/gi, `${PH_MARK_OPEN}$1${PH_MARK_CLOSE}`);
   md = md.replace(/<\/?[^>]+>/g, "");
+  md = md.split(PH_U_OPEN).join("<u>").split(PH_U_CLOSE).join("</u>").split(PH_MARK_OPEN).join("<mark>").split(PH_MARK_CLOSE).join("</mark>");
   md = md.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&nbsp;/g, " ");
   md = md.replace(/\n{3,}/g, "\n\n");
   return md.trim() + "\n";
 }
+function convertHtmlTable(inner) {
+  const stripped = inner.replace(/<\/?(thead|tbody)[^>]*>/gi, "");
+  const rowRe = /<tr[^>]*>([\s\S]*?)<\/tr>/gi;
+  const rows = [];
+  let m;
+  while ((m = rowRe.exec(stripped)) !== null) {
+    const rowHtml = m[1] ?? "";
+    const cellRe = /<(th|td)[^>]*>([\s\S]*?)<\/\1>/gi;
+    const cells = [];
+    let isHeader = false;
+    let cm;
+    while ((cm = cellRe.exec(rowHtml)) !== null) {
+      if ((cm[1] ?? "").toLowerCase() === "th") isHeader = true;
+      cells.push(normalizeTableCell(cm[2] ?? ""));
+    }
+    if (cells.length > 0) rows.push({ isHeader, cells });
+  }
+  if (rows.length === 0) return "";
+  let headerIdx = rows.findIndex((r) => r.isHeader);
+  if (headerIdx === -1) headerIdx = 0;
+  const header = rows[headerIdx].cells;
+  const body = rows.filter((_, i) => i !== headerIdx).map((r) => r.cells);
+  const cols = header.length;
+  const headerLine = "| " + header.join(" | ") + " |";
+  const sepLine = "| " + Array.from({ length: cols }, () => "---").join(" | ") + " |";
+  const bodyLines = body.map((cells) => {
+    const padded = Array.from({ length: cols }, (_, i) => cells[i] ?? "");
+    return "| " + padded.join(" | ") + " |";
+  });
+  return [headerLine, sepLine, ...bodyLines].join("\n") + "\n";
+}
+function normalizeTableCell(html) {
+  return html.replace(/<br\s*\/?>/gi, " ").replace(/<\/?[^>]+>/g, "").replace(/\|/g, "\\|").replace(/\s+/g, " ").trim();
+}
+function convertHtmlTaskList(items) {
+  const liRe = /<li[^>]*data-checked="(true|false)"[^>]*>([\s\S]*?)<\/li>/gi;
+  const out = [];
+  let m;
+  while ((m = liRe.exec(items)) !== null) {
+    const checked = m[1] === "true" ? "x" : " ";
+    const inner = String(m[2] ?? "").replace(/<\/?p[^>]*>/gi, "").trim();
+    out.push(`- [${checked}] ${inner}`);
+  }
+  return out.join("\n");
+}
 
 // src/index.ts
 function createAmpless(opts) {
@@ -517,13 +596,13 @@ function createAmpless(opts) {
   const themeConfig = createThemeConfig(themeActive, storage);
   return {
     listPublishedPosts: (o) => posts.listPublishedPosts(o),
-    getPublishedPost: (slug, o) => posts.getPublishedPost(slug, o),
+    getPublishedPost: (slug) => posts.getPublishedPost(slug),
     listPostsByTag: (tag, o) => posts.listPostsByTag(tag, o),
-    loadSiteSettings: (siteId) => settings.loadSiteSettings(siteId),
-    resolveActiveTheme: (siteId) => themeActive.resolveActiveTheme(siteId),
-    loadThemeConfig: (siteId) => themeConfig.loadThemeConfig(siteId),
-    postMetadata: (post, siteId) => seo.postMetadata(post, siteId),
-    siteMetadata: (siteId) => seo.siteMetadata(siteId),
+    loadSiteSettings: () => settings.loadSiteSettings(),
+    resolveActiveTheme: () => themeActive.resolveActiveTheme(),
+    loadThemeConfig: () => themeConfig.loadThemeConfig(),
+    postMetadata: (post) => seo.postMetadata(post),
+    siteMetadata: () => seo.siteMetadata(),
     renderBody: (post) => renderBody(post),
     renderThemeCss: (cssVars) => renderThemeCss(cssVars),
     publicAssetUrl: (key) => storage.publicAssetUrl(key),

package/dist/middleware.d.ts

@@ -8,24 +8,26 @@ type MiddlewareFn = (request: NextRequest) => NextResponse;
 /**
  * Build the ampless public-site middleware. Performs:
  *
- *  - hostname → siteId resolution (multi-site rewrites)
- *  - `/path` → `/site/<siteId>/path` internal rewrite
+ *  - `/path` → `/site/default/path` internal rewrite
+ *  - `/_/<slug>(/...)` → `/site/default/r/<slug>(/...)` rewrite for
+ *    the unified bare-HTML / static-bundle route
  *  - `?previewTheme=<name>` → `x-preview-theme` header forwarding
- *  - `Cache-Control: private, no-store` in multi-site mode (Amplify
- *    Hosting's CloudFront cache key doesn't include Host, so SSR
- *    responses would cross-contaminate at the same path)
  *
- * No-layout / bare-HTML routing is data-driven: the theme post
- * dispatcher reads `post.metadata.no_layout` and redirects to
- * `/raw/<slug>` when set. The plain prefix-prepend below picks up
- * that path because the raw route lives at
- * `app/site/<siteId>/raw/<slug>/route.ts` — no special middleware
- * branch is needed.
+ * Bare-HTML / static routing is data-driven: the theme post dispatcher
+ * redirects `metadata.no_layout` and `format='static'` posts to
+ * `/_/<slug>`. The middleware rewrites the public `_` prefix to the
+ * routable internal folder name `r/`, because Next.js's App Router
+ * excludes any path part starting with `_` during route discovery
+ * (see `recursive-readdir` + `ignorePartFilter` in
+ * `next/dist/build/route-discovery.js`). The browser URL stays
+ * `/_/<slug>(/...)`; only the rewrite target uses `r/`.
  *
- * The factory captures the multi-site flag at construction time so the
- * hot path stays a pair of cheap header lookups.
+ * Single site per Amplify deployment: the rewritten internal path uses
+ * the fixed `default` segment. The internal `/site/[siteId]/` routing
+ * tree is retained as an implementation detail; a follow-up PR
+ * flattens the URL structure further.
  */
-declare function createAmplessMiddleware({ cmsConfig }: CreateMiddlewareOpts): MiddlewareFn;
+declare function createAmplessMiddleware(_opts: CreateMiddlewareOpts): MiddlewareFn;
 /**
  * Reference matcher config — admin / api / login / static assets /
  * amplify_outputs.json are excluded so middleware doesn't rewrite

package/dist/middleware.js

@@ -1,31 +1,22 @@
 // src/middleware.ts
 import { NextResponse } from "next/server";
-import { resolveSiteId, isMultiSite } from "ampless";
-function createAmplessMiddleware({ cmsConfig }) {
-  const MULTI_SITE = isMultiSite(cmsConfig);
+var INTERNAL_SITE_SEGMENT = "default";
+function createAmplessMiddleware(_opts) {
   return function middleware(request) {
-    const host = (request.headers.get("host") ?? "").split(":")[0];
-    const siteId = resolveSiteId(host ?? "", cmsConfig);
-    if (!siteId) {
-      return new NextResponse("Site not found", { status: 404 });
-    }
     const url = request.nextUrl.clone();
     if (!url.pathname.startsWith("/site/")) {
-      const tail = url.pathname === "/" ? "" : url.pathname;
-      url.pathname = `/site/${siteId}${tail}`;
+      let tail = url.pathname === "/" ? "" : url.pathname;
+      if (tail === "/_" || tail.startsWith("/_/")) {
+        tail = `/r${tail.slice(2)}`;
+      }
+      url.pathname = `/site/${INTERNAL_SITE_SEGMENT}${tail}`;
     }
     const previewTheme = url.searchParams.get("previewTheme");
     const previewColorScheme = url.searchParams.get("previewColorScheme");
     const requestHeaders = new Headers(request.headers);
-    requestHeaders.set("x-site-id", siteId);
     if (previewTheme) requestHeaders.set("x-preview-theme", previewTheme);
     if (previewColorScheme) requestHeaders.set("x-preview-color-scheme", previewColorScheme);
-    const response = NextResponse.rewrite(url, { request: { headers: requestHeaders } });
-    response.headers.set("x-site-id", siteId);
-    if (MULTI_SITE) {
-      response.headers.set("Cache-Control", "private, no-store");
-    }
-    return response;
+    return NextResponse.rewrite(url, { request: { headers: requestHeaders } });
   };
 }
 var defaultMatcherConfig = {