valaxy 0.3.9 → 0.4.0

package/dist/node/index.d.ts

@@ -1,6 +1,6 @@
 import * as vite from 'vite';
 import { InlineConfig } from 'vite';
-import { V as ValaxyConfig } from '../config-97204b79.js';
+import { V as ValaxyConfig } from '../config-de04677b.js';
 import 'type-fest';
 import 'unocss/vite';
 import 'markdown-it';

package/dist/node/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _chunkAQBALXBFjs = require('../chunk-AQBALXBF.js');var _chunkQIXBXHEKjs = require('../chunk-QIXBXHEK.js');_chunkQIXBXHEKjs.i.call(void 0, );exports.createServer = _chunkAQBALXBFjs.g;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _chunkHRARZPSAjs = require('../chunk-HRARZPSA.js');require('../chunk-V3BMKLEW.js');exports.createServer = _chunkHRARZPSAjs.g;

package/dist/node/index.mjs

@@ -1 +1 @@
-import{g as r}from"../chunk-ZUG5LNG5.mjs";import{i as o}from"../chunk-T3K5KZOK.mjs";o();export{r as createServer};
+import{g as o}from"../chunk-N6HD5SHF.mjs";import"../chunk-6LIOFBAA.mjs";export{o as createServer};

package/package.json

@@ -1,44 +1,47 @@
 {
   "name": "valaxy",
-  "version": "0.3.9",
+  "version": "0.4.0",
   "description": "📄 Vite & Vue powered static blog generator.",
-  "keywords": [
-    "vite",
-    "vue",
-    "blog"
-  ],
-  "license": "MIT",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
     "url": "https://www.yunyoujun.cn"
   },
+  "license": "MIT",
+  "homepage": "https://valaxy.yyj.moe",
   "repository": "https://github.com/YunYouJun/valaxy",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "keywords": [
+    "vite",
+    "vue",
+    "blog"
+  ],
   "exports": {
     ".": "./src/index.ts",
     "./*": "./*"
   },
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "bin": {
     "vala": "./bin/valaxy.js",
     "valaxy": "./bin/valaxy.js"
   },
-  "homepage": "https://valaxy.yyj.moe",
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "dependencies": {
     "@ctrl/tinycolor": "^3.4.1",
-    "@iconify-json/carbon": "^1.1.4",
-    "@iconify-json/ri": "^1.1.1",
+    "@iconify-json/carbon": "^1.1.5",
+    "@iconify-json/ri": "^1.1.2",
     "@intlify/vite-plugin-vue-i18n": "^3.4.0",
     "@vitejs/plugin-vue": "^2.3.3",
-    "@vueuse/core": "^8.4.2",
+    "@vueuse/core": "^8.6.0",
     "@vueuse/head": "^0.7.6",
     "consola": "^2.15.3",
     "critters": "^0.0.16",
-    "dayjs": "^1.11.2",
+    "dayjs": "^1.11.3",
     "escape-html": "^1.0.3",
     "feed": "^4.2.2",
-    "katex": "^0.15.3",
+    "katex": "^0.16.0",
     "kolorist": "^1.5.1",
     "markdown-it-anchor": "^8.6.4",
     "markdown-it-attrs": "^4.1.4",
@@ -50,25 +53,24 @@
     "nprogress": "^0.2.0",
     "open": "^8.4.0",
     "pinia": "^2.0.14",
-    "prism-theme-vars": "^0.2.2",
+    "prism-theme-vars": "^0.2.3",
     "prismjs": "^1.28.0",
-    "sass": "^1.51.0",
+    "sass": "^1.52.2",
     "star-markdown-css": "^0.3.3",
     "unconfig": "^0.3.4",
-    "unocss": "^0.33.4",
-    "unplugin-vue-components": "^0.19.5",
-    "vite": "^2.9.9",
+    "unocss": "^0.38.1",
+    "unplugin-vue-components": "^0.19.6",
+    "vite": "^2.9.10",
     "vite-plugin-inspect": "^0.5.0",
     "vite-plugin-md": "^0.13.1",
     "vite-plugin-pages": "^0.23.0",
-    "vite-plugin-pwa": "^0.12.0",
     "vite-plugin-vue-layouts": "^0.6.0",
     "vite-ssg": "0.19.2",
     "vite-ssg-sitemap": "0.2.7",
-    "vue": "^3.2.33",
+    "vue": "^3.2.37",
     "vue-i18n": "^9.1.10",
     "vue-router": "^4.0.15",
-    "yargs": "^17.5.0"
+    "yargs": "^17.5.1"
   },
   "devDependencies": {
     "@types/katex": "^0.14.0",
@@ -78,18 +80,13 @@
     "debug": "^4.3.4",
     "diacritics": "^1.3.0",
     "https-localhost": "^4.7.1",
-    "type-fest": "^2.12.2",
-    "vue-tsc": "^0.34.13"
-  },
-  "engines": {
-    "node": ">=14.0.0"
+    "type-fest": "^2.13.0"
   },
   "scripts": {
     "build": "rimraf dist && tsup --splitting",
     "dev": "tsup --watch --splitting",
     "lint": "eslint \"**/*.{vue,ts,js}\"",
     "preview": "vite preview",
-    "preview-https": "serve dist",
-    "typecheck": "vue-tsc --noEmit"
+    "preview-https": "serve dist"
   }
 }

