valaxy 0.0.6 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy",
-  "version": "0.0.6",
+  "version": "0.0.9",
   "description": "📄 Vite & Vue powered static blog generator.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,6 +9,14 @@
     "vue",
     "blog"
   ],
+  "exports": {
+    ".": "./src/index.ts",
+    "./*": "./*"
+  },
+  "bin": {
+    "vala": "./bin/valaxy.js",
+    "valaxy": "./bin/valaxy.js"
+  },
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -17,10 +25,6 @@
   "license": "MIT",
   "homepage": "https://valaxy.yyj.moe",
   "repository": "https://github.com/YunYouJun/valaxy",
-  "bin": {
-    "vala": "./bin/valaxy.js",
-    "valaxy": "./bin/valaxy.js"
-  },
   "devDependencies": {
     "@types/katex": "^0.14.0",
     "@types/markdown-it-link-attributes": "^3.0.1",

package/src/client/components/ValaxyCopyright.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import { useConfig } from 'valaxy'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { useConfig } from '../config'
 
 const { t, locale } = useI18n()
 

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/modules/valaxy.ts

@@ -1,5 +1,5 @@
 import { createI18n } from 'vue-i18n'
-import { initConfig, valaxyConfigSymbol } from 'valaxy'
+import { initConfig, valaxyConfigSymbol } from '../config'
 import type { UserModule } from '~/types'
 
 // Import i18n resources

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,6 +1,12 @@
 import dayjs from 'dayjs'
-import type { Post } from 'valaxy'
+import type { Post } from '../../types'
 
+/**
+ * use dayjs format date
+ * @param date
+ * @param template
+ * @returns
+ */
 export function formatDate(date: string | number | Date, template = 'YYYY-MM-DD') {
   const today = dayjs(date)
   return today.format(template)

package/src/index.ts

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

package/src/node/plugins/extendConfig.ts

@@ -0,0 +1,45 @@
+import { resolve } from 'path'
+import type { InlineConfig, Plugin } from 'vite'
+import { mergeConfig } from 'vite'
+import type { ResolvedValaxyOptions } from '../options'
+import { toAtFS } from '../utils'
+
+export function createConfigPlugin(options: ResolvedValaxyOptions): Plugin {
+  return {
+    name: 'valaxy:config',
+    config(config) {
+      const injection: InlineConfig = {
+        resolve: {
+          alias: {
+            '@/': `${toAtFS(options.userRoot)}/`,
+            '~/': `${toAtFS(options.clientRoot)}/`,
+            '@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')),
+            [`valaxy-theme-${options.theme}/`]: `${toAtFS(resolve(options.themeRoot))}/`,
+            [`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

@@ -21,11 +21,17 @@ import type { Mode } from '../vite'
 import { setupMarkdownPlugins } from '../markdown'
 import { createMarkdownPlugin, excerpt_separator } from './markdown'
 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
@@ -39,6 +45,7 @@ export function ViteValaxyPlugins(
   const _md = setupMarkdownPlugins(mdIt, options.config.markdownIt)
 
   const roots = [clientRoot, themeRoot, userRoot]
+
   return [
     Vue({
       include: [/\.vue$/, /\.md$/],
@@ -53,6 +60,7 @@ export function ViteValaxyPlugins(
 
     ValaxyPlugin,
     MarkdownPlugin,
+    createConfigPlugin(options),
 
     // https://github.com/hannoeru/vite-plugin-pages
     Pages({
@@ -121,7 +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,20 @@ import { defineConfig } from 'tsup'
 
 export default defineConfig((options) => {
   return {
-    entry: ['src/node/index.ts', 'src/node/cli.ts'],
-    splitting: true,
+    entry: [
+      'src/node/index.ts',
+      'src/node/cli.ts',
+      'src/index.ts',
+    ],
+    // splitting: true,
+    splitting: false,
     clean: true,
     dts: true,
     format: ['cjs', 'esm'],
     minify: !options.watch,
     external: [
-      'vite',
-      'sass',
-      'chalk',
+      '@valaxyjs/config',
+      'valaxy-theme-yun',
     ],
   }
 })

package/dist/build-ONY2EY5P.js

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

package/dist/build-WOTUPDVZ.mjs

@@ -1 +0,0 @@
-import{d as i,h as o}from"./chunk-KVMOYEI7.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};