@qwik.dev/router 2.0.0-beta.7 → 2.0.0-beta.9

package/lib/index.qwik.cjs

@@ -316,16 +316,17 @@ const Link = core.component$((props) => {
       event.preventDefault();
     }
   }) : void 0;
-  const handleClick = clientNavPath ? core.$(async (event, elm) => {
+  const handleClick = clientNavPath ? core.$((event, elm) => {
     if (event.defaultPrevented) {
       if (elm.href) {
         elm.setAttribute("aria-pressed", "true");
-        await nav(elm.href, {
+        nav(elm.href, {
           forceReload: reload,
           replaceState,
           scroll
+        }).then(() => {
+          elm.removeAttribute("aria-pressed");
         });
-        elm.removeAttribute("aria-pressed");
       }
     }
   }) : void 0;
@@ -880,12 +881,13 @@ const useQwikRouter = (props) => {
     }
   }
   const url = new URL(urlEnv);
-  const routeLocation = core.useStore({
+  const routeLocationTarget = {
     url,
     params: env.params,
     isNavigating: false,
     prevUrl: void 0
-  }, {
+  };
+  const routeLocation = core.useStore(routeLocationTarget, {
     deep: false
   });
   const navResolver = {};
@@ -1107,13 +1109,27 @@ const useQwikRouter = (props) => {
         if (navigation.dest.search && !!isSamePath(trackUrl, prevUrl)) {
           trackUrl.search = navigation.dest.search;
         }
+        let shouldForcePrevUrl = false;
+        let shouldForceUrl = false;
+        let shouldForceParams = false;
         if (!isSamePath(trackUrl, prevUrl)) {
-          routeLocation.prevUrl = prevUrl;
+          if (internal._hasStoreEffects(routeLocation, "prevUrl")) {
+            shouldForcePrevUrl = true;
+          }
+          routeLocationTarget.prevUrl = prevUrl;
+        }
+        if (routeLocationTarget.url !== trackUrl) {
+          if (internal._hasStoreEffects(routeLocation, "url")) {
+            shouldForceUrl = true;
+          }
+          routeLocationTarget.url = trackUrl;
+        }
+        if (routeLocationTarget.params !== params) {
+          if (internal._hasStoreEffects(routeLocation, "params")) {
+            shouldForceParams = true;
+          }
+          routeLocationTarget.params = params;
         }
-        routeLocation.url = trackUrl;
-        routeLocation.params = {
-          ...params
-        };
         routeInternal.untrackedValue = {
           type: navType,
           dest: trackUrl
@@ -1121,7 +1137,7 @@ const useQwikRouter = (props) => {
         const resolvedHead = resolveHead(clientPageData, routeLocation, contentModules, locale, serverHead);
         content.headings = pageModule.headings;
         content.menu = menu;
-        contentInternal.value = core.noSerialize(contentModules);
+        contentInternal.untrackedValue = core.noSerialize(contentModules);
         documentHead.links = resolvedHead.links;
         documentHead.meta = resolvedHead.meta;
         documentHead.styles = resolvedHead.styles;
@@ -1263,6 +1279,7 @@ const useQwikRouter = (props) => {
           }
           const navigate = () => {
             clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
+            contentInternal.force();
             return internal._waitUntilRendered(elm);
           };
           const _waitNextPage = () => {
@@ -1290,6 +1307,15 @@ const useQwikRouter = (props) => {
             if (core.isBrowser) {
               callRestoreScrollOnDocument();
             }
+            if (shouldForcePrevUrl) {
+              internal.forceStoreEffects(routeLocation, "prevUrl");
+            }
+            if (shouldForceUrl) {
+              internal.forceStoreEffects(routeLocation, "url");
+            }
+            if (shouldForceParams) {
+              internal.forceStoreEffects(routeLocation, "params");
+            }
             routeLocation.isNavigating = false;
             navResolver.r?.();
           });
@@ -1357,13 +1383,14 @@ const RouterOutlet = core.component$(() => {
   if (!serverData) {
     throw new Error("PrefetchServiceWorker component must be rendered on the server.");
   }
-  const { value } = core.useContext(ContentInternalContext);
-  if (value && value.length > 0) {
-    const contentsLen = value.length;
+  const internalContext = core.useContext(ContentInternalContext);
+  const contents = internalContext.value;
+  if (contents && contents.length > 0) {
+    const contentsLen = contents.length;
     let cmp = null;
     for (let i = contentsLen - 1; i >= 0; i--) {
-      if (value[i].default) {
-        cmp = core.jsx(value[i].default, {
+      if (contents[i].default) {
+        cmp = core.jsx(contents[i].default, {
           children: cmp
         });
       }
@@ -1690,7 +1717,7 @@ const zodQrl = (qrl) => {
           }
         });
         const data = inputData ?? await ev.parseBody();
-        const result = await schema.safeParseAsync(data);
+        const result = await core.withLocale(ev.locale(), () => schema.safeParseAsync(data));
         if (result.success) {
           return result;
         } else {

package/lib/index.qwik.mjs

@@ -1,7 +1,7 @@
 import { jsx, Fragment, jsxs } from "@qwik.dev/core/jsx-runtime";
 import { component$, useErrorBoundary, useOnWindow, $, Slot, createAsyncComputed$, isBrowser, createContextId, implicit$FirstArg, useContext, useVisibleTask$, noSerialize, useServerData, useSignal, untrack, sync$, isDev, withLocale, event$, useStyles$, isServer, useStore, useContextProvider, useTask$, getLocale, jsx as jsx$1, SkipRender, createElement } from "@qwik.dev/core";
 import { p } from "@qwik.dev/core/preloader";
-import { _deserialize, _UNINITIALIZED, _getContextContainer, SerializerSymbol, _getContextElement, _getQContainerElement, _waitUntilRendered, _resolveContextWithoutSequentialScope, _getContextEvent, _serialize } from "@qwik.dev/core/internal";
+import { _deserialize, _UNINITIALIZED, _getContextContainer, SerializerSymbol, _getContextElement, _hasStoreEffects, _getQContainerElement, forceStoreEffects, _waitUntilRendered, _resolveContextWithoutSequentialScope, _getContextEvent, _serialize } from "@qwik.dev/core/internal";
 import * as qwikRouterConfig from "@qwik-router-config";
 import { z } from "zod";
 import { z as z2 } from "zod";
@@ -298,16 +298,17 @@ const Link = component$((props) => {
       event.preventDefault();
     }
   }) : void 0;
-  const handleClick = clientNavPath ? $(async (event, elm) => {
+  const handleClick = clientNavPath ? $((event, elm) => {
     if (event.defaultPrevented) {
       if (elm.href) {
         elm.setAttribute("aria-pressed", "true");
-        await nav(elm.href, {
+        nav(elm.href, {
           forceReload: reload,
           replaceState,
           scroll
+        }).then(() => {
+          elm.removeAttribute("aria-pressed");
         });
-        elm.removeAttribute("aria-pressed");
       }
     }
   }) : void 0;
@@ -862,12 +863,13 @@ const useQwikRouter = (props) => {
     }
   }
   const url = new URL(urlEnv);
-  const routeLocation = useStore({
+  const routeLocationTarget = {
     url,
     params: env.params,
     isNavigating: false,
     prevUrl: void 0
-  }, {
+  };
+  const routeLocation = useStore(routeLocationTarget, {
     deep: false
   });
   const navResolver = {};
@@ -1089,13 +1091,27 @@ const useQwikRouter = (props) => {
         if (navigation.dest.search && !!isSamePath(trackUrl, prevUrl)) {
           trackUrl.search = navigation.dest.search;
         }
+        let shouldForcePrevUrl = false;
+        let shouldForceUrl = false;
+        let shouldForceParams = false;
         if (!isSamePath(trackUrl, prevUrl)) {
-          routeLocation.prevUrl = prevUrl;
+          if (_hasStoreEffects(routeLocation, "prevUrl")) {
+            shouldForcePrevUrl = true;
+          }
+          routeLocationTarget.prevUrl = prevUrl;
+        }
+        if (routeLocationTarget.url !== trackUrl) {
+          if (_hasStoreEffects(routeLocation, "url")) {
+            shouldForceUrl = true;
+          }
+          routeLocationTarget.url = trackUrl;
+        }
+        if (routeLocationTarget.params !== params) {
+          if (_hasStoreEffects(routeLocation, "params")) {
+            shouldForceParams = true;
+          }
+          routeLocationTarget.params = params;
         }
-        routeLocation.url = trackUrl;
-        routeLocation.params = {
-          ...params
-        };
         routeInternal.untrackedValue = {
           type: navType,
           dest: trackUrl
@@ -1103,7 +1119,7 @@ const useQwikRouter = (props) => {
         const resolvedHead = resolveHead(clientPageData, routeLocation, contentModules, locale, serverHead);
         content.headings = pageModule.headings;
         content.menu = menu;
-        contentInternal.value = noSerialize(contentModules);
+        contentInternal.untrackedValue = noSerialize(contentModules);
         documentHead.links = resolvedHead.links;
         documentHead.meta = resolvedHead.meta;
         documentHead.styles = resolvedHead.styles;
@@ -1245,6 +1261,7 @@ const useQwikRouter = (props) => {
           }
           const navigate = () => {
             clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
+            contentInternal.force();
             return _waitUntilRendered(elm);
           };
           const _waitNextPage = () => {
@@ -1272,6 +1289,15 @@ const useQwikRouter = (props) => {
             if (isBrowser) {
               callRestoreScrollOnDocument();
             }
+            if (shouldForcePrevUrl) {
+              forceStoreEffects(routeLocation, "prevUrl");
+            }
+            if (shouldForceUrl) {
+              forceStoreEffects(routeLocation, "url");
+            }
+            if (shouldForceParams) {
+              forceStoreEffects(routeLocation, "params");
+            }
             routeLocation.isNavigating = false;
             navResolver.r?.();
           });
@@ -1339,13 +1365,14 @@ const RouterOutlet = component$(() => {
   if (!serverData) {
     throw new Error("PrefetchServiceWorker component must be rendered on the server.");
   }
-  const { value } = useContext(ContentInternalContext);
-  if (value && value.length > 0) {
-    const contentsLen = value.length;
+  const internalContext = useContext(ContentInternalContext);
+  const contents = internalContext.value;
+  if (contents && contents.length > 0) {
+    const contentsLen = contents.length;
     let cmp = null;
     for (let i = contentsLen - 1; i >= 0; i--) {
-      if (value[i].default) {
-        cmp = jsx$1(value[i].default, {
+      if (contents[i].default) {
+        cmp = jsx$1(contents[i].default, {
           children: cmp
         });
       }
@@ -1672,7 +1699,7 @@ const zodQrl = (qrl) => {
           }
         });
         const data = inputData ?? await ev.parseBody();
-        const result = await schema.safeParseAsync(data);
+        const result = await withLocale(ev.locale(), () => schema.safeParseAsync(data));
         if (result.success) {
           return result;
         } else {

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

@@ -24,9 +24,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// node_modules/.pnpm/set-cookie-parser@2.6.0/node_modules/set-cookie-parser/lib/set-cookie.js
+// node_modules/.pnpm/set-cookie-parser@2.7.1/node_modules/set-cookie-parser/lib/set-cookie.js
 var require_set_cookie = __commonJS({
-  "node_modules/.pnpm/set-cookie-parser@2.6.0/node_modules/set-cookie-parser/lib/set-cookie.js"(exports, module) {
+  "node_modules/.pnpm/set-cookie-parser@2.7.1/node_modules/set-cookie-parser/lib/set-cookie.js"(exports, module) {
     "use strict";
     var defaultParseOptions = {
       decodeValues: true,
@@ -69,6 +69,8 @@ var require_set_cookie = __commonJS({
           cookie.httpOnly = true;
         } else if (key === "samesite") {
           cookie.sameSite = value2;
+        } else if (key === "partitioned") {
+          cookie.partitioned = true;
         } else {
           cookie[key] = value2;
         }
@@ -116,7 +118,6 @@ var require_set_cookie = __commonJS({
       if (!Array.isArray(input)) {
         input = [input];
       }
-      options = options ? Object.assign({}, defaultParseOptions, options) : defaultParseOptions;
       if (!options.map) {
         return input.filter(isNonEmptyString).map(function(str) {
           return parseString2(str, options);

package/lib/ssg/node.cjs

@@ -99,6 +99,7 @@ var import_request_handler = require("../middleware/request-handler/index.cjs");
 var import_web = require("node:stream/web");
 var import_node_url = require("node:url");
 async function workerThread(sys) {
+  delete globalThis.__qwik;
   const ssgOpts = sys.getOptions();
   const pendingPromises = /* @__PURE__ */ new Set();
   const opts = {
@@ -123,6 +124,7 @@ async function workerThread(sys) {
   });
 }
 async function createSingleThreadWorker(sys) {
+  delete globalThis.__qwik;
   const ssgOpts = sys.getOptions();
   const pendingPromises = /* @__PURE__ */ new Set();
   const opts = {

package/lib/ssg/node.mjs

@@ -63,6 +63,7 @@ import { requestHandler, RequestEvShareQData } from "../middleware/request-handl
 import { WritableStream } from "node:stream/web";
 import { pathToFileURL } from "node:url";
 async function workerThread(sys) {
+  delete globalThis.__qwik;
   const ssgOpts = sys.getOptions();
   const pendingPromises = /* @__PURE__ */ new Set();
   const opts = {
@@ -87,6 +88,7 @@ async function workerThread(sys) {
   });
 }
 async function createSingleThreadWorker(sys) {
+  delete globalThis.__qwik;
   const ssgOpts = sys.getOptions();
   const pendingPromises = /* @__PURE__ */ new Set();
   const opts = {