From f52b1d576b024443f737604d2220a0edb1571355 Mon Sep 17 00:00:00 2001
From: Yugo Ogura <jigenbakdaaan@gmail.com>
Date: Thu, 3 Sep 2020 12:15:18 +0900
Subject: [PATCH 1/7] feat: add prev/next links (#56)

* feat: set Prev/Next to page data
* feat: set links at the bottom of page
* feat: hide next/prev links when themeConfig expressly set false
---
 .../components/NextAndPrevLinks.ts            | 22 ++++++++++
 .../components/NextAndPrevLinks.vue           | 25 +++++++++++
 src/client/theme-default/components/Page.vue  |  8 ++++
 src/node/server.ts                            | 41 ++++++++++++++++++-
 types/shared.d.ts                             |  2 +
 5 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 src/client/theme-default/components/NextAndPrevLinks.ts
 create mode 100644 src/client/theme-default/components/NextAndPrevLinks.vue

diff --git a/src/client/theme-default/components/NextAndPrevLinks.ts b/src/client/theme-default/components/NextAndPrevLinks.ts
new file mode 100644
index 00000000..9080a73f
--- /dev/null
+++ b/src/client/theme-default/components/NextAndPrevLinks.ts
@@ -0,0 +1,22 @@
+import { defineComponent, computed } from 'vue'
+import { usePageData } from 'vitepress'
+
+export default defineComponent({
+  setup() {
+    const pageData = usePageData()
+    const next = computed(() => {
+      return pageData.value.next
+    })
+    const prev = computed(() => {
+      return pageData.value.prev
+    })
+    const hasLinks = computed(() => {
+      return !!next || !!prev
+    })
+    return {
+      next,
+      prev,
+      hasLinks
+    }
+  }
+})
diff --git a/src/client/theme-default/components/NextAndPrevLinks.vue b/src/client/theme-default/components/NextAndPrevLinks.vue
new file mode 100644
index 00000000..f15b9b07
--- /dev/null
+++ b/src/client/theme-default/components/NextAndPrevLinks.vue
@@ -0,0 +1,25 @@
+<template>
+  <div v-if="hasLinks" class="links-wrapper">
+    <div class="prev-link">
+      <div v-if="prev">
+      ← <a :href="prev.link">{{prev.text}}</a>
+      </div>
+    </div>
+    <div class="next-link">
+      <div v-if="next">
+      <a :href="next.link">{{next.text}}</a> →
+      </div>
+    </div>
+  </div>
+</template>
+
+<script src="./NextAndPrevLinks"></script>
+
+<style>
+.links-wrapper {
+  padding-top: 1rem;
+  padding-bottom: 1rem;
+  display: flex;
+  justify-content: space-between;
+}
+</style>
\ No newline at end of file
diff --git a/src/client/theme-default/components/Page.vue b/src/client/theme-default/components/Page.vue
index c2c3536c..676886ea 100644
--- a/src/client/theme-default/components/Page.vue
+++ b/src/client/theme-default/components/Page.vue
@@ -1,9 +1,17 @@
 <template>
   <div class="content">
     <Content />
+    <NextAndPrevLinks />
   </div>
 </template>
 
+<script>
+import NextAndPrevLinks from './NextAndPrevLinks.vue'
+export default {
+  components:{ NextAndPrevLinks }
+}
+</script>
+
 <style>
 .content {
   max-width: 46rem;
diff --git a/src/node/server.ts b/src/node/server.ts
index 4eea0adb..644d041a 100644
--- a/src/node/server.ts
+++ b/src/node/server.ts
@@ -104,13 +104,17 @@ function createVitePressPlugin({
         ctx.body = vueSrc
         debug(ctx.url, ctx.status)
 
+        const pageDataWithLinks = {
+          ...pageData,
+          ...getNextAndPrev(siteData.themeConfig, ctx.path)
+        }
         await next()
 
         // make sure this is the main <script> block
         if (!ctx.query.type) {
           // inject pageData to generated script
           ctx.body += `\nexport const __pageData = ${JSON.stringify(
-            JSON.stringify(pageData)
+            JSON.stringify(pageDataWithLinks)
           )}`
         }
         return
@@ -127,6 +131,41 @@ function createVitePressPlugin({
   }
 }
 
+function getNextAndPrev(themeConfig: any, pagePath: string) {
+  if (!themeConfig.sidebar) {
+    return
+  }
+  const sidebar = themeConfig.sidebar
+  let candidates: { text: string; link: string }[] = []
+  Object.keys(sidebar).forEach((k) => {
+    if (!pagePath.startsWith(k)) {
+      return
+    }
+    sidebar[k].forEach((sidebarItem: { [key: string]: any }) => {
+      if (!sidebarItem.children) {
+        return
+      }
+      sidebarItem.children.forEach((candidate: any) => {
+        candidates.push(candidate)
+      })
+    })
+  })
+
+  const path = pagePath.replace(/\.(md|html)$/, '')
+  const currentLinkIndex = candidates.findIndex((v) => v.link === path)
+  const hideNextLink = themeConfig.nextLinks === false
+  const hidePrevLink = themeConfig.prevLinks === false
+
+  return {
+    ...(currentLinkIndex !== -1 && !hideNextLink
+      ? { next: candidates[currentLinkIndex + 1] }
+      : {}),
+    ...(currentLinkIndex !== -1 && !hidePrevLink
+      ? { prev: candidates[currentLinkIndex - 1] }
+      : {})
+  }
+}
+
 export async function createServer(options: ServerConfig = {}) {
   const config = await resolveConfig(options.root)
 
diff --git a/types/shared.d.ts b/types/shared.d.ts
index 93a77742..3cf71d5d 100644
--- a/types/shared.d.ts
+++ b/types/shared.d.ts
@@ -26,6 +26,8 @@ export interface PageData {
   frontmatter: Record<string, any>
   headers: Header[]
   lastUpdated: number
+  next?: { text: string; link: string }
+  prev?: { text: string; link: string }
 }
 
 export interface Header {

From 63a36919601df678a0f8225627d66dff67c81c3a Mon Sep 17 00:00:00 2001
From: em2046 <em2046@qq.com>
Date: Thu, 3 Sep 2020 11:15:42 +0800
Subject: [PATCH 2/7] feat: support config alias (#59)

---
 src/node/build/bundle.ts |  5 +++--
 src/node/config.ts       | 12 ++++++++++--
 src/node/resolver.ts     |  7 ++++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 91543b09..b3ef8d96 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -3,7 +3,7 @@ import slash from 'slash'
 import fs from 'fs-extra'
 import { APP_PATH, createResolver, SITE_DATA_REQUEST_PATH } from '../resolver'
 import { BuildOptions } from './build'
-import { SiteConfig } from '../config'
+import { resolveUserConfig, SiteConfig } from '../config'
 import { Plugin, OutputAsset, OutputChunk } from 'rollup'
 import { createMarkdownToVueRenderFn } from '../markdownToVue'
 import {
@@ -34,7 +34,8 @@ export async function bundle(
   options: BuildOptions
 ): Promise<[BuildResult, BuildResult, Record<string, string>]> {
   const root = config.root
-  const resolver = createResolver(config.themeDir)
+  const userConfig = await resolveUserConfig(root)
+  const resolver = createResolver(config.themeDir, userConfig)
   const markdownToVue = createMarkdownToVueRenderFn(root)
 
   let isClientBuild = true
diff --git a/src/node/config.ts b/src/node/config.ts
index ecc5248a..3df6646c 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -17,6 +17,7 @@ export interface UserConfig<ThemeConfig = any> {
   head?: HeadConfig[]
   themeConfig?: ThemeConfig
   locales?: Record<string, LocaleConfig>
+  alias?: Record<string, string>
   // TODO locales support etc.
 }
 
@@ -37,6 +38,7 @@ const resolve = (root: string, file: string) =>
 export async function resolveConfig(
   root: string = process.cwd()
 ): Promise<SiteConfig> {
+  const userConfig = await resolveUserConfig(root)
   const site = await resolveSiteData(root)
 
   // resolve theme path
@@ -53,13 +55,13 @@ export async function resolveConfig(
     configPath: resolve(root, 'config.js'),
     outDir: resolve(root, 'dist'),
     tempDir: path.resolve(APP_PATH, 'temp'),
-    resolver: createResolver(themeDir)
+    resolver: createResolver(themeDir, userConfig)
   }
 
   return config
 }
 
-export async function resolveSiteData(root: string): Promise<SiteData> {
+export async function resolveUserConfig(root: string) {
   // load user config
   const configPath = resolve(root, 'config.js')
   const hasUserConfig = await fs.pathExists(configPath)
@@ -72,6 +74,12 @@ export async function resolveSiteData(root: string): Promise<SiteData> {
     debug(`no config file found.`)
   }
 
+  return userConfig
+}
+
+export async function resolveSiteData(root: string): Promise<SiteData> {
+  const userConfig = await resolveUserConfig(root)
+
   return {
     lang: userConfig.lang || 'en-US',
     title: userConfig.title || 'VitePress',
diff --git a/src/node/resolver.ts b/src/node/resolver.ts
index 9ba866ac..6ac5afc2 100644
--- a/src/node/resolver.ts
+++ b/src/node/resolver.ts
@@ -1,5 +1,6 @@
 import path from 'path'
 import { Resolver } from 'vite'
+import { UserConfig } from './config'
 
 export const APP_PATH = path.join(__dirname, '../client/app')
 export const SHARED_PATH = path.join(__dirname, '../client/shared')
@@ -15,9 +16,13 @@ export const SITE_DATA_REQUEST_PATH = '/' + SITE_DATA_ID
 // so that we can resolve custom requests that start with /@app or /@theme
 // we also need to map file paths back to their public served paths so that
 // vite HMR can send the correct update notifications to the client.
-export function createResolver(themeDir: string): Resolver {
+export function createResolver(
+  themeDir: string,
+  userConfig: UserConfig
+): Resolver {
   return {
     alias: {
+      ...userConfig.alias,
       '/@app/': APP_PATH,
       '/@theme/': themeDir,
       '/@shared/': SHARED_PATH,

From 5daaa9098993faaf0453de6abba21f3409883f37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Sep 2020 12:17:04 +0900
Subject: [PATCH 3/7] build(deps): bump prismjs from 1.20.0 to 1.21.0 (#66)

Bumps [prismjs](https://github.com/PrismJS/prism) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PrismJS/prism/compare/v1.20.0...v1.21.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 615db856..d017b819 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2983,9 +2983,9 @@ prettier@^2.0.5:
   integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
 
 prismjs@^1.20.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.20.0.tgz#9b685fc480a3514ee7198eac6a3bf5024319ff03"
-  integrity sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.21.0.tgz#36c086ec36b45319ec4218ee164c110f9fc015a3"
+  integrity sha512-uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw==
   optionalDependencies:
     clipboard "^2.0.0"
 

From 092ee772dafa78a66c2e35524bd921eb0aa31b16 Mon Sep 17 00:00:00 2001
From: Carlos Rodrigues <david-181@hotmail.com>
Date: Thu, 3 Sep 2020 04:19:27 +0100
Subject: [PATCH 4/7] fix(router): allow open new tab with ctrl + click (#69)

* fix(router): allow open new tab with ctrl + click

* chore: add other keys
---
 src/client/app/router.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/client/app/router.ts b/src/client/app/router.ts
index 8b4b678e..02499af6 100644
--- a/src/client/app/router.ts
+++ b/src/client/app/router.ts
@@ -97,6 +97,10 @@ export function createRouter(
           const currentUrl = window.location
           // only intercept inbound links
           if (
+            !e.ctrlKey &&
+            !e.shiftKey &&
+            !e.altKey &&
+            !e.metaKey &&
             target !== `_blank` &&
             protocol === currentUrl.protocol &&
             hostname === currentUrl.hostname

From 79bc9fb15a9560932228f22e7bd152272d577da6 Mon Sep 17 00:00:00 2001
From: Carlos Rodrigues <david-181@hotmail.com>
Date: Thu, 3 Sep 2020 04:22:07 +0100
Subject: [PATCH 5/7] feat(sidebar): use base when creating link (#74)

---
 src/client/theme-default/components/SideBar.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/client/theme-default/components/SideBar.ts b/src/client/theme-default/components/SideBar.ts
index fff731e2..d12e3f20 100644
--- a/src/client/theme-default/components/SideBar.ts
+++ b/src/client/theme-default/components/SideBar.ts
@@ -1,4 +1,9 @@
-import { usePageData, useRoute, useSiteDataByRoute } from 'vitepress'
+import {
+  usePageData,
+  useRoute,
+  useSiteDataByRoute,
+  useSiteData
+} from 'vitepress'
 import { computed, h, FunctionalComponent, VNode } from 'vue'
 import { Header } from '../../../../types/shared'
 import { isActive, getPathDirName } from '../utils'
@@ -9,12 +14,14 @@ const SideBarItem: FunctionalComponent<{
   item: ResolvedSidebarItem
 }> = (props) => {
   const {
-    item: { link, text, children }
+    item: { link: relLink, text, children }
   } = props
 
   const route = useRoute()
   const pageData = usePageData()
+  const siteData = useSiteData()
 
+  const link = `${siteData.value.base}${relLink || ''}`
   const active = isActive(route, link)
   const headers = pageData.value.headers
 

From 39dbd7806e96e18e60de87311ae7b162ebb61c3c Mon Sep 17 00:00:00 2001
From: Yugo Ogura <jigenbakdaaan@gmail.com>
Date: Thu, 3 Sep 2020 12:23:01 +0900
Subject: [PATCH 6/7] feat: add responsive sidebar support (#75)

---
 src/client/theme-default/Layout.vue           | 19 +++++++-
 .../components/ToggleSideBarButton.vue        | 47 +++++++++++++++++++
 src/client/theme-default/styles/layout.css    | 21 ++++++++-
 src/client/theme-default/styles/vars.css      |  5 ++
 4 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 src/client/theme-default/components/ToggleSideBarButton.vue

diff --git a/src/client/theme-default/Layout.vue b/src/client/theme-default/Layout.vue
index 66fac926..4234a5f1 100644
--- a/src/client/theme-default/Layout.vue
+++ b/src/client/theme-default/Layout.vue
@@ -2,9 +2,10 @@
   <div class="theme">
     <header>
       <NavBar />
+      <ToggleSideBarButton @toggle="toggleSidebar" />
     </header>
-    <aside>
-      <SideBar />
+    <aside :class="{ open }">
+      <SideBar/>
     </aside>
     <main>
       <Page />
@@ -14,15 +15,29 @@
 </template>
 
 <script>
+import { ref } from 'vue'
+
 import NavBar from './components/NavBar.vue'
+import ToggleSideBarButton from './components/ToggleSideBarButton.vue'
 import SideBar from './components/SideBar.vue'
 import Page from './components/Page.vue'
 
 export default {
   components: {
     NavBar,
+    ToggleSideBarButton,
     SideBar,
     Page
+  },
+  setup() {
+    let open = ref(false)
+    const toggleSidebar = () => {
+      open.value = !open.value
+    }
+    return {
+      open,
+      toggleSidebar
+    }
   }
 }
 </script>
diff --git a/src/client/theme-default/components/ToggleSideBarButton.vue b/src/client/theme-default/components/ToggleSideBarButton.vue
new file mode 100644
index 00000000..d3d1dd1b
--- /dev/null
+++ b/src/client/theme-default/components/ToggleSideBarButton.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="sidebar-button" @click="$emit('toggle')">
+    <svg
+      class="icon"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-hidden="true"
+      role="img"
+      viewBox="0 0 448 512"
+    >
+      <path
+        fill="currentColor"
+        d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12z"
+        class
+      />
+    </svg>
+  </div>
+</template>
+
+<script>
+
+export default {
+  emits: ['toggle']
+}
+</script>
+
+<style>
+.sidebar-button {
+  cursor: pointer;
+  display: none;
+  width: 1.25rem;
+  height: 1.25rem;
+  position: absolute;
+  top: 1.25rem;
+  left: 1rem;
+}
+.sidebar-button .icon {
+  display: block;
+  width: 1.25rem;
+  height: 1.25rem;
+}
+
+@media screen and (max-width: 719px) {
+  .sidebar-button {
+    display: block;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/client/theme-default/styles/layout.css b/src/client/theme-default/styles/layout.css
index bbc68bb5..d440bf04 100644
--- a/src/client/theme-default/styles/layout.css
+++ b/src/client/theme-default/styles/layout.css
@@ -28,6 +28,11 @@ header {
   justify-content: space-between;
   padding: 0 1.75rem 0 1.5rem;
 }
+@media screen and (max-width: 719px) {
+  header {
+    padding: 0 1.75rem 0 4rem;
+  }
+}
 
 aside {
   position: fixed;
@@ -41,11 +46,25 @@ aside {
   z-index: 3;
   overflow-y: auto;
 }
+@media screen and (max-width: 719px) {
+  aside {
+    transition: transform .2s ease;
+    transform: translateX(-100%);
+  }
+  aside.open {
+    transform: translateX(0);
+  }
+}
 
 main {
   margin-top: var(--header-height);
   margin-left: var(--sidebar-width);
 }
+@media screen and (max-width: 719px) {
+  main {
+    margin-left: 0;
+  }
+}
 
 a {
   text-decoration: none;
@@ -69,7 +88,7 @@ h1 {
 
 h2 {
   font-size: 1.65rem;
-  padding-bottom: .3rem;
+  padding-bottom: 0.3rem;
   border-bottom: 1px solid var(--border-color);
 }
 
diff --git a/src/client/theme-default/styles/vars.css b/src/client/theme-default/styles/vars.css
index e188d548..264691a0 100644
--- a/src/client/theme-default/styles/vars.css
+++ b/src/client/theme-default/styles/vars.css
@@ -6,4 +6,9 @@
   --text-color-light: #476582;
   --code-bg-color: #282c34;
   --accent-color: #3eaf7c;
+
+  /* responsive breakpoints */
+  /* --mq-narrow: 959px; */
+  /* --mq-mobile: 719px; */
+  /* --mq-mobile-narrow: 419px; */
 }

From d2b6d39228a03ad122ab09420dab2cba2c2b4167 Mon Sep 17 00:00:00 2001
From: Carlos Rodrigues <david-181@hotmail.com>
Date: Thu, 3 Sep 2020 11:31:24 +0100
Subject: [PATCH 7/7] fix(sidebar): fix sidebar when you open a nested link
 (#73)

---
 src/client/theme-default/components/SideBar.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/theme-default/components/SideBar.ts b/src/client/theme-default/components/SideBar.ts
index d12e3f20..8a8b677c 100644
--- a/src/client/theme-default/components/SideBar.ts
+++ b/src/client/theme-default/components/SideBar.ts
@@ -136,7 +136,8 @@ function resolveMultiSidebar(
   headers: Header[],
   depth: number
 ): ResolvedSidebar {
-  const item = config[getPathDirName(path)]
+  const paths = [path, Object.keys(config)[0]]
+  const item = paths.map((x) => config[getPathDirName(x)]).find(Boolean)
 
   if (Array.isArray(item)) {
     return resolveArraySidebar(item, depth)