vinext 1.0.0-beta.3 → 1.0.0-beta.5

package/dist/index.js

@@ -6,11 +6,14 @@ import { hasBasePath, stripBasePath } from "./utils/base-path.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
 import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
+import { encodeMiddlewareRequestHeaders } from "./utils/middleware-request-headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
+import { methodNotAllowedResponse } from "./server/http-error-responses.js";
 import { isOpenRedirectShaped } from "./server/open-redirect.js";
 import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
+import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
 import { extractMiddlewareMatcherConfig, extractMiddlewareMatcherConfigValue, hasExportedName } from "./build/report.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
@@ -19,8 +22,7 @@ import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { isUnknownRecord } from "./utils/record.js";
 import { logRequest, now } from "./server/request-log.js";
-import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
-import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
+import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
 import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { getPagesPreviewModeId } from "./server/pages-preview.js";
 import { createSSRHandler } from "./server/dev-server.js";
@@ -41,6 +43,7 @@ import { planRouteClassificationInjection } from "./build/route-classification-i
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
+import { loadDotenv } from "./config/dotenv.js";
 import { mergeServerExternalPackages } from "./config/server-external-packages.js";
 import { precompressAssets } from "./build/precompress.js";
 import { ensureAssetsIgnore } from "./build/assets-ignore.js";
@@ -51,6 +54,7 @@ import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
 import { pagesRouteHasPriorityOverAppRoute, validateHybridRouteConflicts } from "./server/hybrid-route-priority.js";
 import { VIRTUAL_MODULE_ID_RE } from "./utils/virtual-module.js";
+import { assertNoPublicDirAssetConflict, assertNoPublicNextRequestConflict } from "./build/public-dir-conflict.js";
 import { renderVinextBuiltUrl } from "./utils/built-asset-url.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
@@ -79,17 +83,18 @@ import { createPreviewBuildCredentials, getPreviewBuildCredentials } from "./bui
 import { createModuleDependencyCache } from "./build/module-dependency-cache.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
-import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter } from "./plugins/sass.js";
+import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter, createSassTsconfigPathImporters } from "./plugins/sass.js";
 import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfig, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { hasExportAllCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
-import { createTransformCache } from "./plugins/transform-cache.js";
 import { createRequireContextPlugin } from "./plugins/require-context.js";
+import { createTransformCache } from "./plugins/transform-cache.js";
 import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-dynamic-import.js";
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
 import { getTypeofWindowReplacement, replaceTypeofWindow } from "./plugins/typeof-window.js";
 import { hasMdxFiles } from "./utils/mdx-scan.js";
+import { publicFilePathVariants } from "./utils/public-file-path.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
 import { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine } from "./utils/vite-version.js";
@@ -97,7 +102,7 @@ import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGI
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
-import { createLogger, loadEnv, parseAst, transformWithOxc } from "vite";
+import { createLogger, parseAst, transformWithOxc } from "vite";
 import { pathToFileURL } from "node:url";
 import { createHash, randomBytes } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
@@ -408,23 +413,45 @@ function resolveTsconfigExtends(configPath, specifier) {
 	} catch {}
 	return null;
 }
