cloudflare-next-intl 0.9.49 → 0.9.51

package/README.md

@@ -267,8 +267,9 @@ export default defineConfig({
 6. **User-Agent Stub (`userAgentStub`)**: Prevents Next.js `user-agent` from importing `node:fs` during workerd runtime execution (which otherwise causes runtime 404 / 500 crashes in Workers proxy/middleware).
 7. **Cloudflare Workers Client Stub (`cfWorkersClientStub`)**: Stubs `cloudflare:workers` in client builds so shared modules can be referenced without client bundling errors.
 8. **Build ID Asset Emission (`buildIdAsset`)**: Emits `BUILD_ID` static asset in the client build directory from `process.env.__VINEXT_SHARED_BUILD_ID` or `process.env.__VINEXT_BUILD_ID`.
-9. **Vinext Route Wiring & Optimistic Prefetch Fix (`vinextRouteWiringFix`)**: Patches Vinext runtime route wiring, route matching, optimistic route template resolution, and prefetch learning so pending prefetches with already cached templates don't block navigation, and leading `:locale` segments route correctly.
-10. **Lucide & Next.js Specifier Optimizer (`lucideOptimizer`)**: Auto-detects `lucide-react` in project dependencies, rewrites named imports to direct deep icon paths (`lucide-react/dist/esm/icons/<icon>.mjs`) to avoid browser socket exhaustion (`ERR_INSUFFICIENT_RESOURCES`), and normalizes Next.js `.js` specifiers (`next/dynamic.js` -> `next/dynamic`) to prevent mid-session Vite re-optimization and React dispatcher splitting.
+9. **Vinext Route Wiring & Optimistic Prefetch Fix (`vinextRouteWiringFix`)**: ⚠️ Monkey-patches Vinext's compiled runtime on disk (`node_modules/vinext/dist/**`) — **on by default** since 0.9.51 via `experimentalRouteLoadingFixes` (also defaulting to on). Fixes route wiring (a route-specific `loading.tsx` losing to an ancestor/root skeleton), route matching and optimistic (client-side) routing for leading `:locale` segments, prefetch learning (an in-flight prefetch losing the race so the previous page stays on screen), and a `refresh()` navigation cancelling an in-flight page-to-page navigation because both share the same counter. Every sub-patch is regex-based against vinext's exact compiled shape and checks that the vinext-internal identifiers it relies on (`makeThenableParams`, `trieMatch`, `getPrefetchCache`, …) are still present before touching a file — a future vinext release that renames or removes one is left unpatched (with a console warning) rather than being patched into a broken half-state. Set `experimentalRouteLoadingFixes: false` (or `vinextRouteWiringFix: false`) to opt out entirely; see **Plugin Options** below for the individual sub-patch flags (`routeWiring`, `routeMatching`, `optimisticRouting`, `prefetchLearning`, `suspenseProbe`, `renderDependency`, `optimisticLearningTimeout`, `pageInvokerSuspensionRelease`, `refreshDeferral`, `unblockRenderDependencies`, `unblockPageElementDependencies`).
+10. **Layout DB Query Check (`layoutQueriesCheck`)**: Scans each `layout.tsx`/`layout.ts` and its reachable server-component import tree (also usable standalone from `cloudflare-next-intl/checkLayoutQueries`, or via the `cfni-check-layout-queries` CLI bin) for blocking `withUserDb()` / `withPublicDb()` calls. A layout re-renders on every route transition within its group, so a DB query anywhere in that tree blocks every page switch under it — the scan stops at Client Components (`'use client'`), which don't block server layout streaming. Prints a visible terminal warning with concrete fixes (move to a Client Component, wrap in `unstable_cache`, or move the query out of the shared layout into the page) by default; pass `{ strict: true }` to fail the build instead, or `false` to disable.
+11. **Lucide & Next.js Specifier Optimizer (`lucideOptimizer`)**: Auto-detects `lucide-react` in project dependencies, rewrites named imports to direct deep icon paths (`lucide-react/dist/esm/icons/<icon>.mjs`) to avoid browser socket exhaustion (`ERR_INSUFFICIENT_RESOURCES`), and normalizes Next.js `.js` specifiers (`next/dynamic.js` -> `next/dynamic`) to prevent mid-session Vite re-optimization and React dispatcher splitting.
 
 ##### Plugin Options
 All features are enabled by default, and can be individually configured or toggled off:
@@ -299,21 +300,40 @@ export default defineConfig({
                 localeParam: "locale",             // Route param name to read (default: "locale")
                 skip: ["src/app/[locale]/(marketing)/**"], // Glob(s) to exclude from the scan
             },
+            layoutQueriesCheck: {                  // Flag blocking DB queries in the layout tree (or `false` to disable)
+                strict: false,                     // Fail the build on violations instead of just warning (default: false)
+                runOnDev: true,                    // Also run on `vite dev`, not just build (default: true)
+            },
             messagesDir: "./messages",            // Path to locale JSON files (default: './messages')
             intlConfigPath: "./src/l18n/intl_config.ts", // Path to intl config (auto-detected if omitted)
             buildIdAsset: true,                   // Emit BUILD_ID asset (or custom string filename, default: true)
             localeFiles: true,                    // Enable @locale-file & glob bundling (default: true)
             userAgentStub: true,                  // Enable regex-based user-agent stub (default: true)
             cfWorkersClientStub: true,            // Enable client cloudflare:workers stub (default: true)
-            vinextRouteWiringFix: true,           // Enable vinext route wiring, matching, and prefetch fixes (default: true, or options object)
+            vinextRouteWiringFix: {                // ⚠️ DANGER: Monkey-patches vinext on disk (default: follows experimentalRouteLoadingFixes, i.e. true; or options object)
+                routeWiring: true,                  // Route-specific loading.tsx wins over ancestor/root skeletons (default: true)
+                routeMatching: true,                // Leading `:locale` segment tried against active locale first (default: true)
+                optimisticRouting: true,            // Same fix client-side for optimistic (instant) navigation (default: true)
+                prefetchLearning: true,             // Wait for an in-flight prefetch of the nav target instead of giving up (default: true)
+                optimisticLearningTimeout: true,    // Lower the fixed safety-cap on that wait; pass a number for a custom ms cap (default: true → 200ms)
+                suspenseProbe: true,                // Respect <Suspense> boundaries when probing for async page dependencies (default: true)
+                renderDependency: true,             // Release a render dependency when its component suspends (default: true)
+                pageInvokerSuspensionRelease: true, // Same release, unconditionally, for the page component's own barrier (default: true)
+                refreshDeferral: true,              // Defer a refresh() navigation while a normal navigation is in flight (default: true)
+                unblockRenderDependencies: true,    // Strip layout/template/slot/route dependency ordering (default: true)
+                unblockPageElementDependencies: false, // Also strip it from the PAGE element itself (default: false — see warning below)
+            },
+            experimentalRouteLoadingFixes: true,  // ⚠️ DANGER: Unified switch enabling both vinextRouteWiringFix and SSG on loading.* (default: true)
             lucideOptimizer: true,                // Auto-optimize lucide-react deep imports and normalize next/*.js (default: true, or options object)
         }),
     ],
 });
 ```
 
+> **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`, `buildIdAsset`, `localeFilePlugin`, `userAgentStubPlugin`, `cfWorkersClientStubPlugin`, `vinextRouteWiringFixPlugin`, `lucideOptimizerPlugin`.
+`imageOptimizerPlugin` (or `imageOptimizer`), `autoLocaleParamsPlugin`, `layoutQueriesPlugin` (or `layoutQueriesCheck`), `buildIdAsset`, `localeFilePlugin`, `userAgentStubPlugin`, `cfWorkersClientStubPlugin`, `vinextRouteWiringFixPlugin`, `lucideOptimizerPlugin`.
 
 ##### Per-Image Optimizer Settings
 

