diff --git a/scripts/collections/build-file-tree.mjs b/scripts/collections/build-file-tree.mjs index 627fb0beb8..198ff4150d 100644 --- a/scripts/collections/build-file-tree.mjs +++ b/scripts/collections/build-file-tree.mjs @@ -44,7 +44,8 @@ export async function buildFileTree(entry = COLLECTIONS_ROOT) { const file = await fs.readFile(entryPath, "utf-8"); const parentSection = await getDirData(path.resolve(parentSegment)); - const { title, mainNavExclude, isDeprecated } = matter(file).data; + const { title, nav_title, mainNavExclude, isDeprecated } = + matter(file).data; /** * @todo @@ -61,7 +62,7 @@ export async function buildFileTree(entry = COLLECTIONS_ROOT) { .replace(/\.mdx?/, ""), slug: path.basename(entryPath, path.extname(entryPath)), parent: parentSection.title, - title, + title: nav_title ?? title, mainNavExclude, isDeprecated, isTranslated: true, diff --git a/scripts/create-i18n-entries.mjs b/scripts/create-i18n-entries.mjs index 640a80238c..317c97bd5b 100644 --- a/scripts/create-i18n-entries.mjs +++ b/scripts/create-i18n-entries.mjs @@ -40,14 +40,14 @@ async function buildSectionList(entryList = [], locale, project = "") { ); if (existsSync(i18nEntryPath + ".mdx")) { - const { title, isDeprecated } = await getFrontMatterData( + const { title, nav_title, isDeprecated } = await getFrontMatterData( i18nEntryPath + ".mdx" ); sectionList.push({ ...entry, path: path.join(locale, entry.path), - title, + title: nav_title ?? title, isDeprecated, isTranslated: true, }); diff --git a/src/routes/index.mdx b/src/routes/index.mdx index d288af1652..6d10f263ac 100644 --- a/src/routes/index.mdx +++ b/src/routes/index.mdx @@ -1,5 +1,7 @@ --- -title: Overview +title: Solid Docs +nav_title: Overview +titleTemplate: ":title" mainNavExclude: true use_cases: >- getting started, learning solid, understanding framework, first project, diff --git a/src/routes/solid-meta/index.mdx b/src/routes/solid-meta/index.mdx index 61137e8d6e..8414f64a36 100644 --- a/src/routes/solid-meta/index.mdx +++ b/src/routes/solid-meta/index.mdx @@ -1,5 +1,7 @@ --- -title: Overview +title: Solid Meta Docs +nav_title: Overview +titleTemplate: ":title" mainNavExclude: true use_cases: >- managing head tags, seo optimization, document metadata, dynamic meta tags, diff --git a/src/routes/solid-router/concepts/data.json b/src/routes/solid-router/concepts/data.json index 835a9fb964..8cef16056b 100644 --- a/src/routes/solid-router/concepts/data.json +++ b/src/routes/solid-router/concepts/data.json @@ -8,7 +8,6 @@ "nesting.mdx", "layouts.mdx", "alternative-routers.mdx", - "queries.mdx", "actions.mdx" ] } diff --git a/src/routes/solid-router/index.mdx b/src/routes/solid-router/index.mdx index a970c8223d..f699bbc0ca 100644 --- a/src/routes/solid-router/index.mdx +++ b/src/routes/solid-router/index.mdx @@ -1,5 +1,7 @@ --- -title: Overview +title: Solid Router Docs +nav_title: Overview +titleTemplate: ":title" use_cases: >- understanding routing, learning basics, overview needed, getting started, spa routing concepts diff --git a/src/routes/solid-router/reference/primitives/use-match.mdx b/src/routes/solid-router/reference/primitives/use-match.mdx index 6dca9eceb7..3b0446131b 100644 --- a/src/routes/solid-router/reference/primitives/use-match.mdx +++ b/src/routes/solid-router/reference/primitives/use-match.mdx @@ -148,5 +148,5 @@ function FileInfo() { ## Related -- [`useParams`](/reference/router-primitives/use-params) -- [`useLocation`](/reference/router-primitives/use-location) +- [`useParams`](/solid-router/reference/primitives/use-params) +- [`useLocation`](/solid-router/reference/primitives/use-location) diff --git a/src/routes/solid-start/index.mdx b/src/routes/solid-start/index.mdx index aa284f9960..f060d9e625 100644 --- a/src/routes/solid-start/index.mdx +++ b/src/routes/solid-start/index.mdx @@ -1,5 +1,7 @@ --- -title: Overview +title: SolidStart Docs +nav_title: Overview +titleTemplate: ":title" use_cases: >- getting started, new projects, learning solidstart, framework overview, architecture decisions diff --git a/src/solidbase-theme/Layout.tsx b/src/solidbase-theme/Layout.tsx index ba9b62e1e1..8c88005ff2 100644 --- a/src/solidbase-theme/Layout.tsx +++ b/src/solidbase-theme/Layout.tsx @@ -6,17 +6,13 @@ import { NotFound } from "~/ui/not-found"; import { I18nProvider } from "~/i18n/i18n-context"; import { useThemeListener } from "@kobalte/solidbase/client"; import { usePace } from "@kobalte/solidbase/default-theme/pace.js"; -import { Title } from "@solidjs/meta"; -import { useProjectTitle } from "~/ui/use-project"; export default function (props: RouteSectionProps) { useThemeListener(); usePace(); - const projectTitle = useProjectTitle(); return ( - {projectTitle()} }> {props.children} diff --git a/src/ui/docs-layout.tsx b/src/ui/docs-layout.tsx index fda9b86a0d..20760ab49f 100644 --- a/src/ui/docs-layout.tsx +++ b/src/ui/docs-layout.tsx @@ -1,11 +1,9 @@ import { Show, onMount, JSX } from "solid-js"; import { useLocation } from "@solidjs/router"; -import { Title } from "@solidjs/meta"; import { coreEntries } from "solid:collection"; import { Pagination } from "~/ui/pagination"; import { EditPageLink } from "./edit-page-link"; import { PageIssueLink } from "./page-issue-link"; -import { useProjectTitle } from "./use-project"; interface DocsLayoutProps { entries: typeof coreEntries; @@ -14,7 +12,6 @@ interface DocsLayoutProps { export const DocsLayout = (props: DocsLayoutProps) => { const location = useLocation(); - const projectTitle = useProjectTitle(); const collection = () => location.pathname.includes("/reference/") @@ -41,9 +38,6 @@ export const DocsLayout = (props: DocsLayoutProps) => { return ( <> - SolidDocs}> - {(title) => {`${title()} - ${projectTitle()}`}} -
{(t) => (