Skip to content

Commit

Permalink
Merge branch 'main' into theme-hope
Browse files Browse the repository at this point in the history
  • Loading branch information
Mister-Hope committed Feb 1, 2024
2 parents 4a22eff + 89c7633 commit 860e18b
Show file tree
Hide file tree
Showing 77 changed files with 1,194 additions and 7,657 deletions.
3 changes: 1 addition & 2 deletions docs/.vuepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { webpackBundler } from '@vuepress/bundler-webpack'
import { docsearchPlugin } from '@vuepress/plugin-docsearch'
import { registerComponentsPlugin } from '@vuepress/plugin-register-components'
import { defineUserConfig } from 'vuepress'
import type { UserConfig } from 'vuepress'
import { getDirname, path } from 'vuepress/utils'
import { head } from './configs/index.js'
import theme from './theme.js'
Expand Down Expand Up @@ -117,4 +116,4 @@ export default defineUserConfig({
componentsDir: path.resolve(__dirname, './components'),
}),
],
}) as UserConfig
})
67 changes: 10 additions & 57 deletions docs/.vuepress/configs/navbar/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export const enNavbar = navbar([
'/guide/plugin.md',
'/guide/bundler.md',
'/guide/migration.md',
'/guide/troubleshooting.md',
],
},
{
Expand Down Expand Up @@ -47,61 +48,9 @@ export const enNavbar = navbar([
prefix: 'bundler/',
children: ['vite', 'webpack'],
},
{
text: 'Default Theme',
prefix: 'default-theme/',
children: [
'config',
'frontmatter',
'components',
'markdown',
'styles',
'extending',
],
},
],
},
{
text: 'Plugins',
icon: 'fa6-solid:plug',
prefix: '/reference/plugin/',
children: [
{
text: 'Common Features',
children: [
'back-to-top',
'container',
'external-link-icon',
'google-analytics',
'medium-zoom',
'nprogress',
'register-components',
],
},
{
text: 'Content Search',
children: ['docsearch', 'search'],
},
{
text: 'PWA',
children: ['pwa', 'pwa-popup'],
},
{
text: 'Syntax Highlighting',
children: ['prismjs', 'shiki'],
},
{
text: 'Theme Development',
children: [
'active-header-links',
'git',
'palette',
'theme-data',
'toc',
],
},
],
},