package/src/client/App.vue

@@ -1,17 +1,37 @@
 <script setup lang="ts">
+import { computed } from 'vue'
+import { useHead } from '@vueuse/head'
+import { useCssVar } from '@vueuse/core'
+import { isDark } from './composables'
+
 // https://github.com/vueuse/head
 // you can use this to manipulate the document head in any components,
 // they will be rendered correctly in the html results with vite-ssg
-import { useHead } from '@vueuse/head'
 import { useConfig } from './config'
 
 const config = useConfig()
 useHead({
   title: config.value.title,
+  link: [
+    {
+      rel: 'icon',
+      href: config.value.favicon,
+      type: config.value.favicon.endsWith('svg') ? 'image/svg+xml' : 'image/png',
+    },
+  ],
   meta: [
     { name: 'description', content: config.value.description },
+    {
+      name: 'theme-color',
+      content: computed(() => isDark.value ? '#00aba9' : '#ffffff'),
+    },
   ],
 })
+
+const bgImg = useCssVar('--yun-bg-img')
+const bgImgUrl = computed(() => config.value.themeConfig.bg_image.url)
+if (bgImgUrl.value)
+  bgImg.value = config.value.themeConfig.bg_image.url
 </script>
 
 <template>

package/src/client/components/ValaxyBg.vue

@@ -0,0 +1,51 @@
+<script lang="ts" setup>
+import { computed } from 'vue'
+import { useThemeConfig } from 'valaxy'
+import { useCssVar } from '@vueuse/core'
+import { isDark } from '~/composables'
+
+const themeConfig = useThemeConfig()
+
+const bgImgOpacity = useCssVar('--va-bg-img-opacity')
+if (themeConfig.value.bg_image.opacity)
+  bgImgOpacity.value = themeConfig.value.bg_image.opacity.toString() || '1'
+
+const styles = computed(() => {
+  return {
+    backgroundImage: `url('${isDark.value
+      ? themeConfig.value.bg_image.dark
+      : themeConfig.value.bg_image.url
+      }')`,
+  }
+})
+</script>
+
+<template>
+  <div class="va-bg" :style="styles" />
+</template>
+
+<style lang="scss">
+.va-bg {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  z-index: -1;
+  background-image: var(--va-bg-image);
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  animation-name: bgFadeIn;
+  animation-duration: 2s;
+  opacity: var(--va-bg-img-opacity, 1);
+}
+
+@keyframes bgFadeIn {
+  from {
+    opacity: 0;
+  }
+
+  to {
+    opacity: var(--va-bg-img-opacity, 1);
+  }
+}
+</style>

package/src/client/composables/comments/twikoo.ts

@@ -26,7 +26,6 @@ export function useTwikoo(options: {} = {}) {
 
   // 直接使用 CDN
   useScriptTag('//cdn.jsdelivr.net/npm/twikoo@1.5.1/dist/twikoo.all.min.js', () => {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     initTwikoo(options)
   })
 }

