From 9e9829bac89f5867208b3b2197aaa7b3d18679ef Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 5 Jan 2026 18:43:37 +0100 Subject: [PATCH 1/7] use unhead for solid --- packages/solid-router/package.json | 5 +- packages/solid-router/src/Asset.tsx | 174 +++------- packages/solid-router/src/HeadContent.tsx | 9 +- packages/solid-router/src/RouterProvider.tsx | 28 +- packages/solid-router/src/Scripts.tsx | 2 +- .../solid-router/src/ssr/RouterClient.tsx | 52 ++- .../solid-router/src/ssr/RouterServer.tsx | 31 +- .../src/ssr/renderRouterToStream.tsx | 200 +++++++++++- .../src/ssr/renderRouterToString.tsx | 69 +++- packages/solid-router/tests/Scripts.test.tsx | 12 +- packages/solid-start-server/package.json | 4 +- pnpm-lock.yaml | 296 +++++++++++++++++- 12 files changed, 670 insertions(+), 212 deletions(-) diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index e8cd2c4457..3e41ee95c8 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -100,13 +100,14 @@ "dependencies": { "@solid-devtools/logger": "^0.9.4", "@solid-primitives/refs": "^1.0.8", - "@solidjs/meta": "^0.29.4", "@tanstack/history": "workspace:*", "@tanstack/router-core": "workspace:*", "@tanstack/solid-store": "^0.8.0", + "@unhead/solid-js": "3.0.0-beta.5", "isbot": "^5.1.22", "tiny-invariant": "^1.3.3", - "tiny-warning": "^1.0.3" + "tiny-warning": "^1.0.3", + "unhead": "3.0.0-beta.5" }, "devDependencies": { "@solidjs/testing-library": "^0.8.10", diff --git a/packages/solid-router/src/Asset.tsx b/packages/solid-router/src/Asset.tsx index 8e1e79bff2..7c9a0c3fc1 100644 --- a/packages/solid-router/src/Asset.tsx +++ b/packages/solid-router/src/Asset.tsx @@ -1,140 +1,56 @@ -import { Link, Meta, Style, Title } from '@solidjs/meta' -import { onCleanup, onMount } from 'solid-js' -import { useRouter } from './useRouter' +import { useHead } from '@unhead/solid-js' import type { RouterManagedTag } from '@tanstack/router-core' import type { JSX } from 'solid-js' +import type { UseHeadInput, ValidTagPositions } from 'unhead/types' -export function Asset({ +export function Asset( + props: RouterManagedTag & { + tagPosition?: ValidTagPositions + }, +): JSX.Element | null { + useHead(toHeadInput(props)) + return null +} + +function toHeadInput({ tag, attrs, children, -}: RouterManagedTag): JSX.Element | null { + tagPosition, +}: RouterManagedTag & { + tagPosition?: ValidTagPositions +}): UseHeadInput { + const withPosition = (input: Record) => { + if (tagPosition) { + input.tagPosition = tagPosition + } + return input + } + switch (tag) { case 'title': - return {children} - case 'meta': - return - case 'link': - return - case 'style': - return