refactor: align vike-{react,vue,solid}

vikejs · Aug 19, 2024 · 619f9ca · 619f9ca
1 parent 1541a5c
commit 619f9ca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/vike-solid/+config.ts b/vike-solid/+config.ts
@@ -1,11 +1,9 @@
+export { config };
+
 import type { Config } from "vike/types";
 import { ssrEffect } from "./renderer/ssrEffect.js";
 
-// This is required to make TypeScript load the global interfaces such as Vike.PageContext so that they're always loaded.
-// We can assume that the user always imports this file over `import vikeSolid from 'vike-solid/config'`
-import "./types/index.js";
-
-export default {
+const config = {
   name: "vike-solid",
   require: {
     vike: ">=0.4.182",
@@ -74,3 +72,7 @@ export default {
     },
   },
 } satisfies Config;
+
+// This is required to make TypeScript load the global interfaces Vike.Config and Vike.PageContext so that they're always loaded: we can assume that the user always imports this file over `import vikeSolid from 'vike-solid/config'`
+import "./types/Config.js";
+import "./types/PageContext.js";
diff --git a/vike-solid/types/Config.ts b/vike-solid/types/Config.ts
@@ -1,18 +1,10 @@
-// https://vike.dev/meta#typescript
-import type { Component, JSX } from "solid-js";
-
-import type {
-  PageContextServer,
-  // Rename it to `PageContext_` to be able to reference it from within `namespace Vike`
-  // - https://stackoverflow.com/questions/46559021/typescript-use-of-global-type-inside-namespace-with-same-type
-  // - https://github.com/Microsoft/TypeScript/issues/983
-  PageContext as PageContext_,
-  PageContextClient,
-} from "vike/types";
+import type { PageContextServer, PageContext, PageContextClient } from "vike/types";
 import type { TagAttributes } from "../utils/getTagAttributesString";
 import type { Viewport } from "../renderer/onRenderHtml";
 import type { ConfigsCumulative } from "../hooks/useConfig/configsCumulative";
+import type { Component, JSX } from "solid-js";
 
+// https://vike.dev/meta#typescript
 declare global {
   namespace Vike {
     interface Config {
@@ -169,6 +161,11 @@ declare global {
   }
 }
 
+// Be able to reference it from within `namespace Vike`
+// - https://stackoverflow.com/questions/46559021/typescript-use-of-global-type-inside-namespace-with-same-type
+// - https://github.com/Microsoft/TypeScript/issues/983
+type PageContext_ = PageContext;
+
 export type Head = Component | JSX.Element;
 
 // JSDocs are preserved

diff --git a/vike-solid/types/index.ts b/vike-solid/types/index.ts