vinext 0.0.31 → 0.0.33

package/dist/server/app-ssr-entry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-ssr-entry.js","names":["createReactElement"],"sources":["../../src/server/app-ssr-entry.ts"],"sourcesContent":["/// <reference types=\"@vitejs/plugin-rsc/types\" />\n\nimport type { ReactNode } from \"react\";\nimport { Fragment, createElement as createReactElement } from \"react\";\nimport { createFromReadableStream } from \"@vitejs/plugin-rsc/ssr\";\nimport { renderToReadableStream, renderToStaticMarkup } from \"react-dom/server.edge\";\nimport * as clientReferences from \"virtual:vite-rsc/client-references\";\nimport type { NavigationContext } from \"../shims/navigation.js\";\nimport {\n  ServerInsertedHTMLContext,\n  clearServerInsertedHTML,\n  flushServerInsertedHTML,\n  setNavigationContext,\n  useServerInsertedHTML,\n} from \"../shims/navigation.js\";\nimport { runWithNavigationContext } from \"../shims/navigation-state.js\";\nimport { safeJsonStringify } from \"./html.js\";\nimport { createRscEmbedTransform, createTickBufferedTransform } from \"./app-ssr-stream.js\";\n\nexport interface FontPreload {\n  href: string;\n  type: string;\n}\n\nexport interface FontData {\n  links?: string[];\n  styles?: string[];\n  preloads?: FontPreload[];\n}\n\ntype ClientRequire = (id: string) => Promise<unknown>;\n\nlet clientRefsPreloaded = false;\n\nfunction getClientReferenceRequire(): ClientRequire | undefined {\n  return (\n    globalThis as typeof globalThis & {\n      __vite_rsc_client_require__?: ClientRequire;\n    }\n  ).__vite_rsc_client_require__;\n}\n\nasync function preloadClientReferences(): Promise<void> {\n  if (clientRefsPreloaded) return;\n\n  const refs = (clientReferences as { default?: Record<string, unknown> }).default;\n  const clientRequire = getClientReferenceRequire();\n  if (!refs || !clientRequire) return;\n\n  await Promise.all(\n    Object.keys(refs).map((id) =>\n      clientRequire(id).catch((error) => {\n        if (process.env.NODE_ENV !== \"production\") {\n          console.warn(\"[vinext] failed to preload client ref:\", id, error);\n        }\n      }),\n    ),\n  );\n\n  clientRefsPreloaded = true;\n}\n\nfunction escapeHtmlAttr(value: string): string {\n  return value.replace(/&/g, \"&amp;\").replace(/\"/g, \"&quot;\");\n}\n\nfunction ssrErrorDigest(input: string): string {\n  let hash = 5381;\n  for (let i = input.length - 1; i >= 0; i--) {\n    hash = (hash * 33) ^ input.charCodeAt(i);\n  }\n  return (hash >>> 0).toString();\n}\n\nfunction getErrorMessage(error: unknown): string {\n  if (error instanceof Error) return error.message;\n  if (typeof error === \"string\") return error;\n  return Object.prototype.toString.call(error);\n}\n\nfunction renderInsertedHtml(insertedElements: readonly unknown[]): string {\n  let insertedHTML = \"\";\n\n  for (const element of insertedElements) {\n    try {\n      insertedHTML += renderToStaticMarkup(\n        createReactElement(Fragment, null, element as ReactNode),\n      );\n    } catch {\n      // Ignore individual callback failures so the rest of the page can render.\n    }\n  }\n\n  return insertedHTML;\n}\n\nfunction renderFontHtml(fontData?: FontData): string {\n  if (!fontData) return \"\";\n\n  let fontHTML = \"\";\n\n  for (const url of fontData.links ?? []) {\n    fontHTML += `<link rel=\"stylesheet\" href=\"${escapeHtmlAttr(url)}\" />\\n`;\n  }\n\n  for (const preload of fontData.preloads ?? []) {\n    fontHTML += `<link rel=\"preload\" href=\"${escapeHtmlAttr(preload.href)}\" as=\"font\" type=\"${escapeHtmlAttr(preload.type)}\" crossorigin />\\n`;\n  }\n\n  if (fontData.styles && fontData.styles.length > 0) {\n    fontHTML += `<style data-vinext-fonts>${fontData.styles.join(\"\\n\")}</style>\\n`;\n  }\n\n  return fontHTML;\n}\n\nfunction extractModulePreloadHtml(bootstrapScriptContent?: string): string {\n  if (!bootstrapScriptContent) return \"\";\n\n  const match = bootstrapScriptContent.match(/import\\(\"([^\"]+)\"\\)/);\n  if (!match?.[1]) return \"\";\n\n  return `<link rel=\"modulepreload\" href=\"${escapeHtmlAttr(match[1])}\" />\\n`;\n}\n\nfunction buildHeadInjectionHtml(\n  navContext: NavigationContext | null,\n  bootstrapScriptContent: string | undefined,\n  insertedHTML: string,\n  fontHTML: string,\n): string {\n  const paramsScript =\n    \"<script>self.__VINEXT_RSC_PARAMS__=\" +\n    safeJsonStringify(navContext?.params ?? {}) +\n    \"</script>\";\n  const navPayload = {\n    pathname: navContext?.pathname ?? \"/\",\n    searchParams: navContext?.searchParams ? [...navContext.searchParams.entries()] : [],\n  };\n  const navScript =\n    \"<script>self.__VINEXT_RSC_NAV__=\" + safeJsonStringify(navPayload) + \"</script>\";\n\n  return (\n    paramsScript +\n    navScript +\n    extractModulePreloadHtml(bootstrapScriptContent) +\n    insertedHTML +\n    fontHTML\n  );\n}\n\nexport async function handleSsr(\n  rscStream: ReadableStream<Uint8Array>,\n  navContext: NavigationContext | null,\n  fontData?: FontData,\n): Promise<ReadableStream<Uint8Array>> {\n  return runWithNavigationContext(async () => {\n    await preloadClientReferences();\n\n    if (navContext) {\n      setNavigationContext(navContext);\n    }\n\n    clearServerInsertedHTML();\n\n    try {\n      const [ssrStream, embedStream] = rscStream.tee();\n      const rscEmbed = createRscEmbedTransform(embedStream);\n\n      let flightRoot: Promise<unknown> | null = null;\n\n      function VinextFlightRoot(): ReactNode {\n        if (!flightRoot) {\n          flightRoot = createFromReadableStream(ssrStream);\n        }\n        return flightRoot as unknown as ReactNode;\n      }\n\n      const root = createReactElement(VinextFlightRoot);\n      const ssrRoot = ServerInsertedHTMLContext\n        ? createReactElement(\n            ServerInsertedHTMLContext.Provider,\n            { value: useServerInsertedHTML },\n            root,\n          )\n        : root;\n\n      const bootstrapScriptContent = await import.meta.viteRsc.loadBootstrapScriptContent(\"index\");\n\n      const htmlStream = await renderToReadableStream(ssrRoot, {\n        bootstrapScriptContent,\n        onError(error) {\n          if (error && typeof error === \"object\" && \"digest\" in error) {\n            return String(error.digest);\n          }\n\n          if (process.env.NODE_ENV === \"production\" && error) {\n            const message = getErrorMessage(error);\n            const stack = error instanceof Error ? (error.stack ?? \"\") : \"\";\n            return ssrErrorDigest(message + stack);\n          }\n\n          return undefined;\n        },\n      });\n\n      const insertedHTML = renderInsertedHtml(flushServerInsertedHTML());\n      const fontHTML = renderFontHtml(fontData);\n      const injectHTML = buildHeadInjectionHtml(\n        navContext,\n        bootstrapScriptContent,\n        insertedHTML,\n        fontHTML,\n      );\n\n      return htmlStream.pipeThrough(createTickBufferedTransform(rscEmbed, injectHTML));\n    } finally {\n      setNavigationContext(null);\n      clearServerInsertedHTML();\n    }\n  }) as Promise<ReadableStream<Uint8Array>>;\n}\n\nexport default {\n  async fetch(request: Request): Promise<Response> {\n    const url = new URL(request.url);\n    if (url.pathname.startsWith(\"//\")) {\n      return new Response(\"404 Not Found\", { status: 404 });\n    }\n\n    const rscModule = await import.meta.viteRsc.loadModule<{\n      default(request: Request): Promise<Response | string | null | undefined>;\n    }>(\"rsc\", \"index\");\n    const result = await rscModule.default(request);\n\n    if (result instanceof Response) {\n      return result;\n    }\n\n    if (result == null) {\n      return new Response(\"Not Found\", { status: 404 });\n    }\n\n    return new Response(String(result), { status: 200 });\n  },\n};\n"],"mappings":"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"}

