vinext 1.3.1 → 1.4.0

package/README.md

@@ -137,7 +137,7 @@ files to `.cjs`) when an unambiguous default Vite config requires the ESM migrat
 `"type": "commonjs"` is never changed. Direct `vite dev` and `vite build` do not perform these
 wrapper compatibility steps.
 
-`@vinext/cloudflare deploy` options: `--preview`, `--env <name>`, `--name <name>`, `--skip-build`, `--dry-run`, `--warm-cache`, `--traffic-aware-warm-cache`.
+`@vinext/cloudflare deploy` options: `--preview`, `--env <name>`, `--name <name>`, `--vite-config <path>`, `--skip-build`, `--dry-run`, `--warm-cache`, `--traffic-aware-warm-cache`.
 
 `vinext init` prompts for a deployment target, defaulting to Cloudflare. Agents must ask the
 user which target they want, then pass `--platform=cloudflare` or `--platform=node`.
@@ -147,6 +147,8 @@ Other options: `--port <port>` (default: 3001), `--skip-check`, `--force`.
 Cloudflare init uses `cf` and `cloudflare.config.ts` by default. Both `vinext init`
 and `create-vinext-app` accept `--legacy-wrangler-cloudflare-init` to retain the
 legacy Wrangler setup. Existing Wrangler configs are not automatically migrated.
+If a root Wrangler config belongs to another Worker, `vinext init --ignore-wrangler-config`
+sets up `cloudflare.config.ts` and leaves that file untouched.
 `vinext init --name <name>` sets the Worker name in the generated config instead of
 deriving it from `package.json`. An existing config keeps its own Worker name, and init
 prints a warning.
@@ -360,7 +362,8 @@ The init command also auto-detects and fixes common migration issues:
 - Resolves tsconfig.json path aliases automatically with Vite's native resolver
 - Detects MDX usage and configures `@mdx-js/rollup`
 - Renames CJS config files (postcss.config.js, etc.) to `.cjs` when needed
-- Detects native Node.js modules (sharp, resvg, satori, lightningcss, @napi-rs/canvas) and auto-stubs them for Workers. If you encounter others that need stubbing, PRs are welcome.
+
+vinext does not stub native Node.js modules such as `sharp`, `@resvg/resvg-js` or `@napi-rs/canvas`. Workers cannot load Node-API addons, so importing one into Worker code fails the build or the request. If a dependency imports one on a code path that never runs on Workers, alias it to a module of your own with `resolve.alias` in `vite.config.ts`. Configs generated by earlier versions of `vinext init` may contain `resolve.alias` entries pointing at `empty-stub.js`, a file init never created; delete them.
 
 Both App Router and Pages Router work on Workers with full client-side hydration.
 

package/THIRD_PARTY_LICENSES.md

@@ -49,3 +49,50 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## iconv-lite (version 0.4.24)
+
+Copyright (c) 2011 Alexander Shtuchkin
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+## safer-buffer (version 2.1.2)
+
+MIT License
+
+Copyright (c) 2018 Nikita Skovoroda <chalkerx@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/_virtual/_rolldown/runtime.js

@@ -1,4 +1,4 @@
-import "node:module";
+import { createRequire } from "node:module";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -21,5 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
+var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
-export { __commonJSMin, __toESM };
+export { __commonJSMin, __require, __toESM };

package/dist/build/prerender.js

@@ -12,10 +12,10 @@ import { NoOpCacheHandler, getCacheHandler, setCacheHandler } from "../shims/cac
 import { headersContextFromRequest, runWithHeadersContext } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife } from "../shims/cache-request-state.js";
 import { normalizeStaticPathsEntry } from "../routing/route-pattern.js";
-import { createRscRequestUrl } from "../server/app-rsc-cache-busting.js";
 import { readPrerenderSecret } from "./server-manifest.js";
 import { buildPregeneratedConcretePathTable } from "../server/prerender-manifest.js";
 import { concatUint8Arrays, decodeRscEmbeddedChunk } from "../server/app-rsc-embedded-chunks.js";
+import { createRscRequestUrl } from "../server/app-rsc-cache-busting.js";
 import { navigationRuntimeRscBootstrapExpression } from "../server/app-ssr-stream.js";
 import { encodePrerenderRouteParams, serializePrerenderRouteParamsHeader } from "../server/prerender-route-params.js";
 import { startProdServer } from "../server/prod-server.js";

package/dist/build/report.d.ts

