From e79108cce040b5068531452864cd6a0a28c2ef42 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 10 Dec 2020 13:35:13 +0100
Subject: [PATCH 01/78] build: fix release script

---
 scripts/release.js | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/scripts/release.js b/scripts/release.js
index b9b13aa7..39d5c1c3 100644
--- a/scripts/release.js
+++ b/scripts/release.js
@@ -8,8 +8,6 @@ const currentVersion = require('../package.json').version
 
 const versionIncrements = ['patch', 'minor', 'major']
 
-const tags = ['latest', 'next']
-
 const inc = (i) => semver.inc(currentVersion, i)
 const bin = (name) => path.resolve(__dirname, `../node_modules/.bin/${name}`)
 const run = (bin, args, opts = {}) =>
@@ -43,19 +41,10 @@ async function main() {
     throw new Error(`Invalid target version: ${targetVersion}`)
   }
 
-  const { tag } = await prompt({
-    type: 'select',
-    name: 'tag',
-    message: 'Select tag type',
-    choices: tags
-  })
-
-  console.log(tag)
-
   const { yes: tagOk } = await prompt({
     type: 'confirm',
     name: 'yes',
-    message: `Releasing v${targetVersion} with the "${tag}" tag. Confirm?`
+    message: `Releasing v${targetVersion}. Confirm?`
   })
 
   if (!tagOk) {
@@ -73,6 +62,7 @@ async function main() {
   // Generate the changelog.
   step('\nGenerating the changelog...')
   await run('yarn', ['changelog'])
+  await run('yarn', ['prettier', '--write', 'CHANGELOG.md'])
 
   const { yes: changelogOk } = await prompt({
     type: 'confirm',
@@ -84,17 +74,16 @@ async function main() {
     return
   }
 
-  // Commit changes to the Git.
+  // Commit changes to the Git and create a tag.
   step('\nCommitting changes...')
-  await run('git', ['add', '-A'])
+  await run('git', ['add', 'CHANGELOG.md', 'package.json'])
   await run('git', ['commit', '-m', `release: v${targetVersion}`])
+  await run('git', ['tag', `v${targetVersion}`])
 
   // Publish the package.
   step('\nPublishing the package...')
   await run('yarn', [
     'publish',
-    '--tag',
-    tag,
     '--new-version',
     targetVersion,
     '--no-commit-hooks',
@@ -103,7 +92,6 @@ async function main() {
 
   // Push to GitHub.
   step('\nPushing to GitHub...')
-  await run('git', ['tag', `v${targetVersion}`])
   await run('git', ['push', 'origin', `refs/tags/v${targetVersion}`])
   await run('git', ['push'])
 }

From 309aa7a8d0e7ab08c1c9db258c74709a66b295cb Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 10 Dec 2020 13:39:22 +0100
Subject: [PATCH 02/78] release: v0.9.2

---
 CHANGELOG.md | 70 +++++++++++++++++++++++++++-------------------------
 package.json |  2 +-
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f075f778..a7d65527 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,65 +1,67 @@
-## [0.9.1](https://github.com/vuejs/vitepress/compare/v0.9.0...v0.9.1) (2020-12-05)
+## [0.9.2](https://github.com/vuejs/vitepress/compare/v0.9.1...v0.9.2) (2020-12-10)
 
+Fix build files
 
-### Bug Fixes
+## [0.9.1](https://github.com/vuejs/vitepress/compare/v0.9.0...v0.9.1) (2020-12-05)
 
-* **theme:** the actionLink miss withBase ([#168](https://github.com/vuejs/vitepress/issues/168)) ([#169](https://github.com/vuejs/vitepress/issues/169)) ([ffaca73](https://github.com/vuejs/vitepress/commit/ffaca73992675cef789fe8e13dd8132ae14bbd53))
-* align $title with vuepress ([#158](https://github.com/vuejs/vitepress/issues/158)) ([#163](https://github.com/vuejs/vitepress/issues/163)) ([30740d3](https://github.com/vuejs/vitepress/commit/30740d3516e3f7cce0e083faa90a732d9916f9af))
-* fix h2 anchor hover ([9bd79e8](https://github.com/vuejs/vitepress/commit/9bd79e8de1827251796d1647b5d258818a94f3b3)), closes [#174](https://github.com/vuejs/vitepress/issues/174)
-* fix inline code not inheriting the parent font size ([f5a570f](https://github.com/vuejs/vitepress/commit/f5a570f640c539d96cfa2104613521a70cf2f199))
-* fix link prefetch ([ade6ddd](https://github.com/vuejs/vitepress/commit/ade6dddbb5ea72cc7569fcfc46f5e6a362af58ce))
-* hydration mismatch when home page having action link ([a7686b7](https://github.com/vuejs/vitepress/commit/a7686b7691a3e3d7d10226fd4f7971929701965a))
-* make home page look better ([#154](https://github.com/vuejs/vitepress/issues/154)) ([a084cd3](https://github.com/vuejs/vitepress/commit/a084cd3f782f2aaf78a6542b0c86f67676580a73))
-* prevLinks and nextLinks config type ([#165](https://github.com/vuejs/vitepress/issues/165)) ([1b6981a](https://github.com/vuejs/vitepress/commit/1b6981a9157588bc4e29e591ba8a0d9ca5c9c9e8))
-* siteData passed to enhanceApp being siteDataByRoute ([#159](https://github.com/vuejs/vitepress/issues/159)) ([01d2837](https://github.com/vuejs/vitepress/commit/01d2837474caef19daaf0be4b3c283dbe85a09da))
+### Bug Fixes
 
+- **theme:** the actionLink miss withBase ([#168](https://github.com/vuejs/vitepress/issues/168)) ([#169](https://github.com/vuejs/vitepress/issues/169)) ([ffaca73](https://github.com/vuejs/vitepress/commit/ffaca73992675cef789fe8e13dd8132ae14bbd53))
+- align $title with vuepress ([#158](https://github.com/vuejs/vitepress/issues/158)) ([#163](https://github.com/vuejs/vitepress/issues/163)) ([30740d3](https://github.com/vuejs/vitepress/commit/30740d3516e3f7cce0e083faa90a732d9916f9af))
+- fix h2 anchor hover ([9bd79e8](https://github.com/vuejs/vitepress/commit/9bd79e8de1827251796d1647b5d258818a94f3b3)), closes [#174](https://github.com/vuejs/vitepress/issues/174)
+- fix inline code not inheriting the parent font size ([f5a570f](https://github.com/vuejs/vitepress/commit/f5a570f640c539d96cfa2104613521a70cf2f199))
+- fix link prefetch ([ade6ddd](https://github.com/vuejs/vitepress/commit/ade6dddbb5ea72cc7569fcfc46f5e6a362af58ce))
+- hydration mismatch when home page having action link ([a7686b7](https://github.com/vuejs/vitepress/commit/a7686b7691a3e3d7d10226fd4f7971929701965a))
+- make home page look better ([#154](https://github.com/vuejs/vitepress/issues/154)) ([a084cd3](https://github.com/vuejs/vitepress/commit/a084cd3f782f2aaf78a6542b0c86f67676580a73))
+- prevLinks and nextLinks config type ([#165](https://github.com/vuejs/vitepress/issues/165)) ([1b6981a](https://github.com/vuejs/vitepress/commit/1b6981a9157588bc4e29e591ba8a0d9ca5c9c9e8))
+- siteData passed to enhanceApp being siteDataByRoute ([#159](https://github.com/vuejs/vitepress/issues/159)) ([01d2837](https://github.com/vuejs/vitepress/commit/01d2837474caef19daaf0be4b3c283dbe85a09da))
 
 ### Features
 
-* built-in ClientOnly component ([8809d2d](https://github.com/vuejs/vitepress/commit/8809d2dbfc6818ba1618fa43368a45130d940890))
-* **default-theme:** support customLayout: true in frontmatter ([f32771f](https://github.com/vuejs/vitepress/commit/f32771fe8646701410ba4b231a2b0ce38230ab64))
-* add `$withBase` global app function ([15e18df](https://github.com/vuejs/vitepress/commit/15e18df01e6e5ca8af605365896fee0024244b37))
-* add Algolia DocSearch ([#40](https://github.com/vuejs/vitepress/issues/40)) ([#153](https://github.com/vuejs/vitepress/issues/153)) ([5bb4730](https://github.com/vuejs/vitepress/commit/5bb4730f7f48153ae006d7878431d0b58b0fffee))
-* add native support for carbon ads ([#86](https://github.com/vuejs/vitepress/issues/86)) ([9d6b8ca](https://github.com/vuejs/vitepress/commit/9d6b8cadcc6cd59bde6b9b20037f9038190672ce))
-* support customizing default theme via slots ([b8e892e](https://github.com/vuejs/vitepress/commit/b8e892e94a2fd2cedf7b25651548a08a758ccbdb))
-* add more global and computed properties (#152) ([c6bdcfb](https://github.com/vuejs/vitepress/commit/c6bdcfbf4f14916f20a7192b44941d33d4bee51e)), closes [#152](https://github.com/vuejs/vitepress/issues/152)
+- built-in ClientOnly component ([8809d2d](https://github.com/vuejs/vitepress/commit/8809d2dbfc6818ba1618fa43368a45130d940890))
+- **default-theme:** support customLayout: true in frontmatter ([f32771f](https://github.com/vuejs/vitepress/commit/f32771fe8646701410ba4b231a2b0ce38230ab64))
+- add `$withBase` global app function ([15e18df](https://github.com/vuejs/vitepress/commit/15e18df01e6e5ca8af605365896fee0024244b37))
+- add Algolia DocSearch ([#40](https://github.com/vuejs/vitepress/issues/40)) ([#153](https://github.com/vuejs/vitepress/issues/153)) ([5bb4730](https://github.com/vuejs/vitepress/commit/5bb4730f7f48153ae006d7878431d0b58b0fffee))
+- add native support for carbon ads ([#86](https://github.com/vuejs/vitepress/issues/86)) ([9d6b8ca](https://github.com/vuejs/vitepress/commit/9d6b8cadcc6cd59bde6b9b20037f9038190672ce))
+- support customizing default theme via slots ([b8e892e](https://github.com/vuejs/vitepress/commit/b8e892e94a2fd2cedf7b25651548a08a758ccbdb))
+- add more global and computed properties (#152) ([c6bdcfb](https://github.com/vuejs/vitepress/commit/c6bdcfbf4f14916f20a7192b44941d33d4bee51e)), closes [#152](https://github.com/vuejs/vitepress/issues/152)
 
 # [0.9.0](https://github.com/vuejs/vitepress/compare/v0.8.1...v0.9.0) (2020-11-24)
 
 ### Bug Fixes
 
-* avoid 300ms click delay on touch devices ([621ca3e](https://github.com/vuejs/vitepress/commit/621ca3e26f65e13e504724aef76aba3f3361ce81))
-* fix nested list having too much margin ([b0cf2be](https://github.com/vuejs/vitepress/commit/b0cf2be5614505731a3b6dcebeab949c3639c2b2))
-* fix sidebar active status not working as expected ([#140](https://github.com/vuejs/vitepress/issues/140)) ([#149](https://github.com/vuejs/vitepress/issues/149)) ([0b181e7](https://github.com/vuejs/vitepress/commit/0b181e7582ea4be7dca51ec399c697e32b7116f3))
-* make code block look prettier ([#146](https://github.com/vuejs/vitepress/issues/146)) ([242fcc1](https://github.com/vuejs/vitepress/commit/242fcc1098f606f13e7d8e123c081e73a3d89366))
-* some color in code block not working as expected ([#143](https://github.com/vuejs/vitepress/issues/143)) ([da09266](https://github.com/vuejs/vitepress/commit/da09266f5eede3796bb150ccd9d6a173e90354a4))
+- avoid 300ms click delay on touch devices ([621ca3e](https://github.com/vuejs/vitepress/commit/621ca3e26f65e13e504724aef76aba3f3361ce81))
+- fix nested list having too much margin ([b0cf2be](https://github.com/vuejs/vitepress/commit/b0cf2be5614505731a3b6dcebeab949c3639c2b2))
+- fix sidebar active status not working as expected ([#140](https://github.com/vuejs/vitepress/issues/140)) ([#149](https://github.com/vuejs/vitepress/issues/149)) ([0b181e7](https://github.com/vuejs/vitepress/commit/0b181e7582ea4be7dca51ec399c697e32b7116f3))
+- make code block look prettier ([#146](https://github.com/vuejs/vitepress/issues/146)) ([242fcc1](https://github.com/vuejs/vitepress/commit/242fcc1098f606f13e7d8e123c081e73a3d89366))
+- some color in code block not working as expected ([#143](https://github.com/vuejs/vitepress/issues/143)) ([da09266](https://github.com/vuejs/vitepress/commit/da09266f5eede3796bb150ccd9d6a173e90354a4))
 
 ### Features
 
-* add "last updated" feature ([40d204b](https://github.com/vuejs/vitepress/commit/40d204b2f68b90bd2c5e9940cd128c4c16cd5274))
+- add "last updated" feature ([40d204b](https://github.com/vuejs/vitepress/commit/40d204b2f68b90bd2c5e9940cd128c4c16cd5274))
 
 ## [0.8.1](https://github.com/vuejs/vitepress/compare/v0.8.0...v0.8.1) (2020-11-20)
 
 ### Bug Fixes
 
-* fix "next and prev link" not working when `link` has extention ([6dcf6b3](https://github.com/vuejs/vitepress/commit/6dcf6b3796bb3d6e703fddd79c6b0c0a7adfd567))
-* fix "next and prev links" not working when the `base` option is set ([#139](https://github.com/vuejs/vitepress/issues/139)) ([018a9b4](https://github.com/vuejs/vitepress/commit/018a9b46d924d0d08f7ff67f18a813348c84ab0a))
+- fix "next and prev link" not working when `link` has extention ([6dcf6b3](https://github.com/vuejs/vitepress/commit/6dcf6b3796bb3d6e703fddd79c6b0c0a7adfd567))
+- fix "next and prev links" not working when the `base` option is set ([#139](https://github.com/vuejs/vitepress/issues/139)) ([018a9b4](https://github.com/vuejs/vitepress/commit/018a9b46d924d0d08f7ff67f18a813348c84ab0a))
 
 # [0.8.0](https://github.com/vuejs/vitepress/compare/v0.7.4...v0.8.0) (2020-11-20)
 
 ### Bug Fixes
 
-* exit process with non-zero code on error ([fb09f8e](https://github.com/vuejs/vitepress/commit/fb09f8e638c06aec32494f731554fb1b989daaf0))
-* fix edit link and prev and next links display ([#97](https://github.com/vuejs/vitepress/issues/97)) ([c3b7172](https://github.com/vuejs/vitepress/commit/c3b71729513592112e233165782e60c9c5b425c4))
-* fix next and prev links not working ([#130](https://github.com/vuejs/vitepress/issues/130)) ([fdd498b](https://github.com/vuejs/vitepress/commit/fdd498be70cc09a4331dadd17c4a5339318f21bf))
-* display header-anchor links when using keyboard navigation ([ddc3640](https://github.com/vuejs/vitepress/commit/ddc3640ce66f606894b31e1b7ebeacaaf7b0f1b5))
-* show top part of scrollbar in sidebar ([#129](https://github.com/vuejs/vitepress/issues/129)) ([1ba209a](https://github.com/vuejs/vitepress/commit/1ba209a4d2b606bee1abb7ec1d383467d98cf198))
+- exit process with non-zero code on error ([fb09f8e](https://github.com/vuejs/vitepress/commit/fb09f8e638c06aec32494f731554fb1b989daaf0))
+- fix edit link and prev and next links display ([#97](https://github.com/vuejs/vitepress/issues/97)) ([c3b7172](https://github.com/vuejs/vitepress/commit/c3b71729513592112e233165782e60c9c5b425c4))
+- fix next and prev links not working ([#130](https://github.com/vuejs/vitepress/issues/130)) ([fdd498b](https://github.com/vuejs/vitepress/commit/fdd498be70cc09a4331dadd17c4a5339318f21bf))
+- display header-anchor links when using keyboard navigation ([ddc3640](https://github.com/vuejs/vitepress/commit/ddc3640ce66f606894b31e1b7ebeacaaf7b0f1b5))
+- show top part of scrollbar in sidebar ([#129](https://github.com/vuejs/vitepress/issues/129)) ([1ba209a](https://github.com/vuejs/vitepress/commit/1ba209a4d2b606bee1abb7ec1d383467d98cf198))
 
 ### Features
 
-* add ability to configure markdown options ([#127](https://github.com/vuejs/vitepress/issues/127)) ([#128](https://github.com/vuejs/vitepress/issues/128)) ([463a03a](https://github.com/vuejs/vitepress/commit/463a03a9815ce8fc9f55293dda07bc211ef4f62b))
-* add serve command ([#136](https://github.com/vuejs/vitepress/issues/136)) ([67868bd](https://github.com/vuejs/vitepress/commit/67868bd9281077a4ce708e666bf61a7824afb8b2))
-* better build command output ([e435eec](https://github.com/vuejs/vitepress/commit/e435eec94a841ab0e1c14d59bb13608d5ad6a011))
+- add ability to configure markdown options ([#127](https://github.com/vuejs/vitepress/issues/127)) ([#128](https://github.com/vuejs/vitepress/issues/128)) ([463a03a](https://github.com/vuejs/vitepress/commit/463a03a9815ce8fc9f55293dda07bc211ef4f62b))
+- add serve command ([#136](https://github.com/vuejs/vitepress/issues/136)) ([67868bd](https://github.com/vuejs/vitepress/commit/67868bd9281077a4ce708e666bf61a7824afb8b2))
+- better build command output ([e435eec](https://github.com/vuejs/vitepress/commit/e435eec94a841ab0e1c14d59bb13608d5ad6a011))
 
 ## [0.7.4](https://github.com/vuejs/vitepress/compare/v0.7.3...v0.7.4) (2020-11-11)
 
diff --git a/package.json b/package.json
index e31fb257..55a24fa9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From 5fc2ee09cd2ea1ce3e310d4d54c2ba16ea9b4c58 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Tue, 15 Dec 2020 16:10:09 +0800
Subject: [PATCH 03/78] chore: typo

---
 src/node/build/build.ts                | 4 ++--
 src/node/build/bundle.ts               | 4 ++--
 src/node/build/render.ts               | 4 ++--
 src/node/markdown/plugins/highlight.ts | 2 +-
 src/node/markdown/plugins/slugify.ts   | 2 +-
 src/node/resolver.ts                   | 2 +-
 src/node/utils/parseHeader.ts          | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index ed34c4b8..090e2a65 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -43,7 +43,7 @@ export async function build(buildOptions: BuildOptions = {}) {
       // alter the main chunk's hash on every build. It's also embedded as a
       // string and JSON.parsed from the client because it's faster than embedding
       // as JS object literal.
-      const hashMapStirng = JSON.stringify(JSON.stringify(pageToHashMap))
+      const hashMapString = JSON.stringify(JSON.stringify(pageToHashMap))
 
       for (const page of siteConfig.pages) {
         await renderPage(
@@ -53,7 +53,7 @@ export async function build(buildOptions: BuildOptions = {}) {
           appChunk,
           cssChunk,
           pageToHashMap,
-          hashMapStirng
+          hashMapString
         )
       }
     } catch (e) {
diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 29762178..b3c928a4 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -104,7 +104,7 @@ export async function bundle(
             fileName: chunk.fileName.replace(/\.js$/, '.lean.js'),
             code: chunk.code.replace(staticStripRE, ``)
           }
-          // remove static markers from orginal code
+          // remove static markers from original code
           chunk.code = chunk.code.replace(staticRestoreRE, '')
         }
       }
@@ -145,7 +145,7 @@ export async function bundle(
     },
     rollupOutputOptions: {
       ...rollupOutputOptions,
-      chunkFileNames: (chunk) => {
+      chunkFileNames(chunk): string {
         if (/runtime-dom/.test(chunk.name)) {
           return `framework.[hash].js`
         }
diff --git a/src/node/build/render.ts b/src/node/build/render.ts
index a3887b01..3883e38f 100644
--- a/src/node/build/render.ts
+++ b/src/node/build/render.ts
@@ -14,7 +14,7 @@ export async function renderPage(
   appChunk: OutputChunk,
   cssChunk: OutputAsset,
   pageToHashMap: Record<string, string>,
-  hashMapStirng: string
+  hashMapString: string
 ) {
   const { createApp } = require(path.join(config.tempDir, `_assets/app.js`))
   const { app, router } = createApp()
@@ -71,7 +71,7 @@ export async function renderPage(
   </head>
   <body>
     <div id="app">${content}</div>
-    <script>__VP_HASH_MAP__ = JSON.parse(${hashMapStirng})</script>
+    <script>__VP_HASH_MAP__ = JSON.parse(${hashMapString})</script>
     <script type="module" async src="${assetPath}${appChunk.fileName}"></script>
   </body>
 </html>`.trim()
diff --git a/src/node/markdown/plugins/highlight.ts b/src/node/markdown/plugins/highlight.ts
index 63d41f48..b9dbe0c9 100644
--- a/src/node/markdown/plugins/highlight.ts
+++ b/src/node/markdown/plugins/highlight.ts
@@ -37,7 +37,7 @@ export const highlight = (str: string, lang: string) => {
     } catch (e) {
       console.warn(
         chalk.yellow(
-          `[vuepress] Syntax highlight for language "${lang}" is not supported.`
+          `[vitepress] Syntax highlight for language "${lang}" is not supported.`
         )
       )
     }
diff --git a/src/node/markdown/plugins/slugify.ts b/src/node/markdown/plugins/slugify.ts
index 0fa4c54f..33d0fe32 100644
--- a/src/node/markdown/plugins/slugify.ts
+++ b/src/node/markdown/plugins/slugify.ts
@@ -12,7 +12,7 @@ export const slugify = (str: string): string => {
       .replace(rControl, '')
       // Replace special characters
       .replace(rSpecial, '-')
-      // Remove continous separators
+      // Remove continuos separators
       .replace(/\-{2,}/g, '-')
       // Remove prefixing and trailing separtors
       .replace(/^\-+|\-+$/g, '')
diff --git a/src/node/resolver.ts b/src/node/resolver.ts
index 5c829011..4438b12d 100644
--- a/src/node/resolver.ts
+++ b/src/node/resolver.ts
@@ -10,7 +10,7 @@ export const DEFAULT_THEME_PATH = path.join(
 )
 
 // special virtual file
-// we can't directly import '/@siteData' becase
+// we can't directly import '/@siteData' because
 // - it's not an actual file so we can't use tsconfig paths to redirect it
 // - TS doesn't allow shimming a module that starts with '/'
 export const SITE_DATA_ID = '@siteData'
diff --git a/src/node/utils/parseHeader.ts b/src/node/utils/parseHeader.ts
index 87271c5f..a0b591d0 100644
--- a/src/node/utils/parseHeader.ts
+++ b/src/node/utils/parseHeader.ts
@@ -5,7 +5,7 @@
 //
 // But header's parsing in the markdown content is done by the markdown
 // loader based on markdown-it. markdown-it parser will will always keep
-// HTML in headers, so in VuePress, after being parsed by the markdiwn
+// HTML in headers, so in VuePress, after being parsed by the markdown
 // loader, the raw HTML in headers will finally be parsed by Vue-loader.
 // so that we can write HTML/Vue in the header. One exception is the HTML
 // wrapped by <code>(markdown token: '`') tag.

From eefbd76b7a6778324e1591d237a1e5ab30658106 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Wed, 23 Dec 2020 18:07:14 +0800
Subject: [PATCH 04/78] chore: typo

---
 src/client/theme-default/config.ts          | 2 +-
 src/client/theme-default/support/sideBar.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/theme-default/config.ts b/src/client/theme-default/config.ts
index b8a36049..e049bcb7 100644
--- a/src/client/theme-default/config.ts
+++ b/src/client/theme-default/config.ts
@@ -15,7 +15,7 @@ export namespace DefaultTheme {
      * Customize the header label. Defaults to GitHub/Gitlab/Bitbucket
      * depending on the provided repo.
      *
-     * @exampe `"Contribute!"`
+     * @example `"Contribute!"`
      */
     repoLabel?: string
 
diff --git a/src/client/theme-default/support/sideBar.ts b/src/client/theme-default/support/sideBar.ts
index fb90d6b1..c44d624f 100644
--- a/src/client/theme-default/support/sideBar.ts
+++ b/src/client/theme-default/support/sideBar.ts
@@ -32,7 +32,7 @@ export function getSideBarConfig(
     return sidebar
   }
 
-  // get the very first segment of the path to compare with nulti sidebar keys
+  // get the very first segment of the path to compare with multiple sidebar keys
   // and make sure it's surrounded by slash
   path = removeExtention(path)
   path = ensureStartingSlash(path).split('/')[1] || '/'

From 5ba4ea2ef0ef76ffd2a445de3958ecb1b0495161 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Wed, 23 Dec 2020 18:08:45 +0800
Subject: [PATCH 05/78] refactor: refactor for <script setup>

---
 src/client/app/components/Debug.vue           | 23 ++++-------
 .../theme-default/components/LastUpdated.vue  | 40 +++++++------------
 .../theme-default/components/PageFooter.vue   | 10 +----
 3 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/src/client/app/components/Debug.vue b/src/client/app/components/Debug.vue
index 71034d9c..c20ea7dd 100644
--- a/src/client/app/components/Debug.vue
+++ b/src/client/app/components/Debug.vue
@@ -8,24 +8,15 @@
   </div>
 </template>
 
-<script lang="ts">
-import { defineComponent, ref, watch } from 'vue'
+<script setup lang="ts">
+import { ref, watch } from 'vue'
 
-export default defineComponent({
-  setup() {
-    const el = ref<HTMLElement | null>(null)
-    const open = ref(false)
+const el = ref<HTMLElement | null>(null)
+const open = ref(false)
 
-    watch(open, (value) => {
-      if (value === false) {
-        el.value!.scrollTop = 0
-      }
-    })
-
-    return {
-      el,
-      open
-    }
+watch(open, (value) => {
+  if (value === false) {
+    el.value!.scrollTop = 0
   }
 })
 </script>
diff --git a/src/client/theme-default/components/LastUpdated.vue b/src/client/theme-default/components/LastUpdated.vue
index c46b4da9..d33ab0a2 100644
--- a/src/client/theme-default/components/LastUpdated.vue
+++ b/src/client/theme-default/components/LastUpdated.vue
@@ -5,39 +5,29 @@
   </p>
 </template>
 
-<script lang="ts">
-import { defineComponent, ref, computed, onMounted } from 'vue'
+<script setup lang="ts">
+import { ref, computed, onMounted } from 'vue'
 import { useSiteDataByRoute, usePageData } from 'vitepress'
 
-export default defineComponent({
-  setup() {
-    const site = useSiteDataByRoute()
-    const page = usePageData()
+const site = useSiteDataByRoute()
+const page = usePageData()
 
-    const datetime = ref('')
+const datetime = ref('')
 
-    const hasLastUpdated = computed(() => {
-      const lu = site.value.themeConfig.lastUpdated
+const hasLastUpdated = computed(() => {
+  const lu = site.value.themeConfig.lastUpdated
 
-      return lu !== undefined && lu !== false
-    })
-
-    const prefix = computed(() => {
-      const p = site.value.themeConfig.lastUpdated
+  return lu !== undefined && lu !== false
+})
 
-      return p === true ? 'Last Updated' : p
-    })
+const prefix = computed(() => {
+  const p = site.value.themeConfig.lastUpdated
 
-    onMounted(() => {
-      datetime.value = new Date(page.value.lastUpdated).toLocaleString('en-US')
-    })
+  return p === true ? 'Last Updated' : p
+})
 
-    return {
-      hasLastUpdated,
-      prefix,
-      datetime
-    }
-  }
+onMounted(() => {
+  datetime.value = new Date(page.value.lastUpdated).toLocaleString('en-US')
 })
 </script>
 
diff --git a/src/client/theme-default/components/PageFooter.vue b/src/client/theme-default/components/PageFooter.vue
index dca324fe..4e3295ba 100644
--- a/src/client/theme-default/components/PageFooter.vue
+++ b/src/client/theme-default/components/PageFooter.vue
@@ -9,17 +9,9 @@
   </footer>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue'
+<script setup lang="ts">
 import EditLink from './EditLink.vue'
 import LastUpdated from './LastUpdated.vue'
-
-export default defineComponent({
-  components: {
-    EditLink,
-    LastUpdated
-  }
-})
 </script>
 
 <style scoped>

From 18d18d2eb15a569113ca68ccbb9ba52dfd46c80a Mon Sep 17 00:00:00 2001
From: Harlan Wilton <harlan@harlanzw.com>
Date: Wed, 23 Dec 2020 21:43:47 +1100
Subject: [PATCH 06/78] fix(md): avoid normalising markdown "mailto:" links
 (#173)

The "mailto:" links were being normalised which resulted in them being linking to a broken URL and not working.
---
 src/node/markdown/plugins/link.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/node/markdown/plugins/link.ts b/src/node/markdown/plugins/link.ts
index 4028b4eb..1e0bcbbb 100644
--- a/src/node/markdown/plugins/link.ts
+++ b/src/node/markdown/plugins/link.ts
@@ -23,7 +23,12 @@ export const linkPlugin = (
         Object.entries(externalAttrs).forEach(([key, val]) => {
           token.attrSet(key, val)
         })
-      } else if (!url.startsWith('#')) {
+      } else if (
+        // internal anchor links
+        !url.startsWith('#') &&
+        // mail links
+        !url.startsWith('mailto:')
+      ) {
         normalizeHref(hrefAttr)
       }
     }

From dd312ce86bf9daf4b169e025d4215c05e2ad63c5 Mon Sep 17 00:00:00 2001
From: Matias Capeletto <matias.capeletto@gmail.com>
Date: Sat, 26 Dec 2020 12:55:28 +0100
Subject: [PATCH 07/78] fix: port fixes to parseHeader utils from vuepress
 (#172)

---
 .../node/utils/deeplyParseHeader.spec.ts      | 33 +++++++++++
 __tests__/node/utils/parseHeader.spec.ts      | 38 +++++++++++++
 .../utils/removeNonCodeWrappedHTML.spec.ts    | 56 +++++++++++++++++++
 src/node/utils/parseHeader.ts                 |  6 +-
 4 files changed, 130 insertions(+), 3 deletions(-)
 create mode 100644 __tests__/node/utils/deeplyParseHeader.spec.ts
 create mode 100644 __tests__/node/utils/parseHeader.spec.ts
 create mode 100644 __tests__/node/utils/removeNonCodeWrappedHTML.spec.ts

diff --git a/__tests__/node/utils/deeplyParseHeader.spec.ts b/__tests__/node/utils/deeplyParseHeader.spec.ts
new file mode 100644
index 00000000..ded20eac
--- /dev/null
+++ b/__tests__/node/utils/deeplyParseHeader.spec.ts
@@ -0,0 +1,33 @@
+import { deeplyParseHeader } from 'node/utils/parseHeader'
+
+test('deeplyParseHeader', () => {
+  const asserts: Record<string, string> = {
+    // Remove tail html
+    '# `H1` <Comp></Comp>': '# H1',
+    '# *H1* <Comp/>': '# H1',
+
+    // Reserve code-wrapped tail html
+    '# `H1` `<Comp></Comp>`': '# H1 <Comp></Comp>',
+    '# *H1* `<Comp/>`': '# H1 <Comp/>',
+
+    // Remove leading html
+    '# <Comp></Comp> `H1`': '#  H1',
+    '# <Comp/> *H1*': '#  H1',
+
+    // Reserve code-wrapped leading html
+    '# `<Comp></Comp>` `H1`': '# <Comp></Comp> H1',
+    '# `<Comp/>` *H1*': '# <Comp/> H1',
+
+    // Remove middle html
+    '# `H1` <Comp></Comp> `H2`': '# H1  H2',
+    '# `H1` <Comp/> `H2`': '# H1  H2',
+
+    // Reserve middle html
+    '# `H1` `<Comp></Comp>` `H2`': '# H1 <Comp></Comp> H2',
+    '# `H1` `<Comp/>` `H2`': '# H1 <Comp/> H2'
+  }
+
+  Object.keys(asserts).forEach((input) => {
+    expect(deeplyParseHeader(input)).toBe(asserts[input])
+  })
+})
diff --git a/__tests__/node/utils/parseHeader.spec.ts b/__tests__/node/utils/parseHeader.spec.ts
new file mode 100644
index 00000000..a150cff0
--- /dev/null
+++ b/__tests__/node/utils/parseHeader.spec.ts
@@ -0,0 +1,38 @@
+import { parseHeader } from 'node/utils/parseHeader'
+
+describe('parseHeader', () => {
+  test('should unescape html', () => {
+    const input = `&lt;div :id=&quot;&#39;app&#39;&quot;&gt;`
+    expect(parseHeader(input)).toBe(`<div :id="'app'">`)
+  })
+
+  test('should remove markdown tokens correctly', () => {
+    const asserts: Record<string, string> = {
+      // vuepress #238
+      '[vue](vuejs.org)': 'vue',
+      '`vue`': 'vue',
+      '*vue*': 'vue',
+      '**vue**': 'vue',
+      '***vue***': 'vue',
+      _vue_: 'vue',
+      '\\_vue\\_': '_vue_',
+      '\\*vue\\*': '*vue*',
+      '\\!vue\\!': '!vue!',
+
+      // vuepress #2688
+      '[vue](vuejs.org) / [vue](vuejs.org)': 'vue / vue',
+      '[\\<ins>](vuejs.org)': '<ins>',
+
+      // vuepress #564 For multiple markdown tokens
+      '`a` and `b`': 'a and b',
+      '***bold and italic***': 'bold and italic',
+      '**bold** and *italic*': 'bold and italic',
+
+      // escaping \$
+      '\\$vue': '$vue'
+    }
+    Object.keys(asserts).forEach((input) => {
+      expect(parseHeader(input)).toBe(asserts[input])
+    })
+  })
+})
diff --git a/__tests__/node/utils/removeNonCodeWrappedHTML.spec.ts b/__tests__/node/utils/removeNonCodeWrappedHTML.spec.ts
new file mode 100644
index 00000000..d5481ad8
--- /dev/null
+++ b/__tests__/node/utils/removeNonCodeWrappedHTML.spec.ts
@@ -0,0 +1,56 @@
+import { removeNonCodeWrappedHTML } from 'node/utils/parseHeader'
+
+test('removeNonCodeWrappedHTML', () => {
+  const asserts: Record<string, string> = {
+    // Remove tail html
+    '# H1 <Comp></Comp>': '# H1 ',
+    '# H1<Comp></Comp>': '# H1',
+    '# H1 <Comp a="b"></Comp>': '# H1 ',
+    '# H1<Comp a="b"></Comp>': '# H1',
+    '# H1 <Comp/>': '# H1 ',
+    '# H1<Comp/>': '# H1',
+    '# H1 <Comp a="b"/>': '# H1 ',
+    '# H1<Comp a="b"/>': '# H1',
+
+    // Reserve code-wrapped tail html
+    '# H1 `<Comp></Comp>`': '# H1 `<Comp></Comp>`',
+    '# H1 `<Comp a="b"></Comp>`': '# H1 `<Comp a="b"></Comp>`',
+    '# H1 `<Comp/>`': '# H1 `<Comp/>`',
+    '# H1 `<Comp a="b"/>`': '# H1 `<Comp a="b"/>`',
+
+    // Remove leading html
+    '# <Comp></Comp> H1': '#  H1',
+    '# <Comp></Comp>H1': '# H1',
+    '# <Comp a="b"></Comp> H1': '#  H1',
+    '# <Comp a="b"></Comp>H1': '# H1',
+    '# <Comp/> H1': '#  H1',
+    '# <Comp/>H1': '# H1',
+    '# <Comp a="b"/> H1': '#  H1',
+    '# <Comp a="b"/>H1': '# H1',
+
+    // Reserve code-wrapped leading html
+    '# `<Comp></Comp>` H1': '# `<Comp></Comp>` H1',
+    '# `<Comp a="b"></Comp>` H1': '# `<Comp a="b"></Comp>` H1',
+    '# `<Comp/>` H1': '# `<Comp/>` H1',
+    '# `<Comp a="b"/>` H1': '# `<Comp a="b"/>` H1',
+
+    // Remove middle html
+    '# H1 <Comp></Comp> H2': '# H1  H2',
+    '# H1 <Comp a="b"></Comp> H2': '# H1  H2',
+    '# H1 <Comp/> H2': '# H1  H2',
+    '# H1 <Comp a="b"/> H2': '# H1  H2',
+
+    // Reserve code-wrapped middle html
+    '# H1 `<Comp></Comp>` H2': '# H1 `<Comp></Comp>` H2',
+    '# H1 `<Comp a="b"></Comp>` H2': '# H1 `<Comp a="b"></Comp>` H2',
+    '# H1 `<Comp/>` H2': '# H1 `<Comp/>` H2',
+    '# H1 `<Comp a="b"/>` H2': '# H1 `<Comp a="b"/>` H2',
+
+    // vuepress #2688
+    '# \\<ins>': '# \\<ins>'
+  }
+
+  Object.keys(asserts).forEach((input) => {
+    expect(removeNonCodeWrappedHTML(input)).toBe(asserts[input])
+  })
+})
diff --git a/src/node/utils/parseHeader.ts b/src/node/utils/parseHeader.ts
index a0b591d0..7d5624e6 100644
--- a/src/node/utils/parseHeader.ts
+++ b/src/node/utils/parseHeader.ts
@@ -28,9 +28,9 @@ const unescapeHtml = (html: string) =>
 
 const removeMarkdownTokens = (str: string) =>
   String(str)
-    .replace(/\[(.*)\]\(.*\)/, '$1') // []()
+    .replace(/(\[(.[^\]]+)\]\((.[^)]+)\))/g, '$2') // []()
     .replace(/(`|\*{1,3}|_)(.*?[^\\])\1/g, '$2') // `{t}` | *{t}* | **{t}** | ***{t}*** | _{t}_
-    .replace(/(\\)(\*|_|`|\!)/g, '$2') // remove escape char '\'
+    .replace(/(\\)(\*|_|`|\!|<|\$)/g, '$2') // remove escape char '\'
 
 const trim = (str: string) => str.trim()
 
@@ -39,7 +39,7 @@ const trim = (str: string) => str.trim()
 // Input: "<a> b",   Output: "b"
 // Input: "`<a>` b", Output: "`<a>` b"
 export const removeNonCodeWrappedHTML = (str: string) => {
-  return String(str).replace(/(^|[^><`])<.*>([^><`]|$)/g, '$1$2')
+  return String(str).replace(/(^|[^><`\\])<.*>([^><`]|$)/g, '$1$2')
 }
 
 const compose = (...processors: ((str: string) => string)[]) => {

From 46e99babc2d1a0e456d47081c2e7beb961bcd1d5 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 27 Dec 2020 01:50:20 +0800
Subject: [PATCH 08/78] fix: style pollution on custom theme (#190)

---
 src/client/app/exports.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/client/app/exports.ts b/src/client/app/exports.ts
index 29242136..21ee2965 100644
--- a/src/client/app/exports.ts
+++ b/src/client/app/exports.ts
@@ -24,6 +24,3 @@ import { ComponentOptions } from 'vue'
 import _Debug from './components/Debug.vue'
 const Debug = _Debug as ComponentOptions
 export { Debug }
-
-// default theme
-export { default as defaultTheme } from '/@default-theme/index'

From cb306fa91191ea64aa1f7ebc3757a72662c5a6bc Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 27 Dec 2020 01:55:02 +0800
Subject: [PATCH 09/78] refactor: use ts for cli (#191)

---
 bin/vitepress.js | 44 +-------------------------------------------
 src/node/cli.ts  | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 43 deletions(-)
 create mode 100644 src/node/cli.ts

diff --git a/bin/vitepress.js b/bin/vitepress.js
index a5b135eb..0aafe1a3 100755
--- a/bin/vitepress.js
+++ b/bin/vitepress.js
@@ -1,44 +1,2 @@
 #!/usr/bin/env node
-const chalk = require('chalk')
-const argv = require('minimist')(process.argv.slice(2))
-
-console.log(chalk.cyan(`vitepress v${require('../package.json').version}`))
-console.log(chalk.cyan(`vite v${require('vite/package.json').version}`))
-
-const command = argv._[0]
-const root = argv._[command ? 1 : 0]
-if (root) {
-  argv.root = root
-}
-
-if (!command || command === 'dev') {
-  const port = argv.port || 3000
-  require('../dist/node')
-    .createServer(argv)
-    .then((server) => {
-      server.listen(port, () => {
-        console.log(`listening at http://localhost:${port}`)
-      })
-    })
-    .catch((err) => {
-      console.error(chalk.red(`failed to start server. error:\n`), err)
-      process.exit(1)
-    })
-} else if (command === 'build') {
-  require('../dist/node')
-    .build(argv)
-    .catch((err) => {
-      console.error(chalk.red(`build error:\n`), err)
-      process.exit(1)
-    })
-} else if (command === 'serve') {
-  require('../dist/node')
-    .serve(argv)
-    .catch((err) => {
-      console.error(chalk.red(`failed to start server. error:\n`), err)
-      process.exit(1)
-    })
-} else {
-  console.log(chalk.red(`unknown command "${command}".`))
-  process.exit(1)
-}
+require('../dist/node/cli')
diff --git a/src/node/cli.ts b/src/node/cli.ts
new file mode 100644
index 00000000..0f806083
--- /dev/null
+++ b/src/node/cli.ts
@@ -0,0 +1,41 @@
+import chalk from 'chalk'
+import minimist from 'minimist'
+import { createServer, build, serve } from '.'
+
+const argv: any = minimist(process.argv.slice(2))
+
+console.log(chalk.cyan(`vitepress v${require('../../package.json').version}`))
+console.log(chalk.cyan(`vite v${require('vite/package.json').version}`))
+
+const command = argv._[0]
+const root = argv._[command ? 1 : 0]
+if (root) {
+  argv.root = root
+}
+
+if (!command || command === 'dev') {
+  const port = argv.port || 3000
+  createServer(argv)
+    .then((server) => {
+      server.listen(port, () => {
+        console.log(`listening at http://localhost:${port}`)
+      })
+    })
+    .catch((err) => {
+      console.error(chalk.red(`failed to start server. error:\n`), err)
+      process.exit(1)
+    })
+} else if (command === 'build') {
+  build(argv).catch((err) => {
+    console.error(chalk.red(`build error:\n`), err)
+    process.exit(1)
+  })
+} else if (command === 'serve') {
+  serve(argv).catch((err) => {
+    console.error(chalk.red(`failed to start server. error:\n`), err)
+    process.exit(1)
+  })
+} else {
+  console.log(chalk.red(`unknown command "${command}".`))
+  process.exit(1)
+}

From 83f14c2552ddc36c2b5392aa28037543664aaa51 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 27 Dec 2020 02:07:37 +0800
Subject: [PATCH 10/78] build(deps): bump ini from 1.3.5 to 1.3.8 (#183)

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

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 31561857..21effec7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3205,9 +3205,9 @@ inherits@2.0.3:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.2:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 interpret@^1.0.0:
   version "1.4.0"

From f05fe8b7f69c9af705a93015021bf84250f2c4d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 27 Dec 2020 02:07:47 +0800
Subject: [PATCH 11/78] build(deps): bump node-notifier from 8.0.0 to 8.0.1
 (#188)

Bumps [node-notifier](https://github.com/mikaelbr/node-notifier) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/mikaelbr/node-notifier/releases)
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/v8.0.1/CHANGELOG.md)
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v8.0.0...v8.0.1)

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

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

diff --git a/yarn.lock b/yarn.lock
index 21effec7..3bd672a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4704,9 +4704,9 @@ node-modules-regexp@^1.0.0:
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
 node-notifier@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620"
-  integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1"
+  integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==
   dependencies:
     growly "^1.3.0"
     is-wsl "^2.2.0"
@@ -5764,9 +5764,11 @@ semver-compare@^1.0.0:
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
 semver@7.x, semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
 
 semver@^6.0.0, semver@^6.3.0:
   version "6.3.0"
@@ -6546,9 +6548,9 @@ uuid@^3.3.2:
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 uuid@^8.3.0:
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
-  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
 v8-to-istanbul@^7.0.0:
   version "7.0.0"

From bf8fd3a6f3ceef273d7f5a231a3a7d904227648d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 28 Dec 2020 17:20:58 -0500
Subject: [PATCH 12/78] wip: dev works with vite 2

---
 docs/index.md                          |   2 +-
 package.json                           |   9 +-
 src/client/app/composables/siteData.ts |   2 +-
 src/node/build/build.ts                |   2 +-
 src/node/build/bundle.ts               |  11 +-
 src/node/cli.ts                        |   9 +-
 src/node/config.ts                     |  10 +-
 src/node/markdownToVue.ts              |  62 +-
 src/node/plugin.ts                     | 107 ++++
 src/node/resolver.ts                   |  32 +-
 src/node/server.ts                     | 146 +----
 yarn.lock                              | 772 +++++++++++++------------
 12 files changed, 581 insertions(+), 583 deletions(-)
 create mode 100644 src/node/plugin.ts

diff --git a/docs/index.md b/docs/index.md
index 8b5fe887..ccf67e64 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -20,7 +20,7 @@ Now, with Vite and Vue 3, it is time to rethink what a "Vue-powered static site
 
 ## Improvements Over VuePress
 
-There're couple of things that are improved from VuePress.
+There're couple of things that are improved from VuePress....
 
 ### It Uses Vue 3
 
diff --git a/package.json b/package.json
index 55a24fa9..a9e693e7 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "release": "node scripts/release.js",
     "docs": "run-p dev docs-dev",
     "docs-dev": "node ./bin/vitepress dev docs",
+    "debug": "node --inspect-brk ./bin/vitepress dev docs",
     "docs-build": "yarn build && node ./bin/vitepress build docs",
     "docs-serve": "yarn docs-build && node ./bin/vitepress serve --root docs"
   },
@@ -64,8 +65,8 @@
   "dependencies": {
     "@docsearch/css": "^1.0.0-alpha.28",
     "@docsearch/js": "^1.0.0-alpha.28",
-    "@vue/compiler-sfc": "^3.0.3",
-    "@vue/server-renderer": "^3.0.3",
+    "@vue/compiler-sfc": "^3.0.4",
+    "@vue/server-renderer": "^3.0.4",
     "chalk": "^4.1.0",
     "debug": "^4.1.1",
     "diacritics": "^1.3.0",
@@ -83,8 +84,8 @@
     "ora": "^5.1.0",
     "prismjs": "^1.20.0",
     "slash": "^3.0.0",
-    "vite": "^1.0.0-rc.13",
-    "vue": "^3.0.3"
+    "vite": "^2.0.0-alpha.1",
+    "vue": "^3.0.4"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.1",
diff --git a/src/client/app/composables/siteData.ts b/src/client/app/composables/siteData.ts
index 26643166..7829e317 100644
--- a/src/client/app/composables/siteData.ts
+++ b/src/client/app/composables/siteData.ts
@@ -16,7 +16,7 @@ function parse(data: string): SiteData {
 
 // hmr
 if (import.meta.hot) {
-  import.meta.hot!.acceptDeps('/@siteData', (m) => {
+  import.meta.hot!.accept('/@siteData', (m) => {
     siteDataRef.value = parse(m.default)
   })
 }
diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 090e2a65..9265456a 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -1,6 +1,6 @@
 import fs from 'fs-extra'
 import { bundle, okMark, failMark } from './bundle'
-import { BuildConfig as ViteBuildOptions } from 'vite'
+import { BuildOptions as ViteBuildOptions } from 'vite'
 import { resolveConfig } from '../config'
 import { renderPage } from './render'
 import { OutputChunk, OutputAsset } from 'rollup'
diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index b3c928a4..7aca513a 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -6,12 +6,7 @@ import { BuildOptions } from './build'
 import { resolveUserConfig, SiteConfig } from '../config'
 import { Plugin, OutputAsset, OutputChunk } from 'rollup'
 import { createMarkdownToVueRenderFn } from '../markdownToVue'
-import {
-  build,
-  ssrBuild,
-  BuildConfig as ViteBuildOptions,
-  BuildResult
-} from 'vite'
+import { build, BuildOptions as ViteBuildOptions } from 'vite'
 import ora from 'ora'
 
 export const okMark = '\x1b[32m✓\x1b[0m'
@@ -60,9 +55,7 @@ export async function bundle(
       // compile md into vue src
       if (id.endsWith('.md')) {
         const content = await fs.readFile(id, 'utf-8')
-        // TODO use git timestamp
-        const lastUpdated = (await fs.stat(id)).mtimeMs
-        const { vueSrc } = markdownToVue(content, id, lastUpdated)
+        const { vueSrc } = markdownToVue(content, id)
         return vueSrc
       }
     },
diff --git a/src/node/cli.ts b/src/node/cli.ts
index 0f806083..bd21caf8 100644
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -14,11 +14,12 @@ if (root) {
 }
 
 if (!command || command === 'dev') {
-  const port = argv.port || 3000
-  createServer(argv)
+  createServer(root, argv)
     .then((server) => {
-      server.listen(port, () => {
-        console.log(`listening at http://localhost:${port}`)
+      return server.listen().then(() => {
+        console.log(
+          `listening at http://localhost:${server.config.server.port}`
+        )
       })
     })
     .catch((err) => {
diff --git a/src/node/config.ts b/src/node/config.ts
index 6f1ce672..72193c9b 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -2,10 +2,10 @@ import path from 'path'
 import fs from 'fs-extra'
 import chalk from 'chalk'
 import globby from 'globby'
-import { createResolver, APP_PATH, DEFAULT_THEME_PATH } from './resolver'
-import { Resolver } from 'vite'
+import { APP_PATH, createAlias, DEFAULT_THEME_PATH } from './resolver'
 import { SiteData, HeadConfig, LocaleConfig } from '../../types/shared'
 import { MarkdownOptions } from './markdown/markdown'
+import { AliasOptions } from 'vite'
 export { resolveSiteDataByRoute } from './shared/config'
 
 const debug = require('debug')('vitepress:config')
@@ -30,7 +30,7 @@ export interface SiteConfig<ThemeConfig = any> {
   themeDir: string
   outDir: string
   tempDir: string
-  resolver: Resolver
+  aliases: AliasOptions
   pages: string[]
   markdown?: MarkdownOptions
 }
@@ -58,8 +58,8 @@ export async function resolveConfig(
     configPath: resolve(root, 'config.js'),
     outDir: resolve(root, 'dist'),
     tempDir: path.resolve(APP_PATH, 'temp'),
-    resolver: createResolver(themeDir, userConfig),
-    markdown: userConfig.markdown
+    markdown: userConfig.markdown,
+    aliases: createAlias(themeDir, userConfig)
   }
 
   return config
diff --git a/src/node/markdownToVue.ts b/src/node/markdownToVue.ts
index 55a48f61..6f7a2a4a 100644
--- a/src/node/markdownToVue.ts
+++ b/src/node/markdownToVue.ts
@@ -1,12 +1,19 @@
+import fs from 'fs'
 import path from 'path'
 import matter from 'gray-matter'
 import LRUCache from 'lru-cache'
 import { createMarkdownRenderer, MarkdownOptions } from './markdown/markdown'
 import { deeplyParseHeader } from './utils/parseHeader'
 import { PageData, HeadConfig } from '../../types/shared'
+import slash from 'slash'
 
 const debug = require('debug')('vitepress:md')
-const cache = new LRUCache<string, MarkdownCompileResult>({ max: 1024 })
+const cache = new LRUCache<string, MarkdownCompileCachedResult>({ max: 1024 })
+
+interface MarkdownCompileCachedResult extends MarkdownCompileResult {
+  tagsWithPageData: string
+  tagsWithoutPageData: string
+}
 
 interface MarkdownCompileResult {
   vueSrc: string
@@ -22,44 +29,63 @@ export function createMarkdownToVueRenderFn(
   return (
     src: string,
     file: string,
-    lastUpdated: number,
     injectData = true
-  ) => {
-    file = path.relative(root, file)
+  ): MarkdownCompileResult => {
+    const relativePath = slash(path.relative(root, file))
+
     const cached = cache.get(src)
     if (cached) {
-      debug(`[cache hit] ${file}`)
-      return cached
+      debug(`[cache hit] ${relativePath}`)
+      return pickResult(cached, injectData)
     }
+
     const start = Date.now()
 
     const { content, data: frontmatter } = matter(src)
     const { html, data } = md.render(content)
 
-    // TODO validate data.links?
+    const vueSrc = `\n<template><div>${html}</div></template>`
 
-    // inject page data
+    // TODO validate data.links?
     const pageData: PageData = {
       title: inferTitle(frontmatter, content),
       description: inferDescription(frontmatter),
       frontmatter,
       headers: data.headers,
-      relativePath: file.replace(/\\/g, '/'),
-      lastUpdated
+      relativePath,
+      // TODO use git timestamp?
+      lastUpdated: fs.statSync(file).mtimeMs
     }
 
-    const additionalBlocks = injectData
-      ? injectPageData(data.hoistedTags || [], pageData)
-      : data.hoistedTags || []
+    const tagsWithPageData = genPageDataCode(
+      data.hoistedTags || [],
+      pageData
+    ).join('\n')
 
-    const vueSrc =
-      additionalBlocks.join('\n') + `\n<template><div>${html}</div></template>`
+    const tagsWithoutPageData = (data.hoistedTags || []).join('\n')
 
     debug(`[render] ${file} in ${Date.now() - start}ms.`)
 
-    const result = { vueSrc, pageData }
+    const result = {
+      vueSrc,
+      pageData,
+      tagsWithPageData,
+      tagsWithoutPageData
+    }
     cache.set(src, result)
-    return result
+    return pickResult(result, injectData)
+  }
+}
+
+function pickResult(
+  res: MarkdownCompileCachedResult,
+  injectData: boolean
+): MarkdownCompileResult {
+  return {
+    vueSrc:
+      res.vueSrc +
+      (injectData ? res.tagsWithPageData : res.tagsWithoutPageData),
+    pageData: res.pageData
   }
 }
 
@@ -68,7 +94,7 @@ const scriptSetupRE = /<\s*script[^>]*\bsetup\b[^>]*/
 const defaultExportRE = /((?:^|\n|;)\s*)export(\s*)default/
 const namedDefaultExportRE = /((?:^|\n|;)\s*)export(.+)as(\s*)default/
 
-function injectPageData(tags: string[], data: PageData) {
+function genPageDataCode(tags: string[], data: PageData) {
   const code = `\nexport const __pageData = ${JSON.stringify(
     JSON.stringify(data)
   )}`
diff --git a/src/node/plugin.ts b/src/node/plugin.ts
new file mode 100644
index 00000000..2039e5a6
--- /dev/null
+++ b/src/node/plugin.ts
@@ -0,0 +1,107 @@
+import path from 'path'
+import { Plugin } from 'vite'
+import { SiteConfig, resolveSiteData } from './config'
+import { createMarkdownToVueRenderFn } from './markdownToVue'
+import { APP_PATH, SITE_DATA_REQUEST_PATH } from './resolver'
+import createVuePlugin from '@vitejs/plugin-vue'
+import slash from 'slash'
+
+export function createVitePressPlugin(
+  root: string,
+  { configPath, aliases, markdown, site: initialSiteData }: SiteConfig
+): Plugin[] {
+  const markdownToVue = createMarkdownToVueRenderFn(root, markdown)
+
+  const vuePlugin = createVuePlugin({
+    include: [/\.vue$/, /\.md$/]
+  })
+
+  let siteData = initialSiteData
+  let stringifiedData = JSON.stringify(JSON.stringify(initialSiteData))
+
+  const vitePressPlugin: Plugin = {
+    name: 'vitepress',
+
+    config() {
+      return {
+        alias: aliases,
+        transformInclude: /\.md$/
+      }
+    },
+
+    resolveId(id) {
+      if (id === SITE_DATA_REQUEST_PATH) {
+        return SITE_DATA_REQUEST_PATH
+      }
+    },
+
+    load(id) {
+      if (id === SITE_DATA_REQUEST_PATH) {
+        return `export default ${stringifiedData}`
+      }
+    },
+
+    transform(code, id) {
+      if (id.endsWith('.md')) {
+        // transform .md files into vueSrc so plugin-vue can handle it
+        return markdownToVue(code, id).vueSrc
+      }
+    },
+
+    configureServer(server) {
+      // serve our index.html after vite history fallback
+      const indexPath = `/@fs/${path.join(APP_PATH, 'index.html')}`
+      return () => {
+        server.app.use((req, _, next) => {
+          if (req.url!.endsWith('.html')) {
+            req.url = indexPath
+          }
+          next()
+        })
+      }
+    },
+
+    async handleHotUpdate(file, mods, read, server) {
+      if (file === configPath) {
+        const newData = await resolveSiteData(root)
+        stringifiedData = JSON.stringify(JSON.stringify(newData))
+        if (newData.base !== siteData.base) {
+          console.warn(
+            `[vitepress]: config.base has changed. Please restart the dev server.`
+          )
+        }
+        siteData = newData
+        return
+      }
+
+      // hot reload .md files as .vue files
+      if (file.endsWith('.md')) {
+        const content = await read()
+        const { pageData, vueSrc } = markdownToVue(
+          content.toString(),
+          file,
+          // do not inject pageData on HMR
+          // it leads to plugin-vue to think <script> has changed and reloads
+          // the component instead of re-rendering.
+          // pageData needs separate HMR logic anyway (see below)
+          false
+        )
+
+        // notify the client to update page data
+        server.ws.send({
+          type: 'custom',
+          event: 'vitepress:pageData',
+          data: {
+            path: `/${slash(path.relative(root, file))}`,
+            pageData
+          }
+        })
+
+        // reload the content component
+        return vuePlugin.handleHotUpdate!(file, mods, () => vueSrc, server)
+      }
+    }
+  }
+
+  return [vitePressPlugin, vuePlugin]
+}
diff --git a/src/node/resolver.ts b/src/node/resolver.ts
index 4438b12d..8d6ab6fb 100644
--- a/src/node/resolver.ts
+++ b/src/node/resolver.ts
@@ -1,5 +1,5 @@
 import path from 'path'
-import { Resolver } from 'vite'
+import { AliasOptions } from 'vite'
 import { UserConfig } from './config'
 
 export const APP_PATH = path.join(__dirname, '../client/app')
@@ -20,29 +20,17 @@ 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(
+export function createAlias(
   themeDir: string,
   userConfig: UserConfig
-): Resolver {
+): AliasOptions {
   return {
-    alias: {
-      ...userConfig.alias,
-      '/@app/': APP_PATH,
-      '/@theme/': themeDir,
-      '/@default-theme/': DEFAULT_THEME_PATH,
-      '/@shared/': SHARED_PATH,
-      vitepress: '/@app/exports.js',
-      [SITE_DATA_ID]: SITE_DATA_REQUEST_PATH
-    },
-    requestToFile(publicPath) {
-      if (publicPath === SITE_DATA_REQUEST_PATH) {
-        return SITE_DATA_REQUEST_PATH
-      }
-    },
-    fileToRequest(filePath) {
-      if (filePath === SITE_DATA_REQUEST_PATH) {
-        return SITE_DATA_REQUEST_PATH
-      }
-    }
+    ...userConfig.alias,
+    '/@app': APP_PATH,
+    '/@theme': themeDir,
+    '/@default-theme': DEFAULT_THEME_PATH,
+    '/@shared': SHARED_PATH,
+    vitepress: `${APP_PATH}/exports.js`,
+    [SITE_DATA_ID]: SITE_DATA_REQUEST_PATH
   }
 }
diff --git a/src/node/server.ts b/src/node/server.ts
index 14814a3c..658c9461 100644
--- a/src/node/server.ts
+++ b/src/node/server.ts
@@ -1,139 +1,17 @@
-import path from 'path'
-import {
-  createServer as createViteServer,
-  cachedRead,
-  ServerConfig,
-  ServerPlugin
-} from 'vite'
-import { resolveConfig, SiteConfig, resolveSiteData } from './config'
-import { createMarkdownToVueRenderFn } from './markdownToVue'
-import { APP_PATH, SITE_DATA_REQUEST_PATH } from './resolver'
-import { existsSync } from 'fs'
+import { createServer as createViteServer, ServerOptions } from 'vite'
+import { resolveConfig } from './config'
+import { createVitePressPlugin } from './plugin'
 
-const debug = require('debug')('vitepress:serve')
-const debugHmr = require('debug')('vitepress:hmr')
-
-function createVitePressPlugin({
-  configPath,
-  markdown,
-  site: initialSiteData
-}: SiteConfig): ServerPlugin {
-  return ({ app, root, watcher, resolver }) => {
-    const markdownToVue = createMarkdownToVueRenderFn(root, markdown)
-
-    // hot reload .md files as .vue files
-    watcher.on('change', async (file) => {
-      if (file.endsWith('.md')) {
-        debugHmr(`reloading ${file}`)
-        const content = await cachedRead(null, file)
-        const timestamp = Date.now()
-        const { pageData, vueSrc } = markdownToVue(
-          content.toString(),
-          file,
-          timestamp,
-          // do not inject pageData on HMR
-          // it leads to vite to think <script> has changed and reloads the
-          // component instead of re-rendering.
-          // pageData needs separate HMR logic anyway (see below)
-          false
-        )
-
-        // notify the client to update page data
-        watcher.send({
-          type: 'custom',
-          id: 'vitepress:pageData',
-          customData: {
-            path: resolver.fileToRequest(file),
-            pageData
-          }
-        })
-
-        // reload the content component
-        watcher.handleVueReload(file, timestamp, vueSrc)
-      }
-    })
-
-    // hot reload handling for siteData
-    // the data is stringified twice so it is sent to the client as a string
-    // it is then parsed on the client via JSON.parse() which is faster than
-    // parsing the object literal as JavaScript.
-    let siteData = initialSiteData
-    let stringifiedData = JSON.stringify(JSON.stringify(initialSiteData))
-    watcher.add(configPath)
-    watcher.on('change', async (file) => {
-      if (file === configPath) {
-        const newData = await resolveSiteData(root)
-        stringifiedData = JSON.stringify(JSON.stringify(newData))
-        if (newData.base !== siteData.base) {
-          console.warn(
-            `[vitepress]: config.base has changed. Please restart the dev server.`
-          )
-        }
-        siteData = newData
-        watcher.handleJSReload(SITE_DATA_REQUEST_PATH)
-      }
-    })
-
-    // inject Koa middleware
-    app.use(async (ctx, next) => {
-      // serve siteData (which is a virtual file)
-      if (ctx.path === SITE_DATA_REQUEST_PATH) {
-        ctx.type = 'js'
-        ctx.body = `export default ${stringifiedData}`
-        debug(ctx.url)
-        return
-      }
-
-      // handle .md -> vue transforms
-      if (ctx.path.endsWith('.md')) {
-        const file = resolver.requestToFile(ctx.path)
-        if (!existsSync(file)) {
-          return next()
-        }
-
-        await cachedRead(ctx, file)
-
-        // let vite know this is supposed to be treated as vue file
-        ctx.vue = true
-
-        const { vueSrc, pageData } = markdownToVue(
-          ctx.body,
-          file,
-          ctx.lastModified.getTime(),
-          false
-        )
-        ctx.body = vueSrc
-        debug(ctx.url, ctx.status)
-
-        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)
-          )}`
-        }
-        return
-      }
-
-      await next()
-
-      // serve our index.html after vite history fallback
-      if (ctx.url.endsWith('.html')) {
-        await cachedRead(ctx, path.join(APP_PATH, 'index.html'))
-        ctx.status = 200
-      }
-    })
-  }
-}
-
-export async function createServer(options: ServerConfig = {}) {
-  const config = await resolveConfig(options.root)
+export async function createServer(
+  root: string = process.cwd(),
+  serverOptions: ServerOptions = {}
+) {
+  const config = await resolveConfig(root)
 
   return createViteServer({
-    ...options,
-    configureServer: createVitePressPlugin(config),
-    resolvers: [config.resolver]
+    root,
+    logLevel: 'warn',
+    plugins: createVitePressPlugin(root, config),
+    server: serverOptions
   })
 }
diff --git a/yarn.lock b/yarn.lock
index 3bd672a7..2caa7680 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,165 +2,164 @@
 # yarn lockfile v1
 
 
-"@algolia/cache-browser-local-storage@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.8.1.tgz#1c0230f6f174a37bb22549ec502cad2dc6973c35"
-  integrity sha512-qqudBJE2BzpiO11CbWDbxLual75qiP6lEjHW1zlG2P6jO/NkCnVMsOhPgu2eiJx7lTJ3vhkn981g87qZre8KSg==
-  dependencies:
-    "@algolia/cache-common" "4.8.1"
-
-"@algolia/cache-common@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.8.1.tgz#19c76300d0e75550c4dd88fa1d12b06a75cc290f"
-  integrity sha512-5bJ3KX0trQfNXFzEgDx7IHUcLdrjIvs/6g5fxGMRr0eWJj6x1tSmbIJBff4pdQw7oWZvO1kueWrWD1v0dV9b/Q==
-
-"@algolia/cache-in-memory@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.8.1.tgz#c84a72e75cf614dc75c2ccf0a993c382d3153862"
-  integrity sha512-4EEUi+DHsMKfZ38AYovXVS09oLTLSQlssw1PTswJEx7wuKCAzctWSBfB116+b1eAw8mp6EmiTJw8D2qFhr70oQ==
-  dependencies:
-    "@algolia/cache-common" "4.8.1"
-
-"@algolia/client-account@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.8.1.tgz#7c75a5151860a592abfe720610babd0652b5d822"
-  integrity sha512-zfQSb9EYzZrOsUqsekKJYuizpQVLiq1D0B81KC8V0PjhjtQc13UrAJx68XP3fkNBe7V9K6H3dIRPOaK5XVHYOg==
-  dependencies:
-    "@algolia/client-common" "4.8.1"
-    "@algolia/client-search" "4.8.1"
-    "@algolia/transporter" "4.8.1"
-
-"@algolia/client-analytics@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.8.1.tgz#330c2e001f758fe750820366092ea6f407d6ca9f"
-  integrity sha512-QF6I7MCV9jI8dawi8W/tA/R5EyE+4uKc74tqLTrm6WoUdlwExaTuKgSjsqZtSjRileIDw5TuuJhSGCpgBktDOg==
-  dependencies:
-    "@algolia/client-common" "4.8.1"
-    "@algolia/client-search" "4.8.1"
-    "@algolia/requester-common" "4.8.1"
-    "@algolia/transporter" "4.8.1"
-
-"@algolia/client-common@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.8.1.tgz#a0527d8ac76b41605f3fd6370d9cf1390ea98e10"
-  integrity sha512-iAVBzNUFyUYqX6yyWN3AsxB+sF2g+lWguXmdMaSDAym4XMRAT6cvd3xUKBloHafzm2zWR69XHm/qxUuqJbFnxQ==
-  dependencies:
-    "@algolia/requester-common" "4.8.1"
-    "@algolia/transporter" "4.8.1"
-
-"@algolia/client-recommendation@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-recommendation/-/client-recommendation-4.8.1.tgz#ce0577f53eaa0877a40e4f14789714a32d199a50"
-  integrity sha512-WiI86PtQKjU+pmIqlzyJ5skOqfZy6PTc7s6XPgPmVd+XfQxRweXxiejbBG0aQlVcZbN2eetNMmI2vawf1cTDWg==
-  dependencies:
-    "@algolia/client-common" "4.8.1"
-    "@algolia/requester-common" "4.8.1"
-    "@algolia/transporter" "4.8.1"
-
-"@algolia/client-search@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.8.1.tgz#62326038d9d128f8bc87857c514ce7dea91f73b1"
-  integrity sha512-EAeTq5iqpoEPQmi25La1zM5hxvE04hnZzutlUq+5flhrmjwV75z6xNjqNBlDVhPwH545Xg2jcccXQjjNzLHj7A==
-  dependencies:
-    "@algolia/client-common" "4.8.1"
-    "@algolia/requester-common" "4.8.1"
-    "@algolia/transporter" "4.8.1"
-
-"@algolia/logger-common@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.8.1.tgz#46accd128bc5179385c437085a02e0d9c5e721ae"
-  integrity sha512-ENX/9LuroGxLCjPbvuO6yKPoFNkSXFO0LhWHeR/JQY0gdTHhHgj2A2nXT4Qt0PxFGE9XNhXlJ3YYVxtWEG8rww==
-
-"@algolia/logger-console@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.8.1.tgz#a0b42f0cab7a33e5cd09ff8a0e6da1d197c2a7aa"
-  integrity sha512-pFxNb9aOvUsyS+RxHJgMvnTCzt6ewqi0nsICDCCXQ/Lz1VrRFbrfmXcfxD46nQ0W8o8/7esXzaVdjGUKmEmq0Q==
-  dependencies:
-    "@algolia/logger-common" "4.8.1"
-
-"@algolia/requester-browser-xhr@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.8.1.tgz#02ceb6548957d347c73a6eb8c8292750136bb88a"
-  integrity sha512-N0+0UONv1FYMTaZR/a6wl43MUrGFYpAvsqlVgCN8/CFhuG4LFBUXhZQudL8wq9GfMoUENJ6P9spCUk2EcE5mKQ==
-  dependencies:
-    "@algolia/requester-common" "4.8.1"
-
-"@algolia/requester-common@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.8.1.tgz#8d0990aed68d785433e40cd389c8a87701543f43"
-  integrity sha512-ZtG4g4pxPbN2qI8E7ChOthuntZGIauQegzXyqYfRAAlIZ+lkTTc8KPmUDREFhkT9znCKoPD43w0j8YogSVo/4A==
-
-"@algolia/requester-node-http@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.8.1.tgz#23702832093e769a7837107bf96200fba9d77be3"
-  integrity sha512-OyryP9UBcIqD9B9C6TfkjeNbd8G/MCxuaBaK3QfbjP/J7EUVeMBFPs0jo52jTKlm8l4cgRIHCDxa1ctgfhE1Xg==
-  dependencies:
-    "@algolia/requester-common" "4.8.1"
-
-"@algolia/transporter@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.8.1.tgz#a80d41ae4f4b0e9f2606f4c20cef9aa4183cb59b"
-  integrity sha512-JNO0Bs9vmQmrM54daORAFdmA05QFV7IQNoLS7ucbtEKexJAwmxb/mOB+sAH6Ju3V8vGPPvvn9jcgu9fwIkyX3Q==
-  dependencies:
-    "@algolia/cache-common" "4.8.1"
-    "@algolia/logger-common" "4.8.1"
-    "@algolia/requester-common" "4.8.1"
+"@algolia/cache-browser-local-storage@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.8.3.tgz#79cc502892c83f378b8f1a87f78020268806f5c3"
+  integrity sha512-Cwc03hikHSUI+xvgUdN+H+f6jFyoDsC9fegzXzJ2nPn1YSN9EXzDMBnbrgl0sbl9iLGXe0EIGMYqR2giCv1wMQ==
+  dependencies:
+    "@algolia/cache-common" "4.8.3"
+
+"@algolia/cache-common@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.8.3.tgz#7aca2644159ec791921dc8b296817e5b532b3464"
+  integrity sha512-Cf7zZ2i6H+tLSBTkFePHhYvlgc9fnMPKsF9qTmiU38kFIGORy/TN2Fx5n1GBuRLIzaSXvcf+oHv1HvU0u1gE1g==
+
+"@algolia/cache-in-memory@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.8.3.tgz#3d2692b895e9b8da47249b2b8dc638f53d6328ee"
+  integrity sha512-+N7tkvmijXiDy2E7u1mM73AGEgGPWFmEmPeJS96oT46I98KXAwVPNYbcAqBE79YlixdXpkYJk41cFcORzNh+Iw==
+  dependencies:
+    "@algolia/cache-common" "4.8.3"
+
+"@algolia/client-account@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.8.3.tgz#4abc270dbd136644e69cc6b1ca1d0d14c9822aaf"
+  integrity sha512-Uku8LqnXBwfDCtsTCDYTUOz2/2oqcAQCKgaO0uGdIR8DTQENBXFQvzziambHdn9KuFuY+6Et9k1+cjpTPBDTBg==
+  dependencies:
+    "@algolia/client-common" "4.8.3"
+    "@algolia/client-search" "4.8.3"
+    "@algolia/transporter" "4.8.3"
+
+"@algolia/client-analytics@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.8.3.tgz#578b6e6fa33818a0417298438066642e584e1de9"
+  integrity sha512-9ensIWmjYJprZ+YjAVSZdWUG05xEnbytENXp508X59tf34IMIX8BR2xl0RjAQODtxBdAteGxuKt5THX6U9tQLA==
+  dependencies:
+    "@algolia/client-common" "4.8.3"
+    "@algolia/client-search" "4.8.3"
+    "@algolia/requester-common" "4.8.3"
+    "@algolia/transporter" "4.8.3"
+
+"@algolia/client-common@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.8.3.tgz#d8ea3368a5b98ce907e4be0eed804c3301cd91de"
+  integrity sha512-TU3623AEFAWUQlDTznkgAMSYo8lfS9pNs5QYDQzkvzWdqK0GBDWthwdRfo9iIsfxiR9qdCMHqwEu+AlZMVhNSA==
+  dependencies:
+    "@algolia/requester-common" "4.8.3"
+    "@algolia/transporter" "4.8.3"
+
+"@algolia/client-recommendation@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/client-recommendation/-/client-recommendation-4.8.3.tgz#fc15688bf9d0fc0111a6c56d247e33dc3fcf8190"
+  integrity sha512-qysGbmkcc6Agt29E38KWJq9JuxjGsyEYoKuX9K+P5HyQh08yR/BlRYrA8mB7vT/OIUHRGFToGO6Vq/rcg0NIOQ==
+  dependencies:
+    "@algolia/client-common" "4.8.3"
+    "@algolia/requester-common" "4.8.3"
+    "@algolia/transporter" "4.8.3"
+
+"@algolia/client-search@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.8.3.tgz#c70e09935e2cf25da356d59794e6a5a95f9a4cc8"
+  integrity sha512-rAnvoy3GAhbzOQVniFcKVn1eM2NX77LearzYNCbtFrFYavG+hJI187bNVmajToiuGZ10FfJvK99X2OB1AzzezQ==
+  dependencies:
+    "@algolia/client-common" "4.8.3"
+    "@algolia/requester-common" "4.8.3"
+    "@algolia/transporter" "4.8.3"
+
+"@algolia/logger-common@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.8.3.tgz#449e8767863466528de7d18017417b319e4782d3"
+  integrity sha512-03wksHRbhl2DouEKnqWuUb64s1lV6kDAAabMCQ2Du1fb8X/WhDmxHC4UXMzypeOGlH5BZBsgVwSB7vsZLP3MZg==
+
+"@algolia/logger-console@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.8.3.tgz#e4bcda8ac6477ecf143a1d536be2b747b84b7047"
+  integrity sha512-Npt+hI4UF8t3TLMluL5utr9Gc11BjL5kDnGZOhDOAz5jYiSO2nrHMFmnpLT4Cy/u7a5t7EB5dlypuC4/AGStkA==
+  dependencies:
+    "@algolia/logger-common" "4.8.3"
+
+"@algolia/requester-browser-xhr@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.8.3.tgz#f2fe880d261e33bce1c6d613be074fd87af9f7e6"
+  integrity sha512-/LTTIpgEmEwkyhn8yXxDdBWqXqzlgw5w2PtTpIwkSlP2/jDwdR/9w1TkFzhNbJ81ki6LAEQM5mSwoTTnbIIecg==
+  dependencies:
+    "@algolia/requester-common" "4.8.3"
+
+"@algolia/requester-common@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.8.3.tgz#633b6782ae3fcf1743507c0ef207db5c62737443"
+  integrity sha512-+Yo9vBkofoKR1SCqqtMnmnfq9yt/BiaDewY/6bYSMNxSYCnu2Fw1JKSIaf/4zos09PMSsxGpLohZwGas3+0GDQ==
+
+"@algolia/requester-node-http@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.8.3.tgz#81c8e5d02f16a57cebfa2309a931fad6de84eb6d"
+  integrity sha512-k2fiKIeMIFqgC01FnzII6kqC2GQBAfbNaUX4k7QCPa6P8t4sp2xE6fImOUiztLnnL3C9X9ZX6Fw3L+cudi7jvQ==
+  dependencies:
+    "@algolia/requester-common" "4.8.3"
+
+"@algolia/transporter@4.8.3":
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.8.3.tgz#6ad10b4be16653d667bb4727df27478931631fe8"
+  integrity sha512-nU7fy2iU8snxATlsks0MjMyv97QJWQmOVwTjDc+KZ4+nue8CLcgm4LA4dsTBqvxeCQIoEtt3n72GwXcaqiJSjQ==
+  dependencies:
+    "@algolia/cache-common" "4.8.3"
+    "@algolia/logger-common" "4.8.3"
+    "@algolia/requester-common" "4.8.3"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
   dependencies:
     "@babel/highlight" "^7.10.4"
 
 "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.12.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
-  integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
+  integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
+    "@babel/generator" "^7.12.10"
     "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helpers" "^7.12.5"
-    "@babel/parser" "^7.12.7"
+    "@babel/parser" "^7.12.10"
     "@babel/template" "^7.12.7"
-    "@babel/traverse" "^7.12.9"
-    "@babel/types" "^7.12.7"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.10"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
     lodash "^4.17.19"
-    resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
-  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
+"@babel/generator@^7.12.10", "@babel/generator@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af"
+  integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==
   dependencies:
-    "@babel/types" "^7.12.5"
+    "@babel/types" "^7.12.11"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/helper-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
-  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
+"@babel/helper-function-name@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42"
+  integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/helper-get-function-arity" "^7.12.10"
+    "@babel/template" "^7.12.7"
+    "@babel/types" "^7.12.11"
 
-"@babel/helper-get-function-arity@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
-  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
+"@babel/helper-get-function-arity@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
+  integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.10"
 
-"@babel/helper-member-expression-to-functions@^7.12.1":
+"@babel/helper-member-expression-to-functions@^7.12.7":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
   integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
@@ -189,12 +188,12 @@
     "@babel/types" "^7.12.1"
     lodash "^4.17.19"
 
-"@babel/helper-optimise-call-expression@^7.10.4":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c"
-  integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==
+"@babel/helper-optimise-call-expression@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d"
+  integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==
   dependencies:
-    "@babel/types" "^7.12.7"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0":
   version "7.10.4"
@@ -202,14 +201,14 @@
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
 "@babel/helper-replace-supers@^7.12.1":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9"
-  integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d"
+  integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.12.1"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/traverse" "^7.12.5"
-    "@babel/types" "^7.12.5"
+    "@babel/helper-member-expression-to-functions" "^7.12.7"
+    "@babel/helper-optimise-call-expression" "^7.12.10"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.11"
 
 "@babel/helper-simple-access@^7.12.1":
   version "7.12.1"
@@ -218,17 +217,17 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
-"@babel/helper-split-export-declaration@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
-  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+"@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a"
+  integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==
   dependencies:
-    "@babel/types" "^7.11.0"
+    "@babel/types" "^7.12.11"
 
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
-  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
 
 "@babel/helpers@^7.12.5":
   version "7.12.5"
@@ -248,10 +247,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.0", "@babel/parser@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
-  integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79"
+  integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -346,27 +345,27 @@
     "@babel/parser" "^7.12.7"
     "@babel/types" "^7.12.7"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9":
-  version "7.12.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f"
-  integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.12.7"
-    "@babel/types" "^7.12.7"
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376"
+  integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==
+  dependencies:
+    "@babel/code-frame" "^7.12.11"
+    "@babel/generator" "^7.12.11"
+    "@babel/helper-function-name" "^7.12.11"
+    "@babel/helper-split-export-declaration" "^7.12.11"
+    "@babel/parser" "^7.12.11"
+    "@babel/types" "^7.12.12"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
-  integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
+"@babel/types@^7.0.0", "@babel/types@^7.12.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299"
+  integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.12.11"
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
@@ -610,25 +609,25 @@
   dependencies:
     vary "^1.1.2"
 
-"@nodelib/fs.scandir@2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
-  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+"@nodelib/fs.scandir@2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
+  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
   dependencies:
-    "@nodelib/fs.stat" "2.0.3"
+    "@nodelib/fs.stat" "2.0.4"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
-  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
+  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
 
 "@nodelib/fs.walk@^1.2.3":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
-  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
+  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
   dependencies:
-    "@nodelib/fs.scandir" "2.1.3"
+    "@nodelib/fs.scandir" "2.1.4"
     fastq "^1.6.0"
 
 "@rollup/plugin-commonjs@^16.0.0":
@@ -728,9 +727,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
-  integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0"
+  integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -743,9 +742,9 @@
     "@types/node" "*"
 
 "@types/connect@*":
-  version "3.4.33"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546"
-  integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==
+  version "3.4.34"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901"
+  integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==
   dependencies:
     "@types/node" "*"
 
@@ -755,9 +754,9 @@
   integrity sha512-P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg==
 
 "@types/cookies@*":
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.5.tgz#aa42c9a9834724bffee597028da5319b38e85e84"
-  integrity sha512-3+TAFSm78O7/bAeYdB8FoYGntuT87vVP9JKuQRL8sRhv9313LP2SpHHL50VeFtnyjIcb3UELddMk5Yt0eOSOkg==
+  version "0.7.6"
+  resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.6.tgz#71212c5391a976d3bae57d4b09fac20fc6bda504"
+  integrity sha512-FK4U5Qyn7/Sc5ih233OuHO0qAkOpEcD/eG6584yEiLKizTFRny86qHLe/rej3HFQrkBuUjF4whFliAdODbVN/w==
   dependencies:
     "@types/connect" "*"
     "@types/express" "*"
@@ -775,9 +774,9 @@
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
 "@types/express-serve-static-core@*":
-  version "4.17.14"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz#cabf91debeeb3cb04b798e2cff908864e89b6106"
-  integrity sha512-uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA==
+  version "4.17.17"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.17.tgz#6ba02465165b6c9c3d8db3a28def6b16fc9b70f5"
+  integrity sha512-YYlVaCni5dnHc+bLZfY908IG1+x5xuibKZMGv8srKkvtul3wUuanYvpIj9GXXoWkQbaAdR+kgX46IETKUALWNQ==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -794,9 +793,9 @@
     "@types/serve-static" "*"
 
 "@types/fs-extra@^9.0.1":
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.4.tgz#12553138cf0438db9a31cdc8b0a3aa9332eb67aa"
-  integrity sha512-50GO5ez44lxK5MDH90DYHFFfqxH7+fTqEEnvguQRzJ/tY9qFrMSHLiYHite+F3SNmf7+LHC1eMXojuD+E3Qcyg==
+  version "9.0.6"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.6.tgz#488e56b77299899a608b8269719c1d133027a6ab"
+  integrity sha512-ecNRHw4clCkowNOBJH1e77nvbPxHYnWIXMv1IAoG/9+MYGkgoyr3Ppxr7XYFNL41V422EDhyV4/4SSK8L2mlig==
   dependencies:
     "@types/node" "*"
 
@@ -849,9 +848,9 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@26.x", "@types/jest@^26.0.15":
-  version "26.0.15"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz#12e02c0372ad0548e07b9f4e19132b834cb1effe"
-  integrity sha512-s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog==
+  version "26.0.19"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.19.tgz#e6fa1e3def5842ec85045bd5210e9bb8289de790"
+  integrity sha512-jqHoirTG61fee6v6rwbnEuKhpSKih0tuhqeFbCmMmErhtu3BYlOZaXWjffgOstMM4S/3iQD31lI5bGLTrs97yQ==
   dependencies:
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"
@@ -898,9 +897,9 @@
     "@types/node" "*"
 
 "@types/linkify-it@*":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-2.1.0.tgz#ea3dd64c4805597311790b61e872cbd1ed2cd806"
-  integrity sha512-Q7DYAOi9O/+cLLhdaSvKdaumWyHbm7HAk/bFwwyTuU0arR5yyCeW5GOoqt4tJTpDRxhpx9Q8kQL6vMpuw9hDSw==
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.0.tgz#c0ca4c253664492dbf47a646f31cfd483a6bbc95"
+  integrity sha512-x9OaQQTb1N2hPZ/LWJsqushexDvz7NgzuZxiRmZio44WPuolTZNHDBCrOxCzRVOMwamJRO2dWax5NbygOf1OTQ==
 
 "@types/lru-cache@^5.1.0":
   version "5.1.0"
@@ -933,14 +932,14 @@
   integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
 
 "@types/node@*":
-  version "14.14.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785"
-  integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==
+  version "14.14.16"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.16.tgz#3cc351f8d48101deadfed4c9e4f116048d437b4b"
+  integrity sha512-naXYePhweTi+BMv11TgioE2/FXU4fSl29HAH1ffxVciNsH3rYXjNP2yM8wqmSm7jS20gM8TIklKiTen+1iVncw==
 
 "@types/node@^13.13.4":
-  version "13.13.33"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.33.tgz#300e65e0b465bda102b9845d172d8d45726a2dd8"
-  integrity sha512-1B3GM1yuYsFyEvBb+ljBqWBOylsWDYioZ5wpu8AhXdIhq20neXS7eaSC8GkwHE0yQYGiOIV43lMsgRYTgKZefQ==
+  version "13.13.38"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.38.tgz#66a7c068305dbd64cf167d0f6b6b6be71dd453e1"
+  integrity sha512-oxo8j9doh7ab9NwDA9bCeFfjHRF/uzk+fTljCy8lMjZ3YzZGAXNDKhTE3Byso/oy32UTUQIXB3HCVHu3d2T3xg==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -961,9 +960,9 @@
     postcss "^7.0.0"
 
 "@types/prettier@^2.0.0":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.5.tgz#b6ab3bba29e16b821d84e09ecfaded462b816b00"
-  integrity sha512-UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ==
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.6.tgz#f4b1efa784e8db479cdb8b14403e2144b1e9ff03"
+  integrity sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA==
 
 "@types/qs@*":
   version "6.9.5"
@@ -996,47 +995,47 @@
   integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
 "@types/yargs-parser@*":
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
-  integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
+  version "20.2.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9"
+  integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==
 
 "@types/yargs@^15.0.0":
-  version "15.0.10"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.10.tgz#0fe3c8173a0d5c3e780b389050140c3f5ea6ea74"
-  integrity sha512-z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ==
+  version "15.0.12"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74"
+  integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==
   dependencies:
     "@types/yargs-parser" "*"
 
-"@vue/compiler-core@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.3.tgz#dbb4d5eb91f294038f0bed170a1c25f59f7dc74f"
-  integrity sha512-iWlRT8RYLmz7zkg84pTOriNUzjH7XACWN++ImFkskWXWeev29IKi7p76T9jKDaMZoPiGcUZ0k9wayuASWVxOwg==
+"@vue/compiler-core@3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.4.tgz#0122aca6eada4cb28b39ed930af917444755e330"
+  integrity sha512-snpMICsbWTZqBFnPB03qr4DtiSxVYfDF3DvbDSkN9Z9NTM8Chl8E/lYhKBSsvauq91DAWAh8PU3lr9vrLyQsug==
   dependencies:
     "@babel/parser" "^7.12.0"
     "@babel/types" "^7.12.0"
-    "@vue/shared" "3.0.3"
+    "@vue/shared" "3.0.4"
     estree-walker "^2.0.1"
     source-map "^0.6.1"
 
-"@vue/compiler-dom@3.0.3", "@vue/compiler-dom@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.3.tgz#582ba30bc82da8409868bc1153ff0e0e2be617e5"
-  integrity sha512-6GdUbDPjsc0MDZGAgpi4lox+d+aW9/brscwBOLOFfy9wcI9b6yLPmBbjdIsJq3pYdJWbdvACdJ77avBBdHEP8A==
+"@vue/compiler-dom@3.0.4", "@vue/compiler-dom@^3.0.3":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.4.tgz#834fd4b15c5698cf9f4505c2bfbccca058a843eb"
+  integrity sha512-FOxbHBIkkGjYQeTz1DlXQjS1Ms8EPXQWsdTdTPeohoS0KzCz6RiOjiAG+jLtMi6Nr5GX2h0TlCvcnI8mcsicFQ==
   dependencies:
-    "@vue/compiler-core" "3.0.3"
-    "@vue/shared" "3.0.3"
+    "@vue/compiler-core" "3.0.4"
+    "@vue/shared" "3.0.4"
 
-"@vue/compiler-sfc@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.3.tgz#7fad9d40e139dd717713c0db701e1eb776f8349f"
-  integrity sha512-YocHSirye85kRVC4lU0+SE6uhrwGJzbhwkrqG4g6kmsAUopZ0qUjbICMlej5bYx2+AUz9yBIM7hpK8nIKFVFjg==
+"@vue/compiler-sfc@^3.0.3", "@vue/compiler-sfc@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.4.tgz#2119fe1e68d2c268aafa20461c82c139a9adf8e0"
+  integrity sha512-brDn6HTuK6R3oBCjtMPPsIpyJEZFinlnxjtBXww/goFJOJBAU9CrsdegwyZItNnixCFUIg4CLv4Nj1Eg/eKlfg==
   dependencies:
     "@babel/parser" "^7.12.0"
     "@babel/types" "^7.12.0"
-    "@vue/compiler-core" "3.0.3"
-    "@vue/compiler-dom" "3.0.3"
-    "@vue/compiler-ssr" "3.0.3"
-    "@vue/shared" "3.0.3"
+    "@vue/compiler-core" "3.0.4"
+    "@vue/compiler-dom" "3.0.4"
+    "@vue/compiler-ssr" "3.0.4"
+    "@vue/shared" "3.0.4"
     consolidate "^0.16.0"
     estree-walker "^2.0.1"
     hash-sum "^2.0.0"
@@ -1048,50 +1047,50 @@
     postcss-selector-parser "^6.0.4"
     source-map "^0.6.1"
 
-"@vue/compiler-ssr@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.3.tgz#7d9e5c1b8c71d69865ac6c48d2e6eb2eecb68501"
-  integrity sha512-IjJMoHCiDk939Ix7Q5wrex59TVJr6JFQ95gf36f4G4UrVau0GGY/3HudnWT/6eyWJ7267+odqQs1uCZgDfL/Ww==
+"@vue/compiler-ssr@3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.4.tgz#ccbd1f55734d51d1402fad825ac102002a7a07c7"
+  integrity sha512-4aYWQEL4+LS4+D44K9Z7xMOWMEjBsz4Li9nMcj2rxRQ35ewK6uFPodvs6ORP60iBDSkwUFZoldFlNemQlu1BFw==
   dependencies:
-    "@vue/compiler-dom" "3.0.3"
-    "@vue/shared" "3.0.3"
+    "@vue/compiler-dom" "3.0.4"
+    "@vue/shared" "3.0.4"
 
-"@vue/reactivity@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.3.tgz#681ee01ceff9219bc4da6bbb7d9c97d452e44d1d"
-  integrity sha512-t39Qmc42MX7wJtf8L6tHlu17eP9Rc5w4aRnxpLHNWoaRxddv/7FBhWqusJ2Bwkk8ixFHOQeejcLMt5G469WYJw==
+"@vue/reactivity@3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.4.tgz#b6599dd8271a745960a03f05744ccf7991ba5d8d"
+  integrity sha512-AFTABrLhUYZY2on3ea9FxeXal7w3f6qIp9gT+/oG93H7dFTL5LvVnxygCopv7tvkIl/GSGQb/yK1D1gmXx1Pww==
   dependencies:
-    "@vue/shared" "3.0.3"
+    "@vue/shared" "3.0.4"
 
-"@vue/runtime-core@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.3.tgz#edab3c9ad122cf8afd034b174cd20c073fbf950a"
-  integrity sha512-Fd1JVnYI6at0W/2ERwJuTSq4S22gNt8bKEbICcvCAac7hJUZ1rylThlrhsvrgA+DVkWU01r0niNZQ4UddlNw7g==
+"@vue/runtime-core@3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.4.tgz#a5b9a001560b1fd8c01a43f68b764c555de7836c"
+  integrity sha512-qH9e4kqU7b3u1JewvLmGmoAGY+mnuBqz7aEKb2mhpEgwa1yFv496BRuUfMXXMCix3+TndUVMJ8jt41FSdNppwg==
   dependencies:
-    "@vue/reactivity" "3.0.3"
-    "@vue/shared" "3.0.3"
+    "@vue/reactivity" "3.0.4"
+    "@vue/shared" "3.0.4"
 
-"@vue/runtime-dom@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.3.tgz#5e3e5e5418b9defcac988d2be0cf65596fa2cc03"
-  integrity sha512-ytTvSlRaEYvLQUkkpruIBizWIwuIeHER0Ch/evO6kUaPLjZjX3NerVxA40cqJx8rRjb9keQso21U2Jcpk8GsTg==
+"@vue/runtime-dom@3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.4.tgz#6f81aec545f24511d2c28a315aa3391420b69c68"
+  integrity sha512-BGIoiTSESzWUhN0Ofi2X/q+HN8f6IUFmUEyyBGKbmx7DTAJNZhFfjqsepfXQrM5IGeTfJLB1ZEVyroDQJNXq3g==
   dependencies:
-    "@vue/runtime-core" "3.0.3"
-    "@vue/shared" "3.0.3"
+    "@vue/runtime-core" "3.0.4"
+    "@vue/shared" "3.0.4"
     csstype "^2.6.8"
 
-"@vue/server-renderer@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.3.tgz#7bb4a53275814402d412143fb4d873ff032124ca"
-  integrity sha512-p54eY/3+SALl0vB0ytLDDKyHDaHLxA3Xl4EMwDbGU9qWewPmmg00rFj9tjRbFD6YmDZECYChT2HdWRYlaIqQvw==
+"@vue/server-renderer@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.4.tgz#7026113694b74e878113cd1c70d1fb8f89d09e99"
+  integrity sha512-+U3MGbIK3tiQh5fa79U1qtI++/gBdGOVxlp5POHRlsjGpA4I2YSSeQSZwqtv1SPAYp/A4d5QvAPZ7BucVKZbgg==
   dependencies:
-    "@vue/compiler-ssr" "3.0.3"
-    "@vue/shared" "3.0.3"
+    "@vue/compiler-ssr" "3.0.4"
+    "@vue/shared" "3.0.4"
 
-"@vue/shared@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.3.tgz#ef12ebff93a446df281e8a0fd765b5aea8e7745b"
-  integrity sha512-yGgkF7u4W0Dmwri9XdeY50kOowN4UIX7aBQ///jbxx37itpzVjK7QzvD3ltQtPfWaJDGBfssGL0wpAgwX9OJpQ==
+"@vue/shared@3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.4.tgz#6dc50f593bdfdeaa6183d1dbc15e2d45e7c6b8b3"
+  integrity sha512-Swfbz31AaMX48CpFl+YmIrqOH9MgJMTrltG9e26A4ZxYx9LjGuMV+41WnxFzS3Bc9nbrc6sDPM37G6nIT8NJSg==
 
 JSONStream@^1.0.4:
   version "1.3.5"
@@ -1156,24 +1155,24 @@ ajv@^6.12.3:
     uri-js "^4.2.2"
 
 algoliasearch@^4.0.0:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.8.1.tgz#ccaa1674459f2266cdc565a041bc59bd41218638"
-  integrity sha512-rK0VQiOC/9DFD6cwAZIl1dq8SrmtSLVmrz9rk2IQ0/jpTKVAE7xstOaml3nvxjBZWcFQsS4+P2qtzsg6NaLaWw==
-  dependencies:
-    "@algolia/cache-browser-local-storage" "4.8.1"
-    "@algolia/cache-common" "4.8.1"
-    "@algolia/cache-in-memory" "4.8.1"
-    "@algolia/client-account" "4.8.1"
-    "@algolia/client-analytics" "4.8.1"
-    "@algolia/client-common" "4.8.1"
-    "@algolia/client-recommendation" "4.8.1"
-    "@algolia/client-search" "4.8.1"
-    "@algolia/logger-common" "4.8.1"
-    "@algolia/logger-console" "4.8.1"
-    "@algolia/requester-browser-xhr" "4.8.1"
-    "@algolia/requester-common" "4.8.1"
-    "@algolia/requester-node-http" "4.8.1"
-    "@algolia/transporter" "4.8.1"
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.8.3.tgz#f76b824423e4264506fb6ba6a6709feb08ab9954"
+  integrity sha512-pljX9jEE2TQ3i1JayhG8afNdE8UuJg3O9c7unW6QO67yRWCKr6b0t5aKC3hSVtjt7pA2TQXLKoAISb4SHx9ozQ==
+  dependencies:
+    "@algolia/cache-browser-local-storage" "4.8.3"
+    "@algolia/cache-common" "4.8.3"
+    "@algolia/cache-in-memory" "4.8.3"
+    "@algolia/client-account" "4.8.3"
+    "@algolia/client-analytics" "4.8.3"
+    "@algolia/client-common" "4.8.3"
+    "@algolia/client-recommendation" "4.8.3"
+    "@algolia/client-search" "4.8.3"
+    "@algolia/logger-common" "4.8.3"
+    "@algolia/logger-console" "4.8.3"
+    "@algolia/requester-browser-xhr" "4.8.3"
+    "@algolia/requester-common" "4.8.3"
+    "@algolia/requester-node-http" "4.8.3"
+    "@algolia/transporter" "4.8.3"
 
 ansi-colors@^4.1.1:
   version "4.1.1"
@@ -1357,9 +1356,9 @@ babel-plugin-jest-hoist@^26.6.2:
     "@types/babel__traverse" "^7.0.6"
 
 babel-preset-current-node-syntax@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz#cf5feef29551253471cfa82fc8e0f5063df07a77"
-  integrity sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
+  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
@@ -1490,14 +1489,14 @@ builtin-modules@^1.1.1:
   integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 builtin-modules@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
-  integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
+  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
 
 cac@^6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/cac/-/cac-6.6.1.tgz#3dde3f6943f45d42a56729ea3573c08b3e7b6a6d"
-  integrity sha512-uhki4T3Ax68hw7Dufi0bATVAF8ayBSwOKUEJHjObPrUN4tlQ8Lf7oljpTje/mArLxYN0D743c2zJt4C1bVTCqg==
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.1.tgz#0609d28a31d887746de4b66a15e3914f106f880c"
+  integrity sha512-LfGt47+ugCY65W4yUEyxnZKd/tJSBJD/gUAxQGiQjH7yqdhbaX2XN0Rli4+0W0DJiDONmYeh0TlJxMtXGZspIg==
 
 cache-base@^1.0.1:
   version "1.0.1"
@@ -1765,9 +1764,9 @@ commander@^2.20.0:
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 commander@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
-  integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
+  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -2387,9 +2386,9 @@ es-to-primitive@^1.2.1:
     is-symbol "^1.0.2"
 
 esbuild@^0.8.12:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.8.15.tgz#cbc4d82a7fc4571d455233456e6fba83fd0364f1"
-  integrity sha512-mSaLo9t/oYtQE6FRUEdO47Pr8PisSPzHtgr+LcihIcjBEhbYwjT6WLCQ7noDoTBfIatBCw229rtmIwl9u9UQwg==
+  version "0.8.26"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.8.26.tgz#a85491617ebd2bd35ca4bf479239487eb6819d71"
+  integrity sha512-u3MMHOOumdWoAKF+073GHPpzvVB2cM+y9VD4ZwYs1FAQ6atRPISya35dbrbOu/mM68mQ42P+nwPzQVBTfQhkvQ==
 
 escape-html@^1.0.3:
   version "1.0.3"
@@ -2439,9 +2438,9 @@ estree-walker@^1.0.1:
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
 estree-walker@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.1.tgz#f8e030fb21cefa183b44b7ad516b747434e7a3e0"
-  integrity sha512-tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
 esutils@^2.0.2:
   version "2.0.3"
@@ -2606,9 +2605,9 @@ fast-levenshtein@~2.0.6:
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fastq@^1.6.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947"
-  integrity sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.0.tgz#74dbefccade964932cdf500473ef302719c652bb"
+  integrity sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==
   dependencies:
     reusify "^1.0.4"
 
@@ -2667,9 +2666,9 @@ find-up@^4.0.0, find-up@^4.1.0:
     path-exists "^4.0.0"
 
 follow-redirects@^1.0.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
-  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
+  integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -2750,9 +2749,9 @@ get-caller-file@^2.0.1:
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-intrinsic@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
-  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49"
+  integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
@@ -3132,9 +3131,9 @@ import-cwd@^3.0.0:
     import-from "^3.0.0"
 
 import-fresh@^3.1.0, import-fresh@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e"
-  integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
@@ -3270,9 +3269,9 @@ is-ci@^2.0.0:
     ci-info "^2.0.0"
 
 is-core-module@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
-  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
   dependencies:
     has "^1.0.3"
 
@@ -3351,9 +3350,9 @@ is-generator-fn@^2.0.0:
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-generator-function@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
-  integrity sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b"
+  integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==
 
 is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
@@ -3373,9 +3372,9 @@ is-module@^1.0.0:
   integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
 is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
 is-number@^3.0.0:
   version "3.0.0"
@@ -3940,9 +3939,9 @@ js-tokens@^4.0.0:
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.11.0, js-yaml@^3.13.1:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -4205,9 +4204,9 @@ linkify-it@^2.0.0:
     uc.micro "^1.0.1"
 
 lint-staged@^10.3.0:
-  version "10.5.2"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.2.tgz#acfaa0093af3262aee3130b2e22438941530bdd1"
-  integrity sha512-e8AYR1TDlzwB8VVd38Xu2lXDZf6BcshVqKVuBQThDJRaJLobqKnpbm4dkwJ2puypQNbLr9KF/9mfA649mAGvjA==
+  version "10.5.3"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.3.tgz#c682838b3eadd4c864d1022da05daa0912fb1da5"
+  integrity sha512-TanwFfuqUBLufxCc3RUtFEkFraSPNR3WzWcGF39R3f2J7S9+iF9W0KTVLfSy09lYGmZS5NDCxjNvhGMSJyFCWg==
   dependencies:
     chalk "^4.1.0"
     cli-truncate "^2.1.0"
@@ -4226,9 +4225,9 @@ lint-staged@^10.3.0:
     stringify-object "^3.3.0"
 
 listr2@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.2.2.tgz#d20feb75015e506992b55af40722ba1af168b8f1"
-  integrity sha512-AajqcZEUikF2ioph6PfH3dIuxJclhr3i3kHgTOP0xeXdWQohrvJAAmqVcV43/GI987HFY/vzT73jYXoa4esDHg==
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.2.3.tgz#ef9e0d790862f038dde8a9837be552b1adfd1c07"
+  integrity sha512-vUb80S2dSUi8YxXahO8/I/s29GqnOL8ozgHVLjfWQXa03BNEeS1TpBLjh2ruaqq5ufx46BRGvfymdBSuoXET5w==
   dependencies:
     chalk "^4.1.0"
     cli-truncate "^2.1.0"
@@ -4507,9 +4506,9 @@ meow@^4.0.0:
     trim-newlines "^2.0.0"
 
 meow@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-8.0.0.tgz#1aa10ee61046719e334ffdc038bb5069250ec99a"
-  integrity sha512-nbsTRz2fwniJBFgUkcdISq8y/q9n9VbiHYbfwklFh5V4V2uAcxtKQkDc0yCLPM/kP0d+inZBewn3zJqewHE7kg==
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.0.tgz#0fcaa267e35e4d58584b8205923df6021ddcc7ba"
+  integrity sha512-fNWkgM1UVMey2kf24yLiccxLihc5W+6zVus3/N0b+VfnJgxV99E9u04X6NAiKdg6ED7DAQBX5sy36NM0QJZkWA==
   dependencies:
     "@types/minimist" "^1.2.0"
     camelcase-keys "^6.2.2"
@@ -4641,11 +4640,16 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.2, ms@^2.1.1:
+ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -4811,9 +4815,9 @@ object-copy@^0.1.0:
     kind-of "^3.0.3"
 
 object-inspect@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
-  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
 
 object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
@@ -5265,9 +5269,9 @@ prelude-ls@~1.1.2:
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 prettier@^2.0.5:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.0.tgz#8a03c7777883b29b37fb2c4348c66a78e980418b"
-  integrity sha512-yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
+  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
 pretty-format@^26.0.0, pretty-format@^26.6.2:
   version "26.6.2"
@@ -5591,7 +5595,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
   integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
@@ -5654,9 +5658,9 @@ rollup-plugin-vue@^6.0.0:
     rollup-pluginutils "^2.8.2"
 
 rollup-plugin-web-worker-loader@^1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-web-worker-loader/-/rollup-plugin-web-worker-loader-1.4.0.tgz#b4fd711118758c2111c30e794e2f2757b75a27b8"
-  integrity sha512-jhlOwSkrXkAVFY2Fded0M1AS9iqZDNjUJxNz4BFjBlaKuUzTx8Ikey+b3LSegUJE4mzAAw2DqJD8pX12R0ZdDw==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-web-worker-loader/-/rollup-plugin-web-worker-loader-1.5.0.tgz#df21973426c6f95b238a84698ae27f8d8aab6b83"
+  integrity sha512-Zx5l370yGDje35rFkM/wbT4dMIq2+kSBdLWQpqLkBuxmrQJcx0umA05kSbNRzccFsudQH4FKYCK8GtSBQRQBBg==
 
 rollup-pluginutils@^2.8.2:
   version "2.8.2"
@@ -5666,9 +5670,9 @@ rollup-pluginutils@^2.8.2:
     estree-walker "^0.6.1"
 
 rollup@^2.32.1, rollup@^2.33.3:
-  version "2.33.3"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.3.tgz#ae72ce31f992b09a580072951bfea76e9df17342"
-  integrity sha512-RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w==
+  version "2.35.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.35.1.tgz#e6bc8d10893556a638066f89e8c97f422d03968c"
+  integrity sha512-q5KxEyWpprAIcainhVy6HfRttD9kutQpHbeqDTWnqAFNJotiojetK6uqmcydNMymBEtC4I8bCYR+J3mTMqeaUA==
   optionalDependencies:
     fsevents "~2.1.2"
 
@@ -5984,9 +5988,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
-  integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -6243,9 +6247,9 @@ terminal-link@^2.0.0:
     supports-hyperlinks "^2.0.0"
 
 terser@^5.0.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.0.tgz#1406fcb4d4bc517add3b22a9694284c040e33448"
-  integrity sha512-eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g==
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289"
+  integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==
   dependencies:
     commander "^2.20.0"
     source-map "~0.7.2"
@@ -6483,9 +6487,9 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
 uglify-js@^3.1.4:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.0.tgz#b943f129275c41d435eb54b643bbffee71dccf57"
-  integrity sha512-8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA==
+  version "3.12.3"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.3.tgz#bb26c4abe0e68c55e9776bca9bed99a4df73facf"
+  integrity sha512-feZzR+kIcSVuLi3s/0x0b2Tx4Iokwqt+8PJM7yRHKuldg4MLdam4TCFeICv+lgDtuYiCtdmrtIP+uN9LWvDasw==
 
 union-value@^1.0.0:
   version "1.0.1"
@@ -6553,9 +6557,9 @@ uuid@^8.3.0:
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
 v8-to-istanbul@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz#b4fe00e35649ef7785a9b7fcebcea05f37c332fc"
-  integrity sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07"
+  integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -6583,7 +6587,7 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^1.0.0-rc.13:
+vite@^2.0.0-alpha.1:
   version "1.0.0-rc.13"
   resolved "https://registry.yarnpkg.com/vite/-/vite-1.0.0-rc.13.tgz#0e0b3b6138998a1d0c02459908a6c4fb2f294727"
   integrity sha512-hLfTbhNPDhwXMCAWR6s6C79G/O8Is0MbslglgoHSQsRby+KnqHgtHChCVBHFeV2oZBV/3xhHhnfm94BDPFe8Ww==
@@ -6644,14 +6648,14 @@ vite@^1.0.0-rc.13:
     vue "^3.0.3"
     ws "^7.3.1"
 
-vue@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.3.tgz#ad94a475e6ebbf3904673b6a0ae46e47b957bd72"
-  integrity sha512-BZG5meD5vLWdvfnRL5WqfDy+cnXO1X/SweModGUna78bdFPZW6+ZO1tU9p0acrskX3DKFcfSp2s4SZnMjABx6w==
+vue@^3.0.3, vue@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.4.tgz#872c65c143f5717bd5387c61613d9f55f4cc0f43"
+  integrity sha512-2o+AiQF8sAupyhbyl3oxVCl3WCwC/n5NI7VMM+gVQ231qvSB8eI7sCBloloqDJK6yA367EEtmRSeSCf4sxCC+A==
   dependencies:
-    "@vue/compiler-dom" "3.0.3"
-    "@vue/runtime-dom" "3.0.3"
-    "@vue/shared" "3.0.3"
+    "@vue/compiler-dom" "3.0.4"
+    "@vue/runtime-dom" "3.0.4"
+    "@vue/shared" "3.0.4"
 
 w3c-hr-time@^1.0.2:
   version "1.0.2"
@@ -6766,9 +6770,9 @@ write-file-atomic@^3.0.0:
     typedarray-to-buffer "^3.1.5"
 
 ws@^7.2.3, ws@^7.3.1:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7"
-  integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb"
+  integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -6786,9 +6790,9 @@ xtend@~4.0.1:
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
 
 yallist@^2.1.2:
   version "2.1.2"

From 084c7deb02c0d2c27009bde4ccf885ab1f00e64e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 28 Dec 2020 18:43:23 -0500
Subject: [PATCH 13/78] wip: handle config hmr

---
 src/client/app/composables/siteData.ts        |  2 +-
 .../theme-default/components/LastUpdated.vue  |  7 +--
 src/node/cli.ts                               |  8 +---
 src/node/markdownToVue.ts                     | 46 ++++---------------
 src/node/plugin.ts                            | 17 ++-----
 src/node/server.ts                            |  2 +-
 6 files changed, 18 insertions(+), 64 deletions(-)

diff --git a/src/client/app/composables/siteData.ts b/src/client/app/composables/siteData.ts
index 7829e317..8b6d7f71 100644
--- a/src/client/app/composables/siteData.ts
+++ b/src/client/app/composables/siteData.ts
@@ -16,7 +16,7 @@ function parse(data: string): SiteData {
 
 // hmr
 if (import.meta.hot) {
-  import.meta.hot!.accept('/@siteData', (m) => {
+  import.meta.hot.accept('/@siteData', (m) => {
     siteDataRef.value = parse(m.default)
   })
 }
diff --git a/src/client/theme-default/components/LastUpdated.vue b/src/client/theme-default/components/LastUpdated.vue
index d33ab0a2..9dfce320 100644
--- a/src/client/theme-default/components/LastUpdated.vue
+++ b/src/client/theme-default/components/LastUpdated.vue
@@ -12,8 +12,6 @@ import { useSiteDataByRoute, usePageData } from 'vitepress'
 const site = useSiteDataByRoute()
 const page = usePageData()
 
-const datetime = ref('')
-
 const hasLastUpdated = computed(() => {
   const lu = site.value.themeConfig.lastUpdated
 
@@ -22,12 +20,11 @@ const hasLastUpdated = computed(() => {
 
 const prefix = computed(() => {
   const p = site.value.themeConfig.lastUpdated
-
   return p === true ? 'Last Updated' : p
 })
 
-onMounted(() => {
-  datetime.value = new Date(page.value.lastUpdated).toLocaleString('en-US')
+const datetime = computed(() => {
+  return new Date(page.value.lastUpdated).toLocaleString('en-US')
 })
 </script>
 
diff --git a/src/node/cli.ts b/src/node/cli.ts
index bd21caf8..eef10966 100644
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -15,13 +15,7 @@ if (root) {
 
 if (!command || command === 'dev') {
   createServer(root, argv)
-    .then((server) => {
-      return server.listen().then(() => {
-        console.log(
-          `listening at http://localhost:${server.config.server.port}`
-        )
-      })
-    })
+    .then((server) => server.listen())
     .catch((err) => {
       console.error(chalk.red(`failed to start server. error:\n`), err)
       process.exit(1)
diff --git a/src/node/markdownToVue.ts b/src/node/markdownToVue.ts
index 6f7a2a4a..cc94049c 100644
--- a/src/node/markdownToVue.ts
+++ b/src/node/markdownToVue.ts
@@ -8,12 +8,7 @@ import { PageData, HeadConfig } from '../../types/shared'
 import slash from 'slash'
 
 const debug = require('debug')('vitepress:md')
-const cache = new LRUCache<string, MarkdownCompileCachedResult>({ max: 1024 })
-
-interface MarkdownCompileCachedResult extends MarkdownCompileResult {
-  tagsWithPageData: string
-  tagsWithoutPageData: string
-}
+const cache = new LRUCache<string, MarkdownCompileResult>({ max: 1024 })
 
 interface MarkdownCompileResult {
   vueSrc: string
@@ -26,17 +21,13 @@ export function createMarkdownToVueRenderFn(
 ) {
   const md = createMarkdownRenderer(options)
 
-  return (
-    src: string,
-    file: string,
-    injectData = true
-  ): MarkdownCompileResult => {
+  return (src: string, file: string): MarkdownCompileResult => {
     const relativePath = slash(path.relative(root, file))
 
     const cached = cache.get(src)
     if (cached) {
       debug(`[cache hit] ${relativePath}`)
-      return pickResult(cached, injectData)
+      return cached
     }
 
     const start = Date.now()
@@ -44,8 +35,6 @@ export function createMarkdownToVueRenderFn(
     const { content, data: frontmatter } = matter(src)
     const { html, data } = md.render(content)
 
-    const vueSrc = `\n<template><div>${html}</div></template>`
-
     // TODO validate data.links?
     const pageData: PageData = {
       title: inferTitle(frontmatter, content),
@@ -54,38 +43,21 @@ export function createMarkdownToVueRenderFn(
       headers: data.headers,
       relativePath,
       // TODO use git timestamp?
-      lastUpdated: fs.statSync(file).mtimeMs
+      lastUpdated: Math.round(fs.statSync(file).mtimeMs)
     }
 
-    const tagsWithPageData = genPageDataCode(
-      data.hoistedTags || [],
-      pageData
-    ).join('\n')
-
-    const tagsWithoutPageData = (data.hoistedTags || []).join('\n')
+    const vueSrc =
+      genPageDataCode(data.hoistedTags || [], pageData).join('\n') +
+      `\n<template><div>${html}</div></template>`
 
     debug(`[render] ${file} in ${Date.now() - start}ms.`)
 
     const result = {
       vueSrc,
-      pageData,
-      tagsWithPageData,
-      tagsWithoutPageData
+      pageData
     }
     cache.set(src, result)
-    return pickResult(result, injectData)
-  }
-}
-
-function pickResult(
-  res: MarkdownCompileCachedResult,
-  injectData: boolean
-): MarkdownCompileResult {
-  return {
-    vueSrc:
-      res.vueSrc +
-      (injectData ? res.tagsWithPageData : res.tagsWithoutPageData),
-    pageData: res.pageData
+    return result
   }
 }
 
diff --git a/src/node/plugin.ts b/src/node/plugin.ts
index 2039e5a6..d38deb66 100644
--- a/src/node/plugin.ts
+++ b/src/node/plugin.ts
@@ -17,7 +17,6 @@ export function createVitePressPlugin(
   })
 
   let siteData = initialSiteData
-  let stringifiedData = JSON.stringify(JSON.stringify(initialSiteData))
 
   const vitePressPlugin: Plugin = {
     name: 'vitepress',
@@ -37,7 +36,7 @@ export function createVitePressPlugin(
 
     load(id) {
       if (id === SITE_DATA_REQUEST_PATH) {
-        return `export default ${stringifiedData}`
+        return `export default ${JSON.stringify(JSON.stringify(siteData))}`
       }
     },
 
@@ -62,30 +61,22 @@ export function createVitePressPlugin(
     },
 
     async handleHotUpdate(file, mods, read, server) {
+      // handle config hmr
       if (file === configPath) {
         const newData = await resolveSiteData(root)
-        stringifiedData = JSON.stringify(JSON.stringify(newData))
         if (newData.base !== siteData.base) {
           console.warn(
             `[vitepress]: config.base has changed. Please restart the dev server.`
           )
         }
         siteData = newData
-        return
+        return [server.moduleGraph.getModuleById(SITE_DATA_REQUEST_PATH)!]
       }
 
       // hot reload .md files as .vue files
       if (file.endsWith('.md')) {
         const content = await read()
-        const { pageData, vueSrc } = markdownToVue(
-          content.toString(),
-          file,
-          // do not inject pageData on HMR
-          // it leads to plugin-vue to think <script> has changed and reloads
-          // the component instead of re-rendering.
-          // pageData needs separate HMR logic anyway (see below)
-          false
-        )
+        const { pageData, vueSrc } = markdownToVue(content, file)
 
         // notify the client to update page data
         server.ws.send({
diff --git a/src/node/server.ts b/src/node/server.ts
index 658c9461..a4f9e914 100644
--- a/src/node/server.ts
+++ b/src/node/server.ts
@@ -10,7 +10,7 @@ export async function createServer(
 
   return createViteServer({
     root,
-    logLevel: 'warn',
+    // logLevel: 'warn',
     plugins: createVitePressPlugin(root, config),
     server: serverOptions
   })

From 02391593bcdd21b621a60aaa0ea2c8cf2ef450d8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2020 00:12:16 -0500
Subject: [PATCH 14/78] fix: temporarily disable slot usage causing hydration
 mismatch

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

diff --git a/src/client/theme-default/components/SideBar.vue b/src/client/theme-default/components/SideBar.vue
index f3057e75..0532370d 100644
--- a/src/client/theme-default/components/SideBar.vue
+++ b/src/client/theme-default/components/SideBar.vue
@@ -2,11 +2,12 @@
   <aside class="sidebar" :class="{ open }">
     <NavLinks class="nav" />
 
-    <slot name="sidebar-top" />
+    <!-- temporarily disabled due to ssr/hydration bug in vue core -->
+    <!-- <slot name="sidebar-top" /> -->
 
     <SideBarLinks />
 
-    <slot name="sidebar-bottom" />
+    <!-- <slot name="sidebar-bottom" /> -->
   </aside>
 </template>
 

From d02cd6b9b5c711b60eb17a3e3071791d832eb673 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2020 00:13:18 -0500
Subject: [PATCH 15/78] wip: build compat for vite 2.0

---
 src/client/app/utils.ts            |   2 +-
 src/node/{resolver.ts => alias.ts} |   0
 src/node/build/build.ts            |  21 +--
 src/node/build/bundle.ts           | 205 +++++++++++------------------
 src/node/build/render.ts           |  23 ++--
 src/node/cli.ts                    |   2 +-
 src/node/config.ts                 |   2 +-
 src/node/plugin.ts                 |  75 ++++++++++-
 8 files changed, 166 insertions(+), 164 deletions(-)
 rename src/node/{resolver.ts => alias.ts} (100%)

diff --git a/src/client/app/utils.ts b/src/client/app/utils.ts
index 0509668a..0eee7e11 100644
--- a/src/client/app/utils.ts
+++ b/src/client/app/utils.ts
@@ -29,7 +29,7 @@ export function pathToFile(path: string): string {
       // client production build needs to account for page hash, which is
       // injected directly in the page's html
       const pageHash = __VP_HASH_MAP__[pagePath]
-      pagePath = `${base}_assets/${pagePath}.${pageHash}.js`
+      pagePath = `${base}assets/${pagePath}.${pageHash}.js`
     } else {
       // ssr build uses much simpler name mapping
       pagePath = `./${pagePath.slice(1).replace(/\//g, '_')}.md.js`
diff --git a/src/node/resolver.ts b/src/node/alias.ts
similarity index 100%
rename from src/node/resolver.ts
rename to src/node/alias.ts
diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 9265456a..a1f64f7a 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -1,24 +1,16 @@
 import fs from 'fs-extra'
 import { bundle, okMark, failMark } from './bundle'
-import { BuildOptions as ViteBuildOptions } from 'vite'
+import { BuildOptions } from 'vite'
 import { resolveConfig } from '../config'
 import { renderPage } from './render'
 import { OutputChunk, OutputAsset } from 'rollup'
 import ora from 'ora'
 
-export type BuildOptions = Pick<
-  Partial<ViteBuildOptions>,
-  | 'root'
-  | 'rollupInputOptions'
-  | 'rollupOutputOptions'
-  | 'rollupPluginVueOptions'
->
-
-export async function build(buildOptions: BuildOptions = {}) {
+export async function build(root: string, buildOptions: BuildOptions = {}) {
   const start = Date.now()
 
   process.env.NODE_ENV = 'production'
-  const siteConfig = await resolveConfig(buildOptions.root)
+  const siteConfig = await resolveConfig(root)
 
   try {
     const [clientResult, , pageToHashMap] = await bundle(
@@ -30,12 +22,11 @@ export async function build(buildOptions: BuildOptions = {}) {
     spinner.start('rendering pages...')
 
     try {
-      const appChunk = clientResult.assets.find(
-        (chunk) =>
-          chunk.type === 'chunk' && chunk.fileName.match(/^app\.\w+\.js$/)
+      const appChunk = clientResult.output.find(
+        (chunk) => chunk.type === 'chunk' && chunk.isEntry && chunk
       ) as OutputChunk
 
-      const cssChunk = clientResult.assets.find(
+      const cssChunk = clientResult.output.find(
         (chunk) => chunk.type === 'asset' && chunk.fileName.endsWith('.css')
       ) as OutputAsset
 
diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 7aca513a..84a62d09 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -1,109 +1,23 @@
+import ora from 'ora'
 import path from 'path'
 import slash from 'slash'
-import fs from 'fs-extra'
-import { APP_PATH, createResolver, SITE_DATA_REQUEST_PATH } from '../resolver'
-import { BuildOptions } from './build'
-import { resolveUserConfig, SiteConfig } from '../config'
-import { Plugin, OutputAsset, OutputChunk } from 'rollup'
-import { createMarkdownToVueRenderFn } from '../markdownToVue'
-import { build, BuildOptions as ViteBuildOptions } from 'vite'
-import ora from 'ora'
+import { APP_PATH } from '../alias'
+import { SiteConfig } from '../config'
+import { RollupOutput, ExternalOption } from 'rollup'
+import { build, BuildOptions, UserConfig as ViteUserConfig } from 'vite'
+import { createVitePressPlugin } from '../plugin'
 
 export const okMark = '\x1b[32m✓\x1b[0m'
 export const failMark = '\x1b[31m✖\x1b[0m'
 
-const hashRE = /\.(\w+)\.js$/
-const staticInjectMarkerRE = /\b(const _hoisted_\d+ = \/\*#__PURE__\*\/createStaticVNode)\("(.*)", (\d+)\)/g
-const staticStripRE = /__VP_STATIC_START__.*?__VP_STATIC_END__/g
-const staticRestoreRE = /__VP_STATIC_(START|END)__/g
-
-const isPageChunk = (
-  chunk: OutputAsset | OutputChunk
-): chunk is OutputChunk & { facadeModuleId: string } =>
-  !!(
-    chunk.type === 'chunk' &&
-    chunk.isEntry &&
-    chunk.facadeModuleId &&
-    chunk.facadeModuleId.endsWith('.md')
-  )
-
 // bundles the VitePress app for both client AND server.
 export async function bundle(
   config: SiteConfig,
   options: BuildOptions
-): Promise<[BuildResult, BuildResult, Record<string, string>]> {
+): Promise<[RollupOutput, RollupOutput, Record<string, string>]> {
   const root = config.root
-  const userConfig = await resolveUserConfig(root)
-  const resolver = createResolver(config.themeDir, userConfig)
-  const markdownToVue = createMarkdownToVueRenderFn(root, userConfig.markdown)
-
-  let isClientBuild = true
   const pageToHashMap = Object.create(null)
 
-  const VitePressPlugin: Plugin = {
-    name: 'vitepress',
-    resolveId(id) {
-      if (id === SITE_DATA_REQUEST_PATH) {
-        return id
-      }
-    },
-
-    async load(id) {
-      if (id === SITE_DATA_REQUEST_PATH) {
-        return `export default ${JSON.stringify(JSON.stringify(config.site))}`
-      }
-      // compile md into vue src
-      if (id.endsWith('.md')) {
-        const content = await fs.readFile(id, 'utf-8')
-        const { vueSrc } = markdownToVue(content, id)
-        return vueSrc
-      }
-    },
-
-    renderChunk(code, chunk) {
-      if (isClientBuild && isPageChunk(chunk as OutputChunk)) {
-        // For each page chunk, inject marker for start/end of static strings.
-        // we do this here because in generateBundle the chunks would have been
-        // minified and we won't be able to safely locate the strings.
-        // Using a regexp relies on specific output from Vue compiler core,
-        // which is a reasonable trade-off considering the massive perf win over
-        // a full AST parse.
-        code = code.replace(
-          staticInjectMarkerRE,
-          '$1("__VP_STATIC_START__$2__VP_STATIC_END__", $3)'
-        )
-        return code
-      }
-      return null
-    },
-
-    generateBundle(_options, bundle) {
-      if (!isClientBuild) {
-        return
-      }
-
-      // for each .md entry chunk, adjust its name to its correct path.
-      for (const name in bundle) {
-        const chunk = bundle[name]
-        if (isPageChunk(chunk)) {
-          // record page -> hash relations
-          const hash = chunk.fileName.match(hashRE)![1]
-          const pageName = chunk.fileName.replace(hashRE, '')
-          pageToHashMap[pageName] = hash
-
-          // inject another chunk with the content stripped
-          bundle[name + '-lean'] = {
-            ...chunk,
-            fileName: chunk.fileName.replace(/\.js$/, '.lean.js'),
-            code: chunk.code.replace(staticStripRE, ``)
-          }
-          // remove static markers from original code
-          chunk.code = chunk.code.replace(staticRestoreRE, '')
-        }
-      }
-    }
-  }
-
   // define custom rollup input
   // this is a multi-entry build - every page is considered an entry chunk
   // the loading is done via filename conversion rules so that the
@@ -118,49 +32,57 @@ export async function bundle(
   })
 
   // resolve options to pass to vite
-  const { rollupInputOptions = {}, rollupOutputOptions = {} } = options
-  const viteOptions: Partial<ViteBuildOptions> = {
-    ...options,
-    base: config.site.base,
-    resolvers: [resolver],
-    outDir: config.outDir,
-    // let rollup-plugin-vue compile .md files as well
-    rollupPluginVueOptions: {
-      include: /\.(vue|md)$/
-    },
-    rollupInputOptions: {
-      ...rollupInputOptions,
-      input,
-      // important so that each page chunk and the index export things for each
-      // other
-      preserveEntrySignatures: 'allow-extension',
-      plugins: [VitePressPlugin, ...(rollupInputOptions.plugins || [])]
-    },
-    rollupOutputOptions: {
-      ...rollupOutputOptions,
-      chunkFileNames(chunk): string {
-        if (/runtime-dom/.test(chunk.name)) {
-          return `framework.[hash].js`
+  const { rollupOptions } = options
+
+  const resolveViteConfig = (ssr: boolean): ViteUserConfig => ({
+    logLevel: 'warn',
+    plugins: createVitePressPlugin(root, config, ssr, pageToHashMap),
+    build: {
+      ...options,
+      base: config.site.base,
+      outDir: ssr ? config.tempDir : config.outDir,
+      cssCodeSplit: !ssr,
+      rollupOptions: {
+        ...rollupOptions,
+        input,
+        external: ssr
+          ? resolveExternal(rollupOptions?.external)
+          : rollupOptions?.external,
+        // important so that each page chunk and the index export things for each
+        // other
+        preserveEntrySignatures: 'allow-extension',
+        output: {
+          ...rollupOptions?.output,
+          ...(ssr
+            ? {
+                format: 'cjs',
+                exports: 'named',
+                entryFileNames: '[name].js'
+              }
+            : {
+                chunkFileNames(chunk): string {
+                  if (!chunk.isEntry && /runtime/.test(chunk.name)) {
+                    return `assets/framework.[hash].js`
+                  }
+                  return `assets/[name].[hash].js`
+                }
+              })
         }
-        return `[name].[hash].js`
-      }
-    },
-    silent: !process.env.DEBUG,
-    minify: !process.env.DEBUG
-  }
+      },
+      minify: false //ssr ? false : !process.env.DEBUG
+    }
+  })
 
-  let clientResult, serverResult
+  let clientResult: RollupOutput
+  let serverResult: RollupOutput
 
   const spinner = ora()
   spinner.start('building client + server bundles...')
   try {
-    ;[clientResult, serverResult] = await Promise.all([
-      build(viteOptions),
-      ssrBuild({
-        ...viteOptions,
-        outDir: config.tempDir
-      })
-    ])
+    ;[clientResult, serverResult] = await (Promise.all([
+      build(resolveViteConfig(false)),
+      build(resolveViteConfig(true))
+    ]) as Promise<[RollupOutput, RollupOutput]>)
   } catch (e) {
     spinner.stopAndPersist({
       symbol: failMark
@@ -171,5 +93,26 @@ export async function bundle(
     symbol: okMark
   })
 
-  return [clientResult[0], serverResult[0], pageToHashMap]
+  return [clientResult, serverResult, pageToHashMap]
+}
+
+function resolveExternal(
+  userExternal: ExternalOption | undefined
+): ExternalOption {
+  const required = ['vue', /^@vue\//]
+  if (!userExternal) {
+    return required
+  }
+  if (Array.isArray(userExternal)) {
+    return [...required, ...userExternal]
+  } else if (typeof userExternal === 'function') {
+    return (src, importer, isResolved) => {
+      if (src === 'vue' || /^@vue\//.test(src)) {
+        return true
+      }
+      return userExternal(src, importer, isResolved)
+    }
+  } else {
+    return [...required, userExternal]
+  }
 }
diff --git a/src/node/build/render.ts b/src/node/build/render.ts
index 3883e38f..8ec778bb 100644
--- a/src/node/build/render.ts
+++ b/src/node/build/render.ts
@@ -2,21 +2,20 @@ import path from 'path'
 import fs from 'fs-extra'
 import { SiteConfig, resolveSiteDataByRoute } from '../config'
 import { HeadConfig } from '../../../types/shared'
-import { BuildResult } from 'vite'
-import { OutputChunk, OutputAsset } from 'rollup'
+import { RollupOutput, OutputChunk, OutputAsset } from 'rollup'
 
 const escape = require('escape-html')
 
 export async function renderPage(
   config: SiteConfig,
   page: string, // foo.md
-  result: BuildResult,
+  result: RollupOutput,
   appChunk: OutputChunk,
   cssChunk: OutputAsset,
   pageToHashMap: Record<string, string>,
   hashMapString: string
 ) {
-  const { createApp } = require(path.join(config.tempDir, `_assets/app.js`))
+  const { createApp } = require(path.join(config.tempDir, `app.js`))
   const { app, router } = createApp()
   const routePath = `/${page.replace(/\.md$/, '')}`
   const siteData = resolveSiteDataByRoute(config.site, routePath)
@@ -30,17 +29,15 @@ export async function renderPage(
   // for any initial page load, we only need the lean version of the page js
   // since the static content is already on the page!
   const pageHash = pageToHashMap[pageName]
-  const pageClientJsFileName = pageName + `.` + pageHash + '.lean.js'
+  const pageClientJsFileName = `assets/${pageName}.${pageHash}.lean.js`
 
   // resolve page data so we can render head tags
   const { __pageData } = require(path.join(
     config.tempDir,
-    `_assets`,
     pageServerJsFileName
   ))
   const pageData = JSON.parse(__pageData)
 
-  const assetPath = `${siteData.base}_assets/`
   const preloadLinks = [
     // resolve imports for index.js + page.md.js and inject script tags for
     // them as well so we fetch everything as early as possible without having
@@ -50,7 +47,7 @@ export async function renderPage(
     appChunk.fileName
   ]
     .map((file) => {
-      return `<link rel="modulepreload" href="${assetPath}${file}">`
+      return `<link rel="modulepreload" href="${siteData.base}${file}">`
     })
     .join('\n    ')
 
@@ -64,7 +61,7 @@ export async function renderPage(
       ${pageData.title ? pageData.title + ` | ` : ``}${siteData.title}
     </title>
     <meta name="description" content="${siteData.description}">
-    <link rel="stylesheet" href="${assetPath}${cssChunk.fileName}">
+    <link rel="stylesheet" href="${siteData.base}${cssChunk.fileName}">
     ${preloadLinks}
     ${renderHead(siteData.head)}
     ${renderHead(pageData.frontmatter.head)}
@@ -72,7 +69,9 @@ export async function renderPage(
   <body>
     <div id="app">${content}</div>
     <script>__VP_HASH_MAP__ = JSON.parse(${hashMapString})</script>
-    <script type="module" async src="${assetPath}${appChunk.fileName}"></script>
+    <script type="module" async src="${siteData.base}${
+    appChunk.fileName
+  }"></script>
   </body>
 </html>`.trim()
   const htmlFileName = path.join(config.outDir, page.replace(/\.md$/, '.html'))
@@ -83,14 +82,14 @@ export async function renderPage(
 function resolvePageImports(
   config: SiteConfig,
   page: string,
-  result: BuildResult,
+  result: RollupOutput,
   indexChunk: OutputChunk
 ) {
   // find the page's js chunk and inject script tags for its imports so that
   // they are start fetching as early as possible
 
   const srcPath = path.resolve(config.root, page)
-  const pageChunk = result.assets.find(
+  const pageChunk = result.output.find(
     (chunk) => chunk.type === 'chunk' && chunk.facadeModuleId === srcPath
   ) as OutputChunk
   return Array.from(new Set([...indexChunk.imports, ...pageChunk.imports]))
diff --git a/src/node/cli.ts b/src/node/cli.ts
index eef10966..63001af9 100644
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -21,7 +21,7 @@ if (!command || command === 'dev') {
       process.exit(1)
     })
 } else if (command === 'build') {
-  build(argv).catch((err) => {
+  build(root, argv).catch((err) => {
     console.error(chalk.red(`build error:\n`), err)
     process.exit(1)
   })
diff --git a/src/node/config.ts b/src/node/config.ts
index 72193c9b..da078a20 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -2,7 +2,7 @@ import path from 'path'
 import fs from 'fs-extra'
 import chalk from 'chalk'
 import globby from 'globby'
-import { APP_PATH, createAlias, DEFAULT_THEME_PATH } from './resolver'
+import { createAlias, APP_PATH, DEFAULT_THEME_PATH } from './alias'
 import { SiteData, HeadConfig, LocaleConfig } from '../../types/shared'
 import { MarkdownOptions } from './markdown/markdown'
 import { AliasOptions } from 'vite'
diff --git a/src/node/plugin.ts b/src/node/plugin.ts
index d38deb66..7bf4d5df 100644
--- a/src/node/plugin.ts
+++ b/src/node/plugin.ts
@@ -2,18 +2,37 @@ import path from 'path'
 import { Plugin } from 'vite'
 import { SiteConfig, resolveSiteData } from './config'
 import { createMarkdownToVueRenderFn } from './markdownToVue'
-import { APP_PATH, SITE_DATA_REQUEST_PATH } from './resolver'
+import { APP_PATH, SITE_DATA_REQUEST_PATH } from './alias'
 import createVuePlugin from '@vitejs/plugin-vue'
 import slash from 'slash'
+import { OutputAsset, OutputChunk } from 'rollup'
+
+const hashRE = /\.(\w+)\.js$/
+const staticInjectMarkerRE = /\b(const _hoisted_\d+ = \/\*#__PURE__\*\/createStaticVNode)\("(.*)", (\d+)\)/g
+const staticStripRE = /__VP_STATIC_START__.*?__VP_STATIC_END__/g
+const staticRestoreRE = /__VP_STATIC_(START|END)__/g
+
+const isPageChunk = (
+  chunk: OutputAsset | OutputChunk
+): chunk is OutputChunk & { facadeModuleId: string } =>
+  !!(
+    chunk.type === 'chunk' &&
+    chunk.isEntry &&
+    chunk.facadeModuleId &&
+    chunk.facadeModuleId.endsWith('.md')
+  )
 
 export function createVitePressPlugin(
   root: string,
-  { configPath, aliases, markdown, site: initialSiteData }: SiteConfig
+  { configPath, aliases, markdown, site: initialSiteData }: SiteConfig,
+  ssr = false,
+  pageToHashMap?: Record<string, string>
 ): Plugin[] {
   const markdownToVue = createMarkdownToVueRenderFn(root, markdown)
 
   const vuePlugin = createVuePlugin({
-    include: [/\.vue$/, /\.md$/]
+    include: [/\.vue$/, /\.md$/],
+    ssr
   })
 
   let siteData = initialSiteData
@@ -51,6 +70,7 @@ export function createVitePressPlugin(
       // serve our index.html after vite history fallback
       const indexPath = `/@fs/${path.join(APP_PATH, 'index.html')}`
       return () => {
+        // @ts-ignore
         server.app.use((req, _, next) => {
           if (req.url!.endsWith('.html')) {
             req.url = indexPath
@@ -60,6 +80,55 @@ export function createVitePressPlugin(
       }
     },
 
+    renderChunk(code, chunk) {
+      if (!ssr && isPageChunk(chunk as OutputChunk)) {
+        // For each page chunk, inject marker for start/end of static strings.
+        // we do this here because in generateBundle the chunks would have been
+        // minified and we won't be able to safely locate the strings.
+        // Using a regexp relies on specific output from Vue compiler core,
+        // which is a reasonable trade-off considering the massive perf win over
+        // a full AST parse.
+        code = code.replace(
+          staticInjectMarkerRE,
+          '$1("__VP_STATIC_START__$2__VP_STATIC_END__", $3)'
+        )
+        return code
+      }
+      return null
+    },
+
+    generateBundle(_options, bundle) {
+      if (ssr) {
+        // ssr build:
+        // delete all asset chunks
+        for (const name in bundle) {
+          if (bundle[name].type === 'asset') {
+            delete bundle[name]
+          }
+        }
+      } else {
+        // client build:
+        // for each .md entry chunk, adjust its name to its correct path.
+        for (const name in bundle) {
+          const chunk = bundle[name]
+          if (isPageChunk(chunk)) {
+            // record page -> hash relations
+            const hash = chunk.fileName.match(hashRE)![1]
+            pageToHashMap![chunk.name] = hash
+
+            // inject another chunk with the content stripped
+            bundle[name + '-lean'] = {
+              ...chunk,
+              fileName: chunk.fileName.replace(/\.js$/, '.lean.js'),
+              code: chunk.code.replace(staticStripRE, ``)
+            }
+            // remove static markers from original code
+            chunk.code = chunk.code.replace(staticRestoreRE, '')
+          }
+        }
+      }
+    },
+
     async handleHotUpdate(file, mods, read, server) {
       // handle config hmr
       if (file === configPath) {

From def99b47b5a8bf056b382066d23e3a44e155cc2d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2020 01:06:46 -0500
Subject: [PATCH 16/78] chore: update lockfile

---
 package.json |   5 +-
 yarn.lock    | 849 ++++-----------------------------------------------
 2 files changed, 63 insertions(+), 791 deletions(-)

diff --git a/package.json b/package.json
index a9e693e7..e6047c33 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "release": "node scripts/release.js",
     "docs": "run-p dev docs-dev",
     "docs-dev": "node ./bin/vitepress dev docs",
-    "debug": "node --inspect-brk ./bin/vitepress dev docs",
+    "docs-debug": "node --inspect-brk ./bin/vitepress dev docs",
     "docs-build": "yarn build && node ./bin/vitepress build docs",
     "docs-serve": "yarn docs-build && node ./bin/vitepress serve --root docs"
   },
@@ -65,6 +65,7 @@
   "dependencies": {
     "@docsearch/css": "^1.0.0-alpha.28",
     "@docsearch/js": "^1.0.0-alpha.28",
+    "@vitejs/plugin-vue": "^1.0.1",
     "@vue/compiler-sfc": "^3.0.4",
     "@vue/server-renderer": "^3.0.4",
     "chalk": "^4.1.0",
@@ -101,8 +102,6 @@
     "enquirer": "^2.3.6",
     "execa": "^4.1.0",
     "jest": "^26.6.3",
-    "koa": "^2.13.0",
-    "koa-static": "^5.0.0",
     "lint-staged": "^10.3.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.5",
diff --git a/yarn.lock b/yarn.lock
index 2caa7680..b939e585 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -602,13 +602,6 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@koa/cors@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@koa/cors/-/cors-3.1.0.tgz#618bb073438cfdbd3ebd0e648a76e33b84f3a3b2"
-  integrity sha512-7ulRC1da/rBa6kj6P4g2aJfnET3z8Uf3SWu60cjbtxTA5g8lxRdX/Bd2P92EagGwwAhANeNw8T8if99rJliR6Q==
-  dependencies:
-    vary "^1.1.2"
-
 "@nodelib/fs.scandir@2.1.4":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
@@ -630,55 +623,6 @@
     "@nodelib/fs.scandir" "2.1.4"
     fastq "^1.6.0"
 
-"@rollup/plugin-commonjs@^16.0.0":
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-16.0.0.tgz#169004d56cd0f0a1d0f35915d31a036b0efe281f"
-  integrity sha512-LuNyypCP3msCGVQJ7ki8PqYdpjfEkE/xtFa5DqlF+7IBD0JsfMZ87C58heSwIMint58sAUZbt3ITqOmdQv/dXw==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    commondir "^1.0.1"
-    estree-walker "^2.0.1"
-    glob "^7.1.6"
-    is-reference "^1.2.1"
-    magic-string "^0.25.7"
-    resolve "^1.17.0"
-
-"@rollup/plugin-json@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3"
-  integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==
-  dependencies:
-    "@rollup/pluginutils" "^3.0.8"
-
-"@rollup/plugin-node-resolve@^10.0.0":
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-10.0.0.tgz#44064a2b98df7530e66acf8941ff262fc9b4ead8"
-  integrity sha512-sNijGta8fqzwA1VwUEtTvWCx2E7qC70NMsDh4ZG13byAXYigBNZMxALhKUSycBks5gupJdq0lFrKumFrRZ8H3A==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    "@types/resolve" "1.17.1"
-    builtin-modules "^3.1.0"
-    deepmerge "^4.2.2"
-    is-module "^1.0.0"
-    resolve "^1.17.0"
-
-"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.0.9", "@rollup/pluginutils@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
-  integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
-  dependencies:
-    "@types/estree" "0.0.39"
-    estree-walker "^1.0.1"
-    picomatch "^2.2.2"
-
-"@rollup/pluginutils@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.0.tgz#0dcc61c780e39257554feb7f77207dceca13c838"
-  integrity sha512-TrBhfJkFxA+ER+ew2U2/fHbebhLT/l/2pRk0hfj9KusXUuRXd2v0R58AfaZK9VXDQ4TogOSEmICVrQAA3zFnHQ==
-  dependencies:
-    estree-walker "^2.0.1"
-    picomatch "^2.2.2"
-
 "@sinonjs/commons@^1.7.0":
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
@@ -763,16 +707,6 @@
     "@types/keygrip" "*"
     "@types/node" "*"
 
-"@types/estree@*":
-  version "0.0.45"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884"
-  integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==
-
-"@types/estree@0.0.39":
-  version "0.0.39"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
-  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
-
 "@types/express-serve-static-core@*":
   version "4.17.17"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.17.tgz#6ba02465165b6c9c3d8db3a28def6b16fc9b70f5"
@@ -821,13 +755,6 @@
   resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.0.tgz#682477dbbbd07cd032731cb3b0e7eaee3d026b69"
   integrity sha512-2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA==
 
-"@types/http-proxy@^1.17.4":
-  version "1.17.4"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.4.tgz#e7c92e3dbe3e13aa799440ff42e6d3a17a9d045b"
-  integrity sha512-IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==
-  dependencies:
-    "@types/node" "*"
-
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@@ -882,7 +809,7 @@
     "@types/koa" "*"
     "@types/koa-send" "*"
 
-"@types/koa@*", "@types/koa@^2.11.4", "@types/koa@^2.11.6":
+"@types/koa@*", "@types/koa@^2.11.6":
   version "2.11.6"
   resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.11.6.tgz#b7030caa6b44af801c2aea13ba77d74aff7484d5"
   integrity sha512-BhyrMj06eQkk04C97fovEDQMpLpd2IxCB4ecitaXwOKGq78Wi2tooaDOWOFGajPk8IkQOAtMppApgSVkYe1F/A==
@@ -974,13 +901,6 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
-"@types/resolve@1.17.1":
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
-  integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/serve-static@*":
   version "1.13.8"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.8.tgz#851129d434433c7082148574ffec263d58309c46"
@@ -1006,6 +926,11 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@vitejs/plugin-vue@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.0.1.tgz#48d5519e82e36ade50170b63364af3f220a6b20c"
+  integrity sha512-SVrvB7qk5Qx0djO4BS6V1AtMXGKYzPUk7yg8UhLiHw6cAkWI/hQMRGuipQ0E8TdwHruJtynqUw1Rf4fxfQdYSQ==
+
 "@vue/compiler-core@3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.4.tgz#0122aca6eada4cb28b39ed930af917444755e330"
@@ -1017,7 +942,7 @@
     estree-walker "^2.0.1"
     source-map "^0.6.1"
 
-"@vue/compiler-dom@3.0.4", "@vue/compiler-dom@^3.0.3":
+"@vue/compiler-dom@3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.4.tgz#834fd4b15c5698cf9f4505c2bfbccca058a843eb"
   integrity sha512-FOxbHBIkkGjYQeTz1DlXQjS1Ms8EPXQWsdTdTPeohoS0KzCz6RiOjiAG+jLtMi6Nr5GX2h0TlCvcnI8mcsicFQ==
@@ -1025,7 +950,7 @@
     "@vue/compiler-core" "3.0.4"
     "@vue/shared" "3.0.4"
 
-"@vue/compiler-sfc@^3.0.3", "@vue/compiler-sfc@^3.0.4":
+"@vue/compiler-sfc@^3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.4.tgz#2119fe1e68d2c268aafa20461c82c139a9adf8e0"
   integrity sha512-brDn6HTuK6R3oBCjtMPPsIpyJEZFinlnxjtBXww/goFJOJBAU9CrsdegwyZItNnixCFUIg4CLv4Nj1Eg/eKlfg==
@@ -1105,14 +1030,6 @@ abab@^2.0.3:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
   integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
 
-accepts@^1.3.5:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
-  dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
-
 acorn-globals@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
@@ -1205,11 +1122,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-any-promise@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1452,13 +1364,6 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-brotli-size@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/brotli-size/-/brotli-size-4.0.0.tgz#a05ee3faad3c0e700a2f2da826ba6b4d76e69e5e"
-  integrity sha512-uA9fOtlTRC0iqKfzff1W34DXUA3GyVqbUaeo3Rw3d4gd1eavKVCETXrn3NzO74W+UVkG3UHu8WxUi+XvKI/huA==
-  dependencies:
-    duplexer "0.1.1"
-
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
@@ -1483,21 +1388,6 @@ buffer-from@1.x, buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
-builtin-modules@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
-
-builtin-modules@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
-  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
-
-cac@^6.6.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.1.tgz#0609d28a31d887746de4b66a15e3914f106f880c"
-  integrity sha512-LfGt47+ugCY65W4yUEyxnZKd/tJSBJD/gUAxQGiQjH7yqdhbaX2XN0Rli4+0W0DJiDONmYeh0TlJxMtXGZspIg==
-
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1513,14 +1403,6 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-cache-content-type@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c"
-  integrity sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==
-  dependencies:
-    mime-types "^2.1.18"
-    ylru "^1.2.0"
-
 call-bind@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
@@ -1654,13 +1536,6 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-clean-css@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
-  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
-  dependencies:
-    source-map "~0.6.0"
-
 clean-stack@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
@@ -1751,6 +1626,11 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+colorette@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -1758,21 +1638,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 commander@^6.2.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
 compare-func@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3"
@@ -1798,18 +1668,6 @@ consolidate@^0.16.0:
   dependencies:
     bluebird "^3.7.2"
 
-content-disposition@~0.5.2:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
-  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
-  dependencies:
-    safe-buffer "5.1.2"
-
-content-type@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
 conventional-changelog-angular@^5.0.12:
   version "5.0.12"
   resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz#c979b8b921cbfe26402eb3da5bbfda02d865a2b9"
@@ -1975,14 +1833,6 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   dependencies:
     safe-buffer "~5.1.1"
 
-cookies@~0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90"
-  integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==
-  dependencies:
-    depd "~2.0.0"
-    keygrip "~1.1.0"
-
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -2113,27 +1963,13 @@ debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1:
+debug@^4.1.0, debug@^4.1.1, debug@^4.2.0:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
   integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
   dependencies:
     ms "2.1.2"
 
-debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 decamelize-keys@^1.0.0, decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -2162,11 +1998,6 @@ dedent@^0.7.0:
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
   integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
-deep-equal@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -2223,26 +2054,6 @@ delegate@^3.1.2:
   resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
   integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
-depd@^1.1.2, depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
-depd@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
-destroy@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-
 detect-newline@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
@@ -2279,21 +2090,6 @@ dot-prop@^5.1.0:
   dependencies:
     is-obj "^2.0.0"
 
-dotenv-expand@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
-  integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
-
-dotenv@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
-  integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
-
-duplexer@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -2302,11 +2098,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
 emittery@^0.7.1:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
@@ -2322,11 +2113,6 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-encodeurl@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
 end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -2371,11 +2157,6 @@ es-abstract@^1.18.0-next.1:
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
-es-module-lexer@^0.3.25:
-  version "0.3.26"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.3.26.tgz#7b507044e97d5b03b01d4392c74ffeb9c177a83b"
-  integrity sha512-Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA==
-
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -2385,7 +2166,7 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-esbuild@^0.8.12:
+esbuild@^0.8.26:
   version "0.8.26"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.8.26.tgz#a85491617ebd2bd35ca4bf479239487eb6819d71"
   integrity sha512-u3MMHOOumdWoAKF+073GHPpzvVB2cM+y9VD4ZwYs1FAQ6atRPISya35dbrbOu/mM68mQ42P+nwPzQVBTfQhkvQ==
@@ -2427,16 +2208,6 @@ estraverse@^4.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estree-walker@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
-  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
-
-estree-walker@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
-  integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
-
 estree-walker@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
@@ -2447,16 +2218,6 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-etag@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
-
-eventemitter3@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
 exec-sh@^0.3.2:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
@@ -2488,7 +2249,7 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^4.0.0, execa@^4.0.3, execa@^4.1.0:
+execa@^4.0.0, execa@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
   integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
@@ -2665,11 +2426,6 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-follow-redirects@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
-  integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
-
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -2696,12 +2452,7 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-fresh@~0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-
-fs-extra@^9.0.0, fs-extra@^9.0.1:
+fs-extra@^9.0.0:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
   integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
@@ -2855,7 +2606,7 @@ glob-parent@^5.1.0, glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -2872,7 +2623,7 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globby@^11.0.0, globby@^11.0.1:
+globby@^11.0.1:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
   integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
@@ -3028,63 +2779,6 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-http-assert@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.4.1.tgz#c5f725d677aa7e873ef736199b89686cceb37878"
-  integrity sha512-rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw==
-  dependencies:
-    deep-equal "~1.0.1"
-    http-errors "~1.7.2"
-
-http-errors@^1.6.3, http-errors@^1.7.3:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507"
-  integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
-http-errors@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.4.0.tgz#6c0242dea6b3df7afda153c71089b31c6e82aabf"
-  integrity sha1-bAJC3qaz33r9oVPHEImzHG6Cqr8=
-  dependencies:
-    inherits "2.0.1"
-    statuses ">= 1.2.1 < 2"
-
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-errors@~1.7.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
-  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
-http-proxy@^1.16.2:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
-  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
-  dependencies:
-    eventemitter3 "^4.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -3123,13 +2817,6 @@ ignore@^5.1.4:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
-import-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92"
-  integrity sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==
-  dependencies:
-    import-from "^3.0.0"
-
 import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -3138,13 +2825,6 @@ import-fresh@^3.1.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966"
-  integrity sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==
-  dependencies:
-    resolve-from "^5.0.0"
-
 import-local@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
@@ -3188,21 +2868,11 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@~2.0.3:
+inherits@2, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
 ini@^1.3.2:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -3349,11 +3019,6 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
-is-generator-function@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b"
-  integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==
-
 is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
@@ -3366,11 +3031,6 @@ is-interactive@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
   integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
 
-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
-
 is-negative-zero@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
@@ -3415,13 +3075,6 @@ is-potential-custom-element-name@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
   integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
 
-is-reference@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
-  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
-  dependencies:
-    "@types/estree" "*"
-
 is-regex@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
@@ -3473,30 +3126,18 @@ is-windows@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-is-wsl@^2.1.1, is-wsl@^2.2.0:
+is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
   dependencies:
     is-docker "^2.0.0"
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isbuiltin@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isbuiltin/-/isbuiltin-1.0.0.tgz#4453b2915690cb47c0cb9c9255a0807778315c96"
-  integrity sha1-RFOykVaQy0fAy5ySVaCAd3gxXJY=
-  dependencies:
-    builtin-modules "^1.1.1"
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -3915,7 +3556,7 @@ jest-watcher@^26.6.2:
     jest-util "^26.6.2"
     string-length "^4.0.1"
 
-jest-worker@^26.2.1, jest-worker@^26.6.2:
+jest-worker@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
   integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
@@ -4051,13 +3692,6 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-keygrip@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226"
-  integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==
-  dependencies:
-    tsscmp "1.0.6"
-
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -4087,97 +3721,6 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-klona@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
-  integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
-
-koa-compose@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-3.2.1.tgz#a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7"
-  integrity sha1-qFzLQLfZhtjlo0Wzoazo6rz1Tec=
-  dependencies:
-    any-promise "^1.1.0"
-
-koa-compose@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877"
-  integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==
-
-koa-conditional-get@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/koa-conditional-get/-/koa-conditional-get-3.0.0.tgz#552cb64a217dfb907e90b7c34f42009e441c4b8e"
-  integrity sha512-VKyPS7SuNH26TjTV2IRz+oh0HV/jc2lYAo51PTQTkj0XFn8ebNZW9riczmrW7ZVBFSnls1Z88DPUYKnvVymruA==
-
-koa-convert@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/koa-convert/-/koa-convert-1.2.0.tgz#da40875df49de0539098d1700b50820cebcd21d0"
-  integrity sha1-2kCHXfSd4FOQmNFwC1CCDOvNIdA=
-  dependencies:
-    co "^4.6.0"
-    koa-compose "^3.0.0"
-
-koa-etag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/koa-etag/-/koa-etag-4.0.0.tgz#2c2bb7ae69ca1ac6ced09ba28dcb78523c810414"
-  integrity sha512-1cSdezCkBWlyuB9l6c/IFoe1ANCDdPBxkDkRiaIup40xpUub6U/wwRXoKBZw/O5BifX9OlqAjYnDyzM6+l+TAg==
-  dependencies:
-    etag "^1.8.1"
-
-koa-proxies@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/koa-proxies/-/koa-proxies-0.11.0.tgz#43dde4260080f7cb0f284655f85cf654bbe9ec84"
-  integrity sha512-iXGRADBE0fM7g7AttNOlLZ/cCFKXeVMHbFJKIRb0dUCrSYXi02loyVSdBlKlBQ5ZfVKJLo9Q9FyqwVTp1poVVA==
-  dependencies:
-    http-proxy "^1.16.2"
-    path-match "^1.2.4"
-
-koa-send@^5.0.0, koa-send@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-5.0.1.tgz#39dceebfafb395d0d60beaffba3a70b4f543fe79"
-  integrity sha512-tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==
-  dependencies:
-    debug "^4.1.1"
-    http-errors "^1.7.3"
-    resolve-path "^1.4.0"
-
-koa-static@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/koa-static/-/koa-static-5.0.0.tgz#5e92fc96b537ad5219f425319c95b64772776943"
-  integrity sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==
-  dependencies:
-    debug "^3.1.0"
-    koa-send "^5.0.0"
-
-koa@^2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.0.tgz#25217e05efd3358a7e5ddec00f0a380c9b71b501"
-  integrity sha512-i/XJVOfPw7npbMv67+bOeXr3gPqOAw6uh5wFyNs3QvJ47tUx3M3V9rIE0//WytY42MKz4l/MXKyGkQ2LQTfLUQ==
-  dependencies:
-    accepts "^1.3.5"
-    cache-content-type "^1.0.0"
-    content-disposition "~0.5.2"
-    content-type "^1.0.4"
-    cookies "~0.8.0"
-    debug "~3.1.0"
-    delegates "^1.0.0"
-    depd "^1.1.2"
-    destroy "^1.0.4"
-    encodeurl "^1.0.2"
-    escape-html "^1.0.3"
-    fresh "~0.5.2"
-    http-assert "^1.3.0"
-    http-errors "^1.6.3"
-    is-generator-function "^1.0.7"
-    koa-compose "^4.1.0"
-    koa-convert "^1.2.0"
-    on-finished "^2.3.0"
-    only "~0.0.2"
-    parseurl "^1.3.2"
-    statuses "^1.5.0"
-    type-is "^1.6.16"
-    vary "^1.1.2"
-
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -4464,11 +4007,6 @@ mdurl@^1.0.1:
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
 memorystream@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
@@ -4571,7 +4109,7 @@ mime-db@1.44.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
   integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
 
-mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.27, mime-types@~2.1.19, mime-types@~2.1.24:
+mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.27"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
   integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
@@ -4645,16 +4183,16 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
+nanoid@^3.1.20:
+  version "3.1.20"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
+  integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -4677,11 +4215,6 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-
 neo-async@^2.6.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
@@ -4692,11 +4225,6 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-node-forge@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
-  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
-
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -4848,13 +4376,6 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-on-finished@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
-  dependencies:
-    ee-first "1.1.1"
-
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -4869,19 +4390,6 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-only@~0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
-  integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q=
-
-open@^7.2.1:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69"
-  integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==
-  dependencies:
-    is-docker "^2.0.0"
-    is-wsl "^2.1.1"
-
 optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -4946,11 +4454,6 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-map-series@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-2.1.0.tgz#7560d4c452d9da0c07e692fdbfe6e2c81a2a91f2"
-  integrity sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==
-
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -5010,11 +4513,6 @@ parse5@5.1.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
   integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
 
-parseurl@^1.3.2:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -5037,7 +4535,7 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
+path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
@@ -5052,26 +4550,11 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-match@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/path-match/-/path-match-1.2.4.tgz#a62747f3c7e0c2514762697f24443585b09100ea"
-  integrity sha1-pidH88fgwlFHYml/JEQ1hbCRAOo=
-  dependencies:
-    http-errors "~1.4.0"
-    path-to-regexp "^1.0.0"
-
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-to-regexp@^1.0.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
-
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -5098,7 +4581,7 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -5156,31 +4639,6 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-postcss-discard-comments@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033"
-  integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==
-  dependencies:
-    postcss "^7.0.0"
-
-postcss-import@^12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
-  integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==
-  dependencies:
-    postcss "^7.0.1"
-    postcss-value-parser "^3.2.3"
-    read-cache "^1.0.0"
-    resolve "^1.1.7"
-
-postcss-load-config@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.0.0.tgz#850bb066edd65b734329eacf83af0c0764226c87"
-  integrity sha512-lErrN8imuEF1cSiHBV8MiR7HeuzlDpCGNtaMyYHlOBuJHHOGw6S4xOMZp8BbXPr7AGQp14L6PZDlIOpfFJ6f7w==
-  dependencies:
-    cosmiconfig "^7.0.0"
-    import-cwd "^3.0.0"
-
 postcss-modules-extract-imports@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
@@ -5239,17 +4697,12 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector
     uniq "^1.0.1"
     util-deprecate "^1.0.2"
 
-postcss-value-parser@^3.2.3:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
-  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
-
 postcss-value-parser@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.35"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
   integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
@@ -5258,6 +4711,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.32, postcss@^7.0.5
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@^8.2.1:
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.1.tgz#eabc5557c4558059b9d9e5b15bce7ffa9089c2a8"
+  integrity sha512-RhsqOOAQzTgh1UB/IZdca7F9WDb7SUCR2Vnv1x7DbvuuggQIpoDwjK+q0rzoPffhYvWNKX5JSwS4so4K3UC6vA==
+  dependencies:
+    colorette "^1.2.1"
+    nanoid "^3.1.20"
+    source-map "^0.6.1"
+
 preact@^10.0.0:
   version "10.5.7"
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.5.7.tgz#f1d84725539e18f7ccbea937cf3db5895661dbd3"
@@ -5346,25 +4808,11 @@ quick-lru@^4.0.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
 react-is@^17.0.1:
   version "17.0.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
   integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
 
-read-cache@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
-  dependencies:
-    pify "^2.3.0"
-
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -5560,11 +5008,6 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -5582,20 +5025,12 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve-path@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
-  integrity sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc=
-  dependencies:
-    http-errors "~1.6.2"
-    path-is-absolute "1.0.1"
-
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
   integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
@@ -5628,48 +5063,7 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rollup-plugin-dynamic-import-variables@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-dynamic-import-variables/-/rollup-plugin-dynamic-import-variables-1.1.0.tgz#4981d38907a471b35234398a09047bef47a2006a"
-  integrity sha512-C1avEmnXC8cC4aAQ5dB63O9oQf7IrhEHc98bQw9Qd6H36FxtZooLCvVfcO4SNYrqaNrzH3ErucQt/zdFSLPHNw==
-  dependencies:
-    "@rollup/pluginutils" "^3.0.9"
-    estree-walker "^2.0.1"
-    globby "^11.0.0"
-    magic-string "^0.25.7"
-
-rollup-plugin-terser@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
-  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    jest-worker "^26.2.1"
-    serialize-javascript "^4.0.0"
-    terser "^5.0.0"
-
-rollup-plugin-vue@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-vue/-/rollup-plugin-vue-6.0.0.tgz#e379e93e5ae9a8648522f698be2e452e8672aaf2"
-  integrity sha512-oVvUd84d5u73M2HYM3XsMDLtZRIA/tw2U0dmHlXU2UWP5JARYHzh/U9vcxaN/x/9MrepY7VH3pHFeOhrWpxs/Q==
-  dependencies:
-    debug "^4.1.1"
-    hash-sum "^2.0.0"
-    rollup-pluginutils "^2.8.2"
-
-rollup-plugin-web-worker-loader@^1.3.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-web-worker-loader/-/rollup-plugin-web-worker-loader-1.5.0.tgz#df21973426c6f95b238a84698ae27f8d8aab6b83"
-  integrity sha512-Zx5l370yGDje35rFkM/wbT4dMIq2+kSBdLWQpqLkBuxmrQJcx0umA05kSbNRzccFsudQH4FKYCK8GtSBQRQBBg==
-
-rollup-pluginutils@^2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
-  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
-  dependencies:
-    estree-walker "^0.6.1"
-
-rollup@^2.32.1, rollup@^2.33.3:
+rollup@^2.33.3, rollup@^2.35.1:
   version "2.35.1"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.35.1.tgz#e6bc8d10893556a638066f89e8c97f422d03968c"
   integrity sha512-q5KxEyWpprAIcainhVy6HfRttD9kutQpHbeqDTWnqAFNJotiojetK6uqmcydNMymBEtC4I8bCYR+J3mTMqeaUA==
@@ -5693,16 +5087,16 @@ rxjs@^6.6.3:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -5750,13 +5144,6 @@ select@^1.1.2:
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
   integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
 
-selfsigned@^1.10.8:
-  version "1.10.8"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30"
-  integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==
-  dependencies:
-    node-forge "^0.10.0"
-
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -5779,13 +5166,6 @@ semver@^6.0.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
-  dependencies:
-    randombytes "^2.1.0"
-
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -5801,21 +5181,6 @@ set-value@^2.0.0, set-value@^2.0.1:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
-
-setprototypeof@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
-  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -5933,7 +5298,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.6, source-map-support@~0.5.19:
+source-map-support@^0.5.6:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -5951,12 +5316,12 @@ source-map@^0.5.0, source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3, source-map@~0.7.2:
+source-map@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -6048,11 +5413,6 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.2.1 < 2", "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
 stealthy-require@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
@@ -6246,15 +5606,6 @@ terminal-link@^2.0.0:
     ansi-escapes "^4.2.1"
     supports-hyperlinks "^2.0.0"
 
-terser@^5.0.0:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289"
-  integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.19"
-
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -6341,11 +5692,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
 tough-cookie@^2.3.3, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -6412,11 +5758,6 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tsscmp@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
-  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -6461,14 +5802,6 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type-is@^1.6.16:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -6573,11 +5906,6 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-vary@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -6588,67 +5916,17 @@ verror@1.10.0:
     extsprintf "^1.2.0"
 
 vite@^2.0.0-alpha.1:
-  version "1.0.0-rc.13"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-1.0.0-rc.13.tgz#0e0b3b6138998a1d0c02459908a6c4fb2f294727"
-  integrity sha512-hLfTbhNPDhwXMCAWR6s6C79G/O8Is0MbslglgoHSQsRby+KnqHgtHChCVBHFeV2oZBV/3xhHhnfm94BDPFe8Ww==
+  version "2.0.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-alpha.1.tgz#bc184f7c0b06e9142dd0b5e49a0a7cbbb79989d2"
+  integrity sha512-bmpgZuTQo3n4jO/jsdiNZRZSIUZeISkCW9c99FV+lnwukA1DFri3ix9w7x439xYQnqDAzONPMfKHtR1zdmyDag==
   dependencies:
-    "@babel/parser" "^7.12.7"
-    "@koa/cors" "^3.1.0"
-    "@rollup/plugin-commonjs" "^16.0.0"
-    "@rollup/plugin-json" "^4.1.0"
-    "@rollup/plugin-node-resolve" "^10.0.0"
-    "@rollup/pluginutils" "^4.1.0"
-    "@types/http-proxy" "^1.17.4"
-    "@types/koa" "^2.11.4"
-    "@types/lru-cache" "^5.1.0"
-    "@vue/compiler-dom" "^3.0.3"
-    "@vue/compiler-sfc" "^3.0.3"
-    brotli-size "^4.0.0"
-    cac "^6.6.1"
-    chalk "^4.1.0"
-    chokidar "^3.4.2"
-    clean-css "^4.2.3"
-    debug "^4.3.1"
-    dotenv "^8.2.0"
-    dotenv-expand "^5.1.0"
-    es-module-lexer "^0.3.25"
-    esbuild "^0.8.12"
-    etag "^1.8.1"
-    execa "^4.0.3"
-    fs-extra "^9.0.1"
-    hash-sum "^2.0.0"
-    isbuiltin "^1.0.0"
-    klona "^2.0.4"
-    koa "^2.13.0"
-    koa-conditional-get "^3.0.0"
-    koa-etag "^4.0.0"
-    koa-proxies "^0.11.0"
-    koa-send "^5.0.1"
-    koa-static "^5.0.0"
-    lru-cache "^6.0.0"
-    magic-string "^0.25.7"
-    merge-source-map "^1.1.0"
-    mime-types "^2.1.27"
-    minimist "^1.2.5"
-    open "^7.2.1"
-    ora "^5.1.0"
-    p-map-series "^2.1.0"
-    postcss-discard-comments "^4.0.2"
-    postcss-import "^12.0.1"
-    postcss-load-config "^3.0.0"
-    resolve "^1.17.0"
-    rollup "^2.32.1"
-    rollup-plugin-dynamic-import-variables "^1.1.0"
-    rollup-plugin-terser "^7.0.2"
-    rollup-plugin-vue "^6.0.0"
-    rollup-plugin-web-worker-loader "^1.3.1"
-    selfsigned "^1.10.8"
-    slash "^3.0.0"
-    source-map "^0.7.3"
-    vue "^3.0.3"
-    ws "^7.3.1"
+    esbuild "^0.8.26"
+    postcss "^8.2.1"
+    rollup "^2.35.1"
+  optionalDependencies:
+    fsevents "~2.1.2"
 
-vue@^3.0.3, vue@^3.0.4:
+vue@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.4.tgz#872c65c143f5717bd5387c61613d9f55f4cc0f43"
   integrity sha512-2o+AiQF8sAupyhbyl3oxVCl3WCwC/n5NI7VMM+gVQ231qvSB8eI7sCBloloqDJK6yA367EEtmRSeSCf4sxCC+A==
@@ -6769,7 +6047,7 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@^7.2.3, ws@^7.3.1:
+ws@^7.2.3:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb"
   integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==
@@ -6844,11 +6122,6 @@ yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-ylru@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.2.1.tgz#f576b63341547989c1de7ba288760923b27fe84f"
-  integrity sha512-faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ==
-
 yorkie@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yorkie/-/yorkie-2.0.0.tgz#92411912d435214e12c51c2ae1093e54b6bb83d9"

From 9ef7c8de1b8d8e6a8cf29d32a77286c306afb32d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2020 10:01:47 -0500
Subject: [PATCH 17/78] types: fix types

---
 package.json                           |  1 +
 src/client/app/composables/siteData.ts |  2 +-
 src/client/shim.d.ts                   |  3 ++-
 yarn.lock                              | 24 ++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e6047c33..be0df27f 100644
--- a/package.json
+++ b/package.json
@@ -84,6 +84,7 @@
     "minimist": "^1.2.5",
     "ora": "^5.1.0",
     "prismjs": "^1.20.0",
+    "sirv": "^1.0.10",
     "slash": "^3.0.0",
     "vite": "^2.0.0-alpha.1",
     "vue": "^3.0.4"
diff --git a/src/client/app/composables/siteData.ts b/src/client/app/composables/siteData.ts
index 8b6d7f71..7829e317 100644
--- a/src/client/app/composables/siteData.ts
+++ b/src/client/app/composables/siteData.ts
@@ -16,7 +16,7 @@ function parse(data: string): SiteData {
 
 // hmr
 if (import.meta.hot) {
-  import.meta.hot.accept('/@siteData', (m) => {
+  import.meta.hot!.accept('/@siteData', (m) => {
     siteDataRef.value = parse(m.default)
   })
 }
diff --git a/src/client/shim.d.ts b/src/client/shim.d.ts
index 4c240a37..166b35e3 100644
--- a/src/client/shim.d.ts
+++ b/src/client/shim.d.ts
@@ -18,5 +18,6 @@ declare module '@docsearch/js' {
 }
 
 declare module '@docsearch/css' {
-  export default string
+  const css: string
+  export default css
 }
diff --git a/yarn.lock b/yarn.lock
index b939e585..32bc629c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -623,6 +623,11 @@
     "@nodelib/fs.scandir" "2.1.4"
     fastq "^1.6.0"
 
+"@polka/url@^1.0.0-next.9":
+  version "1.0.0-next.11"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.11.tgz#aeb16f50649a91af79dbe36574b66d0f9e4d9f71"
+  integrity sha512-3NsZsJIA/22P3QUyrEDNA2D133H4j224twJrdipXN38dpnIOzAbUDtOwkcJ5pXmn75w7LSQDjA4tO9dm1XlqlA==
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
@@ -4116,6 +4121,11 @@ mime-types@^2.1.12, mime-types@~2.1.19:
   dependencies:
     mime-db "1.44.0"
 
+mime@^2.3.1:
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
+  integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
+
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -5229,6 +5239,15 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
+sirv@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.10.tgz#3e591f5a9ae2520f50d5830f5fae38d97e7be194"
+  integrity sha512-H5EZCoZaggEUQy8ocKsF7WAToGuZhjJlLvM3XOef46CbdIgbNeQ1p32N1PCuCjkVYwrAVOSMacN6CXXgIzuspg==
+  dependencies:
+    "@polka/url" "^1.0.0-next.9"
+    mime "^2.3.1"
+    totalist "^1.0.0"
+
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -5692,6 +5711,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+totalist@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
+  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
+
 tough-cookie@^2.3.3, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"

From 04ed45d250233ff64be28f59614cf904add73208 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2020 10:21:27 -0500
Subject: [PATCH 18/78] wip: serve w/ new impl

---
 package.json            |  2 +-
 src/node/serve/serve.ts | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index be0df27f..ed3e9877 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "docs-dev": "node ./bin/vitepress dev docs",
     "docs-debug": "node --inspect-brk ./bin/vitepress dev docs",
     "docs-build": "yarn build && node ./bin/vitepress build docs",
-    "docs-serve": "yarn docs-build && node ./bin/vitepress serve --root docs"
+    "docs-serve": "yarn docs-build && node ./bin/vitepress serve docs"
   },
   "engines": {
     "node": ">=10.0.0"
diff --git a/src/node/serve/serve.ts b/src/node/serve/serve.ts
index b51e169f..8f6ed28d 100644
--- a/src/node/serve/serve.ts
+++ b/src/node/serve/serve.ts
@@ -1,5 +1,5 @@
-import Koa from 'koa'
-import koaServe from 'koa-static'
+import http from 'http'
+import sirv from 'sirv'
 import { resolveConfig } from '../config'
 
 export interface ServeOptions {
@@ -11,11 +11,8 @@ export async function serve(options: ServeOptions = {}) {
   const port = options.port !== undefined ? options.port : 3000
   const site = await resolveConfig(options.root)
 
-  const app = new Koa()
-
-  app.use(koaServe(site.outDir))
-
-  app.listen(port)
-
-  console.log(`listening at http://localhost:${port}`)
+  const server = http.createServer(sirv(site.outDir, { dev: true, etag: true }))
+  server.listen(port, () => {
+    console.log(`listening at http://localhost:${port}`)
+  })
 }

From b50a2dffc469b9231396565ec333a943d7e2e007 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2020 11:43:04 -0500
Subject: [PATCH 19/78] wip: make build pass

---
 package.json              |  2 +-
 src/client/app/exports.ts |  3 +++
 src/node/alias.ts         | 39 +++++++++++++++++++++++++++++++++++----
 src/node/config.ts        |  4 ++--
 yarn.lock                 |  8 ++++----
 5 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index ed3e9877..a8760d44 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-alpha.1",
+    "vite": "^2.0.0-alpha.2",
     "vue": "^3.0.4"
   },
   "devDependencies": {
diff --git a/src/client/app/exports.ts b/src/client/app/exports.ts
index 21ee2965..6012598b 100644
--- a/src/client/app/exports.ts
+++ b/src/client/app/exports.ts
@@ -24,3 +24,6 @@ import { ComponentOptions } from 'vue'
 import _Debug from './components/Debug.vue'
 const Debug = _Debug as ComponentOptions
 export { Debug }
+
+// default theme
+export { default as DefaultTheme } from '../theme-default'
diff --git a/src/node/alias.ts b/src/node/alias.ts
index 8d6ab6fb..50f59a45 100644
--- a/src/node/alias.ts
+++ b/src/node/alias.ts
@@ -1,7 +1,8 @@
 import path from 'path'
-import { AliasOptions } from 'vite'
+import { Alias, AliasOptions } from 'vite'
 import { UserConfig } from './config'
 
+const PKG_ROOT = path.join(__dirname, '../../')
 export const APP_PATH = path.join(__dirname, '../client/app')
 export const SHARED_PATH = path.join(__dirname, '../client/shared')
 export const DEFAULT_THEME_PATH = path.join(
@@ -20,17 +21,47 @@ 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 createAlias(
+export function resolveAliases(
+  root: string,
   themeDir: string,
   userConfig: UserConfig
 ): AliasOptions {
-  return {
+  const paths: Record<string, string> = {
     ...userConfig.alias,
     '/@app': APP_PATH,
     '/@theme': themeDir,
     '/@default-theme': DEFAULT_THEME_PATH,
     '/@shared': SHARED_PATH,
-    vitepress: `${APP_PATH}/exports.js`,
     [SITE_DATA_ID]: SITE_DATA_REQUEST_PATH
   }
+
+  const aliases: Alias[] = [
+    ...Object.keys(paths).map((p) => ({
+      find: p,
+      replacement: paths[p]
+    })),
+    { find: /^vitepress$/, replacement: `${APP_PATH}/exports.js` }
+  ]
+
+  let isLinked = false
+  try {
+    require.resolve('vitepress', { paths: [root] })
+  } catch (e) {
+    isLinked = true
+  }
+
+  if (isLinked) {
+    // aliases for local linked development
+    aliases.push(
+      { find: /^vitepress\//, replacement: PKG_ROOT + '/' },
+      {
+        find: /^vue$/,
+        replacement: require.resolve(
+          '@vue/runtime-dom/dist/runtime-dom.esm-bundler.js'
+        )
+      }
+    )
+  }
+
+  return aliases
 }
diff --git a/src/node/config.ts b/src/node/config.ts
index da078a20..e565e6ec 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -2,7 +2,7 @@ import path from 'path'
 import fs from 'fs-extra'
 import chalk from 'chalk'
 import globby from 'globby'
-import { createAlias, APP_PATH, DEFAULT_THEME_PATH } from './alias'
+import { resolveAliases, APP_PATH, DEFAULT_THEME_PATH } from './alias'
 import { SiteData, HeadConfig, LocaleConfig } from '../../types/shared'
 import { MarkdownOptions } from './markdown/markdown'
 import { AliasOptions } from 'vite'
@@ -59,7 +59,7 @@ export async function resolveConfig(
     outDir: resolve(root, 'dist'),
     tempDir: path.resolve(APP_PATH, 'temp'),
     markdown: userConfig.markdown,
-    aliases: createAlias(themeDir, userConfig)
+    aliases: resolveAliases(root, themeDir, userConfig)
   }
 
   return config
diff --git a/yarn.lock b/yarn.lock
index 32bc629c..e0ddaef1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5939,10 +5939,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-alpha.1:
-  version "2.0.0-alpha.1"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-alpha.1.tgz#bc184f7c0b06e9142dd0b5e49a0a7cbbb79989d2"
-  integrity sha512-bmpgZuTQo3n4jO/jsdiNZRZSIUZeISkCW9c99FV+lnwukA1DFri3ix9w7x439xYQnqDAzONPMfKHtR1zdmyDag==
+vite@^2.0.0-alpha.2:
+  version "2.0.0-alpha.2"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-alpha.2.tgz#ef03271c0dc9d301076fbeed01b48849f89722a1"
+  integrity sha512-iGTlNzH4uskwEu32XmDk0i9dFRUax9ZHjL+5DXbX/cisNYQC35KhLaiLKwdL3iSu8fFYc3nd8sfKfCndJxL3AQ==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"

From 22e12b8928b52a2adabd15255db0836b826bfb24 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2020 11:51:54 -0500
Subject: [PATCH 20/78] chore: bump min node version + target es2019

---
 package.json             | 2 +-
 src/client/tsconfig.json | 1 +
 src/node/tsconfig.json   | 1 +
 tsconfig.json            | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a8760d44..d6de6fe9 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "docs-serve": "yarn docs-build && node ./bin/vitepress serve docs"
   },
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=12.0.0"
   },
   "gitHooks": {
     "pre-commit": "lint-staged"
diff --git a/src/client/tsconfig.json b/src/client/tsconfig.json
index a05dc55d..a2762775 100644
--- a/src/client/tsconfig.json
+++ b/src/client/tsconfig.json
@@ -3,6 +3,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "../../dist/client",
+    "target": "esnext",
     "module": "esnext",
     "lib": ["ESNext", "DOM"],
     "types": ["vite"],
diff --git a/src/node/tsconfig.json b/src/node/tsconfig.json
index ba20f5de..daeb69d0 100644
--- a/src/node/tsconfig.json
+++ b/src/node/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "target": "es2019",
     "baseUrl": ".",
     "outDir": "../../dist/node",
     "module": "commonjs",
diff --git a/tsconfig.json b/tsconfig.json
index 350baedb..89e40b9b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,6 @@
   "compilerOptions": {
     "baseUrl": ".",
     "module": "esnext",
-    "target": "esnext",
     "moduleResolution": "node",
     "strict": true,
     "declaration": true,

From a1daf2b8a012a8a248b3a832d80d6933778087d0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2020 11:59:45 -0500
Subject: [PATCH 21/78] fix: revert datetime handling

---
 src/client/theme-default/components/LastUpdated.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/client/theme-default/components/LastUpdated.vue b/src/client/theme-default/components/LastUpdated.vue
index 9dfce320..d830beee 100644
--- a/src/client/theme-default/components/LastUpdated.vue
+++ b/src/client/theme-default/components/LastUpdated.vue
@@ -23,8 +23,11 @@ const prefix = computed(() => {
   return p === true ? 'Last Updated' : p
 })
 
-const datetime = computed(() => {
-  return new Date(page.value.lastUpdated).toLocaleString('en-US')
+const datetime = ref('')
+onMounted(() => {
+  // locale string might be different based on end user
+  // and will lead to potential hydration mismatch if calculated at build time
+  datetime.value = new Date(page.value.lastUpdated).toLocaleString('en-US')
 })
 </script>
 
@@ -33,7 +36,7 @@ const datetime = computed(() => {
   display: inline-block;
   margin: 0;
   line-height: 1.4;
-  font-size: .9rem;
+  font-size: 0.9rem;
   color: var(--c-text-light);
 }
 

From b1af922e75c7762fbac9f31b08ed043b6282f182 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 10:45:10 -0500
Subject: [PATCH 22/78] chore: bump deps

---
 package.json |  4 ++--
 yarn.lock    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index d6de6fe9..270ad963 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
   "dependencies": {
     "@docsearch/css": "^1.0.0-alpha.28",
     "@docsearch/js": "^1.0.0-alpha.28",
-    "@vitejs/plugin-vue": "^1.0.1",
+    "@vitejs/plugin-vue": "^1.0.2",
     "@vue/compiler-sfc": "^3.0.4",
     "@vue/server-renderer": "^3.0.4",
     "chalk": "^4.1.0",
@@ -86,7 +86,7 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-alpha.2",
+    "vite": "^2.0.0-alpha.3",
     "vue": "^3.0.4"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index e0ddaef1..990ba849 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -931,10 +931,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@vitejs/plugin-vue@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.0.1.tgz#48d5519e82e36ade50170b63364af3f220a6b20c"
-  integrity sha512-SVrvB7qk5Qx0djO4BS6V1AtMXGKYzPUk7yg8UhLiHw6cAkWI/hQMRGuipQ0E8TdwHruJtynqUw1Rf4fxfQdYSQ==
+"@vitejs/plugin-vue@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.0.2.tgz#46da003df81c5ef74cec6d59c16fa13c34bd8108"
+  integrity sha512-qtmVCJ3MfGebpbRIK/UFydlEuvDrz5Z4caARXDWWy23bM6nFq7wIV6/tW4LRdmSHxFdyvogctQ1+zl4brJg1og==
 
 "@vue/compiler-core@3.0.4":
   version "3.0.4"
@@ -5939,10 +5939,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-alpha.2:
-  version "2.0.0-alpha.2"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-alpha.2.tgz#ef03271c0dc9d301076fbeed01b48849f89722a1"
-  integrity sha512-iGTlNzH4uskwEu32XmDk0i9dFRUax9ZHjL+5DXbX/cisNYQC35KhLaiLKwdL3iSu8fFYc3nd8sfKfCndJxL3AQ==
+vite@^2.0.0-alpha.3:
+  version "2.0.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-alpha.3.tgz#ee95db051736646f4c4c02aa5b72de088df6e9d5"
+  integrity sha512-jVARgUHk4XRkeW4c2UWbsu+NfBGuSJjA4hMCai7KhyktDJYbj13kG+1ImuJFUOwinXip0ktsrlVWEilN6t45XA==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"

From 8d946a374b4660aa006de9389c9238ec38ab31f0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 10:45:56 -0500
Subject: [PATCH 23/78] release: v0.10.0

---
 CHANGELOG.md | 12 ++++++++++++
 package.json |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7d65527..87701ddf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [0.10.0](https://github.com/vuejs/vitepress/compare/v0.9.2...v0.10.0) (2020-12-30)
+
+- Upgrade to Vite 2.0
+
+### Bug Fixes
+
+- port fixes to parseHeader utils from vuepress ([#172](https://github.com/vuejs/vitepress/issues/172)) ([dd312ce](https://github.com/vuejs/vitepress/commit/dd312ce86bf9daf4b169e025d4215c05e2ad63c5))
+- revert datetime handling ([a1daf2b](https://github.com/vuejs/vitepress/commit/a1daf2b8a012a8a248b3a832d80d6933778087d0))
+- style pollution on custom theme ([#190](https://github.com/vuejs/vitepress/issues/190)) ([46e99ba](https://github.com/vuejs/vitepress/commit/46e99babc2d1a0e456d47081c2e7beb961bcd1d5))
+- temporarily disable slot usage causing hydration mismatch ([0239159](https://github.com/vuejs/vitepress/commit/02391593bcdd21b621a60aaa0ea2c8cf2ef450d8))
+- **md:** avoid normalising markdown "mailto:" links ([#173](https://github.com/vuejs/vitepress/issues/173)) ([18d18d2](https://github.com/vuejs/vitepress/commit/18d18d2eb15a569113ca68ccbb9ba52dfd46c80a))
+
 ## [0.9.2](https://github.com/vuejs/vitepress/compare/v0.9.1...v0.9.2) (2020-12-10)
 
 Fix build files
diff --git a/package.json b/package.json
index 270ad963..d6a0f31c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From c878e6d3b56ecbd71bd75ff4360446d6dacbd70b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 12:07:14 -0500
Subject: [PATCH 24/78] perf: avoid including optional features in build when
 not used

---
 src/client/shim.d.ts                |  4 +++-
 src/client/theme-default/Layout.vue | 15 +++++++++------
 src/node/plugin.ts                  | 17 +++++++++++++----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/client/shim.d.ts b/src/client/shim.d.ts
index 166b35e3..c6c262e5 100644
--- a/src/client/shim.d.ts
+++ b/src/client/shim.d.ts
@@ -1,5 +1,7 @@
 declare const __VP_HASH_MAP__: Record<string, string>
-
+declare const __CARBON__: boolean
+declare const __BSA__: boolean
+declare const __ALGOLIA__: boolean
 declare module '*.vue' {
   import { ComponentOptions } from 'vue'
   const comp: ComponentOptions
diff --git a/src/client/theme-default/Layout.vue b/src/client/theme-default/Layout.vue
index c7b820ee..d18d9ad3 100644
--- a/src/client/theme-default/Layout.vue
+++ b/src/client/theme-default/Layout.vue
@@ -77,15 +77,18 @@ import NavBar from './components/NavBar.vue'
 import SideBar from './components/SideBar.vue'
 import Page from './components/Page.vue'
 const Home = defineAsyncComponent(() => import('./components/Home.vue'))
-const CarbonAds = defineAsyncComponent(
+
+const NoopComponent = () => null
+
+const CarbonAds = __CARBON__ ? defineAsyncComponent(
   () => import('./components/CarbonAds.vue')
-)
-const BuySellAds = defineAsyncComponent(
+) : NoopComponent
+const BuySellAds = __BSA__ ? defineAsyncComponent(
   () => import('./components/BuySellAds.vue')
-)
-const AlgoliaSearchBox = defineAsyncComponent(
+) : NoopComponent
+const AlgoliaSearchBox = __ALGOLIA__ ? defineAsyncComponent(
   () => import('./components/AlgoliaSearchBox.vue')
-)
+) : NoopComponent
 
 // generic state
 const route = useRoute()
diff --git a/src/node/plugin.ts b/src/node/plugin.ts
index 7bf4d5df..a32d6b9c 100644
--- a/src/node/plugin.ts
+++ b/src/node/plugin.ts
@@ -2,7 +2,7 @@ import path from 'path'
 import { Plugin } from 'vite'
 import { SiteConfig, resolveSiteData } from './config'
 import { createMarkdownToVueRenderFn } from './markdownToVue'
-import { APP_PATH, SITE_DATA_REQUEST_PATH } from './alias'
+import { APP_PATH, DEFAULT_THEME_PATH, SITE_DATA_REQUEST_PATH } from './alias'
 import createVuePlugin from '@vitejs/plugin-vue'
 import slash from 'slash'
 import { OutputAsset, OutputChunk } from 'rollup'
@@ -24,7 +24,7 @@ const isPageChunk = (
 
 export function createVitePressPlugin(
   root: string,
-  { configPath, aliases, markdown, site: initialSiteData }: SiteConfig,
+  { configPath, aliases, markdown, themeDir, site }: SiteConfig,
   ssr = false,
   pageToHashMap?: Record<string, string>
 ): Plugin[] {
@@ -35,7 +35,9 @@ export function createVitePressPlugin(
     ssr
   })
 
-  let siteData = initialSiteData
+  let siteData = site
+
+  const isUsingDefaultTheme = themeDir === DEFAULT_THEME_PATH
 
   const vitePressPlugin: Plugin = {
     name: 'vitepress',
@@ -43,7 +45,14 @@ export function createVitePressPlugin(
     config() {
       return {
         alias: aliases,
-        transformInclude: /\.md$/
+        transformInclude: /\.md$/,
+        define: isUsingDefaultTheme
+          ? {
+              __CARBON__: !!site.themeConfig.carbonAds?.carbon,
+              __BSA__: !!site.themeConfig.carbonAds?.custom,
+              __ALGOLIA__: !!site.themeConfig.algolia
+            }
+          : {}
       }
     },
 

From 60d86e13ef0e8f5f8bce782427c5f6795f6374d9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 12:08:23 -0500
Subject: [PATCH 25/78] chore: use different port for serve

---
 src/node/serve/serve.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/serve/serve.ts b/src/node/serve/serve.ts
index 8f6ed28d..2497cec2 100644
--- a/src/node/serve/serve.ts
+++ b/src/node/serve/serve.ts
@@ -8,7 +8,7 @@ export interface ServeOptions {
 }
 
 export async function serve(options: ServeOptions = {}) {
-  const port = options.port !== undefined ? options.port : 3000
+  const port = options.port !== undefined ? options.port : 5000
   const site = await resolveConfig(options.root)
 
   const server = http.createServer(sirv(site.outDir, { dev: true, etag: true }))

From 2d77eafe3b05e9fe76031af9a6c5386c4c6586ac Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 14:40:19 -0500
Subject: [PATCH 26/78] feat: production ready serve

---
 package.json            |   3 ++
 src/node/serve/serve.ts |  25 ++++++++--
 yarn.lock               | 106 +++++++++++++++++++++++++++++++++++++---
 3 files changed, 123 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index d6a0f31c..98b37e7b 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "@vue/compiler-sfc": "^3.0.4",
     "@vue/server-renderer": "^3.0.4",
     "chalk": "^4.1.0",
+    "compression": "^1.7.4",
     "debug": "^4.1.1",
     "diacritics": "^1.3.0",
     "escape-html": "^1.0.3",
@@ -83,6 +84,7 @@
     "markdown-it-table-of-contents": "^0.4.4",
     "minimist": "^1.2.5",
     "ora": "^5.1.0",
+    "polka": "^0.5.2",
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
@@ -90,6 +92,7 @@
     "vue": "^3.0.4"
   },
   "devDependencies": {
+    "@types/compression": "^1.7.0",
     "@types/fs-extra": "^9.0.1",
     "@types/jest": "^26.0.15",
     "@types/koa": "^2.11.6",
diff --git a/src/node/serve/serve.ts b/src/node/serve/serve.ts
index 2497cec2..d5351806 100644
--- a/src/node/serve/serve.ts
+++ b/src/node/serve/serve.ts
@@ -1,5 +1,5 @@
-import http from 'http'
 import sirv from 'sirv'
+import compression from 'compression'
 import { resolveConfig } from '../config'
 
 export interface ServeOptions {
@@ -11,8 +11,25 @@ export async function serve(options: ServeOptions = {}) {
   const port = options.port !== undefined ? options.port : 5000
   const site = await resolveConfig(options.root)
 
-  const server = http.createServer(sirv(site.outDir, { dev: true, etag: true }))
-  server.listen(port, () => {
-    console.log(`listening at http://localhost:${port}`)
+  const compress = compression()
+  const serve = sirv(site.outDir, {
+    etag: true,
+    single: true,
+    maxAge: 31536000,
+    immutable: true,
+    setHeaders(res, pathname) {
+      if (!pathname.includes('/assets/')) {
+        // force server validation for non-asset files since they are not
+        // fingerprinted.
+        res.setHeader('cache-control', 'no-cache')
+      }
+    }
   })
+
+  require('polka')()
+    .use(compress, serve)
+    .listen(port, (err: any) => {
+      if (err) throw err
+      console.log(`Built site served at http://localhost:${port}.\n`)
+    })
 }
diff --git a/yarn.lock b/yarn.lock
index 990ba849..6975cf13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -106,6 +106,11 @@
     "@algolia/logger-common" "4.8.3"
     "@algolia/requester-common" "4.8.3"
 
+"@arr/every@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@arr/every/-/every-1.0.1.tgz#22fe1f8e6355beca6c7c7bde965eb15cf994387b"
+  integrity sha512-UQFQ6SgyJ6LX42W8rHCs8KVc0JS0tzVL9ct4XYedJukskYVWTo49tNiMEK9C2HTyarbNiT/RVIRSY82vH+6sTg==
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
@@ -623,6 +628,11 @@
     "@nodelib/fs.scandir" "2.1.4"
     fastq "^1.6.0"
 
+"@polka/url@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-0.5.0.tgz#b21510597fd601e5d7c95008b76bf0d254ebfd31"
+  integrity sha512-oZLYFEAzUKyi3SKnXvj32ZCEGH6RDnao7COuCVhDydMS9NrCSVXhM79VaKyP5+Zc33m0QXEd2DN3UkU7OsHcfw==
+
 "@polka/url@^1.0.0-next.9":
   version "1.0.0-next.11"
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.11.tgz#aeb16f50649a91af79dbe36574b66d0f9e4d9f71"
@@ -690,6 +700,13 @@
     "@types/connect" "*"
     "@types/node" "*"
 
+"@types/compression@^1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@types/compression/-/compression-1.7.0.tgz#8dc2a56604873cf0dd4e746d9ae4d31ae77b2390"
+  integrity sha512-3LzWUM+3k3XdWOUk/RO+uSjv7YWOatYq2QADJntK1pjkk4DfVP0KrIEPDnXRJxAAGKe0VpIPRmlINLDuCedZWw==
+  dependencies:
+    "@types/express" "*"
+
 "@types/connect@*":
   version "3.4.34"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901"
@@ -1035,6 +1052,14 @@ abab@^2.0.3:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
   integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
 
+accepts@~1.3.5:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
 acorn-globals@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
@@ -1393,6 +1418,11 @@ buffer-from@1.x, buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1661,6 +1691,26 @@ component-emitter@^1.2.1:
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
+  dependencies:
+    mime-db ">= 1.43.0 < 2"
+
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -1961,7 +2011,7 @@ dateformat@^3.0.0:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-debug@^2.2.0, debug@^2.3.3:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4007,6 +4057,13 @@ markdown-it@^10.0.0:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
+matchit@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/matchit/-/matchit-1.1.0.tgz#c4ccf17d9c824cc1301edbcffde9b75a61d10a7c"
+  integrity sha512-+nGYoOlfHmxe5BW5tE0EMJppXEwdSf8uBA1GTZC7Q77kbT35+VKLYJMzVNWCHSsga1ps1tPYFtFyvxvKzWVmMA==
+  dependencies:
+    "@arr/every" "^1.0.0"
+
 mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -4114,7 +4171,12 @@ mime-db@1.44.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
   integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
 
-mime-types@^2.1.12, mime-types@~2.1.19:
+"mime-db@>= 1.43.0 < 2":
+  version "1.45.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
+  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
+
+mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
   version "2.1.27"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
   integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
@@ -4225,6 +4287,11 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
 neo-async@^2.6.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
@@ -4386,6 +4453,11 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -4644,6 +4716,14 @@ please-upgrade-node@^3.2.0:
   dependencies:
     semver-compare "^1.0.0"
 
+polka@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/polka/-/polka-0.5.2.tgz#588bee0c5806dbc6c64958de3a1251860e9f2e26"
+  integrity sha512-FVg3vDmCqP80tOrs+OeNlgXYmFppTXdjD5E7I4ET1NjvtNmQrb1/mJibybKkb/d4NA7YWAr1ojxuhpL3FHqdlw==
+  dependencies:
+    "@polka/url" "^0.5.0"
+    trouter "^2.0.1"
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -5097,16 +5177,16 @@ rxjs@^6.6.3:
   dependencies:
     tslib "^1.9.0"
 
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -5760,6 +5840,13 @@ trim-off-newlines@^1.0.0:
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
   integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
+trouter@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/trouter/-/trouter-2.0.1.tgz#2726a5f8558e090d24c3a393f09eaab1df232df6"
+  integrity sha512-kr8SKKw94OI+xTGOkfsvwZQ8mWoikZDd2n8XZHjJVZUARZT+4/VV6cacRS6CLsH9bNm+HFIPU1Zx4CnNnb4qlQ==
+  dependencies:
+    matchit "^1.0.0"
+
 ts-jest@^26.4.4:
   version "26.4.4"
   resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.4.tgz#61f13fb21ab400853c532270e52cc0ed7e502c49"
@@ -5930,6 +6017,11 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"

From e3d7fc035376d6d73e350be661925058c84828a8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 14:40:57 -0500
Subject: [PATCH 27/78] fix: minify

---
 src/node/build/bundle.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 84a62d09..b28a1a90 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -69,7 +69,7 @@ export async function bundle(
               })
         }
       },
-      minify: false //ssr ? false : !process.env.DEBUG
+      minify: ssr ? false : !process.env.DEBUG
     }
   })
 

From 04dc058cd9977b47eb29c6d2d043e33d92802af8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 15:01:19 -0500
Subject: [PATCH 28/78] fix: disable css code split

---
 src/node/build/bundle.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index b28a1a90..53062592 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -41,7 +41,7 @@ export async function bundle(
       ...options,
       base: config.site.base,
       outDir: ssr ? config.tempDir : config.outDir,
-      cssCodeSplit: !ssr,
+      cssCodeSplit: false,
       rollupOptions: {
         ...rollupOptions,
         input,

From 6fff96652ecd3dd364e23bbcfb4a1f79a1f267f0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 16:11:17 -0500
Subject: [PATCH 29/78] chore: bump deps

---
 package.json                                  |  10 +-
 .../theme-default/components/SideBar.vue      |   5 +-
 yarn.lock                                     | 134 +++++++++---------
 3 files changed, 74 insertions(+), 75 deletions(-)

diff --git a/package.json b/package.json
index 98b37e7b..528e479f 100644
--- a/package.json
+++ b/package.json
@@ -66,8 +66,8 @@
     "@docsearch/css": "^1.0.0-alpha.28",
     "@docsearch/js": "^1.0.0-alpha.28",
     "@vitejs/plugin-vue": "^1.0.2",
-    "@vue/compiler-sfc": "^3.0.4",
-    "@vue/server-renderer": "^3.0.4",
+    "@vue/compiler-sfc": "^3.0.5",
+    "@vue/server-renderer": "^3.0.5",
     "chalk": "^4.1.0",
     "compression": "^1.7.4",
     "debug": "^4.1.1",
@@ -88,8 +88,8 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-alpha.3",
-    "vue": "^3.0.4"
+    "vite": "^2.0.0-alpha.4",
+    "vue": "^3.0.5"
   },
   "devDependencies": {
     "@types/compression": "^1.7.0",
@@ -113,7 +113,7 @@
     "rollup": "^2.33.3",
     "semver": "^7.3.2",
     "ts-jest": "^26.4.4",
-    "typescript": "^3.8.3",
+    "typescript": "^4.1.3",
     "yorkie": "^2.0.0"
   }
 }
diff --git a/src/client/theme-default/components/SideBar.vue b/src/client/theme-default/components/SideBar.vue
index 0532370d..f3057e75 100644
--- a/src/client/theme-default/components/SideBar.vue
+++ b/src/client/theme-default/components/SideBar.vue
@@ -2,12 +2,11 @@
   <aside class="sidebar" :class="{ open }">
     <NavLinks class="nav" />
 
-    <!-- temporarily disabled due to ssr/hydration bug in vue core -->
-    <!-- <slot name="sidebar-top" /> -->
+    <slot name="sidebar-top" />
 
     <SideBarLinks />
 
-    <!-- <slot name="sidebar-bottom" /> -->
+    <slot name="sidebar-bottom" />
   </aside>
 </template>
 
diff --git a/yarn.lock b/yarn.lock
index 6975cf13..24731956 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -953,36 +953,36 @@
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.0.2.tgz#46da003df81c5ef74cec6d59c16fa13c34bd8108"
   integrity sha512-qtmVCJ3MfGebpbRIK/UFydlEuvDrz5Z4caARXDWWy23bM6nFq7wIV6/tW4LRdmSHxFdyvogctQ1+zl4brJg1og==
 
-"@vue/compiler-core@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.4.tgz#0122aca6eada4cb28b39ed930af917444755e330"
-  integrity sha512-snpMICsbWTZqBFnPB03qr4DtiSxVYfDF3DvbDSkN9Z9NTM8Chl8E/lYhKBSsvauq91DAWAh8PU3lr9vrLyQsug==
+"@vue/compiler-core@3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.5.tgz#a6e54cabe9536e74c6513acd2649f311af1d43ac"
+  integrity sha512-iFXwk2gmU/GGwN4hpBwDWWMLvpkIejf/AybcFtlQ5V1ur+5jwfBaV0Y1RXoR6ePfBPJixtKZ3PmN+M+HgMAtfQ==
   dependencies:
     "@babel/parser" "^7.12.0"
     "@babel/types" "^7.12.0"
-    "@vue/shared" "3.0.4"
+    "@vue/shared" "3.0.5"
     estree-walker "^2.0.1"
     source-map "^0.6.1"
 
-"@vue/compiler-dom@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.4.tgz#834fd4b15c5698cf9f4505c2bfbccca058a843eb"
-  integrity sha512-FOxbHBIkkGjYQeTz1DlXQjS1Ms8EPXQWsdTdTPeohoS0KzCz6RiOjiAG+jLtMi6Nr5GX2h0TlCvcnI8mcsicFQ==
+"@vue/compiler-dom@3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.5.tgz#7885a13e6d18f64dde8ebceec052ed2c102696c2"
+  integrity sha512-HSOSe2XSPuCkp20h4+HXSiPH9qkhz6YbW9z9ZtL5vef2T2PMugH7/osIFVSrRZP/Ul5twFZ7MIRlp8tPX6e4/g==
   dependencies:
-    "@vue/compiler-core" "3.0.4"
-    "@vue/shared" "3.0.4"
+    "@vue/compiler-core" "3.0.5"
+    "@vue/shared" "3.0.5"
 
-"@vue/compiler-sfc@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.4.tgz#2119fe1e68d2c268aafa20461c82c139a9adf8e0"
-  integrity sha512-brDn6HTuK6R3oBCjtMPPsIpyJEZFinlnxjtBXww/goFJOJBAU9CrsdegwyZItNnixCFUIg4CLv4Nj1Eg/eKlfg==
+"@vue/compiler-sfc@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.5.tgz#3ae08e60244a72faf9598361874fb7bdb5b1d37c"
+  integrity sha512-uOAC4X0Gx3SQ9YvDC7YMpbDvoCmPvP0afVhJoxRotDdJ+r8VO3q4hFf/2f7U62k4Vkdftp6DVni8QixrfYzs+w==
   dependencies:
     "@babel/parser" "^7.12.0"
     "@babel/types" "^7.12.0"
-    "@vue/compiler-core" "3.0.4"
-    "@vue/compiler-dom" "3.0.4"
-    "@vue/compiler-ssr" "3.0.4"
-    "@vue/shared" "3.0.4"
+    "@vue/compiler-core" "3.0.5"
+    "@vue/compiler-dom" "3.0.5"
+    "@vue/compiler-ssr" "3.0.5"
+    "@vue/shared" "3.0.5"
     consolidate "^0.16.0"
     estree-walker "^2.0.1"
     hash-sum "^2.0.0"
@@ -994,50 +994,50 @@
     postcss-selector-parser "^6.0.4"
     source-map "^0.6.1"
 
-"@vue/compiler-ssr@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.4.tgz#ccbd1f55734d51d1402fad825ac102002a7a07c7"
-  integrity sha512-4aYWQEL4+LS4+D44K9Z7xMOWMEjBsz4Li9nMcj2rxRQ35ewK6uFPodvs6ORP60iBDSkwUFZoldFlNemQlu1BFw==
+"@vue/compiler-ssr@3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.5.tgz#7661ad891a0be948726c7f7ad1e425253c587b83"
+  integrity sha512-Wm//Kuxa1DpgjE4P9W0coZr8wklOfJ35Jtq61CbU+t601CpPTK4+FL2QDBItaG7aoUUDCWL5nnxMkuaOgzTBKg==
   dependencies:
-    "@vue/compiler-dom" "3.0.4"
-    "@vue/shared" "3.0.4"
+    "@vue/compiler-dom" "3.0.5"
+    "@vue/shared" "3.0.5"
 
-"@vue/reactivity@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.4.tgz#b6599dd8271a745960a03f05744ccf7991ba5d8d"
-  integrity sha512-AFTABrLhUYZY2on3ea9FxeXal7w3f6qIp9gT+/oG93H7dFTL5LvVnxygCopv7tvkIl/GSGQb/yK1D1gmXx1Pww==
+"@vue/reactivity@3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.5.tgz#e3789e4d523d845f9ae0b4d770e2b45594742fd2"
+  integrity sha512-3xodUE3sEIJgS7ntwUbopIpzzvi7vDAOjVamfb2l+v1FUg0jpd3gf62N2wggJw3fxBMr+QvyxpD+dBoxLsmAjw==
   dependencies:
-    "@vue/shared" "3.0.4"
+    "@vue/shared" "3.0.5"
 
-"@vue/runtime-core@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.4.tgz#a5b9a001560b1fd8c01a43f68b764c555de7836c"
-  integrity sha512-qH9e4kqU7b3u1JewvLmGmoAGY+mnuBqz7aEKb2mhpEgwa1yFv496BRuUfMXXMCix3+TndUVMJ8jt41FSdNppwg==
+"@vue/runtime-core@3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.5.tgz#da6331d5f300d5794e9e0ebdc8a8bd72a9e19962"
+  integrity sha512-Cnyi2NqREwOLcTEsIi1DQX1hHtkVj4eGm4hBG7HhokS05DqpK4/80jG6PCCnCH9rIJDB2FqtaODX397210plXg==
   dependencies:
-    "@vue/reactivity" "3.0.4"
-    "@vue/shared" "3.0.4"
+    "@vue/reactivity" "3.0.5"
+    "@vue/shared" "3.0.5"
 
-"@vue/runtime-dom@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.4.tgz#6f81aec545f24511d2c28a315aa3391420b69c68"
-  integrity sha512-BGIoiTSESzWUhN0Ofi2X/q+HN8f6IUFmUEyyBGKbmx7DTAJNZhFfjqsepfXQrM5IGeTfJLB1ZEVyroDQJNXq3g==
+"@vue/runtime-dom@3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.5.tgz#1ce2c9c449e26ab06963da0064096e882a7a8935"
+  integrity sha512-iilX1KySeIzHHtErT6Y44db1rhWK5tAI0CiJIPr+SJoZ2jbjoOSE6ff/jfIQakchbm1d6jq6VtRVnp5xYdOXKA==
   dependencies:
-    "@vue/runtime-core" "3.0.4"
-    "@vue/shared" "3.0.4"
+    "@vue/runtime-core" "3.0.5"
+    "@vue/shared" "3.0.5"
     csstype "^2.6.8"
 
-"@vue/server-renderer@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.4.tgz#7026113694b74e878113cd1c70d1fb8f89d09e99"
-  integrity sha512-+U3MGbIK3tiQh5fa79U1qtI++/gBdGOVxlp5POHRlsjGpA4I2YSSeQSZwqtv1SPAYp/A4d5QvAPZ7BucVKZbgg==
+"@vue/server-renderer@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.5.tgz#1197e7d7b7874e15de284798a3932ec425ffe593"
+  integrity sha512-aB4TymBESEbCJ6A9HfeFpS3U9dC6dRa1zUqWHJqGlikqKr38n0VSYA3lNt0Qnkd6SFDSN6Kn5O34Ih3saMk9KA==
   dependencies:
-    "@vue/compiler-ssr" "3.0.4"
-    "@vue/shared" "3.0.4"
+    "@vue/compiler-ssr" "3.0.5"
+    "@vue/shared" "3.0.5"
 
-"@vue/shared@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.4.tgz#6dc50f593bdfdeaa6183d1dbc15e2d45e7c6b8b3"
-  integrity sha512-Swfbz31AaMX48CpFl+YmIrqOH9MgJMTrltG9e26A4ZxYx9LjGuMV+41WnxFzS3Bc9nbrc6sDPM37G6nIT8NJSg==
+"@vue/shared@3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.5.tgz#c131d88bd6713cc4d93b3bb1372edb1983225ff0"
+  integrity sha512-gYsNoGkWejBxNO6SNRjOh/xKeZ0H0V+TFzaPzODfBjkAIb0aQgBuixC1brandC/CDJy1wYPwSoYrXpvul7m6yw==
 
 JSONStream@^1.0.4:
   version "1.3.5"
@@ -5920,10 +5920,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^3.8.3:
-  version "3.9.7"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
-  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
+typescript@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
+  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
@@ -6031,10 +6031,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-alpha.3:
-  version "2.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-alpha.3.tgz#ee95db051736646f4c4c02aa5b72de088df6e9d5"
-  integrity sha512-jVARgUHk4XRkeW4c2UWbsu+NfBGuSJjA4hMCai7KhyktDJYbj13kG+1ImuJFUOwinXip0ktsrlVWEilN6t45XA==
+vite@^2.0.0-alpha.4:
+  version "2.0.0-alpha.4"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-alpha.4.tgz#4c36681353cbac696addd2b3222b2a3240d4461c"
+  integrity sha512-dM3yJ9YguoK5aT5dFyn5C4cHcjFZ2aygJI0HgvT6Ta19nlDObYZuaI1cEc3ORFGwzO6oDcfPT6locvOadGhBzQ==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"
@@ -6042,14 +6042,14 @@ vite@^2.0.0-alpha.3:
   optionalDependencies:
     fsevents "~2.1.2"
 
-vue@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.4.tgz#872c65c143f5717bd5387c61613d9f55f4cc0f43"
-  integrity sha512-2o+AiQF8sAupyhbyl3oxVCl3WCwC/n5NI7VMM+gVQ231qvSB8eI7sCBloloqDJK6yA367EEtmRSeSCf4sxCC+A==
+vue@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.5.tgz#de1b82eba24abfe71e0970fc9b8d4b2babdc3fe1"
+  integrity sha512-TfaprOmtsAfhQau7WsomXZ8d9op/dkQLNIq8qPV3A0Vxs6GR5E+c1rfJS1SDkXRQj+dFyfnec7+U0Be1huiScg==
   dependencies:
-    "@vue/compiler-dom" "3.0.4"
-    "@vue/runtime-dom" "3.0.4"
-    "@vue/shared" "3.0.4"
+    "@vue/compiler-dom" "3.0.5"
+    "@vue/runtime-dom" "3.0.5"
+    "@vue/shared" "3.0.5"
 
 w3c-hr-time@^1.0.2:
   version "1.0.2"

From b9c9e79cda0ad0ad2d3a7b10ad8173bb78a1f25d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 16:47:00 -0500
Subject: [PATCH 30/78] chore: bump vite

---
 package.json                                             | 2 +-
 src/client/theme-default/components/AlgoliaSearchBox.vue | 7 +------
 yarn.lock                                                | 8 ++++----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 528e479f..d0e20377 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-alpha.4",
+    "vite": "^2.0.0-alpha.5",
     "vue": "^3.0.5"
   },
   "devDependencies": {
diff --git a/src/client/theme-default/components/AlgoliaSearchBox.vue b/src/client/theme-default/components/AlgoliaSearchBox.vue
index 112660ba..dc657a03 100644
--- a/src/client/theme-default/components/AlgoliaSearchBox.vue
+++ b/src/client/theme-default/components/AlgoliaSearchBox.vue
@@ -2,13 +2,8 @@
   <div class="algolia-search-box" id="docsearch" />
 </template>
 
-<script lang="ts">
-// TODO: @vue/compiler-sfc currently has a bug that removes `import 'foo'`
-// statements in <script setup> so we put it here for now
-import '@docsearch/css'
-</script>
-
 <script setup lang="ts">
+import '@docsearch/css'
 import { useRoute, useRouter } from 'vitepress'
 import { defineProps, getCurrentInstance, onMounted, watch } from 'vue'
 import docsearch from '@docsearch/js'
diff --git a/yarn.lock b/yarn.lock
index 24731956..90bef5fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6031,10 +6031,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-alpha.4:
-  version "2.0.0-alpha.4"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-alpha.4.tgz#4c36681353cbac696addd2b3222b2a3240d4461c"
-  integrity sha512-dM3yJ9YguoK5aT5dFyn5C4cHcjFZ2aygJI0HgvT6Ta19nlDObYZuaI1cEc3ORFGwzO6oDcfPT6locvOadGhBzQ==
+vite@^2.0.0-alpha.5:
+  version "2.0.0-alpha.5"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-alpha.5.tgz#e7e840c0caafbc3d1264efb7b7cf5f08000bff24"
+  integrity sha512-cRm1/ZlcmIcl43ehvxs5Hr+5WapCYe3Zf4i6GM0a+VJPUgE0SJFzEO/SgZhJEc7PINmo+4TXKWAokZU+XvvwoA==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"

From 3e85b46727ecc242cd852193574f08796d7352f8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 18:04:52 -0500
Subject: [PATCH 31/78] refactor: improve css treeshaking + avoid layout shift
 on async components

---
 src/client/app/mixin.ts                            | 10 +++++++---
 src/client/theme-default/Layout.vue                |  1 +
 .../theme-default/components/AlgoliaSearchBox.vue  |  1 +
 src/client/theme-default/components/CarbonAds.vue  | 14 ++++++++------
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/client/app/mixin.ts b/src/client/app/mixin.ts
index 95dc8863..9fb29376 100644
--- a/src/client/app/mixin.ts
+++ b/src/client/app/mixin.ts
@@ -1,9 +1,8 @@
-import { App } from 'vue'
+import { App, defineAsyncComponent } from 'vue'
 import { joinPath } from './utils'
 import { SiteDataRef } from './composables/siteData'
 import { PageDataRef } from './composables/pageData'
 import { Content } from './components/Content'
-import Debug from './components/Debug.vue'
 import { ClientOnly } from './components/ClientOnly'
 
 export function mixinGlobalComputed(
@@ -70,5 +69,10 @@ export function mixinGlobalComponents(app: App) {
 
   app.component('Content', Content)
   app.component('ClientOnly', ClientOnly)
-  app.component('Debug', isProd ? () => null : Debug)
+  app.component(
+    'Debug',
+    isProd
+      ? () => null
+      : defineAsyncComponent(() => import('./components/Debug.vue'))
+  )
 }
diff --git a/src/client/theme-default/Layout.vue b/src/client/theme-default/Layout.vue
index d18d9ad3..7cd3b565 100644
--- a/src/client/theme-default/Layout.vue
+++ b/src/client/theme-default/Layout.vue
@@ -76,6 +76,7 @@ import type { DefaultTheme } from './config'
 import NavBar from './components/NavBar.vue'
 import SideBar from './components/SideBar.vue'
 import Page from './components/Page.vue'
+
 const Home = defineAsyncComponent(() => import('./components/Home.vue'))
 
 const NoopComponent = () => null
diff --git a/src/client/theme-default/components/AlgoliaSearchBox.vue b/src/client/theme-default/components/AlgoliaSearchBox.vue
index dc657a03..14e66873 100644
--- a/src/client/theme-default/components/AlgoliaSearchBox.vue
+++ b/src/client/theme-default/components/AlgoliaSearchBox.vue
@@ -139,6 +139,7 @@ function initialize(userOptions: any) {
 @media (min-width: 720px) {
   .algolia-search-box {
     padding-left: 8px;
+    min-width: 176.3px; /* avoid layout shift */
   }
 }
 
diff --git a/src/client/theme-default/components/CarbonAds.vue b/src/client/theme-default/components/CarbonAds.vue
index 7f3e6d6a..796d9952 100644
--- a/src/client/theme-default/components/CarbonAds.vue
+++ b/src/client/theme-default/components/CarbonAds.vue
@@ -28,6 +28,7 @@ onMounted(() => {
   max-width: 280px;
   font-size: .75rem;
   background-color: rgba(255, 255, 255, .8);
+  min-height: 105.38px; /* avoid layout shift on mobile */
 }
 
 .carbon-ads::after {
@@ -46,6 +47,7 @@ onMounted(() => {
     padding: 8px;
     width: 146px;
     max-width: 100%;
+    min-height: 200px;
   }
 }
 
@@ -60,7 +62,7 @@ onMounted(() => {
   }
 }
 
-.carbon-ads ::v-deep(.carbon-img) {
+.carbon-ads :deep(.carbon-img) {
   float: left;
   margin-right: .75rem;
   max-width: 100px;
@@ -68,7 +70,7 @@ onMounted(() => {
 }
 
 @media (min-width: 420px) {
-  .carbon-ads ::v-deep(.carbon-img) {
+  .carbon-ads :deep(.carbon-img) {
     float: none;
     display: block;
     margin-right: 0;
@@ -76,24 +78,24 @@ onMounted(() => {
   }
 }
 
-.carbon-ads ::v-deep(.carbon-img img) {
+.carbon-ads :deep(.carbon-img img) {
   display: block;
   width: 100%;
 }
 
 @media (min-width: 420px) {
-  .carbon-ads ::v-deep(.carbon-text) {
+  .carbon-ads :deep(.carbon-text) {
     padding-top: 8px;
   }
 }
 
-.carbon-ads ::v-deep(.carbon-text) {
+.carbon-ads :deep(.carbon-text) {
   display: block;
   font-weight: 400;
   color: var(--c-text-light);
 }
 
-.carbon-ads ::v-deep(.carbon-poweredby) {
+.carbon-ads :deep(.carbon-poweredby) {
   display: block;
   padding-top: 2px;
   font-weight: 400;

From f62f4a41ce8f22d798d4c07c3f5c95a21f0acbaf Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 18:07:46 -0500
Subject: [PATCH 32/78] release: v0.10.1

---
 CHANGELOG.md | 15 +++++++++++++++
 package.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87701ddf..6d56020e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## [0.10.1](https://github.com/vuejs/vitepress/compare/v0.10.0...v0.10.1) (2020-12-30)
+
+### Bug Fixes
+
+- disable css code split ([04dc058](https://github.com/vuejs/vitepress/commit/04dc058cd9977b47eb29c6d2d043e33d92802af8))
+- minify ([e3d7fc0](https://github.com/vuejs/vitepress/commit/e3d7fc035376d6d73e350be661925058c84828a8))
+
+### Features
+
+- production ready serve ([2d77eaf](https://github.com/vuejs/vitepress/commit/2d77eafe3b05e9fe76031af9a6c5386c4c6586ac))
+
+### Performance Improvements
+
+- avoid including optional features in build when not used ([c878e6d](https://github.com/vuejs/vitepress/commit/c878e6d3b56ecbd71bd75ff4360446d6dacbd70b))
+
 # [0.10.0](https://github.com/vuejs/vitepress/compare/v0.9.2...v0.10.0) (2020-12-30)
 
 - Upgrade to Vite 2.0
diff --git a/package.json b/package.json
index d0e20377..e44934e9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From 4f0c90311f74d0ddbb95f096d5554444946bbe5a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2020 22:40:46 -0500
Subject: [PATCH 33/78] refactor: simplify client path mapping

---
 src/client/app/exports.ts | 29 -----------------------------
 src/client/app/index.html |  2 --
 src/client/index.ts       | 29 +++++++++++++++++++++++++++++
 src/client/tsconfig.json  |  5 ++---
 src/node/alias.ts         | 11 ++++-------
 src/node/plugin.ts        | 10 +++++++---
 6 files changed, 42 insertions(+), 44 deletions(-)
 delete mode 100644 src/client/app/exports.ts
 delete mode 100644 src/client/app/index.html
 create mode 100644 src/client/index.ts

diff --git a/src/client/app/exports.ts b/src/client/app/exports.ts
deleted file mode 100644
index 6012598b..00000000
--- a/src/client/app/exports.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// exports in this file are exposed to themes and md files via 'vitepress'
-// so the user can do `import { useRoute, useSiteData } from 'vitepress'`
-
-// generic types
-export type { Router, Route } from './router'
-
-// theme types
-export * from './theme'
-
-// composables
-export { useRouter, useRoute } from './router'
-export { useSiteData } from './composables/siteData'
-export { useSiteDataByRoute } from './composables/siteDataByRoute'
-export { usePageData } from './composables/pageData'
-export { useFrontmatter } from './composables/frontmatter'
-
-// utilities
-export { inBrowser, joinPath } from './utils'
-
-// components
-export { Content } from './components/Content'
-
-import { ComponentOptions } from 'vue'
-import _Debug from './components/Debug.vue'
-const Debug = _Debug as ComponentOptions
-export { Debug }
-
-// default theme
-export { default as DefaultTheme } from '../theme-default'
diff --git a/src/client/app/index.html b/src/client/app/index.html
deleted file mode 100644
index 69e2efbb..00000000
--- a/src/client/app/index.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<div id="app"></div>
-<script type="module" src="/@app/index.js"></script>
diff --git a/src/client/index.ts b/src/client/index.ts
new file mode 100644
index 00000000..8dc04483
--- /dev/null
+++ b/src/client/index.ts
@@ -0,0 +1,29 @@
+// exports in this file are exposed to themes and md files via 'vitepress'
+// so the user can do `import { useRoute, useSiteData } from 'vitepress'`
+
+// generic types
+export type { Router, Route } from './app/router'
+
+// theme types
+export * from './app/theme'
+
+// composables
+export { useRouter, useRoute } from './app/router'
+export { useSiteData } from './app/composables/siteData'
+export { useSiteDataByRoute } from './app/composables/siteDataByRoute'
+export { usePageData } from './app/composables/pageData'
+export { useFrontmatter } from './app/composables/frontmatter'
+
+// utilities
+export { inBrowser, joinPath } from './app/utils'
+
+// components
+export { Content } from './app/components/Content'
+
+import { ComponentOptions } from 'vue'
+import _Debug from './app/components/Debug.vue'
+const Debug = _Debug as ComponentOptions
+export { Debug }
+
+// default theme
+export { default as DefaultTheme } from './theme-default'
diff --git a/src/client/tsconfig.json b/src/client/tsconfig.json
index a2762775..08160422 100644
--- a/src/client/tsconfig.json
+++ b/src/client/tsconfig.json
@@ -8,11 +8,10 @@
     "lib": ["ESNext", "DOM"],
     "types": ["vite"],
     "paths": {
-      "/@theme/*": ["theme-default/*"],
-      "/@default-theme/*": ["theme-default/*"],
       "/@shared/*": ["shared/*"],
       "/@types/*": ["../../types/*"],
-      "vitepress": ["app/exports.ts"]
+      "/@theme/*": ["theme-default/*"],
+      "vitepress": ["index.ts"]
     }
   },
   "include": [
diff --git a/src/node/alias.ts b/src/node/alias.ts
index 50f59a45..add67ee8 100644
--- a/src/node/alias.ts
+++ b/src/node/alias.ts
@@ -17,10 +17,6 @@ export const DEFAULT_THEME_PATH = path.join(
 export const SITE_DATA_ID = '@siteData'
 export const SITE_DATA_REQUEST_PATH = '/' + SITE_DATA_ID
 
-// this is a path resolver that is passed to vite
-// 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 resolveAliases(
   root: string,
   themeDir: string,
@@ -28,9 +24,7 @@ export function resolveAliases(
 ): AliasOptions {
   const paths: Record<string, string> = {
     ...userConfig.alias,
-    '/@app': APP_PATH,
     '/@theme': themeDir,
-    '/@default-theme': DEFAULT_THEME_PATH,
     '/@shared': SHARED_PATH,
     [SITE_DATA_ID]: SITE_DATA_REQUEST_PATH
   }
@@ -40,7 +34,10 @@ export function resolveAliases(
       find: p,
       replacement: paths[p]
     })),
-    { find: /^vitepress$/, replacement: `${APP_PATH}/exports.js` }
+    {
+      find: /^vitepress$/,
+      replacement: path.join(__dirname, '../client/index')
+    }
   ]
 
   let isLinked = false
diff --git a/src/node/plugin.ts b/src/node/plugin.ts
index a32d6b9c..21d53f33 100644
--- a/src/node/plugin.ts
+++ b/src/node/plugin.ts
@@ -77,12 +77,16 @@ export function createVitePressPlugin(
 
     configureServer(server) {
       // serve our index.html after vite history fallback
-      const indexPath = `/@fs/${path.join(APP_PATH, 'index.html')}`
       return () => {
         // @ts-ignore
-        server.app.use((req, _, next) => {
+        server.app.use((req, res, next) => {
           if (req.url!.endsWith('.html')) {
-            req.url = indexPath
+            res.statusCode = 200
+            res.end(
+              `<div id="app"></div>\n` +
+                `<script type="module" src="/@fs/${APP_PATH}/index.js"></script>`
+            )
+            return
           }
           next()
         })

From 7e4b16ee524efc87c150a3d57a3215aac76b3669 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 31 Dec 2020 11:04:20 -0500
Subject: [PATCH 34/78] fix: adjust multi sidebar matching logic

- matches by ensuring starting slash + startsWith
- catch-all fallback (`/`) should be placed at the end like VuePress
---
 .../theme-default/support/sideBar.spec.ts       |  7 ++++---
 docs/.vitepress/config.js                       |  4 ++--
 src/client/theme-default/support/sideBar.ts     | 17 ++++-------------
 tsconfig.json                                   |  2 +-
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/__tests__/client/theme-default/support/sideBar.spec.ts b/__tests__/client/theme-default/support/sideBar.spec.ts
index a1d0ea82..033daced 100644
--- a/__tests__/client/theme-default/support/sideBar.spec.ts
+++ b/__tests__/client/theme-default/support/sideBar.spec.ts
@@ -16,8 +16,8 @@ describe('client/theme-default/support/sideBar', () => {
 
   it('gets the correct sidebar items from the given path', () => {
     const sidebar = {
-      '/': [{ text: 'R', link: 'r' }],
-      '/guide/': [{ text: 'G', link: 'g' }]
+      '/guide/': [{ text: 'G', link: 'g' }],
+      '/': [{ text: 'R', link: 'r' }]
     }
 
     expect(getSideBarConfig(sidebar, '/')).toEqual(sidebar['/'])
@@ -31,7 +31,8 @@ describe('client/theme-default/support/sideBar', () => {
     }
 
     expect(getSideBarConfig(s, '/guide/')).toEqual(s['/guide/'])
-    expect(getSideBarConfig(s, '/guide')).toEqual(s['/guide/'])
+    // no ending slash should not match
+    expect(getSideBarConfig(s, '/guide')).not.toEqual(s['/guide/'])
     expect(getSideBarConfig(s, 'guide/')).toEqual(s['/guide/'])
     expect(getSideBarConfig(s, 'guide/nested')).toEqual(s['/guide/'])
     expect(getSideBarConfig(s, '/guide/nested')).toEqual(s['/guide/'])
diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js
index 0344926b..d9a95499 100644
--- a/docs/.vitepress/config.js
+++ b/docs/.vitepress/config.js
@@ -32,9 +32,9 @@ module.exports = {
     ],
 
     sidebar: {
-      '/': getGuideSidebar(),
       '/guide/': getGuideSidebar(),
-      '/config/': getConfigSidebar()
+      '/config/': getConfigSidebar(),
+      '/': getGuideSidebar()
     }
   }
 }
diff --git a/src/client/theme-default/support/sideBar.ts b/src/client/theme-default/support/sideBar.ts
index c44d624f..7af83721 100644
--- a/src/client/theme-default/support/sideBar.ts
+++ b/src/client/theme-default/support/sideBar.ts
@@ -1,10 +1,5 @@
 import { DefaultTheme } from '../config'
-import {
-  isArray,
-  ensureSlash,
-  ensureStartingSlash,
-  removeExtention
-} from '../utils'
+import { isArray, ensureStartingSlash, removeExtention } from '../utils'
 
 export function isSideBarConfig(
   sidebar: DefaultTheme.SideBarConfig | DefaultTheme.MultiSideBarConfig
@@ -32,15 +27,11 @@ export function getSideBarConfig(
     return sidebar
   }
 
-  // get the very first segment of the path to compare with multiple sidebar keys
-  // and make sure it's surrounded by slash
-  path = removeExtention(path)
-  path = ensureStartingSlash(path).split('/')[1] || '/'
-  path = ensureSlash(path)
+  path = ensureStartingSlash(path)
 
   for (const dir in sidebar) {
-    // make sure the multi sidebar key is surrounded by slash too
-    if (path === ensureSlash(dir)) {
+    // make sure the multi sidebar key starts with slash too
+    if (path.startsWith(ensureStartingSlash(dir))) {
       return sidebar[dir]
     }
   }
diff --git a/tsconfig.json b/tsconfig.json
index 89e40b9b..c3cffe57 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,7 +17,7 @@
       "tests/*": ["__tests__/*"],
       "/@shared/*": ["src/client/shared/*"],
       "/@types/*": ["types/*"],
-      "vitepress": ["src/client/app/exports.ts"]
+      "vitepress": ["src/client/index.ts"]
     }
   },
   "include": [

From c4b4f5a5ea6e0b81012423720f92c69d366a8932 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 31 Dec 2020 11:06:24 -0500
Subject: [PATCH 35/78] release: v0.10.2

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d56020e..1f86a3b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [0.10.2](https://github.com/vuejs/vitepress/compare/v0.10.1...v0.10.2) (2020-12-31)
+
+### Bug Fixes
+
+- adjust multi sidebar matching logic ([7e4b16e](https://github.com/vuejs/vitepress/commit/7e4b16ee524efc87c150a3d57a3215aac76b3669))
+
 ## [0.10.1](https://github.com/vuejs/vitepress/compare/v0.10.0...v0.10.1) (2020-12-30)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index e44934e9..661805be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From 8a2ff33bf8043b5b0ec21826d7962d7e6337e394 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 1 Jan 2021 11:40:01 -0500
Subject: [PATCH 36/78] fix: loosen navLink active matching

---
 src/client/theme-default/composables/navLink.ts | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/client/theme-default/composables/navLink.ts b/src/client/theme-default/composables/navLink.ts
index e4c18d0d..951a00cd 100644
--- a/src/client/theme-default/composables/navLink.ts
+++ b/src/client/theme-default/composables/navLink.ts
@@ -13,8 +13,9 @@ export function useNavLink(item: DefaultTheme.NavItemWithLink) {
   const props = computed(() => {
     return {
       class: {
-        active:
-          normalizePath(withBase(item.link)) === normalizePath(route.path),
+        active: normalizePath(route.path).startsWith(
+          normalizePath(withBase(item.link))
+        ),
         isExternal
       },
       href: isExternal ? item.link : withBase(item.link),
@@ -31,14 +32,8 @@ export function useNavLink(item: DefaultTheme.NavItemWithLink) {
 }
 
 function normalizePath(path: string): string {
-  path = path
+  return path
     .replace(/#.*$/, '')
     .replace(/\?.*$/, '')
-    .replace(/\.html$/, '')
-
-  if (path.endsWith('/')) {
-    path += 'index'
-  }
-
-  return path
+    .replace(/\.(html|md)$/, '')
 }

From 9a17ddfdfb3cf7afd70d28d697245a298de090e1 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 1 Jan 2021 11:40:11 -0500
Subject: [PATCH 37/78] feat: add altAction for home

---
 .../theme-default/components/HomeHero.vue     | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/client/theme-default/components/HomeHero.vue b/src/client/theme-default/components/HomeHero.vue
index 20df2b7c..145a0721 100644
--- a/src/client/theme-default/components/HomeHero.vue
+++ b/src/client/theme-default/components/HomeHero.vue
@@ -1,17 +1,23 @@
 <template>
   <header v-if="showHero" class="home-hero">
     <figure v-if="$frontmatter.heroImage" class="figure">
-      <img
-        class="image"
-        :src="$withBase($frontmatter.heroImage)"
-        :alt="$frontmatter.heroAlt"
-      >
+      <img class="image" :src="$withBase($frontmatter.heroImage)" :alt="$frontmatter.heroAlt" />
     </figure>
 
     <h1 v-if="hasHeroText" class="title">{{ heroText }}</h1>
     <p v-if="hasTagline" class="description">{{ tagline }}</p>
 
-    <NavLink v-if="hasAction" :item="action" class="action" />
+    <NavLink
+      v-if="hasAction"
+      :item="{ link: data.actionLink, text: data.actionText }"
+      class="action"
+    />
+
+    <NavLink
+      v-if="hasAltAction"
+      :item="{ link: data.altActionLink, text: data.altActionText }"
+      class="action alt"
+    />
   </header>
 </template>
 
@@ -37,10 +43,7 @@ const hasTagline = computed(() => data.value.tagline !== null)
 const tagline = computed(() => data.value.tagline || site.value.description)
 
 const hasAction = computed(() => data.value.actionLink && data.value.actionText)
-const action = computed(() => ({
-  link: data.value.actionLink,
-  text: data.value.actionText,
-}))
+const hasAltAction = computed(() => data.value.altActionLink && data.value.altActionText)
 </script>
 
 <style scoped>
@@ -93,7 +96,7 @@ const action = computed(() => ({
 
 .description {
   margin: 0;
-  margin-top: .25rem;
+  margin-top: 0.25rem;
   line-height: 1.3;
   font-size: 1.2rem;
   color: var(--c-text-light);
@@ -108,24 +111,36 @@ const action = computed(() => ({
 
 .action {
   margin-top: 1.5rem;
+  display: inline-block;
+}
+
+.action.alt {
+  margin-left: 1.5rem;
 }
 
 @media (min-width: 420px) {
   .action {
     margin-top: 2rem;
+    display: inline-block;
   }
 }
 
 .action :deep(.item) {
   display: inline-block;
-  border-radius: 4px;
+  border-radius: 6px;
   padding: 0 20px;
-  line-height: 48px;
+  line-height: 44px;
   font-size: 1rem;
   font-weight: 500;
   color: #ffffff;
   background-color: var(--c-brand);
-  transition: background-color .1s ease;
+  border: 2px solid var(--c-brand);
+  transition: background-color 0.1s ease;
+}
+
+.action.alt :deep(.item) {
+  background-color: #fff;
+  color: var(--c-brand);
 }
 
 .action :deep(.item:hover) {
@@ -137,7 +152,7 @@ const action = computed(() => ({
 @media (min-width: 420px) {
   .action :deep(.item) {
     padding: 0 24px;
-    line-height: 56px;
+    line-height: 52px;
     font-size: 1.2rem;
     font-weight: 500;
   }

From 8769b4b49f398c5244354fbb93fcbecdb9b9c638 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 1 Jan 2021 12:47:48 -0500
Subject: [PATCH 38/78] fix: always define theme globals

---
 src/node/plugin.ts | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/node/plugin.ts b/src/node/plugin.ts
index 21d53f33..cffbab37 100644
--- a/src/node/plugin.ts
+++ b/src/node/plugin.ts
@@ -2,7 +2,7 @@ import path from 'path'
 import { Plugin } from 'vite'
 import { SiteConfig, resolveSiteData } from './config'
 import { createMarkdownToVueRenderFn } from './markdownToVue'
-import { APP_PATH, DEFAULT_THEME_PATH, SITE_DATA_REQUEST_PATH } from './alias'
+import { APP_PATH, SITE_DATA_REQUEST_PATH } from './alias'
 import createVuePlugin from '@vitejs/plugin-vue'
 import slash from 'slash'
 import { OutputAsset, OutputChunk } from 'rollup'
@@ -37,8 +37,6 @@ export function createVitePressPlugin(
 
   let siteData = site
 
-  const isUsingDefaultTheme = themeDir === DEFAULT_THEME_PATH
-
   const vitePressPlugin: Plugin = {
     name: 'vitepress',
 
@@ -46,13 +44,11 @@ export function createVitePressPlugin(
       return {
         alias: aliases,
         transformInclude: /\.md$/,
-        define: isUsingDefaultTheme
-          ? {
-              __CARBON__: !!site.themeConfig.carbonAds?.carbon,
-              __BSA__: !!site.themeConfig.carbonAds?.custom,
-              __ALGOLIA__: !!site.themeConfig.algolia
-            }
-          : {}
+        define: {
+          __CARBON__: !!site.themeConfig.carbonAds?.carbon,
+          __BSA__: !!site.themeConfig.carbonAds?.custom,
+          __ALGOLIA__: !!site.themeConfig.algolia
+        }
       }
     },
 

From a41928ef83eaf9dcb68be26b1e1f8a3edadfb74a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 1 Jan 2021 12:48:08 -0500
Subject: [PATCH 39/78] fix: avoid unexpected vite define replacements in
 markdown content

---
 src/node/markdownToVue.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/node/markdownToVue.ts b/src/node/markdownToVue.ts
index cc94049c..d6097430 100644
--- a/src/node/markdownToVue.ts
+++ b/src/node/markdownToVue.ts
@@ -33,7 +33,12 @@ export function createMarkdownToVueRenderFn(
     const start = Date.now()
 
     const { content, data: frontmatter } = matter(src)
-    const { html, data } = md.render(content)
+    let { html, data } = md.render(content)
+
+    // avoid env variables being replaced by vite
+    html = html
+      .replace(/import\.meta/g, 'import.<wbr/>meta')
+      .replace(/process\.env/g, 'process.<wbr/>env')
 
     // TODO validate data.links?
     const pageData: PageData = {

From e262ef63d89b2bc90c7e42bfc302ba6c602fab16 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 1 Jan 2021 13:03:46 -0500
Subject: [PATCH 40/78] feat(theme-default): nav.item.activeMatch

---
 docs/.vitepress/config.js                      |  8 ++++++--
 .../theme-default/composables/navLink.ts       | 18 +++++++++++++++---
 src/client/theme-default/config.ts             |  1 +
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js
index d9a95499..14c5bd69 100644
--- a/docs/.vitepress/config.js
+++ b/docs/.vitepress/config.js
@@ -23,8 +23,12 @@ module.exports = {
     },
 
     nav: [
-      { text: 'Guide', link: '/' },
-      { text: 'Config Reference', link: '/config/basics' },
+      { text: 'Guide', link: '/', activeMatch: '^/$|^/guide/' },
+      {
+        text: 'Config Reference',
+        link: '/config/basics',
+        activeMatch: '^/config/'
+      },
       {
         text: 'Release Notes',
         link: 'https://github.com/vuejs/vitepress/releases'
diff --git a/src/client/theme-default/composables/navLink.ts b/src/client/theme-default/composables/navLink.ts
index 951a00cd..c9f4d7ac 100644
--- a/src/client/theme-default/composables/navLink.ts
+++ b/src/client/theme-default/composables/navLink.ts
@@ -11,11 +11,22 @@ export function useNavLink(item: DefaultTheme.NavItemWithLink) {
   const isExternal = isExternalCheck(item.link)
 
   const props = computed(() => {
+    const routePath = normalizePath(route.path)
+
+    let active = false
+    if (item.activeMatch) {
+      active = new RegExp(item.activeMatch).test(routePath)
+    } else {
+      const itemPath = normalizePath(withBase(item.link))
+      active =
+        itemPath === '/'
+          ? itemPath === routePath
+          : routePath.startsWith(itemPath)
+    }
+
     return {
       class: {
-        active: normalizePath(route.path).startsWith(
-          normalizePath(withBase(item.link))
-        ),
+        active,
         isExternal
       },
       href: isExternal ? item.link : withBase(item.link),
@@ -36,4 +47,5 @@ function normalizePath(path: string): string {
     .replace(/#.*$/, '')
     .replace(/\?.*$/, '')
     .replace(/\.(html|md)$/, '')
+    .replace(/\/index$/, '/')
 }
diff --git a/src/client/theme-default/config.ts b/src/client/theme-default/config.ts
index e049bcb7..d7284871 100644
--- a/src/client/theme-default/config.ts
+++ b/src/client/theme-default/config.ts
@@ -80,6 +80,7 @@ export namespace DefaultTheme {
     target?: string
     rel?: string
     ariaLabel?: string
+    activeMatch?: string
   }
 
   export interface NavItemWithLink extends NavItemBase {

From c08ceab26724a7d39a5109aca620ed6bfe304401 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 1 Jan 2021 13:15:08 -0500
Subject: [PATCH 41/78] release: v0.10.3

---
 CHANGELOG.md | 13 +++++++++++++
 package.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f86a3b7..a79b43a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## [0.10.3](https://github.com/vuejs/vitepress/compare/v0.10.2...v0.10.3) (2021-01-01)
+
+### Bug Fixes
+
+- always define theme globals ([8769b4b](https://github.com/vuejs/vitepress/commit/8769b4b49f398c5244354fbb93fcbecdb9b9c638))
+- avoid unexpected vite define replacements in markdown content ([a41928e](https://github.com/vuejs/vitepress/commit/a41928ef83eaf9dcb68be26b1e1f8a3edadfb74a))
+- loosen navLink active matching ([8a2ff33](https://github.com/vuejs/vitepress/commit/8a2ff33bf8043b5b0ec21826d7962d7e6337e394))
+
+### Features
+
+- **theme-default:** nav.item.activeMatch ([e262ef6](https://github.com/vuejs/vitepress/commit/e262ef63d89b2bc90c7e42bfc302ba6c602fab16))
+- add altAction for home ([9a17ddf](https://github.com/vuejs/vitepress/commit/9a17ddfdfb3cf7afd70d28d697245a298de090e1))
+
 ## [0.10.2](https://github.com/vuejs/vitepress/compare/v0.10.1...v0.10.2) (2020-12-31)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 661805be..8a1ce0cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From 055e3fd043b6ec425f1b0a0cf529bc1ff66acda5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 1 Jan 2021 13:20:11 -0500
Subject: [PATCH 42/78] fix: respect root during build

---
 src/node/build/bundle.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 53062592..9fc38db9 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -35,6 +35,7 @@ export async function bundle(
   const { rollupOptions } = options
 
   const resolveViteConfig = (ssr: boolean): ViteUserConfig => ({
+    root,
     logLevel: 'warn',
     plugins: createVitePressPlugin(root, config, ssr, pageToHashMap),
     build: {

From d6b8568c52d51d66423a32293879f8bb57756954 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 1 Jan 2021 13:29:57 -0500
Subject: [PATCH 43/78] fix: ensure the same vue dep in all cases

---
 src/node/alias.ts | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/node/alias.ts b/src/node/alias.ts
index add67ee8..fbe2cea5 100644
--- a/src/node/alias.ts
+++ b/src/node/alias.ts
@@ -37,28 +37,18 @@ export function resolveAliases(
     {
       find: /^vitepress$/,
       replacement: path.join(__dirname, '../client/index')
+    },
+    // alias for local linked development
+    { find: /^vitepress\//, replacement: PKG_ROOT + '/' },
+    // make sure it always use the same vue dependency that comes with
+    // vitepress itself
+    {
+      find: /^vue$/,
+      replacement: require.resolve(
+        '@vue/runtime-dom/dist/runtime-dom.esm-bundler.js'
+      )
     }
   ]
 
-  let isLinked = false
-  try {
-    require.resolve('vitepress', { paths: [root] })
-  } catch (e) {
-    isLinked = true
-  }
-
-  if (isLinked) {
-    // aliases for local linked development
-    aliases.push(
-      { find: /^vitepress\//, replacement: PKG_ROOT + '/' },
-      {
-        find: /^vue$/,
-        replacement: require.resolve(
-          '@vue/runtime-dom/dist/runtime-dom.esm-bundler.js'
-        )
-      }
-    )
-  }
-
   return aliases
 }

From 600605be09325e4bbe5fa7e9ffc8fef0ad810dc7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 1 Jan 2021 13:30:52 -0500
Subject: [PATCH 44/78] release: v0.10.4

---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a79b43a7..191e2dcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [0.10.4](https://github.com/vuejs/vitepress/compare/v0.10.3...v0.10.4) (2021-01-01)
+
+### Bug Fixes
+
+- ensure the same vue dep in all cases ([d6b8568](https://github.com/vuejs/vitepress/commit/d6b8568c52d51d66423a32293879f8bb57756954))
+- respect root during build ([055e3fd](https://github.com/vuejs/vitepress/commit/055e3fd043b6ec425f1b0a0cf529bc1ff66acda5))
+
 ## [0.10.3](https://github.com/vuejs/vitepress/compare/v0.10.2...v0.10.3) (2021-01-01)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 8a1ce0cb..f79d9181 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From 65f8a2e608c799e9762ac21aac1ac58f77e719bc Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 2 Jan 2021 01:35:01 -0500
Subject: [PATCH 45/78] docs: add cache headers

---
 docs/public/_headers | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 docs/public/_headers

diff --git a/docs/public/_headers b/docs/public/_headers
new file mode 100644
index 00000000..f7fa3afc
--- /dev/null
+++ b/docs/public/_headers
@@ -0,0 +1,3 @@
+/assets/*
+  cache-control: max-age=31536000
+  cache-control: immutable
\ No newline at end of file

From 991a443c70c6173aa0100fcccf57f3565e9e38d9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 2 Jan 2021 13:27:09 -0500
Subject: [PATCH 46/78] fix: vite 2.0.0-beta.2 compat

---
 package.json       |  4 ++--
 src/node/plugin.ts |  8 ++++++--
 yarn.lock          | 16 ++++++++--------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index f79d9181..8ca00c0b 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
   "dependencies": {
     "@docsearch/css": "^1.0.0-alpha.28",
     "@docsearch/js": "^1.0.0-alpha.28",
-    "@vitejs/plugin-vue": "^1.0.2",
+    "@vitejs/plugin-vue": "^1.0.3",
     "@vue/compiler-sfc": "^3.0.5",
     "@vue/server-renderer": "^3.0.5",
     "chalk": "^4.1.0",
@@ -88,7 +88,7 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-alpha.5",
+    "vite": "^2.0.0-beta.2",
     "vue": "^3.0.5"
   },
   "devDependencies": {
diff --git a/src/node/plugin.ts b/src/node/plugin.ts
index cffbab37..e9503dd5 100644
--- a/src/node/plugin.ts
+++ b/src/node/plugin.ts
@@ -138,8 +138,9 @@ export function createVitePressPlugin(
       }
     },
 
-    async handleHotUpdate(file, mods, read, server) {
+    async handleHotUpdate(ctx) {
       // handle config hmr
+      const { file, read, server } = ctx
       if (file === configPath) {
         const newData = await resolveSiteData(root)
         if (newData.base !== siteData.base) {
@@ -167,7 +168,10 @@ export function createVitePressPlugin(
         })
 
         // reload the content component
-        return vuePlugin.handleHotUpdate!(file, mods, () => vueSrc, server)
+        return vuePlugin.handleHotUpdate!({
+          ...ctx,
+          read: () => vueSrc
+        })
       }
     }
   }
diff --git a/yarn.lock b/yarn.lock
index 90bef5fc..3723d480 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -948,10 +948,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@vitejs/plugin-vue@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.0.2.tgz#46da003df81c5ef74cec6d59c16fa13c34bd8108"
-  integrity sha512-qtmVCJ3MfGebpbRIK/UFydlEuvDrz5Z4caARXDWWy23bM6nFq7wIV6/tW4LRdmSHxFdyvogctQ1+zl4brJg1og==
+"@vitejs/plugin-vue@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.0.3.tgz#2df3c22802f2d2142ae3bd8d3e93623df790446d"
+  integrity sha512-sOVHFS97zxuRLAMj10C9Vaiv3WeEwnhtee9V+yv/G/xoJTXPJIRct4Nj2unPtp5zAUoCL+iTVbIC6LnNmNE4Hw==
 
 "@vue/compiler-core@3.0.5":
   version "3.0.5"
@@ -6031,10 +6031,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-alpha.5:
-  version "2.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-alpha.5.tgz#e7e840c0caafbc3d1264efb7b7cf5f08000bff24"
-  integrity sha512-cRm1/ZlcmIcl43ehvxs5Hr+5WapCYe3Zf4i6GM0a+VJPUgE0SJFzEO/SgZhJEc7PINmo+4TXKWAokZU+XvvwoA==
+vite@^2.0.0-beta.2:
+  version "2.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.2.tgz#5ea8fd4a01d0f722db59bff2bdc4ae24ba9fa63a"
+  integrity sha512-bZ2IeW+Uo4A7HpRIqyyHUDk6/WOGIkNdTm5/0yLmgjvXgLErwUhzv7Z0T0C6lc4lwoQV9KEA8IbFkZ+ZyWzhWg==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"

From 69f85c5312caefe26274b7b06d469f6af8dde490 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 2 Jan 2021 13:28:41 -0500
Subject: [PATCH 47/78] release: v0.10.5

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 191e2dcd..5a9fd1e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [0.10.5](https://github.com/vuejs/vitepress/compare/v0.10.4...v0.10.5) (2021-01-02)
+
+### Bug Fixes
+
+- vite 2.0.0-beta.2 compat ([991a443](https://github.com/vuejs/vitepress/commit/991a443c70c6173aa0100fcccf57f3565e9e38d9))
+
 ## [0.10.4](https://github.com/vuejs/vitepress/compare/v0.10.3...v0.10.4) (2021-01-01)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 8ca00c0b..8102c7bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From da2c4f694e6dd2d11ff061b8eb7cae2354ae930d Mon Sep 17 00:00:00 2001
From: Matias Capeletto <matias.capeletto@gmail.com>
Date: Mon, 4 Jan 2021 09:02:53 +0100
Subject: [PATCH 48/78] fix: bump vite and fix win32 path resolving (#198)

---
 package.json             | 2 +-
 src/node/build/render.ts | 3 ++-
 yarn.lock                | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 8102c7bd..ecd0d0a0 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-beta.2",
+    "vite": "^2.0.0-beta.4",
     "vue": "^3.0.5"
   },
   "devDependencies": {
diff --git a/src/node/build/render.ts b/src/node/build/render.ts
index 8ec778bb..4c2d54c8 100644
--- a/src/node/build/render.ts
+++ b/src/node/build/render.ts
@@ -2,6 +2,7 @@ import path from 'path'
 import fs from 'fs-extra'
 import { SiteConfig, resolveSiteDataByRoute } from '../config'
 import { HeadConfig } from '../../../types/shared'
+import { normalizePath } from 'vite'
 import { RollupOutput, OutputChunk, OutputAsset } from 'rollup'
 
 const escape = require('escape-html')
@@ -88,7 +89,7 @@ function resolvePageImports(
   // find the page's js chunk and inject script tags for its imports so that
   // they are start fetching as early as possible
 
-  const srcPath = path.resolve(config.root, page)
+  const srcPath = normalizePath(path.resolve(config.root, page))
   const pageChunk = result.output.find(
     (chunk) => chunk.type === 'chunk' && chunk.facadeModuleId === srcPath
   ) as OutputChunk
diff --git a/yarn.lock b/yarn.lock
index 3723d480..f666a8e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6031,10 +6031,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-beta.2:
-  version "2.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.2.tgz#5ea8fd4a01d0f722db59bff2bdc4ae24ba9fa63a"
-  integrity sha512-bZ2IeW+Uo4A7HpRIqyyHUDk6/WOGIkNdTm5/0yLmgjvXgLErwUhzv7Z0T0C6lc4lwoQV9KEA8IbFkZ+ZyWzhWg==
+vite@^2.0.0-beta.4:
+  version "2.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.4.tgz#6ea8e08ae5e6b510548d02ec770d34046622aef7"
+  integrity sha512-V0HV6xyUPQ9ktJ8gLm0Et7zTFtp8WmISsH/K+FuGF3aJ4VJOlSYEaget1nHCauUPI7WDPe97suz7SCIVHW2iEg==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"

From 9965ce6ae8ffa158fe55457d7e639d85f09cef16 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 4 Jan 2021 03:05:00 -0500
Subject: [PATCH 49/78] pass ssr option to vite build

this will be required in next release
---
 src/node/build/bundle.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 9fc38db9..a9607a7b 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -40,6 +40,8 @@ export async function bundle(
     plugins: createVitePressPlugin(root, config, ssr, pageToHashMap),
     build: {
       ...options,
+      // @ts-ignore
+      ssr,
       base: config.site.base,
       outDir: ssr ? config.tempDir : config.outDir,
       cssCodeSplit: false,

From fe83ec2848170373df98204b03dc3d9933713a56 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 4 Jan 2021 03:07:57 -0500
Subject: [PATCH 50/78] release: v0.10.6

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a9fd1e1..c0ba3f45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [0.10.6](https://github.com/vuejs/vitepress/compare/v0.10.5...v0.10.6) (2021-01-04)
+
+### Bug Fixes
+
+- bump vite and fix win32 path resolving ([#198](https://github.com/vuejs/vitepress/issues/198)) ([da2c4f6](https://github.com/vuejs/vitepress/commit/da2c4f694e6dd2d11ff061b8eb7cae2354ae930d))
+
 ## [0.10.5](https://github.com/vuejs/vitepress/compare/v0.10.4...v0.10.5) (2021-01-02)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index ecd0d0a0..e918272e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From 759bbd3f6132140eeecef684749681f1b33132d7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2021 13:53:34 -0500
Subject: [PATCH 51/78] chore: bump vite

---
 package.json       |  2 +-
 src/node/plugin.ts |  1 -
 yarn.lock          | 11 ++++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e918272e..4b811ff0 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-beta.4",
+    "vite": "^2.0.0-beta.6",
     "vue": "^3.0.5"
   },
   "devDependencies": {
diff --git a/src/node/plugin.ts b/src/node/plugin.ts
index e9503dd5..53baae8a 100644
--- a/src/node/plugin.ts
+++ b/src/node/plugin.ts
@@ -43,7 +43,6 @@ export function createVitePressPlugin(
     config() {
       return {
         alias: aliases,
-        transformInclude: /\.md$/,
         define: {
           __CARBON__: !!site.themeConfig.carbonAds?.carbon,
           __BSA__: !!site.themeConfig.carbonAds?.custom,
diff --git a/yarn.lock b/yarn.lock
index f666a8e5..ef4f6292 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5120,7 +5120,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
   integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
@@ -6031,13 +6031,14 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-beta.4:
-  version "2.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.4.tgz#6ea8e08ae5e6b510548d02ec770d34046622aef7"
-  integrity sha512-V0HV6xyUPQ9ktJ8gLm0Et7zTFtp8WmISsH/K+FuGF3aJ4VJOlSYEaget1nHCauUPI7WDPe97suz7SCIVHW2iEg==
+vite@^2.0.0-beta.6:
+  version "2.0.0-beta.6"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.6.tgz#8f62e05027b0dbbcc9640c7e641b1f9a39310b62"
+  integrity sha512-VtzB5X5XUUNWBTnOrdsi6pqBj7V/95kJ2GmcVTdfnnmN1KzShEW2NH1e210adXiuuPn4wtGShg4ruIuq02Evzg==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"
+    resolve "^1.19.0"
     rollup "^2.35.1"
   optionalDependencies:
     fsevents "~2.1.2"

From 161e0ea69cf1cbd3ee1132c892cc4419d31e7e0a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2021 13:56:01 -0500
Subject: [PATCH 52/78] types: add vite env

---
 src/client/env.d.ts | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/client/env.d.ts

diff --git a/src/client/env.d.ts b/src/client/env.d.ts
new file mode 100644
index 00000000..a8708975
--- /dev/null
+++ b/src/client/env.d.ts
@@ -0,0 +1 @@
+import 'vite/env'

From 6ff76c4ea8adca955a4739509b6f39309ddddec2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2021 14:10:52 -0500
Subject: [PATCH 53/78] chore: bump vite

---
 package.json                                              | 2 +-
 src/client/app/composables/head.ts                        | 2 +-
 src/client/app/index.ts                                   | 3 ++-
 src/client/app/mixin.ts                                   | 4 +---
 src/client/env.d.ts                                       | 1 -
 src/client/theme-default/composables/activeSidebarLink.ts | 2 +-
 src/client/tsconfig.json                                  | 2 +-
 yarn.lock                                                 | 8 ++++----
 8 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 src/client/env.d.ts

diff --git a/package.json b/package.json
index 4b811ff0..4fd80d28 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-beta.6",
+    "vite": "^2.0.0-beta.7",
     "vue": "^3.0.5"
   },
   "devDependencies": {
diff --git a/src/client/app/composables/head.ts b/src/client/app/composables/head.ts
index 1230760a..fc55fca6 100644
--- a/src/client/app/composables/head.ts
+++ b/src/client/app/composables/head.ts
@@ -7,7 +7,7 @@ export function useUpdateHead(route: Route, siteDataByRouteRef: Ref<SiteData>) {
 
   let isFirstUpdate = true
   const updateHeadTags = (newTags: HeadConfig[]) => {
-    if (process.env.NODE_ENV === 'production' && isFirstUpdate) {
+    if (import.meta.env.PROD && isFirstUpdate) {
       // in production, the initial meta tags are already pre-rendered so we
       // skip the first update.
       isFirstUpdate = false
diff --git a/src/client/app/index.ts b/src/client/app/index.ts
index d450d859..ea308300 100644
--- a/src/client/app/index.ts
+++ b/src/client/app/index.ts
@@ -54,7 +54,7 @@ export function createApp() {
 }
 
 function newApp(): App {
-  return process.env.NODE_ENV === 'production'
+  return import.meta.env.PROD
     ? createSSRApp(VitePressApp)
     : createClientApp(VitePressApp)
 }
@@ -85,6 +85,7 @@ function newRouter(): Router {
     }
 
     // SSR: sync require
+    // @ts-ignore
     return require(pageFilePath)
   }, NotFound)
 }
diff --git a/src/client/app/mixin.ts b/src/client/app/mixin.ts
index 9fb29376..24841ce8 100644
--- a/src/client/app/mixin.ts
+++ b/src/client/app/mixin.ts
@@ -65,13 +65,11 @@ export function mixinGlobalComputed(
 }
 
 export function mixinGlobalComponents(app: App) {
-  const isProd = process.env.NODE_ENV === 'production'
-
   app.component('Content', Content)
   app.component('ClientOnly', ClientOnly)
   app.component(
     'Debug',
-    isProd
+    import.meta.env.PROD
       ? () => null
       : defineAsyncComponent(() => import('./components/Debug.vue'))
   )
diff --git a/src/client/env.d.ts b/src/client/env.d.ts
deleted file mode 100644
index a8708975..00000000
--- a/src/client/env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-import 'vite/env'
diff --git a/src/client/theme-default/composables/activeSidebarLink.ts b/src/client/theme-default/composables/activeSidebarLink.ts
index 278e17c2..1b3b1d01 100644
--- a/src/client/theme-default/composables/activeSidebarLink.ts
+++ b/src/client/theme-default/composables/activeSidebarLink.ts
@@ -113,7 +113,7 @@ function isAnchorActive(
 }
 
 function throttleAndDebounce(fn: () => void, delay: number): () => void {
-  let timeout: NodeJS.Timeout
+  let timeout: number
   let called = false
 
   return () => {
diff --git a/src/client/tsconfig.json b/src/client/tsconfig.json
index 08160422..6182a129 100644
--- a/src/client/tsconfig.json
+++ b/src/client/tsconfig.json
@@ -6,7 +6,7 @@
     "target": "esnext",
     "module": "esnext",
     "lib": ["ESNext", "DOM"],
-    "types": ["vite"],
+    "types": ["vite/client"],
     "paths": {
       "/@shared/*": ["shared/*"],
       "/@types/*": ["../../types/*"],
diff --git a/yarn.lock b/yarn.lock
index ef4f6292..4daa5367 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6031,10 +6031,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-beta.6:
-  version "2.0.0-beta.6"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.6.tgz#8f62e05027b0dbbcc9640c7e641b1f9a39310b62"
-  integrity sha512-VtzB5X5XUUNWBTnOrdsi6pqBj7V/95kJ2GmcVTdfnnmN1KzShEW2NH1e210adXiuuPn4wtGShg4ruIuq02Evzg==
+vite@^2.0.0-beta.7:
+  version "2.0.0-beta.7"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.7.tgz#8200198ac3c0a5e9deb62579e01053cea89d6176"
+  integrity sha512-9tkmaq4PbBDWmcvIto07jpkMiD084EgDsizZxijYrpS3ojC9myksA/hlKA7RzK+uSEFetcb1ZY4ONpJQb/J+vw==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"

From b6ba8a943cc0488410a438c6c2f277c1c33a90bf Mon Sep 17 00:00:00 2001
From: Matias Capeletto <matias.capeletto@gmail.com>
Date: Tue, 5 Jan 2021 22:47:56 +0100
Subject: [PATCH 54/78] fix: scrollbar when using line highlight (#200)

---
 src/client/theme-default/styles/code.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client/theme-default/styles/code.css b/src/client/theme-default/styles/code.css
index adc2a221..e27762ce 100644
--- a/src/client/theme-default/styles/code.css
+++ b/src/client/theme-default/styles/code.css
@@ -85,6 +85,7 @@ li > div[class*='language-'] {
   font-family: var(--code-font-family);
   font-size: var(--code-font-size);
   user-select: none;
+  overflow: hidden;
 }
 
 .highlight-lines .highlighted {

From 64a08b35a3457027d0daa88420fece3052008664 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2021 18:17:05 -0500
Subject: [PATCH 55/78] chore: bump vite again

---
 package.json             | 2 +-
 src/client/app/index.ts  | 1 +
 src/node/build/bundle.ts | 1 -
 yarn.lock                | 8 ++++----
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 4fd80d28..58240fe9 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-beta.7",
+    "vite": "^2.0.0-beta.8",
     "vue": "^3.0.5"
   },
   "devDependencies": {
diff --git a/src/client/app/index.ts b/src/client/app/index.ts
index ea308300..f791f250 100644
--- a/src/client/app/index.ts
+++ b/src/client/app/index.ts
@@ -1,3 +1,4 @@
+import 'vite/dynamic-import-polyfill'
 import { App, createApp as createClientApp, createSSRApp, h } from 'vue'
 import { inBrowser, pathToFile } from './utils'
 import { Router, RouterSymbol, createRouter } from './router'
diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index a9607a7b..9489364c 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -40,7 +40,6 @@ export async function bundle(
     plugins: createVitePressPlugin(root, config, ssr, pageToHashMap),
     build: {
       ...options,
-      // @ts-ignore
       ssr,
       base: config.site.base,
       outDir: ssr ? config.tempDir : config.outDir,
diff --git a/yarn.lock b/yarn.lock
index 4daa5367..79018573 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6031,10 +6031,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-beta.7:
-  version "2.0.0-beta.7"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.7.tgz#8200198ac3c0a5e9deb62579e01053cea89d6176"
-  integrity sha512-9tkmaq4PbBDWmcvIto07jpkMiD084EgDsizZxijYrpS3ojC9myksA/hlKA7RzK+uSEFetcb1ZY4ONpJQb/J+vw==
+vite@^2.0.0-beta.8:
+  version "2.0.0-beta.8"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.8.tgz#3578e94bcba69f0d89808fd665c293570b22c70d"
+  integrity sha512-fl9cDM2KxgpMtU2+xUGLgVmDITpDNEEk1KhDPC+LwjrSvCV7Z84zt3ihvymyjeRmPH7jBWsvuyIPys76gidBWA==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"

From d8bf3b2886b29d6cbe5719f14f3fd1d4b409c4d8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2021 18:20:24 -0500
Subject: [PATCH 56/78] release: v0.10.7

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0ba3f45..9e90c397 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [0.10.7](https://github.com/vuejs/vitepress/compare/v0.10.6...v0.10.7) (2021-01-05)
+
+### Features
+
+Bump to Vite 2.0.0-beta.8
+
+### Bug Fixes
+
+- scrollbar when using line highlight ([#200](https://github.com/vuejs/vitepress/issues/200)) ([b6ba8a9](https://github.com/vuejs/vitepress/commit/b6ba8a943cc0488410a438c6c2f277c1c33a90bf))
+
 ## [0.10.6](https://github.com/vuejs/vitepress/compare/v0.10.5...v0.10.6) (2021-01-04)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 58240fe9..65a02216 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.10.6",
+  "version": "0.10.7",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From bac1ce2d01469ff7586437f43b0d665b1c5eb278 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Mon, 11 Jan 2021 08:24:32 +0800
Subject: [PATCH 57/78] fix: resolve page hash case-insenstively, close #202
 (#203)

---
 src/client/app/index.ts  | 2 +-
 src/client/app/router.ts | 2 +-
 src/client/app/utils.ts  | 4 ++--
 src/node/build/render.ts | 2 +-
 src/node/plugin.ts       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/client/app/index.ts b/src/client/app/index.ts
index f791f250..5eb688e3 100644
--- a/src/client/app/index.ts
+++ b/src/client/app/index.ts
@@ -113,7 +113,7 @@ function shouldHotReload(payload: any): boolean {
 if (inBrowser) {
   const { app, router } = createApp()
 
-  // wait unitl page component is fetched before mounting
+  // wait until page component is fetched before mounting
   router.go().then(() => {
     app.mount('#app')
   })
diff --git a/src/client/app/router.ts b/src/client/app/router.ts
index 4c314ce3..6a99e132 100644
--- a/src/client/app/router.ts
+++ b/src/client/app/router.ts
@@ -23,7 +23,7 @@ const getDefaultRoute = (): Route => ({
   path: '/',
   component: null,
   // this will be set upon initial page load, which is before
-  // the app is mounted, so it's guaranteed to be avaiable in
+  // the app is mounted, so it's guaranteed to be available in
   // components
   data: null as any
 })
diff --git a/src/client/app/utils.ts b/src/client/app/utils.ts
index 0eee7e11..26383bf5 100644
--- a/src/client/app/utils.ts
+++ b/src/client/app/utils.ts
@@ -17,7 +17,7 @@ export function pathToFile(path: string): string {
   }
 
   if (import.meta.env.DEV) {
-    // awlays force re-fetch content in dev
+    // always force re-fetch content in dev
     pagePath += `.md?t=${Date.now()}`
   } else {
     // in production, each .md file is built into a .md.js file following
@@ -28,7 +28,7 @@ export function pathToFile(path: string): string {
       pagePath = pagePath.slice(base.length).replace(/\//g, '_') + '.md'
       // client production build needs to account for page hash, which is
       // injected directly in the page's html
-      const pageHash = __VP_HASH_MAP__[pagePath]
+      const pageHash = __VP_HASH_MAP__[pagePath.toLowerCase()]
       pagePath = `${base}assets/${pagePath}.${pageHash}.js`
     } else {
       // ssr build uses much simpler name mapping
diff --git a/src/node/build/render.ts b/src/node/build/render.ts
index 4c2d54c8..89689166 100644
--- a/src/node/build/render.ts
+++ b/src/node/build/render.ts
@@ -29,7 +29,7 @@ export async function renderPage(
   const pageServerJsFileName = pageName + '.js'
   // for any initial page load, we only need the lean version of the page js
   // since the static content is already on the page!
-  const pageHash = pageToHashMap[pageName]
+  const pageHash = pageToHashMap[pageName.toLowerCase()]
   const pageClientJsFileName = `assets/${pageName}.${pageHash}.lean.js`
 
   // resolve page data so we can render head tags
diff --git a/src/node/plugin.ts b/src/node/plugin.ts
index 53baae8a..29449449 100644
--- a/src/node/plugin.ts
+++ b/src/node/plugin.ts
@@ -122,7 +122,7 @@ export function createVitePressPlugin(
           if (isPageChunk(chunk)) {
             // record page -> hash relations
             const hash = chunk.fileName.match(hashRE)![1]
-            pageToHashMap![chunk.name] = hash
+            pageToHashMap![chunk.name.toLowerCase()] = hash
 
             // inject another chunk with the content stripped
             bundle[name + '-lean'] = {

From 0a85bb89a13e8bc84ff8230a70882cd43f78ef79 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 10 Jan 2021 19:32:22 -0500
Subject: [PATCH 58/78] bump vite

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 65a02216..86feae6a 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-beta.8",
+    "vite": "^2.0.0-beta.20",
     "vue": "^3.0.5"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 79018573..c9f30cb3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6031,10 +6031,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-beta.8:
-  version "2.0.0-beta.8"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.8.tgz#3578e94bcba69f0d89808fd665c293570b22c70d"
-  integrity sha512-fl9cDM2KxgpMtU2+xUGLgVmDITpDNEEk1KhDPC+LwjrSvCV7Z84zt3ihvymyjeRmPH7jBWsvuyIPys76gidBWA==
+vite@^2.0.0-beta.20:
+  version "2.0.0-beta.20"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.20.tgz#338d436345be7e3474b5077f9ff6e3e70048834b"
+  integrity sha512-QsFgitrsGNzFRnPSlbtzz0Q5boMmGx17P4gW9dKu1sqtbg5joMqQrbihh2Tf9xQWu1G0+xPEevrpu1FRI744Xw==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"

From 04a0fc297faf444307dae6b0a7c98f67c0af319a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 10 Jan 2021 21:51:33 -0500
Subject: [PATCH 59/78] bump vite

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 86feae6a..00daa9b7 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-beta.20",
+    "vite": "^2.0.0-beta.21",
     "vue": "^3.0.5"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index c9f30cb3..a837c342 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6031,10 +6031,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-beta.20:
-  version "2.0.0-beta.20"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.20.tgz#338d436345be7e3474b5077f9ff6e3e70048834b"
-  integrity sha512-QsFgitrsGNzFRnPSlbtzz0Q5boMmGx17P4gW9dKu1sqtbg5joMqQrbihh2Tf9xQWu1G0+xPEevrpu1FRI744Xw==
+vite@^2.0.0-beta.21:
+  version "2.0.0-beta.21"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.21.tgz#9a7233c93ed59c5b5de28c3a74f1e94b815d746e"
+  integrity sha512-B6OhGHwh4DTkDBxZXtGhxmDkK75M3o0sKFz/cfZ2bdqxRze870sJgH66kPuYWjgSVDdPz0NTIKBaxrbcA8wwmw==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"

From 69e172a56bbcd372ccb18e0c25c19541bcee9213 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 10 Jan 2021 21:57:11 -0500
Subject: [PATCH 60/78] release: v0.10.8

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e90c397..55a46651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [0.10.8](https://github.com/vuejs/vitepress/compare/v0.10.7...v0.10.8) (2021-01-11)
+
+### Bug Fixes
+
+- resolve page hash case-insenstively, close [#202](https://github.com/vuejs/vitepress/issues/202) ([#203](https://github.com/vuejs/vitepress/issues/203)) ([bac1ce2](https://github.com/vuejs/vitepress/commit/bac1ce2d01469ff7586437f43b0d665b1c5eb278))
+
 ## [0.10.7](https://github.com/vuejs/vitepress/compare/v0.10.6...v0.10.7) (2021-01-05)
 
 ### Features
diff --git a/package.json b/package.json
index 00daa9b7..ccde2bdb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.10.7",
+  "version": "0.10.8",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From 9c7906119e9e83faab27d86868d6ccc94a3a17a6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 11 Jan 2021 18:53:59 -0500
Subject: [PATCH 61/78] refactor: rename site alias

---
 src/node/config.ts | 4 ++--
 src/node/plugin.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/node/config.ts b/src/node/config.ts
index e565e6ec..cfdcfe71 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -30,7 +30,7 @@ export interface SiteConfig<ThemeConfig = any> {
   themeDir: string
   outDir: string
   tempDir: string
-  aliases: AliasOptions
+  alias: AliasOptions
   pages: string[]
   markdown?: MarkdownOptions
 }
@@ -59,7 +59,7 @@ export async function resolveConfig(
     outDir: resolve(root, 'dist'),
     tempDir: path.resolve(APP_PATH, 'temp'),
     markdown: userConfig.markdown,
-    aliases: resolveAliases(root, themeDir, userConfig)
+    alias: resolveAliases(root, themeDir, userConfig)
   }
 
   return config
diff --git a/src/node/plugin.ts b/src/node/plugin.ts
index 29449449..3dcd70f8 100644
--- a/src/node/plugin.ts
+++ b/src/node/plugin.ts
@@ -24,7 +24,7 @@ const isPageChunk = (
 
 export function createVitePressPlugin(
   root: string,
-  { configPath, aliases, markdown, themeDir, site }: SiteConfig,
+  { configPath, alias, markdown, site }: SiteConfig,
   ssr = false,
   pageToHashMap?: Record<string, string>
 ): Plugin[] {
@@ -42,7 +42,7 @@ export function createVitePressPlugin(
 
     config() {
       return {
-        alias: aliases,
+        alias,
         define: {
           __CARBON__: !!site.themeConfig.carbonAds?.carbon,
           __BSA__: !!site.themeConfig.carbonAds?.custom,

From 4072dc5f7ede381709fce49e9a29d6af4f7ab81a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 11 Jan 2021 21:55:59 -0500
Subject: [PATCH 62/78] feat: support customData in config

---
 src/node/config.ts | 5 +++--
 types/shared.d.ts  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/node/config.ts b/src/node/config.ts
index cfdcfe71..f5625643 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -20,7 +20,7 @@ export interface UserConfig<ThemeConfig = any> {
   locales?: Record<string, LocaleConfig>
   alias?: Record<string, string>
   markdown?: MarkdownOptions
-  // TODO locales support etc.
+  customData?: any
 }
 
 export interface SiteConfig<ThemeConfig = any> {
@@ -91,6 +91,7 @@ export async function resolveSiteData(root: string): Promise<SiteData> {
     base: userConfig.base ? userConfig.base.replace(/([^/])$/, '$1/') : '/',
     head: userConfig.head || [],
     themeConfig: userConfig.themeConfig || {},
-    locales: userConfig.locales || {}
+    locales: userConfig.locales || {},
+    customData: userConfig.customData || {}
   }
 }
diff --git a/types/shared.d.ts b/types/shared.d.ts
index cf2aa73a..1f14a6a5 100644
--- a/types/shared.d.ts
+++ b/types/shared.d.ts
@@ -17,6 +17,7 @@ export interface SiteData<ThemeConfig = any> {
   head: HeadConfig[]
   themeConfig: ThemeConfig
   locales: Record<string, LocaleConfig>
+  customData: any
 }
 
 export type HeadConfig =

From a79e1e1916a71271728e6fe7c2b734fc2f209518 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 11 Jan 2021 21:56:08 -0500
Subject: [PATCH 63/78] refactor: move default theme to 'vitepress/theme'

Fixes the case when using a completely custom theme, importing anything
from vitepress causes the entire default theme to be imported too.

BREAKING CHANGE: the default theme is now exposed via 'vitepress/theme',
instead of a named export from 'vitepress'.
---
 src/client/index.ts | 5 +----
 src/node/alias.ts   | 4 ++++
 theme.d.ts          | 3 +++
 types/index.d.ts    | 3 +--
 4 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 theme.d.ts

diff --git a/src/client/index.ts b/src/client/index.ts
index 8dc04483..4bbc0251 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -5,7 +5,7 @@
 export type { Router, Route } from './app/router'
 
 // theme types
-export * from './app/theme'
+export type { Theme, EnhanceAppContext } from './app/theme'
 
 // composables
 export { useRouter, useRoute } from './app/router'
@@ -24,6 +24,3 @@ import { ComponentOptions } from 'vue'
 import _Debug from './app/components/Debug.vue'
 const Debug = _Debug as ComponentOptions
 export { Debug }
-
-// default theme
-export { default as DefaultTheme } from './theme-default'
diff --git a/src/node/alias.ts b/src/node/alias.ts
index fbe2cea5..15bc8290 100644
--- a/src/node/alias.ts
+++ b/src/node/alias.ts
@@ -38,6 +38,10 @@ export function resolveAliases(
       find: /^vitepress$/,
       replacement: path.join(__dirname, '../client/index')
     },
+    {
+      find: /^vitepress\/theme$/,
+      replacement: path.join(__dirname, '../client/theme-default/index')
+    },
     // alias for local linked development
     { find: /^vitepress\//, replacement: PKG_ROOT + '/' },
     // make sure it always use the same vue dependency that comes with
diff --git a/theme.d.ts b/theme.d.ts
new file mode 100644
index 00000000..dd034b53
--- /dev/null
+++ b/theme.d.ts
@@ -0,0 +1,3 @@
+// so that users can do `import DefaultTheme from 'vitepress/theme'`
+import DefaultTheme from './dist/client/theme-default/index'
+export default DefaultTheme
diff --git a/types/index.d.ts b/types/index.d.ts
index fb753f96..10a5d0c2 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -1,5 +1,4 @@
 export * from './shared'
 export * from '../dist/node/index'
-export * from '../dist/client/app/exports'
+export * from '../dist/client/index'
 export * from '../dist/client/theme-default/config'
-export { default as defaultTheme } from '../dist/client/theme-default/index'

From 5a761343792697be450b3bb77c22aad03274400b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 11 Jan 2021 23:25:13 -0500
Subject: [PATCH 64/78] release: v0.11.0

---
 CHANGELOG.md | 17 +++++++++++++++++
 package.json |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55a46651..5ab50f05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# [0.11.0](https://github.com/vuejs/vitepress/compare/v0.10.8...v0.11.0) (2021-01-12)
+
+### Code Refactoring
+
+- move default theme to 'vitepress/theme' ([a79e1e1](https://github.com/vuejs/vitepress/commit/a79e1e1916a71271728e6fe7c2b734fc2f209518))
+
+### Features
+
+- support customData in config ([4072dc5](https://github.com/vuejs/vitepress/commit/4072dc5f7ede381709fce49e9a29d6af4f7ab81a))
+
+### BREAKING CHANGES
+
+- the default theme is now exposed via 'vitepress/theme',
+  instead of a named export from 'vitepress'. This change fixes the case where
+  when a completely custom theme is used, importing anything from 'vitepress'
+  also imports the entire default theme.
+
 ## [0.10.8](https://github.com/vuejs/vitepress/compare/v0.10.7...v0.10.8) (2021-01-11)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index ccde2bdb..9b13eded 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.10.8",
+  "version": "0.11.0",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From ca631c7f516ad6c643d252dd81e03e29fb3b9e05 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 12 Jan 2021 00:01:40 -0500
Subject: [PATCH 65/78] feat: render content on home page

---
 src/client/theme-default/components/Home.vue | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/client/theme-default/components/Home.vue b/src/client/theme-default/components/Home.vue
index 38c0ae02..7c30ce59 100644
--- a/src/client/theme-default/components/Home.vue
+++ b/src/client/theme-default/components/Home.vue
@@ -3,6 +3,9 @@
     <HomeHero />
     <slot name="hero" />
     <HomeFeatures />
+    <div class="home-content">
+      <Content />
+    </div>
     <slot name="features" />
     <HomeFooter />
     <slot name="footer" />
@@ -19,4 +22,17 @@ import HomeFooter from './HomeFooter.vue'
 .home {
   padding-top: var(--header-height);
 }
+
+.home-content {
+  max-width: 960px;
+  margin: 0px auto;
+  padding: 0 1.5rem;
+}
+
+@media (max-width: 720px) {
+  .home-content {
+    max-width: 392px;
+    padding: 0;
+  }
+}
 </style>

From 8dfa70839f06c94f308a61863a62b722068ad17d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 12 Jan 2021 00:02:26 -0500
Subject: [PATCH 66/78] release: v0.11.1

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ab50f05..95639246 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [0.11.1](https://github.com/vuejs/vitepress/compare/v0.11.0...v0.11.1) (2021-01-12)
+
+### Features
+
+- render content on home page ([ca631c7](https://github.com/vuejs/vitepress/commit/ca631c7f516ad6c643d252dd81e03e29fb3b9e05))
+
 # [0.11.0](https://github.com/vuejs/vitepress/compare/v0.10.8...v0.11.0) (2021-01-12)
 
 ### Code Refactoring
diff --git a/package.json b/package.json
index 9b13eded..f7464b3b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From a0f463af8fd828d24d9a01c3d808d85af8a71c9f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 12 Jan 2021 16:49:42 -0500
Subject: [PATCH 67/78] fix: aria label id

---
 src/client/theme-default/components/HomeHero.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/theme-default/components/HomeHero.vue b/src/client/theme-default/components/HomeHero.vue
index 145a0721..3e4072b0 100644
--- a/src/client/theme-default/components/HomeHero.vue
+++ b/src/client/theme-default/components/HomeHero.vue
@@ -4,7 +4,7 @@
       <img class="image" :src="$withBase($frontmatter.heroImage)" :alt="$frontmatter.heroAlt" />
     </figure>
 
-    <h1 v-if="hasHeroText" class="title">{{ heroText }}</h1>
+    <h1 v-if="hasHeroText" id="main-title" class="title">{{ heroText }}</h1>
     <p v-if="hasTagline" class="description">{{ tagline }}</p>
 
     <NavLink

From 12b16259ce12dd6a69038eda1c9fb25866cedfec Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 12 Jan 2021 17:11:12 -0500
Subject: [PATCH 68/78] chore: remove build setup in docs-serve script

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f7464b3b..ae81f886 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "docs-dev": "node ./bin/vitepress dev docs",
     "docs-debug": "node --inspect-brk ./bin/vitepress dev docs",
     "docs-build": "yarn build && node ./bin/vitepress build docs",
-    "docs-serve": "yarn docs-build && node ./bin/vitepress serve docs"
+    "docs-serve": "node ./bin/vitepress serve docs"
   },
   "engines": {
     "node": ">=12.0.0"

From b9fc0cb78d43949b417376498939daa892a33334 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 12 Jan 2021 17:11:26 -0500
Subject: [PATCH 69/78] perf: generate preload directives for dynamicImport
 chunks too

---
 src/node/build/render.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/node/build/render.ts b/src/node/build/render.ts
index 89689166..9102fd09 100644
--- a/src/node/build/render.ts
+++ b/src/node/build/render.ts
@@ -88,12 +88,18 @@ function resolvePageImports(
 ) {
   // find the page's js chunk and inject script tags for its imports so that
   // they are start fetching as early as possible
-
   const srcPath = normalizePath(path.resolve(config.root, page))
   const pageChunk = result.output.find(
     (chunk) => chunk.type === 'chunk' && chunk.facadeModuleId === srcPath
   ) as OutputChunk
-  return Array.from(new Set([...indexChunk.imports, ...pageChunk.imports]))
+  return Array.from(
+    new Set([
+      ...indexChunk.imports,
+      ...indexChunk.dynamicImports,
+      ...pageChunk.imports,
+      ...pageChunk.dynamicImports
+    ])
+  )
 }
 
 function renderHead(head: HeadConfig[]) {

From 122e0263bd8b738a8a909586e51f41268617e7bf Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 12 Jan 2021 17:23:21 -0500
Subject: [PATCH 70/78] release: v0.11.2

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95639246..e96609dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [0.11.2](https://github.com/vuejs/vitepress/compare/v0.11.1...v0.11.2) (2021-01-12)
+
+### Bug Fixes
+
+- aria label id ([a0f463a](https://github.com/vuejs/vitepress/commit/a0f463af8fd828d24d9a01c3d808d85af8a71c9f))
+
+### Performance Improvements
+
+- generate preload directives for dynamicImport chunks too ([b9fc0cb](https://github.com/vuejs/vitepress/commit/b9fc0cb78d43949b417376498939daa892a33334))
+
 ## [0.11.1](https://github.com/vuejs/vitepress/compare/v0.11.0...v0.11.1) (2021-01-12)
 
 ### Features
diff --git a/package.json b/package.json
index ae81f886..b3b37446 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From 3e6e61bcea8d4a34079428fcce3ecd25af1ae4f7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 13 Jan 2021 12:28:14 -0500
Subject: [PATCH 71/78] fix: ignore non-html links in router and prefetch

---
 src/client/app/composables/preFetch.ts | 5 +++++
 src/client/app/router.ts               | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/client/app/composables/preFetch.ts b/src/client/app/composables/preFetch.ts
index 04c8dfde..e35bcecb 100644
--- a/src/client/app/composables/preFetch.ts
+++ b/src/client/app/composables/preFetch.ts
@@ -75,6 +75,11 @@ export function usePrefetch() {
     rIC(() => {
       document.querySelectorAll('#app a').forEach((link) => {
         const { target, hostname, pathname } = link as HTMLAnchorElement
+        const extMatch = pathname.match(/\.\w+$/)
+        if (extMatch && extMatch[0] !== '.html') {
+          return
+        }
+
         if (
           // only prefetch same tab navigation, since a new tab will load
           // the lean js chunk instead.
diff --git a/src/client/app/router.ts b/src/client/app/router.ts
index 6a99e132..7e445d29 100644
--- a/src/client/app/router.ts
+++ b/src/client/app/router.ts
@@ -114,6 +114,7 @@ export function createRouter(
         if (link) {
           const { href, protocol, hostname, pathname, hash, target } = link
           const currentUrl = window.location
+          const extMatch = pathname.match(/\.\w+$/)
           // only intercept inbound links
           if (
             !e.ctrlKey &&
@@ -122,7 +123,8 @@ export function createRouter(
             !e.metaKey &&
             target !== `_blank` &&
             protocol === currentUrl.protocol &&
-            hostname === currentUrl.hostname
+            hostname === currentUrl.hostname &&
+            !(extMatch && extMatch[0] !== '.html')
           ) {
             e.preventDefault()
             if (pathname === currentUrl.pathname) {

From 187815cc9a143bc99db178cce379cd424d17201a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 13 Jan 2021 12:28:42 -0500
Subject: [PATCH 72/78] release: v0.11.3

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e96609dc..82dd03d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [0.11.3](https://github.com/vuejs/vitepress/compare/v0.11.2...v0.11.3) (2021-01-13)
+
+### Bug Fixes
+
+- ignore non-html links in router and prefetch ([3e6e61b](https://github.com/vuejs/vitepress/commit/3e6e61bcea8d4a34079428fcce3ecd25af1ae4f7))
+
 ## [0.11.2](https://github.com/vuejs/vitepress/compare/v0.11.1...v0.11.2) (2021-01-12)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index b3b37446..92e717da 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From b4bdaf648d4506fc3a75251cdeea41f631f815a3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 17 Jan 2021 23:49:13 -0500
Subject: [PATCH 73/78] refactor: vite ssr compat

---
 src/node/alias.ts        |  1 -
 src/node/build/bundle.ts | 36 ++++++------------------------------
 src/node/config.ts       |  2 +-
 src/node/plugin.ts       |  6 ++----
 4 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/node/alias.ts b/src/node/alias.ts
index 15bc8290..bb2314c2 100644
--- a/src/node/alias.ts
+++ b/src/node/alias.ts
@@ -18,7 +18,6 @@ export const SITE_DATA_ID = '@siteData'
 export const SITE_DATA_REQUEST_PATH = '/' + SITE_DATA_ID
 
 export function resolveAliases(
-  root: string,
   themeDir: string,
   userConfig: UserConfig
 ): AliasOptions {
diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 9489364c..7f499958 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -3,7 +3,7 @@ import path from 'path'
 import slash from 'slash'
 import { APP_PATH } from '../alias'
 import { SiteConfig } from '../config'
-import { RollupOutput, ExternalOption } from 'rollup'
+import { RollupOutput } from 'rollup'
 import { build, BuildOptions, UserConfig as ViteUserConfig } from 'vite'
 import { createVitePressPlugin } from '../plugin'
 
@@ -38,8 +38,12 @@ export async function bundle(
     root,
     logLevel: 'warn',
     plugins: createVitePressPlugin(root, config, ssr, pageToHashMap),
+    ssr: {
+      noExternal: ['vitepress']
+    },
     build: {
       ...options,
+      emptyOutDir: true,
       ssr,
       base: config.site.base,
       outDir: ssr ? config.tempDir : config.outDir,
@@ -47,20 +51,13 @@ export async function bundle(
       rollupOptions: {
         ...rollupOptions,
         input,
-        external: ssr
-          ? resolveExternal(rollupOptions?.external)
-          : rollupOptions?.external,
         // important so that each page chunk and the index export things for each
         // other
         preserveEntrySignatures: 'allow-extension',
         output: {
           ...rollupOptions?.output,
           ...(ssr
-            ? {
-                format: 'cjs',
-                exports: 'named',
-                entryFileNames: '[name].js'
-              }
+            ? {}
             : {
                 chunkFileNames(chunk): string {
                   if (!chunk.isEntry && /runtime/.test(chunk.name)) {
@@ -97,24 +94,3 @@ export async function bundle(
 
   return [clientResult, serverResult, pageToHashMap]
 }
-
-function resolveExternal(
-  userExternal: ExternalOption | undefined
-): ExternalOption {
-  const required = ['vue', /^@vue\//]
-  if (!userExternal) {
-    return required
-  }
-  if (Array.isArray(userExternal)) {
-    return [...required, ...userExternal]
-  } else if (typeof userExternal === 'function') {
-    return (src, importer, isResolved) => {
-      if (src === 'vue' || /^@vue\//.test(src)) {
-        return true
-      }
-      return userExternal(src, importer, isResolved)
-    }
-  } else {
-    return [...required, userExternal]
-  }
-}
diff --git a/src/node/config.ts b/src/node/config.ts
index f5625643..d5af0e59 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -59,7 +59,7 @@ export async function resolveConfig(
     outDir: resolve(root, 'dist'),
     tempDir: path.resolve(APP_PATH, 'temp'),
     markdown: userConfig.markdown,
-    alias: resolveAliases(root, themeDir, userConfig)
+    alias: resolveAliases(themeDir, userConfig)
   }
 
   return config
diff --git a/src/node/plugin.ts b/src/node/plugin.ts
index 3dcd70f8..1cebd379 100644
--- a/src/node/plugin.ts
+++ b/src/node/plugin.ts
@@ -31,8 +31,7 @@ export function createVitePressPlugin(
   const markdownToVue = createMarkdownToVueRenderFn(root, markdown)
 
   const vuePlugin = createVuePlugin({
-    include: [/\.vue$/, /\.md$/],
-    ssr
+    include: [/\.vue$/, /\.md$/]
   })
 
   let siteData = site
@@ -73,8 +72,7 @@ export function createVitePressPlugin(
     configureServer(server) {
       // serve our index.html after vite history fallback
       return () => {
-        // @ts-ignore
-        server.app.use((req, res, next) => {
+        server.middlewares.use((req, res, next) => {
           if (req.url!.endsWith('.html')) {
             res.statusCode = 200
             res.end(

From c11055c5fb31ff31502400de3e5f6f05011edd1d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 19 Jan 2021 10:36:35 -0500
Subject: [PATCH 74/78] chore: bump vite

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 92e717da..8cf2fe4c 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "prismjs": "^1.20.0",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
-    "vite": "^2.0.0-beta.21",
+    "vite": "^2.0.0-beta.32",
     "vue": "^3.0.5"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index a837c342..32f9f6d9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6031,10 +6031,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@^2.0.0-beta.21:
-  version "2.0.0-beta.21"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.21.tgz#9a7233c93ed59c5b5de28c3a74f1e94b815d746e"
-  integrity sha512-B6OhGHwh4DTkDBxZXtGhxmDkK75M3o0sKFz/cfZ2bdqxRze870sJgH66kPuYWjgSVDdPz0NTIKBaxrbcA8wwmw==
+vite@^2.0.0-beta.32:
+  version "2.0.0-beta.32"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.0.0-beta.32.tgz#c9281013dfd73794887fc0ed7e96579677beb79a"
+  integrity sha512-RluPnnm4Zyjfu/IBxEmGZe/2QcFqc7qXfhjxzFNiqzyVkmc935HcmSnejkVa7KoW/PeX0wKrtag432esByKVGg==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"

From 8cd0023176793783315cfa5d9999788f53fe32d4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 19 Jan 2021 10:46:43 -0500
Subject: [PATCH 75/78] chore: bump plugin-vue

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8cf2fe4c..09338fbf 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
   "dependencies": {
     "@docsearch/css": "^1.0.0-alpha.28",
     "@docsearch/js": "^1.0.0-alpha.28",
-    "@vitejs/plugin-vue": "^1.0.3",
+    "@vitejs/plugin-vue": "^1.1.0",
     "@vue/compiler-sfc": "^3.0.5",
     "@vue/server-renderer": "^3.0.5",
     "chalk": "^4.1.0",
diff --git a/yarn.lock b/yarn.lock
index 32f9f6d9..bcf66913 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -948,10 +948,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@vitejs/plugin-vue@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.0.3.tgz#2df3c22802f2d2142ae3bd8d3e93623df790446d"
-  integrity sha512-sOVHFS97zxuRLAMj10C9Vaiv3WeEwnhtee9V+yv/G/xoJTXPJIRct4Nj2unPtp5zAUoCL+iTVbIC6LnNmNE4Hw==
+"@vitejs/plugin-vue@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.1.0.tgz#8ae0b11388897b07259c9e5198c0e3fb5e4b37d9"
+  integrity sha512-ExlAt3nb3PB31jV9AgRZSMoGd+aQRU53fc/seghV8/l0JCzaX2mqlgpG8iytWkRxbBPgtAx4TpCPdiVKnTFT/A==
 
 "@vue/compiler-core@3.0.5":
   version "3.0.5"

From 1eed0536edb34f92efb5d523614db5985881872c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 19 Jan 2021 10:50:15 -0500
Subject: [PATCH 76/78] release: v0.11.4

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82dd03d7..7d89f259 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.11.4](https://github.com/vuejs/vitepress/compare/v0.11.3...v0.11.4) (2021-01-19)
+
+- Latest Vite beta.32 compat (internal changes).
+
 ## [0.11.3](https://github.com/vuejs/vitepress/compare/v0.11.2...v0.11.3) (2021-01-13)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 09338fbf..78f6b74f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitepress",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "Vite & Vue powered static site generator",
   "main": "dist/node/index.js",
   "typings": "types/index.d.ts",

From 417caf3c28a14e4c223a65823ab0d5705a3ef9a1 Mon Sep 17 00:00:00 2001
From: Kia King Ishii <kia.king.08@gmail.com>
Date: Fri, 22 Jan 2021 23:05:34 +0900
Subject: [PATCH 77/78] docs: update serve command default port

---
 docs/guide/deploy.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/deploy.md b/docs/guide/deploy.md
index 056a7aff..e189cc27 100644
--- a/docs/guide/deploy.md
+++ b/docs/guide/deploy.md
@@ -34,7 +34,7 @@ $ yarn docs:build
 $ yarn docs:serve
 ```
 
-The `serve` command will boot up local static web server that serves the files from `.vitepress/dist` at http://localhost:3000. It's an easy way to check if the production build looks OK in your local environment.
+The `serve` command will boot up local static web server that serves the files from `.vitepress/dist` at http://localhost:5000. It's an easy way to check if the production build looks OK in your local environment.
 
 You may configure the port of the server py passing `--port` flag as an argument.
 

From 481c4513d78450951add6177824b7996b89ae034 Mon Sep 17 00:00:00 2001
From: Matias Capeletto <matias.capeletto@gmail.com>
Date: Fri, 22 Jan 2021 15:47:08 +0100
Subject: [PATCH 78/78] feat: $lang and $localePath globals (#166) (#167)

close #166

Co-authored-by: Kia King Ishii <kia.king.08@gmail.com>
---
 docs/guide/global-computed.md |  8 ++++++++
 src/client/app/mixin.ts       | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/docs/guide/global-computed.md b/docs/guide/global-computed.md
index d1c0d3f1..384d0e38 100644
--- a/docs/guide/global-computed.md
+++ b/docs/guide/global-computed.md
@@ -64,6 +64,14 @@ Reference of `$page.frontmatter`.
 }
 ```
 
+## $lang
+
+The language of the current page. Default: `en-US`.
+
+## $localePath
+
+The locale path prefix for the current page. Default: `/`.
+
 ## $title
 
 Value of the `<title>` label used for the current page.
diff --git a/src/client/app/mixin.ts b/src/client/app/mixin.ts
index 24841ce8..061c046a 100644
--- a/src/client/app/mixin.ts
+++ b/src/client/app/mixin.ts
@@ -42,6 +42,25 @@ export function mixinGlobalComputed(
       }
     },
 
+    $lang: {
+      get() {
+        return siteByRoute.value.lang
+      }
+    },
+
+    $localePath: {
+      get() {
+        const { locales } = site.value
+        const { lang } = siteByRoute.value
+
+        const path = Object.keys(locales).find(
+          (lp) => locales[lp].lang === lang
+        )
+
+        return (locales && path) || '/'
+      }
+    },
+
     $title: {
       get() {
         return page.value.title