package/dist/server/app-ssr-stream.d.ts

@@ -0,0 +1,30 @@
+//#region src/server/app-ssr-stream.d.ts
+interface RscEmbedTransform {
+  flush(): string;
+  finalize(): Promise<string>;
+}
+/**
+ * Fix invalid preload "as" values in RSC Flight hint lines before they reach
+ * the client. React Flight emits HL hints with as="stylesheet" for CSS, but
+ * the HTML spec requires as="style" for <link rel="preload">.
+ */
+declare function fixFlightHints(text: string): string;
+/**
+ * Create a helper that progressively embeds RSC chunks as inline <script> tags.
+ * The browser entry turns the embedded text chunks back into Uint8Array data.
+ */
+declare function createRscEmbedTransform(embedStream: ReadableStream<Uint8Array>): RscEmbedTransform;
+/**
+ * Fix invalid preload "as" values in server-rendered HTML.
+ * React Fizz emits <link rel="preload" as="stylesheet"> for CSS, but the
+ * HTML spec requires as="style" for <link rel="preload">.
+ */
+declare function fixPreloadAs(html: string): string;
+/**
+ * Create the tick-buffered HTML transform that injects RSC scripts between
+ * React Fizz flush cycles without corrupting split HTML chunks.
+ */
+declare function createTickBufferedTransform(rscEmbed: RscEmbedTransform, injectHTML?: string): TransformStream<Uint8Array, Uint8Array>;
+//#endregion
+export { RscEmbedTransform, createRscEmbedTransform, createTickBufferedTransform, fixFlightHints, fixPreloadAs };
+//# sourceMappingURL=app-ssr-stream.d.ts.map

