vinext 0.0.23 → 0.0.25

package/dist/server/instrumentation.d.ts

@@ -11,7 +11,38 @@
  *
  * References:
  * - https://nextjs.org/docs/app/building-your-application/optimizing/instrumentation
+ *
+ * ## App Router
+ *
+ * For App Router, `register()` is baked directly into the generated RSC entry
+ * as a top-level `await` at module evaluation time (see `app-dev-server.ts`
+ * `generateRscEntry`). This means it runs inside the Worker process (or RSC
+ * Vite environment) — the same process that handles requests — before any
+ * request is served. `runInstrumentation()` is NOT called from `configureServer`
+ * for App Router.
+ *
+ * The `onRequestError` handler is stored on `globalThis` so it is visible across
+ * the RSC and SSR Vite environments (separate module graphs, same Node.js process).
+ * With `@cloudflare/vite-plugin` it runs entirely inside the Worker, so
+ * `globalThis` is the Worker's global — also correct.
+ *
+ * ## Pages Router
+ *
+ * Pages Router has no RSC entry, so `configureServer()` is the right place to
+ * call `register()`. `runInstrumentation()` accepts a `ModuleRunner` (created
+ * via `createDirectRunner()`) rather than `server.ssrLoadModule()` so it is
+ * safe when `@cloudflare/vite-plugin` is present — that plugin replaces the
+ * SSR environment's hot channel, causing `ssrLoadModule()` to crash with
+ * `TypeError: Cannot read properties of undefined (reading 'outsideEmitter')`.
  */
+/**
+ * Minimal duck-typed interface for the module runner passed to
+ * `runInstrumentation`. Only `.import()` is used — this avoids requiring
+ * callers (including tests) to provide a full `ModuleRunner` instance.
+ */
+export interface ModuleImporter {
+    import(id: string): Promise<unknown>;
+}
 /**
  * Find the instrumentation file in the project root.
  */
@@ -39,26 +70,38 @@ export type OnRequestErrorHandler = (error: Error, request: {
 }, context: OnRequestErrorContext) => void | Promise<void>;
 /**
  * Get the registered onRequestError handler (if any).
+ *
+ * Reads from globalThis so it works across Vite environment boundaries.
  */
 export declare function getOnRequestErrorHandler(): OnRequestErrorHandler | null;
 /**
- * Load and execute the instrumentation file.
+ * Load and execute the instrumentation file via a ModuleRunner.
  *
- * This should be called once during server startup. It:
- * 1. Loads the instrumentation module via Vite's SSR module loader
- * 2. Calls the `register()` function if exported
- * 3. Stores the `onRequestError()` handler if exported
+ * Called once during Pages Router server startup (`configureServer`). It:
+ * 1. Loads the instrumentation module via `runner.import()`.
+ * 2. Calls the `register()` function if exported.
+ * 3. Stores the `onRequestError()` handler on `globalThis` so it is visible
+ *    to all Vite environment module graphs (SSR and the host process share
+ *    the same Node.js `globalThis`).
  *
- * @param server - Vite dev server (for SSR module loading)
+ * **App Router** does not use this function. For App Router, `register()` is
+ * emitted as a top-level `await` inside the generated RSC entry module so it
+ * runs in the same Worker/environment as request handling.
+ *
+ * @param runner - A ModuleRunner created via `createDirectRunner()`. Must be
+ *   the same long-lived runner used for middleware and SSR so the module graph
+ *   is shared. Safe with all Vite plugin combinations, including
+ *   `@cloudflare/vite-plugin`, because it never touches the hot channel.
  * @param instrumentationPath - Absolute path to the instrumentation file
  */
