valaxy 0.6.0 → 0.6.3

package/client/components/ValaxyMd.vue

@@ -3,6 +3,7 @@ import type { Post } from 'valaxy'
 import { onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useAplayer, useCodePen } from '~/composables'
+import { useCopyCode } from '~/composables/copy-code'
 import { wrapTable } from '~/utils'
 
 const props = defineProps<{
@@ -27,41 +28,47 @@ if (props.frontmatter.aplayer)
 
 if (props.frontmatter.codepen)
   useCodePen()
+
+useCopyCode()
 </script>
 
 <template>
-  <article v-if="$slots.default" :class="frontmatter.markdown !== false && 'markdown-body'">
-    <slot ref="content" @vnode-updated="updateDom" />
-
-    <div text="center">
-      <a
-        v-if="frontmatter.url"
-        :href="frontmatter.url"
-        class="post-link-btn shadow hover:shadow-md"
-        rounded
-        target="_blank"
-        m="b-4"
-      >
-        {{ t('post.view_link') }}
-      </a>
-    </div>
+  <Transition appear>
+    <article v-if="$slots.default" :class="frontmatter.markdown !== false && 'markdown-body'">
+      <slot ref="content" @vnode-updated="updateDom" />
 
-    <slot v-if="typeof frontmatter.end !== 'undefined'" name="end">
-      <div m="y-4" class="end flex justify-center items-center">
-        <hr class="line inline-flex" w="full" m="!y-2">
-        <span p="x-4" font="serif bold" class="whitespace-nowrap">
-          {{ frontmatter.end ? 'Q.E.D.' : 'To Be Continued.' }}
-        </span>
-        <hr class="line inline-flex" w="full" m="!y-2">
+      <div text="center">
+        <a
+          v-if="frontmatter.url"
+          :href="frontmatter.url"
+          class="post-link-btn shadow hover:shadow-md"
+          rounded
+          target="_blank"
+          m="b-4"
+        >
+          {{ t('post.view_link') }}
+        </a>
       </div>
-    </slot>
-  </article>
+
+      <slot v-if="frontmatter.end !== undefined" name="end">
+        <div m="y-4" class="end flex justify-center items-center">
+          <hr class="line inline-flex" w="full" m="!y-2">
+          <span p="x-4" font="serif bold" class="whitespace-nowrap">
+            {{ frontmatter.end ? 'Q.E.D.' : 'To Be Continued.' }}
+          </span>
+          <hr class="line inline-flex" w="full" m="!y-2">
+        </div>
+      </slot>
+    </article>
+  </Transition>
 </template>
 
 <style lang="scss">
-.end {
-  .line {
-    height: 1px;
+.markdown-body {
+  .end {
+    .line {
+      height: 1px;
+    }
   }
 }
 </style>

package/client/composables/copy-code.ts

@@ -0,0 +1,92 @@
+import { nextTick, watch } from 'vue'
+import { isClient } from '@vueuse/core'
+import { useRoute } from 'vue-router'
+
+export function useCopyCode() {
+  const route = useRoute()
+
+  if (isClient) {
+    watch(
+      () => route.path,
+      () => {
+        nextTick(() => {
+          document
+            .querySelectorAll<HTMLSpanElement>(
+              '.markdown-body div[class*="language-"]>span.copy',
+            )
+            .forEach(handleElement)
+        })
+      },
+      { immediate: true, flush: 'post' },
+    )
+  }
+}
+
+async function copyToClipboard(text: string) {
+  try {
+    return navigator.clipboard.writeText(text)
+  }
+  catch {
+    const element = document.createElement('textarea')
+    const previouslyFocusedElement = document.activeElement
+
+    element.value = text
+
+    // Prevent keyboard from showing on mobile
+    element.setAttribute('readonly', '')
+
+    element.style.contain = 'strict'
+    element.style.position = 'absolute'
+    element.style.left = '-9999px'
+    element.style.fontSize = '12pt' // Prevent zooming on iOS
+
+    const selection = document.getSelection()
+    const originalRange = selection
+      ? selection.rangeCount > 0 && selection.getRangeAt(0)
+      : null
+
+    document.body.appendChild(element)
+    element.select()
+
+    // Explicit selection workaround for iOS
+    element.selectionStart = 0
+    element.selectionEnd = text.length
+
+    document.execCommand('copy')
+    document.body.removeChild(element)
+
+    if (originalRange) {
+      selection!.removeAllRanges() // originalRange can't be truthy when selection is falsy
+      selection!.addRange(originalRange)
+    }
+
+    // Get the focus back on the previously focused element, if any
+    if (previouslyFocusedElement)
+      (previouslyFocusedElement as HTMLElement).focus()
+  }
+}
+
+function handleElement(el: HTMLElement) {
+  el.onclick = () => {
+    const parent = el.parentElement
+
+    if (!parent)
+      return
+
+    const isShell
+      = parent.classList.contains('language-sh')
+      || parent.classList.contains('language-bash')
+
+    let { innerText: text = '' } = parent
+
+    if (isShell)
+      text = text.replace(/^ *\$ /gm, '')
+
+    copyToClipboard(text).then(() => {
+      el.classList.add('copied')
+      setTimeout(() => {
+        el.classList.remove('copied')
+      }, 3000)
+    })
+  }
+}

package/client/composables/outline.ts

@@ -1,6 +1,5 @@
 import type { Ref } from 'vue'
-import { computed, onMounted, onUnmounted, onUpdated } from 'vue'
-import { useRoute } from 'vue-router'
+import { onMounted, onUnmounted, onUpdated } from 'vue'
 import type { Header } from '../../types'
 import { throttleAndDebounce } from '~/utils'
 
@@ -52,18 +51,6 @@ function mapHeaders(
 // magic number to avoid repeated retrieval
 const PAGE_OFFSET = 56
 
-export function useOutline() {
-  const route = useRoute()
-
-  const hasOutline = computed(() => {
-    return route.meta?.headers?.length > 0
-  })
-
-  return {
-    hasOutline,
-  }
-}
-
 export function useActiveAnchor(
   container: Ref<HTMLElement>,
   marker: Ref<HTMLElement>,

package/client/composables/sidebar.ts

@@ -158,15 +158,3 @@ function throttleAndDebounce(fn: () => void, delay: number): () => void {
     }
   }
 }
-
-export function useOutline() {
-  const route = useRoute()
-
-  const hasOutline = computed(() => {
-    return route.meta.headers.length > 0
-  })
-
-  return {
-    hasOutline,
-  }
-}

package/client/locales/en.yml

@@ -3,12 +3,13 @@ button:
   back: Back
   go: GO
   home: Home
-  toggle_dark: Toggle dark mode
+  toggle_light: Switch to light mode
+  toggle_dark: Switch to dark mode
   toggle_langs: Change languages
 intro:
   desc: Theme Yun | Valaxy
   hi: Hi, {name}!
-not-found: Oops! Space collapse!
+not-found: Oops! Space collapsed!
 
 title:
   archive: Archive
@@ -40,8 +41,8 @@ post:
   toc_empty: This post does not have a Table of Contents
   views: Views
   comments_count: Comments
-  related_posts: Related Posts
-  view_link: View Link
+  related_posts: Related posts
+  view_link: View link
   read_more: READ MORE
   cover: Cover
   copyright:
@@ -61,24 +62,24 @@ footer:
   total_visitors: Total Visitors
 
 counter:
-  archives: No post | 1 post in total | {count} posts in total
-  categories: No category | 1 category in total | {count} categories in total
-  tags: No tag | 1 tag in total | {count} tags in total
+  archives: No posts | 1 post | {count} posts
+  categories: No categories | 1 category | {count} categories
+  tags: No tags | 1 tag | {count} tags
   albums:
     zero: No album
-    one: 1 album in total
-    other: '%d albums in total'
+    one: 1 album
+    other: '%d albums'
   photos:
     zero: No photo
-    one: 1 photo in total
-    other: '%d photos in total'
+    one: 1 photo
+    other: '%d photos'
 
 category:
   uncategorized: Uncategorized
 
 search:
   placeholder: Searching...
-  empty: 'We didn''t find any results for the search: {query}.'
+  empty: 'We could not find any results for the search: {query}.'
   hits_time: '{hits} results found in {time} ms'
 
 symbol:
@@ -97,12 +98,12 @@ accessibility:
 
 wordcount:
   count: Word count in article
-  count_total: Word count total
+  count_total: Total words
   time: Reading time
   time_total: Total reading time
 
 time:
-  day: Days
-  hour: Hours
-  minute: Minutes
-  second: Seconds
+  day: 1 Day | %d Days
+  hour: 1 Hour | %d Hours
+  minute: 1 Minute | %d Minutes
+  second: 1 Second | %d Seconds

package/client/locales/zh-CN.yml

@@ -3,6 +3,7 @@ button:
   back: 返回
   go: 确定
   home: 首页
+  toggle_light: 切换亮色模式
   toggle_dark: 切换深色模式
   toggle_langs: 切换语言
 intro:
@@ -101,7 +102,7 @@ wordcount:
   time_total: 站点阅读时长
 
 time:
-  day: 天
-  hour: 小时
-  minute: 分
-  second: 秒
+  day: 1 天 | %d 天
+  hour: 1 小时 | %d 小时
+  minute: 1 分 | %d 分
+  second: 1 秒 | %d 秒

package/client/modules/valaxy.ts

@@ -12,7 +12,7 @@ import { useStorage } from '@vueuse/core'
 
 import type { Router } from 'vue-router'
 import type { PageDataPayload } from '../../types'
-import { initConfig, initContext, valaxyConfigSymbol } from '../config'
+import { initConfig, valaxyConfigSymbol } from '../config'
 import { ensureSuffix } from '@antfu/utils'
 
 import type { UserModule } from '~/types'
@@ -45,7 +45,6 @@ function shouldHotReload(payload: PageDataPayload): boolean {
 
 export const install: UserModule = ({ app, router }) => {
   // inject valaxy config before modules
-  const ctx = initContext()
   const config = initConfig()
   app.provide(valaxyConfigSymbol, config)
 
@@ -62,18 +61,6 @@ export const install: UserModule = ({ app, router }) => {
   router.isReady().then(() => {
     handleHMR(router)
   })
-
-  function pathToUrl(path: string): string {
-    return `${location.origin}/@fs${ctx.value.userRoot}/pages${path}.md?import`
-  }
-
-  router.beforeEach(async (to) => {
-    try {
-      const { __pageData } = await import(/* @vite-ignore */pathToUrl(to.path))
-      to.meta = Object.assign(to.meta, __pageData)
-    }
-    catch {}
-  })
 }
 
 function handleHMR(router: Router): void {