cloudflare-next-intl 0.9.28 → 0.9.32

package/dist/src/db/resolve_mode.d.ts

@@ -7,4 +7,6 @@ export type ResolvedDbMode = {
     mode: 'supabase';
     supabase: SupabaseDbConfig;
 };
-export default function resolveDbMode(db: DbRoutingConfig, generate?: GenerateRoutingConfig): Promise<ResolvedDbMode>;
+declare function resolveDbModeUncached(db: DbRoutingConfig, generate?: GenerateRoutingConfig): Promise<ResolvedDbMode>;
+declare const resolveDbMode: typeof resolveDbModeUncached;
+export default resolveDbMode;

package/dist/src/db/resolve_mode.js

@@ -1,6 +1,7 @@
+import { cache } from 'react';
 import resolveConfigValue from './resolve_config_value.js';
 import { resolveHyperdriveConnectionString } from './resolve_hyperdrive_connection_string.js';
-export default async function resolveDbMode(db, generate) {
+async function resolveDbModeUncached(db, generate) {
     const connectionString = await resolveConfigValue(db.connectionString);
     if (connectionString)
         return { mode: 'postgres', connectionString };
@@ -13,3 +14,5 @@ export default async function resolveDbMode(db, generate) {
         return { mode: 'supabase', supabase: db.supabase };
     return { mode: 'postgres', connectionString: undefined };
 }
+const resolveDbMode = cache(resolveDbModeUncached);
+export default resolveDbMode;

package/dist/src/db/rest_client.js

@@ -1,12 +1,11 @@
+import { cache } from 'react';
 import resolveSupabaseEndpoint from './supabase_config.js';
+const getOrCreateClient = cache(async (supabase, bearerToken) => {
+    const { url, anonKey } = await resolveSupabaseEndpoint(supabase);
+    const { createClient } = await import('@supabase/supabase-js');
+    return createClient(url, anonKey, { accessToken: async () => bearerToken });
+});
 export default function createRestClient(supabase, bearerToken) {
     let clientPromise = null;
-    return () => {
-        clientPromise ?? (clientPromise = (async () => {
-            const { url, anonKey } = await resolveSupabaseEndpoint(supabase);
-            const { createClient } = await import('@supabase/supabase-js');
-            return createClient(url, anonKey, { accessToken: async () => bearerToken });
-        })());
-        return clientPromise;
-    };
+    return () => (clientPromise ?? (clientPromise = getOrCreateClient(supabase, bearerToken)));
 }

package/dist/src/server/components/link.d.ts

@@ -1,8 +1,9 @@
 import { type LinkProps } from 'next/link.js';
 import { type ComponentProps } from 'react';
-export type PrefetchType = 'custom' | 'default';
+export type PrefetchType = 'custom' | 'eager' | 'default';
 type NextLinkProps = Omit<ComponentProps<'a'>, keyof LinkProps> & Omit<LinkProps, 'locale'> & {
     prefetchType?: PrefetchType;
 };
+export declare const PENDING_NAVIGATION_EVENT = "cloudflare-next-intl:pending-navigation";
 declare const Link: import("react").ForwardRefExoticComponent<Omit<NextLinkProps, "ref"> & import("react").RefAttributes<HTMLAnchorElement>>;
 export default Link;

package/dist/src/server/components/link.js

@@ -1,14 +1,16 @@
 "use client";
 import { jsx as _jsx } from "react/jsx-runtime";
 import LinkComponent from 'next/link.js';
-import { forwardRef, useCallback, useEffect, useState, useTransition, } from 'react';
+import { forwardRef, useCallback, useEffect, useRef, useState, useTransition, } from 'react';
 import config from '../../config/intl_config.js';
 import { getLocaleCache } from '../../general/cache_variables.js';
 import { usePathname, useRouter } from 'next/navigation.js';
 const prefetchedRoutes = new Set();
-function CustomLinkFunction({ href, prefetch, prefetchType = 'custom', onClick, onMouseEnter, onPointerDown, ...rest }, ref) {
+export const PENDING_NAVIGATION_EVENT = 'cloudflare-next-intl:pending-navigation';
+function CustomLinkFunction({ href, prefetch, prefetchType = 'custom', onClick, onMouseEnter, onMouseLeave, onPointerDown, ...rest }, ref) {
     const localeValue = getLocaleCache();
     const router = useRouter();
+    prefetch ?? (prefetch = config.link?.defaultPrefetch ?? false);
     const needsLangPath = localeValue !== config.defaultLocale || !localeValue;
     let pathnames;
     let urlString;
@@ -26,10 +28,19 @@ function CustomLinkFunction({ href, prefetch, prefetchType = 'custom', onClick,
     const [isNavigating, setIsNavigating] = useState(false);
     useEffect(() => {
         setIsNavigating(false);
+        window.dispatchEvent(new CustomEvent(PENDING_NAVIGATION_EVENT, { detail: null }));
     }, [pathname]);
-    const isCustom = prefetchType === 'custom' && prefetch !== false;
-    const triggerPrefetch = useCallback(() => {
-        if (!isCustom || !urlString || urlString.startsWith('#') || prefetchedRoutes.has(urlString)) {
+    useEffect(() => {
+        if (!isNavigating)
+            return;
+        const timer = setTimeout(() => setIsNavigating(false), 10000);
+        return () => clearTimeout(timer);
+    }, [isNavigating]);
+    const isCustom = prefetchType === 'custom' || prefetchType === 'eager';
+    const prefetchEnabled = isCustom && prefetch !== false;
+    const isEager = prefetchType === 'eager' && prefetchEnabled;
+    const doPrefetch = useCallback(() => {
+        if (!urlString || urlString.startsWith('#') || prefetchedRoutes.has(urlString)) {
             return;
         }
         prefetchedRoutes.add(urlString);
@@ -38,18 +49,35 @@ function CustomLinkFunction({ href, prefetch, prefetchType = 'custom', onClick,
         }
         catch {
         }
-    }, [isCustom, urlString, pathnames, router]);
-    useEffect(() => {
+    }, [urlString, pathnames, router]);
+    const triggerPointerDownPrefetch = useCallback(() => {
         if (!isCustom)
             return;
-        const timer = setTimeout(triggerPrefetch, 100);
+        doPrefetch();
+    }, [isCustom, doPrefetch]);
+    useEffect(() => {
+        if (!isEager)
+            return;
+        const timer = setTimeout(doPrefetch, 100);
         return () => clearTimeout(timer);
-    }, [urlString, isCustom, triggerPrefetch]);
-    const handleHoverPrefetch = () => {
-        if (isCustom) {
-            triggerPrefetch();
+    }, [urlString, isEager, doPrefetch]);
+    const hoverTimerRef = useRef(null);
+    const clearHoverTimer = () => {
+        if (hoverTimerRef.current) {
+            clearTimeout(hoverTimerRef.current);
+            hoverTimerRef.current = null;
         }
     };
+    const handleHoverStart = () => {
+        if (!prefetchEnabled)
+            return;
+        clearHoverTimer();
+        hoverTimerRef.current = setTimeout(doPrefetch, 100);
+    };
+    const handleHoverEnd = () => {
+        clearHoverTimer();
+    };
+    useEffect(() => clearHoverTimer, []);
     const handleClick = (e) => {
         onClick?.(e);
         if (e.defaultPrevented)
@@ -62,6 +90,12 @@ function CustomLinkFunction({ href, prefetch, prefetchType = 'custom', onClick,
             const targetPath = typeof pathnames === 'string' ? pathnames : urlString;
             if (pathname !== targetPath) {
                 setIsNavigating(true);
+                try {
+                    window.history.replaceState(window.history.state, '', targetPath);
+                    window.dispatchEvent(new CustomEvent(PENDING_NAVIGATION_EVENT, { detail: targetPath }));
+                }
+                catch {
+                }
             }
             startTransition(() => {
                 router.push(targetPath);
@@ -71,10 +105,13 @@ function CustomLinkFunction({ href, prefetch, prefetchType = 'custom', onClick,
     };
     const effectivePrefetch = isCustom ? false : prefetch;
     return _jsx(LinkComponent, { ref: ref, href: pathnames, prefetch: effectivePrefetch, onClick: handleClick, onMouseEnter: (e) => {
-            handleHoverPrefetch();
+            handleHoverStart();
             onMouseEnter?.(e);
+        }, onMouseLeave: (e) => {
+            handleHoverEnd();
+            onMouseLeave?.(e);
         }, onPointerDown: (e) => {
-            handleHoverPrefetch();
+            triggerPointerDownPrefetch();
             onPointerDown?.(e);
         }, ...rest });
 }

package/dist/src/server/functions/geo.d.ts

@@ -3,4 +3,6 @@ export declare const defaultCountryHeaderNames: readonly string[];
 export declare const defaultTimezoneHeaderNames: readonly string[];
 export declare function getCountry(input?: RequestOrHeaders, generate?: GenerateRoutingConfig, headerNames?: readonly string[]): Promise<string | undefined>;
 export declare function getTimezone(input?: RequestOrHeaders, fallback?: string, generate?: GenerateRoutingConfig, headerNames?: readonly string[]): Promise<string | undefined>;
-export declare function resolveEnv(generate?: GenerateRoutingConfig): Promise<Record<string, unknown> | undefined>;
+declare function resolveEnvUncached(generate?: GenerateRoutingConfig): Promise<Record<string, unknown> | undefined>;
+export declare const resolveEnv: typeof resolveEnvUncached;
+export {};

package/dist/src/server/functions/geo.js

@@ -1,3 +1,4 @@
+import { cache } from 'react';
 import { countryCookieKey, timezoneCookieKey } from '../../config/cookie_key.js';
 export const defaultCountryHeaderNames = ['x-cf-country', 'cf-ipcountry'];
 export const defaultTimezoneHeaderNames = ['x-cf-timezone', 'cf-timezone'];
@@ -201,7 +202,7 @@ export async function getTimezone(input, fallback, generate, headerNames) {
     }
     return fallback;
 }
-export async function resolveEnv(generate) {
+async function resolveEnvUncached(generate) {
     if (!generate)
         return undefined;
     if (generate.env) {
@@ -219,3 +220,4 @@ export async function resolveEnv(generate) {
     }
     return undefined;
 }
+export const resolveEnv = cache(resolveEnvUncached);

package/dist/src/types/types.d.ts

@@ -19,6 +19,10 @@ export interface RoutingConfig<AppLocales extends Locales, AppLocalePrefixMode e
     cookieConsent?: CookieConsentRoutingConfig;
     generate?: GenerateRoutingConfig;
     errorHandling?: ErrorHandlingRoutingConfig;
+    link?: LinkRoutingConfig;
+}
+export interface LinkRoutingConfig {
+    defaultPrefetch?: boolean;
 }
 export interface GenerateRoutingConfig {
     env?: object | Record<string, unknown> | (() => object | Record<string, unknown> | Promise<object | Record<string, unknown>>);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-next-intl",
-  "version": "0.9.28",
+  "version": "0.9.32",
   "description": "Optimized Next Intl Package Special for App Router and Cloudflare",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",