package/bin/check_layout_queries.mjs

@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+import { checkLayoutQueries } from "../dist/src/layout_queries_check/index.js";
+
+const isStrict = process.argv.includes("--strict");
+const report = checkLayoutQueries({
+  rootDir: process.cwd(),
+});
+
+if (!report.valid) {
+  console.error(report.formattedMessage);
+  if (isStrict) {
+    process.exit(1);
+  }
+} else {
+  console.log("✅ [cloudflare-next-intl] No blocking database queries found in layout tree.");
+}

package/dist/src/dynamic_pages_check/check_dynamic_pages.d.ts

@@ -9,6 +9,9 @@ export interface CheckDynamicPagesOptions {
     mode?: DynamicPagesCheckMode;
     target?: 'next' | 'vinext';
     skip?: readonly string[];
+    includeLoading?: boolean;
+    verifyVinextRouteWiring?: boolean;
+    projectRoot?: string;
     resolveImports?: boolean;
     aliases?: readonly AliasConfig[];
     extraChecks?: readonly DynamicApiCheck[];
@@ -28,5 +31,6 @@ export interface CheckDynamicPagesIo {
     readFile?: (file: string) => string;
     writeFile?: (file: string, contents: string) => void;
     isFile?: (file: string) => boolean;
+    isVinextRouteWiringSafe?: (root: string) => boolean;
 }
 export declare function checkDynamicPages(options: CheckDynamicPagesOptions, io?: CheckDynamicPagesIo): Promise<(CheckDynamicPagesReport | SyncErrorReportingAuthUserReport)[]>;

package/dist/src/dynamic_pages_check/check_dynamic_pages.js

@@ -6,6 +6,7 @@ import { traceDynamicUsage } from './trace_dynamic_usage.js';
 import { insertDynamicExport } from './insert_dynamic_export.js';
 import { syncErrorReportingAuthUser } from './sync_error_reporting_auth_user.js';
 import { deriveRoute, isApiRoute, makePageLabeler } from './derive_page_label.js';
+import { isVinextAppPageRouteWiringSafeOnDisk } from '../vite/vinext_route_wiring_fix.js';
 const LEGEND = 'λ API   ƒ Dynamic (SSR)   ○ Static (SSG)   = Already declared   - Unclear (framework decides)   · Skipped';
 function actionGlyph(report, isApi) {
     if (isApi && report.action !== 'skipped')
@@ -81,12 +82,33 @@ function defaultIsFile(path) {
         return false;
     }
 }
+function isSsgAction(report) {
+    if (report.action === 'added-force-static' || report.action === 'would-add-force-static') {
+        return true;
+    }
+    if (report.action === 'already-declared') {
+        return report.explicitValue === 'force-static';
+    }
+    return false;
+}
 export async function checkDynamicPages(options, io = {}) {
     const mode = options.mode ?? 'report';
     if (mode === 'off')
         return [];
     const target = options.target ?? 'next';
     const resolveImports = options.resolveImports ?? true;
+    let includeLoading = options.includeLoading ?? false;
+    if (includeLoading && target === 'vinext' && options.verifyVinextRouteWiring !== false) {
+        const projectRoot = options.projectRoot ?? resolve(options.appDir, '..');
+        const checkSafe = io.isVinextRouteWiringSafe ?? isVinextAppPageRouteWiringSafeOnDisk;
+        if (!checkSafe(projectRoot)) {
+            console.warn('[cloudflare-next-intl] WARNING: Vinext route wiring fix is not verified on disk (vinext files may have changed, failed to patch, or patch is disabled). SSG was NOT added to loading.* files.');
+            includeLoading = false;
+        }
+    }
+    if (includeLoading) {
+        console.warn('[cloudflare-next-intl] WARNING: includeLoading is enabled. Forcing SSG on loading.* files is dangerous and can break route rendering, streaming, or hydration.');
+    }
     const findPageFiles = io.findPageFiles ?? findPageFilesImpl;
     const readFile = io.readFile ?? ((file) => readFileSync(file, 'utf8'));
     const writeFile = io.writeFile ?? ((file, contents) => writeFileSync(file, contents, 'utf8'));
@@ -98,6 +120,9 @@ export async function checkDynamicPages(options, io = {}) {
     const extraChecks = options.extraChecks ?? [];
     const reports = [];
     for (const file of findPageFiles(options.appDir)) {
+        if (!includeLoading && fileKind(file) === 'loading') {
+            continue;
+        }
         if (skipSet.has(file)) {
             reports.push({ file, action: 'skipped' });
             continue;
@@ -135,6 +160,14 @@ export async function checkDynamicPages(options, io = {}) {
             reports.push({ file, action: 'would-add-force-dynamic', signals });
         }
     }
+    if (includeLoading) {
+        for (const report of reports) {
+            const r = report;
+            if (fileKind(r.file) === 'loading' && !isSsgAction(r)) {
+                console.warn(`[cloudflare-next-intl] WARNING: Loading file is not static (SSG): ${displayPath(r.file)}`);
+            }
+        }
+    }
     if (options.verbose) {
         const pageLabelStyle = typeof options.verbose === 'object' ? options.verbose.pageLabel : undefined;
         const pageLabel = makePageLabeler(options.appDir, pageLabelStyle, displayPath);

package/dist/src/error_handling/is_stale_deploy_error.js

@@ -6,6 +6,16 @@ export const defaultStaleDeployPatterns = [
     'connection closed',
     'rsc payload',
     'minified react error #412',
+    'minified react error #418',
+    'minified react error #419',
+    'minified react error #421',
+    'minified react error #422',
+    'minified react error #423',
+    'minified react error #425',
+    'minified react error #426',
+    'an error occurred in the server components render',
+    'server components render',
+    'digest property is included on this error instance',
     'the above error occurred in a react component',
     'the connection to the page was unexpectedly closed',
     'readablestream',

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

@@ -157,7 +157,7 @@ export async function getFirebaseAuthClient() {
                 }
             }
             if (perfModule) {
-                cachedPerformance = perfModule.getPerformance(app);
+                cachedPerformance = perfModule.initializePerformance(app, { instrumentationEnabled: false });
             }
             const auth = getAuth(app);
             cached = { app, auth };

package/dist/src/layout_queries_check/check_layout_queries.d.ts

@@ -0,0 +1,23 @@
+export interface LayoutDbViolation {
+    layoutFile: string;
+    sourceFile: string;
+    lineNumber: number;
+    lineContent: string;
+    signal: string;
+    importTrace: string[];
+}
+export interface CheckLayoutQueriesOptions {
+    appDir?: string;
+    rootDir?: string;
+    aliases?: Record<string, string>;
+    maxDepth?: number;
+    throwOnError?: boolean;
+}
+export interface CheckLayoutQueriesReport {
+    valid: boolean;
+    violations: LayoutDbViolation[];
+    formattedMessage: string;
+}
+export declare function findLayoutFiles(dir: string): string[];
+export declare function formatLayoutDbViolationMessage(violations: LayoutDbViolation[]): string;
+export declare function checkLayoutQueries(options?: CheckLayoutQueriesOptions): CheckLayoutQueriesReport;

package/dist/src/layout_queries_check/check_layout_queries.js

@@ -0,0 +1,172 @@
+import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+const DB_SIGNALS = [
+    { name: "withUserDb()", pattern: /\bwithUserDb\s*\(/ },
+    { name: "withPublicDb()", pattern: /\bwithPublicDb\s*\(/ },
+];
+const SUPPORTED_EXTENSIONS = [".tsx", ".ts", ".jsx", ".js", ".mjs"];
+function isClientComponent(content) {
+    return /^\s*["']use client["']/m.test(content);
+}
+export function findLayoutFiles(dir) {
+    const results = [];
+    if (!existsSync(dir))
+        return results;
+    function walk(currentDir) {
+        const entries = readdirSync(currentDir);
+        for (const entry of entries) {
+            if (entry.startsWith(".") || entry === "node_modules")
+                continue;
+            const fullPath = join(currentDir, entry);
+            const stat = statSync(fullPath);
+            if (stat.isDirectory()) {
+                walk(fullPath);
+            }
+            else if (/^layout\.(tsx|ts|jsx|js)$/.test(entry)) {
+                results.push(fullPath);
+            }
+        }
+    }
+    walk(dir);
+    return results;
+}
+function resolveImportPath(specifier, importerFile, rootDir, aliases) {
+    for (const [alias, target] of Object.entries(aliases)) {
+        if (specifier === alias || specifier.startsWith(alias + "/")) {
+            const remainder = specifier.slice(alias.length).replace(/^\//, "");
+            const basePath = resolve(rootDir, target, remainder);
+            return probeExtensions(basePath);
+        }
+    }
+    if (specifier.startsWith("./") || specifier.startsWith("../")) {
+        const basePath = resolve(dirname(importerFile), specifier);
+        return probeExtensions(basePath);
+    }
+    return null;
+}
+function probeExtensions(basePath) {
+    if (existsSync(basePath) && statSync(basePath).isFile()) {
+        return basePath;
+    }
+    for (const ext of SUPPORTED_EXTENSIONS) {
+        const withExt = basePath + ext;
+        if (existsSync(withExt) && statSync(withExt).isFile()) {
+            return withExt;
+        }
+    }
+    for (const ext of SUPPORTED_EXTENSIONS) {
+        const indexFile = join(basePath, "index" + ext);
+        if (existsSync(indexFile) && statSync(indexFile).isFile()) {
+            return indexFile;
+        }
+    }
+    return null;
+}
+function extractImports(content) {
+    const imports = [];
+    const importRegex = /(?:import\s+(?:[\w*\s{},]*\s+from\s+)?|import\s*\(\s*)["']([^"']+)["']/g;
+    let match;
+    while ((match = importRegex.exec(content)) !== null) {
+        if (match[1]) {
+            imports.push(match[1]);
+        }
+    }
+    return imports;
+}
+export function formatLayoutDbViolationMessage(violations) {
+    if (violations.length === 0)
+        return "";
+    const separator = "=".repeat(84);
+    const thinSeparator = "-".repeat(84);
+    const lines = [
+        "",
+        separator,
+        "🚨 [cloudflare-next-intl] BLOCKING DATABASE QUERY DETECTED IN LAYOUT",
+        separator,
+        "",
+        "⚠️  WHY THIS IS DANGEROUS:",
+        "   Layouts are re-evaluated by the server on every route transition within their group.",
+        "   Executing database queries (`withUserDb` / `withPublicDb`) inside the layout tree",
+        "   blocks the entire RSC response on every page switch. This causes page navigation",
+        "   to freeze/hang and completely breaks instant client transitions.",
+        "",
+        "📋 VIOLATIONS FOUND (" + violations.length + "):",
+        thinSeparator,
+    ];
+    violations.forEach((v, i) => {
+        lines.push(` [${i + 1}] Signal: ${v.signal}`);
+        lines.push(`     Layout:   ${v.layoutFile}`);
+        lines.push(`     File:     ${v.sourceFile}:${v.lineNumber}`);
+        lines.push(`     Line:     ${v.lineContent.trim()}`);
+        if (v.importTrace.length > 1) {
+            lines.push(`     Trace:    ${v.importTrace.join(" -> ")}`);
+        }
+        lines.push(thinSeparator);
+    });
+    lines.push("", "💡 HOW TO FIX:", "   1. Move to a Client Component ('use client'):", "      Fetch the data in useEffect / SWR / React Query or a Supabase Realtime subscription.", "      Client components do not block server layout streaming during navigation.", "", "   2. Use Cross-Request Caching (`unstable_cache`):", "      Wrap the database query with `unstable_cache` (from 'next/cache') and a cache tag.", "      This caches results in Cloudflare KV so layout renders in 0ms without hitting Postgres.", "", "   3. Move out of Shared Layout:", "      If only a specific route needs this data, move the component from layout.tsx into that", "      page's page.tsx.", separator, "");
+    return lines.join("\n");
+}
+export function checkLayoutQueries(options = {}) {
+    const rootDir = options.rootDir ?? process.cwd();
+    const appDir = options.appDir ?? resolve(rootDir, "src/app");
+    const aliases = options.aliases ?? {
+        "@": resolve(rootDir, "src"),
+    };
+    const maxDepth = options.maxDepth ?? 20;
+    const layoutFiles = findLayoutFiles(appDir);
+    const violations = [];
+    for (const layoutFile of layoutFiles) {
+        const visited = new Set();
+        function traverse(file, trace, depth) {
+            if (depth > maxDepth || visited.has(file))
+                return;
+            visited.add(file);
+            let content;
+            try {
+                content = readFileSync(file, "utf-8");
+            }
+            catch {
+                return;
+            }
+            if (isClientComponent(content)) {
+                return;
+            }
+            const lines = content.split("\n");
+            lines.forEach((line, index) => {
+                const trimmed = line.trim();
+                if (trimmed.startsWith("//") || trimmed.startsWith("/*") || trimmed.startsWith("*"))
+                    return;
+                for (const signal of DB_SIGNALS) {
+                    if (signal.pattern.test(line)) {
+                        violations.push({
+                            layoutFile,
+                            sourceFile: file,
+                            lineNumber: index + 1,
+                            lineContent: line,
+                            signal: signal.name,
+                            importTrace: [...trace, file],
+                        });
+                    }
+                }
+            });
+            const imports = extractImports(content);
+            for (const imp of imports) {
+                const resolved = resolveImportPath(imp, file, rootDir, aliases);
+                if (resolved) {
+                    traverse(resolved, [...trace, file], depth + 1);
+                }
+            }
+        }
+        traverse(layoutFile, [], 0);
+    }
+    const valid = violations.length === 0;
+    const formattedMessage = formatLayoutDbViolationMessage(violations);
+    if (!valid && options.throwOnError) {
+        throw new Error(formattedMessage);
+    }
+    return {
+        valid,
+        violations,
+        formattedMessage,
+    };
+}

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

@@ -0,0 +1 @@
+export { checkLayoutQueries, formatLayoutDbViolationMessage, findLayoutFiles, type LayoutDbViolation, type CheckLayoutQueriesOptions, type CheckLayoutQueriesReport, } from "./check_layout_queries.js";

package/dist/src/layout_queries_check/index.js

@@ -0,0 +1 @@
+export { checkLayoutQueries, formatLayoutDbViolationMessage, findLayoutFiles, } from "./check_layout_queries.js";

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

@@ -4,6 +4,8 @@ export interface AutoDynamicPagesPluginOptions {
     appDir?: string;
     mode?: DynamicPagesCheckMode;
     target?: 'next' | 'vinext';
+    includeLoading?: boolean;
+    verifyVinextRouteWiring?: boolean;
     syncErrorReportingAuthUser?: boolean;
     extraChecks?: readonly DynamicApiCheck[];
     verbose?: boolean | {

package/dist/src/vite/auto_dynamic_pages_plugin.js

@@ -32,8 +32,11 @@ export function autoDynamicPagesPlugin(options = {}) {
             try {
                 const reports = await checkDynamicPages({
                     appDir,
+                    projectRoot: root,
                     mode: options.mode ?? "fix",
                     target: options.target ?? "vinext",
+                    includeLoading: options.includeLoading ?? false,
+                    verifyVinextRouteWiring: options.verifyVinextRouteWiring ?? true,
                     syncErrorReportingAuthUser: options.syncErrorReportingAuthUser ?? false,
                     extraChecks: options.extraChecks ?? [],
                     verbose: options.verbose ?? false,

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

@@ -1,9 +1,10 @@
 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";
 export { buildIdAsset } from "./build_id_asset.js";
 export { userAgentStubPlugin, USER_AGENT_STUB_ID, USER_AGENT_STUB_CODE } from "./user_agent_stub.js";
 export { cfWorkersClientStubPlugin, CF_WORKERS_CLIENT_STUB_ID, CF_WORKERS_CLIENT_STUB_CODE } from "./cf_workers_client_stub.js";
-export { vinextRouteWiringFixPlugin, patchAppPageRouteWiring, isAppPageRouteWiringFile, isAppPageRouteWiringAlreadyFixed, type VinextRouteWiringFixPluginOptions } from "./vinext_route_wiring_fix.js";
+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 { cloudflareNextIntl, cloudflareNextIntlPlugin, type CloudflareNextIntlOptions, default } from "./plugin.js";

package/dist/src/vite/index.js

@@ -1,9 +1,10 @@
 export { autoDynamicPagesPlugin } from "./auto_dynamic_pages_plugin.js";
 export { autoLocaleParamsPlugin } from "./auto_locale_params_plugin.js";
+export { layoutQueriesPlugin } from "./layout_queries_plugin.js";
 export { buildIdAsset } from "./build_id_asset.js";
 export { userAgentStubPlugin, USER_AGENT_STUB_ID, USER_AGENT_STUB_CODE } from "./user_agent_stub.js";
 export { cfWorkersClientStubPlugin, CF_WORKERS_CLIENT_STUB_ID, CF_WORKERS_CLIENT_STUB_CODE } from "./cf_workers_client_stub.js";
-export { vinextRouteWiringFixPlugin, patchAppPageRouteWiring, isAppPageRouteWiringFile, isAppPageRouteWiringAlreadyFixed } from "./vinext_route_wiring_fix.js";
+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 { cloudflareNextIntl, cloudflareNextIntlPlugin, default } from "./plugin.js";

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

@@ -0,0 +1,7 @@
+import type { Plugin } from "vite";
+import { type CheckLayoutQueriesOptions } from "../layout_queries_check/index.js";
+export interface LayoutQueriesPluginOptions extends CheckLayoutQueriesOptions {
+    strict?: boolean;
+    runOnDev?: boolean;
+}
+export declare function layoutQueriesPlugin(options?: LayoutQueriesPluginOptions): Plugin;

package/dist/src/vite/layout_queries_plugin.js

@@ -0,0 +1,42 @@
+import { existsSync } from "node:fs";
+import { resolve } from "node:path";
+import { checkLayoutQueries } from "../layout_queries_check/index.js";
+export function layoutQueriesPlugin(options = {}) {
+    let ran = false;
+    return {
+        name: "cloudflare-next-intl-layout-queries-check",
+        enforce: "pre",
+        configResolved(config) {
+            if (ran)
+                return;
+            const isBuild = config.command === "build";
+            const isDev = config.command === "serve";
+            const runOnDev = options.runOnDev ?? true;
+            if (!isBuild && !(isDev && runOnDev))
+                return;
+            const root = config.root || process.cwd();
+            const candidateAppDirs = [
+                options.appDir,
+                resolve(root, "src/app"),
+                resolve(root, "app"),
+            ].filter((dir) => !!dir && existsSync(dir));
+            const appDir = candidateAppDirs[0];
+            if (!appDir)
+                return;
+            ran = true;
+            const report = checkLayoutQueries({
+                appDir,
+                rootDir: root,
+                aliases: options.aliases,
+                maxDepth: options.maxDepth,
+                throwOnError: false,
+            });
+            if (!report.valid) {
+                console.warn(report.formattedMessage);
+                if (options.strict) {
+                    throw new Error("[cloudflare-next-intl] Build failed: Blocking database queries detected in layout tree. See details above.");
+                }
+            }
+        },
+    };
+}

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

@@ -3,6 +3,7 @@ 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 LayoutQueriesPluginOptions } from "./layout_queries_plugin.js";
 import { type VinextRouteWiringFixPluginOptions } from "./vinext_route_wiring_fix.js";
 import { type LucideOptimizerPluginOptions } from "./lucide_optimizer_plugin.js";
 export interface CloudflareNextIntlOptions extends LocaleFilePluginOptions {
@@ -15,6 +16,8 @@ export interface CloudflareNextIntlOptions extends LocaleFilePluginOptions {
     imageOptimizer?: boolean | ImageOptimizerPluginOptions;
     vinextRouteWiringFix?: boolean | VinextRouteWiringFixPluginOptions;
     autoLocaleParams?: boolean | AutoLocaleParamsPluginOptions;
+    layoutQueriesCheck?: boolean | LayoutQueriesPluginOptions;
+    experimentalRouteLoadingFixes?: boolean;
 }
 export declare function cloudflareNextIntl(options?: CloudflareNextIntlOptions): Plugin[];
 export declare const cloudflareNextIntlPlugin: typeof cloudflareNextIntl;

package/dist/src/vite/plugin.js

@@ -5,24 +5,39 @@ 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 { layoutQueriesPlugin } from "./layout_queries_plugin.js";
 import { vinextRouteWiringFixPlugin } from "./vinext_route_wiring_fix.js";
 import { lucideOptimizerPlugin } from "./lucide_optimizer_plugin.js";
 export function cloudflareNextIntl(options = {}) {
     const plugins = [];
+    if (options.layoutQueriesCheck !== false) {
+        plugins.push(layoutQueriesPlugin(typeof options.layoutQueriesCheck === "object"
+            ? options.layoutQueriesCheck
+            : undefined));
+    }
     if (options.lucideOptimizer !== false) {
         plugins.push(lucideOptimizerPlugin(typeof options.lucideOptimizer === "object"
             ? options.lucideOptimizer
             : { root: options.root }));
     }
+    const enableRouteLoadingFixes = options.experimentalRouteLoadingFixes !== false;
+    const shouldEnableVinextFix = options.vinextRouteWiringFix !== undefined
+        ? Boolean(options.vinextRouteWiringFix)
+        : enableRouteLoadingFixes;
+    if (shouldEnableVinextFix) {
+        plugins.push(vinextRouteWiringFixPlugin(typeof options.vinextRouteWiringFix === "object" ? options.vinextRouteWiringFix : {}));
+    }
     if (options.autoLocaleParams !== false) {
         plugins.push(autoLocaleParamsPlugin(typeof options.autoLocaleParams === "object"
             ? options.autoLocaleParams
             : undefined));
     }
     if (options.autoDynamicPages !== false) {
-        plugins.push(autoDynamicPagesPlugin(typeof options.autoDynamicPages === "object"
-            ? options.autoDynamicPages
-            : undefined));
+        const autoDynamicPagesOptions = typeof options.autoDynamicPages === "object" ? { ...options.autoDynamicPages } : {};
+        if (enableRouteLoadingFixes && autoDynamicPagesOptions.includeLoading === undefined) {
+            autoDynamicPagesOptions.includeLoading = true;
+        }
+        plugins.push(autoDynamicPagesPlugin(autoDynamicPagesOptions));
     }
     if (options.imageOptimizer !== false) {
         plugins.push(imageOptimizerPlugin(typeof options.imageOptimizer === "object"
@@ -39,9 +54,6 @@ export function cloudflareNextIntl(options = {}) {
     if (options.userAgentStub !== false) {
         plugins.push(userAgentStubPlugin());
     }
-    if (options.vinextRouteWiringFix !== false) {
-        plugins.push(vinextRouteWiringFixPlugin(typeof options.vinextRouteWiringFix === "object" ? options.vinextRouteWiringFix : {}));
-    }
     if (options.localeFiles !== false) {
         plugins.push(localeFilePlugin({
             messagesDir: options.messagesDir,