@qwik.dev/router 2.0.0-beta.13 → 2.0.0-beta.14

package/lib/chunks/routing.qwik.mjs

@@ -1,7 +1,8 @@
-import { createAsyncComputed$, isBrowser } from "@qwik.dev/core";
-import { p } from "@qwik.dev/core/preloader";
-import { _deserialize, _UNINITIALIZED } from "@qwik.dev/core/internal";
-import { R as RouteDataProp, M as MenuDataProp } from "./types.qwik.mjs";
+import { createAsyncComputed$, isBrowser } from '@qwik.dev/core';
+import { p } from '@qwik.dev/core/preloader';
+import { _deserialize, _UNINITIALIZED } from '@qwik.dev/core/internal';
+import { R as RouteDataProp, M as MenuDataProp } from './types.qwik.mjs';
+
 const MODULE_CACHE = /* @__PURE__ */ new WeakMap();
 const CLIENT_DATA_CACHE = /* @__PURE__ */ new Map();
 const QACTION_KEY = "qaction";
@@ -10,6 +11,7 @@ const QFN_KEY = "qfunc";
 const QDATA_KEY = "qdata";
 const Q_ROUTE = "q:route";
 const DEFAULT_LOADERS_SERIALIZATION_STRATEGY = globalThis.__DEFAULT_LOADERS_SERIALIZATION_STRATEGY__ || "never";
+
 const MAX_Q_DATA_RETRY_COUNT = 3;
 const loadClientData = async (url, element, opts, retryCount = 0) => {
   const pagePathname = url.pathname;
@@ -115,6 +117,7 @@ const getFetchOptions = (action, noCache) => {
     };
   }
 };
+
 const toPath = (url) => url.pathname + url.search + url.hash;
 const toUrl = (url, baseUrl) => new URL(url, baseUrl.href);
 const isSameOrigin = (a, b) => a.origin === b.origin;
@@ -182,6 +185,7 @@ const createLoaderSignal = (loadersObject, loaderId, url, serializationStrategy,
     }
   );
 };
