valaxy 0.21.1 → 0.22.2-beta.5

package/bin/{valaxy.mjs → valaxy.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict'
 
-import { run } from '../dist/node/cli/index.mjs'
+import { run } from '../dist/node/cli/index.js'
 
 function main() {
   run()

package/client/composables/common.ts

@@ -31,6 +31,43 @@ export function useFrontmatter<T extends Record<string, any> = PostFrontMatter>(
   return frontmatter
 }
 
+/**
+ * 获取加密文章数据
+ */
+export function useEncryptedContent() {
+  // const value = inject<string>('valaxy:encryptedContent')
+  // inject 还没有插入
+  const route = useRoute()
+  return computed(() => {
+    return route.meta.$encryptedContent || ''
+  })
+}
+
+/**
+ * 获取部分加密内容
+ */
+export function usePartiallyEncryptedContents() {
+  // const value = inject<string>('valaxy:partiallyEncryptedContents')
+  // inject 还没有插入
+  const route = useRoute()
+  return computed(() => {
+    return route.meta.$partiallyEncryptedContents || []
+  })
+}
+
+/**
+ * encryptedPhotos
+ * 获取加密相册数据
+ */
+export function useEncryptedPhotos() {
+  // const value = inject<string>('valaxy:encryptedPhotos')
+  // inject 还没有插入
+  const route = useRoute()
+  return computed(() => {
+    return route.meta.$encryptedPhotos || ''
+  })
+}
+
 /**
  * inject pageData
  */

package/client/composables/global.ts

@@ -1,7 +1,6 @@
 import { useSiteConfig } from 'valaxy'
-import { onBeforeMount, ref } from 'vue'
-
-export const timezone = ref<string>()
+import { onBeforeMount } from 'vue'
+import { dayjs } from '../utils/time'
 
 /**
  * use timezone
@@ -11,6 +10,7 @@ export function useTimezone() {
   const siteConfig = useSiteConfig()
 
   onBeforeMount(() => {
-    timezone.value = siteConfig.value.timezone
+    if (siteConfig.value.timezone)
+      dayjs.tz.setDefault(siteConfig.value.timezone)
   })
 }

package/client/composables/locale.ts

@@ -1,15 +1,17 @@
 import { isClient, useStorage } from '@vueuse/core'
-import { setDefaultOptions } from 'date-fns'
+import dayjs from 'dayjs'
 // not optimize deps all locales
-import { enUS } from 'date-fns/locale/en-US'
-import { zhCN } from 'date-fns/locale/zh-CN'
 import { useI18n } from 'vue-i18n'
 
+import 'dayjs/locale/en'
+import 'dayjs/locale/zh-cn'
+
 export function useLocale() {
   const { availableLocales, locale } = useI18n()
   const lang = useStorage('valaxy-locale', locale.value)
   // set date locale
-  setDefaultOptions({ locale: locale.value === 'zh-CN' ? zhCN : enUS })
+  // setDefaultOptions({ locale: locale.value === 'zh-CN' ? zhCN : enUS })
+  dayjs.locale(locale.value === 'zh-CN' ? 'zh-cn' : 'en')
 
   const toggleLocales = () => {
     // change to some real logic
@@ -20,7 +22,8 @@ export function useLocale() {
     lang.value = locale.value
 
     // set date locale
-    setDefaultOptions({ locale: locale.value === 'zh-CN' ? zhCN : enUS })
+    // setDefaultOptions({ locale: locale.value === 'zh-CN' ? zhCN : enUS })
+    dayjs.locale(locale.value === 'zh-CN' ? 'zh-cn' : 'en')
 
     if (isClient)
       document.documentElement.setAttribute('lang', locale.value)

package/client/composables/outline/anchor.ts

@@ -136,8 +136,10 @@ export function useActiveAnchor(
       marker.value.style.opacity = '1'
     }
     else {
-      marker.value.style.top = `${topOffset}px`
-      marker.value.style.opacity = '0'
+      if (marker.value) {
+        marker.value.style.top = `${topOffset}px`
+        marker.value.style.opacity = '0'
+      }
     }
   }
 }

package/client/main.ts

@@ -1,26 +1,27 @@
 import type { ViteSSGContext } from 'vite-ssg'
+import { DataLoaderPlugin } from 'unplugin-vue-router/data-loaders'
 import { initValaxyConfig, valaxyConfigSymbol } from 'valaxy'
 import { setupLayouts } from 'virtual:generated-layouts'
 import { ViteSSG } from 'vite-ssg'
-import { routes } from 'vue-router/auto-routes'
 
+import { routes } from 'vue-router/auto-routes'
 // import App from '/@valaxyjs/App.vue'
 import App from './App.vue'
-import AppLink from './components/AppLink.vue'
 
+import AppLink from './components/AppLink.vue'
 import setupMain from './setup/main'
-import { setupValaxyDevTools } from './utils/dev'
 
+import { setupValaxyDevTools } from './utils/dev'
 // reset styles, load css before app
 // import '@unocss/reset/tailwind.css'
 // https://unocss.dev/guide/style-reset#tailwind-compat
 // minus the background color override for buttons to avoid conflicts with UI frameworks
 import '@unocss/reset/tailwind-compat.css'
+
 // css
 import './styles/css/css-vars.css'
 
 import './styles/css/main.css'
-
 // generate user styles
 import '/@valaxyjs/styles'
 import 'uno.css'
@@ -78,7 +79,10 @@ export const createApp = ViteSSG(
   },
   (ctx) => {
     // app-level provide
-    const { app } = ctx
+    const { app, router } = ctx
+
+    // Register the plugin before the router
+    app.use(DataLoaderPlugin, { router })
 
     app.provide(valaxyConfigSymbol, valaxyConfig)
 

package/client/templates/loader.vue

@@ -0,0 +1,10 @@
+<script>
+import { defineBasicLoader } from 'unplugin-vue-router/data-loaders/basic'
+
+export const usePageData = defineBasicLoader('/relativePath', async (_to) => {
+  // custom basic loader
+}, {
+  // @see https://uvr.esm.is/data-loaders/defining-loaders.html#non-blocking-loaders-with-lazy
+  lazy: (to, from) => to.name === from.name,
+})
+</script>

package/client/utils/time.ts

@@ -1,64 +1,30 @@
-import type { ToDateOptionsWithTZ } from 'date-fns-tz'
 import type { Post } from '../../types'
-import { format, toDate } from 'date-fns'
-import { format as formatWithTZ, toZonedTime } from 'date-fns-tz'
-import { DateTime } from 'luxon'
-import { timezone as globalTimezone } from '../composables/global'
-import { i18n } from '../modules/valaxy'
+// dayjs
+import dayjs from 'dayjs'
+import relativeTime from 'dayjs/plugin/relativeTime'
+import timezone from 'dayjs/plugin/timezone'
+import utc from 'dayjs/plugin/utc'
 
-const referenceDate = new Date(1986, 3 /* Apr */, 4, 10, 32, 0, 900)
+dayjs.extend(relativeTime)
+dayjs.extend(timezone)
+dayjs.extend(utc)
+
+// https://day.js.org/docs/en/timezone/set-default-timezone
+export { dayjs }
 
 /**
- * format the date
- * @param date the original date
- * @param formatStr the string of tokens
- * @param timezone the time zone of this local time, can be an offset or IANA time zone
- * @param options the object with options. See [Options]{@link https://date-fns.org/docs/Options}
+ * format the date (dayjs)
+ * with default timezone
  */
-export function formatDate(date: string | number | Date, formatStr = 'yyyy-MM-dd', timezone?: string, options?: ToDateOptionsWithTZ): string {
-  const locale = i18n.global.locale.value
-
-  const mergedOptions: ToDateOptionsWithTZ = Object.assign({ locale: { code: locale } }, options)
-  const clientTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone
-
-  try {
-    /**
-     * Format the timezone-less date to ISO. If none is specified, use the client's timezone.
-     * If the input date is already in ISO format, the timezone won't be applied.
-     */
-    date = handleTimeWithZone(date, timezone || globalTimezone.value || clientTimezone).toString()
-    // Convert to the client's timezone unless the user specifies otherwise
-    const zonedDate = toZonedTime(date, options?.timeZone || clientTimezone, mergedOptions)
-    // The format function will never change the underlying date
-    return formatWithTZ(zonedDate, formatStr, { timeZone: options?.timeZone })
+export function formatDate(date?: string | number | Date, options: {
+  template?: string
+  timezone?: string
+  // keepLocalTime?: boolean
+} = {}) {
+  if (typeof date === 'string') {
+    date = new Date(date)
   }
-  catch (error) {
-    console.error(
-      'The date format provided is non-standard. The recommended format is \'yyyy-MM-dd HH:mm:ss\'',
-      '\nError formatting date:',
-      date.toString(),
-      error,
-    )
-    return format(referenceDate, formatStr)
-  }
-}
-
-function handleTimeWithZone(date: string | number | Date, timezone: string) {
-  if (typeof date !== 'string')
-    date = toDate(date).toISOString()
-
-  let dateTime = DateTime.fromISO(date, { setZone: true })
-
-  const toDateTime = (date: string, zone: string) => {
-    // Attempt to format the date using a function that handles non-ISO 8601 formats
-    const isoDate = format(date, 'yyyy-MM-dd\'T\'HH:mm:ss')
-    return DateTime.fromISO(isoDate, { zone })
-  }
-
-  if (!dateTime.isValid || !dateTime.zoneName)
-    dateTime = toDateTime(date, timezone)
-
-  return dateTime
+  return dayjs.tz(dayjs.utc(date), options.timezone).format(options.template || 'YYYY-MM-DD')
 }
 
 /**

package/dist/chunk-ACYXZDCP.js

@@ -0,0 +1,2 @@
+import {createRequire as __createRequire} from 'module';var require=__createRequire(import.meta.url);
+import{a as w,d as h,e as d}from"./chunk-BKO6YTFK.js";d();d();function Q(e,t){var n={};for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&t.indexOf(r)<0&&(n[r]=e[r]);if(e!=null&&typeof Object.getOwnPropertySymbols=="function")for(var o=0,r=Object.getOwnPropertySymbols(e);o<r.length;o++)t.indexOf(r[o])<0&&Object.prototype.propertyIsEnumerable.call(e,r[o])&&(n[r[o]]=e[r[o]]);return n}function Z(e,t,n,r){function o(s){return s instanceof n?s:new n(function(c){c(s)})}return new(n||(n=Promise))(function(s,c){function l(i){try{u(r.next(i))}catch(p){c(p)}}function a(i){try{u(r.throw(i))}catch(p){c(p)}}function u(i){i.done?s(i.value):o(i.value).then(l,a)}u((r=r.apply(e,t||[])).next())})}import{createHash as me}from"node:crypto";import G from"node:fs";import se from"node:module";import b from"node:path";import{fileURLToPath as be,pathToFileURL as X}from"node:url";import{MessageChannel as he,Worker as _e,parentPort as we,receiveMessageOnPort as ge,workerData as re}from"node:worker_threads";d();import{createRequire as de}from"node:module";var j=process.cwd(),A=typeof w>"u"?de(import.meta.url):w,ee=[".ts",".tsx",...Object.keys(A.extensions)];d();import q from"node:fs";import _ from"node:path";var ye=e=>{try{return A.resolve(e)}catch{}},W=e=>!!ye(e),I=(e,t=!1)=>{if(typeof e=="string")return q.existsSync(e)&&(t||q.statSync(e).isFile())?e:"";for(let n of e??[])if(I(n,t))return n;return""},te=(e,t=ee)=>{let n=[...t,""].find(r=>I(e+r));return n==null?"":e+n},D=(e,t,n)=>{if(console.assert(_.isAbsolute(e)),!I(e,!0)||e!==j&&!e.startsWith(j+_.sep))return"";e=_.resolve(q.statSync(e).isDirectory()?e:_.resolve(e,".."));let r=typeof t=="string",o=r?t:"package.json";do{let s=I(_.resolve(e,o),r&&n);if(s)return s;e=_.resolve(e,"..")}while(e===j||e.startsWith(j+_.sep));return""};d();var ve=4,f={TsNode:"ts-node",EsbuildRegister:"esbuild-register",EsbuildRunner:"esbuild-runner",SWC:"swc",TSX:"tsx"},{NODE_OPTIONS:k,SYNCKIT_EXEC_ARGV:B,SYNCKIT_GLOBAL_SHIMS:Se,SYNCKIT_TIMEOUT:ne,SYNCKIT_TS_RUNNER:Ee}=process.env,ie=Number(process.versions.node.split(".")[0])>=20,xe=ne?+ne:void 0,Te=B?.split(",")||[],je=Ee,Oe=["1","true"].includes(Se),Pe=[{moduleName:"node-fetch",globalName:"fetch"},{moduleName:"node:perf_hooks",globalName:"performance",named:"performance"}],Ne=16,g;function Re(e){if(e&&typeof e=="object"){let t={};for(let n in e)t[n]=e[n];return t}}function nt(e,t){g??(g=new Map);let n=g.get(e);if(n)return n;if(!b.isAbsolute(e))throw new Error("`workerPath` must be absolute");let r=Ce(e,typeof t=="number"?{timeout:t}:t);return g.set(e,r),r}var F=typeof w>"u"?se.createRequire(import.meta.url):w,$e=e=>new URL(`data:text/javascript,${encodeURIComponent(e)}`),ae=e=>{var t;try{return!!(!((t=G.statSync(e,{throwIfNoEntry:!1}))===null||t===void 0)&&t.isFile())}catch{return!1}},Ie=(e,{execArgv:t,tsRunner:n})=>{let r=b.extname(e);if(!/[/\\]node_modules[/\\]/.test(e)&&(!r||/^\.[cm]?js$/.test(r))){let a=r?e.slice(0,-r.length):e,u;switch(r){case".cjs":{u=[".cts",".cjs"];break}case".mjs":{u=[".mts",".mjs"];break}default:{u=[".ts",".js"];break}}let i=te(a,u),p;i&&(!r||(p=i!==a))&&(e=i,p&&(r=b.extname(e)))}let o=/\.[cm]?ts$/.test(e),s=e.endsWith(".mjs"),c=e.endsWith(".mts");if(o){if(!c){let a=D(e);a&&(c=F(a).type==="module")}switch(n==null&&W(f.TsNode)&&(n=f.TsNode),n){case f.TsNode:{c?t.includes("--loader")||(t=["--loader",`${f.TsNode}/esm`,...t]):t.includes("-r")||(t=["-r",`${f.TsNode}/register`,...t]);break}case f.EsbuildRegister:{t.includes("-r")||(t=["-r",f.EsbuildRegister,...t]);break}case f.EsbuildRunner:{t.includes("-r")||(t=["-r",`${f.EsbuildRunner}/register`,...t]);break}case f.SWC:{t.includes("-r")||(t=["-r",`@${f.SWC}-node/register`,...t]);break}case f.TSX:{t.includes("--loader")||(t=["--loader",f.TSX,...t]);break}default:throw new Error(`Unknown ts runner: ${String(n)}`)}}else if(!s){let a=D(e);a&&(s=F(a).type==="module")}let l;if(process.versions.pnp){let a=k?.split(/\s+/),u;try{u=F.resolve("pnpapi")}catch{}if(u&&!a?.some((i,p)=>["-r","--require"].includes(i)&&u===F.resolve(a[p+1]))&&!t.includes(u)){t=["-r",u,...t];let i=b.resolve(u,"../.pnp.loader.mjs");ae(i)&&(l=X(i).toString(),ie||(t=["--experimental-loader",l,...t]))}}return{ext:r,isTs:o,jsUseEsm:s,tsRunner:n,tsUseEsm:c,workerPath:e,pnpLoaderPath:l,execArgv:t}},De=e=>me("md5").update(e).digest("hex"),V=(e,t="import")=>{let{moduleName:n,globalName:r,named:o,conditional:s}=typeof e=="string"?{moduleName:e}:e,c=t==="import"?`import${r?" "+(o===null?"* as "+r:o?.trim()?`{${o}}`:r)+" from":""} '${b.isAbsolute(n)?String(X(n)):n}'`:`${r?"const "+(o?.trim()?`{${o}}`:r)+"=":""}require('${n.replace(/\\/g,"\\\\")}')`;if(!r)return c;let l=`globalThis.${r}=${o?.trim()?o:r}`;return c+(s===!1?`;${l}`:`;if(!globalThis.${r})${l}`)},Fe=(e,t)=>e.reduce((n,r)=>`${n}${n?";":""}${V(r,t)}`,""),v,U,Ue=typeof h>"u"?b.dirname(be(import.meta.url)):h,O,S,oe=(e,t,n="import")=>{v??(v=new Map);let r=v.get(e);if(r){let[l,a]=r;if(n==="require"&&!a||n==="import"&&a&&ae(a))return l}let o=Fe(t,n),s=o,c;return n==="import"&&(U||(U=b.resolve(D(Ue),"../node_modules/.synckit")),G.mkdirSync(U,{recursive:!0}),c=b.resolve(U,De(e)+".mjs"),s=V(c),G.writeFileSync(c,o)),v.set(e,[s,c]),s};function Ce(e,{timeout:t=xe,execArgv:n=Te,tsRunner:r=je,transferList:o=[],globalShims:s=Oe}={}){let{port1:c,port2:l}=new he,{isTs:a,ext:u,jsUseEsm:i,tsUseEsm:p,tsRunner:P,workerPath:E,pnpLoaderPath:ce,execArgv:ue}=Ie(e,{execArgv:n,tsRunner:r}),K=X(E);if(/\.[cm]ts$/.test(E)){let y=!p||Number.parseFloat(process.versions.node)>=Ne;if(P){if([f.EsbuildRegister,f.EsbuildRunner,f.SWC,...y?[]:[f.TSX]].includes(P))throw new Error(`${P} is not supported for ${u} files yet`+(y?", you can try [tsx](https://github.com/esbuild-kit/tsx) instead":""))}else throw new Error("No ts runner specified, ts worker path is not supported")}let C=(s===!0?Pe:Array.isArray(s)?s:[]).filter(({moduleName:y})=>W(y));S??(S=new Int32Array(O??(O=new SharedArrayBuffer(ve)),0,1));let H=C.length>0,Y=a?!p:!i&&H,z=new _e(i&&H||p&&P===f.TsNode?$e(`${oe(E,C)};import '${String(K)}'`):Y?`${oe(E,C,"require")};${V(E,"require")}`:K,{eval:Y,workerData:{sharedBuffer:O,workerPort:l,pnpLoaderPath:ce},transferList:[l,...o],execArgv:ue}),fe=0,J=(y,m,x)=>{let L=Date.now(),T=Atomics.wait(S,0,0,x);if(Atomics.store(S,0,0),!["ok","not-equal"].includes(T)){let M={id:m,cmd:"abort"};throw y.postMessage(M),new Error("Internal error: Atomics.wait() failed: "+T)}let N=ge(c).message,{id:R}=N,pe=Q(N,["id"]);if(R<m){let M=Date.now()-L;return J(y,m,x?x-M:void 0)}if(m!==R)throw new Error(`Internal error: Expected id ${m} but got id ${R}`);return Object.assign({id:R},pe)},le=(...y)=>{let m=fe++,x={id:m,args:y};z.postMessage(x);let{result:L,error:T,properties:N}=J(c,m,t);if(T)throw Object.assign(T,N);return L};return z.unref(),le}function ot(e){if(!re)return;let{workerPort:t,sharedBuffer:n,pnpLoaderPath:r}=re;r&&ie&&se.register(r);let o=new Int32Array(n,0,1);we.on("message",({id:s,args:c})=>{Z(this,void 0,void 0,function*(){let l=!1,a=i=>{i.id===s&&i.cmd==="abort"&&(l=!0)};t.on("message",a);let u;try{u={id:s,result:yield e(...c)}}catch(i){u={id:s,error:i,properties:Re(i)}}t.off("message",a),!l&&(t.postMessage(u),Atomics.add(o,0,1),Atomics.notify(o,0))})})}export{nt as a,ot as b};

package/dist/{chunk-KQEK3EI2.mjs → chunk-BKO6YTFK.js}

@@ -1,2 +1,2 @@
 import {createRequire as __createRequire} from 'module';var require=__createRequire(import.meta.url);
-var n=Object.create;var i=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var d=(t=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(t,{get:(e,o)=>(typeof require<"u"?require:e)[o]}):t)(function(t){if(typeof require<"u")return require.apply(this,arguments);throw Error('Dynamic require of "'+t+'" is not supported')});var l=(t,e)=>()=>(t&&(e=t(t=0)),e);var g=(t,e)=>()=>(e||t((e={exports:{}}).exports,e),e.exports);var s=(t,e,o,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let m of p(e))!f.call(t,m)&&m!==o&&i(t,m,{get:()=>e[m],enumerable:!(r=a(e,m))||r.enumerable});return t};var h=(t,e,o)=>(o=t!=null?n(c(t)):{},s(e||!t||!t.__esModule?i(o,"default",{value:t,enumerable:!0}):o,t));var _=l(()=>{"use strict"});export{d as a,g as b,h as c,_ as d};
+var n=Object.create;var i=Object.defineProperty;var a=Object.getOwnPropertyDescriptor;var p=Object.getOwnPropertyNames;var c=Object.getPrototypeOf,f=Object.prototype.hasOwnProperty;var u=(t=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(t,{get:(e,o)=>(typeof require<"u"?require:e)[o]}):t)(function(t){if(typeof require<"u")return require.apply(this,arguments);throw Error('Dynamic require of "'+t+'" is not supported')});var l=(t,e)=>()=>(t&&(e=t(t=0)),e);var D=(t,e)=>()=>(e||t((e={exports:{}}).exports,e),e.exports);var s=(t,e,o,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let m of p(e))!f.call(t,m)&&m!==o&&i(t,m,{get:()=>e[m],enumerable:!(r=a(e,m))||r.enumerable});return t};var F=(t,e,o)=>(o=t!=null?n(c(t)):{},s(e||!t||!t.__esModule?i(o,"default",{value:t,enumerable:!0}):o,t));import{fileURLToPath as _}from"url";import d from"path";var g,h,T,x=l(()=>{"use strict";g=()=>_(import.meta.url),h=()=>d.dirname(g()),T=h()});export{u as a,D as b,F as c,T as d,x as e};