cloudflare-next-intl 0.10.25 → 0.10.27

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

@@ -3,16 +3,14 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { setLocaleCache, setMessageForLocaleCache } from "../../general/cache_variables.js";
 import { useEffect, useMemo, Suspense } from "react";
 import dynamic from "next/dynamic.js";
-import useLazyWrappingProvider from "./use_lazy_wrapping_provider.js";
+import CookieConsentProvider from "../../cookie_consent/client/cookie_consent_provider.js";
+import AuthUserProvider from "../../firebase_auth/client/auth_user_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";
-import AuthUserPendingProvider from "../../firebase_auth/client/auth_user_pending_provider.js";
 import { LocaleContext } from "./locale_provider.js";
 export { LocaleContext };
-const loadAuthUserProvider = () => import("../../firebase_auth/client/auth_user_provider.js");
 const AutoFirebasePerformanceEvents = dynamic(() => import("../../firebase_auth/client/components/auto_firebase_performance_events.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 loadCookieConsentDialog = () => import("../../cookie_consent/client/components/cookie_consent_dialog.js");
@@ -23,8 +21,6 @@ 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);
     useEffect(() => {
         if (!config.cookieConsent || !autoWireDialogs)
             return;
@@ -32,10 +28,10 @@ export default function LocationzationClientProvider({ language, messages, initi
     }, [autoWireDialogs]);
     let providedChildren = children;
     if (config.firebaseAuth && !skipAuthProvider) {
-        providedChildren = _jsx(AuthUserPendingProvider, { initialUser: initialAuthUser, children: _jsxs(AuthUserProvider, { initialUser: initialAuthUser, children: [children, config.firebaseAuth.performance !== false && (_jsx(Suspense, { fallback: null, children: _jsx(AutoFirebasePerformanceEvents, {}) }))] }) });
+        providedChildren = _jsxs(AuthUserProvider, { initialUser: initialAuthUser, children: [children, config.firebaseAuth.performance !== false && (_jsx(Suspense, { fallback: null, children: _jsx(AutoFirebasePerformanceEvents, {}) }))] });
     }
     if (config.cookieConsent) {
-        providedChildren = _jsxs(CookieConsentProvider, { requiresConsent: requiresConsent, children: [providedChildren, cookieConsentReady && analyticsConfig && (_jsx(Suspense, { fallback: null, children: _jsx(CookieConsentAnalytics, { config: analyticsConfig }) })), cookieConsentReady && analyticsConfig && (analyticsConfig.googleAnalyticsId || analyticsConfig.googleAdsId) && (_jsx(Suspense, { fallback: null, children: _jsx(AutoAnalyticsEvents, { config: autoAnalyticsEventsConfig }) })), cookieConsentReady && autoWireDialogs && (_jsx(Suspense, { fallback: null, children: _jsx(CookieConsentDialog, { ...dialogProps }) })), cookieConsentReady && autoWireDialogs && (_jsx(Suspense, { fallback: null, children: _jsx(PrivacyPolicyUpdateDialog, { ...updateDialogProps }) }))] });
+        providedChildren = _jsxs(CookieConsentProvider, { requiresConsent: requiresConsent, children: [providedChildren, analyticsConfig && (_jsx(Suspense, { fallback: null, children: _jsx(CookieConsentAnalytics, { config: analyticsConfig }) })), analyticsConfig && (analyticsConfig.googleAnalyticsId || analyticsConfig.googleAdsId) && (_jsx(Suspense, { fallback: null, children: _jsx(AutoAnalyticsEvents, { config: autoAnalyticsEventsConfig }) })), autoWireDialogs && (_jsx(Suspense, { fallback: null, children: _jsx(CookieConsentDialog, { ...dialogProps }) })), autoWireDialogs && (_jsx(Suspense, { fallback: null, children: _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,12 +3,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { setLocaleCache, setMessageForLocaleCache } from "../../general/cache_variables.js";
 import { createContext, useMemo, Suspense } from "react";
 import dynamic from "next/dynamic.js";
-import useLazyWrappingProvider from "./use_lazy_wrapping_provider.js";
+import CookieConsentProvider from "../../cookie_consent/client/cookie_consent_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 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"));
@@ -18,10 +17,9 @@ 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, cookieConsentReady && analyticsConfig && (_jsx(Suspense, { fallback: null, children: _jsx(CookieConsentAnalytics, { config: analyticsConfig }) })), cookieConsentReady && analyticsConfig && (analyticsConfig.googleAnalyticsId || analyticsConfig.googleAdsId) && (_jsx(Suspense, { fallback: null, children: _jsx(AutoAnalyticsEvents, { config: autoAnalyticsEventsConfig }) })), cookieConsentReady && autoWireDialogs && (_jsx(Suspense, { fallback: null, children: _jsx(CookieConsentDialog, { ...dialogProps }) })), cookieConsentReady && autoWireDialogs && (_jsx(Suspense, { fallback: null, children: _jsx(PrivacyPolicyUpdateDialog, { ...updateDialogProps }) }))] });
+        providedChildren = _jsxs(CookieConsentProvider, { requiresConsent: requiresConsent, children: [providedChildren, analyticsConfig && (_jsx(Suspense, { fallback: null, children: _jsx(CookieConsentAnalytics, { config: analyticsConfig }) })), analyticsConfig && (analyticsConfig.googleAnalyticsId || analyticsConfig.googleAdsId) && (_jsx(Suspense, { fallback: null, children: _jsx(AutoAnalyticsEvents, { config: autoAnalyticsEventsConfig }) })), autoWireDialogs && (_jsx(Suspense, { fallback: null, children: _jsx(CookieConsentDialog, { ...dialogProps }) })), autoWireDialogs && (_jsx(Suspense, { fallback: null, children: _jsx(PrivacyPolicyUpdateDialog, { ...updateDialogProps }) }))] });
     }
     const contextValue = useMemo(() => ({ language, messages }), [language, messages]);
     return _jsx(LocaleContext.Provider, { value: contextValue, children: providedChildren });

package/dist/src/cookie_consent/client/components/cookie_consent_analytics.js

@@ -1,12 +1,14 @@
 'use client';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, Suspense } from 'react';
+import { useEffect, useSyncExternalStore, Suspense } from 'react';
 import dynamic from 'next/dynamic.js';
 import useCookieConsent from '../use_cookie_consent.js';
 const ClarityScript = dynamic(() => import('./clarity_script.js'));
+const noopSubscribe = () => () => undefined;
 export default function CookieConsentAnalytics({ config }) {
     const { consent, requiresConsent } = useCookieConsent();
     const granted = consent === true || !requiresConsent;
+    const hydrated = useSyncExternalStore(noopSubscribe, () => true, () => false);
     useEffect(() => {
         if (consent === null && requiresConsent)
             return;
@@ -21,8 +23,19 @@ export default function CookieConsentAnalytics({ config }) {
             analytics_storage: state,
         });
     }, [consent, requiresConsent, granted]);
+    useEffect(() => {
+        if (!granted || !config.cloudflareBeaconToken)
+            return;
+        if (document.querySelector('script[data-cf-beacon]'))
+            return;
+        const script = document.createElement('script');
+        script.defer = true;
+        script.src = 'https://static.cloudflareinsights.com/beacon.min.js';
+        script.setAttribute('data-cf-beacon', config.cloudflareBeaconToken);
+        document.head.appendChild(script);
+    }, [granted, config.cloudflareBeaconToken]);
     const hasGoogle = Boolean(config.googleAnalyticsId || config.googleAdsId || config.googleAdSenseId);
-    return (_jsxs(_Fragment, { children: [hasGoogle && (_jsx("script", { id: "cookie-consent-google-consent-mode", dangerouslySetInnerHTML: { __html: googleConsentModeBootstrapScript(config) } })), granted && config.cloudflareBeaconToken && (_jsx("script", { defer: true, src: "https://static.cloudflareinsights.com/beacon.min.js", "data-cf-beacon": config.cloudflareBeaconToken })), granted && config.clarityProjectId && (_jsx(Suspense, { fallback: null, children: _jsx(ClarityScript, { projectId: config.clarityProjectId }) }))] }));
+    return (_jsxs(_Fragment, { children: [hasGoogle && (_jsx("script", { id: "cookie-consent-google-consent-mode", dangerouslySetInnerHTML: { __html: googleConsentModeBootstrapScript(config) } })), hydrated && granted && config.clarityProjectId && (_jsx(Suspense, { fallback: null, children: _jsx(ClarityScript, { projectId: config.clarityProjectId }) }))] }));
 }
 export function googleConsentModeBootstrapScript(config) {
     const configCalls = [config.googleAnalyticsId, config.googleAdsId]

package/dist/src/cookie_consent/client/components/cookie_consent_dialog.js

@@ -1,14 +1,17 @@
 'use client';
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useSyncExternalStore } from 'react';
 import useCookieConsent from '../use_cookie_consent.js';
 import DefaultPrivacyPolicyLink from './default_privacy_policy_link.js';
 import DialogPortal from './dialog_portal.js';
 import { getLocaleCache } from '../../../general/cache_variables.js';
 import { defaultCookieConsentText } from './default_dialog_text.js';
 import { defaultCookieDialogClassNames } from './default_dialog_styles.js';
+const noopSubscribe = () => () => undefined;
 export default function CookieConsentDialog({ message, link, privacyPolicyLinkText, showPrivacyPolicy, acceptText, declineText, hideDecline = false, id = 'cookie-consent-dialog', classNames, styles, render, }) {
     const { consent, requiresConsent, isMounted, setConsent, privacyPolicyPath, showPrivacyPolicy: showPrivacyPolicyCtx } = useCookieConsent();
-    if (!isMounted || !requiresConsent || consent !== null)
+    const hydrated = useSyncExternalStore(noopSubscribe, () => true, () => false);
+    if (!hydrated || !isMounted || !requiresConsent || consent !== null)
         return null;
     if (render)
         return _jsx(_Fragment, { children: render({ setConsent }) });

package/dist/src/cookie_consent/client/components/privacy_policy_update_dialog.js

@@ -1,14 +1,17 @@
 'use client';
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useSyncExternalStore } from 'react';
 import useCookieConsent from '../use_cookie_consent.js';
 import DefaultPrivacyPolicyLink from './default_privacy_policy_link.js';
 import DialogPortal from './dialog_portal.js';
 import { getLocaleCache } from '../../../general/cache_variables.js';
 import { defaultPrivacyPolicyUpdateText } from './default_dialog_text.js';
 import { defaultCookieDialogClassNames } from './default_dialog_styles.js';
+const noopSubscribe = () => () => undefined;
 export default function PrivacyPolicyUpdateDialog({ message, link, privacyPolicyLinkText, showPrivacyPolicy, closeText, id = 'privacy-policy-update-dialog', classNames, styles, render, }) {
     const { privacyPolicyUpdated, acknowledgePrivacyPolicyUpdate, privacyPolicyPath, showPrivacyPolicy: showPrivacyPolicyCtx } = useCookieConsent();
-    if (!privacyPolicyUpdated)
+    const hydrated = useSyncExternalStore(noopSubscribe, () => true, () => false);
+    if (!hydrated || !privacyPolicyUpdated)
         return null;
     if (render)
         return _jsx(_Fragment, { children: render({ acknowledge: acknowledgePrivacyPolicyUpdate }) });

package/package.json

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

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

@@ -1,12 +0,0 @@
-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

@@ -1,34 +0,0 @@
-"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/client/auth_user_pending_provider.d.ts

@@ -1,5 +0,0 @@
-import type { SerializedAuthUser } from '../types.js';
-export default function AuthUserPendingProvider({ initialUser, children }: {
-    initialUser?: SerializedAuthUser | null;
-    children?: React.ReactNode;
-}): React.JSX.Element;

package/dist/src/firebase_auth/client/auth_user_pending_provider.js

@@ -1,17 +0,0 @@
-'use client';
-import { jsx as _jsx } from "react/jsx-runtime";
-import { useMemo } from 'react';
-import { AuthUserContext } from './auth_user_context.js';
-function notReady() {
-    return Promise.reject(new Error('AuthUserProvider is still loading'));
-}
-export default function AuthUserPendingProvider({ initialUser = null, children }) {
-    const value = useMemo(() => ({
-        user: initialUser,
-        loading: initialUser === null,
-        reloadUser: notReady,
-        sendVerificationEmail: notReady,
-        logout: notReady,
-    }), [initialUser]);
-    return _jsx(AuthUserContext.Provider, { value: value, children: children });
-}