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

package/lib/chunks/routing.qwik.mjs

@@ -1,4 +1,4 @@
-import { createAsyncComputed$, isBrowser } from '@qwik.dev/core';
+import { createAsync$, 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';
@@ -13,7 +13,7 @@ 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 loadClientData = async (url, opts, retryCount = 0) => {
   const pagePathname = url.pathname;
   const pageSearch = url.search;
   const clientDataPath = getClientDataPath(pagePathname, pageSearch, {
@@ -36,7 +36,7 @@ const loadClientData = async (url, element, opts, retryCount = 0) => {
     qData = fetch(clientDataPath, fetchOptions).then((rsp) => {
       if (rsp.status === 404 && opts?.loaderIds && retryCount < MAX_Q_DATA_RETRY_COUNT) {
         opts.loaderIds = void 0;
-        return loadClientData(url, element, opts, retryCount + 1);
+        return loadClientData(url, opts, retryCount + 1);
       }
       if (rsp.redirected) {
         const redirectedURL = new URL(rsp.url);
@@ -50,7 +50,7 @@ const loadClientData = async (url, element, opts, retryCount = 0) => {
       }
       if ((rsp.headers.get("content-type") || "").includes("json")) {
         return rsp.text().then((text) => {
-          const [clientData] = _deserialize(text, element);
+          const [clientData] = _deserialize(text);
           if (!clientData) {
             location.href = url.href;
             return;
@@ -169,10 +169,10 @@ const isPromise = (value) => {
   return value && typeof value.then === "function";
 };
 const createLoaderSignal = (loadersObject, loaderId, url, serializationStrategy, container) => {
-  return createAsyncComputed$(
+  return createAsync$(
     async () => {
       if (isBrowser && loadersObject[loaderId] === _UNINITIALIZED) {
-        const data = await loadClientData(url, void 0, {
+        const data = await loadClientData(url, {
           loaderIds: [loaderId]
         });
         loadersObject[loaderId] = data?.loaders[loaderId] ?? _UNINITIALIZED;

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference path="./modules.d.ts" />
 
-import type { AsyncComputedReadonlySignal } from '@qwik.dev/core/internal';
+import type { AsyncSignal } 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';
@@ -477,7 +477,7 @@ export declare interface LinkProps extends AnchorAttributes {
      *
      * This **improves UX performance** for client-side (**SPA**) navigations.
      *
-     * Prefetching occurs when a the Link enters the viewport in production (**`on:qvisible`**), or
+     * Prefetching occurs when a the Link enters the viewport in production (**`q-e:qvisible`**), or
      * with **`mouseover`/`focus`** during dev.
      *
      * Prefetching will not occur if the user has the **data saver** setting enabled.
@@ -529,7 +529,7 @@ declare type LoaderOptions = {
 };
 
 /** @public */
-export declare type LoaderSignal<TYPE> = (TYPE extends () => ValueOrPromise<infer VALIDATOR> ? ReadonlySignal<ValueOrPromise<VALIDATOR>> : ReadonlySignal<TYPE>) & Pick<AsyncComputedReadonlySignal, 'promise' | 'loading' | 'error'>;
+export declare type LoaderSignal<TYPE> = (TYPE extends () => ValueOrPromise<infer VALIDATOR> ? ReadonlySignal<ValueOrPromise<VALIDATOR>> : ReadonlySignal<TYPE>) & Pick<AsyncSignal, 'promise' | 'loading' | 'error'>;
 
 /** @public */
 export declare type MenuData = [pathname: string, menuLoader: MenuModuleLoader];

package/lib/index.qwik.mjs

@@ -2,7 +2,7 @@ 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 { _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';
 import * as v from 'valibot';
 import * as z from 'zod';
@@ -77,7 +77,7 @@ const Link = component$((props) => {
       const url = new URL(elm.href);
       preloadRouteBundles(url.pathname);
       if (elm.hasAttribute("data-prefetch")) {
-        loadClientData(url, elm, {
+        loadClientData(url, {
           preloadRouteBundles: false,
           isPrefetch: true
         });
@@ -216,6 +216,8 @@ const createDocumentHead = (defaults) => ({
   frontmatter: { ...defaults?.frontmatter }
 });
 
+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}}}";
+
 function callRestoreScrollOnDocument() {
   if (document.__q_scroll_restore__) {
     document.__q_scroll_restore__();
@@ -420,8 +422,6 @@ const startViewTransition = (params) => {
   }
 };
 
-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 = {};
@@ -606,7 +606,7 @@ const useQwikRouter = (props) => {
       scroll
     };
     if (isBrowser) {
-      loadClientData(dest, _getContextElement());
+      loadClientData(dest);
       loadRoute(
         qwikRouterConfig.routes,
         qwikRouterConfig.menus,
@@ -639,7 +639,7 @@ const useQwikRouter = (props) => {
       let trackUrl;
       let clientPageData;
       let loadedRoute = null;
-      let elm;
+      let container2;
       if (isServer) {
         trackUrl = new URL(navigation.dest, routeLocation.url);
         loadedRoute = env.loadedRoute;
@@ -659,8 +659,8 @@ const useQwikRouter = (props) => {
           qwikRouterConfig.cacheModules,
           trackUrl.pathname
         );
-        elm = _getContextElement();
-        const pageData = clientPageData = await loadClientData(trackUrl, elm, {
+        container2 = _getContextContainer();
+        const pageData = clientPageData = await loadClientData(trackUrl, {
           action,
           clearCache: true
         });
@@ -747,7 +747,7 @@ const useQwikRouter = (props) => {
           }
           const loaders = clientPageData?.loaders;
           if (loaders) {
-            const container2 = _getContextContainer();
+            const container3 = _getContextContainer();
             for (const [key, value] of Object.entries(loaders)) {
               const signal = loaderState[key];
               const awaitedValue = await value;
@@ -758,7 +758,7 @@ const useQwikRouter = (props) => {
                   key,
                   trackUrl,
                   DEFAULT_LOADERS_SERIALIZATION_STRATEGY,
-                  container2
+                  container3
                 );
               } else {
                 signal.invalidate();
@@ -883,7 +883,7 @@ const useQwikRouter = (props) => {
           const navigate = () => {
             clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
             contentInternal.force();
-            return _waitUntilRendered(elm);
+            return _waitUntilRendered(container2);
           };
           const _waitNextPage = () => {
             if (isServer || props?.viewTransition === false) {
@@ -903,8 +903,7 @@ const useQwikRouter = (props) => {
             navigate();
             throw err;
           }).finally(() => {
-            const container2 = _getQContainerElement(elm);
-            container2.setAttribute(Q_ROUTE, routeName);
+            container2.element.setAttribute?.(Q_ROUTE, routeName);
             const scrollState2 = currentScrollState(scroller);
             saveScrollHistory(scrollState2);
             window._qRouterScrollEnabled = true;
@@ -1153,6 +1152,7 @@ const routeAction$ = /* @__PURE__ */ implicit$FirstArg(
 const globalAction$ = /* @__PURE__ */ implicit$FirstArg(
   globalActionQrl
 );
+const getValue = (obj) => obj.value;
 const routeLoaderQrl = ((loaderQrl, ...rest) => {
   const { id, validators, serializationStrategy } = getValidators(rest, loaderQrl);
   function loader() {
@@ -1165,8 +1165,9 @@ const routeLoaderQrl = ((loaderQrl, ...rest) => {
     If your are managing reusable logic or a library it is essential that this function is re-exported from within 'layout.tsx' or 'index.tsx file of the existing route otherwise it will not run or throw exception.
     For more information check: https://qwik.dev/docs/re-exporting-loaders/`);
     }
-    untrack(() => state[id].value);
-    return state[id];
+    const loaderData = state[id];
+    untrack(getValue, loaderData);
+    return loaderData;
   }
   loader.__brand = "server_loader";
   loader.__qrl = loaderQrl;
@@ -1303,7 +1304,7 @@ const zod$ = /* @__PURE__ */ implicit$FirstArg(zodQrl);
 const serverQrl = (qrl, options) => {
   if (isServer) {
     const captured = qrl.getCaptured();
-    if (captured && captured.length > 0 && !_getContextElement()) {
+    if (captured && captured.length > 0 && !_getContextHostElement()) {
       throw new Error("For security reasons, we cannot serialize QRLs that capture lexical scope.");
     }
   }
@@ -1323,7 +1324,6 @@ const serverQrl = (qrl, options) => {
       }
       return qrl.apply(requestEvent, isDev ? deepFreeze(args) : args);
     } else {
-      const ctxElm = _getContextElement();
       const filteredArgs = args.map((arg) => {
         if (arg instanceof SubmitEvent && arg.target instanceof HTMLFormElement) {
           return new FormData(arg.target);
@@ -1366,11 +1366,7 @@ const serverQrl = (qrl, options) => {
       if (res.ok && contentType === "text/qwik-json-stream" && res.body) {
         return (async function* () {
           try {
-            for await (const result of deserializeStream(
-              res.body,
-              ctxElm ?? document.documentElement,
-              abortSignal
-            )) {
+            for await (const result of deserializeStream(res.body, abortSignal)) {
               yield result;
             }
           } finally {
@@ -1381,7 +1377,7 @@ const serverQrl = (qrl, options) => {
         })();
       } else if (contentType === "application/qwik-json") {
         const str = await res.text();
-        const [obj] = _deserialize(str, ctxElm ?? document.documentElement);
+        const [obj] = _deserialize(str);
         if (res.status >= 400) {
           throw obj;
         }
@@ -1441,7 +1437,7 @@ const getValidators = (rest, qrl) => {
     serializationStrategy
   };
 };
-const deserializeStream = async function* (stream, ctxElm, abortSignal) {
+const deserializeStream = async function* (stream, abortSignal) {
   const reader = stream.getReader();
   try {
     let buffer = "";
@@ -1455,7 +1451,7 @@ const deserializeStream = async function* (stream, ctxElm, abortSignal) {
       const lines = buffer.split(/\n/);
       buffer = lines.pop();
       for (const line of lines) {
-        const [deserializedData] = _deserialize(line, ctxElm);
+        const [deserializedData] = _deserialize(line);
         yield deserializedData;
       }
     }

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

@@ -1322,6 +1322,9 @@ async function requestHandler(serverRequestEv, opts) {
     throw new Error("qwikRouterConfig is required.");
   }
   const { pathname, isInternal } = getRouteMatchPathname(serverRequestEv.url.pathname);
+  if (pathname === "/.well-known" || pathname.startsWith("/.well-known/")) {
+    return null;
+  }
   const routeAndHandlers = await loadRequestHandlers(
     qwikRouterConfig,
     pathname,

package/package.json

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