@tinacms/astro 0.2.0 → 0.4.0

package/README.md

@@ -14,11 +14,11 @@ pnpm add @tinacms/astro tinacms
 pnpm add -D @tinacms/cli
 ```
 
-Requires Astro 5. Also needs an SSR adapter (`@astrojs/node`, `vercel`, `netlify`, or `cloudflare`) and `output: 'server'` in your Astro config.
+Requires Astro 5 or 6 and an SSR adapter (`@astrojs/node`, `vercel`, `netlify`, or `cloudflare`) — the island-refresh endpoint (`/tina-island/[name]`) is on-demand. `output: 'server'` is the simplest choice; `output: 'static'` also works as long as editable regions are wrapped in [`<TinaIsland>`](#static-site-editing) and the adapter can serve that one on-demand route.
 
 ## Usage
 
-Add the integration to `astro.config.mjs` once. It wires the request-scoped middleware and the dynamic route that serves the bridge — everything else is auto-injected only on edit-mode requests:
+Add the integration to `astro.config.mjs` once. It wires the request-scoped middleware and stages the bundled bridge as a static asset at `/admin/bridge.js` — everything else is auto-injected only on edit-mode requests:
 
 ```ts
 // astro.config.mjs
@@ -52,24 +52,37 @@ const post = await requestWithMetadata(
 </article>
 ```
 
-That's the whole user surface. No wiring component in your layout, no `forms` prop to maintain, no `Astro.request` to thread. The integration's middleware buffers each HTML response, and on edit-mode requests splices the form payloads and a `<script type="module" src="/_tina/bridge.js">` before `</head>`. Production visitors get **byte-identical HTML to a Tina-free Astro app** — no `data-tina-form` divs, no script tag, no bundle preload.
+That's the whole user surface. No wiring component in your layout, no `forms` prop to maintain, no `Astro.request` to thread. The integration's middleware buffers each HTML response, and on edit-mode requests splices the form payloads and a `<script type="module" src="/admin/bridge.js">` before `</head>`. Production visitors get **byte-identical HTML to a Tina-free Astro app** — no `data-tina-form` divs, no script tag, no bundle preload. (Exception: pages that use [`<TinaIsland>`](#static-site-editing) carry a one-line inline bootstrap so editing also works when the page is statically built.)
 
 For cross-origin admin deployments (Codespaces, separate-domain self-hosted), set `PUBLIC_TINA_ADMIN_ORIGIN` in your env (comma-separate to allow multiple). The middleware embeds it inline so the bridge validates inbound `postMessage` events.
 
+## Static-site editing
+
+`output: 'static'` is supported. The middleware described above only runs on on-demand-rendered routes, so on a prerendered page it never injects anything — instead, **`<TinaIsland>` emits a tiny in-iframe bootstrap script** that loads `/admin/bridge.js` *only* when the page is inside the admin iframe (a no-op for everyone else). On boot the bridge "primes" the page by fetching each island's `/tina-island/[name]` endpoint — which is `prerender = false`, so the adapter still renders it on demand — to pick up the page's form payloads, after which editing works exactly as it does in an SSR project.
+
+Requirements for static editing:
+
+- Wrap every editable region in `<TinaIsland>` with a registered island (see [GETTING_STARTED.md](./GETTING_STARTED.md) steps 5–7) — that's both how the bridge re-renders regions and how the bootstrap gets onto the page.
+- Pass `primary` on your page's main `<TinaIsland>` (`<TinaIsland name="post" params={{ slug }} primary>`). On a static page the bridge can't tell which island is "the page", so without this the editor may land on the multi-document "Referenced Files" list when the page also has e.g. a global-config form. (On SSR pages the first `requestWithMetadata()` call is treated as primary automatically; pass `{ priority: 'primary' }` as the second argument if you need to override that.) Mark at most one per page.
+- Keep the `tina-island/[name].ts` route (`export const prerender = false`).
+
+Trade-off: a page that uses `<TinaIsland>` carries that one-line inline bootstrap in its production HTML, so it's no longer byte-identical to a Tina-free Astro app. Pages without `<TinaIsland>` are unaffected. (On `output: 'server'` the middleware path is unchanged; the bootstrap and the middleware's own injection coexist harmlessly — `bridge.init()` is idempotent.)
+
 ## Subpath exports
 
 | Subpath | What it gives you |
 |---------|-------------------|
 | `@tinacms/astro` | `requestWithMetadata`, `tinaField`, `QueryResult`, and types |
 | `@tinacms/astro/TinaMarkdown.astro` | `<TinaMarkdown content components />` — rich-text renderer. Import from this subpath so Astro's check sees a real `.astro` component (the bare-package default resolves through the types condition to a placeholder). |
-| `@tinacms/astro/integration` | `tina()` integration — auto-wires middleware + bridge route so `requestWithMetadata()` works without you threading `Astro.request` or writing wiring components |
-| `@tinacms/astro/TinaIsland.astro` | `<TinaIsland name wrapper params />` — marker wrapper for an editable region |
+| `@tinacms/astro/integration` | `tina()` integration — auto-wires the middleware and stages the static `/admin/bridge.js` asset so `requestWithMetadata()` works without you threading `Astro.request` or writing wiring components |
+| `@tinacms/astro/TinaIsland.astro` | `<TinaIsland name wrapper params [primary] />` — marker wrapper for an editable region; pass `primary` on the page's main region so the editor opens that form instead of the "Referenced Files" list |
 | `@tinacms/astro/types` | `TinaRichTextContent`, `CustomComponentsMap`, `TinaRichTextNode`, `MdxElement`, `TextElement` |
 | `@tinacms/astro/sanitize` | `sanitizeHref` / `sanitizeImageSrc` for CMS-supplied URLs |
 | `@tinacms/astro/bridge` | `init`, `refreshForms`, and the rest of `@tinacms/bridge` |
 | `@tinacms/astro/tina-field` | `tinaField()` helper |
 | `@tinacms/astro/is-edit-mode` | `isEditMode(request)` — server-side admin-iframe detection |
 | `@tinacms/astro/middleware` | The middleware the integration auto-wires — exported here in case you need to compose it manually |
+| `@tinacms/astro/vite` | `tinaAdminDevRedirect()` — dev-only Vite plugin that redirects `/admin` and `/admin/` to `/admin/index.html` so the admin SPA is reachable from a bare URL during `astro dev` |
 | `@tinacms/astro/experimental` | `experimental_createIslandRoute()` — opt-in helper built on Astro's unstable `experimental_AstroContainer` |
 
 ## Custom MDX components
@@ -148,7 +161,7 @@ CMS-supplied URLs in `a` and `img` nodes pass through `sanitizeHref` / `sanitize
 
 ## Testing
 
-Tests use Astro 5's [`experimental_AstroContainer`](https://docs.astro.build/en/reference/container-reference/). Fixtures are synced from `@tinacms/mdx`'s parser test corpus so renderer assertions track real editor output.
+Tests use Astro's [`experimental_AstroContainer`](https://docs.astro.build/en/reference/container-reference/). Fixtures are synced from `@tinacms/mdx`'s parser test corpus so renderer assertions track real editor output.
 
 ```bash
 pnpm test

package/dist/data.d.ts

@@ -4,13 +4,16 @@ export interface QueryResult<TData> {
     variables: Record<string, unknown>;
     id: string;
 }
-/** Shape every `client.queries.<name>` returns. Inferring from this lets
- *  `requestWithMetadata()` stay framework-agnostic — it doesn't need to
- *  know about `PostQuery`, `PageQuery`, etc. */
 type ClientResult<TData> = {
     data: TData;
     query: string;
     variables: Record<string, unknown>;
 } | null | undefined;
-export declare function requestWithMetadata<TData>(source: ClientResult<TData> | Promise<ClientResult<TData>>): Promise<QueryResult<TData>>;
+export interface RequestOptions {
+    /** Mark the page's own document so the admin opens it on load instead
+     *  of a layout-level global. Mirrors `useTina`'s
+     *  `experimental___selectFormByFormId`. */
+    priority?: 'primary';
+}
+export declare function requestWithMetadata<TData>(source: ClientResult<TData> | Promise<ClientResult<TData>>, options?: RequestOptions): Promise<QueryResult<TData>>;
 export {};

package/dist/data.js

@@ -10,7 +10,11 @@ var formsStore = slot[STORE_KEY] ??= new AsyncLocalStorage();
 function recordForm(form) {
   const list = formsStore.getStore();
   if (!list) return;
-  if (list.some((existing) => existing.id === form.id)) return;
+  const existing = list.find((entry) => entry.id === form.id);
+  if (existing) {
+    if (form.priority === "primary") existing.priority = "primary";
+    return;
+  }
   list.push(form);
 }
 
@@ -21,7 +25,7 @@ var slot2 = globalThis;
 var requestStore = slot2[STORE_KEY2] ??= new AsyncLocalStorage2();
 
 // src/data.ts
-async function requestWithMetadata(source) {
+async function requestWithMetadata(source, options) {
   let result = null;
   try {
     result = await source ?? null;
@@ -50,7 +54,8 @@ async function requestWithMetadata(source) {
     id,
     query,
     variables,
-    data: enriched.data
+    data: enriched.data,
+    priority: options?.priority
   });
   return enriched;
 }

package/dist/data.test-d.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/experimental.js

@@ -1,12 +1,32 @@
 // src/island-route.ts
+import { PREVIEW_CONTENT_TYPE, PRIME_HEADER } from "@tinacms/bridge/preview";
 import { experimental_AstroContainer as AstroContainer } from "astro/container";
-import { PREVIEW_CONTENT_TYPE } from "@tinacms/bridge/preview";
 
 // src/internal/escape.ts
 function escapeAttr(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
 }
 
+// src/internal/forms-store.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var STORE_KEY = Symbol.for("@tinacms/astro/forms-store");
+var slot = globalThis;
+var formsStore = slot[STORE_KEY] ??= new AsyncLocalStorage();
+function sortByPriority(forms) {
+  return [...forms].sort(
+    (a, b) => (a.priority === "primary" ? 0 : 1) - (b.priority === "primary" ? 0 : 1)
+  );
+}
+function renderFormPayloadDiv(form, primary) {
+  return `<div data-tina-form="${escapeAttr(JSON.stringify(form))}"${primary ? " data-tina-primary" : ""} hidden></div>`;
+}
+
+// src/internal/request-context.ts
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
+var STORE_KEY2 = Symbol.for("@tinacms/astro/request-context");
+var slot2 = globalThis;
+var requestStore = slot2[STORE_KEY2] ??= new AsyncLocalStorage2();
+
 // src/island-route.ts
 function experimental_createIslandRoute(islands) {
   return async ({ params, request, url }) => {
@@ -16,13 +36,21 @@ function experimental_createIslandRoute(islands) {
     if (!island) {
       return new Response(`Unknown island "${params.name}"`, { status: 404 });
     }
+    const priming = request.headers.get(PRIME_HEADER) !== null;
     try {
-      const data = await island.fetch(request, url.searchParams);
-      const container = await AstroContainer.create();
-      const html = await container.renderToString(island.component, {
-        props: island.propsFromData(data, url.searchParams)
-      });
-      return new Response(wrapIsland(html, island.wrapper, url), {
+      const forms = [];
+      const html = await requestStore.run(
+        request,
+        () => formsStore.run(forms, async () => {
+          const data = await island.fetch(request, url.searchParams);
+          const container = await AstroContainer.create();
+          return container.renderToString(island.component, {
+            props: island.propsFromData(data, url.searchParams)
+          });
+        })
+      );
+      const body = (priming ? renderFormPayloads(forms) : "") + wrapIsland(html, island.wrapper, url);
+      return new Response(body, {
         headers: {
           "Content-Type": "text/html; charset=utf-8",
           "Cache-Control": "no-store"
@@ -41,12 +69,14 @@ function rejectIfUnsafe(request) {
   if (!contentType.includes(PREVIEW_CONTENT_TYPE)) {
     return new Response("Not Found", { status: 404 });
   }
-  const fetchSite = request.headers.get("sec-fetch-site");
-  if (fetchSite === "cross-site" || fetchSite === "cross-origin") {
+  if (request.headers.get("sec-fetch-site") === "cross-site") {
     return new Response("Forbidden", { status: 403 });
   }
   return null;
 }
+function renderFormPayloads(forms) {
+  return sortByPriority(forms).map((form) => renderFormPayloadDiv(form, form.priority === "primary")).join("");
+}
 function wrapIsland(html, wrapper, url) {
   const cls = wrapper.className ? ` class="${escapeAttr(wrapper.className)}"` : "";
   const marker = escapeAttr(`${url.pathname}${url.search}`);

package/dist/index.js

@@ -24,7 +24,11 @@ var formsStore = slot[STORE_KEY] ??= new AsyncLocalStorage();
 function recordForm(form) {
   const list = formsStore.getStore();
   if (!list) return;
-  if (list.some((existing) => existing.id === form.id)) return;
+  const existing = list.find((entry) => entry.id === form.id);
+  if (existing) {
+    if (form.priority === "primary") existing.priority = "primary";
+    return;
+  }
   list.push(form);
 }
 
@@ -35,7 +39,7 @@ var slot2 = globalThis;
 var requestStore = slot2[STORE_KEY2] ??= new AsyncLocalStorage2();
 
 // src/data.ts
-async function requestWithMetadata(source) {
+async function requestWithMetadata(source, options) {
   let result = null;
   try {
     result = await source ?? null;
@@ -64,7 +68,8 @@ async function requestWithMetadata(source) {
     id,
     query,
     variables,
-    data: enriched.data
+    data: enriched.data,
+    priority: options?.priority
   });
   return enriched;
 }

package/dist/integration.d.ts

@@ -1,25 +1,5 @@
-/**
- * Tina Astro integration. Wires the middleware that exposes
- * `Astro.locals.tinaEdit` so pages and components can branch on edit
- * context without writing `src/middleware.ts` themselves.
- *
- * Usage:
- *
- * ```ts
- * // astro.config.mjs
- * import { defineConfig } from 'astro/config';
- * import tina from '@tinacms/astro/integration';
- *
- * export default defineConfig({
- *   integrations: [tina()],
- * });
- * ```
- */
 import type { AstroIntegration } from 'astro';
 export interface TinaIntegrationOptions {
-    /** Override the middleware ordering relative to other integrations.
-     *  Defaults to `'pre'` so `Astro.locals.tinaEdit` is populated before
-     *  user middleware sees the request. */
     middlewareOrder?: 'pre' | 'post';
 }
 export default function tina(options?: TinaIntegrationOptions): AstroIntegration;

package/dist/integration.js

@@ -1,22 +1,69 @@
 // src/integration.ts
+import { copyFileSync, mkdirSync, readFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import { join } from "node:path";
+import { fileURLToPath } from "node:url";
+var BRIDGE_ROUTE = "/admin/bridge.js";
 function tina(options = {}) {
   const { middlewareOrder = "pre" } = options;
+  let clientDir;
   return {
     name: "@tinacms/astro",
     hooks: {
-      "astro:config:setup": ({ addMiddleware, injectRoute }) => {
+      "astro:config:setup": ({ addMiddleware, updateConfig }) => {
         addMiddleware({
           entrypoint: "@tinacms/astro/middleware",
           order: middlewareOrder
         });
-        injectRoute({
-          pattern: "/_tina/bridge.js",
-          entrypoint: "@tinacms/astro/bridge-route"
-        });
+        updateConfig({ vite: { plugins: [bridgeDevPlugin()] } });
+      },
+      "astro:config:done": ({ config }) => {
+        clientDir = config.build.client;
+      },
+      "astro:build:done": ({ logger }) => {
+        if (!clientDir) return;
+        emitBridgeAsset(fileURLToPath(new URL("admin/", clientDir)), logger);
       }
     }
   };
 }
+function resolveBridge() {
+  return createRequire(import.meta.url).resolve("@tinacms/bridge");
+}
+function bridgeDevPlugin() {
+  return {
+    name: "@tinacms/astro:bridge-dev",
+    apply: "serve",
+    configureServer(server) {
+      server.middlewares.use((req, res, next) => {
+        const path = (req.url || "").split("?")[0];
+        if (path !== BRIDGE_ROUTE) {
+          next();
+          return;
+        }
+        try {
+          const body = readFileSync(resolveBridge());
+          res.setHeader("Content-Type", "text/javascript");
+          res.setHeader("Cache-Control", "no-cache");
+          res.end(body);
+        } catch (error) {
+          res.statusCode = 500;
+          res.end(`/* @tinacms/astro: bridge unavailable: ${error} */`);
+        }
+      });
+    }
+  };
+}
+function emitBridgeAsset(adminDir, logger) {
+  try {
+    mkdirSync(adminDir, { recursive: true });
+    copyFileSync(resolveBridge(), join(adminDir, "bridge.js"));
+  } catch (error) {
+    logger.warn(
+      `could not emit admin/bridge.js \u2014 visual editing will not load: ${error}`
+    );
+  }
+}
 export {
   tina as default
 };

package/dist/internal/admin-origin.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Resolve `PUBLIC_TINA_ADMIN_ORIGIN` (comma-separated allowed) from
+ * Astro's `import.meta.env`. Returns `null` when unset — the bridge then
+ * falls back to `window.location.origin`.
+ */
+export declare function adminOrigins(): string[] | null;

package/dist/internal/forms-store.d.ts

@@ -1,23 +1,12 @@
-/**
- * Per-request collector for `tina()` results. Each call pushes its
- * `{id, query, variables, data}` payload here so the integration's
- * middleware can read the full list at response time and splice the
- * bridge wiring into edit-mode pages — the user never writes a `forms`
- * prop or imports a wiring component.
- *
- * Initialised by the middleware the `tina()` integration injects.
- *
- * The store is keyed by a `Symbol.for(...)` slot on `globalThis` so all
- * bundle copies of this module (esbuild inlines it into each entry that
- * imports it) share the same instance — without that, the middleware
- * would `.run()` one ALS while `tina()` reads from a different one.
- */
 import { AsyncLocalStorage } from 'node:async_hooks';
 export interface CollectedForm {
     id: string;
     query: string;
     variables: object;
     data: object;
+    priority?: 'primary';
 }
 export declare const formsStore: AsyncLocalStorage<CollectedForm[]>;
 export declare function recordForm(form: CollectedForm): void;
+export declare function sortByPriority(forms: CollectedForm[]): CollectedForm[];
+export declare function renderFormPayloadDiv(form: CollectedForm, primary: boolean): string;

package/dist/island-route.d.ts

@@ -1,28 +1,3 @@
-/**
- * Factory for the dynamic `/tina-island/[name]` endpoint the bridge calls
- * to refetch a region with the editor's overlay applied. Each entry in
- * `islands` describes one editable region: how to load its data, which
- * Astro component to render, and the wrapper element the page-side
- * `<div data-tina-island>` is expected to swap.
- *
- * @experimental
- *
- * Built on Astro's `experimental_AstroContainer`, which is itself
- * experimental — Astro may break the underlying API in any minor or patch
- * release. The shape of `createIslandRoute` is similarly experimental and
- * will graduate once the container API stabilises.
- *
- * Usage:
- *
- * ```ts
- * // src/pages/tina-island/[name].ts
- * import { experimental_createIslandRoute } from '@tinacms/astro/experimental';
- * import { islands } from '../../lib/islands';
- *
- * export const prerender = false;
- * export const ALL = experimental_createIslandRoute(islands);
- * ```
- */
 import type { APIRoute } from 'astro';
 import type { AstroComponentFactory } from 'astro/runtime/server/index.js';
 export interface IslandWrapper {

package/dist/island-route.js

@@ -1,12 +1,32 @@
 // src/island-route.ts
+import { PREVIEW_CONTENT_TYPE, PRIME_HEADER } from "@tinacms/bridge/preview";
 import { experimental_AstroContainer as AstroContainer } from "astro/container";
-import { PREVIEW_CONTENT_TYPE } from "@tinacms/bridge/preview";
 
 // src/internal/escape.ts
 function escapeAttr(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
 }
 
+// src/internal/forms-store.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var STORE_KEY = Symbol.for("@tinacms/astro/forms-store");
+var slot = globalThis;
+var formsStore = slot[STORE_KEY] ??= new AsyncLocalStorage();
+function sortByPriority(forms) {
+  return [...forms].sort(
+    (a, b) => (a.priority === "primary" ? 0 : 1) - (b.priority === "primary" ? 0 : 1)
+  );
+}
+function renderFormPayloadDiv(form, primary) {
+  return `<div data-tina-form="${escapeAttr(JSON.stringify(form))}"${primary ? " data-tina-primary" : ""} hidden></div>`;
+}
+
+// src/internal/request-context.ts
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
+var STORE_KEY2 = Symbol.for("@tinacms/astro/request-context");
+var slot2 = globalThis;
+var requestStore = slot2[STORE_KEY2] ??= new AsyncLocalStorage2();
+
 // src/island-route.ts
 function experimental_createIslandRoute(islands) {
   return async ({ params, request, url }) => {
@@ -16,13 +36,21 @@ function experimental_createIslandRoute(islands) {
     if (!island) {
       return new Response(`Unknown island "${params.name}"`, { status: 404 });
     }
+    const priming = request.headers.get(PRIME_HEADER) !== null;
     try {
-      const data = await island.fetch(request, url.searchParams);
-      const container = await AstroContainer.create();
-      const html = await container.renderToString(island.component, {
-        props: island.propsFromData(data, url.searchParams)
-      });
-      return new Response(wrapIsland(html, island.wrapper, url), {
+      const forms = [];
+      const html = await requestStore.run(
+        request,
+        () => formsStore.run(forms, async () => {
+          const data = await island.fetch(request, url.searchParams);
+          const container = await AstroContainer.create();
+          return container.renderToString(island.component, {
+            props: island.propsFromData(data, url.searchParams)
+          });
+        })
+      );
+      const body = (priming ? renderFormPayloads(forms) : "") + wrapIsland(html, island.wrapper, url);
+      return new Response(body, {
         headers: {
           "Content-Type": "text/html; charset=utf-8",
           "Cache-Control": "no-store"
@@ -41,12 +69,14 @@ function rejectIfUnsafe(request) {
   if (!contentType.includes(PREVIEW_CONTENT_TYPE)) {
     return new Response("Not Found", { status: 404 });
   }
-  const fetchSite = request.headers.get("sec-fetch-site");
-  if (fetchSite === "cross-site" || fetchSite === "cross-origin") {
+  if (request.headers.get("sec-fetch-site") === "cross-site") {
     return new Response("Forbidden", { status: 403 });
   }
   return null;
 }
+function renderFormPayloads(forms) {
+  return sortByPriority(forms).map((form) => renderFormPayloadDiv(form, form.priority === "primary")).join("");
+}
 function wrapIsland(html, wrapper, url) {
   const cls = wrapper.className ? ` class="${escapeAttr(wrapper.className)}"` : "";
   const marker = escapeAttr(`${url.pathname}${url.search}`);

package/dist/middleware.d.ts

@@ -1,20 +1,3 @@
-/**
- * Astro middleware injected by the `tina()` integration.
- *
- * - Resolves `isEditMode(request)` once and stashes it on
- *   `context.locals.tinaEdit` so pages and components can branch on edit
- *   context without re-parsing headers.
- * - Scopes the request and a per-request forms collector via
- *   AsyncLocalStorage so `tina()` reads them implicitly — the caller
- *   never threads `Astro.request` through their loaders.
- * - In edit mode only, splices `<div data-tina-form>` payloads and a
- *   `<script>` that loads `/_tina/bridge.js` before `</head>`. The user
- *   writes nothing in their layout, and production HTML is byte-
- *   identical to a Tina-free Astro app.
- * - In edit mode only, refreshes the `__tina_edit` cookie so the session
- *   survives in-iframe link clicks (whose Referer is the previous
- *   preview page, not `/admin/`).
- */
 import type { MiddlewareHandler } from 'astro';
 export declare const onRequest: MiddlewareHandler;
 export default onRequest;

package/dist/middleware.js

@@ -1,13 +1,32 @@
+// src/internal/admin-origin.ts
+function adminOrigins() {
+  const env = import.meta.env;
+  const raw = env?.PUBLIC_TINA_ADMIN_ORIGIN;
+  if (!raw) return null;
+  const origins = raw.split(",").map((s) => s.trim()).filter(Boolean);
+  return origins.length > 0 ? origins : null;
+}
+
+// src/internal/forms-store.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+
 // src/internal/escape.ts
 function escapeAttr(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
 }
 
 // src/internal/forms-store.ts
-import { AsyncLocalStorage } from "node:async_hooks";
 var STORE_KEY = Symbol.for("@tinacms/astro/forms-store");
 var slot = globalThis;
 var formsStore = slot[STORE_KEY] ??= new AsyncLocalStorage();
+function sortByPriority(forms) {
+  return [...forms].sort(
+    (a, b) => (a.priority === "primary" ? 0 : 1) - (b.priority === "primary" ? 0 : 1)
+  );
+}
+function renderFormPayloadDiv(form, primary) {
+  return `<div data-tina-form="${escapeAttr(JSON.stringify(form))}"${primary ? " data-tina-primary" : ""} hidden></div>`;
+}
 
 // src/internal/request-context.ts
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
@@ -50,6 +69,10 @@ function readCookie(request, name) {
 // src/middleware.ts
 var HEAD_CLOSE = "</head>";
 var onRequest = (context, next) => {
+  if (context.isPrerendered) {
+    context.locals.tinaEdit = false;
+    return next();
+  }
   const editing = isEditMode(context.request);
   context.locals.tinaEdit = editing;
   const forms = [];
@@ -86,22 +109,13 @@ function editModeInit(response) {
   return { status: response.status, statusText: response.statusText, headers };
 }
 function renderInjection(forms) {
-  const formDivs = forms.map(
-    (form) => `<div data-tina-form="${escapeAttr(JSON.stringify(form))}" hidden></div>`
-  ).join("");
+  const formDivs = sortByPriority(forms).map((form, i) => renderFormPayloadDiv(form, i === 0)).join("");
   return formDivs + bridgeScript();
 }
 function bridgeScript() {
   const origins = adminOrigins();
   const initArg = origins ? `{adminOrigin:${JSON.stringify(origins)}}` : "";
-  return `<script type="module">import{init,refreshForms}from"/_tina/bridge.js";init(${initArg});document.addEventListener("astro:page-load",refreshForms);</script>`;
-}
-function adminOrigins() {
-  const env = import.meta.env;
-  const raw = env?.PUBLIC_TINA_ADMIN_ORIGIN;
-  if (!raw) return null;
-  const origins = raw.split(",").map((s) => s.trim()).filter(Boolean);
-  return origins.length > 0 ? origins : null;
+  return `<script type="module">import{init,refreshForms}from"/admin/bridge.js";init(${initArg});document.addEventListener("astro:page-load",refreshForms);</script>`;
 }
 export {
   middleware_default as default,

package/dist/vite.d.ts

@@ -0,0 +1,21 @@
+import type { Plugin } from 'vite';
+/**
+ * Dev-only Vite plugin that redirects `/admin` (and `/admin/`) to
+ * `/admin/index.html`.
+ *
+ * In `astro dev`, the admin SPA is served straight from `public/admin/` and
+ * Vite does not resolve a directory index for it, so a bare `/admin` request
+ * 404s. This plugin makes `/admin` land on the SPA the same way it does in a
+ * production build. It only applies to the dev server (`apply: 'serve'`); a
+ * built site serves `public/admin/index.html` itself.
+ *
+ * @example
+ * // astro.config.mjs
+ * import { tinaAdminDevRedirect } from '@tinacms/astro/vite';
+ *
+ * export default defineConfig({
+ *   vite: { plugins: [tinaAdminDevRedirect()] },
+ * });
+ */
+export declare function tinaAdminDevRedirect(): Plugin;
+export default tinaAdminDevRedirect;

package/dist/vite.js

@@ -0,0 +1,24 @@
+// src/vite.ts
+function tinaAdminDevRedirect() {
+  return {
+    name: "tina-admin-dev-redirect",
+    apply: "serve",
+    configureServer(server) {
+      server.middlewares.use((req, res, next) => {
+        const path = (req.url || "").split("?")[0];
+        if (path === "/admin" || path === "/admin/") {
+          res.statusCode = 302;
+          res.setHeader("Location", "/admin/index.html");
+          res.end();
+          return;
+        }
+        next();
+      });
+    }
+  };
+}
+var vite_default = tinaAdminDevRedirect;
+export {
+  vite_default as default,
+  tinaAdminDevRedirect
+};