vinext 0.0.55 → 0.1.0

package/dist/entries/runtime-entry-module.d.ts

@@ -22,5 +22,4 @@ declare function resolveEntryPath(rel: string, base: string): string;
 declare function resolveRuntimeEntryModule(name: string): string;
 declare function resolveClientRuntimeModule(name: string): string;
 //#endregion
-export { resolveClientRuntimeModule, resolveEntryPath, resolveRuntimeEntryModule };
-//# sourceMappingURL=runtime-entry-module.d.ts.map
+export { resolveClientRuntimeModule, resolveEntryPath, resolveRuntimeEntryModule };

package/dist/entries/runtime-entry-module.js

@@ -44,5 +44,3 @@ function resolveRuntimeModulePath(directory, name) {
 }
 //#endregion
 export { resolveClientRuntimeModule, resolveEntryPath, resolveRuntimeEntryModule };
-
-//# sourceMappingURL=runtime-entry-module.js.map

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { NextConfig, NextConfigInput } from "./config/next-config.js";
 import { AppStaticExportOptions, StaticExportOptions, StaticExportResult, staticExportApp, staticExportPages } from "./build/static-export.js";
+import { VinextCacheConfig } from "./cache/cache-adapters-virtual.js";
 import { PluginOption } from "vite";
 import { Options } from "@vitejs/plugin-react";
 
@@ -78,6 +79,26 @@ type VinextOptions = {
    * @default false
    */
   precompress?: boolean;
+  /**
+   * Configure cache handlers declaratively, so you don't need a custom worker
+   * entry that calls `setDataCacheHandler()` / `setCdnCacheAdapter()`. Each slot
+   * is a `{ adapter, options }` descriptor pointing at an adapter module whose
+   * default export is a factory; the plugin registers them automatically on the
+   * first request, passing the host `env` (Worker bindings) so adapters that
+   * need a binding — e.g. a KV namespace — can read it.
+   *
+   * @example
+   * import { cdnAdapter } from "@vinext/cloudflare/cache/cdn-adapter";
+   * import { kvDataAdapter } from "@vinext/cloudflare/cache/kv-data-adapter";
+   *
+   * vinext({
+   *   cache: {
+   *     cdn:  cdnAdapter(),
+   *     data: kvDataAdapter({ binding: "MY_KV" }),
+   *   },
+   * })
+   */
+  cache?: VinextCacheConfig;
   /**
    * Experimental vinext-only feature flags.
    */
@@ -93,5 +114,4 @@ type VinextOptions = {
 };
 declare function vinext(options?: VinextOptions): PluginOption[];
 //#endregion
-export { type AppStaticExportOptions, type NextConfig, type StaticExportOptions, type StaticExportResult, VinextOptions, vinext as default, staticExportApp, staticExportPages };
-//# sourceMappingURL=index.d.ts.map
+export { type AppStaticExportOptions, type NextConfig, type StaticExportOptions, type StaticExportResult, VinextOptions, vinext as default, staticExportApp, staticExportPages };

package/dist/index.js

@@ -1,8 +1,9 @@
 import { detectPackageManager } from "./utils/project.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
-import { buildViteResolveExtensions, createValidFileMatcher } from "./routing/file-matcher.js";
+import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts } from "./routing/file-matcher.js";
 import { hasBasePath } from "./utils/base-path.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
+import { normalizePathSeparators } from "./utils/path.js";
 import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "./server/middleware-request-headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
@@ -13,6 +14,7 @@ import { generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache } from "./routing/app-router.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
+import { isUnknownRecord } from "./utils/record.js";
 import { mergeRewriteQuery } from "./utils/query.js";
 import { logRequest, now } from "./server/request-log.js";
 import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
@@ -26,6 +28,7 @@ import { createDirectRunner } from "./server/dev-module-runner.js";
 import { validateDevRequest } from "./server/dev-origin-check.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
+import { VIRTUAL_CACHE_ADAPTERS, generateCacheAdaptersModule } from "./cache/cache-adapters-virtual.js";
 import { generateBrowserEntry, isLinkPrefetchRoute, toLinkPrefetchRoute } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
