cloudflare-next-intl 0.10.28 → 0.10.30

package/README.md

@@ -167,17 +167,19 @@ 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`.
+in client components. By default, `clientMessages: "auto"` and `autoClientMessages`
+Vite plugin are **enabled by default** with `{ onDynamic: "fallback", fallbackNamespaces: [] }`
+to automatically scan and ship only the namespaces your client components use.
+
+You can customize or disable either side:
+- Set `clientMessages: false` (server-only messages), `true` (all messages), or `["Auth", "Common", "Categories*"]` in intl config.
+- In `vite.config.ts`, pass `autoClientMessages: false` to disable scanning, or customize options:
 
 ```ts
-// vite.config.ts
+// vite.config.ts (optional customization — enabled by default)
 cloudflareNextIntl({
-    autoClientMessages: { fallbackNamespaces: ["Common"], onDynamic: "fallback", packages: ["@my/ui"] }
+    autoClientMessages: { fallbackNamespaces: ["Common"], packages: ["@my/ui"] }
 })
-// intl.config.ts -> setIntlConfig({ clientMessages: "auto", ... })
 ```
 
 > UI library packages can declare `"i18n": { "namespaces": ["Buttons"] }` in `package.json` for automatic inclusion.
@@ -309,9 +311,10 @@ export default defineConfig({
                 blur: { quality: 70, stdDeviation: 20 }, // Next.js blur placeholder options (or `false`)
                 overrides: {                      // Per-image overrides keyed by public src path (wins over scanned <Image> props)
                     "/images/hero.png": { maxWidth: false, formats: ["webp"], blur: { quality: 80 } },
-                    "/images/logo.png": { formats: false, blur: false },
                 },
             },
+            autoImageLoader: true,                // Auto-detect custom image loader (from next.config.* loaderFile or image-loader.ts; default: true, or options object)
+            autoClientMessages: true,             // Auto-scan client useTranslations calls to trim client payload (default: true, or options object)
             autoLocaleParams: {                   // Auto-insert locale params/setLocale (or `false` to disable)
                 mode: "fix",                       // "fix" | "report" | "off" (default: "fix")
                 localeParam: "locale",             // Route param name to read (default: "locale")
@@ -354,7 +357,7 @@ export default defineConfig({
 > **Note:** `unblockPageElementDependencies: true` was measured, in a real app, to make page-to-page navigation noticeably slower rather than faster — it strips ordering vinext's own page-element wiring relies on. Leave it off unless you've verified otherwise for your app.
 
 Individual standalone plugins are also exported if you only need a specific feature:
-`imageOptimizerPlugin` (or `imageOptimizer`), `autoLocaleParamsPlugin`, `layoutQueriesPlugin` (or `layoutQueriesCheck`), `firebaseAuthCheckPlugin` (or `firebaseAuthCheck`), `buildIdAsset`, `localeFilePlugin`, `userAgentStubPlugin`, `cfWorkersClientStubPlugin`, `vinextRouteWiringFixPlugin`, `lucideOptimizerPlugin`.
+`imageOptimizerPlugin` (or `imageOptimizer`), `autoImageLoaderPlugin`, `autoClientMessagesPlugin`, `autoLocaleParamsPlugin`, `layoutQueriesPlugin` (or `layoutQueriesCheck`), `firebaseAuthCheckPlugin` (or `firebaseAuthCheck`), `buildIdAsset`, `localeFilePlugin`, `userAgentStubPlugin`, `cfWorkersClientStubPlugin`, `vinextRouteWiringFixPlugin`, `lucideOptimizerPlugin`.
 
 ##### Per-Image Optimizer Settings
 

package/dist/src/client_messages_scan/scan_project.js

@@ -19,7 +19,7 @@ function walk(dir, out, skipNodeModules) {
 }
 export function scanProject(opts) {
     const files = [];
-    for (const d of opts.dirs ?? ["src", "app", "components"]) {
+    for (const d of opts.dirs ?? ["src", "app", "components", "pages", "shared", "modules", "lib"]) {
         const full = join(opts.root, d);
         if (existsSync(full))
             walk(full, files, true);

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

@@ -1,2 +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;
+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

@@ -2,9 +2,9 @@ import { matchesNamespacePattern } from "../client_messages_scan/match_namespace
 function readAutoManifest() {
     return typeof __CFNI_CLIENT_MESSAGES__ === "undefined" ? undefined : __CFNI_CLIENT_MESSAGES__;
 }
-export default function pickClientMessages(messages, clientMessages, autoManifest = readAutoManifest()) {
+export default function pickClientMessages(messages, clientMessages = "auto", autoManifest = readAutoManifest()) {
     const list = clientMessages === "auto" ? autoManifest ?? true : clientMessages;
-    if (list === undefined || list === true)
+    if (list === true)
         return messages;
     const picked = {};
     if (list === false)

package/dist/src/vite/auto_client_messages_plugin.js

@@ -2,12 +2,17 @@ import { scanProject } from "../client_messages_scan/scan_project.js";
 const KEY = "__CFNI_CLIENT_MESSAGES__";
 const SOURCE = /\.(tsx?|jsx?|mjs)$/;
 export function autoClientMessagesPlugin(options = {}) {
+    const opts = {
+        onDynamic: "fallback",
+        fallbackNamespaces: [],
+        ...options,
+    };
     let last = "";
     const run = () => {
-        const manifest = scanProject({ ...options, root: options.root ?? process.cwd() });
+        const manifest = scanProject({ ...opts, root: opts.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)
+        if (opts.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`

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

