@tinacms/app 2.4.7 → 2.5.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @tinacms/app
 
+## 2.5.0
+
+### Minor Changes
+
+- [#6843](https://github.com/tinacms/tinacms/pull/6843) [`0509095`](https://github.com/tinacms/tinacms/commit/0509095601fedc87f05a622e219e6414ef51a6b6) Thanks [@wicksipedia](https://github.com/wicksipedia)! - Support TinaCMS visual editing on statically-built Astro pages.
+
+  Wrap editable regions in `<TinaIsland>` and visual editing now works under `output: 'static'` (and mixed static/SSR), provided the adapter can serve the one on-demand route `/tina-island/[name]`. Highlights:
+
+  - **Static page support.** `<TinaIsland>` emits a tiny in-iframe bootstrap that fetches `/admin/bridge.js`; on init the bridge "primes" any page with island markers but no server-injected form payloads by calling the island endpoints, which now return the page's form payloads alongside region HTML.
+  - **Bridge served as a static asset.** Dropped the injected `/_tina/bridge.js` route (some adapters 404'd it) in favour of serving `/admin/bridge.js` from a dev-only Vite plugin and emitting the bundle into the build client output — no source-tree writes. The `@tinacms/astro/bridge-route` subpath export is removed.
+  - **Re-prime on soft navigation.** `refreshForms` now re-primes when it sees island markers without server-injected payloads, so Astro `ClientRouter` swaps work without a hard reload.
+  - **Primary-form selection.** Mark the page's main form via `requestWithMetadata(..., { priority: 'primary' })` (SSR) or the `primary` prop on `<TinaIsland>` (static); the admin reducer routes around its default selection so multi-form pages no longer land on "Referenced Files".
+  - **Prerender-safe middleware.** `tina()` now short-circuits on `context.isPrerendered`, fixing the `Astro.request.headers` warnings that fired on every prerendered route during `astro build`.
+  - **New `tinaAdminDevRedirect` Vite plugin** at `@tinacms/astro/vite` — redirects `/admin` and `/admin/` to `/admin/index.html` during `astro dev` so a bare `/admin` request lands on the SPA.
+
+### Patch Changes
+
+- [#6938](https://github.com/tinacms/tinacms/pull/6938) [`4757225`](https://github.com/tinacms/tinacms/commit/475722599ff350b45bfdb4f7a6af2e37d33c81c3) Thanks [@isaaclombardssw](https://github.com/isaaclombardssw)! - chore(deps): upgrade react-router-dom from 6.3.0 to ^6.30.3 to resolve GHSA-9jcx-v3wj-wh4m (unexpected external redirect via untrusted paths)
+
+- Updated dependencies [[`33feeac`](https://github.com/tinacms/tinacms/commit/33feeacf6585be2736a0a14c5a800c1b6db34e44), [`8ac0776`](https://github.com/tinacms/tinacms/commit/8ac0776dea0c0650a5e5098c143b24c17fc25b8e), [`df50cbf`](https://github.com/tinacms/tinacms/commit/df50cbf35536bf2028a742832aebd57701dc3bb6), [`b9eaf61`](https://github.com/tinacms/tinacms/commit/b9eaf61c28c25814ae65b5fbe72d5b33df0b3596), [`cf73a11`](https://github.com/tinacms/tinacms/commit/cf73a115c3a58fac26e2518734dd3cb49133260d), [`4757225`](https://github.com/tinacms/tinacms/commit/475722599ff350b45bfdb4f7a6af2e37d33c81c3)]:
+  - tinacms@3.8.2
+  - @tinacms/mdx@2.1.5
+
+## 2.4.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - tinacms@3.8.1
+
 ## 2.4.7
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/app",
-  "version": "2.4.7",
+  "version": "2.5.0",
   "main": "src/main.tsx",
   "license": "Apache-2.0",
   "devDependencies": {
@@ -23,11 +23,11 @@
     "monaco-editor": "0.31.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "6.3.0",
+    "react-router-dom": "^6.30.3",
     "typescript": "^5.7.3",
     "zod": "^3.24.2",
-    "tinacms": "3.8.0",
-    "@tinacms/mdx": "2.1.4"
+    "tinacms": "3.8.2",
+    "@tinacms/mdx": "2.1.5"
   },
   "repository": {
     "url": "https://github.com/tinacms/tinacms.git",

package/src/lib/graphql-reducer.ts

@@ -190,6 +190,13 @@ export const useGraphQLReducer = (
     ResolvedDocument[]
   >([]);
   const [operationIndex, setOperationIndex] = React.useState(0);
+  // Pending `user-select-form` request whose form hasn't been built yet.
+  // Set when the bridge's `open` is still in flight (the bridge retries
+  // user-select-form but stops once it sees `updateData`, so we can't
+  // rely on a future message landing after `forms:add` resolves).
+  const [pendingPrimaryId, setPendingPrimaryId] = React.useState<string | null>(
+    null
+  );
 
   const activeField = searchParams.get('active-field');
 
@@ -498,13 +505,32 @@ export const useGraphQLReducer = (
     ]
   );
 
+  // The bridge sends `formId` keyed by query id (hashFromQuery output), but
+  // `state.forms` is keyed by document path. Match by either so callers using
+  // `useTina`'s `experimental___selectFormByFormId` (which usually returns a
+  // path) keep working too. Returns false when the form isn't built yet.
+  const activateFormByWireId = React.useCallback(
+    (wireId: string): boolean => {
+      const match = cms.state.forms.find(
+        ({ tinaForm }) =>
+          tinaForm.id === wireId || tinaForm.queries.includes(wireId)
+      );
+      if (!match) return false;
+      cms.dispatch({
+        type: 'forms:set-active-form-id',
+        value: match.tinaForm.id,
+      });
+      return true;
+    },
+    [cms]
+  );
+
   const handleMessage = React.useCallback(
     (event: MessageEvent<PostMessage>) => {
       if (event.data.type === 'user-select-form') {
-        cms.dispatch({
-          type: 'forms:set-active-form-id',
-          value: event.data.formId,
-        });
+        const incoming = event.data.formId;
+        // Buffer until `forms:add` resolves it if the form isn't built yet.
+        setPendingPrimaryId(activateFormByWireId(incoming) ? null : incoming);
       }
 
       if (event?.data?.type === 'quick-edit') {
@@ -586,11 +612,20 @@ export const useGraphQLReducer = (
     return () => {
       setPayloads([]);
       setResults([]);
+      setPendingPrimaryId(null);
       cms.removeAllForms();
       cms.dispatch({ type: 'form-lists:clear' });
     };
   }, [url]);
 
+  // Drain a buffered `user-select-form` once the matching form lands in
+  // `state.forms`. Watches `forms.length` rather than the array identity
+  // so the effect doesn't re-run on unrelated form mutations.
+  React.useEffect(() => {
+    if (!pendingPrimaryId) return;
+    if (activateFormByWireId(pendingPrimaryId)) setPendingPrimaryId(null);
+  }, [cms.state.forms.length, pendingPrimaryId, activateFormByWireId]);
+
   React.useEffect(() => {
     iframe.current?.contentWindow?.postMessage({
       type: 'quickEditEnabled',
@@ -1005,6 +1040,13 @@ const buildForm = ({
     }
   }
   if (form) {
+    // Track the payload (query) id on the form so wire-side lookups —
+    // notably `user-select-form`, which the bridge sends keyed by query
+    // id — can resolve to the document-path-keyed `form.id` used in
+    // `state.forms`. `addQuery` is otherwise only called on the second
+    // open for the same document (see the `existingForm` branch above),
+    // so without this the very first open leaves `form.queries` empty.
+    form.addQuery(payloadId);
     if (shouldRegisterForm) {
       if (collection.ui?.global) {
         cms.plugins.add(new GlobalFormPlugin(form));