@@ -33,10 +36,12 @@ import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/consta
 import { ASSET_PREFIX_URL_DIR, resolveAssetUrlPrefix, resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { getViteMajorVersion } from "./utils/vite-version.js";
-import { findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
+import { createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
 import { precompressAssets } from "./build/precompress.js";
+import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-manifests.js";
 import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
+import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
 import { manifestFilesWithBase } from "./utils/manifest-paths.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
@@ -46,7 +51,7 @@ import { createInstrumentationClientTransformPlugin } from "./plugins/instrument
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
 import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
-import { createOgInlineFetchAssetsPlugin, ogAssetsPlugin } from "./plugins/og-assets.js";
+import { createOgAssetsPlugin, createOgInlineFetchAssetsPlugin } from "./plugins/og-assets.js";
 import { generateRouteTypes } from "./typegen.js";
 import { SSR_EXTERNAL_REACT_ENTRIES, VINEXT_OPTIMIZE_DEPS_EXCLUDE, mergeOptimizeDepsExclude } from "./plugins/rsc-client-shim-excludes.js";
 import { createServerExternalsManifestPlugin } from "./plugins/server-externals-manifest.js";
@@ -55,7 +60,8 @@ import { findClientEntryFile, readClientBuildManifest } from "./utils/client-bui
 import { formatMissingCloudflarePluginError, hasWranglerConfig } from "./deploy.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { buildSassPreprocessorOptions } from "./plugins/sass.js";
-import { createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
+import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
+import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
 import { stripServerExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
@@ -74,9 +80,13 @@ import MagicString from "magic-string";
 import tsconfigPaths from "vite-tsconfig-paths";
 //#region src/index.ts
 installSocketErrorBackstop();
-function createRscCompatibilityId(nextConfig) {
-	if (nextConfig.deploymentId) return nextConfig.deploymentId;
-	return randomUUID();
+function stripViteModuleQuery(id) {
+	const queryIndex = id.search(/[?#]/);
+	return queryIndex === -1 ? id : id.slice(0, queryIndex);
+}
+function isInsideDirectory(dir, filePath) {
+	const relativePath = path.relative(dir, filePath);
+	return relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath);
 }
 function hasModuleLevelUseServerDirective(body) {
 	for (const node of body) {
@@ -154,9 +164,6 @@ function isVinextOgShimImporter(importer) {
 function toRelativeFileEntry(root, absPath) {
 	return path.relative(root, absPath).split(path.sep).join("/");
 }
-function isRecord(value) {
-	return !!value && typeof value === "object" && !Array.isArray(value);
-}
 const TSCONFIG_FILES = ["tsconfig.json", "jsconfig.json"];
 function resolveTsconfigPathCandidate(candidate) {
 	const candidates = candidate.endsWith(".json") ? [candidate] : [
@@ -230,8 +237,8 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 		const extendedPath = resolveTsconfigExtends(normalizedPath, parsed.extends);
 		if (extendedPath) aliases = loadTsconfigPathAliases(extendedPath, projectRoot, seen);
 	}
-	const compilerOptions = isRecord(parsed.compilerOptions) ? parsed.compilerOptions : null;
-	const pathsConfig = compilerOptions && isRecord(compilerOptions.paths) ? compilerOptions.paths : null;
+	const compilerOptions = isUnknownRecord(parsed.compilerOptions) ? parsed.compilerOptions : null;
+	const pathsConfig = compilerOptions && isUnknownRecord(compilerOptions.paths) ? compilerOptions.paths : null;
 	if (!pathsConfig) return aliases;
 	const baseUrl = compilerOptions && typeof compilerOptions.baseUrl === "string" ? compilerOptions.baseUrl : ".";
 	const resolvedBaseUrl = path.resolve(path.dirname(normalizedPath), baseUrl);
@@ -275,16 +282,18 @@ function resolveTsconfigAliases(projectRoot) {
 	return aliases;
 }
 const VIRTUAL_SERVER_ENTRY = "virtual:vinext-server-entry";
-const RESOLVED_SERVER_ENTRY = "\0" + VIRTUAL_SERVER_ENTRY;
+const RESOLVED_SERVER_ENTRY = "\0virtual:vinext-server-entry";
 const VIRTUAL_CLIENT_ENTRY = "virtual:vinext-client-entry";
-const RESOLVED_CLIENT_ENTRY = "\0" + VIRTUAL_CLIENT_ENTRY;
+const RESOLVED_CLIENT_ENTRY = "\0virtual:vinext-client-entry";
 const VIRTUAL_RSC_ENTRY = "virtual:vinext-rsc-entry";
-const RESOLVED_RSC_ENTRY = "\0" + VIRTUAL_RSC_ENTRY;
+const RESOLVED_RSC_ENTRY = "\0virtual:vinext-rsc-entry";
 const VIRTUAL_APP_SSR_ENTRY = "virtual:vinext-app-ssr-entry";
-const RESOLVED_APP_SSR_ENTRY = "\0" + VIRTUAL_APP_SSR_ENTRY;
+const RESOLVED_APP_SSR_ENTRY = "\0virtual:vinext-app-ssr-entry";
 const VIRTUAL_APP_BROWSER_ENTRY = "virtual:vinext-app-browser-entry";
-const RESOLVED_APP_BROWSER_ENTRY = "\0" + VIRTUAL_APP_BROWSER_ENTRY;
+const RESOLVED_APP_BROWSER_ENTRY = "\0virtual:vinext-app-browser-entry";
 const RESOLVED_ROOT_PARAMS = "\0virtual:vinext-root-params";
+/** Virtual module that registers config-driven cache adapters (see VinextOptions.cache). */
+const RESOLVED_CACHE_ADAPTERS = "\0" + VIRTUAL_CACHE_ADAPTERS;
 /** Virtual module for composed instrumentation-client bootstrap. */
 const VIRTUAL_INSTRUMENTATION_CLIENT = "private-next-instrumentation-client";
 const RESOLVED_INSTRUMENTATION_CLIENT = `\0${VIRTUAL_INSTRUMENTATION_CLIENT}.mjs`;
@@ -369,10 +378,12 @@ const _reactServerShims = new Map([
 	["next/dist/client/components/navigation", "navigation"]
 ]);
 const clientManualChunks = createClientManualChunks(_shimsDir);
-const clientOutputConfig = createClientOutputConfig(clientManualChunks);
 const clientCodeSplittingConfig = createClientCodeSplittingConfig(clientManualChunks);
-function getClientOutputConfigForVite(viteMajorVersion) {
-	return viteMajorVersion >= 8 ? { codeSplitting: clientCodeSplittingConfig } : clientOutputConfig;
+function getClientOutputConfigForVite(viteMajorVersion, assetsDir) {
+	return viteMajorVersion >= 8 ? {
+		assetFileNames: createClientAssetFileNames(assetsDir),
+		codeSplitting: clientCodeSplittingConfig
+	} : createClientOutputConfig(clientManualChunks, assetsDir);
 }
 function vinext(options = {}) {
 	const viteMajorVersion = getViteMajorVersion();
@@ -387,6 +398,7 @@ function vinext(options = {}) {
 	let instrumentationPath = null;
 	let instrumentationClientPath = null;
 	let clientInjectModule = null;
+	let clientAssetsInlineLimit = 0;
 	let hasCloudflarePlugin = false;
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
@@ -418,7 +430,10 @@ function vinext(options = {}) {
 	*/
 	async function generateClientEntry$1() {
 		const appPrefetchRoutes = hasAppDir ? (await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)).filter(isLinkPrefetchRoute).map(toLinkPrefetchRoute) : [];
-		return generateClientEntry(pagesDir, nextConfig, fileMatcher, { appPrefetchRoutes });
+		return generateClientEntry(pagesDir, nextConfig, fileMatcher, {
+			appPrefetchRoutes,
+			instrumentationClientPath
+		});
 	}
 	async function writeRouteTypes() {
 		if (!hasAppDir) return;
@@ -566,8 +581,16 @@ function vinext(options = {}) {
 						rawConfig = await resolveNextConfigInput(options.nextConfig, phase);
 					} else rawConfig = await loadNextConfig(root, phase);
 					nextConfig = await resolveNextConfig(rawConfig, root);
+					const sharedBuildId = process.env.__VINEXT_SHARED_BUILD_ID;
+					if (sharedBuildId && sharedBuildId.length > 0) nextConfig = {
+						...nextConfig,
+						buildId: sharedBuildId
+					};
+				}
+				if (rscCompatibilityId === void 0) {
+					const sharedRscCompatibilityId = process.env.__VINEXT_SHARED_RSC_COMPATIBILITY_ID;
+					rscCompatibilityId = sharedRscCompatibilityId && sharedRscCompatibilityId.length > 0 ? sharedRscCompatibilityId : createRscCompatibilityId(nextConfig);
 				}
-				rscCompatibilityId ??= createRscCompatibilityId(nextConfig);
 				fileMatcher = createValidFileMatcher(nextConfig.pageExtensions);
 				instrumentationPath = findInstrumentationFile(root, fileMatcher);
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
@@ -619,6 +642,7 @@ function vinext(options = {}) {
 				defines["process.env.NEXT_DEPLOYMENT_ID"] = nextConfig.deploymentId ? JSON.stringify(nextConfig.deploymentId) : "false";
 				defines["process.env.__NEXT_VERSION"] = JSON.stringify(getVinextVersion());
 				defines["process.env.__NEXT_APP_SHELLS"] = JSON.stringify(nextConfig.appShells);
+				defines["process.env.__NEXT_CACHE_COMPONENTS"] = JSON.stringify(String(nextConfig.cacheComponents ?? false));
 				for (const [key, value] of Object.entries(nextConfig.compilerDefine)) {
 					if (key in defines) throw new Error(`The \`compiler.define\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 					defines[key] = value;
@@ -678,6 +702,7 @@ function vinext(options = {}) {
 					"vinext/cache": path.resolve(__dirname, "cache"),
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
 					"vinext/instrumentation-client": path.resolve(__dirname, "client", "instrumentation-client"),
+					"vinext/dev-error-overlay": path.resolve(__dirname, "server", "dev-error-overlay"),
 					"vinext/html": path.resolve(__dirname, "server", "html"),
 					...clientInjectModule === null ? { "private-next-instrumentation-client": instrumentationClientPath ?? INSTRUMENTATION_CLIENT_EMPTY_MODULE } : {}
 				}).flatMap(([k, v]) => k.startsWith("next/") ? [[k, v], [`${k}.js`, v]] : [[k, v]]));
@@ -696,6 +721,15 @@ function vinext(options = {}) {
 				if (!hasUserMdxPlugin && hasMdxFiles(root, hasAppDir ? appDir : null, hasPagesDir ? pagesDir : null)) await ensureMdxDelegate("detected");
 				const isSSR = !!config.build?.ssr;
 				const isMultiEnv = hasAppDir || hasCloudflarePlugin || hasNitroPlugin;
+				const hasBuildInput = getBuildBundlerOptions(config.build)?.input !== void 0;
+				const shouldInjectPlainPagesEnvironments = !hasAppDir && !hasCloudflarePlugin && !isSSR && !hasBuildInput;
+				const hasClientBuildEnvironment = hasAppDir || hasCloudflarePlugin || hasNitroPlugin || shouldInjectPlainPagesEnvironments;
+				const clientAssetsDir = resolveAssetsDir(nextConfig.assetPrefix ?? "");
+				clientAssetsInlineLimit = config.build?.assetsInlineLimit ?? 0;
+				const devHmrConfig = config.server?.hmr === false ? false : {
+					...typeof config.server?.hmr === "object" ? config.server.hmr : {},
+					overlay: false
+				};
 				const viteConfig = {
 					appType: "custom",
 					build: {
@@ -706,7 +740,8 @@ function vinext(options = {}) {
 							"firefox114",
 							"safari15"
 						],
-						assetsDir: resolveAssetsDir(nextConfig.assetPrefix ?? ""),
+						assetsDir: clientAssetsDir,
+						...!isSSR && !hasClientBuildEnvironment ? { assetsInlineLimit: clientAssetsInlineLimit } : {},
 						...withBuildBundlerOptions(viteMajorVersion, {
 							onwarn: (() => {
 								const userOnwarn = getBuildBundlerOptions(config.build)?.onwarn;
@@ -719,13 +754,16 @@ function vinext(options = {}) {
 								};
 							})(),
 							...!isSSR && !isMultiEnv ? { treeshake: getClientTreeshakeConfigForVite(viteMajorVersion) } : {},
-							...!isSSR && !isMultiEnv ? { output: getClientOutputConfigForVite(viteMajorVersion) } : {}
+							...!isSSR && !isMultiEnv ? { output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir) } : {}
 						})
 					},
-					server: { cors: {
-						preflightContinue: true,
-						origin: /^https?:\/\/(?:(?:[^:]+\.)?localhost|127\.0\.0\.1|\[::1\])(?::\d+)?$/
-					} },
+					server: {
+						cors: {
+							preflightContinue: true,
+							origin: /^https?:\/\/(?:(?:[^:]+\.)?localhost|127\.0\.0\.1|\[::1\])(?::\d+)?$/
+						},
+						hmr: devHmrConfig
+					},
 					...hasCloudflarePlugin || hasNitroPlugin ? {} : config.ssr?.external === true ? { ssr: { external: true } } : { ssr: {
 						external: [
 							"react",
@@ -837,9 +875,10 @@ function vinext(options = {}) {
 							},
 							build: {
 								...hasCloudflarePlugin ? { manifest: true } : {},
+								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions(viteMajorVersion, {
 									input: { index: VIRTUAL_APP_BROWSER_ENTRY },
-									output: getClientOutputConfigForVite(viteMajorVersion),
+									output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
 									treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
 								})
 							}
@@ -851,14 +890,15 @@ function vinext(options = {}) {
 					build: {
 						manifest: true,
 						ssrManifest: true,
+						assetsInlineLimit: clientAssetsInlineLimit,
 						...withBuildBundlerOptions(viteMajorVersion, {
 							input: { index: VIRTUAL_CLIENT_ENTRY },
-							output: getClientOutputConfigForVite(viteMajorVersion),
+							output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
 							treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
 						})
 					}
 				} };
-				else if (!isSSR && !getBuildBundlerOptions(config.build)?.input) viteConfig.environments = {
+				else if (shouldInjectPlainPagesEnvironments) viteConfig.environments = {
 					client: {
 						consumer: "client",
 						optimizeDeps: pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : void 0,
@@ -866,9 +906,10 @@ function vinext(options = {}) {
 							outDir: "dist/client",
 							manifest: true,
 							ssrManifest: true,
+							assetsInlineLimit: clientAssetsInlineLimit,
 							...withBuildBundlerOptions(viteMajorVersion, {
 								input: { index: VIRTUAL_CLIENT_ENTRY },
-								output: getClientOutputConfigForVite(viteMajorVersion),
+								output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
 								treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
 							})
 						}
@@ -927,16 +968,17 @@ function vinext(options = {}) {
 					if (isVercelOgImport(cleanId) && !isVinextOgShimImporter(importer)) return resolveShimModulePath(_shimsDir, "og");
 					if (cleanId === VIRTUAL_SERVER_ENTRY) return RESOLVED_SERVER_ENTRY;
 					if (cleanId === VIRTUAL_CLIENT_ENTRY) return RESOLVED_CLIENT_ENTRY;
-					if (cleanId.endsWith("/" + VIRTUAL_SERVER_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_SERVER_ENTRY)) return RESOLVED_SERVER_ENTRY;
-					if (cleanId.endsWith("/" + VIRTUAL_CLIENT_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_CLIENT_ENTRY)) return RESOLVED_CLIENT_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-server-entry") || cleanId.endsWith("\\virtual:vinext-server-entry")) return RESOLVED_SERVER_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-client-entry") || cleanId.endsWith("\\virtual:vinext-client-entry")) return RESOLVED_CLIENT_ENTRY;
 					if (cleanId === VIRTUAL_RSC_ENTRY) return RESOLVED_RSC_ENTRY;
 					if (cleanId === VIRTUAL_APP_SSR_ENTRY) return RESOLVED_APP_SSR_ENTRY;
 					if (cleanId === VIRTUAL_APP_BROWSER_ENTRY) return RESOLVED_APP_BROWSER_ENTRY;
 					if (cleanId === "next/root-params" || cleanId === "next/root-params.js") return RESOLVED_ROOT_PARAMS;
+					if (cleanId === "virtual:vinext-cache-adapters" || cleanId.endsWith("/virtual:vinext-cache-adapters") || cleanId.endsWith("\\virtual:vinext-cache-adapters")) return RESOLVED_CACHE_ADAPTERS;
 					if (cleanId.startsWith("virtual:vinext-google-fonts?")) return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(VIRTUAL_GOOGLE_FONTS.length);
-					if (cleanId.endsWith("/" + VIRTUAL_RSC_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_RSC_ENTRY)) return RESOLVED_RSC_ENTRY;
-					if (cleanId.endsWith("/" + VIRTUAL_APP_SSR_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_APP_SSR_ENTRY)) return RESOLVED_APP_SSR_ENTRY;
-					if (cleanId.endsWith("/" + VIRTUAL_APP_BROWSER_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_APP_BROWSER_ENTRY)) return RESOLVED_APP_BROWSER_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-rsc-entry") || cleanId.endsWith("\\virtual:vinext-rsc-entry")) return RESOLVED_RSC_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-app-ssr-entry") || cleanId.endsWith("\\virtual:vinext-app-ssr-entry")) return RESOLVED_APP_SSR_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-app-browser-entry") || cleanId.endsWith("\\virtual:vinext-app-browser-entry")) return RESOLVED_APP_BROWSER_ENTRY;
 					if (cleanId.includes("/virtual:vinext-google-fonts?") || cleanId.includes("\\virtual:vinext-google-fonts?")) {
 						const queryIndex = cleanId.indexOf(VIRTUAL_GOOGLE_FONTS + "?");
 						return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(queryIndex + VIRTUAL_GOOGLE_FONTS.length);
@@ -975,6 +1017,7 @@ function vinext(options = {}) {
 					}, instrumentationPath);
 				}
 				if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
+				if (id === RESOLVED_CACHE_ADAPTERS) return generateCacheAdaptersModule(options.cache);
 				if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) return generateSsrEntry(hasPagesDir);
 				if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) {
 					const graph = await appRouteGraph(appDir, nextConfig?.pageExtensions, fileMatcher);
@@ -983,41 +1026,84 @@ function vinext(options = {}) {
 				if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 			},
 			// @vitejs/plugin-rsc runs the RSC environment build in two phases:
-			generateBundle(_options, bundle) {
-				if (this.environment?.name !== "rsc") return;
-				if (!rscClassificationManifest) return;
-				const enableClassificationDebug = Boolean(process.env.VINEXT_DEBUG_CLASSIFICATION);
-				const chunks = [];
-				const chunksByFileName = /* @__PURE__ */ new Map();
-				for (const chunk of Object.values(bundle)) {
-					if (chunk.type !== "chunk") continue;
-					chunks.push({
-						code: chunk.code,
-						fileName: chunk.fileName
+			renderChunk: {
+				order: "pre",
+				handler(code, chunk) {
+					if (this.environment?.name !== "rsc") return null;
+					if (!rscClassificationManifest) return null;
+					if (!code.includes("__VINEXT_CLASS")) return null;
+					const enableClassificationDebug = Boolean(process.env.VINEXT_DEBUG_CLASSIFICATION);
+					const patchPlan = planRouteClassificationInjection({
+						canonicalizeLayoutPath: canonicalize,
+						chunks: [{
+							code,
+							fileName: chunk.fileName
+						}],
+						dynamicShimPaths,
+						enableDebugReasons: enableClassificationDebug,
+						manifest: rscClassificationManifest,
+						moduleInfo: { getModuleInfo: (moduleId) => {
+							const info = this.getModuleInfo(moduleId);
+							if (!info) return null;
+							return {
+								importedIds: info.importedIds ?? [],
+								dynamicImportedIds: info.dynamicallyImportedIds ?? []
+							};
+						} }
 					});
-					chunksByFileName.set(chunk.fileName, chunk);
+					if (patchPlan.kind === "skip") return null;
+					rscClassificationManifest = null;
+					return {
+						code: patchPlan.code,
+						map: patchPlan.map
+					};
 				}
-				const patchPlan = planRouteClassificationInjection({
-					canonicalizeLayoutPath: canonicalize,
-					chunks,
-					dynamicShimPaths,
-					enableDebugReasons: enableClassificationDebug,
-					manifest: rscClassificationManifest,
-					moduleInfo: { getModuleInfo: (moduleId) => {
-						const info = this.getModuleInfo(moduleId);
-						if (!info) return null;
-						return {
-							importedIds: info.importedIds ?? [],
-							dynamicImportedIds: info.dynamicallyImportedIds ?? []
-						};
-					} }
+			}
+		},
+		{
+			name: "vinext:css-url-assets-mark",
+			enforce: "pre",
+			apply: "build",
+			transform(code, id) {
+				if (this.environment?.name !== "client") return null;
+				const marked = markCssUrlAssetReferences(code, id);
+				if (marked === null) return null;
+				return {
+					code: marked,
+					map: null
+				};
+			}
+		},
+		{
+			name: "vinext:client-css-url-assets-defaults",
+			apply: "build",
+			configEnvironment(name) {
+				if (name !== "client") return null;
+				return { build: { assetsInlineLimit: clientAssetsInlineLimit } };
+			}
+		},
+		{
+			name: "vinext:server-minify-defaults",
+			apply: "build",
+			configEnvironment(name, config) {
+				if (name === "client") return null;
+				if (config.build?.minify !== void 0) return null;
+				return { build: { minify: true } };
+			}
+		},
+		{
+			name: "vinext:css-url-assets-restore",
+			enforce: "post",
+			apply: "build",
+			generateBundle(_options, bundle) {
+				if (this.environment?.name !== "client") return;
+				restoreDedupedCssAssetReferences(bundle, (asset) => {
+					this.emitFile({
+						type: "asset",
+						fileName: asset.fileName,
+						source: asset.source
+					});
 				});
-				if (patchPlan.kind === "skip") return;
-				const target = chunksByFileName.get(patchPlan.fileName);
-				if (!target) throw new Error(`vinext: build-time classification — patch target ${patchPlan.fileName} disappeared from the RSC bundle`);
-				target.code = patchPlan.code;
-				target.map = patchPlan.map;
-				rscClassificationManifest = null;
 			}
 		},
 		asyncHooksStubPlugin,
@@ -1185,6 +1271,7 @@ function vinext(options = {}) {
 					}
 					next();
 				});
+				installDevStackSourcemapMiddleware(server);
 				return () => {
 					if (instrumentationPath && !hasAppDir) runInstrumentation(getPagesRunner(), instrumentationPath).catch((err) => {
 						console.error("[vinext] Instrumentation error:", err);
@@ -1597,23 +1684,35 @@ function vinext(options = {}) {
 					if (id.includes("node_modules")) return null;
 					if (id.startsWith("\0")) return null;
 					if (!id.match(/\.(tsx?|jsx?|mjs)$/)) return null;
-					const imageImportRe = new RegExp(`import\\s+(\\w+)\\s+from\\s+['"]([^'"]+\\.(${IMAGE_EXTS}))['"];?`, "g");
-					if (!imageImportRe.test(code)) return null;
-					imageImportRe.lastIndex = 0;
+					const imageExtRe = new RegExp(`\\.(${IMAGE_EXTS})$`);
+					const lang = id.endsWith(".ts") ? "ts" : "tsx";
+					let ast;
+					try {
+						ast = parseAst(code, { lang });
+					} catch {
+						return null;
+					}
 					const s = new MagicString(code);
 					let hasChanges = false;
-					let match;
-					while ((match = imageImportRe.exec(code)) !== null) {
-						const [fullMatch, varName, importPath] = match;
-						const matchStart = match.index;
-						const matchEnd = matchStart + fullMatch.length;
+					for (const node of ast.body) {
+						if (node.type !== "ImportDeclaration") continue;
+						const importNode = node;
+						const importPath = importNode.source?.value;
+						if (typeof importPath !== "string") continue;
+						if (!imageExtRe.test(importPath)) continue;
+						const specifiers = importNode.specifiers ?? [];
+						if (specifiers.length !== 1) continue;
+						const specifier = specifiers[0];
+						if (specifier.type !== "ImportDefaultSpecifier") continue;
+						const varName = specifier.local?.name;
+						if (!varName) continue;
 						const dir = path.dirname(id);
-						const absImagePath = path.resolve(dir, importPath);
+						const absImagePath = normalizePathSeparators(path.resolve(dir, importPath));
 						if (!fs.existsSync(absImagePath)) continue;
 						const urlVar = `__vinext_img_url_${varName}`;
 						const metaVar = `__vinext_img_meta_${varName}`;
 						const replacement = `import ${urlVar} from ${JSON.stringify(importPath)};\nimport ${metaVar} from ${JSON.stringify(absImagePath + "?vinext-meta")};\nconst ${varName} = { src: ${urlVar}, width: ${metaVar}.width, height: ${metaVar}.height };`;
-						s.overwrite(matchStart, matchEnd, replacement);
+						s.overwrite(importNode.start, importNode.end, replacement);
 						hasChanges = true;
 					}
 					if (!hasChanges) return null;
@@ -1625,7 +1724,7 @@ function vinext(options = {}) {
 			}
 		},
 		createGoogleFontsPlugin(_fontGoogleShimPath, _shimsDir),
-		createLocalFontsPlugin(),
+		createLocalFontsPlugin(_shimsDir),
 		createOptimizeImportsPlugin(() => nextConfig, () => root),
 		{
 			name: "vinext:use-cache",
@@ -1677,9 +1776,15 @@ function vinext(options = {}) {
 						const directiveValue = cacheDirective.expression.value;
 						const variant = directiveValue === "use cache" ? "" : directiveValue.replace("use cache:", "").replace("use cache: ", "").trim();
 						const isLayoutOrTemplate = /\/(layout|template)\.(tsx?|jsx?|mjs)$/.test(id);
+						const modulePath = stripViteModuleQuery(id);
+						const moduleFileName = path.basename(modulePath);
+						const isAppPageModule = hasAppDir && isInsideDirectory(appDir, modulePath) && path.parse(moduleFileName).name === "page" && fileMatcher.extensionRegex.test(moduleFileName);
 						const runtimeModuleUrl = pathToFileURL(resolveShimModulePath(shimsDir, "cache-runtime")).href;
 						const result = transformWrapExport(code, ast, {
-							runtime: (value, name) => `(await import(${JSON.stringify(runtimeModuleUrl)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)})`,
+							runtime: (value, name) => {
+								const pageOptions = name === "default" && isAppPageModule ? `, { appPageDefaultExport: true }` : "";
+								return `(await import(${JSON.stringify(runtimeModuleUrl)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)}${pageOptions})`;
+							},
 							rejectNonAsyncFunction: false,
 							filter: (name, meta) => {
 								if (meta.isFunction === false) return false;
@@ -1726,7 +1831,7 @@ function vinext(options = {}) {
 		},
 		createImportMetaUrlPlugin({ getRoot: () => root }),
 		createOgInlineFetchAssetsPlugin(),
-		ogAssetsPlugin,
+		createOgAssetsPlugin(),
 		createServerExternalsManifestPlugin(),
 		{
 			name: "vinext:image-config",
@@ -1754,7 +1859,7 @@ function vinext(options = {}) {
 				name: "vinext:build-id",
 				apply: "build",
 				enforce: "post",
-				closeBundle: {
+				writeBundle: {
 					sequential: true,
 					order: "post",
 					handler() {
@@ -1836,6 +1941,26 @@ function vinext(options = {}) {
 				}
 			}
 		},
+		{
+			name: "vinext:next-client-runtime-manifests",
+			apply: "build",
+			enforce: "post",
+			writeBundle: {
+				sequential: true,
+				order: "post",
+				handler(outputOptions) {
+					const clientDir = outputOptions.dir;
+					if (!clientDir) return;
+					if (!(this.environment?.name === "client")) return;
+					emitNextClientRuntimeManifests({
+						clientDir,
+						assetsSubdir: resolveAssetsDir(nextConfig.assetPrefix),
+						buildId: nextConfig.buildId,
+						rewrites: nextConfig.rewrites
+					});
+				}
+			}
+		},
 		(() => {
 			let pendingPrecompress = null;
 			let pendingPrecompressError = null;
@@ -1864,8 +1989,7 @@ function vinext(options = {}) {
 									if (!isTTY) return;
 									const pct = total > 0 ? Math.floor(completed / total * 100) : 0;
 									const bar = `[${"█".repeat(Math.floor(pct / 5))}${" ".repeat(20 - Math.floor(pct / 5))}]`;
-									const maxFile = 30;
-									const fileLabel = file.length > maxFile ? "…" + file.slice(-(maxFile - 1)) : file;
+									const fileLabel = file.length > 30 ? "…" + file.slice(-29) : file;
 									const line = `Compressing assets... ${bar} ${String(completed).padStart(String(total).length)}/${total} ${fileLabel}`;
 									const padded = line.padEnd(lastLineLen);
 									lastLineLen = line.length;
@@ -2028,15 +2152,19 @@ function vinext(options = {}) {
 						`    if (mod) {`,
 						`      WebAssembly.instantiate(mod, imports).then(function(inst) { callback(inst); });`,
 						`    } else {`,
-						`      var b = Buffer.from(__vi_yoga_b64, "base64");`,
-						`      WebAssembly.instantiate(b, imports).then(function(r) { callback(r.instance); });`,
+						`      Promise.all([import("node:fs"), import("node:url")]).then(function(mods) {`,
+						`        var p = mods[1].fileURLToPath(new URL("./yoga.wasm", import.meta.url));`,
+						`        return mods[0].promises.readFile(p).then(function(bytes) {`,
+						`          return WebAssembly.instantiate(bytes, imports).then(function(r) { callback(r.instance); });`,
+						`        });`,
+						`      });`,
 						`    }`,
 						`  });`,
 						`  return {};`,
 						`} })`
 					].join("\n");
 					result = result.replace(YOGA_CALL, YOGA_CALL_PATCHED);
-					result = [`var __vi_yoga_b64 = ${JSON.stringify(yogaBase64)};`, `var __vi_yoga_mod = import("./yoga.wasm?module").then(function(m) { return m.default; }).catch(function() { return null; });`].join("\n") + "\n" + result;
+					result = [`var __vi_yoga_mod = import("./yoga.wasm?module").then(function(m) { return m.default; }).catch(function() { return null; });`].join("\n") + "\n" + result;
 				}
 				const resvgMatch = /import\s+resvg_wasm\s+from\s+["']\.\/resvg\.wasm\?module["']\s*;?/.exec(result);
 				if (resvgMatch) {
@@ -2160,18 +2288,5 @@ function applyHeaders(pathname, res, headers, ctx, basePath = "") {
 		} else if (!res.getHeader(lk)) res.setHeader(header.key, header.value);
 	}
 }
-/**
-* Find a file by name (without extension) in a directory.
-* Checks the configured page extensions.
-*/
-function findFileWithExts(dir, name, matcher) {
-	for (const ext of matcher.dottedExtensions) {
-		const filePath = path.join(dir, name + ext);
-		if (fs.existsSync(filePath)) return filePath;
-	}
-	return null;
-}
 //#endregion
 export { vinext as default, staticExportApp, staticExportPages };
-
-//# sourceMappingURL=index.js.map