cloudflare-next-intl 0.13.1 → 0.13.2

package/README.md

@@ -599,6 +599,8 @@ export default setIntlConfig({
         // countryHeaderNames: ["x-cf-country", "cf-ipcountry"],
         // gdprCountries: [...], // defaults to EU/EEA + UK + Switzerland
         // enableAnalyticsInDevMode: true, // analytics stay off in dev otherwise
+        // googleTagId: "GT-XXXXXXXX", // gtag.js in IntlHelperScript; defaults to analytics.googleAdsId
+        // googleTag: false, // turn off the IntlHelperScript Google tag
         // autoWireDialogs: false, // opt out and render the dialogs yourself
         // dialogProps: { acceptText: "Accept", showPrivacyPolicy: true }, // forwarded to CookieConsentDialog
         // updateDialogProps: { closeText: "Got it", showPrivacyPolicy: true }, // forwarded to PrivacyPolicyUpdateDialog

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

@@ -31,7 +31,7 @@ export default function ClientExtensions({ initialAuthUser = null, skipAuthProvi
         providedChildren = (_jsxs(AuthUserProvider, { initialUser: initialAuthUser, children: [children, isPerf && (_jsx(Suspense, { fallback: null, children: _jsx(AutoFirebasePerformanceEvents, {}) }))] }));
     }
     if (isConsent) {
-        providedChildren = (_jsxs(CookieConsentProvider, { requiresConsent: requiresConsent, cookieConsentConfig: resolvedConsent, 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 ?? resolvedConsent?.autoAnalyticsEvents }) })), autoWireDialogs && (_jsxs(_Fragment, { children: [_jsx(Suspense, { fallback: null, children: _jsx(CookieConsentDialog, { ...(dialogProps ?? resolvedConsent?.dialogProps) }) }), _jsx(Suspense, { fallback: null, children: _jsx(PrivacyPolicyUpdateDialog, { ...(updateDialogProps ?? resolvedConsent?.updateDialogProps) }) })] }))] }));
+        providedChildren = (_jsxs(CookieConsentProvider, { requiresConsent: requiresConsent, cookieConsentConfig: resolvedConsent, children: [providedChildren, analyticsConfig && (_jsx(Suspense, { fallback: null, children: _jsx(CookieConsentAnalytics, { config: analyticsConfig }) })), analyticsConfig && (analyticsConfig.googleAnalyticsId || analyticsConfig.googleAdsId || (typeof analyticsConfig.googleTagId === 'string' && analyticsConfig.googleTagId)) && (_jsx(Suspense, { fallback: null, children: _jsx(AutoAnalyticsEvents, { config: autoAnalyticsEventsConfig ?? resolvedConsent?.autoAnalyticsEvents }) })), autoWireDialogs && (_jsxs(_Fragment, { children: [_jsx(Suspense, { fallback: null, children: _jsx(CookieConsentDialog, { ...(dialogProps ?? resolvedConsent?.dialogProps) }) }), _jsx(Suspense, { fallback: null, children: _jsx(PrivacyPolicyUpdateDialog, { ...(updateDialogProps ?? resolvedConsent?.updateDialogProps) }) })] }))] }));
     }
     return (_jsxs(_Fragment, { children: [_jsx(ClientThemeScript, {}), providedChildren] }));
 }

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

@@ -34,19 +34,30 @@ export default function CookieConsentAnalytics({ config }) {
         script.setAttribute('data-cf-beacon', config.cloudflareBeaconToken);
         document.head.appendChild(script);
     }, [granted, config.cloudflareBeaconToken]);
-    const hasGoogle = Boolean(config.googleAnalyticsId || config.googleAdsId || config.googleAdSenseId);
+    const hasGoogle = Boolean(config.googleAnalyticsId ||
+        config.googleAdsId ||
+        config.googleAdSenseId ||
+        (typeof config.googleTagId === 'string' && config.googleTagId));
     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]
+    const configCalls = [
+        config.googleAnalyticsId,
+        config.googleAdsId,
+        typeof config.googleTagId === 'string' ? config.googleTagId : undefined,
+    ]
         .filter(Boolean)
+        .filter((id, index, arr) => arr.indexOf(id) === index)
         .map((id) => `gtag('config', '${id}');`)
         .join('\n');
-    const gtagLoader = config.googleAnalyticsId || config.googleAdsId
+    const gtagTargetId = config.googleAnalyticsId ??
+        config.googleAdsId ??
+        (typeof config.googleTagId === 'string' ? config.googleTagId : undefined);
+    const gtagLoader = gtagTargetId
         ? `(function(){
   var s = document.createElement('script');
   s.async = true;
-  s.src = 'https://www.googletagmanager.com/gtag/js?id=${config.googleAnalyticsId ?? config.googleAdsId}';
+  s.src = 'https://www.googletagmanager.com/gtag/js?id=${gtagTargetId}';
   document.head.appendChild(s);
 })();`
         : '';

