chore: wip

Author: chrisbbreuer

pkgx.yaml

@@ -20,4 +20,4 @@ dependencies:
   rust-lang.org: ^1.74.1
   sqlite.org: ^3.42.0
   stedolan.github.io/jq: ^1.7 # can be removed when publishing works without npm
-  redis.io: ^7.2.5
+  redis.io: ^7.4.0

storage/framework/core/vite-plugin/src/auto-imports.ts

@@ -3,8 +3,9 @@ import type { AutoImportsOptions } from '@stacksjs/types'
 import { unheadVueComposablesImports as VueHeadImports } from '@unhead/vue'
 import AutoImport from 'unplugin-auto-import/vite'
 import { VueRouterAutoImports } from 'unplugin-vue-router'
+import type { Plugin } from 'vite'
 
-export function autoImports(options?: AutoImportsOptions) {
+export function autoImports(options?: AutoImportsOptions): Plugin {
   return AutoImport({
     include: /\.(stx|vue|js|ts|mdx?|html)($|\?)/,
     imports: [

storage/framework/core/vite-plugin/src/components.ts

@@ -1,8 +1,9 @@
 import { path as p } from '@stacksjs/path'
 import type { ComponentOptions } from '@stacksjs/types'
 import Components from 'unplugin-vue-components/vite'
+import type { Plugin } from 'vite'
 
-export function components(options?: ComponentOptions) {
+export function components(options?: ComponentOptions): Plugin {
   return Components({
     extensions: ['stx', 'vue', 'md'],
     include: /\.(stx|vue|md)($|\?)/,

storage/framework/core/vite-plugin/src/css-engine.ts

@@ -1,16 +1,20 @@
 import { path as p } from '@stacksjs/path'
 import UnoCSS from 'unocss/vite'
+import type { Plugin } from 'vite'
 
-export function cssEngine(isWebComponent = false) {
-  return UnoCSS({
-    configFile: p.uiPath('src/unocss.config.ts'),
-    mode: isWebComponent ? 'shadow-dom' : 'vue-scoped',
-    // content: {
-    //   pipeline: {
-    //     include: /\.(stx|vue|js|ts|mdx?|elm|html)($|\?)/,
-    //     // exclude files
-    //     // exclude: []
-    //   },
-    // },
-  })
+export function cssEngine(isWebComponent = false): Plugin {
+  return {
+    name: 'css-engine-plugin',
+    ...UnoCSS({
+      configFile: p.uiPath('src/unocss.config.ts'),
+      mode: isWebComponent ? 'shadow-dom' : 'vue-scoped',
+      // content: {
+      //   pipeline: {
+      //     include: /\.(stx|vue|js|ts|mdx?|elm|html)($|\?)/,
+      //     // exclude files
+      //     // exclude: []
+      //   },
+      // },
+    }),
+  }
 }

storage/framework/core/vite-plugin/src/docs.ts

@@ -1,8 +1,9 @@
 import { kolorist as c } from '@stacksjs/cli'
 import type { ViteDevServer } from 'vite'
+import type { Plugin } from 'vite'
 import { version } from '../../package.json'
 
-export const docsEngine = {
+export const docsEngine: Plugin = {
   name: 'stacks-plugin',
   configureServer(server: ViteDevServer) {
     // const base = server.config.base || '/'

storage/framework/core/vite-plugin/src/i18n.ts

@@ -3,10 +3,13 @@ import { path as p } from '@stacksjs/path'
 import type { Plugin } from 'vite'
 
 export function i18n(): Plugin {
-  return VueI18n({
-    runtimeOnly: true,
-    compositionOnly: true,
-    fullInstall: true,
-    include: [p.resolve(__dirname, '../../../../../../../lang/**')],
-  })
+  return {
+    name: 'i18n-plugin',
+    ...VueI18n({
+      runtimeOnly: true,
+      compositionOnly: true,
+      fullInstall: true,
+      include: [p.resolve(__dirname, '../../../../../../../lang/**')],
+    }),
+  }
 }

storage/framework/core/vite-plugin/src/inspect.ts

@@ -1,6 +1,7 @@
 import type { InspectOptions } from '@stacksjs/types'
+import type { Plugin } from 'vite'
 import Inspect from 'vite-plugin-inspect'
 
-export function inspect(options?: InspectOptions) {
+export function inspect(options?: InspectOptions): Plugin {
   return Inspect(options)
 }

storage/framework/core/vite-plugin/src/layouts.ts

@@ -1,8 +1,9 @@
 import { path as p } from '@stacksjs/path'
+import type { Plugin } from 'vite'
 import Layouts from 'vite-plugin-vue-layouts'
 import type { UserOptions as LayoutOptions } from 'vite-plugin-vue-layouts'
 
-export function layouts(options?: LayoutOptions) {
+export function layouts(options?: LayoutOptions): Plugin {
   const opts = {
     extensions: ['stx', 'vue'],
     layoutsDirs: p.layoutsPath(),

storage/framework/core/vite-plugin/src/markdown.ts

@@ -1,28 +1,33 @@
 import LinkAttributes from 'markdown-it-link-attributes'
 import Shiki from 'markdown-it-shikiji'
 import Markdown from 'unplugin-vue-markdown/vite'
+import type { Plugin } from 'vite'
 
-export function markdown() {
-  return Markdown({
-    wrapperClasses: 'prose prose-sm m-auto text-left',
-    headEnabled: true,
-    async markdownItSetup(md) {
-      md.use(LinkAttributes, {
-        matcher: (link: string) => /^https?:\/\//.test(link),
-        attrs: {
-          target: '_blank',
-          rel: 'noopener',
-        },
-      })
-      md.use(
-        await Shiki({
-          defaultColor: false,
-          themes: {
-            light: 'vitesse-light',
-            dark: 'vitesse-dark',
+export function markdown(): Plugin {
+  return {
+    name: 'markdown-plugin',
+
+    ...Markdown({
+      wrapperClasses: 'prose prose-sm m-auto text-left',
+      headEnabled: true,
+      async markdownItSetup(md) {
+        md.use(LinkAttributes, {
+          matcher: (link: string) => /^https?:\/\//.test(link),
+          attrs: {
+            target: '_blank',
+            rel: 'noopener',
           },
-        }),
-      )
-    },
-  })
+        })
+        md.use(
+          await Shiki({
+            defaultColor: false,
+            themes: {
+              light: 'vitesse-light',
+              dark: 'vitesse-dark',
+            },
+          }),
+        )
+      },
+    }),
+  }
 }

storage/framework/core/vite-plugin/src/pages.ts

@@ -1,17 +1,21 @@
 import { defu } from 'defu'
 import type { Options, TreeNode } from 'unplugin-vue-router'
 import VueRouter from 'unplugin-vue-router/vite'
+import type { Plugin } from 'vite'
 
 // https://github.com/posva/unplugin-vue-router
-export function pages(options?: Options) {
+export function pages(options?: Options): Plugin {
   const defaultOptions = {
     extensions: ['.stx', '.vue', '.md'],
     getRouteName: (routeNode: TreeNode) => getFileBasedRouteName(routeNode),
   }
 
   const newOptions = defu(options, defaultOptions)
 
-  return VueRouter(newOptions)
+  return {
+    name: 'pages-plugin',
+    ...VueRouter(newOptions),
+  }
 }
 
 function getFileBasedRouteName(node: TreeNode): string {