cloudflare-next-intl 0.9.45 → 0.9.46

package/dist/src/dynamic_pages_check/resolve_local_imports.js

@@ -22,8 +22,6 @@ function bindingsFromClause(clause) {
     const namespaceMatch = /^\*\s*as\s+(\w+)$/.exec(clause.trim());
     if (namespaceMatch)
         return [namespaceMatch[1]];
-    if (clause.trim() === '*')
-        return [];
     const braceMatch = /\{([^}]*)\}/.exec(clause);
     if (braceMatch) {
         for (const rawItem of braceMatch[1].split(',')) {

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

@@ -7,6 +7,10 @@ export declare function patchRouteMatching(code: string): string;
 export declare function isOptimisticRoutingFile(id: string): boolean;
 export declare function isOptimisticRoutingAlreadyFixed(code: string): boolean;
 export declare function patchOptimisticRouting(code: string): string;
+export declare function isPrefetchLearningFile(id: string): boolean;
+export declare function isPrefetchLearningAlreadyFixed(code: string): boolean;
+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 resolveVinextRouteMatchingPath(root?: string): string | null;
@@ -15,11 +19,14 @@ export interface SyncPatchVinextOnDiskOptions {
     routeWiring?: boolean;
     routeMatching?: boolean;
     optimisticRouting?: boolean;
+    prefetchLearning?: boolean;
 }
 export declare function syncPatchVinextOnDisk(root?: string, options?: SyncPatchVinextOnDiskOptions): boolean;
+export declare function bustVinextOptimizeDepsCache(cacheDir: string): boolean;
 export interface VinextRouteWiringFixPluginOptions {
     routeWiring?: boolean;
     routeMatching?: boolean;
     optimisticRouting?: boolean;
+    prefetchLearning?: boolean;
 }
 export declare function vinextRouteWiringFixPlugin(options?: VinextRouteWiringFixPluginOptions): Plugin;

package/dist/src/vite/vinext_route_wiring_fix.js

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, writeFileSync, rmSync } from "node:fs";
 import { resolve } from "node:path";
 const PREFETCH_LOADING_FN_RE = /function\s+getPrefetchLoadingEntry\s*\(\s*route\s*\)\s*\{[\s\S]*?return\s+getDefaultExport\s*\(\s*route\.loading\s*\)\s*\?[\s\S]*?:\s*null\s*;\s*\}/;
 const FIXED_PREFETCH_LOADING_FN = `function getPrefetchLoadingEntry(route) {
@@ -113,14 +113,17 @@ export function isOptimisticRoutingAlreadyFixed(code) {
     const hasRawPartsFix = code.includes("options.rawUrlParts[0] !== options.match.params.locale");
     return hasLocalePrefixFirst && hasRawPartsFix;
 }
-const MATCH_OPTIMISTIC_ROUTE_RE = /function\s+matchOptimisticRouteManifestRoute\s*\(\s*options\s*\)\s*\{[\s\S]*?const\s+trie\s*=\s*getRouteTrie\([\s\S]*?\);[\s\S]*?const\s+match\s*=\s*matchNode\([\s\S]*?\);[\s\S]*?return\s+null;\s*\}/;
-const FIXED_MATCH_OPTIMISTIC_ROUTE = `function matchOptimisticRouteManifestRoute(options) {
+const MATCH_OPTIMISTIC_ROUTE_RE = /function\s+matchOptimisticRouteManifestRoute\s*\(\s*options\s*\)\s*\{[\s\S]*?getRouteTrie\([\s\S]*?\)[\s\S]*?\n\}/;
+const FIXED_MATCH_OPTIMISTIC_ROUTE = `function getActiveRouteLocale() {
+	return (typeof document !== "undefined" && (document.documentElement?.lang || document.cookie.match(/__user_locale_key__=([^;]+)/)?.[1])) || (typeof window !== "undefined" && window.__VINEXT_LOCALE__) || "en";
+}
+function matchOptimisticRouteManifestRoute(options) {
 	const urlParts = hrefToRouteParts(options.href, options.basePath);
 	if (urlParts === null) return null;
 	const trie = getRouteTrie(options.routeManifest);
 	const hasLeadingLocaleParam = Array.from(options.routeManifest?.segmentGraph?.routes?.values() ?? []).some((r) => r.patternParts?.[0] === ":locale");
 	if (hasLeadingLocaleParam) {
-		const activeLocale = (typeof document !== "undefined" && (document.documentElement?.lang || document.cookie.match(/__user_locale_key__=([^;]+)/)?.[1])) || (typeof window !== "undefined" && window.__VINEXT_LOCALE__) || "en";
+		const activeLocale = getActiveRouteLocale();
 		if (urlParts.normalized[0] !== activeLocale) {
 			const localeMatch = matchNode(trie, [activeLocale, ...urlParts.normalized], 0, []);
 			if (localeMatch !== null) {
@@ -147,14 +150,85 @@ export function patchOptimisticRouting(code) {
         return code;
     }
     let result = code;
-    if (MATCH_OPTIMISTIC_ROUTE_RE.test(result)) {
+    if (!result.includes("hasLeadingLocaleParam") && MATCH_OPTIMISTIC_ROUTE_RE.test(result)) {
         result = result.replace(MATCH_OPTIMISTIC_ROUTE_RE, FIXED_MATCH_OPTIMISTIC_ROUTE);
     }
-    if (RESOLVE_OPTIMISTIC_NAV_PARAMS_RE.test(result)) {
+    if (!result.includes("options.rawUrlParts[0] !== options.match.params.locale") && RESOLVE_OPTIMISTIC_NAV_PARAMS_RE.test(result)) {
         result = result.replace(RESOLVE_OPTIMISTIC_NAV_PARAMS_RE, FIXED_RESOLVE_OPTIMISTIC_NAV_PARAMS);
     }
     return result;
 }
+export function isPrefetchLearningFile(id) {
+    const cleanId = id.split("?")[0].replace(/\\/g, "/");
+    return cleanId.endsWith("/app-browser-entry.js") || cleanId.endsWith("/app-browser-entry.ts");
+}
+export function isPrefetchLearningAlreadyFixed(code) {
+    const hasFixedFunction = code.includes("isPendingNavigationTarget");
+    const hasFixedCallSite = code.includes("targetRscUrl: rscUrl,");
+    return hasFixedFunction && hasFixedCallSite;
+}
+const LEARN_TEMPLATES_FN_RE = /async\s+function\s+learnOptimisticRouteTemplatesFromPrefetchCache\s*\(\s*options\s*\)\s*\{[\s\S]*?await\s+Promise\.allSettled\(\s*learning\s*\);\s*\}/;
+const FIXED_LEARN_TEMPLATES_FN = `async function learnOptimisticRouteTemplatesFromPrefetchCache(options) {
+	if (options.routeManifest === null) return;
+	const learning = [...optimisticRouteTemplateLearning.values()];
+	for (const [cacheKey, entry] of getPrefetchCache()) {
+		const sourceKey = getOptimisticPrefetchSourceKey({
+			cacheKey,
+			interceptionContext: options.interceptionContext,
+			mountedSlotsHeader: options.mountedSlotsHeader
+		});
+		if (optimisticRouteTemplateSources.has(sourceKey)) continue;
+		if (optimisticRouteTemplateLearning.has(sourceKey)) continue;
+		if (entry.prefetchKind === "route-tree") continue;
+		const isPendingNavigationTarget = !isSettledPrefetchCacheEntry(entry) && entry.pending !== void 0 && options.targetRscUrl !== void 0 && parsePrefetchCacheKey(cacheKey).rscUrl === options.targetRscUrl;
+		if (!isSettledPrefetchCacheEntry(entry) && !isPendingNavigationTarget) continue;
+		const promise = (async () => {
+			let settledEntry = entry;
+			if (!isSettledPrefetchCacheEntry(settledEntry)) {
+				await Promise.race([
+					settledEntry.pending?.catch(() => {}),
+					new Promise((resolve) => setTimeout(resolve, 3000))
+				]);
+				settledEntry = getPrefetchCache().get(cacheKey) ?? settledEntry;
+				if (!isSettledPrefetchCacheEntry(settledEntry)) return;
+			}
+			return learnOptimisticRouteTemplateFromPrefetch({
+				cacheKey,
+				entry: settledEntry,
+				interceptionContext: options.interceptionContext,
+				mountedSlotsHeader: options.mountedSlotsHeader,
+				routeManifest: options.routeManifest
+			});
+		})().then((learned) => {
+			if (learned) optimisticRouteTemplateSources.add(sourceKey);
+		}).finally(() => {
+			optimisticRouteTemplateLearning.delete(sourceKey);
+		});
+		optimisticRouteTemplateLearning.set(sourceKey, promise);
+		learning.push(promise);
+	}
+	if (learning.length === 0) return;
+	await Promise.allSettled(learning);
+}`;
+const LEARN_TEMPLATES_CALL_RE = /(await\s+learnOptimisticRouteTemplatesFromPrefetchCache\(\s*\{\s*)interceptionContext:\s*requestInterceptionContext,/;
+const FIXED_LEARN_TEMPLATES_CALL = "$1interceptionContext: requestInterceptionContext,\n\t\t\t\t\t\t\ttargetRscUrl: rscUrl,";
+export function patchPrefetchLearning(code) {
+    if (isPrefetchLearningAlreadyFixed(code)) {
+        return code;
+    }
+    let result = code;
+    if (!result.includes("isPendingNavigationTarget") && LEARN_TEMPLATES_FN_RE.test(result)) {
+        result = result.replace(LEARN_TEMPLATES_FN_RE, FIXED_LEARN_TEMPLATES_FN);
+    }
+    if (!result.includes("targetRscUrl: rscUrl,") && LEARN_TEMPLATES_CALL_RE.test(result)) {
+        result = result.replace(LEARN_TEMPLATES_CALL_RE, FIXED_LEARN_TEMPLATES_CALL);
+    }
+    return result;
+}
+export function resolveVinextBrowserEntryPath(root = process.cwd()) {
+    const directPath = resolve(root, "node_modules/vinext/dist/server/app-browser-entry.js");
+    return existsSync(directPath) ? directPath : null;
+}
 export function isAppPageRouteWiringFile(id) {
     const cleanId = id.split("?")[0].replace(/\\/g, "/");
     return cleanId.endsWith("/app-page-route-wiring.js") || cleanId.endsWith("/app-page-route-wiring.tsx") || cleanId.endsWith("/app-page-route-wiring.ts");
@@ -172,7 +246,7 @@ export function resolveVinextOptimisticRoutingPath(root = process.cwd()) {
     return existsSync(directPath) ? directPath : null;
 }
 export function syncPatchVinextOnDisk(root = process.cwd(), options = {}) {
-    const { routeWiring = true, routeMatching = true, optimisticRouting = true } = options;
+    const { routeWiring = true, routeMatching = true, optimisticRouting = true, prefetchLearning = true } = options;
     let changed = false;
     const wiringPath = routeWiring ? resolveVinextAppPageRouteWiringPath(root) : null;
     if (wiringPath) {
@@ -184,6 +258,9 @@ export function syncPatchVinextOnDisk(root = process.cwd(), options = {}) {
                     writeFileSync(wiringPath, patched, "utf8");
                     changed = true;
                 }
+                else {
+                    console.warn(`[cfni:vinext-route-wiring-fix] ${wiringPath} does not match the expected shape for patchAppPageRouteWiring — this vinext version may have changed; the route-wiring fix was NOT applied.`);
+                }
             }
         }
         catch {
@@ -199,6 +276,9 @@ export function syncPatchVinextOnDisk(root = process.cwd(), options = {}) {
                     writeFileSync(matchingPath, patched, "utf8");
                     changed = true;
                 }
+                else {
+                    console.warn(`[cfni:vinext-route-wiring-fix] ${matchingPath} does not match the expected shape for patchRouteMatching — this vinext version may have changed; the route-matching fix was NOT applied.`);
+                }
             }
         }
         catch {
@@ -214,6 +294,27 @@ export function syncPatchVinextOnDisk(root = process.cwd(), options = {}) {
                     writeFileSync(optimisticPath, patched, "utf8");
                     changed = true;
                 }
+                else {
+                    console.warn(`[cfni:vinext-route-wiring-fix] ${optimisticPath} does not match the expected shape for patchOptimisticRouting — this vinext version may have changed; the optimistic-routing fix was NOT applied.`);
+                }
+            }
+        }
+        catch {
+        }
+    }
+    const browserEntryPath = prefetchLearning ? resolveVinextBrowserEntryPath(root) : null;
+    if (browserEntryPath) {
+        try {
+            const content = readFileSync(browserEntryPath, "utf8");
+            if (!isPrefetchLearningAlreadyFixed(content)) {
+                const patched = patchPrefetchLearning(content);
+                if (patched !== content) {
+                    writeFileSync(browserEntryPath, patched, "utf8");
+                    changed = true;
+                }
+                else {
+                    console.warn(`[cfni:vinext-route-wiring-fix] ${browserEntryPath} does not match the expected shape for patchPrefetchLearning — this vinext version may have changed; the prefetch-learning fix was NOT applied.`);
+                }
             }
         }
         catch {
@@ -221,16 +322,39 @@ export function syncPatchVinextOnDisk(root = process.cwd(), options = {}) {
     }
     return changed;
 }
+export function bustVinextOptimizeDepsCache(cacheDir) {
+    let removed = false;
+    for (const sub of ["deps", "deps_ssr", "deps_rsc"]) {
+        const dir = resolve(cacheDir, sub);
+        if (!existsSync(dir))
+            continue;
+        try {
+            rmSync(dir, { recursive: true, force: true });
+            removed = true;
+        }
+        catch {
+        }
+    }
+    return removed;
+}
 export function vinextRouteWiringFixPlugin(options = {}) {
     const routeWiring = options.routeWiring !== false;
     const routeMatching = options.routeMatching !== false;
     const optimisticRouting = options.optimisticRouting !== false;
+    const prefetchLearning = options.prefetchLearning !== false;
     return {
         name: "cfni:vinext-route-wiring-fix",
         enforce: "pre",
         configResolved(config) {
             const root = config.root || process.cwd();
-            syncPatchVinextOnDisk(root, { routeWiring, routeMatching, optimisticRouting });
+            const changed = syncPatchVinextOnDisk(root, { routeWiring, routeMatching, optimisticRouting, prefetchLearning });
+            if (changed) {
+                const cacheDir = config.cacheDir || resolve(root, "node_modules/.vite");
+                const busted = bustVinextOptimizeDepsCache(cacheDir);
+                if (busted) {
+                    console.log("[cfni:vinext-route-wiring-fix] patched vinext on disk and cleared its stale Vite optimizeDeps cache — dependencies will re-bundle on next request.");
+                }
+            }
         },
         transform(code, id) {
             if (routeWiring && isAppPageRouteWiringFile(id)) {
@@ -253,6 +377,16 @@ export function vinextRouteWiringFixPlugin(options = {}) {
                     map: null,
                 };
             }
+            if (prefetchLearning && isPrefetchLearningFile(id)) {
+                if (isPrefetchLearningAlreadyFixed(code)) {
+                    return;
+                }
+                const patched = patchPrefetchLearning(code);
+                return {
+                    code: patched,
+                    map: null,
+                };
+            }
             if (optimisticRouting && isOptimisticRoutingFile(id)) {
                 if (isOptimisticRoutingAlreadyFixed(code)) {
                     return;

package/package.json

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