@@ -1,5 +1,4 @@
 import { AppRoute } from "../routing/app-route-graph.js";
-import { LayoutBuildClassification } from "./layout-classification-types.js";
 import { Route } from "../routing/pages-router.js";
 import { PrerenderResult } from "./prerender.js";
 //#region src/build/report.d.ts
@@ -77,19 +76,6 @@ export declare function extractExportConstNumber(code: string, name: string): nu
  *   null     — no `revalidate` key found (fully static)
  */
 export declare function extractGetStaticPropsRevalidate(code: string): number | false | null;
-/**
- * Classifies a layout file by its segment config exports (`dynamic`, `revalidate`).
- *
- * Returns a tagged `LayoutBuildClassification` carrying both the decision and
- * the specific segment-config field that produced it. `{ kind: "absent" }`
- * means no segment config is present and the caller should defer to the next
- * layer (module graph analysis).
- *
- * Unlike page classification, positive `revalidate` values are not meaningful
- * for layout skip decisions — ISR is a page-level concept. Only the extremes
- * (`revalidate = 0` → dynamic, `revalidate = Infinity` → static) are decisive.
- */
-export declare function classifyLayoutSegmentConfig(code: string): LayoutBuildClassification;
 /**
  * Classifies a Pages Router page file by reading its source and examining
  * which data-fetching exports it contains.

package/dist/build/report.js

@@ -392,56 +392,6 @@ function propertyName(key) {
 	return null;
 }
 /**
-* Classifies a layout file by its segment config exports (`dynamic`, `revalidate`).
-*
-* Returns a tagged `LayoutBuildClassification` carrying both the decision and
-* the specific segment-config field that produced it. `{ kind: "absent" }`
-* means no segment config is present and the caller should defer to the next
-* layer (module graph analysis).
-*
-* Unlike page classification, positive `revalidate` values are not meaningful
-* for layout skip decisions — ISR is a page-level concept. Only the extremes
-* (`revalidate = 0` → dynamic, `revalidate = Infinity` → static) are decisive.
-*/
-function classifyLayoutSegmentConfig(code) {
-	const program = parseRouteModule(code);
-	const dynamicValue = program ? extractExportConstStringFromProgram(program, "dynamic") : null;
-	if (dynamicValue === "force-dynamic") return {
-		kind: "dynamic",
-		reason: {
-			layer: "segment-config",
-			key: "dynamic",
-			value: "force-dynamic"
-		}
-	};
-	if (dynamicValue === "force-static" || dynamicValue === "error") return {
-		kind: "static",
-		reason: {
-			layer: "segment-config",
-			key: "dynamic",
-			value: dynamicValue
-		}
-	};
-	const revalidateValue = program ? extractExportConstNumberFromProgram(program, "revalidate") : null;
-	if (revalidateValue === Infinity) return {
-		kind: "static",
-		reason: {
-			layer: "segment-config",
-			key: "revalidate",
-			value: Infinity
-		}
-	};
-	if (revalidateValue === 0) return {
-		kind: "dynamic",
-		reason: {
-			layer: "segment-config",
-			key: "revalidate",
-			value: 0
-		}
-	};
-	return { kind: "absent" };
-}
-/**
 * Classifies a Pages Router page file by reading its source and examining
 * which data-fetching exports it contains.
 *
@@ -675,4 +625,4 @@ async function printBuildReport(options) {
 	}
 }
 //#endregion
-export { buildReportRows, classifyAppRoute, classifyAppRouteHandler, classifyLayoutSegmentConfig, classifyPagesRoute, extractExportConstNumber, extractExportConstString, extractGetStaticPropsRevalidate, extractMiddlewareMatcherConfig, extractMiddlewareMatcherConfigValue, formatBuildReport, getAppRouteRenderEntryPath, hasExportedName, hasNamedExport, hasRuntimeExportedName, printBuildReport };
+export { buildReportRows, classifyAppRoute, classifyAppRouteHandler, classifyPagesRoute, extractExportConstNumber, extractExportConstString, extractGetStaticPropsRevalidate, extractMiddlewareMatcherConfig, extractMiddlewareMatcherConfigValue, formatBuildReport, getAppRouteRenderEntryPath, hasExportedName, hasNamedExport, hasRuntimeExportedName, printBuildReport };

package/dist/check.js

@@ -438,7 +438,7 @@ const LIBRARY_SUPPORT = {
 	},
 	"next-intl": {
 		status: "supported",
-		detail: "createNextIntlPlugin is only optional with the request config at (src/)i18n/request.*; its experimental messages, precompile and extract options don't work (they need webpack/Turbopack loaders)"
+		detail: "createNextIntlPlugin is only optional with the request config at (src/)i18n/request.*; its experimental extract option doesn't work (it needs a webpack/Turbopack loader)"
 	},
 	"@clerk/nextjs": {
 		status: "supported",

package/dist/cli.js

@@ -284,6 +284,9 @@ function printHelp(cmd) {
                          (Response Store or Workers Cache, default: prompt with No)
     --legacy-wrangler-cloudflare-init
                          Use the legacy Wrangler setup instead of cf
+    --ignore-wrangler-config
+                         Set up cf even if a root Wrangler config exists
+                         (use when it belongs to an unrelated Worker)
     --cdn-cache <type>   Cloudflare CDN cache: none, response-store, workers-cache,
                          static-assets, or data-cache
                          (default: none; response-store is the default cache choice)

package/dist/client/dev-error-overlay.js

@@ -1,7 +1,7 @@
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
-import { VINEXT_DEV_ERROR_RECOVERY_EVENT } from "../utils/dev-error-recovery-event.js";
 import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "../utils/dev-stack-sourcemap-endpoint.js";
 import { dismissOverlay, expandOverlay, getOverlaySnapshot, minimizeOverlay, reportToOverlay, setOverlayIndex, subscribeOverlay, updateOverlayErrorStack } from "./dev-error-overlay-store.js";
+import { VINEXT_DEV_ERROR_RECOVERY_EVENT } from "../utils/dev-error-recovery-event.js";
 import { Fragment, useEffect, useMemo, useState, useSyncExternalStore } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 import { createRoot } from "react-dom/client";

package/dist/client/navigation-runtime.d.ts

@@ -1,5 +1,6 @@
 import { BrowserRouteManifest, BrowserRouteManifestWire } from "../routing/browser-route-manifest.js";
 import { AppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
+import { CachedRscResponse } from "../shims/navigation.js";
 //#region src/client/navigation-runtime.d.ts
 type NavigationRuntimeSnapshot = {
   pathname: string;
@@ -42,7 +43,9 @@ type NavigationRuntimeTraversalIntent = {
 };
 export type NavigationRuntimeNavigate = (href: string, redirectDepth?: number, navigationKind?: NavigationRuntimeKind, historyUpdateMode?: NavigationRuntimeHistoryUpdateMode, previousNextUrlOverride?: string | null, programmaticTransition?: boolean, traversalIntent?: NavigationRuntimeTraversalIntent, scrollIntent?: AppRouterScrollIntent | null, visibleCommitMode?: NavigationRuntimeVisibleCommitMode, bypassNavigationCache?: boolean) => Promise<void>;
 export type NavigationRuntimeFunctions = {
-  clearNavigationCaches?: () => void;
+  clearNavigationCaches?: (options?: {
+    pingVisibleLinks?: boolean;
+  }) => void;
   commitHashNavigation?: (href: string, historyUpdateMode: NavigationRuntimeHistoryUpdateMode, scroll: boolean) => void;
   navigateExternal?: (href: string, historyUpdateMode: NavigationRuntimeHistoryUpdateMode) => Promise<void>;
   navigate?: NavigationRuntimeNavigate;
@@ -57,6 +60,15 @@ export type NavigationRuntimeFunctions = {
   notifyLinkNavigationStart?: () => void;
   pingVisibleLinks?: () => void;
   preparePrefetchResponse?: (response: Response) => Promise<unknown>;
+  /**
+   * The visited (BFCache) response a full prefetch can be fulfilled from, and
+   * until when a navigation would still reuse it (null if it wouldn't).
+   */
+  readVisitedResponseForFullPrefetch?: (rscUrls: readonly string[], interceptionContext: string | null, mountedSlotsHeader: string | null) => {
+    navigatedAt: number;
+    navigationFreshUntil: number | null;
+    response: CachedRscResponse;
+  } | null;
   claimCurrentHistoryTreeSnapshot?: (historyUpdateMode: NavigationRuntimeHistoryUpdateMode, previousHistoryState: unknown) => void;
   commitAppOwnedHistoryStateWrite?: (historyUpdateMode: NavigationRuntimeHistoryUpdateMode, previousHistoryState: unknown) => void;
   /**

package/dist/client/navigation-runtime.js

@@ -26,7 +26,7 @@ function readRuntimeWindow() {
 }
 function isNavigationRuntimeFunctions(value) {
 	if (!isUnknownRecord(value)) return false;
-	return isOptionalRuntimeFunction(Reflect.get(value, "clearNavigationCaches")) && isOptionalRuntimeFunction(Reflect.get(value, "commitHashNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "navigateExternal")) && isOptionalRuntimeFunction(Reflect.get(value, "navigate")) && isOptionalRuntimeFunction(Reflect.get(value, "getPrefetchRouterState")) && isOptionalRuntimeFunction(Reflect.get(value, "notifyLinkNavigationStart")) && isOptionalRuntimeFunction(Reflect.get(value, "pingVisibleLinks")) && isOptionalRuntimeFunction(Reflect.get(value, "preparePrefetchResponse")) && isOptionalRuntimeFunction(Reflect.get(value, "claimCurrentHistoryTreeSnapshot")) && isOptionalRuntimeFunction(Reflect.get(value, "commitAppOwnedHistoryStateWrite")) && isOptionalRuntimeFunction(Reflect.get(value, "discardPendingNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "flushCommittingNavigationUrl")) && isOptionalRuntimeFunction(Reflect.get(value, "loadRouteManifest"));
+	return isOptionalRuntimeFunction(Reflect.get(value, "clearNavigationCaches")) && isOptionalRuntimeFunction(Reflect.get(value, "commitHashNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "navigateExternal")) && isOptionalRuntimeFunction(Reflect.get(value, "navigate")) && isOptionalRuntimeFunction(Reflect.get(value, "getPrefetchRouterState")) && isOptionalRuntimeFunction(Reflect.get(value, "notifyLinkNavigationStart")) && isOptionalRuntimeFunction(Reflect.get(value, "pingVisibleLinks")) && isOptionalRuntimeFunction(Reflect.get(value, "preparePrefetchResponse")) && isOptionalRuntimeFunction(Reflect.get(value, "readVisitedResponseForFullPrefetch")) && isOptionalRuntimeFunction(Reflect.get(value, "claimCurrentHistoryTreeSnapshot")) && isOptionalRuntimeFunction(Reflect.get(value, "commitAppOwnedHistoryStateWrite")) && isOptionalRuntimeFunction(Reflect.get(value, "discardPendingNavigation")) && isOptionalRuntimeFunction(Reflect.get(value, "flushCommittingNavigationUrl")) && isOptionalRuntimeFunction(Reflect.get(value, "loadRouteManifest"));
 }
 function isNavigationRuntimeRscChunk(value) {
 	if (typeof value === "string") return true;

package/dist/config/next-config.d.ts

@@ -102,6 +102,18 @@ export type MdxOptions = {
   rehypePlugins?: unknown[];
   recmaPlugins?: unknown[];
 };
+/**
+ * The webpack/Turbopack rule `createNextIntlPlugin` adds for its
+ * `experimental.messages` catalogs. vinext runs the same loader on the files it matches.
+ */
+export type NextIntlCatalogLoader = {
+  /** Absolute catalog directories (the rule's `include`). */
+  include: string[];
+  /** Catalog file extension test (the rule's `test`). */
+  test: RegExp;
+  /** The loader's `options`. */
+  options: Record<string, unknown>;
+};
 export type PrefetchInliningConfig = false | {
   maxBundleSize: number;
   maxSize: number;
@@ -352,6 +364,11 @@ export type ResolvedNextConfig = {
   /** Server globals injected into instrumentation.ts by wrapped webpack configs. */
   instrumentationServerValueInjections: Record<string, unknown>;
   cacheComponents: boolean;
+  /**
+   * `experimental.cachedNavigations`: lets the client cache the static stage of
+   * navigation responses. Requires `cacheComponents`.
+   */
+  cachedNavigations: boolean;
   appNavFailHandling: boolean;
   /**
    * Enables the experimental App Router gesture transition API:
@@ -374,6 +391,8 @@ export type ResolvedNextConfig = {
   i18n: NextI18nConfig | null;
   /** MDX remark/rehype/recma plugins extracted from @next/mdx config */
   mdx: MdxOptions | null;
+  /** next-intl's message catalog loader rule from `createNextIntlPlugin`. */
+  nextIntlCatalogLoader: NextIntlCatalogLoader | null;
   /** Explicit module aliases preserved from wrapped next.config plugins. */
   aliases: Record<string, string>;
   /** Extra allowed origins for dev server access (from allowedDevOrigins). */

package/dist/config/next-config.js

@@ -1,4 +1,5 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { escapeRegExp } from "../utils/regex.js";
 import { DEFAULT_PAGE_EXTENSIONS, normalizePageExtensions } from "../routing/file-matcher.js";
 import { loadCommonJsModule, shouldRetryAsCommonJs } from "../utils/commonjs-loader.js";
 import { isUnknownRecord } from "../utils/record.js";
@@ -884,6 +885,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 			resolveExtensions: null,
 			serverResolveExtensions: null,
 			cacheComponents: false,
+			cachedNavigations: false,
 			appNavFailHandling: false,
 			gestureTransition: false,
 			prefetchInlining: false,
@@ -897,6 +899,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 			images: void 0,
 			i18n: null,
 			mdx: null,
+			nextIntlCatalogLoader: null,
 			aliases: {},
 			allowedDevOrigins: [],
 			serverActionsAllowedOrigins: [],
@@ -1049,7 +1052,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 	if (rawLightningCssFeatures && !useLightningcss) console.warn("[vinext] experimental.lightningCssFeatures is set but experimental.useLightningcss is not enabled. The lightningCssFeatures option has no effect without useLightningcss.");
 	if (experimental?.cachedNavigations === true && !cacheComponents) console.warn("[vinext] `experimental.cachedNavigations` requires `cacheComponents: true` to have any effect. Set `cacheComponents: true` in your next.config, or remove `experimental.cachedNavigations`.");
 	if (config.webpack !== void 0) {
-		if (mdx || Object.keys(webpackProbe.aliases).length > 0 || webpackProbe.resolveExtensionsCustomized || webpackProbe.instrumentationClientRouteManifest !== void 0) console.warn("[vinext] next.config option \"webpack\" is only partially supported. vinext preserves resolve.alias, resolve.extensions, MDX loader settings, and instrumentation-client route manifests, but other webpack customization is ignored");
+		if (mdx || Object.keys(webpackProbe.aliases).length > 0 || webpackProbe.resolveExtensionsCustomized || webpackProbe.instrumentationClientRouteManifest !== void 0 || webpackProbe.nextIntlCatalogLoader !== null) console.warn("[vinext] next.config option \"webpack\" is only partially supported. vinext preserves resolve.alias, resolve.extensions, MDX loader settings, next-intl message catalog loaders, and instrumentation-client route manifests, but other webpack customization is ignored");
 		else console.warn("[vinext] next.config option \"webpack\" is not yet supported and will be ignored");
 	}
 	const output = readOptionalString(config.output) ?? "";
@@ -1099,6 +1102,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 		instrumentationClientRouteManifest: webpackProbe.instrumentationClientRouteManifest,
 		instrumentationServerValueInjections: webpackProbe.instrumentationServerValueInjections,
 		cacheComponents,
+		cachedNavigations: cacheComponents && experimental?.cachedNavigations === true,
 		appNavFailHandling: experimental?.appNavFailHandling === true,
 		gestureTransition: experimental?.gestureTransition === true,
 		prefetchInlining,
@@ -1108,6 +1112,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 		images,
 		i18n,
 		mdx,
+		nextIntlCatalogLoader: webpackProbe.nextIntlCatalogLoader ?? extractTurbopackNextIntlCatalogLoader(config, root),
 		aliases,
 		allowedDevOrigins,
 		serverActionsAllowedOrigins,
@@ -1144,6 +1149,7 @@ async function resolveNextConfig(config, root = toSlash(process.cwd()), options
 		lightningCssFeatures
 	};
 	detectNextIntlConfig(root, resolved);
+	if (resolved.aliases["use-intl/format-message"]?.includes("format-only") && resolved.nextIntlCatalogLoader === null) console.warn("[vinext] next-intl's `experimental.messages.precompile` is enabled, but vinext could not find next-intl's catalog loader in the webpack or Turbopack config. Messages with arguments or rich text will render their raw ICU source; remove `precompile` to format them at runtime");
 	if (resolved.basePath !== "" && resolved.basePath !== "/" && resolved.assetPrefix === "") resolved.assetPrefix = resolved.basePath;
 	return resolved;
 }
@@ -1180,10 +1186,36 @@ function extractTurboAliases(config, root) {
 		...normalizeAliasEntries(readOptionalRecord(topLevelTurbopack?.resolveAlias), root)
 	};
 }
