diff --git a/package.json b/package.json
index ee254b9..092cbce 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,10 @@
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 2"
   },
   "dependencies": {
+    "@rollup/pluginutils": "^4.1.0",
     "debug": "^4.1.1",
     "hash-sum": "^2.0.0",
-    "rollup-pluginutils": "^2.8.2"
+    "source-map": "^0.6.1"
   },
   "peerDependencies": {
     "@vue/compiler-sfc": "*"
@@ -38,6 +39,7 @@
     "lint-staged": "^10.1.7",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.5",
+    "pug": "^3.0.0",
     "rollup": "^2.7.2",
     "rollup-plugin-postcss": "^3.1.8",
     "ts-jest": "^26.0.0",
@@ -55,7 +57,6 @@
   },
   "prettier": {
     "printWidth": 80,
-    "trailingComma": "es5",
     "semi": false,
     "singleQuote": true
   }
diff --git a/src/handleHotUpdate.ts b/src/handleHotUpdate.ts
new file mode 100644
index 0000000..6ae29ac
--- /dev/null
+++ b/src/handleHotUpdate.ts
@@ -0,0 +1,192 @@
+import fs from 'fs'
+import _debug from 'debug'
+import { parse, SFCBlock, SFCDescriptor } from '@vue/compiler-sfc'
+import {
+  getDescriptor,
+  setDescriptor,
+  setPrevDescriptor,
+} from './utils/descriptorCache'
+import { getResolvedScript, setResolvedScript } from './script'
+
+const debug = _debug('vite:hmr')
+
+/**
+ * Vite-specific HMR handling
+ */
+export async function handleHotUpdate(file: string, modules: any[]) {
+  if (!file.endsWith('.vue')) {
+    return
+  }
+
+  const prevDescriptor = getDescriptor(file)
+  if (!prevDescriptor) {
+    // file hasn't been requested yet (e.g. async component)
+    return
+  }
+
+  let content = fs.readFileSync(file, 'utf-8')
+  if (!content) {
+    await untilModified(file)
+    content = fs.readFileSync(file, 'utf-8')
+  }
+
+  const { descriptor } = parse(content, {
+    filename: file,
+    sourceMap: true,
+  })
+  setDescriptor(file, descriptor)
+  setPrevDescriptor(file, prevDescriptor)
+
+  let needRerender = false
+  const filteredModules = new Set()
+  const mainModule = modules.find(
+    (m) => !/type=/.test(m.id) || /type=script/.test(m.id)
+  )
+  const templateModule = modules.find((m) => /type=template/.test(m.id))
+
+  if (
+    !isEqualBlock(descriptor.script, prevDescriptor.script) ||
+    !isEqualBlock(descriptor.scriptSetup, prevDescriptor.scriptSetup)
+  ) {
+    filteredModules.add(mainModule)
+  }
+
+  if (!isEqualBlock(descriptor.template, prevDescriptor.template)) {
+    // when a <script setup> component's template changes, it will need correct
+    // binding metadata. However, when reloading the template alone the binding
+    // metadata will not be available since the script part isn't loaded.
+    // in this case, reuse the compiled script from previous descriptor.
+    if (!filteredModules.has(mainModule)) {
+      setResolvedScript(descriptor, getResolvedScript(prevDescriptor)!)
+    }
+    filteredModules.add(templateModule)
+    needRerender = true
+  }
+
+  let didUpdateStyle = false
+  const prevStyles = prevDescriptor.styles || []
+  const nextStyles = descriptor.styles || []
+
+  // force reload if CSS vars injection changed
+  if (descriptor.cssVars) {
+    if (prevDescriptor.cssVars.join('') !== descriptor.cssVars.join('')) {
+      filteredModules.add(mainModule)
+    }
+  }
+
+  // force reload if scoped status has changed
+  if (prevStyles.some((s) => s.scoped) !== nextStyles.some((s) => s.scoped)) {
+    // template needs to be invalidated as well
+    filteredModules.add(templateModule)
+    filteredModules.add(mainModule)
+  }
+
+  // only need to update styles if not reloading, since reload forces
+  // style updates as well.
+  for (let i = 0; i < nextStyles.length; i++) {
+    const prev = prevStyles[i]
+    const next = nextStyles[i]
+    if (!prev || !isEqualBlock(prev, next)) {
+      didUpdateStyle = true
+      const mod = modules.find((m) => m.id.includes(`type=style&index=${i}`))
+      if (mod) {
+        filteredModules.add(mod)
+      } else {
+        // new style block - force reload
+        filteredModules.add(mainModule)
+      }
+    }
+  }
+  if (prevStyles.length > nextStyles.length) {
+    // style block removed - force reload
+    filteredModules.add(mainModule)
+  }
+
+  const prevCustoms = prevDescriptor.customBlocks || []
+  const nextCustoms = descriptor.customBlocks || []
+
+  // custom blocks update causes a reload
+  // because the custom block contents is changed and it may be used in JS.
+  for (let i = 0; i < nextCustoms.length; i++) {
+    const prev = prevCustoms[i]
+    const next = nextCustoms[i]
+    if (!prev || !isEqualBlock(prev, next)) {
+      const mod = modules.find((m) =>
+        m.id.includes(`type=${prev.type}&index=${i}`)
+      )
+      if (mod) {
+        filteredModules.add(mod)
+      } else {
+        filteredModules.add(mainModule)
+      }
+    }
+  }
+  if (prevCustoms.length > nextCustoms.length) {
+    // block rmeoved, force reload
+    filteredModules.add(mainModule)
+  }
+
+  let updateType = []
+  if (needRerender) {
+    updateType.push(`template`)
+    // template is inlined into main, add main module instead
+    if (!templateModule) {
+      filteredModules.add(mainModule)
+    }
+  }
+  if (didUpdateStyle) {
+    updateType.push(`style`)
+  }
+  if (updateType.length) {
+    debug(`[vue:update(${updateType.join('&')})] ${file}`)
+  }
+  return [...filteredModules].filter(Boolean)
+}
+
+// vitejs/vite#610 when hot-reloading Vue files, we read immediately on file
+// change event and sometimes this can be too early and get an empty buffer.
+// Poll until the file's modified time has changed before reading again.
+async function untilModified(file: string) {
+  const mtime = fs.statSync(file).mtimeMs
+  return new Promise((r) => {
+    let n = 0
+    const poll = async () => {
+      n++
+      const newMtime = fs.statSync(file).mtimeMs
+      if (newMtime !== mtime || n > 10) {
+        r(0)
+      } else {
+        setTimeout(poll, 10)
+      }
+    }
+    setTimeout(poll, 10)
+  })
+}
+
+function isEqualBlock(a: SFCBlock | null, b: SFCBlock | null) {
+  if (!a && !b) return true
+  if (!a || !b) return false
+  // src imports will trigger their own updates
+  if (a.src && b.src && a.src === b.src) return true
+  if (a.content !== b.content) return false
+  const keysA = Object.keys(a.attrs)
+  const keysB = Object.keys(b.attrs)
+  if (keysA.length !== keysB.length) {
+    return false
+  }
+  return keysA.every((key) => a.attrs[key] === b.attrs[key])
+}
+
+export function isOnlyTemplateChanged(
+  prev: SFCDescriptor,
+  next: SFCDescriptor
+) {
+  return (
+    isEqualBlock(prev.script, next.script) &&
+    isEqualBlock(prev.scriptSetup, next.scriptSetup) &&
+    prev.styles.length === next.styles.length &&
+    prev.styles.every((s, i) => isEqualBlock(s, next.styles[i])) &&
+    prev.customBlocks.length === next.customBlocks.length &&
+    prev.customBlocks.every((s, i) => isEqualBlock(s, next.customBlocks[i]))
+  )
+}
diff --git a/src/index.ts b/src/index.ts
index f89a059..0d68b7b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -14,15 +14,15 @@ import {
 import fs from 'fs'
 import createDebugger from 'debug'
 import { Plugin } from 'rollup'
-import { createFilter } from 'rollup-pluginutils'
-import { transformSFCEntry } from './sfc'
-import { transformTemplate } from './template'
+import { createFilter } from '@rollup/pluginutils'
+import { genSfcFacade } from './sfcFacade'
+import { transformTemplateAsModule } from './template'
 import { transformStyle } from './style'
 import { createCustomBlockFilter } from './utils/customBlockFilter'
 import { getDescriptor, setDescriptor } from './utils/descriptorCache'
 import { parseVuePartRequest } from './utils/query'
-import { normalizeSourceMap } from './utils/sourceMap'
 import { getResolvedScript } from './script'
+import { handleHotUpdate } from './handleHotUpdate'
 
 const debug = createDebugger('rollup-plugin-vue')
 
@@ -30,8 +30,9 @@ export interface Options {
   include: string | RegExp | (string | RegExp)[]
   exclude: string | RegExp | (string | RegExp)[]
   target: 'node' | 'browser'
+  vite: boolean
+  hmr: boolean
   exposeFilename: boolean
-
   customBlocks?: string[]
 
   // if true, handle preprocessors directly instead of delegating to other
@@ -58,6 +59,8 @@ export interface Options {
 const defaultOptions: Options = {
   include: /\.vue$/,
   exclude: [],
+  vite: false,
+  hmr: false,
   target: 'browser',
   exposeFilename: false,
   customBlocks: [],
@@ -69,6 +72,10 @@ export default function PluginVue(userOptions: Partial<Options> = {}): Plugin {
     ...userOptions,
   }
 
+  if (options.vite) {
+    options.preprocessStyles = false
+  }
+
   const isServer = options.target === 'node'
   const isProduction =
     process.env.NODE_ENV === 'production' || process.env.BUILD === 'production'
@@ -109,23 +116,21 @@ export default function PluginVue(userOptions: Partial<Options> = {}): Plugin {
           return fs.readFileSync(query.filename, 'utf-8')
         }
         const descriptor = getDescriptor(query.filename)
-        if (descriptor) {
-          const block =
-            query.type === 'template'
-              ? descriptor.template!
-              : query.type === 'script'
-              ? getResolvedScript(descriptor, isServer)
-              : query.type === 'style'
-              ? descriptor.styles[query.index]
-              : typeof query.index === 'number'
-              ? descriptor.customBlocks[query.index]
-              : null
-
-          if (block) {
-            return {
-              code: block.content,
-              map: normalizeSourceMap(block.map, id),
-            }
+        const block =
+          query.type === 'template'
+            ? descriptor.template!
+            : query.type === 'script'
+            ? getResolvedScript(descriptor, isServer)
+            : query.type === 'style'
+            ? descriptor.styles[query.index]
+            : typeof query.index === 'number'
+            ? descriptor.customBlocks[query.index]
+            : null
+
+        if (block) {
+          return {
+            code: block.content,
+            map: block.map as any,
           }
         }
       }
@@ -139,7 +144,7 @@ export default function PluginVue(userOptions: Partial<Options> = {}): Plugin {
       // generate an entry module that imports the actual blocks of the SFC
       if (!query.vue && filter(id)) {
         debug(`transform SFC entry (${id})`)
-        const output = transformSFCEntry(
+        const output = await genSfcFacade(
           code,
           id,
           options,
@@ -165,14 +170,17 @@ export default function PluginVue(userOptions: Partial<Options> = {}): Plugin {
         }
         if (query.type === 'template') {
           debug(`transform template (${id})`)
-          return transformTemplate(code, id, options, query, this)
+          return transformTemplateAsModule(code, options, query, this)
         } else if (query.type === 'style') {
           debug(`transform style (${id})`)
-          return transformStyle(code, id, options, query, isProduction, this)
+          return transformStyle(code, options, query, isProduction, this)
         }
       }
       return null
     },
+
+    // @ts-ignore
+    handleHotUpdate,
   }
 }
 
diff --git a/src/script.ts b/src/script.ts
index 4e9c9b6..78c6ee2 100644
--- a/src/script.ts
+++ b/src/script.ts
@@ -10,11 +10,19 @@ const serverCache = new WeakMap<SFCDescriptor, SFCScriptBlock | null>()
 
 export function getResolvedScript(
   descriptor: SFCDescriptor,
-  isServer: boolean
+  isServer = false
 ): SFCScriptBlock | null | undefined {
   return (isServer ? serverCache : clientCache).get(descriptor)
 }
 
+export function setResolvedScript(
+  descriptor: SFCDescriptor,
+  script: SFCScriptBlock,
+  isServer = false
+) {
+  ;(isServer ? serverCache : clientCache).set(descriptor, script)
+}
+
 export function resolveScript(
   descriptor: SFCDescriptor,
   scopeId: string,
@@ -40,7 +48,7 @@ export function resolveScript(
       resolved = compileScript(descriptor, {
         id: scopeId,
         isProd,
-        inlineTemplate: true,
+        inlineTemplate: !options.hmr,
         templateOptions: getTemplateCompilerOptions(
           options,
           descriptor,
diff --git a/src/sfc.ts b/src/sfc.ts
deleted file mode 100644
index d52c00d..0000000
--- a/src/sfc.ts
+++ /dev/null
@@ -1,256 +0,0 @@
-import hash from 'hash-sum'
-import path from 'path'
-import qs from 'querystring'
-import { parse, SFCBlock, SFCDescriptor } from '@vue/compiler-sfc'
-import { Options } from '.'
-import { setDescriptor } from './utils/descriptorCache'
-import { TransformPluginContext } from 'rollup'
-import { createRollupError } from './utils/error'
-import { resolveScript } from './script'
-
-export function transformSFCEntry(
-  code: string,
-  filename: string,
-  options: Options,
-  sourceRoot: string,
-  isProduction: boolean,
-  isServer: boolean,
-  filterCustomBlock: (type: string) => boolean,
-  pluginContext: TransformPluginContext
-) {
-  const { descriptor, errors } = parse(code, {
-    sourceMap: true,
-    filename,
-    sourceRoot,
-  })
-  setDescriptor(filename, descriptor)
-
-  if (errors.length) {
-    errors.forEach((error) =>
-      pluginContext.error(createRollupError(filename, error))
-    )
-    return null
-  }
-
-  const shortFilePath = path
-    .relative(sourceRoot, filename)
-    .replace(/^(\.\.[\/\\])+/, '')
-    .replace(/\\/g, '/')
-  const scopeId = hash(
-    isProduction ? shortFilePath + '\n' + code : shortFilePath
-  )
-  // feature information
-  const hasScoped = descriptor.styles.some((s) => s.scoped)
-
-  const isTemplateInlined =
-    descriptor.scriptSetup && !(descriptor.template && descriptor.template.src)
-  const hasTemplateImport = descriptor.template && !isTemplateInlined
-
-  const templateImport = hasTemplateImport
-    ? genTemplateCode(descriptor, scopeId, isServer)
-    : ''
-
-  const renderReplace = hasTemplateImport
-    ? isServer
-      ? `script.ssrRender = ssrRender`
-      : `script.render = render`
-    : ''
-
-  const scriptImport = genScriptCode(
-    descriptor,
-    scopeId,
-    isProduction,
-    isServer,
-    options,
-    pluginContext
-  )
-  const stylesCode = genStyleCode(descriptor, scopeId, options.preprocessStyles)
-  const customBlocksCode = getCustomBlock(descriptor, filterCustomBlock)
-  const output = [
-    scriptImport,
-    templateImport,
-    stylesCode,
-    customBlocksCode,
-    renderReplace,
-  ]
-  if (hasScoped) {
-    output.push(`script.__scopeId = ${JSON.stringify(`data-v-${scopeId}`)}`)
-  }
-  if (!isProduction) {
-    output.push(`script.__file = ${JSON.stringify(shortFilePath)}`)
-  } else if (options.exposeFilename) {
-    output.push(
-      `script.__file = ${JSON.stringify(path.basename(shortFilePath))}`
-    )
-  }
-  output.push('export default script')
-  return {
-    code: output.join('\n'),
-    map: {
-      mappings: '',
-    },
-  }
-}
-
-function genTemplateCode(
-  descriptor: SFCDescriptor,
-  id: string,
-  isServer: boolean
-) {
-  const renderFnName = isServer ? 'ssrRender' : 'render'
-  let templateImport = `const ${renderFnName} = () => {}`
-  let templateRequest
-  if (descriptor.template) {
-    const src = descriptor.template.src || descriptor.filename
-    const idQuery = `&id=${id}`
-    const srcQuery = descriptor.template.src ? `&src` : ``
-    const attrsQuery = attrsToQuery(descriptor.template.attrs, 'js', true)
-    const query = `?vue&type=template${idQuery}${srcQuery}${attrsQuery}`
-    templateRequest = JSON.stringify(src + query)
-    templateImport = `import { ${renderFnName} } from ${templateRequest}`
-  }
-
-  return templateImport
-}
-
-function genScriptCode(
-  descriptor: SFCDescriptor,
-  scopeId: string,
-  isProd: boolean,
-  isServer: boolean,
-  options: Options,
-  pluginContext: TransformPluginContext
-) {
-  let scriptImport = `const script = {}`
-  const script = resolveScript(
-    descriptor,
-    scopeId,
-    isProd,
-    isServer,
-    options,
-    pluginContext
-  )
-  if (script) {
-    const src = script.src || descriptor.filename
-    const attrsQuery = attrsToQuery(script.attrs, 'js')
-    const srcQuery = script.src ? `&src` : ``
-    const query = `?vue&type=script${srcQuery}${attrsQuery}`
-    const scriptRequest = JSON.stringify(src + query)
-    scriptImport =
-      `import script from ${scriptRequest}\n` + `export * from ${scriptRequest}` // support named exports
-  }
-  return scriptImport
-}
-
-function genStyleCode(
-  descriptor: SFCDescriptor,
-  scopeId: string,
-  preprocessStyles?: boolean
-) {
-  let stylesCode = ``
-  let hasCSSModules = false
-  if (descriptor.styles.length) {
-    descriptor.styles.forEach((style, i) => {
-      const src = style.src || descriptor.filename
-      // do not include module in default query, since we use it to indicate
-      // that the module needs to export the modules json
-      const attrsQuery = attrsToQuery(style.attrs, 'css', preprocessStyles)
-      const attrsQueryWithoutModule = attrsQuery.replace(
-        /&module(=true|=[^&]+)?/,
-        ''
-      )
-      // make sure to only pass id when necessary so that we don't inject
-      // duplicate tags when multiple components import the same css file
-      const idQuery = `&id=${scopeId}`
-      const srcQuery = style.src ? `&src` : ``
-      const query = `?vue&type=style&index=${i}${srcQuery}${idQuery}`
-      const styleRequest = src + query + attrsQuery
-      const styleRequestWithoutModule = src + query + attrsQueryWithoutModule
-      if (style.module) {
-        if (!hasCSSModules) {
-          stylesCode += `\nconst cssModules = script.__cssModules = {}`
-          hasCSSModules = true
-        }
-        stylesCode += genCSSModulesCode(
-          i,
-          styleRequest,
-          styleRequestWithoutModule,
-          style.module
-        )
-      } else {
-        stylesCode += `\nimport ${JSON.stringify(styleRequest)}`
-      }
-      // TODO SSR critical CSS collection
-    })
-  }
-  return stylesCode
-}
-
-function getCustomBlock(
-  descriptor: SFCDescriptor,
-  filter: (type: string) => boolean
-) {
-  let code = ''
-
-  descriptor.customBlocks.forEach((block, index) => {
-    if (filter(block.type)) {
-      const src = block.src || descriptor.filename
-      const attrsQuery = attrsToQuery(block.attrs, block.type)
-      const srcQuery = block.src ? `&src` : ``
-      const query = `?vue&type=${block.type}&index=${index}${srcQuery}${attrsQuery}`
-      const request = JSON.stringify(src + query)
-      code += `import block${index} from ${request}\n`
-      code += `if (typeof block${index} === 'function') block${index}(script)\n`
-    }
-  })
-
-  return code
-}
-
-function genCSSModulesCode(
-  index: number,
-  request: string,
-  requestWithoutModule: string,
-  moduleName: string | boolean
-): string {
-  const styleVar = `style${index}`
-  let code =
-    // first import the CSS for extraction
-    `\nimport ${JSON.stringify(requestWithoutModule)}` +
-    // then import the json file to expose to component...
-    `\nimport ${styleVar} from ${JSON.stringify(request + '.js')}`
-
-  // inject variable
-  const name = typeof moduleName === 'string' ? moduleName : '$style'
-  code += `\ncssModules["${name}"] = ${styleVar}`
-  return code
-}
-
-// these are built-in query parameters so should be ignored
-// if the user happen to add them as attrs
-const ignoreList = ['id', 'index', 'src', 'type', 'lang']
-
-function attrsToQuery(
-  attrs: SFCBlock['attrs'],
-  langFallback?: string,
-  forceLangFallback = false
-): string {
-  let query = ``
-  for (const name in attrs) {
-    const value = attrs[name]
-    if (!ignoreList.includes(name)) {
-      query += `&${qs.escape(name)}${
-        value ? `=${qs.escape(String(value))}` : ``
-      }`
-    }
-  }
-  if (langFallback || attrs.lang) {
-    query +=
-      `lang` in attrs
-        ? forceLangFallback
-          ? `&lang.${langFallback}`
-          : `&lang.${attrs.lang}`
-        : `&lang.${langFallback}`
-  }
-  return query
-}
diff --git a/src/sfcFacade.ts b/src/sfcFacade.ts
new file mode 100644
index 0000000..2002d72
--- /dev/null
+++ b/src/sfcFacade.ts
@@ -0,0 +1,387 @@
+import hash from 'hash-sum'
+import path from 'path'
+import qs from 'querystring'
+import {
+  parse,
+  rewriteDefault,
+  SFCBlock,
+  SFCDescriptor,
+} from '@vue/compiler-sfc'
+import { Options } from '.'
+import { getPrevDescriptor, setDescriptor } from './utils/descriptorCache'
+import { PluginContext, TransformPluginContext } from 'rollup'
+import { createRollupError } from './utils/error'
+import { resolveScript } from './script'
+import { transformTemplateInMain } from './template'
+import { isOnlyTemplateChanged } from './handleHotUpdate'
+import { RawSourceMap, SourceMapConsumer, SourceMapGenerator } from 'source-map'
+
+export async function genSfcFacade(
+  code: string,
+  filename: string,
+  options: Options,
+  sourceRoot: string,
+  isProduction: boolean,
+  isServer: boolean,
+  filterCustomBlock: (type: string) => boolean,
+  pluginContext: TransformPluginContext
+) {
+  // prev descriptor is only set and used for hmr
+  const prevDescriptor = getPrevDescriptor(filename)
+  const { descriptor, errors } = parse(code, {
+    sourceMap: true,
+    filename,
+  })
+  setDescriptor(filename, descriptor)
+
+  if (errors.length) {
+    errors.forEach((error) =>
+      pluginContext.error(createRollupError(filename, error))
+    )
+    return null
+  }
+
+  const shortFilePath = path
+    .relative(sourceRoot, filename)
+    .replace(/^(\.\.[\/\\])+/, '')
+    .replace(/\\/g, '/')
+  const scopeId = hash(
+    isProduction ? shortFilePath + '\n' + code : shortFilePath
+  )
+  // feature information
+  const hasScoped = descriptor.styles.some((s) => s.scoped)
+
+  // script
+  const { code: scriptCode, map } = await genScriptCode(
+    descriptor,
+    scopeId,
+    isProduction,
+    isServer,
+    options,
+    pluginContext
+  )
+
+  // template
+  const useInlineTemplate =
+    !options.hmr &&
+    descriptor.scriptSetup &&
+    !(descriptor.template && descriptor.template.src)
+  const hasTemplateImport = descriptor.template && !useInlineTemplate
+
+  let templateCode = ''
+  let templateMap
+  if (hasTemplateImport) {
+    ;({ code: templateCode, map: templateMap } = genTemplateCode(
+      descriptor,
+      scopeId,
+      options,
+      isServer,
+      pluginContext
+    ))
+  }
+
+  const renderReplace = hasTemplateImport
+    ? isServer
+      ? `_sfc_main.ssrRender = _sfc_ssrRender`
+      : `_sfc_main.render = _sfc_render`
+    : ''
+
+  // styles
+  const stylesCode = genStyleCode(
+    descriptor,
+    scopeId,
+    options.preprocessStyles,
+    options.vite
+  )
+
+  // custom blocks
+  const customBlocksCode = getCustomBlock(descriptor, filterCustomBlock)
+
+  const output: string[] = [
+    scriptCode,
+    templateCode,
+    stylesCode,
+    customBlocksCode,
+    renderReplace,
+  ]
+  if (hasScoped) {
+    output.push(`_sfc_main.__scopeId = ${JSON.stringify(`data-v-${scopeId}`)}`)
+  }
+  if (!isProduction) {
+    output.push(`_sfc_main.__file = ${JSON.stringify(shortFilePath)}`)
+  } else if (options.exposeFilename) {
+    output.push(
+      `_sfc_main.__file = ${JSON.stringify(path.basename(shortFilePath))}`
+    )
+  }
+  output.push('export default _sfc_main')
+
+  if (options.hmr) {
+    // check if the template is the only thing that changed
+    if (prevDescriptor && isOnlyTemplateChanged(prevDescriptor, descriptor)) {
+      output.push(`export const _rerender_only = true`)
+    }
+    output.push(`_sfc_main.__hmrId = ${JSON.stringify(scopeId)}`)
+    output.push(
+      `__VUE_HMR_RUNTIME__.createRecord(_sfc_main.__hmrId, _sfc_main)`
+    )
+    output.push(
+      `import.meta.hot.accept(({ default: updated, _rerender_only }) => {`,
+      `  if (_rerender_only) {`,
+      `    __VUE_HMR_RUNTIME__.rerender(updated.__hmrId, updated.render)`,
+      `  } else {`,
+      `    __VUE_HMR_RUNTIME__.reload(updated.__hmrId, updated)`,
+      `  }`,
+      `})`
+    )
+  }
+
+  // if the template is inlined into the main module (indicated by the presence
+  // of templateMap, we need to concatenate the two source maps.
+  let resolvedMap = map
+  if (map && templateMap) {
+    const generator = SourceMapGenerator.fromSourceMap(
+      new SourceMapConsumer(map)
+    )
+    const offset = scriptCode.match(/\r?\n/g)?.length || 1
+    const templateMapConsumer = new SourceMapConsumer(templateMap)
+    templateMapConsumer.eachMapping((m) => {
+      generator.addMapping({
+        source: m.source,
+        original: { line: m.originalLine, column: m.originalColumn },
+        generated: {
+          line: m.generatedLine + offset,
+          column: m.generatedColumn,
+        },
+      })
+    })
+    resolvedMap = (generator as any).toJSON()
+    // if this is a template only update, we will be reusing a cached version
+    // of the main module compile result, which has outdated sourcesContent.
+    resolvedMap.sourcesContent = templateMap.sourcesContent
+  }
+
+  return {
+    code: output.join('\n'),
+    map: resolvedMap || {
+      mappings: '',
+    },
+  }
+}
+
+function genTemplateCode(
+  descriptor: SFCDescriptor,
+  id: string,
+  options: Options,
+  isServer: boolean,
+  pluginContext: PluginContext
+) {
+  const renderFnName = isServer ? 'ssrRender' : 'render'
+  const template = descriptor.template!
+
+  // If the template is not using pre-processor AND is not using external src,
+  // compile and inline it directly in the main module. When served in vite this
+  // saves an extra request per SFC which can improve load performance.
+  if (!template.lang && !template.src) {
+    return transformTemplateInMain(
+      template.content,
+      descriptor,
+      id,
+      options,
+      pluginContext
+    )
+  } else {
+    const src = template.src || descriptor.filename
+    const idQuery = `&id=${id}`
+    const srcQuery = template.src ? `&src` : ``
+    const attrsQuery = attrsToQuery(template.attrs, 'js', true)
+    const query = `?vue&type=template${idQuery}${srcQuery}${attrsQuery}`
+    return {
+      code: `import { ${renderFnName} as _sfc_${renderFnName} } from ${JSON.stringify(
+        src + query
+      )}`,
+      map: undefined,
+    }
+  }
+}
+
+async function genScriptCode(
+  descriptor: SFCDescriptor,
+  scopeId: string,
+  isProd: boolean,
+  isServer: boolean,
+  options: Options,
+  pluginContext: TransformPluginContext
+): Promise<{
+  code: string
+  map: RawSourceMap
+}> {
+  let scriptCode = `const _sfc_main = {}`
+  let map
+  const script = resolveScript(
+    descriptor,
+    scopeId,
+    isProd,
+    isServer,
+    options,
+    pluginContext
+  )
+  if (script) {
+    // If the script is js/ts and has no external src, it can be directly placed
+    // in the main module.
+    if (
+      (!script.lang ||
+        (script.lang === 'ts' && (pluginContext as any).server)) &&
+      !script.src
+    ) {
+      scriptCode = rewriteDefault(script.content, `_sfc_main`)
+      map = script.map
+      if (script.lang === 'ts') {
+        const result = await (pluginContext as any).server.transformWithEsbuild(
+          scriptCode,
+          descriptor.filename,
+          { loader: 'ts' },
+          map
+        )
+        scriptCode = result.code
+        map = result.map
+      }
+    } else {
+      const src = script.src || descriptor.filename
+      const attrsQuery = attrsToQuery(script.attrs, 'js')
+      const srcQuery = script.src ? `&src` : ``
+      const query = `?vue&type=script${srcQuery}${attrsQuery}`
+      const scriptRequest = JSON.stringify(src + query)
+      scriptCode =
+        `import _sfc_main from ${scriptRequest}\n` +
+        `export * from ${scriptRequest}` // support named exports
+    }
+  }
+  return {
+    code: scriptCode,
+    map,
+  }
+}
+
+function genStyleCode(
+  descriptor: SFCDescriptor,
+  scopeId: string,
+  preprocessStyles?: boolean,
+  isVite?: boolean
+) {
+  let stylesCode = ``
+  let hasCSSModules = false
+  if (descriptor.styles.length) {
+    descriptor.styles.forEach((style, i) => {
+      const src = style.src || descriptor.filename
+      // do not include module in default query, since we use it to indicate
+      // that the module needs to export the modules json
+      const attrsQuery = attrsToQuery(style.attrs, 'css', preprocessStyles)
+      const attrsQueryWithoutModule = attrsQuery.replace(
+        /&module(=true|=[^&]+)?/,
+        ''
+      )
+      // make sure to only pass id when necessary so that we don't inject
+      // duplicate tags when multiple components import the same css file
+      const idQuery = `&id=${scopeId}`
+      const srcQuery = style.src ? `&src` : ``
+      const query = `?vue&type=style&index=${i}${srcQuery}${idQuery}`
+      const styleRequest = src + query + attrsQuery
+      const styleRequestWithoutModule = src + query + attrsQueryWithoutModule
+      if (style.module) {
+        if (!hasCSSModules) {
+          stylesCode += `\nconst cssModules = _sfc_main.__cssModules = {}`
+          hasCSSModules = true
+        }
+        stylesCode += genCSSModulesCode(
+          i,
+          styleRequest,
+          styleRequestWithoutModule,
+          style.module,
+          isVite
+        )
+      } else {
+        stylesCode += `\nimport ${JSON.stringify(styleRequest)}`
+      }
+      // TODO SSR critical CSS collection
+    })
+  }
+  return stylesCode
+}
+
+function getCustomBlock(
+  descriptor: SFCDescriptor,
+  filter: (type: string) => boolean
+) {
+  let code = ''
+
+  descriptor.customBlocks.forEach((block, index) => {
+    if (filter(block.type)) {
+      const src = block.src || descriptor.filename
+      const attrsQuery = attrsToQuery(block.attrs, block.type)
+      const srcQuery = block.src ? `&src` : ``
+      const query = `?vue&type=${block.type}&index=${index}${srcQuery}${attrsQuery}`
+      const request = JSON.stringify(src + query)
+      code += `import block${index} from ${request}\n`
+      code += `if (typeof block${index} === 'function') block${index}(_sfc_main)\n`
+    }
+  })
+
+  return code
+}
+
+function genCSSModulesCode(
+  index: number,
+  request: string,
+  requestWithoutModule: string,
+  moduleName: string | boolean,
+  isVite?: boolean
+): string {
+  const styleVar = `style${index}`
+  let code
+  if (!isVite) {
+    code =
+      // first import the CSS for extraction
+      `\nimport ${JSON.stringify(requestWithoutModule)}` +
+      // then import the json file to expose to component...
+      `\nimport ${styleVar} from ${JSON.stringify(request + '.js')}`
+  } else {
+    // vite handles module.ext in a single import
+    request = request.replace(/\.(\w+)$/, '.module.$1.js')
+    code = `\n import ${styleVar} from ${JSON.stringify(request)}`
+  }
+
+  // inject variable
+  const name = typeof moduleName === 'string' ? moduleName : '$style'
+  code += `\ncssModules["${name}"] = ${styleVar}`
+  return code
+}
+
+// these are built-in query parameters so should be ignored
+// if the user happen to add them as attrs
+const ignoreList = ['id', 'index', 'src', 'type', 'lang']
+
+function attrsToQuery(
+  attrs: SFCBlock['attrs'],
+  langFallback?: string,
+  forceLangFallback = false
+): string {
+  let query = ``
+  for (const name in attrs) {
+    const value = attrs[name]
+    if (!ignoreList.includes(name)) {
+      query += `&${qs.escape(name)}${
+        value ? `=${qs.escape(String(value))}` : ``
+      }`
+    }
+  }
+  if (langFallback || attrs.lang) {
+    query +=
+      `lang` in attrs
+        ? forceLangFallback
+          ? `&lang.${langFallback}`
+          : `&lang.${attrs.lang}`
+        : `&lang.${langFallback}`
+  }
+  return query
+}
diff --git a/src/style.ts b/src/style.ts
index d00660d..ec72e5e 100644
--- a/src/style.ts
+++ b/src/style.ts
@@ -6,11 +6,9 @@ import { TransformPluginContext } from 'rollup'
 import { Options } from '.'
 import { getDescriptor } from './utils/descriptorCache'
 import { StyleBlockQuery } from './utils/query'
-import { normalizeSourceMap } from './utils/sourceMap'
 
 export async function transformStyle(
   code: string,
-  request: string,
   options: Options,
   query: StyleBlockQuery,
   isProduction: boolean,
@@ -20,7 +18,7 @@ export async function transformStyle(
   const block = descriptor.styles[query.index]!
 
   let preprocessOptions = options.preprocessOptions || {}
-  const preprocessLang = (options.preprocessStyles
+  const preprocessLang = (options.preprocessStyles && !options.vite
     ? block.lang
     : undefined) as SFCAsyncStyleCompileOptions['preprocessLang']
 
@@ -52,7 +50,8 @@ export async function transformStyle(
     isProd: isProduction,
     source: code,
     scoped: block.scoped,
-    modules: !!block.module,
+    // vite handle CSS modules
+    modules: !!block.module && !options.vite,
     postcssOptions: options.postcssOptions,
     postcssPlugins: options.postcssPlugins,
     modulesOptions: options.cssModulesOptions,
@@ -62,16 +61,21 @@ export async function transformStyle(
   })
 
   if (result.errors.length) {
-    result.errors.forEach((error) =>
-      pluginContext.error({
-        id: query.filename,
-        message: error.message,
-      })
-    )
+    result.errors.forEach((error: any) => {
+      if (error.line && error.column) {
+        error.loc = {
+          file: query.filename,
+          line: error.line + block.loc.start.line,
+          column: error.column,
+        }
+      }
+      pluginContext.error(error)
+    })
     return null
   }
 
-  if (query.module) {
+  if (query.module && !options.vite) {
+    // vite handles css modules code generation down the stream
     return {
       code: `export default ${JSON.stringify(result.modules)}`,
       map: null,
@@ -79,7 +83,7 @@ export async function transformStyle(
   } else {
     return {
       code: result.code,
-      map: normalizeSourceMap(result.map!, request),
+      map: result.map as any,
     }
   }
 }
diff --git a/src/template.ts b/src/template.ts
index b23a8f9..93dd997 100644
--- a/src/template.ts
+++ b/src/template.ts
@@ -1,55 +1,100 @@
 import {
-  compileTemplate,
+  compileTemplate as compile,
   SFCDescriptor,
   SFCTemplateCompileOptions,
 } from '@vue/compiler-sfc'
-import { TransformPluginContext } from 'rollup'
+import { PluginContext, TransformPluginContext } from 'rollup'
 import { Options } from '.'
 import { getResolvedScript } from './script'
 import { getDescriptor } from './utils/descriptorCache'
 import { createRollupError } from './utils/error'
 import { TemplateBlockQuery } from './utils/query'
-import { normalizeSourceMap } from './utils/sourceMap'
 
-export function transformTemplate(
+export function transformTemplateAsModule(
   code: string,
-  request: string,
   options: Options,
   query: TemplateBlockQuery,
   pluginContext: TransformPluginContext
 ) {
   const descriptor = getDescriptor(query.filename)
-  const result = compileTemplate({
-    ...getTemplateCompilerOptions(options, descriptor, query.id),
-    id: query.id,
+
+  const result = compileTemplate(
+    code,
+    descriptor,
+    query.id,
+    options,
+    pluginContext
+  )
+
+  let returnCode = result.code
+  if (options.hmr) {
+    returnCode += `\nimport.meta.hot.accept(({ render }) => {
+      __VUE_HMR_RUNTIME__.rerender(${JSON.stringify(query.id)}, render)
+    })`
+  }
+
+  return {
+    code: returnCode,
+    map: result.map as any,
+  }
+}
+
+/**
+ * transform the template directly in the main SFC module
+ */
+export function transformTemplateInMain(
+  code: string,
+  descriptor: SFCDescriptor,
+  id: string,
+  options: Options,
+  pluginContext: PluginContext
+) {
+  const result = compileTemplate(code, descriptor, id, options, pluginContext)
+  return {
+    ...result,
+    code: result.code.replace(
+      /\nexport (function|const) (render|ssrRender)/,
+      '\n$1 _sfc_$2'
+    ),
+  }
+}
+
+export function compileTemplate(
+  code: string,
+  descriptor: SFCDescriptor,
+  id: string,
+  options: Options,
+  pluginContext: PluginContext
+) {
+  const filename = descriptor.filename
+  const compileOptions = getTemplateCompilerOptions(options, descriptor, id)
+  const result = compile({
+    ...compileOptions,
+    id,
     source: code,
-    filename: query.filename,
+    filename,
   })
 
   if (result.errors.length) {
     result.errors.forEach((error) =>
       pluginContext.error(
         typeof error === 'string'
-          ? { id: query.filename, message: error }
-          : createRollupError(query.filename, error)
+          ? { id: filename, message: error }
+          : createRollupError(filename, error)
       )
     )
-    return null
   }
 
   if (result.tips.length) {
     result.tips.forEach((tip) =>
       pluginContext.warn({
-        id: query.filename,
+        id: filename,
         message: tip,
       })
     )
   }
 
-  return {
-    code: result.code,
-    map: normalizeSourceMap(result.map!, request),
-  }
+  return result
 }
 
 export function getTemplateCompilerOptions(
diff --git a/src/utils/descriptorCache.ts b/src/utils/descriptorCache.ts
index a3424f3..118df46 100644
--- a/src/utils/descriptorCache.ts
+++ b/src/utils/descriptorCache.ts
@@ -1,15 +1,23 @@
 import { SFCDescriptor } from '@vue/compiler-sfc'
 
 const cache = new Map<string, SFCDescriptor>()
+const prevCache = new Map<string, SFCDescriptor | undefined>()
 
 export function setDescriptor(id: string, entry: SFCDescriptor) {
   cache.set(id, entry)
 }
 
+export function getPrevDescriptor(id: string) {
+  return prevCache.get(id)
+}
+
+export function setPrevDescriptor(id: string, entry: SFCDescriptor) {
+  prevCache.set(id, entry)
+}
+
 export function getDescriptor(id: string) {
   if (cache.has(id)) {
     return cache.get(id)!
   }
-
   throw new Error(`${id} is not parsed yet`)
 }
diff --git a/yarn.lock b/yarn.lock
index 1a4bb89..621b08d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -164,6 +164,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
   integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
 
+"@babel/parser@^7.6.0":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81"
+  integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==
+
 "@babel/parser@^7.8.6":
   version "7.9.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
@@ -288,6 +293,15 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.6.1":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
+  integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.8.6":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"
@@ -523,6 +537,14 @@
     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"
+
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
@@ -906,6 +928,11 @@ arrify@^1.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
@@ -913,6 +940,11 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
+assert-never@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
+  integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
+
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
@@ -1001,6 +1033,13 @@ babel-preset-jest@^26.0.0:
     babel-plugin-jest-hoist "^26.0.0"
     babel-preset-current-node-syntax "^0.1.2"
 
+babel-walk@3.0.0-canary-5:
+  version "3.0.0-canary-5"
+  resolved "https://registry.yarnpkg.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz#f66ecd7298357aee44955f235a6ef54219104b11"
+  integrity sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==
+  dependencies:
+    "@babel/types" "^7.9.6"
+
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -1264,6 +1303,13 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
+character-parser@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A=
+  dependencies:
+    is-regex "^1.0.3"
+
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -1424,6 +1470,14 @@ consolidate@^0.16.0:
   dependencies:
     bluebird "^3.7.2"
 
+constantinople@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151"
+  integrity sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==
+  dependencies:
+    "@babel/parser" "^7.6.0"
+    "@babel/types" "^7.6.1"
+
 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"
@@ -1947,6 +2001,11 @@ diff-sequences@^26.0.0:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.0.0.tgz#0760059a5c287637b842bd7085311db7060e88a6"
   integrity sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg==
 
+doctypes@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+  integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=
+
 dom-serializer@0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -2810,9 +2869,9 @@ inherits@2, inherits@^2.0.3, inherits@~2.0.3:
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 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"
@@ -2941,6 +3000,14 @@ is-docker@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"
   integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==
 
+is-expression@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-4.0.0.tgz#c33155962abf21d0afd2552514d67d2ec16fd2ab"
+  integrity sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==
+  dependencies:
+    acorn "^7.1.1"
+    object-assign "^4.1.1"
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -3036,11 +3103,23 @@ 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-promise@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
+  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
+
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
   integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
+is-regex@^1.0.3, is-regex@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
+  dependencies:
+    has-symbols "^1.0.1"
+
 is-regex@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
@@ -3048,13 +3127,6 @@ is-regex@^1.0.5:
   dependencies:
     has "^1.0.3"
 
-is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
-  dependencies:
-    has-symbols "^1.0.1"
-
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
@@ -3561,6 +3633,11 @@ jest@^26.0.1:
     import-local "^3.0.2"
     jest-cli "^26.0.1"
 
+js-stringify@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+  integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds=
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -3665,6 +3742,14 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+jstransformer@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  integrity sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=
+  dependencies:
+    is-promise "^2.0.0"
+    promise "^7.0.1"
+
 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"
@@ -4308,7 +4393,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -5136,6 +5221,13 @@ promise.series@^0.2.0:
   resolved "https://registry.yarnpkg.com/promise.series/-/promise.series-0.2.0.tgz#2cc7ebe959fc3a6619c04ab4dbdc9e452d864bbd"
   integrity sha1-LMfr6Vn8OmYZwEq029yeRS2GS70=
 
+promise@^7.0.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
 prompts@^2.0.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"
@@ -5149,6 +5241,109 @@ psl@^1.1.28:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
+pug-attrs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-3.0.0.tgz#b10451e0348165e31fad1cc23ebddd9dc7347c41"
+  integrity sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==
+  dependencies:
+    constantinople "^4.0.1"
+    js-stringify "^1.0.2"
+    pug-runtime "^3.0.0"
+
+pug-code-gen@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.1.tgz#ff3b337b100c494ea63ef766091d27f7d73acb7e"
+  integrity sha512-xJIGvmXTQlkJllq6hqxxjRWcay2F9CU69TuAuiVZgHK0afOhG5txrQOcZyaPHBvSWCU/QQOqEp5XCH94rRZpBQ==
+  dependencies:
+    constantinople "^4.0.1"
+    doctypes "^1.1.0"
+    js-stringify "^1.0.2"
+    pug-attrs "^3.0.0"
+    pug-error "^2.0.0"
+    pug-runtime "^3.0.0"
+    void-elements "^3.1.0"
+    with "^7.0.0"
+
+pug-error@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.0.0.tgz#5c62173cb09c34de2a2ce04f17b8adfec74d8ca5"
+  integrity sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==
+
+pug-filters@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-4.0.0.tgz#d3e49af5ba8472e9b7a66d980e707ce9d2cc9b5e"
+  integrity sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==
+  dependencies:
+    constantinople "^4.0.1"
+    jstransformer "1.0.0"
+    pug-error "^2.0.0"
+    pug-walk "^2.0.0"
+    resolve "^1.15.1"
+
+pug-lexer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-5.0.0.tgz#0b779e7d8cbf0f103803675be96351942fd9a727"
+  integrity sha512-52xMk8nNpuyQ/M2wjZBN5gXQLIylaGkAoTk5Y1pBhVqaopaoj8Z0iVzpbFZAqitL4RHNVDZRnJDsqEYe99Ti0A==
+  dependencies:
+    character-parser "^2.2.0"
+    is-expression "^4.0.0"
+    pug-error "^2.0.0"
+
+pug-linker@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-4.0.0.tgz#12cbc0594fc5a3e06b9fc59e6f93c146962a7708"
+  integrity sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==
+  dependencies:
+    pug-error "^2.0.0"
+    pug-walk "^2.0.0"
+
+pug-load@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-3.0.0.tgz#9fd9cda52202b08adb11d25681fb9f34bd41b662"
+  integrity sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==
+  dependencies:
+    object-assign "^4.1.1"
+    pug-walk "^2.0.0"
+
+pug-parser@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-6.0.0.tgz#a8fdc035863a95b2c1dc5ebf4ecf80b4e76a1260"
+  integrity sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==
+  dependencies:
+    pug-error "^2.0.0"
+    token-stream "1.0.0"
+
+pug-runtime@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-3.0.0.tgz#d523025fdc0a1efe70929d1fd3a2d24121ffffb6"
+  integrity sha512-GoEPcmQNnaTsePEdVA05bDpY+Op5VLHKayg08AQiqJBWU/yIaywEYv7TetC5dEQS3fzBBoyb2InDcZEg3mPTIA==
+
+pug-strip-comments@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz#f94b07fd6b495523330f490a7f554b4ff876303e"
+  integrity sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==
+  dependencies:
+    pug-error "^2.0.0"
+
+pug-walk@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-2.0.0.tgz#417aabc29232bb4499b5b5069a2b2d2a24d5f5fe"
+  integrity sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==
+
+pug@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.0.tgz#101eecd7a236cd9906e420e17799d4d57f2b7d93"
+  integrity sha512-inmsJyFBSHZaiGLaguoFgJGViX0If6AcfcElimvwj9perqjDpUpw79UIEDZbWFmoGVidh08aoE+e8tVkjVJPCw==
+  dependencies:
+    pug-code-gen "^3.0.0"
+    pug-filters "^4.0.0"
+    pug-lexer "^5.0.0"
+    pug-linker "^4.0.0"
+    pug-load "^3.0.0"
+    pug-parser "^6.0.0"
+    pug-runtime "^3.0.0"
+    pug-strip-comments "^2.0.0"
+
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -5407,7 +5602,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.6, resolve@^1.15.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==
@@ -6200,6 +6395,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+token-stream@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4"
+  integrity sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=
+
 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"
@@ -6432,6 +6632,11 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+void-elements@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
+  integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
+
 w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
@@ -6508,6 +6713,16 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
+with@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/with/-/with-7.0.2.tgz#ccee3ad542d25538a7a7a80aad212b9828495bac"
+  integrity sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==
+  dependencies:
+    "@babel/parser" "^7.9.6"
+    "@babel/types" "^7.9.6"
+    assert-never "^1.2.1"
+    babel-walk "3.0.0-canary-5"
+
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"