vinext 0.0.54 → 0.0.55

package/dist/shims/thenable-params.js

@@ -25,16 +25,38 @@ const wellKnownProperties = new Set([
 function isWellKnownProperty(prop) {
 	return wellKnownProperties.has(prop);
 }
-function makeThenableParams(obj) {
+function observeParamKeys(observer, keys) {
+	if (observer) observer.observeParamAccess(keys);
+}
+function observeAllParamKeys(observer, plain) {
+	observeParamKeys(observer, Object.keys(plain));
+}
+function observeReadableParamKeys(observer, plain) {
+	observeParamKeys(observer, Object.keys(plain).filter((key) => !isWellKnownProperty(key)));
+}
+function isPromiseContinuation(prop) {
+	return prop === "then" || prop === "catch" || prop === "finally";
+}
+function makeThenableParams(obj, observer) {
 	const plain = { ...obj };
 	const promise = Promise.resolve(plain);
 	return new Proxy(promise, {
 		get(target, prop, receiver) {
+			if (isPromiseContinuation(prop)) {
+				const value = Reflect.get(target, prop, receiver);
+				if (typeof value !== "function") return value;
+				return (...args) => {
+					observeAllParamKeys(observer, plain);
+					return Reflect.apply(value, target, args);
+				};
+			}
+			if (typeof prop === "string" && !isWellKnownProperty(prop)) observeParamKeys(observer, [prop]);
 			if (!isWellKnownProperty(prop) && hasParamProperty(plain, prop)) return Reflect.get(plain, prop);
 			const value = Reflect.get(target, prop, receiver);
 			return typeof value === "function" ? value.bind(target) : value;
 		},
 		getOwnPropertyDescriptor(target, prop) {
+			if (typeof prop === "string" && !isWellKnownProperty(prop)) observeParamKeys(observer, [prop]);
 			if (!isWellKnownProperty(prop) && hasParamProperty(plain, prop)) return {
 				configurable: true,
 				enumerable: true,
@@ -44,9 +66,11 @@ function makeThenableParams(obj) {
 			return Reflect.getOwnPropertyDescriptor(target, prop);
 		},
 		has(target, prop) {
+			if (typeof prop === "string" && !isWellKnownProperty(prop)) observeParamKeys(observer, [prop]);
 			return Reflect.has(target, prop) || !isWellKnownProperty(prop) && hasParamProperty(plain, prop);
 		},
 		ownKeys() {
+			observeReadableParamKeys(observer, plain);
 			return Reflect.ownKeys(plain).filter((prop) => !isWellKnownProperty(prop));
 		}
 	});

package/dist/shims/thenable-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"thenable-params.js","names":[],"sources":["../../src/shims/thenable-params.ts"],"sourcesContent":["function hasParamProperty<T extends Record<string, unknown>>(obj: T, prop: PropertyKey): boolean {\n  return Object.prototype.hasOwnProperty.call(obj, prop);\n}\n\n// Properties that cannot be shadowed by param names because they need to\n// remain the true underlying value for Promises / React to work correctly.\n//\n// Next.js comments out `value` and `error` in reflect-utils.ts because they\n// use `Promise.resolve(underlyingParams)` directly in production, so React\n// mutations on the promise object are never shadowed. vinext uses a Proxy\n// that intercepts sync reads through a separate `plain` object, which means\n// a param named `value` or `error` would shadow React's `.status`/`.value`\n// attachments that React adds to resolved promises for `use()` caching.\n// https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/utils/reflect-utils.ts\nconst WELL_KNOWN_PROPERTIES = [\n  // Object prototype\n  \"hasOwnProperty\",\n  \"isPrototypeOf\",\n  \"propertyIsEnumerable\",\n  \"toString\",\n  \"valueOf\",\n  \"toLocaleString\",\n\n  // Promise prototype\n  \"then\",\n  \"catch\",\n  \"finally\",\n\n  // React Promise extension (status is explicitly reserved by Next.js;\n  // value/error are reserved here because our Proxy-based approach creates\n  // a shadowing risk that native Promise does not have)\n  \"status\",\n  \"value\",\n  \"error\",\n\n  // React introspection\n  \"displayName\",\n  \"_debugInfo\",\n\n  // Common tested properties\n  \"toJSON\",\n  \"$$typeof\",\n  \"__esModule\",\n\n  // Tested by flight when checking for iterables\n  \"@@iterator\",\n] as const;\n\n// The type-level set of well-known properties is derived directly from the\n// runtime array above, so they can never drift out of sync. These properties\n// are omitted from the synchronous intersection because the Proxy returns\n// Promise/React internals for them, not the param value. After awaiting, the\n// resolved object contains the actual param values for all keys.\ntype WellKnownProperty = (typeof WELL_KNOWN_PROPERTIES)[number];\n\nconst wellKnownProperties = new Set<PropertyKey>(WELL_KNOWN_PROPERTIES);\n\nfunction isWellKnownProperty(prop: PropertyKey): boolean {\n  return wellKnownProperties.has(prop);\n}\n\nexport type ThenableParams<T extends Record<string, unknown>> = Promise<T> &\n  Omit<T, WellKnownProperty>;\n\nexport function makeThenableParams<T extends Record<string, unknown>>(obj: T): ThenableParams<T> {\n  const plain = { ...obj };\n  const promise = Promise.resolve(plain);\n\n  // The Proxy implements both Promise and plain-object behaviour so that\n  // `await params` and `params.id` both work. TypeScript's Proxy type\n  // cannot express this intersection precisely — the cast is isolated to\n  // the boundary so the handler above stays fully type-checked.\n  return new Proxy(promise, {\n    get(target, prop, receiver) {\n      if (!isWellKnownProperty(prop) && hasParamProperty(plain, prop)) {\n        return Reflect.get(plain, prop);\n      }\n\n      const value = Reflect.get(target, prop, receiver);\n      return typeof value === \"function\" ? value.bind(target) : value;\n    },\n    getOwnPropertyDescriptor(target, prop) {\n      if (!isWellKnownProperty(prop) && hasParamProperty(plain, prop)) {\n        return {\n          configurable: true,\n          enumerable: true,\n          value: Reflect.get(plain, prop),\n          writable: true,\n        };\n      }\n\n      return Reflect.getOwnPropertyDescriptor(target, prop);\n    },\n    has(target, prop) {\n      return (\n        Reflect.has(target, prop) || (!isWellKnownProperty(prop) && hasParamProperty(plain, prop))\n      );\n    },\n    ownKeys() {\n      return Reflect.ownKeys(plain).filter((prop) => !isWellKnownProperty(prop));\n    },\n  }) as unknown as ThenableParams<T>;\n}\n"],"mappings":";AAAA,SAAS,iBAAoD,KAAQ,MAA4B;CAC/F,OAAO,OAAO,UAAU,eAAe,KAAK,KAAK,KAAK;;AAsDxD,MAAM,sBAAsB,IAAI,IAAiB;CAvC/C;CACA;CACA;CACA;CACA;CACA;CAGA;CACA;CACA;CAKA;CACA;CACA;CAGA;CACA;CAGA;CACA;CACA;CAGA;CAUoE,CAAC;AAEvE,SAAS,oBAAoB,MAA4B;CACvD,OAAO,oBAAoB,IAAI,KAAK;;AAMtC,SAAgB,mBAAsD,KAA2B;CAC/F,MAAM,QAAQ,EAAE,GAAG,KAAK;CACxB,MAAM,UAAU,QAAQ,QAAQ,MAAM;CAMtC,OAAO,IAAI,MAAM,SAAS;EACxB,IAAI,QAAQ,MAAM,UAAU;GAC1B,IAAI,CAAC,oBAAoB,KAAK,IAAI,iBAAiB,OAAO,KAAK,EAC7D,OAAO,QAAQ,IAAI,OAAO,KAAK;GAGjC,MAAM,QAAQ,QAAQ,IAAI,QAAQ,MAAM,SAAS;GACjD,OAAO,OAAO,UAAU,aAAa,MAAM,KAAK,OAAO,GAAG;;EAE5D,yBAAyB,QAAQ,MAAM;GACrC,IAAI,CAAC,oBAAoB,KAAK,IAAI,iBAAiB,OAAO,KAAK,EAC7D,OAAO;IACL,cAAc;IACd,YAAY;IACZ,OAAO,QAAQ,IAAI,OAAO,KAAK;IAC/B,UAAU;IACX;GAGH,OAAO,QAAQ,yBAAyB,QAAQ,KAAK;;EAEvD,IAAI,QAAQ,MAAM;GAChB,OACE,QAAQ,IAAI,QAAQ,KAAK,IAAK,CAAC,oBAAoB,KAAK,IAAI,iBAAiB,OAAO,KAAK;;EAG7F,UAAU;GACR,OAAO,QAAQ,QAAQ,MAAM,CAAC,QAAQ,SAAS,CAAC,oBAAoB,KAAK,CAAC;;EAE7E,CAAC"}
+{"version":3,"file":"thenable-params.js","names":[],"sources":["../../src/shims/thenable-params.ts"],"sourcesContent":["function hasParamProperty<T extends Record<string, unknown>>(obj: T, prop: PropertyKey): boolean {\n  return Object.prototype.hasOwnProperty.call(obj, prop);\n}\n\n// Properties that cannot be shadowed by param names because they need to\n// remain the true underlying value for Promises / React to work correctly.\n//\n// Next.js comments out `value` and `error` in reflect-utils.ts because they\n// use `Promise.resolve(underlyingParams)` directly in production, so React\n// mutations on the promise object are never shadowed. vinext uses a Proxy\n// that intercepts sync reads through a separate `plain` object, which means\n// a param named `value` or `error` would shadow React's `.status`/`.value`\n// attachments that React adds to resolved promises for `use()` caching.\n// https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/utils/reflect-utils.ts\nconst WELL_KNOWN_PROPERTIES = [\n  // Object prototype\n  \"hasOwnProperty\",\n  \"isPrototypeOf\",\n  \"propertyIsEnumerable\",\n  \"toString\",\n  \"valueOf\",\n  \"toLocaleString\",\n\n  // Promise prototype\n  \"then\",\n  \"catch\",\n  \"finally\",\n\n  // React Promise extension (status is explicitly reserved by Next.js;\n  // value/error are reserved here because our Proxy-based approach creates\n  // a shadowing risk that native Promise does not have)\n  \"status\",\n  \"value\",\n  \"error\",\n\n  // React introspection\n  \"displayName\",\n  \"_debugInfo\",\n\n  // Common tested properties\n  \"toJSON\",\n  \"$$typeof\",\n  \"__esModule\",\n\n  // Tested by flight when checking for iterables\n  \"@@iterator\",\n] as const;\n\n// The type-level set of well-known properties is derived directly from the\n// runtime array above, so they can never drift out of sync. These properties\n// are omitted from the synchronous intersection because the Proxy returns\n// Promise/React internals for them, not the param value. After awaiting, the\n// resolved object contains the actual param values for all keys.\ntype WellKnownProperty = (typeof WELL_KNOWN_PROPERTIES)[number];\n\nconst wellKnownProperties = new Set<PropertyKey>(WELL_KNOWN_PROPERTIES);\n\nfunction isWellKnownProperty(prop: PropertyKey): boolean {\n  return wellKnownProperties.has(prop);\n}\n\nexport type ThenableParams<T extends Record<string, unknown>> = Promise<T> &\n  Omit<T, WellKnownProperty>;\n\nexport type ThenableParamsObserver = Readonly<{\n  observeParamAccess: (keys: readonly string[]) => void;\n}>;\n\nfunction observeParamKeys(\n  observer: ThenableParamsObserver | undefined,\n  keys: readonly string[],\n): void {\n  if (observer) {\n    observer.observeParamAccess(keys);\n  }\n}\n\nfunction observeAllParamKeys<T extends Record<string, unknown>>(\n  observer: ThenableParamsObserver | undefined,\n  plain: T,\n): void {\n  observeParamKeys(observer, Object.keys(plain));\n}\n\nfunction observeReadableParamKeys<T extends Record<string, unknown>>(\n  observer: ThenableParamsObserver | undefined,\n  plain: T,\n): void {\n  const keys = Object.keys(plain).filter((key) => !isWellKnownProperty(key));\n  observeParamKeys(observer, keys);\n}\n\nfunction isPromiseContinuation(prop: PropertyKey): boolean {\n  return prop === \"then\" || prop === \"catch\" || prop === \"finally\";\n}\n\nexport function makeThenableParams<T extends Record<string, unknown>>(\n  obj: T,\n  observer?: ThenableParamsObserver,\n): ThenableParams<T> {\n  const plain = { ...obj };\n  const promise = Promise.resolve(plain);\n\n  // The Proxy implements both Promise and plain-object behaviour so that\n  // `await params` and `params.id` both work. TypeScript's Proxy type\n  // cannot express this intersection precisely — the cast is isolated to\n  // the boundary so the handler above stays fully type-checked.\n  return new Proxy(promise, {\n    get(target, prop, receiver) {\n      if (isPromiseContinuation(prop)) {\n        const value = Reflect.get(target, prop, receiver);\n        if (typeof value !== \"function\") return value;\n        return (...args: unknown[]) => {\n          observeAllParamKeys(observer, plain);\n          return Reflect.apply(value, target, args);\n        };\n      }\n\n      if (typeof prop === \"string\" && !isWellKnownProperty(prop)) {\n        observeParamKeys(observer, [prop]);\n      }\n\n      if (!isWellKnownProperty(prop) && hasParamProperty(plain, prop)) {\n        return Reflect.get(plain, prop);\n      }\n\n      const value = Reflect.get(target, prop, receiver);\n      return typeof value === \"function\" ? value.bind(target) : value;\n    },\n    getOwnPropertyDescriptor(target, prop) {\n      if (typeof prop === \"string\" && !isWellKnownProperty(prop)) {\n        observeParamKeys(observer, [prop]);\n      }\n\n      if (!isWellKnownProperty(prop) && hasParamProperty(plain, prop)) {\n        return {\n          configurable: true,\n          enumerable: true,\n          value: Reflect.get(plain, prop),\n          writable: true,\n        };\n      }\n\n      return Reflect.getOwnPropertyDescriptor(target, prop);\n    },\n    has(target, prop) {\n      if (typeof prop === \"string\" && !isWellKnownProperty(prop)) {\n        observeParamKeys(observer, [prop]);\n      }\n\n      return (\n        Reflect.has(target, prop) || (!isWellKnownProperty(prop) && hasParamProperty(plain, prop))\n      );\n    },\n    ownKeys() {\n      observeReadableParamKeys(observer, plain);\n      return Reflect.ownKeys(plain).filter((prop) => !isWellKnownProperty(prop));\n    },\n  }) as unknown as ThenableParams<T>;\n}\n"],"mappings":";AAAA,SAAS,iBAAoD,KAAQ,MAA4B;CAC/F,OAAO,OAAO,UAAU,eAAe,KAAK,KAAK,KAAK;;AAsDxD,MAAM,sBAAsB,IAAI,IAAiB;CAvC/C;CACA;CACA;CACA;CACA;CACA;CAGA;CACA;CACA;CAKA;CACA;CACA;CAGA;CACA;CAGA;CACA;CACA;CAGA;CAUoE,CAAC;AAEvE,SAAS,oBAAoB,MAA4B;CACvD,OAAO,oBAAoB,IAAI,KAAK;;AAUtC,SAAS,iBACP,UACA,MACM;CACN,IAAI,UACF,SAAS,mBAAmB,KAAK;;AAIrC,SAAS,oBACP,UACA,OACM;CACN,iBAAiB,UAAU,OAAO,KAAK,MAAM,CAAC;;AAGhD,SAAS,yBACP,UACA,OACM;CAEN,iBAAiB,UADJ,OAAO,KAAK,MAAM,CAAC,QAAQ,QAAQ,CAAC,oBAAoB,IAAI,CAC1C,CAAC;;AAGlC,SAAS,sBAAsB,MAA4B;CACzD,OAAO,SAAS,UAAU,SAAS,WAAW,SAAS;;AAGzD,SAAgB,mBACd,KACA,UACmB;CACnB,MAAM,QAAQ,EAAE,GAAG,KAAK;CACxB,MAAM,UAAU,QAAQ,QAAQ,MAAM;CAMtC,OAAO,IAAI,MAAM,SAAS;EACxB,IAAI,QAAQ,MAAM,UAAU;GAC1B,IAAI,sBAAsB,KAAK,EAAE;IAC/B,MAAM,QAAQ,QAAQ,IAAI,QAAQ,MAAM,SAAS;IACjD,IAAI,OAAO,UAAU,YAAY,OAAO;IACxC,QAAQ,GAAG,SAAoB;KAC7B,oBAAoB,UAAU,MAAM;KACpC,OAAO,QAAQ,MAAM,OAAO,QAAQ,KAAK;;;GAI7C,IAAI,OAAO,SAAS,YAAY,CAAC,oBAAoB,KAAK,EACxD,iBAAiB,UAAU,CAAC,KAAK,CAAC;GAGpC,IAAI,CAAC,oBAAoB,KAAK,IAAI,iBAAiB,OAAO,KAAK,EAC7D,OAAO,QAAQ,IAAI,OAAO,KAAK;GAGjC,MAAM,QAAQ,QAAQ,IAAI,QAAQ,MAAM,SAAS;GACjD,OAAO,OAAO,UAAU,aAAa,MAAM,KAAK,OAAO,GAAG;;EAE5D,yBAAyB,QAAQ,MAAM;GACrC,IAAI,OAAO,SAAS,YAAY,CAAC,oBAAoB,KAAK,EACxD,iBAAiB,UAAU,CAAC,KAAK,CAAC;GAGpC,IAAI,CAAC,oBAAoB,KAAK,IAAI,iBAAiB,OAAO,KAAK,EAC7D,OAAO;IACL,cAAc;IACd,YAAY;IACZ,OAAO,QAAQ,IAAI,OAAO,KAAK;IAC/B,UAAU;IACX;GAGH,OAAO,QAAQ,yBAAyB,QAAQ,KAAK;;EAEvD,IAAI,QAAQ,MAAM;GAChB,IAAI,OAAO,SAAS,YAAY,CAAC,oBAAoB,KAAK,EACxD,iBAAiB,UAAU,CAAC,KAAK,CAAC;GAGpC,OACE,QAAQ,IAAI,QAAQ,KAAK,IAAK,CAAC,oBAAoB,KAAK,IAAI,iBAAiB,OAAO,KAAK;;EAG7F,UAAU;GACR,yBAAyB,UAAU,MAAM;GACzC,OAAO,QAAQ,QAAQ,MAAM,CAAC,QAAQ,SAAS,CAAC,oBAAoB,KAAK,CAAC;;EAE7E,CAAC"}

package/dist/shims/unified-request-context.js

@@ -26,8 +26,10 @@ function createRequestContext(opts) {
 		serverContext: null,
 		serverInsertedHTMLCallbacks: [],
 		requestScopedCacheLife: null,
+		unstableCacheObservations: /* @__PURE__ */ new Map(),
 		unstableCacheRevalidation: "foreground",
 		_privateCache: null,
+		cacheableFetchUrls: /* @__PURE__ */ new Set(),
 		currentRequestTags: [],
 		currentFetchSoftTags: [],
 		currentFetchCacheMode: null,
@@ -38,6 +40,7 @@ function createRequestContext(opts) {
 		requestCache: /* @__PURE__ */ new WeakMap(),
 		ssrContext: null,
 		ssrHeadChildren: [],
+		documentInitialHead: [],
 		rootParams: null,
 		...opts
 	};

package/dist/shims/unified-request-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"unified-request-context.js","names":[],"sources":["../../src/shims/unified-request-context.ts"],"sourcesContent":["/**\n * Unified per-request context backed by a single AsyncLocalStorage.\n *\n * Consolidates the 5–6 nested ALS scopes that previously wrapped every\n * App Router request (headers, navigation, cache-state, private-cache,\n * fetch-cache, execution-context) into one flat store.\n *\n * Each shim module checks `isInsideUnifiedScope()` and reads its sub-fields\n * from the unified store, falling back to its own standalone ALS when\n * outside (SSR environment, Pages Router, tests).\n */\n\nimport type { AsyncLocalStorage } from \"node:async_hooks\";\nimport { getOrCreateAls } from \"./internal/als-registry.js\";\nimport type {\n  CacheState,\n  ExecutionContextLike,\n  FetchCacheState,\n  HeadState,\n  I18nState,\n  NavigationState,\n  PrivateCacheState,\n  RouterState,\n  RootParamsState,\n  VinextHeadersShimState,\n} from \"./request-state-types.js\";\n\n// ---------------------------------------------------------------------------\n// Unified context shape\n// ---------------------------------------------------------------------------\n\n/**\n * Flat union of all per-request state previously spread across\n * VinextHeadersShimState, NavigationState, CacheState, PrivateCacheState,\n * FetchCacheState, and ExecutionContextLike.\n *\n * Each field group is documented with its source shim module.\n */\nexport type UnifiedRequestContext = {\n  // ── request-context.ts ─────────────────────────────────────────────\n  /** Cloudflare Workers ExecutionContext, or null on Node.js dev. */\n  executionContext: ExecutionContextLike | null;\n\n  // ── cache-for-request.ts ──────────────────────────────────────────\n  /** Per-request cache for cacheForRequest(). Keyed by factory function reference. */\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  requestCache: WeakMap<(...args: any[]) => any, unknown>;\n} & VinextHeadersShimState &\n  I18nState &\n  NavigationState &\n  CacheState &\n  PrivateCacheState &\n  FetchCacheState &\n  RouterState &\n  HeadState &\n  RootParamsState;\n\n// ---------------------------------------------------------------------------\n// ALS setup — stored on globalThis via Symbol.for so all Vite environments\n// (RSC/SSR/client) share the same instance.\n// ---------------------------------------------------------------------------\n\nconst _REQUEST_CONTEXT_ALS_KEY = Symbol.for(\"vinext.requestContext.als\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = getOrCreateAls<UnifiedRequestContext>(\"vinext.unifiedRequestContext.als\");\n\nfunction _getInheritedExecutionContext(): ExecutionContextLike | null {\n  const unifiedStore = _als.getStore();\n  if (unifiedStore) return unifiedStore.executionContext;\n\n  const executionContextAls = _g[_REQUEST_CONTEXT_ALS_KEY] as\n    | AsyncLocalStorage<ExecutionContextLike | null>\n    | undefined;\n  return executionContextAls?.getStore() ?? null;\n}\n\n// ---------------------------------------------------------------------------\n// Public API\n// ---------------------------------------------------------------------------\n\n/**\n * Create a fresh `UnifiedRequestContext` with defaults for all fields.\n * Pass partial overrides for the fields you need to pre-populate.\n */\nexport function createRequestContext(opts?: Partial<UnifiedRequestContext>): UnifiedRequestContext {\n  return {\n    headersContext: null,\n    actionRevalidationKind: 0,\n    dynamicUsageDetected: false,\n    renderRequestApiUsage: new Set(),\n    invalidDynamicUsageError: null,\n    pendingSetCookies: [],\n    draftModeCookieHeader: null,\n    phase: \"render\",\n    i18nContext: null,\n    serverContext: null,\n    serverInsertedHTMLCallbacks: [],\n    requestScopedCacheLife: null,\n    unstableCacheRevalidation: \"foreground\",\n    _privateCache: null,\n    currentRequestTags: [],\n    currentFetchSoftTags: [],\n    currentFetchCacheMode: null,\n    dynamicFetchUrls: new Set<string>(),\n    isFetchDedupeActive: false,\n    currentFetchDedupeEntries: new Map(),\n    executionContext: _getInheritedExecutionContext(), // inherits from standalone ALS if present\n    requestCache: new WeakMap(),\n    ssrContext: null,\n    ssrHeadChildren: [],\n    rootParams: null,\n    ...opts,\n  };\n}\n\n/**\n * Run `fn` within a unified request context scope.\n * All shim modules will read/write their state from `ctx` for the\n * duration of the call, including async continuations.\n */\nexport function runWithRequestContext<T>(\n  ctx: UnifiedRequestContext,\n  fn: () => Promise<T>,\n): Promise<T>;\nexport function runWithRequestContext<T>(\n  ctx: UnifiedRequestContext,\n  fn: () => T | Promise<T>,\n): T | Promise<T>;\nexport function runWithRequestContext<T>(\n  ctx: UnifiedRequestContext,\n  fn: () => T | Promise<T>,\n): T | Promise<T> {\n  return _als.run(ctx, fn);\n}\n\n/**\n * Run `fn` in a nested unified scope derived from the current request context.\n * Used by legacy runWith* wrappers to reset or override one sub-state while\n * preserving proper async isolation for continuations created inside `fn`.\n * The child scope is a shallow clone of the parent store, so untouched fields\n * keep sharing their existing references while overridden slices can be reset.\n *\n * @internal\n */\nexport function runWithUnifiedStateMutation<T>(\n  mutate: (ctx: UnifiedRequestContext) => void,\n  fn: () => Promise<T>,\n): Promise<T>;\nexport function runWithUnifiedStateMutation<T>(\n  mutate: (ctx: UnifiedRequestContext) => void,\n  fn: () => T | Promise<T>,\n): T | Promise<T>;\nexport function runWithUnifiedStateMutation<T>(\n  mutate: (ctx: UnifiedRequestContext) => void,\n  fn: () => T | Promise<T>,\n): T | Promise<T> {\n  const parentCtx = _als.getStore();\n  if (!parentCtx) return fn();\n\n  const childCtx = { ...parentCtx };\n  // NOTE: This is a shallow clone. Array fields (pendingSetCookies,\n  // serverInsertedHTMLCallbacks, currentRequestTags, ssrHeadChildren), Set\n  // fields (renderRequestApiUsage, dynamicFetchUrls), the _privateCache Map,\n  // requestCache WeakMap, and object fields (headersContext,\n  // i18nContext, serverContext, ssrContext, executionContext,\n  // requestScopedCacheLife) still share references with the parent until\n  // replaced. requestCache is intentionally shared — nested scopes within\n  // the same request should see the same cached values. The mutate\n  // callback must replace those reference-typed slices (for example\n  // `ctx.currentRequestTags = []` or `ctx.renderRequestApiUsage = new Set()`)\n  // rather than mutating them in-place (for\n  // example `ctx.currentRequestTags.push(...)`) or the parent scope will\n  // observe those changes too. Keep this enumeration in sync with\n  // UnifiedRequestContext: when adding a new reference-typed field, add it\n  // here too and verify callers still follow the replace-not-mutate rule.\n  mutate(childCtx);\n  return _als.run(childCtx, fn);\n}\n\n/**\n * Get the current unified request context.\n * Returns the ALS store when inside a `runWithRequestContext()` scope,\n * or a fresh detached context otherwise. Unlike the legacy per-shim fallback\n * singletons, this detached value is ephemeral — mutations do not persist\n * across calls. This is intentional to prevent state leakage outside request\n * scopes.\n *\n * Only direct callers observe this detached fallback. Shim `_getState()`\n * helpers should continue to gate on `isInsideUnifiedScope()` and fall back\n * to their standalone ALS/fallback singletons outside the unified scope.\n * If called inside a standalone `runWithExecutionContext()` scope, the\n * detached context still reflects that inherited `executionContext`.\n */\nexport function getRequestContext(): UnifiedRequestContext {\n  return _als.getStore() ?? createRequestContext();\n}\n\n/**\n * Check whether the current execution is inside a `runWithRequestContext()` scope.\n * Shim modules use this to decide whether to read from the unified store\n * or fall back to their own standalone ALS.\n */\nexport function isInsideUnifiedScope(): boolean {\n  return _als.getStore() != null;\n}\n"],"mappings":";;AA8DA,MAAM,2BAA2B,OAAO,IAAI,4BAA4B;AACxE,MAAM,KAAK;AACX,MAAM,OAAO,eAAsC,mCAAmC;AAEtF,SAAS,gCAA6D;CACpE,MAAM,eAAe,KAAK,UAAU;CACpC,IAAI,cAAc,OAAO,aAAa;CAKtC,OAH4B,GAAG,2BAGH,UAAU,IAAI;;;;;;AAW5C,SAAgB,qBAAqB,MAA8D;CACjG,OAAO;EACL,gBAAgB;EAChB,wBAAwB;EACxB,sBAAsB;EACtB,uCAAuB,IAAI,KAAK;EAChC,0BAA0B;EAC1B,mBAAmB,EAAE;EACrB,uBAAuB;EACvB,OAAO;EACP,aAAa;EACb,eAAe;EACf,6BAA6B,EAAE;EAC/B,wBAAwB;EACxB,2BAA2B;EAC3B,eAAe;EACf,oBAAoB,EAAE;EACtB,sBAAsB,EAAE;EACxB,uBAAuB;EACvB,kCAAkB,IAAI,KAAa;EACnC,qBAAqB;EACrB,2CAA2B,IAAI,KAAK;EACpC,kBAAkB,+BAA+B;EACjD,8BAAc,IAAI,SAAS;EAC3B,YAAY;EACZ,iBAAiB,EAAE;EACnB,YAAY;EACZ,GAAG;EACJ;;AAgBH,SAAgB,sBACd,KACA,IACgB;CAChB,OAAO,KAAK,IAAI,KAAK,GAAG;;AAoB1B,SAAgB,4BACd,QACA,IACgB;CAChB,MAAM,YAAY,KAAK,UAAU;CACjC,IAAI,CAAC,WAAW,OAAO,IAAI;CAE3B,MAAM,WAAW,EAAE,GAAG,WAAW;CAgBjC,OAAO,SAAS;CAChB,OAAO,KAAK,IAAI,UAAU,GAAG;;;;;;;;;;;;;;;;AAiB/B,SAAgB,oBAA2C;CACzD,OAAO,KAAK,UAAU,IAAI,sBAAsB;;;;;;;AAQlD,SAAgB,uBAAgC;CAC9C,OAAO,KAAK,UAAU,IAAI"}
+{"version":3,"file":"unified-request-context.js","names":[],"sources":["../../src/shims/unified-request-context.ts"],"sourcesContent":["/**\n * Unified per-request context backed by a single AsyncLocalStorage.\n *\n * Consolidates the 5–6 nested ALS scopes that previously wrapped every\n * App Router request (headers, navigation, cache-state, private-cache,\n * fetch-cache, execution-context) into one flat store.\n *\n * Each shim module checks `isInsideUnifiedScope()` and reads its sub-fields\n * from the unified store, falling back to its own standalone ALS when\n * outside (SSR environment, Pages Router, tests).\n */\n\nimport type { AsyncLocalStorage } from \"node:async_hooks\";\nimport { getOrCreateAls } from \"./internal/als-registry.js\";\nimport type {\n  CacheState,\n  ExecutionContextLike,\n  FetchCacheState,\n  HeadState,\n  I18nState,\n  NavigationState,\n  PrivateCacheState,\n  RouterState,\n  RootParamsState,\n  VinextHeadersShimState,\n} from \"./request-state-types.js\";\n\n// ---------------------------------------------------------------------------\n// Unified context shape\n// ---------------------------------------------------------------------------\n\n/**\n * Flat union of all per-request state previously spread across\n * VinextHeadersShimState, NavigationState, CacheState, PrivateCacheState,\n * FetchCacheState, and ExecutionContextLike.\n *\n * Each field group is documented with its source shim module.\n */\nexport type UnifiedRequestContext = {\n  // ── request-context.ts ─────────────────────────────────────────────\n  /** Cloudflare Workers ExecutionContext, or null on Node.js dev. */\n  executionContext: ExecutionContextLike | null;\n\n  // ── cache-for-request.ts ──────────────────────────────────────────\n  /** Per-request cache for cacheForRequest(). Keyed by factory function reference. */\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  requestCache: WeakMap<(...args: any[]) => any, unknown>;\n} & VinextHeadersShimState &\n  I18nState &\n  NavigationState &\n  CacheState &\n  PrivateCacheState &\n  FetchCacheState &\n  RouterState &\n  HeadState &\n  RootParamsState;\n\n// ---------------------------------------------------------------------------\n// ALS setup — stored on globalThis via Symbol.for so all Vite environments\n// (RSC/SSR/client) share the same instance.\n// ---------------------------------------------------------------------------\n\nconst _REQUEST_CONTEXT_ALS_KEY = Symbol.for(\"vinext.requestContext.als\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = getOrCreateAls<UnifiedRequestContext>(\"vinext.unifiedRequestContext.als\");\n\nfunction _getInheritedExecutionContext(): ExecutionContextLike | null {\n  const unifiedStore = _als.getStore();\n  if (unifiedStore) return unifiedStore.executionContext;\n\n  const executionContextAls = _g[_REQUEST_CONTEXT_ALS_KEY] as\n    | AsyncLocalStorage<ExecutionContextLike | null>\n    | undefined;\n  return executionContextAls?.getStore() ?? null;\n}\n\n// ---------------------------------------------------------------------------\n// Public API\n// ---------------------------------------------------------------------------\n\n/**\n * Create a fresh `UnifiedRequestContext` with defaults for all fields.\n * Pass partial overrides for the fields you need to pre-populate.\n */\nexport function createRequestContext(opts?: Partial<UnifiedRequestContext>): UnifiedRequestContext {\n  return {\n    headersContext: null,\n    actionRevalidationKind: 0,\n    dynamicUsageDetected: false,\n    renderRequestApiUsage: new Set(),\n    invalidDynamicUsageError: null,\n    pendingSetCookies: [],\n    draftModeCookieHeader: null,\n    phase: \"render\",\n    i18nContext: null,\n    serverContext: null,\n    serverInsertedHTMLCallbacks: [],\n    requestScopedCacheLife: null,\n    unstableCacheObservations: new Map(),\n    unstableCacheRevalidation: \"foreground\",\n    _privateCache: null,\n    cacheableFetchUrls: new Set<string>(),\n    currentRequestTags: [],\n    currentFetchSoftTags: [],\n    currentFetchCacheMode: null,\n    dynamicFetchUrls: new Set<string>(),\n    isFetchDedupeActive: false,\n    currentFetchDedupeEntries: new Map(),\n    executionContext: _getInheritedExecutionContext(), // inherits from standalone ALS if present\n    requestCache: new WeakMap(),\n    ssrContext: null,\n    ssrHeadChildren: [],\n    documentInitialHead: [],\n    rootParams: null,\n    ...opts,\n  };\n}\n\n/**\n * Run `fn` within a unified request context scope.\n * All shim modules will read/write their state from `ctx` for the\n * duration of the call, including async continuations.\n */\nexport function runWithRequestContext<T>(\n  ctx: UnifiedRequestContext,\n  fn: () => Promise<T>,\n): Promise<T>;\nexport function runWithRequestContext<T>(\n  ctx: UnifiedRequestContext,\n  fn: () => T | Promise<T>,\n): T | Promise<T>;\nexport function runWithRequestContext<T>(\n  ctx: UnifiedRequestContext,\n  fn: () => T | Promise<T>,\n): T | Promise<T> {\n  return _als.run(ctx, fn);\n}\n\n/**\n * Run `fn` in a nested unified scope derived from the current request context.\n * Used by legacy runWith* wrappers to reset or override one sub-state while\n * preserving proper async isolation for continuations created inside `fn`.\n * The child scope is a shallow clone of the parent store, so untouched fields\n * keep sharing their existing references while overridden slices can be reset.\n *\n * @internal\n */\nexport function runWithUnifiedStateMutation<T>(\n  mutate: (ctx: UnifiedRequestContext) => void,\n  fn: () => Promise<T>,\n): Promise<T>;\nexport function runWithUnifiedStateMutation<T>(\n  mutate: (ctx: UnifiedRequestContext) => void,\n  fn: () => T | Promise<T>,\n): T | Promise<T>;\nexport function runWithUnifiedStateMutation<T>(\n  mutate: (ctx: UnifiedRequestContext) => void,\n  fn: () => T | Promise<T>,\n): T | Promise<T> {\n  const parentCtx = _als.getStore();\n  if (!parentCtx) return fn();\n\n  const childCtx = { ...parentCtx };\n  // NOTE: This is a shallow clone. Array fields (pendingSetCookies,\n  // serverInsertedHTMLCallbacks, currentRequestTags, ssrHeadChildren), Set\n  // fields (renderRequestApiUsage, cacheableFetchUrls, dynamicFetchUrls),\n  // Map fields (unstableCacheObservations, _privateCache),\n  // requestCache WeakMap, and object fields (headersContext,\n  // i18nContext, serverContext, ssrContext, executionContext,\n  // requestScopedCacheLife) still share references with the parent until\n  // replaced. requestCache is intentionally shared — nested scopes within\n  // the same request should see the same cached values. The mutate\n  // callback must replace those reference-typed slices (for example\n  // `ctx.currentRequestTags = []` or `ctx.renderRequestApiUsage = new Set()`)\n  // rather than mutating them in-place (for\n  // example `ctx.currentRequestTags.push(...)`) or the parent scope will\n  // observe those changes too. Keep this enumeration in sync with\n  // UnifiedRequestContext: when adding a new reference-typed field, add it\n  // here too and verify callers still follow the replace-not-mutate rule.\n  mutate(childCtx);\n  return _als.run(childCtx, fn);\n}\n\n/**\n * Get the current unified request context.\n * Returns the ALS store when inside a `runWithRequestContext()` scope,\n * or a fresh detached context otherwise. Unlike the legacy per-shim fallback\n * singletons, this detached value is ephemeral — mutations do not persist\n * across calls. This is intentional to prevent state leakage outside request\n * scopes.\n *\n * Only direct callers observe this detached fallback. Shim `_getState()`\n * helpers should continue to gate on `isInsideUnifiedScope()` and fall back\n * to their standalone ALS/fallback singletons outside the unified scope.\n * If called inside a standalone `runWithExecutionContext()` scope, the\n * detached context still reflects that inherited `executionContext`.\n */\nexport function getRequestContext(): UnifiedRequestContext {\n  return _als.getStore() ?? createRequestContext();\n}\n\n/**\n * Check whether the current execution is inside a `runWithRequestContext()` scope.\n * Shim modules use this to decide whether to read from the unified store\n * or fall back to their own standalone ALS.\n */\nexport function isInsideUnifiedScope(): boolean {\n  return _als.getStore() != null;\n}\n"],"mappings":";;AA8DA,MAAM,2BAA2B,OAAO,IAAI,4BAA4B;AACxE,MAAM,KAAK;AACX,MAAM,OAAO,eAAsC,mCAAmC;AAEtF,SAAS,gCAA6D;CACpE,MAAM,eAAe,KAAK,UAAU;CACpC,IAAI,cAAc,OAAO,aAAa;CAKtC,OAH4B,GAAG,2BAGH,UAAU,IAAI;;;;;;AAW5C,SAAgB,qBAAqB,MAA8D;CACjG,OAAO;EACL,gBAAgB;EAChB,wBAAwB;EACxB,sBAAsB;EACtB,uCAAuB,IAAI,KAAK;EAChC,0BAA0B;EAC1B,mBAAmB,EAAE;EACrB,uBAAuB;EACvB,OAAO;EACP,aAAa;EACb,eAAe;EACf,6BAA6B,EAAE;EAC/B,wBAAwB;EACxB,2CAA2B,IAAI,KAAK;EACpC,2BAA2B;EAC3B,eAAe;EACf,oCAAoB,IAAI,KAAa;EACrC,oBAAoB,EAAE;EACtB,sBAAsB,EAAE;EACxB,uBAAuB;EACvB,kCAAkB,IAAI,KAAa;EACnC,qBAAqB;EACrB,2CAA2B,IAAI,KAAK;EACpC,kBAAkB,+BAA+B;EACjD,8BAAc,IAAI,SAAS;EAC3B,YAAY;EACZ,iBAAiB,EAAE;EACnB,qBAAqB,EAAE;EACvB,YAAY;EACZ,GAAG;EACJ;;AAgBH,SAAgB,sBACd,KACA,IACgB;CAChB,OAAO,KAAK,IAAI,KAAK,GAAG;;AAoB1B,SAAgB,4BACd,QACA,IACgB;CAChB,MAAM,YAAY,KAAK,UAAU;CACjC,IAAI,CAAC,WAAW,OAAO,IAAI;CAE3B,MAAM,WAAW,EAAE,GAAG,WAAW;CAiBjC,OAAO,SAAS;CAChB,OAAO,KAAK,IAAI,UAAU,GAAG;;;;;;;;;;;;;;;;AAiB/B,SAAgB,oBAA2C;CACzD,OAAO,KAAK,UAAU,IAAI,sBAAsB;;;;;;;AAQlD,SAAgB,uBAAgC;CAC9C,OAAO,KAAK,UAAU,IAAI"}

package/dist/utils/client-build-manifest.d.ts

@@ -0,0 +1,15 @@
+import { BuildManifestChunk } from "./lazy-chunks.js";
+
+//#region src/utils/client-build-manifest.d.ts
+type ClientBuildManifest = Record<string, BuildManifestChunk>;
+declare function readClientBuildManifest(manifestPath: string): ClientBuildManifest | undefined;
+declare function findClientEntryFileFromManifest(buildManifest: ClientBuildManifest, assetBase: string): string | undefined;
+declare function findClientEntryFile(options: {
+  buildManifest?: ClientBuildManifest;
+  clientDir: string;
+  assetsSubdir: string;
+  assetBase: string;
+}): string | undefined;
+//#endregion
+export { findClientEntryFile, findClientEntryFileFromManifest, readClientBuildManifest };
+//# sourceMappingURL=client-build-manifest.d.ts.map

package/dist/utils/client-build-manifest.js

@@ -0,0 +1,54 @@
+import { isUnknownRecord } from "./record.js";
+import { manifestFileWithBase } from "./manifest-paths.js";
+import fs from "node:fs";
+import path from "node:path";
+//#region src/utils/client-build-manifest.ts
+const CLIENT_ENTRY_MARKERS = ["vinext-client-entry", "vinext-app-browser-entry"];
+function readClientBuildManifest(manifestPath) {
+	if (!fs.existsSync(manifestPath)) return void 0;
+	try {
+		const value = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
+		if (!isUnknownRecord(value)) return void 0;
+		const manifest = {};
+		for (const [key, entry] of Object.entries(value)) {
+			if (!isUnknownRecord(entry) || typeof entry.file !== "string") continue;
+			const imports = readStringArray(entry.imports);
+			const dynamicImports = readStringArray(entry.dynamicImports);
+			const css = readStringArray(entry.css);
+			const assets = readStringArray(entry.assets);
+			manifest[key] = {
+				file: entry.file,
+				...entry.isEntry === true ? { isEntry: true } : {},
+				...entry.isDynamicEntry === true ? { isDynamicEntry: true } : {},
+				...imports ? { imports } : {},
+				...dynamicImports ? { dynamicImports } : {},
+				...css ? { css } : {},
+				...assets ? { assets } : {}
+			};
+		}
+		return manifest;
+	} catch {
+		return;
+	}
+}
+function findClientEntryFileFromManifest(buildManifest, assetBase) {
+	const entries = Object.values(buildManifest).filter((entry) => entry.isEntry && entry.file);
+	const chosen = entries.find((entry) => CLIENT_ENTRY_MARKERS.some((marker) => entry.file.includes(marker))) ?? entries[0];
+	return chosen ? manifestFileWithBase(chosen.file, assetBase) : void 0;
+}
+function findClientEntryFileInAssetsDir(options) {
+	const assetsDir = path.join(options.clientDir, options.assetsSubdir);
+	if (!fs.existsSync(assetsDir)) return void 0;
+	const entry = fs.readdirSync(assetsDir).find((file) => CLIENT_ENTRY_MARKERS.some((marker) => file.includes(marker)) && file.endsWith(".js"));
+	return entry ? manifestFileWithBase(`${options.assetsSubdir}/${entry}`, options.assetBase) : void 0;
+}
+function findClientEntryFile(options) {
+	return (options.buildManifest ? findClientEntryFileFromManifest(options.buildManifest, options.assetBase) : void 0) ?? findClientEntryFileInAssetsDir(options);
+}
+function readStringArray(value) {
+	return Array.isArray(value) && value.every((item) => typeof item === "string") ? value : void 0;
+}
+//#endregion
+export { findClientEntryFile, findClientEntryFileFromManifest, readClientBuildManifest };
+
+//# sourceMappingURL=client-build-manifest.js.map

package/dist/utils/client-build-manifest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-build-manifest.js","names":[],"sources":["../../src/utils/client-build-manifest.ts"],"sourcesContent":["import fs from \"node:fs\";\nimport path from \"node:path\";\nimport { manifestFileWithBase } from \"./manifest-paths.js\";\nimport type { BuildManifestChunk } from \"./lazy-chunks.js\";\nimport { isUnknownRecord } from \"./record.js\";\n\ntype ClientBuildManifest = Record<string, BuildManifestChunk>;\n\nconst CLIENT_ENTRY_MARKERS = [\"vinext-client-entry\", \"vinext-app-browser-entry\"] as const;\n\nexport function readClientBuildManifest(manifestPath: string): ClientBuildManifest | undefined {\n  if (!fs.existsSync(manifestPath)) return undefined;\n\n  try {\n    const value: unknown = JSON.parse(fs.readFileSync(manifestPath, \"utf-8\"));\n    if (!isUnknownRecord(value)) return undefined;\n\n    const manifest: ClientBuildManifest = {};\n    for (const [key, entry] of Object.entries(value)) {\n      if (!isUnknownRecord(entry) || typeof entry.file !== \"string\") continue;\n\n      const imports = readStringArray(entry.imports);\n      const dynamicImports = readStringArray(entry.dynamicImports);\n      const css = readStringArray(entry.css);\n      const assets = readStringArray(entry.assets);\n      manifest[key] = {\n        file: entry.file,\n        ...(entry.isEntry === true ? { isEntry: true } : {}),\n        ...(entry.isDynamicEntry === true ? { isDynamicEntry: true } : {}),\n        ...(imports ? { imports } : {}),\n        ...(dynamicImports ? { dynamicImports } : {}),\n        ...(css ? { css } : {}),\n        ...(assets ? { assets } : {}),\n      };\n    }\n\n    return manifest;\n  } catch {\n    return undefined;\n  }\n}\n\nexport function findClientEntryFileFromManifest(\n  buildManifest: ClientBuildManifest,\n  assetBase: string,\n): string | undefined {\n  const entries = Object.values(buildManifest).filter((entry) => entry.isEntry && entry.file);\n  // A client build can emit more than one `isEntry` chunk (e.g. the client\n  // entry plus instrumentation or middleware entries), and the manifest's\n  // iteration order is not guaranteed to surface the client entry first.\n  // Prefer the chunk whose file carries a known client-entry marker — matching\n  // the precise on-disk scan in findClientEntryFileInAssetsDir — and only fall\n  // back to the first entry when nothing is marked.\n  const markedEntry = entries.find((entry) =>\n    CLIENT_ENTRY_MARKERS.some((marker) => entry.file.includes(marker)),\n  );\n  const chosen = markedEntry ?? entries[0];\n\n  return chosen ? manifestFileWithBase(chosen.file, assetBase) : undefined;\n}\n\nfunction findClientEntryFileInAssetsDir(options: {\n  clientDir: string;\n  assetsSubdir: string;\n  assetBase: string;\n}): string | undefined {\n  const assetsDir = path.join(options.clientDir, options.assetsSubdir);\n  if (!fs.existsSync(assetsDir)) return undefined;\n\n  const entry = fs\n    .readdirSync(assetsDir)\n    .find(\n      (file) =>\n        CLIENT_ENTRY_MARKERS.some((marker) => file.includes(marker)) && file.endsWith(\".js\"),\n    );\n\n  return entry\n    ? manifestFileWithBase(`${options.assetsSubdir}/${entry}`, options.assetBase)\n    : undefined;\n}\n\nexport function findClientEntryFile(options: {\n  buildManifest?: ClientBuildManifest;\n  clientDir: string;\n  assetsSubdir: string;\n  assetBase: string;\n}): string | undefined {\n  return (\n    (options.buildManifest\n      ? findClientEntryFileFromManifest(options.buildManifest, options.assetBase)\n      : undefined) ?? findClientEntryFileInAssetsDir(options)\n  );\n}\n\nfunction readStringArray(value: unknown): string[] | undefined {\n  return Array.isArray(value) && value.every((item): item is string => typeof item === \"string\")\n    ? value\n    : undefined;\n}\n"],"mappings":";;;;;AAQA,MAAM,uBAAuB,CAAC,uBAAuB,2BAA2B;AAEhF,SAAgB,wBAAwB,cAAuD;CAC7F,IAAI,CAAC,GAAG,WAAW,aAAa,EAAE,OAAO,KAAA;CAEzC,IAAI;EACF,MAAM,QAAiB,KAAK,MAAM,GAAG,aAAa,cAAc,QAAQ,CAAC;EACzE,IAAI,CAAC,gBAAgB,MAAM,EAAE,OAAO,KAAA;EAEpC,MAAM,WAAgC,EAAE;EACxC,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,MAAM,EAAE;GAChD,IAAI,CAAC,gBAAgB,MAAM,IAAI,OAAO,MAAM,SAAS,UAAU;GAE/D,MAAM,UAAU,gBAAgB,MAAM,QAAQ;GAC9C,MAAM,iBAAiB,gBAAgB,MAAM,eAAe;GAC5D,MAAM,MAAM,gBAAgB,MAAM,IAAI;GACtC,MAAM,SAAS,gBAAgB,MAAM,OAAO;GAC5C,SAAS,OAAO;IACd,MAAM,MAAM;IACZ,GAAI,MAAM,YAAY,OAAO,EAAE,SAAS,MAAM,GAAG,EAAE;IACnD,GAAI,MAAM,mBAAmB,OAAO,EAAE,gBAAgB,MAAM,GAAG,EAAE;IACjE,GAAI,UAAU,EAAE,SAAS,GAAG,EAAE;IAC9B,GAAI,iBAAiB,EAAE,gBAAgB,GAAG,EAAE;IAC5C,GAAI,MAAM,EAAE,KAAK,GAAG,EAAE;IACtB,GAAI,SAAS,EAAE,QAAQ,GAAG,EAAE;IAC7B;;EAGH,OAAO;SACD;EACN;;;AAIJ,SAAgB,gCACd,eACA,WACoB;CACpB,MAAM,UAAU,OAAO,OAAO,cAAc,CAAC,QAAQ,UAAU,MAAM,WAAW,MAAM,KAAK;CAU3F,MAAM,SAHc,QAAQ,MAAM,UAChC,qBAAqB,MAAM,WAAW,MAAM,KAAK,SAAS,OAAO,CAAC,CAE1C,IAAI,QAAQ;CAEtC,OAAO,SAAS,qBAAqB,OAAO,MAAM,UAAU,GAAG,KAAA;;AAGjE,SAAS,+BAA+B,SAIjB;CACrB,MAAM,YAAY,KAAK,KAAK,QAAQ,WAAW,QAAQ,aAAa;CACpE,IAAI,CAAC,GAAG,WAAW,UAAU,EAAE,OAAO,KAAA;CAEtC,MAAM,QAAQ,GACX,YAAY,UAAU,CACtB,MACE,SACC,qBAAqB,MAAM,WAAW,KAAK,SAAS,OAAO,CAAC,IAAI,KAAK,SAAS,MAAM,CACvF;CAEH,OAAO,QACH,qBAAqB,GAAG,QAAQ,aAAa,GAAG,SAAS,QAAQ,UAAU,GAC3E,KAAA;;AAGN,SAAgB,oBAAoB,SAKb;CACrB,QACG,QAAQ,gBACL,gCAAgC,QAAQ,eAAe,QAAQ,UAAU,GACzE,KAAA,MAAc,+BAA+B,QAAQ;;AAI7D,SAAS,gBAAgB,OAAsC;CAC7D,OAAO,MAAM,QAAQ,MAAM,IAAI,MAAM,OAAO,SAAyB,OAAO,SAAS,SAAS,GAC1F,QACA,KAAA"}

package/dist/utils/hash.js

@@ -14,7 +14,7 @@ function fnv1a64(input) {
 		h2 ^= input.charCodeAt(i);
 		h2 = h2 * 16777619 >>> 0;
 	}
-	return h1.toString(36) + h2.toString(36);
+	return h1.toString(16).padStart(8, "0") + h2.toString(16).padStart(8, "0");
 }
 //#endregion
 export { fnv1a64 };

package/dist/utils/hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"hash.js","names":[],"sources":["../../src/utils/hash.ts"],"sourcesContent":["/**\n * FNV-1a hash producing a 64-bit result (two 32-bit rounds with different seeds).\n * Used for deterministic key generation where collisions must be rare.\n */\nexport function fnv1a64(input: string): string {\n  // First 32-bit round with standard FNV offset basis\n  let h1 = 0x811c9dc5;\n  for (let i = 0; i < input.length; i++) {\n    h1 ^= input.charCodeAt(i);\n    h1 = (h1 * 0x01000193) >>> 0;\n  }\n  // Second 32-bit round with different seed\n  let h2 = 0x050c5d1f;\n  for (let i = 0; i < input.length; i++) {\n    h2 ^= input.charCodeAt(i);\n    h2 = (h2 * 0x01000193) >>> 0;\n  }\n  return h1.toString(36) + h2.toString(36);\n}\n"],"mappings":";;;;;AAIA,SAAgB,QAAQ,OAAuB;CAE7C,IAAI,KAAK;CACT,KAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;EACrC,MAAM,MAAM,WAAW,EAAE;EACzB,KAAM,KAAK,aAAgB;;CAG7B,IAAI,KAAK;CACT,KAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;EACrC,MAAM,MAAM,WAAW,EAAE;EACzB,KAAM,KAAK,aAAgB;;CAE7B,OAAO,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS,GAAG"}
+{"version":3,"file":"hash.js","names":[],"sources":["../../src/utils/hash.ts"],"sourcesContent":["/**\n * FNV-1a hash producing a 64-bit result (two 32-bit rounds with different seeds).\n * Used for deterministic key generation where collisions must be rare.\n */\nexport function fnv1a64(input: string): string {\n  // First 32-bit round with standard FNV offset basis\n  let h1 = 0x811c9dc5;\n  for (let i = 0; i < input.length; i++) {\n    h1 ^= input.charCodeAt(i);\n    h1 = (h1 * 0x01000193) >>> 0;\n  }\n  // Second 32-bit round with different seed\n  let h2 = 0x050c5d1f;\n  for (let i = 0; i < input.length; i++) {\n    h2 ^= input.charCodeAt(i);\n    h2 = (h2 * 0x01000193) >>> 0;\n  }\n  return h1.toString(16).padStart(8, \"0\") + h2.toString(16).padStart(8, \"0\");\n}\n"],"mappings":";;;;;AAIA,SAAgB,QAAQ,OAAuB;CAE7C,IAAI,KAAK;CACT,KAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;EACrC,MAAM,MAAM,WAAW,EAAE;EACzB,KAAM,KAAK,aAAgB;;CAG7B,IAAI,KAAK;CACT,KAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;EACrC,MAAM,MAAM,WAAW,EAAE;EACzB,KAAM,KAAK,aAAgB;;CAE7B,OAAO,GAAG,SAAS,GAAG,CAAC,SAAS,GAAG,IAAI,GAAG,GAAG,SAAS,GAAG,CAAC,SAAS,GAAG,IAAI"}

package/dist/utils/lazy-chunks.d.ts

@@ -30,5 +30,5 @@ type BuildManifestChunk = {
  */
 declare function computeLazyChunks(buildManifest: Record<string, BuildManifestChunk>): string[];
 //#endregion
-export { computeLazyChunks };
+export { BuildManifestChunk, computeLazyChunks };
 //# sourceMappingURL=lazy-chunks.d.ts.map

package/dist/utils/lazy-chunks.js.map

@@ -1 +1 @@
-{"version":3,"file":"lazy-chunks.js","names":[],"sources":["../../src/utils/lazy-chunks.ts"],"sourcesContent":["/**\n * Build-manifest chunk metadata used to compute lazy chunks.\n */\ntype BuildManifestChunk = {\n  file: string;\n  isEntry?: boolean;\n  isDynamicEntry?: boolean;\n  imports?: string[];\n  dynamicImports?: string[];\n  css?: string[];\n  assets?: string[];\n};\n\n/**\n * Compute the set of chunk filenames that are ONLY reachable through dynamic\n * imports (i.e. behind React.lazy(), next/dynamic, or manual import()).\n *\n * These chunks should NOT be modulepreloaded in the HTML — they will be\n * fetched on demand when the dynamic import executes.\n *\n * Algorithm: Starting from all entry chunks in the build manifest, walk the\n * static `imports` tree (breadth-first). Any chunk file NOT reached by this\n * walk is only reachable through `dynamicImports` and is therefore \"lazy\".\n *\n * @param buildManifest - Vite's build manifest (manifest.json), which is a\n *   Record<string, ManifestChunk> where each chunk has `file`, `imports`,\n *   `dynamicImports`, `isEntry`, and `isDynamicEntry` fields.\n * @returns Array of chunk filenames (e.g. \"_next/static/mermaid-NOHMQCX5.js\") that\n *   should be excluded from modulepreload hints.\n */\nexport function computeLazyChunks(buildManifest: Record<string, BuildManifestChunk>): string[] {\n  // Collect all chunk files that are statically reachable from entries\n  const eagerFiles = new Set<string>();\n  const visited = new Set<string>();\n  const queue: string[] = [];\n\n  // Start BFS from all entry chunks\n  for (const key of Object.keys(buildManifest)) {\n    const chunk = buildManifest[key];\n    if (chunk.isEntry) {\n      queue.push(key);\n    }\n  }\n\n  while (queue.length > 0) {\n    const key = queue.shift();\n    if (!key || visited.has(key)) continue;\n    visited.add(key);\n\n    const chunk = buildManifest[key];\n    if (!chunk) continue;\n\n    // Mark this chunk's file as eager\n    eagerFiles.add(chunk.file);\n\n    // Also mark its CSS as eager (CSS should always be preloaded to avoid FOUC)\n    if (chunk.css) {\n      for (const cssFile of chunk.css) {\n        eagerFiles.add(cssFile);\n      }\n    }\n\n    // Follow only static imports — NOT dynamicImports\n    if (chunk.imports) {\n      for (const imp of chunk.imports) {\n        if (!visited.has(imp)) {\n          queue.push(imp);\n        }\n      }\n    }\n  }\n\n  // Any JS file in the manifest that's NOT in eagerFiles is a lazy chunk\n  const lazyChunks: string[] = [];\n  const allFiles = new Set<string>();\n  for (const key of Object.keys(buildManifest)) {\n    const chunk = buildManifest[key];\n    if (chunk.file && !allFiles.has(chunk.file)) {\n      allFiles.add(chunk.file);\n      if (!eagerFiles.has(chunk.file) && chunk.file.endsWith(\".js\")) {\n        lazyChunks.push(chunk.file);\n      }\n    }\n  }\n\n  return lazyChunks;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AA8BA,SAAgB,kBAAkB,eAA6D;CAE7F,MAAM,6BAAa,IAAI,KAAa;CACpC,MAAM,0BAAU,IAAI,KAAa;CACjC,MAAM,QAAkB,EAAE;CAG1B,KAAK,MAAM,OAAO,OAAO,KAAK,cAAc,EAE1C,IADc,cAAc,KAClB,SACR,MAAM,KAAK,IAAI;CAInB,OAAO,MAAM,SAAS,GAAG;EACvB,MAAM,MAAM,MAAM,OAAO;EACzB,IAAI,CAAC,OAAO,QAAQ,IAAI,IAAI,EAAE;EAC9B,QAAQ,IAAI,IAAI;EAEhB,MAAM,QAAQ,cAAc;EAC5B,IAAI,CAAC,OAAO;EAGZ,WAAW,IAAI,MAAM,KAAK;EAG1B,IAAI,MAAM,KACR,KAAK,MAAM,WAAW,MAAM,KAC1B,WAAW,IAAI,QAAQ;EAK3B,IAAI,MAAM;QACH,MAAM,OAAO,MAAM,SACtB,IAAI,CAAC,QAAQ,IAAI,IAAI,EACnB,MAAM,KAAK,IAAI;;;CAOvB,MAAM,aAAuB,EAAE;CAC/B,MAAM,2BAAW,IAAI,KAAa;CAClC,KAAK,MAAM,OAAO,OAAO,KAAK,cAAc,EAAE;EAC5C,MAAM,QAAQ,cAAc;EAC5B,IAAI,MAAM,QAAQ,CAAC,SAAS,IAAI,MAAM,KAAK,EAAE;GAC3C,SAAS,IAAI,MAAM,KAAK;GACxB,IAAI,CAAC,WAAW,IAAI,MAAM,KAAK,IAAI,MAAM,KAAK,SAAS,MAAM,EAC3D,WAAW,KAAK,MAAM,KAAK;;;CAKjC,OAAO"}
+{"version":3,"file":"lazy-chunks.js","names":[],"sources":["../../src/utils/lazy-chunks.ts"],"sourcesContent":["/**\n * Build-manifest chunk metadata used to compute lazy chunks.\n */\nexport type BuildManifestChunk = {\n  file: string;\n  isEntry?: boolean;\n  isDynamicEntry?: boolean;\n  imports?: string[];\n  dynamicImports?: string[];\n  css?: string[];\n  assets?: string[];\n};\n\n/**\n * Compute the set of chunk filenames that are ONLY reachable through dynamic\n * imports (i.e. behind React.lazy(), next/dynamic, or manual import()).\n *\n * These chunks should NOT be modulepreloaded in the HTML — they will be\n * fetched on demand when the dynamic import executes.\n *\n * Algorithm: Starting from all entry chunks in the build manifest, walk the\n * static `imports` tree (breadth-first). Any chunk file NOT reached by this\n * walk is only reachable through `dynamicImports` and is therefore \"lazy\".\n *\n * @param buildManifest - Vite's build manifest (manifest.json), which is a\n *   Record<string, ManifestChunk> where each chunk has `file`, `imports`,\n *   `dynamicImports`, `isEntry`, and `isDynamicEntry` fields.\n * @returns Array of chunk filenames (e.g. \"_next/static/mermaid-NOHMQCX5.js\") that\n *   should be excluded from modulepreload hints.\n */\nexport function computeLazyChunks(buildManifest: Record<string, BuildManifestChunk>): string[] {\n  // Collect all chunk files that are statically reachable from entries\n  const eagerFiles = new Set<string>();\n  const visited = new Set<string>();\n  const queue: string[] = [];\n\n  // Start BFS from all entry chunks\n  for (const key of Object.keys(buildManifest)) {\n    const chunk = buildManifest[key];\n    if (chunk.isEntry) {\n      queue.push(key);\n    }\n  }\n\n  while (queue.length > 0) {\n    const key = queue.shift();\n    if (!key || visited.has(key)) continue;\n    visited.add(key);\n\n    const chunk = buildManifest[key];\n    if (!chunk) continue;\n\n    // Mark this chunk's file as eager\n    eagerFiles.add(chunk.file);\n\n    // Also mark its CSS as eager (CSS should always be preloaded to avoid FOUC)\n    if (chunk.css) {\n      for (const cssFile of chunk.css) {\n        eagerFiles.add(cssFile);\n      }\n    }\n\n    // Follow only static imports — NOT dynamicImports\n    if (chunk.imports) {\n      for (const imp of chunk.imports) {\n        if (!visited.has(imp)) {\n          queue.push(imp);\n        }\n      }\n    }\n  }\n\n  // Any JS file in the manifest that's NOT in eagerFiles is a lazy chunk\n  const lazyChunks: string[] = [];\n  const allFiles = new Set<string>();\n  for (const key of Object.keys(buildManifest)) {\n    const chunk = buildManifest[key];\n    if (chunk.file && !allFiles.has(chunk.file)) {\n      allFiles.add(chunk.file);\n      if (!eagerFiles.has(chunk.file) && chunk.file.endsWith(\".js\")) {\n        lazyChunks.push(chunk.file);\n      }\n    }\n  }\n\n  return lazyChunks;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AA8BA,SAAgB,kBAAkB,eAA6D;CAE7F,MAAM,6BAAa,IAAI,KAAa;CACpC,MAAM,0BAAU,IAAI,KAAa;CACjC,MAAM,QAAkB,EAAE;CAG1B,KAAK,MAAM,OAAO,OAAO,KAAK,cAAc,EAE1C,IADc,cAAc,KAClB,SACR,MAAM,KAAK,IAAI;CAInB,OAAO,MAAM,SAAS,GAAG;EACvB,MAAM,MAAM,MAAM,OAAO;EACzB,IAAI,CAAC,OAAO,QAAQ,IAAI,IAAI,EAAE;EAC9B,QAAQ,IAAI,IAAI;EAEhB,MAAM,QAAQ,cAAc;EAC5B,IAAI,CAAC,OAAO;EAGZ,WAAW,IAAI,MAAM,KAAK;EAG1B,IAAI,MAAM,KACR,KAAK,MAAM,WAAW,MAAM,KAC1B,WAAW,IAAI,QAAQ;EAK3B,IAAI,MAAM;QACH,MAAM,OAAO,MAAM,SACtB,IAAI,CAAC,QAAQ,IAAI,IAAI,EACnB,MAAM,KAAK,IAAI;;;CAOvB,MAAM,aAAuB,EAAE;CAC/B,MAAM,2BAAW,IAAI,KAAa;CAClC,KAAK,MAAM,OAAO,OAAO,KAAK,cAAc,EAAE;EAC5C,MAAM,QAAQ,cAAc;EAC5B,IAAI,MAAM,QAAQ,CAAC,SAAS,IAAI,MAAM,KAAK,EAAE;GAC3C,SAAS,IAAI,MAAM,KAAK;GACxB,IAAI,CAAC,WAAW,IAAI,MAAM,KAAK,IAAI,MAAM,KAAK,SAAS,MAAM,EAC3D,WAAW,KAAK,MAAM,KAAK;;;CAKjC,OAAO"}

package/dist/utils/vite-version.d.ts

@@ -0,0 +1,11 @@
+//#region src/utils/vite-version.d.ts
+/**
+ * Detect Vite major version at runtime by resolving from cwd.
+ * The plugin may be installed in a workspace root with Vite 7 but used
+ * by a project that has Vite 8 — so we resolve from cwd, not from
+ * the plugin's own location.
+ */
+declare function getViteMajorVersion(): number;
+//#endregion
+export { getViteMajorVersion };
+//# sourceMappingURL=vite-version.d.ts.map

package/dist/utils/vite-version.js

@@ -0,0 +1,36 @@
+import { createRequire } from "node:module";
+import path from "node:path";
+//#region src/utils/vite-version.ts
+/**
+* Vite major-version detection.
+*
+* Several vinext behaviors depend on whether the host project is running Vite 8
+* (Rolldown-based, with native `resolve.tsconfigPaths`, `oxc` transforms, and
+* `rolldownOptions`) or Vite 7 (Rollup/esbuild). This helper centralizes the
+* detection so the Vite-major gate is computed the same way everywhere.
+*/
+/**
+* Detect Vite major version at runtime by resolving from cwd.
+* The plugin may be installed in a workspace root with Vite 7 but used
+* by a project that has Vite 8 — so we resolve from cwd, not from
+* the plugin's own location.
+*/
+function getViteMajorVersion() {
+	try {
+		const vitePkg = createRequire(path.join(process.cwd(), "package.json"))("vite/package.json");
+		const viteMajor = parseInt(vitePkg?.version, 10);
+		if (vitePkg?.name === "vite" && Number.isFinite(viteMajor)) return viteMajor;
+		const bundledViteMajor = parseInt(vitePkg?.bundledVersions?.vite, 10);
+		if (Number.isFinite(bundledViteMajor)) return bundledViteMajor;
+		console.warn(`[vinext] Could not determine Vite major version from ${vitePkg?.name ?? "vite/package.json"}; assuming Vite 7`);
+		return 7;
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		console.warn(`[vinext] Failed to resolve vite/package.json (${message}); assuming Vite 7`);
+		return 7;
+	}
+}
+//#endregion
+export { getViteMajorVersion };
+
+//# sourceMappingURL=vite-version.js.map

package/dist/utils/vite-version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-version.js","names":[],"sources":["../../src/utils/vite-version.ts"],"sourcesContent":["/**\n * Vite major-version detection.\n *\n * Several vinext behaviors depend on whether the host project is running Vite 8\n * (Rolldown-based, with native `resolve.tsconfigPaths`, `oxc` transforms, and\n * `rolldownOptions`) or Vite 7 (Rollup/esbuild). This helper centralizes the\n * detection so the Vite-major gate is computed the same way everywhere.\n */\nimport path from \"node:path\";\nimport { createRequire } from \"node:module\";\n\n/**\n * Detect Vite major version at runtime by resolving from cwd.\n * The plugin may be installed in a workspace root with Vite 7 but used\n * by a project that has Vite 8 — so we resolve from cwd, not from\n * the plugin's own location.\n */\nexport function getViteMajorVersion(): number {\n  try {\n    const require = createRequire(path.join(process.cwd(), \"package.json\"));\n    const vitePkg = require(\"vite/package.json\");\n\n    const viteMajor = parseInt(vitePkg?.version, 10);\n    if (vitePkg?.name === \"vite\" && Number.isFinite(viteMajor)) {\n      return viteMajor;\n    }\n\n    const bundledViteMajor = parseInt(vitePkg?.bundledVersions?.vite, 10);\n    if (Number.isFinite(bundledViteMajor)) {\n      return bundledViteMajor;\n    }\n\n    // npm aliases like `vite: npm:@voidzero-dev/vite-plus-core@...` expose the\n    // aliased package.json, whose own version is not Vite's version.\n    console.warn(\n      `[vinext] Could not determine Vite major version from ${vitePkg?.name ?? \"vite/package.json\"}; assuming Vite 7`,\n    );\n    return 7;\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    console.warn(`[vinext] Failed to resolve vite/package.json (${message}); assuming Vite 7`);\n    return 7;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAiBA,SAAgB,sBAA8B;CAC5C,IAAI;EAEF,MAAM,UADU,cAAc,KAAK,KAAK,QAAQ,KAAK,EAAE,eAAe,CAC/C,CAAC,oBAAoB;EAE5C,MAAM,YAAY,SAAS,SAAS,SAAS,GAAG;EAChD,IAAI,SAAS,SAAS,UAAU,OAAO,SAAS,UAAU,EACxD,OAAO;EAGT,MAAM,mBAAmB,SAAS,SAAS,iBAAiB,MAAM,GAAG;EACrE,IAAI,OAAO,SAAS,iBAAiB,EACnC,OAAO;EAKT,QAAQ,KACN,wDAAwD,SAAS,QAAQ,oBAAoB,mBAC9F;EACD,OAAO;UACA,OAAO;EACd,MAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;EACtE,QAAQ,KAAK,iDAAiD,QAAQ,oBAAoB;EAC1F,OAAO"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "0.0.54",
+  "version": "0.0.55",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {
@@ -81,7 +81,7 @@
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^6.0.1",
-    "@vitejs/plugin-rsc": "^0.5.26",
+    "@vitejs/plugin-rsc": "^0.5.27",
     "react-server-dom-webpack": "^19.2.6",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.1.22",
     "vite-plus": "0.1.22"