cloudflare-next-intl 0.10.26 → 0.10.28

package/README.md

@@ -166,6 +166,22 @@ export function Navigation() {
 }
 ```
 
+`IntlProvider` sends the locale's messages to the client for `useTranslations`
+in client components. Set `clientMessages` in your config to shrink that
+payload: `false` sends none (server-only translations), an array such as
+`["Auth", "Common", "Categories*"]` sends only matching namespaces, or `"auto"`
+uses build-time AST scan via the `autoClientMessages` Vite plugin. Default: `true`.
+
+```ts
+// vite.config.ts
+cloudflareNextIntl({
+    autoClientMessages: { fallbackNamespaces: ["Common"], onDynamic: "fallback", packages: ["@my/ui"] }
+})
+// intl.config.ts -> setIntlConfig({ clientMessages: "auto", ... })
+```
+
+> UI library packages can declare `"i18n": { "namespaces": ["Buttons"] }` in `package.json` for automatic inclusion.
+
 ### Locale-aware links (non-locale-switching)
 
 Use `Link` (server-safe, from `./Link`) for normal navigation that should
@@ -609,6 +625,9 @@ import { useCookieConsent } from "cloudflare-next-intl/useCookieConsent";
 const { consent, setConsent } = useCookieConsent();
 ```
 
+Composing the providers yourself (`autoWireAnalytics: false`)? `AutoAnalyticsEvents`
+is exported from `cloudflare-next-intl/AutoAnalyticsEvents` (and `cloudflare-next-intl/cookieConsent`).
+
 See [`package/src/cookie_consent/README.md`](package/src/cookie_consent/README.md) for layout, customization, and gotchas.
 
 ### Error handling

package/dist/src/client_messages_scan/index.d.ts

@@ -0,0 +1,3 @@
+export { scanFile, type FileScanResult, type DynamicCall } from "./scan_file.js";
+export { matchesNamespacePattern } from "./match_namespace.js";
+export { scanProject, type ScanProjectOptions, type ClientMessagesManifest } from "./scan_project.js";

package/dist/src/client_messages_scan/index.js

@@ -0,0 +1,3 @@
+export { scanFile } from "./scan_file.js";
+export { matchesNamespacePattern } from "./match_namespace.js";
+export { scanProject } from "./scan_project.js";

package/dist/src/client_messages_scan/match_namespace.d.ts

@@ -0,0 +1 @@
+export declare function matchesNamespacePattern(ns: string, pattern: string): boolean;

package/dist/src/client_messages_scan/match_namespace.js

@@ -0,0 +1,3 @@
+export function matchesNamespacePattern(ns, pattern) {
+    return pattern.endsWith("*") ? ns.startsWith(pattern.slice(0, -1)) : ns === pattern;
+}

package/dist/src/client_messages_scan/scan_file.d.ts

@@ -0,0 +1,16 @@
+export interface DynamicCall {
+    file: string;
+    line: number;
+    text: string;
+    prop?: {
+        component: string;
+        name: string;
+    };
+}
+export interface FileScanResult {
+    namespaces: string[];
+    dynamicCalls: DynamicCall[];
+    usesRoot: boolean;
+}
+export declare function findJsxPropValues(file: string, code: string, component: string, prop: string): string[] | null;
+export declare function scanFile(file: string, code: string): FileScanResult;

package/dist/src/client_messages_scan/scan_file.js

