diff --git a/package.json b/package.json index 38928c8..4be02f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kobalte/solidbase", - "version": "0.6.1-dev", + "version": "0.6.2-dev", "description": "Fully featured, fully customisable static site generation for SolidStart", "type": "module", "sideEffects": true, diff --git a/src/config/index.ts b/src/config/index.ts index fdc2ea1..48635f5 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -11,6 +11,9 @@ import type { SolidBaseRoutesConfig } from "./route-config.js"; import { validateSolidBaseRoutesConfig as validateRoutes } from "./route-config.js"; import solidBaseVitePlugin from "./vite-plugin/index.js"; +export type { SolidBaseRouteOption } from "./route-config.js"; +export { getSolidBaseRouteFallbackOptions } from "./route-config.js"; + const SOLID_BASE_OVERRIDE_CONFIG_KEYS = [ "title", "titleTemplate", diff --git a/src/default-theme/components/VersionSelector.tsx b/src/default-theme/components/VersionSelector.tsx index 06c3134..f4a70ff 100644 --- a/src/default-theme/components/VersionSelector.tsx +++ b/src/default-theme/components/VersionSelector.tsx @@ -1,4 +1,3 @@ -import { solidBaseConfig } from "virtual:solidbase/config"; import { Popover } from "@kobalte/core/popover"; import { createMemo, createSignal, For, Show } from "solid-js"; import IconExpandUpDownLine from "~icons/ri/expand-up-down-line"; @@ -7,6 +6,7 @@ import { getSolidBaseRouteFallbackOptions, type SolidBaseRouteOption, } from "../../config/route-config.js"; +import { useRouteConfig } from "../utils.js"; import styles from "./VersionSelector.module.css"; const VERSION_AXIS = "version"; @@ -14,13 +14,11 @@ const VERSION_AXIS = "version"; export default function VersionSelector() { const [open, setOpen] = createSignal(false); + const config = useRouteConfig(); + const current = useSolidBaseRoute(); const options = createMemo(() => - getSolidBaseRouteFallbackOptions( - solidBaseConfig.routes, - VERSION_AXIS, - current(), - ), + getSolidBaseRouteFallbackOptions(config().routes, VERSION_AXIS, current()), ); const currentOption = createMemo(() => options().find((option) => option.name === current()[VERSION_AXIS]), @@ -44,7 +42,7 @@ export default function VersionSelector() { > {getOptionLabel(current())}