package/dist/src/cookie_consent/client/cookie_consent_provider.js

@@ -17,6 +17,10 @@ function parseConsent(raw) {
     return null;
 }
 const defaultGdprCountriesSet = new Set(defaultGdprCountries);
+const countryCookiePollMs = 200;
+const countryCookieRevealMs = 2000;
+const countryCookieMaxWaitMs = 15000;
+const countryCookieRefreshParam = '__cfni_country';
 export default function CookieConsentProvider({ requiresConsent: requiresConsentProp = true, cookieConsentConfig, children, }) {
     const { consentCookieName, dateCookieName, maxAge, policyDate, privacyPolicyPath, showPrivacyPolicy, gdprCountries } = useMemo(() => {
         const cc = requireCookieConsentConfig(cookieConsentConfig ?? config.cookieConsent);
@@ -40,25 +44,48 @@ export default function CookieConsentProvider({ requiresConsent: requiresConsent
         const storedConsent = parseConsent(rawConsent);
         const isFirstVisit = rawConsent === null;
         setConsentState(storedConsent);
-        if (requiresConsentProp) {
+        const gdprSet = gdprCountries ? new Set(gdprCountries) : defaultGdprCountriesSet;
+        const applyCountryCookie = () => {
             const countryCookie = getCookie(countryCookieKey);
-            if (countryCookie) {
-                const gdprSet = gdprCountries
-                    ? new Set(gdprCountries)
-                    : defaultGdprCountriesSet;
-                setRequiresConsent(gdprSet.has(countryCookie));
-            }
+            if (!countryCookie)
+                return false;
+            setRequiresConsent(gdprSet.has(countryCookie));
+            return true;
+        };
+        let pollId;
+        let revealId;
+        let stopId;
+        const stopPolling = () => {
+            clearInterval(pollId);
+            clearTimeout(revealId);
+            clearTimeout(stopId);
+        };
+        if (!requiresConsentProp || applyCountryCookie()) {
+            setIsMounted(true);
         }
-        setIsMounted(true);
-        if (isFirstVisit || !policyDate)
-            return;
-        const storedDateRaw = getCookie(dateCookieName);
-        if (!storedDateRaw) {
-            setCookie({ name: dateCookieName, value: policyDate.toISOString(), maxAge });
-            return;
+        else {
+            fetch(`${window.location.pathname}?${countryCookieRefreshParam}=${Date.now()}`, { method: 'HEAD', cache: 'no-store', credentials: 'same-origin' })
+                .catch(() => undefined);
+            pollId = setInterval(() => {
+                if (!applyCountryCookie())
+                    return;
+                stopPolling();
+                setIsMounted(true);
+            }, countryCookiePollMs);
+            revealId = setTimeout(() => setIsMounted(true), countryCookieRevealMs);
+            stopId = setTimeout(stopPolling, countryCookieMaxWaitMs);
+        }
+        if (!isFirstVisit && policyDate) {
+            const storedDateRaw = getCookie(dateCookieName);
+            if (!storedDateRaw) {
+                setCookie({ name: dateCookieName, value: policyDate.toISOString(), maxAge });
+            }
+            else {
+                const storedDate = new Date(storedDateRaw);
+                setPrivacyPolicyUpdated(!Number.isNaN(storedDate.getTime()) && storedDate < policyDate);
+            }
         }
-        const storedDate = new Date(storedDateRaw);
-        setPrivacyPolicyUpdated(!Number.isNaN(storedDate.getTime()) && storedDate < policyDate);
+        return stopPolling;
     }, [consentCookieName, dateCookieName, maxAge, policyDate, requiresConsentProp, gdprCountries]);
     const setConsent = useCallback((value) => {
         if (value === null) {

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

@@ -1,6 +1,9 @@
 import React from 'react';
 import { defaultReloadHtml } from 'cloudflare-next-intl-errors/staleDeployScripts';
 export { defaultReloadHtml };
-export default function HelperScript({ locale }: {
+export interface HelperScriptProps {
     locale?: string;
-}): React.JSX.Element;
+    googleTag?: boolean;
+    googleTagId?: string | false;
+}
+export default function HelperScript({ locale, googleTag, googleTagId, }?: HelperScriptProps): React.JSX.Element;

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

@@ -1,12 +1,28 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import CoreHelperScript from 'cloudflare-next-intl-intl/internal/helperScript';
 import ThemeScript from 'cloudflare-next-intl-theme/ThemeScript';
 import StaleDeployScripts, { defaultReloadHtml } from 'cloudflare-next-intl-errors/staleDeployScripts';
 import config from '../../config/intl_config.js';
 export { defaultReloadHtml };
-export default function HelperScript({ locale }) {
+export default function HelperScript({ locale, googleTag, googleTagId, } = {}) {
     const analytics = config.cookieConsent?.analytics;
-    const hasGoogle = !!(analytics?.googleAnalyticsId || analytics?.googleAdsId || analytics?.googleAdSenseId);
+    const cookieConsent = config.cookieConsent;
+    const isGoogleTagExplicitlyOff = googleTag === false ||
+        googleTagId === false ||
+        analytics?.googleTag === false ||
+        analytics?.googleTagId === false ||
+        cookieConsent?.googleTag === false ||
+        cookieConsent?.googleTagId === false;
+    const rawTagId = (typeof googleTagId === 'string' ? googleTagId : undefined) ||
+        (typeof analytics?.googleTagId === 'string' ? analytics.googleTagId : undefined) ||
+        (typeof cookieConsent?.googleTagId === 'string' ? cookieConsent.googleTagId : undefined) ||
+        analytics?.googleAdsId;
+    const resolvedGoogleTagId = !isGoogleTagExplicitlyOff ? rawTagId : undefined;
+    const shouldRenderGoogleTag = Boolean(resolvedGoogleTagId && !isGoogleTagExplicitlyOff);
+    const hasGoogle = !!(analytics?.googleAnalyticsId ||
+        analytics?.googleAdsId ||
+        analytics?.googleAdSenseId ||
+        shouldRenderGoogleTag);
     const hasClarity = !!analytics?.clarityProjectId;
     const hasFirebase = !!config.firebaseAuth;
     const hasTurnstile = !!config.firebaseAuth?.appCheck?.turnstileSiteKey;
@@ -22,5 +38,7 @@ export default function HelperScript({ locale }) {
     const preconnectOrigins = [];
     if (hasTurnstile)
         preconnectOrigins.push('https://challenges.cloudflare.com');
-    return (_jsxs(CoreHelperScript, { locale: locale, prefetchOrigins: prefetchOrigins.length > 0 ? prefetchOrigins : undefined, preconnectOrigins: preconnectOrigins.length > 0 ? preconnectOrigins : undefined, children: [_jsx(ThemeScript, {}), _jsx(StaleDeployScripts, { reloadHtml: config.errorHandling?.staleDeployReloadHtml })] }));
+    return (_jsxs(CoreHelperScript, { locale: locale, prefetchOrigins: prefetchOrigins.length > 0 ? prefetchOrigins : undefined, preconnectOrigins: preconnectOrigins.length > 0 ? preconnectOrigins : undefined, children: [_jsx(ThemeScript, {}), _jsx(StaleDeployScripts, { reloadHtml: config.errorHandling?.staleDeployReloadHtml }), shouldRenderGoogleTag && (_jsxs(_Fragment, { children: [_jsx("script", { async: true, src: `https://www.googletagmanager.com/gtag/js?id=${resolvedGoogleTagId}` }), _jsx("script", { id: "google-tag-init", dangerouslySetInnerHTML: {
+                            __html: `window.dataLayer = window.dataLayer || [];\nfunction gtag(){dataLayer.push(arguments);}\ngtag('js', new Date());\ngtag('config', '${resolvedGoogleTagId}');`,
+                        } })] }))] }));
 }

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

@@ -20,6 +20,8 @@ export interface CookieConsentRoutingConfig {
     privacyPolicyDateCookieName?: string;
     cookieMaxAge?: number;
     autoWireAnalytics?: boolean;
+    googleTag?: boolean;
+    googleTagId?: string | false;
     analytics?: CookieConsentAnalyticsConfig;
     getAnalytics?: () => CookieConsentAnalyticsConfig | Promise<CookieConsentAnalyticsConfig>;
     autoAnalyticsEvents?: AutoAnalyticsEventsConfig;
@@ -55,6 +57,8 @@ export interface CookieConsentAnalyticsConfig {
     cloudflareBeaconToken?: string;
     googleAnalyticsId?: string;
     googleAdsId?: string;
+    googleTagId?: string | false;
+    googleTag?: boolean;
     googleAdSenseId?: string;
     clarityProjectId?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-next-intl",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "Optimized Next Intl Package Special for App Router and Cloudflare",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -364,7 +364,7 @@
   "homepage": "https://github.com/demian-ilnytskyi/cloudflare-next-intl#readme",
   "dependencies": {
     "@microsoft/clarity": "^1.0.2",
-    "cloudflare-next-intl-auth": "^0.2.1",
+    "cloudflare-next-intl-auth": "^0.3.0",
     "cloudflare-next-intl-db": "^0.3.0",
     "cloudflare-next-intl-db-codegen": "^0.1.4",
     "cloudflare-next-intl-errors": "^0.1.0",