+function mergeSassTsconfigPathAliases(...groups) {
+	const merged = /* @__PURE__ */ new Map();
+	for (const group of groups) for (const alias of group) merged.set(alias.find, alias);
+	return [...merged.values()];
+}
+function hasZeroOrOneAsterisk(value) {
+	const first = value.indexOf("*");
+	return first < 0 || first === value.lastIndexOf("*");
+}
 function materializeTsconfigPathAliases(pathsConfig, baseUrl, projectRoot) {
-	const aliases = {};
+	const vite = {};
+	const sass = [];
 	for (const [find, rawTargets] of Object.entries(pathsConfig)) {
-		const target = Array.isArray(rawTargets) ? rawTargets.find((value) => typeof value === "string") : typeof rawTargets === "string" ? rawTargets : null;
-		if (!target) continue;
+		const targets = Array.isArray(rawTargets) ? rawTargets.filter((value) => typeof value === "string") : typeof rawTargets === "string" ? [rawTargets] : [];
+		if (targets.length === 0) continue;
+		if (find.length > 0 && hasZeroOrOneAsterisk(find)) {
+			const findHasStar = find.includes("*");
+			const replacements = targets.filter((target) => target.length > 0 && hasZeroOrOneAsterisk(target) && (findHasStar || !target.includes("*"))).map((target) => path.resolve(baseUrl, target));
+			if (replacements.length > 0) sass.push({
+				find,
+				replacements
+			});
+		}
+		const target = targets[0];
 		if (find.includes("*") || target.includes("*")) {
 			if (!find.endsWith("/*") || !target.endsWith("/*")) continue;
 			if (find.indexOf("*") !== find.length - 1 || target.indexOf("*") !== target.length - 1) continue;
 			const aliasKey = find.slice(0, -2);
 			const targetDir = target.slice(0, -2);
 			if (!aliasKey || !targetDir) continue;
-			aliases[aliasKey] = toViteAliasReplacement(path.resolve(baseUrl, targetDir), projectRoot);
+			vite[aliasKey] = toViteAliasReplacement(path.resolve(baseUrl, targetDir), projectRoot);
 			continue;
 		}
-		aliases[find] = toViteAliasReplacement(path.resolve(baseUrl, target), projectRoot);
+		vite[find] = toViteAliasReplacement(path.resolve(baseUrl, target), projectRoot);
 	}
-	return aliases;
+	return {
+		vite,
+		sass
+	};
 }
 function toViteAliasReplacement(absolutePath, projectRoot) {
 	const normalizedPath = toSlash(absolutePath);
@@ -457,31 +484,52 @@ function resolveSwcHelpersAlias(root) {
 }
 function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */ new Set()) {
 	const normalizedPath = tryRealpathSync(configPath) ?? configPath;
-	if (seen.has(normalizedPath)) return {};
+	if (seen.has(normalizedPath)) return {
+		vite: {},
+		sass: []
+	};
 	seen.add(normalizedPath);
 	let parsed = null;
 	try {
 		parsed = parseStaticObjectLiteral(fs.readFileSync(normalizedPath, "utf-8"));
 	} catch {
-		return {};
+		return {
+			vite: {},
+			sass: []
+		};
 	}
-	if (!parsed) return {};
-	let aliases = {};
+	if (!parsed) return {
+		vite: {},
+		sass: []
+	};
+	let aliases = {
+		vite: {},
+		sass: []
+	};
 	for (const extendsSpecifier of normalizeTsconfigExtends(parsed.extends)) {
 		const extendedPath = resolveTsconfigExtends(normalizedPath, extendsSpecifier);
-		if (extendedPath) aliases = {
-			...aliases,
-			...loadTsconfigPathAliases(extendedPath, projectRoot, seen)
-		};
+		if (extendedPath) {
+			const parent = loadTsconfigPathAliases(extendedPath, projectRoot, seen);
+			aliases = {
+				vite: {
+					...aliases.vite,
+					...parent.vite
+				},
+				sass: mergeSassTsconfigPathAliases(aliases.sass, parent.sass)
+			};
+		}
 	}
 	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);
+	const own = materializeTsconfigPathAliases(pathsConfig, path.resolve(path.dirname(normalizedPath), baseUrl), projectRoot);
 	return {
-		...aliases,
-		...materializeTsconfigPathAliases(pathsConfig, resolvedBaseUrl, projectRoot)
+		vite: {
+			...aliases.vite,
+			...own.vite
+		},
+		sass: mergeSassTsconfigPathAliases(aliases.sass, own.sass)
 	};
 }
 /**
@@ -538,10 +586,17 @@ function resolveTsconfigAliases(projectRoot, configuredPath) {
 	const configPath = configuredPath ? path.resolve(projectRoot, configuredPath) : void 0;
 	const cacheKey = configPath ?? projectRoot;
 	if (_tsconfigAliasCache.has(cacheKey)) return _tsconfigAliasCache.get(cacheKey);
-	let aliases = {};
+	let aliases = {
+		vite: {},
+		sass: []
+	};
 	for (const candidate of configPath ? [configPath] : TSCONFIG_FILES.map((name) => path.join(projectRoot, name))) {
 		if (!fs.existsSync(candidate)) continue;
-		aliases = sortTsconfigAliasesBySpecificity(loadTsconfigPathAliases(candidate, projectRoot));
+		const materialized = loadTsconfigPathAliases(candidate, projectRoot);
+		aliases = {
+			vite: sortTsconfigAliasesBySpecificity(materialized.vite),
+			sass: materialized.sass
+		};
 		break;
 	}
 	_tsconfigAliasCache.set(cacheKey, aliases);
@@ -773,6 +828,8 @@ function vinext(options = {}) {
 	let pagesOptimizeEntries = [];
 	const pagesClientAssetsOutputDirs = /* @__PURE__ */ new Set();
 	let pagesClientAssetsModule = null;
