@tanstack/solid-router 1.166.7 → 2.0.0-alpha.1

package/dist/cjs/Asset.cjs

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Solid = require("solid-js/web");
-const meta = require("@solidjs/meta");
-const Solid$1 = require("solid-js");
+const Solid = require("@solidjs/web");
 const isServer = require("@tanstack/router-core/isServer");
+const Solid$1 = require("solid-js");
 const useRouter = require("./useRouter.cjs");
-var _tmpl$ = /* @__PURE__ */ Solid.template(`<script>`);
+var _tmpl$ = /* @__PURE__ */ Solid.template(`<meta>`), _tmpl$2 = /* @__PURE__ */ Solid.template(`<link>`), _tmpl$3 = /* @__PURE__ */ Solid.template(`<style>`), _tmpl$4 = /* @__PURE__ */ Solid.template(`<title>`), _tmpl$5 = /* @__PURE__ */ Solid.template(`<script>`);
 function Asset({
   tag,
   attrs,
@@ -13,17 +12,37 @@ function Asset({
 }) {
   switch (tag) {
     case "title":
-      return Solid.createComponent(meta.Title, Solid.mergeProps(attrs, {
+      return Solid.createComponent(Title, {
+        attrs,
         children
-      }));
+      });
     case "meta":
-      return Solid.createComponent(meta.Meta, attrs);
+      return (() => {
+        var _el$ = _tmpl$();
+        Solid.spread(_el$, attrs, false, false);
+        return _el$;
+      })();
     case "link":
-      return Solid.createComponent(meta.Link, attrs);
+      return (() => {
+        var _el$2 = _tmpl$2();
+        Solid.spread(_el$2, attrs, false, false);
+        return _el$2;
+      })();
     case "style":
-      return Solid.createComponent(meta.Style, Solid.mergeProps(attrs, {
-        children
-      }));
+      if (typeof children === "string") {
+        return (() => {
+          var _el$3 = _tmpl$3();
+          Solid.spread(_el$3, Solid.mergeProps(attrs, {
+            "innerHTML": children
+          }), false, false);
+          return _el$3;
+        })();
+      }
+      return (() => {
+        var _el$4 = _tmpl$3();
+        Solid.spread(_el$4, attrs, false, false);
+        return _el$4;
+      })();
     case "script":
       return Solid.createComponent(Script, {
         attrs,
@@ -33,97 +52,121 @@ function Asset({
       return null;
   }
 }
-function Script({
-  attrs,
-  children
-}) {
+function Title(props) {
+  const router = useRouter.useRouter();
+  const attrs = props.attrs;
+  const children = props.children;
+  if (isServer.isServer ?? router.isServer) {
+    return (() => {
+      var _el$5 = _tmpl$4();
+      Solid.spread(_el$5, attrs, false, true);
+      Solid.insert(_el$5, children);
+      return _el$5;
+    })();
+  }
+  Solid$1.createEffect(() => children, (titleText) => {
+    document.title = typeof titleText === "string" ? titleText : "";
+  });
+  return (() => {
+    var _el$6 = _tmpl$4();
+    Solid.spread(_el$6, attrs, false, true);
+    Solid.insert(_el$6, children);
+    return _el$6;
+  })();
+}
+function Script(props) {
   const router = useRouter.useRouter();
+  const attrs = props.attrs;
+  const children = props.children;
   const dataScript = typeof attrs?.type === "string" && attrs.type !== "" && attrs.type !== "text/javascript" && attrs.type !== "module";
-  Solid$1.onMount(() => {
-    if (dataScript) return;
+  if (isServer.isServer ?? router.isServer) {
     if (attrs?.src) {
+      return (() => {
+        var _el$7 = _tmpl$5();
+        Solid.spread(_el$7, attrs, false, false);
+        return _el$7;
+      })();
+    }
+    if (typeof children === "string") {
+      return (() => {
+        var _el$8 = _tmpl$5();
+        Solid.spread(_el$8, Solid.mergeProps(attrs, {
+          "innerHTML": children
+        }), false, false);
+        return _el$8;
+      })();
+    }
+    return null;
+  }
+  if (dataScript && typeof children === "string") {
+    return (() => {
+      var _el$9 = _tmpl$5();
+      Solid.spread(_el$9, Solid.mergeProps(attrs, {
+        "innerHTML": children
+      }), false, false);
+      return _el$9;
+    })();
+  }
+  Solid$1.createEffect(() => ({
+    attrs,
+    children,
+    dataScript
+  }), ({
+    attrs: attrs2,
+    children: children2,
+    dataScript: dataScript2
+  }) => {
+    if (dataScript2) return;
+    let script;
+    if (attrs2?.src) {
       const normSrc = (() => {
         try {
           const base = document.baseURI || window.location.href;
-          return new URL(attrs.src, base).href;
+          return new URL(attrs2.src, base).href;
         } catch {
-          return attrs.src;
+          return attrs2.src;
         }
       })();
       const existingScript = Array.from(document.querySelectorAll("script[src]")).find((el) => el.src === normSrc);
       if (existingScript) {
         return;
       }
-      const script = document.createElement("script");
-      for (const [key, value] of Object.entries(attrs)) {
+      script = document.createElement("script");
+      for (const [key, value] of Object.entries(attrs2)) {
         if (value !== void 0 && value !== false) {
           script.setAttribute(key, typeof value === "boolean" ? "" : String(value));
         }
       }
       document.head.appendChild(script);
-      Solid$1.onCleanup(() => {
-        if (script.parentNode) {
-          script.parentNode.removeChild(script);
-        }
-      });
-    }
-    if (typeof children === "string") {
-      const typeAttr = typeof attrs?.type === "string" ? attrs.type : "text/javascript";
-      const nonceAttr = typeof attrs?.nonce === "string" ? attrs.nonce : void 0;
+    } else if (typeof children2 === "string") {
+      const typeAttr = typeof attrs2?.type === "string" ? attrs2.type : "text/javascript";
+      const nonceAttr = typeof attrs2?.nonce === "string" ? attrs2.nonce : void 0;
       const existingScript = Array.from(document.querySelectorAll("script:not([src])")).find((el) => {
         if (!(el instanceof HTMLScriptElement)) return false;
         const sType = el.getAttribute("type") ?? "text/javascript";
         const sNonce = el.getAttribute("nonce") ?? void 0;
-        return el.textContent === children && sType === typeAttr && sNonce === nonceAttr;
+        return el.textContent === children2 && sType === typeAttr && sNonce === nonceAttr;
       });
       if (existingScript) {
         return;
       }
-      const script = document.createElement("script");
-      script.textContent = children;
-      if (attrs) {
-        for (const [key, value] of Object.entries(attrs)) {
+      script = document.createElement("script");
+      script.textContent = children2;
+      if (attrs2) {
+        for (const [key, value] of Object.entries(attrs2)) {
           if (value !== void 0 && value !== false) {
             script.setAttribute(key, typeof value === "boolean" ? "" : String(value));
           }
         }
       }
       document.head.appendChild(script);
-      Solid$1.onCleanup(() => {
-        if (script.parentNode) {
-          script.parentNode.removeChild(script);
-        }
-      });
     }
+    Solid$1.onCleanup(() => {
+      if (script?.parentNode) {
+        script.parentNode.removeChild(script);
+      }
+    });
   });
-  if (!(isServer.isServer ?? router.isServer)) {
-    if (dataScript && typeof children === "string") {
-      return (() => {
-        var _el$ = _tmpl$();
-        Solid.spread(_el$, Solid.mergeProps(attrs, {
-          "innerHTML": children
-        }), false, false);
-        return _el$;
-      })();
-    }
-    return null;
-  }
-  if (attrs?.src && typeof attrs.src === "string") {
-    return (() => {
-      var _el$2 = _tmpl$();
-      Solid.spread(_el$2, attrs, false, false);
-      return _el$2;
-    })();
-  }
-  if (typeof children === "string") {
-    return (() => {
-      var _el$3 = _tmpl$();
-      Solid.spread(_el$3, Solid.mergeProps(attrs, {
-        "innerHTML": children
-      }), false, false);
-      return _el$3;
-    })();
-  }
   return null;
 }
 exports.Asset = Asset;

package/dist/cjs/Asset.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Asset.cjs","sources":["../../src/Asset.tsx"],"sourcesContent":["import { Link, Meta, Style, Title } from '@solidjs/meta'\nimport { onCleanup, onMount } from 'solid-js'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { useRouter } from './useRouter'\nimport type { RouterManagedTag } from '@tanstack/router-core'\nimport type { JSX } from 'solid-js'\n\nexport function Asset({\n  tag,\n  attrs,\n  children,\n}: RouterManagedTag): JSX.Element | null {\n  switch (tag) {\n    case 'title':\n      return <Title {...attrs}>{children}</Title>\n    case 'meta':\n      return <Meta {...attrs} />\n    case 'link':\n      return <Link {...attrs} />\n    case 'style':\n      return <Style {...attrs}>{children}</Style>\n    case 'script':\n      return <Script attrs={attrs}>{children}</Script>\n    default:\n      return null\n  }\n}\n\ninterface ScriptAttrs {\n  [key: string]: string | boolean | undefined\n  src?: string\n}\n\nfunction Script({\n  attrs,\n  children,\n}: {\n  attrs?: ScriptAttrs\n  children?: string\n}): JSX.Element | null {\n  const router = useRouter()\n  const dataScript =\n    typeof attrs?.type === 'string' &&\n    attrs.type !== '' &&\n    attrs.type !== 'text/javascript' &&\n    attrs.type !== 'module'\n\n  onMount(() => {\n    if (dataScript) return\n\n    if (attrs?.src) {\n      const normSrc = (() => {\n        try {\n          const base = document.baseURI || window.location.href\n          return new URL(attrs.src, base).href\n        } catch {\n          return attrs.src\n        }\n      })()\n      const existingScript = Array.from(\n        document.querySelectorAll('script[src]'),\n      ).find((el) => (el as HTMLScriptElement).src === normSrc)\n\n      if (existingScript) {\n        return\n      }\n\n      const script = document.createElement('script')\n\n      for (const [key, value] of Object.entries(attrs)) {\n        if (value !== undefined && value !== false) {\n          script.setAttribute(\n            key,\n            typeof value === 'boolean' ? '' : String(value),\n          )\n        }\n      }\n\n      document.head.appendChild(script)\n\n      onCleanup(() => {\n        if (script.parentNode) {\n          script.parentNode.removeChild(script)\n        }\n      })\n    }\n\n    if (typeof children === 'string') {\n      const typeAttr =\n        typeof attrs?.type === 'string' ? attrs.type : 'text/javascript'\n      const nonceAttr =\n        typeof attrs?.nonce === 'string' ? attrs.nonce : undefined\n      const existingScript = Array.from(\n        document.querySelectorAll('script:not([src])'),\n      ).find((el) => {\n        if (!(el instanceof HTMLScriptElement)) return false\n        const sType = el.getAttribute('type') ?? 'text/javascript'\n        const sNonce = el.getAttribute('nonce') ?? undefined\n        return (\n          el.textContent === children &&\n          sType === typeAttr &&\n          sNonce === nonceAttr\n        )\n      })\n\n      if (existingScript) {\n        return\n      }\n\n      const script = document.createElement('script')\n      script.textContent = children\n\n      if (attrs) {\n        for (const [key, value] of Object.entries(attrs)) {\n          if (value !== undefined && value !== false) {\n            script.setAttribute(\n              key,\n              typeof value === 'boolean' ? '' : String(value),\n            )\n          }\n        }\n      }\n\n      document.head.appendChild(script)\n\n      onCleanup(() => {\n        if (script.parentNode) {\n          script.parentNode.removeChild(script)\n        }\n      })\n    }\n  })\n\n  if (!(isServer ?? router.isServer)) {\n    if (dataScript && typeof children === 'string') {\n      return <script {...attrs} innerHTML={children} />\n    }\n\n    // render an empty script on the client just to avoid hydration errors\n    return null\n  }\n\n  if (attrs?.src && typeof attrs.src === 'string') {\n    return <script {...attrs} />\n  }\n\n  if (typeof children === 'string') {\n    return <script {...attrs} innerHTML={children} />\n  }\n\n  return null\n}\n"],"names":["Asset","tag","attrs","children","_$createComponent","Title","_$mergeProps","Meta","Link","Style","Script","router","useRouter","dataScript","type","onMount","src","normSrc","base","document","baseURI","window","location","href","URL","existingScript","Array","from","querySelectorAll","find","el","script","createElement","key","value","Object","entries","undefined","setAttribute","String","head","appendChild","onCleanup","parentNode","removeChild","typeAttr","nonceAttr","nonce","HTMLScriptElement","sType","getAttribute","sNonce","textContent","isServer","_el$","_tmpl$","_$spread","_el$2","_el$3"],"mappings":"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"}
+{"version":3,"file":"Asset.cjs","sources":["../../src/Asset.tsx"],"sourcesContent":["import { isServer } from '@tanstack/router-core/isServer'\nimport { createEffect, onCleanup } from 'solid-js'\nimport { useRouter } from './useRouter'\nimport type { RouterManagedTag } from '@tanstack/router-core'\nimport type { JSX } from 'solid-js'\n\nexport function Asset({\n  tag,\n  attrs,\n  children,\n}: RouterManagedTag): JSX.Element | null {\n  switch (tag) {\n    case 'title':\n      return <Title attrs={attrs} children={children} />\n    case 'meta':\n      return <meta {...attrs} />\n    case 'link':\n      return <link {...attrs} />\n    case 'style':\n      if (typeof children === 'string') {\n        return <style {...attrs} innerHTML={children} />\n      }\n      return <style {...attrs} />\n    case 'script':\n      return <Script attrs={attrs} children={children} />\n    default:\n      return null\n  }\n}\n\nfunction Title(props: {\n  attrs?: Record<string, any>\n  children?: unknown\n}): JSX.Element | null {\n  const router = useRouter()\n  const attrs = props.attrs\n  const children = props.children\n\n  // Server: render <title> normally\n  if (isServer ?? router.isServer) {\n    return <title {...attrs}>{children as string}</title>\n  }\n\n  // Client: imperatively set document.title so it updates during\n  // client-side navigation (JSX <title> in <head> doesn't reliably\n  // update the browser's document.title).\n  createEffect(\n    () => children,\n    (titleText) => {\n      document.title = typeof titleText === 'string' ? titleText : ''\n    },\n  )\n\n  // Still render the <title> element in the DOM for consistency,\n  // but the imperative assignment above is what actually drives the update.\n  return <title {...attrs}>{children as string}</title>\n}\n\nfunction Script(props: {\n  attrs?: Record<string, any>\n  children?: unknown\n}): JSX.Element | null {\n  const router = useRouter()\n  const attrs = props.attrs\n  const children = props.children\n\n  const dataScript =\n    typeof attrs?.type === 'string' &&\n    attrs.type !== '' &&\n    attrs.type !== 'text/javascript' &&\n    attrs.type !== 'module'\n\n  // --- Server rendering ---\n  if (isServer ?? router.isServer) {\n    if (attrs?.src) {\n      return <script {...attrs} />\n    }\n\n    if (typeof children === 'string') {\n      return <script {...attrs} innerHTML={children} />\n    }\n\n    return null\n  }\n\n  // --- Client rendering ---\n\n  // Data scripts (e.g. application/ld+json) are rendered in the tree;\n  // they don't need to execute.\n  if (dataScript && typeof children === 'string') {\n    return <script {...attrs} innerHTML={children} />\n  }\n\n  // For executable scripts, use imperative DOM injection so the browser\n  // actually executes them during client-side navigation.\n  createEffect(\n    () => ({ attrs, children, dataScript }) as const,\n    ({ attrs, children, dataScript }) => {\n      if (dataScript) return\n\n      let script: HTMLScriptElement | undefined\n\n      if (attrs?.src) {\n        const normSrc = (() => {\n          try {\n            const base = document.baseURI || window.location.href\n            return new URL(attrs.src, base).href\n          } catch {\n            return attrs.src\n          }\n        })()\n        const existingScript = Array.from(\n          document.querySelectorAll('script[src]'),\n        ).find((el) => (el as HTMLScriptElement).src === normSrc)\n\n        if (existingScript) {\n          return\n        }\n\n        script = document.createElement('script')\n\n        for (const [key, value] of Object.entries(attrs)) {\n          if (value !== undefined && value !== false) {\n            script.setAttribute(\n              key,\n              typeof value === 'boolean' ? '' : String(value),\n            )\n          }\n        }\n\n        document.head.appendChild(script)\n      } else if (typeof children === 'string') {\n        const typeAttr =\n          typeof attrs?.type === 'string' ? attrs.type : 'text/javascript'\n        const nonceAttr =\n          typeof attrs?.nonce === 'string' ? attrs.nonce : undefined\n        const existingScript = Array.from(\n          document.querySelectorAll('script:not([src])'),\n        ).find((el) => {\n          if (!(el instanceof HTMLScriptElement)) return false\n          const sType = el.getAttribute('type') ?? 'text/javascript'\n          const sNonce = el.getAttribute('nonce') ?? undefined\n          return (\n            el.textContent === children &&\n            sType === typeAttr &&\n            sNonce === nonceAttr\n          )\n        })\n\n        if (existingScript) {\n          return\n        }\n\n        script = document.createElement('script')\n        script.textContent = children\n\n        if (attrs) {\n          for (const [key, value] of Object.entries(attrs)) {\n            if (value !== undefined && value !== false) {\n              script.setAttribute(\n                key,\n                typeof value === 'boolean' ? '' : String(value),\n              )\n            }\n          }\n        }\n\n        document.head.appendChild(script)\n      }\n\n      onCleanup(() => {\n        if (script?.parentNode) {\n          script.parentNode.removeChild(script)\n        }\n      })\n    },\n  )\n\n  return null\n}\n"],"names":["Asset","tag","attrs","children","_$createComponent","Title","_el$","_tmpl$","_$spread","_el$2","_tmpl$2","_el$3","_tmpl$3","_$mergeProps","_el$4","Script","props","router","useRouter","isServer","_el$5","_tmpl$4","_$insert","createEffect","titleText","document","title","_el$6","dataScript","type","src","_el$7","_tmpl$5","_el$8","_el$9","script","normSrc","base","baseURI","window","location","href","URL","existingScript","Array","from","querySelectorAll","find","el","createElement","key","value","Object","entries","undefined","setAttribute","String","head","appendChild","typeAttr","nonceAttr","nonce","HTMLScriptElement","sType","getAttribute","sNonce","textContent","onCleanup","parentNode","removeChild"],"mappings":"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"}

package/dist/cjs/CatchBoundary.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Solid = require("solid-js/web");
+const Solid = require("@solidjs/web");
 const Solid$1 = require("solid-js");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -19,14 +19,14 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid$1);
-var _tmpl$ = /* @__PURE__ */ Solid.template(`<div style=padding:.5rem;max-width:100%><div style=display:flex;align-items:center;gap:.5rem><strong style=font-size:1rem>Something went wrong!</strong><button style="appearance:none;font-size:.6em;border:1px solid currentColor;padding:.1rem .2rem;font-weight:bold;border-radius:.25rem"></button></div><div style=height:.25rem>`), _tmpl$2 = /* @__PURE__ */ Solid.template(`<div><pre style="font-size:.7em;border:1px solid red;border-radius:.25rem;padding:.3rem;color:red;overflow:auto">`), _tmpl$3 = /* @__PURE__ */ Solid.template(`<code>`);
+var _tmpl$ = /* @__PURE__ */ Solid.template(`<div style=padding:.5rem;max-width:100%><div style=display:flex;align-items:center;gap:.5rem>∂<strong style=font-size:1rem>Something went wrong!</strong><button style="appearance:none;font-size:.6em;border:1px solid currentColor;padding:.1rem .2rem;font-weight:bold;border-radius:.25rem"></button></div><div style=height:.25rem>`), _tmpl$2 = /* @__PURE__ */ Solid.template(`<div><pre style="font-size:.7em;border:1px solid red;border-radius:.25rem;padding:.3rem;color:red;overflow:auto">`), _tmpl$3 = /* @__PURE__ */ Solid.template(`<code>`);
 function CatchBoundary(props) {
-  return Solid.createComponent(Solid__namespace.ErrorBoundary, {
+  return Solid.createComponent(Solid__namespace.Errored, {
     fallback: (error, reset) => {
       props.onCatch?.(error);
-      Solid__namespace.createEffect(Solid__namespace.on([props.getResetKey], () => reset(), {
-        defer: true
-      }));
+      Solid__namespace.createEffect(props.getResetKey, () => {
+        reset();
+      });
       return Solid.createComponent(Solid.Dynamic, {
         get component() {
           return props.errorComponent ?? ErrorComponent;
@@ -45,23 +45,23 @@ function ErrorComponent({
 }) {
   const [show, setShow] = Solid__namespace.createSignal(process.env.NODE_ENV !== "production");
   return (() => {
-    var _el$ = _tmpl$(), _el$2 = _el$.firstChild, _el$3 = _el$2.firstChild, _el$4 = _el$3.nextSibling;
+    var _el$ = _tmpl$(), _el$2 = _el$.firstChild, _el$3 = _el$2.firstChild, _el$4 = _el$3.nextSibling, _el$5 = _el$4.nextSibling;
     _el$2.nextSibling;
-    _el$4.$$click = () => setShow((d) => !d);
-    Solid.insert(_el$4, () => show() ? "Hide Error" : "Show Error");
+    _el$5.$$click = () => setShow((d) => !d);
+    Solid.insert(_el$5, () => show() ? "Hide Error" : "Show Error");
     Solid.insert(_el$, (() => {
       var _c$ = Solid.memo(() => !!show());
       return () => _c$() ? (() => {
-        var _el$6 = _tmpl$2(), _el$7 = _el$6.firstChild;
-        Solid.insert(_el$7, (() => {
+        var _el$7 = _tmpl$2(), _el$8 = _el$7.firstChild;
+        Solid.insert(_el$8, (() => {
           var _c$2 = Solid.memo(() => !!error.message);
           return () => _c$2() ? (() => {
-            var _el$8 = _tmpl$3();
-            Solid.insert(_el$8, () => error.message);
-            return _el$8;
+            var _el$9 = _tmpl$3();
+            Solid.insert(_el$9, () => error.message);
+            return _el$9;
           })() : null;
         })());
-        return _el$6;
+        return _el$7;
       })() : null;
     })(), null);
     return _el$;

package/dist/cjs/CatchBoundary.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"CatchBoundary.cjs","sources":["../../src/CatchBoundary.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { Dynamic } from 'solid-js/web'\nimport type { ErrorRouteComponent } from './route'\n\nexport function CatchBoundary(\n  props: {\n    getResetKey: () => number | string\n    children: Solid.JSX.Element\n    errorComponent?: ErrorRouteComponent\n    onCatch?: (error: Error) => void\n  } & Solid.ParentProps,\n) {\n  return (\n    <Solid.ErrorBoundary\n      fallback={(error, reset) => {\n        props.onCatch?.(error)\n\n        Solid.createEffect(\n          Solid.on([props.getResetKey], () => reset(), { defer: true }),\n        )\n\n        return (\n          <Dynamic\n            component={props.errorComponent ?? ErrorComponent}\n            error={error}\n            reset={reset}\n          />\n        )\n      }}\n    >\n      {props.children}\n    </Solid.ErrorBoundary>\n  )\n}\n\nexport function ErrorComponent({ error }: { error: any }) {\n  const [show, setShow] = Solid.createSignal(\n    process.env.NODE_ENV !== 'production',\n  )\n\n  return (\n    <div style={{ padding: '.5rem', 'max-width': '100%' }}>\n      <div style={{ display: 'flex', 'align-items': 'center', gap: '.5rem' }}>\n        <strong style={{ 'font-size': '1rem' }}>Something went wrong!</strong>\n        <button\n          style={{\n            appearance: 'none',\n            'font-size': '.6em',\n            border: '1px solid currentColor',\n            padding: '.1rem .2rem',\n            'font-weight': 'bold',\n            'border-radius': '.25rem',\n          }}\n          onClick={() => setShow((d) => !d)}\n        >\n          {show() ? 'Hide Error' : 'Show Error'}\n        </button>\n      </div>\n      <div style={{ height: '.25rem' }} />\n      {show() ? (\n        <div>\n          <pre\n            style={{\n              'font-size': '.7em',\n              border: '1px solid red',\n              'border-radius': '.25rem',\n              padding: '.3rem',\n              color: 'red',\n              overflow: 'auto',\n            }}\n          >\n            {error.message ? <code>{error.message}</code> : null}\n          </pre>\n        </div>\n      ) : null}\n    </div>\n  )\n}\n"],"names":["CatchBoundary","props","_$createComponent","Solid","ErrorBoundary","fallback","error","reset","onCatch","createEffect","on","getResetKey","defer","Dynamic","component","errorComponent","ErrorComponent","children","show","setShow","createSignal","process","env","NODE_ENV","_el$","_tmpl$","_el$2","firstChild","_el$3","_el$4","nextSibling","$$click","d","_$insert","_c$","_$memo","_el$6","_tmpl$2","_el$7","_c$2","message","_el$8","_tmpl$3","_$delegateEvents"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAIO,SAASA,cACdC,OAMA;AACA,SAAAC,MAAAA,gBACGC,iBAAMC,eAAa;AAAA,IAClBC,UAAUA,CAACC,OAAOC,UAAU;AAC1BN,YAAMO,UAAUF,KAAK;AAErBH,uBAAMM,aACJN,iBAAMO,GAAG,CAACT,MAAMU,WAAW,GAAG,MAAMJ,SAAS;AAAA,QAAEK,OAAO;AAAA,MAAA,CAAM,CAC9D;AAEA,aAAAV,MAAAA,gBACGW,MAAAA,SAAO;AAAA,QAAA,IACNC,YAAS;AAAA,iBAAEb,MAAMc,kBAAkBC;AAAAA,QAAc;AAAA,QACjDV;AAAAA,QACAC;AAAAA,MAAAA,CAAY;AAAA,IAGlB;AAAA,IAAC,IAAAU,WAAA;AAAA,aAEAhB,MAAMgB;AAAAA,IAAQ;AAAA,EAAA,CAAA;AAGrB;AAEO,SAASD,eAAe;AAAA,EAAEV;AAAsB,GAAG;AACxD,QAAM,CAACY,MAAMC,OAAO,IAAIhB,iBAAMiB,aAC5BC,QAAQC,IAAIC,aAAa,YAC3B;AAEA,UAAA,MAAA;AAAA,QAAAC,OAAAC,OAAAA,GAAAC,QAAAF,KAAAG,YAAAC,QAAAF,MAAAC,YAAAE,QAAAD,MAAAE;AAAAJ,UAAAI;AAAAD,UAAAE,UAaiB,MAAMZ,QAASa,CAAAA,MAAM,CAACA,CAAC;AAACC,UAAAA,OAAAJ,OAAA,MAEhCX,KAAAA,IAAS,eAAe,YAAY;AAAAe,UAAAA,OAAAT,OAAA,MAAA;AAAA,UAAAU,MAAAC,MAAAA,KAAA,MAAA,CAAA,CAIxCjB,MAAM;AAAA,aAAA,MAANgB,IAAAA,KAAA,MAAA;AAAA,YAAAE,QAAAC,QAAAA,GAAAC,QAAAF,MAAAT;AAAAM,cAAAA,OAAAK,QAAA,MAAA;AAAA,cAAAC,OAAAJ,MAAAA,KAAA,MAAA,CAAA,CAYM7B,MAAMkC,OAAO;AAAA,iBAAA,MAAbD,KAAAA,KAAA,MAAA;AAAA,gBAAAE,QAAAC,QAAAA;AAAAT,kBAAAA,OAAAQ,OAAA,MAAuBnC,MAAMkC,OAAO;AAAA,mBAAAC;AAAAA,UAAA,OAAW;AAAA,QAAI,IAAA;AAAA,eAAAL;AAAAA,MAAA,OAGtD;AAAA,IAAI,GAAA,GAAA,IAAA;AAAA,WAAAZ;AAAAA,EAAA,GAAA;AAGd;AAACmB,MAAAA,eAAA,CAAA,OAAA,CAAA;;;"}
+{"version":3,"file":"CatchBoundary.cjs","sources":["../../src/CatchBoundary.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { Dynamic } from '@solidjs/web'\nimport type { ErrorRouteComponent } from './route'\n\nexport function CatchBoundary(\n  props: {\n    getResetKey: () => number | string\n    children: Solid.JSX.Element\n    errorComponent?: ErrorRouteComponent\n    onCatch?: (error: Error) => void\n  } & Solid.ParentProps,\n) {\n  return (\n    <Solid.Errored\n      fallback={(error, reset) => {\n        props.onCatch?.(error)\n\n        Solid.createEffect(props.getResetKey, () => {\n          // We trigger reset here. For a fully deferred effect we might need usePrevious,\n          // but calling reset on key change is the main goal.\n          reset()\n        })\n\n        return (\n          <Dynamic\n            component={props.errorComponent ?? ErrorComponent}\n            error={error}\n            reset={reset}\n          />\n        )\n      }}\n    >\n      {props.children}\n    </Solid.Errored>\n  )\n}\n\nexport function ErrorComponent({ error }: { error: any }) {\n  const [show, setShow] = Solid.createSignal(\n    process.env.NODE_ENV !== 'production',\n  )\n\n  return (\n    <div style={{ padding: '.5rem', 'max-width': '100%' }}>\n      <div style={{ display: 'flex', 'align-items': 'center', gap: '.5rem' }}>\n        ∂<strong style={{ 'font-size': '1rem' }}>Something went wrong!</strong>\n        <button\n          style={{\n            appearance: 'none',\n            'font-size': '.6em',\n            border: '1px solid currentColor',\n            padding: '.1rem .2rem',\n            'font-weight': 'bold',\n            'border-radius': '.25rem',\n          }}\n          onClick={() => setShow((d) => !d)}\n        >\n          {show() ? 'Hide Error' : 'Show Error'}\n        </button>\n      </div>\n      <div style={{ height: '.25rem' }} />\n      {show() ? (\n        <div>\n          <pre\n            style={{\n              'font-size': '.7em',\n              border: '1px solid red',\n              'border-radius': '.25rem',\n              padding: '.3rem',\n              color: 'red',\n              overflow: 'auto',\n            }}\n          >\n            {error.message ? <code>{error.message}</code> : null}\n          </pre>\n        </div>\n      ) : null}\n    </div>\n  )\n}\n"],"names":["CatchBoundary","props","_$createComponent","Solid","Errored","fallback","error","reset","onCatch","createEffect","getResetKey","Dynamic","component","errorComponent","ErrorComponent","children","show","setShow","createSignal","process","env","NODE_ENV","_el$","_tmpl$","_el$2","firstChild","_el$3","_el$4","nextSibling","_el$5","$$click","d","_$insert","_c$","_$memo","_el$7","_tmpl$2","_el$8","_c$2","message","_el$9","_tmpl$3","_$delegateEvents"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAIO,SAASA,cACdC,OAMA;AACA,SAAAC,MAAAA,gBACGC,iBAAMC,SAAO;AAAA,IACZC,UAAUA,CAACC,OAAOC,UAAU;AAC1BN,YAAMO,UAAUF,KAAK;AAErBH,uBAAMM,aAAaR,MAAMS,aAAa,MAAM;AAG1CH,cAAAA;AAAAA,MACF,CAAC;AAED,aAAAL,MAAAA,gBACGS,MAAAA,SAAO;AAAA,QAAA,IACNC,YAAS;AAAA,iBAAEX,MAAMY,kBAAkBC;AAAAA,QAAc;AAAA,QACjDR;AAAAA,QACAC;AAAAA,MAAAA,CAAY;AAAA,IAGlB;AAAA,IAAC,IAAAQ,WAAA;AAAA,aAEAd,MAAMc;AAAAA,IAAQ;AAAA,EAAA,CAAA;AAGrB;AAEO,SAASD,eAAe;AAAA,EAAER;AAAsB,GAAG;AACxD,QAAM,CAACU,MAAMC,OAAO,IAAId,iBAAMe,aAC5BC,QAAQC,IAAIC,aAAa,YAC3B;AAEA,UAAA,MAAA;AAAA,QAAAC,OAAAC,OAAAA,GAAAC,QAAAF,KAAAG,YAAAC,QAAAF,MAAAC,YAAAE,QAAAD,MAAAE,aAAAC,QAAAF,MAAAC;AAAAJ,UAAAI;AAAAC,UAAAC,UAaiB,MAAMb,QAASc,CAAAA,MAAM,CAACA,CAAC;AAACC,UAAAA,OAAAH,OAAA,MAEhCb,KAAAA,IAAS,eAAe,YAAY;AAAAgB,UAAAA,OAAAV,OAAA,MAAA;AAAA,UAAAW,MAAAC,MAAAA,KAAA,MAAA,CAAA,CAIxClB,MAAM;AAAA,aAAA,MAANiB,IAAAA,KAAA,MAAA;AAAA,YAAAE,QAAAC,QAAAA,GAAAC,QAAAF,MAAAV;AAAAO,cAAAA,OAAAK,QAAA,MAAA;AAAA,cAAAC,OAAAJ,MAAAA,KAAA,MAAA,CAAA,CAYM5B,MAAMiC,OAAO;AAAA,iBAAA,MAAbD,KAAAA,KAAA,MAAA;AAAA,gBAAAE,QAAAC,QAAAA;AAAAT,kBAAAA,OAAAQ,OAAA,MAAuBlC,MAAMiC,OAAO;AAAA,mBAAAC;AAAAA,UAAA,OAAW;AAAA,QAAI,IAAA;AAAA,eAAAL;AAAAA,MAAA,OAGtD;AAAA,IAAI,GAAA,GAAA,IAAA;AAAA,WAAAb;AAAAA,EAAA,GAAA;AAGd;AAACoB,MAAAA,eAAA,CAAA,OAAA,CAAA;;;"}

package/dist/cjs/ClientOnly.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Solid = require("solid-js/web");
+const Solid = require("@solidjs/web");
 const Solid$1 = require("solid-js");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -35,7 +35,7 @@ function ClientOnly(props) {
 }
 function useHydrated() {
   const [hydrated, setHydrated] = Solid__namespace.createSignal(false);
-  Solid__namespace.onMount(() => {
+  Solid__namespace.createEffect(() => true, () => {
     setHydrated(true);
   });
   return hydrated;

package/dist/cjs/ClientOnly.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ClientOnly.cjs","sources":["../../src/ClientOnly.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nexport interface ClientOnlyProps {\n  /**\n   * The children to render when the JS is loaded.\n   */\n  children: Solid.JSX.Element\n  /**\n   * The fallback component to render if the JS is not yet loaded.\n   */\n  fallback?: Solid.JSX.Element\n}\n\n/**\n * Render the children only after the JS has loaded client-side. Use an optional\n * fallback component if the JS is not yet loaded.\n *\n * @example\n * Render a Chart component if JS loads, renders a simple FakeChart\n * component server-side or if there is no JS. The FakeChart can have only the\n * UI without the behavior or be a loading spinner or skeleton.\n *\n * ```tsx\n * return (\n *   <ClientOnly fallback={<FakeChart />}>\n *     <Chart />\n *   </ClientOnly>\n * )\n * ```\n */\nexport function ClientOnly(props: ClientOnlyProps) {\n  const hydrated = useHydrated()\n  return (\n    <Solid.Show when={hydrated()} fallback={props.fallback ?? null}>\n      <>{props.children}</>\n    </Solid.Show>\n  )\n}\n\n/**\n * Return a boolean indicating if the JS has been hydrated already.\n * When doing Server-Side Rendering, the result will always be false.\n * When doing Client-Side Rendering, the result will always be false on the\n * first render and true from then on. Even if a new component renders it will\n * always start with true.\n *\n * @example\n * ```tsx\n * // Disable a button that needs JS to work.\n * const hydrated = useHydrated()\n * return (\n *   <button type=\"button\" disabled={!hydrated()} onClick={doSomethingCustom}>\n *     Click me\n *   </button>\n * )\n * ```\n * @returns True if the JS has been hydrated already, false otherwise.\n */\nexport function useHydrated(): Solid.Accessor<boolean> {\n  const [hydrated, setHydrated] = Solid.createSignal(false)\n  Solid.onMount(() => {\n    setHydrated(true)\n  })\n  return hydrated\n}\n"],"names":["ClientOnly","props","hydrated","useHydrated","_$createComponent","Solid","Show","when","fallback","children","_$memo","setHydrated","createSignal","onMount"],"mappings":";;;;;;;;;;;;;;;;;;;;;AA8BO,SAASA,WAAWC,OAAwB;AACjD,QAAMC,WAAWC,YAAAA;AACjB,SAAAC,MAAAA,gBACGC,iBAAMC,MAAI;AAAA,IAAA,IAACC,OAAI;AAAA,aAAEL,SAAAA;AAAAA,IAAU;AAAA,IAAA,IAAEM,WAAQ;AAAA,aAAEP,MAAMO,YAAY;AAAA,IAAI;AAAA,IAAA,IAAAC,WAAA;AAAA,aAAAC,MAAAA,KAAA,MACzDT,MAAMQ,QAAQ;AAAA,IAAA;AAAA,EAAA,CAAA;AAGvB;AAqBO,SAASN,cAAuC;AACrD,QAAM,CAACD,UAAUS,WAAW,IAAIN,iBAAMO,aAAa,KAAK;AACxDP,mBAAMQ,QAAQ,MAAM;AAClBF,gBAAY,IAAI;AAAA,EAClB,CAAC;AACD,SAAOT;AACT;;;"}
+{"version":3,"file":"ClientOnly.cjs","sources":["../../src/ClientOnly.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nexport interface ClientOnlyProps {\n  /**\n   * The children to render when the JS is loaded.\n   */\n  children: Solid.JSX.Element\n  /**\n   * The fallback component to render if the JS is not yet loaded.\n   */\n  fallback?: Solid.JSX.Element\n}\n\n/**\n * Render the children only after the JS has loaded client-side. Use an optional\n * fallback component if the JS is not yet loaded.\n *\n * @example\n * Render a Chart component if JS loads, renders a simple FakeChart\n * component server-side or if there is no JS. The FakeChart can have only the\n * UI without the behavior or be a loading spinner or skeleton.\n *\n * ```tsx\n * return (\n *   <ClientOnly fallback={<FakeChart />}>\n *     <Chart />\n *   </ClientOnly>\n * )\n * ```\n */\nexport function ClientOnly(props: ClientOnlyProps) {\n  const hydrated = useHydrated()\n  return (\n    <Solid.Show when={hydrated()} fallback={props.fallback ?? null}>\n      <>{props.children}</>\n    </Solid.Show>\n  )\n}\n\n/**\n * Return a boolean indicating if the JS has been hydrated already.\n * When doing Server-Side Rendering, the result will always be false.\n * When doing Client-Side Rendering, the result will always be false on the\n * first render and true from then on. Even if a new component renders it will\n * always start with true.\n *\n * @example\n * ```tsx\n * // Disable a button that needs JS to work.\n * const hydrated = useHydrated()\n * return (\n *   <button type=\"button\" disabled={!hydrated()} onClick={doSomethingCustom}>\n *     Click me\n *   </button>\n * )\n * ```\n * @returns True if the JS has been hydrated already, false otherwise.\n */\nexport function useHydrated(): Solid.Accessor<boolean> {\n  const [hydrated, setHydrated] = Solid.createSignal(false)\n\n  Solid.createEffect(\n    () => true,\n    () => {\n      setHydrated(true)\n    },\n  )\n\n  return hydrated\n}\n"],"names":["ClientOnly","props","hydrated","useHydrated","_$createComponent","Solid","Show","when","fallback","children","_$memo","setHydrated","createSignal","createEffect"],"mappings":";;;;;;;;;;;;;;;;;;;;;AA8BO,SAASA,WAAWC,OAAwB;AACjD,QAAMC,WAAWC,YAAAA;AACjB,SAAAC,MAAAA,gBACGC,iBAAMC,MAAI;AAAA,IAAA,IAACC,OAAI;AAAA,aAAEL,SAAAA;AAAAA,IAAU;AAAA,IAAA,IAAEM,WAAQ;AAAA,aAAEP,MAAMO,YAAY;AAAA,IAAI;AAAA,IAAA,IAAAC,WAAA;AAAA,aAAAC,MAAAA,KAAA,MACzDT,MAAMQ,QAAQ;AAAA,IAAA;AAAA,EAAA,CAAA;AAGvB;AAqBO,SAASN,cAAuC;AACrD,QAAM,CAACD,UAAUS,WAAW,IAAIN,iBAAMO,aAAa,KAAK;AAExDP,mBAAMQ,aACJ,MAAM,MACN,MAAM;AACJF,gBAAY,IAAI;AAAA,EAClB,CACF;AAEA,SAAOT;AACT;;;"}

package/dist/cjs/HeadContent.cjs

@@ -1,19 +1,27 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Solid = require("solid-js/web");
-const meta = require("@solidjs/meta");
+const Solid = require("@solidjs/web");
 const Solid$1 = require("solid-js");
 const Asset = require("./Asset.cjs");
 const headContentUtils = require("./headContentUtils.cjs");
 function HeadContent() {
   const tags = headContentUtils.useTags();
-  return Solid.createComponent(meta.MetaProvider, {
-    get children() {
-      return Solid.createComponent(Solid$1.For, {
-        get each() {
-          return tags();
+  return Solid.createComponent(Solid$1.For, {
+    get each() {
+      return tags();
+    },
+    children: (tag) => {
+      const t = tag();
+      return Solid.createComponent(Asset.Asset, {
+        get tag() {
+          return t.tag;
         },
-        children: (tag) => Solid.createComponent(Asset.Asset, tag)
+        get attrs() {
+          return t.attrs;
+        },
+        get children() {
+          return t.children;
+        }
       });
     }
   });

package/dist/cjs/HeadContent.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"HeadContent.cjs","sources":["../../src/HeadContent.tsx"],"sourcesContent":["import { MetaProvider } from '@solidjs/meta'\nimport { For } from 'solid-js'\nimport { Asset } from './Asset'\nimport { useTags } from './headContentUtils'\n\n/**\n * @description The `HeadContent` component is used to render meta tags, links, and scripts for the current route.\n * When using full document hydration (hydrating from `<html>`), this component should be rendered in the `<body>`\n * to ensure it's part of the reactive tree and updates correctly during client-side navigation.\n * The component uses portals internally to render content into the `<head>` element.\n */\nexport function HeadContent() {\n  const tags = useTags()\n\n  return (\n    <MetaProvider>\n      <For each={tags()}>{(tag) => <Asset {...tag} />}</For>\n    </MetaProvider>\n  )\n}\n"],"names":["HeadContent","tags","useTags","_$createComponent","MetaProvider","children","For","each","tag","Asset"],"mappings":";;;;;;;AAWO,SAASA,cAAc;AAC5B,QAAMC,OAAOC,iBAAAA,QAAAA;AAEb,SAAAC,MAAAA,gBACGC,KAAAA,cAAY;AAAA,IAAA,IAAAC,WAAA;AAAA,aAAAF,MAAAA,gBACVG,QAAAA,KAAG;AAAA,QAAA,IAACC,OAAI;AAAA,iBAAEN,KAAAA;AAAAA,QAAM;AAAA,QAAAI,UAAIG,CAAAA,QAAGL,MAAAA,gBAAMM,MAAAA,OAAUD,GAAG;AAAA,MAAA,CAAI;AAAA,IAAA;AAAA,EAAA,CAAA;AAGrD;;"}
+{"version":3,"file":"HeadContent.cjs","sources":["../../src/HeadContent.tsx"],"sourcesContent":["import { For } from 'solid-js'\nimport { Asset } from './Asset'\nimport { useTags } from './headContentUtils'\n\n/**\n * @description The `HeadContent` component is used to render meta tags, links, and scripts for the current route.\n * When using full document hydration (hydrating from `<html>`), this component should be rendered in the `<body>`\n * to ensure it's part of the reactive tree and updates correctly during client-side navigation.\n * The component uses portals internally to render content into the `<head>` element.\n */\nexport function HeadContent() {\n  const tags = useTags()\n\n  return (\n    <For each={tags()}>\n      {(tag) => {\n        const t = tag() as any\n        return <Asset tag={t.tag} attrs={t.attrs} children={t.children} />\n      }}\n    </For>\n  )\n}\n"],"names":["HeadContent","tags","useTags","_$createComponent","For","each","children","tag","t","Asset","attrs"],"mappings":";;;;;;AAUO,SAASA,cAAc;AAC5B,QAAMC,OAAOC,iBAAAA,QAAAA;AAEb,SAAAC,MAAAA,gBACGC,QAAAA,KAAG;AAAA,IAAA,IAACC,OAAI;AAAA,aAAEJ,KAAAA;AAAAA,IAAM;AAAA,IAAAK,UACbC,CAAAA,QAAQ;AACR,YAAMC,IAAID,IAAAA;AACV,aAAAJ,MAAAA,gBAAQM,MAAAA,OAAK;AAAA,QAAA,IAACF,MAAG;AAAA,iBAAEC,EAAED;AAAAA,QAAG;AAAA,QAAA,IAAEG,QAAK;AAAA,iBAAEF,EAAEE;AAAAA,QAAK;AAAA,QAAA,IAAEJ,WAAQ;AAAA,iBAAEE,EAAEF;AAAAA,QAAQ;AAAA,MAAA,CAAA;AAAA,IAChE;AAAA,EAAA,CAAC;AAGP;;"}

package/dist/cjs/HeadContent.dev.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Solid$1 = require("solid-js/web");
-const meta = require("@solidjs/meta");
+const Solid$1 = require("@solidjs/web");
 const Solid = require("solid-js");
 const Asset = require("./Asset.cjs");
 const ClientOnly = require("./ClientOnly.cjs");
@@ -10,8 +9,8 @@ const DEV_STYLES_ATTR = "data-tanstack-router-dev-styles";
 function HeadContent() {
   const tags = headContentUtils.useTags();
   const hydrated = ClientOnly.useHydrated();
-  Solid.createEffect(() => {
-    if (hydrated()) {
+  Solid.createEffect(() => [hydrated()], ([hydrated2]) => {
+    if (hydrated2) {
       document.querySelectorAll(`link[${DEV_STYLES_ATTR}]`).forEach((el) => el.remove());
     }
   });
@@ -21,13 +20,22 @@ function HeadContent() {
     }
     return tags();
   });
-  return Solid$1.createComponent(meta.MetaProvider, {
-    get children() {
-      return Solid$1.createComponent(Solid.For, {
-        get each() {
-          return filteredTags();
+  return Solid$1.createComponent(Solid.For, {
+    get each() {
+      return filteredTags();
+    },
+    children: (tag) => {
+      const t = tag();
+      return Solid$1.createComponent(Asset.Asset, {
+        get tag() {
+          return t.tag;
+        },
+        get attrs() {
+          return t.attrs;
         },
-        children: (tag) => Solid$1.createComponent(Asset.Asset, tag)
+        get children() {
+          return t.children;
+        }
       });
     }
   });

package/dist/cjs/HeadContent.dev.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"HeadContent.dev.cjs","sources":["../../src/HeadContent.dev.tsx"],"sourcesContent":["import { MetaProvider } from '@solidjs/meta'\nimport { For, createEffect, createMemo } from 'solid-js'\nimport { Asset } from './Asset'\nimport { useHydrated } from './ClientOnly'\nimport { useTags } from './headContentUtils'\n\nconst DEV_STYLES_ATTR = 'data-tanstack-router-dev-styles'\n\n/**\n * @description The `HeadContent` component is used to render meta tags, links, and scripts for the current route.\n * When using full document hydration (hydrating from `<html>`), this component should be rendered in the `<body>`\n * to ensure it's part of the reactive tree and updates correctly during client-side navigation.\n * The component uses portals internally to render content into the `<head>` element.\n *\n * Development version: filters out dev styles link after hydration and\n * includes a fallback cleanup effect for hydration mismatch cases.\n */\nexport function HeadContent() {\n  const tags = useTags()\n  const hydrated = useHydrated()\n\n  // Fallback cleanup for hydration mismatch cases\n  // Runs when hydration completes to remove any orphaned dev styles links from DOM\n  createEffect(() => {\n    if (hydrated()) {\n      document\n        .querySelectorAll(`link[${DEV_STYLES_ATTR}]`)\n        .forEach((el) => el.remove())\n    }\n  })\n\n  // Filter out dev styles after hydration\n  const filteredTags = createMemo(() => {\n    if (hydrated()) {\n      return tags().filter((tag) => !tag.attrs?.[DEV_STYLES_ATTR])\n    }\n    return tags()\n  })\n\n  return (\n    <MetaProvider>\n      <For each={filteredTags()}>{(tag) => <Asset {...tag} />}</For>\n    </MetaProvider>\n  )\n}\n"],"names":["DEV_STYLES_ATTR","HeadContent","tags","useTags","hydrated","useHydrated","createEffect","document","querySelectorAll","forEach","el","remove","filteredTags","createMemo","filter","tag","attrs","_$createComponent","MetaProvider","children","For","each","Asset"],"mappings":";;;;;;;;AAMA,MAAMA,kBAAkB;AAWjB,SAASC,cAAc;AAC5B,QAAMC,OAAOC,iBAAAA,QAAAA;AACb,QAAMC,WAAWC,WAAAA,YAAAA;AAIjBC,QAAAA,aAAa,MAAM;AACjB,QAAIF,YAAY;AACdG,eACGC,iBAAiB,QAAQR,eAAe,GAAG,EAC3CS,QAASC,CAAAA,OAAOA,GAAGC,OAAAA,CAAQ;AAAA,IAChC;AAAA,EACF,CAAC;AAGD,QAAMC,eAAeC,MAAAA,WAAW,MAAM;AACpC,QAAIT,YAAY;AACd,aAAOF,KAAAA,EAAOY,OAAQC,CAAAA,QAAQ,CAACA,IAAIC,QAAQhB,eAAe,CAAC;AAAA,IAC7D;AACA,WAAOE,KAAAA;AAAAA,EACT,CAAC;AAED,SAAAe,QAAAA,gBACGC,KAAAA,cAAY;AAAA,IAAA,IAAAC,WAAA;AAAA,aAAAF,QAAAA,gBACVG,MAAAA,KAAG;AAAA,QAAA,IAACC,OAAI;AAAA,iBAAET,aAAAA;AAAAA,QAAc;AAAA,QAAAO,UAAIJ,CAAAA,QAAGE,QAAAA,gBAAMK,MAAAA,OAAUP,GAAG;AAAA,MAAA,CAAI;AAAA,IAAA;AAAA,EAAA,CAAA;AAG7D;;"}
+{"version":3,"file":"HeadContent.dev.cjs","sources":["../../src/HeadContent.dev.tsx"],"sourcesContent":["import { For, createEffect, createMemo } from 'solid-js'\nimport { Asset } from './Asset'\nimport { useHydrated } from './ClientOnly'\nimport { useTags } from './headContentUtils'\n\nconst DEV_STYLES_ATTR = 'data-tanstack-router-dev-styles'\n\n/**\n * @description The `HeadContent` component is used to render meta tags, links, and scripts for the current route.\n * When using full document hydration (hydrating from `<html>`), this component should be rendered in the `<body>`\n * to ensure it's part of the reactive tree and updates correctly during client-side navigation.\n * The component uses portals internally to render content into the `<head>` element.\n *\n * Development version: filters out dev styles link after hydration and\n * includes a fallback cleanup effect for hydration mismatch cases.\n */\nexport function HeadContent() {\n  const tags = useTags()\n  const hydrated = useHydrated()\n\n  // Fallback cleanup for hydration mismatch cases\n  // Runs when hydration completes to remove any orphaned dev styles links from DOM\n  createEffect(\n    () => [hydrated()] as const,\n    ([hydrated]) => {\n      if (hydrated) {\n        document\n          .querySelectorAll(`link[${DEV_STYLES_ATTR}]`)\n          .forEach((el) => el.remove())\n      }\n    },\n  )\n\n  // Filter out dev styles after hydration\n  const filteredTags = createMemo(() => {\n    if (hydrated()) {\n      return tags().filter((tag) => !tag.attrs?.[DEV_STYLES_ATTR])\n    }\n    return tags()\n  })\n\n  return (\n    <For each={filteredTags()}>\n      {(tag) => {\n        const t = tag() as any\n        return <Asset tag={t.tag} attrs={t.attrs} children={t.children} />\n      }}\n    </For>\n  )\n}\n"],"names":["DEV_STYLES_ATTR","HeadContent","tags","useTags","hydrated","useHydrated","createEffect","document","querySelectorAll","forEach","el","remove","filteredTags","createMemo","filter","tag","attrs","_$createComponent","For","each","children","t","Asset"],"mappings":";;;;;;;AAKA,MAAMA,kBAAkB;AAWjB,SAASC,cAAc;AAC5B,QAAMC,OAAOC,iBAAAA,QAAAA;AACb,QAAMC,WAAWC,WAAAA,YAAAA;AAIjBC,QAAAA,aACE,MAAM,CAACF,SAAAA,CAAU,GACjB,CAAC,CAACA,SAAQ,MAAM;AACd,QAAIA,WAAU;AACZG,eACGC,iBAAiB,QAAQR,eAAe,GAAG,EAC3CS,QAASC,CAAAA,OAAOA,GAAGC,OAAAA,CAAQ;AAAA,IAChC;AAAA,EACF,CACF;AAGA,QAAMC,eAAeC,MAAAA,WAAW,MAAM;AACpC,QAAIT,YAAY;AACd,aAAOF,KAAAA,EAAOY,OAAQC,CAAAA,QAAQ,CAACA,IAAIC,QAAQhB,eAAe,CAAC;AAAA,IAC7D;AACA,WAAOE,KAAAA;AAAAA,EACT,CAAC;AAED,SAAAe,QAAAA,gBACGC,MAAAA,KAAG;AAAA,IAAA,IAACC,OAAI;AAAA,aAAEP,aAAAA;AAAAA,IAAc;AAAA,IAAAQ,UACrBL,CAAAA,QAAQ;AACR,YAAMM,IAAIN,IAAAA;AACV,aAAAE,QAAAA,gBAAQK,MAAAA,OAAK;AAAA,QAAA,IAACP,MAAG;AAAA,iBAAEM,EAAEN;AAAAA,QAAG;AAAA,QAAA,IAAEC,QAAK;AAAA,iBAAEK,EAAEL;AAAAA,QAAK;AAAA,QAAA,IAAEI,WAAQ;AAAA,iBAAEC,EAAED;AAAAA,QAAQ;AAAA,MAAA,CAAA;AAAA,IAChE;AAAA,EAAA,CAAC;AAGP;;"}