Merge branch 'master-upstream' into feat/components

# Conflicts:
#	src/config.ts
pull/7/head
pikax 5 years ago
commit 437e28f1cc

@ -48,11 +48,12 @@
"author": "Evan You", "author": "Evan You",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@vue/compiler-sfc": "^3.0.0-beta.6", "@vue/compiler-sfc": "^3.0.0-beta.9",
"@vue/server-renderer": "^3.0.0-beta.6", "@vue/server-renderer": "^3.0.0-beta.9",
"debug": "^4.1.1", "debug": "^4.1.1",
"diacritics": "^1.3.0", "diacritics": "^1.3.0",
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
"fs-extra": "^9.0.0",
"globby": "^11.0.0", "globby": "^11.0.0",
"gray-matter": "^4.0.2", "gray-matter": "^4.0.2",
"lru-cache": "^5.1.1", "lru-cache": "^5.1.1",
@ -64,10 +65,11 @@
"minimist": "^1.2.5", "minimist": "^1.2.5",
"prismjs": "^1.20.0", "prismjs": "^1.20.0",
"slash": "^3.0.0", "slash": "^3.0.0",
"vite": "^0.9.1", "vite": "^0.10.1",
"vue": "^3.0.0-beta.6" "vue": "^3.0.0-beta.9"
}, },
"devDependencies": { "devDependencies": {
"@types/fs-extra": "^8.1.0",
"@types/lru-cache": "^5.1.0", "@types/lru-cache": "^5.1.0",
"@types/markdown-it": "^10.0.1", "@types/markdown-it": "^10.0.1",
"@types/node": "^13.13.4", "@types/node": "^13.13.4",

@ -1,14 +1,15 @@
import path from 'path' import fs from 'fs-extra'
import { promises as fs } from 'fs'
import { bundle } from './bundle' import { bundle } from './bundle'
import { BuildOptions as ViteBuildOptions } from 'vite' import { BuildOptions as ViteBuildOptions } from 'vite'
import { resolveConfig } from '../config' import { resolveConfig } from '../config'
import { renderPage } from './render' import { renderPage } from './render'
import { exists, copyDir } from '../utils/fs'
export type BuildOptions = Pick< export type BuildOptions = Pick<
ViteBuildOptions, ViteBuildOptions,
'root' | 'rollupInputOptions' | 'rollupOutputOptions' | 'root'
| 'rollupInputOptions'
| 'rollupOutputOptions'
| 'rollupPluginVueOptions'
> >
export const ASSETS_DIR = '_assets/' export const ASSETS_DIR = '_assets/'
@ -21,16 +22,8 @@ export async function build(buildOptions: BuildOptions = {}) {
for (const page of siteConfig.pages) { for (const page of siteConfig.pages) {
await renderPage(siteConfig, page, clientResult) await renderPage(siteConfig, page, clientResult)
} }
if (await exists(siteConfig.publicDir)) {
console.log('copying public dir...')
await copyDir(
siteConfig.publicDir,
path.join(siteConfig.outDir, 'public')
)
}
} finally { } finally {
await fs.rmdir(siteConfig.tempDir, { recursive: true }) await fs.remove(siteConfig.tempDir)
} }
console.log('done.') console.log('done.')
} }