+	let devPublicFileRoutes = null;
+	let publicDirConflictOptions = null;
 	let rscCompatibilityId;
 	let draftModeSecret = getPagesPreviewModeId();
 	let previewBuildCredentials;
@@ -803,8 +860,9 @@ function vinext(options = {}) {
 	* Generate the virtual SSR server entry module.
 	* This is the entry point for `vite build --ssr`.
 	*/
-	async function generateServerEntry$1() {
-		return generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath);
+	async function generateServerEntry$1(configuredPublicDir) {
+		const publicFiles = isServeCommand && devPublicFileRoutes ? [...devPublicFileRoutes].sort() : scanPublicFileRoutes(root, configuredPublicDir === "" ? false : configuredPublicDir);
+		return generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, publicFiles);
 	}
 	/**
 	* Generate the virtual client hydration entry module.
@@ -984,7 +1042,7 @@ function vinext(options = {}) {
 			transform: {
 				filter: { id: /\.m?js(?:\?.*)?$/ },
 				async handler(code, id) {
-					const cleanId = id.split("?")[0];
+					const cleanId = toSlash(stripViteModuleQuery(id));
 					if (isInsideDirectory(__dirname, cleanId)) return;
 					if (cleanId.includes("/node_modules/")) {
 						if (!code.includes("use client") && !code.includes("use server")) return;
@@ -1030,13 +1088,16 @@ function vinext(options = {}) {
 				root = toSlash(config.root ?? process.cwd());
 				const userResolve = config.resolve;
 				let tsconfigPathAliases = {};
+				let sassTsconfigPathAliases = [];
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
 				const mode = env?.mode ?? "development";
-				const dotenvVars = loadEnv(mode, config.envDir ?? root, "");
-				for (const [key, value] of Object.entries(dotenvVars)) if (process.env[key] === void 0) process.env[key] = value;
+				if (config.envDir !== false) loadDotenv({
+					root: config.envDir ?? root,
+					mode
+				});
 				let resolvedNodeEnv;
-				if (mode === "test") resolvedNodeEnv = "test";
-				else if (env?.command === "build" || env?.isPreview === true) resolvedNodeEnv = "production";
+				if (env?.command === "build" || env?.isPreview === true) resolvedNodeEnv = "production";
+				else if (mode === "test") resolvedNodeEnv = "test";
 				else resolvedNodeEnv = "development";
 				if (process.env.NODE_ENV !== resolvedNodeEnv) Reflect.set(process.env, "NODE_ENV", resolvedNodeEnv);
 				if (env?.command === "build") previewBuildCredentials = getPreviewBuildCredentials() ?? createPreviewBuildCredentials();
@@ -1078,7 +1139,9 @@ function vinext(options = {}) {
 					};
 				}
 				const configuredTsconfigPath = isUnknownRecord(nextConfig.typescript) ? typeof nextConfig.typescript.tsconfigPath === "string" ? nextConfig.typescript.tsconfigPath : void 0 : void 0;
-				tsconfigPathAliases = resolveTsconfigAliases(root, configuredTsconfigPath);
+				const resolvedTsconfigAliases = resolveTsconfigAliases(root, configuredTsconfigPath);
+				tsconfigPathAliases = resolvedTsconfigAliases.vite;
+				sassTsconfigPathAliases = resolvedTsconfigAliases.sass;
 				const shouldAutoEnableNativeTsconfigPaths = userResolve?.tsconfigPaths === void 0 && configuredTsconfigPath === void 0;
 				if (Object.keys(tsconfigPathAliases).length > 0) config.customLogger = suppressAliasCustomResolverDeprecationWarning(config.customLogger ?? createLogger(config.logLevel, { allowClearScreen: config.clearScreen }));
 				if (rscCompatibilityId === void 0) {
@@ -1118,6 +1181,7 @@ function vinext(options = {}) {
 				defines["process.env.__VINEXT_PREFETCH_INLINING"] = JSON.stringify(nextConfig.prefetchInlining ? "true" : "false");
 				defines["process.env.__NEXT_GESTURE_TRANSITION"] = JSON.stringify(nextConfig.gestureTransition);
 				defines["process.env.__NEXT_APP_NAV_FAIL_HANDLING"] = JSON.stringify(nextConfig.appNavFailHandling);
+				defines["process.env.__NEXT_TEST_MODE"] = JSON.stringify(process.env.__NEXT_TEST_MODE ?? false);
 				defines["process.env.__NEXT_SCROLL_RESTORATION"] = JSON.stringify(nextConfig.scrollRestoration ? "true" : "false");
 				defines["process.env.__VINEXT_TRAILING_SLASH"] = JSON.stringify(nextConfig.trailingSlash ? "true" : "false");
 				defines["process.env.__VINEXT_IMAGE_REMOTE_PATTERNS"] = JSON.stringify(JSON.stringify(nextConfig.images?.remotePatterns ?? []));
@@ -1133,16 +1197,7 @@ function vinext(options = {}) {
 						2048,
 						3840
 					];
-					const imageSizes = nextConfig.images?.imageSizes ?? [
-						16,
-						32,
-						48,
-						64,
-						96,
-						128,
-						256,
-						384
-					];
+					const imageSizes = nextConfig.images?.imageSizes ?? DEFAULT_IMAGE_SIZES;
 					defines["process.env.__VINEXT_IMAGE_DEVICE_SIZES"] = JSON.stringify(JSON.stringify(deviceSizes));
 					defines["process.env.__VINEXT_IMAGE_SIZES"] = JSON.stringify(JSON.stringify(imageSizes));
 					defines["process.env.__VINEXT_IMAGE_QUALITIES"] = JSON.stringify(JSON.stringify(nextConfig.images?.qualities ?? null));
@@ -1192,6 +1247,7 @@ function vinext(options = {}) {
 					"vinext/head-state": path.join(shimsDir, "head-state"),
 					"vinext/i18n-state": path.join(shimsDir, "i18n-state"),
 					"vinext/i18n-context": path.join(shimsDir, "i18n-context"),
+					"vinext/client": path.resolve(__dirname, "client", "index"),
 					"vinext/cache": path.resolve(__dirname, "cache"),
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
 					"vinext/instrumentation-client": path.resolve(__dirname, "client", "instrumentation-client"),
@@ -1306,8 +1362,11 @@ function vinext(options = {}) {
 						...postcssOverride ? { postcss: postcssOverride } : {},
 						preprocessorOptions: (() => {
 							const tildeImporter = createSassTildeImporter(root);
+							const tsconfigPathImporters = createSassTsconfigPathImporters(sassTsconfigPathAliases);
 							const cssUrlAssetImporter = env.command === "build" ? createSassCssUrlAssetImporter() : null;
 							const userAdditionalData = sassPreprocessorOptions?.additionalData;
+							const rawUserImporters = sassPreprocessorOptions?.importers;
+							const userImporters = Array.isArray(rawUserImporters) ? rawUserImporters : rawUserImporters == null ? [] : [rawUserImporters];
 							const baseOpts = {
 								...sassPreprocessorOptions,
 								...cssUrlAssetImporter ? { additionalData: async (source, filename) => {
@@ -1317,7 +1376,8 @@ function vinext(options = {}) {
 								importers: [
 									tildeImporter,
 									...cssUrlAssetImporter ? [cssUrlAssetImporter] : [],
-									...sassPreprocessorOptions?.importers ?? []
+									...userImporters,
+									...tsconfigPathImporters
 								]
 							};
 							return {
@@ -1524,6 +1584,14 @@ function vinext(options = {}) {
 						sourcePath: path.relative(root, route.pagePath ?? route.routePath)
 					})));
 				}
+				if (config.command === "build") {
+					publicDirConflictOptions = {
+						root: config.root,
+						publicDir: config.publicDir === "" ? null : config.publicDir,
+						assetsDir: config.environments?.client?.build?.assetsDir ?? config.build?.assetsDir ?? resolveAssetsDir(nextConfig.assetPrefix ?? "")
+					};
+					assertNoPublicDirAssetConflict(publicDirConflictOptions);
+				}
 				if (hasAppDir) {
 					const ssrEnv = config.environments?.ssr;
 					if (ssrEnv?.resolve?.external === true && Array.isArray(ssrEnv.resolve.noExternal)) ssrEnv.resolve.noExternal = ssrEnv.resolve.noExternal.filter((entry) => typeof entry !== "string" || !SSR_EXTERNAL_REACT_ENTRIES.includes(entry));
@@ -1544,6 +1612,13 @@ function vinext(options = {}) {
 					configFile: config.configFile
 				}));
 			},
+			renderStart: {
+				order: "pre",
+				handler() {
+					if (this.environment?.name !== "client" || !publicDirConflictOptions) return;
+					assertNoPublicDirAssetConflict(publicDirConflictOptions);
+				}
+			},
 			resolveId: {
 				filter: { id: /(?:next\/|vinext\/(?:shims\/|server\/app-rsc-handler)|virtual:vinext-|@vercel\/og(?:\.js)?$)/ },
 				handler(id, importer) {
@@ -1589,7 +1664,7 @@ function vinext(options = {}) {
 				filter: { id: /virtual:vinext-/ },
 				async handler(id) {
 					if (id === RESOLVED_WORKER_ENTRY) return `export { default } from ${JSON.stringify(hasAppDir ? "vinext/server/app-router-entry" : "vinext/server/pages-router-entry")};`;
-					if (id === RESOLVED_SERVER_ENTRY) return await generateServerEntry$1();
+					if (id === RESOLVED_SERVER_ENTRY) return await generateServerEntry$1(this.environment.config.publicDir === "" ? false : this.environment.config.publicDir);
 					if (id === RESOLVED_CLIENT_ENTRY) return await generateClientEntry$1();
 					if (id === RESOLVED_PAGES_CLIENT_ASSETS) {
 						const metadata = { clientEntry: DEV_PAGES_CLIENT_ENTRY };
@@ -1642,7 +1717,7 @@ function vinext(options = {}) {
 								contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
 							},
 							hasPagesDir,
-							publicFiles: scanPublicFileRoutes(root),
+							publicFiles: isServeCommand && devPublicFileRoutes ? [...devPublicFileRoutes].sort() : scanPublicFileRoutes(root, this.environment.config.publicDir === "" ? false : this.environment.config.publicDir),
 							globalNotFoundPath,
 							draftModeSecret
 						}, instrumentationPath);
@@ -1902,6 +1977,19 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					req.__vinextOriginalEncodedUrl ??= req.url;
 					next();
 				});
+				server.middlewares.use((req, _res, next) => {
+					try {
+						assertNoPublicNextRequestConflict({
+							root: server.config.root,
+							publicDir: server.config.publicDir === "" ? null : server.config.publicDir,
+							basePath: nextConfig.basePath ?? "",
+							requestUrl: req.url ?? "/"
+						});
+						next();
+					} catch (error) {
+						next(error);
+					}
+				});
 				const pageExtensions = fileMatcher.extensionRegex;
 				let pagesRunner = null;
 				const getTrustedDevRevalidateOrigin = () => {
@@ -2050,7 +2138,32 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				server.httpServer?.on("connection", (socket) => {
 					socket.on("error", () => {});
 				});
+				const configuredPublicDir = server.config.publicDir === "" ? false : server.config.publicDir;
+				const devPublicDir = configuredPublicDir === false ? null : path.resolve(toSlash(server.config.root), toSlash(configuredPublicDir));
+				devPublicFileRoutes = new Set(scanPublicFileRoutes(root, configuredPublicDir));
+				const publicRoutesForFile = (filePath) => {
+					if (devPublicDir === null) return null;
+					const cleanPath = toSlash(stripViteModuleQuery(filePath));
+					const relativePath = path.relative(devPublicDir, cleanPath);
+					if (relativePath === "" || relativePath.startsWith("../") || path.isAbsolute(relativePath)) return null;
+					return publicFilePathVariants(`/${relativePath}`);
+				};
+				const updatePublicFileRoute = (filePath, present) => {
+					const routes = publicRoutesForFile(filePath);
+					if (routes === null || devPublicFileRoutes === null) return;
+					let changed = false;
+					for (const route of routes) {
+						if (!(present ? !devPublicFileRoutes.has(route) : devPublicFileRoutes.has(route))) continue;
+						changed = true;
+						if (present) devPublicFileRoutes.add(route);
+						else devPublicFileRoutes.delete(route);
+					}
+					if (!changed) return;
+					if (hasAppDir) invalidateRscEntryModule();
+					if (hasCloudflarePlugin && hasPagesDir && !hasAppDir) invalidatePagesServerEntry();
+				};
 				server.watcher.on("add", (filePath) => {
+					updatePublicFileRoute(filePath, true);
 					let routeChanged = false;
 					const pagesAppChanged = isPagesAppFile(filePath);
 					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
@@ -2077,6 +2190,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule();
 				});
 				server.watcher.on("unlink", (filePath) => {
+					updatePublicFileRoute(filePath, false);
 					let routeChanged = false;
 					const pagesAppChanged = isPagesAppFile(filePath);
 					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
@@ -2097,6 +2211,23 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						revalidateHybridRoutes();
 					}
 				});
+				let handlePagesMiddleware = null;
+				const isExistingDevPublicFile = (requestPathname) => devPublicFileRoutes?.has(requestPathname) === true;
+				const isUnsupportedDevPublicRequest = (req, pathnameState = "pre-base") => {
+					if (req.method === "GET" || req.method === "HEAD") return false;
+					let pathname;
+					try {
+						pathname = normalizePathnameForRouteMatchStrict(new URL(req.url ?? "/", "http://vinext.invalid").pathname);
+					} catch {
+						return false;
+					}
+					const basePath = nextConfig?.basePath ?? "";
+					if (pathnameState === "pre-base" && basePath) {
+						if (!hasBasePath(pathname, basePath)) return false;
+						pathname = stripBasePath(pathname, basePath);
+					}
+					return isExistingDevPublicFile(pathname);
+				};
 				server.middlewares.use((req, res, next) => {
 					const blockReason = validateDevRequest({
 						origin: req.headers.origin,
@@ -2113,12 +2244,27 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					next();
 				});
+				server.middlewares.use((req, res, next) => {
+					if (!hasPagesDir || !handlePagesMiddleware || !isUnsupportedDevPublicRequest(req)) return next();
+					handlePagesMiddleware(req, res, next);
+				});
 				installDevStackSourcemapMiddleware(server);
 				return () => {
 					const viteFilesystemMiddlewares = server.middlewares.stack.filter(({ handle }) => {
 						const name = typeof handle === "function" ? handle.name : "";
 						return name === "viteServePublicMiddleware" || name === "viteServeStaticMiddleware";
 					}).map(({ handle }) => handle).filter((handle) => typeof handle === "function");
+					if (hasAppDir && !hasPagesDir || hasCloudflarePlugin) {
+						const publicMiddlewareEntry = server.middlewares.stack.find(({ handle }) => typeof handle === "function" && handle.name === "viteServePublicMiddleware");
+						const viteServePublic = publicMiddlewareEntry?.handle;
+						if (publicMiddlewareEntry && viteServePublic) {
+							const vinextServePublicMiddleware = (req, res, next) => {
+								if (isUnsupportedDevPublicRequest(req, "post-base")) return next();
+								return viteServePublic(req, res, next);
+							};
+							publicMiddlewareEntry.handle = vinextServePublicMiddleware;
+						}
+					}
 					const serveRewrittenViteFilesystemRoute = async (req, res, requestPathname, stagedHeaders) => {
 						const originalUrl = req.url;
 						const originalStatusCode = res.statusCode;
@@ -2213,7 +2359,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						});
 						next();
 					});
-					const handlePagesMiddleware = async (req, res, next) => {
+					handlePagesMiddleware = async (req, res, next) => {
 						try {
 							let url = req.url ?? "/";
 							const originalRequestUrl = url;
@@ -2245,17 +2391,6 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const requestHost = revalidationHostname ?? ((Array.isArray(req.headers.host) ? req.headers.host[0] : req.headers.host) || "localhost");
 							const requestOrigin = `http://${requestHost}`;
 							const getUrlHostname = (requestUrl) => new URL(requestUrl).hostname;
-							if (isImageOptimizationPath(url.split("?")[0])) {
-								const encodedLocation = resolveDevImageRedirect(new URL(url, requestOrigin), [...nextConfig.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...nextConfig.images?.imageSizes ?? DEFAULT_IMAGE_SIZES], nextConfig.images?.qualities);
-								if (!encodedLocation) {
-									res.writeHead(400);
-									res.end("Invalid image optimization parameters");
-									return;
-								}
-								res.writeHead(302, { Location: encodedLocation });
-								res.end();
-								return;
-							}
 							const originalEncodedUrl = req.__vinextOriginalEncodedUrl ?? url;
 							const originalEncodedPathname = originalEncodedUrl.split("?")[0];
 							if (isOpenRedirectShaped(originalEncodedPathname)) {
@@ -2334,15 +2469,16 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							}
 							if (hasCloudflarePlugin) return next();
 							let isDataReq = false;
+							let dataNotFoundResponse = null;
 							if (isNextDataPathname(pathname)) {
 								const devBuildId = nextConfig?.buildId ?? process.env.__VINEXT_BUILD_ID ?? "development";
 								const dataMatch = parseNextDataPathname(pathname, devBuildId);
 								if (dataMatch) {
 									isDataReq = true;
 									const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-									const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, capturedMiddlewarePath !== null && nextConfig?.trailingSlash === true);
+									const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, shouldAddTrailingSlashToPagesDataPath(capturedMiddlewarePath !== null, nextConfig?.trailingSlash === true, nextConfig?.skipProxyUrlNormalize === true));
 									url = pagePathname + qs;
-									middlewareUrl = url;
+									if (!nextConfig?.skipProxyUrlNormalize) middlewareUrl = url;
 									routeUrl = url;
 									pathname = pagePathname;
 									configMatchPathname = pagePathname;
@@ -2351,9 +2487,16 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 									const notFoundHeaders = { "Content-Type": "application/json" };
 									if (deploymentId) notFoundHeaders[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
-									res.writeHead(404, notFoundHeaders);
-									res.end("{}");
-									return;
+									if (!nextConfig?.skipProxyUrlNormalize) {
+										res.writeHead(404, notFoundHeaders);
+										res.end("{}");
+										return;
+									}
+									isDataReq = true;
+									dataNotFoundResponse = new Response("{}", {
+										status: 404,
+										headers: notFoundHeaders
+									});
 								}
 							}
 							const filePathMatchesRewrite = [
@@ -2365,15 +2508,16 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								hadBasePath: true
 							}));
 							const isFilePathRequest = pathname.includes(".") && !pathname.endsWith(".html");
+							const isExistingPublicMutation = req.method !== "GET" && req.method !== "HEAD" && isExistingDevPublicFile(pathname);
 							let filePathMatchesPagesRoute = false;
 							const requestHostname = getUrlHostname(requestOrigin);
-							if (isFilePathRequest && !filePathMatchesRewrite) {
+							if (isFilePathRequest && !filePathMatchesRewrite && !isDataReq) {
 								const [pageRoutes, apiRoutes] = await Promise.all([pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher), apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)]);
 								const pageRouteUrl = nextConfig?.i18n ? resolvePagesI18nRequest(pathname, nextConfig.i18n, req.headers, requestHostname, bp, nextConfig.trailingSlash ?? false).url : pathname;
 								const apiRouteUrl = stripI18nLocaleForApiRoute(pathname, nextConfig?.i18n ?? null);
 								filePathMatchesPagesRoute = matchRoute(pageRouteUrl, pageRoutes) !== null || matchRoute(apiRouteUrl, apiRoutes) !== null;
 							}
-							if (isFilePathRequest && !filePathMatchesRewrite && !filePathMatchesPagesRoute) return next();
+							if (isFilePathRequest && !isDataReq && !filePathMatchesRewrite && !filePathMatchesPagesRoute && !isExistingPublicMutation) return next();
 							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
 							const isDataRequest = isDataReq;
 							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
@@ -2412,6 +2556,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								return result;
 							} : null;
 							const devPageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+							let devApiRoutesPromise = null;
+							const getDevApiRoutes = () => devApiRoutesPromise ??= apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+							let devAppRoutesPromise = null;
+							const getDevAppRoutes = () => devAppRoutesPromise ??= hasAppDir && appDir ? appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : Promise.resolve([]);
 							const devPageRouteDataKinds = /* @__PURE__ */ new Map();
 							const classifyDevPageRoute = (route) => {
 								const cached = devPageRouteDataKinds.get(route.filePath);
@@ -2439,9 +2587,15 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								isDataReq,
 								isDataRequest,
 								hasMiddleware: capturedMiddlewarePath !== null,
+								dataNotFoundResponse,
 								rawSearch: url.includes("?") ? url.slice(url.indexOf("?")) : "",
 								configMatchPathname,
 								runMiddleware: devRunMiddlewareAdapter,
+								matchApiRoute: async (apiUrl) => {
+									const pagesMatch = matchRoute(apiUrl, await getDevApiRoutes());
+									if (pagesMatch) return pagesMatch;
+									return matchAppRoute(apiUrl, await getDevAppRoutes());
+								},
 								matchPageRoute: (resolvedPathname, request) => {
 									const m = matchRoute(nextConfig?.i18n ? resolvePagesI18nRequest(resolvedPathname, nextConfig.i18n, request.headers, getUrlHostname(request.url), bp, nextConfig.trailingSlash ?? false).url : resolvedPathname, devPageRoutes);
 									return m ? { route: {
@@ -2464,8 +2618,17 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									}
 									return proxyExternalRequest(new Request(new URL(url, requestOrigin), externalInit), externalUrl);
 								},
-								serveFilesystemRoute: async (requestPathname, stagedHeaders, phase) => {
-									if (phase === "direct" || req.method !== "GET" && req.method !== "HEAD" || requestPathname === "/" || requestPathname === "/api" || requestPathname.startsWith("/api/")) return false;
+								serveFilesystemRoute: async (requestPathname, stagedHeaders, phase, resolvedUrl) => {
+									if (isImageOptimizationPath(requestPathname)) {
+										const encodedLocation = resolveDevImageRedirect(new URL(resolvedUrl, requestOrigin), [...nextConfig.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...nextConfig.images?.imageSizes ?? DEFAULT_IMAGE_SIZES], nextConfig.images?.qualities);
+										return encodedLocation ? new Response(null, {
+											status: 302,
+											headers: { Location: encodedLocation }
+										}) : new Response("Invalid image optimization parameters", { status: 400 });
+									}
+									const isRetrievalMethod = req.method === "GET" || req.method === "HEAD";
+									if (phase === "direct" && isRetrievalMethod || requestPathname === "/" || requestPathname === "/api" || requestPathname.startsWith("/api/")) return false;
+									if (!isRetrievalMethod) return isExistingDevPublicFile(requestPathname) ? methodNotAllowedResponse("GET, HEAD") : false;
 									return serveRewrittenViteFilesystemRoute(req, res, requestPathname, stagedHeaders);
 								}
 							});
@@ -2475,19 +2638,35 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							}
 							if (pipelineResult.type === "next") return next();
 							if (pipelineResult.type === "handled") return;
