cloudflare-next-intl 0.9.54 → 0.9.56

package/dist/src/client/components/client_provider.js

@@ -3,13 +3,14 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { setLocaleCache, setMessageForLocaleCache } from "../../general/cache_variables.js";
 import { createContext, useMemo } from "react";
 import dynamic from "next/dynamic.js";
+import useLazyWrappingProvider from "./use_lazy_wrapping_provider.js";
 import config from "@intl-config";
 import installConsoleErrorOverride from "../../error_handling/install_console_error_override.js";
 import installGlobalErrorOverride from "../../error_handling/install_global_error_override.js";
 export const LocaleContext = createContext(undefined);
-const AuthUserProvider = dynamic(() => import("../../firebase_auth/client/auth_user_provider.js"));
+const loadAuthUserProvider = () => import("../../firebase_auth/client/auth_user_provider.js");
 const AutoFirebasePerformanceEvents = dynamic(() => import("../../firebase_auth/client/components/auto_firebase_performance_events.js"));
-const CookieConsentProvider = dynamic(() => import("../../cookie_consent/client/cookie_consent_provider.js"));
+const loadCookieConsentProvider = () => import("../../cookie_consent/client/cookie_consent_provider.js");
 const CookieConsentAnalytics = dynamic(() => import("../../cookie_consent/client/components/cookie_consent_analytics.js"));
 const AutoAnalyticsEvents = dynamic(() => import("../../cookie_consent/client/components/auto_analytics_events.js"));
 const CookieConsentDialog = dynamic(() => import("../../cookie_consent/client/components/cookie_consent_dialog.js"));