+function extractTurbopackNextIntlCatalogLoader(config, root) {
+	const experimental = readOptionalRecord(config.experimental);
+	for (const turbo of [readOptionalRecord(config.turbopack), readOptionalRecord(experimental?.turbo)]) {
+		const rules = readOptionalRecord(turbo?.rules);
+		for (const [glob, entry] of Object.entries(rules ?? {})) {
+			const extension = /^\*(\.[^*/{}]+)$/.exec(glob)?.[1];
+			if (!extension) continue;
+			for (const rule of Array.isArray(entry) ? entry : [entry]) {
+				if (!isUnknownRecord(rule) || !Array.isArray(rule.loaders)) continue;
+				const loader = rule.loaders.find((use) => isUnknownRecord(use) && use.loader === NEXT_INTL_CATALOG_LOADER);
+				if (!isUnknownRecord(loader) || !isUnknownRecord(loader.options)) continue;
+				const condition = readOptionalRecord(rule.condition);
+				const dirs = typeof condition?.path === "string" ? /^(?:\{([^{}]+)\}|([^{}]+))\/\*\*\/\*$/.exec(condition.path) : null;
+				const include = (dirs?.[1]?.split(",") ?? (dirs?.[2] ? [dirs[2]] : [])).map((dir) => path.resolve(root, dir));
+				if (include.length === 0) continue;
+				return {
+					include,
+					test: new RegExp(`${escapeRegExp(extension)}$`),
+					options: loader.options
+				};
+			}
+		}
+	}
+	return null;
+}
 async function probeWebpackConfig(config, root, dev) {
 	if (typeof config.webpack !== "function") return {
 		aliases: {},
 		mdx: null,
+		nextIntlCatalogLoader: null,
 		resolveExtensions: null,
 		serverResolveExtensions: null,
 		resolveExtensionsCustomized: false,
@@ -1204,6 +1236,7 @@ async function probeWebpackConfig(config, root, dev) {
 		return {
 			aliases: normalizeAliasEntries(clientProbe.config.resolve?.alias, root),
 			mdx: extractMdxOptionsFromRules(clientProbe.rules),
+			nextIntlCatalogLoader: extractNextIntlCatalogLoader(clientProbe.rules),
 			resolveExtensions: clientProbe.resolveExtensions,
 			serverResolveExtensions: serverProbe.resolveExtensions,
 			resolveExtensionsCustomized: clientProbe.resolveExtensions !== null || serverProbe.resolveExtensions !== null,
@@ -1214,6 +1247,7 @@ async function probeWebpackConfig(config, root, dev) {
 		return {
 			aliases: {},
 			mdx: null,
+			nextIntlCatalogLoader: null,
 			resolveExtensions: null,
 			serverResolveExtensions: null,
 			resolveExtensionsCustomized: false,
@@ -1246,6 +1280,35 @@ function extractInstrumentationClientRouteManifest(rules) {
 	for (const rule of rules) visit(rule);
 	return manifest;
 }
+const NEXT_INTL_CATALOG_LOADER = "next-intl/extractor/catalogLoader";
+function extractNextIntlCatalogLoader(rules) {
+	let catalogLoader = null;
+	const visit = (rule) => {
+		if (!rule || typeof rule !== "object") return;
+		if (Array.isArray(rule)) {
+			for (const child of rule) visit(child);
+			return;
+		}
+		if (Array.isArray(rule.oneOf)) for (const child of rule.oneOf) visit(child);
+		if (Array.isArray(rule.rules)) for (const child of rule.rules) visit(child);
+		if (!(rule.test instanceof RegExp)) return;
+		const include = typeof rule.include === "string" ? [rule.include] : rule.include;
+		if (!Array.isArray(include) || include.length === 0) return;
+		if (!include.every((dir) => typeof dir === "string")) return;
+		const uses = Array.isArray(rule.use) ? rule.use : rule.use ? [rule.use] : [];
+		for (const use of uses) {
+			if (!isUnknownRecord(use) || use.loader !== NEXT_INTL_CATALOG_LOADER) continue;
+			if (!isUnknownRecord(use.options)) continue;
+			catalogLoader = {
+				include,
+				test: rule.test,
+				options: use.options
+			};
+		}
+	};
+	for (const rule of rules) visit(rule);
+	return catalogLoader;
+}
 function matchesWebpackCondition(condition, value) {
 	if (typeof condition === "string") return value.startsWith(condition);
 	if (condition instanceof RegExp) {