+							const forEachStagedHeader = (visit) => {
+								for (const [key, value] of Object.entries(pipelineResult.stagedHeaders)) if (Array.isArray(value)) for (const item of value) visit(key, item);
+								else visit(key, value);
+							};
 							const flushStagedHeaders = () => {
-								for (const [key, value] of Object.entries(pipelineResult.stagedHeaders)) if (Array.isArray(value)) for (const v of value) res.appendHeader(key, v);
-								else res.appendHeader(key, value);
+								forEachStagedHeader((key, value) => res.appendHeader(key, value));
 							};
 							const flushRequestHeaders = () => {
 								applyRequestHeadersToNodeRequest(pipelineResult.requestHeaders);
 							};
+							const forwardInternalApiRewriteToApp = (apiUrl) => {
+								const responseHeaders = [];
+								forEachStagedHeader((key, value) => responseHeaders.push([key, value]));
+								const requestHeaders = new Headers();
+								encodeMiddlewareRequestHeaders(requestHeaders, pipelineResult.requestHeaders);
+								flushRequestHeaders();
+								req.headers[VINEXT_MW_CTX_HEADER] = JSON.stringify({
+									h: responseHeaders,
+									q: [...requestHeaders],
+									s: pipelineResult.middlewareStatus ?? null,
+									r: apiUrl
+								});
+							};
 							if (pipelineResult.type === "api") {
-								const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-								const apiMatch = matchRoute(pipelineResult.apiUrl, apiRoutes);
+								const devApiRoutes = await getDevApiRoutes();
+								const apiMatch = matchRoute(pipelineResult.apiUrl, devApiRoutes);
 								if (apiMatch && hasAppDir && appDir) {
-									const appRoutes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
-									const appMatch = matchAppRoute(pipelineResult.apiUrl, appRoutes);
+									const devAppRoutes = await getDevAppRoutes();
+									const appMatch = matchAppRoute(pipelineResult.apiUrl, devAppRoutes);
 									if (appMatch && !pagesRouteHasPriorityOverAppRoute(apiMatch.route, appMatch.route)) return next();
 								}
 								if (apiMatch) {
@@ -2495,14 +2674,17 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									flushRequestHeaders();
 									if (pipelineResult.middlewareStatus !== void 0) req.__vinextMiddlewareStatus = pipelineResult.middlewareStatus;
 								}
-								if (await handleApiRoute(getPagesRunner(), req, res, pipelineResult.apiUrl, apiRoutes, {
+								if (await handleApiRoute(getPagesRunner(), req, res, pipelineResult.apiUrl, devApiRoutes, {
 									basePath: nextConfig?.basePath,
 									i18n: nextConfig?.i18n,
 									trustedRevalidateOrigin: getTrustedDevRevalidateOrigin(),
 									allowedRevalidateHeaderKeys: nextConfig?.allowedRevalidateHeaderKeys,
 									trailingSlash: nextConfig?.trailingSlash
 								})) return;
-								if (hasAppDir) return next();
+								if (hasAppDir) {
+									if (pipelineResult.configRewriteFired) forwardInternalApiRewriteToApp(pipelineResult.apiUrl);
+									return next();
+								}
 								res.statusCode = 404;
 								res.end("404 - API route not found");
 								return;
@@ -2518,7 +2700,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								}
 								if (!cachedSSRHandler || cachedSSRHandler.routes !== routes) cachedSSRHandler = {
 									routes,
-									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots, nextConfig?.reactStrictMode === true, nextConfig?.expireTime)
+									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots, nextConfig?.reactStrictMode === true, nextConfig?.expireTime, nextConfig?.crossOrigin)
 								};
 								flushStagedHeaders();
 								flushRequestHeaders();