package/src/client/composables/sidebar.ts

@@ -42,14 +42,16 @@ export function useActiveSidebarLinks(container: Ref<HTMLElement>, marker: Ref<H
         : container.value.querySelector(`.va-toc a[href="${hash}"]`) as HTMLAnchorElement)
 
     // marker animation
-    if (activeLink) {
-      activeLink.classList.add('active')
-      marker.value.style.opacity = '1'
-      marker.value.style.top = `${activeLink.offsetTop + 2}px`
-    }
-    else {
-      marker.value.style.opacity = '0'
-      marker.value.style.top = '54px'
+    if (marker.value) {
+      if (activeLink) {
+        activeLink.classList.add('active')
+        marker.value.style.opacity = '1'
+        marker.value.style.top = `${activeLink.offsetTop + 2}px`
+      }
+      else {
+        marker.value.style.opacity = '0'
+        marker.value.style.top = '54px'
+      }
     }
   }
 

package/src/client/index.html

@@ -4,13 +4,12 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="icon" href="/favicon.svg" type="image/svg+xml">
   <link rel="apple-touch-icon" href="/pwa-192x192.png">
   <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#00aba9">
   <meta name="msapplication-TileColor" content="#00aba9">
   <meta name="theme-color" content="#ffffff">
   <script>