@@ -19,12 +20,14 @@ export default function LocationzationClientProvider({ language, messages, initi
     setMessageForLocaleCache(language, messages);
     installConsoleErrorOverride(config, true);
     installGlobalErrorOverride(config);
+    const { Provider: AuthUserProvider } = useLazyWrappingProvider(loadAuthUserProvider);
+    const { Provider: CookieConsentProvider, isReady: cookieConsentReady } = useLazyWrappingProvider(loadCookieConsentProvider);
     let providedChildren = children;
     if (config.firebaseAuth && !skipAuthProvider) {
         providedChildren = _jsxs(AuthUserProvider, { initialUser: initialAuthUser, children: [children, config.firebaseAuth.performance !== false && _jsx(AutoFirebasePerformanceEvents, {})] });
     }
     if (config.cookieConsent) {
-        providedChildren = _jsxs(CookieConsentProvider, { requiresConsent: requiresConsent, children: [providedChildren, analyticsConfig && _jsx(CookieConsentAnalytics, { config: analyticsConfig }), analyticsConfig && (analyticsConfig.googleAnalyticsId || analyticsConfig.googleAdsId) && _jsx(AutoAnalyticsEvents, { config: autoAnalyticsEventsConfig }), autoWireDialogs && _jsx(CookieConsentDialog, { ...dialogProps }), autoWireDialogs && _jsx(PrivacyPolicyUpdateDialog, { ...updateDialogProps })] });
+        providedChildren = _jsxs(CookieConsentProvider, { requiresConsent: requiresConsent, children: [providedChildren, cookieConsentReady && analyticsConfig && _jsx(CookieConsentAnalytics, { config: analyticsConfig }), cookieConsentReady && analyticsConfig && (analyticsConfig.googleAnalyticsId || analyticsConfig.googleAdsId) && _jsx(AutoAnalyticsEvents, { config: autoAnalyticsEventsConfig }), cookieConsentReady && autoWireDialogs && _jsx(CookieConsentDialog, { ...dialogProps }), cookieConsentReady && autoWireDialogs && _jsx(PrivacyPolicyUpdateDialog, { ...updateDialogProps })] });
     }
     const contextValue = useMemo(() => ({ language, messages }), [language, messages]);
     return _jsx(LocaleContext.Provider, { value: contextValue, children: providedChildren });

package/dist/src/client/components/client_provider_static.js

@@ -3,11 +3,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { setLocaleCache, setMessageForLocaleCache } from "../../general/cache_variables.js";
 import { createContext, useMemo } from "react";
 import dynamic from "next/dynamic.js";
+import useLazyWrappingProvider from "./use_lazy_wrapping_provider.js";
 import config from "@intl-config";
 import installConsoleErrorOverride from "../../error_handling/install_console_error_override.js";
 import installGlobalErrorOverride from "../../error_handling/install_global_error_override.js";
 export const LocaleContext = createContext(undefined);
-const CookieConsentProvider = dynamic(() => import("../../cookie_consent/client/cookie_consent_provider.js"));
+const loadCookieConsentProvider = () => import("../../cookie_consent/client/cookie_consent_provider.js");
 const CookieConsentAnalytics = dynamic(() => import("../../cookie_consent/client/components/cookie_consent_analytics.js"));
 const AutoAnalyticsEvents = dynamic(() => import("../../cookie_consent/client/components/auto_analytics_events.js"));
 const CookieConsentDialog = dynamic(() => import("../../cookie_consent/client/components/cookie_consent_dialog.js"));
@@ -17,9 +18,10 @@ export default function LocationzationClientProvider({ language, messages, analy
     setMessageForLocaleCache(language, messages);
     installConsoleErrorOverride(config, true);
     installGlobalErrorOverride(config);
+    const { Provider: CookieConsentProvider, isReady: cookieConsentReady } = useLazyWrappingProvider(loadCookieConsentProvider);
     let providedChildren = children;
     if (config.cookieConsent) {
-        providedChildren = _jsxs(CookieConsentProvider, { requiresConsent: requiresConsent, children: [providedChildren, analyticsConfig && _jsx(CookieConsentAnalytics, { config: analyticsConfig }), analyticsConfig && (analyticsConfig.googleAnalyticsId || analyticsConfig.googleAdsId) && _jsx(AutoAnalyticsEvents, { config: autoAnalyticsEventsConfig }), autoWireDialogs && _jsx(CookieConsentDialog, { ...dialogProps }), autoWireDialogs && _jsx(PrivacyPolicyUpdateDialog, { ...updateDialogProps })] });
+        providedChildren = _jsxs(CookieConsentProvider, { requiresConsent: requiresConsent, children: [providedChildren, cookieConsentReady && analyticsConfig && _jsx(CookieConsentAnalytics, { config: analyticsConfig }), cookieConsentReady && analyticsConfig && (analyticsConfig.googleAnalyticsId || analyticsConfig.googleAdsId) && _jsx(AutoAnalyticsEvents, { config: autoAnalyticsEventsConfig }), cookieConsentReady && autoWireDialogs && _jsx(CookieConsentDialog, { ...dialogProps }), cookieConsentReady && autoWireDialogs && _jsx(PrivacyPolicyUpdateDialog, { ...updateDialogProps })] });
     }
     const contextValue = useMemo(() => ({ language, messages }), [language, messages]);
     return _jsx(LocaleContext.Provider, { value: contextValue, children: providedChildren });

package/dist/src/client/components/use_lazy_wrapping_provider.d.ts

@@ -0,0 +1,12 @@
+import { type ComponentType } from "react";
+type ModuleLoader<P> = () => Promise<{
+    default: ComponentType<P>;
+}>;
+export interface LazyWrappingProviderResult<P extends Record<string, unknown>> {
+    Provider: ComponentType<P & {
+        children?: React.ReactNode;
+    }>;
+    isReady: boolean;
+}
+export default function useLazyWrappingProvider<P extends Record<string, unknown>>(loader: ModuleLoader<P>): LazyWrappingProviderResult<P>;
+export {};

package/dist/src/client/components/use_lazy_wrapping_provider.js

@@ -0,0 +1,34 @@
+"use client";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect, useRef, useState } from "react";
+const settledCache = new Map();
+export default function useLazyWrappingProvider(loader) {
+    const opaqueLoader = loader;
+    const resolvedRef = useRef(settledCache.get(opaqueLoader) ?? null);
+    const [isReady, setIsReady] = useState(resolvedRef.current !== null);
+    useEffect(() => {
+        if (resolvedRef.current)
+            return;
+        let cancelled = false;
+        loader().then((mod) => {
+            if (cancelled)
+                return;
+            settledCache.set(opaqueLoader, mod.default);
+            resolvedRef.current = mod.default;
+            setIsReady(true);
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, []);
+    const wrapperRef = useRef(null);
+    if (!wrapperRef.current) {
+        wrapperRef.current = function LazyWrappingProvider({ children, ...props }) {
+            const Resolved = resolvedRef.current;
+            if (!Resolved)
+                return children;
+            return _jsx(Resolved, { ...props, children: children });
+        };
+    }
+    return { Provider: wrapperRef.current, isReady };
+}

package/dist/src/firebase_auth/server/mint_server_app_check_token.d.ts

@@ -1,2 +1,5 @@
 import type { FirebaseAppCheckConfig } from '../../types/types.js';
+export declare const missingCredentialsReportState: {
+    reported: boolean;
+};
 export default function mintServerAppCheckToken(projectId: string, apiKey: string, appCheck: FirebaseAppCheckConfig | undefined): Promise<string | undefined>;

package/dist/src/firebase_auth/server/mint_server_app_check_token.js

@@ -3,12 +3,37 @@ import reportError from '../../error_handling/report_error.js';
 import signCustomTokenRemote from './sign_custom_token_remote.js';
 const APP_CHECK_CUSTOM_TOKEN_AUDIENCE = 'https://firebaseappcheck.googleapis.com/google.firebase.appcheck.v1.TokenExchangeService';
 const CUSTOM_TOKEN_LIFETIME = '5m';
+export const missingCredentialsReportState = { reported: false };
+async function reportMissingCredentials(appCheck, hasOauthTriple) {
+    if (appCheck.reportMissingServerCredentials === false)
+        return;
+    if (missingCredentialsReportState.reported)
+        return;
+    missingCredentialsReportState.reported = true;
+    const missing = [];
+    if (!appCheck.clientEmail)
+        missing.push('clientEmail');
+    if (!appCheck.appId)
+        missing.push('appId');
+    if (!appCheck.privateKey && !hasOauthTriple) {
+        missing.push('privateKey (or the full oauthClientId/oauthClientSecret/oauthRefreshToken triple)');
+    }
+    await reportError(config, {
+        error: new Error(`firebaseAuth.appCheck is configured but cannot mint an App Check token server-side — missing: ${missing.join(', ')}. `
+            + 'Signed-in users will render as signed-out on any cold navigation that arrives before the client writes the App Check cookie. '
+            + 'Set the missing service-account values, or pass `appCheck.reportMissingServerCredentials: false` to silence this.'),
+        classOrMethodName: 'mintServerAppCheckToken',
+        dedupKey: 'mintServerAppCheckToken:missing-server-credentials',
+    });
+}
 export default async function mintServerAppCheckToken(projectId, apiKey, appCheck) {
-    if (!appCheck?.clientEmail || !appCheck.appId)
+    if (!appCheck)
         return undefined;
-    const hasOauthTriple = appCheck.oauthClientId && appCheck.oauthClientSecret && appCheck.oauthRefreshToken;
-    if (!appCheck.privateKey && !hasOauthTriple)
+    const hasOauthTriple = Boolean(appCheck.oauthClientId && appCheck.oauthClientSecret && appCheck.oauthRefreshToken);
+    if (!appCheck.clientEmail || !appCheck.appId || (!appCheck.privateKey && !hasOauthTriple)) {
+        await reportMissingCredentials(appCheck, hasOauthTriple);
         return undefined;
+    }
     try {
         const claims = {
             iss: appCheck.clientEmail,

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

@@ -19,9 +19,16 @@ export default function HelperScript() {
                 var key = 'stale-deploy-recovery-reloaded';
                 var timeKey = 'stale-deploy-recovery-time';
                 var countKey = 'stale-deploy-recovery-count';
-                var maxAttempts = 2;
+                var maxAttempts = 3;
                 var throttleMs = 15000;
                 var attemptedThisLoad = false;
+                var retryScheduled = false;
+                // Set by the resource-error listener: the first same-origin
+                // chunk that failed. Reloading is pointless until that URL
+                // answers with real JavaScript again, so it doubles as the
+                // health probe below.
+                var probeUrl = null;
+                var maxProbes = 4;
                 function isStale(msg) {
                     if (msg === undefined || msg === null) return true;
                     msg = String(msg).toLowerCase();
@@ -30,6 +37,49 @@ export default function HelperScript() {
                     }
                     return false;
                 }
+                function showOverlay() {
+                    try {
+                        if (document.documentElement) {
+                            document.documentElement.style.backgroundColor = '#ffffff';
+                        }
+                        if (document.body) {
+                            document.body.style.backgroundColor = '#ffffff';
+                            document.body.innerHTML = ${JSON.stringify(reloadHtml)};
+                        }
+                    } catch (e) {}
+                }
+                function doReload() {
+                    try {
+                        var u = new URL(window.location.href);
+                        u.searchParams.set('_stale_reload', String(Date.now()));
+                        window.location.replace(u.toString());
+                    } catch (e) {
+                        try { window.location.reload(); } catch (e2) {}
+                    }
+                }
+                // A deploy swaps the Worker version colo by colo, so for a few
+                // seconds the document can come from the new version while a
+                // chunk request still lands on the old one, which answers with
+                // a plain-text 404 body instead of JavaScript. Reloading inside
+                // that window just reproduces the error, so poll the failed
+                // chunk with a cache-busted request until it is real
+                // JavaScript, then reload once. Give up after maxProbes and
+                // reload anyway rather than hanging on the overlay.
+                function probeThenReload(attempt) {
+                    if (!probeUrl || typeof fetch !== 'function') return doReload();
+                    var url = probeUrl + (probeUrl.indexOf('?') > -1 ? '&' : '?') + '_r=' + Date.now();
+                    fetch(url, { cache: 'reload', credentials: 'omit' }).then(function(r) {
+                        var ct = (r.headers.get('content-type') || '').toLowerCase();
+                        if (!r.ok || ct.indexOf('javascript') === -1) throw new Error('unhealthy: ' + r.status + ' ' + ct);
+                        doReload();
+                    }).catch(function(err) {
+                        if (attempt >= maxProbes) {
+                            console.warn('[StaleDeploy early-catch] Asset still unhealthy after', attempt + 1, 'probes - reloading anyway:', String(err));
+                            return doReload();
+                        }
+                        setTimeout(function() { probeThenReload(attempt + 1); }, 500 * Math.pow(2, attempt));
+                    });
+                }
                 function recover(msg, source) {
                     if (attemptedThisLoad) return;
                     try {
@@ -55,30 +105,28 @@ export default function HelperScript() {
                             console.warn('[StaleDeploy early-catch] Skipping reload, attempts exhausted for buildId:', buildId, attempts);
                             return;
                         }
+                        // A reload that lands inside the same throttle window
+                        // means the previous recovery did not help: the assets
+                        // are momentarily unreadable at the edge rather than
+                        // stale. Waiting out the window and retrying lets the
+                        // page heal itself instead of stranding the visitor on
+                        // the error UI.
                         if (sameBuild && throttled) {
-                            console.warn('[StaleDeploy early-catch] Skipping reload, throttled for buildId:', buildId);
+                            if (retryScheduled) return;
+                            retryScheduled = true;
+                            var wait = throttleMs - (Date.now() - last);
+                            if (!(wait > 0)) wait = 0;
+                            console.warn('[StaleDeploy early-catch] Throttled for buildId:', buildId, '- retrying in', wait, 'ms');
+                            showOverlay();
+                            setTimeout(function() { retryScheduled = false; recover(msg, source); }, wait + 250);
                             return;
                         }
                         attemptedThisLoad = true;
                         sessionStorage.setItem(key, buildId);
                         sessionStorage.setItem(countKey, String(attempts + 1));
                         sessionStorage.setItem(timeKey, String(Date.now()));
-                        try {
-                            if (document.documentElement) {
-                                document.documentElement.style.backgroundColor = '#ffffff';
-                            }
-                            if (document.body) {
-                                document.body.style.backgroundColor = '#ffffff';
-                                document.body.innerHTML = ${JSON.stringify(reloadHtml)};
-                            }
-                        } catch (e) {}
-                        try {
-                            var u = new URL(window.location.href);
-                            u.searchParams.set('_stale_reload', String(Date.now()));
-                            window.location.replace(u.toString());
-                        } catch (e) {
-                            window.location.reload();
-                        }
+                        showOverlay();
+                        probeThenReload(0);
                     } catch (e) {
                         console.error('Stale Deploy Early Catch Script Error:', e);
                     }
@@ -102,6 +150,7 @@ export default function HelperScript() {
                         var sameOrigin = false;
                         try { sameOrigin = new URL(src, window.location.href).origin === window.location.origin; } catch (err2) { return; }
                         if (!sameOrigin) return;
+                        if (!probeUrl) probeUrl = src;
                         recover('chunk resource failed to load: ' + src, 'resource-error');
                     } catch (err) {}
                 }, true);

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

@@ -170,6 +170,7 @@ export interface FirebaseAppCheckConfig {
     oauthClientSecret?: string;
     oauthRefreshToken?: string;
     appId: string;
+    reportMissingServerCredentials?: boolean;
 }
 export interface CookieAttributes {
     domain?: string | undefined;

package/package.json

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