From cb0a83231517ddeac3b7b51862d6af59a7833216 Mon Sep 17 00:00:00 2001 From: Evan You Date: Wed, 20 May 2020 23:12:57 -0400 Subject: [PATCH] bump deps + compat with vite 0.16 --- package.json | 8 +- src/build/build.ts | 9 +- src/build/bundle.ts | 11 +- src/build/render.ts | 11 +- src/server.ts | 2 +- yarn.lock | 315 ++++++++++++++++++++++---------------------- 6 files changed, 176 insertions(+), 180 deletions(-) diff --git a/package.json b/package.json index bdd5669c..2ab72ea4 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "author": "Evan You", "license": "MIT", "dependencies": { - "@vue/compiler-sfc": "^3.0.0-beta.10", - "@vue/server-renderer": "^3.0.0-beta.10", + "@vue/compiler-sfc": "^3.0.0-beta.14", + "@vue/server-renderer": "^3.0.0-beta.14", "debug": "^4.1.1", "diacritics": "^1.3.0", "escape-html": "^1.0.3", @@ -65,8 +65,8 @@ "minimist": "^1.2.5", "prismjs": "^1.20.0", "slash": "^3.0.0", - "vite": "^0.15.3", - "vue": "^3.0.0-beta.10" + "vite": "^0.16.4", + "vue": "^3.0.0-beta.14" }, "devDependencies": { "@types/fs-extra": "^8.1.0", diff --git a/src/build/build.ts b/src/build/build.ts index a1cac9ae..836f23b5 100644 --- a/src/build/build.ts +++ b/src/build/build.ts @@ -3,7 +3,7 @@ import { bundle } from './bundle' import { BuildConfig as ViteBuildOptions } from 'vite' import { resolveConfig } from '../config' import { renderPage } from './render' -import { OutputChunk } from 'rollup' +import { OutputChunk, OutputAsset } from 'rollup' export type BuildOptions = Pick< ViteBuildOptions, @@ -13,8 +13,6 @@ export type BuildOptions = Pick< | 'rollupPluginVueOptions' > -export const ASSETS_DIR = '_assets/' - export async function build(buildOptions: BuildOptions = {}) { const siteConfig = await resolveConfig(buildOptions.root) try { @@ -29,6 +27,10 @@ export async function build(buildOptions: BuildOptions = {}) { chunk.type === 'chunk' && chunk.fileName.match(/^app\.\w+\.js$/) ) as OutputChunk + const cssChunk = clientResult.assets.find( + (chunk) => chunk.type === 'asset' && chunk.fileName.endsWith('.css') + ) as OutputAsset + // We embed the hash map string into each page directly so that it doesn't // 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 @@ -41,6 +43,7 @@ export async function build(buildOptions: BuildOptions = {}) { page, clientResult, appChunk, + cssChunk, pageToHashMap, hashMapStirng ) diff --git a/src/build/bundle.ts b/src/build/bundle.ts index 7f1f13eb..4be30b45 100644 --- a/src/build/bundle.ts +++ b/src/build/bundle.ts @@ -2,7 +2,7 @@ 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, ASSETS_DIR } from './build' +import { BuildOptions } from './build' import { SiteConfig } from '../config' import { Plugin, OutputAsset, OutputChunk } from 'rollup' import { createMarkdownToVueRenderFn } from '../markdownToVue' @@ -121,7 +121,6 @@ export async function bundle( base: config.site.base, resolvers: [resolver], outDir: config.outDir, - assetsDir: ASSETS_DIR, // let rollup-plugin-vue compile .md files as well rollupPluginVueOptions: { include: /\.(vue|md)$/ @@ -143,13 +142,7 @@ export async function bundle( } console.log('building client bundle...') - const clientResult = await build({ - ...viteOptions, - rollupOutputOptions: { - ...viteOptions.rollupOutputOptions, - entryFileNames: `[name].[hash].js` - } - }) + const clientResult = await build(viteOptions) console.log('building server bundle...') isClientBuild = false diff --git a/src/build/render.ts b/src/build/render.ts index 1f846d82..d4d9da1e 100644 --- a/src/build/render.ts +++ b/src/build/render.ts @@ -3,8 +3,7 @@ import fs from 'fs-extra' import { SiteConfig, HeadConfig } from '../config' import { BuildResult } from 'vite' import { renderToString } from '@vue/server-renderer' -import { OutputChunk } from 'rollup' -import { ASSETS_DIR } from './build' +import { OutputChunk, OutputAsset } from 'rollup' const escape = require('escape-html') @@ -13,10 +12,11 @@ export async function renderPage( page: string, // foo.md result: BuildResult, appChunk: OutputChunk, + cssChunk: OutputAsset, pageToHashMap: Record, hashMapStirng: string ) { - const { createApp } = require(path.join(config.tempDir, ASSETS_DIR, 'app.js')) + const { createApp } = require(path.join(config.tempDir, 'app.js')) const { app, router } = createApp() const routePath = `/${page.replace(/\.md$/, '')}` router.go(routePath) @@ -33,12 +33,11 @@ export async function renderPage( // resolve page data so we can render head tags const { __pageData } = require(path.join( config.tempDir, - ASSETS_DIR, pageServerJsFileName )) const pageData = JSON.parse(__pageData) - const assetPath = `${config.site.base}${ASSETS_DIR}` + const assetPath = `${config.site.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 @@ -59,7 +58,7 @@ export async function renderPage( config.site.title } - + ${preloadLinks} ${renderHead(config.site.head)} ${renderHead(pageData.frontmatter.head)} diff --git a/src/server.ts b/src/server.ts index b5fe12f3..0db7b7cb 100644 --- a/src/server.ts +++ b/src/server.ts @@ -139,7 +139,7 @@ export async function createServer(options: ServerConfig = {}) { return createViteServer({ ...options, - plugins: [createVitePressPlugin(config)], + configureServer: createVitePressPlugin(config), resolvers: [config.resolver] }) } diff --git a/yarn.lock b/yarn.lock index a2c8ee9f..d0f67468 100644 --- a/yarn.lock +++ b/yarn.lock @@ -289,71 +289,34 @@ "@types/express-serve-static-core" "*" "@types/mime" "*" -"@vue/compiler-core@3.0.0-beta.10": - version "3.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-beta.10.tgz#42b62871d36839c794fb6650c322a4c517a2c813" - integrity sha512-GX5D9a0mjTUzZkd1PTDbETQlP0zcDb4k8wnMsYr1ZW/HXHn+PeS131FWSXz7kV4hVFiwOgxLfN+GEXseZXrxrA== +"@vue/compiler-core@3.0.0-beta.14": + version "3.0.0-beta.14" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-beta.14.tgz#69019b5c3da8335e6d83f81b37648caf120dbacd" + integrity sha512-VZarslk2r0E8V9Iuu24LPOWuomWV8KgTp3Pmie6Ys+LnIk+G/hme9BwC2jZgmqgF+adwcfmUC5BTi/KbhRVeIw== dependencies: "@babel/parser" "^7.8.6" "@babel/types" "^7.8.6" - "@vue/shared" "3.0.0-beta.10" + "@vue/shared" "3.0.0-beta.14" estree-walker "^0.8.1" source-map "^0.6.1" -"@vue/compiler-core@3.0.0-beta.12": - version "3.0.0-beta.12" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-beta.12.tgz#1d9bfeeedd7fb9fd8181e762b8c42568e9caf69c" - integrity sha512-+UjGiEo/RLx7yaAUfSuhZCvXypV85CKgVERXvtL/yOLd+3Y37Z7d5Qwnsej3S4NPvhvHNUFplhU1P1LOucw0pg== +"@vue/compiler-dom@3.0.0-beta.14", "@vue/compiler-dom@^3.0.0-beta.14": + version "3.0.0-beta.14" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-beta.14.tgz#2ea1c165e06e9630e687a7a5cbde4e8b20b064ac" + integrity sha512-wZ2uWo4jvAGD5FPNZYMOxpKEDigLcoPvOGhIAv8H4B6ltDyW54Zfc4RrW5MopJqEcHDDZMpcgGcFN5Qa09sLOg== dependencies: - "@babel/parser" "^7.8.6" - "@babel/types" "^7.8.6" - "@vue/shared" "3.0.0-beta.12" - estree-walker "^0.8.1" - source-map "^0.6.1" - -"@vue/compiler-dom@3.0.0-beta.10": - version "3.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-beta.10.tgz#5b35df447eb96cb7faed37b76a8a9aca71a87c67" - integrity sha512-S1Qqc74Hc3BnHjORzWJvG4Fj5B4O8aqTF1Oyd+Px65CB6qkbAaqTLneYnM5by/78j8inmt4FCHOf48L+gzChRA== - dependencies: - "@vue/compiler-core" "3.0.0-beta.10" - "@vue/shared" "3.0.0-beta.10" - -"@vue/compiler-dom@3.0.0-beta.12": - version "3.0.0-beta.12" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-beta.12.tgz#f455898b96d421d71c808ca35b8349504a2f7ffd" - integrity sha512-HEirNEGczvMep3suCZO91q/1x5wEO0y0MvZJ51HJL2UZBSUjBSp/8ilBVWpOoOYC6mYVoxEIm1Jv9AoSsOipzQ== - dependencies: - "@vue/compiler-core" "3.0.0-beta.12" - "@vue/shared" "3.0.0-beta.12" - -"@vue/compiler-sfc@^3.0.0-beta.10": - version "3.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-beta.10.tgz#bfde1343c79147a270b64b96a0608ce8bc7cfd6d" - integrity sha512-m8N0zP6Mpdka3o1bCnpyPvGQ47SVqgsnLuL/xmwIsMl/ml2f/UQpbsICY8ANN1/1QLvmXEP5Gl5PcoEVB7uHpQ== - dependencies: - "@vue/compiler-core" "3.0.0-beta.10" - "@vue/compiler-dom" "3.0.0-beta.10" - "@vue/compiler-ssr" "3.0.0-beta.10" - "@vue/shared" "3.0.0-beta.10" - consolidate "^0.15.1" - hash-sum "^2.0.0" - lru-cache "^5.1.1" - merge-source-map "^1.1.0" - postcss "^7.0.27" - postcss-modules "^2.0.0" - postcss-selector-parser "^6.0.2" - source-map "^0.6.1" + "@vue/compiler-core" "3.0.0-beta.14" + "@vue/shared" "3.0.0-beta.14" -"@vue/compiler-sfc@^3.0.0-beta.12": - version "3.0.0-beta.12" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-beta.12.tgz#ed93aa0f07d5d099cea7582118e05fbb7c77b1c6" - integrity sha512-YtX7SJdk68eKPwcL0u515MjOerMSao5UrM0EtL5zxLlQUiokmqxddxALEM28C62CoUonAWr8CWqnb262u0DBoA== +"@vue/compiler-sfc@^3.0.0-beta.14": + version "3.0.0-beta.14" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-beta.14.tgz#3984416c0ed1bbdfbeee9d33c8a2c1152ed00770" + integrity sha512-pS/vTlLWBEkyyA2oZBQHqqObaLEy25BKX9LzNphDBC+zKRufGQEObecwSbJK2QGdu8/bzxI3sAJvBlPm8ZmDOA== dependencies: - "@vue/compiler-core" "3.0.0-beta.12" - "@vue/compiler-dom" "3.0.0-beta.12" - "@vue/compiler-ssr" "3.0.0-beta.12" - "@vue/shared" "3.0.0-beta.12" + "@vue/compiler-core" "3.0.0-beta.14" + "@vue/compiler-dom" "3.0.0-beta.14" + "@vue/compiler-ssr" "3.0.0-beta.14" + "@vue/shared" "3.0.0-beta.14" consolidate "^0.15.1" hash-sum "^2.0.0" lru-cache "^5.1.1" @@ -363,87 +326,50 @@ postcss-selector-parser "^6.0.2" source-map "^0.6.1" -"@vue/compiler-ssr@3.0.0-beta.10": - version "3.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-beta.10.tgz#13d862282533e6a075df82152ee8df8f51a28ee8" - integrity sha512-gjIz+kUUT7axvJU+pSi5ZnNjl/DnmT/npQWUfLlizG8HTyfAhbf/YG6H389OyDwZEs8mMjfxz/Jd0fSZQRgjdQ== - dependencies: - "@vue/compiler-dom" "3.0.0-beta.10" - "@vue/shared" "3.0.0-beta.10" - -"@vue/compiler-ssr@3.0.0-beta.12": - version "3.0.0-beta.12" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-beta.12.tgz#ba935628ca2c917e8114b24d95ebfaf345136eb1" - integrity sha512-e1HRCQn5wCOQpcjLWUMyWPzKQSFmn2Sn0ZuhXPBsK1IlR1ElFOK6EC/EUHGwz3piFWZpuqpEWX7+0B9AYWNJAg== - dependencies: - "@vue/compiler-dom" "3.0.0-beta.12" - "@vue/shared" "3.0.0-beta.12" - -"@vue/reactivity@3.0.0-beta.10": - version "3.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-beta.10.tgz#c63ee8dc9b6205d41595d20e2b5ff5cadf6b3cd7" - integrity sha512-4f/hqdVptNMxCcZfmyxBRrOV0AT0z41CrRtJWCpLQhr+VEisKVhpfe7P7hhfp8prbPhSWa9oZuqVtb5MccgN4g== - dependencies: - "@vue/shared" "3.0.0-beta.10" - -"@vue/reactivity@3.0.0-beta.12": - version "3.0.0-beta.12" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-beta.12.tgz#33e8c3845dc663967c85217316f831a0153c40dc" - integrity sha512-ZgqLVADzwgFvm+Jf12bfzesvV3wcZXfM6JmryZ2BrWvkGS+Xo0A4oOcnsB4Tmqw5lemdYYkoleup02ChzvRlMg== +"@vue/compiler-ssr@3.0.0-beta.14": + version "3.0.0-beta.14" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-beta.14.tgz#e5a0dc1afcaf4f110e2e447b41bb3d8172e3e3e9" + integrity sha512-u5NquoX/EgmY40PICZoOA+CBzQNkYW0IhrTiqzN2BivUAO4PM3L0jesAFTbVX5CQ6eGJn1jGjBuuEks2IkJzsw== dependencies: - "@vue/shared" "3.0.0-beta.12" + "@vue/compiler-dom" "3.0.0-beta.14" + "@vue/shared" "3.0.0-beta.14" -"@vue/runtime-core@3.0.0-beta.10": - version "3.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-beta.10.tgz#4294faa5fc14fb4286598a566f86691014f6ec2b" - integrity sha512-oBIckKooEeohEPwrn57cuoghNyqY630xmp2exBKiFEaVK3d9N8JBNaFAzw1KZsDNzSyZbUdHzqOZIcZjindypw== +"@vue/reactivity@3.0.0-beta.14": + version "3.0.0-beta.14" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-beta.14.tgz#a041ec24ce2e545583a6a1a42774311c16870a91" + integrity sha512-csqLljnM+8OBBAyzeUXGIYJhhph0DLOsHQwJGmz7uc342taW6XSi4MXaLk5MRiigunfmXxEswJGziwsh+4YP3g== dependencies: - "@vue/reactivity" "3.0.0-beta.10" - "@vue/shared" "3.0.0-beta.10" + "@vue/shared" "3.0.0-beta.14" -"@vue/runtime-core@3.0.0-beta.12": - version "3.0.0-beta.12" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-beta.12.tgz#f35fa386c319e13da682e58f171e25c2376ec865" - integrity sha512-qcgfp5VJCuObGIYPoust7l3hZONHfgJfVeVYPjaKi+asjlYwdmjTRExUahhjuHvkLdSGRY+qckS3Adga7kyMjg== +"@vue/runtime-core@3.0.0-beta.14": + version "3.0.0-beta.14" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-beta.14.tgz#4f8162befd6ad1ac55cc6c142edc8301b090658a" + integrity sha512-5WKNMd7lX0vdSMeNd1cF0VhM+N+kXicSXKKZtTfQLUfZt1gLuE3nlBhv1PqjGf79zXw5lQLzz6XoUY1i52rEkA== dependencies: - "@vue/reactivity" "3.0.0-beta.12" - "@vue/shared" "3.0.0-beta.12" + "@vue/reactivity" "3.0.0-beta.14" + "@vue/shared" "3.0.0-beta.14" -"@vue/runtime-dom@3.0.0-beta.10": - version "3.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-beta.10.tgz#bd06be5e075dabf5eb883f596e7923ec78821f90" - integrity sha512-xrPf0KN1Xe8mFzqxUMxpkzwJjVZcGFEKZLcX4Oh2EmxikD9lnR6DghyPy/LL8QOpJUge6p2mmsqvXwS6MODHDA== +"@vue/runtime-dom@3.0.0-beta.14": + version "3.0.0-beta.14" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-beta.14.tgz#080e9dd48a95da639f9fcc6d70a2d9620aec6ab8" + integrity sha512-nwHvG+IsO0Ttl39NPvQKX2vv5H4XWZVzZCX1rqEIBP3llHyyB9dMrNSPcw54YlPGrEuCwBxVDokHG4CSeVEdtg== dependencies: - "@vue/runtime-core" "3.0.0-beta.10" - "@vue/shared" "3.0.0-beta.10" + "@vue/runtime-core" "3.0.0-beta.14" + "@vue/shared" "3.0.0-beta.14" csstype "^2.6.8" -"@vue/runtime-dom@3.0.0-beta.12": - version "3.0.0-beta.12" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-beta.12.tgz#f9c0f02fb2152727ec0746517ae5ab08513d00e8" - integrity sha512-1fyDeKKX2KMZbMmxn9a/QzwYSlbzZlGz3Iy9iss/WbFFK9hNtAEWY6x4iwtw7/vJ00EE8OOMgHX3ki9fNNqSqw== +"@vue/server-renderer@^3.0.0-beta.14": + version "3.0.0-beta.14" + resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.0-beta.14.tgz#3311e145466e68e7050d6211c3f6d72d2777b1ea" + integrity sha512-Wpt2hlrVu3L66/WFX6cnqCUr68wcHhaR6IiVDgnOUQW/SyVJPCKpSsnuB+4Y6VmiKbINBWBG/rG3TVC/yiFi1w== dependencies: - "@vue/runtime-core" "3.0.0-beta.12" - "@vue/shared" "3.0.0-beta.12" - csstype "^2.6.8" - -"@vue/server-renderer@^3.0.0-beta.10": - version "3.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.0-beta.10.tgz#7249c0104474e7f1facdc0665434239d50c5c039" - integrity sha512-MLx4AQJF9WFyOzV4YWXAzINRhp4UJPBGC/A9d2PVjs+SlFRjLSdV/hi5otAIzC+rMARJZbmKRpNDgfvleA/gvw== - dependencies: - "@vue/compiler-ssr" "3.0.0-beta.10" - "@vue/shared" "3.0.0-beta.10" - -"@vue/shared@3.0.0-beta.10": - version "3.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-beta.10.tgz#4c8f9aebcd5a0e9dafb9fb788569f4ce49d209e5" - integrity sha512-nKPkVB1KqhGuR6lPDcPJ+mhrfVuIGXNmw8s6ecPGjhjil2DetSe1RhgfwRBM0U/QuqUD6RjsIT5WZlnV7878Gg== + "@vue/compiler-ssr" "3.0.0-beta.14" + "@vue/shared" "3.0.0-beta.14" -"@vue/shared@3.0.0-beta.12": - version "3.0.0-beta.12" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-beta.12.tgz#cb7a2bb047919d2c944bf822032b0a8aa869ba1d" - integrity sha512-cA0DD3VFGYI76lbM90fAYXNJ9EmDNsm1tthO4FIY18DwziZKJWCfQBhEfHQd2skHcTE4OqH5eBxgsKEdn/LuGQ== +"@vue/shared@3.0.0-beta.14": + version "3.0.0-beta.14" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-beta.14.tgz#886afe5c233a5b255c186142324c40f114958af5" + integrity sha512-mnK5teJMLzsBE56Kys+uiyR/jAl1kbokHZ++MnlP7ls9icPqZ/QQE/VTDl3QJ7IHteS2VR6ytAz/Aa/4Dpv/ew== JSONStream@^1.0.4: version "1.3.5" @@ -1273,7 +1199,7 @@ dateformat@^3.0.0: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -debug@^3.1.0: +debug@^3.0.0, debug@^3.1.0: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -1540,11 +1466,16 @@ estree-walker@^1.0.1: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== -etag@^1.3.0: +etag@^1.3.0, 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.4" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" + integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== + execa@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" @@ -1648,6 +1579,13 @@ find-up@^2.0.0, find-up@^2.1.0: dependencies: locate-path "^2.0.0" +follow-redirects@^1.0.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb" + integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA== + dependencies: + debug "^3.0.0" + fresh@~0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" @@ -1883,6 +1821,14 @@ http-errors@^1.6.3, http-errors@~1.7.2: 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" @@ -1893,6 +1839,15 @@ http-errors@~1.6.2: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" +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" + human-signals@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" @@ -1960,6 +1915,11 @@ indexes-of@^1.0.1: resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= +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" @@ -2165,6 +2125,11 @@ is-wsl@^2.1.1: 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: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -2277,6 +2242,14 @@ koa-etag@^3.0.0: etag "^1.3.0" mz "^2.1.0" +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: version "5.0.0" resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-5.0.0.tgz#5e8441e07ef55737734d7ced25b842e50646e7eb" @@ -2643,7 +2616,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.18, mime-types@~2.1.24: +mime-types@^2.1.18, mime-types@^2.1.27, 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== @@ -2714,6 +2687,11 @@ neo-async@^2.6.0: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== +node-forge@0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579" + integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ== + node-releases@^1.1.53: version "1.1.53" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4" @@ -2968,11 +2946,26 @@ 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" @@ -3563,6 +3556,11 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" +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-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" @@ -3622,10 +3620,10 @@ rollup-plugin-terser@^5.3.0: serialize-javascript "^2.1.2" terser "^4.6.2" -rollup-plugin-vue@^6.0.0-alpha.10: - version "6.0.0-alpha.10" - resolved "https://registry.yarnpkg.com/rollup-plugin-vue/-/rollup-plugin-vue-6.0.0-alpha.10.tgz#0fbe33f2e3d9f13c392a1eef0c421aa9cc218bb6" - integrity sha512-10GOFWTGMrX0pkG4AlkiyElhpQi2bSGD/Zed8IycRmpf7vO8NRm5hf+KM+uLGeZjPck1NNnQoUf6kPYCZ0CZAA== +rollup-plugin-vue@^6.0.0-beta.1: + version "6.0.0-beta.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-vue/-/rollup-plugin-vue-6.0.0-beta.1.tgz#6334f3d76867f761623ba34c54a34a58a8d7ed24" + integrity sha512-jML9JYr+ZMQ1xUfMSgNzJ5kcv0kM+js9DJNBrUmvp1Lhydx8X4b3VOtybr0Dch5V3hUeBdxtKQgopadBnY9axA== dependencies: debug "^4.1.1" hash-sum "^2.0.0" @@ -3685,6 +3683,13 @@ select@^1.1.2: resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= +selfsigned@^1.10.7: + version "1.10.7" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz#da5819fd049d5574f28e88a9bcc6dbc6e6f3906b" + integrity sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA== + dependencies: + node-forge "0.9.0" + semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" @@ -3847,7 +3852,7 @@ stable@^0.1.8: resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@^1.5.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= @@ -4271,17 +4276,18 @@ vendors@^1.0.0: resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== -vite@^0.15.3: - version "0.15.3" - resolved "https://registry.yarnpkg.com/vite/-/vite-0.15.3.tgz#b1ec491e6ddebf7489dcd56b7138e334817660c5" - integrity sha512-w4/WObJPyUsj6JAAEySy/uovxhER0g2weIfBliFOiEWXbK8WCuqNf5mrSB/h15AvTqPxO5FSYZVRHC0Vro0DVQ== +vite@^0.16.4: + version "0.16.4" + resolved "https://registry.yarnpkg.com/vite/-/vite-0.16.4.tgz#f92a7c82754e8df8938f434ac631df137d5e01b6" + integrity sha512-NASAy0MgI1kYf1GrhMmpVcN4VST3yt8uHQc8w+lDL+gXXQ3YdCv7R5xFMMdov2Mwozm7XUBrk68fMXWO35HfdA== dependencies: "@babel/parser" "^7.9.4" "@rollup/plugin-commonjs" "~11.0.0" "@rollup/plugin-json" "^4.0.3" "@rollup/plugin-node-resolve" "^7.1.3" "@types/koa" "^2.11.3" - "@vue/compiler-sfc" "^3.0.0-beta.12" + "@vue/compiler-dom" "^3.0.0-beta.14" + "@vue/compiler-sfc" "^3.0.0-beta.14" brotli-size "^4.0.0" chalk "^4.0.0" chokidar "^3.3.1" @@ -4289,16 +4295,19 @@ vite@^0.15.3: debug "^4.1.1" es-module-lexer "^0.3.18" esbuild "^0.3.2" + etag "^1.8.1" execa "^4.0.1" fs-extra "^9.0.0" hash-sum "^2.0.0" koa "^2.11.0" koa-conditional-get "^2.0.0" koa-etag "^3.0.0" + koa-proxies "^0.11.0" koa-send "^5.0.0" koa-static "^5.0.0" lru-cache "^5.1.1" magic-string "^0.25.7" + mime-types "^2.1.27" minimist "^1.2.5" open "^7.0.3" ora "^4.0.4" @@ -4307,28 +4316,20 @@ vite@^0.15.3: postcss-modules "^2.0.0" rollup "^2.7.2" rollup-plugin-terser "^5.3.0" - rollup-plugin-vue "^6.0.0-alpha.10" + rollup-plugin-vue "^6.0.0-beta.1" + selfsigned "^1.10.7" slash "^3.0.0" - vue "^3.0.0-beta.12" + vue "^3.0.0-beta.14" ws "^7.2.3" -vue@^3.0.0-beta.10: - version "3.0.0-beta.10" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-beta.10.tgz#2e506a2923d84e3aacbdea0c1f232a7f78fc22e6" - integrity sha512-qA7uwX9mFtPd7yUF0lZq3B5yd9AZBmyCk/CCakhyCBqfWE4KsqaIYwb2Uwn6VXn0/aNzKZ8akP0OYCKygq1fkg== - dependencies: - "@vue/compiler-dom" "3.0.0-beta.10" - "@vue/runtime-dom" "3.0.0-beta.10" - "@vue/shared" "3.0.0-beta.10" - -vue@^3.0.0-beta.12: - version "3.0.0-beta.12" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-beta.12.tgz#e72d1baeede285768d2df0f2b52dc79427f49419" - integrity sha512-4Y8LPplndYp48q1P8CSbG3Et/bPcMQB11edusA6SuIGmgrLdS4Ntdwpjtc9kglYHaY9/E/VTVjl4jAGqpAFR1w== +vue@^3.0.0-beta.14: + version "3.0.0-beta.14" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-beta.14.tgz#d2c8739e00c4a4a06b519c14c57d204c350c980c" + integrity sha512-0MH1g5O3zX8ijvZuiQTYFq3UwHxtj512I/wrMPQLVXwjqb+ILA+fooSpdz4xgUBBl5zN/K9xJIwbl23sv+Sn7A== dependencies: - "@vue/compiler-dom" "3.0.0-beta.12" - "@vue/runtime-dom" "3.0.0-beta.12" - "@vue/shared" "3.0.0-beta.12" + "@vue/compiler-dom" "3.0.0-beta.14" + "@vue/runtime-dom" "3.0.0-beta.14" + "@vue/shared" "3.0.0-beta.14" wcwidth@^1.0.1: version "1.0.1"