cloudflare-next-intl 0.9.49 → 0.9.50

package/README.md

@@ -305,7 +305,8 @@ export default defineConfig({
             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: false,          // ⚠️ DANGER: Monkey-patches vinext on disk (default: false, or options object)
+            experimentalRouteLoadingFixes: false, // ⚠️ DANGER: Unified switch enabling both vinextRouteWiringFix and SSG on loading.* (default: false)
             lucideOptimizer: true,                // Auto-optimize lucide-react deep imports and normalize next/*.js (default: true, or options object)
         }),
     ],

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/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

@@ -3,7 +3,7 @@ export { autoLocaleParamsPlugin, type AutoLocaleParamsPluginOptions } from "./au
 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, 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

@@ -3,7 +3,7 @@ export { autoLocaleParamsPlugin } from "./auto_locale_params_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 } 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/plugin.d.ts

@@ -15,6 +15,7 @@ export interface CloudflareNextIntlOptions extends LocaleFilePluginOptions {
     imageOptimizer?: boolean | ImageOptimizerPluginOptions;
     vinextRouteWiringFix?: boolean | VinextRouteWiringFixPluginOptions;
     autoLocaleParams?: boolean | AutoLocaleParamsPluginOptions;
+    experimentalRouteLoadingFixes?: boolean;
 }
 export declare function cloudflareNextIntl(options?: CloudflareNextIntlOptions): Plugin[];
 export declare const cloudflareNextIntlPlugin: typeof cloudflareNextIntl;

package/dist/src/vite/plugin.js

@@ -14,15 +14,24 @@ export function cloudflareNextIntl(options = {}) {
             ? options.lucideOptimizer
             : { root: options.root }));
     }
+    const enableRouteLoadingFixes = options.experimentalRouteLoadingFixes === true;
+    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 +48,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,

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

@@ -13,6 +13,7 @@ export declare function patchPrefetchLearning(code: string): string;
 export declare function resolveVinextBrowserEntryPath(root?: string): string | null;
 export declare function isAppPageRouteWiringFile(id: string): boolean;
 export declare function resolveVinextAppPageRouteWiringPath(root?: string): string | null;
