@qwik.dev/router 2.0.0-beta.21 → 2.0.0-beta.24

package/lib/chunks/index.mjs

@@ -740,7 +740,7 @@ async function workerRender(sys, opts, staticRoute, pendingPromises, callback) {
                       stack: e.stack
                     };
                   });
-                  const serialized = await _serialize([qData]);
+                  const serialized = await _serialize(qData);
                   dataWriter.write(serialized);
                   writePromises.push(
                     new Promise((resolve) => {

package/lib/chunks/routing.qwik.mjs

@@ -50,7 +50,7 @@ const loadClientData = async (url, opts, retryCount = 0) => {
       }
       if ((rsp.headers.get("content-type") || "").includes("json")) {
         return rsp.text().then((text) => {
-          const [clientData] = _deserialize(text);
+          const clientData = _deserialize(text);
           if (!clientData) {
             location.href = url.href;
             return;
@@ -347,7 +347,11 @@ const deepFreeze = (obj) => {
   Object.getOwnPropertyNames(obj).forEach((prop) => {
     const value = obj[prop];
     if (value && typeof value === "object" && !Object.isFrozen(value)) {
-      deepFreeze(value);
+      try {
+        deepFreeze(value);
+      } catch {
+        return obj;
+      }
     }
   });
   return Object.freeze(obj);
@@ -426,4 +430,4 @@ 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, QFN_KEY as f, getClientNavPath as g, QACTION_KEY as h, isPromise as i, QDATA_KEY as j, QLOADER_KEY as k, loadClientData as l, preloadRouteBundles as p, shouldPreload as s, toUrl as t };

package/lib/index.d.ts

@@ -12,7 +12,6 @@ import { QRL } from '@qwik.dev/core';
 import { QRLEventHandlerMulti } from '@qwik.dev/core';
 import { QwikIntrinsicElements } from '@qwik.dev/core';
 import { QwikJSX } from '@qwik.dev/core';
-import type { ReadonlySignal } from '@qwik.dev/core';
 import { Render } from '@qwik.dev/core/server';
 import { RenderOptions } from '@qwik.dev/core/server';
 import { RequestEvent } from '@qwik.dev/router/middleware/request-handler';
@@ -23,6 +22,7 @@ import { RequestEventLoader } from '@qwik.dev/router/middleware/request-handler'
 import { RequestHandler } from '@qwik.dev/router/middleware/request-handler';
 import type { ResolveSyncValue } from '@qwik.dev/router/middleware/request-handler';
 import type { SerializationStrategy } from '@qwik.dev/core/internal';
+import type { Signal } from '@qwik.dev/core';
 import type * as v from 'valibot';
 import type { ValueOrPromise } from '@qwik.dev/core';
 import { ValueOrPromise as ValueOrPromise_2 } from '@qwik.dev/core/internal';
@@ -437,7 +437,7 @@ export declare type JSONValue = string | number | boolean | {
 } | Array<JSONValue>;
 
 /** @public */
-declare type JSXChildren = string | number | boolean | null | undefined | Function | RegExp | JSXChildren[] | Promise<JSXChildren> | Signal<JSXChildren> | JSXNode;
+declare type JSXChildren = string | number | boolean | null | undefined | Function | RegExp | JSXChildren[] | Promise<JSXChildren> | Signal_2<JSXChildren> | JSXNode;
 
 /**
  * A JSX Node, an internal structure. You probably want to use `JSXOutput` instead.
@@ -529,7 +529,7 @@ declare type LoaderOptions = {
 };
 
 /** @public */
-export declare type LoaderSignal<TYPE> = (TYPE extends () => ValueOrPromise<infer VALIDATOR> ? ReadonlySignal<ValueOrPromise<VALIDATOR>> : ReadonlySignal<TYPE>) & Pick<AsyncSignal, 'promise' | 'loading' | 'error'>;
+export declare type LoaderSignal<TYPE> = (TYPE extends () => ValueOrPromise<infer VALIDATOR> ? Signal<ValueOrPromise<VALIDATOR>> : Signal<TYPE>) & Pick<AsyncSignal, 'promise' | 'loading' | 'error'>;
 
 /** @public */
 export declare type MenuData = [pathname: string, menuLoader: MenuModuleLoader];
@@ -715,11 +715,6 @@ export declare interface QwikRouterProps {
 /** @public This is a wrapper around the `useQwikRouter()` hook. We recommend using the hook instead of this component, unless you have a good reason to make your root component reactive. */
 export declare const QwikRouterProvider: Component<QwikRouterProps>;
 
-/** @public */
-declare interface ReadonlySignal_2<T = unknown> {
-    readonly value: T;
-}
-
 /** @public */
 export declare type RendererOptions = Omit<RenderOptions, 'serverData'> & {
     serverData: ServerData;
@@ -873,8 +868,16 @@ export declare const ServiceWorkerRegister: (props: {
  *
  * @public
  */
-declare interface Signal<T = any> extends ReadonlySignal_2<T> {
+declare interface Signal_2<T = any> {
+    /** Reading from this subscribes to updates; writing to this triggers updates. */
     value: T;
+    /** Reading from this does not subscribe to updates; writing to this does not trigger updates. */
+    untrackedValue: T;
+    /**
+     * Use this to trigger running subscribers, for example when the value mutated but remained the
+     * same object.
+     */
+    trigger(): void;
 }
 
 /** @public */

package/lib/index.qwik.mjs

@@ -1,6 +1,6 @@
 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 { 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';
 import { _asyncRequestStore } from '@qwik.dev/router/middleware/request-handler';
@@ -882,7 +882,7 @@ const useQwikRouter = (props) => {
           }
           const navigate = () => {
             clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
-            contentInternal.force();
+            contentInternal.trigger();
             return _waitUntilRendered(container2);
           };
           const _waitNextPage = () => {
@@ -1322,9 +1322,9 @@ const serverQrl = (qrl, options) => {
           (v2) => v2 && Object.prototype.hasOwnProperty.call(v2, "sharedMap") && Object.prototype.hasOwnProperty.call(v2, "cookie")
         );
       }
-      return qrl.apply(requestEvent, isDev ? deepFreeze(args) : args);
+      return qrl.apply(requestEvent, args);
     } else {
-      const filteredArgs = args.map((arg) => {
+      let filteredArgs = args.map((arg) => {
         if (arg instanceof SubmitEvent && arg.target instanceof HTMLFormElement) {
           return new FormData(arg.target);
         } else if (arg instanceof Event) {
@@ -1334,6 +1334,9 @@ const serverQrl = (qrl, options) => {
         }
         return arg;
       });
+      if (!filteredArgs.length) {
+        filteredArgs = void 0;
+      }
       const qrlHash = qrl.getHash();
       let query = "";
       const config = {
@@ -1349,11 +1352,11 @@ const serverQrl = (qrl, options) => {
         signal: abortSignal
       };
       const captured = qrl.getCaptured();
-      let toSend;
+      let toSend = [filteredArgs];
       if (captured?.length) {
-        toSend = [filteredArgs, captured];
+        toSend = [filteredArgs, ...captured];
       } else {
-        toSend = filteredArgs.length ? [filteredArgs] : [];
+        toSend = filteredArgs ? [filteredArgs] : [];
       }
       const body = await _serialize(toSend);
       if (method === "GET") {
@@ -1377,7 +1380,7 @@ const serverQrl = (qrl, options) => {
         })();
       } else if (contentType === "application/qwik-json") {
         const str = await res.text();
-        const [obj] = _deserialize(str);
+        const obj = _deserialize(str);
         if (res.status >= 400) {
           throw obj;
         }
@@ -1451,7 +1454,7 @@ const deserializeStream = async function* (stream, abortSignal) {
       const lines = buffer.split(/\n/);
       buffer = lines.pop();
       for (const line of lines) {
-        const [deserializedData] = _deserialize(line);
+        const deserializedData = _deserialize(line);
         yield deserializedData;
       }
     }

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

@@ -1,5 +1,5 @@
 import { isServer } from '@qwik.dev/core/build';
-import { i as isPromise, k as QDATA_KEY, Q as Q_ROUTE, h as QFN_KEY, m as QLOADER_KEY, j as QACTION_KEY, d as loadRoute } from '../../chunks/routing.qwik.mjs';
+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 { L as LoadedRouteProp } from '../../chunks/types.qwik.mjs';
@@ -337,7 +337,7 @@ async function runNext(requestEv, rebuildRouteInfo, resolve) {
         const accept = requestEv.request.headers.get("Accept");
         if (accept && !accept.includes("text/html")) {
           requestEv.headers.set("Content-Type", "application/qwik-json");
-          requestEv.send(status, await _serialize([e.data]));
+          requestEv.send(status, await _serialize(e.data));
         } else {
           requestEv.html(status, getErrorHtml(status, e.data));
         }
@@ -1007,51 +1007,51 @@ async function runServerFunction(ev) {
     ev.exit();
     const isDev = getRequestMode(ev) === "dev";
     const data = await ev.parseBody();
-    if (Array.isArray(data)) {
-      const qrl = inlinedQrl(null, serverFnHash, data[1]);
-      let result;
-      try {
+    if (!Array.isArray(data) || !(Array.isArray(data[0]) || data[0] === void 0)) {
+      throw ev.error(500, "Invalid request");
+    }
+    const qrl = inlinedQrl(null, serverFnHash, data.slice(1));
+    let result;
+    try {
+      if (isDev) {
+        result = await measure(
+          ev,
+          `server_${serverFnHash}`,
+          () => qrl.apply(ev, data[0])
+        );
+      } else {
+        result = await qrl.apply(ev, data[0]);
+      }
+    } catch (err) {
+      if (err instanceof ServerError$1) {
+        throw ev.error(err.status, err.data);
+      }
+      console.error(`Server function ${serverFnHash} failed:`, err);
+      throw ev.error(500, "Invalid request");
+    }
+    if (isAsyncIterator(result)) {
+      ev.headers.set("Content-Type", "text/qwik-json-stream");
+      const writable = ev.getWritableStream();
+      const stream = writable.getWriter();
+      for await (const item of result) {
         if (isDev) {
-          result = await measure(
-            ev,
-            `server_${serverFnHash}`,
-            () => qrl.apply(ev, data[0])
-          );
-        } else {
-          result = await qrl.apply(ev, data[0]);
+          verifySerializable(item, qrl);
         }
-      } catch (err) {
-        if (err instanceof ServerError$1) {
-          throw ev.error(err.status, err.data);
+        const message = await _serialize(item);
+        if (ev.signal.aborted) {
+          break;
         }
-        console.error(`Server function ${serverFnHash} failed:`, err);
-        throw ev.error(500, "Invalid request");
-      }
-      if (isAsyncIterator(result)) {
-        ev.headers.set("Content-Type", "text/qwik-json-stream");
-        const writable = ev.getWritableStream();
-        const stream = writable.getWriter();
-        for await (const item of result) {
-          if (isDev) {
-            verifySerializable(item, qrl);
-          }
-          const message = await _serialize([item]);
-          if (ev.signal.aborted) {
-            break;
-          }
-          await stream.write(encoder.encode(`${message}
+        await stream.write(encoder.encode(`${message}
 `));
-        }
-        stream.close();
-      } else {
-        verifySerializable(result, qrl);
-        ev.headers.set("Content-Type", "application/qwik-json");
-        const message = await _serialize([result]);
-        ev.send(200, message);
       }
-      return;
+      stream.close();
+    } else {
+      verifySerializable(result, qrl);
+      ev.headers.set("Content-Type", "application/qwik-json");
+      const message = await _serialize(result);
+      ev.send(200, message);
     }
-    throw ev.error(500, "Invalid request");
+    return;
   }
 }
 function fixTrailingSlash(ev) {
@@ -1251,7 +1251,7 @@ async function renderQData(requestEv) {
     isRewrite: requestEv.sharedMap.get(RequestEvIsRewrite)
   };
   const writer = requestEv.getWritableStream().getWriter();
-  const data = await _serialize([qData]);
+  const data = await _serialize(qData);
   writer.write(encoder.encode(data));
   requestEv.sharedMap.set(RequestEvShareQData, qData);
   writer.close();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.24",
   "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.21"
+    "@qwik.dev/core": "2.0.0-beta.24"
   },
   "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.21"
+    "@qwik.dev/core": "^2.0.0-beta.24"
   },
   "publishConfig": {
     "access": "public"