package/dist/server/app-ssr-stream.js

@@ -0,0 +1,116 @@
+import { safeJsonStringify } from "./html.js";
+//#region src/server/app-ssr-stream.ts
+/**
+* Fix invalid preload "as" values in RSC Flight hint lines before they reach
+* the client. React Flight emits HL hints with as="stylesheet" for CSS, but
+* the HTML spec requires as="style" for <link rel="preload">.
+*/
+function fixFlightHints(text) {
+	return text.replace(/(\d+:HL\[.*?),"stylesheet"(\]|,)/g, "$1,\"style\"$2");
+}
+/**
+* Create a helper that progressively embeds RSC chunks as inline <script> tags.
+* The browser entry turns the embedded text chunks back into Uint8Array data.
+*/
+function createRscEmbedTransform(embedStream) {
+	const reader = embedStream.getReader();
+	const decoder = new TextDecoder();
+	let pendingChunks = [];
+	let reading = false;
+	async function pumpReader() {
+		if (reading) return;
+		reading = true;
+		try {
+			while (true) {
+				const result = await reader.read();
+				if (result.done) break;
+				const text = decoder.decode(result.value, { stream: true });
+				pendingChunks.push(fixFlightHints(text));
+			}
+		} catch (error) {
+			if (process.env.NODE_ENV !== "production") console.warn("[vinext] RSC embed stream read error:", error);
+		} finally {
+			reading = false;
+		}
+	}
+	const pumpPromise = pumpReader();
+	return {
+		flush() {
+			if (pendingChunks.length === 0) return "";
+			const chunks = pendingChunks;
+			pendingChunks = [];
+			let scripts = "";
+			for (const chunk of chunks) scripts += "<script>self.__VINEXT_RSC_CHUNKS__=self.__VINEXT_RSC_CHUNKS__||[];self.__VINEXT_RSC_CHUNKS__.push(" + safeJsonStringify(chunk) + ")<\/script>";
+			return scripts;
+		},
+		async finalize() {
+			await pumpPromise;
+			let scripts = this.flush();
+			scripts += "<script>self.__VINEXT_RSC_DONE__=true<\/script>";
+			return scripts;
+		}
+	};
+}
+/**
+* Fix invalid preload "as" values in server-rendered HTML.
+* React Fizz emits <link rel="preload" as="stylesheet"> for CSS, but the
+* HTML spec requires as="style" for <link rel="preload">.
+*/
+function fixPreloadAs(html) {
+	return html.replace(/<link(?=[^>]*\srel="preload")[^>]*>/g, (tag) => {
+		return tag.replace(" as=\"stylesheet\"", " as=\"style\"");
+	});
+}
+/**
+* Create the tick-buffered HTML transform that injects RSC scripts between
+* React Fizz flush cycles without corrupting split HTML chunks.
+*/
+function createTickBufferedTransform(rscEmbed, injectHTML = "") {
+	const decoder = new TextDecoder();
+	const encoder = new TextEncoder();
+	let injected = false;
+	let buffered = [];
+	let timeoutId = null;
+	const flushBuffered = (controller) => {
+		for (const chunk of buffered) {
+			if (!injected) {
+				const headEnd = chunk.indexOf("</head>");
+				if (headEnd !== -1) {
+					const before = chunk.slice(0, headEnd);
+					const after = chunk.slice(headEnd);
+					controller.enqueue(encoder.encode(before + injectHTML + after));
+					injected = true;
+					continue;
+				}
+			}
+			controller.enqueue(encoder.encode(chunk));
+		}
+		buffered = [];
+	};
+	return new TransformStream({
+		transform(chunk, controller) {
+			buffered.push(fixPreloadAs(decoder.decode(chunk, { stream: true })));
+			if (timeoutId !== null) return;
+			timeoutId = setTimeout(() => {
+				flushBuffered(controller);
+				const rscScripts = rscEmbed.flush();
+				if (rscScripts) controller.enqueue(encoder.encode(rscScripts));
+				timeoutId = null;
+			}, 0);
+		},
+		async flush(controller) {
+			if (timeoutId !== null) {
+				clearTimeout(timeoutId);
+				timeoutId = null;
+			}
+			flushBuffered(controller);
+			if (!injected && injectHTML) controller.enqueue(encoder.encode(injectHTML));
+			const finalScripts = await rscEmbed.finalize();
+			if (finalScripts) controller.enqueue(encoder.encode(finalScripts));
+		}
+	});
+}
+//#endregion
+export { createRscEmbedTransform, createTickBufferedTransform, fixFlightHints, fixPreloadAs };
+
+//# sourceMappingURL=app-ssr-stream.js.map

