valaxy 0.0.7 → 0.0.8

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "valaxy",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "📄 Vite & Vue powered static blog generator.",
-  "main": "src/index.ts",
-  "types": "dist/types/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "keywords": [
     "vite",
     "vue",

package/src/client/composables/category.ts

@@ -1,4 +1,4 @@
-import type { Post } from 'valaxy'
+import type { Post } from '../../types'
 import { usePostList } from './post'
 
 export interface ParentCategory {
@@ -32,7 +32,7 @@ export function useCategory() {
 
   const uncategorized = categoryMap.children.get('Uncategorized') as PostCategory
 
-  posts.value.forEach((post) => {
+  posts.value.forEach((post: Post) => {
     if (post.categories) {
       if (Array.isArray(post.categories)) {
         const len = post.categories.length

package/src/client/composables/common.ts

@@ -1,8 +1,9 @@
 import { useRoute } from 'vue-router'
-import type { Post } from 'valaxy'
 import { computed } from 'vue'
 
-import { isDev, useConfig } from 'valaxy'
+import { isDev } from '../..'
+import type { Post } from '../../types'
+import { useConfig } from '../config'
 
 export function useFrontmatter() {
   const route = useRoute()

package/src/client/composables/post.ts

@@ -1,8 +1,8 @@
-import { sortByDate } from 'valaxy'
 import type { StyleValue } from 'vue'
 import { computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { useThemeConfig } from '../../core/config'
+import { useThemeConfig } from '../config'
+import { sortByDate } from '../utils'
 
 /**
  * get post list

package/src/client/composables/tag.ts

@@ -1,4 +1,5 @@
 import { TinyColor } from '@ctrl/tinycolor'
+import type { Post } from '../../types'
 import { usePostList } from './post'
 
 export type Tags = Map<string, {
@@ -41,7 +42,7 @@ export function useTag() {
 
   const tagMap: Tags = new Map()
 
-  posts.value.forEach((post) => {
+  posts.value.forEach((post: Post) => {
     if (post.tags) {
       let tags: string[]
       if (typeof post.tags === 'string')

package/src/{core → client}/config.ts

@@ -2,7 +2,7 @@
 import valaxyConfig from '@valaxyjs/config'
 import type { ComputedRef, InjectionKey } from 'vue'
 import { computed, inject, readonly, shallowRef } from 'vue'
-import type { ThemeConfig } from 'valaxy-theme-yun'
+import type { ThemeConfig } from '../../../valaxy-theme-yun'
 import type { ValaxyConfig } from '../types'
 
 /**

package/src/client/index.ts

@@ -0,0 +1,4 @@
+export * from './config'
+
+export * from './composables'
+export * from './utils'

package/src/client/utils/index.ts

@@ -1,2 +1,4 @@
 export * from './helper'
 export * from './time'
+
+export const isDev = import.meta.env.DEV === true

package/src/client/utils/time.ts

@@ -1,5 +1,5 @@
 import dayjs from 'dayjs'
-import type { Post } from 'valaxy'
+import type { Post } from '../../types'
 
 export function formatDate(date: string | number | Date, template = 'YYYY-MM-DD') {
   const today = dayjs(date)

package/src/index.ts

@@ -1,2 +1,2 @@
-export * from './core'
+export * from './client'
 export * from './types'

package/src/node/plugins/extendConfig.ts

@@ -16,11 +16,27 @@ export function createConfigPlugin(options: ResolvedValaxyOptions): Plugin {
             '@valaxyjs/client': `${toAtFS(options.clientRoot)}/`,
             '@valaxyjs/config': '/@valaxyjs/config',
             'valaxy/package.json': toAtFS(resolve(options.clientRoot, '../../package.json')),
-            'valaxy': toAtFS(resolve(options.clientRoot, '..')),
+            'valaxy': toAtFS(resolve(options.clientRoot, '../index.ts')),
             '@valaxyjs/core': toAtFS(resolve(options.clientRoot, '../core')),
             [`valaxy-theme-${options.theme}`]: `${toAtFS(resolve(options.themeRoot))}/`,
           },
         },
+
+        optimizeDeps: {
+          entries: [resolve(options.clientRoot, 'main.ts'), options.configFile],
+
+          include: [
+            'vue',
+            'vue-router',
+            '@vueuse/core',
+            '@vueuse/head',
+            'dayjs',
+            'nprogress',
+          ],
+          exclude: [
+            'vue-demi',
+          ],
+        },
       }
       return mergeConfig(config, injection)
     },

package/src/node/plugins/preset.ts

@@ -24,9 +24,14 @@ import { createUnocssPlugin } from './unocss'
 import { createConfigPlugin } from './extendConfig'
 import { createValaxyPlugin } from '.'
 
+export interface ValaxyPluginOptions {
+  components?: Parameters<typeof Components>[0]
+}
+
 export function ViteValaxyPlugins(
   options: ResolvedValaxyOptions,
   serverOptions: ValaxyServerOptions = {},
+  pluginOptions: ValaxyPluginOptions = {},
   mode: Mode = 'dev',
 ): (PluginOption | PluginOption[])[] | undefined {
   const { clientRoot, themeRoot, userRoot } = options
@@ -40,6 +45,7 @@ export function ViteValaxyPlugins(
   const _md = setupMarkdownPlugins(mdIt, options.config.markdownIt)
 
   const roots = [clientRoot, themeRoot, userRoot]
+
   return [
     Vue({
       include: [/\.vue$/, /\.md$/],
@@ -123,8 +129,10 @@ export function ViteValaxyPlugins(
       allowOverrides: true,
       // override: user -> theme -> client
       // latter override former
-      dirs: roots.map(root => `${root}/components`),
+      dirs: roots.map(root => `${root}/components`).concat(['src/components', 'components']),
       dts: `${options.userRoot}/components.d.ts`,
+
+      ...pluginOptions,
     }),
 
     // https://github.com/antfu/unocss

package/src/node/vite.ts

@@ -1,18 +1,13 @@
-import path from 'path'
-
 import generateSitemap from 'vite-ssg-sitemap'
 import type { InlineConfig } from 'vite'
 import { searchForWorkspaceRoot } from 'vite'
 import type { ResolvedValaxyOptions, ValaxyServerOptions } from './options'
 
 import { ViteValaxyPlugins } from './plugins/preset'
-import { VALAXY_CONFIG_ID } from './plugins/valaxy'
 
 export type Mode = 'dev' | 'build'
 
 export function createViteConfig(options: ResolvedValaxyOptions, serverOptions: ValaxyServerOptions = {}, mode: Mode = 'dev'): InlineConfig {
-  const { configFile } = options
-
   const viteConfig: InlineConfig = {
     // remove vue-i18n warnings
     // https://vue-i18n.intlify.dev/guide/advanced/optimization.html#reduce-bundle-size-with-feature-build-flags
@@ -26,24 +21,11 @@ export function createViteConfig(options: ResolvedValaxyOptions, serverOptions:
     //   __VUE_I18N_LEGACY_API__: 'false',
     // },
 
-    resolve: {
-      alias: {
-        '@/': `${options.userRoot}/`,
-        '~/': `${options.clientRoot}/`,
-        '@valaxyjs/client': `${options.clientRoot}/`,
-        'valaxy/package.json': `${path.resolve(options.clientRoot, '../../package.json')}`,
-        'valaxy': `${path.resolve(options.clientRoot, '..')}`,
-        [VALAXY_CONFIG_ID]: `/${VALAXY_CONFIG_ID}`,
-        '@valaxyjs/core': `${path.resolve(options.clientRoot, '../core')}`,
-        [`valaxy-theme-${options.theme}`]: `${path.resolve(options.themeRoot)}/`,
-      },
-    },
-
     root: options.clientRoot,
     // todo user base
     // base: '/',
 
-    plugins: ViteValaxyPlugins(options, serverOptions, mode),
+    plugins: ViteValaxyPlugins(options, serverOptions, {}, mode),
 
     server: {
       fs: {
@@ -55,19 +37,6 @@ export function createViteConfig(options: ResolvedValaxyOptions, serverOptions:
       },
     },
 
-    optimizeDeps: {
-      entries: [path.resolve(options.clientRoot, 'main.ts'), configFile],
-
-      include: [
-        'vue',
-        'vue-router',
-        '@vueuse/core',
-        '@vueuse/head',
-      ],
-      exclude: [
-        'vue-demi',
-      ],
-    },
   }
 
   if (mode === 'build') {

package/tsup.config.ts

@@ -2,16 +2,19 @@ import { defineConfig } from 'tsup'
 
 export default defineConfig((options) => {
   return {
-    entry: ['src/node/index.ts', 'src/node/cli.ts', 'src/types/index.ts'],
+    entry: [
+      'src/node/index.ts',
+      'src/node/cli.ts',
+      'src/index.ts',
+    ],
     splitting: true,
     clean: true,
     dts: true,
     format: ['cjs', 'esm'],
     minify: !options.watch,
     external: [
-      'vite',
-      'sass',
-      'chalk',
+      '@valaxyjs/config',
+      'valaxy-theme-yun',
     ],
   }
 })

package/dist/build-OOT6HK6S.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _chunkL5SNNWFJjs = require('./chunk-L5SNNWFJ.js');var _chunkL3EDI35Ijs = require('./chunk-L3EDI35I.js');_chunkL3EDI35Ijs.e.call(void 0, );var _vite = require('vite');async function a(n,e={}){let t=_vite.mergeConfig.call(void 0, e,_chunkL5SNNWFJjs.d.call(void 0, n));await _vite.build.call(void 0, t)}exports.build = a;

package/dist/build-SG32QSQ3.mjs

@@ -1 +0,0 @@
-import{d as o}from"./chunk-QI435Q25.mjs";import{e as i}from"./chunk-MVJUGWXR.mjs";i();import{mergeConfig as r,build as f}from"vite";async function a(n,e={}){let t=r(e,o(n));await f(t)}export{a as build};

package/dist/chunk-7JDYOPID.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _chunkL5SNNWFJjs = require('./chunk-L5SNNWFJ.js');var _chunkL3EDI35Ijs = require('./chunk-L3EDI35I.js');_chunkL3EDI35Ijs.e.call(void 0, );var _vite = require('vite');async function c(o,t={},i={}){return process.env.EDITOR=process.env.EDITOR||"code",await _vite.createServer.call(void 0, _vite.mergeConfig.call(void 0, t,_chunkL5SNNWFJjs.d.call(void 0, o,i)))}exports.a = c;

package/dist/chunk-JJEBEWGI.mjs

@@ -1 +0,0 @@
-import{d as r}from"./chunk-QI435Q25.mjs";import{e}from"./chunk-MVJUGWXR.mjs";e();import{createServer as n,mergeConfig as a}from"vite";async function c(o,t={},i={}){return process.env.EDITOR=process.env.EDITOR||"code",await n(a(t,r(o,i)))}export{c as a};

package/dist/chunk-L3EDI35I.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var c=Object.create;var a=Object.defineProperty;var p=Object.getOwnPropertyDescriptor;var m=Object.getOwnPropertyNames,s=Object.getOwnPropertySymbols,d=Object.getPrototypeOf,g=Object.prototype.hasOwnProperty,u=Object.prototype.propertyIsEnumerable;var l=(e,n,t)=>n in e?a(e,n,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[n]=t,f= exports.a =(e,n)=>{for(var t in n||(n={}))g.call(n,t)&&l(e,t,n[t]);if(s)for(var t of s(n))u.call(n,t)&&l(e,t,n[t]);return e};var h=(e=>typeof require!="undefined"?require:typeof Proxy!="undefined"?new Proxy(e,{get:(n,t)=>(typeof require!="undefined"?require:n)[t]}):e)(function(e){if(typeof require!="undefined")return require.apply(this,arguments);throw new Error('Dynamic require of "'+e+'" is not supported')});var y=(e,n)=>()=>(e&&(n=e(e=0)),n);var x=(e,n)=>()=>(n||e((n={exports:{}}).exports,n),n.exports);var b=(e,n,t,r)=>{if(n&&typeof n=="object"||typeof n=="function")for(let i of m(n))!g.call(e,i)&&i!==t&&a(e,i,{get:()=>n[i],enumerable:!(r=p(n,i))||r.enumerable});return e};var k=(e,n,t)=>(t=e!=null?c(d(e)):{},b(n||!e||!e.__esModule?a(t,"default",{value:e,enumerable:!0}):t,e));var o=y(()=>{});o();o();var V={url:"",lang:"en",title:"Valaxy Blog",subtitle:"Next Generation Static Blog Framework.",author:{avatar:"https://cdn.jsdelivr.net/gh/YunYouJun/yun/images/meme/yun-good-with-bg.jpg",name:"YunYouJun",status:{emoji:"\u{1F60A}",message:"All at sea."}},social:[],description:"A blog generated by Valaxy.",license:{enabled:!0,language:"",type:"by-nc-sa"},sponsor:{enable:!0,title:"\u6211\u5F88\u53EF\u7231\uFF0C\u8BF7\u7ED9\u6211\u94B1",methods:[{name:"\u652F\u4ED8\u5B9D",url:"https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/donate/alipay-qrcode.jpg",color:"#00A3EE",icon:"i-ri-alipay-line"},{name:"QQ \u652F\u4ED8",url:"https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/donate/qqpay-qrcode.png",color:"#12B7F5",icon:"i-ri-qq-line"},{name:"\u5FAE\u4FE1\u652F\u4ED8",url:"https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/donate/wechatpay-qrcode.jpg",color:"#2DC100",icon:"i-ri-wechat-pay-line"}]},search:{algolia:{enable:!1,appId:"",apiKey:"",indexName:"",chunkSize:5e3}},comment:{waline:{enable:!1,serverURL:""}},theme:"yun",themeConfig:{},unocss:{},markdown:{excerpt:"<!-- more -->"},markdownIt:{toc:{listType:"ol"},katex:{}}};o();exports.a = f; exports.b = h; exports.c = x; exports.d = k; exports.e = o; exports.f = V;