diff --git a/vike-solid/renderer/+config.ts b/vike-solid/renderer/+config.ts index dc7cbd2..3716fe7 100644 --- a/vike-solid/renderer/+config.ts +++ b/vike-solid/renderer/+config.ts @@ -1,4 +1,6 @@ import type { Config, ConfigEffect, PageContext } from "vite-plugin-ssr/types"; +// We purposely define the ConfigVikeSolid interface in this file: that way we ensure it's always applied whenever the user `import vikeSolid from 'vike-solid'` +import type { Component } from "./types.js"; // Depending on the value of `config.meta.ssr`, set other config options' `env` // accordingly. @@ -54,11 +56,9 @@ export default { }, } satisfies Config; -// We purposely define the ConfigVikeSolid interface in this file: that way we ensure it's always applied whenever the user `import vikeSolid from 'vike-solid'` -import type { Component } from "./types.js"; declare global { namespace VikePackages { - interface ConfigVikeReact { + interface ConfigVikeSolid { /** Solid element renderer and appended into */ Head?: Component; Layout?: Component; diff --git a/vike-solid/renderer/getPageElement.tsx b/vike-solid/renderer/getPageElement.tsx index cae7e75..5e855b2 100644 --- a/vike-solid/renderer/getPageElement.tsx +++ b/vike-solid/renderer/getPageElement.tsx @@ -1,33 +1,20 @@ -export { getPageElement }; - import type { PageContext } from "vite-plugin-ssr/types"; import { PageContextProvider, usePageContext } from "./PageContextProvider"; import type { JSX } from "solid-js"; import { Dynamic } from "solid-js/web"; import type { Store } from "solid-js/store"; -function getPageElement(pageContext: Store): JSX.Element { +export function getPageElement(pageContext: Store): JSX.Element { const page = ( - - - - - + + + ); return page; } -function Wrapper(props: { children: JSX.Element }) { - const pageContext = usePageContext(); - return ( - - {props.children} - - ); -} - function Layout(props: { children: JSX.Element }) { const pageContext = usePageContext(); return (