@@ -1,6 +1,7 @@
 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 NEXT_CONFIG_CANDIDATES: readonly ["next.config.ts", "next.config.mts", "next.config.mjs", "next.config.js", "next.config.cjs"];
 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;
@@ -8,6 +9,7 @@ export interface AutoImageLoaderOptions {
     exportName?: string;
     root?: string;
 }
+export declare function findLoaderFileFromNextConfig(root: string): string | null;
 export interface DetectedImageLoader {
     exists: boolean;
     isEmpty: boolean;

package/dist/src/vite/auto_image_loader_plugin.js

@@ -3,6 +3,13 @@ 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 NEXT_CONFIG_CANDIDATES = [
+    "next.config.ts",
+    "next.config.mts",
+    "next.config.mjs",
+    "next.config.js",
+    "next.config.cjs",
+];
 export const DEFAULT_LOADER_CANDIDATES = [
     "image-loader.ts",
     "image-loader.js",
@@ -17,6 +24,32 @@ export const DEFAULT_LOADER_CANDIDATES = [
     "src/image-loader.tsx",
     "src/image-loader.jsx",
 ];
+export function findLoaderFileFromNextConfig(root) {
+    for (const name of NEXT_CONFIG_CANDIDATES) {
+        const configPath = path.resolve(root, name);
+        if (!existsSync(configPath))
+            continue;
+        const raw = readFileSync(configPath, "utf8");
+        const stripped = raw
+            .replace(/\/\*[\s\S]*?\*\//g, "")
+            .replace(/\/\/.*/g, "");
+        const match = stripped.match(/loaderFile\s*:\s*["'`]([^"'`]+)["'`]/);
+        if (match?.[1]) {
+            const candidate = match[1].trim();
+            const resolved = path.isAbsolute(candidate) ? candidate : path.resolve(root, candidate);
+            if (existsSync(resolved)) {
+                return resolved;
+            }
+            const extensions = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
+            for (const ext of extensions) {
+                if (existsSync(resolved + ext)) {
+                    return resolved + ext;
+                }
+            }
+        }
+    }
+    return null;
+}
 export function findExportedLoaderName(code, preferredExportName) {
     const stripped = code
         .replace(/\/\*[\s\S]*?\*\//g, "")
@@ -76,11 +109,17 @@ export function detectImageLoader(options) {
         }
     }
     else {
-        for (const candidate of DEFAULT_LOADER_CANDIDATES) {
-            const candidatePath = path.resolve(root, candidate);
-            if (existsSync(candidatePath)) {
-                targetPath = candidatePath;
-                break;
+        const configLoader = findLoaderFileFromNextConfig(root);
+        if (configLoader) {
+            targetPath = configLoader;
+        }
+        else {
+            for (const candidate of DEFAULT_LOADER_CANDIDATES) {
+                const candidatePath = path.resolve(root, candidate);
+                if (existsSync(candidatePath)) {
+                    targetPath = candidatePath;
+                    break;
+                }
             }
         }
     }

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

@@ -12,6 +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 { autoImageLoaderPlugin, detectImageLoader, findExportedLoaderName, findLoaderFileFromNextConfig, generateLoaderVirtualModule, DEFAULT_LOADER_CANDIDATES, NEXT_CONFIG_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

@@ -12,6 +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 { autoImageLoaderPlugin, detectImageLoader, findExportedLoaderName, findLoaderFileFromNextConfig, generateLoaderVirtualModule, DEFAULT_LOADER_CANDIDATES, NEXT_CONFIG_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.js

@@ -55,7 +55,7 @@ export function cloudflareNextIntl(options = {}) {
             ? { root: options.root, ...options.autoImageLoader }
             : { root: options.root }));
     }
-    if (options.autoClientMessages) {
+    if (options.autoClientMessages !== false) {
         plugins.push(autoClientMessagesPlugin(typeof options.autoClientMessages === "object"
             ? { root: options.root, ...options.autoClientMessages }
             : { root: options.root }));

package/package.json

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