package/dist/server/app-ssr-stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-ssr-stream.js","names":[],"sources":["../../src/server/app-ssr-stream.ts"],"sourcesContent":["import { safeJsonStringify } from \"./html.js\";\n\nexport interface RscEmbedTransform {\n  flush(): string;\n  finalize(): Promise<string>;\n}\n\n/**\n * Fix invalid preload \"as\" values in RSC Flight hint lines before they reach\n * the client. React Flight emits HL hints with as=\"stylesheet\" for CSS, but\n * the HTML spec requires as=\"style\" for <link rel=\"preload\">.\n */\nexport function fixFlightHints(text: string): string {\n  return text.replace(/(\\d+:HL\\[.*?),\"stylesheet\"(\\]|,)/g, '$1,\"style\"$2');\n}\n\n/**\n * Create a helper that progressively embeds RSC chunks as inline <script> tags.\n * The browser entry turns the embedded text chunks back into Uint8Array data.\n */\nexport function createRscEmbedTransform(\n  embedStream: ReadableStream<Uint8Array>,\n): RscEmbedTransform {\n  const reader = embedStream.getReader();\n  const decoder = new TextDecoder();\n  let pendingChunks: string[] = [];\n  let reading = false;\n\n  async function pumpReader(): Promise<void> {\n    if (reading) return;\n    reading = true;\n    try {\n      while (true) {\n        const result = await reader.read();\n        if (result.done) break;\n        const text = decoder.decode(result.value, { stream: true });\n        // The RSC entry already fixes HL hints at the source. Keep this second\n        // pass as defense in depth for any embed stream that bypasses that\n        // wrapper; the rewrite is idempotent, so double-application is safe.\n        pendingChunks.push(fixFlightHints(text));\n      }\n    } catch (error) {\n      if (process.env.NODE_ENV !== \"production\") {\n        console.warn(\"[vinext] RSC embed stream read error:\", error);\n      }\n    } finally {\n      reading = false;\n    }\n  }\n\n  const pumpPromise = pumpReader();\n\n  return {\n    flush(): string {\n      if (pendingChunks.length === 0) return \"\";\n\n      const chunks = pendingChunks;\n      pendingChunks = [];\n\n      let scripts = \"\";\n      for (const chunk of chunks) {\n        scripts +=\n          \"<script>self.__VINEXT_RSC_CHUNKS__=self.__VINEXT_RSC_CHUNKS__||[];self.__VINEXT_RSC_CHUNKS__.push(\" +\n          safeJsonStringify(chunk) +\n          \")</script>\";\n      }\n      return scripts;\n    },\n\n    async finalize(): Promise<string> {\n      await pumpPromise;\n      let scripts = this.flush();\n      scripts += \"<script>self.__VINEXT_RSC_DONE__=true</script>\";\n      return scripts;\n    },\n  };\n}\n\n/**\n * Fix invalid preload \"as\" values in server-rendered HTML.\n * React Fizz emits <link rel=\"preload\" as=\"stylesheet\"> for CSS, but the\n * HTML spec requires as=\"style\" for <link rel=\"preload\">.\n */\nexport function fixPreloadAs(html: string): string {\n  return html.replace(/<link(?=[^>]*\\srel=\"preload\")[^>]*>/g, (tag) => {\n    return tag.replace(' as=\"stylesheet\"', ' as=\"style\"');\n  });\n}\n\n/**\n * Create the tick-buffered HTML transform that injects RSC scripts between\n * React Fizz flush cycles without corrupting split HTML chunks.\n */\nexport function createTickBufferedTransform(\n  rscEmbed: RscEmbedTransform,\n  injectHTML = \"\",\n): TransformStream<Uint8Array, Uint8Array> {\n  const decoder = new TextDecoder();\n  const encoder = new TextEncoder();\n  let injected = false;\n  let buffered: string[] = [];\n  let timeoutId: ReturnType<typeof setTimeout> | null = null;\n\n  const flushBuffered = (controller: TransformStreamDefaultController<Uint8Array>): void => {\n    for (const chunk of buffered) {\n      if (!injected) {\n        const headEnd = chunk.indexOf(\"</head>\");\n        if (headEnd !== -1) {\n          const before = chunk.slice(0, headEnd);\n          const after = chunk.slice(headEnd);\n          controller.enqueue(encoder.encode(before + injectHTML + after));\n          injected = true;\n          continue;\n        }\n      }\n      controller.enqueue(encoder.encode(chunk));\n    }\n    buffered = [];\n  };\n\n  return new TransformStream<Uint8Array, Uint8Array>({\n    transform(chunk, controller) {\n      buffered.push(fixPreloadAs(decoder.decode(chunk, { stream: true })));\n\n      if (timeoutId !== null) return;\n\n      timeoutId = setTimeout(() => {\n        flushBuffered(controller);\n\n        const rscScripts = rscEmbed.flush();\n        if (rscScripts) {\n          controller.enqueue(encoder.encode(rscScripts));\n        }\n\n        timeoutId = null;\n      }, 0);\n    },\n\n    async flush(controller) {\n      if (timeoutId !== null) {\n        clearTimeout(timeoutId);\n        timeoutId = null;\n      }\n\n      flushBuffered(controller);\n\n      if (!injected && injectHTML) {\n        controller.enqueue(encoder.encode(injectHTML));\n      }\n\n      const finalScripts = await rscEmbed.finalize();\n      if (finalScripts) {\n        controller.enqueue(encoder.encode(finalScripts));\n      }\n    },\n  });\n}\n"],"mappings":";;;;;;;AAYA,SAAgB,eAAe,MAAsB;AACnD,QAAO,KAAK,QAAQ,qCAAqC,iBAAe;;;;;;AAO1E,SAAgB,wBACd,aACmB;CACnB,MAAM,SAAS,YAAY,WAAW;CACtC,MAAM,UAAU,IAAI,aAAa;CACjC,IAAI,gBAA0B,EAAE;CAChC,IAAI,UAAU;CAEd,eAAe,aAA4B;AACzC,MAAI,QAAS;AACb,YAAU;AACV,MAAI;AACF,UAAO,MAAM;IACX,MAAM,SAAS,MAAM,OAAO,MAAM;AAClC,QAAI,OAAO,KAAM;IACjB,MAAM,OAAO,QAAQ,OAAO,OAAO,OAAO,EAAE,QAAQ,MAAM,CAAC;AAI3D,kBAAc,KAAK,eAAe,KAAK,CAAC;;WAEnC,OAAO;AACd,OAAI,QAAQ,IAAI,aAAa,aAC3B,SAAQ,KAAK,yCAAyC,MAAM;YAEtD;AACR,aAAU;;;CAId,MAAM,cAAc,YAAY;AAEhC,QAAO;EACL,QAAgB;AACd,OAAI,cAAc,WAAW,EAAG,QAAO;GAEvC,MAAM,SAAS;AACf,mBAAgB,EAAE;GAElB,IAAI,UAAU;AACd,QAAK,MAAM,SAAS,OAClB,YACE,uGACA,kBAAkB,MAAM,GACxB;AAEJ,UAAO;;EAGT,MAAM,WAA4B;AAChC,SAAM;GACN,IAAI,UAAU,KAAK,OAAO;AAC1B,cAAW;AACX,UAAO;;EAEV;;;;;;;AAQH,SAAgB,aAAa,MAAsB;AACjD,QAAO,KAAK,QAAQ,yCAAyC,QAAQ;AACnE,SAAO,IAAI,QAAQ,sBAAoB,gBAAc;GACrD;;;;;;AAOJ,SAAgB,4BACd,UACA,aAAa,IAC4B;CACzC,MAAM,UAAU,IAAI,aAAa;CACjC,MAAM,UAAU,IAAI,aAAa;CACjC,IAAI,WAAW;CACf,IAAI,WAAqB,EAAE;CAC3B,IAAI,YAAkD;CAEtD,MAAM,iBAAiB,eAAmE;AACxF,OAAK,MAAM,SAAS,UAAU;AAC5B,OAAI,CAAC,UAAU;IACb,MAAM,UAAU,MAAM,QAAQ,UAAU;AACxC,QAAI,YAAY,IAAI;KAClB,MAAM,SAAS,MAAM,MAAM,GAAG,QAAQ;KACtC,MAAM,QAAQ,MAAM,MAAM,QAAQ;AAClC,gBAAW,QAAQ,QAAQ,OAAO,SAAS,aAAa,MAAM,CAAC;AAC/D,gBAAW;AACX;;;AAGJ,cAAW,QAAQ,QAAQ,OAAO,MAAM,CAAC;;AAE3C,aAAW,EAAE;;AAGf,QAAO,IAAI,gBAAwC;EACjD,UAAU,OAAO,YAAY;AAC3B,YAAS,KAAK,aAAa,QAAQ,OAAO,OAAO,EAAE,QAAQ,MAAM,CAAC,CAAC,CAAC;AAEpE,OAAI,cAAc,KAAM;AAExB,eAAY,iBAAiB;AAC3B,kBAAc,WAAW;IAEzB,MAAM,aAAa,SAAS,OAAO;AACnC,QAAI,WACF,YAAW,QAAQ,QAAQ,OAAO,WAAW,CAAC;AAGhD,gBAAY;MACX,EAAE;;EAGP,MAAM,MAAM,YAAY;AACtB,OAAI,cAAc,MAAM;AACtB,iBAAa,UAAU;AACvB,gBAAY;;AAGd,iBAAc,WAAW;AAEzB,OAAI,CAAC,YAAY,WACf,YAAW,QAAQ,QAAQ,OAAO,WAAW,CAAC;GAGhD,MAAM,eAAe,MAAM,SAAS,UAAU;AAC9C,OAAI,aACF,YAAW,QAAQ,QAAQ,OAAO,aAAa,CAAC;;EAGrD,CAAC"}