{
text: 'Learn More',
icon: 'fa6-solid:feather',
Expand All @@ -122,6 +71,14 @@ export const enNavbar = navbar([
{
text: 'Resources',
children: [
{
text: 'Official Ecosystem',
link: 'https://ecosystem.vuejs.press/',
},
{
text: 'VuePress MarketPlace',
link: 'https://marketplace.vuejs.press',
},
{
text: 'Contributing Guide',
link: 'https://github.com/vuepress/core/blob/main/CONTRIBUTING.md',
Expand All @@ -130,10 +87,6 @@ export const enNavbar = navbar([
text: 'Awesome VuePress',
link: 'https://github.com/vuepress/awesome-vuepress',
},
{
text: 'VuePress MarketPlace',
link: 'https://marketplace.vuejs.press',
},
],
},
],
Expand Down
66 changes: 9 additions & 57 deletions docs/.vuepress/configs/navbar/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export const zhNavbar = navbar([
'/zh/guide/plugin.md',
'/zh/guide/bundler.md',
'/zh/guide/migration.md',
'/zh/guide/troubleshooting.md',
],
},
{
Expand All @@ -43,59 +44,6 @@ export const zhNavbar = navbar([
prefix: 'bundler/',
children: ['vite', 'webpack'],
},
{
text: '默认主题',
prefix: 'default-theme/',
children: [
'config',
'frontmatter',
'components',
'markdown',
'styles',
'extending',
],
},
],
},
{
text: '插件',
icon: 'fa6-solid:plug',
prefix: '/zh/reference/plugin/',
children: [
{
text: '常用功能',
children: [
'back-to-top',
'container',
'external-link-icon',
'google-analytics',
'medium-zoom',
'nprogress',
'register-components',
],
},
{
text: '内容搜索',
children: ['docsearch', 'search'],
},
{
text: 'PWA',
children: ['pwa', 'pwa-popup'],
},
{
text: '语法高亮',
children: ['prismjs', 'shiki'],
},
{
text: '主题开发',
children: [
'active-header-links',
'git',
'palette',
'theme-data',
'toc',
],
},
],
},
{
Expand All @@ -118,6 +66,14 @@ export const zhNavbar = navbar([
{
text: '其他资源',
children: [
{
text: '官方生态系统',
link: 'https://ecosystem.vuejs.press/zh/',
},
{
text: 'VuePress 市场',
link: 'https://marketplace.vuejs.press/zh/',
},
{
text: '贡献指南',
link: 'https://github.com/vuepress/core/blob/main/CONTRIBUTING_zh.md',
Expand All @@ -126,10 +82,6 @@ export const zhNavbar = navbar([
text: 'Awesome VuePress',
link: 'https://github.com/vuepress/awesome-vuepress',
},
{
text: 'VuePress 市场',
link: 'https://marketplace.vuejs.press/zh/',
},
],
},
],
Expand Down
85 changes: 48 additions & 37 deletions docs/.vuepress/configs/sidebar/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,24 @@ import { sidebar } from 'vuepress-theme-hope'

export const enSidebar = sidebar({
'/guide/': [
'introduction',
'getting-started',
'configuration',
'page',
'markdown',
'assets',
'i18n',
'deployment',
'theme',
'plugin',
'bundler',
'migration',
{
text: 'Guide',
children: [
'/guide/introduction.md',
'/guide/getting-started.md',
'/guide/configuration.md',
'/guide/page.md',
'/guide/markdown.md',
'/guide/assets.md',
'/guide/i18n.md',
'/guide/deployment.md',
'/guide/theme.md',
'/guide/plugin.md',
'/guide/bundler.md',
'/guide/migration.md',
'/guide/troubleshooting.md',
],
},
],
'/advanced/': [
{
Expand Down Expand Up @@ -60,56 +66,61 @@ export const enSidebar = sidebar({
},
{
text: 'Default Theme Reference',
icon: 'fa6-solid:palette',
prefix: 'default-theme/',
collapsible: true,
children: [
'config',
'frontmatter',
'components',
'markdown',
'styles',
'extending',
'/reference/default-theme/config.md',
'/reference/default-theme/frontmatter.md',
'/reference/default-theme/components.md',
'/reference/default-theme/markdown.md',
'/reference/default-theme/styles.md',
'/reference/default-theme/extending.md',
],
},
{
text: 'Official Plugins Reference',
icon: 'fa6-solid:plug',
prefix: 'plugin/',
collapsible: true,
children: [
{
text: 'Common Features',
children: [
'back-to-top',
'container',
'external-link-icon',
'google-analytics',
'medium-zoom',
'nprogress',
'register-components',
'/reference/plugin/back-to-top.md',
'/reference/plugin/container.md',
'/reference/plugin/external-link-icon.md',
'/reference/plugin/google-analytics.md',
'/reference/plugin/medium-zoom.md',
'/reference/plugin/nprogress.md',
'/reference/plugin/register-components.md',
],
},
{
text: 'Content Search',
children: ['docsearch', 'search'],
children: [
'/reference/plugin/docsearch.md',
'/reference/plugin/search.md',
],
},
{
text: 'PWA',
children: ['pwa', 'pwa-popup'],
children: [
'/reference/plugin/pwa.md',
'/reference/plugin/pwa-popup.md',
],
},
{
text: 'Syntax Highlighting',
children: ['prismjs', 'shiki'],
children: [
'/reference/plugin/prismjs.md',
'/reference/plugin/shiki.md',
],
},
{
text: 'Theme Development',
children: [
'active-header-links',
'git',
'palette',
'theme-data',
'toc',
'/reference/plugin/active-header-links.md',
'/reference/plugin/git.md',
'/reference/plugin/palette.md',
'/reference/plugin/theme-data.md',
'/reference/plugin/toc.md',
],
},
],
Expand Down
Loading

0 comments on commit 860e18b

Please sign in to comment.