vinext 1.0.0-beta.1 → 1.0.0-beta.2

package/dist/entries/app-rsc-entry.js

@@ -401,6 +401,10 @@ function matchRoute(url) {
   return __routeMatcher.matchRoute(url);
 }
 
+function matchRequestRoute(url) {
+  return __routeMatcher.matchRequestRoute(url);
+}
+
 /**
  * Check if a pathname matches any intercepting route.
  * Returns the match info or null.
@@ -523,6 +527,7 @@ export default createAppRscHandler({
     actionFailed,
     handlerStart,
     interceptionContext,
+    interceptionPathname,
     isProgressiveActionRender,
     isRscRequest,
     middlewareContext,
@@ -589,6 +594,7 @@ export default createAppRscHandler({
           observeMetadataSearchParamsAccess: buildOptions?.observeMetadataSearchParamsAccess === true,
           observePageSearchParamsAccess: buildOptions?.observePageSearchParamsAccess === true,
           serveStreamingMetadata: buildOptions?.serveStreamingMetadata,
+          isProduction: process.env.NODE_ENV === "production",
         }, layoutParamAccess, displayPathname);
       },
       clientReuseManifest,
@@ -608,7 +614,10 @@ export default createAppRscHandler({
       fetchCache: __segmentConfig.fetchCache ?? null,
       isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime),
       findIntercept(pathname) {
-        return findIntercept(pathname, interceptionContext);
+        return findIntercept(
+          pathname === cleanPathname ? interceptionPathname : pathname,
+          interceptionContext,
+        );
       },
       generateStaticParams: __generateStaticParams,
       getFontLinks: _getSSRFontLinks,
@@ -660,7 +669,7 @@ export default createAppRscHandler({
         });
       },
       async probePage(probeSearchParams = searchParams) {
-        const __probeIntercept = findIntercept(cleanPathname, interceptionContext);
+        const __probeIntercept = findIntercept(interceptionPathname, interceptionContext);
         // The intercepting-route page module is lazy (page: null + __pageLoader).
         // Resolve it before probing so buildAppPageProbes inspects the real page
         // component for dynamic bailout — matching the render path, which also
@@ -682,7 +691,7 @@ export default createAppRscHandler({
         }));
       },
       renderErrorBoundaryPage(renderErr, errorOrigin) {
-        const __activeIntercept = findIntercept(cleanPathname, interceptionContext);
+        const __activeIntercept = findIntercept(interceptionPathname, interceptionContext);
         return __fallbackRenderer.renderErrorBoundary(route, renderErr, isRscRequest, request, params, scriptNonce, middlewareContext, {
           isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime),
           sourcePageSegments: __activeIntercept?.slotKey === __SIBLING_PAGE_INTERCEPT_SLOT_KEY
@@ -691,9 +700,10 @@ export default createAppRscHandler({
         }, errorOrigin);
       },
       renderHttpAccessFallbackPage(statusCode, opts, currentMiddlewareContext) {
-        const __activeIntercept = findIntercept(cleanPathname, interceptionContext);
+        const __activeIntercept = findIntercept(interceptionPathname, interceptionContext);
         return __fallbackRenderer.renderHttpAccessFallback(route, statusCode, isRscRequest, request, opts, scriptNonce, currentMiddlewareContext, {
           isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime),
+          routePathname: cleanPathname,
           sourcePageSegments: __activeIntercept?.slotKey === __SIBLING_PAGE_INTERCEPT_SLOT_KEY
             ? __activeIntercept.sourcePageSegments
             : null,
@@ -772,6 +782,7 @@ export default createAppRscHandler({
     contentType,
     middlewareContext,
     request,
+    routeMatch,
   }) {
     const {
       handleProgressiveServerActionRequest: __handleProgressiveServerActionRequest,
@@ -792,11 +803,10 @@ export default createAppRscHandler({
       contentType,
       actionId,
     );
-    const __progressiveActionMatch = __isProgressiveAction ? matchRoute(cleanPathname) : null;
     const __hasPageRoute = Boolean(
-      __progressiveActionMatch &&
-        __progressiveActionMatch.route.__loadPage &&
-        !__progressiveActionMatch.route.__loadRouteHandler,
+      __isProgressiveAction &&
+        routeMatch?.route.__loadPage &&
+        !routeMatch.route.__loadRouteHandler,
     );
     return __handleProgressiveServerActionRequest({
       actionId,
@@ -829,6 +839,8 @@ export default createAppRscHandler({
     middlewareContext,
     mountedSlotsHeader,
     request,
+    routeMatch,
+    routePathname,
     searchParams,
   }) {
     const {
@@ -836,7 +848,7 @@ export default createAppRscHandler({
       readActionBodyWithLimit: __readBodyWithLimit,
       readActionFormDataWithLimit: __readFormDataWithLimit,
     } = await __loadAppServerActionExecution();
-    const __actionMatch = matchRoute(cleanPathname);
+    const __actionMatch = routeMatch;
     if (__actionMatch) await __ensureRouteLoaded(__actionMatch.route);
     const __actionIsEdgeRuntime = __actionMatch
       ? __isEdgeRuntime(__resolveRouteRuntime(__actionMatch.route))
@@ -876,6 +888,8 @@ export default createAppRscHandler({
         __clearRequestContext();
       },
       contentType,
+      currentRouteMatch: __actionMatch,
+      currentRoutePathname: routePathname,
       createNotFoundElement(actionRouteId) {
         return {
           ...__AppElementsWire.createMetadataEntries({
@@ -940,6 +954,9 @@ export default createAppRscHandler({
           interceptLayouts: intercept.interceptLayouts,
           interceptLayoutSegments: intercept.interceptLayoutSegments,
           interceptBranchSegments: intercept.interceptBranchSegments,
+          interceptNotFoundBranchSegments: intercept.interceptNotFoundBranchSegments,
+          interceptNotFound: intercept.notFound,
+          interceptNotFoundTreePosition: intercept.notFoundTreePosition,
           interceptSlotId: intercept.slotId,
           interceptSlotKey: intercept.slotKey,
           interceptSourceMatchedUrl: interceptionContext,
@@ -963,6 +980,7 @@ export default createAppRscHandler({
     });
   },` : ""}
   matchRoute,
+  matchRequestRoute,
   ${middlewarePath ? `runMiddleware({ cleanPathname, context, hadBasePath, isDataRequest, request }) {
     return __applyAppMiddleware({
       basePath: __basePath,

package/dist/entries/app-rsc-manifest.js

@@ -77,13 +77,16 @@ function registerRouteModules(routes, imports) {
 			for (const layoutPath of slot.configLayoutPaths ?? []) imports.getLazyLoaderVar(layoutPath);
 			if (slot.loadingPath) imports.getLazyLoaderVar(slot.loadingPath);
 			if (slot.errorPath) imports.getLazyLoaderVar(slot.errorPath);
+			if (slot.notFoundPath) imports.getLazyLoaderVar(slot.notFoundPath);
 			for (const ir of slot.interceptingRoutes) {
 				imports.getLazyLoaderVar(ir.pagePath);
+				if (ir.notFoundPath) imports.getLazyLoaderVar(ir.notFoundPath);
 				for (const layoutPath of ir.layoutPaths) imports.getLazyLoaderVar(layoutPath);
 			}
 		}
 		for (const ir of route.siblingIntercepts ?? []) {
 			imports.getLazyLoaderVar(ir.pagePath);
+			if (ir.notFoundPath) imports.getLazyLoaderVar(ir.notFoundPath);
 			for (const layoutPath of ir.layoutPaths) imports.getLazyLoaderVar(layoutPath);
 		}
 	}
@@ -115,8 +118,12 @@ function buildRouteEntries(routes, imports) {
       __loadInterceptLayouts: ${lazyLoaderArray(ir.layoutPaths, imports)},
       interceptLayoutSegments: ${JSON.stringify(ir.layoutSegments ?? [])},
       interceptBranchSegments: ${JSON.stringify(ir.branchSegments ?? [])},
+      interceptNotFoundBranchSegments: ${JSON.stringify(ir.notFoundBranchSegments ?? ir.branchSegments ?? [])},
       page: null,
       __pageLoader: ${imports.getLazyLoaderVar(ir.pagePath)},
+      notFound: null,
+      __loadNotFound: ${ir.notFoundPath ? imports.getLazyLoaderVar(ir.notFoundPath) : "null"},
+      notFoundTreePosition: ${ir.notFoundTreePosition ?? "null"},
       params: ${JSON.stringify(ir.params)},
     }`);
 		const slotEntries = route.parallelSlots.map((slot) => {
@@ -129,8 +136,12 @@ function buildRouteEntries(routes, imports) {
           __loadInterceptLayouts: ${lazyLoaderArray(ir.layoutPaths, imports)},
           interceptLayoutSegments: ${JSON.stringify(ir.layoutSegments ?? [])},
           interceptBranchSegments: ${JSON.stringify(ir.branchSegments ?? [])},
+          interceptNotFoundBranchSegments: ${JSON.stringify(ir.notFoundBranchSegments ?? ir.branchSegments ?? [])},
           page: null,
           __pageLoader: ${imports.getLazyLoaderVar(ir.pagePath)},
+          notFound: null,
+          __loadNotFound: ${ir.notFoundPath ? imports.getLazyLoaderVar(ir.notFoundPath) : "null"},
+          notFoundTreePosition: ${ir.notFoundTreePosition ?? "null"},
           params: ${JSON.stringify(ir.params)},
         }`);
 			return `      ${JSON.stringify(slot.key)}: {
@@ -149,6 +160,9 @@ function buildRouteEntries(routes, imports) {
         __loadLoading: ${slot.loadingPath ? imports.getLazyLoaderVar(slot.loadingPath) : "null"},
         error: null,
         __loadError: ${slot.errorPath ? imports.getLazyLoaderVar(slot.errorPath) : "null"},
+        notFound: null,
+        __loadNotFound: ${slot.notFoundPath ? imports.getLazyLoaderVar(slot.notFoundPath) : "null"},
+        notFoundTreePosition: ${slot.notFoundTreePosition ?? "null"},
         layoutIndex: ${slot.layoutIndex},
         routeSegments: ${JSON.stringify(slot.routeSegments)},
         slotPatternParts: ${slot.slotPatternParts ? JSON.stringify(slot.slotPatternParts) : "null"},
@@ -204,14 +218,17 @@ ${siblingInterceptEntries.join(",\n")}
     __loadError: ${route.errorPath ? imports.getLazyLoaderVar(route.errorPath) : "null"},
     notFound: null,
     __loadNotFound: ${route.notFoundPath ? imports.getLazyLoaderVar(route.notFoundPath) : "null"},
+    notFoundTreePosition: ${route.notFoundTreePosition ?? "null"},
     notFounds: ${moduleArray(notFoundPaths.length)},
     __loadNotFounds: ${notFoundLoaders},
     forbidden: null,
     __loadForbidden: ${route.forbiddenPath ? imports.getLazyLoaderVar(route.forbiddenPath) : "null"},
+    forbiddenTreePosition: ${route.forbiddenTreePosition ?? "null"},
     forbiddens: ${moduleArray(forbiddenPaths.length)},
     __loadForbiddens: ${forbiddenLoaders},
     unauthorized: null,
     __loadUnauthorized: ${route.unauthorizedPath ? imports.getLazyLoaderVar(route.unauthorizedPath) : "null"},
+    unauthorizedTreePosition: ${route.unauthorizedTreePosition ?? "null"},
     unauthorizeds: ${moduleArray(unauthorizedPaths.length)},
     __loadUnauthorizeds: ${unauthorizedLoaders},
   }`;

package/dist/entries/pages-server-entry.js

@@ -236,8 +236,8 @@ const _apiRouteTrie = _buildRouteTrie(apiRoutes);
 function matchRoute(url, routes) {
   const pathname = url.split("?")[0];
   let normalizedUrl = pathname === "/" ? "/" : pathname.replace(/\\/$/, "");
-  // NOTE: Do NOT decodeURIComponent here. The pathname is already decoded at
-  // the entry point. Decoding again would create a double-decode vector.
+  // Static route selection uses raw encoded identity (/%61bout must not
+  // select /about). _trieMatch decodes dynamic captures exactly once.
   const urlParts = normalizedUrl.split("/").filter(Boolean);
   const trie = routes === pageRoutes ? _pageRouteTrie : _apiRouteTrie;
   return _trieMatch(trie, urlParts);
@@ -307,6 +307,7 @@ const _renderPage = __createPagesPageHandler({
       : null,
   setI18nContext: typeof setI18nContext === "function" ? setI18nContext : null,
   wrapWithRouterContext: typeof wrapWithRouterContext === "function" ? wrapWithRouterContext : null,
+  router: Router,
   resetSSRHead: typeof resetSSRHead === "function" ? resetSSRHead : undefined,
   getSSRHeadHTML: typeof getSSRHeadHTML === "function" ? getSSRHeadHTML : undefined,
   setDocumentInitialHead: typeof setDocumentInitialHead === "function" ? setDocumentInitialHead : undefined,

package/dist/index.js

@@ -2,15 +2,17 @@ import path, { toSlash } from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/
 import { detectPackageManager, formatMissingCloudflarePluginError, hasWranglerConfig } from "./utils/project.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
+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 { 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 { isOpenRedirectShaped } from "./server/open-redirect.js";
-import { filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
+import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
-import { extractMiddlewareMatcherConfig, hasExportedName } from "./build/report.js";
+import { extractMiddlewareMatcherConfig, extractMiddlewareMatcherConfigValue, hasExportedName } from "./build/report.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
@@ -18,7 +20,7 @@ import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentat
 import { isUnknownRecord } from "./utils/record.js";
 import { logRequest, now } from "./server/request-log.js";
 import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
-import { isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname } from "./server/pages-data-route.js";
+import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, 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";
@@ -68,6 +70,7 @@ import { createOgAssetsPlugin, createOgInlineFetchAssetsPlugin } from "./plugins
 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";
+import public_shim_map_default from "./shims/public-shim-map.json.js";
 import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
 import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
 import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, setPagesClientAssetsBuildMetadata, takePagesClientAssetsBuildMetadata, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
@@ -667,27 +670,14 @@ function generateRootParamsModule(rootParamNames) {
 	const exports = names.map((name) => `export function ${name}() { return getRootParam(${JSON.stringify(name)}); }`).join("\n");
 	return `import { getRootParam } from ${JSON.stringify(rootParamsShimPath)};\n${exports}\n`;
 }
-/**
-* Shims with a `.react-server.ts` variant for the RSC environment.
-* Maps import specifier → base shim name. In the RSC env, resolveId
-* appends `.react-server`; in other envs it resolves to the base.
-*
-* These MUST NOT appear in `nextShimMap` (resolve.alias) because Vite's
-* alias plugin runs before user `enforce:"pre"` plugins — aliases are
-* unoverridable. Keeping them out of the alias lets the resolveId hook
-* control resolution per-environment.
-*
-* To add a new react-server shim:
-*   1. Create `<name>.react-server.ts` in src/shims/
-*   2. Add entries here for each import specifier.
-*/
-const _reactServerShims = /* @__PURE__ */ new Map([
-	["next/navigation", "navigation"],
-	["next/navigation.js", "navigation"],
-	["next/dist/client/components/navigation", "navigation"],
-	["next/error", "error"],
-	["next/error.js", "error"]
-]);
+const _publicNextShimMap = public_shim_map_default;
+const _reactServerShims = /* @__PURE__ */ new Map();
+for (const [specifier, definition] of Object.entries(_publicNextShimMap)) {
+	if (!definition.reactServer) continue;
+	_reactServerShims.set(specifier, definition.shim);
+	_reactServerShims.set(`${specifier}.js`, definition.shim);
+}
+_reactServerShims.set("next/dist/client/components/navigation", "navigation");
 const clientCodeSplittingConfig = createClientCodeSplittingConfig(createClientManualChunks(_shimsDir));
 const appClientCodeSplittingConfig = createClientCodeSplittingConfig(createClientManualChunks(_shimsDir, true));
 function getClientOutputConfig(assetsDir, preserveAppRouteBoundaries = false) {
@@ -774,10 +764,9 @@ function vinext(options = {}) {
 		});
 	}
 	async function writeRouteTypes() {
-		if (!hasAppDir) return;
 		await generateRouteTypes({
 			root,
-			appDir,
+			appDir: hasAppDir ? appDir : null,
 			pageExtensions: nextConfig.pageExtensions
 		});
 	}