-export declare function runInstrumentation(server: {
-    ssrLoadModule: (id: string) => Promise<Record<string, unknown>>;
-}, instrumentationPath: string): Promise<void>;
+export declare function runInstrumentation(runner: ModuleImporter, instrumentationPath: string): Promise<void>;
 /**
  * Report a request error via the instrumentation handler.
  *
  * No-op if no onRequestError handler is registered.
+ *
+ * Reads the handler from globalThis so this function works correctly regardless
+ * of which environment it is called from.
  */
 export declare function reportRequestError(error: Error, request: {
     path: string;

package/dist/server/instrumentation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/server/instrumentation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAiBH;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQnE;AAED;;;;;GAKG;AACH,MAAM,WAAW,qBAAqB;IACpC,4CAA4C;IAC5C,UAAU,EAAE,cAAc,GAAG,YAAY,CAAC;IAC1C,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB;IACrB,SAAS,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,YAAY,CAAC;IACxD,yCAAyC;IACzC,gBAAgB,CAAC,EAAE,WAAW,GAAG,OAAO,GAAG,SAAS,CAAC;CACtD;AAED,MAAM,MAAM,qBAAqB,GAAG,CAClC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAC1E,OAAO,EAAE,qBAAqB,KAC3B,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAK1B;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,qBAAqB,GAAG,IAAI,CAEvE;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE;IAAE,aAAa,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CAAE,EAC3E,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAC1E,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAUf"}
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/server/instrumentation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAIH;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACtC;AAcD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQnE;AAED;;;;;GAKG;AACH,MAAM,WAAW,qBAAqB;IACpC,4CAA4C;IAC5C,UAAU,EAAE,cAAc,GAAG,YAAY,CAAC;IAC1C,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB;IACrB,SAAS,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,YAAY,CAAC;IACxD,yCAAyC;IACzC,gBAAgB,CAAC,EAAE,WAAW,GAAG,OAAO,GAAG,SAAS,CAAC;CACtD;AAED,MAAM,MAAM,qBAAqB,GAAG,CAClC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAC1E,OAAO,EAAE,qBAAqB,KAC3B,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE1B;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,qBAAqB,GAAG,IAAI,CAEvE;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,cAAc,EACtB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAC1E,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAYf"}

package/dist/server/instrumentation.js

@@ -11,6 +11,29 @@
  *
  * References:
  * - https://nextjs.org/docs/app/building-your-application/optimizing/instrumentation
+ *
+ * ## App Router
+ *
+ * For App Router, `register()` is baked directly into the generated RSC entry
+ * as a top-level `await` at module evaluation time (see `app-dev-server.ts`
+ * `generateRscEntry`). This means it runs inside the Worker process (or RSC
+ * Vite environment) — the same process that handles requests — before any
+ * request is served. `runInstrumentation()` is NOT called from `configureServer`
+ * for App Router.
+ *
+ * The `onRequestError` handler is stored on `globalThis` so it is visible across
+ * the RSC and SSR Vite environments (separate module graphs, same Node.js process).
+ * With `@cloudflare/vite-plugin` it runs entirely inside the Worker, so
+ * `globalThis` is the Worker's global — also correct.
+ *
+ * ## Pages Router
+ *
+ * Pages Router has no RSC entry, so `configureServer()` is the right place to
+ * call `register()`. `runInstrumentation()` accepts a `ModuleRunner` (created
+ * via `createDirectRunner()`) rather than `server.ssrLoadModule()` so it is
+ * safe when `@cloudflare/vite-plugin` is present — that plugin replaces the
+ * SSR environment's hot channel, causing `ssrLoadModule()` to crash with
+ * `TypeError: Cannot read properties of undefined (reading 'outsideEmitter')`.
  */
 import fs from "node:fs";
 import path from "node:path";
@@ -37,35 +60,45 @@ export function findInstrumentationFile(root) {
     }
     return null;
 }
-/** Module-level reference to the onRequestError handler. */
-let _onRequestError = null;
 /**
  * Get the registered onRequestError handler (if any).
+ *
+ * Reads from globalThis so it works across Vite environment boundaries.
  */
 export function getOnRequestErrorHandler() {
-    return _onRequestError;
+    return globalThis.__VINEXT_onRequestErrorHandler__ ?? null;
 }
 /**
- * Load and execute the instrumentation file.
+ * Load and execute the instrumentation file via a ModuleRunner.
  *
- * This should be called once during server startup. It:
- * 1. Loads the instrumentation module via Vite's SSR module loader
- * 2. Calls the `register()` function if exported
- * 3. Stores the `onRequestError()` handler if exported
+ * Called once during Pages Router server startup (`configureServer`). It:
+ * 1. Loads the instrumentation module via `runner.import()`.
+ * 2. Calls the `register()` function if exported.
+ * 3. Stores the `onRequestError()` handler on `globalThis` so it is visible
+ *    to all Vite environment module graphs (SSR and the host process share
+ *    the same Node.js `globalThis`).
  *
- * @param server - Vite dev server (for SSR module loading)
+ * **App Router** does not use this function. For App Router, `register()` is
+ * emitted as a top-level `await` inside the generated RSC entry module so it
+ * runs in the same Worker/environment as request handling.
+ *
+ * @param runner - A ModuleRunner created via `createDirectRunner()`. Must be
+ *   the same long-lived runner used for middleware and SSR so the module graph
+ *   is shared. Safe with all Vite plugin combinations, including
+ *   `@cloudflare/vite-plugin`, because it never touches the hot channel.
  * @param instrumentationPath - Absolute path to the instrumentation file
  */
-export async function runInstrumentation(server, instrumentationPath) {
+export async function runInstrumentation(runner, instrumentationPath) {
     try {
-        const mod = await server.ssrLoadModule(instrumentationPath);
+        const mod = await runner.import(instrumentationPath);
         // Call register() if exported
         if (typeof mod.register === "function") {
             await mod.register();
         }
-        // Store onRequestError handler if exported
+        // Store onRequestError handler on globalThis so environments can reach the
+        // same handler.
         if (typeof mod.onRequestError === "function") {
-            _onRequestError = mod.onRequestError;
+            globalThis.__VINEXT_onRequestErrorHandler__ = mod.onRequestError;
         }
     }
     catch (err) {
@@ -76,12 +109,16 @@ export async function runInstrumentation(server, instrumentationPath) {
  * Report a request error via the instrumentation handler.
  *
  * No-op if no onRequestError handler is registered.
+ *
+ * Reads the handler from globalThis so this function works correctly regardless
+ * of which environment it is called from.
  */
 export async function reportRequestError(error, request, context) {
-    if (!_onRequestError)
+    const handler = getOnRequestErrorHandler();
+    if (!handler)
         return;
     try {
-        await _onRequestError(error, request, context);
+        await handler(error, request, context);
     }
     catch (reportErr) {
         console.error("[vinext] onRequestError handler threw:", reportErr instanceof Error ? reportErr.message : String(reportErr));

package/dist/server/instrumentation.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../../src/server/instrumentation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,2CAA2C;AAC3C,MAAM,qBAAqB,GAAG;IAC5B,oBAAoB;IACpB,qBAAqB;IACrB,oBAAoB;IACpB,qBAAqB;IACrB,wBAAwB;IACxB,yBAAyB;IACzB,wBAAwB;IACxB,yBAAyB;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAY;IAClD,KAAK,MAAM,IAAI,IAAI,qBAAqB,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvC,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAyBD,4DAA4D;AAC5D,IAAI,eAAe,GAAiC,IAAI,CAAC;AAEzD;;GAEG;AACH,MAAM,UAAU,wBAAwB;IACtC,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAA2E,EAC3E,mBAA2B;IAE3B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;QAE5D,8BAA8B;QAC9B,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YACvC,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC;QACvB,CAAC;QAED,2CAA2C;QAC3C,IAAI,OAAO,GAAG,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;YAC7C,eAAe,GAAG,GAAG,CAAC,cAAuC,CAAC;QAChE,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CACX,0CAA0C,EAC1C,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CACjD,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAAY,EACZ,OAA0E,EAC1E,OAA8B;IAE9B,IAAI,CAAC,eAAe;QAAE,OAAO;IAC7B,IAAI,CAAC;QACH,MAAM,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;QACnB,OAAO,CAAC,KAAK,CACX,wCAAwC,EACxC,SAAS,YAAY,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CACnE,CAAC;IACJ,CAAC;AACH,CAAC","sourcesContent":["/**\n * instrumentation.ts support\n *\n * Next.js supports an `instrumentation.ts` file at the project root that\n * exports a `register()` function. This function is called once when the\n * server starts, before any request handling. It's the recommended way to\n * set up observability tools (Sentry, Datadog, OpenTelemetry, etc.).\n *\n * Optionally, it can also export `onRequestError()` which is called when\n * an unhandled error occurs during request handling.\n *\n * References:\n * - https://nextjs.org/docs/app/building-your-application/optimizing/instrumentation\n */\n\nimport fs from \"node:fs\";\nimport path from \"node:path\";\n\n/** Possible instrumentation file names. */\nconst INSTRUMENTATION_FILES = [\n  \"instrumentation.ts\",\n  \"instrumentation.tsx\",\n  \"instrumentation.js\",\n  \"instrumentation.mjs\",\n  \"src/instrumentation.ts\",\n  \"src/instrumentation.tsx\",\n  \"src/instrumentation.js\",\n  \"src/instrumentation.mjs\",\n];\n\n/**\n * Find the instrumentation file in the project root.\n */\nexport function findInstrumentationFile(root: string): string | null {\n  for (const file of INSTRUMENTATION_FILES) {\n    const fullPath = path.join(root, file);\n    if (fs.existsSync(fullPath)) {\n      return fullPath;\n    }\n  }\n  return null;\n}\n\n/**\n * The onRequestError handler type from Next.js instrumentation.\n *\n * Called when an unhandled error occurs during request handling.\n * Provides the error, the request info, and an error context.\n */\nexport interface OnRequestErrorContext {\n  /** The route path (e.g., '/blog/[slug]') */\n  routerKind: \"Pages Router\" | \"App Router\";\n  /** The matched route pattern */\n  routePath: string;\n  /** The route type */\n  routeType: \"render\" | \"route\" | \"action\" | \"middleware\";\n  /** HTTP status code that will be sent */\n  revalidateReason?: \"on-demand\" | \"stale\" | undefined;\n}\n\nexport type OnRequestErrorHandler = (\n  error: Error,\n  request: { path: string; method: string; headers: Record<string, string> },\n  context: OnRequestErrorContext,\n) => void | Promise<void>;\n\n/** Module-level reference to the onRequestError handler. */\nlet _onRequestError: OnRequestErrorHandler | null = null;\n\n/**\n * Get the registered onRequestError handler (if any).\n */\nexport function getOnRequestErrorHandler(): OnRequestErrorHandler | null {\n  return _onRequestError;\n}\n\n/**\n * Load and execute the instrumentation file.\n *\n * This should be called once during server startup. It:\n * 1. Loads the instrumentation module via Vite's SSR module loader\n * 2. Calls the `register()` function if exported\n * 3. Stores the `onRequestError()` handler if exported\n *\n * @param server - Vite dev server (for SSR module loading)\n * @param instrumentationPath - Absolute path to the instrumentation file\n */\nexport async function runInstrumentation(\n  server: { ssrLoadModule: (id: string) => Promise<Record<string, unknown>> },\n  instrumentationPath: string,\n): Promise<void> {\n  try {\n    const mod = await server.ssrLoadModule(instrumentationPath);\n\n    // Call register() if exported\n    if (typeof mod.register === \"function\") {\n      await mod.register();\n    }\n\n    // Store onRequestError handler if exported\n    if (typeof mod.onRequestError === \"function\") {\n      _onRequestError = mod.onRequestError as OnRequestErrorHandler;\n    }\n  } catch (err) {\n    console.error(\n      \"[vinext] Failed to load instrumentation:\",\n      err instanceof Error ? err.message : String(err),\n    );\n  }\n}\n\n/**\n * Report a request error via the instrumentation handler.\n *\n * No-op if no onRequestError handler is registered.\n */\nexport async function reportRequestError(\n  error: Error,\n  request: { path: string; method: string; headers: Record<string, string> },\n  context: OnRequestErrorContext,\n): Promise<void> {\n  if (!_onRequestError) return;\n  try {\n    await _onRequestError(error, request, context);\n  } catch (reportErr) {\n    console.error(\n      \"[vinext] onRequestError handler threw:\",\n      reportErr instanceof Error ? reportErr.message : String(reportErr),\n    );\n  }\n}\n"]}
+{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../../src/server/instrumentation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAU7B,2CAA2C;AAC3C,MAAM,qBAAqB,GAAG;IAC5B,oBAAoB;IACpB,qBAAqB;IACrB,oBAAoB;IACpB,qBAAqB;IACrB,wBAAwB;IACxB,yBAAyB;IACzB,wBAAwB;IACxB,yBAAyB;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAY;IAClD,KAAK,MAAM,IAAI,IAAI,qBAAqB,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvC,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAyBD;;;;GAIG;AACH,MAAM,UAAU,wBAAwB;IACtC,OAAO,UAAU,CAAC,gCAAgC,IAAI,IAAI,CAAC;AAC7D,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAsB,EACtB,mBAA2B;IAE3B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAA4B,CAAC;QAEhF,8BAA8B;QAC9B,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YACvC,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC;QACvB,CAAC;QAED,2EAA2E;QAC3E,gBAAgB;QAChB,IAAI,OAAO,GAAG,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;YAChD,UAAU,CAAC,gCAAgC,GAAG,GAAG,CAAC,cAAuC,CAAC;QACzF,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CACX,0CAA0C,EAC1C,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CACjD,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAAY,EACZ,OAA0E,EAC1E,OAA8B;IAE9B,MAAM,OAAO,GAAG,wBAAwB,EAAE,CAAC;IAC5C,IAAI,CAAC,OAAO;QAAE,OAAO;IAEpB,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;QACnB,OAAO,CAAC,KAAK,CACX,wCAAwC,EACxC,SAAS,YAAY,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CACnE,CAAC;IACJ,CAAC;AACH,CAAC","sourcesContent":["/**\n * instrumentation.ts support\n *\n * Next.js supports an `instrumentation.ts` file at the project root that\n * exports a `register()` function. This function is called once when the\n * server starts, before any request handling. It's the recommended way to\n * set up observability tools (Sentry, Datadog, OpenTelemetry, etc.).\n *\n * Optionally, it can also export `onRequestError()` which is called when\n * an unhandled error occurs during request handling.\n *\n * References:\n * - https://nextjs.org/docs/app/building-your-application/optimizing/instrumentation\n *\n * ## App Router\n *\n * For App Router, `register()` is baked directly into the generated RSC entry\n * as a top-level `await` at module evaluation time (see `app-dev-server.ts`\n * `generateRscEntry`). This means it runs inside the Worker process (or RSC\n * Vite environment) — the same process that handles requests — before any\n * request is served. `runInstrumentation()` is NOT called from `configureServer`\n * for App Router.\n *\n * The `onRequestError` handler is stored on `globalThis` so it is visible across\n * the RSC and SSR Vite environments (separate module graphs, same Node.js process).\n * With `@cloudflare/vite-plugin` it runs entirely inside the Worker, so\n * `globalThis` is the Worker's global — also correct.\n *\n * ## Pages Router\n *\n * Pages Router has no RSC entry, so `configureServer()` is the right place to\n * call `register()`. `runInstrumentation()` accepts a `ModuleRunner` (created\n * via `createDirectRunner()`) rather than `server.ssrLoadModule()` so it is\n * safe when `@cloudflare/vite-plugin` is present — that plugin replaces the\n * SSR environment's hot channel, causing `ssrLoadModule()` to crash with\n * `TypeError: Cannot read properties of undefined (reading 'outsideEmitter')`.\n */\n\nimport fs from \"node:fs\";\nimport path from \"node:path\";\n/**\n * Minimal duck-typed interface for the module runner passed to\n * `runInstrumentation`. Only `.import()` is used — this avoids requiring\n * callers (including tests) to provide a full `ModuleRunner` instance.\n */\nexport interface ModuleImporter {\n  import(id: string): Promise<unknown>;\n}\n\n/** Possible instrumentation file names. */\nconst INSTRUMENTATION_FILES = [\n  \"instrumentation.ts\",\n  \"instrumentation.tsx\",\n  \"instrumentation.js\",\n  \"instrumentation.mjs\",\n  \"src/instrumentation.ts\",\n  \"src/instrumentation.tsx\",\n  \"src/instrumentation.js\",\n  \"src/instrumentation.mjs\",\n];\n\n/**\n * Find the instrumentation file in the project root.\n */\nexport function findInstrumentationFile(root: string): string | null {\n  for (const file of INSTRUMENTATION_FILES) {\n    const fullPath = path.join(root, file);\n    if (fs.existsSync(fullPath)) {\n      return fullPath;\n    }\n  }\n  return null;\n}\n\n/**\n * The onRequestError handler type from Next.js instrumentation.\n *\n * Called when an unhandled error occurs during request handling.\n * Provides the error, the request info, and an error context.\n */\nexport interface OnRequestErrorContext {\n  /** The route path (e.g., '/blog/[slug]') */\n  routerKind: \"Pages Router\" | \"App Router\";\n  /** The matched route pattern */\n  routePath: string;\n  /** The route type */\n  routeType: \"render\" | \"route\" | \"action\" | \"middleware\";\n  /** HTTP status code that will be sent */\n  revalidateReason?: \"on-demand\" | \"stale\" | undefined;\n}\n\nexport type OnRequestErrorHandler = (\n  error: Error,\n  request: { path: string; method: string; headers: Record<string, string> },\n  context: OnRequestErrorContext,\n) => void | Promise<void>;\n\n/**\n * Get the registered onRequestError handler (if any).\n *\n * Reads from globalThis so it works across Vite environment boundaries.\n */\nexport function getOnRequestErrorHandler(): OnRequestErrorHandler | null {\n  return globalThis.__VINEXT_onRequestErrorHandler__ ?? null;\n}\n\n/**\n * Load and execute the instrumentation file via a ModuleRunner.\n *\n * Called once during Pages Router server startup (`configureServer`). It:\n * 1. Loads the instrumentation module via `runner.import()`.\n * 2. Calls the `register()` function if exported.\n * 3. Stores the `onRequestError()` handler on `globalThis` so it is visible\n *    to all Vite environment module graphs (SSR and the host process share\n *    the same Node.js `globalThis`).\n *\n * **App Router** does not use this function. For App Router, `register()` is\n * emitted as a top-level `await` inside the generated RSC entry module so it\n * runs in the same Worker/environment as request handling.\n *\n * @param runner - A ModuleRunner created via `createDirectRunner()`. Must be\n *   the same long-lived runner used for middleware and SSR so the module graph\n *   is shared. Safe with all Vite plugin combinations, including\n *   `@cloudflare/vite-plugin`, because it never touches the hot channel.\n * @param instrumentationPath - Absolute path to the instrumentation file\n */\nexport async function runInstrumentation(\n  runner: ModuleImporter,\n  instrumentationPath: string,\n): Promise<void> {\n  try {\n    const mod = await runner.import(instrumentationPath) as Record<string, unknown>;\n\n    // Call register() if exported\n    if (typeof mod.register === \"function\") {\n      await mod.register();\n    }\n\n    // Store onRequestError handler on globalThis so environments can reach the\n    // same handler.\n    if (typeof mod.onRequestError === \"function\") {\n\t\t\tglobalThis.__VINEXT_onRequestErrorHandler__ = mod.onRequestError as OnRequestErrorHandler;\n    }\n  } catch (err) {\n    console.error(\n      \"[vinext] Failed to load instrumentation:\",\n      err instanceof Error ? err.message : String(err),\n    );\n  }\n}\n\n/**\n * Report a request error via the instrumentation handler.\n *\n * No-op if no onRequestError handler is registered.\n *\n * Reads the handler from globalThis so this function works correctly regardless\n * of which environment it is called from.\n */\nexport async function reportRequestError(\n  error: Error,\n  request: { path: string; method: string; headers: Record<string, string> },\n  context: OnRequestErrorContext,\n): Promise<void> {\n  const handler = getOnRequestErrorHandler();\n\tif (!handler) return;\n\n  try {\n    await handler(error, request, context);\n  } catch (reportErr) {\n    console.error(\n      \"[vinext] onRequestError handler threw:\",\n      reportErr instanceof Error ? reportErr.message : String(reportErr),\n    );\n  }\n}\n"]}

package/dist/server/middleware.d.ts

@@ -17,7 +17,7 @@
  *
  * Supports the `config.matcher` export for path filtering.
  */
-import type { ViteDevServer } from "vite";
+import type { ModuleRunner } from "vite/module-runner";
 /**
  * Determine whether a middleware/proxy file path refers to a proxy file.
  * proxy.ts files accept `proxy` or `default` exports.
@@ -89,11 +89,15 @@ export interface MiddlewareResult {
 /**
  * Load and execute middleware for a given request.
  *
- * @param server - Vite dev server (for SSR module loading)
+ * @param runner - A ModuleRunner used to load the middleware module.
+ *   Must be a long-lived instance created once (e.g. in configureServer) via
+ *   createDirectRunner() — NOT recreated per request. Using server.ssrLoadModule
+ *   directly crashes with `outsideEmitter` when @cloudflare/vite-plugin is
+ *   present because SSRCompatModuleRunner reads environment.hot.api synchronously.
  * @param middlewarePath - Absolute path to the middleware file
  * @param request - The incoming Request object
  * @returns Middleware result describing what action to take
  */
-export declare function runMiddleware(server: ViteDevServer, middlewarePath: string, request: Request): Promise<MiddlewareResult>;
+export declare function runMiddleware(runner: ModuleRunner, middlewarePath: string, request: Request): Promise<MiddlewareResult>;
 export {};
 //# sourceMappingURL=middleware.d.ts.map

package/dist/server/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/server/middleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAO1C;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGrD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,QAAQ,CAeV;AA0BD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqB9D;AAED,qDAAqD;AACrD,KAAK,aAAa,GACd,MAAM,GACN,MAAM,EAAE,GACR;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,EAAE,CAAC;AAE1F;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,aAAa,GAAG,SAAS,GACjC,OAAO,CAqBT;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAkCvE;AAED,oCAAoC;AACpC,MAAM,WAAW,gBAAgB;IAC/B,gDAAgD;IAChD,QAAQ,EAAE,OAAO,CAAC;IAClB,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8CAA8C;IAC9C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0FAA0F;IAC1F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sCAAsC;IACtC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,mEAAmE;IACnE,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,gBAAgB,CAAC,CA8H3B"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/server/middleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOvD;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGrD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,QAAQ,CAeV;AA0BD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqB9D;AAED,qDAAqD;AACrD,KAAK,aAAa,GACd,MAAM,GACN,MAAM,EAAE,GACR;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,EAAE,CAAC;AAE1F;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,aAAa,GAAG,SAAS,GACjC,OAAO,CAqBT;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAkCvE;AAED,oCAAoC;AACpC,MAAM,WAAW,gBAAgB;IAC/B,gDAAgD;IAChD,QAAQ,EAAE,OAAO,CAAC;IAClB,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8CAA8C;IAC9C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0FAA0F;IAC1F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sCAAsC;IACtC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,mEAAmE;IACnE,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,gBAAgB,CAAC,CAqI3B"}

package/dist/server/middleware.js

@@ -19,7 +19,7 @@
  */
 import fs from "node:fs";
 import path from "node:path";
-import { NextRequest } from "../shims/server.js";
+import { NextRequest, NextFetchEvent } from "../shims/server.js";
 import { safeRegExp } from "../config/config-matchers.js";
 import { normalizePath } from "./normalize-path.js";
 /**
@@ -181,14 +181,20 @@ export function matchPattern(pathname, pattern) {
 /**
  * Load and execute middleware for a given request.
  *
- * @param server - Vite dev server (for SSR module loading)
+ * @param runner - A ModuleRunner used to load the middleware module.
+ *   Must be a long-lived instance created once (e.g. in configureServer) via
+ *   createDirectRunner() — NOT recreated per request. Using server.ssrLoadModule
+ *   directly crashes with `outsideEmitter` when @cloudflare/vite-plugin is
+ *   present because SSRCompatModuleRunner reads environment.hot.api synchronously.
  * @param middlewarePath - Absolute path to the middleware file
  * @param request - The incoming Request object
  * @returns Middleware result describing what action to take
  */
-export async function runMiddleware(server, middlewarePath, request) {
-    // Load the middleware module via Vite's SSR module loader
-    const mod = await server.ssrLoadModule(middlewarePath);
+export async function runMiddleware(runner, middlewarePath, request) {
+    // Load the middleware module via the direct-call ModuleRunner.
+    // This bypasses the hot channel entirely and is safe with all Vite plugin
+    // combinations, including @cloudflare/vite-plugin.
+    const mod = await runner.import(middlewarePath);
     // Resolve the handler based on file type (proxy.ts vs middleware.ts).
     // Throws if the file doesn't export a valid function, matching Next.js behavior.
     // https://github.com/vercel/next.js/blob/canary/test/e2e/app-dir/proxy-missing-export/proxy-missing-export.test.ts
@@ -221,10 +227,11 @@ export async function runMiddleware(server, middlewarePath, request) {
     }
     // Wrap in NextRequest so middleware gets .nextUrl, .cookies, .geo, .ip, etc.
     const nextRequest = mwRequest instanceof NextRequest ? mwRequest : new NextRequest(mwRequest);
+    const fetchEvent = new NextFetchEvent({ page: normalizedPathname });
     // Execute the middleware
     let response;
     try {
-        response = await middlewareFn(nextRequest);
+        response = await middlewareFn(nextRequest, fetchEvent);
     }
     catch (e) {
         console.error("[vinext] Middleware error:", e);
@@ -238,6 +245,9 @@ export async function runMiddleware(server, middlewarePath, request) {
             }),
         };
     }
+    // Drain waitUntil promises (fire-and-forget: we don't block the response
+    // on these — matches platform semantics where waitUntil runs after response).
+    fetchEvent.drainWaitUntil();
     // No response = continue
     if (!response) {
         return { continue: true };

package/dist/server/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/server/middleware.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * proxy.ts / middleware.ts runner\n *\n * Loads and executes the user's proxy.ts (Next.js 16) or middleware.ts file\n * before routing. Runs in Node (not Edge Runtime), per the vinext design.\n *\n * In Next.js 16, proxy.ts replaces middleware.ts:\n * - proxy.ts: default export OR named `proxy` function, runs on Node.js runtime\n * - middleware.ts: deprecated but still supported for Edge runtime use cases\n *\n * The proxy/middleware receives a NextRequest and can:\n * - Return NextResponse.next() to continue to the route\n * - Return NextResponse.redirect() to redirect\n * - Return NextResponse.rewrite() to rewrite the URL\n * - Set/modify headers and cookies\n * - Return a Response directly (e.g., for auth guards)\n *\n * Supports the `config.matcher` export for path filtering.\n */\n\nimport type { ViteDevServer } from \"vite\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport { NextRequest } from \"../shims/server.js\";\nimport { safeRegExp } from \"../config/config-matchers.js\";\nimport { normalizePath } from \"./normalize-path.js\";\n\n/**\n * Determine whether a middleware/proxy file path refers to a proxy file.\n * proxy.ts files accept `proxy` or `default` exports.\n * middleware.ts files accept `middleware` or `default` exports.\n *\n * Matches Next.js behavior where each file type only accepts its own\n * named export or a default export:\n * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/templates/middleware.ts\n */\nexport function isProxyFile(filePath: string): boolean {\n  const base = path.basename(filePath).replace(/\\.\\w+$/, \"\");\n  return base === \"proxy\";\n}\n\n/**\n * Resolve the middleware/proxy handler function from a module's exports.\n * Matches Next.js behavior: for proxy files, check `proxy` then `default`;\n * for middleware files, check `middleware` then `default`.\n *\n * Throws if the file exists but doesn't export a valid function, matching\n * Next.js's ProxyMissingExportError behavior.\n *\n * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/build/templates/middleware.ts\n * @see https://github.com/vercel/next.js/blob/canary/test/e2e/app-dir/proxy-missing-export/proxy-missing-export.test.ts\n */\nexport function resolveMiddlewareHandler(\n  mod: Record<string, unknown>,\n  filePath: string,\n): Function {\n  const isProxy = isProxyFile(filePath);\n  const handler = isProxy\n    ? (mod.proxy ?? mod.default)\n    : (mod.middleware ?? mod.default);\n\n  if (typeof handler !== \"function\") {\n    const fileType = isProxy ? \"Proxy\" : \"Middleware\";\n    const expectedExport = isProxy ? \"proxy\" : \"middleware\";\n    throw new Error(\n      `The ${fileType} file \"${filePath}\" must export a function named \\`${expectedExport}\\` or a \\`default\\` function.`,\n    );\n  }\n\n  return handler as Function;\n}\n\n/**\n * Possible proxy/middleware file names.\n * proxy.ts (Next.js 16) is checked first, then middleware.ts (deprecated).\n */\nconst PROXY_FILES = [\n  \"proxy.ts\",\n  \"proxy.js\",\n  \"proxy.mjs\",\n  \"src/proxy.ts\",\n  \"src/proxy.js\",\n  \"src/proxy.mjs\",\n];\n\nconst MIDDLEWARE_FILES = [\n  \"middleware.ts\",\n  \"middleware.tsx\",\n  \"middleware.js\",\n  \"middleware.mjs\",\n  \"src/middleware.ts\",\n  \"src/middleware.tsx\",\n  \"src/middleware.js\",\n  \"src/middleware.mjs\",\n];\n\n/**\n * Find the proxy or middleware file in the project root.\n * Checks for proxy.ts (Next.js 16) first, then falls back to middleware.ts.\n * If middleware.ts is found, logs a deprecation warning.\n */\nexport function findMiddlewareFile(root: string): string | null {\n  // Check proxy.ts first (Next.js 16 replacement for middleware.ts)\n  for (const file of PROXY_FILES) {\n    const fullPath = path.join(root, file);\n    if (fs.existsSync(fullPath)) {\n      return fullPath;\n    }\n  }\n\n  // Fall back to middleware.ts (deprecated in Next.js 16)\n  for (const file of MIDDLEWARE_FILES) {\n    const fullPath = path.join(root, file);\n    if (fs.existsSync(fullPath)) {\n      console.warn(\n        \"[vinext] middleware.ts is deprecated in Next.js 16. \" +\n          \"Rename to proxy.ts and export a default or named proxy function.\",\n      );\n      return fullPath;\n    }\n  }\n  return null;\n}\n\n/** Matcher pattern from middleware config export. */\ntype MatcherConfig =\n  | string\n  | string[]\n  | { source: string; regexp?: string; locale?: boolean; has?: any[]; missing?: any[] }[];\n\n/**\n * Check if a pathname matches the middleware matcher config.\n * If no matcher is configured, middleware runs on all paths\n * except static files and internal Next.js paths.\n */\nexport function matchesMiddleware(\n  pathname: string,\n  matcher: MatcherConfig | undefined,\n): boolean {\n  if (!matcher) {\n    // Next.js default: middleware runs on ALL paths when no matcher is configured.\n    // Users opt out of specific paths by configuring a matcher pattern.\n    return true;\n  }\n\n  const patterns: string[] = [];\n  if (typeof matcher === \"string\") {\n    patterns.push(matcher);\n  } else if (Array.isArray(matcher)) {\n    for (const m of matcher) {\n      if (typeof m === \"string\") {\n        patterns.push(m);\n      } else if (m && typeof m === \"object\" && \"source\" in m) {\n        patterns.push(m.source);\n      }\n    }\n  }\n\n  return patterns.some((pattern) => matchPattern(pathname, pattern));\n}\n\n/**\n * Match a single pattern against a pathname.\n * Supports Next.js matcher patterns:\n *   /about          -> exact match\n *   /dashboard/:path*  -> prefix match with params\n *   /api/:path+     -> one or more segments\n *   /((?!api|_next).*)  -> regex patterns\n */\nexport function matchPattern(pathname: string, pattern: string): boolean {\n  // Handle regex patterns (starts with /)\n  if (pattern.includes(\"(\") || pattern.includes(\"\\\\\")) {\n    const re = safeRegExp(\"^\" + pattern + \"$\");\n    if (re) return re.test(pathname);\n    // Fall through to simple matching\n  }\n\n  // Convert Next.js path patterns to regex in a single pass.\n  // Matches /:param*, /:param+, :param, dots, and literal text.\n  // Param names may contain hyphens (e.g. [[...sign-in]]).\n  let regexStr = \"\";\n  const tokenRe = /\\/:([\\w-]+)\\*|\\/:([\\w-]+)\\+|:([\\w-]+)|[.]|[^/:.]+|./g;\n  let tok: RegExpExecArray | null;\n  while ((tok = tokenRe.exec(pattern)) !== null) {\n    if (tok[1] !== undefined) {\n      // /:param* → optionally match slash + zero or more segments\n      regexStr += \"(?:/.*)?\";\n    } else if (tok[2] !== undefined) {\n      // /:param+ → match slash + one or more segments\n      regexStr += \"(?:/.+)\";\n    } else if (tok[3] !== undefined) {\n      // :param → match one segment\n      regexStr += \"([^/]+)\";\n    } else if (tok[0] === \".\") {\n      regexStr += \"\\\\.\";\n    } else {\n      regexStr += tok[0];\n    }\n  }\n\n  const re = safeRegExp(\"^\" + regexStr + \"$\");\n  if (re) return re.test(pathname);\n  return pathname === pattern;\n}\n\n/** Result of running middleware. */\nexport interface MiddlewareResult {\n  /** Whether to continue to the route handler. */\n  continue: boolean;\n  /** If set, redirect to this URL. */\n  redirectUrl?: string;\n  /** HTTP status for redirect (default 307). */\n  redirectStatus?: number;\n  /** If set, rewrite to this URL (internal). */\n  rewriteUrl?: string;\n  /** HTTP status for rewrite (e.g. 403 from NextResponse.rewrite(url, { status: 403 })). */\n  rewriteStatus?: number;\n  /** Headers to set on the response. */\n  responseHeaders?: Headers;\n  /** If the middleware returned a full Response, use it directly. */\n  response?: Response;\n}\n\n/**\n * Load and execute middleware for a given request.\n *\n * @param server - Vite dev server (for SSR module loading)\n * @param middlewarePath - Absolute path to the middleware file\n * @param request - The incoming Request object\n * @returns Middleware result describing what action to take\n */\nexport async function runMiddleware(\n  server: ViteDevServer,\n  middlewarePath: string,\n  request: Request,\n): Promise<MiddlewareResult> {\n  // Load the middleware module via Vite's SSR module loader\n  const mod = await server.ssrLoadModule(middlewarePath);\n\n  // Resolve the handler based on file type (proxy.ts vs middleware.ts).\n  // Throws if the file doesn't export a valid function, matching Next.js behavior.\n  // https://github.com/vercel/next.js/blob/canary/test/e2e/app-dir/proxy-missing-export/proxy-missing-export.test.ts\n  const middlewareFn = resolveMiddlewareHandler(mod, middlewarePath);\n\n  // Check matcher config\n  const config = mod.config;\n  const matcher = config?.matcher;\n  const url = new URL(request.url);\n\n  // Normalize the pathname before middleware matching to prevent bypasses\n  // via percent-encoding (/%61dmin → /admin) or double slashes (/dashboard//settings).\n  let decodedPathname: string;\n  try {\n    decodedPathname = decodeURIComponent(url.pathname);\n  } catch {\n    // Malformed percent-encoding (e.g. /%E0%A4%A) — return 400 instead of throwing.\n    return { continue: false, response: new Response(\"Bad Request\", { status: 400 }) };\n  }\n  const normalizedPathname = normalizePath(decodedPathname);\n\n  if (!matchesMiddleware(normalizedPathname, matcher)) {\n    return { continue: true };\n  }\n\n   // Construct a new Request with the fully decoded + normalized pathname so\n   // middleware always sees the same canonical path that the router uses.\n  let mwRequest = request;\n  if (normalizedPathname !== url.pathname) {\n    const mwUrl = new URL(url);\n    mwUrl.pathname = normalizedPathname;\n    mwRequest = new Request(mwUrl, request);\n  }\n\n  // Wrap in NextRequest so middleware gets .nextUrl, .cookies, .geo, .ip, etc.\n  const nextRequest = mwRequest instanceof NextRequest ? mwRequest : new NextRequest(mwRequest);\n\n  // Execute the middleware\n  let response: Response | undefined;\n  try {\n    response = await middlewareFn(nextRequest);\n  } catch (e: any) {\n    console.error(\"[vinext] Middleware error:\", e);\n    const message =\n      process.env.NODE_ENV === \"production\"\n        ? \"Internal Server Error\"\n        : \"Middleware Error: \" + (e?.message ?? String(e));\n    return {\n      continue: false,\n      response: new Response(message, {\n        status: 500,\n      }),\n    };\n  }\n\n  // No response = continue\n  if (!response) {\n    return { continue: true };\n  }\n\n  // Check for x-middleware-next header (NextResponse.next())\n  if (response.headers.get(\"x-middleware-next\") === \"1\") {\n    // Continue to the route, but apply any headers the middleware set.\n    // Strip ALL x-middleware-* headers (including x-middleware-request-*)\n    // so they never leak to the client — they are internal routing signals.\n    const responseHeaders = new Headers();\n    for (const [key, value] of response.headers) {\n      if (!key.startsWith(\"x-middleware-\")) {\n        responseHeaders.append(key, value);\n      }\n    }\n    return { continue: true, responseHeaders };\n  }\n\n  // Check for redirect (3xx status)\n  if (response.status >= 300 && response.status < 400) {\n    const location = response.headers.get(\"Location\") ?? response.headers.get(\"location\");\n    if (location) {\n      // Collect non-internal headers (e.g. Set-Cookie) to forward with the redirect.\n      const responseHeaders = new Headers();\n      for (const [key, value] of response.headers) {\n        if (!key.startsWith(\"x-middleware-\") && key.toLowerCase() !== \"location\") {\n          responseHeaders.append(key, value);\n        }\n      }\n      return {\n        continue: false,\n        redirectUrl: location,\n        redirectStatus: response.status,\n        responseHeaders,\n      };\n    }\n  }\n\n  // Check for rewrite (x-middleware-rewrite header)\n  const rewriteUrl = response.headers.get(\"x-middleware-rewrite\");\n  if (rewriteUrl) {\n    // Continue to the route but with a rewritten URL\n    const responseHeaders = new Headers();\n    for (const [key, value] of response.headers) {\n      if (!key.startsWith(\"x-middleware-\")) {\n        responseHeaders.append(key, value);\n      }\n    }\n    // Parse the rewrite URL — may be absolute or relative\n    let rewritePath: string;\n    try {\n      const rewriteParsed = new URL(rewriteUrl, request.url);\n      rewritePath = rewriteParsed.pathname + rewriteParsed.search;\n    } catch {\n      rewritePath = rewriteUrl;\n    }\n    return {\n      continue: true,\n      rewriteUrl: rewritePath,\n      rewriteStatus: response.status !== 200 ? response.status : undefined,\n      responseHeaders,\n    };\n  }\n\n  // Middleware returned a full Response (e.g., blocking, custom body)\n  return { continue: false, response };\n}\n"]}
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/server/middleware.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * proxy.ts / middleware.ts runner\n *\n * Loads and executes the user's proxy.ts (Next.js 16) or middleware.ts file\n * before routing. Runs in Node (not Edge Runtime), per the vinext design.\n *\n * In Next.js 16, proxy.ts replaces middleware.ts:\n * - proxy.ts: default export OR named `proxy` function, runs on Node.js runtime\n * - middleware.ts: deprecated but still supported for Edge runtime use cases\n *\n * The proxy/middleware receives a NextRequest and can:\n * - Return NextResponse.next() to continue to the route\n * - Return NextResponse.redirect() to redirect\n * - Return NextResponse.rewrite() to rewrite the URL\n * - Set/modify headers and cookies\n * - Return a Response directly (e.g., for auth guards)\n *\n * Supports the `config.matcher` export for path filtering.\n */\n\nimport type { ModuleRunner } from \"vite/module-runner\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport { NextRequest, NextFetchEvent } from \"../shims/server.js\";\nimport { safeRegExp } from \"../config/config-matchers.js\";\nimport { normalizePath } from \"./normalize-path.js\";\n\n/**\n * Determine whether a middleware/proxy file path refers to a proxy file.\n * proxy.ts files accept `proxy` or `default` exports.\n * middleware.ts files accept `middleware` or `default` exports.\n *\n * Matches Next.js behavior where each file type only accepts its own\n * named export or a default export:\n * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/templates/middleware.ts\n */\nexport function isProxyFile(filePath: string): boolean {\n  const base = path.basename(filePath).replace(/\\.\\w+$/, \"\");\n  return base === \"proxy\";\n}\n\n/**\n * Resolve the middleware/proxy handler function from a module's exports.\n * Matches Next.js behavior: for proxy files, check `proxy` then `default`;\n * for middleware files, check `middleware` then `default`.\n *\n * Throws if the file exists but doesn't export a valid function, matching\n * Next.js's ProxyMissingExportError behavior.\n *\n * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/build/templates/middleware.ts\n * @see https://github.com/vercel/next.js/blob/canary/test/e2e/app-dir/proxy-missing-export/proxy-missing-export.test.ts\n */\nexport function resolveMiddlewareHandler(\n  mod: Record<string, unknown>,\n  filePath: string,\n): Function {\n  const isProxy = isProxyFile(filePath);\n  const handler = isProxy\n    ? (mod.proxy ?? mod.default)\n    : (mod.middleware ?? mod.default);\n\n  if (typeof handler !== \"function\") {\n    const fileType = isProxy ? \"Proxy\" : \"Middleware\";\n    const expectedExport = isProxy ? \"proxy\" : \"middleware\";\n    throw new Error(\n      `The ${fileType} file \"${filePath}\" must export a function named \\`${expectedExport}\\` or a \\`default\\` function.`,\n    );\n  }\n\n  return handler as Function;\n}\n\n/**\n * Possible proxy/middleware file names.\n * proxy.ts (Next.js 16) is checked first, then middleware.ts (deprecated).\n */\nconst PROXY_FILES = [\n  \"proxy.ts\",\n  \"proxy.js\",\n  \"proxy.mjs\",\n  \"src/proxy.ts\",\n  \"src/proxy.js\",\n  \"src/proxy.mjs\",\n];\n\nconst MIDDLEWARE_FILES = [\n  \"middleware.ts\",\n  \"middleware.tsx\",\n  \"middleware.js\",\n  \"middleware.mjs\",\n  \"src/middleware.ts\",\n  \"src/middleware.tsx\",\n  \"src/middleware.js\",\n  \"src/middleware.mjs\",\n];\n\n/**\n * Find the proxy or middleware file in the project root.\n * Checks for proxy.ts (Next.js 16) first, then falls back to middleware.ts.\n * If middleware.ts is found, logs a deprecation warning.\n */\nexport function findMiddlewareFile(root: string): string | null {\n  // Check proxy.ts first (Next.js 16 replacement for middleware.ts)\n  for (const file of PROXY_FILES) {\n    const fullPath = path.join(root, file);\n    if (fs.existsSync(fullPath)) {\n      return fullPath;\n    }\n  }\n\n  // Fall back to middleware.ts (deprecated in Next.js 16)\n  for (const file of MIDDLEWARE_FILES) {\n    const fullPath = path.join(root, file);\n    if (fs.existsSync(fullPath)) {\n      console.warn(\n        \"[vinext] middleware.ts is deprecated in Next.js 16. \" +\n          \"Rename to proxy.ts and export a default or named proxy function.\",\n      );\n      return fullPath;\n    }\n  }\n  return null;\n}\n\n/** Matcher pattern from middleware config export. */\ntype MatcherConfig =\n  | string\n  | string[]\n  | { source: string; regexp?: string; locale?: boolean; has?: any[]; missing?: any[] }[];\n\n/**\n * Check if a pathname matches the middleware matcher config.\n * If no matcher is configured, middleware runs on all paths\n * except static files and internal Next.js paths.\n */\nexport function matchesMiddleware(\n  pathname: string,\n  matcher: MatcherConfig | undefined,\n): boolean {\n  if (!matcher) {\n    // Next.js default: middleware runs on ALL paths when no matcher is configured.\n    // Users opt out of specific paths by configuring a matcher pattern.\n    return true;\n  }\n\n  const patterns: string[] = [];\n  if (typeof matcher === \"string\") {\n    patterns.push(matcher);\n  } else if (Array.isArray(matcher)) {\n    for (const m of matcher) {\n      if (typeof m === \"string\") {\n        patterns.push(m);\n      } else if (m && typeof m === \"object\" && \"source\" in m) {\n        patterns.push(m.source);\n      }\n    }\n  }\n\n  return patterns.some((pattern) => matchPattern(pathname, pattern));\n}\n\n/**\n * Match a single pattern against a pathname.\n * Supports Next.js matcher patterns:\n *   /about          -> exact match\n *   /dashboard/:path*  -> prefix match with params\n *   /api/:path+     -> one or more segments\n *   /((?!api|_next).*)  -> regex patterns\n */\nexport function matchPattern(pathname: string, pattern: string): boolean {\n  // Handle regex patterns (starts with /)\n  if (pattern.includes(\"(\") || pattern.includes(\"\\\\\")) {\n    const re = safeRegExp(\"^\" + pattern + \"$\");\n    if (re) return re.test(pathname);\n    // Fall through to simple matching\n  }\n\n  // Convert Next.js path patterns to regex in a single pass.\n  // Matches /:param*, /:param+, :param, dots, and literal text.\n  // Param names may contain hyphens (e.g. [[...sign-in]]).\n  let regexStr = \"\";\n  const tokenRe = /\\/:([\\w-]+)\\*|\\/:([\\w-]+)\\+|:([\\w-]+)|[.]|[^/:.]+|./g;\n  let tok: RegExpExecArray | null;\n  while ((tok = tokenRe.exec(pattern)) !== null) {\n    if (tok[1] !== undefined) {\n      // /:param* → optionally match slash + zero or more segments\n      regexStr += \"(?:/.*)?\";\n    } else if (tok[2] !== undefined) {\n      // /:param+ → match slash + one or more segments\n      regexStr += \"(?:/.+)\";\n    } else if (tok[3] !== undefined) {\n      // :param → match one segment\n      regexStr += \"([^/]+)\";\n    } else if (tok[0] === \".\") {\n      regexStr += \"\\\\.\";\n    } else {\n      regexStr += tok[0];\n    }\n  }\n\n  const re = safeRegExp(\"^\" + regexStr + \"$\");\n  if (re) return re.test(pathname);\n  return pathname === pattern;\n}\n\n/** Result of running middleware. */\nexport interface MiddlewareResult {\n  /** Whether to continue to the route handler. */\n  continue: boolean;\n  /** If set, redirect to this URL. */\n  redirectUrl?: string;\n  /** HTTP status for redirect (default 307). */\n  redirectStatus?: number;\n  /** If set, rewrite to this URL (internal). */\n  rewriteUrl?: string;\n  /** HTTP status for rewrite (e.g. 403 from NextResponse.rewrite(url, { status: 403 })). */\n  rewriteStatus?: number;\n  /** Headers to set on the response. */\n  responseHeaders?: Headers;\n  /** If the middleware returned a full Response, use it directly. */\n  response?: Response;\n}\n\n/**\n * Load and execute middleware for a given request.\n *\n * @param runner - A ModuleRunner used to load the middleware module.\n *   Must be a long-lived instance created once (e.g. in configureServer) via\n *   createDirectRunner() — NOT recreated per request. Using server.ssrLoadModule\n *   directly crashes with `outsideEmitter` when @cloudflare/vite-plugin is\n *   present because SSRCompatModuleRunner reads environment.hot.api synchronously.\n * @param middlewarePath - Absolute path to the middleware file\n * @param request - The incoming Request object\n * @returns Middleware result describing what action to take\n */\nexport async function runMiddleware(\n  runner: ModuleRunner,\n  middlewarePath: string,\n  request: Request,\n): Promise<MiddlewareResult> {\n  // Load the middleware module via the direct-call ModuleRunner.\n  // This bypasses the hot channel entirely and is safe with all Vite plugin\n  // combinations, including @cloudflare/vite-plugin.\n  const mod = await runner.import(middlewarePath) as Record<string, unknown>;\n\n  // Resolve the handler based on file type (proxy.ts vs middleware.ts).\n  // Throws if the file doesn't export a valid function, matching Next.js behavior.\n  // https://github.com/vercel/next.js/blob/canary/test/e2e/app-dir/proxy-missing-export/proxy-missing-export.test.ts\n  const middlewareFn = resolveMiddlewareHandler(mod, middlewarePath);\n\n  // Check matcher config\n  const config = mod.config as { matcher?: MatcherConfig } | undefined;\n  const matcher = config?.matcher;\n  const url = new URL(request.url);\n\n  // Normalize the pathname before middleware matching to prevent bypasses\n  // via percent-encoding (/%61dmin → /admin) or double slashes (/dashboard//settings).\n  let decodedPathname: string;\n  try {\n    decodedPathname = decodeURIComponent(url.pathname);\n  } catch {\n    // Malformed percent-encoding (e.g. /%E0%A4%A) — return 400 instead of throwing.\n    return { continue: false, response: new Response(\"Bad Request\", { status: 400 }) };\n  }\n  const normalizedPathname = normalizePath(decodedPathname);\n\n  if (!matchesMiddleware(normalizedPathname, matcher)) {\n    return { continue: true };\n  }\n\n   // Construct a new Request with the fully decoded + normalized pathname so\n   // middleware always sees the same canonical path that the router uses.\n  let mwRequest = request;\n  if (normalizedPathname !== url.pathname) {\n    const mwUrl = new URL(url);\n    mwUrl.pathname = normalizedPathname;\n    mwRequest = new Request(mwUrl, request);\n  }\n\n  // Wrap in NextRequest so middleware gets .nextUrl, .cookies, .geo, .ip, etc.\n  const nextRequest = mwRequest instanceof NextRequest ? mwRequest : new NextRequest(mwRequest);\n  const fetchEvent = new NextFetchEvent({ page: normalizedPathname });\n\n  // Execute the middleware\n  let response: Response | undefined;\n  try {\n    response = await middlewareFn(nextRequest, fetchEvent);\n  } catch (e: any) {\n    console.error(\"[vinext] Middleware error:\", e);\n    const message =\n      process.env.NODE_ENV === \"production\"\n        ? \"Internal Server Error\"\n        : \"Middleware Error: \" + (e?.message ?? String(e));\n    return {\n      continue: false,\n      response: new Response(message, {\n        status: 500,\n      }),\n    };\n  }\n\n  // Drain waitUntil promises (fire-and-forget: we don't block the response\n  // on these — matches platform semantics where waitUntil runs after response).\n  fetchEvent.drainWaitUntil();\n\n  // No response = continue\n  if (!response) {\n    return { continue: true };\n  }\n\n  // Check for x-middleware-next header (NextResponse.next())\n  if (response.headers.get(\"x-middleware-next\") === \"1\") {\n    // Continue to the route, but apply any headers the middleware set.\n    // Strip ALL x-middleware-* headers (including x-middleware-request-*)\n    // so they never leak to the client — they are internal routing signals.\n    const responseHeaders = new Headers();\n    for (const [key, value] of response.headers) {\n      if (!key.startsWith(\"x-middleware-\")) {\n        responseHeaders.append(key, value);\n      }\n    }\n    return { continue: true, responseHeaders };\n  }\n\n  // Check for redirect (3xx status)\n  if (response.status >= 300 && response.status < 400) {\n    const location = response.headers.get(\"Location\") ?? response.headers.get(\"location\");\n    if (location) {\n      // Collect non-internal headers (e.g. Set-Cookie) to forward with the redirect.\n      const responseHeaders = new Headers();\n      for (const [key, value] of response.headers) {\n        if (!key.startsWith(\"x-middleware-\") && key.toLowerCase() !== \"location\") {\n          responseHeaders.append(key, value);\n        }\n      }\n      return {\n        continue: false,\n        redirectUrl: location,\n        redirectStatus: response.status,\n        responseHeaders,\n      };\n    }\n  }\n\n  // Check for rewrite (x-middleware-rewrite header)\n  const rewriteUrl = response.headers.get(\"x-middleware-rewrite\");\n  if (rewriteUrl) {\n    // Continue to the route but with a rewritten URL\n    const responseHeaders = new Headers();\n    for (const [key, value] of response.headers) {\n      if (!key.startsWith(\"x-middleware-\")) {\n        responseHeaders.append(key, value);\n      }\n    }\n    // Parse the rewrite URL — may be absolute or relative\n    let rewritePath: string;\n    try {\n      const rewriteParsed = new URL(rewriteUrl, request.url);\n      rewritePath = rewriteParsed.pathname + rewriteParsed.search;\n    } catch {\n      rewritePath = rewriteUrl;\n    }\n    return {\n      continue: true,\n      rewriteUrl: rewritePath,\n      rewriteStatus: response.status !== 200 ? response.status : undefined,\n      responseHeaders,\n    };\n  }\n\n  // Middleware returned a full Response (e.g., blocking, custom body)\n  return { continue: false, response };\n}\n"]}

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

@@ -37,11 +37,17 @@ declare const COMPRESS_THRESHOLD = 1024;
  * Preference order: br > gzip > deflate > identity.
  */
 declare function negotiateEncoding(req: IncomingMessage): "br" | "gzip" | "deflate" | null;
+/**
+ * Merge middleware headers and a Web Response's headers into a single
+ * record suitable for Node.js `res.writeHead()`. Uses `getSetCookie()`
+ * to preserve multiple Set-Cookie values instead of flattening them.
+ */
+declare function mergeResponseHeaders(middlewareHeaders: Record<string, string | string[]>, response: Response): Record<string, string | string[]>;
 /**
  * Send a compressed response if the content type is compressible and the
  * client supports compression. Otherwise send uncompressed.
  */
-declare function sendCompressed(req: IncomingMessage, res: ServerResponse, body: string | Buffer, contentType: string, statusCode: number, extraHeaders?: Record<string, string>, compress?: boolean): void;
+declare function sendCompressed(req: IncomingMessage, res: ServerResponse, body: string | Buffer, contentType: string, statusCode: number, extraHeaders?: Record<string, string | string[]>, compress?: boolean): void;
 /**
  * Resolve the host for a request, ignoring X-Forwarded-Host to prevent
  * host header poisoning attacks (open redirects, cache poisoning).
@@ -74,5 +80,5 @@ declare function nodeToWebRequest(req: IncomingMessage): Request;
  * Pages Router (dist/server/entry.js) and configures the appropriate handler.
  */
 export declare function startProdServer(options?: ProdServerOptions): Promise<import("node:http").Server<typeof IncomingMessage, typeof ServerResponse>>;
-export { sendCompressed, negotiateEncoding, COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, resolveHost, trustedHosts, trustProxy, nodeToWebRequest };
+export { sendCompressed, negotiateEncoding, COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, resolveHost, trustedHosts, trustProxy, nodeToWebRequest, mergeResponseHeaders };
 //# sourceMappingURL=prod-server.d.ts.map

package/dist/server/prod-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prod-server.d.ts","sourceRoot":"","sources":["../../src/server/prod-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EAAgB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAuBpF,MAAM,WAAW,iBAAiB;IAChC,wBAAwB;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sBAAsB;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2CAA2C;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,mDAAmD;AACnD,QAAA,MAAM,kBAAkB,aAetB,CAAC;AAEH,0GAA0G;AAC1G,QAAA,MAAM,kBAAkB,OAAO,CAAC;AAEhC;;;GAGG;AACH,iBAAS,iBAAiB,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAQjF;AAoBD;;;GAGG;AACH,iBAAS,cAAc,CACrB,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,YAAY,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACzC,QAAQ,GAAE,OAAc,GACvB,IAAI,CAkCN;AAkGD;;;;;;;;;;;GAWG;AACH,iBAAS,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAcnE;AAED,4EAA4E;AAC5E,QAAA,MAAM,YAAY,EAAE,GAAG,CAAC,MAAM,CAK7B,CAAC;AAEF;;;;GAIG;AACH,QAAA,MAAM,UAAU,SAAkE,CAAC;AAEnF;;GAEG;AACH,iBAAS,gBAAgB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAmCvD;AA+ED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,OAAO,GAAE,iBAAsB,sFA6BpE;AAsiBD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"prod-server.d.ts","sourceRoot":"","sources":["../../src/server/prod-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EAAgB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAuBpF,MAAM,WAAW,iBAAiB;IAChC,wBAAwB;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sBAAsB;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2CAA2C;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,mDAAmD;AACnD,QAAA,MAAM,kBAAkB,aAetB,CAAC;AAEH,0GAA0G;AAC1G,QAAA,MAAM,kBAAkB,OAAO,CAAC;AAEhC;;;GAGG;AACH,iBAAS,iBAAiB,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAQjF;AAoBD;;;;GAIG;AACH,iBAAS,oBAAoB,CAC3B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EACpD,QAAQ,EAAE,QAAQ,GACjB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAqBnC;AAED;;;GAGG;AACH,iBAAS,cAAc,CACrB,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,YAAY,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAM,EACpD,QAAQ,GAAE,OAAc,GACvB,IAAI,CAmCN;AAkGD;;;;;;;;;;;GAWG;AACH,iBAAS,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAcnE;AAED,4EAA4E;AAC5E,QAAA,MAAM,YAAY,EAAE,GAAG,CAAC,MAAM,CAK7B,CAAC;AAEF;;;;GAIG;AACH,QAAA,MAAM,UAAU,SAAkE,CAAC;AAEnF;;GAEG;AACH,iBAAS,gBAAgB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAmCvD;AA+ED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,OAAO,GAAE,iBAAsB,sFA6BpE;AAkiBD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,CAAC"}