vinext 1.0.0-beta.6 → 1.0.0-beta.7

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

@@ -1,9 +1,11 @@
 import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { resolveEntryPath } from "./runtime-entry-module.js";
 import { isProxyFile } from "../server/middleware.js";
+import { safeJsonStringify } from "../server/html.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES } from "../server/image-optimization.js";
 import { buildAppRscManifestCode } from "./app-rsc-manifest.js";
 import { generateDevOriginCheckCode } from "../server/dev-origin-check.js";
+import { ACTION_OWNER_MANIFEST_ID } from "../plugins/action-owner-manifest.js";
 import { randomUUID } from "node:crypto";
 //#region src/entries/app-rsc-entry.ts
 /**
@@ -22,9 +24,10 @@ const normalizePathModulePath = resolveEntryPath("../server/normalize-path.js",
 const appRouteHandlerDispatchPath = resolveEntryPath("../server/app-route-handler-dispatch.js", import.meta.url);
 const appRouteRequestBuiltInsPath = resolveEntryPath("../server/app-route-request-built-ins.js", import.meta.url);
 const appRouteHandlerResponsePath = resolveEntryPath("../server/app-route-handler-response.js", import.meta.url);
+const appServerActionExecutionPath = resolveEntryPath("../server/app-server-action-execution.js", import.meta.url);
+const appActionForwardingPath = resolveEntryPath("../server/app-action-forwarding.js", import.meta.url);
 const appMiddlewarePath = resolveEntryPath("../server/app-middleware.js", import.meta.url);
 const metadataRouteResponsePath = resolveEntryPath("../server/metadata-route-response.js", import.meta.url);
-const appServerActionExecutionPath = resolveEntryPath("../server/app-server-action-execution.js", import.meta.url);
 const appRscErrorsPath = resolveEntryPath("../server/app-rsc-errors.js", import.meta.url);
 const appPageExecutionPath = resolveEntryPath("../server/app-page-execution.js", import.meta.url);
 const appFallbackRendererPath = resolveEntryPath("../server/app-fallback-renderer.js", import.meta.url);
@@ -81,6 +84,7 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const cacheComponents = config?.cacheComponents === true;
 	const prefetchInlining = config?.prefetchInlining ?? false;
 	const hasServerActions = config?.hasServerActions !== false;
+	const actionOwners = config?.actionOwners;
 	const hasAppRouteHandlers = routes.some((route) => route.routePath !== null);
 	const i18nConfig = config?.i18n ?? null;
 	const hasPagesDir = config?.hasPagesDir ?? false;
@@ -130,6 +134,7 @@ const prerenderToReadableStream = createRscPrerenderer(async (model, options) =>
 import { createElement } from "react";
 import { getNavigationContext as _getNavigationContext } from "next/navigation";
 import { configureMemoryCacheHandler as __configureMemoryCacheHandler } from "vinext/shims/cache-handler";
+import { getRequestExecutionContext as __getRequestExecutionContext } from "vinext/shims/request-context";
 import { headersContextFromRequest, getDraftModeCookieHeader, getAndClearPendingCookies, consumeDynamicUsage, consumeInvalidDynamicUsageError, setHeadersAccessPhase } from "next/headers";
 import { mergeMetadata, resolveModuleMetadata, mergeViewport, resolveModuleViewport } from "vinext/metadata";
 ${middlewarePath ? `import * as middlewareModule from ${JSON.stringify(toSlash(middlewarePath))};
@@ -139,6 +144,7 @@ import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered }
 import { createAppRscHandler } from "vinext/server/app-rsc-handler";
 import { registerConfiguredCacheAdapters as __registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
 import __pagesClientAssets from "virtual:vinext-pages-client-assets";
+${actionOwners === void 0 ? `import __vinextActionOwners from ${JSON.stringify(ACTION_OWNER_MANIFEST_ID)};` : ""}
 import { setPagesClientAssets as __setPagesClientAssets } from "vinext/server/pages-client-assets";
 import { decodePathParams as __decodePathParams } from ${JSON.stringify(normalizePathModulePath)};
 import { buildRequestHeadersFromMiddlewareResponse as __buildRequestHeadersFromMiddlewareResponse } from ${JSON.stringify(middlewareRequestHeadersPath)};
@@ -146,7 +152,8 @@ ${hasPagesDir ? `import {
   applyRouteHandlerMiddlewareContext as __applyRouteHandlerMiddlewareContext,
 } from ${JSON.stringify(appRouteHandlerResponsePath)};` : ""}
 const __loadAppRouteHandlerDispatch = () => import(${JSON.stringify(appRouteHandlerDispatchPath)});
-${hasServerActions ? `const __loadAppServerActionExecution = () => import(${JSON.stringify(appServerActionExecutionPath)});` : ""}
+${hasServerActions ? `const __loadAppServerActionExecution = () => import(${JSON.stringify(appServerActionExecutionPath)});
+const __loadAppActionForwarding = () => import(${JSON.stringify(appActionForwardingPath)});` : ""}
 ${(metadataRoutes?.length ?? 0) > 0 ? `const __loadMetadataRouteResponse = () => import(${JSON.stringify(metadataRouteResponsePath)});` : ""}
 ${(metadataRoutes?.length ?? 0) > 0 ? `const __loadFileBasedMetadata = () => import(${JSON.stringify(fileBasedMetadataPath)});
 async function __applyFileBasedMetadata(...args) {
@@ -219,7 +226,6 @@ import { renderPagesFallback as __renderPagesFallback } from ${JSON.stringify(ap
 // so per-route dispatch can opt into suppression via .run(true, ...).
 import { suppressHookWarningAls } from ${JSON.stringify(appHookWarningSuppressionPath)};
 import { clearAppRequestContext as __clearRequestContext, setAppNavigationContext as setNavigationContext } from ${JSON.stringify(appRequestContextPath)};
-
 __configureMemoryCacheHandler({ cacheMaxMemorySize: ${JSON.stringify(cacheMaxMemorySize)} });
 import { createAppPrerenderStaticParamsResolver as __createAppPrerenderStaticParamsResolver } from ${JSON.stringify(appPrerenderStaticParamsPath)};
 import { ensureAppRouteModulesLoaded as __ensureRouteLoaded, loadAppInterceptPage as __loadAppInterceptPage } from ${JSON.stringify(appRouteModuleLoaderPath)};
@@ -283,6 +289,18 @@ function __resolveRouteDynamicConfig(route) {
   }).dynamicConfig ?? null;
 }
 
+function __resolveRouteRevalidateSeconds(route) {
+  return __resolveAppPageSegmentConfig({
+    layouts: route.layouts,
+    page: route.page,
+    parallelSegments: Object.values(route.slots ?? {}).flatMap((slot) => [
+      slot.layout,
+      ...(slot.configLayouts ?? []),
+      slot.page ?? slot.default,
+    ]),
+  }).revalidateSeconds;
+}
+
 function __resolveRouteRuntime(route) {
   return __resolveAppPageSegmentConfig({
     layouts: route.layouts,
@@ -415,8 +433,12 @@ function matchRequestRoute(url) {
  * Check if a pathname matches any intercepting route.
  * Returns the match info or null.
  */
