valaxy 0.5.0 → 0.6.0

package/node/rss.ts

@@ -24,7 +24,7 @@ const markdown = MarkdownIt({
 export async function build(options: ResolvedValaxyOptions) {
   const { config } = options
 
-  if (!config.url) {
+  if (!config.url || config.url === '/') {
     consola.error('You must set "config.url" to generate rss.')
     return
   }

package/node/utils/getGitTimestamp.ts

@@ -0,0 +1,13 @@
+import { spawn } from 'cross-spawn'
+
+export function getGitTimestamp(file: string) {
+  return new Promise<number>((resolve, reject) => {
+    const child = spawn('git', ['log', '-1', '--pretty="%ci"', file])
+    let output = ''
+    child.stdout.on('data', d => (output += String(d)))
+    child.on('close', () => {
+      resolve(+new Date(output))
+    })
+    child.on('error', reject)
+  })
+}

package/node/utils/index.ts

@@ -4,6 +4,17 @@ import globalDirs from 'global-dirs'
 import { sync as resolve } from 'resolve'
 import consola from 'consola'
 
+export * from './getGitTimestamp'
+
+/**
+ * transform obj for vite cde
+ * @param obj
+ * @returns
+ */
+export const transformObject = (obj: any) => {
+  return `JSON.parse(${JSON.stringify(JSON.stringify(obj))})`
+}
+
 export function slash(str: string) {
   return str.replace(/\\/g, '/')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -17,16 +17,22 @@
   ],
   "exports": {
     ".": {
-      "types": "./index.d.ts",
+      "types": "./dist/index.d.ts",
       "require": "./dist/index.js",
       "import": "./dist/index.mjs"
     },
     "./client": "./dist/client.d.ts",
     "./client/*": "./client/*",
+    "./node": {
+      "types": "./dist/node/index.d.ts",
+      "require": "./dist/node/index.js",
+      "import": "./dist/node/index.mjs"
+    },
     "./*": "./*"
   },
   "main": "dist/index.js",
-  "types": "index.d.ts",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
   "bin": {
     "vala": "./bin/valaxy.js",
     "valaxy": "./bin/valaxy.js"
@@ -35,6 +41,7 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
+    "@antfu/utils": "^0.5.2",
     "@ctrl/tinycolor": "^3.4.1",
     "@docsearch/css": "^3.1.0",
     "@docsearch/js": "^3.1.0",
@@ -42,15 +49,19 @@
     "@iconify-json/ri": "^1.1.2",
     "@intlify/vite-plugin-vue-i18n": "^3.4.0",
     "@vitejs/plugin-vue": "^2.3.3",
-    "@vueuse/core": "^8.7.3",
+    "@vueuse/core": "^8.7.4",
     "@vueuse/head": "^0.7.6",
     "consola": "^2.15.3",
     "critters": "^0.0.16",
+    "cross-spawn": "^7.0.3",
     "dayjs": "^1.11.3",
     "escape-html": "^1.0.3",
     "feed": "^4.2.2",
+    "gray-matter": "^4.0.3",
     "katex": "^0.16.0",
     "kolorist": "^1.5.1",
+    "lru-cache": "^7.10.1",
+    "markdown-it": "^13.0.1",
     "markdown-it-anchor": "^8.6.4",
     "markdown-it-attrs": "^4.1.4",
     "markdown-it-container": "^3.0.0",
@@ -64,13 +75,13 @@
     "prism-theme-vars": "^0.2.3",
     "prismjs": "^1.28.0",
     "sass": "^1.52.3",
+    "shiki": "^0.10.1",
     "star-markdown-css": "^0.3.3",
     "unconfig": "^0.3.4",
-    "unocss": "^0.39.0",
+    "unocss": "^0.39.3",
     "unplugin-vue-components": "^0.19.6",
     "vite": "^2.9.12",
     "vite-plugin-inspect": "^0.5.0",
-    "vite-plugin-md": "^0.13.1",
     "vite-plugin-pages": "^0.24.2",
     "vite-plugin-vue-layouts": "^0.6.0",
     "vite-ssg": "0.19.2",
@@ -81,7 +92,9 @@
     "yargs": "^17.5.1"
   },
   "devDependencies": {
+    "@types/cross-spawn": "^6.0.2",
     "@types/katex": "^0.14.0",
+    "@types/lru-cache": "^7.10.10",
     "@types/markdown-it-link-attributes": "^3.0.1",
     "@types/nprogress": "^0.2.0",
     "@types/yargs": "^17.0.10",
@@ -92,7 +105,7 @@
   },
   "scripts": {
     "build": "rimraf dist && tsup --splitting",
-    "dev": "tsup --watch --splitting",
+    "dev": "tsup --splitting --watch",
     "lint": "eslint \"**/*.{vue,ts,js}\"",
     "preview": "vite preview",
     "preview-https": "serve dist"

package/shared/index.ts

@@ -0,0 +1 @@
+export const EXTERNAL_URL_RE = /^https?:/i

package/tsup.config.ts

@@ -3,20 +3,22 @@ import { defineConfig } from 'tsup'
 export default defineConfig((options) => {
   return {
     entry: [
-      'client/index.ts',
+      'index.ts',
+      // 'client/index.ts',
       'node/index.ts',
       'node/cli.ts',
-      'types/index.ts',
+      // 'types/index.ts',
     ],
     // https://tsup.egoist.sh/#code-splitting
     // Code splitting currently only works with the esm output format, and it's enabled by default. If you want code splitting for cjs output format as well, try using --splitting flag which is an experimental feature to get rid of the limitation in esbuild.
-    splitting: true,
+    // splitting: true,
     clean: true,
     dts: true,
     format: ['cjs', 'esm'],
     minify: !options.watch,
     external: [
       '@valaxyjs/config',
+      '@valaxyjs/context',
       'valaxy-theme-yun',
     ],
   }

package/types/config.ts

@@ -1,10 +1,7 @@
 import type { PartialDeep } from 'type-fest'
 import type { VitePluginConfig } from 'unocss/vite'
-import type Markdown from 'vite-plugin-md'
 import type { MarkdownOptions } from '../node/markdown'
 
-export type ViteMdOptions = Parameters<typeof Markdown>[0]
-
 export type ValaxyThemeConfig = Record<string, any>
 
 export interface SocialLink {
@@ -32,6 +29,7 @@ export interface AlgoliaSearchOptions {
   initialQuery?: string
 }
 
+// packages/valaxy/node/config.ts
 export interface ValaxyConfig<T = ValaxyThemeConfig> {
   /**
    * Default language
@@ -42,6 +40,7 @@ export interface ValaxyConfig<T = ValaxyThemeConfig> {
   /**
    * You site url in web, required for ssg & rss
    * @description 站点的 URL，SSG & RSS 需要（譬如生成版权处文章永久链接）
+   * @default '/'
    */
   url: string
   /**
@@ -84,6 +83,11 @@ export interface ValaxyConfig<T = ValaxyThemeConfig> {
     }
   }
 
+  /**
+   * show last updated time by git
+   */
+  lastUpdated: boolean
+
   /**
    * icon for your website
    */
@@ -203,7 +207,6 @@ export interface ValaxyConfig<T = ValaxyThemeConfig> {
   /**
    * for markdown
    */
-  markdown: ViteMdOptions
   markdownIt: MarkdownOptions
 }
 

package/types/data.ts

@@ -0,0 +1,31 @@
+import type { Post } from './posts'
+
+export interface Header {
+  level: number
+  title: string
+  slug: string
+  /**
+   * i18n
+   */
+  lang?: string
+}
+
+export interface PageData {
+  path: string
+  relativePath: string
+  title: string
+  titleTemplate?: string
+  description: string
+  headers: Header[]
+  frontmatter: Post
+  lastUpdated?: number
+}
+
+export interface PageDataPayload {
+  path: string
+  pageData: PageData
+}
+
+export type HeadConfig =
+  | [string, Record<string, string>]
+  | [string, Record<string, string>, string]

package/types/index.ts

@@ -1,2 +1,3 @@
 export * from './config'
 export * from './posts'
+export * from './data'

package/types/posts.ts

@@ -118,5 +118,5 @@ export interface Post extends Record<string, any> {
    * enable markdown-body class
    * @description 是否启用默认的 markdown 样式
    */
-  markdown: boolean
+  markdown?: boolean
 }