@qwik.dev/router 2.0.0-beta.29 → 2.0.0-beta.30

package/lib/index.qwik.mjs

@@ -1,6 +1,6 @@
-import { componentQrl, inlinedQrl, useErrorBoundary, useOnWindow, _captures, _jsxSorted, Slot, useSignal, untrack, _qrlSync, useVisibleTaskQrl, isDev, _jsxSplit, _getConstProps, _getVarProps, eventQrl, isServer, useStylesQrl, useServerData, useStore, useContextProvider, useTaskQrl, isBrowser, getLocale, noSerialize, useContext, SkipRender, implicit$FirstArg, withLocale, _wrapProp, createElement } from '@qwik.dev/core';
+import { componentQrl, inlinedQrl, useErrorBoundary, useOnWindow, _captures, _jsxSorted, Slot, useSignal, untrack, _qrlSync, useVisibleTaskQrl, isDev, _jsxSplit, _getConstProps, _getVarProps, eventQrl, isServer, useStylesQrl, useServerData, useStore, useContextProvider, useTaskQrl, isBrowser, getLocale, noSerialize, useContext, SkipRender, implicit$FirstArg, withLocale, _wrapProp, _restProps, _fnSignal, createElement } from '@qwik.dev/core';
 import { Fragment } from '@qwik.dev/core/jsx-runtime';
-import { g as getClientNavPath, s as shouldPreload, p as preloadRouteBundles, l as loadClientData, i as isSamePath, c as createLoaderSignal, a as createDocumentHead, D as DEFAULT_LOADERS_SERIALIZATION_STRATEGY, t as toUrl, b as isSameOrigin, d as loadRoute, r as resolveHead, C as CLIENT_DATA_CACHE, Q as Q_ROUTE, e as clientNavigate, f as QFN_KEY, h as QACTION_KEY, j as QDATA_KEY } from './chunks/routing.qwik.mjs';
+import { g as getClientNavPath, s as shouldPreload, p as preloadRouteBundles, l as loadClientData, i as isSamePath, c as createLoaderSignal, a as createDocumentHead, D as DEFAULT_LOADERS_SERIALIZATION_STRATEGY, t as toUrl, b as isSameOrigin, d as clientNavigate, e as loadRoute, r as resolveHead, C as CLIENT_DATA_CACHE, Q as Q_ROUTE, f as toPath, h as QFN_KEY, j as QACTION_KEY, k as QDATA_KEY } from './chunks/routing.qwik.mjs';
 import { u as useNavigate, a as useLocation, b as useQwikRouterEnv, C as ContentContext, c as ContentInternalContext, D as DocumentHeadContext, H as HttpStatusContext, R as RouteLocationContext, d as RouteNavigateContext, e as RouteStateContext, f as RouteActionContext, g as RoutePreventNavigateContext, h as useAction, i as useDocumentHead } from './chunks/use-functions.qwik.mjs';
 export { j as useContent, k as useHttpStatus, l as usePreventNavigate$, m as usePreventNavigateQrl } from './chunks/use-functions.qwik.mjs';
 import * as qwikRouterConfig from '@qwik-router-config';
@@ -356,7 +356,7 @@ const useQwikRouter = (props) => {
   if (!isServer) {
     throw new Error("useQwikRouter can only run during SSR on the server. If you are seeing this, it means you are re-rendering the root of your application. Fix that or use the <QwikRouterProvider> component around the root of your application.");
   }
-  useStylesQrl(/* @__PURE__ */ inlinedQrl(transitionCss, "useQwikRouter_useStyles_g40PKfcKmYU"));
+  useStylesQrl(/* @__PURE__ */ inlinedQrl(transitionCss, "qwik_view_transition_css_inline_vNfd9raIMI0"));
   const env = useQwikRouterEnv();
   if (!env?.params) {
     throw new Error(`Missing Qwik Router Env Data for help visit https://github.com/QwikDev/qwik/issues/6237`);
@@ -452,8 +452,18 @@ const useQwikRouter = (props) => {
       }
     };
   }, "useQwikRouter_registerPreventNav_69B0DK0eZJc");
