diff --git a/cypress/e2e/theme-yun/fm.spec.ts b/cypress/e2e/theme-yun/fm.spec.ts index e0df6b6b..b6669af7 100644 --- a/cypress/e2e/theme-yun/fm.spec.ts +++ b/cypress/e2e/theme-yun/fm.spec.ts @@ -10,6 +10,21 @@ context('Frontmatter', { .should('eq', Cypress.env('theme-yun')) }) + it('posted & edited time', () => { + cy.visit('/posts/hello-valaxy') + + cy.get('.post-time time') + .should('have.length', 2) + + cy.get('.post-time > .posted-time time') + .invoke('text') + .should('match', /\d{4}-\d{2}-\d{2}/) + + cy.get('.post-time > .edited-time time') + .invoke('text') + .should('match', /\d{4}-\d{2}-\d{2}/) + }) + // time warning in post it('time warning', () => { cy.visit('/test/time_warning') @@ -21,15 +36,13 @@ context('Frontmatter', { it('word count & reading time', () => { cy.visit('/posts/hello-valaxy') - const counterContainer = cy.get('.post-counter') - - counterContainer - .get('.word-count span') + cy + .get('.post-counter > .word-count span') .invoke('text') .should('match', /\d+/) - counterContainer - .get('.reading-time time') + cy + .get('.post-counter > .reading-time time') .invoke('text') .then((text) => { text = text.trim() diff --git a/docs/.gitignore b/docs/.gitignore index 4f2fc4ac..f4719ff1 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1 +1,10 @@ .vitepress/cache + +# valaxy rss +public/atom.xml + +# valaxy rss +public/feed.xml + +# valaxy rss +public/feed.json diff --git a/packages/valaxy-theme-yun/components/YunPostCollapse.vue b/packages/valaxy-theme-yun/components/YunPostCollapse.vue index bbaa8e46..748961f2 100644 --- a/packages/valaxy-theme-yun/components/YunPostCollapse.vue +++ b/packages/valaxy-theme-yun/components/YunPostCollapse.vue @@ -66,7 +66,9 @@ const sortedYears = computed(() => { >
- +

diff --git a/packages/valaxy-theme-yun/components/YunPostMeta.vue b/packages/valaxy-theme-yun/components/YunPostMeta.vue index e7bd6925..9250040e 100644 --- a/packages/valaxy-theme-yun/components/YunPostMeta.vue +++ b/packages/valaxy-theme-yun/components/YunPostMeta.vue @@ -30,14 +30,14 @@ const siteConfig = useSiteConfig() flex="~ col" justify="center" items="center" text="sm" py="1" >
- +
-
diff --git a/packages/valaxy/node/plugins/extendConfig.ts b/packages/valaxy/node/plugins/extendConfig.ts index e2b32f97..00948863 100644 --- a/packages/valaxy/node/plugins/extendConfig.ts +++ b/packages/valaxy/node/plugins/extendConfig.ts @@ -53,7 +53,7 @@ const EXCLUDE = [ 'unocss', 'vue', - 'vue-i18n', + // 'vue-i18n', 'vue-demi', // separate deps vue-i18n @vue/devtools-api 'vue-router', diff --git a/packages/valaxy/node/plugins/vueRouter.ts b/packages/valaxy/node/plugins/vueRouter.ts index 97a9a292..80ac7504 100644 --- a/packages/valaxy/node/plugins/vueRouter.ts +++ b/packages/valaxy/node/plugins/vueRouter.ts @@ -109,7 +109,7 @@ export function createRouterPlugin(options: ResolvedValaxyOptions) { // set route meta route.addToMeta({ - frontmatter: Object.assign(defaultFrontmatter, mdFm), + frontmatter: mdFm, excerpt: excerpt ? getExcerptByType(excerpt, mdFm.excerpt_type) : '', })