package/dist/server/dev-server.d.ts

@@ -1,6 +1,7 @@
 import { ValidFileMatcher } from "../routing/file-matcher.js";
 import { Route } from "../routing/pages-router.js";
 import { NextI18nConfig } from "../config/next-config.js";
+import { ModuleImporter } from "./instrumentation.js";
 import { ViteDevServer } from "vite";
 import { IncomingMessage, ServerResponse } from "node:http";
 
@@ -30,12 +31,12 @@ declare function parseCookieLocale(req: IncomingMessage, i18nConfig: NextI18nCon
  *
  * For each request:
  * 1. Match the URL against discovered routes
- * 2. Load the page module via Vite's SSR module loader
+ * 2. Load the page module via the ModuleRunner
  * 3. Call getServerSideProps/getStaticProps if present
  * 4. Render the component to HTML
  * 5. Wrap in _document shell and send response
  */
-declare function createSSRHandler(server: ViteDevServer, routes: Route[], pagesDir: string, i18nConfig?: NextI18nConfig | null, fileMatcher?: ValidFileMatcher, basePath?: string, trailingSlash?: boolean): (req: IncomingMessage, res: ServerResponse, url: string, /** Status code override — propagated from middleware rewrite status. */
+declare function createSSRHandler(server: ViteDevServer, runner: ModuleImporter, routes: Route[], pagesDir: string, i18nConfig?: NextI18nConfig | null, fileMatcher?: ValidFileMatcher, basePath?: string, trailingSlash?: boolean): (req: IncomingMessage, res: ServerResponse, url: string, /** Status code override — propagated from middleware rewrite status. */
 
 statusCode?: number) => Promise<void>;
 //#endregion

package/dist/server/dev-server.js

@@ -2,6 +2,7 @@ import { createValidFileMatcher } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { matchRoute } from "../routing/pages-router.js";
 import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { importModule, reportRequestError } from "./instrumentation.js";
 import { _runWithCacheState } from "../shims/cache.js";
 import { buildPagesCacheValue, getRevalidateDuration, isrCacheKey, isrGet, isrSet, setRevalidateDuration, triggerBackgroundRegeneration } from "./isr-cache.js";
 import { runWithPrivateCache } from "../shims/cache-runtime.js";
@@ -10,7 +11,6 @@ import { parseQueryString } from "../utils/query.js";
 import "../shims/router-state.js";
 import { runWithHeadState } from "../shims/head-state.js";
 import { runWithServerInsertedHTMLState } from "../shims/navigation-state.js";
-import { reportRequestError } from "./instrumentation.js";
 import { safeJsonStringify } from "./html.js";
 import { logRequest, now } from "./request-log.js";
 import { detectLocaleFromAcceptLanguage, extractLocaleFromUrl as extractLocaleFromUrl$1, parseCookieLocaleFromHeader, resolvePagesI18nRequest } from "./pages-i18n.js";
@@ -128,14 +128,14 @@ function parseCookieLocale(req, i18nConfig) {
 *
 * For each request:
 * 1. Match the URL against discovered routes
-* 2. Load the page module via Vite's SSR module loader
+* 2. Load the page module via the ModuleRunner
 * 3. Call getServerSideProps/getStaticProps if present
 * 4. Render the component to HTML
 * 5. Wrap in _document shell and send response
 */
-function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, basePath = "", trailingSlash = false) {
+function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatcher, basePath = "", trailingSlash = false) {
 	const matcher = fileMatcher ?? createValidFileMatcher();
-	const _alsRegistration = Promise.all([server.ssrLoadModule("vinext/head-state"), server.ssrLoadModule("vinext/router-state")]);
+	const _alsRegistration = Promise.all([runner.import("vinext/head-state"), runner.import("vinext/router-state")]);
 	_alsRegistration.catch(() => {});
 	return async (req, res, url, statusCode) => {
 		const _reqStart = now();
@@ -171,7 +171,7 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 		}
 		const match = matchRoute(localeStrippedUrl, routes);
 		if (!match) {
-			await renderErrorPage(server, req, res, url, pagesDir, 404, void 0, matcher);
+			await renderErrorPage(server, runner, req, res, url, pagesDir, 404, void 0, matcher);
 			return;
 		}
 		const { route, params } = match;
@@ -179,7 +179,7 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 			ensureFetchPatch();
 			try {
 				await _alsRegistration;
-				const routerShim = await server.ssrLoadModule("next/router");
+				const routerShim = await importModule(runner, "next/router");
 				if (typeof routerShim.setSSRContext === "function") routerShim.setSSRContext({
 					pathname: patternToNextFormat(route.pattern),
 					query: {
@@ -193,8 +193,8 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 					domainLocales
 				});
 				if (i18nConfig) {
-					await server.ssrLoadModule("vinext/i18n-state");
-					const i18nCtx = await server.ssrLoadModule("vinext/i18n-context");
+					await runner.import("vinext/i18n-state");
+					const i18nCtx = await importModule(runner, "vinext/i18n-context");
 					if (typeof i18nCtx.setI18nContext === "function") i18nCtx.setI18nContext({
 						locale: locale ?? currentDefaultLocale,
 						locales: i18nConfig.locales,
@@ -203,7 +203,7 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 						hostname: req.headers.host?.split(":", 1)[0]
 					});
 				}
-				const pageModule = await server.ssrLoadModule(route.filePath);
+				const pageModule = await importModule(runner, route.filePath);
 				_compileEnd = now();
 				const PageComponent = pageModule.default;
 				if (!PageComponent) {
@@ -227,7 +227,7 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 								return String(val) === String(actual);
 							});
 						})) {
-							await renderErrorPage(server, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, matcher);
+							await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, matcher);
 							return;
 						}
 					}