+  const getScroller = /* @__PURE__ */ inlinedQrl(() => {
+    let scroller = document.getElementById(QWIK_ROUTER_SCROLLER);
+    if (!scroller) {
+      scroller = document.getElementById(QWIK_CITY_SCROLLER);
+      if (scroller && isDev) {
+        console.warn(`Please update your scroller ID to "${QWIK_ROUTER_SCROLLER}" as "${QWIK_CITY_SCROLLER}" is deprecated and will be removed in V3`);
+      }
+    }
+    return scroller ?? document.documentElement;
+  }, "useQwikRouter_getScroller_0UhDFwlxeFQ");
   const goto = /* @__PURE__ */ inlinedQrl(async (path, opt) => {
-    const actionState2 = _captures[0], navResolver2 = _captures[1], routeInternal2 = _captures[2], routeLocation2 = _captures[3];
+    const actionState2 = _captures[0], getScroller2 = _captures[1], navResolver2 = _captures[2], routeInternal2 = _captures[3], routeLocation2 = _captures[4];
     const { type = "link", forceReload = path === void 0, replaceState = false, scroll = true } = typeof opt === "object" ? opt : {
       forceReload: opt
     };
@@ -494,16 +504,7 @@ const useQwikRouter = (props) => {
         if (type === "link" && dest.href !== location.href) {
           history.pushState(null, "", dest);
         }
-        let scroller = document.getElementById(QWIK_ROUTER_SCROLLER);
-        if (!scroller) {
-          scroller = document.getElementById(QWIK_CITY_SCROLLER);
-          if (scroller && isDev) {
-            console.warn(`Please update your scroller ID to "${QWIK_ROUTER_SCROLLER}" as "${QWIK_CITY_SCROLLER}" is deprecated and will be removed in V3`);
-          }
-        }
-        if (!scroller) {
-          scroller = document.documentElement;
-        }
+        const scroller = await getScroller2();
         restoreScroll(type, dest, new URL(location.href), scroller, getScrollHistory());
         if (type === "popstate") {
           window._qRouterScrollEnabled = true;
@@ -516,12 +517,23 @@ const useQwikRouter = (props) => {
       }
       return;
     }
+    let historyUpdated = false;
+    if (isBrowser && type === "link" && !forceReload) {
+      const scroller = await getScroller2();
+      window._qRouterScrollEnabled = false;
+      clearTimeout(window._qRouterScrollDebounce);
+      const scrollState = currentScrollState(scroller);
+      saveScrollHistory(scrollState);
+      clientNavigate(window, type, new URL(location.href), dest, replaceState);
+      historyUpdated = true;
+    }
     routeInternal2.value = {
       type,
       dest,
       forceReload,
       replaceState,
-      scroll
+      scroll,
+      historyUpdated
     };
     if (isBrowser) {
       loadClientData(dest);
@@ -534,6 +546,7 @@ const useQwikRouter = (props) => {
     });
   }, "useQwikRouter_goto_8j8Vrz2yUIM", [
     actionState,
+    getScroller,
     navResolver,
     routeInternal,
     routeLocation
@@ -548,7 +561,7 @@ const useQwikRouter = (props) => {
   useContextProvider(RouteActionContext, actionState);
   useContextProvider(RoutePreventNavigateContext, registerPreventNav);
   useTaskQrl(/* @__PURE__ */ inlinedQrl(({ track }) => {
-    const actionState2 = _captures[0], content2 = _captures[1], contentInternal2 = _captures[2], documentHead2 = _captures[3], env2 = _captures[4], goto2 = _captures[5], httpStatus2 = _captures[6], loaderState2 = _captures[7], loadersObject2 = _captures[8], navResolver2 = _captures[9], props2 = _captures[10], routeInternal2 = _captures[11], routeLocation2 = _captures[12], routeLocationTarget2 = _captures[13], serverHead2 = _captures[14];
+    const actionState2 = _captures[0], content2 = _captures[1], contentInternal2 = _captures[2], documentHead2 = _captures[3], env2 = _captures[4], getScroller2 = _captures[5], goto2 = _captures[6], httpStatus2 = _captures[7], loaderState2 = _captures[8], loadersObject2 = _captures[9], navResolver2 = _captures[10], props2 = _captures[11], routeInternal2 = _captures[12], routeLocation2 = _captures[13], routeLocationTarget2 = _captures[14], serverHead2 = _captures[15];
     async function run() {
       const navigation = track(routeInternal2);
       const action = track(actionState2);
@@ -665,7 +678,7 @@ const useQwikRouter = (props) => {
           if (navType === "popstate") {
             scrollState = getScrollHistory();
           }
-          const scroller = document.getElementById(QWIK_ROUTER_SCROLLER) ?? document.documentElement;
+          const scroller = await getScroller2();
           if (navigation.scroll && (!navigation.forceReload || !isSamePath(trackUrl, prevUrl)) && (navType === "link" || navType === "popstate") || navType === "form" && !isSamePath(trackUrl, prevUrl)) {
             document.__q_scroll_restore__ = () => restoreScroll(navType, trackUrl, prevUrl, scroller, scrollState);
           }
@@ -789,11 +802,21 @@ const useQwikRouter = (props) => {
           if (navType !== "popstate") {
             window._qRouterScrollEnabled = false;
             clearTimeout(window._qRouterScrollDebounce);
-            const scrollState2 = currentScrollState(scroller);
-            saveScrollHistory(scrollState2);
+            if (!navigation.historyUpdated) {
+              const scrollState2 = currentScrollState(scroller);
+              saveScrollHistory(scrollState2);
+            }
           }
           const navigate = () => {
-            clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
+            if (navigation.historyUpdated) {
+              const currentPath = location.pathname + location.search + location.hash;
+              const nextPath = toPath(trackUrl);
+              if (currentPath !== nextPath) {
+                history.replaceState(history.state, "", nextPath);
+              }
+            } else {
+              clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
+            }
             contentInternal2.trigger();
             return _waitUntilRendered(container2);
           };
@@ -850,6 +873,7 @@ const useQwikRouter = (props) => {
     contentInternal,
     documentHead,
     env,
+    getScroller,
     goto,
     httpStatus,
     loaderState,
@@ -1195,17 +1219,17 @@ Action.run() can only be called on the browser, for example when a user clicks a
           id: id2,
           resolve: noSerialize(resolve)
         };
-      }).then(({ result, status }) => {
+      }).then((_rawProps) => {
         state2.isRunning = false;
-        state2.status = status;
-        state2.value = result;
+        state2.status = _rawProps.status;
+        state2.value = _rawProps.result;
         if (form) {
           if (form.getAttribute("data-spa-reset") === "true") {
             form.reset();
           }
           const detail = {
-            status,
-            value: result
+            status: _rawProps.status,
+            value: _rawProps.result
           };
           form.dispatchEvent(new CustomEvent("submitcompleted", {
             bubbles: false,
@@ -1215,8 +1239,8 @@ Action.run() can only be called on the browser, for example when a user clicks a
           }));
         }
         return {
-          status,
-          value: result
+          status: _rawProps.status,
+          value: _rawProps.result
         };
       });
     }, "routeActionQrl_action_submit_YuS5bpdQ360", [
@@ -1422,17 +1446,31 @@ const ServiceWorkerRegister = (props) => /* @__PURE__ */ _jsxSorted("script", {
   dangerouslySetInnerHTML: swRegister
 }, null, 3, "1x_0");
 
-const GetForm = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(({ action: _0, spaReset, reloadDocument, onSubmit$, ...rest }) => {
+const _hf0 = (p0) => !p0.reloadDocument;
+const _hf0_str = "!p0.reloadDocument";
+const _hf1 = (p0) => p0.spaReset ? "true" : void 0;
+const _hf1_str = 'p0.spaReset?"true":undefined';
+const GetForm = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl((_rawProps) => {
+  const rest = _restProps(_rawProps, [
+    "action",
+    "spaReset",
+    "reloadDocument",
+    "onSubmit$"
+  ]);
   const nav = useNavigate();
   return /* @__PURE__ */ _jsxSplit("form", {
     action: "get",
-    "preventdefault:submit": !reloadDocument,
-    "data-spa-reset": spaReset ? "true" : void 0,
+    "preventdefault:submit": _fnSignal(_hf0, [
+      _rawProps
+    ], _hf0_str),
+    "data-spa-reset": _fnSignal(_hf1, [
+      _rawProps
+    ], _hf1_str),
     ..._getVarProps(rest),
     ..._getConstProps(rest),
     "q-e:submit": [
-      ...Array.isArray(onSubmit$) ? onSubmit$ : [
-        onSubmit$
+      ...Array.isArray(_rawProps.onSubmit$) ? _rawProps.onSubmit$ : [
+        _rawProps.onSubmit$
       ],
       /* @__PURE__ */ inlinedQrl(async (_evt, form) => {
         const nav2 = _captures[0];

package/lib/middleware/bun/index.mjs

@@ -53,9 +53,9 @@ function createQwikRouter(opts) {
       };
       const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
-        handledResponse.completion.then((v) => {
-          if (v) {
-            console.error(v);
+        handledResponse.completion.then((completion) => {
+          if (completion) {
+            console.error(completion);
           }
         });
         const response = await handledResponse.response;

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

@@ -63,9 +63,9 @@ function createQwikRouter(opts) {
       };
       const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
-        handledResponse.completion.then((v) => {
-          if (v) {
-            console.error(v);
+        handledResponse.completion.then((completion) => {
+          if (completion) {
+            console.error(completion);
           }
         });
         const response = await handledResponse.response;

package/lib/middleware/deno/index.mjs

@@ -51,9 +51,9 @@ function createQwikRouter(opts) {
       };
       const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
-        handledResponse.completion.then((v) => {
-          if (v) {
-            console.error(v);
+        handledResponse.completion.then((completion) => {
+          if (completion) {
+            console.error(completion);
           }
         });
         const response = await handledResponse.response;

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

@@ -41,9 +41,9 @@ function createQwikRouter(opts) {
       };
       const handledResponse = await requestHandler(serverRequestEv, opts);
       if (handledResponse) {
-        handledResponse.completion.then((v) => {
-          if (v) {
-            console.error(v);
+        handledResponse.completion.then((completion) => {
+          if (completion) {
+            console.error(completion);
           }
         });
         const response = await handledResponse.response;

package/lib/middleware/request-handler/index.d.ts

@@ -7,7 +7,6 @@ import type { Loader as Loader_2 } from '@qwik.dev/router';
 import type { QwikCityPlan } from '@qwik.dev/router';
 import type { QwikIntrinsicElements } from '@qwik.dev/core';
 import type { QwikRouterConfig } from '@qwik.dev/router';
-import { RedirectMessage as RedirectMessage_2 } from '@qwik.dev/router/middleware/request-handler';
 import type { Render } from '@qwik.dev/core/server';
 import type { RenderOptions } from '@qwik.dev/core/server';
 import { RequestEvent as RequestEvent_2 } from '@qwik.dev/router/middleware/request-handler';
@@ -383,22 +382,12 @@ declare type PageModule = RouteModule & {
 /** @public */
 declare type PathParams = Record<string, string>;
 
+declare type QwikRouterCompletion = Error | undefined | object;
+
 declare interface QwikRouterRun<T> {
-    /**
-     * The response to the request, if any. If there is no response, there might have been an error,
-     * or the request was aborted.
-     */
     response: Promise<T | null>;
     requestEv: RequestEvent_2;
-    /**
-     * Promise for the completion of the request.
-     *
-     * If it returns a RedirectMessage, it means the request must be redirected.
-     *
-     * If it returns an Error, it means there was an error, and if possible, the response already
-     * includes the error. The error is informational only.
-     */
-    completion: Promise<RedirectMessage_2 | Error | undefined>;
+    completion: Promise<QwikRouterCompletion>;
 }
 
 /**
@@ -762,7 +751,7 @@ export declare interface ServerRequestEvent<T = unknown> {
 export declare type ServerRequestMode = 'static' | 'server';
 
 /** @public */
-export declare type ServerResponseHandler<T = any> = (status: number, headers: Headers, cookies: Cookie, resolve: (response: T) => void, requestEv: RequestEventInternal) => WritableStream<Uint8Array>;
+export declare type ServerResponseHandler<T = any> = (status: number, headers: Headers, cookies: Cookie, resolve: (response: T) => void, requestEv: RequestEvent) => WritableStream<Uint8Array>;
 
 /** @public */
 declare interface StaticGenerate {