@qwik.dev/router 2.0.0-beta.25 → 2.0.0-beta.26

package/lib/index.qwik.mjs

@@ -1,5 +1,5 @@
 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 { component$, useErrorBoundary, useOnWindow, $, Slot, createContextId, useContext, implicit$FirstArg, useVisibleTask$, noSerialize, 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 QFN_KEY, h as QACTION_KEY, j as QDATA_KEY } from './chunks/routing.qwik.mjs';
 import * as qwikRouterConfig from '@qwik-router-config';
 import { _getContextContainer, SerializerSymbol, _UNINITIALIZED, _hasStoreEffects, forceStoreEffects, _waitUntilRendered, _getContextHostElement, _getContextEvent, _serialize, _deserialize, _resolveContextWithoutSequentialScope } from '@qwik.dev/core/internal';
@@ -596,6 +596,11 @@ const useQwikRouter = (props) => {
           window._qRouterScrollEnabled = true;
         }
       }
+      if (dest.href !== routeLocation.url.href) {
+        const newUrl = new URL(dest.href);
+        routeInternal.value.dest = newUrl;
+        routeLocation.url = newUrl;
+      }
       return;
     }
     routeInternal.value = {

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

@@ -689,7 +689,7 @@ export declare interface ServerRequestEvent<T = unknown> {
 }
 
 /** @public */
-export declare type ServerRequestMode = 'dev' | 'static' | 'server';
+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>;

package/lib/middleware/request-handler/index.mjs

@@ -1,7 +1,7 @@
 import { isServer } from '@qwik.dev/core/build';
 import { i as isPromise, j as QDATA_KEY, Q as Q_ROUTE, f as QFN_KEY, k as QLOADER_KEY, h as QACTION_KEY, d as loadRoute } from '../../chunks/routing.qwik.mjs';
 import { inlinedQrl } from '@qwik.dev/core';
-import { _serialize, _UNINITIALIZED, _deserialize, _verifySerializable } from '@qwik.dev/core/internal';
+import { _serialize, isDev, _UNINITIALIZED, _deserialize, _verifySerializable } from '@qwik.dev/core/internal';
 import { L as LoadedRouteProp } from '../../chunks/types.qwik.mjs';
 import { _asyncRequestStore as _asyncRequestStore$1, ServerError as ServerError$1, RedirectMessage as RedirectMessage$1, RewriteMessage as RewriteMessage$1, AbortMessage as AbortMessage$1 } from '@qwik.dev/router/middleware/request-handler';
 import { g as getErrorHtml, m as minimalHtmlResponse } from '../../chunks/error-handler.mjs';
@@ -343,7 +343,7 @@ async function runNext(requestEv, rebuildRouteInfo, resolve) {
         }
         return e;
       }
-      if (getRequestMode(requestEv) !== "dev") {
+      if (!isDev) {
         try {
           if (!requestEv.headersSent) {
             requestEv.headers.set("content-type", "text/html; charset=utf-8");
@@ -528,8 +528,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, baseP
           );
         }
         if (loaders[id] === _UNINITIALIZED) {
-          const isDev = getRequestMode(requestEv) === "dev";
-          await getRouteLoaderPromise(loaderOrAction, loaders, requestEv, isDev);
+          await getRouteLoaderPromise(loaderOrAction, loaders, requestEv);
         }
       }
       return loaders[id];
@@ -577,7 +576,10 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, baseP
     rewrite: (pathname2) => {
       check();
       if (pathname2.startsWith("http")) {
-        throw new Error("Rewrite does not support absolute urls");
+        throw new ServerError$1(
+          400,
+          isDev ? "Rewrite does not support absolute urls" : "Bad Request"
+        );
       }
       sharedMap.set(RequestEvIsRewrite, true);
       return exit(new RewriteMessage$1(pathname2.replace(/\/+/g, "/")));
@@ -618,7 +620,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, baseP
     },
     getWritableStream: () => {
       if (writableStream === null) {
-        if (serverRequestEv.mode === "dev") {
+        if (isDev) {
           const serverTiming = sharedMap.get(RequestEvShareServerTiming);
           if (serverTiming) {
             headers.set(
@@ -879,7 +881,6 @@ function actionsMiddleware(routeActions) {
     }
     const { method } = requestEv;
     const loaders = getRequestLoaders(requestEv);
-    const isDev = getRequestMode(requestEv) === "dev";
     if (isDev && method === "GET") {
       if (requestEv.query.has(QACTION_KEY)) {
         console.warn(
@@ -900,7 +901,7 @@ function actionsMiddleware(routeActions) {
               `Expected request data for the action id ${selectedActionId} to be an object`
             );
           }
-          const result = await runValidators(requestEv, action.__validators, data, isDev);
+          const result = await runValidators(requestEv, action.__validators, data);
           if (!result.success) {
             loaders[selectedActionId] = requestEv.fail(result.status ?? 500, result.error);
           } else {
@@ -927,23 +928,21 @@ function loadersMiddleware(routeLoaders) {
       return;
     }
     const loaders = getRequestLoaders(requestEv);
-    const isDev = getRequestMode(requestEv) === "dev";
     if (routeLoaders.length > 0) {
       const resolvedLoadersPromises = routeLoaders.map(
-        (loader) => getRouteLoaderPromise(loader, loaders, requestEv, isDev)
+        (loader) => getRouteLoaderPromise(loader, loaders, requestEv)
       );
       await Promise.all(resolvedLoadersPromises);
     }
   };
 }
-async function getRouteLoaderPromise(loader, loaders, requestEv, isDev) {
+async function getRouteLoaderPromise(loader, loaders, requestEv) {
   const loaderId = loader.__id;
   loaders[loaderId] = runValidators(
     requestEv,
     loader.__validators,
-    void 0,
+    void 0
     // data
-    isDev
   ).then((res) => {
     if (res.success) {
       if (isDev) {
@@ -973,7 +972,7 @@ async function getRouteLoaderPromise(loader, loaders, requestEv, isDev) {
   loadersSerializationStrategy.set(loaderId, loader.__serializationStrategy);
   return loaders[loaderId];
 }
-async function runValidators(requestEv, validators, data, isDev) {
+async function runValidators(requestEv, validators, data) {
   let lastResult = {
     success: true,
     data
@@ -1005,7 +1004,6 @@ async function runServerFunction(ev) {
   const serverFnHash = ev.query.get(QFN_KEY);
   if (serverFnHash && ev.request.headers.get("X-QRL") === serverFnHash && ev.request.headers.get("Content-Type") === "application/qwik-json") {
     ev.exit();
-    const isDev = getRequestMode(ev) === "dev";
     const data = await ev.parseBody();
     if (!Array.isArray(data) || !(Array.isArray(data[0]) || data[0] === void 0)) {
       throw ev.error(500, "Invalid request");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.25",
+  "version": "2.0.0-beta.26",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@azure/functions": "3.5.1",
@@ -40,7 +40,7 @@
     "tsm": "2.3.0",
     "typescript": "5.9.3",
     "uvu": "0.5.6",
-    "@qwik.dev/core": "2.0.0-beta.25"
+    "@qwik.dev/core": "2.0.0-beta.26"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -169,7 +169,7 @@
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
     "vite": ">=5 <8",
-    "@qwik.dev/core": "^2.0.0-beta.25"
+    "@qwik.dev/core": "^2.0.0-beta.26"
   },
   "publishConfig": {
     "access": "public"