@qwik.dev/router 2.0.0-beta.6 → 2.0.0-beta.8

package/lib/index.qwik.mjs

@@ -1,11 +1,12 @@
 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 } from "@qwik.dev/core";
+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 * as qwikRouterConfig from "@qwik-router-config";
 import { z } from "zod";
 import { z as z2 } from "zod";
 import swRegister from "@qwik-router-sw-register";
+import { renderToStream } from "@qwik.dev/core/server";
 const ErrorBoundary = component$((props) => {
   const store2 = useErrorBoundary();
   useOnWindow("qerror", $((e) => {
@@ -348,8 +349,8 @@ const Link = component$((props) => {
     children: /* @__PURE__ */ jsx(Slot, {})
   });
 });
-const resolveHead = (endpoint, routeLocation, contentModules, locale) => {
-  const head = createDocumentHead();
+const resolveHead = (endpoint, routeLocation, contentModules, locale, defaults) => {
+  const head = createDocumentHead(defaults);
   const getData = (loaderOrAction) => {
     const id = loaderOrAction.__id;
     if (loaderOrAction.__brand === "server_loader") {
@@ -405,13 +406,23 @@ const mergeArray = (existingArr, newArr) => {
     }
   }
 };
-const createDocumentHead = () => ({
-  title: "",
-  meta: [],
-  links: [],
-  styles: [],
-  scripts: [],
-  frontmatter: {}
+const createDocumentHead = (defaults) => ({
+  title: defaults?.title || "",
+  meta: [
+    ...defaults?.meta || []
+  ],
+  links: [
+    ...defaults?.links || []
+  ],
+  styles: [
+    ...defaults?.styles || []
+  ],
+  scripts: [
+    ...defaults?.scripts || []
+  ],
+  frontmatter: {
+    ...defaults?.frontmatter
+  }
 });
 function matchRoute(route, path) {
   const routeIdx = startIdxSkipSlash(route);
@@ -823,7 +834,7 @@ const preventNav = {};
 const internalState = {
   navCount: 0
 };
-const QwikRouterProvider = component$((props) => {
+const useQwikRouter = (props) => {
   useStyles$(`
     @layer qwik {
       @supports selector(html:active-view-transition-type(type)) {
@@ -844,6 +855,7 @@ const QwikRouterProvider = component$((props) => {
   if (!urlEnv) {
     throw new Error(`Missing Qwik URL Env Data`);
   }
+  const serverHead = useServerData("documentHead");
   if (isServer) {
     if (env.ev.originalUrl.pathname !== env.ev.url.pathname && !__EXPERIMENTAL__.enableRequestRewrite) {
       throw new Error(`enableRequestRewrite is an experimental feature and is not enabled. Please enable the feature flag by adding \`experimental: ["enableRequestRewrite"]\` to your qwikVite plugin options.`);
@@ -883,7 +895,7 @@ const QwikRouterProvider = component$((props) => {
     replaceState: false,
     scroll: true
   });
-  const documentHead = useStore(createDocumentHead);
+  const documentHead = useStore(() => createDocumentHead(serverHead));
   const content = useStore({
     headings: void 0,
     menu: void 0
@@ -1088,7 +1100,7 @@ const QwikRouterProvider = component$((props) => {
           type: navType,
           dest: trackUrl
         };
-        const resolvedHead = resolveHead(clientPageData, routeLocation, contentModules, locale);
+        const resolvedHead = resolveHead(clientPageData, routeLocation, contentModules, locale, serverHead);
         content.headings = pageModule.headings;
         content.menu = menu;
         contentInternal.value = noSerialize(contentModules);
@@ -1236,7 +1248,7 @@ const QwikRouterProvider = component$((props) => {
             return _waitUntilRendered(elm);
           };
           const _waitNextPage = () => {
-            if (isServer || props.viewTransition === false) {
+            if (isServer || props?.viewTransition === false) {
               return navigate();
             } else {
               const viewTransition = startViewTransition({
@@ -1272,10 +1284,13 @@ const QwikRouterProvider = component$((props) => {
       run();
     }
   });
+};
+const QwikRouterProvider = component$((props) => {
+  useQwikRouter(props);
   return /* @__PURE__ */ jsx(Slot, {});
 });
 const QwikCityProvider = QwikRouterProvider;
-const QwikRouterMockProvider = component$((props) => {
+const useQwikMockRouter = (props) => {
   const urlEnv = props.url ?? "http://localhost/";
   const url = new URL(urlEnv);
   const routeLocation = useStore({
@@ -1313,6 +1328,9 @@ const QwikRouterMockProvider = component$((props) => {
   useContextProvider(RouteStateContext, loaderState);
   useContextProvider(RouteActionContext, actionState);
   useContextProvider(RouteInternalContext, routeInternal);
+};
+const QwikRouterMockProvider = component$((props) => {
+  useQwikMockRouter(props);
   return /* @__PURE__ */ jsx(Slot, {});
 });
 const QwikCityMockProvider = QwikRouterMockProvider;
@@ -1654,7 +1672,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 {
@@ -1963,7 +1981,52 @@ function omitProps(obj, keys) {
   }
   return omittedObj;
 }
+const createRenderer = (getOptions) => {
+  return (opts) => {
+    const { jsx: jsx2, options } = getOptions(opts);
+    return renderToStream(jsx2, options);
+  };
+};
+const DocumentHeadTags = component$((props) => {
+  let head = useDocumentHead();
+  if (props) {
+    head = {
+      ...head,
+      ...props
+    };
+  }
+  return /* @__PURE__ */ jsxs(Fragment, {
+    children: [
+      head.title && /* @__PURE__ */ jsx("title", {
+        children: head.title
+      }),
+      head.meta.map((m) => /* @__PURE__ */ jsx("meta", {
+        ...m
+      })),
+      head.links.map((l) => /* @__PURE__ */ jsx("link", {
+        ...l
+      })),
+      head.styles.map((s) => {
+        const props2 = s.props || s;
+        return /* @__PURE__ */ createElement("style", {
+          ...props2,
+          dangerouslySetInnerHTML: s.style || props2.dangerouslySetInnerHTML,
+          key: s.key
+        });
+      }),
+      head.scripts.map((s) => {
+        const props2 = s.props || s;
+        return /* @__PURE__ */ createElement("script", {
+          ...props2,
+          dangerouslySetInnerHTML: s.script || props2.dangerouslySetInnerHTML,
+          key: s.key
+        });
+      })
+    ]
+  });
+});
 export {
+  DocumentHeadTags,
   ErrorBoundary,
   Form,
   Link,
@@ -1975,6 +2038,7 @@ export {
   QwikRouterProvider,
   RouterOutlet,
   ServiceWorkerRegister,
+  createRenderer,
   globalAction$,
   globalActionQrl,
   omitProps,
@@ -1991,6 +2055,7 @@ export {
   useNavigate,
   usePreventNavigate$,
   usePreventNavigateQrl,
+  useQwikRouter,
   valibot$,
   valibotQrl,
   validator$,

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/middleware/request-handler/index.d.ts

@@ -215,10 +215,7 @@ declare interface DocumentHeadProps extends RouteLocation {
 declare interface DocumentHeadValue<FrontMatter extends Record<string, any> = Record<string, unknown>> {
     /** Sets `document.title`. */
     readonly title?: string;
-    /**
-     * Used to manually set meta tags in the head. Additionally, the `data` property could be used to
-     * set arbitrary data which the `<head>` component could later use to generate `<meta>` tags.
-     */
+    /** Used to manually set meta tags in the head. */
     readonly meta?: readonly DocumentMeta[];
     /** Used to manually append `<link>` elements to the `<head>`. */
     readonly links?: readonly DocumentLink[];
@@ -235,50 +232,48 @@ declare interface DocumentHeadValue<FrontMatter extends Record<string, any> = Re
 }
 
 /** @public */
-declare interface DocumentLink {
-    as?: string;
-    crossorigin?: string;
-    disabled?: boolean;
-    href?: string;
-    hreflang?: string;
-    id?: string;
-    imagesizes?: string;
-    imagesrcset?: string;
-    integrity?: string;
-    media?: string;
-    prefetch?: string;
-    referrerpolicy?: string;
-    rel?: string;
-    sizes?: string;
-    title?: string;
-    type?: string;
-    key?: string;
-}
+declare type DocumentLink = QwikIntrinsicElements['link'];
 
 /** @public */
-declare interface DocumentMeta {
-    readonly content?: string;
-    readonly httpEquiv?: string;
-    readonly name?: string;
-    readonly property?: string;
-    readonly key?: string;
-    readonly itemprop?: string;
-    readonly media?: string;
-}
+declare type DocumentMeta = QwikIntrinsicElements['meta'];
 
-/** @beta */
-declare interface DocumentScript {
-    readonly script?: string;
-    readonly props?: Readonly<QwikIntrinsicElements['script']>;
-    readonly key?: string;
-}
+/** @public */
+declare type DocumentScript = ((Omit<QwikIntrinsicElements['script'], 'dangerouslySetInnerHTML'> & {
+    props?: never;
+}) | {
+    key?: string;
+    /**
+     * The props of the script element. @deprecated Prefer setting the properties directly instead
+     * of using this property.
+     */
+    props: Readonly<QwikIntrinsicElements['script']>;
+}) & ({
+    /** The inline script content. */
+    script?: string;
+    dangerouslySetInnerHTML?: never;
+} | {
+    dangerouslySetInnerHTML?: string;
+    script?: never;
+});
 
 /** @public */
-declare interface DocumentStyle {
-    readonly style: string;
-    readonly props?: Readonly<QwikIntrinsicElements['style']>;
-    readonly key?: string;
-}
+declare type DocumentStyle = Readonly<((Omit<QwikIntrinsicElements['style'], 'dangerouslySetInnerHTML'> & {
+    props?: never;
+}) | {
+    key?: string;
+    /**
+     * The props of the style element. @deprecated Prefer setting the properties directly
+     * instead of using this property.
+     */
+    props: Readonly<QwikIntrinsicElements['style']>;
+}) & ({
+    /** The inline style content. */
+    style?: string;
+    dangerouslySetInnerHTML?: never;
+} | {
+    dangerouslySetInnerHTML?: string;
+    style?: never;
+})>;
 
 /** @public */
 export declare interface EnvGetter {