-    (function() {
+    (function () {
       const prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
       const setting = localStorage.getItem('vueuse-color-scheme') || 'auto'
       if (setting === 'dark' || (prefersDark && setting !== 'light'))

package/src/client/main.ts

@@ -15,7 +15,11 @@ const routes = setupLayouts(__DEV__ ? generatedRoutes : generatedRoutes.filter(i
 // https://github.com/antfu/vite-ssg
 export const createApp = ViteSSG(
   App,
-  { routes, base: import.meta.env.BASE_URL },
+  {
+    routes,
+    base: import.meta.env.BASE_URL,
+    scrollBehavior() { return { top: 0 } },
+  },
   (ctx) => {
     // install all modules under `modules/`
     Object.values(import.meta.globEager('./modules/*.ts')).forEach(i => i.install?.(ctx))

package/src/client/modules/valaxy.ts

@@ -9,6 +9,7 @@ import { createI18n } from 'vue-i18n'
 // import messages from '@intlify/vite-plugin-vue-i18n/messages'
 
 import { useStorage } from '@vueuse/core'
+
 import { initConfig, valaxyConfigSymbol } from '../config'
 
 import type { UserModule } from '~/types'
@@ -38,7 +39,6 @@ function shouldHotReload(payload: any): boolean {
   return payloadPath === locationPath
 }
 
-// https://github.com/antfu/vite-plugin-pwa#automatic-reload-when-new-content-available
 export const install: UserModule = ({ app, router }) => {
   // inject valaxy config before modules
   const config = initConfig()

package/src/client/styles/common/markdown.scss

@@ -1,9 +1,13 @@
-@use 'sass:map';
+@use "sass:map";
 
 .markdown-body {
   --prism-font-family: var(--va-font-mono);
 
   --smc-font-family: var(--va-font-sans);
+
+  video {
+    margin: auto;
+  }
 }
 
 // for anchor

package/src/client/styles/global/index.scss

@@ -10,29 +10,4 @@ body,
 
 body {
   background-color: var(--va-c-bg);
-  
-  &::before {
-    content: '';
-    position: fixed;
-    width: 100%;
-    height: 100%;
-    z-index: -1;
-    background-image: var(--yun-bg-image);
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
-    animation-name: bgFadeIn;
-    animation-duration: 2s;
-    opacity: 1;
-  }
-}
-
-@keyframes bgFadeIn {
-  from {
-    opacity: 0;
-  }
-
-  to {
-    opacity: 1;
-  }
 }

package/src/node/markdown/markdown-it/katex.ts

@@ -174,7 +174,7 @@ export default function math_plugin(md: any, options: KatexOptions) {
     }
     catch (error) {
       if (options.throwOnError)
-        // eslint-disable-next-line no-console
+
         console.warn(error)
       return latex
     }
@@ -191,7 +191,7 @@ export default function math_plugin(md: any, options: KatexOptions) {
     }
     catch (error) {
       if (options.throwOnError)
-        // eslint-disable-next-line no-console
+
         console.warn(error)
       return latex
     }

package/src/node/plugins/extendConfig.ts

@@ -35,6 +35,7 @@ export function createConfigPlugin(options: ResolvedValaxyOptions): Plugin {
             'dayjs',
             'nprogress',
           ],
+
         },
       }
       return mergeConfig(config, injection)

package/src/node/plugins/markdown.ts

@@ -11,7 +11,7 @@ export type ViteMdOptions = Parameters<typeof Markdown>[0]
 export const excerpt_separator = '<!-- more -->'
 
 // https://github.com/antfu/vite-plugin-md
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+
 export function createMarkdownPlugin(options: ResolvedValaxyOptions): Plugin[] {
   const mdOptions = options.config.markdownIt
 

package/src/node/plugins/preset.ts

@@ -10,7 +10,6 @@ import Vue from '@vitejs/plugin-vue'
 import Pages from 'vite-plugin-pages'
 import Layouts from 'vite-plugin-vue-layouts'
 import Components from 'unplugin-vue-components/vite'
-import { VitePWA } from 'vite-plugin-pwa'
 import VueI18n from '@intlify/vite-plugin-vue-i18n'
 import Inspect from 'vite-plugin-inspect'
 
@@ -173,35 +172,6 @@ export async function ViteValaxyPlugins(
 
     ...MarkdownPlugin,
 
-    // https://github.com/antfu/vite-plugin-pwa
-    VitePWA({
-      registerType: 'autoUpdate',
-      includeAssets: ['favicon.svg', 'safari-pinned-tab.svg'],
-      manifest: {
-        name: 'Theme Yun',
-        short_name: 'Yun',
-        theme_color: '#ffffff',
-        icons: [
-          {
-            src: '/pwa-192x192.png',
-            sizes: '192x192',
-            type: 'image/png',
-          },
-          {
-            src: '/pwa-512x512.png',
-            sizes: '512x512',
-            type: 'image/png',
-          },
-          {
-            src: '/pwa-512x512.png',
-            sizes: '512x512',
-            type: 'image/png',
-            purpose: 'any maskable',
-          },
-        ],
-      },
-    }),
-
     // https://github.com/intlify/bundle-tools/tree/main/packages/vite-plugin-vue-i18n
     VueI18n({
       runtimeOnly: true,

package/src/node/rss.ts

@@ -101,7 +101,7 @@ export async function build(options: ResolvedValaxyOptions) {
   // write
   feedOptions.author = author
   feedOptions.image = config.author.avatar.startsWith('http') ? config.author.avatar : `${DOMAIN}${config.author.avatar}`
-  feedOptions.favicon = `${DOMAIN}/${config.feed.favicon}`
+  feedOptions.favicon = `${DOMAIN}/${config.feed.favicon || config.favicon}`
 
   const feed = new Feed(feedOptions)
   posts.forEach(item => feed.addItem(item))

package/src/node/server.ts

@@ -12,10 +12,12 @@ export async function createServer(
   // default editor vscode
   process.env.EDITOR = process.env.EDITOR || 'code'
 
-  const server = await createViteServer(mergeConfig(
-    viteConfig,
-    await createViteConfig(options, serverOptions),
-  ))
+  const server = await createViteServer(
+    mergeConfig(
+      viteConfig,
+      await createViteConfig(options, serverOptions),
+    ),
+  )
 
   return server
 }

package/src/types/config.ts

@@ -71,6 +71,11 @@ export interface ValaxyConfig<T = ValaxyThemeConfig> {
     }
   }
 
+  /**
+   * icon for your website
+   */
+  favicon: string
+
   feed: {
     /**
      * name: feed -> feed.xml / feed.atom / feed.json
@@ -206,9 +211,10 @@ export const defaultValaxyConfig: ValaxyConfig = {
       message: 'All at sea.',
     },
   },
+  favicon: 'favicon.svg',
   feed: {
     name: '',
-    favicon: 'favicon.png',
+    favicon: 'favicon.svg',
   },
   social: [],