create-vike 0.0.306 → 0.0.307

package/boilerplate-react/server/index.js

@@ -9,7 +9,7 @@
 //     - See vavite + Vike examples at https://github.com/cyco130/vavite/tree/main/examples
 //  - vite-node (https://github.com/antfu/vite-node)
 //  - HatTip (https://github.com/hattipjs/hattip)
-//    - You can use Bati (https://batijs.github.io/) to scaffold a vike + HatTip app. Note that Bati generates apps that use the V1 design (https://vike.dev/migration/v1-design) and Vike packages (https://vike.dev/vike-packages)
+//    - You can use Bati (https://batijs.github.io/) to scaffold a Vike + HatTip app. Note that Bati generates apps that use the V1 design (https://vike.dev/migration/v1-design) and Vike packages (https://vike.dev/vike-packages)
 
 import express from 'express'
 import compression from 'compression'

package/boilerplate-react/vite.config.js

@@ -1,6 +1,6 @@
 import react from '@vitejs/plugin-react'
-import ssr from 'vike/plugin'
+import vike from 'vike/plugin'
 
 export default {
-  plugins: [react(), ssr()]
+  plugins: [react(), vike()]
 }

package/boilerplate-react-ts/.eslintrc.cjs

@@ -1,6 +1,7 @@
 module.exports = {
   rules: {
-    'react-refresh/only-export-components': 'warn'
+    'react-refresh/only-export-components': 'warn',
+    '@typescript-eslint/no-namespace': 'off'
   },
   reportUnusedDisableDirectives: true,
   ignorePatterns: ['dist/*'],

package/boilerplate-react-ts/renderer/types.ts

@@ -1,35 +1,33 @@
-export type { PageContextServer }
-export type { PageContextClient }
-export type { PageContext }
-export type { PageProps }
-
-import type {
-  PageContextBuiltInServer,
+export type {
+  PageContextServer,
   /*
   // When using Client Routing https://vike.dev/clientRouting
-  PageContextBuiltInClientWithClientRouting as PageContextBuiltInClient
+  PageContextClient,
+  PageContext,
   /*/
   // When using Server Routing
-  PageContextBuiltInClientWithServerRouting as PageContextBuiltInClient
+  PageContextClientWithServerRouting as PageContextClient,
+  PageContextWithServerRouting as PageContext
   //*/
 } from 'vike/types'
+export type { PageProps }
 
-type Page = (pageProps: PageProps) => React.ReactElement
-type PageProps = Record<string, unknown>
-
-export type PageContextCustom = {
-  Page: Page
-  pageProps?: PageProps
-  urlPathname: string
-  exports: {
-    documentProps?: {
-      title?: string
-      description?: string
+// https://vike.dev/pageContext#typescript
+declare global {
+  namespace Vike {
+    interface PageContext {
+      Page: Page
+      pageProps?: PageProps
+      urlPathname: string
+      exports: {
+        documentProps?: {
+          title?: string
+          description?: string
+        }
+      }
     }
   }
 }
 
-type PageContextServer = PageContextBuiltInServer<Page> & PageContextCustom
-type PageContextClient = PageContextBuiltInClient<Page> & PageContextCustom
-
-type PageContext = PageContextClient | PageContextServer
+type Page = (pageProps: PageProps) => React.ReactElement
+type PageProps = Record<string, unknown>

package/boilerplate-react-ts/server/index.ts

@@ -9,7 +9,7 @@
 //     - See vavite + Vike examples at https://github.com/cyco130/vavite/tree/main/examples
 //  - vite-node (https://github.com/antfu/vite-node)
 //  - HatTip (https://github.com/hattipjs/hattip)
-//    - You can use Bati (https://batijs.github.io/) to scaffold a vike + HatTip app. Note that Bati generates apps that use the V1 design (https://vike.dev/migration/v1-design) and Vike packages (https://vike.dev/vike-packages)
+//    - You can use Bati (https://batijs.github.io/) to scaffold a Vike + HatTip app. Note that Bati generates apps that use the V1 design (https://vike.dev/migration/v1-design) and Vike packages (https://vike.dev/vike-packages)
 
 import express from 'express'
 import compression from 'compression'

package/boilerplate-react-ts/vite.config.ts

@@ -1,9 +1,9 @@
 import react from '@vitejs/plugin-react'
-import ssr from 'vike/plugin'
+import vike from 'vike/plugin'
 import { UserConfig } from 'vite'
 
 const config: UserConfig = {
-  plugins: [react(), ssr()]
+  plugins: [react(), vike()]
 }
 
 export default config

package/boilerplate-vue/server/index.js

@@ -9,7 +9,7 @@
 //     - See vavite + Vike examples at https://github.com/cyco130/vavite/tree/main/examples
 //  - vite-node (https://github.com/antfu/vite-node)
 //  - HatTip (https://github.com/hattipjs/hattip)
-//    - You can use Bati (https://batijs.github.io/) to scaffold a vike + HatTip app. Note that Bati generates apps that use the V1 design (https://vike.dev/migration/v1-design) and Vike packages (https://vike.dev/vike-packages)
+//    - You can use Bati (https://batijs.github.io/) to scaffold a Vike + HatTip app. Note that Bati generates apps that use the V1 design (https://vike.dev/migration/v1-design) and Vike packages (https://vike.dev/vike-packages)
 
 import express from 'express'
 import compression from 'compression'

package/boilerplate-vue/vite.config.js

@@ -1,6 +1,6 @@
 import vue from '@vitejs/plugin-vue'
-import ssr from 'vike/plugin'
+import vike from 'vike/plugin'
 
 export default {
-  plugins: [vue(), ssr()]
+  plugins: [vue(), vike()]
 }

package/boilerplate-vue-ts/renderer/types.ts

@@ -1,38 +1,37 @@
-export type { PageContextServer }
-export type { PageContextClient }
-export type { PageContext }
-export type { PageProps }
-export type { Component }
-
-import type {
-  PageContextBuiltInServer,
+export type {
+  PageContextServer,
   /*
   // When using Client Routing https://vike.dev/clientRouting
-  PageContextBuiltInClientWithClientRouting as PageContextBuiltInClient
+  PageContextClient,
+  PageContext,
   /*/
   // When using Server Routing
-  PageContextBuiltInClientWithServerRouting as PageContextBuiltInClient
+  PageContextClientWithServerRouting as PageContextClient,
+  PageContextWithServerRouting as PageContext
   //*/
 } from 'vike/types'
-import type { ComponentPublicInstance } from 'vue'
-
-type Component = ComponentPublicInstance // https://stackoverflow.com/questions/63985658/how-to-type-vue-instance-out-of-definecomponent-in-vue-3/63986086#63986086
-type Page = Component
-type PageProps = {}
+export type { PageProps }
+export type { Component }
 
-export type PageContextCustom = {
-  Page: Page
-  pageProps?: PageProps
-  urlPathname: string
-  exports: {
-    documentProps?: {
-      title?: string
-      description?: string
+// https://vike.dev/pageContext#typescript
+declare global {
+  namespace Vike {
+    interface PageContext {
+      Page: Page
+      pageProps?: PageProps
+      urlPathname: string
+      exports: {
+        documentProps?: {
+          title?: string
+          description?: string
+        }
+      }
     }
   }
 }
 
-type PageContextServer = PageContextBuiltInServer<Page> & PageContextCustom
-type PageContextClient = PageContextBuiltInClient<Page> & PageContextCustom
+import type { ComponentPublicInstance } from 'vue'
 
-type PageContext = PageContextClient | PageContextServer
+type Component = ComponentPublicInstance // https://stackoverflow.com/questions/63985658/how-to-type-vue-instance-out-of-definecomponent-in-vue-3/63986086#63986086
+type Page = Component
+type PageProps = {}

package/boilerplate-vue-ts/server/index.ts

@@ -9,7 +9,7 @@
 //     - See vavite + Vike examples at https://github.com/cyco130/vavite/tree/main/examples
 //  - vite-node (https://github.com/antfu/vite-node)
 //  - HatTip (https://github.com/hattipjs/hattip)
-//    - You can use Bati (https://batijs.github.io/) to scaffold a vike + HatTip app. Note that Bati generates apps that use the V1 design (https://vike.dev/migration/v1-design) and Vike packages (https://vike.dev/vike-packages)
+//    - You can use Bati (https://batijs.github.io/) to scaffold a Vike + HatTip app. Note that Bati generates apps that use the V1 design (https://vike.dev/migration/v1-design) and Vike packages (https://vike.dev/vike-packages)
 
 import express from 'express'
 import compression from 'compression'

package/boilerplate-vue-ts/vite.config.ts

@@ -1,9 +1,9 @@
 import vue from '@vitejs/plugin-vue'
-import ssr from 'vike/plugin'
+import vike from 'vike/plugin'
 import { UserConfig } from 'vite'
 
 const config: UserConfig = {
-  plugins: [vue(), ssr()]
+  plugins: [vue(), vike()]
 }
 
 export default config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-vike",
-  "version": "0.0.306",
+  "version": "0.0.307",
   "license": "MIT",
   "bin": {
     "create-vike": "index.js"