@qwik.dev/router 2.0.0-alpha.9 → 2.0.0-beta.2

package/lib/index.qwik.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("@qwik.dev/core/jsx-runtime");
 const core = require("@qwik.dev/core");
+const preloader = require("@qwik.dev/core/preloader");
 const internal = require("@qwik.dev/core/internal");
 const qwikRouterConfig = require("@qwik-router-config");
 const zod = require("zod");
@@ -37,7 +38,6 @@ const ErrorBoundary = core.component$((props) => {
 });
 const MODULE_CACHE = /* @__PURE__ */ new WeakMap();
 const CLIENT_DATA_CACHE = /* @__PURE__ */ new Map();
-const PREFETCHED_NAVIGATE_PATHS = /* @__PURE__ */ new Set();
 const QACTION_KEY = "qaction";
 const QFN_KEY = "qfunc";
 const QDATA_KEY = "qdata";
@@ -75,15 +75,7 @@ const getClientNavPath = (props, baseUrl) => {
   }
   return null;
 };
-const shouldPrefetchData = (clientNavPath, currentLoc) => {
-  if (clientNavPath) {
-    const prefetchUrl = toUrl(clientNavPath, currentLoc.url);
-    const currentUrl = toUrl("", currentLoc.url);
-    return !isSamePath(prefetchUrl, currentUrl);
-  }
-  return false;
-};
-const shouldPrefetchSymbols = (clientNavPath, currentLoc) => {
+const shouldPreload = (clientNavPath, currentLoc) => {
   if (clientNavPath) {
     const prefetchUrl = toUrl(clientNavPath, currentLoc.url);
     const currentUrl = toUrl("", currentLoc.url);
@@ -133,16 +125,8 @@ const newScrollState = () => {
 const prefetchSymbols = (path) => {
   if (core.isBrowser) {
     path = path.endsWith("/") ? path : path + "/";
-    if (!PREFETCHED_NAVIGATE_PATHS.has(path)) {
-      PREFETCHED_NAVIGATE_PATHS.add(path);
-      document.dispatchEvent(new CustomEvent("qprefetch", {
-        detail: {
-          links: [
-            path
-          ]
-        }
-      }));
-    }
+    path = path.length > 1 && path.startsWith("/") ? path.slice(1) : path;
+    preloader.p(path, 0.8);
   }
 };
 const loadClientData = async (url, element, opts) => {
@@ -158,7 +142,7 @@ const loadClientData = async (url, element, opts) => {
   }
   let resolveFn;
   if (!qData) {
-    const fetchOptions = getFetchOptions(opts?.action);
+    const fetchOptions = getFetchOptions(opts?.action, opts?.clearCache);
     if (opts?.action) {
       opts.action.data = void 0;
     }
@@ -214,16 +198,19 @@ const loadClientData = async (url, element, opts) => {
     return v;
   });
 };
-const getFetchOptions = (action) => {
+const getFetchOptions = (action, noCache) => {
   const actionData = action?.data;
   if (!actionData) {
-    return {
-      cache: "no-cache",
-      headers: {
-        "Cache-Control": "no-cache",
-        Pragma: "no-cache"
-      }
-    };
+    if (noCache) {
+      return {
+        cache: "no-cache",
+        headers: {
+          "Cache-Control": "no-cache",
+          Pragma: "no-cache"
+        }
+      };
+    }
+    return void 0;
   }
   if (actionData instanceof FormData) {
     return {
@@ -267,14 +254,15 @@ const Link = core.component$((props) => {
   const nav = useNavigate();
   const loc = useLocation();
   const originalHref = props.href;
+  const anchorRef = core.useSignal();
   const { onClick$, prefetch: prefetchProp, reload, replaceState, scroll, ...linkProps } = /* @__PURE__ */ (() => props)();
   const clientNavPath = core.untrack(() => getClientNavPath({
     ...linkProps,
     reload
   }, loc));
   linkProps.href = clientNavPath || originalHref;
-  const prefetchData = core.untrack(() => !!clientNavPath && prefetchProp !== false && prefetchProp !== "js" && shouldPrefetchData(clientNavPath, loc) || void 0);
-  const prefetch = core.untrack(() => prefetchData || !!clientNavPath && prefetchProp !== false && shouldPrefetchSymbols(clientNavPath, loc));
+  const prefetchData = core.untrack(() => !!clientNavPath && prefetchProp !== false && prefetchProp !== "js" || void 0);
+  const prefetch = core.untrack(() => prefetchData || !!clientNavPath && prefetchProp !== false && shouldPreload(clientNavPath, loc));
   const handlePrefetch = prefetch ? core.$((_, elm) => {
     if (navigator.connection?.saveData) {
       return;
@@ -308,7 +296,23 @@ const Link = core.component$((props) => {
       }
     }
   }) : void 0;
+  core.useVisibleTask$(({ track }) => {
+    track(() => loc.url.pathname);
+    const handler = linkProps.onQVisible$;
+    if (handler) {
+      const event = new CustomEvent("qvisible");
+      if (Array.isArray(handler)) {
+        handler.flat(10).forEach((handler2) => handler2?.(event, anchorRef.value));
+      } else {
+        handler?.(event, anchorRef.value);
+      }
+    }
+    if (!core.isDev && anchorRef.value) {
+      handlePrefetch?.(void 0, anchorRef.value);
+    }
+  });
   return /* @__PURE__ */ jsxRuntime.jsx("a", {
+    ref: anchorRef,
     "q:link": !!clientNavPath,
     ...linkProps,
     onClick$: [
@@ -325,11 +329,8 @@ const Link = core.component$((props) => {
       linkProps.onFocus$,
       handlePrefetch
     ],
-    // Don't prefetch on visible in dev mode
-    onQVisible$: [
-      linkProps.onQVisible$,
-      !core.isDev ? handlePrefetch : void 0
-    ],
+    // We need to prevent the onQVisible$ from being called twice since it is handled in the visible task
+    onQVisible$: [],
     children: /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {})
   });
 });
@@ -770,6 +771,26 @@ const spaInit = core.event$((_, el) => {
     }, 0);
   }
 });
+const startViewTransition = (params) => {
+  if (!params.update) {
+    return;
+  }
+  if ("startViewTransition" in document) {
+    let transition;
+    try {
+      transition = document.startViewTransition(params);
+    } catch {
+      transition = document.startViewTransition(params.update);
+    }
+    const event = new CustomEvent("qviewtransition", {
+      detail: transition
+    });
+    document.dispatchEvent(event);
+    return transition;
+  } else {
+    params.update?.();
+  }
+};
 const QWIK_CITY_SCROLLER = "_qCityScroller";
 const QWIK_ROUTER_SCROLLER = "_qRouterScroller";
 const preventNav = {};
@@ -777,7 +798,18 @@ const internalState = {
   navCount: 0
 };
 const QwikRouterProvider = core.component$((props) => {
-  core.useStyles$(`:root{view-transition-name:none}`);
+  core.useStyles$(`
+    @layer qwik {
+      @supports selector(html:active-view-transition-type(type)) {
+        html:active-view-transition-type(qwik-router-spa) {
+          :root{view-transition-name:none}
+        }
+      }
+      @supports not selector(html:active-view-transition-type(type)) {
+        :root{view-transition-name:none}
+      }
+    }
+  `);
   const env = useQwikRouterEnv();
   if (!env?.params) {
     throw new Error(`Missing Qwik Router Env Data for help visit https://github.com/QwikDev/qwik/issues/6237`);
@@ -786,6 +818,11 @@ const QwikRouterProvider = core.component$((props) => {
   if (!urlEnv) {
     throw new Error(`Missing Qwik URL Env Data`);
   }
+  if (core.isServer) {
+    if (env.ev.originalUrl.pathname !== env.ev.url.pathname && !__EXPERIMENTAL__.enableRequestRewrite) {
+      throw new Error(`enableRequestRewrite is an experimental feature and is not enabled. Please enable the feature flag by adding \`experimental: ["enableRequestRewrite"]\` to your qwikVite plugin options.`);
+    }
+  }
   const url = new URL(urlEnv);
   const routeLocation = core.useStore({
     url,
@@ -974,12 +1011,21 @@ const QwikRouterProvider = core.component$((props) => {
         const newHref = pageData.href;
         const newURL = new URL(newHref, trackUrl);
         if (!isSamePath(newURL, trackUrl)) {
-          trackUrl = newURL;
-          loadRoutePromise = loadRoute(qwikRouterConfig__namespace.routes, qwikRouterConfig__namespace.menus, qwikRouterConfig__namespace.cacheModules, trackUrl.pathname);
+          if (!pageData.isRewrite) {
+            trackUrl = newURL;
+          }
+          loadRoutePromise = loadRoute(
+            qwikRouterConfig__namespace.routes,
+            qwikRouterConfig__namespace.menus,
+            qwikRouterConfig__namespace.cacheModules,
+            newURL.pathname
+            // Load the actual required path.
+          );
         }
         try {
           loadedRoute = await loadRoutePromise;
         } catch (e) {
+          console.error(e);
           window.location.href = newHref;
           return;
         }
@@ -1014,9 +1060,6 @@ const QwikRouterProvider = core.component$((props) => {
         documentHead.title = resolvedHead.title;
         documentHead.frontmatter = resolvedHead.frontmatter;
         if (core.isBrowser) {
-          if (props.viewTransition !== false) {
-            document.__q_view_transition__ = true;
-          }
           let scrollState;
           if (navType === "popstate") {
             scrollState = getScrollHistory();
@@ -1139,8 +1182,27 @@ const QwikRouterProvider = core.component$((props) => {
             const scrollState2 = currentScrollState(scroller);
             saveScrollHistory(scrollState2);
           }
-          clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
-          internal._waitUntilRendered(elm).then(() => {
+          const navigate = () => {
+            clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
+            return internal._waitUntilRendered(elm);
+          };
+          const _waitNextPage = () => {
+            if (core.isServer || props.viewTransition === false) {
+              return navigate();
+            } else {
+              const viewTransition = startViewTransition({
+                update: navigate,
+                types: [
+                  "qwik-navigation"
+                ]
+              });
+              if (!viewTransition) {
+                return Promise.resolve();
+              }
+              return viewTransition.ready;
+            }
+          };
+          _waitNextPage().then(() => {
             const container = internal._getQContainerElement(elm);
             container.setAttribute("q:route", routeName);
             const scrollState2 = currentScrollState(scroller);
@@ -1155,11 +1217,10 @@ const QwikRouterProvider = core.component$((props) => {
         }
       }
     }
-    const promise = run();
     if (core.isServer) {
-      return promise;
+      return run();
     } else {
-      return;
+      run();
     }
   });
   return /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {});
@@ -1722,7 +1783,8 @@ const deserializeStream = async function* (stream, ctxElm, abortSignal) {
     reader.releaseLock();
   }
 };
-const ServiceWorkerRegister = (props) => core.jsx("script", {
+const ServiceWorkerRegister = (props) => /* @__PURE__ */ jsxRuntime.jsx("script", {
+  type: "module",
   dangerouslySetInnerHTML: swRegister,
   nonce: props.nonce
 });

package/lib/index.qwik.mjs

@@ -1,6 +1,7 @@
 import { jsx, Fragment, jsxs } from "@qwik.dev/core/jsx-runtime";
-import { component$, useErrorBoundary, useOnWindow, $, Slot, isBrowser, createContextId, implicit$FirstArg, useContext, useVisibleTask$, noSerialize, useServerData, untrack, sync$, isDev, withLocale, event$, useStyles$, useStore, useSignal, useContextProvider, useTask$, isServer, getLocale, jsx as jsx$1, SkipRender } from "@qwik.dev/core";
-import { _deserialize, _weakSerialize, _getContextElement, _waitUntilRendered, _getQContainerElement, _wrapStore, _getContextEvent, _serialize } from "@qwik.dev/core/internal";
+import { component$, useErrorBoundary, useOnWindow, $, Slot, isBrowser, createContextId, implicit$FirstArg, useContext, useVisibleTask$, noSerialize, useServerData, useSignal, untrack, sync$, isDev, withLocale, event$, useStyles$, isServer, useStore, useContextProvider, useTask$, getLocale, jsx as jsx$1, SkipRender } from "@qwik.dev/core";
+import { p } from "@qwik.dev/core/preloader";
+import { _deserialize, _weakSerialize, _getContextElement, _getQContainerElement, _waitUntilRendered, _wrapStore, _getContextEvent, _serialize } from "@qwik.dev/core/internal";
 import * as qwikRouterConfig from "@qwik-router-config";
 import { z } from "zod";
 import { z as z2 } from "zod";
@@ -19,7 +20,6 @@ const ErrorBoundary = component$((props) => {
 });
 const MODULE_CACHE = /* @__PURE__ */ new WeakMap();
 const CLIENT_DATA_CACHE = /* @__PURE__ */ new Map();
-const PREFETCHED_NAVIGATE_PATHS = /* @__PURE__ */ new Set();
 const QACTION_KEY = "qaction";
 const QFN_KEY = "qfunc";
 const QDATA_KEY = "qdata";
@@ -57,15 +57,7 @@ const getClientNavPath = (props, baseUrl) => {
   }
   return null;
 };
-const shouldPrefetchData = (clientNavPath, currentLoc) => {
-  if (clientNavPath) {
-    const prefetchUrl = toUrl(clientNavPath, currentLoc.url);
-    const currentUrl = toUrl("", currentLoc.url);
-    return !isSamePath(prefetchUrl, currentUrl);
-  }
-  return false;
-};
-const shouldPrefetchSymbols = (clientNavPath, currentLoc) => {
+const shouldPreload = (clientNavPath, currentLoc) => {
   if (clientNavPath) {
     const prefetchUrl = toUrl(clientNavPath, currentLoc.url);
     const currentUrl = toUrl("", currentLoc.url);
@@ -115,16 +107,8 @@ const newScrollState = () => {
 const prefetchSymbols = (path) => {
   if (isBrowser) {
     path = path.endsWith("/") ? path : path + "/";
-    if (!PREFETCHED_NAVIGATE_PATHS.has(path)) {
-      PREFETCHED_NAVIGATE_PATHS.add(path);
-      document.dispatchEvent(new CustomEvent("qprefetch", {
-        detail: {
-          links: [
-            path
-          ]
-        }
-      }));
-    }
+    path = path.length > 1 && path.startsWith("/") ? path.slice(1) : path;
+    p(path, 0.8);
   }
 };
 const loadClientData = async (url, element, opts) => {
@@ -140,7 +124,7 @@ const loadClientData = async (url, element, opts) => {
   }
   let resolveFn;
   if (!qData) {
-    const fetchOptions = getFetchOptions(opts?.action);
+    const fetchOptions = getFetchOptions(opts?.action, opts?.clearCache);
     if (opts?.action) {
       opts.action.data = void 0;
     }
@@ -196,16 +180,19 @@ const loadClientData = async (url, element, opts) => {
     return v;
   });
 };
-const getFetchOptions = (action) => {
+const getFetchOptions = (action, noCache) => {
   const actionData = action?.data;
   if (!actionData) {
-    return {
-      cache: "no-cache",
-      headers: {
-        "Cache-Control": "no-cache",
-        Pragma: "no-cache"
-      }
-    };
+    if (noCache) {
+      return {
+        cache: "no-cache",
+        headers: {
+          "Cache-Control": "no-cache",
+          Pragma: "no-cache"
+        }
+      };
+    }
+    return void 0;
   }
   if (actionData instanceof FormData) {
     return {
@@ -249,14 +236,15 @@ const Link = component$((props) => {
   const nav = useNavigate();
   const loc = useLocation();
   const originalHref = props.href;
+  const anchorRef = useSignal();
   const { onClick$, prefetch: prefetchProp, reload, replaceState, scroll, ...linkProps } = /* @__PURE__ */ (() => props)();
   const clientNavPath = untrack(() => getClientNavPath({
     ...linkProps,
     reload
   }, loc));
   linkProps.href = clientNavPath || originalHref;
-  const prefetchData = untrack(() => !!clientNavPath && prefetchProp !== false && prefetchProp !== "js" && shouldPrefetchData(clientNavPath, loc) || void 0);
-  const prefetch = untrack(() => prefetchData || !!clientNavPath && prefetchProp !== false && shouldPrefetchSymbols(clientNavPath, loc));
+  const prefetchData = untrack(() => !!clientNavPath && prefetchProp !== false && prefetchProp !== "js" || void 0);
+  const prefetch = untrack(() => prefetchData || !!clientNavPath && prefetchProp !== false && shouldPreload(clientNavPath, loc));
   const handlePrefetch = prefetch ? $((_, elm) => {
     if (navigator.connection?.saveData) {
       return;
@@ -290,7 +278,23 @@ const Link = component$((props) => {
       }
     }
   }) : void 0;
+  useVisibleTask$(({ track }) => {
+    track(() => loc.url.pathname);
+    const handler = linkProps.onQVisible$;
+    if (handler) {
+      const event = new CustomEvent("qvisible");
+      if (Array.isArray(handler)) {
+        handler.flat(10).forEach((handler2) => handler2?.(event, anchorRef.value));
+      } else {
+        handler?.(event, anchorRef.value);
+      }
+    }
+    if (!isDev && anchorRef.value) {
+      handlePrefetch?.(void 0, anchorRef.value);
+    }
+  });
   return /* @__PURE__ */ jsx("a", {
+    ref: anchorRef,
     "q:link": !!clientNavPath,
     ...linkProps,
     onClick$: [
@@ -307,11 +311,8 @@ const Link = component$((props) => {
       linkProps.onFocus$,
       handlePrefetch
     ],
-    // Don't prefetch on visible in dev mode
-    onQVisible$: [
-      linkProps.onQVisible$,
-      !isDev ? handlePrefetch : void 0
-    ],
+    // We need to prevent the onQVisible$ from being called twice since it is handled in the visible task
+    onQVisible$: [],
     children: /* @__PURE__ */ jsx(Slot, {})
   });
 });
@@ -752,6 +753,26 @@ const spaInit = event$((_, el) => {
     }, 0);
   }
 });
+const startViewTransition = (params) => {
+  if (!params.update) {
+    return;
+  }
+  if ("startViewTransition" in document) {
+    let transition;
+    try {
+      transition = document.startViewTransition(params);
+    } catch {
+      transition = document.startViewTransition(params.update);
+    }
+    const event = new CustomEvent("qviewtransition", {
+      detail: transition
+    });
+    document.dispatchEvent(event);
+    return transition;
+  } else {
+    params.update?.();
+  }
+};
 const QWIK_CITY_SCROLLER = "_qCityScroller";
 const QWIK_ROUTER_SCROLLER = "_qRouterScroller";
 const preventNav = {};
@@ -759,7 +780,18 @@ const internalState = {
   navCount: 0
 };
 const QwikRouterProvider = component$((props) => {
-  useStyles$(`:root{view-transition-name:none}`);
+  useStyles$(`
+    @layer qwik {
+      @supports selector(html:active-view-transition-type(type)) {
+        html:active-view-transition-type(qwik-router-spa) {
+          :root{view-transition-name:none}
+        }
+      }
+      @supports not selector(html:active-view-transition-type(type)) {
+        :root{view-transition-name:none}
+      }
+    }
+  `);
   const env = useQwikRouterEnv();
   if (!env?.params) {
     throw new Error(`Missing Qwik Router Env Data for help visit https://github.com/QwikDev/qwik/issues/6237`);
@@ -768,6 +800,11 @@ const QwikRouterProvider = component$((props) => {
   if (!urlEnv) {
     throw new Error(`Missing Qwik URL Env Data`);
   }
+  if (isServer) {
+    if (env.ev.originalUrl.pathname !== env.ev.url.pathname && !__EXPERIMENTAL__.enableRequestRewrite) {
+      throw new Error(`enableRequestRewrite is an experimental feature and is not enabled. Please enable the feature flag by adding \`experimental: ["enableRequestRewrite"]\` to your qwikVite plugin options.`);
+    }
+  }
   const url = new URL(urlEnv);
   const routeLocation = useStore({
     url,
@@ -956,12 +993,21 @@ const QwikRouterProvider = component$((props) => {
         const newHref = pageData.href;
         const newURL = new URL(newHref, trackUrl);
         if (!isSamePath(newURL, trackUrl)) {
-          trackUrl = newURL;
-          loadRoutePromise = loadRoute(qwikRouterConfig.routes, qwikRouterConfig.menus, qwikRouterConfig.cacheModules, trackUrl.pathname);
+          if (!pageData.isRewrite) {
+            trackUrl = newURL;
+          }
+          loadRoutePromise = loadRoute(
+            qwikRouterConfig.routes,
+            qwikRouterConfig.menus,
+            qwikRouterConfig.cacheModules,
+            newURL.pathname
+            // Load the actual required path.
+          );
         }
         try {
           loadedRoute = await loadRoutePromise;
         } catch (e) {
+          console.error(e);
           window.location.href = newHref;
           return;
         }
@@ -996,9 +1042,6 @@ const QwikRouterProvider = component$((props) => {
         documentHead.title = resolvedHead.title;
         documentHead.frontmatter = resolvedHead.frontmatter;
         if (isBrowser) {
-          if (props.viewTransition !== false) {
-            document.__q_view_transition__ = true;
-          }
           let scrollState;
           if (navType === "popstate") {
             scrollState = getScrollHistory();
@@ -1121,8 +1164,27 @@ const QwikRouterProvider = component$((props) => {
             const scrollState2 = currentScrollState(scroller);
             saveScrollHistory(scrollState2);
           }
-          clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
-          _waitUntilRendered(elm).then(() => {
+          const navigate = () => {
+            clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
+            return _waitUntilRendered(elm);
+          };
+          const _waitNextPage = () => {
+            if (isServer || props.viewTransition === false) {
+              return navigate();
+            } else {
+              const viewTransition = startViewTransition({
+                update: navigate,
+                types: [
+                  "qwik-navigation"
+                ]
+              });
+              if (!viewTransition) {
+                return Promise.resolve();
+              }
+              return viewTransition.ready;
+            }
+          };
+          _waitNextPage().then(() => {
             const container = _getQContainerElement(elm);
             container.setAttribute("q:route", routeName);
             const scrollState2 = currentScrollState(scroller);
@@ -1137,11 +1199,10 @@ const QwikRouterProvider = component$((props) => {
         }
       }
     }
-    const promise = run();
     if (isServer) {
-      return promise;
+      return run();
     } else {
-      return;
+      run();
     }
   });
   return /* @__PURE__ */ jsx(Slot, {});
@@ -1704,7 +1765,8 @@ const deserializeStream = async function* (stream, ctxElm, abortSignal) {
     reader.releaseLock();
   }
 };
-const ServiceWorkerRegister = (props) => jsx$1("script", {
+const ServiceWorkerRegister = (props) => /* @__PURE__ */ jsx("script", {
+  type: "module",
   dangerouslySetInnerHTML: swRegister,
   nonce: props.nonce
 });

package/lib/middleware/aws-lambda/index.d.ts

@@ -1,48 +1,48 @@
-import { Http2ServerRequest } from 'http2';
-import { IncomingMessage } from 'http';
-import { NodeRequestNextFunction } from '@qwik.dev/router/middleware/node';
-import type { QwikCityPlan } from '@qwik.dev/router';
-import type { QwikManifest } from '@qwik.dev/core/optimizer';
-import type { QwikRouterConfig } from '@qwik.dev/router';
-import type { Render } from '@qwik.dev/core/server';
-import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
-import { ServerResponse } from 'http';
-
-declare interface AwsOpt {
-    render: Render;
-    manifest: QwikManifest;
-    qwikRouterConfig: QwikRouterConfig;
-    /** @deprecated Use `QwikRouterConfig` instead. Will be removed in V3 */
-    qwikCityPlan?: QwikCityPlan;
-}
-
-/**
- * @deprecated Use `createQwikRouter` instead. Will be removed in V3
- * @public
- */
-export declare const createQwikCity: typeof createQwikRouter;
-
-/** @public */
-export declare function createQwikRouter(opts: AwsOpt): {
-    fixPath: (pathT: string) => string;
-    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
-    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
-    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e: any) => void) => Promise<void>;
-    handle: (req: any, res: any) => void;
-};
-
-/** @public */
-export declare interface PlatformAwsLambda extends Object {
-}
-
-/**
- * @deprecated Use `QwikRouterAwsLambdaOptions` instead. Will be removed in V3
- * @public
- */
-export declare type QwikCityAwsLambdaOptions = QwikRouterAwsLambdaOptions;
-
-/** @public */
-export declare interface QwikRouterAwsLambdaOptions extends ServerRenderOptions {
-}
-
-export { }
+import { Http2ServerRequest } from 'http2';
+import { IncomingMessage } from 'http';
+import { NodeRequestNextFunction } from '@qwik.dev/router/middleware/node';
+import type { QwikCityPlan } from '@qwik.dev/router';
+import type { QwikManifest } from '@qwik.dev/core/optimizer';
+import type { QwikRouterConfig } from '@qwik.dev/router';
+import type { Render } from '@qwik.dev/core/server';
+import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
+import { ServerResponse } from 'http';
+
+declare interface AwsOpt {
+    render: Render;
+    manifest?: QwikManifest;
+    qwikRouterConfig: QwikRouterConfig;
+    /** @deprecated Use `QwikRouterConfig` instead. Will be removed in V3 */
+    qwikCityPlan?: QwikCityPlan;
+}
+
+/**
+ * @deprecated Use `createQwikRouter` instead. Will be removed in V3
+ * @public
+ */
+export declare const createQwikCity: typeof createQwikRouter;
+
+/** @public */
+export declare function createQwikRouter(opts: AwsOpt): {
+    fixPath: (pathT: string) => string;
+    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
+    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
+    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e: any) => void) => Promise<void>;
+    handle: (req: any, res: any) => void;
+};
+
+/** @public */
+export declare interface PlatformAwsLambda extends Object {
+}
+
+/**
+ * @deprecated Use `QwikRouterAwsLambdaOptions` instead. Will be removed in V3
+ * @public
+ */
+export declare type QwikCityAwsLambdaOptions = QwikRouterAwsLambdaOptions;
+
+/** @public */
+export declare interface QwikRouterAwsLambdaOptions extends ServerRenderOptions {
+}
+
+export { }