@@ -989,7 +978,7 @@ function vinext(options = {}) {
 				if (mode === "test") resolvedNodeEnv = "test";
 				else if (env?.command === "build" || env?.isPreview === true) resolvedNodeEnv = "production";
 				else resolvedNodeEnv = "development";
-				if (process.env.NODE_ENV !== resolvedNodeEnv) process.env.NODE_ENV = resolvedNodeEnv;
+				if (process.env.NODE_ENV !== resolvedNodeEnv) Reflect.set(process.env, "NODE_ENV", resolvedNodeEnv);
 				if (env?.command === "build") previewBuildCredentials = getPreviewBuildCredentials() ?? createPreviewBuildCredentials();
 				draftModeSecret = previewBuildCredentials?.id ?? getPagesPreviewModeId();
 				let baseDir;
@@ -1008,6 +997,8 @@ function vinext(options = {}) {
 				appDir = path.join(baseDir, "app");
 				hasPagesDir = fs.existsSync(pagesDir);
 				hasAppDir = !options.disableAppRouter && fs.existsSync(appDir);
+				invalidateRouteCache(pagesDir);
+				invalidateAppRouteCache();
 				if (!nextConfig) {
 					const phase = env?.command === "build" ? PHASE_PRODUCTION_BUILD : PHASE_DEVELOPMENT_SERVER;
 					let rawConfig;
@@ -1036,6 +1027,10 @@ function vinext(options = {}) {
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
 				const middlewareConventionDir = canonicalize(baseDir) === canonicalize(path.join(root, "src")) ? path.join(root, "src") : root;
 				middlewarePath = findMiddlewareFile(root, fileMatcher, middlewareConventionDir);
+				if (middlewarePath) {
+					const staticMatcher = extractMiddlewareMatcherConfigValue(middlewarePath);
+					if (staticMatcher !== void 0) validateMiddlewareMatcherPatterns(staticMatcher);
+				}
 				const instrumentationClientInjects = nextConfig.instrumentationClientInject.map((spec) => spec.startsWith("./") || spec.startsWith("../") ? path.resolve(root, spec) : spec);
 				clientInjectModule = instrumentationClientInjects.length ? generateInstrumentationClientInjectModule(instrumentationClientInjects, instrumentationClientPath, INSTRUMENTATION_CLIENT_EMPTY_MODULE) : null;
 				if (env?.command === "build") await writeRouteTypes();
@@ -1050,6 +1045,10 @@ function vinext(options = {}) {
 				}
 				defines["process.env.__NEXT_ROUTER_BASEPATH"] = JSON.stringify(nextConfig.basePath);
 				defines["process.env.__VINEXT_HAS_PAGES_ROUTER"] = JSON.stringify(String(hasPagesDir));
+				defines["process.env.__VINEXT_HAS_CLIENT_REWRITES"] = JSON.stringify(String(nextConfig.rewrites.beforeFiles.length > 0 || nextConfig.rewrites.afterFiles.length > 0 || nextConfig.rewrites.fallback.length > 0));
+				defines["process.env.__VINEXT_HAS_CONFIG_HEADERS"] = JSON.stringify(String(nextConfig.headers.length > 0));
+				defines["process.env.__VINEXT_HAS_CONFIG_REDIRECTS"] = JSON.stringify(String(nextConfig.redirects.length > 0));
+				defines["process.env.__VINEXT_HAS_CONFIG_REWRITES"] = JSON.stringify(String(nextConfig.rewrites.beforeFiles.length > 0 || nextConfig.rewrites.afterFiles.length > 0 || nextConfig.rewrites.fallback.length > 0));
 				defines["process.env.__NEXT_CLIENT_ROUTER_DYNAMIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.dynamic));
 				defines["process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.static));
 				defines["process.env.__VINEXT_PREFETCH_INLINING"] = JSON.stringify(nextConfig.prefetchInlining ? "true" : "false");
@@ -1101,28 +1100,7 @@ function vinext(options = {}) {
 				}
 				for (const key of Object.keys(nextConfig.compilerDefineServer)) if (key in defines) throw new Error(`The \`compiler.defineServer\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 				nextShimMap = Object.fromEntries(Object.entries({
-					"next/link": path.join(shimsDir, "link"),
-					"next/head": path.join(shimsDir, "head"),
-					"next/router": path.join(shimsDir, "router"),
-					"next/compat/router": path.join(shimsDir, "compat-router"),
-					"next/image": path.join(shimsDir, "image"),
-					"next/legacy/image": path.join(shimsDir, "legacy-image"),
-					"next/dynamic": path.join(shimsDir, "dynamic"),
-					"next/app": path.join(shimsDir, "app"),
-					"next/document": path.join(shimsDir, "document"),
-					"next/config": path.join(shimsDir, "config"),
-					"next/script": path.join(shimsDir, "script"),
-					"next/server": path.join(shimsDir, "server"),
-					"next/headers": path.join(shimsDir, "headers"),
-					"next/font/google": path.join(shimsDir, "font-google"),
-					"next/font/local": path.join(shimsDir, "font-local"),
-					"next/cache": path.join(shimsDir, "cache"),
-					"next/form": path.join(shimsDir, "form"),
-					"next/og": path.join(shimsDir, "og"),
-					"next/web-vitals": path.join(shimsDir, "web-vitals"),
-					"next/amp": path.join(shimsDir, "amp"),
-					"next/offline": path.join(shimsDir, "offline"),
-					"next/constants": path.join(shimsDir, "constants"),
+					...Object.fromEntries(Object.entries(_publicNextShimMap).filter(([, definition]) => !definition.reactServer).map(([specifier, definition]) => [specifier, path.join(shimsDir, definition.shim)])),
 					"next/dist/shared/lib/app-router-context.shared-runtime": path.join(shimsDir, "internal", "app-router-context"),
 					"next/dist/shared/lib/app-router-context": path.join(shimsDir, "internal", "app-router-context"),
 					"next/dist/shared/lib/router-context.shared-runtime": path.join(shimsDir, "internal", "router-context"),
@@ -1460,7 +1438,7 @@ function vinext(options = {}) {
 					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], VINEXT_OPTIMIZE_DEPS_EXCLUDE, PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE);
 				}
 				const configuredExtensions = name === "client" ? nextConfig.resolveExtensions : nextConfig.serverResolveExtensions;
-				const extensions = configuredExtensions === null ? buildViteResolveExtensions(nextConfig.pageExtensions, config.resolve?.extensions) : normalizeViteResolveExtensions(configuredExtensions);
+				const extensions = configuredExtensions === null ? buildViteResolveExtensions(config.resolve?.extensions) : normalizeViteResolveExtensions(configuredExtensions);
 				config.resolve ??= {};
 				config.resolve.extensions = extensions;
 				return null;
@@ -1856,6 +1834,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			},
 			configureServer(server) {
+				server.middlewares.use((req, _res, next) => {
+					req.__vinextOriginalEncodedUrl ??= req.url;
+					next();
+				});
 				const pageExtensions = fileMatcher.extensionRegex;
 				let pagesRunner = null;
 				let cachedSSRHandler = null;
@@ -2193,9 +2175,25 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								res.end();
 								return;
 							}
+							const originalEncodedUrl = req.__vinextOriginalEncodedUrl ?? url;
+							const originalEncodedPathname = originalEncodedUrl.split("?")[0];
+							if (isOpenRedirectShaped(originalEncodedPathname)) {
+								res.writeHead(404);
+								res.end("This page could not be found");
+								return;
+							}
+							const canonicalOriginalUrl = canonicalizeRequestUrlPathname(originalEncodedUrl);
+							url = canonicalizeRequestUrlPathname(url);
 							const rawPathname = url.split("?")[0];
 							if (rawPathname.endsWith("/index.html")) url = url.replace("/index.html", "/");
 							else if (rawPathname.endsWith(".html")) url = url.replace(/\.html(?=\?|$)/, "");
+							let middlewareUrl = canonicalOriginalUrl;
+							let routeUrl = middlewareUrl;
+							{
+								const routePathname = routeUrl.split("?")[0];
+								if (routePathname.endsWith("/index.html")) routeUrl = routeUrl.replace("/index.html", "/");
+								else if (routePathname.endsWith(".html")) routeUrl = routeUrl.replace(/\.html(?=\?|$)/, "");
+							}
 							let pathname = url.split("?")[0];
 							if (isOpenRedirectShaped(pathname)) {
 								res.writeHead(404);
@@ -2210,20 +2208,42 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								res.end("Bad Request");
 								return;
 							}
+							if (urlParserCreatesPagesDataPath(pathname)) {
+								res.writeHead(404);
+								res.end("This page could not be found");
+								return;
+							}
+							pathname = encodeUrlParserIgnoredCharacters(pathname);
 							{
 								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
 								url = pathname + qs;
 							}
 							const capturedMiddlewarePath = middlewarePath;
 							const bp = nextConfig?.basePath ?? "";
-							if (bp && pathname.startsWith(bp)) {
-								const stripped = pathname.slice(bp.length) || "/";
-								url = stripped + (url.includes("?") ? url.slice(url.indexOf("?")) : "");
-								pathname = stripped;
+							const viteBase = server.config.base;
+							const viteBasePath = viteBase.startsWith("/") && viteBase !== "/" ? viteBase.replace(/\/+$/, "") : "";
+							const routingBasePath = bp || viteBasePath;
+							if (routingBasePath) {
+								if (hasBasePath(pathname, routingBasePath)) {
+									const stripped = stripBasePath(pathname, routingBasePath);
+									url = stripped + (url.includes("?") ? url.slice(url.indexOf("?")) : "");
+									pathname = stripped;
+								}
+								const middlewarePathname = middlewareUrl.split("?")[0];
+								if (hasBasePath(middlewarePathname, routingBasePath)) {
+									const middlewareQs = middlewareUrl.includes("?") ? middlewareUrl.slice(middlewareUrl.indexOf("?")) : "";
+									middlewareUrl = stripBasePath(middlewarePathname, routingBasePath) + middlewareQs;
+								}
+								const routePathname = routeUrl.split("?")[0];
+								if (hasBasePath(routePathname, routingBasePath)) {
+									const routeQs = routeUrl.includes("?") ? routeUrl.slice(routeUrl.indexOf("?")) : "";
+									routeUrl = stripBasePath(routePathname, routingBasePath) + routeQs;
+								}
 							}
+							let configMatchPathname = stripBasePath(middlewareUrl.split("?")[0], routingBasePath);
 							if (nextConfig) {
 								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-								const trailingSlashRedirect = normalizeTrailingSlash(pathname, bp, nextConfig.trailingSlash, qs);
+								const trailingSlashRedirect = normalizeTrailingSlash(routeUrl.split("?")[0], bp, nextConfig.trailingSlash, qs);
 								if (trailingSlashRedirect) {
 									const location = trailingSlashRedirect.headers.get("Location");
 									res.writeHead(trailingSlashRedirect.status, location ? { Location: location } : void 0);
@@ -2241,7 +2261,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
 									const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, capturedMiddlewarePath !== null && nextConfig?.trailingSlash === true);
 									url = pagePathname + qs;
+									middlewareUrl = url;
+									routeUrl = url;
 									pathname = pagePathname;
+									configMatchPathname = pagePathname;
 									req.url = url;
 								} else {
 									const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -2276,7 +2299,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							for (const header of INTERNAL_HEADERS) delete req.headers[header];
 							for (const header of VINEXT_INTERNAL_HEADERS) delete req.headers[header];
 							const method = req.method ?? "GET";
-							const webRequest = new Request(new URL(url, requestOrigin), {
+							const webRequest = new Request(new URL(routeUrl, requestOrigin), {
 								method,
 								headers: nodeRequestHeaders
 							});
@@ -2287,11 +2310,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const devRunMiddlewareAdapter = capturedMiddlewarePath ? async (_request, _ctx, opts) => {
 								const rawProto = process.env.VINEXT_TRUST_PROXY === "1" || (process.env.VINEXT_TRUSTED_HOSTS ?? "").split(",").some((h) => h.trim()) ? String(req.headers["x-forwarded-proto"] || "").split(",")[0].trim() : "";
 								const mwOrigin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${requestHost}`;
-								const middlewareRequest = new Request(new URL(url, mwOrigin), {
+								const middlewareRequest = new Request(new URL(middlewareUrl, mwOrigin), {
 									method: req.method,
 									headers: nodeRequestHeaders
 								});
-								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest);
+								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname);
 								if (hasAppDir && result.continue) {
 									const mwCtxEntries = [];
 									if (result.responseHeaders) {
@@ -2335,6 +2358,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								isDataRequest,
 								hasMiddleware: capturedMiddlewarePath !== null,
 								rawSearch: url.includes("?") ? url.slice(url.indexOf("?")) : "",
+								configMatchPathname,
 								runMiddleware: devRunMiddlewareAdapter,
 								matchPageRoute: (resolvedPathname, request) => {
 									const m = matchRoute(nextConfig?.i18n ? resolvePagesI18nRequest(resolvedPathname, nextConfig.i18n, request.headers, getUrlHostname(request.url), bp, nextConfig.trailingSlash ?? false).url : resolvedPathname, devPageRoutes);

package/dist/init.d.ts

@@ -3,14 +3,15 @@ import { getReactUpgradeDeps } from "./utils/react-version.js";
 
 //#region src/init.d.ts
 type InitOptions = {
-  /** Project root directory */root: string; /** Dev server port (default: 3001) */
-  port?: number; /** Skip the compatibility check step */
+  /** Project root directory */root: string; /** Dev server port (default: 3001), or false to omit the port flag. */
+  port?: number | false; /** Skip the compatibility check step */
   skipCheck?: boolean; /** Force overwrite even if vite.config.ts exists */
   force?: boolean; /** Deployment target selected by the user */
   platform?: InitPlatform; /** Configure build-time pre-rendering for all discovered static routes */
   prerender?: boolean; /** Cloudflare cache and image choices. */
   cloudflare?: CloudflareInitOptions; /** Install missing dependencies with the detected package manager (default: true). */
-  install?: boolean; /** @internal — override exec for testing (avoids ESM spy issues) */
+  install?: boolean; /** Script naming style (default: namespaced, e.g. dev:vinext). */
+  scriptNames?: "namespaced" | "standard"; /** @internal — override exec for testing (avoids ESM spy issues) */
   _exec?: (cmd: string, opts: {
     cwd: string;
     stdio: string;
@@ -34,8 +35,9 @@ declare function generateViteConfig(_isAppRouter: boolean, prerender?: boolean):
  * Add vinext scripts to package.json without overwriting existing scripts.
  * Returns the list of script names that were added.
  */
-declare function addScripts(root: string, port: number, platform?: InitPlatform, options?: {
+declare function addScripts(root: string, port: number | false, platform?: InitPlatform, options?: {
   warmCdnCache?: boolean;
+  scriptNames?: "namespaced" | "standard";
 }): string[];
 type InitDependencyGroups = {
   dependencies: string[];

package/dist/init.js

@@ -78,22 +78,16 @@ function addScripts(root, port, platform = "node", options = {}) {
 		const pkg = JSON.parse(raw);
 		if (!pkg.scripts) pkg.scripts = {};
 		const added = [];
-		if (!pkg.scripts["dev:vinext"]) {
-			pkg.scripts["dev:vinext"] = `vinext dev --port ${port}`;
-			added.push("dev:vinext");
-		}
-		if (!pkg.scripts["build:vinext"]) {
-			pkg.scripts["build:vinext"] = "vinext build";
-			added.push("build:vinext");
-		}
-		if (!pkg.scripts["start:vinext"]) {
-			pkg.scripts["start:vinext"] = platform === "cloudflare" ? "wrangler dev --config dist/server/wrangler.json" : "vinext start";
-			added.push("start:vinext");
-		}
-		if (platform === "cloudflare" && !pkg.scripts["deploy:vinext"]) {
-			pkg.scripts["deploy:vinext"] = options.warmCdnCache ? "vinext-cloudflare deploy --config dist/server/wrangler.json --experimental-warm-cdn-cache" : "vinext-cloudflare deploy --config dist/server/wrangler.json";
-			added.push("deploy:vinext");
-		}
+		const addScript = (name, command) => {
+			const scriptName = options.scriptNames === "standard" ? name : `${name}:vinext`;
+			if (pkg.scripts[scriptName]) return;
+			pkg.scripts[scriptName] = command;
+			added.push(scriptName);
+		};
+		addScript("dev", port === false ? "vinext dev" : `vinext dev --port ${port}`);
+		addScript("build", "vinext build");
+		addScript("start", platform === "cloudflare" ? "wrangler dev --config dist/server/wrangler.json" : "vinext start");
+		if (platform === "cloudflare") addScript("deploy", options.warmCdnCache ? "vinext-cloudflare deploy --config dist/server/wrangler.json --experimental-warm-cdn-cache" : "vinext-cloudflare deploy --config dist/server/wrangler.json");
 		if (added.length > 0) fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf-8");
 		return added;
 	} catch {
@@ -342,7 +336,10 @@ async function init(options) {
 		existingViteConfigPath = renamedPath;
 	}
 	const addedTypeModule = ensureESModule(root);
-	const addedScripts = addScripts(root, port, platform, { warmCdnCache: options.cloudflare?.warmCdnCache ?? false });
+	const addedScripts = addScripts(root, port, platform, {
+		warmCdnCache: options.cloudflare?.warmCdnCache ?? false,
+		scriptNames: options.scriptNames
+	});
 	const setupContext = {
 		root,
 		isAppRouter: isApp,
@@ -436,15 +433,16 @@ async function init(options) {
 	if (updatedGitignore) console.log(`    ${terminalStyle.green("✓")} Added vinext output directories to .gitignore`);
 	const nextSteps = [...platformSetup.nextSteps];
 	if (dependencyInstallNeedsApproval) nextSteps.push("Dependency installation is incomplete because pnpm blocked dependency build scripts:", "1. Review and approve the required build scripts:", "   pnpm approve-builds", "2. Finish installing dependencies:", "   pnpm install");
-	const deployCommandStep = platform === "cloudflare" ? `    ${pmName} run deploy:vinext Deploy to Cloudflare Workers\n` : "";
+	const scriptName = (name) => options.scriptNames === "standard" ? name : `${name}:vinext`;
+	const deployCommandStep = platform === "cloudflare" ? `    ${pmName} run ${scriptName("deploy")} Deploy to Cloudflare Workers\n` : "";
 	const startCommandDescription = platform === "cloudflare" ? "Start the built Worker locally with Wrangler" : "Start vinext production server";
 	console.log(`
   ${terminalStyle.cyan(terminalStyle.bold("Next steps:"))}
 ${nextSteps.map((step) => `    ${step}`).join("\n")}${nextSteps.length > 0 ? "\n" : ""}
-    ${pmName} run dev:vinext    Start the vinext dev server
-    ${pmName} run build:vinext  Build production output
-    ${pmName} run start:vinext  ${startCommandDescription}
-${deployCommandStep}    ${pmName} run dev           Start Next.js (still works as before)
+    ${pmName} run ${scriptName("dev")}    Start the vinext dev server
+    ${pmName} run ${scriptName("build")}  Build production output
+    ${pmName} run ${scriptName("start")}  ${startCommandDescription}
+${deployCommandStep}${options.scriptNames === "standard" ? "" : `    ${pmName} run dev           Start Next.js (still works as before)\n`}
 `);
 	return {
 		installedDeps: [.../* @__PURE__ */ new Set([...dependencyEntriesAdded, ...devDependencyEntriesAdded])],

package/dist/plugins/og-assets.js

@@ -109,7 +109,7 @@ const OG_WASM_ASSETS = ["resvg.wasm", "yoga.wasm"];
 */
 function findEmittedWasmAsset(bundle, baseName) {
 	const stem = baseName.replace(/\.wasm$/, "");
-	const re = new RegExp(`^${stem}(?:-[\\w-]+)?\\.wasm$`);
+	const re = new RegExp(`^${stem}(?:[-.][\\w-]+)?\\.wasm$`);
 	for (const output of Object.values(bundle)) {
 		if (output.type !== "asset") continue;
 		if (re.test(path.basename(output.fileName))) return output.fileName;