@@ -0,0 +1,175 @@
+import ts from "typescript";
+const HOOK_MODULES = new Set(["cloudflare-next-intl/use", "cloudflare-next-intl/client", "cloudflare-next-intl"]);
+function topLevel(ns) {
+    return ns.split(".")[0];
+}
+function literalsOfType(node, sf, aliases) {
+    if (!node)
+        return null;
+    if (ts.isLiteralTypeNode(node) && ts.isStringLiteral(node.literal))
+        return [node.literal.text];
+    if (ts.isUnionTypeNode(node)) {
+        const out = [];
+        for (const t of node.types) {
+            const r = literalsOfType(t, sf, aliases);
+            if (!r)
+                return null;
+            out.push(...r);
+        }
+        return out;
+    }
+    if (ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName))
+        return literalsOfType(aliases.get(node.typeName.text), sf, aliases);
+    return null;
+}
+function componentName(fn) {
+    if ((ts.isFunctionDeclaration(fn) || ts.isFunctionExpression(fn)) && fn.name)
+        return fn.name.text;
+    if ((ts.isArrowFunction(fn) || ts.isFunctionExpression(fn)) && ts.isVariableDeclaration(fn.parent) && ts.isIdentifier(fn.parent.name))
+        return fn.parent.name.text;
+    return null;
+}
+function propOf(arg, propParams) {
+    if (ts.isIdentifier(arg)) {
+        const p = propParams.get(arg.text);
+        return p ?? null;
+    }
+    if (ts.isTemplateExpression(arg) && arg.head.text === "" && ts.isIdentifier(arg.templateSpans[0].expression)) {
+        const p = propParams.get(arg.templateSpans[0].expression.text);
+        return p ?? null;
+    }
+    return null;
+}
+export function findJsxPropValues(file, code, component, prop) {
+    if (!code.includes(`<${component}`))
+        return [];
+    const sf = ts.createSourceFile(file, code, ts.ScriptTarget.Latest, true, file.endsWith("x") ? ts.ScriptKind.TSX : ts.ScriptKind.TS);
+    const values = [];
+    let unresolved = false;
+    const visit = (node) => {
+        if ((ts.isJsxOpeningElement(node) || ts.isJsxSelfClosingElement(node)) && node.tagName.getText() === component) {
+            let value = null;
+            for (const attr of node.attributes.properties) {
+                if (ts.isJsxSpreadAttribute(attr)) {
+                    value = null;
+                    break;
+                }
+                if (attr.name.getText() !== prop)
+                    continue;
+                const init = attr.initializer;
+                if (init && ts.isStringLiteral(init))
+                    value = init.text;
+                else if (init && ts.isJsxExpression(init) && init.expression && (ts.isStringLiteral(init.expression) || ts.isNoSubstitutionTemplateLiteral(init.expression)))
+                    value = init.expression.text;
+            }
+            if (value === null)
+                unresolved = true;
+            else
+                values.push(value);
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(sf);
+    return unresolved ? null : values;
+}
+export function scanFile(file, code) {
+    const result = { namespaces: [], dynamicCalls: [], usesRoot: false };
+    if (!code.includes("useTranslations"))
+        return result;
+    const sf = ts.createSourceFile(file, code, ts.ScriptTarget.Latest, true, file.endsWith("x") ? ts.ScriptKind.TSX : ts.ScriptKind.TS);
+    const hookNames = new Set();
+    const consts = new Map();
+    const typeAliases = new Map();
+    const paramTypes = new Map();
+    const propParams = new Map();
+    const collect = (node) => {
+        if (ts.isImportDeclaration(node) && ts.isStringLiteral(node.moduleSpecifier) && HOOK_MODULES.has(node.moduleSpecifier.text)) {
+            const named = node.importClause?.namedBindings;
+            if (named && ts.isNamedImports(named)) {
+                for (const el of named.elements)
+                    if ((el.propertyName ?? el.name).text === "useTranslations")
+                        hookNames.add(el.name.text);
+            }
+        }
+        if (ts.isVariableDeclaration(node) && ts.isIdentifier(node.name) && node.initializer)
+            consts.set(node.name.text, node.initializer);
+        if (ts.isTypeAliasDeclaration(node))
+            typeAliases.set(node.name.text, node.type);
+        if (ts.isParameter(node) && node.type) {
+            if (ts.isIdentifier(node.name))
+                paramTypes.set(node.name.text, node.type);
+            const component = componentName(node.parent);
+            if (component && ts.isObjectBindingPattern(node.name)) {
+                for (const el of node.name.elements) {
+                    if (!ts.isIdentifier(el.name))
+                        continue;
+                    const key = (el.propertyName && ts.isIdentifier(el.propertyName) ? el.propertyName : el.name).text;
+                    propParams.set(el.name.text, { component, name: key });
+                }
+            }
+            if (ts.isObjectBindingPattern(node.name) && ts.isTypeLiteralNode(node.type)) {
+                for (const el of node.name.elements) {
+                    if (!ts.isIdentifier(el.name))
+                        continue;
+                    const key = (el.propertyName && ts.isIdentifier(el.propertyName) ? el.propertyName : el.name).text;
+                    const member = node.type.members.find((m) => ts.isPropertySignature(m) && ts.isIdentifier(m.name) && m.name.text === key);
+                    if (member?.type)
+                        paramTypes.set(el.name.text, member.type);
+                }
+            }
+        }
+        ts.forEachChild(node, collect);
+    };
+    collect(sf);
+    if (hookNames.size === 0)
+        return result;
+    const resolve = (expr, depth = 0) => {
+        if (depth > 5)
+            return null;
+        if (ts.isStringLiteral(expr) || ts.isNoSubstitutionTemplateLiteral(expr))
+            return [expr.text];
+        if (ts.isTemplateExpression(expr) && expr.head.text.includes(".")) {
+            const top = expr.head.text.split(".")[0];
+            if (top)
+                return [top];
+        }
+        if (ts.isParenthesizedExpression(expr) || ts.isAsExpression(expr))
+            return resolve(expr.expression, depth + 1);
+        if (ts.isConditionalExpression(expr)) {
+            const a = resolve(expr.whenTrue, depth + 1);
+            const b = resolve(expr.whenFalse, depth + 1);
+            return a && b ? [...a, ...b] : null;
+        }
+        if (ts.isIdentifier(expr)) {
+            const init = consts.get(expr.text);
+            if (init)
+                return resolve(init, depth + 1);
+            return literalsOfType(paramTypes.get(expr.text), sf, typeAliases);
+        }
+        return null;
+    };
+    const found = new Set();
+    const visit = (node) => {
+        if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && hookNames.has(node.expression.text)) {
+            const arg = node.arguments[0];
+            if (!arg)
+                result.usesRoot = true;
+            else {
+                const values = resolve(arg);
+                if (values)
+                    values.forEach((v) => found.add(topLevel(v)));
+                else {
+                    const call = { file, line: sf.getLineAndCharacterOfPosition(arg.getStart()).line + 1, text: arg.getText() };
+                    const prop = propOf(arg, propParams);
+                    if (prop)
+                        call.prop = prop;
+                    result.dynamicCalls.push(call);
+                }
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(sf);
+    result.namespaces = [...found];
+    return result;
+}

package/dist/src/client_messages_scan/scan_project.d.ts

@@ -0,0 +1,16 @@
+import { matchesNamespacePattern } from "./match_namespace.js";
+import { type DynamicCall } from "./scan_file.js";
+export { matchesNamespacePattern };
+export interface ScanProjectOptions {
+    root: string;
+    dirs?: string[];
+    packages?: string[];
+    fallbackNamespaces?: string[];
+    onDynamic?: "all" | "fallback";
+}
+export interface ClientMessagesManifest {
+    namespaces: string[] | true;
+    dynamicCalls: DynamicCall[];
+    scannedFiles: number;
+}
+export declare function scanProject(opts: ScanProjectOptions): ClientMessagesManifest;

package/dist/src/client_messages_scan/scan_project.js

@@ -0,0 +1,67 @@
+import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
+import { join } from "node:path";
+import { matchesNamespacePattern } from "./match_namespace.js";
+import { findJsxPropValues, scanFile } from "./scan_file.js";
+export { matchesNamespacePattern };
+const EXT = /\.(tsx?|jsx?|mjs)$/;
+const SKIP_DIRS = new Set(["node_modules", "dist", ".next", ".git"]);
+function walk(dir, out, skipNodeModules) {
+    for (const name of readdirSync(dir)) {
+        const full = join(dir, name);
+        if (statSync(full).isDirectory()) {
+            if (SKIP_DIRS.has(name) && (skipNodeModules || name !== "dist"))
+                continue;
+            walk(full, out, skipNodeModules);
+        }
+        else if (EXT.test(name) && !/\.(test|spec|bench)\./.test(name) && !name.endsWith(".d.ts"))
+            out.push(full);
+    }
+}
+export function scanProject(opts) {
+    const files = [];
+    for (const d of opts.dirs ?? ["src", "app", "components"]) {
+        const full = join(opts.root, d);
+        if (existsSync(full))
+            walk(full, files, true);
+    }
+    const found = new Set(opts.fallbackNamespaces ?? []);
+    for (const pkg of opts.packages ?? []) {
+        const pkgDir = join(opts.root, "node_modules", pkg);
+        const pjPath = join(pkgDir, "package.json");
+        if (!existsSync(pjPath))
+            continue;
+        const pj = JSON.parse(readFileSync(pjPath, "utf8"));
+        if (Array.isArray(pj.i18n?.namespaces))
+            pj.i18n.namespaces.forEach((n) => found.add(n));
+        else
+            walk(pkgDir, files, false);
+    }
+    let dynamicCalls = [];
+    let usesRoot = false;
+    const sources = new Map();
+    for (const f of files) {
+        const code = readFileSync(f, "utf8");
+        sources.set(f, code);
+        const r = scanFile(f, code);
+        r.namespaces.forEach((n) => found.add(n));
+        dynamicCalls.push(...r.dynamicCalls);
+        usesRoot || (usesRoot = r.usesRoot);
+    }
+    dynamicCalls = dynamicCalls.filter((call) => {
+        if (!call.prop)
+            return true;
+        const values = [];
+        for (const [f, code] of sources) {
+            const v = findJsxPropValues(f, code, call.prop.component, call.prop.name);
+            if (v === null)
+                return true;
+            values.push(...v);
+        }
+        if (values.length === 0)
+            return true;
+        values.forEach((v) => found.add(v.split(".")[0]));
+        return false;
+    });
+    const sendAll = usesRoot || (dynamicCalls.length > 0 && (opts.onDynamic ?? "all") === "all");
+    return { namespaces: sendAll ? true : [...found].sort(), dynamicCalls, scannedFiles: files.length };
+}

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

@@ -1,6 +1,6 @@
 'use client';
 import { usePathname } from 'next/navigation.js';
-import { useReportWebVitals } from 'next/web-vitals';
+import { useReportWebVitals } from 'next/web-vitals.js';
 import { useEffect } from 'react';
 import useCookieConsent from '../use_cookie_consent.js';
 const metricEventNames = {

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/dist/src/cookie_consent/index.d.ts

@@ -3,6 +3,7 @@ export { default as useCookieConsent } from './client/use_cookie_consent.js';
 export { default as CookieConsentDialog } from './client/components/cookie_consent_dialog.js';
 export { default as PrivacyPolicyUpdateDialog } from './client/components/privacy_policy_update_dialog.js';
 export { default as CookieConsentAnalytics } from './client/components/cookie_consent_analytics.js';
+export { default as AutoAnalyticsEvents } from './client/components/auto_analytics_events.js';
 export { defaultGdprCountries } from './gdpr_countries.js';
 export type { CookieConsentContextType, ConsentValue, CookieDialogClassNames, CookieDialogStyles } from './types.js';
 export type { CookieConsentDialogProps } from './client/components/cookie_consent_dialog.js';

package/dist/src/cookie_consent/index.js

@@ -3,4 +3,5 @@ export { default as useCookieConsent } from './client/use_cookie_consent.js';
 export { default as CookieConsentDialog } from './client/components/cookie_consent_dialog.js';
 export { default as PrivacyPolicyUpdateDialog } from './client/components/privacy_policy_update_dialog.js';
 export { default as CookieConsentAnalytics } from './client/components/cookie_consent_analytics.js';
+export { default as AutoAnalyticsEvents } from './client/components/auto_analytics_events.js';
 export { defaultGdprCountries } from './gdpr_countries.js';

package/dist/src/general/pick_client_messages.d.ts

@@ -0,0 +1,2 @@
+import type { TranslationObject } from "../types/types.js";
+export default function pickClientMessages(messages: TranslationObject, clientMessages: boolean | "auto" | readonly string[] | undefined, autoManifest?: string[] | true | undefined): TranslationObject;

package/dist/src/general/pick_client_messages.js

@@ -0,0 +1,17 @@
+import { matchesNamespacePattern } from "../client_messages_scan/match_namespace.js";
+function readAutoManifest() {
+    return typeof __CFNI_CLIENT_MESSAGES__ === "undefined" ? undefined : __CFNI_CLIENT_MESSAGES__;
+}
+export default function pickClientMessages(messages, clientMessages, autoManifest = readAutoManifest()) {
+    const list = clientMessages === "auto" ? autoManifest ?? true : clientMessages;
+    if (list === undefined || list === true)
+        return messages;
+    const picked = {};
+    if (list === false)
+        return picked;
+    for (const namespace of Object.keys(messages)) {
+        if (list.some((p) => matchesNamespacePattern(namespace, p)))
+            picked[namespace] = messages[namespace];
+    }
+    return picked;
+}

package/dist/src/image_optimizer/next_image_shim.js

@@ -22,6 +22,14 @@ catch {
 const images = (manifestData && typeof manifestData === "object" && manifestData.images)
     ? manifestData.images
     : {};
+let defaultCustomLoader;
+try {
+    const loaderMod = (await import("virtual:cloudflare-next-intl-image-loader"));
+    defaultCustomLoader = loaderMod.defaultLoader ?? loaderMod.default;
+}
+catch {
+    defaultCustomLoader = undefined;
+}
 function findEntry(srcVal) {
     if (!srcVal)
         return undefined;
@@ -85,6 +93,7 @@ function resolveProps(props) {
     let width = props.width;
     let height = props.height;
     let style = props.style;
+    const loader = props.loader ?? defaultCustomLoader;
     const entry = findEntry(src);
     if (entry) {
         const variant = pickVariant(entry, typeof props.width === "number" ? props.width : undefined);
@@ -117,7 +126,7 @@ function resolveProps(props) {
             ...style,
         };
     }
-    return { ...props, src, blurDataURL, width, height, style };
+    return { ...props, src, blurDataURL, width, height, style, loader };
 }
 export default function Image(props) {
     const resolved = resolveProps(props);

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

@@ -5,6 +5,7 @@ import { Suspense } from "react";
 import dynamic from "next/dynamic.js";
 import { localesSet } from "../../config/middleware.js";
 import config from "../../config/intl_config.js";
+import pickClientMessages from "../../general/pick_client_messages.js";
 import installConsoleErrorOverride from "../../error_handling/install_console_error_override.js";
 import reportError from "../../error_handling/report_error.js";
 const LocationzationClientProvider = dynamic(() => import("../../client/components/client_provider.js"));
@@ -21,7 +22,7 @@ export default async function LocationzationProvider({ language, messages, stati
     if (messages) {
         setMessageForLocaleCache(language, messages);
     }
-    const messagesValue = messages ?? await getMessage(language);
+    const messagesValue = pickClientMessages(messages ?? await getMessage(language), config.clientMessages);
     installConsoleErrorOverride(config);
     let initialAuthUser = null;
     const autoWireClientProvider = config.firebaseAuth?.autoWireClientProvider !== false;

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

@@ -5,6 +5,7 @@ import { Suspense } from "react";
 import dynamic from "next/dynamic.js";
 import { localesSet } from "../../config/middleware.js";
 import config from "../../config/intl_config.js";
+import pickClientMessages from "../../general/pick_client_messages.js";
 import installConsoleErrorOverride from "../../error_handling/install_console_error_override.js";
 import reportError from "../../error_handling/report_error.js";
 const LocationzationClientProvider = dynamic(() => import("../../client/components/client_provider_static.js"));
@@ -26,7 +27,7 @@ export default async function LocationzationProvider({ language, messages, child
     if (messages) {
         setMessageForLocaleCache(language, messages);
     }
-    const messagesValue = messages ?? await getMessage(language);
+    const messagesValue = pickClientMessages(messages ?? await getMessage(language), config.clientMessages);
     installConsoleErrorOverride(config);
     let analyticsConfig;
     let requiresConsent = true;

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

@@ -19,6 +19,7 @@ export interface RoutingConfig<AppLocales extends Locales, AppLocalePrefixMode e
     db?: DbRoutingConfig;
     cookieConsent?: CookieConsentRoutingConfig;
     generate?: GenerateRoutingConfig;
+    clientMessages?: boolean | "auto" | readonly string[];
     errorHandling?: ErrorHandlingRoutingConfig;
     link?: LinkRoutingConfig;
 }

package/dist/src/vite/auto_client_messages_plugin.d.ts

@@ -0,0 +1,7 @@
+import type { Plugin } from "vite";
+import { type ScanProjectOptions } from "../client_messages_scan/scan_project.js";
+export interface AutoClientMessagesOptions extends Partial<Omit<ScanProjectOptions, "root">> {
+    root?: string;
+    strict?: boolean;
+}
+export declare function autoClientMessagesPlugin(options?: AutoClientMessagesOptions): Plugin;

package/dist/src/vite/auto_client_messages_plugin.js

@@ -0,0 +1,34 @@
+import { scanProject } from "../client_messages_scan/scan_project.js";
+const KEY = "__CFNI_CLIENT_MESSAGES__";
+const SOURCE = /\.(tsx?|jsx?|mjs)$/;
+export function autoClientMessagesPlugin(options = {}) {
+    let last = "";
+    const run = () => {
+        const manifest = scanProject({ ...options, root: options.root ?? process.cwd() });
+        for (const d of manifest.dynamicCalls)
+            console.warn(`[cloudflare-next-intl] dynamic useTranslations: ${d.file}:${d.line} ${d.text}`);
+        if (options.strict && manifest.dynamicCalls.length > 0)
+            throw new Error("[cloudflare-next-intl] Dynamic useTranslations namespaces found. Use literals, union types, or fallbackNamespaces with onDynamic: \"fallback\".");
+        console.log(manifest.namespaces === true
+            ? `[cloudflare-next-intl] client messages: sending all (root or dynamic access) from ${manifest.scannedFiles} files`
+            : `[cloudflare-next-intl] client messages: ${manifest.namespaces.length} namespaces from ${manifest.scannedFiles} files`);
+        return JSON.stringify(manifest.namespaces);
+    };
+    return {
+        name: "cloudflare-next-intl-auto-client-messages",
+        config() {
+            last = run();
+            return { define: { [KEY]: last } };
+        },
+        handleHotUpdate({ file, server }) {
+            if (!SOURCE.test(file))
+                return;
+            const next = run();
+            if (next === last)
+                return;
+            last = next;
+            server.config.define[KEY] = next;
+            server.ws.send({ type: "full-reload" });
+        },
+    };
+}

package/dist/src/vite/auto_image_loader_plugin.d.ts

@@ -0,0 +1,21 @@
+import type { Plugin } from "vite";
+export declare const VIRTUAL_IMAGE_LOADER_ID = "virtual:cloudflare-next-intl-image-loader";
+export declare const RESOLVED_IMAGE_LOADER_ID: string;
+export declare const DEFAULT_LOADER_CANDIDATES: readonly ["image-loader.ts", "image-loader.js", "image-loader.mjs", "image-loader.cjs", "image-loader.tsx", "image-loader.jsx", "src/image-loader.ts", "src/image-loader.js", "src/image-loader.mjs", "src/image-loader.cjs", "src/image-loader.tsx", "src/image-loader.jsx"];
+export interface AutoImageLoaderOptions {
+    enabled?: boolean;
+    file?: string;
+    exportName?: string;
+    root?: string;
+}
+export interface DetectedImageLoader {
+    exists: boolean;
+    isEmpty: boolean;
+    loaderPath: string | null;
+    exportName: string | null;
+}
+export declare function findExportedLoaderName(code: string, preferredExportName?: string): string | null;
+export declare function detectImageLoader(options?: AutoImageLoaderOptions): DetectedImageLoader;
+export declare function generateLoaderVirtualModule(detected: DetectedImageLoader): string;
+export declare function autoImageLoaderPlugin(options?: AutoImageLoaderOptions): Plugin;
+export default autoImageLoaderPlugin;

package/dist/src/vite/auto_image_loader_plugin.js

@@ -0,0 +1,151 @@
+import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
+import { getShimPath, VIRTUAL_IMAGE_SHIM_ID } from "../image_optimizer/plugin.js";
+export const VIRTUAL_IMAGE_LOADER_ID = "virtual:cloudflare-next-intl-image-loader";
+export const RESOLVED_IMAGE_LOADER_ID = "\0" + VIRTUAL_IMAGE_LOADER_ID;
+export const DEFAULT_LOADER_CANDIDATES = [
+    "image-loader.ts",
+    "image-loader.js",
+    "image-loader.mjs",
+    "image-loader.cjs",
+    "image-loader.tsx",
+    "image-loader.jsx",
+    "src/image-loader.ts",
+    "src/image-loader.js",
+    "src/image-loader.mjs",
+    "src/image-loader.cjs",
+    "src/image-loader.tsx",
+    "src/image-loader.jsx",
+];
+export function findExportedLoaderName(code, preferredExportName) {
+    const stripped = code
+        .replace(/\/\*[\s\S]*?\*\//g, "")
+        .replace(/\/\/.*/g, "");
+    if (preferredExportName) {
+        if (preferredExportName === "default") {
+            if (/export\s+default\b/.test(stripped) || /export\s*\{[^}]*\bas\s+default\b[^}]*\}/.test(stripped)) {
+                return "default";
+            }
+            return null;
+        }
+        const fnRegex = new RegExp(`export\\s+(?:async\\s+)?function\\s+${preferredExportName}\\b`);
+        if (fnRegex.test(stripped))
+            return preferredExportName;
+        const constRegex = new RegExp(`export\\s+(?:const|let|var)\\s+${preferredExportName}\\b`);
+        if (constRegex.test(stripped))
+            return preferredExportName;
+        const reExportRegex = new RegExp(`export\\s*\\{[^}]*\\b(?:as\\s+)?${preferredExportName}\\b[^}]*\\}`);
+        if (reExportRegex.test(stripped))
+            return preferredExportName;
+        return null;
+    }
+    if (/export\s+default\b/.test(stripped) || /export\s*\{[^}]*\bas\s+default\b[^}]*\}/.test(stripped)) {
+        return "default";
+    }
+    const fnMatch = stripped.match(/export\s+(?:async\s+)?function\s+([a-zA-Z0-9_$]+)/);
+    if (fnMatch?.[1]) {
+        return fnMatch[1];
+    }
+    const varMatch = stripped.match(/export\s+(?:const|let|var)\s+([a-zA-Z0-9_$]+)/);
+    if (varMatch?.[1]) {
+        return varMatch[1];
+    }
+    const exportBlockMatch = stripped.match(/export\s*\{([^}]+)\}/);
+    if (exportBlockMatch?.[1]) {
+        const entries = exportBlockMatch[1].split(",");
+        for (const entry of entries) {
+            const parts = entry.trim().split(/\s+as\s+/);
+            const exportedName = parts[parts.length - 1]?.trim();
+            if (exportedName) {
+                return exportedName;
+            }
+        }
+    }
+    return null;
+}
+export function detectImageLoader(options) {
+    const root = options?.root ? path.resolve(options.root) : process.cwd();
+    let targetPath = null;
+    if (options?.file) {
+        const customPath = path.isAbsolute(options.file) ? options.file : path.resolve(root, options.file);
+        if (existsSync(customPath)) {
+            targetPath = customPath;
+        }
+        else {
+            return { exists: false, isEmpty: false, loaderPath: null, exportName: null };
+        }
+    }
+    else {
+        for (const candidate of DEFAULT_LOADER_CANDIDATES) {
+            const candidatePath = path.resolve(root, candidate);
+            if (existsSync(candidatePath)) {
+                targetPath = candidatePath;
+                break;
+            }
+        }
+    }
+    if (!targetPath) {
+        return { exists: false, isEmpty: false, loaderPath: null, exportName: null };
+    }
+    const content = readFileSync(targetPath, "utf8");
+    const stripped = content.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\/\/.*/g, "").trim();
+    if (!stripped) {
+        return { exists: true, isEmpty: true, loaderPath: targetPath, exportName: null };
+    }
+    const exportName = findExportedLoaderName(content, options?.exportName);
+    return {
+        exists: true,
+        isEmpty: false,
+        loaderPath: targetPath,
+        exportName,
+    };
+}
+export function generateLoaderVirtualModule(detected) {
+    if (!detected.exists || detected.isEmpty || !detected.loaderPath || !detected.exportName) {
+        return `export const defaultLoader = undefined;\nexport const hasCustomLoader = false;\nexport default undefined;\n`;
+    }
+    const normalizedPath = detected.loaderPath.replace(/\\/g, "/");
+    if (detected.exportName === "default") {
+        return `import loader from ${JSON.stringify(normalizedPath)};\nexport const defaultLoader = loader;\nexport const hasCustomLoader = true;\nexport default loader;\n`;
+    }
+    return `import { ${detected.exportName} as loader } from ${JSON.stringify(normalizedPath)};\nexport const defaultLoader = loader;\nexport const hasCustomLoader = true;\nexport default loader;\n`;
+}
+export function autoImageLoaderPlugin(options) {
+    const isEnabled = options?.enabled !== false;
+    return {
+        name: "cloudflare-next-intl-auto-image-loader",
+        enforce: "pre",
+        resolveId(id) {
+            if (id === VIRTUAL_IMAGE_LOADER_ID) {
+                return RESOLVED_IMAGE_LOADER_ID;
+            }
+            if (id === VIRTUAL_IMAGE_SHIM_ID) {
+                return getShimPath();
+            }
+            return undefined;
+        },
+        load(id) {
+            if (id === RESOLVED_IMAGE_LOADER_ID) {
+                if (!isEnabled) {
+                    return `export const defaultLoader = undefined;\nexport const hasCustomLoader = false;\nexport default undefined;\n`;
+                }
+                const detected = detectImageLoader(options);
+                return generateLoaderVirtualModule(detected);
+            }
+            return undefined;
+        },
+        transform(code, id) {
+            if (!isEnabled)
+                return undefined;
+            if (id.includes("node_modules"))
+                return undefined;
+            if (id === getShimPath())
+                return undefined;
+            if (!/from\s*["']next\/image["']/.test(code))
+                return undefined;
+            const next = code.replace(/(import\s+(?!type\s)[^;]*?from\s*)(["'])next\/image\2/g, `$1$2${VIRTUAL_IMAGE_SHIM_ID}$2`);
+            return next === code ? undefined : { code: next, map: null };
+        },
+    };
+}
+export default autoImageLoaderPlugin;

package/dist/src/vite/index.d.ts

@@ -1,3 +1,4 @@
+export { autoClientMessagesPlugin, type AutoClientMessagesOptions } from "./auto_client_messages_plugin.js";
 export { autoDynamicPagesPlugin, type AutoDynamicPagesPluginOptions } from "./auto_dynamic_pages_plugin.js";
 export { autoLocaleParamsPlugin, type AutoLocaleParamsPluginOptions } from "./auto_locale_params_plugin.js";
 export { layoutQueriesPlugin, type LayoutQueriesPluginOptions } from "./layout_queries_plugin.js";
@@ -11,5 +12,6 @@ export { reactEvalStubPlugin, reactEvalEsbuildPlugin, transformReactEval, EVAL_W
 export { vinextRouteWiringFixPlugin, patchAppPageRouteWiring, isAppPageRouteWiringFile, isAppPageRouteWiringAlreadyFixed, isVinextAppPageRouteWiringSafeOnDisk, patchAppPageProbe, isAppPageProbeFile, isAppPageProbeAlreadyFixed, isVinextAppPageProbeSafeOnDisk, type VinextRouteWiringFixPluginOptions, } from "./vinext_route_wiring_fix.js";
 export { localeFilePlugin, resolveDefaultIntlConfigPath, type LocaleFilePluginOptions } from "./locale_file_plugin.js";
 export { lucideOptimizerPlugin, detectLucideReact, resolveLucideEsmEntry, parseLucideIconMap, transformLucideImports, transformNextJsImports, type LucideOptimizerPluginOptions, } from "./lucide_optimizer_plugin.js";
+export { autoImageLoaderPlugin, detectImageLoader, findExportedLoaderName, generateLoaderVirtualModule, DEFAULT_LOADER_CANDIDATES, VIRTUAL_IMAGE_LOADER_ID, RESOLVED_IMAGE_LOADER_ID, type AutoImageLoaderOptions, type DetectedImageLoader, } from "./auto_image_loader_plugin.js";
 export { cloudflareNextIntl, cloudflareNextIntlPlugin, type CloudflareNextIntlOptions, default } from "./plugin.js";
 export { imageOptimizer, imageOptimizerPlugin, VIRTUAL_IMAGE_SHIM_ID, type ImageFormat, type ImageBlurOptions, type ImageOverrideOptions, type ImageOptimizerPluginOptions, type ResolvedBlurOptions, type ResolvedOptions, type ResolvedImageConfig, type OptimizedImage, type ManifestData, type ManifestEntry, } from "../image_optimizer/index.js";

package/dist/src/vite/index.js

@@ -1,3 +1,4 @@
+export { autoClientMessagesPlugin } from "./auto_client_messages_plugin.js";
 export { autoDynamicPagesPlugin } from "./auto_dynamic_pages_plugin.js";
 export { autoLocaleParamsPlugin } from "./auto_locale_params_plugin.js";
 export { layoutQueriesPlugin } from "./layout_queries_plugin.js";
@@ -11,5 +12,6 @@ export { reactEvalStubPlugin, reactEvalEsbuildPlugin, transformReactEval, EVAL_W
 export { vinextRouteWiringFixPlugin, patchAppPageRouteWiring, isAppPageRouteWiringFile, isAppPageRouteWiringAlreadyFixed, isVinextAppPageRouteWiringSafeOnDisk, patchAppPageProbe, isAppPageProbeFile, isAppPageProbeAlreadyFixed, isVinextAppPageProbeSafeOnDisk, } from "./vinext_route_wiring_fix.js";
 export { localeFilePlugin, resolveDefaultIntlConfigPath } from "./locale_file_plugin.js";
 export { lucideOptimizerPlugin, detectLucideReact, resolveLucideEsmEntry, parseLucideIconMap, transformLucideImports, transformNextJsImports, } from "./lucide_optimizer_plugin.js";
+export { autoImageLoaderPlugin, detectImageLoader, findExportedLoaderName, generateLoaderVirtualModule, DEFAULT_LOADER_CANDIDATES, VIRTUAL_IMAGE_LOADER_ID, RESOLVED_IMAGE_LOADER_ID, } from "./auto_image_loader_plugin.js";
 export { cloudflareNextIntl, cloudflareNextIntlPlugin, default } from "./plugin.js";
 export { imageOptimizer, imageOptimizerPlugin, VIRTUAL_IMAGE_SHIM_ID, } from "../image_optimizer/index.js";

package/dist/src/vite/plugin.d.ts

@@ -3,6 +3,8 @@ import { type LocaleFilePluginOptions } from "./locale_file_plugin.js";
 import { type ImageOptimizerPluginOptions } from "../image_optimizer/index.js";
 import { type AutoDynamicPagesPluginOptions } from "./auto_dynamic_pages_plugin.js";
 import { type AutoLocaleParamsPluginOptions } from "./auto_locale_params_plugin.js";
+import { type AutoImageLoaderOptions } from "./auto_image_loader_plugin.js";
+import { type AutoClientMessagesOptions } from "./auto_client_messages_plugin.js";
 import { type LayoutQueriesPluginOptions } from "./layout_queries_plugin.js";
 import { type FirebaseAuthCheckPluginOptions } from "./firebase_auth_check_plugin.js";
 import { type VinextRouteWiringFixPluginOptions } from "./vinext_route_wiring_fix.js";
@@ -17,6 +19,8 @@ export interface CloudflareNextIntlOptions extends LocaleFilePluginOptions {
     bufferStub?: boolean;
     reactEvalStub?: boolean;
     optionalFirebaseStub?: boolean;
+    autoImageLoader?: boolean | AutoImageLoaderOptions;
+    autoClientMessages?: boolean | AutoClientMessagesOptions;
     imageOptimizer?: boolean | ImageOptimizerPluginOptions;
     vinextRouteWiringFix?: boolean | VinextRouteWiringFixPluginOptions;
     autoLocaleParams?: boolean | AutoLocaleParamsPluginOptions;

package/dist/src/vite/plugin.js

@@ -8,6 +8,8 @@ import { localeFilePlugin } from "./locale_file_plugin.js";
 import { imageOptimizerPlugin } from "../image_optimizer/index.js";
 import { autoDynamicPagesPlugin } from "./auto_dynamic_pages_plugin.js";
 import { autoLocaleParamsPlugin } from "./auto_locale_params_plugin.js";
+import { autoImageLoaderPlugin } from "./auto_image_loader_plugin.js";
+import { autoClientMessagesPlugin } from "./auto_client_messages_plugin.js";
 import { layoutQueriesPlugin } from "./layout_queries_plugin.js";
 import { firebaseAuthCheckPlugin } from "./firebase_auth_check_plugin.js";
 import { vinextRouteWiringFixPlugin } from "./vinext_route_wiring_fix.js";
@@ -48,6 +50,16 @@ export function cloudflareNextIntl(options = {}) {
         }
         plugins.push(autoDynamicPagesPlugin(autoDynamicPagesOptions));
     }
+    if (options.autoImageLoader !== false) {
+        plugins.push(autoImageLoaderPlugin(typeof options.autoImageLoader === "object"
+            ? { root: options.root, ...options.autoImageLoader }
+            : { root: options.root }));
+    }
+    if (options.autoClientMessages) {
+        plugins.push(autoClientMessagesPlugin(typeof options.autoClientMessages === "object"
+            ? { root: options.root, ...options.autoClientMessages }
+            : { root: options.root }));
+    }
     if (options.imageOptimizer !== false) {
         plugins.push(imageOptimizerPlugin(typeof options.imageOptimizer === "object"
             ? options.imageOptimizer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-next-intl",
-  "version": "0.10.26",
+  "version": "0.10.28",
   "description": "Optimized Next Intl Package Special for App Router and Cloudflare",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -180,6 +180,10 @@
       "types": "./dist/src/cookie_consent/client/components/cookie_consent_analytics.d.ts",
       "import": "./dist/src/cookie_consent/client/components/cookie_consent_analytics.js"
     },
+    "./AutoAnalyticsEvents": {
+      "types": "./dist/src/cookie_consent/client/components/auto_analytics_events.d.ts",
+      "import": "./dist/src/cookie_consent/client/components/auto_analytics_events.js"
+    },
     "./errorHandling": {
       "types": "./dist/src/error_handling/index.d.ts",
       "import": "./dist/src/error_handling/index.js"