+export declare function isVinextAppPageRouteWiringSafeOnDisk(root?: string): boolean;
 export declare function resolveVinextRouteMatchingPath(root?: string): string | null;
 export declare function resolveVinextOptimisticRoutingPath(root?: string): string | null;
 export interface SyncPatchVinextOnDiskOptions {

package/dist/src/vite/vinext_route_wiring_fix.js

@@ -28,11 +28,35 @@ const FIXED_PREFETCH_LOADING_FN = `function getPrefetchLoadingEntry(route) {
 }`;
 const ROUTE_LOADING_GUARD_RE = /if\s*\(\s*!isPrefetchLoadingShell\s*&&\s*treePosition\s*<\s*routeSegments\.length\s*\)\s*\{/g;
 const FIXED_ROUTE_LOADING_GUARD = "if (!isPrefetchLoadingShell && treePosition < routeSegments.length && !routeLoadingComponent) {";
+const PAGE_LOADING_FALLBACK_RE = /fallback:\s*\/\*\s*@__PURE__\s*\*\/\s*jsx\s*\(\s*PageLoadingComponent\s*,\s*\{\s*\}\s*\)/;
+const FIXED_PAGE_LOADING_FALLBACK = "fallback: /* @__PURE__ */ jsx(PageLoadingComponent, { params: options.makeThenableParams(options.matchedParams) })";
+const ANCESTOR_LOADING_FALLBACK_RE = /fallback:\s*\/\*\s*@__PURE__\s*\*\/\s*jsx\s*\(\s*AncestorLoadingComponent\s*,\s*\{\s*\}\s*\)/;
+const FIXED_ANCESTOR_LOADING_FALLBACK = "fallback: /* @__PURE__ */ jsx(AncestorLoadingComponent, { params: options.makeThenableParams(resolveAppPageSegmentParams(options.route.routeSegments, ancestorLoadingEntry.treePosition, options.matchedParams)) })";
+const BRANCH_LOADING_FALLBACK_RE = /fallback:\s*\/\*\s*@__PURE__\s*\*\/\s*jsx\s*\(\s*(?<![A-Za-z0-9_$])LoadingComponent\s*,\s*\{\s*\}\s*\)/;
+const FIXED_BRANCH_LOADING_FALLBACK = "fallback: /* @__PURE__ */ jsx(LoadingComponent, { params: options.makeThenableParams(slotParams) })";
+const OWNER_LOADING_FALLBACK_RE = /fallback:\s*\/\*\s*@__PURE__\s*\*\/\s*jsx\s*\(\s*OwnerLoadingComponent\s*,\s*\{\s*\}\s*\)/;
+const FIXED_OWNER_LOADING_FALLBACK = "fallback: /* @__PURE__ */ jsx(OwnerLoadingComponent, { params: options.makeThenableParams(resolveAppPageSegmentParams(options.route.routeSegments, ownerLoadingEntry.treePosition, options.matchedParams)) })";
+const PREFETCH_LOADING_CALL_RE = /routeChildren\s*=\s*\/\*\s*@__PURE__\s*\*\/\s*jsx\s*\(\s*prefetchLoadingComponent\s*,\s*\{\s*\}\s*\)/;
+const FIXED_PREFETCH_LOADING_CALL = "routeChildren = /* @__PURE__ */ jsx(prefetchLoadingComponent, { params: options.makeThenableParams(options.matchedParams) })";
+const ROUTE_LOADING_FALLBACK_RE = /fallback:\s*\/\*\s*@__PURE__\s*\*\/\s*jsx\s*\(\s*routeLoadingComponent\s*,\s*\{\s*\}\s*\)/;
+const FIXED_ROUTE_LOADING_FALLBACK = "fallback: /* @__PURE__ */ jsx(routeLoadingComponent, { params: options.makeThenableParams(options.matchedParams) })";
+const SEGMENT_LOADING_FALLBACK_RE = /fallback:\s*\/\*\s*@__PURE__\s*\*\/\s*jsx\s*\(\s*segmentLoadingComponent\s*,\s*\{\s*\}\s*\)/;
+const FIXED_SEGMENT_LOADING_FALLBACK = "fallback: /* @__PURE__ */ jsx(segmentLoadingComponent, { params: options.makeThenableParams(resolveAppPageSegmentParams(options.route.routeSegments, treePosition, options.matchedParams)) })";
+const PREFETCH_SLOT_LOADING_CALL_RE = /slotElement\s*=\s*\/\*\s*@__PURE__\s*\*\/\s*jsx\s*\(\s*getDefaultExport\s*\(\s*prefetchSlotLoadingEntry\.loadingModule\s*\)\s*,\s*\{\s*\}\s*\)/;
+const FIXED_PREFETCH_SLOT_LOADING_CALL = "slotElement = /* @__PURE__ */ jsx(getDefaultExport(prefetchSlotLoadingEntry.loadingModule), { params: options.makeThenableParams(slotParams) })";
 export function isAppPageRouteWiringAlreadyFixed(code) {
     const hasBuggyPrefetch = code.includes("firstNestedEntry") &&
         PREFETCH_LOADING_FN_RE.test(code);
     const hasBuggySuspense = !code.includes("!routeLoadingComponent") && ROUTE_LOADING_GUARD_RE.test(code);
-    return !hasBuggyPrefetch && !hasBuggySuspense;
+    const hasEmptyLoadingProps = PAGE_LOADING_FALLBACK_RE.test(code) ||
+        ANCESTOR_LOADING_FALLBACK_RE.test(code) ||
+        BRANCH_LOADING_FALLBACK_RE.test(code) ||
+        OWNER_LOADING_FALLBACK_RE.test(code) ||
+        PREFETCH_LOADING_CALL_RE.test(code) ||
+        ROUTE_LOADING_FALLBACK_RE.test(code) ||
+        SEGMENT_LOADING_FALLBACK_RE.test(code) ||
+        PREFETCH_SLOT_LOADING_CALL_RE.test(code);
+    return !hasBuggyPrefetch && !hasBuggySuspense && !hasEmptyLoadingProps;
 }
 export function patchAppPageRouteWiring(code) {
     if (isAppPageRouteWiringAlreadyFixed(code)) {
@@ -49,6 +73,30 @@ export function patchAppPageRouteWiring(code) {
     if (hasBuggySuspense) {
         result = result.replace(ROUTE_LOADING_GUARD_RE, FIXED_ROUTE_LOADING_GUARD);
     }
+    if (PAGE_LOADING_FALLBACK_RE.test(result)) {
+        result = result.replace(PAGE_LOADING_FALLBACK_RE, FIXED_PAGE_LOADING_FALLBACK);
+    }
+    while (ANCESTOR_LOADING_FALLBACK_RE.test(result)) {
+        result = result.replace(ANCESTOR_LOADING_FALLBACK_RE, FIXED_ANCESTOR_LOADING_FALLBACK);
+    }
+    if (BRANCH_LOADING_FALLBACK_RE.test(result)) {
+        result = result.replace(BRANCH_LOADING_FALLBACK_RE, FIXED_BRANCH_LOADING_FALLBACK);
+    }
+    if (OWNER_LOADING_FALLBACK_RE.test(result)) {
+        result = result.replace(OWNER_LOADING_FALLBACK_RE, FIXED_OWNER_LOADING_FALLBACK);
+    }
+    if (PREFETCH_LOADING_CALL_RE.test(result)) {
+        result = result.replace(PREFETCH_LOADING_CALL_RE, FIXED_PREFETCH_LOADING_CALL);
+    }
+    if (ROUTE_LOADING_FALLBACK_RE.test(result)) {
+        result = result.replace(ROUTE_LOADING_FALLBACK_RE, FIXED_ROUTE_LOADING_FALLBACK);
+    }
+    if (SEGMENT_LOADING_FALLBACK_RE.test(result)) {
+        result = result.replace(SEGMENT_LOADING_FALLBACK_RE, FIXED_SEGMENT_LOADING_FALLBACK);
+    }
+    if (PREFETCH_SLOT_LOADING_CALL_RE.test(result)) {
+        result = result.replace(PREFETCH_SLOT_LOADING_CALL_RE, FIXED_PREFETCH_SLOT_LOADING_CALL);
+    }
     return result;
 }
 export function isRouteMatchingFile(id) {
@@ -296,6 +344,18 @@ export function resolveVinextAppPageRouteWiringPath(root = process.cwd()) {
     const directPath = resolve(root, "node_modules/vinext/dist/server/app-page-route-wiring.js");
     return existsSync(directPath) ? directPath : null;
 }
+export function isVinextAppPageRouteWiringSafeOnDisk(root = process.cwd()) {
+    const filePath = resolveVinextAppPageRouteWiringPath(root);
+    if (!filePath)
+        return false;
+    try {
+        const content = readFileSync(filePath, "utf8");
+        return isAppPageRouteWiringAlreadyFixed(content);
+    }
+    catch {
+        return false;
+    }
+}
 export function resolveVinextRouteMatchingPath(root = process.cwd()) {
     const directPath = resolve(root, "node_modules/vinext/dist/routing/route-matching.js");
     return existsSync(directPath) ? directPath : null;
@@ -397,6 +457,7 @@ export function bustVinextOptimizeDepsCache(cacheDir) {
     return removed;
 }
 export function vinextRouteWiringFixPlugin(options = {}) {
+    console.warn("[cloudflare-next-intl] WARNING: vinextRouteWiringFix is enabled. Monkey-patching vinext on disk is dangerous and can break routing or upstream compatibility.");
     const routeWiring = options.routeWiring !== false;
     const routeMatching = options.routeMatching !== false;
     const optimisticRouting = options.optimisticRouting !== false;

package/package.json

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