-function findIntercept(pathname, sourcePathname = null) {
-  return __routeMatcher.findIntercept(pathname, sourcePathname);
+function findIntercept(pathname, sourcePathname = null, interceptionId = null) {
+  return __routeMatcher.findIntercept(pathname, sourcePathname, interceptionId);
+}
+
+function hasInterceptionId(interceptionId) {
+  return __routeMatcher.hasInterceptionId(interceptionId);
 }
 
 async function buildPageElements(route, params, routePath, pageRequest, layoutParamAccess, displayPathname = routePath, scriptNonce) {
@@ -515,7 +537,8 @@ ${rootParamNameEntries.join("\n")}
 };
 
 __setPagesClientAssets(__pagesClientAssets);
-export default createAppRscHandler({
+function __VINEXT_ACTION_OWNERS() { return ${actionOwners === void 0 ? "__vinextActionOwners" : safeJsonStringify(actionOwners)}; }
+const __appRscHandler = createAppRscHandler({
   basePath: __basePath,
   buildId: process.env.__VINEXT_BUILD_ID ?? null,
   ensureRouteLoaded: __ensureRouteLoaded,
@@ -542,6 +565,7 @@ export default createAppRscHandler({
     actionFailed,
     handlerStart,
     interceptionContext,
+    interceptionId,
     interceptionPathname,
     isProgressiveActionRender,
     isRscRequest,
@@ -632,6 +656,7 @@ export default createAppRscHandler({
         return findIntercept(
           pathname === cleanPathname ? interceptionPathname : pathname,
           interceptionContext,
+          interceptionId,
         );
       },
       generateStaticParams: __generateStaticParams,
@@ -731,6 +756,9 @@ export default createAppRscHandler({
       resolveRouteFetchCacheMode(targetRoute) {
         return __resolveRouteFetchCacheMode(targetRoute);
       },
+      resolveRouteRevalidateSeconds(targetRoute) {
+        return __resolveRouteRevalidateSeconds(targetRoute);
+      },
       resolveRouteDynamicConfig(targetRoute) {
         return __resolveRouteDynamicConfig(targetRoute);
       },
@@ -803,6 +831,10 @@ export default createAppRscHandler({
       isProgressiveServerActionRequest: __isProgressiveServerActionRequest,
       readActionFormDataWithLimit: __readFormDataWithLimit,
     } = await __loadAppServerActionExecution();
+    const {
+      areServerActionsOwnedByRoute: __areServerActionsOwnedByRoute,
+      forwardServerActionIfNeeded: __forwardServerActionIfNeeded,
+    } = await __loadAppActionForwarding();
     // A multipart form POST to a page is always a server-action attempt, so a
     // body that decodes to no action must surface as 404 action-not-found
     // (#1340). Route handlers run after this dispatch and accept raw multipart
@@ -835,6 +867,39 @@ export default createAppRscHandler({
       decodeFormState,
       getAndClearPendingCookies,
       getDraftModeCookieHeader,
+      forwardAction(__progressiveActionId) {
+        return __forwardServerActionIfNeeded({
+          actionId: __progressiveActionId,
+          actionOwners: __VINEXT_ACTION_OWNERS(),
+          allowedOrigins: __allowedOrigins,
+          basePath: __basePath,
+          clearRequestContext: __clearRequestContext,
+          currentRoutePattern: routeMatch?.route.pattern ?? null,
+          dispatch(__forwardRequest) {
+            const __executionContext = __getRequestExecutionContext();
+            return __appRscHandler(
+              __forwardRequest,
+              __executionContext
+                ? {
+                    actionForwarded: true,
+                    cache: __executionContext.cache,
+                    passThroughOnException: __executionContext.passThroughOnException?.bind(__executionContext),
+                    waitUntil: __executionContext.waitUntil.bind(__executionContext),
+                  }
+                : { actionForwarded: true },
+            );
+          },
+          middlewareContext,
+          request,
+        });
+      },
+      validateActionReferences(__progressiveActionIds) {
+        return __areServerActionsOwnedByRoute(
+          __VINEXT_ACTION_OWNERS(),
+          __progressiveActionIds,
+          routeMatch?.route.pattern ?? null,
+        );
+      },
       hasPageRoute: __hasPageRoute,
       maxActionBodySize: __MAX_ACTION_BODY_SIZE,
       middlewareHeaders: middlewareContext.headers,
@@ -860,6 +925,34 @@ export default createAppRscHandler({
     sourceConfigHeaders,
     searchParams,
   }) {
+    const { forwardServerActionIfNeeded: __forwardServerActionIfNeeded } =
+      await __loadAppActionForwarding();
+    const __currentActionMatch = routeMatch;
+    const __forwardResponse = await __forwardServerActionIfNeeded({
+      actionId,
+      actionOwners: __VINEXT_ACTION_OWNERS(),
+      allowedOrigins: __allowedOrigins,
+      basePath: __basePath,
+      clearRequestContext: __clearRequestContext,
+      currentRoutePattern: __currentActionMatch?.route.pattern ?? null,
+      dispatch(__forwardRequest) {
+        const __executionContext = __getRequestExecutionContext();
+        return __appRscHandler(
+          __forwardRequest,
+          __executionContext
+            ? {
+                actionForwarded: true,
+                cache: __executionContext.cache,
+                passThroughOnException: __executionContext.passThroughOnException?.bind(__executionContext),
+                waitUntil: __executionContext.waitUntil.bind(__executionContext),
+              }
+            : { actionForwarded: true },
+        );
+      },
+      middlewareContext,
+      request,
+    });
+    if (__forwardResponse) return __forwardResponse;
     const {
       handleServerActionRscRequest: __handleServerActionRscRequest,
       readActionBodyWithLimit: __readBodyWithLimit,
@@ -926,6 +1019,9 @@ export default createAppRscHandler({
       },
       createTemporaryReferenceSet,
       decodeReply,
+      dispatchRedirectRequest(redirectRequest) {
+        return __appRscHandler(redirectRequest, undefined);
+      },
       draftModeSecret: __draftModeSecret,
       findIntercept(pathnameToMatch) {
         return findIntercept(pathnameToMatch, interceptionContext);
@@ -958,6 +1054,9 @@ export default createAppRscHandler({
       resolveRouteFetchCacheMode(targetRoute) {
         return __resolveRouteFetchCacheMode(targetRoute);
       },
+      resolveRouteRevalidateSeconds(targetRoute) {
+        return __resolveRouteRevalidateSeconds(targetRoute);
+      },
       resolveRouteDynamicConfig(targetRoute) {
         return __resolveRouteDynamicConfig(targetRoute);
       },
@@ -973,6 +1072,7 @@ export default createAppRscHandler({
       setNavigationContext,
       toInterceptOpts(intercept) {
         return {
+          interceptionId: intercept.interceptionId,
           interceptGraphId: intercept.interceptionGraphId,
           interceptionContext,
           interceptLayouts: intercept.interceptLayouts,
@@ -1021,8 +1121,9 @@ export default createAppRscHandler({
   },` : ""}
   matchRoute,
   matchRequestRoute,
-  matchInterceptRoute(pathname, sourcePathname) {
-    const intercept = findIntercept(pathname, sourcePathname);
+  hasInterceptionId,
+  matchInterceptRoute(pathname, sourcePathname, interceptionId) {
+    const intercept = findIntercept(pathname, sourcePathname, interceptionId);
     if (!intercept) return null;
     const route = routes[intercept.sourceRouteIndex];
     if (!route) return null;
@@ -1078,6 +1179,8 @@ export default createAppRscHandler({
   validateDevRequestOrigin: __validateDevRequestOrigin,
 });
 
+export default __appRscHandler;
+
 if (import.meta.hot) {
   import.meta.hot.accept();
 }

package/dist/entries/pages-client-entry.d.ts

@@ -1,5 +1,5 @@
-import { ResolvedNextConfig } from "../config/next-config.js";
 import { createValidFileMatcher } from "../routing/file-matcher.js";
+import { ResolvedNextConfig } from "../config/next-config.js";
 import { StaticMiddlewareMatcher } from "../build/report.js";
 import { VinextLinkPrefetchRoute } from "../client/vinext-next-data.js";
 //#region src/entries/pages-client-entry.d.ts

package/dist/entries/pages-server-entry.d.ts

@@ -1,5 +1,5 @@
-import { ResolvedNextConfig } from "../config/next-config.js";
 import { createValidFileMatcher } from "../routing/file-matcher.js";
+import { ResolvedNextConfig } from "../config/next-config.js";
 //#region src/entries/pages-server-entry.d.ts
 /**
  * Generate the virtual SSR server entry module.

package/dist/index.js

@@ -29,10 +29,12 @@ import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, resolveDevImageRedirect } from "./server/image-optimization.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
+import { isPathInside, isPathInsideOrEqual, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { invalidateMetadataFileCache, scanMetadataFiles } from "./server/metadata-routes.js";
 import { shouldInvalidateAppRouteFile } from "./server/dev-route-files.js";
 import { createDirectRunner } from "./server/dev-module-runner.js";
 import { validateDevRequest } from "./server/dev-origin-check.js";
+import { createActionOwnerManifestPlugin } from "./plugins/action-owner-manifest.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
 import { VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY, VIRTUAL_CACHE_ADAPTERS, generateCacheAdaptersModule } from "./cache/cache-adapters-virtual.js";
@@ -66,7 +68,6 @@ import { createInstrumentationClientTransformPlugin } from "./plugins/instrument
 import { createStyledJsxPlugin } from "./plugins/styled-jsx.js";
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
 import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
-import { stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { createPagesNodeExternalsPlugin } from "./plugins/pages-node-externals.js";
 import { validateMiddlewareModuleExports } from "./plugins/middleware-export-validation.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
@@ -91,7 +92,9 @@ import { createClientAssetFileNames, createClientCodeSplittingConfig, createClie
 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 { createWorkerImageImportsPlugin } from "./plugins/worker-image-imports.js";
 import { createRequireContextPlugin } from "./plugins/require-context.js";
+import { createRequireConditionResolutionPlugin, isConditionalRequireScriptModuleId } from "./plugins/require-condition-resolution.js";
 import { createTransformCache } from "./plugins/transform-cache.js";
 import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-dynamic-import.js";
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
@@ -105,7 +108,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, parseAst, transformWithOxc } from "vite";
+import { createIdResolver, createLogger, parseAst, transformWithOxc } from "vite";
 import { pathToFileURL } from "node:url";
 import { createHash, randomBytes } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
@@ -124,10 +127,6 @@ const OPTIONAL_OPTIMIZE_DEPS_WARNING_RE = /Failed to resolve dependency: .*use-s
 const VINEXT_FILTERED_OPTIMIZE_DEPS_WARN = Symbol.for("vinext.filteredOptimizeDepsWarn");
 const ANSI_ESCAPE_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
 installSocketErrorBackstop();
-function isInsideDirectory(dir, filePath) {
-	const relativePath = path.relative(dir, filePath);
-	return relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath);
-}
 function hasServerOnlyMarkerImport(code) {
 	if (!code.includes("server-only")) return false;
 	let ast;
@@ -254,9 +253,11 @@ function isolateGlobalNotFoundStylesheetImports(code, id) {
 function isScriptModuleId(id) {
 	return SCRIPT_IMPORT_RE.test(stripViteModuleQuery(id).toLowerCase());
 }
-function skipCommonjsForLocalCjs(id) {
+function commonjsTransformFilter(id, transformProjectLocalCommonJs = false, transformBundledDependencies = false, isBundledCommonJsDependency = () => false) {
 	const cleanId = toSlash(stripViteModuleQuery(id));
-	return /\.c[jt]s$/i.test(cleanId) && !cleanId.includes("node_modules") ? false : void 0;
+	if (isConditionalRequireScriptModuleId(cleanId)) return true;
+	if (transformBundledDependencies && isBundledCommonJsDependency(cleanId)) return true;
+	if (/\.c[jt]s$/i.test(cleanId) && !cleanId.includes("node_modules")) return transformProjectLocalCommonJs;
 }
 function hasOnlyTypeSpecifiers(statement) {
 	return statement.specifiers !== void 0 && statement.specifiers.length > 0 && statement.specifiers.every((specifier) => specifier.importKind === "type" || specifier.exportKind === "type");
@@ -749,6 +750,21 @@ function getClientOutputConfig(assetsDir, preserveAppRouteBoundaries = false) {
 		codeSplitting
 	};
 }
+function createServerEnvironmentFileNameResolver(config, outputRoot) {
+	const resolvedOutputRoot = path.resolve(config.root, outputRoot);
+	const outputPrefixes = new Map(["rsc", "ssr"].map((name) => {
+		const outDir = config.environments[name]?.build.outDir;
+		if (!outDir) return [name, ""];
+		const resolvedOutDir = path.resolve(config.root, outDir);
+		if (!isPathInsideOrEqual(resolvedOutputRoot, resolvedOutDir)) return [name, ""];
+		const relative = path.relative(resolvedOutputRoot, resolvedOutDir);
+		return [name, relative === "." ? "" : relative];
+	}));
+	return (environmentName, fileName) => {
+		const prefix = environmentName ? outputPrefixes.get(environmentName) : void 0;
+		return prefix ? path.join(prefix, fileName) : fileName;
+	};
+}
 function vinext(options = {}) {
 	const { supportsNativeTypeofWindowFolding: useNativeTypeofWindowFolding } = assertSupportedViteVersion();
 	const prerenderConfig = normalizeVinextPrerenderConfig(options.prerender);
@@ -774,6 +790,13 @@ function vinext(options = {}) {
 	let pagesBundledPackages = /* @__PURE__ */ new Set();
 	let isServeCommand = false;
 	let pagesOptimizeEntries = [];
+	const importMetaUrlCapability = createImportMetaUrlPlugin({
+		getRoot: () => root,
+		createEmittedModuleFileNameResolver(config) {
+			if (!hasCloudflarePlugin || !hasAppDir) return void 0;
+			return createServerEnvironmentFileNameResolver(config, config.environments.rsc?.build.outDir ?? options.rscOutDir ?? "dist/server");
+		}
+	});
 	const pagesClientAssetsOutputDirs = /* @__PURE__ */ new Set();
 	let pagesClientAssetsModule = null;
 	let devPublicFileRoutes = null;
@@ -783,6 +806,8 @@ function vinext(options = {}) {
 	let previewBuildCredentials;
 	const sassComposesLoader = createSassAwareFileSystemLoader();
 	let rscClassificationManifest = null;
+	let rscActionOwnerRoutes = null;
+	let rscActionOwnerSharedRoots = [];
 	const shimsDir = path.resolve(__dirname, "shims");
 	const canonicalize = (p) => toSlash(tryRealpathSync(p) ?? p);
 	const pageTransformCanonicalPaths = /* @__PURE__ */ new Map();
@@ -885,7 +910,7 @@ function vinext(options = {}) {
 		const { getPluginApi } = await rscPluginModulePromise;
 		const pluginApi = getPluginApi(config);
 		if (!pluginApi || pluginApi.manager.isScanBuild) return true;
-		return Object.keys(pluginApi.manager.serverReferenceMetaMap).length > 0;
+		return pluginApi.manager.serverReferences.metaMap.size > 0;
 	}
 	const configuredReactOptions = options.react && options.react !== true ? options.react : void 0;
 	const reactOptions = configuredReactOptions;
@@ -980,12 +1005,36 @@ function vinext(options = {}) {
 		}
 	};
 	const cachedConsumerConditionTransform = createTransformCache();
+	let transformProjectLocalCommonJs = false;
+	let transformBundledCommonJsDependencies = false;
+	const commonJsPlugin = commonjs({ filter(id) {
+		return commonjsTransformFilter(id, transformProjectLocalCommonJs, transformBundledCommonJsDependencies, importMetaUrlCapability.isBundledCommonJsDependencyId);
+	} });
+	const commonJsTransform = commonJsPlugin.transform;
+	if (typeof commonJsTransform === "function") commonJsPlugin.transform = function environmentAwareCommonJsTransform(code, id, ...args) {
+		if (this.environment.mode === "dev" && this.environment.depsOptimizer?.isOptimizedDepFile(id)) return null;
+		const isDev = this.environment.mode === "dev";
+		const isServer = this.environment.config.consumer === "server";
+		const bundledDependency = isDev && isServer && (code.includes("__filename") || code.includes("__dirname")) && importMetaUrlCapability.isBundledCommonJsDependencyId(id);
+		const projectLocal = !bundledDependency && !id.includes("/node_modules/") && !id.includes("\\node_modules\\");
+		const previousProjectLocal = transformProjectLocalCommonJs;
+		const previous = transformBundledCommonJsDependencies;
+		transformProjectLocalCommonJs = projectLocal && isDev;
+		transformBundledCommonJsDependencies = bundledDependency;
+		try {
+			return commonJsTransform.call(this, code, id, ...args);
+		} finally {
+			transformProjectLocalCommonJs = previousProjectLocal;
+			transformBundledCommonJsDependencies = previous;
+		}
+	};
 	const plugins = [
 		createStyledJsxPlugin(earlyBaseDir),
 		mdxProxyPlugin,
 		reactPluginPromise,
 		createIgnoreDynamicRequestsPlugin(() => nextConfig?.turbopackTranspilePackages ?? []),
-		commonjs({ filter: skipCommonjsForLocalCjs }),
+		createRequireConditionResolutionPlugin(createIdResolver, commonjsTransformFilter),
+		commonJsPlugin,
 		{
 			name: "vinext:global-not-found-css-isolation",
 			apply: "build",
@@ -1009,7 +1058,7 @@ function vinext(options = {}) {
 				filter: { id: /\.m?js(?:\?.*)?$/ },
 				async handler(code, id) {
 					const cleanId = toSlash(stripViteModuleQuery(id));
-					if (isInsideDirectory(__dirname, cleanId)) return;
+					if (isPathInside(__dirname, cleanId)) return;
 					if (cleanId.includes("/node_modules/")) {
 						if (!code.includes("use client") && !code.includes("use server")) return;
 						if (!hasReactDirective(code)) return;
@@ -1286,6 +1335,7 @@ function vinext(options = {}) {
 							...!isSSR && !isMultiEnv ? { output: getClientOutputConfig(clientAssetsDir) } : {}
 						})
 					},
+					worker: { plugins: () => [createWorkerImageImportsPlugin({ deploymentId: nextConfig.deploymentId })] },
 					server: {
 						cors: {
 							preflightContinue: true,
@@ -1326,7 +1376,7 @@ function vinext(options = {}) {
 					},
 					define: defines,
 					...nextConfig.basePath ? { base: nextConfig.basePath + "/" } : {},
-					...nextConfig.assetPrefix || nextConfig.deploymentId ? { experimental: { renderBuiltUrl: (filename, context) => renderVinextBuiltUrl(filename, nextConfig.assetPrefix, nextConfig.deploymentId, context.hostType) } } : {},
+					...nextConfig.assetPrefix || nextConfig.deploymentId ? { experimental: { renderBuiltUrl: (filename, context) => renderVinextBuiltUrl(filename, nextConfig.assetPrefix, nextConfig.deploymentId, context.hostType, context.hostId) } } : {},
 					css: {
 						...nextConfig.useLightningcss ? {
 							transformer: "lightningcss",
@@ -1512,7 +1562,7 @@ function vinext(options = {}) {
 							noExternal: true
 						},
 						optimizeDeps: {
-							exclude: ["ipaddr.js"],
+							exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], Object.keys(nextShimMap)),
 							...depOptimizeNodeEnvOptions
 						},
 						build: {
@@ -1531,6 +1581,12 @@ function vinext(options = {}) {
 				return viteConfig;
 			},
 			configEnvironment(name, config) {
+				if (name !== "client" && config.consumer !== "client") {
+					config.optimizeDeps ??= {};
+					config.optimizeDeps.rolldownOptions ??= {};
+					const configuredPlugins = config.optimizeDeps.rolldownOptions.plugins;
+					config.optimizeDeps.rolldownOptions.plugins = [...Array.isArray(configuredPlugins) ? configuredPlugins : configuredPlugins ? [configuredPlugins] : [], importMetaUrlCapability.optimizeDepsPlugin];
+				}
 				if (isServeCommand && hasCloudflarePlugin && hasPagesDir && !hasAppDir && name !== "client") {
 					config.optimizeDeps ??= {};
 					config.optimizeDeps.entries = mergeStringArrayValues(config.optimizeDeps.entries, pagesOptimizeEntries);
@@ -1545,6 +1601,19 @@ function vinext(options = {}) {
 			},
 			async configResolved(config) {
 				if (isServeCommand && hasCloudflarePlugin && hasPagesDir && !hasAppDir) suppressOptionalOptimizeDepsWarnings(config.logger);
+				if (config.worker?.rolldownOptions) {
+					const workerFileNames = `${resolveAssetsDir(nextConfig.assetPrefix ?? "")}/workers/[name]-[hash].js`;
+					const workerOutputs = config.worker.rolldownOptions.output;
+					config.worker.rolldownOptions.output = Array.isArray(workerOutputs) ? (workerOutputs.length > 0 ? workerOutputs : [{}]).map((output) => ({
+						...output,
+						entryFileNames: workerFileNames,
+						chunkFileNames: workerFileNames
+					})) : {
+						...workerOutputs,
+						entryFileNames: workerFileNames,
+						chunkFileNames: workerFileNames
+					};
+				}
 				sassComposesLoader.setResolvedConfig(config);
 				if (config.command === "build" && hasAppDir && hasPagesDir) {
 					const [appRoutes, pageRoutes, apiRoutes] = await Promise.all([
@@ -1663,6 +1732,8 @@ function vinext(options = {}) {
 						const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
 						const globalNotFoundPath = nextConfig?.globalNotFound ? findFileWithExts(appDir, "global-not-found", fileMatcher) : null;
 						rscClassificationManifest = collectRouteClassificationManifest(routes);
+						rscActionOwnerRoutes = this.environment.config.command === "build" && hasServerActions ? routes : null;
+						rscActionOwnerSharedRoots = [globalErrorPath, globalNotFoundPath].filter((path) => path !== null);
 						return generateRscEntry(appDir, routes, middlewarePath, metaRoutes, globalErrorPath, nextConfig?.basePath, nextConfig?.trailingSlash, {
 							redirects: nextConfig?.redirects,
 							rewrites: nextConfig?.rewrites,
@@ -1682,6 +1753,7 @@ function vinext(options = {}) {
 							cacheComponents: nextConfig?.cacheComponents,
 							prefetchInlining: nextConfig?.prefetchInlining,
 							hasServerActions,
+							actionOwners: this.environment.config.command === "build" ? void 0 : null,
 							i18n: nextConfig?.i18n,
 							imageConfig: {
 								deviceSizes: nextConfig?.images?.deviceSizes,
@@ -1732,9 +1804,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				handler(code, chunk) {
 					if (this.environment?.name !== "rsc") return null;
 					if (!rscClassificationManifest) return null;
-					if (!code.includes("__VINEXT_CLASS")) return null;
+					const hasClassificationStub = code.includes("__VINEXT_CLASS");
+					if (!hasClassificationStub) return null;
 					const enableClassificationDebug = Boolean(process.env.VINEXT_DEBUG_CLASSIFICATION);
-					const patchPlan = planRouteClassificationInjection({
+					const patchPlan = hasClassificationStub && rscClassificationManifest ? planRouteClassificationInjection({
 						canonicalizeLayoutPath: canonicalize,
 						chunks: [{
 							code,
@@ -1751,12 +1824,13 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								dynamicImportedIds: info.dynamicallyImportedIds ?? []
 							};
 						} }
-					});
+					}) : { kind: "skip" };
+					const nextCode = patchPlan.kind === "skip" ? code : patchPlan.code;
 					if (patchPlan.kind === "skip") return null;
 					rscClassificationManifest = null;
 					return {
-						code: patchPlan.code,
-						map: patchPlan.map
+						code: nextCode,
+						map: null
 					};
 				}
 			}
@@ -1960,6 +2034,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			},
 			configureServer(server) {
+				const devBuildId = nextConfig?.buildId ?? process.env.__VINEXT_BUILD_ID ?? "development";
 				server.middlewares.use((req, _res, next) => {
 					req.__vinextOriginalEncodedUrl ??= req.url;
 					next();
@@ -2458,7 +2533,6 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							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;
@@ -2687,7 +2761,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, nextConfig?.crossOrigin)
+									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, devBuildId)
 								};
 								flushStagedHeaders();
 								flushRequestHeaders();
@@ -2996,7 +3070,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		createLocalFontsPlugin(_shimsDir),
 		createOptimizeImportsPlugin(() => nextConfig, () => root),
 		createDynamicPreloadMetadataPlugin(),
-		createImportMetaUrlPlugin({ getRoot: () => root }),
+		importMetaUrlCapability.vitePlugin,
 		createExtensionlessDynamicImportPlugin(),
 		createRequireContextPlugin(),
 		createOgInlineFetchAssetsPlugin(),
@@ -3344,8 +3418,20 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		}
 	];
+	if (rscPluginPromise) plugins.push(rscPluginPromise);
+	if (earlyAppDirExists) plugins.push(createActionOwnerManifestPlugin({
+		canonicalizeModuleId: canonicalize,
+		async getManager(config) {
+			return (await rscPluginModulePromise)?.getPluginApi(config)?.manager;
+		},
+		getRoutes: () => rscActionOwnerRoutes ?? [],
+		getSharedRoots: () => rscActionOwnerSharedRoots,
+		onComplete() {
+			rscActionOwnerRoutes = null;
+			rscActionOwnerSharedRoots = [];
+		}
+	}));
 	if (rscPluginPromise) {
-		plugins.push(rscPluginPromise);
 		plugins.push(createRscReferenceValidationNormalizerPlugin());
 		plugins.push(createRscClientReferenceLoadersPlugin());
 	} else if (manualUseCachePluginPromise) plugins.push(manualUseCachePluginPromise);

package/dist/plugins/action-owner-manifest.d.ts

@@ -0,0 +1,14 @@
+import { AppRoute } from "../routing/app-route-graph.js";
+import { Plugin, ResolvedConfig } from "vite";
+import { RscPluginManager } from "@vitejs/plugin-rsc";
+//#region src/plugins/action-owner-manifest.d.ts
+declare const ACTION_OWNER_MANIFEST_ID = "virtual:vinext-action-owner-manifest";
+declare function createActionOwnerManifestPlugin(options: {
+  canonicalizeModuleId: (id: string) => string;
+  getManager: (config: ResolvedConfig) => Promise<RscPluginManager | undefined>;
+  getRoutes: () => readonly AppRoute[];
+  getSharedRoots: () => readonly string[];
+  onComplete?: () => void;
+}): Plugin;
+//#endregion
+export { ACTION_OWNER_MANIFEST_ID, createActionOwnerManifestPlugin };