+
 const clientNavigate = (win, navType, fromURL, toURL, replaceState = false) => {
   if (navType !== "popstate") {
     const samePath = isSamePath(fromURL, toURL);
@@ -213,6 +217,7 @@ const preloadRouteBundles = (path, probability = 0.8) => {
     p(path, probability);
   }
 };
+
 function matchRoute(route, path) {
   const routeIdx = startIdxSkipSlash(route);
   const routeLength = lengthNoTrailingSlash(route);
@@ -228,24 +233,12 @@ function matchRoutePart(route, routeIdx, routeLength, path, pathIdx, pathLength)
   while (routeIdx < routeLength) {
     const routeCh = route.charCodeAt(routeIdx++);
     const pathCh = path.charCodeAt(pathIdx++);
-    if (routeCh === 91) {
+    if (routeCh === 91 /* OPEN_BRACKET */) {
       const isMany = isThreeDots(route, routeIdx);
       const paramNameStart = routeIdx + (isMany ? 3 : 0);
-      const paramNameEnd = scan(
-        route,
-        paramNameStart,
-        routeLength,
-        93
-        /* CLOSE_BRACKET */
-      );
+      const paramNameEnd = scan(route, paramNameStart, routeLength, 93 /* CLOSE_BRACKET */);
       const paramName = route.substring(paramNameStart, paramNameEnd);
-      const paramSuffixEnd = scan(
-        route,
-        paramNameEnd + 1,
-        routeLength,
-        47
-        /* SLASH */
-      );
+      const paramSuffixEnd = scan(route, paramNameEnd + 1, routeLength, 47 /* SLASH */);
       const suffix = route.substring(paramNameEnd + 1, paramSuffixEnd);
       routeIdx = paramNameEnd + 1;
       const paramValueStart = pathIdx - 1;
@@ -264,7 +257,7 @@ function matchRoutePart(route, routeIdx, routeLength, path, pathIdx, pathLength)
           return Object.assign(params || (params = {}), match);
         }
       }
-      const paramValueEnd = scan(path, paramValueStart, pathLength, 47, suffix);
+      const paramValueEnd = scan(path, paramValueStart, pathLength, 47 /* SLASH */, suffix);
       if (paramValueEnd == -1) {
         return null;
       }
@@ -287,21 +280,21 @@ function matchRoutePart(route, routeIdx, routeLength, path, pathIdx, pathLength)
   }
 }
 function isRestParameter(text, idx) {
-  return text.charCodeAt(idx) === 91 && isThreeDots(text, idx + 1);
+  return text.charCodeAt(idx) === 91 /* OPEN_BRACKET */ && isThreeDots(text, idx + 1);
 }
 function lengthNoTrailingSlash(text) {
   const length = text.length;
-  return length > 1 && text.charCodeAt(length - 1) === 47 ? length - 1 : length;
+  return length > 1 && text.charCodeAt(length - 1) === 47 /* SLASH */ ? length - 1 : length;
 }
 function allConsumed(text, idx) {
   const length = text.length;
-  return idx >= length || idx == length - 1 && text.charCodeAt(idx) === 47;
+  return idx >= length || idx == length - 1 && text.charCodeAt(idx) === 47 /* SLASH */;
 }
 function startIdxSkipSlash(text) {
-  return text.charCodeAt(0) === 47 ? 1 : 0;
+  return text.charCodeAt(0) === 47 /* SLASH */ ? 1 : 0;
 }
 function isThreeDots(text, idx) {
-  return text.charCodeAt(idx) === 46 && text.charCodeAt(idx + 1) === 46 && text.charCodeAt(idx + 2) === 46;
+  return text.charCodeAt(idx) === 46 /* DOT */ && text.charCodeAt(idx + 1) === 46 /* DOT */ && text.charCodeAt(idx + 2) === 46 /* DOT */;
 }
 function scan(text, idx, end, ch, suffix = "") {
   while (idx < end && text.charCodeAt(idx) !== ch) {
@@ -316,7 +309,7 @@ function scan(text, idx, end, ch, suffix = "") {
   return idx - suffixLength;
 }
 function recursiveScan(paramName, suffix, path, pathStart, pathLength, route, routeStart, routeLength) {
-  if (path.charCodeAt(pathStart) === 47) {
+  if (path.charCodeAt(pathStart) === 47 /* SLASH */) {
     pathStart++;
   }
   let pathIdx = pathLength;
@@ -346,6 +339,7 @@ function lastIndexOf(text, start, match, searchIdx, notFoundIdx) {
   }
   return idx > start ? idx : notFoundIdx;
 }
+
 const deepFreeze = (obj) => {
   if (obj == null) {
     return obj;
@@ -358,6 +352,7 @@ const deepFreeze = (obj) => {
   });
   return Object.freeze(obj);
 };
+
 const loadRoute = async (routes, menus, cacheModules, pathname, isInternal) => {
   if (!Array.isArray(routes)) {
     return null;
@@ -430,24 +425,5 @@ const getMenuLoader = (menus, pathname) => {
     }
   }
 };
-export {
-  CLIENT_DATA_CACHE as C,
-  DEFAULT_LOADERS_SERIALIZATION_STRATEGY as D,
-  Q_ROUTE as Q,
-  isSamePath as a,
-  isSameOrigin as b,
-  createLoaderSignal as c,
-  loadRoute as d,
-  clientNavigate as e,
-  deepFreeze as f,
-  getClientNavPath as g,
-  QFN_KEY as h,
-  isPromise as i,
-  QACTION_KEY as j,
-  QDATA_KEY as k,
-  loadClientData as l,
-  QLOADER_KEY as m,
-  preloadRouteBundles as p,
-  shouldPreload as s,
-  toUrl as t
-};
+
+export { CLIENT_DATA_CACHE as C, DEFAULT_LOADERS_SERIALIZATION_STRATEGY as D, Q_ROUTE as Q, isSamePath as a, isSameOrigin as b, createLoaderSignal as c, loadRoute as d, clientNavigate as e, deepFreeze as f, getClientNavPath as g, QFN_KEY as h, isPromise as i, QACTION_KEY as j, QDATA_KEY as k, loadClientData as l, QLOADER_KEY as m, preloadRouteBundles as p, shouldPreload as s, toUrl as t };

package/lib/chunks/types.qwik.mjs

@@ -18,8 +18,5 @@ var LoadedRouteProp = /* @__PURE__ */ ((LoadedRouteProp2) => {
   LoadedRouteProp2[LoadedRouteProp2["RouteBundleNames"] = 4] = "RouteBundleNames";
   return LoadedRouteProp2;
 })(LoadedRouteProp || {});
-export {
-  LoadedRouteProp as L,
-  MenuDataProp as M,
-  RouteDataProp as R
-};
+
+export { LoadedRouteProp as L, MenuDataProp as M, RouteDataProp as R };

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 /// <reference path="./modules.d.ts" />
 
+import type { AsyncComputedReadonlySignal } from '@qwik.dev/core/internal';
 import { Component } from '@qwik.dev/core';
 import { Cookie } from '@qwik.dev/router/middleware/request-handler';
 import { CookieOptions } from '@qwik.dev/router/middleware/request-handler';
@@ -527,7 +528,7 @@ declare type LoaderOptions = {
 };
 
 /** @public */
-export declare type LoaderSignal<TYPE> = TYPE extends () => ValueOrPromise<infer VALIDATOR> ? ReadonlySignal<ValueOrPromise<VALIDATOR>> : ReadonlySignal<TYPE>;
+export declare type LoaderSignal<TYPE> = (TYPE extends () => ValueOrPromise<infer VALIDATOR> ? ReadonlySignal<ValueOrPromise<VALIDATOR>> : ReadonlySignal<TYPE>) & Pick<AsyncComputedReadonlySignal, 'promise' | 'loading' | 'error'>;
 
 /** @public */
 export declare type MenuData = [pathname: string, menuLoader: MenuModuleLoader];

package/lib/index.qwik.mjs

@@ -1,16 +1,17 @@
-import { jsx, Fragment, jsxs } from "@qwik.dev/core/jsx-runtime";
-import { component$, useErrorBoundary, useOnWindow, $, Slot, createContextId, useContext, implicit$FirstArg, noSerialize, useVisibleTask$, useServerData, useSignal, untrack, sync$, isDev, withLocale, event$, isServer, useStyles$, useStore, isBrowser, useContextProvider, useTask$, getLocale, jsx as jsx$1, SkipRender, createElement } from "@qwik.dev/core";
-import { g as getClientNavPath, s as shouldPreload, p as preloadRouteBundles, l as loadClientData, i as isPromise, a as isSamePath, c as createLoaderSignal, t as toUrl, b as isSameOrigin, d as loadRoute, D as DEFAULT_LOADERS_SERIALIZATION_STRATEGY, C as CLIENT_DATA_CACHE, Q as Q_ROUTE, e as clientNavigate, f as deepFreeze, h as QFN_KEY, j as QACTION_KEY, k as QDATA_KEY } from "./chunks/routing.qwik.mjs";
-import * as qwikRouterConfig from "@qwik-router-config";
-import { _getContextContainer, SerializerSymbol, _UNINITIALIZED, _getContextElement, _hasStoreEffects, _getQContainerElement, forceStoreEffects, _waitUntilRendered, _getContextEvent, _serialize, _deserialize, _resolveContextWithoutSequentialScope } from "@qwik.dev/core/internal";
-import { _asyncRequestStore } from "@qwik.dev/router/middleware/request-handler";
-import * as v from "valibot";
-import * as z from "zod";
-import { z as z2 } from "zod";
-import swRegister from "@qwik-router-sw-register";
-import { renderToStream } from "@qwik.dev/core/server";
-import "@qwik.dev/core/preloader";
-import "./chunks/types.qwik.mjs";
+import { jsx, Fragment, jsxs } from '@qwik.dev/core/jsx-runtime';
+import { component$, useErrorBoundary, useOnWindow, $, Slot, createContextId, useContext, implicit$FirstArg, noSerialize, useVisibleTask$, useServerData, useSignal, untrack, sync$, isDev, withLocale, event$, isServer, useStyles$, useStore, isBrowser, useContextProvider, useTask$, getLocale, jsx as jsx$1, SkipRender, createElement } from '@qwik.dev/core';
+import { g as getClientNavPath, s as shouldPreload, p as preloadRouteBundles, l as loadClientData, i as isPromise, a as isSamePath, c as createLoaderSignal, t as toUrl, b as isSameOrigin, d as loadRoute, D as DEFAULT_LOADERS_SERIALIZATION_STRATEGY, C as CLIENT_DATA_CACHE, Q as Q_ROUTE, e as clientNavigate, f as deepFreeze, h as QFN_KEY, j as QACTION_KEY, k as QDATA_KEY } from './chunks/routing.qwik.mjs';
+import * as qwikRouterConfig from '@qwik-router-config';
+import { _getContextContainer, SerializerSymbol, _UNINITIALIZED, _getContextElement, _hasStoreEffects, _getQContainerElement, forceStoreEffects, _waitUntilRendered, _getContextEvent, _serialize, _deserialize, _resolveContextWithoutSequentialScope } from '@qwik.dev/core/internal';
+import { _asyncRequestStore } from '@qwik.dev/router/middleware/request-handler';
+import * as v from 'valibot';
+import * as z from 'zod';
+export { z } from 'zod';
+import swRegister from '@qwik-router-sw-register';
+import { renderToStream } from '@qwik.dev/core/server';
+import '@qwik.dev/core/preloader';
+import './chunks/types.qwik.mjs';
+
 const ErrorBoundary = component$((props) => {
   const store = useErrorBoundary();
   useOnWindow(
@@ -24,6 +25,7 @@ const ErrorBoundary = component$((props) => {
   }
   return /* @__PURE__ */ jsx(Slot, {});
 });
+
 const RouteStateContext = /* @__PURE__ */ createContextId("qc-s");
 const ContentContext = /* @__PURE__ */ createContextId("qc-c");
 const ContentInternalContext = /* @__PURE__ */ createContextId("qc-ic");
@@ -32,6 +34,7 @@ const RouteLocationContext = /* @__PURE__ */ createContextId("qc-l");
 const RouteNavigateContext = /* @__PURE__ */ createContextId("qc-n");
 const RouteActionContext = /* @__PURE__ */ createContextId("qc-a");
 const RoutePreventNavigateContext = /* @__PURE__ */ createContextId("qc-p");
+
 const useContent = () => useContext(ContentContext);
 const useDocumentHead = () => useContext(DocumentHeadContext);
 const useLocation = () => useContext(RouteLocationContext);
@@ -48,6 +51,7 @@ const usePreventNavigateQrl = (fn) => {
 const usePreventNavigate$ = implicit$FirstArg(usePreventNavigateQrl);
 const useAction = () => useContext(RouteActionContext);
 const useQwikRouterEnv = () => noSerialize(useServerData("qwikrouter"));
+
 const Link = component$((props) => {
   const nav = useNavigate();
   const loc = useLocation();
@@ -141,6 +145,7 @@ const Link = component$((props) => {
     }
   );
 });
+
 const resolveHead = (endpoint, routeLocation, contentModules, locale, defaults) => withLocale(locale, () => {
   const head = createDocumentHead(defaults);
   const getData = ((loaderOrAction) => {
@@ -214,28 +219,29 @@ const createDocumentHead = (defaults) => ({
   scripts: [...defaults?.scripts || []],
   frontmatter: { ...defaults?.frontmatter }
 });
+
 function callRestoreScrollOnDocument() {
   if (document.__q_scroll_restore__) {
     document.__q_scroll_restore__();
     document.__q_scroll_restore__ = void 0;
   }
 }
-const restoreScroll = (type, toUrl2, fromUrl, scroller, scrollState) => {
+const restoreScroll = (type, toUrl, fromUrl, scroller, scrollState) => {
   if (type === "popstate" && scrollState) {
     scroller.scrollTo(scrollState.x, scrollState.y);
   } else if (type === "link" || type === "form") {
-    if (!hashScroll(toUrl2, fromUrl)) {
+    if (!hashScroll(toUrl, fromUrl)) {
       scroller.scrollTo(0, 0);
     }
   }
 };
-const hashScroll = (toUrl2, fromUrl) => {
-  const elmId = toUrl2.hash.slice(1);
+const hashScroll = (toUrl, fromUrl) => {
+  const elmId = toUrl.hash.slice(1);
   const elm = elmId && document.getElementById(elmId);
   if (elm) {
     elm.scrollIntoView();
     return true;
-  } else if (!elm && toUrl2.hash && isSamePath(toUrl2, fromUrl)) {
+  } else if (!elm && toUrl.hash && isSamePath(toUrl, fromUrl)) {
     return true;
   }
   return false;
@@ -257,6 +263,7 @@ const saveScrollHistory = (scrollState) => {
   state._qRouterScroll = scrollState;
   history.replaceState(state, "");
 };
+
 const spaInit = event$((_, el) => {
   if (!window._qRouterSPA && !window._qRouterInitPopstate) {
     const currentPath = location.pathname + location.search;
@@ -265,7 +272,7 @@ const spaInit = event$((_, el) => {
         window.scrollTo(scrollState.x, scrollState.y);
       }
     };
-    const currentScrollState2 = () => {
+    const currentScrollState = () => {
       const elm = document.documentElement;
       return {
         x: elm.scrollLeft,
@@ -276,7 +283,7 @@ const spaInit = event$((_, el) => {
     };
     const saveScrollState = (scrollState) => {
       const state = history.state || {};
-      state._qRouterScroll = scrollState || currentScrollState2();
+      state._qRouterScroll = scrollState || currentScrollState();
       history.replaceState(state, "");
     };
     saveScrollState();
@@ -322,7 +329,7 @@ const spaInit = event$((_, el) => {
             );
           }
         }
-        state._qRouterScroll = state._qRouterScroll || currentScrollState2();
+        state._qRouterScroll = state._qRouterScroll || currentScrollState();
         return state;
       };
       history.pushState = (state, title, url) => {
@@ -356,7 +363,7 @@ const spaInit = event$((_, el) => {
             } else {
               window._qRouterScrollEnabled = false;
               clearTimeout(window._qRouterScrollDebounce);
-              saveScrollState({ ...currentScrollState2(), x: 0, y: 0 });
+              saveScrollState({ ...currentScrollState(), x: 0, y: 0 });
               location.reload();
             }
           } else {
@@ -397,6 +404,7 @@ const spaInit = event$((_, el) => {
     }, 0);
   }
 });
+
 const startViewTransition = (params) => {
   if (!params.update) {
     return;
@@ -415,7 +423,9 @@ const startViewTransition = (params) => {
     params.update?.();
   }
 };
+
 const transitionCss = "@layer qwik{@supports selector(html:active-view-transition-type(type)){html:active-view-transition-type(qwik-navigation){:root{view-transition-name:none}}}@supports not selector(html:active-view-transition-type(type)){:root{view-transition-name:none}}}";
+
 const QWIK_CITY_SCROLLER = "_qCityScroller";
 const QWIK_ROUTER_SCROLLER = "_qRouterScroller";
 const preventNav = {};
@@ -470,8 +480,8 @@ const useQwikRouter = (props) => {
   }
   loadersObject[SerializerSymbol] = (obj) => {
     const loadersSerializationObject = {};
-    for (const [k, v2] of Object.entries(obj)) {
-      loadersSerializationObject[k] = getSerializationStrategy(k) === "always" ? v2 : _UNINITIALIZED;
+    for (const [k, v] of Object.entries(obj)) {
+      loadersSerializationObject[k] = getSerializationStrategy(k) === "always" ? v : _UNINITIALIZED;
     }
     return loadersSerializationObject;
   };
@@ -504,7 +514,7 @@ const useQwikRouter = (props) => {
     if (!isBrowser) {
       return;
     }
-    preventNav.$handler$ || (preventNav.$handler$ = (event) => {
+    preventNav.$handler$ ||= (event) => {
       internalState.navCount++;
       if (!preventNav.$cbs$) {
         return;
@@ -516,8 +526,8 @@ const useQwikRouter = (props) => {
         event.preventDefault();
         event.returnValue = true;
       }
-    });
-    (preventNav.$cbs$ || (preventNav.$cbs$ = /* @__PURE__ */ new Set())).add(fn$);
+    };
+    (preventNav.$cbs$ ||= /* @__PURE__ */ new Set()).add(fn$);
     fn$.resolve();
     window.addEventListener("beforeunload", preventNav.$handler$);
     return () => {
@@ -966,6 +976,7 @@ const QwikRouterMockProvider = component$((props) => {
   return /* @__PURE__ */ jsx(Slot, {});
 });
 const QwikCityMockProvider = QwikRouterMockProvider;
+
 const RouterOutlet = component$(() => {
   const serverData = useServerData("containerAttributes");
   if (!serverData) {
@@ -1007,6 +1018,7 @@ const RouterOutlet = component$(() => {
   }
   return SkipRender;
 });
+
 const routeActionQrl = ((actionQrl, ...rest) => {
   const { id, validators } = getValidators(rest, actionQrl);
   function action() {
@@ -1425,7 +1437,9 @@ const deserializeStream = async function* (stream, ctxElm, abortSignal) {
     reader.releaseLock();
   }
 };
+
 const ServiceWorkerRegister = (props) => /* @__PURE__ */ jsx("script", { type: "module", dangerouslySetInnerHTML: swRegister, nonce: props.nonce });
+
 const Form = ({ action, spaReset, reloadDocument, onSubmit$, ...rest }, key) => {
   if (action) {
     const isArrayApi = Array.isArray(onSubmit$);
@@ -1525,6 +1539,7 @@ const GetForm = component$(
     );
   }
 );
+
 const untypedAppUrl = function appUrl(route, params, paramsPrefix = "") {
   const path = route.split("/");
   for (let i = 0; i < path.length; i++) {
@@ -1561,12 +1576,14 @@ function omitProps(obj, keys) {
   }
   return omittedObj;
 }
+
 const createRenderer = (getOptions) => {
   return ((opts) => {
-    const { jsx: jsx2, options } = getOptions(opts);
-    return renderToStream(jsx2, options);
+    const { jsx, options } = getOptions(opts);
+    return renderToStream(jsx, options);
   });
 };
+
 const DocumentHeadTags = component$((props) => {
   let head = useDocumentHead();
   if (props) {
@@ -1600,42 +1617,5 @@ const DocumentHeadTags = component$((props) => {
     })
   ] });
 });
-export {
-  DocumentHeadTags,
-  ErrorBoundary,
-  Form,
-  Link,
-  QWIK_CITY_SCROLLER,
-  QWIK_ROUTER_SCROLLER,
-  QwikCityMockProvider,
-  QwikCityProvider,
-  QwikRouterMockProvider,
-  QwikRouterProvider,
-  RouterOutlet,
-  ServiceWorkerRegister,
-  createRenderer,
-  globalAction$,
-  globalActionQrl,
-  omitProps,
-  routeAction$,
-  routeActionQrl,
-  routeLoader$,
-  routeLoaderQrl,
-  server$,
-  serverQrl,
-  untypedAppUrl,
-  useContent,
-  useDocumentHead,
-  useLocation,
-  useNavigate,
-  usePreventNavigate$,
-  usePreventNavigateQrl,
-  useQwikRouter,
-  valibot$,
-  valibotQrl,
-  validator$,
-  validatorQrl,
-  z2 as z,
-  zod$,
-  zodQrl
-};
+
+export { DocumentHeadTags, ErrorBoundary, Form, Link, QWIK_CITY_SCROLLER, QWIK_ROUTER_SCROLLER, QwikCityMockProvider, QwikCityProvider, QwikRouterMockProvider, QwikRouterProvider, RouterOutlet, ServiceWorkerRegister, createRenderer, globalAction$, globalActionQrl, omitProps, routeAction$, routeActionQrl, routeLoader$, routeLoaderQrl, server$, serverQrl, untypedAppUrl, useContent, useDocumentHead, useLocation, useNavigate, usePreventNavigate$, usePreventNavigateQrl, useQwikRouter, valibot$, valibotQrl, validator$, validatorQrl, zod$, zodQrl };

package/lib/middleware/aws-lambda/index.mjs

@@ -1,4 +1,5 @@
-import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middleware/node";
+import { createQwikRouter as createQwikRouter$1 } from '@qwik.dev/router/middleware/node';
+
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
     console.warn("qwikCityPlan is deprecated. Simply remove it.");
@@ -46,7 +47,5 @@ function createQwikRouter(opts) {
   }
 }
 const createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/azure-swa/index.mjs

@@ -1,6 +1,7 @@
-import { setServerPlatform } from "@qwik.dev/core/server";
-import { requestHandler, isStaticPath, getNotFound } from "@qwik.dev/router/middleware/request-handler";
-import { parseString } from "set-cookie-parser";
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { requestHandler, isStaticPath, getNotFound } from '@qwik.dev/router/middleware/request-handler';
+import { parseString } from 'set-cookie-parser';
+
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
     console.warn("qwikCityPlan is deprecated. Simply remove it.");
@@ -86,7 +87,5 @@ function createQwikRouter(opts) {
   return onAzureSwaRequest;
 }
 const createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/bun/index.mjs

@@ -1,13 +1,14 @@
-import { setServerPlatform } from "@qwik.dev/core/server";
-import { _TextEncoderStream_polyfill, isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
-import { join, extname } from "node:path";
-import { M as MIME_TYPES } from "../../chunks/mime-types.mjs";
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { _TextEncoderStream_polyfill, isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
+import { join, extname } from 'node:path';
+import { M as MIME_TYPES } from '../../chunks/mime-types.mjs';
+
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
     console.warn("qwikCityPlan is deprecated. Simply remove it.");
     opts.qwikRouterConfig = opts.qwikCityPlan;
   }
-  globalThis.TextEncoderStream || (globalThis.TextEncoderStream = _TextEncoderStream_polyfill);
+  globalThis.TextEncoderStream ||= _TextEncoderStream_polyfill;
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
@@ -136,7 +137,5 @@ function createQwikRouter(opts) {
   };
 }
 const createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/cloudflare-pages/index.mjs

@@ -1,5 +1,6 @@
-import { setServerPlatform } from "@qwik.dev/core/server";
-import { _TextEncoderStream_polyfill, isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from "@qwik.dev/router/middleware/request-handler";
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { _TextEncoderStream_polyfill, isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from '@qwik.dev/router/middleware/request-handler';
+
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
     console.warn("qwikCityPlan is deprecated. Simply remove it.");
@@ -90,7 +91,5 @@ function createQwikRouter(opts) {
   return onCloudflarePagesFetch;
 }
 const createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/deno/index.mjs

@@ -1,7 +1,8 @@
-import { setServerPlatform } from "@qwik.dev/core/server";
-import { isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
-import { M as MIME_TYPES } from "../../chunks/mime-types.mjs";
-import { join, fromFileUrl, extname } from "https://deno.land/std/path/mod.ts";
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
+import { M as MIME_TYPES } from '../../chunks/mime-types.mjs';
+import { join, fromFileUrl, extname } from 'https://deno.land/std/path/mod.ts';
+
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
     console.warn("qwikCityPlan is deprecated. Simply remove it.");
@@ -123,7 +124,5 @@ function createQwikRouter(opts) {
   };
 }
 const createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/firebase/index.mjs

@@ -1,4 +1,5 @@
-import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middleware/node";
+import { createQwikRouter as createQwikRouter$1 } from '@qwik.dev/router/middleware/node';
+
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
     console.warn("qwikCityPlan is deprecated. Simply remove it.");
@@ -27,7 +28,5 @@ function createQwikRouter(opts) {
   return qwikApp;
 }
 const createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/netlify-edge/index.mjs

@@ -1,5 +1,6 @@
-import { setServerPlatform } from "@qwik.dev/core/server";
-import { isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from "@qwik.dev/router/middleware/request-handler";
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from '@qwik.dev/router/middleware/request-handler';
+
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
     console.warn("qwikCityPlan is deprecated. Simply remove it.");
@@ -65,7 +66,5 @@ function createQwikRouter(opts) {
   return onNetlifyEdgeRequest;
 }
 const createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+
+export { createQwikCity, createQwikRouter };

package/lib/middleware/node/index.mjs

@@ -1,10 +1,12 @@
-import { setServerPlatform } from "@qwik.dev/core/server";
-import { isStaticPath, getNotFound, requestHandler } from "@qwik.dev/router/middleware/request-handler";
-import { createReadStream } from "node:fs";
-import { join, basename, extname } from "node:path";
-import { fileURLToPath } from "node:url";
-import { M as MIME_TYPES } from "../../chunks/mime-types.mjs";
-import { Http2ServerRequest } from "node:http2";
+import { isDev } from '@qwik.dev/core';
+import { setServerPlatform } from '@qwik.dev/core/server';
+import { isStaticPath, getNotFound, requestHandler } from '@qwik.dev/router/middleware/request-handler';
+import { createReadStream } from 'node:fs';
+import { join, basename, extname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { M as MIME_TYPES } from '../../chunks/mime-types.mjs';
+import { Http2ServerRequest } from 'node:http2';
+
 function computeOrigin(req, opts) {
   return opts?.getOrigin?.(req) ?? opts?.origin ?? process.env.ORIGIN ?? fallbackOrigin(req);
 }
@@ -120,6 +122,7 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
   };
   return serverRequestEv;
 }
+
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
     console.warn("qwikCityPlan is deprecated. Simply remove it.");
@@ -139,6 +142,9 @@ function createQwikRouter(opts) {
         "server",
         opts.getClientConn
       );
+      if (isDev && opts.platform) {
+        Object.assign(serverRequestEv.platform, opts.platform);
+      }
       const handled = await requestHandler(serverRequestEv, opts);
       if (handled) {
         const err = await handled.completion;
@@ -212,7 +218,5 @@ function createQwikRouter(opts) {
   };
 }
 const createQwikCity = createQwikRouter;
-export {
-  createQwikCity,
-  createQwikRouter
-};
+
+export { createQwikCity, createQwikRouter };