@ -1,12 +1,17 @@
import path from 'path' import path from 'path'
import slash from 'slash' import slash from 'slash'
import { promises as fs } from 'fs' import fs from 'fs-extra'
import { APP_PATH, createResolver } from '../utils/pathResolver' import { APP_PATH, createResolver } from '../utils/pathResolver'
import { build, BuildOptions as ViteBuildOptions, BuildResult } from 'vite'
import { BuildOptions, ASSETS_DIR } from './build' import { BuildOptions, ASSETS_DIR } from './build'
import { SiteConfig } from '../config' import { SiteConfig } from '../config'
import { Plugin } from 'rollup' import { Plugin } from 'rollup'
import { createMarkdownToVueRenderFn } from '../markdownToVue' import { createMarkdownToVueRenderFn } from '../markdownToVue'
import {
build,
ssrBuild,
BuildOptions as ViteBuildOptions,
BuildResult
} from 'vite'
// bundles the VitePress app for both client AND server. // bundles the VitePress app for both client AND server.
export async function bundle( export async function bundle(
@ -17,8 +22,6 @@ export async function bundle(
const resolver = createResolver(config.themeDir, config.componentDir) const resolver = createResolver(config.themeDir, config.componentDir)
const markdownToVue = createMarkdownToVueRenderFn(root) const markdownToVue = createMarkdownToVueRenderFn(root)
const { rollupInputOptions = {}, rollupOutputOptions = {} } = options
const VitePressPlugin: Plugin = { const VitePressPlugin: Plugin = {
name: 'vitepress', name: 'vitepress',
resolveId(id) { resolveId(id) {
@ -63,22 +66,25 @@ export async function bundle(
// convert page files to absolute paths // convert page files to absolute paths
const pages = config.pages.map((file) => path.resolve(root, file)) const pages = config.pages.map((file) => path.resolve(root, file))
// let rollup-plugin-vue compile .md files as well // resolve options to pass to vite
const rollupPluginVueOptions = { const { rollupInputOptions = {}, rollupOutputOptions = {} } = options
include: /\.(vue|md)$/ const viteOptions: ViteBuildOptions = {
}
const clientOptions: ViteBuildOptions = {
...options, ...options,
cdn: false, cdn: false,
silent: true,
resolvers: [resolver], resolvers: [resolver],
srcRoots: [APP_PATH, config.themeDir], srcRoots: [APP_PATH, config.themeDir],
outDir: config.outDir, outDir: config.outDir,
assetsDir: ASSETS_DIR, assetsDir: ASSETS_DIR,
rollupPluginVueOptions, // let rollup-plugin-vue compile .md files as well
rollupPluginVueOptions: {
include: /\.(vue|md)$/
},
rollupInputOptions: { rollupInputOptions: {
...rollupInputOptions, ...rollupInputOptions,
// use our custom 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
// metadata doesn't need to be included in the main chunk.
input: [path.resolve(APP_PATH, 'index.js'), ...pages], input: [path.resolve(APP_PATH, 'index.js'), ...pages],
plugins: [VitePressPlugin, ...(rollupInputOptions.plugins || [])] plugins: [VitePressPlugin, ...(rollupInputOptions.plugins || [])]
}, },
@ -87,29 +93,13 @@ export async function bundle(
} }
console.log('building client bundle...') console.log('building client bundle...')
const clientResult = await build(clientOptions) const clientResult = await build(viteOptions)
console.log('building server bundle...') console.log('building server bundle...')
const serverResult = await build({ const serverResult = await ssrBuild({
...clientOptions, ...viteOptions,
outDir: config.tempDir, silent: true,
rollupPluginVueOptions: { outDir: config.tempDir
...rollupPluginVueOptions,
target: 'node'
},
rollupInputOptions: {
...clientOptions.rollupInputOptions,
external: ['vue', '@vue/server-renderer']
},
rollupOutputOptions: {
...rollupOutputOptions,
format: 'cjs',
exports: 'named'
},
// server build doesn't need to emit static assets
emitAssets: false,
// server build doesn't need minification
minify: false
}) })
return [clientResult, serverResult] return [clientResult, serverResult]

@ -1,5 +1,5 @@
import path from 'path' import path from 'path'
import { promises as fs } from 'fs' import fs from 'fs-extra'
import { SiteConfig, HeadConfig } from '../config' import { SiteConfig, HeadConfig } from '../config'
import { BuildResult } from 'vite' import { BuildResult } from 'vite'
import { renderToString } from '@vue/server-renderer' import { renderToString } from '@vue/server-renderer'
@ -64,7 +64,7 @@ export async function renderPage(
</body> </body>
</html>`.trim() </html>`.trim()
const htmlFileName = path.join(config.outDir, page.replace(/\.md$/, '.html')) const htmlFileName = path.join(config.outDir, page.replace(/\.md$/, '.html'))
await fs.mkdir(path.dirname(htmlFileName), { recursive: true }) await fs.ensureDir(path.dirname(htmlFileName))
await fs.writeFile(htmlFileName, html) await fs.writeFile(htmlFileName, html)
} }

@ -1,10 +1,10 @@
import path from 'path' import path from 'path'
import fs from 'fs-extra'
import chalk from 'chalk' import chalk from 'chalk'
import globby from 'globby' import globby from 'globby'
import { createResolver, APP_PATH } from './utils/pathResolver' import { createResolver, APP_PATH } from './utils/pathResolver'
import { Resolver } from 'vite' import { Resolver } from 'vite'
import { Header } from './markdown/plugins/header' import { Header } from './markdown/plugins/header'
import { exists } from './utils/fs'
const debug = require('debug')('vitepress:config') const debug = require('debug')('vitepress:config')
@ -27,7 +27,6 @@ export interface SiteConfig<ThemeConfig = any> {
configPath: string configPath: string
themeDir: string themeDir: string
componentDir: string componentDir: string
publicDir: string
outDir: string outDir: string
tempDir: string tempDir: string
resolver: Resolver resolver: Resolver
@ -59,7 +58,7 @@ export async function resolveConfig(
// resolve theme path // resolve theme path
const userThemeDir = resolve(root, 'theme') const userThemeDir = resolve(root, 'theme')
const themeDir = (await exists(userThemeDir)) const themeDir = (await fs.pathExists(userThemeDir))
? userThemeDir ? userThemeDir
: path.join(__dirname, '../lib/theme-default') : path.join(__dirname, '../lib/theme-default')
const componentDir = resolve(root, 'components') const componentDir = resolve(root, 'components')
@ -70,9 +69,8 @@ export async function resolveConfig(
themeDir, themeDir,
pages: await globby(['**.md'], { cwd: root, ignore: ['node_modules'] }), pages: await globby(['**.md'], { cwd: root, ignore: ['node_modules'] }),
configPath: resolve(root, 'config.js'), configPath: resolve(root, 'config.js'),
publicDir: resolve(root, 'public'),
componentDir: componentDir,
outDir: resolve(root, 'dist'), outDir: resolve(root, 'dist'),
componentDir: componentDir,
tempDir: path.resolve(APP_PATH, 'temp'), tempDir: path.resolve(APP_PATH, 'temp'),
resolver: createResolver(themeDir, componentDir) resolver: createResolver(themeDir, componentDir)
} }
@ -83,7 +81,7 @@ export async function resolveConfig(
export async function resolveSiteData(root: string): Promise<SiteData> { export async function resolveSiteData(root: string): Promise<SiteData> {
// load user config // load user config
const configPath = resolve(root, 'config.js') const configPath = resolve(root, 'config.js')
const hasUserConfig = await exists(configPath) const hasUserConfig = await fs.pathExists(configPath)
// always delete cache first before loading config // always delete cache first before loading config
delete require.cache[configPath] delete require.cache[configPath]
const userConfig: UserConfig = hasUserConfig ? require(configPath) : {} const userConfig: UserConfig = hasUserConfig ? require(configPath) : {}

@ -1,29 +0,0 @@
import path from 'path'
import { promises as fs } from 'fs'
export async function exists(path: string) {
try {
await fs.stat(path)
return true
} catch (e) {
return false
}
}
export async function copyDir(from: string, to: string) {
if (exists(to)) {
await fs.rmdir(to, { recursive: true })
}
await fs.mkdir(to, { recursive: true })
const content = await fs.readdir(from)
for (const entry of content) {
const fromPath = path.join(from, entry)
const toPath = path.join(to, entry)
const stat = await fs.stat(fromPath)
if (stat.isFile()) {
await fs.copyFile(fromPath, toPath)
} else if (stat.isDirectory()) {
await copyDir(fromPath, toPath)
}
}
}

@ -179,6 +179,13 @@
"@types/qs" "*" "@types/qs" "*"
"@types/serve-static" "*" "@types/serve-static" "*"
"@types/fs-extra@^8.1.0":
version "8.1.0"
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.0.tgz#1114834b53c3914806cd03b3304b37b3bd221a4d"
integrity sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg==
dependencies:
"@types/node" "*"
"@types/http-assert@*": "@types/http-assert@*":
version "1.5.1" version "1.5.1"
resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b" resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b"
@ -277,34 +284,34 @@
"@types/express-serve-static-core" "*" "@types/express-serve-static-core" "*"
"@types/mime" "*" "@types/mime" "*"
"@vue/compiler-core@3.0.0-beta.7": "@vue/compiler-core@3.0.0-beta.9":
version "3.0.0-beta.7" version "3.0.0-beta.9"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-beta.7.tgz#22767e988d941605ed21e14325e41b479f1ba97b" resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-beta.9.tgz#4ecf5012d9fc5757337ad7bffcc9758e133c16a2"
integrity sha512-JDVuGzWfNdVveNambLLU7+jR+l3yRiu8TwhOLkAoaK8iAgA4J5kW/o4LYBmZgyGegpzotT7zHg8/CfsLiCNG/w== integrity sha512-9wSyjY4n4+XySezEt8j+fe+UCht+HyqIT98lafqcZ/c7GVNNz87zej0VNR/tO1agwSdPZjApRv/kes7lcKs88w==
dependencies: dependencies:
"@babel/parser" "^7.8.6" "@babel/parser" "^7.8.6"
"@babel/types" "^7.8.6" "@babel/types" "^7.8.6"
"@vue/shared" "3.0.0-beta.7" "@vue/shared" "3.0.0-beta.9"
estree-walker "^0.8.1" estree-walker "^0.8.1"
source-map "^0.6.1" source-map "^0.6.1"
"@vue/compiler-dom@3.0.0-beta.7": "@vue/compiler-dom@3.0.0-beta.9":
version "3.0.0-beta.7" version "3.0.0-beta.9"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-beta.7.tgz#ba21ff6b7d8c7e2b7bbbbccd317cdcc16d31bff2" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-beta.9.tgz#ef4fd5cdcdceb37d67eccb70d28d09cecf0a3425"
integrity sha512-uMJrYHUNkfdOM9MkYpsfK4+Yz9OPIfi8TEupond9+kwGmQZmVC/Gw86wdnM9lMZU/eXv1S5zoYNv8PH0w3ipEw== integrity sha512-KMWbE/O+177d8QSS46fyCYDipOw4RIoh9mo1s1CqBWQxHwNelOMU4NnHZ9TvpxBo+Dzyvzk9b9x/56KSKMcdJg==
dependencies: dependencies:
"@vue/compiler-core" "3.0.0-beta.7" "@vue/compiler-core" "3.0.0-beta.9"
"@vue/shared" "3.0.0-beta.7" "@vue/shared" "3.0.0-beta.9"
"@vue/compiler-sfc@^3.0.0-beta.6", "@vue/compiler-sfc@^3.0.0-beta.7": "@vue/compiler-sfc@^3.0.0-beta.9":
version "3.0.0-beta.7" version "3.0.0-beta.9"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-beta.7.tgz#d4d6e1b60802e7f90c61c86986b366cf69bcbb61" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-beta.9.tgz#3b85acf7c8b9792ffcfa9880cb8684fe679d25b3"
integrity sha512-BhDO3gzcKPt5S9UonTYvM/3WgrLWxYgEV3D40/X0aRIrCp88DCzSpKxDvTtHSdaZpCzm2HgW3E2fdGWVbCWeqg== integrity sha512-J6C4l8GxP2jWRZFXGO4AwZcOzHUYNT08kGTFZM2V9GBMg3UaLmE6DvUPTPBTrBL55RTyaV2O+U44S5iYlyUi1A==
dependencies: dependencies:
"@vue/compiler-core" "3.0.0-beta.7" "@vue/compiler-core" "3.0.0-beta.9"
"@vue/compiler-dom" "3.0.0-beta.7" "@vue/compiler-dom" "3.0.0-beta.9"
"@vue/compiler-ssr" "3.0.0-beta.7" "@vue/compiler-ssr" "3.0.0-beta.9"
"@vue/shared" "3.0.0-beta.7" "@vue/shared" "3.0.0-beta.9"
consolidate "^0.15.1" consolidate "^0.15.1"
hash-sum "^2.0.0" hash-sum "^2.0.0"
lru-cache "^5.1.1" lru-cache "^5.1.1"
@ -314,50 +321,50 @@
postcss-selector-parser "^6.0.2" postcss-selector-parser "^6.0.2"
source-map "^0.6.1" source-map "^0.6.1"
"@vue/compiler-ssr@3.0.0-beta.7": "@vue/compiler-ssr@3.0.0-beta.9":
version "3.0.0-beta.7" version "3.0.0-beta.9"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-beta.7.tgz#2fe9309c7d56bef45a374bd01bb6d38f3d57174e" resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-beta.9.tgz#be8fd55885218957a65a333f129783c36a882657"
integrity sha512-TimgEJssiECdgd/YmY+zFCzu3/n3yXz2xDAPlholATls9WwPokm3Ow+FWNXwt/wWFw6NBtd8Sy9MmVKN/QzyOA== integrity sha512-WoOd36XPR5aY9es+pTuP0DVPY45sDQnXBxFDagNUOJ3VXu40NLwiXYNTRxRPOExkgEL0YcDNds6/bLqDWGD4JQ==
dependencies: dependencies:
"@vue/compiler-dom" "3.0.0-beta.7" "@vue/compiler-dom" "3.0.0-beta.9"
"@vue/shared" "3.0.0-beta.7" "@vue/shared" "3.0.0-beta.9"
"@vue/reactivity@3.0.0-beta.7": "@vue/reactivity@3.0.0-beta.9":
version "3.0.0-beta.7" version "3.0.0-beta.9"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-beta.7.tgz#f936175526ac075d6f8926b424cc41425ecf2503" resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-beta.9.tgz#3a81a6a0dff47ee4713aceb5c77302620de471fe"
integrity sha512-sCZLmuZ6kqQun9Sj7080pDhrKEW/g7Cv3vnOV82h7dWf9rKXDfw0AlNAdFIFTij3aYizrMHWDy3OtrOIpKqZbQ== integrity sha512-cdAwMceme0ku8M/9npFx2jHMJexlOctA8bJA5LNF8ISaQcfklTGa2u7+iWZDfF6slxPjkeGKLpOyKE5qIdBgAA==
dependencies: dependencies:
"@vue/shared" "3.0.0-beta.7" "@vue/shared" "3.0.0-beta.9"
"@vue/runtime-core@3.0.0-beta.7": "@vue/runtime-core@3.0.0-beta.9":
version "3.0.0-beta.7" version "3.0.0-beta.9"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-beta.7.tgz#303063d03291ef4ed3d39e34cc69c8ce2498c75d" resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-beta.9.tgz#7b9ab834e0a566ec669e463b301bad327a95a6dc"
integrity sha512-aIfxhzMCYtk0jdcvGcvEJy5xy/jB+kyAX+EsbwtAEjXvWb+TFL2sfavKGecClMTIWqcMXPhFE+uzXG3TOdo4JQ== integrity sha512-SU8OFkgnRoWQNEdHqPqubIKrTWwR3f68SRxdyOvre2NoPPCf6+TWoNlrWMBFSROn0qvhFOvQybJt3002uD0uQw==
dependencies: dependencies:
"@vue/reactivity" "3.0.0-beta.7" "@vue/reactivity" "3.0.0-beta.9"
"@vue/shared" "3.0.0-beta.7" "@vue/shared" "3.0.0-beta.9"
"@vue/runtime-dom@3.0.0-beta.7": "@vue/runtime-dom@3.0.0-beta.9":
version "3.0.0-beta.7" version "3.0.0-beta.9"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-beta.7.tgz#df32a6ab73d53cfc72f82ead7f82b259e66b262d" resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-beta.9.tgz#cebfa7f9e417e0502bbb37b40b8fdc089fe70100"
integrity sha512-iphBSnQiR/VV0MHz+su90YkiUjRvS5RTdGqeX8DUemhRgk+hUv1dMLHnWiPXhyvWH5ZLZNFfq2Fi94/77L5Gcg== integrity sha512-P0IUIShcudwEZ0ez1nQXyKY0hzrHfwxmz1b+z7ppeoVIDf3tKSwL1gCqPtQdYwWyfu8bTU8C/8DQF3V7jcyeZA==
dependencies: dependencies:
"@vue/runtime-core" "3.0.0-beta.7" "@vue/runtime-core" "3.0.0-beta.9"
"@vue/shared" "3.0.0-beta.7" "@vue/shared" "3.0.0-beta.9"
csstype "^2.6.8" csstype "^2.6.8"
"@vue/server-renderer@^3.0.0-beta.6": "@vue/server-renderer@^3.0.0-beta.9":
version "3.0.0-beta.7" version "3.0.0-beta.9"
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.0-beta.7.tgz#4c7d2507c324acc4ebe5a4f845782295091056cd" resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.0-beta.9.tgz#8398d28c4bf95160b568656e5cc6ae29780a6463"
integrity sha512-wujurPgTHtO/CThFeK5cMTpMoC3VgcxSua5JX/A/eb5ITWEIMJMGP+sRuQv3i/dXpTj0Lcuy8vyDqEbSaKJ9aQ== integrity sha512-0YosDTJ8f2sc1gLHtM2gA1PFn3tFUiWM3HOOmOTdPt/hSZMoU4HbIGMupz+snCThpuxc2fbuMkfam4cNsM0dhg==
dependencies: dependencies:
"@vue/compiler-ssr" "3.0.0-beta.7" "@vue/compiler-ssr" "3.0.0-beta.9"
"@vue/shared" "3.0.0-beta.7" "@vue/shared" "3.0.0-beta.9"
"@vue/shared@3.0.0-beta.7": "@vue/shared@3.0.0-beta.9":
version "3.0.0-beta.7" version "3.0.0-beta.9"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-beta.7.tgz#63093533cdff879985777817559c1e340cb89164" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-beta.9.tgz#b3bfd0553bef22d508d0e56cc305e25783e64017"
integrity sha512-denIRh2j5xCyFz4g75jLiFrcw2C7E5NoYgT0akCQI/xdYZvZ08m8rXsckAgBf1TiLehu1t3BGCc8NY7PBDGBTg== integrity sha512-ndn3/TCCzvmFI5zTpBTdKdNW2x+ibshvjcoajvcUXNRLlHVJNad0PdnvklPu6zaI6+9fkFpFC5AnMkLg5/KvSw==
JSONStream@^1.0.4: JSONStream@^1.0.4:
version "1.3.5" version "1.3.5"
@ -485,6 +492,11 @@ astral-regex@^2.0.0:
resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
at-least-node@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
big.js@^5.2.2: big.js@^5.2.2:
version "5.2.2" version "5.2.2"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@ -1525,6 +1537,16 @@ fresh@~0.5.2:
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
fs-extra@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3"
integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==
dependencies:
at-least-node "^1.0.0"
graceful-fs "^4.2.0"
jsonfile "^6.0.1"
universalify "^1.0.0"
fsevents@~2.1.2: fsevents@~2.1.2:
version "2.1.3" version "2.1.3"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
@ -1635,7 +1657,7 @@ good-listener@^1.2.2:
dependencies: dependencies:
delegate "^3.1.2" delegate "^3.1.2"
graceful-fs@^4.1.2: graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
version "4.2.4" version "4.2.4"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
@ -1770,6 +1792,13 @@ ignore@^5.1.4:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
import-cwd@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
dependencies:
import-from "^2.1.0"
import-fresh@^2.0.0: import-fresh@^2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
@ -1786,6 +1815,13 @@ import-fresh@^3.1.0:
parent-module "^1.0.0" parent-module "^1.0.0"
resolve-from "^4.0.0" resolve-from "^4.0.0"
import-from@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
dependencies:
resolve-from "^3.0.0"
indent-string@^2.1.0: indent-string@^2.1.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@ -2042,6 +2078,15 @@ json5@^1.0.1:
dependencies: dependencies:
minimist "^1.2.0" minimist "^1.2.0"
jsonfile@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
dependencies:
universalify "^1.0.0"
optionalDependencies:
graceful-fs "^4.1.6"
jsonparse@^1.2.0: jsonparse@^1.2.0:
version "1.3.1" version "1.3.1"
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@ -2879,6 +2924,14 @@ postcss-discard-overridden@^4.0.1:
dependencies: dependencies:
postcss "^7.0.0" postcss "^7.0.0"
postcss-load-config@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003"
integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==
dependencies:
cosmiconfig "^5.0.0"
import-cwd "^2.0.0"
postcss-merge-longhand@^4.0.11: postcss-merge-longhand@^4.0.11:
version "4.0.11" version "4.0.11"
resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24" resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24"
@ -3167,6 +3220,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27:
source-map "^0.6.1" source-map "^0.6.1"
supports-color "^6.1.0" supports-color "^6.1.0"
postcss@^7.0.28:
version "7.0.29"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz#d3a903872bd52280b83bce38cdc83ce55c06129e"
integrity sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==
dependencies:
chalk "^2.4.2"
source-map "^0.6.1"
supports-color "^6.1.0"
prettier@^2.0.5: prettier@^2.0.5:
version "2.0.5" version "2.0.5"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
@ -3995,6 +4057,11 @@ uniqs@^2.0.0:
resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
universalify@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
unquote@~1.1.1: unquote@~1.1.1:
version "1.1.1" version "1.1.1"
resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
@ -4043,10 +4110,10 @@ vendors@^1.0.0:
resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
vite@^0.9.1: vite@^0.10.1:
version "0.9.1" version "0.10.2"
resolved "https://registry.yarnpkg.com/vite/-/vite-0.9.1.tgz#a35b0c032be627932246f0d4aad6da91e541e0b1" resolved "https://registry.yarnpkg.com/vite/-/vite-0.10.2.tgz#863a630115ded1eb239b5a7ed96f73f8c26e0b44"
integrity sha512-viZrY6VmpHeDpan8IRnwVJf04EZP1Kw4M30FHAS6Tr3I3B+T9cbOq9PdhLPlOyf3md29NjyMvbTgmxQOaZygMg== integrity sha512-Oi9ya/bAbx2LOxLoQO9q9BoDEdiiOE6F5dxGc13uabMWLeMKEbgYaNsl8lxpOU77sIaeDEFGEiqLDcJfcuy5Bw==
dependencies: dependencies:
"@babel/parser" "^7.9.4" "@babel/parser" "^7.9.4"
"@rollup/plugin-alias" "^3.1.0" "@rollup/plugin-alias" "^3.1.0"
@ -4054,12 +4121,13 @@ vite@^0.9.1:
"@rollup/plugin-node-resolve" "^7.1.3" "@rollup/plugin-node-resolve" "^7.1.3"
"@rollup/plugin-replace" "^2.3.2" "@rollup/plugin-replace" "^2.3.2"
"@types/koa" "^2.11.3" "@types/koa" "^2.11.3"
"@vue/compiler-sfc" "^3.0.0-beta.7" "@vue/compiler-sfc" "^3.0.0-beta.9"
chalk "^4.0.0" chalk "^4.0.0"
chokidar "^3.3.1" chokidar "^3.3.1"
cssnano "^4.1.10" cssnano "^4.1.10"
debug "^4.1.1" debug "^4.1.1"
es-module-lexer "^0.3.18" es-module-lexer "^0.3.18"
fs-extra "^9.0.0"
hash-sum "^2.0.0" hash-sum "^2.0.0"
koa "^2.11.0" koa "^2.11.0"
koa-conditional-get "^2.0.0" koa-conditional-get "^2.0.0"
@ -4069,23 +4137,25 @@ vite@^0.9.1:
lru-cache "^5.1.1" lru-cache "^5.1.1"
magic-string "^0.25.7" magic-string "^0.25.7"
minimist "^1.2.5" minimist "^1.2.5"
postcss "^7.0.27" postcss "^7.0.28"
postcss-load-config "^2.1.0"
postcss-modules "^2.0.0"
resolve-from "^5.0.0" resolve-from "^5.0.0"
rollup "^2.7.2" rollup "^2.7.2"
rollup-plugin-terser "^5.3.0" rollup-plugin-terser "^5.3.0"
rollup-plugin-vue "^6.0.0-alpha.7" rollup-plugin-vue "^6.0.0-alpha.7"
slash "^3.0.0" slash "^3.0.0"
vue "^3.0.0-beta.7" vue "^3.0.0-beta.9"
ws "^7.2.3" ws "^7.2.3"
vue@^3.0.0-beta.6, vue@^3.0.0-beta.7: vue@^3.0.0-beta.9:
version "3.0.0-beta.7" version "3.0.0-beta.9"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-beta.7.tgz#2f40249d585edf68b5d92794e0bc2c2ee9ba1f20" resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-beta.9.tgz#f2cfcf5bafa8da9fb8b4fc8249f06674a38ed19f"
integrity sha512-OldB4H0jhIaDNa7RNRx9YA/+NwF3PZ4EPEkE/N6FqOq2sjNR4E3r8DDmwNGsCvvzhr1A+nFgBiCn6fAkdrWCOw== integrity sha512-K9EBlcTSRDIXo8IkRK5fY1X4cU6Z7iE7F6wSyMyzWWfuJCg1uO+xPEmRfp+kSioRk2QOtAJOqADpNsR+dM4bmQ==
dependencies: dependencies:
"@vue/compiler-dom" "3.0.0-beta.7" "@vue/compiler-dom" "3.0.0-beta.9"
"@vue/runtime-dom" "3.0.0-beta.7" "@vue/runtime-dom" "3.0.0-beta.9"
"@vue/shared" "3.0.0-beta.7" "@vue/shared" "3.0.0-beta.9"
wcwidth@^1.0.1: wcwidth@^1.0.1:
version "1.0.1" version "1.0.1"

Loading…
Cancel
Save