fimo-next 2.7.1 → 2.8.0-staging.10

package/README.md

@@ -1,6 +1,6 @@
 # fimo-next
 
-The Next.js runtime for Fimo projects. Install it alongside `fimo` and
+The Next.js runtime for Fimo sites. Install it alongside `fimo` and
 `fimo-react` at the same version, plus `@tanstack/react-query`:
 
 ```bash
@@ -9,7 +9,7 @@ npm install fimo fimo-react fimo-next @tanstack/react-query
 
 Render `FimoProvider` once at the application root: from `fimo-next` in the
 App Router root layout (a Server Component), or from `fimo-next/client` in
-`pages/_app.tsx`. It resolves the connection to the linked Fimo project on the
+`pages/_app.tsx`. It resolves the connection to the linked Fimo site on the
 server and passes only public connection data to the browser; the application
 never manages Fimo runtime variables.
 

package/dist/runtime/next/connection/contract.js

@@ -68,5 +68,5 @@ export function parseConnection(text) {
         return null;
     }
 }
-export const NOT_CONNECTED_MESSAGE = 'This Next.js application is not connected to a Fimo project. ' +
+export const NOT_CONNECTED_MESSAGE = 'This Next.js application is not connected to a Fimo site. ' +
     'Run `fimo link` in the project directory, or set FIMO_CONTENT_API_URL to the tenant content API URL.';

package/dist/runtime/next/provider.js

@@ -4,7 +4,7 @@ import { QueryClient, QueryClientContext, QueryClientProvider } from '@tanstack/
 import { createLabels } from 'fimo/labels';
 import { ensurePreviewScript } from 'fimo/preview';
 import { useRouter as usePagesRouter } from 'next/compat/router.js';
-import { usePathname } from 'next/navigation.js';
+import { usePathname, useRouter } from 'next/navigation.js';
 import { createContext, Suspense, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { resolveConnection } from '#connection';
 import { connectClientRuntime } from './client-runtime.js';
@@ -40,23 +40,37 @@ export function FimoProvider({ children, ...props }) {
     const [connection] = useState(resolveConnection);
     return (_jsxs(_Fragment, { children: [_jsx("script", { id: FIMO_CONNECTION_SCRIPT_ID, type: "application/json", dangerouslySetInnerHTML: { __html: serializeConnection(connection) } }), _jsx(FimoClientProvider, { connection: connection, ...props, children: children })] }));
 }
+/**
+ * `next/compat/router` answers only under the Pages Router, and
+ * `next/navigation`'s router hook only under the App Router, so each router
+ * gets its own bridge rather than one component calling a hook that may not
+ * exist.
+ */
 function FimoPreviewRuntime({ previewScriptUrl }) {
+    const pagesRouter = usePagesRouter();
+    return pagesRouter ? (_jsx(PagesRouterPreview, { router: pagesRouter, previewScriptUrl: previewScriptUrl })) : (_jsx(AppRouterPreview, { previewScriptUrl: previewScriptUrl }));
+}
+function AppRouterPreview({ previewScriptUrl }) {
+    const router = useRouter();
+    // The router fetches and renders the picked route; a raw history.pushState
+    // only moved the URL and left the previous page on screen.
+    const navigate = useCallback((to) => router.push(to), [router]);
+    usePreviewBridge(previewScriptUrl, usePathname() ?? '/', navigate);
+    return null;
+}
+function PagesRouterPreview({ router, previewScriptUrl, }) {
+    const pathname = usePathname() ?? router.asPath.split(/[?#]/, 1)[0] ?? '/';
+    const navigate = useCallback((to) => router.push(to), [router]);
+    usePreviewBridge(previewScriptUrl, pathname, navigate);
+    return null;
+}
+function usePreviewBridge(previewScriptUrl, pathname, navigate) {
     const context = useContext(FimoNextContext);
     const locale = context.locale ?? context.connection?.defaultLocale ?? 'en';
-    const appPathname = usePathname();
-    const pagesRouter = usePagesRouter();
-    const pathname = appPathname ?? pagesRouter?.asPath.split(/[?#]/, 1)[0] ?? '/';
-    const navigate = useCallback((to) => {
-        if (pagesRouter) {
-            return pagesRouter.push(to);
-        }
-        window.history.pushState(null, '', to);
-    }, [pagesRouter]);
     useEffect(() => {
         ensurePreviewScript(previewScriptUrl);
         return connectNextPreview({ locale, navigate, pathname, previewScriptUrl });
     }, [locale, navigate, pathname, previewScriptUrl]);
-    return null;
 }
 export function useNextContentLocale(requestedLocale, defaultLocale) {
     const context = useContext(FimoNextContext);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo-next",
-  "version": "2.7.1",
+  "version": "2.8.0-staging.10",
   "description": "Fimo runtime for Next.js projects.",
   "files": [
     "dist/",
@@ -49,22 +49,22 @@
     "test:watch": "vitest"
   },
   "devDependencies": {
-    "@fimo/tsconfig": "2.7.1",
+    "@fimo/tsconfig": "2.8.0-staging.10",
     "@tanstack/react-query": "^5.80.6",
     "@types/node": "22.18.6",
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
-    "fimo": "2.7.1",
-    "fimo-react": "2.7.1",
-    "next": "16.3.3",
+    "fimo": "2.8.0-staging.10",
+    "fimo-react": "2.8.0-staging.10",
+    "next": "16.3.8",
     "react": "19.2.4",
     "react-dom": "19.2.4",
     "typescript": "7.0.2",
-    "vitest": "5.0.0"
+    "vitest": "5.0.3"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.80.6",
-    "fimo": ">=2.0.1",
+    "fimo": "2.8.0-staging.10",
     "fimo-react": ">=2.0.1",
     "next": "^15.0.0 || ^16.0.0",
     "react": "^18.2.0 || ^19.0.0",