@@ -258,7 +258,7 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 						return;
 					}
 					if (result && "notFound" in result && result.notFound) {
-						await renderErrorPage(server, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext);
+						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext);
 						return;
 					}
 					if (!statusCode && res.statusCode !== 200) statusCode = res.statusCode;
@@ -273,9 +273,9 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 				let earlyFontLinkHeader = "";
 				try {
 					const earlyPreloads = [];
-					const fontGoogleEarly = await server.ssrLoadModule("next/font/google");
+					const fontGoogleEarly = await importModule(runner, "next/font/google");
 					if (typeof fontGoogleEarly.getSSRFontPreloads === "function") earlyPreloads.push(...fontGoogleEarly.getSSRFontPreloads());
-					const fontLocalEarly = await server.ssrLoadModule("next/font/local");
+					const fontLocalEarly = await importModule(runner, "next/font/local");
 					if (typeof fontLocalEarly.getSSRFontPreloads === "function") earlyPreloads.push(...fontLocalEarly.getSSRFontPreloads());
 					if (earlyPreloads.length > 0) earlyFontLinkHeader = earlyPreloads.map((p) => `<${p.href}>; rel=preload; as=font; type=${p.type}; crossorigin`).join(", ");
 				} catch {}
@@ -325,8 +325,8 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 											domainLocales
 										});
 										if (i18nConfig) {
-											await server.ssrLoadModule("vinext/i18n-state");
-											const i18nCtx = await server.ssrLoadModule("vinext/i18n-context");
+											await runner.import("vinext/i18n-state");
+											const i18nCtx = await importModule(runner, "vinext/i18n-context");
 											if (typeof i18nCtx.setI18nContext === "function") i18nCtx.setI18nContext({
 												locale: locale ?? currentDefaultLocale,
 												locales: i18nConfig.locales,
@@ -338,7 +338,7 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 										let RegenApp = null;
 										const appPath = path.join(pagesDir, "_app");
 										if (findFileWithExtensions(appPath, matcher)) try {
-											RegenApp = (await server.ssrLoadModule(appPath)).default ?? null;
+											RegenApp = (await runner.import(appPath)).default ?? null;
 										} catch {}
 										let el = RegenApp ? React.createElement(RegenApp, {
 											Component: pageModule.default,
@@ -398,7 +398,7 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 						return;
 					}
 					if (result && "notFound" in result && result.notFound) {
-						await renderErrorPage(server, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext);
+						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext);
 						return;
 					}
 					if (typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
@@ -406,7 +406,7 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 				let AppComponent = null;
 				const appPath = path.join(pagesDir, "_app");
 				if (findFileWithExtensions(appPath, matcher)) try {
-					AppComponent = (await server.ssrLoadModule(appPath)).default ?? null;
+					AppComponent = (await importModule(runner, appPath)).default ?? null;
 				} catch {}
 				const createElement = React.createElement;
 				let element;
@@ -417,15 +417,15 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 				});
 				else element = createElement(PageComponent, pageProps);
 				if (wrapWithRouterContext) element = wrapWithRouterContext(element);
-				const headShim = await server.ssrLoadModule("next/head");
+				const headShim = await importModule(runner, "next/head");
 				if (typeof headShim.resetSSRHead === "function") headShim.resetSSRHead();
-				const dynamicShim = await server.ssrLoadModule("next/dynamic");
+				const dynamicShim = await importModule(runner, "next/dynamic");
 				if (typeof dynamicShim.flushPreloads === "function") await dynamicShim.flushPreloads();
 				let fontHeadHTML = "";
 				const allFontStyles = [];
 				const allFontPreloads = [];
 				try {
-					const fontGoogle = await server.ssrLoadModule("next/font/google");
+					const fontGoogle = await importModule(runner, "next/font/google");
 					if (typeof fontGoogle.getSSRFontLinks === "function") {
 						const fontUrls = fontGoogle.getSSRFontLinks();
 						for (const fontUrl of fontUrls) {
@@ -437,7 +437,7 @@ function createSSRHandler(server, routes, pagesDir, i18nConfig, fileMatcher, bas
 					if (typeof fontGoogle.getSSRFontPreloads === "function") allFontPreloads.push(...fontGoogle.getSSRFontPreloads());
 				} catch {}
 				try {
-					const fontLocal = await server.ssrLoadModule("next/font/local");
+					const fontLocal = await importModule(runner, "next/font/local");
 					if (typeof fontLocal.getSSRFontStyles === "function") allFontStyles.push(...fontLocal.getSSRFontStyles());
 					if (typeof fontLocal.getSSRFontPreloads === "function") allFontPreloads.push(...fontLocal.getSSRFontPreloads());
 				} catch {}
@@ -495,7 +495,7 @@ hydrate();
 				const docPath = path.join(pagesDir, "_document");
 				let DocumentComponent = null;
 				if (findFileWithExtensions(docPath, matcher)) try {
-					DocumentComponent = (await server.ssrLoadModule(docPath)).default ?? null;
+					DocumentComponent = (await runner.import(docPath)).default ?? null;
 				} catch {}
 				const allScripts = `${nextDataScript}\n  ${hydrationScript}`;
 				const extraHeaders = { ...gsspExtraHeaders };
@@ -528,7 +528,6 @@ hydrate();
 					setRevalidateDuration(cacheKey, isrRevalidateSeconds);
 				}
 			} catch (e) {
-				server.ssrFixStacktrace?.(e);
 				console.error(e);
 				reportRequestError(e instanceof Error ? e : new Error(String(e)), {
 					path: url,
@@ -540,7 +539,7 @@ hydrate();
 					routeType: "render"
 				}).catch(() => {});
 				try {
-					await renderErrorPage(server, req, res, url, pagesDir, 500, void 0, matcher);
+					await renderErrorPage(server, runner, req, res, url, pagesDir, 500, void 0, matcher);
 				} catch (fallbackErr) {
 					res.statusCode = 500;
 					res.end(`Internal Server Error: ${fallbackErr.message}`);
@@ -557,24 +556,24 @@ hydrate();
 * - 500: pages/500.tsx -> pages/_error.tsx -> default
 * - other: pages/_error.tsx -> default
 */
-async function renderErrorPage(server, _req, res, url, pagesDir, statusCode, wrapWithRouterContext, fileMatcher) {
+async function renderErrorPage(server, runner, _req, res, url, pagesDir, statusCode, wrapWithRouterContext, fileMatcher) {
 	const matcher = fileMatcher ?? createValidFileMatcher();
 	const candidates = statusCode === 404 ? ["404", "_error"] : statusCode === 500 ? ["500", "_error"] : ["_error"];
 	for (const candidate of candidates) try {
 		const candidatePath = path.join(pagesDir, candidate);
 		if (!findFileWithExtensions(candidatePath, matcher)) continue;
-		const ErrorComponent = (await server.ssrLoadModule(candidatePath)).default;
+		const ErrorComponent = (await importModule(runner, candidatePath)).default;
 		if (!ErrorComponent) continue;
 		let AppComponent = null;
 		const appPathErr = path.join(pagesDir, "_app");
 		if (findFileWithExtensions(appPathErr, matcher)) try {
-			AppComponent = (await server.ssrLoadModule(appPathErr)).default ?? null;
+			AppComponent = (await importModule(runner, appPathErr)).default ?? null;
 		} catch {}
 		const createElement = React.createElement;
 		const errorProps = { statusCode };
 		let wrapFn = wrapWithRouterContext;
 		if (!wrapFn) try {
-			wrapFn = (await server.ssrLoadModule("next/router")).wrapWithRouterContext;
+			wrapFn = (await importModule(runner, "next/router")).wrapWithRouterContext;
 		} catch {}
 		let element;
 		if (AppComponent) element = createElement(AppComponent, {
@@ -588,7 +587,7 @@ async function renderErrorPage(server, _req, res, url, pagesDir, statusCode, wra
 		let DocumentComponent = null;
 		const docPathErr = path.join(pagesDir, "_document");
 		if (findFileWithExtensions(docPathErr, matcher)) try {
-			DocumentComponent = (await server.ssrLoadModule(docPathErr)).default ?? null;
+			DocumentComponent = (await importModule(runner, docPathErr)).default ?? null;
 		} catch {}
 		if (DocumentComponent) {
 			let docHtml = await renderToStringAsync(createElement(DocumentComponent));