From 80e44a8fbb2677396c7ef557460e54979dc04f59 Mon Sep 17 00:00:00 2001
From: Roman Imankulov <roman.imankulov@gmail.com>
Date: Thu, 2 Jun 2022 08:15:38 +0100
Subject: [PATCH 01/72] docs: update Heroku deployment instructions (#7910)

---
 docs/guide/static-deploy.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/guide/static-deploy.md b/docs/guide/static-deploy.md
index 7b732cb990cbf6..97ebae14372340 100644
--- a/docs/guide/static-deploy.md
+++ b/docs/guide/static-deploy.md
@@ -266,12 +266,17 @@ You can also deploy to a [custom domain](http://surge.sh/help/adding-a-custom-do
 
    # creates a new app with a specified name
    $ heroku apps:create example
+   ```
+
+6. Set buildpacks. We use `heroku/nodejs` to build the project and `heroku-buildpack-static` to serve it.
 
-   # set buildpack for static sites
-   $ heroku buildpacks:set https://github.com/heroku/heroku-buildpack-static.git
+   ```bash
+   # set buildpacks
+   $ heroku buildpacks:set heroku/nodejs
+   $ heroku buildpacks:add https://github.com/heroku/heroku-buildpack-static.git
    ```
 
-6. Deploy your site:
+7. Deploy your site:
 
    ```bash
    # publish site

From e9925948fd4e199625bbb25ee931bed1d50e9618 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Fri, 3 Jun 2022 22:20:03 +0800
Subject: [PATCH 02/72] feat: expose `version` (#8456)

---
 packages/vite/src/node/publicUtils.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/vite/src/node/publicUtils.ts b/packages/vite/src/node/publicUtils.ts
index e24db763814dec..31c7135965a3d8 100644
--- a/packages/vite/src/node/publicUtils.ts
+++ b/packages/vite/src/node/publicUtils.ts
@@ -3,6 +3,7 @@
  * This file will be bundled to ESM and CJS and redirected by ../index.cjs
  * Please control the side-effects by checking the ./dist/node-cjs/publicUtils.cjs bundle
  */
+export { VERSION as version } from './constants'
 export {
   splitVendorChunkPlugin,
   splitVendorChunk

From d97e4022c4253c42e44483b9c88a7c2b76a713a8 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Fri, 3 Jun 2022 22:22:50 +0800
Subject: [PATCH 03/72] chore: resolve ssr options (#8455)

---
 packages/vite/src/node/config.ts    | 28 ++++-----------------
 packages/vite/src/node/index.ts     |  6 +++++
 packages/vite/src/node/ssr/index.ts | 39 +++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 23 deletions(-)
 create mode 100644 packages/vite/src/node/ssr/index.ts

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
index d80f5a60583abc..a9e6ba33f1d0ba 100644
--- a/packages/vite/src/node/config.ts
+++ b/packages/vite/src/node/config.ts
@@ -41,6 +41,8 @@ import type { PluginContainer } from './server/pluginContainer'
 import { createPluginContainer } from './server/pluginContainer'
 import type { PackageCache } from './packages'
 import { loadEnv, resolveEnvPrefix } from './env'
+import type { ResolvedSSROptions, SSROptions } from './ssr'
+import { resolveSSROptions } from './ssr'
 
 const debug = createDebugger('vite:config')
 
@@ -228,29 +230,6 @@ export interface ExperimentalOptions {
   importGlobRestoreExtension?: boolean
 }
 
-export type SSRTarget = 'node' | 'webworker'
-
-export type SSRFormat = 'esm' | 'cjs'
-
-export interface SSROptions {
-  external?: string[]
-  noExternal?: string | RegExp | (string | RegExp)[] | true
-  /**
-   * Define the target for the ssr build. The browser field in package.json
-   * is ignored for node but used if webworker is the target
-   * Default: 'node'
-   */
-  target?: SSRTarget
-  /**
-   * Define the format for the ssr build. Since Vite v3 the SSR build generates ESM by default.
-   * `'cjs'` can be selected to generate a CJS build, but it isn't recommended. This option is
-   * left marked as experimental to give users more time to update to ESM. CJS builds requires
-   * complex externalization heuristics that aren't present in the ESM format.
-   * @experimental
-   */
-  format?: SSRFormat
-}
-
 export interface ResolveWorkerOptions {
   format: 'es' | 'iife'
   plugins: Plugin[]
@@ -285,6 +264,7 @@ export type ResolvedConfig = Readonly<
     server: ResolvedServerOptions
     build: ResolvedBuildOptions
     preview: ResolvedPreviewOptions
+    ssr: ResolvedSSROptions | undefined
     assetsInclude: (file: string) => boolean
     logger: Logger
     createResolver: (options?: Partial<InternalResolveOptions>) => ResolveFn
@@ -491,6 +471,7 @@ export async function resolveConfig(
       : ''
 
   const server = resolveServerOptions(resolvedRoot, config.server, logger)
+  const ssr = resolveSSROptions(config.ssr)
 
   const optimizeDeps = config.optimizeDeps || {}
 
@@ -508,6 +489,7 @@ export async function resolveConfig(
     cacheDir,
     command,
     mode,
+    ssr,
     isWorker: false,
     mainConfig: null,
     isProduction,
diff --git a/packages/vite/src/node/index.ts b/packages/vite/src/node/index.ts
index ff8c0ebdf6abab..2eb69befb4ee2a 100644
--- a/packages/vite/src/node/index.ts
+++ b/packages/vite/src/node/index.ts
@@ -39,6 +39,12 @@ export type {
   DepsOptimizer,
   ExportsData
 } from './optimizer'
+export type {
+  ResolvedSSROptions,
+  SSROptions,
+  SSRFormat,
+  SSRTarget
+} from './ssr'
 export type { Plugin } from './plugin'
 export type { PackageCache, PackageData } from './packages'
 export type {
diff --git a/packages/vite/src/node/ssr/index.ts b/packages/vite/src/node/ssr/index.ts
new file mode 100644
index 00000000000000..84f050ff8e41d4
--- /dev/null
+++ b/packages/vite/src/node/ssr/index.ts
@@ -0,0 +1,39 @@
+export type SSRTarget = 'node' | 'webworker'
+export type SSRFormat = 'esm' | 'cjs'
+
+export interface SSROptions {
+  external?: string[]
+  noExternal?: string | RegExp | (string | RegExp)[] | true
+  /**
+   * Define the target for the ssr build. The browser field in package.json
+   * is ignored for node but used if webworker is the target
+   * Default: 'node'
+   */
+  target?: SSRTarget
+  /**
+   * Define the format for the ssr build. Since Vite v3 the SSR build generates ESM by default.
+   * `'cjs'` can be selected to generate a CJS build, but it isn't recommended. This option is
+   * left marked as experimental to give users more time to update to ESM. CJS builds requires
+   * complex externalization heuristics that aren't present in the ESM format.
+   * @experimental
+   */
+  format?: SSRFormat
+}
+
+export interface ResolvedSSROptions extends SSROptions {
+  target: SSRTarget
+  format: SSRFormat
+}
+
+export function resolveSSROptions(
+  ssr: SSROptions | undefined
+): ResolvedSSROptions | undefined {
+  if (ssr === undefined) {
+    return undefined
+  }
+  return {
+    format: 'esm',
+    target: 'node',
+    ...ssr
+  }
+}

From 64fc61cf76cc62b1cafc2c3dab738c22cb7f2d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Sun, 5 Jun 2022 15:04:04 +0900
Subject: [PATCH 04/72] perf: disable postcss sourcemap when unused (#8451)

---
 packages/vite/src/node/plugins/css.ts | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
index 1fa30f6a272ddd..89bbfd6c8c46f4 100644
--- a/packages/vite/src/node/plugins/css.ts
+++ b/packages/vite/src/node/plugins/css.ts
@@ -837,15 +837,19 @@ async function compileCSS(
       ...postcssOptions,
       to: id,
       from: id,
-      map: {
-        inline: false,
-        annotation: false,
-        // postcss may return virtual files
-        // we cannot obtain content of them, so this needs to be enabled
-        sourcesContent: true
-        // when "prev: preprocessorMap", the result map may include duplicate filename in `postcssResult.map.sources`
-        // prev: preprocessorMap,
-      }
+      ...(devSourcemap
+        ? {
+            map: {
+              inline: false,
+              annotation: false,
+              // postcss may return virtual files
+              // we cannot obtain content of them, so this needs to be enabled
+              sourcesContent: true
+              // when "prev: preprocessorMap", the result map may include duplicate filename in `postcssResult.map.sources`
+              // prev: preprocessorMap,
+            }
+          }
+        : {})
     })
 
   // record CSS dependencies from @imports

From 129b4997859e3e17bcfd40d422c4dfaecccc15cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Sun, 5 Jun 2022 15:04:32 +0900
Subject: [PATCH 05/72] chore: generate vite sourcemap when not production
 (#8453)

---
 packages/vite/rollup.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vite/rollup.config.ts b/packages/vite/rollup.config.ts
index 6759ede01d14c2..7232fa2484fff5 100644
--- a/packages/vite/rollup.config.ts
+++ b/packages/vite/rollup.config.ts
@@ -183,7 +183,7 @@ function createNodeConfig(isProduction: boolean) {
     ],
     plugins: createNodePlugins(
       isProduction,
-      false,
+      !isProduction,
       // in production we use api-extractor for dts generation
       // in development we need to rely on the rollup ts plugin
       isProduction ? false : path.resolve(__dirname, 'dist/node')

From 1061bbdaf81c2808ed8a86946cf0e07a0d8e5b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Sun, 5 Jun 2022 15:28:10 +0900
Subject: [PATCH 06/72] fix(optimizer): external require-import conversion
 (fixes #2492, #3409) (#8459)

---
 .../src/node/optimizer/esbuildDepPlugin.ts    | 28 ++++++++++++++++++-
 .../__tests__/optimize-deps.spec.ts           |  6 +++-
 .../optimize-deps/dep-cjs-with-assets/foo.css |  3 ++
 .../dep-cjs-with-assets/index.js              |  3 ++
 .../dep-cjs-with-assets/package.json          |  6 ++++
 .../optimize-deps/dep-linked-include/test.css |  2 +-
 playground/optimize-deps/index.html           |  8 ++++++
 playground/optimize-deps/package.json         |  1 +
 pnpm-lock.yaml                                | 11 ++++++++
 9 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 playground/optimize-deps/dep-cjs-with-assets/foo.css
 create mode 100644 playground/optimize-deps/dep-cjs-with-assets/index.js
 create mode 100644 playground/optimize-deps/dep-cjs-with-assets/package.json

diff --git a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
index 0c32af75219438..ee2a6e18cf04c6 100644
--- a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
+++ b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
@@ -13,6 +13,10 @@ import {
 import { browserExternalId } from '../plugins/resolve'
 import type { ExportsData } from '.'
 
+const externalWithConversionNamespace =
+  'vite:dep-pre-bundle:external-conversion'
+const convertedExternalPrefix = 'vite-dep-pre-bundle-external:'
+
 const externalTypes = [
   'css',
   // supported pre-processor types
@@ -80,20 +84,42 @@ export function esbuildDepPlugin(
     name: 'vite:dep-pre-bundle',
     setup(build) {
       // externalize assets and commonly known non-js file types
+      // See #8459 for more details about this require-import conversion
       build.onResolve(
         {
           filter: new RegExp(`\\.(` + allExternalTypes.join('|') + `)(\\?.*)?$`)
         },
         async ({ path: id, importer, kind }) => {
+          // if the prefix exist, it is already converted to `import`, so set `external: true`
+          if (id.startsWith(convertedExternalPrefix)) {
+            return {
+              path: id.slice(convertedExternalPrefix.length),
+              external: true
+            }
+          }
+
           const resolved = await resolve(id, importer, kind)
           if (resolved) {
+            // here it is not set to `external: true` to convert `require` to `import`
             return {
               path: resolved,
-              external: true
+              namespace: externalWithConversionNamespace
             }
           }
         }
       )
+      build.onLoad(
+        { filter: /./, namespace: externalWithConversionNamespace },
+        (args) => {
+          // import itself with prefix (this is the actual part of require-import conversion)
+          return {
+            contents:
+              `export { default } from "${convertedExternalPrefix}${args.path}";` +
+              `export * from "${convertedExternalPrefix}${args.path}";`,
+            loader: 'js'
+          }
+        }
+      )
 
       function resolveEntry(id: string) {
         const flatId = flattenId(id)
diff --git a/playground/optimize-deps/__tests__/optimize-deps.spec.ts b/playground/optimize-deps/__tests__/optimize-deps.spec.ts
index a32274dca25e0c..929455300ba555 100644
--- a/playground/optimize-deps/__tests__/optimize-deps.spec.ts
+++ b/playground/optimize-deps/__tests__/optimize-deps.spec.ts
@@ -77,7 +77,11 @@ test('dep with dynamic import', async () => {
 })
 
 test('dep with css import', async () => {
-  expect(await getColor('h1')).toBe('red')
+  expect(await getColor('.dep-linked-include')).toBe('red')
+})
+
+test('CJS dep with css import', async () => {
+  expect(await getColor('.cjs-with-assets')).toBe('blue')
 })
 
 test('dep w/ non-js files handled via plugin', async () => {
diff --git a/playground/optimize-deps/dep-cjs-with-assets/foo.css b/playground/optimize-deps/dep-cjs-with-assets/foo.css
new file mode 100644
index 00000000000000..8347f9fb0c358e
--- /dev/null
+++ b/playground/optimize-deps/dep-cjs-with-assets/foo.css
@@ -0,0 +1,3 @@
+.cjs-with-assets {
+  color: blue;
+}
diff --git a/playground/optimize-deps/dep-cjs-with-assets/index.js b/playground/optimize-deps/dep-cjs-with-assets/index.js
new file mode 100644
index 00000000000000..26b296af650d88
--- /dev/null
+++ b/playground/optimize-deps/dep-cjs-with-assets/index.js
@@ -0,0 +1,3 @@
+require('./foo.css')
+
+exports.a = 11
diff --git a/playground/optimize-deps/dep-cjs-with-assets/package.json b/playground/optimize-deps/dep-cjs-with-assets/package.json
new file mode 100644
index 00000000000000..2e4f6e68c7510c
--- /dev/null
+++ b/playground/optimize-deps/dep-cjs-with-assets/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "dep-cjs-with-assets",
+  "private": true,
+  "version": "0.0.0",
+  "main": "index.js"
+}
diff --git a/playground/optimize-deps/dep-linked-include/test.css b/playground/optimize-deps/dep-linked-include/test.css
index 60f1eab97137f7..20ae3263941d1e 100644
--- a/playground/optimize-deps/dep-linked-include/test.css
+++ b/playground/optimize-deps/dep-linked-include/test.css
@@ -1,3 +1,3 @@
-body {
+.dep-linked-include {
   color: red;
 }
diff --git a/playground/optimize-deps/index.html b/playground/optimize-deps/index.html
index 3cd619f9ce9236..c70ab5b2f09322 100644
--- a/playground/optimize-deps/index.html
+++ b/playground/optimize-deps/index.html
@@ -35,6 +35,12 @@ <h2>Detecting linked src package and optimizing its deps (lodash-es)</h2>
 <h2>Optimizing force included dep even when it's linked</h2>
 <div class="force-include"></div>
 
+<h2>Dep with CSS</h2>
+<div class="dep-linked-include">This should be red</div>
+
+<h2>CJS Dep with CSS</h2>
+<div class="cjs-with-assets">This should be blue</div>
+
 <h2>import * as ...</h2>
 <div class="import-star"></div>
 
@@ -91,6 +97,8 @@ <h2>Reused variable names</h2>
     text('.import-star', `[success] ${keys.join(', ')}`)
   }
 
+  import 'dep-cjs-with-assets'
+
   import { env } from 'dep-node-env'
   text('.node-env', env)
 
diff --git a/playground/optimize-deps/package.json b/playground/optimize-deps/package.json
index 055d23bc9ce597..d323ca77af0a29 100644
--- a/playground/optimize-deps/package.json
+++ b/playground/optimize-deps/package.json
@@ -13,6 +13,7 @@
     "clipboard": "^2.0.11",
     "dep-cjs-compiled-from-cjs": "file:./dep-cjs-compiled-from-cjs",
     "dep-cjs-compiled-from-esm": "file:./dep-cjs-compiled-from-esm",
+    "dep-cjs-with-assets": "file:./dep-cjs-with-assets",
     "dep-esbuild-plugin-transform": "file:./dep-esbuild-plugin-transform",
     "dep-linked": "link:./dep-linked",
     "dep-linked-include": "link:./dep-linked-include",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index acef1fe7331aef..aa07fd3c5ae874 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -576,6 +576,7 @@ importers:
       clipboard: ^2.0.11
       dep-cjs-compiled-from-cjs: file:./dep-cjs-compiled-from-cjs
       dep-cjs-compiled-from-esm: file:./dep-cjs-compiled-from-esm
+      dep-cjs-with-assets: file:./dep-cjs-with-assets
       dep-esbuild-plugin-transform: file:./dep-esbuild-plugin-transform
       dep-linked: link:./dep-linked
       dep-linked-include: link:./dep-linked-include
@@ -596,6 +597,7 @@ importers:
       clipboard: 2.0.11
       dep-cjs-compiled-from-cjs: file:playground/optimize-deps/dep-cjs-compiled-from-cjs
       dep-cjs-compiled-from-esm: file:playground/optimize-deps/dep-cjs-compiled-from-esm
+      dep-cjs-with-assets: file:playground/optimize-deps/dep-cjs-with-assets
       dep-esbuild-plugin-transform: file:playground/optimize-deps/dep-esbuild-plugin-transform
       dep-linked: link:dep-linked
       dep-linked-include: link:dep-linked-include
@@ -620,6 +622,9 @@ importers:
   playground/optimize-deps/dep-cjs-compiled-from-esm:
     specifiers: {}
 
+  playground/optimize-deps/dep-cjs-with-assets:
+    specifiers: {}
+
   playground/optimize-deps/dep-esbuild-plugin-transform:
     specifiers: {}
 
@@ -8810,6 +8815,12 @@ packages:
     version: 0.0.0
     dev: false
 
+  file:playground/optimize-deps/dep-cjs-with-assets:
+    resolution: {directory: playground/optimize-deps/dep-cjs-with-assets, type: directory}
+    name: dep-cjs-with-assets
+    version: 0.0.0
+    dev: false
+
   file:playground/optimize-deps/dep-esbuild-plugin-transform:
     resolution: {directory: playground/optimize-deps/dep-esbuild-plugin-transform, type: directory}
     name: dep-esbuild-plugin-transform

From e2e44ff32b7b2bcbcae793cdcda263d1ad495fc0 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Sun, 5 Jun 2022 18:55:45 +0800
Subject: [PATCH 07/72] feat: handle named imports of builtin modules (#8338)

---
 .../src/node/optimizer/esbuildDepPlugin.ts    | 36 ++++++++--
 .../vite/src/node/plugins/importAnalysis.ts   | 69 +++++++++++++------
 packages/vite/src/node/plugins/resolve.ts     | 16 +++--
 playground/optimize-deps/.env                 |  1 -
 .../__tests__/optimize-deps.spec.ts           | 41 ++++++++++-
 .../dep-with-builtin-module-cjs/index.js      | 18 +++++
 .../dep-with-builtin-module-cjs/package.json  |  6 ++
 .../dep-with-builtin-module-esm/index.js      | 21 ++++++
 .../dep-with-builtin-module-esm/package.json  |  7 ++
 playground/optimize-deps/index.html           | 31 +++++++++
 playground/optimize-deps/package.json         |  2 +
 playground/optimize-deps/vite.config.js       | 13 ++++
 pnpm-lock.yaml                                | 22 ++++++
 13 files changed, 244 insertions(+), 39 deletions(-)
 delete mode 100644 playground/optimize-deps/.env
 create mode 100644 playground/optimize-deps/dep-with-builtin-module-cjs/index.js
 create mode 100644 playground/optimize-deps/dep-with-builtin-module-cjs/package.json
 create mode 100644 playground/optimize-deps/dep-with-builtin-module-esm/index.js
 create mode 100644 playground/optimize-deps/dep-with-builtin-module-esm/package.json

diff --git a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
index ee2a6e18cf04c6..fbfb658e9f7505 100644
--- a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
+++ b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
@@ -219,15 +219,37 @@ export function esbuildDepPlugin(
 
       build.onLoad(
         { filter: /.*/, namespace: 'browser-external' },
-        ({ path: id }) => {
+        ({ path }) => {
           return {
-            contents:
-              `export default new Proxy({}, {
-  get() {
-    throw new Error('Module "${id}" has been externalized for ` +
-              `browser compatibility and cannot be accessed in client code.')
+            // Return in CJS to intercept named imports. Use `Object.create` to
+            // create the Proxy in the prototype to workaround esbuild issue. Why?
+            //
+            // In short, esbuild cjs->esm flow:
+            // 1. Create empty object using `Object.create(Object.getPrototypeOf(module.exports))`.
+            // 2. Assign props of `module.exports` to the object.
+            // 3. Return object for ESM use.
+            //
+            // If we do `module.exports = new Proxy({}, {})`, step 1 returns empty object,
+            // step 2 does nothing as there's no props for `module.exports`. The final object
+            // is just an empty object.
+            //
+            // Creating the Proxy in the prototype satisfies step 1 immediately, which means
+            // the returned object is a Proxy that we can intercept.
+            //
+            // Note: Skip keys that are accessed by esbuild and browser devtools.
+            contents: `\
+module.exports = Object.create(new Proxy({}, {
+  get(_, key) {
+    if (
+      key !== '__esModule' &&
+      key !== '__proto__' &&
+      key !== 'constructor' &&
+      key !== 'splice'
+    ) {
+      throw new Error(\`Module "${path}" has been externalized for browser compatibility. Cannot access "${path}.\${key}" in client code.\`)
+    }
   }
-})`
+}))`
           }
         }
       )
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
index ba221b4b1d5283..0c279da0601727 100644
--- a/packages/vite/src/node/plugins/importAnalysis.ts
+++ b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -58,6 +58,7 @@ import {
   delayDepsOptimizerUntil
 } from './optimizedDeps'
 import { isCSSRequest, isDirectCSSRequest } from './css'
+import { browserExternalId } from './resolve'
 
 const isDebug = !!process.env.DEBUG
 const debug = createDebugger('vite:import-analysis')
@@ -322,11 +323,9 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
           s: start,
           e: end,
           ss: expStart,
-          se: expEnd,
           d: dynamicIndex,
           // #2083 User may use escape path,
           // so use imports[index].n to get the unescaped string
-          // @ts-ignore
           n: specifier
         } = imports[index]
 
@@ -434,29 +433,20 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
                 }
               } else if (needsInterop) {
                 debug(`${url} needs interop`)
-                if (isDynamicImport) {
-                  // rewrite `import('package')` to expose the default directly
-                  str().overwrite(
-                    expStart,
-                    expEnd,
-                    `import('${url}').then(m => m.default && m.default.__esModule ? m.default : ({ ...m.default, default: m.default }))`,
-                    { contentOnly: true }
-                  )
-                } else {
-                  const exp = source.slice(expStart, expEnd)
-                  const rewritten = transformCjsImport(exp, url, rawUrl, index)
-                  if (rewritten) {
-                    str().overwrite(expStart, expEnd, rewritten, {
-                      contentOnly: true
-                    })
-                  } else {
-                    // #1439 export * from '...'
-                    str().overwrite(start, end, url, { contentOnly: true })
-                  }
-                }
+                interopNamedImports(str(), imports[index], url, index)
                 rewriteDone = true
               }
             }
+            // If source code imports builtin modules via named imports, the stub proxy export
+            // would fail as it's `export default` only. Apply interop for builtin modules to
+            // correctly throw the error message.
+            else if (
+              url.includes(browserExternalId) &&
+              source.slice(expStart, start).includes('{')
+            ) {
+              interopNamedImports(str(), imports[index], url, index)
+              rewriteDone = true
+            }
             if (!rewriteDone) {
               str().overwrite(start, end, isDynamicImport ? `'${url}'` : url, {
                 contentOnly: true
@@ -639,6 +629,41 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
   }
 }
 
+function interopNamedImports(
+  str: MagicString,
+  importSpecifier: ImportSpecifier,
+  rewrittenUrl: string,
+  importIndex: number
+) {
+  const source = str.original
+  const {
+    s: start,
+    e: end,
+    ss: expStart,
+    se: expEnd,
+    d: dynamicIndex
+  } = importSpecifier
+  if (dynamicIndex > -1) {
+    // rewrite `import('package')` to expose the default directly
+    str.overwrite(
+      expStart,
+      expEnd,
+      `import('${rewrittenUrl}').then(m => m.default && m.default.__esModule ? m.default : ({ ...m.default, default: m.default }))`,
+      { contentOnly: true }
+    )
+  } else {
+    const exp = source.slice(expStart, expEnd)
+    const rawUrl = source.slice(start, end)
+    const rewritten = transformCjsImport(exp, rewrittenUrl, rawUrl, importIndex)
+    if (rewritten) {
+      str.overwrite(expStart, expEnd, rewritten, { contentOnly: true })
+    } else {
+      // #1439 export * from '...'
+      str.overwrite(start, end, rewrittenUrl, { contentOnly: true })
+    }
+  }
+}
+
 type ImportNameSpecifier = { importedName: string; localName: string }
 
 /**
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
index 33a5ad31efe5b4..7ccc3a7eb5cb7a 100644
--- a/packages/vite/src/node/plugins/resolve.ts
+++ b/packages/vite/src/node/plugins/resolve.ts
@@ -339,15 +339,17 @@ export function resolvePlugin(baseOptions: InternalResolveOptions): Plugin {
 
     load(id) {
       if (id.startsWith(browserExternalId)) {
-        return isProduction
-          ? `export default {}`
-          : `export default new Proxy({}, {
-  get() {
-    throw new Error('Module "${id.slice(
-      browserExternalId.length + 1
-    )}" has been externalized for browser compatibility and cannot be accessed in client code.')
+        if (isProduction) {
+          return `export default {}`
+        } else {
+          id = id.slice(browserExternalId.length + 1)
+          return `\
+export default new Proxy({}, {
+  get(_, key) {
+    throw new Error(\`Module "${id}" has been externalized for browser compatibility. Cannot access "${id}.\${key}" in client code.\`)
   }
 })`
+        }
       }
     }
   }
diff --git a/playground/optimize-deps/.env b/playground/optimize-deps/.env
deleted file mode 100644
index 995fca4af2ee24..00000000000000
--- a/playground/optimize-deps/.env
+++ /dev/null
@@ -1 +0,0 @@
-NODE_ENV=production
\ No newline at end of file
diff --git a/playground/optimize-deps/__tests__/optimize-deps.spec.ts b/playground/optimize-deps/__tests__/optimize-deps.spec.ts
index 929455300ba555..bf4fee61e4e74c 100644
--- a/playground/optimize-deps/__tests__/optimize-deps.spec.ts
+++ b/playground/optimize-deps/__tests__/optimize-deps.spec.ts
@@ -1,4 +1,11 @@
-import { getColor, page } from '~utils'
+import {
+  browserErrors,
+  browserLogs,
+  getColor,
+  isBuild,
+  isServe,
+  page
+} from '~utils'
 
 test('default + named imports from cjs dep (react)', async () => {
   expect(await page.textContent('.cjs button')).toBe('count is 0')
@@ -63,7 +70,7 @@ test('import * from optimized dep', async () => {
 })
 
 test('import from dep with process.env.NODE_ENV', async () => {
-  expect(await page.textContent('.node-env')).toMatch(`prod`)
+  expect(await page.textContent('.node-env')).toMatch(isBuild ? 'prod' : 'dev')
 })
 
 test('import from dep with .notjs files', async () => {
@@ -113,3 +120,33 @@ test('import aliased package with colon', async () => {
 test('variable names are reused in different scripts', async () => {
   expect(await page.textContent('.reused-variable-names')).toBe('reused')
 })
+
+test.runIf(isServe)('error on builtin modules usage', () => {
+  expect(browserLogs).toEqual(
+    expect.arrayContaining([
+      // from dep-with-builtin-module-esm top-level try-catch
+      expect.stringContaining(
+        'dep-with-builtin-module-esm Error: Module "fs" has been externalized for browser compatibility. Cannot access "fs.readFileSync" in client code.'
+      ),
+      expect.stringContaining(
+        'dep-with-builtin-module-esm Error: Module "path" has been externalized for browser compatibility. Cannot access "path.join" in client code.'
+      ),
+      // from dep-with-builtin-module-cjs top-level try-catch
+      expect.stringContaining(
+        'dep-with-builtin-module-cjs Error: Module "path" has been externalized for browser compatibility. Cannot access "path.join" in client code.'
+      )
+    ])
+  )
+
+  expect(browserErrors.map((error) => error.message)).toEqual(
+    expect.arrayContaining([
+      // from user source code
+      'Module "buffer" has been externalized for browser compatibility. Cannot access "buffer.Buffer" in client code.',
+      'Module "child_process" has been externalized for browser compatibility. Cannot access "child_process.execSync" in client code.',
+      // from dep-with-builtin-module-esm read()
+      'Module "fs" has been externalized for browser compatibility. Cannot access "fs.readFileSync" in client code.',
+      // from dep-with-builtin-module-esm read()
+      'Module "fs" has been externalized for browser compatibility. Cannot access "fs.readFileSync" in client code.'
+    ])
+  )
+})
diff --git a/playground/optimize-deps/dep-with-builtin-module-cjs/index.js b/playground/optimize-deps/dep-with-builtin-module-cjs/index.js
new file mode 100644
index 00000000000000..920a0da0d97dda
--- /dev/null
+++ b/playground/optimize-deps/dep-with-builtin-module-cjs/index.js
@@ -0,0 +1,18 @@
+const fs = require('fs')
+const path = require('path')
+
+// NOTE: require destructure would error immediately because of how esbuild
+// compiles it. There's no way around it as it's direct property access, which
+// triggers the Proxy get trap.
+
+// access from default import
+try {
+  path.join()
+} catch (e) {
+  console.log('dep-with-builtin-module-cjs', e)
+}
+
+// access from function
+module.exports.read = () => {
+  return fs.readFileSync('test')
+}
diff --git a/playground/optimize-deps/dep-with-builtin-module-cjs/package.json b/playground/optimize-deps/dep-with-builtin-module-cjs/package.json
new file mode 100644
index 00000000000000..8b39306140e804
--- /dev/null
+++ b/playground/optimize-deps/dep-with-builtin-module-cjs/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "dep-with-builtin-module-cjs",
+  "private": true,
+  "version": "0.0.0",
+  "main": "index.js"
+}
diff --git a/playground/optimize-deps/dep-with-builtin-module-esm/index.js b/playground/optimize-deps/dep-with-builtin-module-esm/index.js
new file mode 100644
index 00000000000000..e3734720051aca
--- /dev/null
+++ b/playground/optimize-deps/dep-with-builtin-module-esm/index.js
@@ -0,0 +1,21 @@
+import { readFileSync } from 'fs'
+import path from 'path'
+
+// access from named import
+try {
+  readFileSync()
+} catch (e) {
+  console.log('dep-with-builtin-module-esm', e)
+}
+
+// access from default import
+try {
+  path.join()
+} catch (e) {
+  console.log('dep-with-builtin-module-esm', e)
+}
+
+// access from function
+export function read() {
+  return readFileSync('test')
+}
diff --git a/playground/optimize-deps/dep-with-builtin-module-esm/package.json b/playground/optimize-deps/dep-with-builtin-module-esm/package.json
new file mode 100644
index 00000000000000..e01897e5a51850
--- /dev/null
+++ b/playground/optimize-deps/dep-with-builtin-module-esm/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "dep-with-builtin-module-esm",
+  "private": true,
+  "version": "0.0.0",
+  "main": "index.js",
+  "type": "module"
+}
diff --git a/playground/optimize-deps/index.html b/playground/optimize-deps/index.html
index c70ab5b2f09322..39d76fd83d0609 100644
--- a/playground/optimize-deps/index.html
+++ b/playground/optimize-deps/index.html
@@ -138,3 +138,34 @@ <h2>Reused variable names</h2>
   const reusedName = 'reused'
   text('.reused-variable-names', reusedName)
 </script>
+
+<script type="module">
+  // should error on builtin modules (named import)
+  import { Buffer } from 'buffer'
+  // named imports error immediately
+</script>
+
+<script type="module">
+  // should error on builtin modules (default import)
+  import cp from 'child_process'
+  // must access property to error
+  if (import.meta.env.DEV) {
+    cp.execSync()
+  }
+</script>
+
+<script type="module">
+  // should error on builtin modules from dep
+  import { read } from 'dep-with-builtin-module-esm'
+  if (import.meta.env.DEV) {
+    read()
+  }
+</script>
+
+<script type="module">
+  // should error on builtin modules from dep
+  import { read } from 'dep-with-builtin-module-cjs'
+  if (import.meta.env.DEV) {
+    read()
+  }
+</script>
diff --git a/playground/optimize-deps/package.json b/playground/optimize-deps/package.json
index d323ca77af0a29..7509b8284b9bc1 100644
--- a/playground/optimize-deps/package.json
+++ b/playground/optimize-deps/package.json
@@ -19,6 +19,8 @@
     "dep-linked-include": "link:./dep-linked-include",
     "dep-node-env": "file:./dep-node-env",
     "dep-not-js": "file:./dep-not-js",
+    "dep-with-builtin-module-cjs": "file:./dep-with-builtin-module-cjs",
+    "dep-with-builtin-module-esm": "file:./dep-with-builtin-module-esm",
     "dep-with-dynamic-import": "file:./dep-with-dynamic-import",
     "lodash-es": "^4.17.21",
     "nested-exclude": "file:./nested-exclude",
diff --git a/playground/optimize-deps/vite.config.js b/playground/optimize-deps/vite.config.js
index fb3bbfc4a33eb5..d5da62f3331fc2 100644
--- a/playground/optimize-deps/vite.config.js
+++ b/playground/optimize-deps/vite.config.js
@@ -62,6 +62,19 @@ module.exports = {
           return { code }
         }
       }
+    },
+    // TODO: Remove this one support for prebundling in build lands.
+    // It is expected that named importing in build doesn't work
+    // as it incurs a lot of overhead in build.
+    {
+      name: 'polyfill-named-fs-build',
+      apply: 'build',
+      enforce: 'pre',
+      load(id) {
+        if (id === '__vite-browser-external:fs') {
+          return `export default {}; export function readFileSync() {}`
+        }
+      }
     }
   ]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index aa07fd3c5ae874..5e2530f0dafc6b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -582,6 +582,8 @@ importers:
       dep-linked-include: link:./dep-linked-include
       dep-node-env: file:./dep-node-env
       dep-not-js: file:./dep-not-js
+      dep-with-builtin-module-cjs: file:./dep-with-builtin-module-cjs
+      dep-with-builtin-module-esm: file:./dep-with-builtin-module-esm
       dep-with-dynamic-import: file:./dep-with-dynamic-import
       lodash-es: ^4.17.21
       nested-exclude: file:./nested-exclude
@@ -603,6 +605,8 @@ importers:
       dep-linked-include: link:dep-linked-include
       dep-node-env: file:playground/optimize-deps/dep-node-env
       dep-not-js: file:playground/optimize-deps/dep-not-js
+      dep-with-builtin-module-cjs: file:playground/optimize-deps/dep-with-builtin-module-cjs
+      dep-with-builtin-module-esm: file:playground/optimize-deps/dep-with-builtin-module-esm
       dep-with-dynamic-import: file:playground/optimize-deps/dep-with-dynamic-import
       lodash-es: 4.17.21
       nested-exclude: file:playground/optimize-deps/nested-exclude
@@ -646,6 +650,12 @@ importers:
   playground/optimize-deps/dep-not-js:
     specifiers: {}
 
+  playground/optimize-deps/dep-with-builtin-module-cjs:
+    specifiers: {}
+
+  playground/optimize-deps/dep-with-builtin-module-esm:
+    specifiers: {}
+
   playground/optimize-deps/dep-with-dynamic-import:
     specifiers: {}
 
@@ -8839,6 +8849,18 @@ packages:
     version: 1.0.0
     dev: false
 
+  file:playground/optimize-deps/dep-with-builtin-module-cjs:
+    resolution: {directory: playground/optimize-deps/dep-with-builtin-module-cjs, type: directory}
+    name: dep-with-builtin-module-cjs
+    version: 0.0.0
+    dev: false
+
+  file:playground/optimize-deps/dep-with-builtin-module-esm:
+    resolution: {directory: playground/optimize-deps/dep-with-builtin-module-esm, type: directory}
+    name: dep-with-builtin-module-esm
+    version: 0.0.0
+    dev: false
+
   file:playground/optimize-deps/dep-with-dynamic-import:
     resolution: {directory: playground/optimize-deps/dep-with-dynamic-import, type: directory}
     name: dep-with-dynamic-import

From 908c9e4cdd2cceb0f01495e38066ffe33c21ddb8 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Sun, 5 Jun 2022 18:58:48 +0800
Subject: [PATCH 08/72] feat: preserve process env vars in lib build (#8090)

---
 packages/vite/src/node/plugins/define.ts | 44 ++++++++++++------------
 playground/lib/__tests__/lib.spec.ts     | 28 +++++++--------
 playground/lib/index.dist.html           |  9 +++++
 playground/lib/src/main.js               |  3 ++
 4 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/packages/vite/src/node/plugins/define.ts b/packages/vite/src/node/plugins/define.ts
index ca0f446cc1f58e..6edb1bd8858a11 100644
--- a/packages/vite/src/node/plugins/define.ts
+++ b/packages/vite/src/node/plugins/define.ts
@@ -10,15 +10,23 @@ const isNonJsRequest = (request: string): boolean => nonJsRe.test(request)
 
 export function definePlugin(config: ResolvedConfig): Plugin {
   const isBuild = config.command === 'build'
-
-  const processNodeEnv: Record<string, string> = {
-    'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || config.mode),
-    'global.process.env.NODE_ENV': JSON.stringify(
-      process.env.NODE_ENV || config.mode
-    ),
-    'globalThis.process.env.NODE_ENV': JSON.stringify(
-      process.env.NODE_ENV || config.mode
-    )
+  const isBuildLib = isBuild && config.build.lib
+
+  // ignore replace process.env in lib build
+  const processEnv: Record<string, string> = {}
+  const processNodeEnv: Record<string, string> = {}
+  if (!isBuildLib) {
+    const nodeEnv = process.env.NODE_ENV || config.mode
+    Object.assign(processEnv, {
+      'process.env.': `({}).`,
+      'global.process.env.': `({}).`,
+      'globalThis.process.env.': `({}).`
+    })
+    Object.assign(processNodeEnv, {
+      'process.env.NODE_ENV': JSON.stringify(nodeEnv),
+      'global.process.env.NODE_ENV': JSON.stringify(nodeEnv),
+      'globalThis.process.env.NODE_ENV': JSON.stringify(nodeEnv)
+    })
   }
 
   const userDefine: Record<string, string> = {}
@@ -27,7 +35,8 @@ export function definePlugin(config: ResolvedConfig): Plugin {
     userDefine[key] = typeof val === 'string' ? val : JSON.stringify(val)
   }
 
-  // during dev, import.meta properties are handled by importAnalysis plugin
+  // during dev, import.meta properties are handled by importAnalysis plugin.
+  // ignore replace import.meta.env in lib build
   const importMetaKeys: Record<string, string> = {}
   if (isBuild) {
     const env: Record<string, any> = {
@@ -47,22 +56,13 @@ export function definePlugin(config: ResolvedConfig): Plugin {
   function generatePattern(
     ssr: boolean
   ): [Record<string, string | undefined>, RegExp | null] {
-    const processEnv: Record<string, string> = {}
-    const isNeedProcessEnv = !ssr || config.ssr?.target === 'webworker'
-
-    if (isNeedProcessEnv) {
-      Object.assign(processEnv, {
-        'process.env.': `({}).`,
-        'global.process.env.': `({}).`,
-        'globalThis.process.env.': `({}).`
-      })
-    }
+    const replaceProcessEnv = !ssr || config.ssr?.target === 'webworker'
 
     const replacements: Record<string, string> = {
-      ...(isNeedProcessEnv ? processNodeEnv : {}),
+      ...(replaceProcessEnv ? processNodeEnv : {}),
       ...userDefine,
       ...importMetaKeys,
-      ...processEnv
+      ...(replaceProcessEnv ? processEnv : {})
     }
 
     const replacementsKeys = Object.keys(replacements)
diff --git a/playground/lib/__tests__/lib.spec.ts b/playground/lib/__tests__/lib.spec.ts
index 32c6edba1bdeb9..9046097f7e8375 100644
--- a/playground/lib/__tests__/lib.spec.ts
+++ b/playground/lib/__tests__/lib.spec.ts
@@ -1,11 +1,9 @@
-import path from 'path'
-import fs from 'fs'
 import {
   isBuild,
   isServe,
   page,
+  readFile,
   serverLogs,
-  testDir,
   untilUpdated
 } from '~utils'
 
@@ -16,20 +14,14 @@ describe.runIf(isBuild)('build', () => {
 
   test('umd', async () => {
     expect(await page.textContent('.umd')).toBe('It works')
-    const code = fs.readFileSync(
-      path.join(testDir, 'dist/my-lib-custom-filename.umd.js'),
-      'utf-8'
-    )
+    const code = readFile('dist/my-lib-custom-filename.umd.js')
     // esbuild helpers are injected inside of the UMD wrapper
     expect(code).toMatch(/^\(function\(/)
   })
 
   test('iife', async () => {
     expect(await page.textContent('.iife')).toBe('It works')
-    const code = fs.readFileSync(
-      path.join(testDir, 'dist/my-lib-custom-filename.iife.js'),
-      'utf-8'
-    )
+    const code = readFile('dist/my-lib-custom-filename.iife.js')
     // esbuild helpers are injected inside of the IIFE wrapper
     expect(code).toMatch(/^const MyLib=function\(\){"use strict";/)
   })
@@ -39,10 +31,7 @@ describe.runIf(isBuild)('build', () => {
       () => page.textContent('.dynamic-import-message'),
       'hello vite'
     )
-    const code = fs.readFileSync(
-      path.join(testDir, 'dist/lib/dynamic-import-message.es.mjs'),
-      'utf-8'
-    )
+    const code = readFile('dist/lib/dynamic-import-message.es.mjs')
     expect(code).not.toMatch('__vitePreload')
 
     // Test that library chunks are hashed
@@ -55,6 +44,15 @@ describe.runIf(isBuild)('build', () => {
       expect(log).not.toMatch('All "@import" rules must come first')
     })
   })
+
+  test('preserve process.env', () => {
+    const es = readFile('dist/my-lib-custom-filename.mjs')
+    const iife = readFile('dist/my-lib-custom-filename.iife.js')
+    const umd = readFile('dist/my-lib-custom-filename.umd.js')
+    expect(es).toMatch('process.env.NODE_ENV')
+    expect(iife).toMatch('process.env.NODE_ENV')
+    expect(umd).toMatch('process.env.NODE_ENV')
+  })
 })
 
 test.runIf(isServe)('dev', async () => {
diff --git a/playground/lib/index.dist.html b/playground/lib/index.dist.html
index 02362a9c111e5e..99f08c73396fea 100644
--- a/playground/lib/index.dist.html
+++ b/playground/lib/index.dist.html
@@ -4,6 +4,15 @@
 <div class="iife"></div>
 <div class="dynamic-import-message"></div>
 
+<script>
+  // shim test preserve process.env.NODE_ENV
+  globalThis.process = {
+    env: {
+      NODE_ENV: 'production'
+    }
+  }
+</script>
+
 <script type="module">
   import myLib from './my-lib-custom-filename.mjs'
 
diff --git a/playground/lib/src/main.js b/playground/lib/src/main.js
index cb2fb3b842dc4f..ca7adf0a873ae6 100644
--- a/playground/lib/src/main.js
+++ b/playground/lib/src/main.js
@@ -3,4 +3,7 @@ export default function myLib(sel) {
   console.log({ ...'foo' })
 
   document.querySelector(sel).textContent = 'It works'
+
+  // Env vars should not be replaced
+  console.log(process.env.NODE_ENV)
 }

From 477c7ac5c6df5f60f819a8ec831937416d35a471 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 Jun 2022 07:38:30 +0200
Subject: [PATCH 09/72] chore(deps): update dependency lint-staged to v13
 (#8475)

---
 package.json   |  2 +-
 pnpm-lock.yaml | 95 ++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 69 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index aafd42d91f7cf6..42647946e8fa49 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "execa": "^5.1.1",
     "fs-extra": "^10.1.0",
     "kill-port": "^1.6.1",
-    "lint-staged": "^12.4.3",
+    "lint-staged": "^13.0.0",
     "minimist": "^1.2.6",
     "node-fetch": "^2.6.7",
     "npm-run-all": "^4.1.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5e2530f0dafc6b..a1140991d8284c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -46,7 +46,7 @@ importers:
       execa: ^5.1.1
       fs-extra: ^10.1.0
       kill-port: ^1.6.1
-      lint-staged: ^12.4.3
+      lint-staged: ^13.0.0
       minimist: ^1.2.6
       node-fetch: ^2.6.7
       npm-run-all: ^4.1.5
@@ -104,7 +104,7 @@ importers:
       execa: 5.1.1
       fs-extra: 10.1.0
       kill-port: 1.6.1
-      lint-staged: 12.4.3
+      lint-staged: 13.0.0
       minimist: 1.2.6
       node-fetch: 2.6.7
       npm-run-all: 4.1.5
@@ -3780,19 +3780,6 @@ packages:
     dependencies:
       ms: 2.1.2
 
-  /debug/4.3.4_supports-color@9.2.2:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-      supports-color: 9.2.2
-    dev: true
-
   /decamelize-keys/1.1.0:
     resolution: {integrity: sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=}
     engines: {node: '>=0.10.0'}
@@ -4712,6 +4699,21 @@ packages:
       strip-final-newline: 2.0.0
     dev: true
 
+  /execa/6.1.0:
+    resolution: {integrity: sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      cross-spawn: 7.0.3
+      get-stream: 6.0.1
+      human-signals: 3.0.1
+      is-stream: 3.0.0
+      merge-stream: 2.0.0
+      npm-run-path: 5.1.0
+      onetime: 6.0.0
+      signal-exit: 3.0.7
+      strip-final-newline: 3.0.0
+    dev: true
+
   /express/4.18.1:
     resolution: {integrity: sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==}
     engines: {node: '>= 0.10.0'}
@@ -5271,6 +5273,11 @@ packages:
     engines: {node: '>=10.17.0'}
     dev: true
 
+  /human-signals/3.0.1:
+    resolution: {integrity: sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==}
+    engines: {node: '>=12.20.0'}
+    dev: true
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -5529,6 +5536,11 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /is-stream/3.0.0:
+    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dev: true
+
   /is-string/1.0.7:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
     engines: {node: '>= 0.4'}
@@ -5746,16 +5758,16 @@ packages:
   /lines-and-columns/1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
-  /lint-staged/12.4.3:
-    resolution: {integrity: sha512-eH6SKOmdm/ZwCRMTZAmM3q3dPkpq6vco/BfrOw8iGun4Xs/thYegPD/MLIwKO+iPkzibkLJuQcRhRLXKvaKreg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  /lint-staged/13.0.0:
+    resolution: {integrity: sha512-vWban5utFt78VZohbosUxNIa46KKJ+KOQTDWTQ8oSl1DLEEVl9zhUtaQbiiydAmx+h2wKJK2d0+iMaRmknuWRQ==}
+    engines: {node: ^14.13.1 || >=16.0.0}
     hasBin: true
     dependencies:
       cli-truncate: 3.1.0
       colorette: 2.0.16
       commander: 9.3.0
-      debug: 4.3.4_supports-color@9.2.2
-      execa: 5.1.1
+      debug: 4.3.4
+      execa: 6.1.0
       lilconfig: 2.0.5
       listr2: 4.0.5
       micromatch: 4.0.5
@@ -5763,10 +5775,10 @@ packages:
       object-inspect: 1.12.2
       pidtree: 0.5.0
       string-argv: 0.3.1
-      supports-color: 9.2.2
-      yaml: 1.10.2
+      yaml: 2.1.1
     transitivePeerDependencies:
       - enquirer
+      - supports-color
     dev: true
 
   /listr2/4.0.5:
@@ -6027,6 +6039,11 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /mimic-fn/4.0.0:
+    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
+    engines: {node: '>=12'}
+    dev: true
+
   /min-indent/1.0.1:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
@@ -6335,6 +6352,13 @@ packages:
       path-key: 3.1.1
     dev: true
 
+  /npm-run-path/5.1.0:
+    resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      path-key: 4.0.0
+    dev: true
+
   /npmlog/5.0.1:
     resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==}
     dependencies:
@@ -6426,6 +6450,13 @@ packages:
       mimic-fn: 2.1.0
     dev: true
 
+  /onetime/6.0.0:
+    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      mimic-fn: 4.0.0
+    dev: true
+
   /open/8.4.0:
     resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
     engines: {node: '>=12'}
@@ -6564,6 +6595,11 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /path-key/4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
+    dev: true
+
   /path-parse/1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
@@ -7868,6 +7904,11 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /strip-final-newline/3.0.0:
+    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
+    engines: {node: '>=12'}
+    dev: true
+
   /strip-indent/3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
@@ -7914,11 +7955,6 @@ packages:
     dependencies:
       has-flag: 4.0.0
 
-  /supports-color/9.2.2:
-    resolution: {integrity: sha512-XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA==}
-    engines: {node: '>=12'}
-    dev: true
-
   /supports-preserve-symlinks-flag/1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
@@ -8752,6 +8788,11 @@ packages:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
 
+  /yaml/2.1.1:
+    resolution: {integrity: sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==}
+    engines: {node: '>= 14'}
+    dev: true
+
   /yargs-parser/20.2.9:
     resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
     engines: {node: '>=10'}

From 6d0ede7c60aaa4c010207a047bf30a2b87b5049f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 Jun 2022 19:44:19 +0200
Subject: [PATCH 10/72] chore(deps): update all non-major dependencies (#8474)

---
 package.json                                  |  10 +-
 .../template-preact-ts/package.json           |   2 +-
 .../create-vite/template-preact/package.json  |   2 +-
 .../template-react-ts/package.json            |   2 +-
 .../create-vite/template-react/package.json   |   2 +-
 .../template-svelte-ts/package.json           |   6 +-
 .../create-vite/template-svelte/package.json  |   2 +-
 .../create-vite/template-vue-ts/package.json  |   4 +-
 .../create-vite/template-vue/package.json     |   2 +-
 packages/plugin-legacy/package.json           |   2 +-
 packages/plugin-vue/package.json              |   2 +-
 packages/vite/package.json                    |   2 +-
 playground/alias/package.json                 |   2 +-
 playground/css-sourcemap/package.json         |   4 +-
 playground/css/package.json                   |   4 +-
 playground/extensions/package.json            |   2 +-
 playground/json/package.json                  |   2 +-
 playground/multiple-entrypoints/package.json  |   2 +-
 playground/optimize-deps/package.json         |   4 +-
 playground/preload/package.json               |   2 +-
 playground/ssr-vue/package.json               |   2 +-
 playground/tailwind/package.json              |   4 +-
 playground/vue-jsx/package.json               |   2 +-
 playground/vue-lib/package.json               |   2 +-
 playground/vue-server-origin/package.json     |   2 +-
 playground/vue-sourcemap/package.json         |   4 +-
 playground/vue/package.json                   |   6 +-
 pnpm-lock.yaml                                | 347 +++++++++---------
 28 files changed, 214 insertions(+), 215 deletions(-)

diff --git a/package.json b/package.json
index 42647946e8fa49..b44e7ddfa99091 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "conventional-changelog-cli": "^2.2.2",
     "cross-env": "^7.0.3",
     "esbuild": "^0.14.38",
-    "eslint": "^8.16.0",
+    "eslint": "^8.17.0",
     "eslint-define-config": "^1.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
@@ -76,7 +76,7 @@
     "npm-run-all": "^4.1.5",
     "picocolors": "^1.0.0",
     "playwright-chromium": "^1.22.2",
-    "pnpm": "^7.1.7",
+    "pnpm": "^7.1.9",
     "prettier": "2.6.2",
     "prompts": "^2.4.2",
     "rimraf": "^3.0.2",
@@ -89,8 +89,8 @@
     "unbuild": "^0.7.4",
     "vite": "workspace:*",
     "vitepress": "1.0.0-draft.8",
-    "vitest": "^0.13.0",
-    "vue": "^3.2.36"
+    "vitest": "^0.14.1",
+    "vue": "^3.2.37"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm exec lint-staged --concurrent false",
@@ -110,7 +110,7 @@
       "eslint --fix"
     ]
   },
-  "packageManager": "pnpm@7.1.7",
+  "packageManager": "pnpm@7.1.9",
   "pnpm": {
     "overrides": {
       "vite": "workspace:*",
diff --git a/packages/create-vite/template-preact-ts/package.json b/packages/create-vite/template-preact-ts/package.json
index daa47a76c434bc..1f3d95c2b2f74e 100644
--- a/packages/create-vite/template-preact-ts/package.json
+++ b/packages/create-vite/template-preact-ts/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "preact": "^10.7.2"
+    "preact": "^10.7.3"
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.2.0",
diff --git a/packages/create-vite/template-preact/package.json b/packages/create-vite/template-preact/package.json
index 438307a4c75b61..a2bcbdbd2aa6da 100644
--- a/packages/create-vite/template-preact/package.json
+++ b/packages/create-vite/template-preact/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "preact": "^10.7.2"
+    "preact": "^10.7.3"
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.2.0",
diff --git a/packages/create-vite/template-react-ts/package.json b/packages/create-vite/template-react-ts/package.json
index 7e91f9c6589b16..09683bac609c91 100644
--- a/packages/create-vite/template-react-ts/package.json
+++ b/packages/create-vite/template-react-ts/package.json
@@ -13,7 +13,7 @@
     "react-dom": "^18.1.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.9",
+    "@types/react": "^18.0.12",
     "@types/react-dom": "^18.0.5",
     "@vitejs/plugin-react": "^1.3.2",
     "typescript": "^4.6.4",
diff --git a/packages/create-vite/template-react/package.json b/packages/create-vite/template-react/package.json
index b79e9889800e06..034891165e9d92 100644
--- a/packages/create-vite/template-react/package.json
+++ b/packages/create-vite/template-react/package.json
@@ -13,7 +13,7 @@
     "react-dom": "^18.1.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.9",
+    "@types/react": "^18.0.12",
     "@types/react-dom": "^18.0.5",
     "@vitejs/plugin-react": "^1.3.2",
     "vite": "^2.9.9"
diff --git a/packages/create-vite/template-svelte-ts/package.json b/packages/create-vite/template-svelte-ts/package.json
index 53a4c5ea8e01a0..cae318abece338 100644
--- a/packages/create-vite/template-svelte-ts/package.json
+++ b/packages/create-vite/template-svelte-ts/package.json
@@ -10,11 +10,11 @@
     "check": "svelte-check --tsconfig ./tsconfig.json"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.46",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.47",
     "@tsconfig/svelte": "^3.0.0",
     "svelte": "^3.48.0",
-    "svelte-check": "^2.7.1",
-    "svelte-preprocess": "^4.10.6",
+    "svelte-check": "^2.7.2",
+    "svelte-preprocess": "^4.10.7",
     "tslib": "^2.4.0",
     "typescript": "^4.6.4",
     "vite": "^2.9.9"
diff --git a/packages/create-vite/template-svelte/package.json b/packages/create-vite/template-svelte/package.json
index 5d469f55d796b9..0f7550c9ac713b 100644
--- a/packages/create-vite/template-svelte/package.json
+++ b/packages/create-vite/template-svelte/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.46",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.47",
     "svelte": "^3.48.0",
     "vite": "^2.9.9"
   }
diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json
index 5f352e2519aa25..ca1cdd385ef710 100644
--- a/packages/create-vite/template-vue-ts/package.json
+++ b/packages/create-vite/template-vue-ts/package.json
@@ -9,12 +9,12 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.2.36"
+    "vue": "^3.2.37"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^2.3.3",
     "typescript": "^4.6.4",
     "vite": "^2.9.9",
-    "vue-tsc": "^0.35.2"
+    "vue-tsc": "^0.37.0"
   }
 }
diff --git a/packages/create-vite/template-vue/package.json b/packages/create-vite/template-vue/package.json
index c519cb36270f61..9f70700a3a6134 100644
--- a/packages/create-vite/template-vue/package.json
+++ b/packages/create-vite/template-vue/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.2.36"
+    "vue": "^3.2.37"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^2.3.3",
diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json
index 3321c4de7815c7..57786e8b2dcb86 100644
--- a/packages/plugin-legacy/package.json
+++ b/packages/plugin-legacy/package.json
@@ -36,7 +36,7 @@
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "dependencies": {
     "@babel/standalone": "^7.18.4",
-    "core-js": "^3.22.7",
+    "core-js": "^3.22.8",
     "magic-string": "^0.26.2",
     "regenerator-runtime": "^0.13.9",
     "systemjs": "^6.12.1"
diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json
index 999cda6486ad9f..d1ca5fd8f9ce46 100644
--- a/packages/plugin-vue/package.json
+++ b/packages/plugin-vue/package.json
@@ -46,7 +46,7 @@
     "slash": "^4.0.0",
     "source-map": "^0.6.1",
     "vite": "workspace:*",
-    "vue": "^3.2.36"
+    "vue": "^3.2.37"
   },
   "dependencies": {
     "@rollup/pluginutils": "^4.2.1"
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 3b20f0e566d28b..ee03a8fe615565 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -80,7 +80,7 @@
     "@rollup/plugin-node-resolve": "13.3.0",
     "@rollup/plugin-typescript": "^8.3.2",
     "@rollup/pluginutils": "^4.2.1",
-    "@vue/compiler-dom": "^3.2.36",
+    "@vue/compiler-dom": "^3.2.37",
     "acorn": "^8.7.1",
     "cac": "6.7.9",
     "chokidar": "^3.5.3",
diff --git a/playground/alias/package.json b/playground/alias/package.json
index c9883422d785d4..ee345bf1f9ce13 100644
--- a/playground/alias/package.json
+++ b/playground/alias/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "aliased-module": "file:./dir/module",
-    "vue": "^3.2.36"
+    "vue": "^3.2.37"
   },
   "devDependencies": {
     "resolve-linked": "workspace:*"
diff --git a/playground/css-sourcemap/package.json b/playground/css-sourcemap/package.json
index f235b613e17922..bfa9e5934c1d7a 100644
--- a/playground/css-sourcemap/package.json
+++ b/playground/css-sourcemap/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "less": "^4.1.2",
     "magic-string": "^0.26.2",
-    "sass": "^1.52.1",
-    "stylus": "^0.58.0"
+    "sass": "^1.52.2",
+    "stylus": "^0.58.1"
   }
 }
diff --git a/playground/css/package.json b/playground/css/package.json
index b83dcf384ad7e6..29b1318945a93c 100644
--- a/playground/css/package.json
+++ b/playground/css/package.json
@@ -13,7 +13,7 @@
     "fast-glob": "^3.2.11",
     "less": "^4.1.2",
     "postcss-nested": "^5.0.6",
-    "sass": "^1.52.1",
-    "stylus": "^0.58.0"
+    "sass": "^1.52.2",
+    "stylus": "^0.58.1"
   }
 }
diff --git a/playground/extensions/package.json b/playground/extensions/package.json
index 3224757b1c4e0d..380aaa142fd0c4 100644
--- a/playground/extensions/package.json
+++ b/playground/extensions/package.json
@@ -9,6 +9,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.2.36"
+    "vue": "^3.2.37"
   }
 }
diff --git a/playground/json/package.json b/playground/json/package.json
index 5b7b28da0bafe2..ef60b42ff96971 100644
--- a/playground/json/package.json
+++ b/playground/json/package.json
@@ -15,6 +15,6 @@
     "cross-env": "^7.0.3",
     "express": "^4.18.1",
     "json-module": "file:./json-module",
-    "vue": "^3.2.36"
+    "vue": "^3.2.37"
   }
 }
diff --git a/playground/multiple-entrypoints/package.json b/playground/multiple-entrypoints/package.json
index ebde2bcad32803..c33ca1e5a099c3 100644
--- a/playground/multiple-entrypoints/package.json
+++ b/playground/multiple-entrypoints/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "fast-glob": "^3.2.11",
-    "sass": "^1.52.1"
+    "sass": "^1.52.2"
   }
 }
diff --git a/playground/optimize-deps/package.json b/playground/optimize-deps/package.json
index 7509b8284b9bc1..3a274ff63b5fdf 100644
--- a/playground/optimize-deps/package.json
+++ b/playground/optimize-deps/package.json
@@ -24,12 +24,12 @@
     "dep-with-dynamic-import": "file:./dep-with-dynamic-import",
     "lodash-es": "^4.17.21",
     "nested-exclude": "file:./nested-exclude",
-    "phoenix": "^1.6.9",
+    "phoenix": "^1.6.10",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "resolve-linked": "workspace:0.0.0",
     "url": "^0.11.0",
-    "vue": "^3.2.36",
+    "vue": "^3.2.37",
     "vuex": "^4.0.2"
   },
   "devDependencies": {
diff --git a/playground/preload/package.json b/playground/preload/package.json
index 7a2c9edc585706..f9318c47277b33 100644
--- a/playground/preload/package.json
+++ b/playground/preload/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.2.36",
+    "vue": "^3.2.37",
     "vue-router": "^4.0.15"
   },
   "devDependencies": {
diff --git a/playground/ssr-vue/package.json b/playground/ssr-vue/package.json
index 28ad825ccb455b..085aa145f399ac 100644
--- a/playground/ssr-vue/package.json
+++ b/playground/ssr-vue/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "example-external-component": "file:example-external-component",
-    "vue": "^3.2.36",
+    "vue": "^3.2.37",
     "vue-router": "^4.0.15",
     "vuex": "^4.0.2"
   },
diff --git a/playground/tailwind/package.json b/playground/tailwind/package.json
index 454ce968fbd82d..b67102570f338b 100644
--- a/playground/tailwind/package.json
+++ b/playground/tailwind/package.json
@@ -11,11 +11,11 @@
   "dependencies": {
     "autoprefixer": "^10.4.7",
     "tailwindcss": "^2.2.19",
-    "vue": "^3.2.36",
+    "vue": "^3.2.37",
     "vue-router": "^4.0.15"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*",
-    "ts-node": "^10.8.0"
+    "ts-node": "^10.8.1"
   }
 }
diff --git a/playground/vue-jsx/package.json b/playground/vue-jsx/package.json
index dd10e5506ba99b..af84606ab64eea 100644
--- a/playground/vue-jsx/package.json
+++ b/playground/vue-jsx/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.2.36"
+    "vue": "^3.2.37"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*",
diff --git a/playground/vue-lib/package.json b/playground/vue-lib/package.json
index cfd37778ac9d9a..c10f1729c5a71a 100644
--- a/playground/vue-lib/package.json
+++ b/playground/vue-lib/package.json
@@ -8,7 +8,7 @@
     "build-consumer": "vite build --config ./vite.config.consumer.ts"
   },
   "dependencies": {
-    "vue": "^3.2.36"
+    "vue": "^3.2.37"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*"
diff --git a/playground/vue-server-origin/package.json b/playground/vue-server-origin/package.json
index e2b984b365e681..8d379e3ee194d1 100644
--- a/playground/vue-server-origin/package.json
+++ b/playground/vue-server-origin/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.2.36"
+    "vue": "^3.2.37"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*"
diff --git a/playground/vue-sourcemap/package.json b/playground/vue-sourcemap/package.json
index b5e42d8d3f83d4..40bd2fecc788a0 100644
--- a/playground/vue-sourcemap/package.json
+++ b/playground/vue-sourcemap/package.json
@@ -12,9 +12,9 @@
     "@vitejs/plugin-vue": "workspace:*",
     "less": "^4.1.2",
     "postcss-nested": "^5.0.6",
-    "sass": "^1.52.1"
+    "sass": "^1.52.2"
   },
   "dependencies": {
-    "vue": "^3.2.36"
+    "vue": "^3.2.37"
   }
 }
diff --git a/playground/vue/package.json b/playground/vue/package.json
index 7bed9b7083bf88..a4911f76cc6e84 100644
--- a/playground/vue/package.json
+++ b/playground/vue/package.json
@@ -10,14 +10,14 @@
   },
   "dependencies": {
     "lodash-es": "^4.17.21",
-    "vue": "^3.2.36"
+    "vue": "^3.2.37"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*",
     "js-yaml": "^4.1.0",
     "less": "^4.1.2",
     "pug": "^3.0.2",
-    "sass": "^1.52.1",
-    "stylus": "^0.58.0"
+    "sass": "^1.52.2",
+    "stylus": "^0.58.1"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a1140991d8284c..438930772bdd48 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -38,7 +38,7 @@ importers:
       conventional-changelog-cli: ^2.2.2
       cross-env: ^7.0.3
       esbuild: ^0.14.38
-      eslint: ^8.16.0
+      eslint: ^8.17.0
       eslint-define-config: ^1.5.0
       eslint-plugin-import: ^2.26.0
       eslint-plugin-node: ^11.1.0
@@ -52,7 +52,7 @@ importers:
       npm-run-all: ^4.1.5
       picocolors: ^1.0.0
       playwright-chromium: ^1.22.2
-      pnpm: ^7.1.7
+      pnpm: ^7.1.9
       prettier: 2.6.2
       prompts: ^2.4.2
       rimraf: ^3.0.2
@@ -65,8 +65,8 @@ importers:
       unbuild: ^0.7.4
       vite: workspace:*
       vitepress: 1.0.0-draft.8
-      vitest: ^0.13.0
-      vue: ^3.2.36
+      vitest: ^0.14.1
+      vue: ^3.2.37
     devDependencies:
       '@babel/types': 7.18.4
       '@microsoft/api-extractor': 7.24.2
@@ -91,15 +91,15 @@ importers:
       '@types/semver': 7.3.9
       '@types/stylus': 0.48.38
       '@types/ws': 8.5.3
-      '@typescript-eslint/eslint-plugin': 5.27.0_wty7taswolhs3dkiohqfkuwyye
-      '@typescript-eslint/parser': 5.27.0_utdtartgf6fqqgkivzeynh76la
+      '@typescript-eslint/eslint-plugin': 5.27.0_bmkwjfsdzl3qsmmksash2s7t5q
+      '@typescript-eslint/parser': 5.27.0_pm7osnb22e4oktq33hptgspr5i
       conventional-changelog-cli: 2.2.2
       cross-env: 7.0.3
       esbuild: 0.14.38
-      eslint: 8.16.0
+      eslint: 8.17.0
       eslint-define-config: 1.5.0
-      eslint-plugin-import: 2.26.0_xsmuhwqsfrjm7m3kqio7zoeziq
-      eslint-plugin-node: 11.1.0_eslint@8.16.0
+      eslint-plugin-import: 2.26.0_er3f6f6cekbq4lwnvn7afiwhn4
+      eslint-plugin-node: 11.1.0_eslint@8.17.0
       esno: 0.16.3
       execa: 5.1.1
       fs-extra: 10.1.0
@@ -110,7 +110,7 @@ importers:
       npm-run-all: 4.1.5
       picocolors: 1.0.0
       playwright-chromium: 1.22.2
-      pnpm: 7.1.7
+      pnpm: 7.1.9
       prettier: 2.6.2
       prompts: 2.4.2
       rimraf: 3.0.2
@@ -123,8 +123,8 @@ importers:
       unbuild: 0.7.4
       vite: link:packages/vite
       vitepress: 1.0.0-draft.8
-      vitest: 0.13.0
-      vue: 3.2.36
+      vitest: 0.14.1
+      vue: 3.2.37
 
   packages/create-vite:
     specifiers:
@@ -140,14 +140,14 @@ importers:
     specifiers:
       '@babel/core': ^7.18.2
       '@babel/standalone': ^7.18.4
-      core-js: ^3.22.7
+      core-js: ^3.22.8
       magic-string: ^0.26.2
       regenerator-runtime: ^0.13.9
       systemjs: ^6.12.1
       vite: workspace:*
     dependencies:
       '@babel/standalone': 7.18.4
-      core-js: 3.22.7
+      core-js: 3.22.8
       magic-string: 0.26.2
       regenerator-runtime: 0.13.9
       systemjs: 6.12.1
@@ -188,7 +188,7 @@ importers:
       slash: ^4.0.0
       source-map: ^0.6.1
       vite: workspace:*
-      vue: ^3.2.36
+      vue: ^3.2.37
     dependencies:
       '@rollup/pluginutils': 4.2.1
     devDependencies:
@@ -199,7 +199,7 @@ importers:
       slash: 4.0.0
       source-map: 0.6.1
       vite: link:../vite
-      vue: 3.2.36
+      vue: 3.2.37
 
   packages/plugin-vue-jsx:
     specifiers:
@@ -231,7 +231,7 @@ importers:
       '@rollup/plugin-node-resolve': 13.3.0
       '@rollup/plugin-typescript': ^8.3.2
       '@rollup/pluginutils': ^4.2.1
-      '@vue/compiler-dom': ^3.2.36
+      '@vue/compiler-dom': ^3.2.37
       acorn: ^8.7.1
       cac: 6.7.9
       chokidar: ^3.5.3
@@ -299,7 +299,7 @@ importers:
       '@rollup/plugin-node-resolve': 13.3.0_rollup@2.72.1
       '@rollup/plugin-typescript': 8.3.2_rollup@2.72.1+tslib@2.4.0
       '@rollup/pluginutils': 4.2.1
-      '@vue/compiler-dom': 3.2.36
+      '@vue/compiler-dom': 3.2.37
       acorn: 8.7.1
       cac: 6.7.9
       chokidar: 3.5.3
@@ -356,10 +356,10 @@ importers:
     specifiers:
       aliased-module: file:./dir/module
       resolve-linked: workspace:*
-      vue: ^3.2.36
+      vue: ^3.2.37
     dependencies:
       aliased-module: file:playground/alias/dir/module
-      vue: 3.2.36
+      vue: 3.2.37
     devDependencies:
       resolve-linked: link:../resolve-linked
 
@@ -390,15 +390,15 @@ importers:
       fast-glob: ^3.2.11
       less: ^4.1.2
       postcss-nested: ^5.0.6
-      sass: ^1.52.1
-      stylus: ^0.58.0
+      sass: ^1.52.2
+      stylus: ^0.58.1
     devDependencies:
       css-dep: link:css-dep
       fast-glob: 3.2.11
       less: 4.1.2
       postcss-nested: 5.0.6
-      sass: 1.52.1
-      stylus: 0.58.0
+      sass: 1.52.2
+      stylus: 0.58.1
 
   playground/css-codesplit:
     specifiers: {}
@@ -410,13 +410,13 @@ importers:
     specifiers:
       less: ^4.1.2
       magic-string: ^0.26.2
-      sass: ^1.52.1
-      stylus: ^0.58.0
+      sass: ^1.52.2
+      stylus: ^0.58.1
     devDependencies:
       less: 4.1.2
       magic-string: 0.26.2
-      sass: 1.52.1
-      stylus: 0.58.0
+      sass: 1.52.2
+      stylus: 0.58.1
 
   playground/css/css-dep:
     specifiers: {}
@@ -456,9 +456,9 @@ importers:
 
   playground/extensions:
     specifiers:
-      vue: ^3.2.36
+      vue: ^3.2.37
     dependencies:
-      vue: 3.2.36
+      vue: 3.2.37
 
   playground/file-delete-restore:
     specifiers:
@@ -491,12 +491,12 @@ importers:
       cross-env: ^7.0.3
       express: ^4.18.1
       json-module: file:./json-module
-      vue: ^3.2.36
+      vue: ^3.2.37
     devDependencies:
       cross-env: 7.0.3
       express: 4.18.1
       json-module: file:playground/json/json-module
-      vue: 3.2.36
+      vue: 3.2.37
 
   playground/json/json-module:
     specifiers: {}
@@ -515,10 +515,10 @@ importers:
   playground/multiple-entrypoints:
     specifiers:
       fast-glob: ^3.2.11
-      sass: ^1.52.1
+      sass: ^1.52.2
     devDependencies:
       fast-glob: 3.2.11
-      sass: 1.52.1
+      sass: 1.52.2
 
   playground/nested-deps:
     specifiers:
@@ -587,12 +587,12 @@ importers:
       dep-with-dynamic-import: file:./dep-with-dynamic-import
       lodash-es: ^4.17.21
       nested-exclude: file:./nested-exclude
-      phoenix: ^1.6.9
+      phoenix: ^1.6.10
       react: ^17.0.2
       react-dom: ^17.0.2
       resolve-linked: workspace:0.0.0
       url: ^0.11.0
-      vue: ^3.2.36
+      vue: ^3.2.37
       vuex: ^4.0.2
     dependencies:
       axios: 0.27.2
@@ -610,13 +610,13 @@ importers:
       dep-with-dynamic-import: file:playground/optimize-deps/dep-with-dynamic-import
       lodash-es: 4.17.21
       nested-exclude: file:playground/optimize-deps/nested-exclude
-      phoenix: 1.6.9
+      phoenix: 1.6.10
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
       resolve-linked: link:../resolve-linked
       url: 0.11.0
-      vue: 3.2.36
-      vuex: 4.0.2_vue@3.2.36
+      vue: 3.2.37
+      vuex: 4.0.2_vue@3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
 
@@ -689,11 +689,11 @@ importers:
   playground/preload:
     specifiers:
       '@vitejs/plugin-vue': workspace:*
-      vue: ^3.2.36
+      vue: ^3.2.37
       vue-router: ^4.0.15
     dependencies:
-      vue: 3.2.36
-      vue-router: 4.0.15_vue@3.2.36
+      vue: 3.2.37
+      vue-router: 4.0.15_vue@3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
 
@@ -900,14 +900,14 @@ importers:
       example-external-component: file:example-external-component
       express: ^4.18.1
       serve-static: ^1.15.0
-      vue: ^3.2.36
+      vue: ^3.2.37
       vue-router: ^4.0.15
       vuex: ^4.0.2
     dependencies:
       example-external-component: file:playground/ssr-vue/example-external-component
-      vue: 3.2.36
-      vue-router: 4.0.15_vue@3.2.36
-      vuex: 4.0.2_vue@3.2.36
+      vue: 3.2.37
+      vue-router: 4.0.15_vue@3.2.37
+      vuex: 4.0.2_vue@3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
       '@vitejs/plugin-vue-jsx': link:../../packages/plugin-vue-jsx
@@ -939,17 +939,17 @@ importers:
       '@vitejs/plugin-vue': workspace:*
       autoprefixer: ^10.4.7
       tailwindcss: ^2.2.19
-      ts-node: ^10.8.0
-      vue: ^3.2.36
+      ts-node: ^10.8.1
+      vue: ^3.2.37
       vue-router: ^4.0.15
     dependencies:
       autoprefixer: 10.4.7
-      tailwindcss: 2.2.19_tob5czlylbhxx3vaetl5hdifjq
-      vue: 3.2.36
-      vue-router: 4.0.15_vue@3.2.36
+      tailwindcss: 2.2.19_lbvqn3ypbknass5qgyhojko2ui
+      vue: 3.2.37
+      vue-router: 4.0.15_vue@3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
-      ts-node: 10.8.0
+      ts-node: 10.8.1
 
   playground/tailwind-sourcemap:
     specifiers:
@@ -970,27 +970,27 @@ importers:
       less: ^4.1.2
       lodash-es: ^4.17.21
       pug: ^3.0.2
-      sass: ^1.52.1
-      stylus: ^0.58.0
-      vue: ^3.2.36
+      sass: ^1.52.2
+      stylus: ^0.58.1
+      vue: ^3.2.37
     dependencies:
       lodash-es: 4.17.21
-      vue: 3.2.36
+      vue: 3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
       js-yaml: 4.1.0
       less: 4.1.2
       pug: 3.0.2
-      sass: 1.52.1
-      stylus: 0.58.0
+      sass: 1.52.2
+      stylus: 0.58.1
 
   playground/vue-jsx:
     specifiers:
       '@vitejs/plugin-vue': workspace:*
       '@vitejs/plugin-vue-jsx': workspace:*
-      vue: ^3.2.36
+      vue: ^3.2.37
     dependencies:
-      vue: 3.2.36
+      vue: 3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
       '@vitejs/plugin-vue-jsx': link:../../packages/plugin-vue-jsx
@@ -998,18 +998,18 @@ importers:
   playground/vue-lib:
     specifiers:
       '@vitejs/plugin-vue': workspace:*
-      vue: ^3.2.36
+      vue: ^3.2.37
     dependencies:
-      vue: 3.2.36
+      vue: 3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
 
   playground/vue-server-origin:
     specifiers:
       '@vitejs/plugin-vue': workspace:*
-      vue: ^3.2.36
+      vue: ^3.2.37
     dependencies:
-      vue: 3.2.36
+      vue: 3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
 
@@ -1018,15 +1018,15 @@ importers:
       '@vitejs/plugin-vue': workspace:*
       less: ^4.1.2
       postcss-nested: ^5.0.6
-      sass: ^1.52.1
-      vue: ^3.2.36
+      sass: ^1.52.2
+      vue: ^3.2.37
     dependencies:
-      vue: 3.2.36
+      vue: 3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
       less: 4.1.2
       postcss-nested: 5.0.6
-      sass: 1.52.1
+      sass: 1.52.2
 
   playground/wasm:
     specifiers: {}
@@ -1442,7 +1442,6 @@ packages:
     hasBin: true
     dependencies:
       '@babel/types': 7.18.4
-    dev: true
 
   /@babel/plugin-proposal-pipeline-operator/7.18.2:
     resolution: {integrity: sha512-EeXGb75lqRe+BRJeRRgyPJtbYykdgoCZtIXMWohhGvxnAwmrQv/x4d6WYtk6pGk+wAkqIqVb8ySUp5rJNBTDAA==}
@@ -2364,7 +2363,7 @@ packages:
       '@types/node': 17.0.32
     dev: true
 
-  /@typescript-eslint/eslint-plugin/5.27.0_wty7taswolhs3dkiohqfkuwyye:
+  /@typescript-eslint/eslint-plugin/5.27.0_bmkwjfsdzl3qsmmksash2s7t5q:
     resolution: {integrity: sha512-DDrIA7GXtmHXr1VCcx9HivA39eprYBIFxbQEHI6NyraRDxCGpxAFiYQAT/1Y0vh1C+o2vfBiy4IuPoXxtTZCAQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -2375,12 +2374,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.27.0_utdtartgf6fqqgkivzeynh76la
+      '@typescript-eslint/parser': 5.27.0_pm7osnb22e4oktq33hptgspr5i
       '@typescript-eslint/scope-manager': 5.27.0
-      '@typescript-eslint/type-utils': 5.27.0_utdtartgf6fqqgkivzeynh76la
-      '@typescript-eslint/utils': 5.27.0_utdtartgf6fqqgkivzeynh76la
+      '@typescript-eslint/type-utils': 5.27.0_pm7osnb22e4oktq33hptgspr5i
+      '@typescript-eslint/utils': 5.27.0_pm7osnb22e4oktq33hptgspr5i
       debug: 4.3.4
-      eslint: 8.16.0
+      eslint: 8.17.0
       functional-red-black-tree: 1.0.1
       ignore: 5.2.0
       regexpp: 3.2.0
@@ -2391,7 +2390,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.27.0_utdtartgf6fqqgkivzeynh76la:
+  /@typescript-eslint/parser/5.27.0_pm7osnb22e4oktq33hptgspr5i:
     resolution: {integrity: sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -2405,7 +2404,7 @@ packages:
       '@typescript-eslint/types': 5.27.0
       '@typescript-eslint/typescript-estree': 5.27.0_typescript@4.6.4
       debug: 4.3.4
-      eslint: 8.16.0
+      eslint: 8.17.0
       typescript: 4.6.4
     transitivePeerDependencies:
       - supports-color
@@ -2419,7 +2418,7 @@ packages:
       '@typescript-eslint/visitor-keys': 5.27.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.27.0_utdtartgf6fqqgkivzeynh76la:
+  /@typescript-eslint/type-utils/5.27.0_pm7osnb22e4oktq33hptgspr5i:
     resolution: {integrity: sha512-vpTvRRchaf628Hb/Xzfek+85o//zEUotr1SmexKvTfs7czXfYjXVT/a5yDbpzLBX1rhbqxjDdr1Gyo0x1Fc64g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -2429,9 +2428,9 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/utils': 5.27.0_utdtartgf6fqqgkivzeynh76la
+      '@typescript-eslint/utils': 5.27.0_pm7osnb22e4oktq33hptgspr5i
       debug: 4.3.4
-      eslint: 8.16.0
+      eslint: 8.17.0
       tsutils: 3.21.0_typescript@4.6.4
       typescript: 4.6.4
     transitivePeerDependencies:
@@ -2464,7 +2463,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.27.0_utdtartgf6fqqgkivzeynh76la:
+  /@typescript-eslint/utils/5.27.0_pm7osnb22e4oktq33hptgspr5i:
     resolution: {integrity: sha512-nZvCrkIJppym7cIbP3pOwIkAefXOmfGPnCM0LQfzNaKxJHI6VjI8NC662uoiPlaf5f6ymkTy9C3NQXev2mdXmA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -2474,9 +2473,9 @@ packages:
       '@typescript-eslint/scope-manager': 5.27.0
       '@typescript-eslint/types': 5.27.0
       '@typescript-eslint/typescript-estree': 5.27.0_typescript@4.6.4
-      eslint: 8.16.0
+      eslint: 8.17.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.16.0
+      eslint-utils: 3.0.0_eslint@8.17.0
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -2520,11 +2519,11 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /@vue/compiler-core/3.2.36:
-    resolution: {integrity: sha512-bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw==}
+  /@vue/compiler-core/3.2.37:
+    resolution: {integrity: sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==}
     dependencies:
-      '@babel/parser': 7.18.0
-      '@vue/shared': 3.2.36
+      '@babel/parser': 7.18.4
+      '@vue/shared': 3.2.37
       estree-walker: 2.0.2
       source-map: 0.6.1
 
@@ -2535,11 +2534,11 @@ packages:
       '@vue/shared': 3.2.33
     dev: true
 
-  /@vue/compiler-dom/3.2.36:
-    resolution: {integrity: sha512-tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA==}
+  /@vue/compiler-dom/3.2.37:
+    resolution: {integrity: sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==}
     dependencies:
-      '@vue/compiler-core': 3.2.36
-      '@vue/shared': 3.2.36
+      '@vue/compiler-core': 3.2.37
+      '@vue/shared': 3.2.37
 
   /@vue/compiler-sfc/3.2.33:
     resolution: {integrity: sha512-H8D0WqagCr295pQjUYyO8P3IejM3vEzeCO1apzByAEaAR/WimhMYczHfZVvlCE/9yBaEu/eu9RdiWr0kF8b71Q==}
@@ -2556,15 +2555,15 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /@vue/compiler-sfc/3.2.36:
-    resolution: {integrity: sha512-AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA==}
+  /@vue/compiler-sfc/3.2.37:
+    resolution: {integrity: sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==}
     dependencies:
-      '@babel/parser': 7.18.0
-      '@vue/compiler-core': 3.2.36
-      '@vue/compiler-dom': 3.2.36
-      '@vue/compiler-ssr': 3.2.36
-      '@vue/reactivity-transform': 3.2.36
-      '@vue/shared': 3.2.36
+      '@babel/parser': 7.18.4
+      '@vue/compiler-core': 3.2.37
+      '@vue/compiler-dom': 3.2.37
+      '@vue/compiler-ssr': 3.2.37
+      '@vue/reactivity-transform': 3.2.37
+      '@vue/shared': 3.2.37
       estree-walker: 2.0.2
       magic-string: 0.25.9
       postcss: 8.4.14
@@ -2577,11 +2576,11 @@ packages:
       '@vue/shared': 3.2.33
     dev: true
 
-  /@vue/compiler-ssr/3.2.36:
-    resolution: {integrity: sha512-+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw==}
+  /@vue/compiler-ssr/3.2.37:
+    resolution: {integrity: sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==}
     dependencies:
-      '@vue/compiler-dom': 3.2.36
-      '@vue/shared': 3.2.36
+      '@vue/compiler-dom': 3.2.37
+      '@vue/shared': 3.2.37
 
   /@vue/devtools-api/6.1.4:
     resolution: {integrity: sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ==}
@@ -2597,12 +2596,12 @@ packages:
       magic-string: 0.25.9
     dev: true
 
-  /@vue/reactivity-transform/3.2.36:
-    resolution: {integrity: sha512-Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA==}
+  /@vue/reactivity-transform/3.2.37:
+    resolution: {integrity: sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==}
     dependencies:
-      '@babel/parser': 7.18.0
-      '@vue/compiler-core': 3.2.36
-      '@vue/shared': 3.2.36
+      '@babel/parser': 7.18.4
+      '@vue/compiler-core': 3.2.37
+      '@vue/shared': 3.2.37
       estree-walker: 2.0.2
       magic-string: 0.25.9
 
@@ -2612,10 +2611,10 @@ packages:
       '@vue/shared': 3.2.33
     dev: true
 
-  /@vue/reactivity/3.2.36:
-    resolution: {integrity: sha512-c2qvopo0crh9A4GXi2/2kfGYMxsJW4tVILrqRPydVGZHhq0fnzy6qmclWOhBFckEhmyxmpHpdJtIRYGeKcuhnA==}
+  /@vue/reactivity/3.2.37:
+    resolution: {integrity: sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==}
     dependencies:
-      '@vue/shared': 3.2.36
+      '@vue/shared': 3.2.37
 
   /@vue/runtime-core/3.2.33:
     resolution: {integrity: sha512-N2D2vfaXsBPhzCV3JsXQa2NECjxP3eXgZlFqKh4tgakp3iX6LCGv76DLlc+IfFZq+TW10Y8QUfeihXOupJ1dGw==}
@@ -2624,11 +2623,11 @@ packages:
       '@vue/shared': 3.2.33
     dev: true
 
-  /@vue/runtime-core/3.2.36:
-    resolution: {integrity: sha512-PTWBD+Lub+1U3/KhbCExrfxyS14hstLX+cBboxVHaz+kXoiDLNDEYAovPtxeTutbqtClIXtft+wcGdC+FUQ9qQ==}
+  /@vue/runtime-core/3.2.37:
+    resolution: {integrity: sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==}
     dependencies:
-      '@vue/reactivity': 3.2.36
-      '@vue/shared': 3.2.36
+      '@vue/reactivity': 3.2.37
+      '@vue/shared': 3.2.37
 
   /@vue/runtime-dom/3.2.33:
     resolution: {integrity: sha512-LSrJ6W7CZTSUygX5s8aFkraDWlO6K4geOwA3quFF2O+hC3QuAMZt/0Xb7JKE3C4JD4pFwCSO7oCrZmZ0BIJUnw==}
@@ -2638,11 +2637,11 @@ packages:
       csstype: 2.6.20
     dev: true
 
-  /@vue/runtime-dom/3.2.36:
-    resolution: {integrity: sha512-gYPYblm7QXHVuBohqNRRT7Wez0f2Mx2D40rb4fleehrJU9CnkjG0phhcGEZFfGwCmHZRqBCRgbFWE98bPULqkg==}
+  /@vue/runtime-dom/3.2.37:
+    resolution: {integrity: sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==}
     dependencies:
-      '@vue/runtime-core': 3.2.36
-      '@vue/shared': 3.2.36
+      '@vue/runtime-core': 3.2.37
+      '@vue/shared': 3.2.37
       csstype: 2.6.20
 
   /@vue/server-renderer/3.2.33_vue@3.2.33:
@@ -2655,21 +2654,21 @@ packages:
       vue: 3.2.33
     dev: true
 
-  /@vue/server-renderer/3.2.36_vue@3.2.36:
-    resolution: {integrity: sha512-uZE0+jfye6yYXWvAQYeHZv+f50sRryvy16uiqzk3jn8hEY8zTjI+rzlmZSGoE915k+W/Ol9XSw6vxOUD8dGkUg==}
+  /@vue/server-renderer/3.2.37_vue@3.2.37:
+    resolution: {integrity: sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==}
     peerDependencies:
-      vue: 3.2.36
+      vue: 3.2.37
     dependencies:
-      '@vue/compiler-ssr': 3.2.36
-      '@vue/shared': 3.2.36
-      vue: 3.2.36
+      '@vue/compiler-ssr': 3.2.37
+      '@vue/shared': 3.2.37
+      vue: 3.2.37
 
   /@vue/shared/3.2.33:
     resolution: {integrity: sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==}
     dev: true
 
-  /@vue/shared/3.2.36:
-    resolution: {integrity: sha512-JtB41wXl7Au3+Nl3gD16Cfpj7k/6aCroZ6BbOiCMFCMvrOpkg/qQUXTso2XowaNqBbnkuGHurLAqkLBxNGc1hQ==}
+  /@vue/shared/3.2.37:
+    resolution: {integrity: sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==}
 
   /@vueuse/core/8.5.0_vue@3.2.33:
     resolution: {integrity: sha512-VEJ6sGNsPlUp0o9BGda2YISvDZbhWJSOJu5zlp2TufRGVrLcYUKr31jyFEOj6RXzG3k/H4aCYeZyjpItfU8glw==}
@@ -3624,8 +3623,8 @@ packages:
       is-what: 3.14.1
     dev: true
 
-  /core-js/3.22.7:
-    resolution: {integrity: sha512-Jt8SReuDKVNZnZEzyEQT5eK6T2RRCXkfTq7Lo09kpm+fHjgGewSbNjV+Wt4yZMhPDdzz2x1ulI5z/w4nxpBseg==}
+  /core-js/3.22.8:
+    resolution: {integrity: sha512-UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA==}
     requiresBuild: true
     dev: false
 
@@ -4461,7 +4460,7 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.27.0_utdtartgf6fqqgkivzeynh76la
+      '@typescript-eslint/parser': 5.27.0_pm7osnb22e4oktq33hptgspr5i
       debug: 3.2.7
       eslint-import-resolver-node: 0.3.6
       find-up: 2.1.0
@@ -4469,18 +4468,18 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-es/3.0.1_eslint@8.16.0:
+  /eslint-plugin-es/3.0.1_eslint@8.17.0:
     resolution: {integrity: sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==}
     engines: {node: '>=8.10.0'}
     peerDependencies:
       eslint: '>=4.19.1'
     dependencies:
-      eslint: 8.16.0
+      eslint: 8.17.0
       eslint-utils: 2.1.0
       regexpp: 3.2.0
     dev: true
 
-  /eslint-plugin-import/2.26.0_xsmuhwqsfrjm7m3kqio7zoeziq:
+  /eslint-plugin-import/2.26.0_er3f6f6cekbq4lwnvn7afiwhn4:
     resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -4490,12 +4489,12 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.27.0_utdtartgf6fqqgkivzeynh76la
+      '@typescript-eslint/parser': 5.27.0_pm7osnb22e4oktq33hptgspr5i
       array-includes: 3.1.5
       array.prototype.flat: 1.3.0
       debug: 2.6.9
       doctrine: 2.1.0
-      eslint: 8.16.0
+      eslint: 8.17.0
       eslint-import-resolver-node: 0.3.6
       eslint-module-utils: 2.7.3_nd4nb6nccnlbwilvit6hlaep3q
       has: 1.0.3
@@ -4511,14 +4510,14 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-node/11.1.0_eslint@8.16.0:
+  /eslint-plugin-node/11.1.0_eslint@8.17.0:
     resolution: {integrity: sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==}
     engines: {node: '>=8.10.0'}
     peerDependencies:
       eslint: '>=5.16.0'
     dependencies:
-      eslint: 8.16.0
-      eslint-plugin-es: 3.0.1_eslint@8.16.0
+      eslint: 8.17.0
+      eslint-plugin-es: 3.0.1_eslint@8.17.0
       eslint-utils: 2.1.0
       ignore: 5.2.0
       minimatch: 3.1.2
@@ -4549,13 +4548,13 @@ packages:
       eslint-visitor-keys: 1.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.16.0:
+  /eslint-utils/3.0.0_eslint@8.17.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 8.16.0
+      eslint: 8.17.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
@@ -4574,8 +4573,8 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint/8.16.0:
-    resolution: {integrity: sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==}
+  /eslint/8.17.0:
+    resolution: {integrity: sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
@@ -4588,7 +4587,7 @@ packages:
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.16.0
+      eslint-utils: 3.0.0_eslint@8.17.0
       eslint-visitor-keys: 3.3.0
       espree: 9.3.2
       esquery: 1.4.0
@@ -4778,7 +4777,7 @@ packages:
     dev: true
 
   /fast-levenshtein/2.0.6:
-    resolution: {integrity: sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=}
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
     dev: true
 
   /fastq/1.13.0:
@@ -4946,7 +4945,7 @@ packages:
     dev: true
 
   /functional-red-black-tree/1.0.1:
-    resolution: {integrity: sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=}
+    resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==}
     dev: true
 
   /functions-have-names/1.2.3:
@@ -5328,7 +5327,7 @@ packages:
     dev: true
 
   /imurmurhash/0.1.4:
-    resolution: {integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o=}
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
     dev: true
 
@@ -5636,7 +5635,7 @@ packages:
     dev: true
 
   /json-stable-stringify-without-jsonify/1.0.1:
-    resolution: {integrity: sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=}
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
     dev: true
 
   /json-stringify-safe/5.0.1:
@@ -6212,7 +6211,7 @@ packages:
     hasBin: true
 
   /natural-compare/1.4.0:
-    resolution: {integrity: sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=}
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
     dev: true
 
   /needle/2.9.1:
@@ -6639,8 +6638,8 @@ packages:
       is-reference: 1.2.1
     dev: true
 
-  /phoenix/1.6.9:
-    resolution: {integrity: sha512-YZ5mXU2cHd/VUuPSv5AELv/bT+0uJ94PQjiuDS7jVNBU8n75WzrpWzQ5OJ5qSuMVCqOtZK0GJd6WlFVUSmTKAQ==}
+  /phoenix/1.6.10:
+    resolution: {integrity: sha512-KfYAJrrw95JGaOlvmZ+lFJZhSfQmo4SVOj6s175/V8YxqhYGO5EGacdrJxQmJ6uhaK4H3S6b0wkC1T33qU/d8Q==}
     dev: false
 
   /picocolors/1.0.0:
@@ -6701,8 +6700,8 @@ packages:
     hasBin: true
     dev: true
 
-  /pnpm/7.1.7:
-    resolution: {integrity: sha512-8+IAfyunrOHfNmVu03E9rSBVUgypFGMKeyhVif0Drv/gcWgXuzxSBkCxrfNJbEf0cHtA+ftTqMQ20uSlrtnSEg==}
+  /pnpm/7.1.9:
+    resolution: {integrity: sha512-YWA+iqayHb0MndHTyqvVPKQVYVCOoBYlQNLP3hAf2DT/Iw2EHVcP18yCT+xnsPNvkC4VYfQepE6AZvySQue1TA==}
     engines: {node: '>=14.19'}
     hasBin: true
     dev: true
@@ -6787,7 +6786,7 @@ packages:
       yaml: 1.10.2
     dev: true
 
-  /postcss-load-config/3.1.4_ts-node@10.8.0:
+  /postcss-load-config/3.1.4_ts-node@10.8.1:
     resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
     engines: {node: '>= 10'}
     peerDependencies:
@@ -6800,7 +6799,7 @@ packages:
         optional: true
     dependencies:
       lilconfig: 2.0.5
-      ts-node: 10.8.0
+      ts-node: 10.8.1
       yaml: 1.10.2
     dev: false
 
@@ -7489,8 +7488,8 @@ packages:
       truncate-utf8-bytes: 1.0.2
     dev: true
 
-  /sass/1.52.1:
-    resolution: {integrity: sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==}
+  /sass/1.52.2:
+    resolution: {integrity: sha512-mfHB2VSeFS7sZlPv9YohB9GB7yWIgQNTGniQwfQ04EoQN0wsQEv7SwpCwy/x48Af+Z3vDeFXz+iuXM3HK/phZQ==}
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
@@ -7930,8 +7929,8 @@ packages:
   /stylis/4.0.13:
     resolution: {integrity: sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==}
 
-  /stylus/0.58.0:
-    resolution: {integrity: sha512-q27Pof0PINInv/gTO1AH+6C1VkoedEOPp38CB/DFWdSgu4fBCwnxM8cZEm4M1zU+Jr6rmZ75hkmqk2QyDze10g==}
+  /stylus/0.58.1:
+    resolution: {integrity: sha512-AYiCHm5ogczdCPMfe9aeQa4NklB2gcf4D/IhzYPddJjTgPc+k4D/EVE0yfQbZD43MHP3lPy+8NZ9fcFxkrgs/w==}
     hasBin: true
     dependencies:
       css: 3.0.0
@@ -8011,7 +8010,7 @@ packages:
       - ts-node
     dev: false
 
-  /tailwindcss/2.2.19_tob5czlylbhxx3vaetl5hdifjq:
+  /tailwindcss/2.2.19_lbvqn3ypbknass5qgyhojko2ui:
     resolution: {integrity: sha512-6Ui7JSVtXadtTUo2NtkBBacobzWiQYVjYW0ZnKaP9S1ZCKQ0w7KVNz+YSDI/j7O7KCMHbOkz94ZMQhbT9pOqjw==}
     engines: {node: '>=12.13.0'}
     hasBin: true
@@ -8042,7 +8041,7 @@ packages:
       normalize-path: 3.0.0
       object-hash: 2.2.0
       postcss-js: 3.0.3
-      postcss-load-config: 3.1.4_ts-node@10.8.0
+      postcss-load-config: 3.1.4_ts-node@10.8.1
       postcss-nested: 5.0.6
       postcss-selector-parser: 6.0.10
       postcss-value-parser: 4.2.0
@@ -8226,8 +8225,8 @@ packages:
       utf8-byte-length: 1.0.4
     dev: true
 
-  /ts-node/10.8.0:
-    resolution: {integrity: sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA==}
+  /ts-node/10.8.1:
+    resolution: {integrity: sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==}
     hasBin: true
     peerDependencies:
       '@swc/core': '>=1.2.50'
@@ -8541,8 +8540,8 @@ packages:
       - react-dom
     dev: true
 
-  /vitest/0.13.0:
-    resolution: {integrity: sha512-vuYt3+G25MMnANgyMHHG3VK86C9K/VFi/8uH5myQ2v660W4WArv99ElakPlVFxxSXXM1jqQPiPj2ht35Bod9LQ==}
+  /vitest/0.14.1:
+    resolution: {integrity: sha512-2UUm6jYgkwh7Y3VKSRR8OuaNCm+iA5LPDnal7jyITN39maZK9L+JVxqjtQ39PSFo5Fl3/BgaJvER6GGHX9JLxg==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
     peerDependencies:
@@ -8600,13 +8599,13 @@ packages:
       vue: 3.2.33
     dev: true
 
-  /vue-router/4.0.15_vue@3.2.36:
+  /vue-router/4.0.15_vue@3.2.37:
     resolution: {integrity: sha512-xa+pIN9ZqORdIW1MkN2+d9Ui2pCM1b/UMgwYUCZOiFYHAvz/slKKBDha8DLrh5aCG/RibtrpyhKjKOZ85tYyWg==}
     peerDependencies:
       vue: ^3.2.0
     dependencies:
       '@vue/devtools-api': 6.1.4
-      vue: 3.2.36
+      vue: 3.2.37
     dev: false
 
   /vue/3.2.33:
@@ -8619,22 +8618,22 @@ packages:
       '@vue/shared': 3.2.33
     dev: true
 
-  /vue/3.2.36:
-    resolution: {integrity: sha512-5yTXmrE6gW8IQgttzHW5bfBiFA6mx35ZXHjGLDmKYzW6MMmYvCwuKybANRepwkMYeXw2v1buGg3/lPICY5YlZw==}
+  /vue/3.2.37:
+    resolution: {integrity: sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==}
     dependencies:
-      '@vue/compiler-dom': 3.2.36
-      '@vue/compiler-sfc': 3.2.36
-      '@vue/runtime-dom': 3.2.36
-      '@vue/server-renderer': 3.2.36_vue@3.2.36
-      '@vue/shared': 3.2.36
+      '@vue/compiler-dom': 3.2.37
+      '@vue/compiler-sfc': 3.2.37
+      '@vue/runtime-dom': 3.2.37
+      '@vue/server-renderer': 3.2.37_vue@3.2.37
+      '@vue/shared': 3.2.37
 
-  /vuex/4.0.2_vue@3.2.36:
+  /vuex/4.0.2_vue@3.2.37:
     resolution: {integrity: sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==}
     peerDependencies:
       vue: ^3.0.2
     dependencies:
       '@vue/devtools-api': 6.1.4
-      vue: 3.2.36
+      vue: 3.2.37
     dev: false
 
   /web-streams-polyfill/3.2.1:

From 408e5a78325bd2a6ff36e83094806e371a5de4d6 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Tue, 7 Jun 2022 06:21:00 +0200
Subject: [PATCH 11/72] fix: respect server.headers in static middlewares
 (#8481)

---
 packages/vite/src/node/server/index.ts        |  4 +-
 .../src/node/server/middlewares/static.ts     | 44 ++++++++++++-------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
index 095c7027c68558..33565d7390d601 100644
--- a/packages/vite/src/node/server/index.ts
+++ b/packages/vite/src/node/server/index.ts
@@ -477,7 +477,9 @@ export async function createServer(
   // this applies before the transform middleware so that these files are served
   // as-is without transforms.
   if (config.publicDir) {
-    middlewares.use(servePublicMiddleware(config.publicDir))
+    middlewares.use(
+      servePublicMiddleware(config.publicDir, config.server.headers)
+    )
   }
 
   // main transform middleware
diff --git a/packages/vite/src/node/server/middlewares/static.ts b/packages/vite/src/node/server/middlewares/static.ts
index 5d4a948885baa3..3d0f453971803e 100644
--- a/packages/vite/src/node/server/middlewares/static.ts
+++ b/packages/vite/src/node/server/middlewares/static.ts
@@ -1,5 +1,5 @@
 import path from 'path'
-import type { ServerResponse } from 'http'
+import type { OutgoingHttpHeaders, ServerResponse } from 'http'
 import type { Options } from 'sirv'
 import sirv from 'sirv'
 import type { Connect } from 'types/connect'
@@ -20,24 +20,34 @@ import {
 
 const { isMatch } = micromatch
 
-const sirvOptions: Options = {
-  dev: true,
-  etag: true,
-  extensions: [],
-  setHeaders(res, pathname) {
-    // Matches js, jsx, ts, tsx.
-    // The reason this is done, is that the .ts file extension is reserved
-    // for the MIME type video/mp2t. In almost all cases, we can expect
-    // these files to be TypeScript files, and for Vite to serve them with
-    // this Content-Type.
-    if (/\.[tj]sx?$/.test(pathname)) {
-      res.setHeader('Content-Type', 'application/javascript')
+const sirvOptions = (headers?: OutgoingHttpHeaders): Options => {
+  return {
+    dev: true,
+    etag: true,
+    extensions: [],
+    setHeaders(res, pathname) {
+      // Matches js, jsx, ts, tsx.
+      // The reason this is done, is that the .ts file extension is reserved
+      // for the MIME type video/mp2t. In almost all cases, we can expect
+      // these files to be TypeScript files, and for Vite to serve them with
+      // this Content-Type.
+      if (/\.[tj]sx?$/.test(pathname)) {
+        res.setHeader('Content-Type', 'application/javascript')
+      }
+      if (headers) {
+        for (const name in headers) {
+          res.setHeader(name, headers[name]!)
+        }
+      }
     }
   }
 }
 
-export function servePublicMiddleware(dir: string): Connect.NextHandleFunction {
-  const serve = sirv(dir, sirvOptions)
+export function servePublicMiddleware(
+  dir: string,
+  headers?: OutgoingHttpHeaders
+): Connect.NextHandleFunction {
+  const serve = sirv(dir, sirvOptions(headers))
 
   // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
   return function viteServePublicMiddleware(req, res, next) {
@@ -53,7 +63,7 @@ export function serveStaticMiddleware(
   dir: string,
   server: ViteDevServer
 ): Connect.NextHandleFunction {
-  const serve = sirv(dir, sirvOptions)
+  const serve = sirv(dir, sirvOptions(server.config.server.headers))
 
   // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
   return function viteServeStaticMiddleware(req, res, next) {
@@ -109,7 +119,7 @@ export function serveStaticMiddleware(
 export function serveRawFsMiddleware(
   server: ViteDevServer
 ): Connect.NextHandleFunction {
-  const serveFromRoot = sirv('/', sirvOptions)
+  const serveFromRoot = sirv('/', sirvOptions(server.config.server.headers))
 
   // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
   return function viteServeRawFsMiddleware(req, res, next) {

From d72b3ddacd7fee209234dc1dd4081ce90f10d091 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Wed, 8 Jun 2022 09:36:56 +0200
Subject: [PATCH 12/72] feat(create-vite): align template styles with docs
 (#8478)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 翠 / green <green@sapphi.red>
Co-authored-by: Tony Trinh <tony19@gmail.com>
---
 .../create-vite/template-lit-ts/index.html    |   7 +-
 .../template-lit-ts/public/vite.svg           |   1 +
 .../template-lit-ts/src/assets/lit.svg        |   1 +
 .../template-lit-ts/src/favicon.svg           |  15 ---
 .../create-vite/template-lit-ts/src/index.css |  40 +++++++
 .../template-lit-ts/src/my-element.ts         | 101 ++++++++++++++---
 packages/create-vite/template-lit/index.html  |   7 +-
 .../create-vite/template-lit/public/vite.svg  |   1 +
 .../template-lit/src/assets/lit.svg           |   1 +
 .../create-vite/template-lit/src/favicon.svg  |  15 ---
 .../create-vite/template-lit/src/index.css    |  31 ++++++
 .../template-lit/src/my-element.js            | 105 +++++++++++++++---
 .../create-vite/template-preact-ts/index.html |   4 +-
 .../template-preact-ts/public/vite.svg        |   1 +
 .../template-preact-ts/src/app.css            |  22 ++++
 .../template-preact-ts/src/app.tsx            |  35 ++++--
 .../template-preact-ts/src/assets/preact.svg  |   1 +
 .../template-preact-ts/src/favicon.svg        |  15 ---
 .../template-preact-ts/src/index.css          |  79 +++++++++----
 .../template-preact-ts/src/logo.tsx           |  47 --------
 .../create-vite/template-preact/index.html    |   4 +-
 .../template-preact/public/vite.svg           |   1 +
 .../create-vite/template-preact/src/app.css   |  22 ++++
 .../create-vite/template-preact/src/app.jsx   |  35 ++++--
 .../template-preact/src/assets/preact.svg     |   1 +
 .../template-preact/src/favicon.svg           |  15 ---
 .../create-vite/template-preact/src/index.css |  79 +++++++++----
 .../create-vite/template-preact/src/logo.jsx  |  47 --------
 .../create-vite/template-react-ts/index.html  |   4 +-
 .../template-react-ts/public/vite.svg         |   1 +
 .../create-vite/template-react-ts/src/App.css |  49 ++++----
 .../create-vite/template-react-ts/src/App.tsx |  50 ++++-----
 .../template-react-ts/src/assets/react.svg    |   1 +
 .../template-react-ts/src/favicon.svg         |  15 ---
 .../template-react-ts/src/index.css           |  72 ++++++++++--
 .../template-react-ts/src/logo.svg            |   7 --
 .../create-vite/template-react/index.html     |   4 +-
 .../template-react/public/vite.svg            |   1 +
 .../create-vite/template-react/src/App.css    |  49 ++++----
 .../create-vite/template-react/src/App.jsx    |  50 ++++-----
 .../template-react/src/assets/react.svg       |   1 +
 .../template-react/src/favicon.svg            |  15 ---
 .../create-vite/template-react/src/index.css  |  72 ++++++++++--
 .../create-vite/template-react/src/logo.svg   |   7 --
 .../create-vite/template-svelte-ts/index.html |   4 +-
 .../template-svelte-ts/public/favicon.ico     | Bin 1150 -> 0 bytes
 .../template-svelte-ts/public/vite.svg        |   1 +
 .../template-svelte-ts/src/App.svelte         |  73 +++++-------
 .../template-svelte-ts/src/app.css            |  80 +++++++++++++
 .../template-svelte-ts/src/assets/svelte.png  | Bin 5185 -> 0 bytes
 .../template-svelte-ts/src/assets/svelte.svg  |   1 +
 .../template-svelte-ts/src/lib/Counter.svelte |  26 +----
 .../template-svelte-ts/src/main.ts            |   1 +
 .../create-vite/template-svelte/index.html    |   4 +-
 .../template-svelte/public/favicon.ico        | Bin 1150 -> 0 bytes
 .../template-svelte/public/vite.svg           |   1 +
 .../template-svelte/src/App.svelte            |  71 ++++--------
 .../create-vite/template-svelte/src/app.css   |  80 +++++++++++++
 .../template-svelte/src/assets/svelte.png     | Bin 5185 -> 0 bytes
 .../template-svelte/src/assets/svelte.svg     |   1 +
 .../template-svelte/src/lib/Counter.svelte    |  26 +----
 .../create-vite/template-svelte/src/main.js   |   1 +
 .../template-vanilla-ts/index.html            |   4 +-
 .../template-vanilla-ts/public/vite.svg       |   1 +
 .../template-vanilla-ts/src/counter.ts        |   9 ++
 .../template-vanilla-ts/src/main.ts           |  22 +++-
 .../template-vanilla-ts/src/style.css         |  92 ++++++++++++++-
 .../template-vanilla-ts/src/typescript.svg    |   1 +
 .../create-vite/template-vanilla/counter.js   |   9 ++
 .../create-vite/template-vanilla/favicon.svg  |  15 ---
 .../create-vite/template-vanilla/index.html   |   2 +-
 .../template-vanilla/javascript.svg           |   1 +
 packages/create-vite/template-vanilla/main.js |  18 ++-
 .../template-vanilla/public/vite.svg          |   1 +
 .../create-vite/template-vanilla/style.css    |  92 ++++++++++++++-
 .../create-vite/template-vue-ts/index.html    |   4 +-
 .../template-vue-ts/public/favicon.ico        | Bin 4286 -> 0 bytes
 .../template-vue-ts/public/vite.svg           |   1 +
 .../create-vite/template-vue-ts/src/App.vue   |  26 +++--
 .../template-vue-ts/src/assets/logo.png       | Bin 6849 -> 0 bytes
 .../template-vue-ts/src/assets/vue.svg        |   1 +
 .../src/components/HelloWorld.vue             |  48 +++-----
 .../create-vite/template-vue-ts/src/main.ts   |   1 +
 .../create-vite/template-vue-ts/src/style.css |  80 +++++++++++++
 packages/create-vite/template-vue/index.html  |   4 +-
 .../template-vue/public/favicon.ico           | Bin 4286 -> 0 bytes
 .../create-vite/template-vue/public/vite.svg  |   1 +
 packages/create-vite/template-vue/src/App.vue |  26 +++--
 .../template-vue/src/assets/logo.png          | Bin 6849 -> 0 bytes
 .../template-vue/src/assets/vue.svg           |   1 +
 .../src/components/HelloWorld.vue             |  34 +++---
 packages/create-vite/template-vue/src/main.js |   1 +
 .../create-vite/template-vue/src/style.css    |  89 +++++++++++++++
 93 files changed, 1391 insertions(+), 694 deletions(-)
 create mode 100644 packages/create-vite/template-lit-ts/public/vite.svg
 create mode 100644 packages/create-vite/template-lit-ts/src/assets/lit.svg
 delete mode 100644 packages/create-vite/template-lit-ts/src/favicon.svg
 create mode 100644 packages/create-vite/template-lit-ts/src/index.css
 create mode 100644 packages/create-vite/template-lit/public/vite.svg
 create mode 100644 packages/create-vite/template-lit/src/assets/lit.svg
 delete mode 100644 packages/create-vite/template-lit/src/favicon.svg
 create mode 100644 packages/create-vite/template-lit/src/index.css
 create mode 100644 packages/create-vite/template-preact-ts/public/vite.svg
 create mode 100644 packages/create-vite/template-preact-ts/src/app.css
 create mode 100644 packages/create-vite/template-preact-ts/src/assets/preact.svg
 delete mode 100644 packages/create-vite/template-preact-ts/src/favicon.svg
 delete mode 100644 packages/create-vite/template-preact-ts/src/logo.tsx
 create mode 100644 packages/create-vite/template-preact/public/vite.svg
 create mode 100644 packages/create-vite/template-preact/src/app.css
 create mode 100644 packages/create-vite/template-preact/src/assets/preact.svg
 delete mode 100644 packages/create-vite/template-preact/src/favicon.svg
 delete mode 100644 packages/create-vite/template-preact/src/logo.jsx
 create mode 100644 packages/create-vite/template-react-ts/public/vite.svg
 create mode 100644 packages/create-vite/template-react-ts/src/assets/react.svg
 delete mode 100644 packages/create-vite/template-react-ts/src/favicon.svg
 delete mode 100644 packages/create-vite/template-react-ts/src/logo.svg
 create mode 100644 packages/create-vite/template-react/public/vite.svg
 create mode 100644 packages/create-vite/template-react/src/assets/react.svg
 delete mode 100644 packages/create-vite/template-react/src/favicon.svg
 delete mode 100644 packages/create-vite/template-react/src/logo.svg
 delete mode 100644 packages/create-vite/template-svelte-ts/public/favicon.ico
 create mode 100644 packages/create-vite/template-svelte-ts/public/vite.svg
 create mode 100644 packages/create-vite/template-svelte-ts/src/app.css
 delete mode 100644 packages/create-vite/template-svelte-ts/src/assets/svelte.png
 create mode 100644 packages/create-vite/template-svelte-ts/src/assets/svelte.svg
 delete mode 100644 packages/create-vite/template-svelte/public/favicon.ico
 create mode 100644 packages/create-vite/template-svelte/public/vite.svg
 create mode 100644 packages/create-vite/template-svelte/src/app.css
 delete mode 100644 packages/create-vite/template-svelte/src/assets/svelte.png
 create mode 100644 packages/create-vite/template-svelte/src/assets/svelte.svg
 create mode 100644 packages/create-vite/template-vanilla-ts/public/vite.svg
 create mode 100644 packages/create-vite/template-vanilla-ts/src/counter.ts
 create mode 100644 packages/create-vite/template-vanilla-ts/src/typescript.svg
 create mode 100644 packages/create-vite/template-vanilla/counter.js
 delete mode 100644 packages/create-vite/template-vanilla/favicon.svg
 create mode 100644 packages/create-vite/template-vanilla/javascript.svg
 create mode 100644 packages/create-vite/template-vanilla/public/vite.svg
 delete mode 100644 packages/create-vite/template-vue-ts/public/favicon.ico
 create mode 100644 packages/create-vite/template-vue-ts/public/vite.svg
 delete mode 100644 packages/create-vite/template-vue-ts/src/assets/logo.png
 create mode 100644 packages/create-vite/template-vue-ts/src/assets/vue.svg
 create mode 100644 packages/create-vite/template-vue-ts/src/style.css
 delete mode 100644 packages/create-vite/template-vue/public/favicon.ico
 create mode 100644 packages/create-vite/template-vue/public/vite.svg
 delete mode 100644 packages/create-vite/template-vue/src/assets/logo.png
 create mode 100644 packages/create-vite/template-vue/src/assets/vue.svg
 create mode 100644 packages/create-vite/template-vue/src/style.css

diff --git a/packages/create-vite/template-lit-ts/index.html b/packages/create-vite/template-lit-ts/index.html
index d8846e99db1d36..fdee573db235f3 100644
--- a/packages/create-vite/template-lit-ts/index.html
+++ b/packages/create-vite/template-lit-ts/index.html
@@ -2,14 +2,15 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + Lit App</title>
+    <title>Vite + Lit + TS</title>
+    <link rel="stylesheet" href="./src/index.css" />
     <script type="module" src="/src/my-element.ts"></script>
   </head>
   <body>
     <my-element>
-      <p>This is child content</p>
+      <h1>Vite + Lit</h1>
     </my-element>
   </body>
 </html>
diff --git a/packages/create-vite/template-lit-ts/public/vite.svg b/packages/create-vite/template-lit-ts/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-lit-ts/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-lit-ts/src/assets/lit.svg b/packages/create-vite/template-lit-ts/src/assets/lit.svg
new file mode 100644
index 00000000000000..4a9c1fe662ea4e
--- /dev/null
+++ b/packages/create-vite/template-lit-ts/src/assets/lit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="25.6" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 320"><path fill="#00E8FF" d="m64 192l25.926-44.727l38.233-19.114l63.974 63.974l10.833 61.754L192 320l-64-64l-38.074-25.615z"></path><path fill="#283198" d="M128 256V128l64-64v128l-64 64ZM0 256l64 64l9.202-60.602L64 192l-37.542 23.71L0 256Z"></path><path fill="#324FFF" d="M64 192V64l64-64v128l-64 64Zm128 128V192l64-64v128l-64 64ZM0 256V128l64 64l-64 64Z"></path><path fill="#0FF" d="M64 320V192l64 64z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-lit-ts/src/favicon.svg b/packages/create-vite/template-lit-ts/src/favicon.svg
deleted file mode 100644
index de4aeddc12bdfe..00000000000000
--- a/packages/create-vite/template-lit-ts/src/favicon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="410" height="404" viewBox="0 0 410 404" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M399.641 59.5246L215.643 388.545C211.844 395.338 202.084 395.378 198.228 388.618L10.5817 59.5563C6.38087 52.1896 12.6802 43.2665 21.0281 44.7586L205.223 77.6824C206.398 77.8924 207.601 77.8904 208.776 77.6763L389.119 44.8058C397.439 43.2894 403.768 52.1434 399.641 59.5246Z" fill="url(#paint0_linear)"/>
-<path d="M292.965 1.5744L156.801 28.2552C154.563 28.6937 152.906 30.5903 152.771 32.8664L144.395 174.33C144.198 177.662 147.258 180.248 150.51 179.498L188.42 170.749C191.967 169.931 195.172 173.055 194.443 176.622L183.18 231.775C182.422 235.487 185.907 238.661 189.532 237.56L212.947 230.446C216.577 229.344 220.065 232.527 219.297 236.242L201.398 322.875C200.278 328.294 207.486 331.249 210.492 326.603L212.5 323.5L323.454 102.072C325.312 98.3645 322.108 94.137 318.036 94.9228L279.014 102.454C275.347 103.161 272.227 99.746 273.262 96.1583L298.731 7.86689C299.767 4.27314 296.636 0.855181 292.965 1.5744Z" fill="url(#paint1_linear)"/>
-<defs>
-<linearGradient id="paint0_linear" x1="6.00017" y1="32.9999" x2="235" y2="344" gradientUnits="userSpaceOnUse">
-<stop stop-color="#41D1FF"/>
-<stop offset="1" stop-color="#BD34FE"/>
-</linearGradient>
-<linearGradient id="paint1_linear" x1="194.651" y1="8.81818" x2="236.076" y2="292.989" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFEA83"/>
-<stop offset="0.0833333" stop-color="#FFDD35"/>
-<stop offset="1" stop-color="#FFA800"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/create-vite/template-lit-ts/src/index.css b/packages/create-vite/template-lit-ts/src/index.css
new file mode 100644
index 00000000000000..d39ac2e34eebe8
--- /dev/null
+++ b/packages/create-vite/template-lit-ts/src/index.css
@@ -0,0 +1,40 @@
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+}
diff --git a/packages/create-vite/template-lit-ts/src/my-element.ts b/packages/create-vite/template-lit-ts/src/my-element.ts
index c7fd4c6d6982f4..2808d30ae6ef66 100644
--- a/packages/create-vite/template-lit-ts/src/my-element.ts
+++ b/packages/create-vite/template-lit-ts/src/my-element.ts
@@ -1,5 +1,7 @@
 import { html, css, LitElement } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
+import viteLogo from '/vite.svg'
+import litLogo from './assets/lit.svg'
 
 /**
  * An example element.
@@ -9,20 +11,11 @@ import { customElement, property } from 'lit/decorators.js'
  */
 @customElement('my-element')
 export class MyElement extends LitElement {
-  static styles = css`
-    :host {
-      display: block;
-      border: solid 1px gray;
-      padding: 16px;
-      max-width: 800px;
-    }
-  `
-
   /**
-   * The name to say "Hello" to.
+   * Copy for the read the docs hint.
    */
   @property()
-  name = 'World'
+  docsHint = 'Click on the Vite and Lit logos to learn more'
 
   /**
    * The number of times the button has been clicked.
@@ -32,11 +25,21 @@ export class MyElement extends LitElement {
 
   render() {
     return html`
-      <h1>Hello, ${this.name}!</h1>
-      <button @click=${this._onClick} part="button">
-        Click Count: ${this.count}
-      </button>
+      <div>
+        <a href="https://vitejs.dev" target="_blank"
+          ><img src="${viteLogo}" class="logo" alt="Vite logo"
+        /></a>
+        <a href="https://lit.dev" target="_blank"
+          ><img src=${litLogo} class="logo" alt="Lit logo"
+        /></a>
+      </div>
       <slot></slot>
+      <div class="card">
+        <button @click=${this._onClick} part="button">
+          count is ${this.count}
+        </button>
+      </div>
+      <p class="read-the-docs">${this.docsHint}</p>
     `
   }
 
@@ -44,9 +47,71 @@ export class MyElement extends LitElement {
     this.count++
   }
 
-  foo(): string {
-    return 'foo'
-  }
+  static styles = css`
+    :host {
+      max-width: 1280px;
+      margin: 0 auto;
+      padding: 2rem;
+      text-align: center;
+    }
+
+    .logo {
+      height: 6em;
+      padding: 1.5em;
+    }
+    .logo:hover {
+      filter: drop-shadow(0 0 2em #646cffaa);
+    }
+
+    .card {
+      padding: 2em;
+    }
+
+    .read-the-docs {
+      color: #888;
+    }
+
+    h1 {
+      font-size: 3.2em;
+    }
+
+    a {
+      font-weight: 500;
+      color: #646cff;
+      text-decoration: inherit;
+    }
+    a:hover {
+      color: #535bf2;
+    }
+
+    button {
+      border-radius: 8px;
+      border: 1px solid transparent;
+      padding: 0.6em 1.2em;
+      font-size: 1em;
+      font-weight: 500;
+      font-family: inherit;
+      background-color: #1a1a1a;
+      cursor: pointer;
+      transition: border-color 0.25s;
+    }
+    button:hover {
+      border-color: #646cff;
+    }
+    button:focus,
+    button:focus-visible {
+      outline: 4px auto -webkit-focus-ring-color;
+    }
+
+    @media (prefers-color-scheme: light) {
+      a:hover {
+        color: #747bff;
+      }
+      button {
+        background-color: #f9f9f9;
+      }
+    }
+  `
 }
 
 declare global {
diff --git a/packages/create-vite/template-lit/index.html b/packages/create-vite/template-lit/index.html
index 2c9742f1c3bcff..e8be0205b1d8cf 100644
--- a/packages/create-vite/template-lit/index.html
+++ b/packages/create-vite/template-lit/index.html
@@ -2,14 +2,15 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + Lit App</title>
+    <title>Vite + Lit</title>
+    <link rel="stylesheet" href="./src/index.css" />
     <script type="module" src="/src/my-element.js"></script>
   </head>
   <body>
     <my-element>
-      <p>This is child content</p>
+      <h1>Vite + Lit</h1>
     </my-element>
   </body>
 </html>
diff --git a/packages/create-vite/template-lit/public/vite.svg b/packages/create-vite/template-lit/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-lit/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-lit/src/assets/lit.svg b/packages/create-vite/template-lit/src/assets/lit.svg
new file mode 100644
index 00000000000000..4a9c1fe662ea4e
--- /dev/null
+++ b/packages/create-vite/template-lit/src/assets/lit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="25.6" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 320"><path fill="#00E8FF" d="m64 192l25.926-44.727l38.233-19.114l63.974 63.974l10.833 61.754L192 320l-64-64l-38.074-25.615z"></path><path fill="#283198" d="M128 256V128l64-64v128l-64 64ZM0 256l64 64l9.202-60.602L64 192l-37.542 23.71L0 256Z"></path><path fill="#324FFF" d="M64 192V64l64-64v128l-64 64Zm128 128V192l64-64v128l-64 64ZM0 256V128l64 64l-64 64Z"></path><path fill="#0FF" d="M64 320V192l64 64z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-lit/src/favicon.svg b/packages/create-vite/template-lit/src/favicon.svg
deleted file mode 100644
index de4aeddc12bdfe..00000000000000
--- a/packages/create-vite/template-lit/src/favicon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="410" height="404" viewBox="0 0 410 404" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M399.641 59.5246L215.643 388.545C211.844 395.338 202.084 395.378 198.228 388.618L10.5817 59.5563C6.38087 52.1896 12.6802 43.2665 21.0281 44.7586L205.223 77.6824C206.398 77.8924 207.601 77.8904 208.776 77.6763L389.119 44.8058C397.439 43.2894 403.768 52.1434 399.641 59.5246Z" fill="url(#paint0_linear)"/>
-<path d="M292.965 1.5744L156.801 28.2552C154.563 28.6937 152.906 30.5903 152.771 32.8664L144.395 174.33C144.198 177.662 147.258 180.248 150.51 179.498L188.42 170.749C191.967 169.931 195.172 173.055 194.443 176.622L183.18 231.775C182.422 235.487 185.907 238.661 189.532 237.56L212.947 230.446C216.577 229.344 220.065 232.527 219.297 236.242L201.398 322.875C200.278 328.294 207.486 331.249 210.492 326.603L212.5 323.5L323.454 102.072C325.312 98.3645 322.108 94.137 318.036 94.9228L279.014 102.454C275.347 103.161 272.227 99.746 273.262 96.1583L298.731 7.86689C299.767 4.27314 296.636 0.855181 292.965 1.5744Z" fill="url(#paint1_linear)"/>
-<defs>
-<linearGradient id="paint0_linear" x1="6.00017" y1="32.9999" x2="235" y2="344" gradientUnits="userSpaceOnUse">
-<stop stop-color="#41D1FF"/>
-<stop offset="1" stop-color="#BD34FE"/>
-</linearGradient>
-<linearGradient id="paint1_linear" x1="194.651" y1="8.81818" x2="236.076" y2="292.989" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFEA83"/>
-<stop offset="0.0833333" stop-color="#FFDD35"/>
-<stop offset="1" stop-color="#FFA800"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/create-vite/template-lit/src/index.css b/packages/create-vite/template-lit/src/index.css
new file mode 100644
index 00000000000000..b52d4c639b5e5f
--- /dev/null
+++ b/packages/create-vite/template-lit/src/index.css
@@ -0,0 +1,31 @@
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+}
diff --git a/packages/create-vite/template-lit/src/my-element.js b/packages/create-vite/template-lit/src/my-element.js
index 83b11fa869c26c..6ca0dab47b3a3f 100644
--- a/packages/create-vite/template-lit/src/my-element.js
+++ b/packages/create-vite/template-lit/src/my-element.js
@@ -1,4 +1,6 @@
 import { html, css, LitElement } from 'lit'
+import viteLogo from '/vite.svg'
+import litLogo from './assets/lit.svg'
 
 /**
  * An example element.
@@ -7,23 +9,12 @@ import { html, css, LitElement } from 'lit'
  * @csspart button - The button
  */
 export class MyElement extends LitElement {
-  static get styles() {
-    return css`
-      :host {
-        display: block;
-        border: solid 1px gray;
-        padding: 16px;
-        max-width: 800px;
-      }
-    `
-  }
-
   static get properties() {
     return {
       /**
-       * The name to say "Hello" to.
+       * Copy for the read the docs hint.
        */
-      name: { type: String },
+      docsHint: { type: String },
 
       /**
        * The number of times the button has been clicked.
@@ -34,23 +25,101 @@ export class MyElement extends LitElement {
 
   constructor() {
     super()
-    this.name = 'World'
+    this.docsHint = 'Click on the Vite and Lit logos to learn more'
     this.count = 0
   }
 
   render() {
     return html`
-      <h1>Hello, ${this.name}!</h1>
-      <button @click=${this._onClick} part="button">
-        Click Count: ${this.count}
-      </button>
+      <div>
+        <a href="https://vitejs.dev" target="_blank"
+          ><img src="${viteLogo}" class="logo" alt="Vite logo"
+        /></a>
+        <a href="https://lit.dev" target="_blank"
+          ><img src=${litLogo} class="logo" alt="Lit logo"
+        /></a>
+      </div>
       <slot></slot>
+      <div class="card">
+        <button @click=${this._onClick} part="button">
+          count is ${this.count}
+        </button>
+      </div>
+      <p class="read-the-docs">${this.docsHint}</p>
     `
   }
 
   _onClick() {
     this.count++
   }
+
+  static get styles() {
+    return css`
+      :host {
+        max-width: 1280px;
+        margin: 0 auto;
+        padding: 2rem;
+        text-align: center;
+      }
+
+      .logo {
+        height: 6em;
+        padding: 1.5em;
+      }
+      .logo:hover {
+        filter: drop-shadow(0 0 2em #646cffaa);
+      }
+
+      .card {
+        padding: 2em;
+      }
+
+      .read-the-docs {
+        color: #888;
+      }
+
+      a {
+        font-weight: 500;
+        color: #646cff;
+        text-decoration: inherit;
+      }
+      a:hover {
+        color: #535bf2;
+      }
+
+      h1 {
+        font-size: 3.2em;
+      }
+
+      button {
+        border-radius: 8px;
+        border: 1px solid transparent;
+        padding: 0.6em 1.2em;
+        font-size: 1em;
+        font-weight: 500;
+        font-family: inherit;
+        background-color: #1a1a1a;
+        cursor: pointer;
+        transition: border-color 0.25s;
+      }
+      button:hover {
+        border-color: #646cff;
+      }
+      button:focus,
+      button:focus-visible {
+        outline: 4px auto -webkit-focus-ring-color;
+      }
+
+      @media (prefers-color-scheme: light) {
+        a:hover {
+          color: #747bff;
+        }
+        button {
+          background-color: #f9f9f9;
+        }
+      }
+    `
+  }
 }
 
 window.customElements.define('my-element', MyElement)
diff --git a/packages/create-vite/template-preact-ts/index.html b/packages/create-vite/template-preact-ts/index.html
index 5dd45a1e2ab404..ed0f5bbd72520b 100644
--- a/packages/create-vite/template-preact-ts/index.html
+++ b/packages/create-vite/template-preact-ts/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
+    <title>Vite + Preact + TS</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/packages/create-vite/template-preact-ts/public/vite.svg b/packages/create-vite/template-preact-ts/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-preact-ts/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-preact-ts/src/app.css b/packages/create-vite/template-preact-ts/src/app.css
new file mode 100644
index 00000000000000..9e9f9c9c6884c9
--- /dev/null
+++ b/packages/create-vite/template-preact-ts/src/app.css
@@ -0,0 +1,22 @@
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+.logo {
+  height: 6em;
+  padding: 1.5em;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}
diff --git a/packages/create-vite/template-preact-ts/src/app.tsx b/packages/create-vite/template-preact-ts/src/app.tsx
index 64fe3eda94c933..db652c2630f10b 100644
--- a/packages/create-vite/template-preact-ts/src/app.tsx
+++ b/packages/create-vite/template-preact-ts/src/app.tsx
@@ -1,19 +1,32 @@
-import { Logo } from './logo'
+import { useState } from 'preact/hooks'
+import viteLogo from '/vite.svg'
+import preactLogo from './assets/preact.svg'
+import './app.css'
 
 export function App() {
+  const [count, setCount] = useState(0)
+
   return (
     <>
-      <Logo />
-      <p>Hello Vite + Preact!</p>
-      <p>
-        <a
-          class="link"
-          href="https://preactjs.com/"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn Preact
+      <div>
+        <a href="https://vitejs.dev" target="_blank">
+          <img src={viteLogo} class="logo" alt="Vite logo" />
+        </a>
+        <a href="https://preactjs.com" target="_blank">
+          <img src={preactLogo} class="logo" alt="Preact logo" />
         </a>
+      </div>
+      <h1>Vite + Preact</h1>
+      <div class="card">
+        <button onClick={() => setCount((count) => count + 1)}>
+          count is {count}
+        </button>
+        <p>
+          Edit <code>src/app.tsx</code> and save to test HMR
+        </p>
+      </div>
+      <p class="read-the-docs">
+        Click on the Vite and Preact logos to learn more
       </p>
     </>
   )
diff --git a/packages/create-vite/template-preact-ts/src/assets/preact.svg b/packages/create-vite/template-preact-ts/src/assets/preact.svg
new file mode 100644
index 00000000000000..908f17def0b5a4
--- /dev/null
+++ b/packages/create-vite/template-preact-ts/src/assets/preact.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="27.68" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 296"><path fill="#673AB8" d="m128 0l128 73.9v147.8l-128 73.9L0 221.7V73.9z"></path><path fill="#FFF" d="M34.865 220.478c17.016 21.78 71.095 5.185 122.15-34.704c51.055-39.888 80.24-88.345 63.224-110.126c-17.017-21.78-71.095-5.184-122.15 34.704c-51.055 39.89-80.24 88.346-63.224 110.126Zm7.27-5.68c-5.644-7.222-3.178-21.402 7.573-39.253c11.322-18.797 30.541-39.548 54.06-57.923c23.52-18.375 48.303-32.004 69.281-38.442c19.922-6.113 34.277-5.075 39.92 2.148c5.644 7.223 3.178 21.403-7.573 39.254c-11.322 18.797-30.541 39.547-54.06 57.923c-23.52 18.375-48.304 32.004-69.281 38.441c-19.922 6.114-34.277 5.076-39.92-2.147Z"></path><path fill="#FFF" d="M220.239 220.478c17.017-21.78-12.169-70.237-63.224-110.126C105.96 70.464 51.88 53.868 34.865 75.648c-17.017 21.78 12.169 70.238 63.224 110.126c51.055 39.889 105.133 56.485 122.15 34.704Zm-7.27-5.68c-5.643 7.224-19.998 8.262-39.92 2.148c-20.978-6.437-45.761-20.066-69.28-38.441c-23.52-18.376-42.74-39.126-54.06-57.923c-10.752-17.851-13.218-32.03-7.575-39.254c5.644-7.223 19.999-8.261 39.92-2.148c20.978 6.438 45.762 20.067 69.281 38.442c23.52 18.375 42.739 39.126 54.06 57.923c10.752 17.85 13.218 32.03 7.574 39.254Z"></path><path fill="#FFF" d="M127.552 167.667c10.827 0 19.603-8.777 19.603-19.604c0-10.826-8.776-19.603-19.603-19.603c-10.827 0-19.604 8.777-19.604 19.603c0 10.827 8.777 19.604 19.604 19.604Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-preact-ts/src/favicon.svg b/packages/create-vite/template-preact-ts/src/favicon.svg
deleted file mode 100644
index de4aeddc12bdfe..00000000000000
--- a/packages/create-vite/template-preact-ts/src/favicon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="410" height="404" viewBox="0 0 410 404" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M399.641 59.5246L215.643 388.545C211.844 395.338 202.084 395.378 198.228 388.618L10.5817 59.5563C6.38087 52.1896 12.6802 43.2665 21.0281 44.7586L205.223 77.6824C206.398 77.8924 207.601 77.8904 208.776 77.6763L389.119 44.8058C397.439 43.2894 403.768 52.1434 399.641 59.5246Z" fill="url(#paint0_linear)"/>
-<path d="M292.965 1.5744L156.801 28.2552C154.563 28.6937 152.906 30.5903 152.771 32.8664L144.395 174.33C144.198 177.662 147.258 180.248 150.51 179.498L188.42 170.749C191.967 169.931 195.172 173.055 194.443 176.622L183.18 231.775C182.422 235.487 185.907 238.661 189.532 237.56L212.947 230.446C216.577 229.344 220.065 232.527 219.297 236.242L201.398 322.875C200.278 328.294 207.486 331.249 210.492 326.603L212.5 323.5L323.454 102.072C325.312 98.3645 322.108 94.137 318.036 94.9228L279.014 102.454C275.347 103.161 272.227 99.746 273.262 96.1583L298.731 7.86689C299.767 4.27314 296.636 0.855181 292.965 1.5744Z" fill="url(#paint1_linear)"/>
-<defs>
-<linearGradient id="paint0_linear" x1="6.00017" y1="32.9999" x2="235" y2="344" gradientUnits="userSpaceOnUse">
-<stop stop-color="#41D1FF"/>
-<stop offset="1" stop-color="#BD34FE"/>
-</linearGradient>
-<linearGradient id="paint1_linear" x1="194.651" y1="8.81818" x2="236.076" y2="292.989" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFEA83"/>
-<stop offset="0.0833333" stop-color="#FFDD35"/>
-<stop offset="1" stop-color="#FFA800"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/create-vite/template-preact-ts/src/index.css b/packages/create-vite/template-preact-ts/src/index.css
index 3d36f1648343ec..dbc2fdd562ab3b 100644
--- a/packages/create-vite/template-preact-ts/src/index.css
+++ b/packages/create-vite/template-preact-ts/src/index.css
@@ -1,30 +1,69 @@
-html,
-body {
-  height: 100%;
-  width: 100%;
-  padding: 0;
-  margin: 0;
-  background: #fafafa;
-  font-family: 'Helvetica Neue', arial, sans-serif;
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
   font-weight: 400;
-  color: #444;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
 }
 
-* {
-  box-sizing: border-box;
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
 }
 
-#app {
-  height: 100%;
-  text-align: center;
-  background-color: #673ab8;
-  color: #fff;
-  font-size: 1.5em;
-  padding-top: 100px;
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
 }
 
-.link {
-  color: #fff;
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
 }
diff --git a/packages/create-vite/template-preact-ts/src/logo.tsx b/packages/create-vite/template-preact-ts/src/logo.tsx
deleted file mode 100644
index dee6f347a90a54..00000000000000
--- a/packages/create-vite/template-preact-ts/src/logo.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-export const Logo = () => (
-  <svg
-    class="logo"
-    height="180px"
-    viewBox="-256 -256 1800 512"
-    title="Preact"
-    style="
-display: inline-block;
-margin: -0.25em 0px 0px;
-vertical-align: middle;
-"
-  >
-    <path
-      d="M0,-256 221.7025033688164,-128 221.7025033688164,128 0,256 -221.7025033688164,128 -221.7025033688164,-128z"
-      fill="white"
-    ></path>
-    <ellipse
-      cx="0"
-      cy="0"
-      rx="75px"
-      ry="196px"
-      stroke-width="16px"
-      stroke-dasharray="365.2604060943886 81.7395939056114"
-      stroke-dashoffset="1131.9689975248618"
-      fill="none"
-      stroke="#673ab8"
-      transform="rotate(52)"
-    ></ellipse>
-    <ellipse
-      cx="0"
-      cy="0"
-      rx="75px"
-      ry="196px"
-      stroke-width="16px"
-      stroke-dasharray="403.1225208830963 43.87747911690373"
-      stroke-dashoffset="-963.0079812482553"
-      fill="none"
-      stroke="#673ab8"
-      transform="rotate(-52)"
-    ></ellipse>
-    <circle cx="0" cy="0" r="34" fill="#673ab8"></circle>
-    <path
-      fill="white"
-      d="M289.85 25.25L289.85 125L272 125L272-122.63L335.88-122.63Q379.45-122.63 401.59-103.55Q423.73-84.48 423.73-49.13Q423.73-32.85 417.69-19.20Q411.65-5.55 400.27 4.34Q388.90 14.22 372.63 19.74Q356.35 25.25 335.88 25.25L289.85 25.25M289.85 10.90L335.88 10.90Q352.33 10.90 365.27 6.35Q378.23 1.80 387.24-6.25Q396.25-14.30 401.06-25.24Q405.88-36.18 405.88-49.13Q405.88-77.65 388.29-93.05Q370.70-108.45 335.88-108.45L289.85-108.45L289.85 10.90ZM497.58 13.00L497.58 125L479.73 125L479.73-122.63L542.90-122.63Q585.78-122.63 606.95-106.09Q628.13-89.55 628.13-57.53Q628.13-43.35 623.23-31.63Q618.33-19.90 609.14-11.06Q599.95-2.23 587 3.46Q574.05 9.15 557.78 10.90Q561.98 13.52 565.30 17.90L650.53 125L634.95 125Q632.15 125 630.14 123.95Q628.13 122.90 626.20 120.45L546.93 20.00Q543.95 16.15 540.54 14.57Q537.13 13.00 529.95 13.00L497.58 13.00M497.58-0.30L540.63-0.30Q557.08-0.30 570.11-4.24Q583.15-8.18 592.16-15.53Q601.18-22.88 605.90-33.20Q610.63-43.53 610.63-56.48Q610.63-82.90 593.30-95.68Q575.98-108.45 542.90-108.45L497.58-108.45L497.58-0.30ZM843.73-122.63L843.73-107.75L713.35-107.75L713.35-7.65L821.85-7.65L821.85 6.87L713.35 6.87L713.35 110.13L843.73 110.13L843.73 125L695.33 125L695.33-122.63L843.73-122.63ZM1088.55 125L1074.73 125Q1072.28 125 1070.70 123.69Q1069.13 122.38 1068.25 120.28L1039.03 48.35L917.40 48.35L888.35 120.28Q887.65 122.20 885.90 123.60Q884.15 125 881.70 125L868.05 125L969.38-122.63L987.23-122.63L1088.55 125M922.83 35.05L1033.78 35.05L983.20-90.08Q981.98-93.05 980.75-96.81Q979.53-100.58 978.30-104.78Q977.08-100.58 975.85-96.81Q974.63-93.05 973.40-89.90L922.83 35.05ZM1302.40 83.35Q1304.15 83.35 1305.38 84.57L1312.38 92.10Q1304.67 100.33 1295.58 106.89Q1286.47 113.45 1275.71 118.09Q1264.95 122.72 1252.09 125.26Q1239.22 127.80 1223.83 127.80Q1198.10 127.80 1176.66 118.79Q1155.22 109.78 1139.91 93.24Q1124.60 76.70 1116.03 53.25Q1107.45 29.80 1107.45 1.10Q1107.45-27.08 1116.29-50.35Q1125.13-73.63 1141.14-90.34Q1157.15-107.05 1179.46-116.24Q1201.78-125.43 1228.72-125.43Q1242.20-125.43 1253.40-123.41Q1264.60-121.40 1274.31-117.64Q1284.03-113.88 1292.60-108.28Q1301.17-102.68 1309.40-95.33L1303.97-87.45Q1302.58-85.35 1299.60-85.35Q1298.03-85.35 1295.58-87.19Q1293.13-89.03 1289.36-91.74Q1285.60-94.45 1280.26-97.69Q1274.92-100.93 1267.58-103.64Q1260.22-106.35 1250.60-108.19Q1240.97-110.03 1228.72-110.03Q1206.15-110.03 1187.25-102.24Q1168.35-94.45 1154.70-80.01Q1141.05-65.58 1133.44-45.01Q1125.83-24.45 1125.83 1.10Q1125.83 27.35 1133.35 48.00Q1140.88 68.65 1154.17 82.91Q1167.47 97.17 1185.59 104.79Q1203.70 112.40 1224.88 112.40Q1238.17 112.40 1248.59 110.65Q1259 108.90 1267.75 105.40Q1276.50 101.90 1284.03 96.82Q1291.55 91.75 1298.90 84.92Q1299.78 84.22 1300.56 83.79Q1301.35 83.35 1302.40 83.35ZM1530.42-122.63L1530.42-107.40L1443.45-107.40L1443.45 125L1425.60 125L1425.60-107.40L1338.10-107.40L1338.10-122.63L1530.42-122.63Z"
-    ></path>
-  </svg>
-)
diff --git a/packages/create-vite/template-preact/index.html b/packages/create-vite/template-preact/index.html
index c06e9fce67a28f..9f89c1bcc0ddef 100644
--- a/packages/create-vite/template-preact/index.html
+++ b/packages/create-vite/template-preact/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
+    <title>Vite + Preact</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/packages/create-vite/template-preact/public/vite.svg b/packages/create-vite/template-preact/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-preact/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-preact/src/app.css b/packages/create-vite/template-preact/src/app.css
new file mode 100644
index 00000000000000..9e9f9c9c6884c9
--- /dev/null
+++ b/packages/create-vite/template-preact/src/app.css
@@ -0,0 +1,22 @@
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+.logo {
+  height: 6em;
+  padding: 1.5em;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}
diff --git a/packages/create-vite/template-preact/src/app.jsx b/packages/create-vite/template-preact/src/app.jsx
index 64fe3eda94c933..c2ce201061e5bd 100644
--- a/packages/create-vite/template-preact/src/app.jsx
+++ b/packages/create-vite/template-preact/src/app.jsx
@@ -1,19 +1,32 @@
-import { Logo } from './logo'
+import { useState } from 'preact/hooks'
+import viteLogo from '/vite.svg'
+import preactLogo from './assets/preact.svg'
+import './app.css'
 
 export function App() {
+  const [count, setCount] = useState(0)
+
   return (
     <>
-      <Logo />
-      <p>Hello Vite + Preact!</p>
-      <p>
-        <a
-          class="link"
-          href="https://preactjs.com/"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn Preact
+      <div>
+        <a href="https://vitejs.dev" target="_blank">
+          <img src={viteLogo} class="logo" alt="Vite logo" />
+        </a>
+        <a href="https://preactjs.com" target="_blank">
+          <img src={preactLogo} class="logo" alt="Preact logo" />
         </a>
+      </div>
+      <h1>Vite + Preact</h1>
+      <div class="card">
+        <button onClick={() => setCount((count) => count + 1)}>
+          count is {count}
+        </button>
+        <p>
+          Edit <code>src/app.jsx</code> and save to test HMR
+        </p>
+      </div>
+      <p class="read-the-docs">
+        Click on the Vite and Preact logos to learn more
       </p>
     </>
   )
diff --git a/packages/create-vite/template-preact/src/assets/preact.svg b/packages/create-vite/template-preact/src/assets/preact.svg
new file mode 100644
index 00000000000000..908f17def0b5a4
--- /dev/null
+++ b/packages/create-vite/template-preact/src/assets/preact.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="27.68" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 296"><path fill="#673AB8" d="m128 0l128 73.9v147.8l-128 73.9L0 221.7V73.9z"></path><path fill="#FFF" d="M34.865 220.478c17.016 21.78 71.095 5.185 122.15-34.704c51.055-39.888 80.24-88.345 63.224-110.126c-17.017-21.78-71.095-5.184-122.15 34.704c-51.055 39.89-80.24 88.346-63.224 110.126Zm7.27-5.68c-5.644-7.222-3.178-21.402 7.573-39.253c11.322-18.797 30.541-39.548 54.06-57.923c23.52-18.375 48.303-32.004 69.281-38.442c19.922-6.113 34.277-5.075 39.92 2.148c5.644 7.223 3.178 21.403-7.573 39.254c-11.322 18.797-30.541 39.547-54.06 57.923c-23.52 18.375-48.304 32.004-69.281 38.441c-19.922 6.114-34.277 5.076-39.92-2.147Z"></path><path fill="#FFF" d="M220.239 220.478c17.017-21.78-12.169-70.237-63.224-110.126C105.96 70.464 51.88 53.868 34.865 75.648c-17.017 21.78 12.169 70.238 63.224 110.126c51.055 39.889 105.133 56.485 122.15 34.704Zm-7.27-5.68c-5.643 7.224-19.998 8.262-39.92 2.148c-20.978-6.437-45.761-20.066-69.28-38.441c-23.52-18.376-42.74-39.126-54.06-57.923c-10.752-17.851-13.218-32.03-7.575-39.254c5.644-7.223 19.999-8.261 39.92-2.148c20.978 6.438 45.762 20.067 69.281 38.442c23.52 18.375 42.739 39.126 54.06 57.923c10.752 17.85 13.218 32.03 7.574 39.254Z"></path><path fill="#FFF" d="M127.552 167.667c10.827 0 19.603-8.777 19.603-19.604c0-10.826-8.776-19.603-19.603-19.603c-10.827 0-19.604 8.777-19.604 19.603c0 10.827 8.777 19.604 19.604 19.604Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-preact/src/favicon.svg b/packages/create-vite/template-preact/src/favicon.svg
deleted file mode 100644
index de4aeddc12bdfe..00000000000000
--- a/packages/create-vite/template-preact/src/favicon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="410" height="404" viewBox="0 0 410 404" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M399.641 59.5246L215.643 388.545C211.844 395.338 202.084 395.378 198.228 388.618L10.5817 59.5563C6.38087 52.1896 12.6802 43.2665 21.0281 44.7586L205.223 77.6824C206.398 77.8924 207.601 77.8904 208.776 77.6763L389.119 44.8058C397.439 43.2894 403.768 52.1434 399.641 59.5246Z" fill="url(#paint0_linear)"/>
-<path d="M292.965 1.5744L156.801 28.2552C154.563 28.6937 152.906 30.5903 152.771 32.8664L144.395 174.33C144.198 177.662 147.258 180.248 150.51 179.498L188.42 170.749C191.967 169.931 195.172 173.055 194.443 176.622L183.18 231.775C182.422 235.487 185.907 238.661 189.532 237.56L212.947 230.446C216.577 229.344 220.065 232.527 219.297 236.242L201.398 322.875C200.278 328.294 207.486 331.249 210.492 326.603L212.5 323.5L323.454 102.072C325.312 98.3645 322.108 94.137 318.036 94.9228L279.014 102.454C275.347 103.161 272.227 99.746 273.262 96.1583L298.731 7.86689C299.767 4.27314 296.636 0.855181 292.965 1.5744Z" fill="url(#paint1_linear)"/>
-<defs>
-<linearGradient id="paint0_linear" x1="6.00017" y1="32.9999" x2="235" y2="344" gradientUnits="userSpaceOnUse">
-<stop stop-color="#41D1FF"/>
-<stop offset="1" stop-color="#BD34FE"/>
-</linearGradient>
-<linearGradient id="paint1_linear" x1="194.651" y1="8.81818" x2="236.076" y2="292.989" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFEA83"/>
-<stop offset="0.0833333" stop-color="#FFDD35"/>
-<stop offset="1" stop-color="#FFA800"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/create-vite/template-preact/src/index.css b/packages/create-vite/template-preact/src/index.css
index 3d36f1648343ec..dbc2fdd562ab3b 100644
--- a/packages/create-vite/template-preact/src/index.css
+++ b/packages/create-vite/template-preact/src/index.css
@@ -1,30 +1,69 @@
-html,
-body {
-  height: 100%;
-  width: 100%;
-  padding: 0;
-  margin: 0;
-  background: #fafafa;
-  font-family: 'Helvetica Neue', arial, sans-serif;
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
   font-weight: 400;
-  color: #444;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
 }
 
-* {
-  box-sizing: border-box;
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
 }
 
-#app {
-  height: 100%;
-  text-align: center;
-  background-color: #673ab8;
-  color: #fff;
-  font-size: 1.5em;
-  padding-top: 100px;
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
 }
 
-.link {
-  color: #fff;
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
 }
diff --git a/packages/create-vite/template-preact/src/logo.jsx b/packages/create-vite/template-preact/src/logo.jsx
deleted file mode 100644
index dee6f347a90a54..00000000000000
--- a/packages/create-vite/template-preact/src/logo.jsx
+++ /dev/null
@@ -1,47 +0,0 @@
-export const Logo = () => (
-  <svg
-    class="logo"
-    height="180px"
-    viewBox="-256 -256 1800 512"
-    title="Preact"
-    style="
-display: inline-block;
-margin: -0.25em 0px 0px;
-vertical-align: middle;
-"
-  >
-    <path
-      d="M0,-256 221.7025033688164,-128 221.7025033688164,128 0,256 -221.7025033688164,128 -221.7025033688164,-128z"
-      fill="white"
-    ></path>
-    <ellipse
-      cx="0"
-      cy="0"
-      rx="75px"
-      ry="196px"
-      stroke-width="16px"
-      stroke-dasharray="365.2604060943886 81.7395939056114"
-      stroke-dashoffset="1131.9689975248618"
-      fill="none"
-      stroke="#673ab8"
-      transform="rotate(52)"
-    ></ellipse>
-    <ellipse
-      cx="0"
-      cy="0"
-      rx="75px"
-      ry="196px"
-      stroke-width="16px"
-      stroke-dasharray="403.1225208830963 43.87747911690373"
-      stroke-dashoffset="-963.0079812482553"
-      fill="none"
-      stroke="#673ab8"
-      transform="rotate(-52)"
-    ></ellipse>
-    <circle cx="0" cy="0" r="34" fill="#673ab8"></circle>
-    <path
-      fill="white"
-      d="M289.85 25.25L289.85 125L272 125L272-122.63L335.88-122.63Q379.45-122.63 401.59-103.55Q423.73-84.48 423.73-49.13Q423.73-32.85 417.69-19.20Q411.65-5.55 400.27 4.34Q388.90 14.22 372.63 19.74Q356.35 25.25 335.88 25.25L289.85 25.25M289.85 10.90L335.88 10.90Q352.33 10.90 365.27 6.35Q378.23 1.80 387.24-6.25Q396.25-14.30 401.06-25.24Q405.88-36.18 405.88-49.13Q405.88-77.65 388.29-93.05Q370.70-108.45 335.88-108.45L289.85-108.45L289.85 10.90ZM497.58 13.00L497.58 125L479.73 125L479.73-122.63L542.90-122.63Q585.78-122.63 606.95-106.09Q628.13-89.55 628.13-57.53Q628.13-43.35 623.23-31.63Q618.33-19.90 609.14-11.06Q599.95-2.23 587 3.46Q574.05 9.15 557.78 10.90Q561.98 13.52 565.30 17.90L650.53 125L634.95 125Q632.15 125 630.14 123.95Q628.13 122.90 626.20 120.45L546.93 20.00Q543.95 16.15 540.54 14.57Q537.13 13.00 529.95 13.00L497.58 13.00M497.58-0.30L540.63-0.30Q557.08-0.30 570.11-4.24Q583.15-8.18 592.16-15.53Q601.18-22.88 605.90-33.20Q610.63-43.53 610.63-56.48Q610.63-82.90 593.30-95.68Q575.98-108.45 542.90-108.45L497.58-108.45L497.58-0.30ZM843.73-122.63L843.73-107.75L713.35-107.75L713.35-7.65L821.85-7.65L821.85 6.87L713.35 6.87L713.35 110.13L843.73 110.13L843.73 125L695.33 125L695.33-122.63L843.73-122.63ZM1088.55 125L1074.73 125Q1072.28 125 1070.70 123.69Q1069.13 122.38 1068.25 120.28L1039.03 48.35L917.40 48.35L888.35 120.28Q887.65 122.20 885.90 123.60Q884.15 125 881.70 125L868.05 125L969.38-122.63L987.23-122.63L1088.55 125M922.83 35.05L1033.78 35.05L983.20-90.08Q981.98-93.05 980.75-96.81Q979.53-100.58 978.30-104.78Q977.08-100.58 975.85-96.81Q974.63-93.05 973.40-89.90L922.83 35.05ZM1302.40 83.35Q1304.15 83.35 1305.38 84.57L1312.38 92.10Q1304.67 100.33 1295.58 106.89Q1286.47 113.45 1275.71 118.09Q1264.95 122.72 1252.09 125.26Q1239.22 127.80 1223.83 127.80Q1198.10 127.80 1176.66 118.79Q1155.22 109.78 1139.91 93.24Q1124.60 76.70 1116.03 53.25Q1107.45 29.80 1107.45 1.10Q1107.45-27.08 1116.29-50.35Q1125.13-73.63 1141.14-90.34Q1157.15-107.05 1179.46-116.24Q1201.78-125.43 1228.72-125.43Q1242.20-125.43 1253.40-123.41Q1264.60-121.40 1274.31-117.64Q1284.03-113.88 1292.60-108.28Q1301.17-102.68 1309.40-95.33L1303.97-87.45Q1302.58-85.35 1299.60-85.35Q1298.03-85.35 1295.58-87.19Q1293.13-89.03 1289.36-91.74Q1285.60-94.45 1280.26-97.69Q1274.92-100.93 1267.58-103.64Q1260.22-106.35 1250.60-108.19Q1240.97-110.03 1228.72-110.03Q1206.15-110.03 1187.25-102.24Q1168.35-94.45 1154.70-80.01Q1141.05-65.58 1133.44-45.01Q1125.83-24.45 1125.83 1.10Q1125.83 27.35 1133.35 48.00Q1140.88 68.65 1154.17 82.91Q1167.47 97.17 1185.59 104.79Q1203.70 112.40 1224.88 112.40Q1238.17 112.40 1248.59 110.65Q1259 108.90 1267.75 105.40Q1276.50 101.90 1284.03 96.82Q1291.55 91.75 1298.90 84.92Q1299.78 84.22 1300.56 83.79Q1301.35 83.35 1302.40 83.35ZM1530.42-122.63L1530.42-107.40L1443.45-107.40L1443.45 125L1425.60 125L1425.60-107.40L1338.10-107.40L1338.10-122.63L1530.42-122.63Z"
-    ></path>
-  </svg>
-)
diff --git a/packages/create-vite/template-react-ts/index.html b/packages/create-vite/template-react-ts/index.html
index 38f386110323c3..e0d1c840806ee7 100644
--- a/packages/create-vite/template-react-ts/index.html
+++ b/packages/create-vite/template-react-ts/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
+    <title>Vite + React + TS</title>
   </head>
   <body>
     <div id="root"></div>
diff --git a/packages/create-vite/template-react-ts/public/vite.svg b/packages/create-vite/template-react-ts/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-react-ts/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-react-ts/src/App.css b/packages/create-vite/template-react-ts/src/App.css
index 8da3fde63d9e7d..2e82675c3c44a9 100644
--- a/packages/create-vite/template-react-ts/src/App.css
+++ b/packages/create-vite/template-react-ts/src/App.css
@@ -1,34 +1,19 @@
-.App {
+#root {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
   text-align: center;
 }
 
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
+.logo {
+  height: 6em;
+  padding: 1.5em;
 }
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
 }
 
-@keyframes App-logo-spin {
+@keyframes logo-spin {
   from {
     transform: rotate(0deg);
   }
@@ -37,6 +22,16 @@
   }
 }
 
-button {
-  font-size: calc(10px + 2vmin);
+@media (prefers-reduced-motion: no-preference) {
+  a:nth-of-type(2) .logo {
+    animation: logo-spin infinite 20s linear;
+  }
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
 }
diff --git a/packages/create-vite/template-react-ts/src/App.tsx b/packages/create-vite/template-react-ts/src/App.tsx
index 3d9bd71e51303e..8cfb82d3fbf3c2 100644
--- a/packages/create-vite/template-react-ts/src/App.tsx
+++ b/packages/create-vite/template-react-ts/src/App.tsx
@@ -1,5 +1,6 @@
 import { useState } from 'react'
-import logo from './logo.svg'
+import viteLogo from '/vite.svg'
+import reactLogo from './assets/react.svg'
 import './App.css'
 
 function App() {
@@ -7,37 +8,26 @@ function App() {
 
   return (
     <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>Hello Vite + React!</p>
+      <div>
+        <a href="https://vitejs.dev" target="_blank">
+          <img src={viteLogo} className="logo" alt="Vite logo" />
+        </a>
+        <a href="https://reactjs.org" target="_blank">
+          <img src={reactLogo} className="logo" alt="React logo" />
+        </a>
+      </div>
+      <h1>Vite + React</h1>
+      <div className="card">
+        <button onClick={() => setCount((count) => count + 1)}>
+          count is {count}
+        </button>
         <p>
-          <button type="button" onClick={() => setCount((count) => count + 1)}>
-            count is: {count}
-          </button>
+          Edit <code>src/App.tsx</code> and save to test HMR
         </p>
-        <p>
-          Edit <code>App.tsx</code> and save to test HMR updates.
-        </p>
-        <p>
-          <a
-            className="App-link"
-            href="https://reactjs.org"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            Learn React
-          </a>
-          {' | '}
-          <a
-            className="App-link"
-            href="https://vitejs.dev/guide/features.html"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            Vite Docs
-          </a>
-        </p>
-      </header>
+      </div>
+      <p className="read-the-docs">
+        Click on the Vite and React logos to learn more
+      </p>
     </div>
   )
 }
diff --git a/packages/create-vite/template-react-ts/src/assets/react.svg b/packages/create-vite/template-react-ts/src/assets/react.svg
new file mode 100644
index 00000000000000..6c87de9bb33584
--- /dev/null
+++ b/packages/create-vite/template-react-ts/src/assets/react.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-react-ts/src/favicon.svg b/packages/create-vite/template-react-ts/src/favicon.svg
deleted file mode 100644
index de4aeddc12bdfe..00000000000000
--- a/packages/create-vite/template-react-ts/src/favicon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="410" height="404" viewBox="0 0 410 404" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M399.641 59.5246L215.643 388.545C211.844 395.338 202.084 395.378 198.228 388.618L10.5817 59.5563C6.38087 52.1896 12.6802 43.2665 21.0281 44.7586L205.223 77.6824C206.398 77.8924 207.601 77.8904 208.776 77.6763L389.119 44.8058C397.439 43.2894 403.768 52.1434 399.641 59.5246Z" fill="url(#paint0_linear)"/>
-<path d="M292.965 1.5744L156.801 28.2552C154.563 28.6937 152.906 30.5903 152.771 32.8664L144.395 174.33C144.198 177.662 147.258 180.248 150.51 179.498L188.42 170.749C191.967 169.931 195.172 173.055 194.443 176.622L183.18 231.775C182.422 235.487 185.907 238.661 189.532 237.56L212.947 230.446C216.577 229.344 220.065 232.527 219.297 236.242L201.398 322.875C200.278 328.294 207.486 331.249 210.492 326.603L212.5 323.5L323.454 102.072C325.312 98.3645 322.108 94.137 318.036 94.9228L279.014 102.454C275.347 103.161 272.227 99.746 273.262 96.1583L298.731 7.86689C299.767 4.27314 296.636 0.855181 292.965 1.5744Z" fill="url(#paint1_linear)"/>
-<defs>
-<linearGradient id="paint0_linear" x1="6.00017" y1="32.9999" x2="235" y2="344" gradientUnits="userSpaceOnUse">
-<stop stop-color="#41D1FF"/>
-<stop offset="1" stop-color="#BD34FE"/>
-</linearGradient>
-<linearGradient id="paint1_linear" x1="194.651" y1="8.81818" x2="236.076" y2="292.989" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFEA83"/>
-<stop offset="0.0833333" stop-color="#FFDD35"/>
-<stop offset="1" stop-color="#FFA800"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/create-vite/template-react-ts/src/index.css b/packages/create-vite/template-react-ts/src/index.css
index ec2585e8c0bb81..dbc2fdd562ab3b 100644
--- a/packages/create-vite/template-react-ts/src/index.css
+++ b/packages/create-vite/template-react-ts/src/index.css
@@ -1,13 +1,69 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
 }
 
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
 }
diff --git a/packages/create-vite/template-react-ts/src/logo.svg b/packages/create-vite/template-react-ts/src/logo.svg
deleted file mode 100644
index 6b60c1042f58d9..00000000000000
--- a/packages/create-vite/template-react-ts/src/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>
diff --git a/packages/create-vite/template-react/index.html b/packages/create-vite/template-react/index.html
index b46ab83364e374..79c470191164e9 100644
--- a/packages/create-vite/template-react/index.html
+++ b/packages/create-vite/template-react/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
+    <title>Vite + React</title>
   </head>
   <body>
     <div id="root"></div>
diff --git a/packages/create-vite/template-react/public/vite.svg b/packages/create-vite/template-react/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-react/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-react/src/App.css b/packages/create-vite/template-react/src/App.css
index 8da3fde63d9e7d..2e82675c3c44a9 100644
--- a/packages/create-vite/template-react/src/App.css
+++ b/packages/create-vite/template-react/src/App.css
@@ -1,34 +1,19 @@
-.App {
+#root {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
   text-align: center;
 }
 
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
+.logo {
+  height: 6em;
+  padding: 1.5em;
 }
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
 }
 
-@keyframes App-logo-spin {
+@keyframes logo-spin {
   from {
     transform: rotate(0deg);
   }
@@ -37,6 +22,16 @@
   }
 }
 
-button {
-  font-size: calc(10px + 2vmin);
+@media (prefers-reduced-motion: no-preference) {
+  a:nth-of-type(2) .logo {
+    animation: logo-spin infinite 20s linear;
+  }
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
 }
diff --git a/packages/create-vite/template-react/src/App.jsx b/packages/create-vite/template-react/src/App.jsx
index 7d4eb10ff833d1..78ced9c794224d 100644
--- a/packages/create-vite/template-react/src/App.jsx
+++ b/packages/create-vite/template-react/src/App.jsx
@@ -1,5 +1,6 @@
 import { useState } from 'react'
-import logo from './logo.svg'
+import viteLogo from '/vite.svg'
+import reactLogo from './assets/react.svg'
 import './App.css'
 
 function App() {
@@ -7,37 +8,26 @@ function App() {
 
   return (
     <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>Hello Vite + React!</p>
+      <div>
+        <a href="https://vitejs.dev" target="_blank">
+          <img src={viteLogo} className="logo" alt="Vite logo" />
+        </a>
+        <a href="https://reactjs.org" target="_blank">
+          <img src={reactLogo} className="logo" alt="React logo" />
+        </a>
+      </div>
+      <h1>Vite + React</h1>
+      <div className="card">
+        <button onClick={() => setCount((count) => count + 1)}>
+          count is {count}
+        </button>
         <p>
-          <button type="button" onClick={() => setCount((count) => count + 1)}>
-            count is: {count}
-          </button>
+          Edit <code>src/App.jsx</code> and save to test HMR
         </p>
-        <p>
-          Edit <code>App.jsx</code> and save to test HMR updates.
-        </p>
-        <p>
-          <a
-            className="App-link"
-            href="https://reactjs.org"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            Learn React
-          </a>
-          {' | '}
-          <a
-            className="App-link"
-            href="https://vitejs.dev/guide/features.html"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            Vite Docs
-          </a>
-        </p>
-      </header>
+      </div>
+      <p className="read-the-docs">
+        Click on the Vite and React logos to learn more
+      </p>
     </div>
   )
 }
diff --git a/packages/create-vite/template-react/src/assets/react.svg b/packages/create-vite/template-react/src/assets/react.svg
new file mode 100644
index 00000000000000..6c87de9bb33584
--- /dev/null
+++ b/packages/create-vite/template-react/src/assets/react.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-react/src/favicon.svg b/packages/create-vite/template-react/src/favicon.svg
deleted file mode 100644
index de4aeddc12bdfe..00000000000000
--- a/packages/create-vite/template-react/src/favicon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="410" height="404" viewBox="0 0 410 404" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M399.641 59.5246L215.643 388.545C211.844 395.338 202.084 395.378 198.228 388.618L10.5817 59.5563C6.38087 52.1896 12.6802 43.2665 21.0281 44.7586L205.223 77.6824C206.398 77.8924 207.601 77.8904 208.776 77.6763L389.119 44.8058C397.439 43.2894 403.768 52.1434 399.641 59.5246Z" fill="url(#paint0_linear)"/>
-<path d="M292.965 1.5744L156.801 28.2552C154.563 28.6937 152.906 30.5903 152.771 32.8664L144.395 174.33C144.198 177.662 147.258 180.248 150.51 179.498L188.42 170.749C191.967 169.931 195.172 173.055 194.443 176.622L183.18 231.775C182.422 235.487 185.907 238.661 189.532 237.56L212.947 230.446C216.577 229.344 220.065 232.527 219.297 236.242L201.398 322.875C200.278 328.294 207.486 331.249 210.492 326.603L212.5 323.5L323.454 102.072C325.312 98.3645 322.108 94.137 318.036 94.9228L279.014 102.454C275.347 103.161 272.227 99.746 273.262 96.1583L298.731 7.86689C299.767 4.27314 296.636 0.855181 292.965 1.5744Z" fill="url(#paint1_linear)"/>
-<defs>
-<linearGradient id="paint0_linear" x1="6.00017" y1="32.9999" x2="235" y2="344" gradientUnits="userSpaceOnUse">
-<stop stop-color="#41D1FF"/>
-<stop offset="1" stop-color="#BD34FE"/>
-</linearGradient>
-<linearGradient id="paint1_linear" x1="194.651" y1="8.81818" x2="236.076" y2="292.989" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFEA83"/>
-<stop offset="0.0833333" stop-color="#FFDD35"/>
-<stop offset="1" stop-color="#FFA800"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/create-vite/template-react/src/index.css b/packages/create-vite/template-react/src/index.css
index ec2585e8c0bb81..dbc2fdd562ab3b 100644
--- a/packages/create-vite/template-react/src/index.css
+++ b/packages/create-vite/template-react/src/index.css
@@ -1,13 +1,69 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
 }
 
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
 }
diff --git a/packages/create-vite/template-react/src/logo.svg b/packages/create-vite/template-react/src/logo.svg
deleted file mode 100644
index 6b60c1042f58d9..00000000000000
--- a/packages/create-vite/template-react/src/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>
diff --git a/packages/create-vite/template-svelte-ts/index.html b/packages/create-vite/template-svelte-ts/index.html
index d2f6839bab176c..b5b125269662aa 100644
--- a/packages/create-vite/template-svelte-ts/index.html
+++ b/packages/create-vite/template-svelte-ts/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Svelte + TS + Vite App</title>
+    <title>Vite + Svelte + TS</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/packages/create-vite/template-svelte-ts/public/favicon.ico b/packages/create-vite/template-svelte-ts/public/favicon.ico
deleted file mode 100644
index d75d248ef0b15096a95054643a4d97f5d9b60846..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmaKqSxA*Z7>4KMS_;~x;8i!JU{-`tpyx!I(n2NFMU)w2L{WiMS3#Lcp@vrpA*5Yp
zSy6|`AkYfDD<i0E#V`++Z6*?!>(e{`n8yX0pLf20X1@3RmKkGw`Vte3=0)aUq%ldx
zm^49K+Hw0b#^`KboP)QXJOwbuVUFxlAs{RfqJ+twGylWfOp{Hc$s#253LlN1nsFVc
zKa>40?h5(7PTC6ltDx)(Y&Ze2xggCq(kK?<y<8^e<6=jMdpU6v+;{||V|e5D0Ms=>
zTA`;gAfKD!+uFjpxc_A3+Ma(L28W=z4Gvs@r*ECk`;c45=S#;=oA|abt`f&j5&uJO
z3Dn+&^gZ%h4JidsaTR{{!_Y8PUx(-%PosPy2gi@qIvBMMYz;e3L1{f~mrd9RdB>pZ
zD}4R|sk_C`;=cT&r)c=8u>7h9)u32*SbL`xiq3(pq5C^5-sSOw;<|fv@nfXfl&U`2
z81K5ExDp;bf#DISW%IY%k&2-noShOoz-;kb(u?5RFX-ro?87j3GZdCXrFc8bTx}jd
zz_n@djWnxc*TbbCjEq80FPyG}1zQwvjq7R6ZSWuQ@_#A*LN5n<3$BI?X}q%iD!B-s
zdSFcNp!EgpJr6C<U|<k(bVthdxj6Hu@vTm#H17HQ3@zUW4b6^YJ7BdMAG-UHPpy1s
zP4L4xSd9eXsA6=)<w3zo)vq^js2Y;DdA)1b`LZco_mbS~YVqmZ)>AK?klug4>=)Tv
z+F#{yt>6EK)3NU=L&y_W3UNaC?Tg=6YE0)^V;(0Mb0$WJ7>7@Lg0~+3x9d)!Pd<O-
HJ0{LwWbpi$

diff --git a/packages/create-vite/template-svelte-ts/public/vite.svg b/packages/create-vite/template-svelte-ts/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-svelte-ts/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-svelte-ts/src/App.svelte b/packages/create-vite/template-svelte-ts/src/App.svelte
index 4023b8b9774246..cc0917872ad18e 100644
--- a/packages/create-vite/template-svelte-ts/src/App.svelte
+++ b/packages/create-vite/template-svelte-ts/src/App.svelte
@@ -1,65 +1,42 @@
 <script lang="ts">
-  import logo from './assets/svelte.png'
+  import viteLogo from '/vite.svg'
+  import svelteLogo from './assets/svelte.svg'
   import Counter from './lib/Counter.svelte'
 </script>
 
 <main>
-  <img src={logo} alt="Svelte Logo" />
-  <h1>Hello Typescript!</h1>
-
-  <Counter />
+  <div>
+    <a href="https://vitejs.dev" target="_blank"> 
+      <img src={viteLogo} alt="Vite Logo" />
+    </a>
+    <a href="https://svelte.dev" target="_blank"> 
+      <img src={svelteLogo} alt="Svelte Logo" />
+    </a>
+  </div>
+  <h1>Vite + Svelte</h1>
+
+  <div class="card">
+    <Counter />
+  </div>
 
   <p>
-    Visit <a href="https://svelte.dev">svelte.dev</a> to learn how to build Svelte
-    apps.
+    Check out <a href="https://github.com/sveltejs/kit#readme" target="_blank">SvelteKit</a>, the official Svelte app framework powered by Vite!
   </p>
 
-  <p>
-    Check out <a href="https://github.com/sveltejs/kit#readme">SvelteKit</a> for
-    the officially supported framework, also powered by Vite!
+  <p class="read-the-docs">
+    Click on the Vite and Svelte logos to learn more
   </p>
 </main>
 
 <style>
-  :root {
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
-      Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-  }
-
-  main {
-    text-align: center;
-    padding: 1em;
-    margin: 0 auto;
-  }
-
   img {
-    height: 16rem;
-    width: 16rem;
+    height: 6em;
+    padding: 1.5em;
   }
-
-  h1 {
-    color: #ff3e00;
-    text-transform: uppercase;
-    font-size: 4rem;
-    font-weight: 100;
-    line-height: 1.1;
-    margin: 2rem auto;
-    max-width: 14rem;
-  }
-
-  p {
-    max-width: 14rem;
-    margin: 1rem auto;
-    line-height: 1.35;
+  img:hover {
+    filter: drop-shadow(0 0 2em #646cffaa);
   }
-
-  @media (min-width: 480px) {
-    h1 {
-      max-width: none;
-    }
-
-    p {
-      max-width: none;
-    }
+  .read-the-docs {
+    color: #888;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/packages/create-vite/template-svelte-ts/src/app.css b/packages/create-vite/template-svelte-ts/src/app.css
new file mode 100644
index 00000000000000..07396c895cc09e
--- /dev/null
+++ b/packages/create-vite/template-svelte-ts/src/app.css
@@ -0,0 +1,80 @@
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+}
+
+.card {
+  padding: 2em;
+}
+
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
+}
diff --git a/packages/create-vite/template-svelte-ts/src/assets/svelte.png b/packages/create-vite/template-svelte-ts/src/assets/svelte.png
deleted file mode 100644
index e673c91c7bcb0e3a1be737745af56990613a641e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5185
zcmb7Ic{r5c+ka+Z#*(pQFEeFJ2}O~Z8EF@d5F#cN<(nC6vWyuCh3ZR|LZ*_XWJ_TN
zGm@>cg|g2KDN<ue4aQ^M`MvLTz1REid#>lX&N=se&V8QiJoo*%Kj+*cI2_v~tsxBn
zz@`(&51#=5sJICQkT7x8Ql!%%u6zlnoR5ga1q=NDo|E#Tvlx+&i6{s!iYADXh@uR#
zsDLVZaZglB7qwK1df1}TUeOF!w7eiTzrmZlAzn^C?2LmGAdfM@6NqH$J$fa(m%HH1
zEfIf;QtXMtHqMbFKSx~OKEuf3c~rB^bdVIWHs`$YVN>_&XMCrPgxJLYDO?fn5VAhz
zS{B*|nZ)foWa$5LZCB%jF2cAcUORK-k8ut2urUfK=zcD`G@zLOQwDqfy#AkE*PAJx
z4GhXXimv`pa!)O#G7HtL5)-th2wK70>Ye}Gbc4OQY3E&j(YUf>x;${qk(kCxEbmWI
zRa1Ok9w9+fDE)D8K*t0V9-I9LPEuhSu@$-e+FCf5be=t<NIf`sTg7i*;p0SS<6X_J
z`@V%$%ibO_O)sPM4irWq4L8NjDbv7gbQIB-e|G9NH++dOSF=azCx;SRP5k~h*ERp2
z)W5mr@&DZU>#I@-)=37iq+*2{ba2H2FWiIdr6?Kc=LDOLd-zI-=UB<IPRy(Uz7&aG
zN*S=RIyRKN_wL_O_jFeLUT1em4SE;#udi5FFnmyH_pxA(OosE$%=d{ORbY}r(0hrs
z{`tY|fmlXp^EZuHV}gw38?1YlDa~BTS>UAUEa*oP{^!lu7LH2;!g18V=DQ5^+iQ!k
z_q?5*CAo2QiN^^sS&F$uuNy<L>r&q(NB8NGlnH{spB704y!@*#_GxnoJ8qq88l_0H
z+N{Dd%ic8-6zjYP(|CfMwWz_vgae*Bibc6^4}Og8iZd$Yf4Repz2wpP>3;iml^>LE
z`w;i4F4)5cz@2j~(2rZE^7n+Zt|0ArFaOnDB?vsW`og-;ZCkJ^5x)HRA?fCWgW)zB
zg1~Q;P$%t_;4=ablxaey+KXQ#Xw*;6TBXLuGrh`S!3$3}W!F+Ez<6C=C$36`#$<4o
z2Aq=F0bzwdNlU@mYD4k}PCy`=ROKjuMP9x;^KGmGwMRYm8*QDRWTM^$Gyh8QP44y#
zw7$my<zsg5=<$IJfS$*1%&*K#l?ZLZ81Mxq`f#xw!1~{gwwizJ<V7cb5|e5KLHGz-
zwDH*hMF6`J&wy`nA4d^y$GV&vCrRh}$R{wd^A9FKJR><N{s$#=NGrUsNxb!@iM#h|
zLM%1|KPc;$+1U*A$Ws2JtYP>dNNyM=`F6N=&QmP3(<OiKQB3csk=Tgjg7?e(c9vA$
z>t%#k5_LV-qq&p!=wBhv8E=5kjvE3$O+~yx<e7%z@-DeXvopC2lHb^!ztk4naZ;ym
z^D8;wTaTuG)A@_2l^ug%)=SCEsOjH5VOW#Nh+r-9S%HTayy=fnq&f%Nb)%uvmL*ad
zLlwV25AXRw!L?qR(4vTkbi!GGg!*Kh`H09j4BIG$T^1gTU@f|cnh!FX^&McVEL?`L
z%lNnNdVM8;<(y<Al7x_{SdDBls&3&+ocmaXd7xar+Folp3oG-*x2W#1vfQLKs|v&x
ztu6edl(k)h_RWod<8rpWYZ+u=v?G(Jvn9Ohj#@)1thox@y$#wco!=<zr>7&~UyC8_
zdv9csIBh?UT&>PkUg{VHHzZYoe}Xg?@|i;L__UJe=IPTw<T%MuJ@5BJl`z9=TnaA!
zoxhh>WY0%%dk#LMf0}Ac5k#XfN13Ts3vSg+4s*G0A2*i-!;o3ErBBhw2|*>K@EQww
znf^f!xTE_@s7_PkuJ)~8rI}A;&6ld&a}7i3?1U)Pp-(-9EcnGvwz|YS&0_(h0e;dA
zbBSOC`|;P9$%`iGmcT>9E6uKAPw4|J&SX)_6gE+>4gyy-1TB~UZUyw+;Zu=gr(wiZ
z3HoBGc;BZ{)UPu5>~4^37zY%30f`CxB&WtPibuS|Y;D{aNIqr05-Z7eA%3ip5Su`-
zSb#;)f^dqDc*mX?iLbEYa6E2NXN!=vFjGqjlm0fb%^zS;P-09~OdLn5d+7u9B8sZt
zDL|(kE>dqXUPu>ov_Zx%jiZV+&c1+Ihn#>UE$`-B&VaOxE62#Es?vlP)aJgZDTVj=
zYWcOyQ@GP-k72ie-G*$-V4@$%xbXoC=>+XyTwdF5t6j@^whHV|O!P*{YaUiQ5{b8;
zr>x}Uo|yQW(=2Dw$3$c2=-K9-L`0=H1X&@y9nn@R*QmES;KDVBhKA1kI0RX&@Q&U(
zZEv*fLeDCmj&40dS7Jl!^`ReE>(J!YL1Z|NP~R#`4!ZbzK&cLf6f*H`{#?q+dWJ)Z
zE;le*hCP6kdU-5@x~nDj9$bd1to2-K2-4KyL^Xm5TB`CJJ|M13oBU>apA(C+IN+xc
z{dvi-b$)i1jKBt;$rAG9&0t))j(N&03`^cbiCIttM9R5|C-^kg6(HsYK|Ho@j{1s$
zZhJ*9hkd?v%zE*6SFHZW=R#Uch#l2#bgAofCx}fDgHC-23)O2VYAEIdr&Iz4L6eh9
zvvdbLoEqmVgbVAi^EtCGjvb&p!z#3t`l%xw9*8i%i6)oV+COulKRG@iqiD17y!;yP
zd!+y9?X@j{zP;Sg%Z<gP1MAy=_p0COro~u}RbCKQ{Mt;(n00Yffsh>xbl9Cy&Jl7X
z1#?M<pW;REx`BNcXu~ITv?QVdIF-_Rf`VzP(2?|?ROqXdc&L1=j+eUWU)ZGQWC2`O
z0gForM2<Ayg3-O^(v9qq_miv<Y{L{^>o4FtI~z0*VQWA%&DgYK2Z||2J*(0x8`gi>
zxV0QcKX>)4YA2SUC3fkQyFdLjogxe(wgSJUofsu5w57^<fNXbX<~EgNeqF8%Li{KB
zFpIYx)2(j<5cx@_F1gl{?+&yY!Mmh(#_ed*t5fJ!1hzdBKAR_6UI7N6XVSJ|BXXsa
zLsKbR#(4bf_-*a7@&VHJe+tUZAAg6jD2{=$pSoj+=o$s`?)@F6QBDDAOmB_EpPPX?
z4M`mz7@u-WEo2NDwD`s62Ge_cqHH$RZvDjtm1`_#S-2fw<3Vnnq@-{zHz`}Fd&;T>
z3+#?&yX#h36xC^deink;;{E+nyg};Nmpb9Ix4HJ?(rwoZ)#Odo$G|gtq~7YPqRh4(
zh1ZA?z7enrUBo~5d>1fHwEuL8Y`nQ(^KeV-eyUKR7$WdAqkGklSBG49RabVZ@|_$U
z5(RUUylOpjFk=d%4o#g01a`M7_MU_p8+dQZ^FB(UhhLaWUAB#1G$h2hB~+O%As$lX
z;5DnxFjV|J1k)ejZQoz><{B+wxYAp$#rsZK%cH90XTbV+rNK`HD^$aDIy~$`kL=1V
z`DjIA%#f)v6T$5{CSbt*co0r72lYjlUKk|PVo%7XI_b4T#PSd=@}MpzD6m6YMqxmg
zog14%H-elu+8&v4tu$t6kCV{}wmPe-@$`>V=~P>Td7p3i__?d2W?didI7KO0`AtDS
zNkYFh{fi?q_87+Zuy(-<l<#SMd5_BZl2^Uw>sy>bf*vYQb2Zu$O-%G;w6LaQy~^@6
zi%!2m+^_dUu`8tYw+hDBoVCb>vvT?YvVi1<tJ9N^1%DfYG|`+^wRV%6|7jrJ$P6}x
zJZDRF6h*>wJd0XA;TNQDu?xVxPSOf7n?0s5$TrhD4#!Ej8RWHotCK$T>pJr<6W}ft
zs2=&E!~c=f`Z4B`<OF>3$P}ftU2Efp@%slfc-J;x<y8Vx!iwxWwyMpp?eq6?H$uU)
zfOzDL{W>RRfVU{RNDpRBms=jB%j5mx;R-|v;vEX+_-hII!_*f};KVAN?G&KRX2GAP
z@M-P#1(Lu}Vf%(uI#n;@WUr&j6T9yeKm(vc3$0bvQVrP+0>Gj(#Mx=P07kC*HFfwN
zL@_McO}h|6=EYg>1Wid!yHn^8@{Wrac4o6d;9D$$eI)Dq^iw7pk3j;75`Y_=EP$1W
zV@}mQsr#6i*6kMpfC>Qgw};`VlrIpn0(C`5t*y2QT|UXZ83+LaJPXTFRLcbf&;$??
z*o01LS#cm2mpPaQt^Q6K4)<7a_aXez;t12qY*}+D5Y(;1-=Wkwzuh}`7!Jd@I*TP<
z{kaqVyWCNRCgT21z|n_T{krVdCM4`SutmqRNR#5u{Qmfb-+6{vSI7Eyw!BMVJ_^_V
z=e)8FLDBy9)HQtG^Qy*B9zxH2=uOs+Fi7E~92GST6s^KC-+fiaTdfwdNsskFo15Aw
z>Y0)goNAwX{kFLGl+yEV)Wm3qF_(yxO)113`bU1q^?tmduw|-0m;uYduI4Y_u*6%Q
zD_HN#Ir9SFY2xda>Rz&Y!FC)~sCq?a{nIB@6U;;a8yAD{C0-UVtlm}gpx(Jv#iCS5
za~|tC=IwX7Ce%$se?DYzGp13<t9hFbdoFx-5;A>*Dcw74EzW6C4fnsgQ1_ftW(glh
zYR`vEVWs!4#3U~BlYDPlNkkH3?^}zBVx;XO=;oPdo>SK>Wmc7%E)<{7oEXQ)P_97y
zW^Mys9}K7)M**F*?y+#TLcw6>1W3pOwun;-HlY$c!d|P?OP0jdwL{H#Ju41xj#=wQ
zK1%#&e@95andgyN3Xp->QqM`sS$Hr$>(OL$g~x$7q;xwy^sp4bD$|?g$X<~}&jbCG
z!mwp&N@N864PGXd{FIENON#LY4&g3Hb<d8Yo+u=nu4+1J6@1N}0Oh^ngT?+tEGnAc
z1r@;5;8Q2DTGf!Ydc`{QJ)k-b;Tc-gJ@n5A2<U06_4w>68}-^3p7<7|&i7!qYv82c
zWzcl^2op_+0jl*Z)ll9|^7uIEu}Vo`l`?kH>gC>=20o%p1Sho>_*hqbcTI!%!uka)
zm37F1BxUAQlmHfdl<dHirN(i+G7Zzz51C22Q=`Sn#y(OrH)cSIZI{KZnF9ipm}n|V
z2ZZ9qnzbxaj4;XKGO$q3iI4u$ICKplFgWR|+&daT7{Au<N7QaJU}(&^?i{c^4+<QP
z^Lx+(sx+=g8B`+yDUwr0J*Qf5{!uF*M(2g#IPcT*%m6Pj5jD4fDM64?P<{Ht?kP&B
zcFGy8l&;{rVE59guau)%(=R&ofJ7a4`mEGRoWT_;!0Gen|5@iBV?nsCEsT}BWoNZ%
zLWm}Qd-oz|gr75Zmk7fINWJZ6k1R6KO^}6JiKowi{eqSPq;8%161Hi(IA-U4URWum
zPDHHp5qEBIjp1gH<`6Nn0v4j_@Z>ujuuchBZ$u^?W4Db}C;@aS>HzF2dqzyMOy*Sh
z(5Wv}OKL;O7>XObV}F;DhLVKI!>&4SlHa~ZNj{@va7%gk!tN9y<UYDpuX!JRlSO&6
ze<M9|*E$EyOTeiCT+7v6-}d#_qfJnIt;JadNtxNXiuw~MOX~zzSaFMN0kC=gs4y<o
z=-oxLCmhyFmiYtQ5VD|u-a95}cK7EQeldq-(UI#+%PCa>H)f`)Y>BNNee-wqA@-P7
zmo+fE1fDFDy5jJ;Xx%Vphi<8q*sE+o6j#svA+b8COA9Tb>VG}kVH{;4npU-WV@SN>
z7h5iYHXpu;bW`YCjvKbdZ+RuWyp}W%apAIAI#7XabEo}8k*lC(H12@_m>L8(PF&v^
zaNz#Z{+A36u5PQePx%t|DWl-{b)%94C(3iFnQCKqB@UdvUJ&t}uRrZ-(~}LzHt>s?
zI4^1WJ-_da&#$`sHM;;m#u)`M=-XB+@(Dr3e1V1XFj+N$#+uG$EhjA+$Y(InEUE1|
zzr;{K2u|<}<zKrBw7);Fg{NkU|1G@t4PrHcUu;JW6Gq_9LkmZ1g|mv7^Ba7Dqu)n&
zf+Z_Z(65WXQt(Q+HRa<0sZ-Yap}5ASTcN6IrlrEgrEM0MI(orJ#Xe}yix4mI*>LNm
zeA;QzyA%d`Y%7x3CQmytPLj~7MjBV}+Y1oeosBMhsAZtpM^q-K2SK$1RuY)*r>Ac)
zyx&D(@M4P!OS?bxb<JkrB8Rerpg`N&#r6h`aGZvc8y22;``NUIJ#jUSJ$iBgoFr%8
zyiC;2@jm*5Y`yt?)%|CshSjpEFS#W`o@*=S$3~-Cj-~d$bz5$G<Il?{(+t+Nd|f-2
zN`$n_0Df>&=*qsLrp#$aL5l~B@cgqSn$l)9a+Ej#0$9I`r}~GR>lgGJLL0AYHaiMz
z57?PKj3e0X-KfnMGScNGpI}CopnjI306}!4=8YMK!NNC_o5B*XvJ~Q7gN|s#j?BxH
z&pqp-7!uE}Lf;N#&_OrAd-W3Ju4q6>@mIUVW8H-gbD950f3-t{IF#cVf1gTT#;Fi%
zL3ztx?fKh2{6f@fl5oybzmlxNPrT}|$H<QULVO9^r`@^fu?7kEu5@n3k+@<;nARc$
z;EZHPgZ_K$P+Bee`Ql&OfEu(p;#4hq>{0{B)$ED+1bc(~OSM{-l{1dmLsMzh(PL+#
z^-QYsfRKLw0CxvyusMaFRAGzu=X-Ta&i1yewRWmEXKzr^arb{88cLjS{NPaL18a<Q
zhra#QBhh~D7}{vwmgM)dvonfIGKsJ9H=c{Pdu<Qqz6oBaXfBQl18??Sk&6#ptQvT_
z2|O9-k>*Igysgcdvt!TEjakV5xkVE<*{Q0J4)t!~JyB2ikK)7;hr{KEi1Gggj~dWS

diff --git a/packages/create-vite/template-svelte-ts/src/assets/svelte.svg b/packages/create-vite/template-svelte-ts/src/assets/svelte.svg
new file mode 100644
index 00000000000000..c5e08481f8aede
--- /dev/null
+++ b/packages/create-vite/template-svelte-ts/src/assets/svelte.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="26.6" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 308"><path fill="#FF3E00" d="M239.682 40.707C211.113-.182 154.69-12.301 113.895 13.69L42.247 59.356a82.198 82.198 0 0 0-37.135 55.056a86.566 86.566 0 0 0 8.536 55.576a82.425 82.425 0 0 0-12.296 30.719a87.596 87.596 0 0 0 14.964 66.244c28.574 40.893 84.997 53.007 125.787 27.016l71.648-45.664a82.182 82.182 0 0 0 37.135-55.057a86.601 86.601 0 0 0-8.53-55.577a82.409 82.409 0 0 0 12.29-30.718a87.573 87.573 0 0 0-14.963-66.244"></path><path fill="#FFF" d="M106.889 270.841c-23.102 6.007-47.497-3.036-61.103-22.648a52.685 52.685 0 0 1-9.003-39.85a49.978 49.978 0 0 1 1.713-6.693l1.35-4.115l3.671 2.697a92.447 92.447 0 0 0 28.036 14.007l2.663.808l-.245 2.659a16.067 16.067 0 0 0 2.89 10.656a17.143 17.143 0 0 0 18.397 6.828a15.786 15.786 0 0 0 4.403-1.935l71.67-45.672a14.922 14.922 0 0 0 6.734-9.977a15.923 15.923 0 0 0-2.713-12.011a17.156 17.156 0 0 0-18.404-6.832a15.78 15.78 0 0 0-4.396 1.933l-27.35 17.434a52.298 52.298 0 0 1-14.553 6.391c-23.101 6.007-47.497-3.036-61.101-22.649a52.681 52.681 0 0 1-9.004-39.849a49.428 49.428 0 0 1 22.34-33.114l71.664-45.677a52.218 52.218 0 0 1 14.563-6.398c23.101-6.007 47.497 3.036 61.101 22.648a52.685 52.685 0 0 1 9.004 39.85a50.559 50.559 0 0 1-1.713 6.692l-1.35 4.116l-3.67-2.693a92.373 92.373 0 0 0-28.037-14.013l-2.664-.809l.246-2.658a16.099 16.099 0 0 0-2.89-10.656a17.143 17.143 0 0 0-18.398-6.828a15.786 15.786 0 0 0-4.402 1.935l-71.67 45.674a14.898 14.898 0 0 0-6.73 9.975a15.9 15.9 0 0 0 2.709 12.012a17.156 17.156 0 0 0 18.404 6.832a15.841 15.841 0 0 0 4.402-1.935l27.345-17.427a52.147 52.147 0 0 1 14.552-6.397c23.101-6.006 47.497 3.037 61.102 22.65a52.681 52.681 0 0 1 9.003 39.848a49.453 49.453 0 0 1-22.34 33.12l-71.664 45.673a52.218 52.218 0 0 1-14.563 6.398"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-svelte-ts/src/lib/Counter.svelte b/packages/create-vite/template-svelte-ts/src/lib/Counter.svelte
index b8e7524c2232aa..979b4dfc91c86e 100644
--- a/packages/create-vite/template-svelte-ts/src/lib/Counter.svelte
+++ b/packages/create-vite/template-svelte-ts/src/lib/Counter.svelte
@@ -6,29 +6,5 @@
 </script>
 
 <button on:click={increment}>
-  Clicks: {count}
+  count is {count}
 </button>
-
-<style>
-  button {
-    font-family: inherit;
-    font-size: inherit;
-    padding: 1em 2em;
-    color: #ff3e00;
-    background-color: rgba(255, 62, 0, 0.1);
-    border-radius: 2em;
-    border: 2px solid rgba(255, 62, 0, 0);
-    outline: none;
-    width: 200px;
-    font-variant-numeric: tabular-nums;
-    cursor: pointer;
-  }
-
-  button:focus {
-    border: 2px solid #ff3e00;
-  }
-
-  button:active {
-    background-color: rgba(255, 62, 0, 0.2);
-  }
-</style>
diff --git a/packages/create-vite/template-svelte-ts/src/main.ts b/packages/create-vite/template-svelte-ts/src/main.ts
index d8200ac4fe3078..5c1f795f9f55a6 100644
--- a/packages/create-vite/template-svelte-ts/src/main.ts
+++ b/packages/create-vite/template-svelte-ts/src/main.ts
@@ -1,3 +1,4 @@
+import './app.css'
 import App from './App.svelte'
 
 const app = new App({
diff --git a/packages/create-vite/template-svelte/index.html b/packages/create-vite/template-svelte/index.html
index 4a3886b62cf793..26c29c45b2689e 100644
--- a/packages/create-vite/template-svelte/index.html
+++ b/packages/create-vite/template-svelte/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Svelte + Vite App</title>
+    <title>Vite + Svelte</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/packages/create-vite/template-svelte/public/favicon.ico b/packages/create-vite/template-svelte/public/favicon.ico
deleted file mode 100644
index d75d248ef0b15096a95054643a4d97f5d9b60846..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmaKqSxA*Z7>4KMS_;~x;8i!JU{-`tpyx!I(n2NFMU)w2L{WiMS3#Lcp@vrpA*5Yp
zSy6|`AkYfDD<i0E#V`++Z6*?!>(e{`n8yX0pLf20X1@3RmKkGw`Vte3=0)aUq%ldx
zm^49K+Hw0b#^`KboP)QXJOwbuVUFxlAs{RfqJ+twGylWfOp{Hc$s#253LlN1nsFVc
zKa>40?h5(7PTC6ltDx)(Y&Ze2xggCq(kK?<y<8^e<6=jMdpU6v+;{||V|e5D0Ms=>
zTA`;gAfKD!+uFjpxc_A3+Ma(L28W=z4Gvs@r*ECk`;c45=S#;=oA|abt`f&j5&uJO
z3Dn+&^gZ%h4JidsaTR{{!_Y8PUx(-%PosPy2gi@qIvBMMYz;e3L1{f~mrd9RdB>pZ
zD}4R|sk_C`;=cT&r)c=8u>7h9)u32*SbL`xiq3(pq5C^5-sSOw;<|fv@nfXfl&U`2
z81K5ExDp;bf#DISW%IY%k&2-noShOoz-;kb(u?5RFX-ro?87j3GZdCXrFc8bTx}jd
zz_n@djWnxc*TbbCjEq80FPyG}1zQwvjq7R6ZSWuQ@_#A*LN5n<3$BI?X}q%iD!B-s
zdSFcNp!EgpJr6C<U|<k(bVthdxj6Hu@vTm#H17HQ3@zUW4b6^YJ7BdMAG-UHPpy1s
zP4L4xSd9eXsA6=)<w3zo)vq^js2Y;DdA)1b`LZco_mbS~YVqmZ)>AK?klug4>=)Tv
z+F#{yt>6EK)3NU=L&y_W3UNaC?Tg=6YE0)^V;(0Mb0$WJ7>7@Lg0~+3x9d)!Pd<O-
HJ0{LwWbpi$

diff --git a/packages/create-vite/template-svelte/public/vite.svg b/packages/create-vite/template-svelte/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-svelte/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-svelte/src/App.svelte b/packages/create-vite/template-svelte/src/App.svelte
index 90ca0665a7416a..a5a4f8caab6977 100644
--- a/packages/create-vite/template-svelte/src/App.svelte
+++ b/packages/create-vite/template-svelte/src/App.svelte
@@ -1,65 +1,42 @@
 <script>
-  import logo from './assets/svelte.png'
+  import viteLogo from '/vite.svg'
+  import svelteLogo from './assets/svelte.svg'
   import Counter from './lib/Counter.svelte'
 </script>
 
 <main>
-  <img src={logo} alt="Svelte Logo" />
-  <h1>Hello world!</h1>
-
-  <Counter />
+  <div>
+    <a href="https://vitejs.dev" target="_blank"> 
+      <img src={viteLogo} alt="Vite Logo" />
+    </a>
+    <a href="https://svelte.dev" target="_blank"> 
+      <img src={svelteLogo} alt="Svelte Logo" />
+    </a>
+  </div>
+  <h1>Vite + Svelte</h1>
+
+  <div class="card">
+    <Counter />
+  </div>
 
   <p>
-    Visit <a href="https://svelte.dev">svelte.dev</a> to learn how to build Svelte
-    apps.
+    Check out <a href="https://github.com/sveltejs/kit#readme" target="_blank">SvelteKit</a>, the official Svelte app framework powered by Vite!
   </p>
 
-  <p>
-    Check out <a href="https://github.com/sveltejs/kit#readme">SvelteKit</a> for
-    the officially supported framework, also powered by Vite!
+  <p class="read-the-docs">
+    Click on the Vite and Svelte logos to learn more
   </p>
 </main>
 
 <style>
-  :root {
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
-      Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-  }
-
-  main {
-    text-align: center;
-    padding: 1em;
-    margin: 0 auto;
-  }
-
   img {
-    height: 16rem;
-    width: 16rem;
+    height: 6em;
+    padding: 1.5em;
   }
-
-  h1 {
-    color: #ff3e00;
-    text-transform: uppercase;
-    font-size: 4rem;
-    font-weight: 100;
-    line-height: 1.1;
-    margin: 2rem auto;
-    max-width: 14rem;
-  }
-
-  p {
-    max-width: 14rem;
-    margin: 1rem auto;
-    line-height: 1.35;
+  img:hover {
+    filter: drop-shadow(0 0 2em #646cffaa);
   }
-
-  @media (min-width: 480px) {
-    h1 {
-      max-width: none;
-    }
-
-    p {
-      max-width: none;
-    }
+  .read-the-docs {
+    color: #888;
   }
 </style>
diff --git a/packages/create-vite/template-svelte/src/app.css b/packages/create-vite/template-svelte/src/app.css
new file mode 100644
index 00000000000000..07396c895cc09e
--- /dev/null
+++ b/packages/create-vite/template-svelte/src/app.css
@@ -0,0 +1,80 @@
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+}
+
+.card {
+  padding: 2em;
+}
+
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
+}
diff --git a/packages/create-vite/template-svelte/src/assets/svelte.png b/packages/create-vite/template-svelte/src/assets/svelte.png
deleted file mode 100644
index e673c91c7bcb0e3a1be737745af56990613a641e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5185
zcmb7Ic{r5c+ka+Z#*(pQFEeFJ2}O~Z8EF@d5F#cN<(nC6vWyuCh3ZR|LZ*_XWJ_TN
zGm@>cg|g2KDN<ue4aQ^M`MvLTz1REid#>lX&N=se&V8QiJoo*%Kj+*cI2_v~tsxBn
zz@`(&51#=5sJICQkT7x8Ql!%%u6zlnoR5ga1q=NDo|E#Tvlx+&i6{s!iYADXh@uR#
zsDLVZaZglB7qwK1df1}TUeOF!w7eiTzrmZlAzn^C?2LmGAdfM@6NqH$J$fa(m%HH1
zEfIf;QtXMtHqMbFKSx~OKEuf3c~rB^bdVIWHs`$YVN>_&XMCrPgxJLYDO?fn5VAhz
zS{B*|nZ)foWa$5LZCB%jF2cAcUORK-k8ut2urUfK=zcD`G@zLOQwDqfy#AkE*PAJx
z4GhXXimv`pa!)O#G7HtL5)-th2wK70>Ye}Gbc4OQY3E&j(YUf>x;${qk(kCxEbmWI
zRa1Ok9w9+fDE)D8K*t0V9-I9LPEuhSu@$-e+FCf5be=t<NIf`sTg7i*;p0SS<6X_J
z`@V%$%ibO_O)sPM4irWq4L8NjDbv7gbQIB-e|G9NH++dOSF=azCx;SRP5k~h*ERp2
z)W5mr@&DZU>#I@-)=37iq+*2{ba2H2FWiIdr6?Kc=LDOLd-zI-=UB<IPRy(Uz7&aG
zN*S=RIyRKN_wL_O_jFeLUT1em4SE;#udi5FFnmyH_pxA(OosE$%=d{ORbY}r(0hrs
z{`tY|fmlXp^EZuHV}gw38?1YlDa~BTS>UAUEa*oP{^!lu7LH2;!g18V=DQ5^+iQ!k
z_q?5*CAo2QiN^^sS&F$uuNy<L>r&q(NB8NGlnH{spB704y!@*#_GxnoJ8qq88l_0H
z+N{Dd%ic8-6zjYP(|CfMwWz_vgae*Bibc6^4}Og8iZd$Yf4Repz2wpP>3;iml^>LE
z`w;i4F4)5cz@2j~(2rZE^7n+Zt|0ArFaOnDB?vsW`og-;ZCkJ^5x)HRA?fCWgW)zB
zg1~Q;P$%t_;4=ablxaey+KXQ#Xw*;6TBXLuGrh`S!3$3}W!F+Ez<6C=C$36`#$<4o
z2Aq=F0bzwdNlU@mYD4k}PCy`=ROKjuMP9x;^KGmGwMRYm8*QDRWTM^$Gyh8QP44y#
zw7$my<zsg5=<$IJfS$*1%&*K#l?ZLZ81Mxq`f#xw!1~{gwwizJ<V7cb5|e5KLHGz-
zwDH*hMF6`J&wy`nA4d^y$GV&vCrRh}$R{wd^A9FKJR><N{s$#=NGrUsNxb!@iM#h|
zLM%1|KPc;$+1U*A$Ws2JtYP>dNNyM=`F6N=&QmP3(<OiKQB3csk=Tgjg7?e(c9vA$
z>t%#k5_LV-qq&p!=wBhv8E=5kjvE3$O+~yx<e7%z@-DeXvopC2lHb^!ztk4naZ;ym
z^D8;wTaTuG)A@_2l^ug%)=SCEsOjH5VOW#Nh+r-9S%HTayy=fnq&f%Nb)%uvmL*ad
zLlwV25AXRw!L?qR(4vTkbi!GGg!*Kh`H09j4BIG$T^1gTU@f|cnh!FX^&McVEL?`L
z%lNnNdVM8;<(y<Al7x_{SdDBls&3&+ocmaXd7xar+Folp3oG-*x2W#1vfQLKs|v&x
ztu6edl(k)h_RWod<8rpWYZ+u=v?G(Jvn9Ohj#@)1thox@y$#wco!=<zr>7&~UyC8_
zdv9csIBh?UT&>PkUg{VHHzZYoe}Xg?@|i;L__UJe=IPTw<T%MuJ@5BJl`z9=TnaA!
zoxhh>WY0%%dk#LMf0}Ac5k#XfN13Ts3vSg+4s*G0A2*i-!;o3ErBBhw2|*>K@EQww
znf^f!xTE_@s7_PkuJ)~8rI}A;&6ld&a}7i3?1U)Pp-(-9EcnGvwz|YS&0_(h0e;dA
zbBSOC`|;P9$%`iGmcT>9E6uKAPw4|J&SX)_6gE+>4gyy-1TB~UZUyw+;Zu=gr(wiZ
z3HoBGc;BZ{)UPu5>~4^37zY%30f`CxB&WtPibuS|Y;D{aNIqr05-Z7eA%3ip5Su`-
zSb#;)f^dqDc*mX?iLbEYa6E2NXN!=vFjGqjlm0fb%^zS;P-09~OdLn5d+7u9B8sZt
zDL|(kE>dqXUPu>ov_Zx%jiZV+&c1+Ihn#>UE$`-B&VaOxE62#Es?vlP)aJgZDTVj=
zYWcOyQ@GP-k72ie-G*$-V4@$%xbXoC=>+XyTwdF5t6j@^whHV|O!P*{YaUiQ5{b8;
zr>x}Uo|yQW(=2Dw$3$c2=-K9-L`0=H1X&@y9nn@R*QmES;KDVBhKA1kI0RX&@Q&U(
zZEv*fLeDCmj&40dS7Jl!^`ReE>(J!YL1Z|NP~R#`4!ZbzK&cLf6f*H`{#?q+dWJ)Z
zE;le*hCP6kdU-5@x~nDj9$bd1to2-K2-4KyL^Xm5TB`CJJ|M13oBU>apA(C+IN+xc
z{dvi-b$)i1jKBt;$rAG9&0t))j(N&03`^cbiCIttM9R5|C-^kg6(HsYK|Ho@j{1s$
zZhJ*9hkd?v%zE*6SFHZW=R#Uch#l2#bgAofCx}fDgHC-23)O2VYAEIdr&Iz4L6eh9
zvvdbLoEqmVgbVAi^EtCGjvb&p!z#3t`l%xw9*8i%i6)oV+COulKRG@iqiD17y!;yP
zd!+y9?X@j{zP;Sg%Z<gP1MAy=_p0COro~u}RbCKQ{Mt;(n00Yffsh>xbl9Cy&Jl7X
z1#?M<pW;REx`BNcXu~ITv?QVdIF-_Rf`VzP(2?|?ROqXdc&L1=j+eUWU)ZGQWC2`O
z0gForM2<Ayg3-O^(v9qq_miv<Y{L{^>o4FtI~z0*VQWA%&DgYK2Z||2J*(0x8`gi>
zxV0QcKX>)4YA2SUC3fkQyFdLjogxe(wgSJUofsu5w57^<fNXbX<~EgNeqF8%Li{KB
zFpIYx)2(j<5cx@_F1gl{?+&yY!Mmh(#_ed*t5fJ!1hzdBKAR_6UI7N6XVSJ|BXXsa
zLsKbR#(4bf_-*a7@&VHJe+tUZAAg6jD2{=$pSoj+=o$s`?)@F6QBDDAOmB_EpPPX?
z4M`mz7@u-WEo2NDwD`s62Ge_cqHH$RZvDjtm1`_#S-2fw<3Vnnq@-{zHz`}Fd&;T>
z3+#?&yX#h36xC^deink;;{E+nyg};Nmpb9Ix4HJ?(rwoZ)#Odo$G|gtq~7YPqRh4(
zh1ZA?z7enrUBo~5d>1fHwEuL8Y`nQ(^KeV-eyUKR7$WdAqkGklSBG49RabVZ@|_$U
z5(RUUylOpjFk=d%4o#g01a`M7_MU_p8+dQZ^FB(UhhLaWUAB#1G$h2hB~+O%As$lX
z;5DnxFjV|J1k)ejZQoz><{B+wxYAp$#rsZK%cH90XTbV+rNK`HD^$aDIy~$`kL=1V
z`DjIA%#f)v6T$5{CSbt*co0r72lYjlUKk|PVo%7XI_b4T#PSd=@}MpzD6m6YMqxmg
zog14%H-elu+8&v4tu$t6kCV{}wmPe-@$`>V=~P>Td7p3i__?d2W?didI7KO0`AtDS
zNkYFh{fi?q_87+Zuy(-<l<#SMd5_BZl2^Uw>sy>bf*vYQb2Zu$O-%G;w6LaQy~^@6
zi%!2m+^_dUu`8tYw+hDBoVCb>vvT?YvVi1<tJ9N^1%DfYG|`+^wRV%6|7jrJ$P6}x
zJZDRF6h*>wJd0XA;TNQDu?xVxPSOf7n?0s5$TrhD4#!Ej8RWHotCK$T>pJr<6W}ft
zs2=&E!~c=f`Z4B`<OF>3$P}ftU2Efp@%slfc-J;x<y8Vx!iwxWwyMpp?eq6?H$uU)
zfOzDL{W>RRfVU{RNDpRBms=jB%j5mx;R-|v;vEX+_-hII!_*f};KVAN?G&KRX2GAP
z@M-P#1(Lu}Vf%(uI#n;@WUr&j6T9yeKm(vc3$0bvQVrP+0>Gj(#Mx=P07kC*HFfwN
zL@_McO}h|6=EYg>1Wid!yHn^8@{Wrac4o6d;9D$$eI)Dq^iw7pk3j;75`Y_=EP$1W
zV@}mQsr#6i*6kMpfC>Qgw};`VlrIpn0(C`5t*y2QT|UXZ83+LaJPXTFRLcbf&;$??
z*o01LS#cm2mpPaQt^Q6K4)<7a_aXez;t12qY*}+D5Y(;1-=Wkwzuh}`7!Jd@I*TP<
z{kaqVyWCNRCgT21z|n_T{krVdCM4`SutmqRNR#5u{Qmfb-+6{vSI7Eyw!BMVJ_^_V
z=e)8FLDBy9)HQtG^Qy*B9zxH2=uOs+Fi7E~92GST6s^KC-+fiaTdfwdNsskFo15Aw
z>Y0)goNAwX{kFLGl+yEV)Wm3qF_(yxO)113`bU1q^?tmduw|-0m;uYduI4Y_u*6%Q
zD_HN#Ir9SFY2xda>Rz&Y!FC)~sCq?a{nIB@6U;;a8yAD{C0-UVtlm}gpx(Jv#iCS5
za~|tC=IwX7Ce%$se?DYzGp13<t9hFbdoFx-5;A>*Dcw74EzW6C4fnsgQ1_ftW(glh
zYR`vEVWs!4#3U~BlYDPlNkkH3?^}zBVx;XO=;oPdo>SK>Wmc7%E)<{7oEXQ)P_97y
zW^Mys9}K7)M**F*?y+#TLcw6>1W3pOwun;-HlY$c!d|P?OP0jdwL{H#Ju41xj#=wQ
zK1%#&e@95andgyN3Xp->QqM`sS$Hr$>(OL$g~x$7q;xwy^sp4bD$|?g$X<~}&jbCG
z!mwp&N@N864PGXd{FIENON#LY4&g3Hb<d8Yo+u=nu4+1J6@1N}0Oh^ngT?+tEGnAc
z1r@;5;8Q2DTGf!Ydc`{QJ)k-b;Tc-gJ@n5A2<U06_4w>68}-^3p7<7|&i7!qYv82c
zWzcl^2op_+0jl*Z)ll9|^7uIEu}Vo`l`?kH>gC>=20o%p1Sho>_*hqbcTI!%!uka)
zm37F1BxUAQlmHfdl<dHirN(i+G7Zzz51C22Q=`Sn#y(OrH)cSIZI{KZnF9ipm}n|V
z2ZZ9qnzbxaj4;XKGO$q3iI4u$ICKplFgWR|+&daT7{Au<N7QaJU}(&^?i{c^4+<QP
z^Lx+(sx+=g8B`+yDUwr0J*Qf5{!uF*M(2g#IPcT*%m6Pj5jD4fDM64?P<{Ht?kP&B
zcFGy8l&;{rVE59guau)%(=R&ofJ7a4`mEGRoWT_;!0Gen|5@iBV?nsCEsT}BWoNZ%
zLWm}Qd-oz|gr75Zmk7fINWJZ6k1R6KO^}6JiKowi{eqSPq;8%161Hi(IA-U4URWum
zPDHHp5qEBIjp1gH<`6Nn0v4j_@Z>ujuuchBZ$u^?W4Db}C;@aS>HzF2dqzyMOy*Sh
z(5Wv}OKL;O7>XObV}F;DhLVKI!>&4SlHa~ZNj{@va7%gk!tN9y<UYDpuX!JRlSO&6
ze<M9|*E$EyOTeiCT+7v6-}d#_qfJnIt;JadNtxNXiuw~MOX~zzSaFMN0kC=gs4y<o
z=-oxLCmhyFmiYtQ5VD|u-a95}cK7EQeldq-(UI#+%PCa>H)f`)Y>BNNee-wqA@-P7
zmo+fE1fDFDy5jJ;Xx%Vphi<8q*sE+o6j#svA+b8COA9Tb>VG}kVH{;4npU-WV@SN>
z7h5iYHXpu;bW`YCjvKbdZ+RuWyp}W%apAIAI#7XabEo}8k*lC(H12@_m>L8(PF&v^
zaNz#Z{+A36u5PQePx%t|DWl-{b)%94C(3iFnQCKqB@UdvUJ&t}uRrZ-(~}LzHt>s?
zI4^1WJ-_da&#$`sHM;;m#u)`M=-XB+@(Dr3e1V1XFj+N$#+uG$EhjA+$Y(InEUE1|
zzr;{K2u|<}<zKrBw7);Fg{NkU|1G@t4PrHcUu;JW6Gq_9LkmZ1g|mv7^Ba7Dqu)n&
zf+Z_Z(65WXQt(Q+HRa<0sZ-Yap}5ASTcN6IrlrEgrEM0MI(orJ#Xe}yix4mI*>LNm
zeA;QzyA%d`Y%7x3CQmytPLj~7MjBV}+Y1oeosBMhsAZtpM^q-K2SK$1RuY)*r>Ac)
zyx&D(@M4P!OS?bxb<JkrB8Rerpg`N&#r6h`aGZvc8y22;``NUIJ#jUSJ$iBgoFr%8
zyiC;2@jm*5Y`yt?)%|CshSjpEFS#W`o@*=S$3~-Cj-~d$bz5$G<Il?{(+t+Nd|f-2
zN`$n_0Df>&=*qsLrp#$aL5l~B@cgqSn$l)9a+Ej#0$9I`r}~GR>lgGJLL0AYHaiMz
z57?PKj3e0X-KfnMGScNGpI}CopnjI306}!4=8YMK!NNC_o5B*XvJ~Q7gN|s#j?BxH
z&pqp-7!uE}Lf;N#&_OrAd-W3Ju4q6>@mIUVW8H-gbD950f3-t{IF#cVf1gTT#;Fi%
zL3ztx?fKh2{6f@fl5oybzmlxNPrT}|$H<QULVO9^r`@^fu?7kEu5@n3k+@<;nARc$
z;EZHPgZ_K$P+Bee`Ql&OfEu(p;#4hq>{0{B)$ED+1bc(~OSM{-l{1dmLsMzh(PL+#
z^-QYsfRKLw0CxvyusMaFRAGzu=X-Ta&i1yewRWmEXKzr^arb{88cLjS{NPaL18a<Q
zhra#QBhh~D7}{vwmgM)dvonfIGKsJ9H=c{Pdu<Qqz6oBaXfBQl18??Sk&6#ptQvT_
z2|O9-k>*Igysgcdvt!TEjakV5xkVE<*{Q0J4)t!~JyB2ikK)7;hr{KEi1Gggj~dWS

diff --git a/packages/create-vite/template-svelte/src/assets/svelte.svg b/packages/create-vite/template-svelte/src/assets/svelte.svg
new file mode 100644
index 00000000000000..c5e08481f8aede
--- /dev/null
+++ b/packages/create-vite/template-svelte/src/assets/svelte.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="26.6" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 308"><path fill="#FF3E00" d="M239.682 40.707C211.113-.182 154.69-12.301 113.895 13.69L42.247 59.356a82.198 82.198 0 0 0-37.135 55.056a86.566 86.566 0 0 0 8.536 55.576a82.425 82.425 0 0 0-12.296 30.719a87.596 87.596 0 0 0 14.964 66.244c28.574 40.893 84.997 53.007 125.787 27.016l71.648-45.664a82.182 82.182 0 0 0 37.135-55.057a86.601 86.601 0 0 0-8.53-55.577a82.409 82.409 0 0 0 12.29-30.718a87.573 87.573 0 0 0-14.963-66.244"></path><path fill="#FFF" d="M106.889 270.841c-23.102 6.007-47.497-3.036-61.103-22.648a52.685 52.685 0 0 1-9.003-39.85a49.978 49.978 0 0 1 1.713-6.693l1.35-4.115l3.671 2.697a92.447 92.447 0 0 0 28.036 14.007l2.663.808l-.245 2.659a16.067 16.067 0 0 0 2.89 10.656a17.143 17.143 0 0 0 18.397 6.828a15.786 15.786 0 0 0 4.403-1.935l71.67-45.672a14.922 14.922 0 0 0 6.734-9.977a15.923 15.923 0 0 0-2.713-12.011a17.156 17.156 0 0 0-18.404-6.832a15.78 15.78 0 0 0-4.396 1.933l-27.35 17.434a52.298 52.298 0 0 1-14.553 6.391c-23.101 6.007-47.497-3.036-61.101-22.649a52.681 52.681 0 0 1-9.004-39.849a49.428 49.428 0 0 1 22.34-33.114l71.664-45.677a52.218 52.218 0 0 1 14.563-6.398c23.101-6.007 47.497 3.036 61.101 22.648a52.685 52.685 0 0 1 9.004 39.85a50.559 50.559 0 0 1-1.713 6.692l-1.35 4.116l-3.67-2.693a92.373 92.373 0 0 0-28.037-14.013l-2.664-.809l.246-2.658a16.099 16.099 0 0 0-2.89-10.656a17.143 17.143 0 0 0-18.398-6.828a15.786 15.786 0 0 0-4.402 1.935l-71.67 45.674a14.898 14.898 0 0 0-6.73 9.975a15.9 15.9 0 0 0 2.709 12.012a17.156 17.156 0 0 0 18.404 6.832a15.841 15.841 0 0 0 4.402-1.935l27.345-17.427a52.147 52.147 0 0 1 14.552-6.397c23.101-6.006 47.497 3.037 61.102 22.65a52.681 52.681 0 0 1 9.003 39.848a49.453 49.453 0 0 1-22.34 33.12l-71.664 45.673a52.218 52.218 0 0 1-14.563 6.398"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-svelte/src/lib/Counter.svelte b/packages/create-vite/template-svelte/src/lib/Counter.svelte
index 37a92cbf4bbd10..e45f903109790d 100644
--- a/packages/create-vite/template-svelte/src/lib/Counter.svelte
+++ b/packages/create-vite/template-svelte/src/lib/Counter.svelte
@@ -6,29 +6,5 @@
 </script>
 
 <button on:click={increment}>
-  Clicks: {count}
+  count is {count}
 </button>
-
-<style>
-  button {
-    font-family: inherit;
-    font-size: inherit;
-    padding: 1em 2em;
-    color: #ff3e00;
-    background-color: rgba(255, 62, 0, 0.1);
-    border-radius: 2em;
-    border: 2px solid rgba(255, 62, 0, 0);
-    outline: none;
-    width: 200px;
-    font-variant-numeric: tabular-nums;
-    cursor: pointer;
-  }
-
-  button:focus {
-    border: 2px solid #ff3e00;
-  }
-
-  button:active {
-    background-color: rgba(255, 62, 0, 0.2);
-  }
-</style>
diff --git a/packages/create-vite/template-svelte/src/main.js b/packages/create-vite/template-svelte/src/main.js
index d8200ac4fe3078..5c1f795f9f55a6 100644
--- a/packages/create-vite/template-svelte/src/main.js
+++ b/packages/create-vite/template-svelte/src/main.js
@@ -1,3 +1,4 @@
+import './app.css'
 import App from './App.svelte'
 
 const app = new App({
diff --git a/packages/create-vite/template-vanilla-ts/index.html b/packages/create-vite/template-vanilla-ts/index.html
index 867581c5124fa1..f86e483c942e8d 100644
--- a/packages/create-vite/template-vanilla-ts/index.html
+++ b/packages/create-vite/template-vanilla-ts/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="favicon.svg" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
+    <title>Vite + TS</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/packages/create-vite/template-vanilla-ts/public/vite.svg b/packages/create-vite/template-vanilla-ts/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-vanilla-ts/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-vanilla-ts/src/counter.ts b/packages/create-vite/template-vanilla-ts/src/counter.ts
new file mode 100644
index 00000000000000..a3529e1f26bfc8
--- /dev/null
+++ b/packages/create-vite/template-vanilla-ts/src/counter.ts
@@ -0,0 +1,9 @@
+export function setupCounter(element: HTMLButtonElement) {
+  let counter = 0
+  const setCounter = (count: number) => {
+    counter = count
+    element.innerHTML = `count is ${counter}`
+  }
+  element.addEventListener('click', () => setCounter(++counter))
+  setCounter(0)
+}
diff --git a/packages/create-vite/template-vanilla-ts/src/main.ts b/packages/create-vite/template-vanilla-ts/src/main.ts
index f77db7a8fcab13..8dd51bd53cd550 100644
--- a/packages/create-vite/template-vanilla-ts/src/main.ts
+++ b/packages/create-vite/template-vanilla-ts/src/main.ts
@@ -1,8 +1,20 @@
 import './style.css'
+import viteLogo from '/vite.svg'
+import typescriptLogo from './typescript.svg'
+import { setupCounter } from './counter'
 
-const app = document.querySelector<HTMLDivElement>('#app')!
-
-app.innerHTML = `
-  <h1>Hello Vite!</h1>
-  <a href="https://vitejs.dev/guide/features.html" target="_blank">Documentation</a>
+document.querySelector<HTMLDivElement>('#app')!.innerHTML = `
+  <div>
+    <a href="https://vitejs.dev" target="_blank"><img class="logo" alt="Vite logo" src="${viteLogo}" /></a>
+    <a href="https://www.typescriptlang.org/" target="_blank"><img class="logo" alt="TypeScript logo" src="${typescriptLogo}" /></a>
+    <h1>Vite + TypeScript</h1>
+    <div class="card">
+      <button id="counter" type="button"></button>
+    </div>
+    <p class="read-the-docs">
+      Click on the Vite and TypeScript logos to learn more
+    </p>
+  </div>
 `
+
+setupCounter(document.querySelector<HTMLButtonElement>('#counter')!)
diff --git a/packages/create-vite/template-vanilla-ts/src/style.css b/packages/create-vite/template-vanilla-ts/src/style.css
index 852de7aa2ae573..b99c9e8fa9d8d9 100644
--- a/packages/create-vite/template-vanilla-ts/src/style.css
+++ b/packages/create-vite/template-vanilla-ts/src/style.css
@@ -1,8 +1,92 @@
-#app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+}
+
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
   text-align: center;
-  color: #2c3e50;
-  margin-top: 60px;
+}
+
+.logo {
+  height: 6em;
+  padding: 1.5em;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
 }
diff --git a/packages/create-vite/template-vanilla-ts/src/typescript.svg b/packages/create-vite/template-vanilla-ts/src/typescript.svg
new file mode 100644
index 00000000000000..d91c910cc30bf4
--- /dev/null
+++ b/packages/create-vite/template-vanilla-ts/src/typescript.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="32" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 256"><path fill="#007ACC" d="M0 128v128h256V0H0z"></path><path fill="#FFF" d="m56.612 128.85l-.081 10.483h33.32v94.68h23.568v-94.68h33.321v-10.28c0-5.69-.122-10.444-.284-10.566c-.122-.162-20.4-.244-44.983-.203l-44.74.122l-.121 10.443Zm149.955-10.742c6.501 1.625 11.459 4.51 16.01 9.224c2.357 2.52 5.851 7.111 6.136 8.208c.08.325-11.053 7.802-17.798 11.988c-.244.162-1.22-.894-2.317-2.52c-3.291-4.795-6.745-6.867-12.028-7.233c-7.76-.528-12.759 3.535-12.718 10.321c0 1.992.284 3.17 1.097 4.795c1.707 3.536 4.876 5.649 14.832 9.956c18.326 7.883 26.168 13.084 31.045 20.48c5.445 8.249 6.664 21.415 2.966 31.208c-4.063 10.646-14.14 17.879-28.323 20.276c-4.388.772-14.79.65-19.504-.203c-10.28-1.828-20.033-6.908-26.047-13.572c-2.357-2.6-6.949-9.387-6.664-9.874c.122-.163 1.178-.813 2.356-1.504c1.138-.65 5.446-3.129 9.509-5.485l7.355-4.267l1.544 2.276c2.154 3.29 6.867 7.801 9.712 9.305c8.167 4.307 19.383 3.698 24.909-1.26c2.357-2.153 3.332-4.388 3.332-7.68c0-2.966-.366-4.266-1.91-6.501c-1.99-2.845-6.054-5.242-17.595-10.24c-13.206-5.69-18.895-9.224-24.096-14.832c-3.007-3.25-5.852-8.452-7.03-12.8c-.975-3.617-1.22-12.678-.447-16.335c2.723-12.76 12.353-21.659 26.25-24.3c4.51-.853 14.994-.528 19.424.569Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-vanilla/counter.js b/packages/create-vite/template-vanilla/counter.js
new file mode 100644
index 00000000000000..12ae65abfaea09
--- /dev/null
+++ b/packages/create-vite/template-vanilla/counter.js
@@ -0,0 +1,9 @@
+export function setupCounter(element) {
+  let counter = 0
+  const setCounter = (count) => {
+    counter = count
+    element.innerHTML = `count is ${counter}`
+  }
+  element.addEventListener('click', () => setCounter(++counter))
+  setCounter(0)
+}
diff --git a/packages/create-vite/template-vanilla/favicon.svg b/packages/create-vite/template-vanilla/favicon.svg
deleted file mode 100644
index de4aeddc12bdfe..00000000000000
--- a/packages/create-vite/template-vanilla/favicon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="410" height="404" viewBox="0 0 410 404" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M399.641 59.5246L215.643 388.545C211.844 395.338 202.084 395.378 198.228 388.618L10.5817 59.5563C6.38087 52.1896 12.6802 43.2665 21.0281 44.7586L205.223 77.6824C206.398 77.8924 207.601 77.8904 208.776 77.6763L389.119 44.8058C397.439 43.2894 403.768 52.1434 399.641 59.5246Z" fill="url(#paint0_linear)"/>
-<path d="M292.965 1.5744L156.801 28.2552C154.563 28.6937 152.906 30.5903 152.771 32.8664L144.395 174.33C144.198 177.662 147.258 180.248 150.51 179.498L188.42 170.749C191.967 169.931 195.172 173.055 194.443 176.622L183.18 231.775C182.422 235.487 185.907 238.661 189.532 237.56L212.947 230.446C216.577 229.344 220.065 232.527 219.297 236.242L201.398 322.875C200.278 328.294 207.486 331.249 210.492 326.603L212.5 323.5L323.454 102.072C325.312 98.3645 322.108 94.137 318.036 94.9228L279.014 102.454C275.347 103.161 272.227 99.746 273.262 96.1583L298.731 7.86689C299.767 4.27314 296.636 0.855181 292.965 1.5744Z" fill="url(#paint1_linear)"/>
-<defs>
-<linearGradient id="paint0_linear" x1="6.00017" y1="32.9999" x2="235" y2="344" gradientUnits="userSpaceOnUse">
-<stop stop-color="#41D1FF"/>
-<stop offset="1" stop-color="#BD34FE"/>
-</linearGradient>
-<linearGradient id="paint1_linear" x1="194.651" y1="8.81818" x2="236.076" y2="292.989" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFEA83"/>
-<stop offset="0.0833333" stop-color="#FFDD35"/>
-<stop offset="1" stop-color="#FFA800"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/create-vite/template-vanilla/index.html b/packages/create-vite/template-vanilla/index.html
index f1dedb52dba233..2ad7b1ab9e691d 100644
--- a/packages/create-vite/template-vanilla/index.html
+++ b/packages/create-vite/template-vanilla/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="favicon.svg" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite App</title>
   </head>
diff --git a/packages/create-vite/template-vanilla/javascript.svg b/packages/create-vite/template-vanilla/javascript.svg
new file mode 100644
index 00000000000000..f9abb2b728d73b
--- /dev/null
+++ b/packages/create-vite/template-vanilla/javascript.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="32" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 256"><path fill="#F7DF1E" d="M0 0h256v256H0V0Z"></path><path d="m67.312 213.932l19.59-11.856c3.78 6.701 7.218 12.371 15.465 12.371c7.905 0 12.89-3.092 12.89-15.12v-81.798h24.057v82.138c0 24.917-14.606 36.259-35.916 36.259c-19.245 0-30.416-9.967-36.087-21.996m85.07-2.576l19.588-11.341c5.157 8.421 11.859 14.607 23.715 14.607c9.969 0 16.325-4.984 16.325-11.858c0-8.248-6.53-11.17-17.528-15.98l-6.013-2.58c-17.357-7.387-28.87-16.667-28.87-36.257c0-18.044 13.747-31.792 35.228-31.792c15.294 0 26.292 5.328 34.196 19.247l-18.732 12.03c-4.125-7.389-8.591-10.31-15.465-10.31c-7.046 0-11.514 4.468-11.514 10.31c0 7.217 4.468 10.14 14.778 14.608l6.014 2.577c20.45 8.765 31.963 17.7 31.963 37.804c0 21.654-17.012 33.51-39.867 33.51c-22.339 0-36.774-10.654-43.819-24.574"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-vanilla/main.js b/packages/create-vite/template-vanilla/main.js
index 4c0070f03c7ba0..35c67ecd6283eb 100644
--- a/packages/create-vite/template-vanilla/main.js
+++ b/packages/create-vite/template-vanilla/main.js
@@ -1,6 +1,20 @@
 import './style.css'
+import viteLogo from '/vite.svg'
+import javascriptLogo from './javascript.svg'
+import { setupCounter } from './counter.js'
 
 document.querySelector('#app').innerHTML = `
-  <h1>Hello Vite!</h1>
-  <a href="https://vitejs.dev/guide/features.html" target="_blank">Documentation</a>
+  <div>
+    <a href="https://vitejs.dev" target="_blank"><img class="logo" alt="Vite logo" src="${viteLogo}" /></a>
+    <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript" target="_blank"><img class="logo" alt="JavaScript logo" src="${javascriptLogo}" /></a>
+    <h1>Hello Vite!</h1>
+    <div class="card">
+      <button id="counter" type="button"></button>
+    </div>
+    <p class="read-the-docs">
+      Click on the Vite logo to learn more
+    </p>
+  </div>
 `
+
+setupCounter(document.querySelector('#counter'))
diff --git a/packages/create-vite/template-vanilla/public/vite.svg b/packages/create-vite/template-vanilla/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-vanilla/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-vanilla/style.css b/packages/create-vite/template-vanilla/style.css
index 852de7aa2ae573..b99c9e8fa9d8d9 100644
--- a/packages/create-vite/template-vanilla/style.css
+++ b/packages/create-vite/template-vanilla/style.css
@@ -1,8 +1,92 @@
-#app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+}
+
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
   text-align: center;
-  color: #2c3e50;
-  margin-top: 60px;
+}
+
+.logo {
+  height: 6em;
+  padding: 1.5em;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
 }
diff --git a/packages/create-vite/template-vue-ts/index.html b/packages/create-vite/template-vue-ts/index.html
index 11603f878f1226..143557b5286bc1 100644
--- a/packages/create-vite/template-vue-ts/index.html
+++ b/packages/create-vite/template-vue-ts/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
+    <title>Vite + Vue + TS</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/packages/create-vite/template-vue-ts/public/favicon.ico b/packages/create-vite/template-vue-ts/public/favicon.ico
deleted file mode 100644
index df36fcfb72584e00488330b560ebcf34a41c64c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kev<ISBgE$F{SFy+(=9Z)f)De0Se}ZDZW}Z3B
zElCeVrw;K0Fdl_Cg=gZOFXXc3pL)Q05CAuT+XucQ<8g~3dteP~|7s7c6QYP;fy;mF
zMN;>tV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?<QnEgvj4i?s}Yk=qA2z`-^*<eK3c)MS4JOdbsTQEOa0)
z0NWqlna2rzs>5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7<X*Er!BfRbvU93$DH%#v6dRt^6HBxz1xBNHx=$&_Gv<&J}Ljk
zJN<Fzx(`Oe@KgQ0F$<14=XV#WK`o#6Ku>z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{T<?%b6i9IjI)Ls)S{-*mq<@~R{?$}ZKjf;^k75i_}(2MXt}^SEBVg7AI@28
zo_uPg2V)_e-`2Ois=PYoe%9u*n9({PFR)OnHJPi{dNx>Kx<YG`4QQ>D#iCLfl2<BD
h7L=-;Q>vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S

diff --git a/packages/create-vite/template-vue-ts/public/vite.svg b/packages/create-vite/template-vue-ts/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-vue-ts/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-vue-ts/src/App.vue b/packages/create-vite/template-vue-ts/src/App.vue
index 1503baf999e683..b40827e623e6e7 100644
--- a/packages/create-vite/template-vue-ts/src/App.vue
+++ b/packages/create-vite/template-vue-ts/src/App.vue
@@ -5,17 +5,23 @@ import HelloWorld from './components/HelloWorld.vue'
 </script>
 
 <template>
-  <img alt="Vue logo" src="./assets/logo.png" />
-  <HelloWorld msg="Hello Vue 3 + TypeScript + Vite" />
+  <div>
+    <a href="https://vitejs.dev" target="_blank">
+      <img class="logo" alt="Vite logo" src="/vite.svg" />
+    </a>
+    <a href="https://vuejs.org/" target="_blank">
+      <img class="logo" alt="Vue logo" src="./assets/vue.svg" />
+    </a>
+  </div>
+  <HelloWorld msg="Vite + Vue" />
 </template>
 
-<style>
-#app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  margin-top: 60px;
+<style scoped>
+.logo {
+  height: 6em;
+  padding: 1.5em;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
 }
 </style>
diff --git a/packages/create-vite/template-vue-ts/src/assets/logo.png b/packages/create-vite/template-vue-ts/src/assets/logo.png
deleted file mode 100644
index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6849
zcmaKRcUV(fvo}bjDT-7nLI_nlK}sT_69H+`qzVWDA|yaU?}j417wLi^B1KB1SLsC&
zL0ag7$U(XW5YR7p&Ux?s<Na=)C)s<=p5LrlQ`Vj}i8j!?Lr2R_OGZXUr=_WGNV*Q3
zf2k=+zm;ZH`J@Y*r-qrQk(;BZj~xa<rsClC5CPOe**PH$5q1uK9)k!4GBOHYq_LT&
znXV4h-VG&gcg`d3i*hHS$;cFxeBJHrT@aqYhX^Mm8V1^F=>P$d4lvMt8C^+TcQu4F
zQqv!UF!I+kw)c0jhd6+g6oCr9P?7)?!qX1ui*iL{p}sKCAGuJ{{W)0z1pLF|=>h}&
zt(2Lr0Z`2ig8<5i%Zk}cO5Fm=LByqGWaS`oqChZdEFmc`0hSb#gg|Aap^{+WKOYcj
zHjINK)KDG%&s?Mt4CL(T=?;~U@bU2x_mLKN!#GJuK_CzbNw5SMEJorG!}_5;?R>@1
zSl)jns3WlU7^J%=(hUtfmuUCU&C3%8B5C^f5>W2Cy8jW3#{Od{lF1}|?c61##3dzA
zsPlFG;l_FzBK}8>|H_Ru_H#!_7$UH4UKo3lKOA}g1(R&|e@}GINYVzX?q=_WLZCgh
z)L|eJMce`D0EIwgRaNETDsr+?vQknSGAi=7H00r`QnI%oQnFxm`G2umXso9l+8*&Q
z7WqF|$p49js$mdzo^BXpH#gURy=UO;=IMrYc5?@+sR4y_?d*~0^YP7d+y0{}0)zBM
zIKVM(DBvICK#~7N0a+PY6)7;u=dutmNqK3AlsrUU9U`d;msiucB_|8|2kY=(7XA;G
zwDA8AR)VCA#JOkxm#6<Fk;3Qv_CIk;8vG~n5ol7lV@Ppr$`vO}M#g$eOI^j-clMjL
zOPuv5uLtX1JFT#MwySH_RJ4r>oHNS^YVuOU;8p$N)2{`;oF|rQ?B~K$%rHDxXs+_G
zF5|-uqHZvSzq}L;5Kcy_P+x0${33}Ofb6+TX&=y;;PkEOpz%<lxjl%Ocl~M2y2lP|
zbFM`Z-*dEp9W{5_I?FqgKOqcjrGzul_KvvA0B9o^)C&!8LQLB95vnvr20|)KwER)3
zg@AiPX~4f9{zIy9K63eeK%_eUy<Xj$!il}`M9Aai_i>+_bCw_<t<K-?r^}*l>{<&~
zeLV|!bP%l1qxywfVr9Z9JI+++EO^x>ZuCK);=$VIG1`kxK8F2M8AdC$iOe3cj<EWM
zKtfCf^Zg1tRdj=Xm)|^7J1pa)+-CDvXj&R?416f(tgg8|WBR8cdxDx?*Yn+_9!KKY
zYfc;GQgX!L+9q}en#aZ8FKqby@Ji7SuT!4)GFKidFyC9wMywvB3c%^>1fo(ce4l-9
z7*zKy3={MixvUk=enQE;ED~7tv%qh&3lR<0m??@w{ILF|e#QOyPkFYK!&Up7xWNtL
zOW%1QMC<3o;G9_S1;NkPB6bqbCOjeztEc6TsBM<(q9((JKiH{01+Ud=uw9B@{;(JJ
z-DxI2*{pMq`q1RQc;V8@gYAY44Z!%#W~M9pRxI(R?SJ7<UU2Y^EpY^fzuq-h_rtLL
zw8{`NN~<)$oMx`|^gGr>sy7em=Z5DbuDlr@*q|25V)($-f}9c#?D%dU^RS<(wz?{P
zFFHtCab*!rl(~j@0(Nadvwg8q|4!}L^>d?0al6}Rrv9$0M#^&@zjbfJy_n!%mVHK4
z6pLRIQ^Uq~dnyy$`ay51Us6WaP%&O;@49m&{G3z7xV3dLtt1VTOMYl3UW~Rm{Eq4m
zF?Zl_v;?7EFx1_+#WFUXxcK78IV)FO>42@cm@}2I%pVbZqQ}3;p;sDIm&knay03a^
zn$5}Q$G!@fTwD$e(x-~aWP0h+4N<q|;xEwzsU+0W)#|>Rz$Kln<bW)%U3n>O_H2c<
z(XX#lPuW_%H#Q+c&(nRyX1-Ia<yTsbNAz3PBfuh9@JU{>dKR-%$4FYC0fsCmL9ky3
zKpxyjd^JFR+vg2!=HWf}2Z?@Td`0EG`kU?{8zKrvtsm)|7>pPk9nu@2^z96aU2<#`
z2QhvH5w&V;wER?mopu+nqu*n8p~(%Q<o-E#HMmv_6Lr(S<y?zXl02$twV54+g=p_C
zbPW!;qljHcIPw~aX95_u!itzF%xKBH?y!MCRe^`1V@8<G!;_`~Q-@-mUm7r`3Jc*<
zW|jM!A9`X|osT!srEU-27h+^5j<OqNPj-EFHPokG&HB5WAG01lt!13`S9niUI^dz+
zrPE=GX-SXL@wqVGe*HT?V{#O~&~?uH#PoV2h;Vj@x`#d8)T&F})!(j^f1!z+l?Jjx
zylKosI<}}<nHbsk7I?v<<vXs6tPoozmJ}avD&{J7$vR$!Ni~Q@;tH>kwSs&*0eJwa
zMXR05`OSFpfyRb!<VB&Y0bEEVE$hSNXH(0mbzS-;?|O<AG)<R8gmLSuf>Y_+H@O%Y
z0=K^y6B8Gcbl?SA)qMP3Z+=C(?8zL@=74R=EVnE?vY!1BQy2@q*RUgRx4yJ$k}MnL
zs!?74QciNb-LcG*&o<9=DSL>1n}ZNd)w1z3-0Pd^4ED1{qd=9|!!N?xnXjM!EuylY
z5=!H>&hSofh8V?Jofyd!h`xDI1fYAuV(sZwwN~{$a}MX^=+0TH*SFp$vyxmUv7C*W
zv^3Gl0+eTFgBi3FVD;$nhcp)ka*4gSskYIqQ&+M}xP9yLAkWzBI^I%zR^l1e?bW_6
zIn{mo{dD=)9@V?s^fa55jh78rP*Ze<3`tRCN4*mpO$@7a^*2B*7N_|A(Ve2VB|)_o
z$=#_=aBkhe(ifX}MLT()@5?<tMQW)|T904`EDIN{(*~?7PZ%vrUEuUf@Om1Lh8V<U
zqvVYpe+tw_sKHyj#O-VCO5S%E1lshLO74De`Gk2E(7WE#<PpDtbvmnFnSOqG1oI3d
zYC<jZo_G~2KIE6{8;7bJFfC?E4zS>OV+~7cXC3r!%{QJxriXo9I%*3q4KT4Xxzyd{
z9;_%=W%q!Vw$Z7F3lUnY+1HZ*lO;4;VR2+i4+D(m#01OYq|L_fbnT;KN<^dkkCwtd
zF7n+O7KvAw8c`JUh6LmeIrk4`F3o|AagKSMK3))_5Cv~y2Bb2!Ibg9BO7Vkz?pAYX
zoI=B}+$R22&IL`NCYUYjrdhwjnM<dIpta11b@>x_v=-Qcx-jmtN>!Zqf|n1^SWrHy
zK|MwJ?Z#^>)rfT5YSY{qjZ&`Fjd;^vv&gF-Yj6$9-Dy$<6zeP4s+78gS2|t%Z309b
z0^fp~ue_}i`U9j!<|qF92_3oB09NqgAoehQ`)<)dSfKoJl_A6Ec#*Mx9Cpd-p#$Ez
z={AM*r-bQs6*z$!*V<pNyBZpFi*F}aPuOZk!oD1sov}{rrxFZa@)!5H(|DKR-T0B*
zk=XmkSgqtSP+yWN@0aMgOdP>A4|QE7bf@-4vb?Q+pPKLkY2{yKsw{&udv_2v8{Dbd
zm~8VAv!G~s)`O3|Q6vFUV%8%+?ZSVUa(;fhPNg#vab@J*9XE4#D%)$UU-T5`fwjz!
z6&gA^`OGu6aUk{l*h9eB?opVdrHK>Q@U>&JQ_2pR%}TyOXGq_6s56_`U(WoOaAb+K
zXQr#6H}>a-GYs9^bG<C4b$CvneP46N2fi^kmcJjoTXRGgd^g1b&uQ5spV5+b#%y`#
zrU;H~D)utn!YWIi=j;?C-zcJ^D5xZF+#(?rMdp;)?KT1xBnMkmoV;zh&S;rXW6QQx
zWTQ2K14`6wG0eo+=1oSxjIHJc9Zkw+()XT69~5<`ZtDM}Z2bxUwYy3m%<I&~-0+^1
zYtu2vJf--MIxlG~PPDn;z8t5-=$6>P2Y&hSP5gEtW+GVC4=wy0wQk=~%CSXj=GH6q
z-T#s!BV`xZVxm{~jr_ezYRpqqIcXC=Oq`b{lu`Rt(IYr4B91hhVC?yg{ol4WUr3v9
zOAk2LG>CIECZ-WIs0$N}F#eoIUEtZudc7DPYIjzGqDLWk_A4#(<oDDN)6%Ctygl~O
zyPZcr9YCj-jDP7@YK23SJG!MDFZ1)E9`{R$R<J$u)%oUM9#k)$atlYczfhesFXL-4
zvsoG-9l@uTA8QI2Z$HsSvPZlMpB!@DV{4Bs(b)t!a<<4O@H~uuN{fO$vY>LgacooD
z2K4IWs@N`Bddm-{%oy}!k0^i6Yh)uJ1S*90>|bm3TOZxcV|ywHUb(+CeX-o1|LTZM
zwU>dY3R&U)T(}5#Neh?-CWT~@{6Ke@sI)uSuzoah8COy)w)B)aslJmp`WUcjdia-0
zl2Y}&L~XfA`uYQboAJ1;J{XLhYjH){cObH3FDva+^8ioOQy%Z=xyjGLmWMrzfFoH;
zEi3AG`_v+%)&lDJE;iJWJDI@-X9K5O)LD~j*PBe(wu+|%ar~C+LK1+-+lK<ll>=t#
z+Xc+J7qp~5q=B~rD!x78)?1+KUIbYr^5rcl&tB-cTtj+e%{gpZZ4G~6r15+d|J(ky
zjg@@UzMW0k9@S#W(1H{u;Nq(7llJbq;;4t$awM;l&(2s+$l!Ay9^Ge|34CVhr7|BG
z?dAR83smef^frq9V(OH+a+ki#q&-7TkWfFM=5bsGbU(8mC;>QTCWL5ydz9s6k@?+V
zcjiH`VI=59P-(-DWXZ~5DH>B^_H~;4$)KUhnmGo*G!Tq8^LjfUDO)lASN*=#AY_yS
zqW9UX(VOCO&p@kHdUUgsBO0KhXxn1sprK5h8}+>IhX(nSXZKwlNsjk^M|RAaqmCZB
zHBol<PMLlw!1W2AX{4`0(aI-^)x1d_zq-0U*e!X=g^kk>OHYBas@&{PT=R+?d8pZu
zUHfyucQ`(umXSW7o?HQ3H21M`ZJal+%*)SH1B1j6rxTlG3hx1IGJN^M7{$j(9V;MZ
zRKybgVuxKo#XVM+?*yTy{W+XHaU5Jbt-UG33x{u(N-2wmw;zzPH&4DE103HV@ER86
z|FZEmQb|&1s5#`$4!Cm}&`^{(4V}OP$bk`}v6q6rm;P!H)W|2i^e{7lTk2W@jo_9q
z*aw|U7#+g59Fv(5qI`#O-qPj#@_P>PC#I(GSp3DLv7x-dmYK=C7lPF8a)bxb=@)B1
zUZ`EqpXV2dR}B&r`uM}N(TS99ZT0UB%IN|0H%DcVO#T%L_chrgn#m6%x4KE*IMfjX
zJ%4veCEqbXZ`H`F_+fELMC@wuy_ch%t*+Z+1I}wN#C+dRrf2X{1C8=yZ_%Pt6wL_~
zZ2NN-hXOT4P4n$QFO7yYHS-4wF1Xfr-meG9Pn;uK51?hfel`d38k{W)F*|gJLT2#T
z<~>spMu4(mul-8Q3*pf=N4DcI)zzjqAgbE2eOT7~&f1W3VsdD44Ffe;3mJp-V@8UC
z)|qnPc12o~$X-+U@L_lWqv-RtvB~%hLF($%Ew5w>^NR82qC_0F<zVqs?Raxz=2A>B
z)=hP1-OEx?lLi#jnLzH}a;Nvr@JDO-zQWd}#k^an$Kwml;MrD&)sC5b`s0ZkVyPkb
zt}-jOq^%_9>YZe7Y}PhW{a)c39G`kg(P4@kxjcYfgB4XOOcmezdUI7j-!gs7oAo2o
zx(Ph{G+YZ`a%~kzK!HTAA5NXE-7vOFRr5oqY$rH>WI6SFvWmahFav!CfRMM3%8J&c
z*p+%|-fNS_@QrFr(at!JY9jCg9F-%5{nb5Bo~z@Y9m&SHYV`49GAJjA5h~h4(G!Se
zZmK{Bo7ivCfvl}@A-ptkFGcWXAzj3xfl{evi-OG(TaCn1FAHxRc{}B|x+Ua1D=I6M
z!C^ZIvK6aS_c&(=OQDZfm>O`Nxsw{ta&yiYPA~@e#c%N>>#rq)k6Aru-qD4(D^v)y
z*>Rs;YUbD1S8^D(ps6Jbj0K3wJw>L4m)0e(6Pee3Y?gy9i0^bZO?$*sv+xKV?WBlh
zAp*;v6w!a8;A7sLB*g-^<$Z4L7|5jXxxP1}hQZ<55f9<^KJ>^mKlWSGaLcO0=$jem
zWyZkRwe~u{{tU63DlCaS9$Y4CP4f?+wwa(&1ou)b>72yd<aYLC-(YWFHR=3p2C;o@
zP>rFvm`R<qZaNijJ?9e0Ao@J0FQbg1c%wi*X&vhQIV{0-tqBevRs?R)1sbxUT&}HJ
z*KdKSzTFX7&Aa4>j-0`kBJgK@nd(*Eh!(NC{F-@=FnF&Y!q`7){YsLLHf0_B6aHc#
z>WIuHTyJwIH{BJ4)2RtEauC7Yq7Cytc|S<m;S)8!_N`GikUqEGHdRcGU-QPEbp3se
zE7LrqZLNv81NNuz!tDCc*XEM9tD}O}AA<wr-O|Mp0pzPgSb{6jitn>)4^*t8Va3HR
zg=~sN^tp9re@w=GTx$;zOWMjcg-7X3Wk^N$n;&Kf1RgVG2}2L-(0o)54C509C&77i
zrjSi{X*WV=%C17((N^6R4Ya*4#6s_L99RtQ>m(%#nQ#wrRC8Y%yxkH;d!MdY+Tw@r
zjpSnK`;C-U{ATcgaxoEpP0Gf+tx);buOM<s@Z}LbUcXA@TIG=Q@myo%l9hl^&h34x
zu6;dv<5;?t)>lK=01D|J+ROu37qc*rD(w`#O=3*O*w9?biwNoq3WN1`&Wp8TvKj3C
z3HR9ssH7a&Vr<6waJrU<Uz3;wi7<=4xfd1VLN$2P7x}BBS2io@ltlrnmzyIDtt<yX
zAPcqxp4#$=Z%yky_m)4l_cnk`*u)Ahtuv8K{6vhAKMH6ow@c&kpm#&qGLE(Nu?A^>
zdLg!ieYz%U^bmpn%;(V%%ugMk92&?_XX1K@mwnVSE6!&%P%Wdi7_h`CpScvspMx?N
zQUR>oadnG17#hNc$pkTp+9<O}Jes}mOYA)lX@8ntoYG-_HA4-;x|^l1dmnFbnH;3A
zo7RmzjAt!StB&)wt}}Vz$Tx7{+QOd#U@!|=V-Oy>lW+MBKHRZ~7<Tp{OpB;sNJVcO
zP9gJmH&Z2nt++Wk^~d|9`p`s~@#e4h2h+!@-1=fBDgb_osGReiQgZ>4XWUryd)4yd
zj98$%XmIL4(9OnoeO5Fnyn&fpQ9b0h4e6EHHw*l68j;>(ya`g^S&y2{O8U>1*>4zR
zq*WSI_2o$CHQ?x0!wl9bpx|Cm2+kFMR)oMud1%n2=qn5nE&t@Fgr#=Zv2?}wtEz^T
z9rrj=?I<GKR}2`GsAAn<o<uOC`pid<%}8(c`p&zgnk&0rnZ{7Rb)^0-DfYcASTQ0s
zKO0S&yqP5xyM1crewennx~2nl$+FH?k$&4izqT?3*7J(SmJOw`dZb5FYs=|K5XN*~
z@!QVYGRE&)UH{eRL^>H*qI5{G@Rn&}^Z{+TW}mQe<Ew(X_9Cg%_)${IZP(Sf(i}}#
zbP^Uyd)|N;rJ4rvPkN0$CN?X?Bu3o`sBkNx9e)Hk<|kZoor>b9=8b<_a`&Cm#n%n~
zU47MvCBsdXFB1+adOO)03+nczfWa#vwk<X*p?NEOGFg@VXR_YfNi3ZWGup*ZMYLrd
zivdVFWx1f#$rH$D0S;+?%}dLVO}~LftMC3)E?;ORtVD#gO@_oLGdOsk#uT@)CP$RI
z#-#zp;&|vD_rYnvw~2N0Wp+nQ+xVJ$IH9kk(&N_Uad`)ORc-o<^o9v_z)$2HD4jGQ
zI}WMPN93Rji|(>#r{o{dF)QWya9v2nv43Zp3%Ps}($lA02*_g25t;|T{A5snSY?3A
zrRQ~(Ygh_ebltHo1VC<XI}!-0hb>bJb*eOAr;4cnlXLvI>*$-#AVsGg6B1r7@;g^L
zFlJ_th0vxO7;-opU@WA<a+$A0VKV&CD~?Y9W`bM2k~*P|j8E*2CoV8)Cu!IV5;k=`
zm0lA9424u4MQ;9hkajM?rCu<5Nio0ru*d*6!O7wLB^>Fe;<}?!2q?RBrFK5U{<mA*
z;WN^+Hz{=MA9j{=Q!Qyy7=i0XTx(4nT94X=`8CIvSzRT*3@ox%j?(gLc30~Knc##R
z`(0eGu62$+sd#-(+!IS_v$FsA^Q8gK0r%Y15^&Pc`)3fzUE9X{;k8eN8;R}9b;E)`
zT8R>*ai@NLKZ^};Ul}beukveh?TQn;$%9=R+DX07m82gP$=}Uo_%&ngV`}Hyv8g{u
z3SWzTGV|cwQuFIs7ZDOqO_fGf8Q`8MwL}eUp>q?4eqCmOTcwQuXtQckPy|4F1on8l
zP*h>d+cH#XQf|+6c|S{7SF(Lg>bR~l(0uY?O{OEVlaxa5@e%T&xju=o1`=OD#qc16
zSvyH*my(dcp6~VqR;o(#@m44Lug@~_qw+HA=mS#Z^<V!az}@c{ARa+_X}NO~a$=9p
za)_Ly?(LOnFWV{rQbS?1K7hP~fC?!$z}<pP%6*k1O(nj^MX2}V?0EMJUI;+4&As(@
zxYB>4reBy8iV?H~I;{LQWk3aKK8$bLRyt$g?-<xQqj`npk`D=fcL`B%EgjfC99(LE
z!z(C4-ap+uQYSIckaE<2uA^ag^t_eaYn_Jfq@U?vzOdv%t*)||aVad7PZ((`gpV!x
rZ$0M!)qwuD?ff?h#CY04MnNVFTnmG)-+p%fr;?V2o_dw4E$;sThR3J6

diff --git a/packages/create-vite/template-vue-ts/src/assets/vue.svg b/packages/create-vite/template-vue-ts/src/assets/vue.svg
new file mode 100644
index 00000000000000..770e9d333ee70e
--- /dev/null
+++ b/packages/create-vite/template-vue-ts/src/assets/vue.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-vue-ts/src/components/HelloWorld.vue b/packages/create-vite/template-vue-ts/src/components/HelloWorld.vue
index 38dae70739a15a..5230910336b442 100644
--- a/packages/create-vite/template-vue-ts/src/components/HelloWorld.vue
+++ b/packages/create-vite/template-vue-ts/src/components/HelloWorld.vue
@@ -9,44 +9,30 @@ const count = ref(0)
 <template>
   <h1>{{ msg }}</h1>
 
-  <p>
-    Recommended IDE setup:
-    <a href="https://code.visualstudio.com/" target="_blank">VS Code</a>
-    +
-    <a href="https://github.com/johnsoncodehk/volar" target="_blank">Volar</a>
-  </p>
-
-  <p>See <code>README.md</code> for more information.</p>
+  <div class="card">
+    <button type="button" @click="count++">count is {{ count }}</button>
+    <p>
+      Edit
+      <code>components/HelloWorld.vue</code> to test HMR
+    </p>
+  </div>
 
   <p>
-    <a href="https://vitejs.dev/guide/features.html" target="_blank">
-      Vite Docs
-    </a>
-    |
-    <a href="https://v3.vuejs.org/" target="_blank">Vue 3 Docs</a>
+    Check out
+    <a href="https://vuejs.org/guide/quick-start.html#local" target="_blank"
+      >create-vue</a
+    >, the official Vue + Vite starter
   </p>
-
-  <button type="button" @click="count++">count is: {{ count }}</button>
   <p>
-    Edit
-    <code>components/HelloWorld.vue</code> to test hot module replacement.
+    Install
+    <a href="https://github.com/johnsoncodehk/volar" target="_blank">Volar</a>
+    in your IDE for a better DX
   </p>
+  <p class="read-the-docs">Click on the Vite and Vue logos to learn more</p>
 </template>
 
 <style scoped>
-a {
-  color: #42b983;
-}
-
-label {
-  margin: 0 0.5em;
-  font-weight: bold;
-}
-
-code {
-  background-color: #eee;
-  padding: 2px 4px;
-  border-radius: 4px;
-  color: #304455;
+.read-the-docs {
+  color: #888;
 }
 </style>
diff --git a/packages/create-vite/template-vue-ts/src/main.ts b/packages/create-vite/template-vue-ts/src/main.ts
index 01433bca2ac765..2425c0f745bef4 100644
--- a/packages/create-vite/template-vue-ts/src/main.ts
+++ b/packages/create-vite/template-vue-ts/src/main.ts
@@ -1,4 +1,5 @@
 import { createApp } from 'vue'
+import './style.css'
 import App from './App.vue'
 
 createApp(App).mount('#app')
diff --git a/packages/create-vite/template-vue-ts/src/style.css b/packages/create-vite/template-vue-ts/src/style.css
new file mode 100644
index 00000000000000..6abdac306bc2c4
--- /dev/null
+++ b/packages/create-vite/template-vue-ts/src/style.css
@@ -0,0 +1,80 @@
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+.card {
+  padding: 2em;
+}
+
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
+}
diff --git a/packages/create-vite/template-vue/index.html b/packages/create-vite/template-vue/index.html
index 030a6ff51bfc6f..795e4fbadb8831 100644
--- a/packages/create-vite/template-vue/index.html
+++ b/packages/create-vite/template-vue/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
+    <title>Vite + Vue</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/packages/create-vite/template-vue/public/favicon.ico b/packages/create-vite/template-vue/public/favicon.ico
deleted file mode 100644
index df36fcfb72584e00488330b560ebcf34a41c64c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kev<ISBgE$F{SFy+(=9Z)f)De0Se}ZDZW}Z3B
zElCeVrw;K0Fdl_Cg=gZOFXXc3pL)Q05CAuT+XucQ<8g~3dteP~|7s7c6QYP;fy;mF
zMN;>tV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?<QnEgvj4i?s}Yk=qA2z`-^*<eK3c)MS4JOdbsTQEOa0)
z0NWqlna2rzs>5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7<X*Er!BfRbvU93$DH%#v6dRt^6HBxz1xBNHx=$&_Gv<&J}Ljk
zJN<Fzx(`Oe@KgQ0F$<14=XV#WK`o#6Ku>z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{T<?%b6i9IjI)Ls)S{-*mq<@~R{?$}ZKjf;^k75i_}(2MXt}^SEBVg7AI@28
zo_uPg2V)_e-`2Ois=PYoe%9u*n9({PFR)OnHJPi{dNx>Kx<YG`4QQ>D#iCLfl2<BD
h7L=-;Q>vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S

diff --git a/packages/create-vite/template-vue/public/vite.svg b/packages/create-vite/template-vue/public/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/packages/create-vite/template-vue/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-vue/src/App.vue b/packages/create-vite/template-vue/src/App.vue
index 09bbb6a561285f..ddb1b007bc3604 100644
--- a/packages/create-vite/template-vue/src/App.vue
+++ b/packages/create-vite/template-vue/src/App.vue
@@ -5,17 +5,23 @@ import HelloWorld from './components/HelloWorld.vue'
 </script>
 
 <template>
-  <img alt="Vue logo" src="./assets/logo.png" />
-  <HelloWorld msg="Hello Vue 3 + Vite" />
+  <div>
+    <a href="https://vitejs.dev" target="_blank">
+      <img class="logo" alt="Vite logo" src="/vite.svg" />
+    </a>
+    <a href="https://vuejs.org/" target="_blank">
+      <img class="logo" alt="Vue logo" src="./assets/vue.svg" />
+    </a>
+  </div>
+  <HelloWorld msg="Vite + Vue" />
 </template>
 
-<style>
-#app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  margin-top: 60px;
+<style scoped>
+.logo {
+  height: 6em;
+  padding: 1.5em;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
 }
 </style>
diff --git a/packages/create-vite/template-vue/src/assets/logo.png b/packages/create-vite/template-vue/src/assets/logo.png
deleted file mode 100644
index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6849
zcmaKRcUV(fvo}bjDT-7nLI_nlK}sT_69H+`qzVWDA|yaU?}j417wLi^B1KB1SLsC&
zL0ag7$U(XW5YR7p&Ux?s<Na=)C)s<=p5LrlQ`Vj}i8j!?Lr2R_OGZXUr=_WGNV*Q3
zf2k=+zm;ZH`J@Y*r-qrQk(;BZj~xa<rsClC5CPOe**PH$5q1uK9)k!4GBOHYq_LT&
znXV4h-VG&gcg`d3i*hHS$;cFxeBJHrT@aqYhX^Mm8V1^F=>P$d4lvMt8C^+TcQu4F
zQqv!UF!I+kw)c0jhd6+g6oCr9P?7)?!qX1ui*iL{p}sKCAGuJ{{W)0z1pLF|=>h}&
zt(2Lr0Z`2ig8<5i%Zk}cO5Fm=LByqGWaS`oqChZdEFmc`0hSb#gg|Aap^{+WKOYcj
zHjINK)KDG%&s?Mt4CL(T=?;~U@bU2x_mLKN!#GJuK_CzbNw5SMEJorG!}_5;?R>@1
zSl)jns3WlU7^J%=(hUtfmuUCU&C3%8B5C^f5>W2Cy8jW3#{Od{lF1}|?c61##3dzA
zsPlFG;l_FzBK}8>|H_Ru_H#!_7$UH4UKo3lKOA}g1(R&|e@}GINYVzX?q=_WLZCgh
z)L|eJMce`D0EIwgRaNETDsr+?vQknSGAi=7H00r`QnI%oQnFxm`G2umXso9l+8*&Q
z7WqF|$p49js$mdzo^BXpH#gURy=UO;=IMrYc5?@+sR4y_?d*~0^YP7d+y0{}0)zBM
zIKVM(DBvICK#~7N0a+PY6)7;u=dutmNqK3AlsrUU9U`d;msiucB_|8|2kY=(7XA;G
zwDA8AR)VCA#JOkxm#6<Fk;3Qv_CIk;8vG~n5ol7lV@Ppr$`vO}M#g$eOI^j-clMjL
zOPuv5uLtX1JFT#MwySH_RJ4r>oHNS^YVuOU;8p$N)2{`;oF|rQ?B~K$%rHDxXs+_G
zF5|-uqHZvSzq}L;5Kcy_P+x0${33}Ofb6+TX&=y;;PkEOpz%<lxjl%Ocl~M2y2lP|
zbFM`Z-*dEp9W{5_I?FqgKOqcjrGzul_KvvA0B9o^)C&!8LQLB95vnvr20|)KwER)3
zg@AiPX~4f9{zIy9K63eeK%_eUy<Xj$!il}`M9Aai_i>+_bCw_<t<K-?r^}*l>{<&~
zeLV|!bP%l1qxywfVr9Z9JI+++EO^x>ZuCK);=$VIG1`kxK8F2M8AdC$iOe3cj<EWM
zKtfCf^Zg1tRdj=Xm)|^7J1pa)+-CDvXj&R?416f(tgg8|WBR8cdxDx?*Yn+_9!KKY
zYfc;GQgX!L+9q}en#aZ8FKqby@Ji7SuT!4)GFKidFyC9wMywvB3c%^>1fo(ce4l-9
z7*zKy3={MixvUk=enQE;ED~7tv%qh&3lR<0m??@w{ILF|e#QOyPkFYK!&Up7xWNtL
zOW%1QMC<3o;G9_S1;NkPB6bqbCOjeztEc6TsBM<(q9((JKiH{01+Ud=uw9B@{;(JJ
z-DxI2*{pMq`q1RQc;V8@gYAY44Z!%#W~M9pRxI(R?SJ7<UU2Y^EpY^fzuq-h_rtLL
zw8{`NN~<)$oMx`|^gGr>sy7em=Z5DbuDlr@*q|25V)($-f}9c#?D%dU^RS<(wz?{P
zFFHtCab*!rl(~j@0(Nadvwg8q|4!}L^>d?0al6}Rrv9$0M#^&@zjbfJy_n!%mVHK4
z6pLRIQ^Uq~dnyy$`ay51Us6WaP%&O;@49m&{G3z7xV3dLtt1VTOMYl3UW~Rm{Eq4m
zF?Zl_v;?7EFx1_+#WFUXxcK78IV)FO>42@cm@}2I%pVbZqQ}3;p;sDIm&knay03a^
zn$5}Q$G!@fTwD$e(x-~aWP0h+4N<q|;xEwzsU+0W)#|>Rz$Kln<bW)%U3n>O_H2c<
z(XX#lPuW_%H#Q+c&(nRyX1-Ia<yTsbNAz3PBfuh9@JU{>dKR-%$4FYC0fsCmL9ky3
zKpxyjd^JFR+vg2!=HWf}2Z?@Td`0EG`kU?{8zKrvtsm)|7>pPk9nu@2^z96aU2<#`
z2QhvH5w&V;wER?mopu+nqu*n8p~(%Q<o-E#HMmv_6Lr(S<y?zXl02$twV54+g=p_C
zbPW!;qljHcIPw~aX95_u!itzF%xKBH?y!MCRe^`1V@8<G!;_`~Q-@-mUm7r`3Jc*<
zW|jM!A9`X|osT!srEU-27h+^5j<OqNPj-EFHPokG&HB5WAG01lt!13`S9niUI^dz+
zrPE=GX-SXL@wqVGe*HT?V{#O~&~?uH#PoV2h;Vj@x`#d8)T&F})!(j^f1!z+l?Jjx
zylKosI<}}<nHbsk7I?v<<vXs6tPoozmJ}avD&{J7$vR$!Ni~Q@;tH>kwSs&*0eJwa
zMXR05`OSFpfyRb!<VB&Y0bEEVE$hSNXH(0mbzS-;?|O<AG)<R8gmLSuf>Y_+H@O%Y
z0=K^y6B8Gcbl?SA)qMP3Z+=C(?8zL@=74R=EVnE?vY!1BQy2@q*RUgRx4yJ$k}MnL
zs!?74QciNb-LcG*&o<9=DSL>1n}ZNd)w1z3-0Pd^4ED1{qd=9|!!N?xnXjM!EuylY
z5=!H>&hSofh8V?Jofyd!h`xDI1fYAuV(sZwwN~{$a}MX^=+0TH*SFp$vyxmUv7C*W
zv^3Gl0+eTFgBi3FVD;$nhcp)ka*4gSskYIqQ&+M}xP9yLAkWzBI^I%zR^l1e?bW_6
zIn{mo{dD=)9@V?s^fa55jh78rP*Ze<3`tRCN4*mpO$@7a^*2B*7N_|A(Ve2VB|)_o
z$=#_=aBkhe(ifX}MLT()@5?<tMQW)|T904`EDIN{(*~?7PZ%vrUEuUf@Om1Lh8V<U
zqvVYpe+tw_sKHyj#O-VCO5S%E1lshLO74De`Gk2E(7WE#<PpDtbvmnFnSOqG1oI3d
zYC<jZo_G~2KIE6{8;7bJFfC?E4zS>OV+~7cXC3r!%{QJxriXo9I%*3q4KT4Xxzyd{
z9;_%=W%q!Vw$Z7F3lUnY+1HZ*lO;4;VR2+i4+D(m#01OYq|L_fbnT;KN<^dkkCwtd
zF7n+O7KvAw8c`JUh6LmeIrk4`F3o|AagKSMK3))_5Cv~y2Bb2!Ibg9BO7Vkz?pAYX
zoI=B}+$R22&IL`NCYUYjrdhwjnM<dIpta11b@>x_v=-Qcx-jmtN>!Zqf|n1^SWrHy
zK|MwJ?Z#^>)rfT5YSY{qjZ&`Fjd;^vv&gF-Yj6$9-Dy$<6zeP4s+78gS2|t%Z309b
z0^fp~ue_}i`U9j!<|qF92_3oB09NqgAoehQ`)<)dSfKoJl_A6Ec#*Mx9Cpd-p#$Ez
z={AM*r-bQs6*z$!*V<pNyBZpFi*F}aPuOZk!oD1sov}{rrxFZa@)!5H(|DKR-T0B*
zk=XmkSgqtSP+yWN@0aMgOdP>A4|QE7bf@-4vb?Q+pPKLkY2{yKsw{&udv_2v8{Dbd
zm~8VAv!G~s)`O3|Q6vFUV%8%+?ZSVUa(;fhPNg#vab@J*9XE4#D%)$UU-T5`fwjz!
z6&gA^`OGu6aUk{l*h9eB?opVdrHK>Q@U>&JQ_2pR%}TyOXGq_6s56_`U(WoOaAb+K
zXQr#6H}>a-GYs9^bG<C4b$CvneP46N2fi^kmcJjoTXRGgd^g1b&uQ5spV5+b#%y`#
zrU;H~D)utn!YWIi=j;?C-zcJ^D5xZF+#(?rMdp;)?KT1xBnMkmoV;zh&S;rXW6QQx
zWTQ2K14`6wG0eo+=1oSxjIHJc9Zkw+()XT69~5<`ZtDM}Z2bxUwYy3m%<I&~-0+^1
zYtu2vJf--MIxlG~PPDn;z8t5-=$6>P2Y&hSP5gEtW+GVC4=wy0wQk=~%CSXj=GH6q
z-T#s!BV`xZVxm{~jr_ezYRpqqIcXC=Oq`b{lu`Rt(IYr4B91hhVC?yg{ol4WUr3v9
zOAk2LG>CIECZ-WIs0$N}F#eoIUEtZudc7DPYIjzGqDLWk_A4#(<oDDN)6%Ctygl~O
zyPZcr9YCj-jDP7@YK23SJG!MDFZ1)E9`{R$R<J$u)%oUM9#k)$atlYczfhesFXL-4
zvsoG-9l@uTA8QI2Z$HsSvPZlMpB!@DV{4Bs(b)t!a<<4O@H~uuN{fO$vY>LgacooD
z2K4IWs@N`Bddm-{%oy}!k0^i6Yh)uJ1S*90>|bm3TOZxcV|ywHUb(+CeX-o1|LTZM
zwU>dY3R&U)T(}5#Neh?-CWT~@{6Ke@sI)uSuzoah8COy)w)B)aslJmp`WUcjdia-0
zl2Y}&L~XfA`uYQboAJ1;J{XLhYjH){cObH3FDva+^8ioOQy%Z=xyjGLmWMrzfFoH;
zEi3AG`_v+%)&lDJE;iJWJDI@-X9K5O)LD~j*PBe(wu+|%ar~C+LK1+-+lK<ll>=t#
z+Xc+J7qp~5q=B~rD!x78)?1+KUIbYr^5rcl&tB-cTtj+e%{gpZZ4G~6r15+d|J(ky
zjg@@UzMW0k9@S#W(1H{u;Nq(7llJbq;;4t$awM;l&(2s+$l!Ay9^Ge|34CVhr7|BG
z?dAR83smef^frq9V(OH+a+ki#q&-7TkWfFM=5bsGbU(8mC;>QTCWL5ydz9s6k@?+V
zcjiH`VI=59P-(-DWXZ~5DH>B^_H~;4$)KUhnmGo*G!Tq8^LjfUDO)lASN*=#AY_yS
zqW9UX(VOCO&p@kHdUUgsBO0KhXxn1sprK5h8}+>IhX(nSXZKwlNsjk^M|RAaqmCZB
zHBol<PMLlw!1W2AX{4`0(aI-^)x1d_zq-0U*e!X=g^kk>OHYBas@&{PT=R+?d8pZu
zUHfyucQ`(umXSW7o?HQ3H21M`ZJal+%*)SH1B1j6rxTlG3hx1IGJN^M7{$j(9V;MZ
zRKybgVuxKo#XVM+?*yTy{W+XHaU5Jbt-UG33x{u(N-2wmw;zzPH&4DE103HV@ER86
z|FZEmQb|&1s5#`$4!Cm}&`^{(4V}OP$bk`}v6q6rm;P!H)W|2i^e{7lTk2W@jo_9q
z*aw|U7#+g59Fv(5qI`#O-qPj#@_P>PC#I(GSp3DLv7x-dmYK=C7lPF8a)bxb=@)B1
zUZ`EqpXV2dR}B&r`uM}N(TS99ZT0UB%IN|0H%DcVO#T%L_chrgn#m6%x4KE*IMfjX
zJ%4veCEqbXZ`H`F_+fELMC@wuy_ch%t*+Z+1I}wN#C+dRrf2X{1C8=yZ_%Pt6wL_~
zZ2NN-hXOT4P4n$QFO7yYHS-4wF1Xfr-meG9Pn;uK51?hfel`d38k{W)F*|gJLT2#T
z<~>spMu4(mul-8Q3*pf=N4DcI)zzjqAgbE2eOT7~&f1W3VsdD44Ffe;3mJp-V@8UC
z)|qnPc12o~$X-+U@L_lWqv-RtvB~%hLF($%Ew5w>^NR82qC_0F<zVqs?Raxz=2A>B
z)=hP1-OEx?lLi#jnLzH}a;Nvr@JDO-zQWd}#k^an$Kwml;MrD&)sC5b`s0ZkVyPkb
zt}-jOq^%_9>YZe7Y}PhW{a)c39G`kg(P4@kxjcYfgB4XOOcmezdUI7j-!gs7oAo2o
zx(Ph{G+YZ`a%~kzK!HTAA5NXE-7vOFRr5oqY$rH>WI6SFvWmahFav!CfRMM3%8J&c
z*p+%|-fNS_@QrFr(at!JY9jCg9F-%5{nb5Bo~z@Y9m&SHYV`49GAJjA5h~h4(G!Se
zZmK{Bo7ivCfvl}@A-ptkFGcWXAzj3xfl{evi-OG(TaCn1FAHxRc{}B|x+Ua1D=I6M
z!C^ZIvK6aS_c&(=OQDZfm>O`Nxsw{ta&yiYPA~@e#c%N>>#rq)k6Aru-qD4(D^v)y
z*>Rs;YUbD1S8^D(ps6Jbj0K3wJw>L4m)0e(6Pee3Y?gy9i0^bZO?$*sv+xKV?WBlh
zAp*;v6w!a8;A7sLB*g-^<$Z4L7|5jXxxP1}hQZ<55f9<^KJ>^mKlWSGaLcO0=$jem
zWyZkRwe~u{{tU63DlCaS9$Y4CP4f?+wwa(&1ou)b>72yd<aYLC-(YWFHR=3p2C;o@
zP>rFvm`R<qZaNijJ?9e0Ao@J0FQbg1c%wi*X&vhQIV{0-tqBevRs?R)1sbxUT&}HJ
z*KdKSzTFX7&Aa4>j-0`kBJgK@nd(*Eh!(NC{F-@=FnF&Y!q`7){YsLLHf0_B6aHc#
z>WIuHTyJwIH{BJ4)2RtEauC7Yq7Cytc|S<m;S)8!_N`GikUqEGHdRcGU-QPEbp3se
zE7LrqZLNv81NNuz!tDCc*XEM9tD}O}AA<wr-O|Mp0pzPgSb{6jitn>)4^*t8Va3HR
zg=~sN^tp9re@w=GTx$;zOWMjcg-7X3Wk^N$n;&Kf1RgVG2}2L-(0o)54C509C&77i
zrjSi{X*WV=%C17((N^6R4Ya*4#6s_L99RtQ>m(%#nQ#wrRC8Y%yxkH;d!MdY+Tw@r
zjpSnK`;C-U{ATcgaxoEpP0Gf+tx);buOM<s@Z}LbUcXA@TIG=Q@myo%l9hl^&h34x
zu6;dv<5;?t)>lK=01D|J+ROu37qc*rD(w`#O=3*O*w9?biwNoq3WN1`&Wp8TvKj3C
z3HR9ssH7a&Vr<6waJrU<Uz3;wi7<=4xfd1VLN$2P7x}BBS2io@ltlrnmzyIDtt<yX
zAPcqxp4#$=Z%yky_m)4l_cnk`*u)Ahtuv8K{6vhAKMH6ow@c&kpm#&qGLE(Nu?A^>
zdLg!ieYz%U^bmpn%;(V%%ugMk92&?_XX1K@mwnVSE6!&%P%Wdi7_h`CpScvspMx?N
zQUR>oadnG17#hNc$pkTp+9<O}Jes}mOYA)lX@8ntoYG-_HA4-;x|^l1dmnFbnH;3A
zo7RmzjAt!StB&)wt}}Vz$Tx7{+QOd#U@!|=V-Oy>lW+MBKHRZ~7<Tp{OpB;sNJVcO
zP9gJmH&Z2nt++Wk^~d|9`p`s~@#e4h2h+!@-1=fBDgb_osGReiQgZ>4XWUryd)4yd
zj98$%XmIL4(9OnoeO5Fnyn&fpQ9b0h4e6EHHw*l68j;>(ya`g^S&y2{O8U>1*>4zR
zq*WSI_2o$CHQ?x0!wl9bpx|Cm2+kFMR)oMud1%n2=qn5nE&t@Fgr#=Zv2?}wtEz^T
z9rrj=?I<GKR}2`GsAAn<o<uOC`pid<%}8(c`p&zgnk&0rnZ{7Rb)^0-DfYcASTQ0s
zKO0S&yqP5xyM1crewennx~2nl$+FH?k$&4izqT?3*7J(SmJOw`dZb5FYs=|K5XN*~
z@!QVYGRE&)UH{eRL^>H*qI5{G@Rn&}^Z{+TW}mQe<Ew(X_9Cg%_)${IZP(Sf(i}}#
zbP^Uyd)|N;rJ4rvPkN0$CN?X?Bu3o`sBkNx9e)Hk<|kZoor>b9=8b<_a`&Cm#n%n~
zU47MvCBsdXFB1+adOO)03+nczfWa#vwk<X*p?NEOGFg@VXR_YfNi3ZWGup*ZMYLrd
zivdVFWx1f#$rH$D0S;+?%}dLVO}~LftMC3)E?;ORtVD#gO@_oLGdOsk#uT@)CP$RI
z#-#zp;&|vD_rYnvw~2N0Wp+nQ+xVJ$IH9kk(&N_Uad`)ORc-o<^o9v_z)$2HD4jGQ
zI}WMPN93Rji|(>#r{o{dF)QWya9v2nv43Zp3%Ps}($lA02*_g25t;|T{A5snSY?3A
zrRQ~(Ygh_ebltHo1VC<XI}!-0hb>bJb*eOAr;4cnlXLvI>*$-#AVsGg6B1r7@;g^L
zFlJ_th0vxO7;-opU@WA<a+$A0VKV&CD~?Y9W`bM2k~*P|j8E*2CoV8)Cu!IV5;k=`
zm0lA9424u4MQ;9hkajM?rCu<5Nio0ru*d*6!O7wLB^>Fe;<}?!2q?RBrFK5U{<mA*
z;WN^+Hz{=MA9j{=Q!Qyy7=i0XTx(4nT94X=`8CIvSzRT*3@ox%j?(gLc30~Knc##R
z`(0eGu62$+sd#-(+!IS_v$FsA^Q8gK0r%Y15^&Pc`)3fzUE9X{;k8eN8;R}9b;E)`
zT8R>*ai@NLKZ^};Ul}beukveh?TQn;$%9=R+DX07m82gP$=}Uo_%&ngV`}Hyv8g{u
z3SWzTGV|cwQuFIs7ZDOqO_fGf8Q`8MwL}eUp>q?4eqCmOTcwQuXtQckPy|4F1on8l
zP*h>d+cH#XQf|+6c|S{7SF(Lg>bR~l(0uY?O{OEVlaxa5@e%T&xju=o1`=OD#qc16
zSvyH*my(dcp6~VqR;o(#@m44Lug@~_qw+HA=mS#Z^<V!az}@c{ARa+_X}NO~a$=9p
za)_Ly?(LOnFWV{rQbS?1K7hP~fC?!$z}<pP%6*k1O(nj^MX2}V?0EMJUI;+4&As(@
zxYB>4reBy8iV?H~I;{LQWk3aKK8$bLRyt$g?-<xQqj`npk`D=fcL`B%EgjfC99(LE
z!z(C4-ap+uQYSIckaE<2uA^ag^t_eaYn_Jfq@U?vzOdv%t*)||aVad7PZ((`gpV!x
rZ$0M!)qwuD?ff?h#CY04MnNVFTnmG)-+p%fr;?V2o_dw4E$;sThR3J6

diff --git a/packages/create-vite/template-vue/src/assets/vue.svg b/packages/create-vite/template-vue/src/assets/vue.svg
new file mode 100644
index 00000000000000..770e9d333ee70e
--- /dev/null
+++ b/packages/create-vite/template-vue/src/assets/vue.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>
\ No newline at end of file
diff --git a/packages/create-vite/template-vue/src/components/HelloWorld.vue b/packages/create-vite/template-vue/src/components/HelloWorld.vue
index aa607e31e0ad7c..91f9bfcbcb305d 100644
--- a/packages/create-vite/template-vue/src/components/HelloWorld.vue
+++ b/packages/create-vite/template-vue/src/components/HelloWorld.vue
@@ -11,30 +11,30 @@ const count = ref(0)
 <template>
   <h1>{{ msg }}</h1>
 
-  <p>
-    Recommended IDE setup:
-    <a href="https://code.visualstudio.com/" target="_blank">VS Code</a>
-    +
-    <a href="https://github.com/johnsoncodehk/volar" target="_blank">Volar</a>
-  </p>
+  <div class="card">
+    <button type="button" @click="count++">count is {{ count }}</button>
+    <p>
+      Edit
+      <code>components/HelloWorld.vue</code> to test HMR
+    </p>
+  </div>
 
   <p>
-    <a href="https://vitejs.dev/guide/features.html" target="_blank">
-      Vite Documentation
-    </a>
-    |
-    <a href="https://v3.vuejs.org/" target="_blank">Vue 3 Documentation</a>
+    Check out
+    <a href="https://vuejs.org/guide/quick-start.html#local" target="_blank"
+      >create-vue</a
+    >, the official Vue + Vite starter
   </p>
-
-  <button type="button" @click="count++">count is: {{ count }}</button>
   <p>
-    Edit
-    <code>components/HelloWorld.vue</code> to test hot module replacement.
+    Install
+    <a href="https://github.com/johnsoncodehk/volar" target="_blank">Volar</a>
+    in your IDE for a better DX
   </p>
+  <p class="read-the-docs">Click on the Vite and Vue logos to learn more</p>
 </template>
 
 <style scoped>
-a {
-  color: #42b983;
+.read-the-docs {
+  color: #888;
 }
 </style>
diff --git a/packages/create-vite/template-vue/src/main.js b/packages/create-vite/template-vue/src/main.js
index 01433bca2ac765..2425c0f745bef4 100644
--- a/packages/create-vite/template-vue/src/main.js
+++ b/packages/create-vite/template-vue/src/main.js
@@ -1,4 +1,5 @@
 import { createApp } from 'vue'
+import './style.css'
 import App from './App.vue'
 
 createApp(App).mount('#app')
diff --git a/packages/create-vite/template-vue/src/style.css b/packages/create-vite/template-vue/src/style.css
new file mode 100644
index 00000000000000..62b04c13f8df74
--- /dev/null
+++ b/packages/create-vite/template-vue/src/style.css
@@ -0,0 +1,89 @@
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+.card {
+  padding: 2em;
+}
+
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
+}

From 1f1ca5eb2a2493804f79562334bc8708dd246f0d Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Wed, 8 Jun 2022 16:04:17 +0800
Subject: [PATCH 13/72] chore(create-vite): update logo and header styles
 (#8502)

---
 packages/create-vite/template-lit-ts/src/my-element.ts | 2 ++
 packages/create-vite/template-lit/src/my-element.js    | 2 ++
 packages/create-vite/template-preact-ts/src/index.css  | 1 +
 packages/create-vite/template-preact/src/index.css     | 1 +
 packages/create-vite/template-react-ts/src/App.css     | 1 +
 packages/create-vite/template-react-ts/src/index.css   | 1 +
 packages/create-vite/template-react/src/App.css        | 1 +
 packages/create-vite/template-react/src/index.css      | 1 +
 packages/create-vite/template-svelte-ts/src/App.svelte | 1 +
 packages/create-vite/template-svelte-ts/src/app.css    | 1 +
 packages/create-vite/template-svelte/src/App.svelte    | 1 +
 packages/create-vite/template-svelte/src/app.css       | 1 +
 packages/create-vite/template-vanilla-ts/src/style.css | 2 ++
 packages/create-vite/template-vanilla/style.css        | 2 ++
 packages/create-vite/template-vue-ts/src/App.vue       | 1 +
 packages/create-vite/template-vue-ts/src/style.css     | 1 +
 packages/create-vite/template-vue/src/App.vue          | 1 +
 packages/create-vite/template-vue/src/style.css        | 1 +
 18 files changed, 22 insertions(+)

diff --git a/packages/create-vite/template-lit-ts/src/my-element.ts b/packages/create-vite/template-lit-ts/src/my-element.ts
index 2808d30ae6ef66..fe5707212e5bdd 100644
--- a/packages/create-vite/template-lit-ts/src/my-element.ts
+++ b/packages/create-vite/template-lit-ts/src/my-element.ts
@@ -58,6 +58,7 @@ export class MyElement extends LitElement {
     .logo {
       height: 6em;
       padding: 1.5em;
+      will-change: filter;
     }
     .logo:hover {
       filter: drop-shadow(0 0 2em #646cffaa);
@@ -73,6 +74,7 @@ export class MyElement extends LitElement {
 
     h1 {
       font-size: 3.2em;
+      line-height: 1.1;
     }
 
     a {
diff --git a/packages/create-vite/template-lit/src/my-element.js b/packages/create-vite/template-lit/src/my-element.js
index 6ca0dab47b3a3f..f5ea09b7d1ea22 100644
--- a/packages/create-vite/template-lit/src/my-element.js
+++ b/packages/create-vite/template-lit/src/my-element.js
@@ -65,6 +65,7 @@ export class MyElement extends LitElement {
       .logo {
         height: 6em;
         padding: 1.5em;
+        will-change: filter;
       }
       .logo:hover {
         filter: drop-shadow(0 0 2em #646cffaa);
@@ -89,6 +90,7 @@ export class MyElement extends LitElement {
 
       h1 {
         font-size: 3.2em;
+        line-height: 1.1;
       }
 
       button {
diff --git a/packages/create-vite/template-preact-ts/src/index.css b/packages/create-vite/template-preact-ts/src/index.css
index dbc2fdd562ab3b..917888c1d1115a 100644
--- a/packages/create-vite/template-preact-ts/src/index.css
+++ b/packages/create-vite/template-preact-ts/src/index.css
@@ -34,6 +34,7 @@ body {
 
 h1 {
   font-size: 3.2em;
+  line-height: 1.1;
 }
 
 button {
diff --git a/packages/create-vite/template-preact/src/index.css b/packages/create-vite/template-preact/src/index.css
index dbc2fdd562ab3b..917888c1d1115a 100644
--- a/packages/create-vite/template-preact/src/index.css
+++ b/packages/create-vite/template-preact/src/index.css
@@ -34,6 +34,7 @@ body {
 
 h1 {
   font-size: 3.2em;
+  line-height: 1.1;
 }
 
 button {
diff --git a/packages/create-vite/template-react-ts/src/App.css b/packages/create-vite/template-react-ts/src/App.css
index 2e82675c3c44a9..514d6bff3fbc88 100644
--- a/packages/create-vite/template-react-ts/src/App.css
+++ b/packages/create-vite/template-react-ts/src/App.css
@@ -8,6 +8,7 @@
 .logo {
   height: 6em;
   padding: 1.5em;
+  will-change: filter;
 }
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
diff --git a/packages/create-vite/template-react-ts/src/index.css b/packages/create-vite/template-react-ts/src/index.css
index dbc2fdd562ab3b..917888c1d1115a 100644
--- a/packages/create-vite/template-react-ts/src/index.css
+++ b/packages/create-vite/template-react-ts/src/index.css
@@ -34,6 +34,7 @@ body {
 
 h1 {
   font-size: 3.2em;
+  line-height: 1.1;
 }
 
 button {
diff --git a/packages/create-vite/template-react/src/App.css b/packages/create-vite/template-react/src/App.css
index 2e82675c3c44a9..514d6bff3fbc88 100644
--- a/packages/create-vite/template-react/src/App.css
+++ b/packages/create-vite/template-react/src/App.css
@@ -8,6 +8,7 @@
 .logo {
   height: 6em;
   padding: 1.5em;
+  will-change: filter;
 }
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
diff --git a/packages/create-vite/template-react/src/index.css b/packages/create-vite/template-react/src/index.css
index dbc2fdd562ab3b..917888c1d1115a 100644
--- a/packages/create-vite/template-react/src/index.css
+++ b/packages/create-vite/template-react/src/index.css
@@ -34,6 +34,7 @@ body {
 
 h1 {
   font-size: 3.2em;
+  line-height: 1.1;
 }
 
 button {
diff --git a/packages/create-vite/template-svelte-ts/src/App.svelte b/packages/create-vite/template-svelte-ts/src/App.svelte
index cc0917872ad18e..dcc7939896dd46 100644
--- a/packages/create-vite/template-svelte-ts/src/App.svelte
+++ b/packages/create-vite/template-svelte-ts/src/App.svelte
@@ -32,6 +32,7 @@
   img {
     height: 6em;
     padding: 1.5em;
+    will-change: filter;
   }
   img:hover {
     filter: drop-shadow(0 0 2em #646cffaa);
diff --git a/packages/create-vite/template-svelte-ts/src/app.css b/packages/create-vite/template-svelte-ts/src/app.css
index 07396c895cc09e..bcc7233dd1ca85 100644
--- a/packages/create-vite/template-svelte-ts/src/app.css
+++ b/packages/create-vite/template-svelte-ts/src/app.css
@@ -34,6 +34,7 @@ body {
 
 h1 {
   font-size: 3.2em;
+  line-height: 1.1;
 }
 
 .card {
diff --git a/packages/create-vite/template-svelte/src/App.svelte b/packages/create-vite/template-svelte/src/App.svelte
index a5a4f8caab6977..415b6429ae04a8 100644
--- a/packages/create-vite/template-svelte/src/App.svelte
+++ b/packages/create-vite/template-svelte/src/App.svelte
@@ -32,6 +32,7 @@
   img {
     height: 6em;
     padding: 1.5em;
+    will-change: filter;
   }
   img:hover {
     filter: drop-shadow(0 0 2em #646cffaa);
diff --git a/packages/create-vite/template-svelte/src/app.css b/packages/create-vite/template-svelte/src/app.css
index 07396c895cc09e..bcc7233dd1ca85 100644
--- a/packages/create-vite/template-svelte/src/app.css
+++ b/packages/create-vite/template-svelte/src/app.css
@@ -34,6 +34,7 @@ body {
 
 h1 {
   font-size: 3.2em;
+  line-height: 1.1;
 }
 
 .card {
diff --git a/packages/create-vite/template-vanilla-ts/src/style.css b/packages/create-vite/template-vanilla-ts/src/style.css
index b99c9e8fa9d8d9..bbba76e52c2fdd 100644
--- a/packages/create-vite/template-vanilla-ts/src/style.css
+++ b/packages/create-vite/template-vanilla-ts/src/style.css
@@ -34,6 +34,7 @@ body {
 
 h1 {
   font-size: 3.2em;
+  line-height: 1.1;
 }
 
 #app {
@@ -46,6 +47,7 @@ h1 {
 .logo {
   height: 6em;
   padding: 1.5em;
+  will-change: filter;
 }
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
diff --git a/packages/create-vite/template-vanilla/style.css b/packages/create-vite/template-vanilla/style.css
index b99c9e8fa9d8d9..bbba76e52c2fdd 100644
--- a/packages/create-vite/template-vanilla/style.css
+++ b/packages/create-vite/template-vanilla/style.css
@@ -34,6 +34,7 @@ body {
 
 h1 {
   font-size: 3.2em;
+  line-height: 1.1;
 }
 
 #app {
@@ -46,6 +47,7 @@ h1 {
 .logo {
   height: 6em;
   padding: 1.5em;
+  will-change: filter;
 }
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
diff --git a/packages/create-vite/template-vue-ts/src/App.vue b/packages/create-vite/template-vue-ts/src/App.vue
index b40827e623e6e7..adce760c87dfdf 100644
--- a/packages/create-vite/template-vue-ts/src/App.vue
+++ b/packages/create-vite/template-vue-ts/src/App.vue
@@ -20,6 +20,7 @@ import HelloWorld from './components/HelloWorld.vue'
 .logo {
   height: 6em;
   padding: 1.5em;
+  will-change: filter;
 }
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
diff --git a/packages/create-vite/template-vue-ts/src/style.css b/packages/create-vite/template-vue-ts/src/style.css
index 6abdac306bc2c4..0192f9aac987dc 100644
--- a/packages/create-vite/template-vue-ts/src/style.css
+++ b/packages/create-vite/template-vue-ts/src/style.css
@@ -34,6 +34,7 @@ body {
 
 h1 {
   font-size: 3.2em;
+  line-height: 1.1;
 }
 
 button {
diff --git a/packages/create-vite/template-vue/src/App.vue b/packages/create-vite/template-vue/src/App.vue
index ddb1b007bc3604..417581c657f3e6 100644
--- a/packages/create-vite/template-vue/src/App.vue
+++ b/packages/create-vite/template-vue/src/App.vue
@@ -20,6 +20,7 @@ import HelloWorld from './components/HelloWorld.vue'
 .logo {
   height: 6em;
   padding: 1.5em;
+  will-change: filter;
 }
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
diff --git a/packages/create-vite/template-vue/src/style.css b/packages/create-vite/template-vue/src/style.css
index 62b04c13f8df74..a566a347d0d5ee 100644
--- a/packages/create-vite/template-vue/src/style.css
+++ b/packages/create-vite/template-vue/src/style.css
@@ -43,6 +43,7 @@ body {
 
 h1 {
   font-size: 3.2em;
+  line-height: 1.1;
 }
 
 button {

From 164f528838f3a146c82d68992d38316b9214f9b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Wed, 8 Jun 2022 17:39:57 +0900
Subject: [PATCH 14/72] refactor!: make terser an optional dependency (#8049)

---
 docs/config/build-options.md             |  6 ++++
 packages/plugin-legacy/README.md         |  6 ++++
 packages/plugin-legacy/package.json      |  1 +
 packages/vite/package.json               | 12 +++----
 packages/vite/rollup.config.ts           | 28 +--------------
 packages/vite/src/node/plugins/css.ts    |  8 ++---
 packages/vite/src/node/plugins/terser.ts | 45 ++++++++++++++++--------
 packages/vite/src/node/utils.ts          | 12 +++++++
 playground/legacy/package.json           |  3 +-
 playground/preload/package.json          |  3 +-
 playground/vitestSetup.ts                |  4 ++-
 pnpm-lock.yaml                           |  6 ++--
 12 files changed, 76 insertions(+), 58 deletions(-)

diff --git a/docs/config/build-options.md b/docs/config/build-options.md
index 11b4685aa72555..f0f213d5d44428 100644
--- a/docs/config/build-options.md
+++ b/docs/config/build-options.md
@@ -147,6 +147,12 @@ Set to `false` to disable minification, or specify the minifier to use. The defa
 
 Note the `build.minify` option is not available when using the `'es'` format in lib mode.
 
+Terser must be installed when it is set to `'terser'`.
+
+```sh
+npm add -D terser
+```
+
 ## build.terserOptions
 
 - **Type:** `TerserOptions`
diff --git a/packages/plugin-legacy/README.md b/packages/plugin-legacy/README.md
index f7cd62b4dbe15c..4cec856f95d7af 100644
--- a/packages/plugin-legacy/README.md
+++ b/packages/plugin-legacy/README.md
@@ -27,6 +27,12 @@ export default {
 }
 ```
 
+Terser must be installed because plugin-legacy uses Terser for minification.
+
+```sh
+npm add -D terser
+```
+
 ## Options
 
 ### `targets`
diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json
index 57786e8b2dcb86..0c77100be3b56f 100644
--- a/packages/plugin-legacy/package.json
+++ b/packages/plugin-legacy/package.json
@@ -42,6 +42,7 @@
     "systemjs": "^6.12.1"
   },
   "peerDependencies": {
+    "terser": "^5.4.0",
     "vite": "^3.0.0-alpha"
   },
   "devDependencies": {
diff --git a/packages/vite/package.json b/packages/vite/package.json
index ee03a8fe615565..36b58b122fbf44 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -20,10 +20,7 @@
     "./client": {
       "types": "./client.d.ts"
     },
-    "./dist/client/*": "./dist/client/*",
-    "./terser": {
-      "require": "./dist/node-cjs/terser.cjs"
-    }
+    "./dist/client/*": "./dist/client/*"
   },
   "files": [
     "bin",
@@ -118,7 +115,6 @@
     "source-map-support": "^0.5.21",
     "strip-ansi": "^6.0.1",
     "strip-literal": "^0.3.0",
-    "terser": "^5.14.0",
     "tsconfck": "^2.0.1",
     "tslib": "^2.4.0",
     "types": "link:./types",
@@ -128,7 +124,8 @@
   "peerDependencies": {
     "less": "*",
     "sass": "*",
-    "stylus": "*"
+    "stylus": "*",
+    "terser": "^5.4.0"
   },
   "peerDependenciesMeta": {
     "sass": {
@@ -139,6 +136,9 @@
     },
     "less": {
       "optional": true
+    },
+    "terser": {
+      "optional": true
     }
   }
 }
diff --git a/packages/vite/rollup.config.ts b/packages/vite/rollup.config.ts
index 7232fa2484fff5..62f14f7790fa1d 100644
--- a/packages/vite/rollup.config.ts
+++ b/packages/vite/rollup.config.ts
@@ -118,10 +118,6 @@ function createNodePlugins(
     // Shim them with eval() so rollup can skip these calls.
     isProduction &&
       shimDepsPlugin({
-        'plugins/terser.ts': {
-          src: `require.resolve('terser'`,
-          replacement: `require.resolve('vite/terser'`
-        },
         // chokidar -> fsevents
         'fsevents-handler.js': {
           src: `require('fsevents')`,
@@ -191,27 +187,6 @@ function createNodeConfig(isProduction: boolean) {
   })
 }
 
-/**
- * Terser needs to be run inside a worker, so it cannot be part of the main
- * bundle. We produce a separate bundle for it and shims plugin/terser.ts to
- * use the production path during build.
- */
-const terserConfig = defineConfig({
-  ...sharedNodeOptions,
-  output: {
-    ...sharedNodeOptions.output,
-    entryFileNames: `node-cjs/[name].cjs`,
-    exports: 'default',
-    format: 'cjs',
-    sourcemap: false
-  },
-  input: {
-    // eslint-disable-next-line node/no-restricted-require
-    terser: require.resolve('terser')
-  },
-  plugins: [nodeResolve(), commonjs()]
-})
-
 function createCjsConfig(isProduction: boolean) {
   return defineConfig({
     ...sharedNodeOptions,
@@ -245,8 +220,7 @@ export default (commandLineArgs: any) => {
     envConfig,
     clientConfig,
     createNodeConfig(isProduction),
-    createCjsConfig(isProduction),
-    ...(isProduction ? [terserConfig] : [])
+    createCjsConfig(isProduction)
   ])
 }
 
diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
index 89bbfd6c8c46f4..ce068ac6104f81 100644
--- a/packages/vite/src/node/plugins/css.ts
+++ b/packages/vite/src/node/plugins/css.ts
@@ -40,7 +40,8 @@ import {
   isRelativeBase,
   normalizePath,
   parseRequest,
-  processSrcSet
+  processSrcSet,
+  requireResolveFromRootWithFallback
 } from '../utils'
 import type { Logger } from '../logger'
 import { addToHTMLProxyTransformResult } from './html'
@@ -1296,10 +1297,7 @@ function loadPreprocessor(lang: PreprocessLang, root: string): any {
     return loadedPreprocessors[lang]
   }
   try {
-    // Search for the preprocessor in the root directory first, and fall back
-    // to the default require paths.
-    const fallbackPaths = _require.resolve.paths?.(lang) || []
-    const resolved = _require.resolve(lang, { paths: [root, ...fallbackPaths] })
+    const resolved = requireResolveFromRootWithFallback(root, lang)
     return (loadedPreprocessors[lang] = _require(resolved))
   } catch (e) {
     if (e.code === 'MODULE_NOT_FOUND') {
diff --git a/packages/vite/src/node/plugins/terser.ts b/packages/vite/src/node/plugins/terser.ts
index 4e6b7b681a2cea..6362ca0b726fbf 100644
--- a/packages/vite/src/node/plugins/terser.ts
+++ b/packages/vite/src/node/plugins/terser.ts
@@ -1,26 +1,40 @@
-import { dirname } from 'path'
-import { fileURLToPath } from 'url'
 import { Worker } from 'okie'
 import type { Terser } from 'types/terser'
 import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '..'
+import { requireResolveFromRootWithFallback } from '../utils'
 
-// TODO: use import()
-const _dirname = dirname(fileURLToPath(import.meta.url))
+let terserPath: string | undefined
+const loadTerserPath = (root: string) => {
+  if (terserPath) return terserPath
+  try {
+    terserPath = requireResolveFromRootWithFallback(root, 'terser')
+  } catch (e) {
+    if (e.code === 'MODULE_NOT_FOUND') {
+      throw new Error(
+        'terser not found. Since Vite v3, terser has become an optional dependency. You need to install it.'
+      )
+    } else {
+      const message = new Error(`terser failed to load:\n${e.message}`)
+      message.stack = e.stack + '\n' + message.stack
+      throw message
+    }
+  }
+  return terserPath
+}
 
 export function terserPlugin(config: ResolvedConfig): Plugin {
   const makeWorker = () =>
     new Worker(
-      async (basedir: string, code: string, options: Terser.MinifyOptions) => {
-        // when vite is linked, the worker thread won't share the same resolve
-        // root with vite itself, so we have to pass in the basedir and resolve
-        // terser first.
-        // eslint-disable-next-line node/no-restricted-require, no-restricted-globals
-        const terserPath = require.resolve('terser', {
-          paths: [basedir]
-        })
-        // eslint-disable-next-line no-restricted-globals
-        return require(terserPath).minify(code, options) as Terser.MinifyOutput
+      async (
+        terserPath: string,
+        code: string,
+        options: Terser.MinifyOptions
+      ) => {
+        // test fails when using `import`. maybe related: https://github.com/nodejs/node/issues/43205
+        // eslint-disable-next-line no-restricted-globals -- this function runs inside cjs
+        const terser = require(terserPath)
+        return terser.minify(code, options) as Terser.MinifyOutput
       }
     )
 
@@ -50,7 +64,8 @@ export function terserPlugin(config: ResolvedConfig): Plugin {
       // Lazy load worker.
       worker ||= makeWorker()
 
-      const res = await worker.run(_dirname, code, {
+      const terserPath = loadTerserPath(config.root)
+      const res = await worker.run(terserPath, code, {
         safari10: true,
         ...config.build.terserOptions,
         sourceMap: !!outputOptions.sourcemap,
diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
index 121505f566f6e9..8d52dc2bfe1e53 100644
--- a/packages/vite/src/node/utils.ts
+++ b/packages/vite/src/node/utils.ts
@@ -791,6 +791,18 @@ export function getHash(text: Buffer | string): string {
   return createHash('sha256').update(text).digest('hex').substring(0, 8)
 }
 
+export const requireResolveFromRootWithFallback = (
+  root: string,
+  id: string
+): string => {
+  // Search in the root directory first, and fallback to the default require paths.
+  const fallbackPaths = _require.resolve.paths?.(id) || []
+  const path = _require.resolve(id, {
+    paths: [root, ...fallbackPaths]
+  })
+  return path
+}
+
 // Based on node-graceful-fs
 
 // The ISC License
diff --git a/playground/legacy/package.json b/playground/legacy/package.json
index 4f11c234573f40..347e410e2bf4d6 100644
--- a/playground/legacy/package.json
+++ b/playground/legacy/package.json
@@ -12,6 +12,7 @@
   },
   "devDependencies": {
     "@vitejs/plugin-legacy": "workspace:*",
-    "express": "^4.18.1"
+    "express": "^4.18.1",
+    "terser": "^5.13.1"
   }
 }
diff --git a/playground/preload/package.json b/playground/preload/package.json
index f9318c47277b33..cb160b90482524 100644
--- a/playground/preload/package.json
+++ b/playground/preload/package.json
@@ -13,6 +13,7 @@
     "vue-router": "^4.0.15"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "workspace:*"
+    "@vitejs/plugin-vue": "workspace:*",
+    "terser": "^5.13.1"
   }
 }
diff --git a/playground/vitestSetup.ts b/playground/vitestSetup.ts
index 70ac682d7bec27..13e7592ad380f2 100644
--- a/playground/vitestSetup.ts
+++ b/playground/vitestSetup.ts
@@ -182,7 +182,9 @@ export async function startDefaultServe() {
     build: {
       // esbuild do not minify ES lib output since that would remove pure annotations and break tree-shaking
       // skip transpilation during tests to make it faster
-      target: 'esnext'
+      target: 'esnext',
+      // tests are flaky when `emptyOutDir` is `true`
+      emptyOutDir: false
     },
     customLogger: createInMemoryLogger(serverLogs)
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 438930772bdd48..08492822578d23 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -274,7 +274,6 @@ importers:
       source-map-support: ^0.5.21
       strip-ansi: ^6.0.1
       strip-literal: ^0.3.0
-      terser: ^5.14.0
       tsconfck: ^2.0.1
       tslib: ^2.4.0
       types: link:./types
@@ -337,7 +336,6 @@ importers:
       source-map-support: 0.5.21
       strip-ansi: 6.0.1
       strip-literal: 0.3.0
-      terser: 5.14.0
       tsconfck: 2.0.1
       tslib: 2.4.0
       types: link:types
@@ -505,9 +503,11 @@ importers:
     specifiers:
       '@vitejs/plugin-legacy': workspace:*
       express: ^4.18.1
+      terser: ^5.13.1
     devDependencies:
       '@vitejs/plugin-legacy': link:../../packages/plugin-legacy
       express: 4.18.1
+      terser: 5.14.0
 
   playground/lib:
     specifiers: {}
@@ -689,6 +689,7 @@ importers:
   playground/preload:
     specifiers:
       '@vitejs/plugin-vue': workspace:*
+      terser: ^5.13.1
       vue: ^3.2.37
       vue-router: ^4.0.15
     dependencies:
@@ -696,6 +697,7 @@ importers:
       vue-router: 4.0.15_vue@3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
+      terser: 5.14.0
 
   playground/preserve-symlinks:
     specifiers:

From 0826f7b1f10039f542c4fde87e17c59492c4e885 Mon Sep 17 00:00:00 2001
From: kakachake <34683677+kakachake@users.noreply.github.com>
Date: Wed, 8 Jun 2022 17:52:23 +0800
Subject: [PATCH 15/72] docs(plugin-vue-jsx): update the options (#8496)

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
Co-authored-by: Tony Trinh <tony19@gmail.com>
---
 packages/plugin-vue-jsx/README.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/plugin-vue-jsx/README.md b/packages/plugin-vue-jsx/README.md
index f6159cf3a82cab..c75e6d786f67b6 100644
--- a/packages/plugin-vue-jsx/README.md
+++ b/packages/plugin-vue-jsx/README.md
@@ -17,7 +17,23 @@ export default {
 
 ## Options
 
-See [@vue/babel-plugin-jsx](https://github.com/vuejs/jsx-next).
+### include
+
+Type: `(string | RegExp)[] | string | RegExp | null`
+
+Default: `/\.[jt]sx$/`
+
+A [picomatch pattern](https://github.com/micromatch/picomatch), or array of patterns, which specifies the files the plugin should operate on.
+
+### exclude
+
+Type: `(string | RegExp)[] | string | RegExp | null`
+
+Default: `undefined`
+
+A [picomatch pattern](https://github.com/micromatch/picomatch), or array of patterns, which specifies the files to be ignored by the plugin.
+
+> See [@vue/babel-plugin-jsx](https://github.com/vuejs/jsx-next) for other options.
 
 ## HMR Detection
 

From f59adf8ebe06cf1df827a813ccea6cf6ceb127dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Wed, 8 Jun 2022 19:56:21 +0900
Subject: [PATCH 16/72] refactor: remove hooks ssr param support (#8491)

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
---
 packages/plugin-react/src/index.ts   |  4 ++--
 packages/plugin-vue-jsx/src/index.ts |  2 +-
 packages/plugin-vue/src/index.ts     | 12 ++----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/packages/plugin-react/src/index.ts b/packages/plugin-react/src/index.ts
index 562b8291112297..763534ca2ef182 100644
--- a/packages/plugin-react/src/index.ts
+++ b/packages/plugin-react/src/index.ts
@@ -165,7 +165,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
       }
     },
     async transform(code, id, options) {
-      const ssr = typeof options === 'boolean' ? options : options?.ssr === true
+      const ssr = options?.ssr === true
       // File extension could be mocked/overridden in querystring.
       const [filepath, querystring = ''] = id.split('?')
       const [extension = ''] =
@@ -379,7 +379,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
     /*
     resolveId(id: string) {
       return id === runtimeId ? id : null
-    }, 
+    },
     load(id: string) {
       if (id === runtimeId) {
         const runtimePath = resolve.sync(runtimeId, {
diff --git a/packages/plugin-vue-jsx/src/index.ts b/packages/plugin-vue-jsx/src/index.ts
index 302cb323849ad6..c3edb77c5b0e6e 100644
--- a/packages/plugin-vue-jsx/src/index.ts
+++ b/packages/plugin-vue-jsx/src/index.ts
@@ -74,7 +74,7 @@ function vueJsxPlugin(options: Options = {}): Plugin {
     },
 
     async transform(code, id, opt) {
-      const ssr = typeof opt === 'boolean' ? opt : (opt && opt.ssr) === true
+      const ssr = opt?.ssr === true
       const {
         include,
         exclude,
diff --git a/packages/plugin-vue/src/index.ts b/packages/plugin-vue/src/index.ts
index 805df6fec674d0..6ccbe7bf06da80 100644
--- a/packages/plugin-vue/src/index.ts
+++ b/packages/plugin-vue/src/index.ts
@@ -107,14 +107,6 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin {
     devToolsEnabled: process.env.NODE_ENV !== 'production'
   }
 
-  // Temporal handling for 2.7 breaking change
-  const isSSR = (opt: { ssr?: boolean } | boolean | undefined) =>
-    opt === undefined
-      ? false
-      : typeof opt === 'boolean'
-      ? opt
-      : opt?.ssr === true
-
   return {
     name: 'vite:vue',
 
@@ -169,7 +161,7 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin {
     },
 
     load(id, opt) {
-      const ssr = isSSR(opt)
+      const ssr = opt?.ssr === true
       if (id === EXPORT_HELPER_ID) {
         return helperCode
       }
@@ -202,7 +194,7 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin {
     },
 
     transform(code, id, opt) {
-      const ssr = isSSR(opt)
+      const ssr = opt?.ssr === true
       const { filename, query } = parseVueRequest(id)
       if (query.raw) {
         return

From 51e9195fe94657e7ab14a22a0e7de338ad0724fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Thu, 9 Jun 2022 00:58:01 +0900
Subject: [PATCH 17/72] feat: better config `__dirname` support (#8442)

---
 docs/config/index.md             | 10 +++++-----
 packages/vite/src/node/config.ts | 24 +++++++++++++-----------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/docs/config/index.md b/docs/config/index.md
index 31e341a399756e..5daf5e7f714275 100644
--- a/docs/config/index.md
+++ b/docs/config/index.md
@@ -24,14 +24,14 @@ vite --config my-config.js
 ```
 
 ::: tip NOTE
-Vite will replace `__filename`, `__dirname`, and `import.meta.url` in config files and its deps. Using these as variable names or passing as a parameter to a function with string double quote (example `console.log`) will result in an error:
+Vite will inject `__filename`, `__dirname` in config files and its deps. Declaring these variables at top level will result in an error:
 
 ```js
-const __filename = "value"
-// will be transformed to
-const "path/vite.config.js" = "value"
+const __filename = 'value' // SyntaxError: Identifier '__filename' has already been declared
 
-console.log("import.meta.url") // break error on build
+const func = () => {
+  const __filename = 'value' // no error
+}
 ```
 
 :::
diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
index a9e6ba33f1d0ba..ce897d745d2e27 100644
--- a/packages/vite/src/node/config.ts
+++ b/packages/vite/src/node/config.ts
@@ -772,6 +772,7 @@ async function bundleConfigFile(
   fileName: string,
   isESM = false
 ): Promise<{ code: string; dependencies: string[] }> {
+  const importMetaUrlVarName = '__vite_injected_original_import_meta_url'
   const result = await build({
     absWorkingDir: process.cwd(),
     entryPoints: [fileName],
@@ -782,6 +783,9 @@ async function bundleConfigFile(
     format: isESM ? 'esm' : 'cjs',
     sourcemap: 'inline',
     metafile: true,
+    define: {
+      'import.meta.url': importMetaUrlVarName
+    },
     plugins: [
       {
         name: 'externalize-deps',
@@ -797,22 +801,20 @@ async function bundleConfigFile(
         }
       },
       {
-        name: 'replace-import-meta',
+        name: 'inject-file-scope-variables',
         setup(build) {
           build.onLoad({ filter: /\.[jt]s$/ }, async (args) => {
             const contents = await fs.promises.readFile(args.path, 'utf8')
+            const injectValues =
+              `const __dirname = ${JSON.stringify(path.dirname(args.path))};` +
+              `const __filename = ${JSON.stringify(args.path)};` +
+              `const ${importMetaUrlVarName} = ${JSON.stringify(
+                pathToFileURL(args.path).href
+              )};`
+
             return {
               loader: args.path.endsWith('.ts') ? 'ts' : 'js',
-              contents: contents
-                .replace(
-                  /\bimport\.meta\.url\b/g,
-                  JSON.stringify(pathToFileURL(args.path).href)
-                )
-                .replace(
-                  /\b__dirname\b/g,
-                  JSON.stringify(path.dirname(args.path))
-                )
-                .replace(/\b__filename\b/g, JSON.stringify(args.path))
+              contents: injectValues + contents
             }
           })
         }

From fba82d0ff66d2a13393b052dd95df9e180db663c Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Wed, 8 Jun 2022 18:21:01 +0200
Subject: [PATCH 18/72] fix: respect optimize deps entries (#8489)

---
 packages/vite/src/node/optimizer/index.ts     |  7 ++
 packages/vite/src/node/optimizer/optimizer.ts | 89 ++++++++++++++++++
 .../vite/src/node/plugins/importAnalysis.ts   | 13 ++-
 .../vite/src/node/plugins/optimizedDeps.ts    | 94 +------------------
 packages/vite/src/node/plugins/worker.ts      |  4 +-
 .../src/node/plugins/workerImportMetaUrl.ts   |  4 +-
 .../optimize-deps/added-in-entries/index.js   |  2 +
 .../added-in-entries/package.json             |  6 ++
 playground/optimize-deps/entry.js             | 11 +++
 playground/optimize-deps/package.json         |  1 +
 playground/optimize-deps/vite.config.js       |  3 +-
 pnpm-lock.yaml                                | 11 +++
 12 files changed, 141 insertions(+), 104 deletions(-)
 create mode 100644 playground/optimize-deps/added-in-entries/index.js
 create mode 100644 playground/optimize-deps/added-in-entries/package.json
 create mode 100644 playground/optimize-deps/entry.js

diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts
index ea291675ccc8cf..8160ee0b0d83a0 100644
--- a/packages/vite/src/node/optimizer/index.ts
+++ b/packages/vite/src/node/optimizer/index.ts
@@ -45,11 +45,18 @@ export type ExportsData = {
 export interface DepsOptimizer {
   metadata: DepOptimizationMetadata
   scanProcessing?: Promise<void>
+
   registerMissingImport: (id: string, resolved: string) => OptimizedDepInfo
   run: () => void
+
   isOptimizedDepFile: (id: string) => boolean
   isOptimizedDepUrl: (url: string) => boolean
   getOptimizedDepId: (depInfo: OptimizedDepInfo) => string
+
+  delayDepsOptimizerUntil: (id: string, done: () => Promise<any>) => void
+  registerWorkersSource: (id: string) => void
+  resetRegisteredIds: () => void
+
   options: DepOptimizationOptions
 }
 
diff --git a/packages/vite/src/node/optimizer/optimizer.ts b/packages/vite/src/node/optimizer/optimizer.ts
index d1846903d95269..a7c5391de79b5f 100644
--- a/packages/vite/src/node/optimizer/optimizer.ts
+++ b/packages/vite/src/node/optimizer/optimizer.ts
@@ -1,6 +1,8 @@
 import colors from 'picocolors'
 import _debug from 'debug'
+import glob from 'fast-glob'
 import { getHash } from '../utils'
+import { transformRequest } from '../server/transformRequest'
 import type { ResolvedConfig, ViteDevServer } from '..'
 import {
   addOptimizedDepInfo,
@@ -65,6 +67,9 @@ export async function initDepsOptimizer(
     isOptimizedDepUrl: createIsOptimizedDepUrl(config),
     getOptimizedDepId: (depInfo: OptimizedDepInfo) =>
       isBuild ? depInfo.file : `${depInfo.file}?v=${depInfo.browserHash}`,
+    registerWorkersSource,
+    delayDepsOptimizerUntil,
+    resetRegisteredIds,
     options: config.optimizeDeps
   }
 
@@ -101,8 +106,12 @@ export async function initDepsOptimizer(
   let enqueuedRerun: (() => void) | undefined
   let currentlyProcessing = false
 
+  // Only pretransform optimizeDeps.entries on cold start
+  let optimizeDepsEntriesVisited = !!cachedMetadata
+
   // If there wasn't a cache or it is outdated, we need to prepare a first run
   let firstRunCalled = !!cachedMetadata
+
   if (!cachedMetadata) {
     if (!scan) {
       // Initialize discovered deps with manually added optimizeDeps.include info
@@ -496,5 +505,85 @@ export async function initDepsOptimizer(
     }, timeout)
   }
 
+  const runOptimizerIfIdleAfterMs = 100
+
+  let registeredIds: { id: string; done: () => Promise<any> }[] = []
+  let seenIds = new Set<string>()
+  let workersSources = new Set<string>()
+  let waitingOn: string | undefined
+
+  function resetRegisteredIds() {
+    registeredIds = []
+    seenIds = new Set<string>()
+    workersSources = new Set<string>()
+    waitingOn = undefined
+  }
+
+  function registerWorkersSource(id: string): void {
+    workersSources.add(id)
+    if (waitingOn === id) {
+      waitingOn = undefined
+    }
+  }
+
+  function delayDepsOptimizerUntil(id: string, done: () => Promise<any>): void {
+    if (!depsOptimizer.isOptimizedDepFile(id) && !seenIds.has(id)) {
+      seenIds.add(id)
+      registeredIds.push({ id, done })
+      runOptimizerWhenIdle()
+    }
+    if (server && !optimizeDepsEntriesVisited) {
+      optimizeDepsEntriesVisited = true
+      preTransformOptimizeDepsEntries(server)
+    }
+  }
+
+  function runOptimizerWhenIdle() {
+    if (!waitingOn) {
+      const next = registeredIds.pop()
+      if (next) {
+        waitingOn = next.id
+        const afterLoad = () => {
+          waitingOn = undefined
+          if (registeredIds.length > 0) {
+            runOptimizerWhenIdle()
+          } else if (!workersSources.has(next.id)) {
+            getDepsOptimizer(config)?.run()
+          }
+        }
+        next
+          .done()
+          .then(() => {
+            setTimeout(
+              afterLoad,
+              registeredIds.length > 0 ? 0 : runOptimizerIfIdleAfterMs
+            )
+          })
+          .catch(afterLoad)
+      }
+    }
+  }
+
   return depsOptimizer
 }
+
+export async function preTransformOptimizeDepsEntries(
+  server: ViteDevServer
+): Promise<void> {
+  const { config } = server
+  const { entries } = config.optimizeDeps
+  if (entries) {
+    const explicitEntries = await glob(entries, {
+      cwd: config.root,
+      ignore: ['**/node_modules/**', `**/${config.build.outDir}/**`],
+      absolute: true
+    })
+    // TODO: should we restrict the entries to JS and HTML like the
+    // scanner did? I think we can let the user chose any entry
+    for (const entry of explicitEntries) {
+      transformRequest(entry, server, { ssr: false }).catch((e) => {
+        config.logger.error(e.message)
+      })
+    }
+  }
+}
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
index 0c279da0601727..2b3507f25c0931 100644
--- a/packages/vite/src/node/plugins/importAnalysis.ts
+++ b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -53,10 +53,7 @@ import {
   optimizedDepNeedsInterop
 } from '../optimizer'
 import { checkPublicFile } from './asset'
-import {
-  ERR_OUTDATED_OPTIMIZED_DEP,
-  delayDepsOptimizerUntil
-} from './optimizedDeps'
+import { ERR_OUTDATED_OPTIMIZED_DEP } from './optimizedDeps'
 import { isCSSRequest, isDirectCSSRequest } from './css'
 import { browserExternalId } from './resolve'
 
@@ -599,7 +596,9 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
         )
 
       // pre-transform known direct imports
-      // TODO: we should also crawl dynamic imports
+      // TODO: should we also crawl dynamic imports? or the experience is good enough to allow
+      // users to chose their tradeoffs by explicitily setting optimizeDeps.entries for the
+      // most common dynamic imports
       if (config.server.preTransformRequests && staticImportedUrls.size) {
         staticImportedUrls.forEach(({ url, id }) => {
           url = unwrapId(removeImportQuery(url)).replace(
@@ -614,8 +613,8 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
             // Unexpected error, log the issue but avoid an unhandled exception
             config.logger.error(e.message)
           })
-          if (!config.optimizeDeps.devScan) {
-            delayDepsOptimizerUntil(config, id, () => request)
+          if (depsOptimizer && !config.optimizeDeps.devScan) {
+            depsOptimizer.delayDepsOptimizerUntil(id, () => request)
           }
         })
       }
diff --git a/packages/vite/src/node/plugins/optimizedDeps.ts b/packages/vite/src/node/plugins/optimizedDeps.ts
index 49bcc69bf6f25e..0e1cba664341f5 100644
--- a/packages/vite/src/node/plugins/optimizedDeps.ts
+++ b/packages/vite/src/node/plugins/optimizedDeps.ts
@@ -13,100 +13,10 @@ export const ERR_OUTDATED_OPTIMIZED_DEP = 'ERR_OUTDATED_OPTIMIZED_DEP'
 const isDebug = process.env.DEBUG
 const debug = createDebugger('vite:optimize-deps')
 
-const runOptimizerIfIdleAfterMs = 100
-
-interface RunProcessingInfo {
-  ids: { id: string; done: () => Promise<any> }[]
-  seenIds: Set<string>
-  workersSources: Set<string>
-  waitingOn: string | undefined
-}
-
-const runProcessingInfoMap = new WeakMap<ResolvedConfig, RunProcessingInfo>()
-
-function initRunProcessingInfo(config: ResolvedConfig) {
-  config = config.mainConfig || config
-  const runProcessingInfo = {
-    ids: [],
-    seenIds: new Set<string>(),
-    workersSources: new Set<string>(),
-    waitingOn: undefined
-  }
-  runProcessingInfoMap.set(config, runProcessingInfo)
-  return runProcessingInfo
-}
-
-function getRunProcessingInfo(config: ResolvedConfig): RunProcessingInfo {
-  return (
-    runProcessingInfoMap.get(config.mainConfig || config) ??
-    initRunProcessingInfo(config)
-  )
-}
-
-export function registerWorkersSource(
-  config: ResolvedConfig,
-  id: string
-): void {
-  const info = getRunProcessingInfo(config)
-  info.workersSources.add(id)
-  if (info.waitingOn === id) {
-    info.waitingOn = undefined
-  }
-}
-
-export function delayDepsOptimizerUntil(
-  config: ResolvedConfig,
-  id: string,
-  done: () => Promise<any>
-): void {
-  const info = getRunProcessingInfo(config)
-  if (
-    !getDepsOptimizer(config)?.isOptimizedDepFile(id) &&
-    !info.seenIds.has(id)
-  ) {
-    info.seenIds.add(id)
-    info.ids.push({ id, done })
-    runOptimizerWhenIdle(config)
-  }
-}
-
-function runOptimizerWhenIdle(config: ResolvedConfig) {
-  const info = getRunProcessingInfo(config)
-  if (!info.waitingOn) {
-    const next = info.ids.pop()
-    if (next) {
-      info.waitingOn = next.id
-      const afterLoad = () => {
-        info.waitingOn = undefined
-        if (info.ids.length > 0) {
-          runOptimizerWhenIdle(config)
-        } else if (!info.workersSources.has(next.id)) {
-          getDepsOptimizer(config)?.run()
-        }
-      }
-      next
-        .done()
-        .then(() => {
-          setTimeout(
-            afterLoad,
-            info.ids.length > 0 ? 0 : runOptimizerIfIdleAfterMs
-          )
-        })
-        .catch(afterLoad)
-    }
-  }
-}
-
 export function optimizedDepsPlugin(config: ResolvedConfig): Plugin {
   return {
     name: 'vite:optimized-deps',
 
-    buildStart() {
-      if (!config.isWorker) {
-        initRunProcessingInfo(config)
-      }
-    },
-
     async resolveId(id) {
       if (getDepsOptimizer(config)?.isOptimizedDepFile(id)) {
         return id
@@ -174,7 +84,7 @@ export function optimizedDepsBuildPlugin(config: ResolvedConfig): Plugin {
 
     buildStart() {
       if (!config.isWorker) {
-        initRunProcessingInfo(config)
+        getDepsOptimizer(config)?.resetRegisteredIds()
       }
     },
 
@@ -185,7 +95,7 @@ export function optimizedDepsBuildPlugin(config: ResolvedConfig): Plugin {
     },
 
     transform(_code, id) {
-      delayDepsOptimizerUntil(config, id, async () => {
+      getDepsOptimizer(config)?.delayDepsOptimizerUntil(id, async () => {
         await this.load({ id })
       })
     },
diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
index 1e38a18f3dbdbe..2f50acfcdfa0fe 100644
--- a/packages/vite/src/node/plugins/worker.ts
+++ b/packages/vite/src/node/plugins/worker.ts
@@ -13,8 +13,8 @@ import {
   parseRequest
 } from '../utils'
 import { onRollupWarning } from '../build'
+import { getDepsOptimizer } from '../optimizer'
 import { fileToUrl } from './asset'
-import { registerWorkersSource } from './optimizedDeps'
 
 interface WorkerCache {
   // save worker all emit chunk avoid rollup make the same asset unique.
@@ -269,7 +269,7 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
         : 'module'
       const workerOptions = workerType === 'classic' ? '' : ',{type: "module"}'
       if (isBuild) {
-        registerWorkersSource(config, id)
+        getDepsOptimizer(config)?.registerWorkersSource(id)
         if (query.inline != null) {
           const chunk = await bundleWorkerEntry(config, id, query)
           // inline as blob data url
diff --git a/packages/vite/src/node/plugins/workerImportMetaUrl.ts b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
index cfb10fdb2e8591..510ae644a1a11b 100644
--- a/packages/vite/src/node/plugins/workerImportMetaUrl.ts
+++ b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
@@ -12,10 +12,10 @@ import {
   parseRequest,
   transformResult
 } from '../utils'
+import { getDepsOptimizer } from '../optimizer'
 import type { WorkerType } from './worker'
 import { WORKER_FILE_ID, workerFileToUrl } from './worker'
 import { fileToUrl } from './asset'
-import { registerWorkersSource } from './optimizedDeps'
 
 const ignoreFlagRE = /\/\*\s*@vite-ignore\s*\*\//
 
@@ -123,7 +123,7 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
 
           let url: string
           if (isBuild) {
-            registerWorkersSource(config, id)
+            getDepsOptimizer(config)?.registerWorkersSource(id)
             url = await workerFileToUrl(config, file, query)
           } else {
             url = await fileToUrl(cleanUrl(file), config, this)
diff --git a/playground/optimize-deps/added-in-entries/index.js b/playground/optimize-deps/added-in-entries/index.js
new file mode 100644
index 00000000000000..f660e74d01dd01
--- /dev/null
+++ b/playground/optimize-deps/added-in-entries/index.js
@@ -0,0 +1,2 @@
+// written in cjs, optimization should convert this to esm
+module.exports = 'added-in-entries'
diff --git a/playground/optimize-deps/added-in-entries/package.json b/playground/optimize-deps/added-in-entries/package.json
new file mode 100644
index 00000000000000..b770dc1c053537
--- /dev/null
+++ b/playground/optimize-deps/added-in-entries/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "added-in-entries",
+  "private": true,
+  "version": "1.0.0",
+  "main": "index.js"
+}
diff --git a/playground/optimize-deps/entry.js b/playground/optimize-deps/entry.js
new file mode 100644
index 00000000000000..fe7746a556c6f4
--- /dev/null
+++ b/playground/optimize-deps/entry.js
@@ -0,0 +1,11 @@
+import msg from 'added-in-entries'
+
+// This is an entry file that is added to optimizeDeps.entries
+// When the deps aren't cached, these entries are also processed
+// to discover dependencies in them. This should only be needed
+// for code splitted sections that are commonly visited after
+// first load where a full-reload wants to be avoided at the expense
+// of extra processing on cold start. Another option is to add
+// the missing dependencies to optimizeDeps.include directly
+
+console.log(msg)
diff --git a/playground/optimize-deps/package.json b/playground/optimize-deps/package.json
index 3a274ff63b5fdf..4673bbf16d9cc5 100644
--- a/playground/optimize-deps/package.json
+++ b/playground/optimize-deps/package.json
@@ -22,6 +22,7 @@
     "dep-with-builtin-module-cjs": "file:./dep-with-builtin-module-cjs",
     "dep-with-builtin-module-esm": "file:./dep-with-builtin-module-esm",
     "dep-with-dynamic-import": "file:./dep-with-dynamic-import",
+    "added-in-entries": "file:./added-in-entries",
     "lodash-es": "^4.17.21",
     "nested-exclude": "file:./nested-exclude",
     "phoenix": "^1.6.10",
diff --git a/playground/optimize-deps/vite.config.js b/playground/optimize-deps/vite.config.js
index d5da62f3331fc2..e268510d5c8d76 100644
--- a/playground/optimize-deps/vite.config.js
+++ b/playground/optimize-deps/vite.config.js
@@ -33,7 +33,8 @@ module.exports = {
           }
         }
       ]
-    }
+    },
+    entries: ['entry.js']
   },
 
   build: {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 08492822578d23..60c13ef3e463de 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -572,6 +572,7 @@ importers:
   playground/optimize-deps:
     specifiers:
       '@vitejs/plugin-vue': workspace:*
+      added-in-entries: file:./added-in-entries
       axios: ^0.27.2
       clipboard: ^2.0.11
       dep-cjs-compiled-from-cjs: file:./dep-cjs-compiled-from-cjs
@@ -595,6 +596,7 @@ importers:
       vue: ^3.2.37
       vuex: ^4.0.2
     dependencies:
+      added-in-entries: file:playground/optimize-deps/added-in-entries
       axios: 0.27.2
       clipboard: 2.0.11
       dep-cjs-compiled-from-cjs: file:playground/optimize-deps/dep-cjs-compiled-from-cjs
@@ -620,6 +622,9 @@ importers:
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
 
+  playground/optimize-deps/added-in-entries:
+    specifiers: {}
+
   playground/optimize-deps/dep-cjs-compiled-from-cjs:
     specifiers: {}
 
@@ -8855,6 +8860,12 @@ packages:
     version: 0.0.0
     dev: true
 
+  file:playground/optimize-deps/added-in-entries:
+    resolution: {directory: playground/optimize-deps/added-in-entries, type: directory}
+    name: added-in-entries
+    version: 1.0.0
+    dev: false
+
   file:playground/optimize-deps/dep-cjs-compiled-from-cjs:
     resolution: {directory: playground/optimize-deps/dep-cjs-compiled-from-cjs, type: directory}
     name: dep-cjs-compiled-from-cjs

From 8d082204cb9b7f7412f328ea7670e76738cce44a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Thu, 9 Jun 2022 21:19:45 +0900
Subject: [PATCH 19/72] chore(create-vite): add current directory description
 (#8501)

---
 packages/create-vite/README.md             |  2 ++
 packages/create-vite/__tests__/cli.spec.ts |  8 +++++-
 packages/create-vite/index.js              | 29 ++++++++++++++--------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/packages/create-vite/README.md b/packages/create-vite/README.md
index e22c268ab99f9c..7c753d212bd302 100644
--- a/packages/create-vite/README.md
+++ b/packages/create-vite/README.md
@@ -56,6 +56,8 @@ Currently supported template presets include:
 - `svelte`
 - `svelte-ts`
 
+You can use `.` for the project name to scaffold in the current directory.
+
 ## Community Templates
 
 create-vite is a tool to quickly start a project from a basic template for popular frameworks. Check out Awesome Vite for [community maintained templates](https://github.com/vitejs/awesome-vite#templates) that include other tools or target different frameworks. You can use a tool like [degit](https://github.com/Rich-Harris/degit) to scaffold your project with one of the templates.
diff --git a/packages/create-vite/__tests__/cli.spec.ts b/packages/create-vite/__tests__/cli.spec.ts
index d9b6bafdefa306..f9172aeece98d2 100644
--- a/packages/create-vite/__tests__/cli.spec.ts
+++ b/packages/create-vite/__tests__/cli.spec.ts
@@ -40,6 +40,12 @@ test('prompts for the project name if none supplied', () => {
   expect(stdout).toContain('Project name:')
 })
 
+test('prompts for the framework if none supplied when target dir is current directory', () => {
+  mkdirpSync(genPath)
+  const { stdout } = run(['.'], { cwd: genPath })
+  expect(stdout).toContain('Select a framework:')
+})
+
 test('prompts for the framework if none supplied', () => {
   const { stdout } = run([projectName])
   expect(stdout).toContain('Select a framework:')
@@ -65,7 +71,7 @@ test('asks to overwrite non-empty target directory', () => {
 
 test('asks to overwrite non-empty current directory', () => {
   createNonEmptyDir()
-  const { stdout } = run(['.'], { cwd: genPath, input: 'test-app\n' })
+  const { stdout } = run(['.'], { cwd: genPath })
   expect(stdout).toContain(`Current directory is not empty.`)
 })
 
diff --git a/packages/create-vite/index.js b/packages/create-vite/index.js
index 93ddb3c3f027a1..ec084e8327d603 100755
--- a/packages/create-vite/index.js
+++ b/packages/create-vite/index.js
@@ -130,12 +130,12 @@ const renameFiles = {
 }
 
 async function init() {
-  let targetDir = argv._[0]
+  let targetDir = formatTargetDir(argv._[0])
   let template = argv.template || argv.t
 
-  const defaultProjectName = !targetDir
-    ? 'vite-project'
-    : targetDir.trim().replace(/\/+$/g, '')
+  const defaultTargetDir = 'vite-project'
+  const getProjectName = () =>
+    targetDir === '.' ? path.basename(path.resolve()) : targetDir
 
   let result = {}
 
@@ -146,10 +146,10 @@ async function init() {
           type: targetDir ? null : 'text',
           name: 'projectName',
           message: reset('Project name:'),
-          initial: defaultProjectName,
-          onState: (state) =>
-            (targetDir =
-              state.value.trim().replace(/\/+$/g, '') || defaultProjectName)
+          initial: defaultTargetDir,
+          onState: (state) => {
+            targetDir = formatTargetDir(state.value) || defaultTargetDir
+          }
         },
         {
           type: () =>
@@ -171,10 +171,10 @@ async function init() {
           name: 'overwriteChecker'
         },
         {
-          type: () => (isValidPackageName(targetDir) ? null : 'text'),
+          type: () => (isValidPackageName(getProjectName()) ? null : 'text'),
           name: 'packageName',
           message: reset('Package name:'),
-          initial: () => toValidPackageName(targetDir),
+          initial: () => toValidPackageName(getProjectName()),
           validate: (dir) =>
             isValidPackageName(dir) || 'Invalid package.json name'
         },
@@ -265,7 +265,7 @@ async function init() {
     fs.readFileSync(path.join(templateDir, `package.json`), 'utf-8')
   )
 
-  pkg.name = packageName || targetDir
+  pkg.name = packageName || getProjectName()
 
   write('package.json', JSON.stringify(pkg, null, 2))
 
@@ -289,6 +289,13 @@ async function init() {
   console.log()
 }
 
+/**
+ * @param {string | undefined} targetDir
+ */
+function formatTargetDir(targetDir) {
+  return targetDir?.trim().replace(/\/+$/g, '')
+}
+
 function copy(src, dest) {
   const stat = fs.statSync(src)
   if (stat.isDirectory()) {

From 0e5c0091bfa884371bed2f9279c97b974aa4ee17 Mon Sep 17 00:00:00 2001
From: Tim MacDonald <hello@timacdonald.me>
Date: Thu, 9 Jun 2022 22:22:05 +1000
Subject: [PATCH 20/72] fix(dev): avoid FOUC when swapping out link tag (fix
 #7973) (#8495)

---
 packages/vite/src/client/client.ts   | 13 ++++++++-
 playground/hmr/__tests__/hmr.spec.ts | 14 ++++++++++
 playground/hmr/hmr.ts                | 42 ++++++++++++++++++++++++----
 playground/hmr/index.html            | 10 ++++++-
 4 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/packages/vite/src/client/client.ts b/packages/vite/src/client/client.ts
index 5aec1eae9c5bc0..8f39164e05a774 100644
--- a/packages/vite/src/client/client.ts
+++ b/packages/vite/src/client/client.ts
@@ -101,7 +101,18 @@ async function handleMessage(payload: HMRPayload) {
             const newPath = `${base}${searchUrl.slice(1)}${
               searchUrl.includes('?') ? '&' : '?'
             }t=${timestamp}`
-            el.href = new URL(newPath, el.href).href
+
+            // rather than swapping the href on the existing tag, we will
+            // create a new link tag. Once the new stylesheet has loaded we
+            // will remove the existing link tag. This removes a Flash Of
+            // Unstyled Content that can occur when swapping out the tag href
+            // directly, as the new stylesheet has not yet been loaded.
+            const newLinkTag = el.cloneNode() as HTMLLinkElement
+            newLinkTag.href = new URL(newPath, el.href).href
+            const removeOldEl = () => el.remove()
+            newLinkTag.addEventListener('load', removeOldEl)
+            newLinkTag.addEventListener('error', removeOldEl)
+            el.after(newLinkTag)
           }
           console.log(`[vite] css hot updated: ${searchUrl}`)
         }
diff --git a/playground/hmr/__tests__/hmr.spec.ts b/playground/hmr/__tests__/hmr.spec.ts
index d06fee31f110ea..2ccdf96d84b970 100644
--- a/playground/hmr/__tests__/hmr.spec.ts
+++ b/playground/hmr/__tests__/hmr.spec.ts
@@ -169,6 +169,20 @@ if (!isBuild) {
     expect(textpost).not.toMatch('direct')
   })
 
+  test('it swaps out link tags', async () => {
+    await page.goto(viteTestUrl)
+
+    editFile('global.css', (code) => code.replace('white', 'tomato'))
+
+    let el = await page.$('.link-tag-added')
+    await untilUpdated(() => el.textContent(), 'yes')
+
+    el = await page.$('.link-tag-removed')
+    await untilUpdated(() => el.textContent(), 'yes')
+
+    expect((await page.$$('link')).length).toBe(1)
+  })
+
   test('not loaded dynamic import', async () => {
     await page.goto(viteTestUrl + '/counter/index.html')
 
diff --git a/playground/hmr/hmr.ts b/playground/hmr/hmr.ts
index 113b87bc5865d4..f2d21b9bc78884 100644
--- a/playground/hmr/hmr.ts
+++ b/playground/hmr/hmr.ts
@@ -41,12 +41,42 @@ if (import.meta.hot) {
         update.type === 'css-update' && update.path.match('global.css')
     )
     if (cssUpdate) {
-      const el = document.querySelector('#global-css') as HTMLLinkElement
-      text('.css-prev', el.href)
-      // We don't have a vite:afterUpdate event, but updates are currently sync
-      setTimeout(() => {
-        text('.css-post', el.href)
-      }, 0)
+      text(
+        '.css-prev',
+        (document.querySelector('.global-css') as HTMLLinkElement).href
+      )
+
+      // We don't have a vite:afterUpdate event.
+      // We need to wait until the tag has been swapped out, which
+      // includes the time taken to download and parse the new stylesheet.
+      const observer = new MutationObserver((mutations) => {
+        mutations.forEach((mutation) => {
+          mutation.addedNodes.forEach((node) => {
+            if (
+              node.nodeType === Node.ELEMENT_NODE &&
+              (node as Element).tagName === 'LINK'
+            ) {
+              text('.link-tag-added', 'yes')
+            }
+          })
+          mutation.removedNodes.forEach((node) => {
+            if (
+              node.nodeType === Node.ELEMENT_NODE &&
+              (node as Element).tagName === 'LINK'
+            ) {
+              text('.link-tag-removed', 'yes')
+              text(
+                '.css-post',
+                (document.querySelector('.global-css') as HTMLLinkElement).href
+              )
+            }
+          })
+        })
+      })
+
+      observer.observe(document.querySelector('#style-tags-wrapper'), {
+        childList: true
+      })
     }
   })
 
diff --git a/playground/hmr/index.html b/playground/hmr/index.html
index 65a2ed381b027a..7857ef818a911c 100644
--- a/playground/hmr/index.html
+++ b/playground/hmr/index.html
@@ -1,4 +1,10 @@
-<link id="global-css" rel="stylesheet" href="./global.css?param=required" />
+<div id="style-tags-wrapper">
+  <link
+    class="global-css"
+    rel="stylesheet"
+    href="./global.css?param=required"
+  />
+</div>
 <script type="module" src="./hmr.ts"></script>
 <style>
   .import-image {
@@ -16,4 +22,6 @@
 <div class="custom-communication"></div>
 <div class="css-prev"></div>
 <div class="css-post"></div>
+<div class="link-tag-added">no</div>
+<div class="link-tag-removed">no</div>
 <div class="import-image"></div>

From 9065b3758f00fe1fdeeddbfc6baae38122ceeadd Mon Sep 17 00:00:00 2001
From: stygian-desolator <73412177+stygian-desolator@users.noreply.github.com>
Date: Thu, 9 Jun 2022 23:30:20 +0800
Subject: [PATCH 21/72] fix(optimizer): encode `_` and `.` in different way
 (#8508)

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
---
 packages/vite/src/node/utils.ts                      |  5 ++++-
 .../optimize-deps/__tests__/optimize-deps.spec.ts    |  5 +++++
 playground/optimize-deps/index.html                  | 12 ++++++++++++
 playground/optimize-deps/package.json                |  4 +++-
 pnpm-lock.yaml                                       |  8 ++++++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
index 8d52dc2bfe1e53..4840cc413eb378 100644
--- a/packages/vite/src/node/utils.ts
+++ b/packages/vite/src/node/utils.ts
@@ -37,7 +37,10 @@ export function unwrapId(id: string): string {
 }
 
 export const flattenId = (id: string): string =>
-  id.replace(/(\s*>\s*)/g, '__').replace(/[\/\.:]/g, '_')
+  id
+    .replace(/[\/:]/g, '_')
+    .replace(/[\.]/g, '__')
+    .replace(/(\s*>\s*)/g, '___')
 
 export const normalizeId = (id: string): string =>
   id.replace(/(\s*>\s*)/g, ' > ')
diff --git a/playground/optimize-deps/__tests__/optimize-deps.spec.ts b/playground/optimize-deps/__tests__/optimize-deps.spec.ts
index bf4fee61e4e74c..cc712fbbdc4a09 100644
--- a/playground/optimize-deps/__tests__/optimize-deps.spec.ts
+++ b/playground/optimize-deps/__tests__/optimize-deps.spec.ts
@@ -121,6 +121,11 @@ test('variable names are reused in different scripts', async () => {
   expect(await page.textContent('.reused-variable-names')).toBe('reused')
 })
 
+test('flatten id should generate correctly', async () => {
+  expect(await page.textContent('.clonedeep-slash')).toBe('clonedeep-slash')
+  expect(await page.textContent('.clonedeep-dot')).toBe('clonedeep-dot')
+})
+
 test.runIf(isServe)('error on builtin modules usage', () => {
   expect(browserLogs).toEqual(
     expect.arrayContaining([
diff --git a/playground/optimize-deps/index.html b/playground/optimize-deps/index.html
index 39d76fd83d0609..b96620902c1eca 100644
--- a/playground/optimize-deps/index.html
+++ b/playground/optimize-deps/index.html
@@ -74,6 +74,10 @@ <h2>Alias with colon</h2>
 <h2>Reused variable names</h2>
 <div>This should show reused: <span class="reused-variable-names"></span></div>
 
+<h2>Flatten Id</h2>
+<div class="clonedeep-slash"></div>
+<div class="clonedeep-dot"></div>
+
 <script>
   function text(el, text) {
     document.querySelector(el).textContent = text
@@ -169,3 +173,11 @@ <h2>Reused variable names</h2>
     read()
   }
 </script>
+
+<script type="module">
+  import cloneDeepSlash from 'lodash/cloneDeep'
+  import cloneDeepDot from 'lodash.clonedeep'
+
+  text('.clonedeep-slash', cloneDeepSlash({ name: 'clonedeep-slash' }).name)
+  text('.clonedeep-dot', cloneDeepDot({ name: 'clonedeep-dot' }).name)
+</script>
diff --git a/playground/optimize-deps/package.json b/playground/optimize-deps/package.json
index 4673bbf16d9cc5..d8302ff0e23cc7 100644
--- a/playground/optimize-deps/package.json
+++ b/playground/optimize-deps/package.json
@@ -31,7 +31,9 @@
     "resolve-linked": "workspace:0.0.0",
     "url": "^0.11.0",
     "vue": "^3.2.37",
-    "vuex": "^4.0.2"
+    "vuex": "^4.0.2",
+    "lodash": "^4.17.21",
+    "lodash.clonedeep": "^4.5.0"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 60c13ef3e463de..f57f9baab70ffa 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -586,7 +586,9 @@ importers:
       dep-with-builtin-module-cjs: file:./dep-with-builtin-module-cjs
       dep-with-builtin-module-esm: file:./dep-with-builtin-module-esm
       dep-with-dynamic-import: file:./dep-with-dynamic-import
+      lodash: ^4.17.21
       lodash-es: ^4.17.21
+      lodash.clonedeep: ^4.5.0
       nested-exclude: file:./nested-exclude
       phoenix: ^1.6.10
       react: ^17.0.2
@@ -610,7 +612,9 @@ importers:
       dep-with-builtin-module-cjs: file:playground/optimize-deps/dep-with-builtin-module-cjs
       dep-with-builtin-module-esm: file:playground/optimize-deps/dep-with-builtin-module-esm
       dep-with-dynamic-import: file:playground/optimize-deps/dep-with-dynamic-import
+      lodash: 4.17.21
       lodash-es: 4.17.21
+      lodash.clonedeep: 4.5.0
       nested-exclude: file:playground/optimize-deps/nested-exclude
       phoenix: 1.6.10
       react: 17.0.2
@@ -5849,6 +5853,10 @@ packages:
     resolution: {integrity: sha1-soqmKIorn8ZRA1x3EfZathkDMaY=}
     dev: true
 
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
   /lodash.defaults/4.2.0:
     resolution: {integrity: sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=}
     dev: true

From 1e055489595476822f0183248f1029bd2d165785 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Fri, 10 Jun 2022 09:39:21 +0200
Subject: [PATCH 22/72] fix: deps optimizer idle logic for workers (fix #8479)
 (#8511)

---
 packages/vite/src/node/optimizer/optimizer.ts  | 14 ++++++++++----
 playground/worker/dep-to-optimize/index.js     |  1 +
 playground/worker/dep-to-optimize/package.json |  7 +++++++
 playground/worker/my-worker.ts                 |  3 ++-
 playground/worker/package.json                 |  3 +++
 pnpm-lock.yaml                                 | 12 ++++++++++++
 6 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 playground/worker/dep-to-optimize/index.js
 create mode 100644 playground/worker/dep-to-optimize/package.json

diff --git a/packages/vite/src/node/optimizer/optimizer.ts b/packages/vite/src/node/optimizer/optimizer.ts
index a7c5391de79b5f..a75eb9090aa109 100644
--- a/packages/vite/src/node/optimizer/optimizer.ts
+++ b/packages/vite/src/node/optimizer/optimizer.ts
@@ -521,8 +521,12 @@ export async function initDepsOptimizer(
 
   function registerWorkersSource(id: string): void {
     workersSources.add(id)
+    // Avoid waiting for this id, as it may be blocked by the rollup
+    // bundling process of the worker that also depends on the optimizer
+    registeredIds = registeredIds.filter((registered) => registered.id !== id)
     if (waitingOn === id) {
       waitingOn = undefined
+      runOptimizerWhenIdle()
     }
   }
 
@@ -545,10 +549,12 @@ export async function initDepsOptimizer(
         waitingOn = next.id
         const afterLoad = () => {
           waitingOn = undefined
-          if (registeredIds.length > 0) {
-            runOptimizerWhenIdle()
-          } else if (!workersSources.has(next.id)) {
-            getDepsOptimizer(config)?.run()
+          if (!workersSources.has(next.id)) {
+            if (registeredIds.length > 0) {
+              runOptimizerWhenIdle()
+            } else {
+              getDepsOptimizer(config)?.run()
+            }
           }
         }
         next
diff --git a/playground/worker/dep-to-optimize/index.js b/playground/worker/dep-to-optimize/index.js
new file mode 100644
index 00000000000000..a9e424d7c3a0bf
--- /dev/null
+++ b/playground/worker/dep-to-optimize/index.js
@@ -0,0 +1 @@
+export const msg = 'dep-to-optimize'
diff --git a/playground/worker/dep-to-optimize/package.json b/playground/worker/dep-to-optimize/package.json
new file mode 100644
index 00000000000000..79ef04de908d58
--- /dev/null
+++ b/playground/worker/dep-to-optimize/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "dep-to-optimize",
+  "private": true,
+  "version": "1.0.0",
+  "type": "module",
+  "main": "index.js"
+}
diff --git a/playground/worker/my-worker.ts b/playground/worker/my-worker.ts
index cfaaeeb4b788d3..5d45a833497fd7 100644
--- a/playground/worker/my-worker.ts
+++ b/playground/worker/my-worker.ts
@@ -1,9 +1,10 @@
 import { mode, msg } from './modules/workerImport'
 import { bundleWithPlugin } from './modules/test-plugin'
+import { msg as msgFromDep } from 'dep-to-optimize'
 
 self.onmessage = (e) => {
   if (e.data === 'ping') {
-    self.postMessage({ msg, mode, bundleWithPlugin })
+    self.postMessage({ msg, mode, bundleWithPlugin, msgFromDep })
   }
 }
 
diff --git a/playground/worker/package.json b/playground/worker/package.json
index d66a96e84d59f2..a4ee96e1620538 100644
--- a/playground/worker/package.json
+++ b/playground/worker/package.json
@@ -23,6 +23,9 @@
     "preview:relative-base": "cross-env WORKER_MODE=inline vite --config ./vite.config-relative-base.js preview",
     "debug": "node --inspect-brk ../../packages/vite/bin/vite"
   },
+  "dependencies": {
+    "dep-to-optimize": "file:./dep-to-optimize"
+  },
   "devDependencies": {
     "@vitejs/plugin-vue-jsx": "workspace:*"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f57f9baab70ffa..0e072489df63e2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1045,9 +1045,15 @@ importers:
   playground/worker:
     specifiers:
       '@vitejs/plugin-vue-jsx': workspace:*
+      dep-to-optimize: file:./dep-to-optimize
+    dependencies:
+      dep-to-optimize: file:playground/worker/dep-to-optimize
     devDependencies:
       '@vitejs/plugin-vue-jsx': link:../../packages/plugin-vue-jsx
 
+  playground/worker/dep-to-optimize:
+    specifiers: {}
+
 packages:
 
   /@algolia/autocomplete-core/1.5.2:
@@ -9017,3 +9023,9 @@ packages:
     name: example-external-component
     version: 0.0.0
     dev: false
+
+  file:playground/worker/dep-to-optimize:
+    resolution: {directory: playground/worker/dep-to-optimize, type: directory}
+    name: dep-to-optimize
+    version: 1.0.0
+    dev: false

From 121a482a6f7ca1001c2e90c8ff441a59cb3adcc4 Mon Sep 17 00:00:00 2001
From: patak-dev <matias.capeletto@gmail.com>
Date: Fri, 10 Jun 2022 11:50:04 +0200
Subject: [PATCH 23/72] release: v3.0.0-alpha.10

---
 packages/vite/CHANGELOG.md | 22 ++++++++++++++++++++++
 packages/vite/package.json |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md
index 7711aee6dc3b1f..87d237b182efaf 100644
--- a/packages/vite/CHANGELOG.md
+++ b/packages/vite/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 3.0.0-alpha.10 (2022-06-10)
+
+* fix: deps optimizer idle logic for workers (fix #8479) (#8511) ([1e05548](https://github.com/vitejs/vite/commit/1e05548)), closes [#8479](https://github.com/vitejs/vite/issues/8479) [#8511](https://github.com/vitejs/vite/issues/8511)
+* fix: not match \n when injecting esbuild helpers (#8414) ([5a57626](https://github.com/vitejs/vite/commit/5a57626)), closes [#8414](https://github.com/vitejs/vite/issues/8414)
+* fix: remove empty chunk css imports when using esnext (#8345) ([b3d9652](https://github.com/vitejs/vite/commit/b3d9652)), closes [#8345](https://github.com/vitejs/vite/issues/8345)
+* fix: respect optimize deps entries (#8489) ([fba82d0](https://github.com/vitejs/vite/commit/fba82d0)), closes [#8489](https://github.com/vitejs/vite/issues/8489)
+* fix: respect server.headers in static middlewares (#8481) ([408e5a7](https://github.com/vitejs/vite/commit/408e5a7)), closes [#8481](https://github.com/vitejs/vite/issues/8481)
+* fix(dev): avoid FOUC when swapping out link tag (fix #7973) (#8495) ([0e5c009](https://github.com/vitejs/vite/commit/0e5c009)), closes [#7973](https://github.com/vitejs/vite/issues/7973) [#8495](https://github.com/vitejs/vite/issues/8495)
+* fix(optimizer): encode `_` and `.` in different way (#8508) ([9065b37](https://github.com/vitejs/vite/commit/9065b37)), closes [#8508](https://github.com/vitejs/vite/issues/8508)
+* fix(optimizer): external require-import conversion (fixes #2492, #3409) (#8459) ([1061bbd](https://github.com/vitejs/vite/commit/1061bbd)), closes [#2492](https://github.com/vitejs/vite/issues/2492) [#3409](https://github.com/vitejs/vite/issues/3409) [#8459](https://github.com/vitejs/vite/issues/8459)
+* feat: better config `__dirname` support (#8442) ([51e9195](https://github.com/vitejs/vite/commit/51e9195)), closes [#8442](https://github.com/vitejs/vite/issues/8442)
+* feat: expose `version` (#8456) ([e992594](https://github.com/vitejs/vite/commit/e992594)), closes [#8456](https://github.com/vitejs/vite/issues/8456)
+* feat: handle named imports of builtin modules (#8338) ([e2e44ff](https://github.com/vitejs/vite/commit/e2e44ff)), closes [#8338](https://github.com/vitejs/vite/issues/8338)
+* feat: preserve process env vars in lib build (#8090) ([908c9e4](https://github.com/vitejs/vite/commit/908c9e4)), closes [#8090](https://github.com/vitejs/vite/issues/8090)
+* refactor!: make terser an optional dependency (#8049) ([164f528](https://github.com/vitejs/vite/commit/164f528)), closes [#8049](https://github.com/vitejs/vite/issues/8049)
+* chore: generate vite sourcemap when not production (#8453) ([129b499](https://github.com/vitejs/vite/commit/129b499)), closes [#8453](https://github.com/vitejs/vite/issues/8453)
+* chore: resolve ssr options (#8455) ([d97e402](https://github.com/vitejs/vite/commit/d97e402)), closes [#8455](https://github.com/vitejs/vite/issues/8455)
+* chore(deps): update all non-major dependencies (#8474) ([6d0ede7](https://github.com/vitejs/vite/commit/6d0ede7)), closes [#8474](https://github.com/vitejs/vite/issues/8474)
+* perf: disable postcss sourcemap when unused (#8451) ([64fc61c](https://github.com/vitejs/vite/commit/64fc61c)), closes [#8451](https://github.com/vitejs/vite/issues/8451)
+
+
+
 ## 3.0.0-alpha.9 (2022-06-01)
 
 * fix: make array `acornInjectPlugins` work (fixes #8410) (#8415) ([08d594b](https://github.com/vitejs/vite/commit/08d594b)), closes [#8410](https://github.com/vitejs/vite/issues/8410) [#8415](https://github.com/vitejs/vite/issues/8415)
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 36b58b122fbf44..5d30d6f3bef105 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.0.0-alpha.9",
+  "version": "3.0.0-alpha.10",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",

From 3f4d22d1f3361ec3013e15288d1a1f16c615a121 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Fri, 10 Jun 2022 15:49:49 +0200
Subject: [PATCH 24/72] fix: outdated optimized dep removed from module graph
 (#8533)

---
 packages/vite/src/node/plugins/importAnalysis.ts | 16 +++++++++++++---
 packages/vite/src/node/plugins/optimizedDeps.ts  |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
index 2b3507f25c0931..023740efc33b0b 100644
--- a/packages/vite/src/node/plugins/importAnalysis.ts
+++ b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -53,7 +53,10 @@ import {
   optimizedDepNeedsInterop
 } from '../optimizer'
 import { checkPublicFile } from './asset'
-import { ERR_OUTDATED_OPTIMIZED_DEP } from './optimizedDeps'
+import {
+  ERR_OUTDATED_OPTIMIZED_DEP,
+  throwOutdatedRequest
+} from './optimizedDeps'
 import { isCSSRequest, isDirectCSSRequest } from './css'
 import { browserExternalId } from './resolve'
 
@@ -167,10 +170,19 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
         )
       }
 
+      const depsOptimizer = getDepsOptimizer(config)
+
       const { moduleGraph } = server
       // since we are already in the transform phase of the importer, it must
       // have been loaded so its entry is guaranteed in the module graph.
       const importerModule = moduleGraph.getModuleById(importer)!
+      if (!importerModule && depsOptimizer?.isOptimizedDepFile(importer)) {
+        // Ids of optimized deps could be invalidated and removed from the graph
+        // Return without transforming, this request is no longer valid, a full reload
+        // is going to request this id again. Throwing an outdated error so we
+        // properly finish the request with a 504 sent to the browser.
+        throwOutdatedRequest(importer)
+      }
 
       if (!imports.length) {
         importerModule.isSelfAccepting = false
@@ -197,8 +209,6 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       const toAbsoluteUrl = (url: string) =>
         path.posix.resolve(path.posix.dirname(importerModule.url), url)
 
-      const depsOptimizer = getDepsOptimizer(config)
-
       const normalizeUrl = async (
         url: string,
         pos: number
diff --git a/packages/vite/src/node/plugins/optimizedDeps.ts b/packages/vite/src/node/plugins/optimizedDeps.ts
index 0e1cba664341f5..b50294f9e64b9b 100644
--- a/packages/vite/src/node/plugins/optimizedDeps.ts
+++ b/packages/vite/src/node/plugins/optimizedDeps.ts
@@ -139,7 +139,7 @@ export function optimizedDepsBuildPlugin(config: ResolvedConfig): Plugin {
   }
 }
 
-function throwProcessingError(id: string) {
+function throwProcessingError(id: string): never {
   const err: any = new Error(
     `Something unexpected happened while optimizing "${id}". ` +
       `The current page should have reloaded by now`
@@ -150,7 +150,7 @@ function throwProcessingError(id: string) {
   throw err
 }
 
-function throwOutdatedRequest(id: string) {
+export function throwOutdatedRequest(id: string): never {
   const err: any = new Error(
     `There is a new version of the pre-bundle for "${id}", ` +
       `a page reload is going to ask for it.`

From 87f58ad1963d1d864c4c15d55ce4e45ecab1a8c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Fri, 10 Jun 2022 23:44:17 +0900
Subject: [PATCH 25/72] chore: include 2.9.10-2.9.12 changelog in main (#8535)

---
 packages/vite/CHANGELOG.md | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md
index 87d237b182efaf..92a05ffb43ea64 100644
--- a/packages/vite/CHANGELOG.md
+++ b/packages/vite/CHANGELOG.md
@@ -2,10 +2,7 @@
 
 * fix: deps optimizer idle logic for workers (fix #8479) (#8511) ([1e05548](https://github.com/vitejs/vite/commit/1e05548)), closes [#8479](https://github.com/vitejs/vite/issues/8479) [#8511](https://github.com/vitejs/vite/issues/8511)
 * fix: not match \n when injecting esbuild helpers (#8414) ([5a57626](https://github.com/vitejs/vite/commit/5a57626)), closes [#8414](https://github.com/vitejs/vite/issues/8414)
-* fix: remove empty chunk css imports when using esnext (#8345) ([b3d9652](https://github.com/vitejs/vite/commit/b3d9652)), closes [#8345](https://github.com/vitejs/vite/issues/8345)
 * fix: respect optimize deps entries (#8489) ([fba82d0](https://github.com/vitejs/vite/commit/fba82d0)), closes [#8489](https://github.com/vitejs/vite/issues/8489)
-* fix: respect server.headers in static middlewares (#8481) ([408e5a7](https://github.com/vitejs/vite/commit/408e5a7)), closes [#8481](https://github.com/vitejs/vite/issues/8481)
-* fix(dev): avoid FOUC when swapping out link tag (fix #7973) (#8495) ([0e5c009](https://github.com/vitejs/vite/commit/0e5c009)), closes [#7973](https://github.com/vitejs/vite/issues/7973) [#8495](https://github.com/vitejs/vite/issues/8495)
 * fix(optimizer): encode `_` and `.` in different way (#8508) ([9065b37](https://github.com/vitejs/vite/commit/9065b37)), closes [#8508](https://github.com/vitejs/vite/issues/8508)
 * fix(optimizer): external require-import conversion (fixes #2492, #3409) (#8459) ([1061bbd](https://github.com/vitejs/vite/commit/1061bbd)), closes [#2492](https://github.com/vitejs/vite/issues/2492) [#3409](https://github.com/vitejs/vite/issues/3409) [#8459](https://github.com/vitejs/vite/issues/8459)
 * feat: better config `__dirname` support (#8442) ([51e9195](https://github.com/vitejs/vite/commit/51e9195)), closes [#8442](https://github.com/vitejs/vite/issues/8442)
@@ -91,11 +88,9 @@
 
 * fix: correctly replace process.env.NODE_ENV (#8283) ([ec52baa](https://github.com/vitejs/vite/commit/ec52baa)), closes [#8283](https://github.com/vitejs/vite/issues/8283)
 * fix: dev sourcemap (#8269) ([505f75e](https://github.com/vitejs/vite/commit/505f75e)), closes [#8269](https://github.com/vitejs/vite/issues/8269)
-* fix: EPERM error on Windows when processing dependencies (#8235) ([67743a3](https://github.com/vitejs/vite/commit/67743a3)), closes [#8235](https://github.com/vitejs/vite/issues/8235)
 * fix: glob types (#8257) ([03b227e](https://github.com/vitejs/vite/commit/03b227e)), closes [#8257](https://github.com/vitejs/vite/issues/8257)
 * fix: srcset handling in html (#6419) ([a0ee4ff](https://github.com/vitejs/vite/commit/a0ee4ff)), closes [#6419](https://github.com/vitejs/vite/issues/6419)
 * fix: support set NODE_ENV in scripts when custom mode option (#8218) ([adcf041](https://github.com/vitejs/vite/commit/adcf041)), closes [#8218](https://github.com/vitejs/vite/issues/8218)
-* fix(css): remove `?used` hack (fixes #6421, #8245) (#8278) ([0b25cc1](https://github.com/vitejs/vite/commit/0b25cc1)), closes [#6421](https://github.com/vitejs/vite/issues/6421) [#8245](https://github.com/vitejs/vite/issues/8245) [#8278](https://github.com/vitejs/vite/issues/8278)
 * fix(hmr): catch thrown errors when connecting to hmr websocket (#7111) ([4bc9284](https://github.com/vitejs/vite/commit/4bc9284)), closes [#7111](https://github.com/vitejs/vite/issues/7111)
 * fix(plugin-legacy): respect `entryFileNames` for polyfill chunks (#8247) ([baa9632](https://github.com/vitejs/vite/commit/baa9632)), closes [#8247](https://github.com/vitejs/vite/issues/8247)
 * fix(plugin-react): broken optimized deps dir check (#8255) ([9e2a1ea](https://github.com/vitejs/vite/commit/9e2a1ea)), closes [#8255](https://github.com/vitejs/vite/issues/8255)
@@ -128,9 +123,7 @@
 
 * feat: allow any JS identifier in define, not ASCII-only (#5972) ([95eb45b](https://github.com/vitejs/vite/commit/95eb45b)), closes [#5972](https://github.com/vitejs/vite/issues/5972)
 * feat: enable `generatedCode: 'es2015'` for rollup build (#5018) ([46d5e67](https://github.com/vitejs/vite/commit/46d5e67)), closes [#5018](https://github.com/vitejs/vite/issues/5018)
-* feat: new hook `configurePreviewServer` (#7658) ([20ea999](https://github.com/vitejs/vite/commit/20ea999)), closes [#7658](https://github.com/vitejs/vite/issues/7658)
 * feat: rework `dynamic-import-vars` (#7756) ([80d113b](https://github.com/vitejs/vite/commit/80d113b)), closes [#7756](https://github.com/vitejs/vite/issues/7756)
-* feat: treat Astro file scripts as TS (#8151) ([559c952](https://github.com/vitejs/vite/commit/559c952)), closes [#8151](https://github.com/vitejs/vite/issues/8151)
 * feat: worker emit fileName with config (#7804) ([04c2edd](https://github.com/vitejs/vite/commit/04c2edd)), closes [#7804](https://github.com/vitejs/vite/issues/7804)
 * feat(glob-import): support `{ import: '*' }` (#8071) ([0b78b2a](https://github.com/vitejs/vite/commit/0b78b2a)), closes [#8071](https://github.com/vitejs/vite/issues/8071)
 * fix: add hash to lib chunk names (#7190) ([c81cedf](https://github.com/vitejs/vite/commit/c81cedf)), closes [#7190](https://github.com/vitejs/vite/issues/7190)
@@ -168,7 +161,6 @@
 * chore: using Unicode instead of unicode in doc and tests (#6852) ([c2bf62b](https://github.com/vitejs/vite/commit/c2bf62b)), closes [#6852](https://github.com/vitejs/vite/issues/6852)
 * chore(deps): update tsconfck to 2.0.0 built for node14+ (#8144) ([0513d13](https://github.com/vitejs/vite/commit/0513d13)), closes [#8144](https://github.com/vitejs/vite/issues/8144)
 * chore(deps): use `esno` to replace `ts-node` (#8152) ([2363bd3](https://github.com/vitejs/vite/commit/2363bd3)), closes [#8152](https://github.com/vitejs/vite/issues/8152)
-* chore(lint): sort for imports (#8113) ([43a58dd](https://github.com/vitejs/vite/commit/43a58dd)), closes [#8113](https://github.com/vitejs/vite/issues/8113)
 * build!: remove node v12 support (#7833) ([eeac2d2](https://github.com/vitejs/vite/commit/eeac2d2)), closes [#7833](https://github.com/vitejs/vite/issues/7833)
 * feat!: rework `import.meta.glob` (#7537) ([330e0a9](https://github.com/vitejs/vite/commit/330e0a9)), closes [#7537](https://github.com/vitejs/vite/issues/7537)
 * feat!: vite dev default port is now 5173 (#8148) ([1cc2e2d](https://github.com/vitejs/vite/commit/1cc2e2d)), closes [#8148](https://github.com/vitejs/vite/issues/8148)
@@ -180,6 +172,30 @@
 
 
 
+## <small>2.9.12 (2022-06-10)</small>
+
+* fix: outdated optimized dep removed from module graph (#8534) ([c0d6c60](https://github.com/vitejs/vite/commit/c0d6c60)), closes [#8534](https://github.com/vitejs/vite/issues/8534)
+
+
+
+## <small>2.9.11 (2022-06-10)</small>
+
+* fix: respect server.headers in static middlewares (#8481) ([ab7dc1c](https://github.com/vitejs/vite/commit/ab7dc1c)), closes [#8481](https://github.com/vitejs/vite/issues/8481)
+* fix(dev): avoid FOUC when swapping out link tag (fix #7973) (#8495) ([01fa807](https://github.com/vitejs/vite/commit/01fa807)), closes [#7973](https://github.com/vitejs/vite/issues/7973) [#8495](https://github.com/vitejs/vite/issues/8495)
+
+
+
+## <small>2.9.10 (2022-06-06)</small>
+
+* feat: treat Astro file scripts as TS (#8151) ([9fdd0a3](https://github.com/vitejs/vite/commit/9fdd0a3)), closes [#8151](https://github.com/vitejs/vite/issues/8151)
+* feat: new hook `configurePreviewServer` (#7658) (#8437) ([7b972bc](https://github.com/vitejs/vite/commit/7b972bc)), closes [#7658](https://github.com/vitejs/vite/issues/7658) [#8437](https://github.com/vitejs/vite/issues/8437)
+* fix: remove empty chunk css imports when using esnext (#8345) ([9fbc1a9](https://github.com/vitejs/vite/commit/9fbc1a9)), closes [#8345](https://github.com/vitejs/vite/issues/8345)
+* fix: EPERM error on Windows when processing dependencies (#8235) ([dfe4307](https://github.com/vitejs/vite/commit/dfe4307)), closes [#8235](https://github.com/vitejs/vite/issues/8235)
+* fix(css): remove `?used` hack (fixes #6421, #8245) (#8278) (#8471) ([8d7bac4](https://github.com/vitejs/vite/commit/8d7bac4)), closes [#6421](https://github.com/vitejs/vite/issues/6421) [#8245](https://github.com/vitejs/vite/issues/8245) [#8278](https://github.com/vitejs/vite/issues/8278) [#8471](https://github.com/vitejs/vite/issues/8471)
+* chore(lint): sort for imports (#8113) ([4bd1531](https://github.com/vitejs/vite/commit/4bd1531)), closes [#8113](https://github.com/vitejs/vite/issues/8113)
+
+
+
 ## <small>2.9.9 (2022-05-11)</small>
 
 * fix: add direct query to html-proxy css (fixes #8091) (#8094) ([a24b5e3](https://github.com/vitejs/vite/commit/a24b5e3)), closes [#8091](https://github.com/vitejs/vite/issues/8091) [#8094](https://github.com/vitejs/vite/issues/8094)

From 8447414c3e7b7d85154b1eb8a3bf041f2888d815 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart.louwers@gmail.com>
Date: Fri, 10 Jun 2022 18:36:47 +0200
Subject: [PATCH 26/72] docs: punctuation typo (#8536)

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

diff --git a/docs/guide/features.md b/docs/guide/features.md
index d58a09e4cbf2cb..57d1e5a71e4a82 100644
--- a/docs/guide/features.md
+++ b/docs/guide/features.md
@@ -34,7 +34,7 @@ Vite only performs transpilation on `.ts` files and does **NOT** perform type ch
 
 Vite uses [esbuild](https://github.com/evanw/esbuild) to transpile TypeScript into JavaScript which is about 20~30x faster than vanilla `tsc`, and HMR updates can reflect in the browser in under 50ms.
 
-Use the [Type-Only Imports and Export](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export) syntax to avoid potential problems like type-only imports being incorrectly bundled. for example:
+Use the [Type-Only Imports and Export](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export) syntax to avoid potential problems like type-only imports being incorrectly bundled, for example:
 
 ```ts
 import type { T } from 'only/types'

From 3a21a5e39b47120e5139269138eae0e2ca2efcd4 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Sat, 11 Jun 2022 17:27:57 +0800
Subject: [PATCH 27/72] feat(create-vite): use framework brand glow color
 (#8539)

---
 packages/create-vite/template-lit-ts/package.json |  4 ++--
 .../create-vite/template-lit-ts/src/my-element.ts | 15 +++++++++------
 packages/create-vite/template-lit/package.json    |  4 ++--
 .../create-vite/template-lit/src/my-element.js    | 15 +++++++++------
 .../create-vite/template-preact-ts/src/app.css    |  3 +++
 .../create-vite/template-preact-ts/src/app.tsx    |  2 +-
 packages/create-vite/template-preact/src/app.css  |  3 +++
 packages/create-vite/template-preact/src/app.jsx  |  2 +-
 .../create-vite/template-react-ts/src/App.css     |  3 +++
 .../create-vite/template-react-ts/src/App.tsx     |  2 +-
 packages/create-vite/template-react/src/App.css   |  3 +++
 packages/create-vite/template-react/src/App.jsx   |  2 +-
 .../create-vite/template-svelte-ts/src/App.svelte | 11 +++++++----
 .../create-vite/template-svelte/src/App.svelte    | 11 +++++++----
 .../create-vite/template-vanilla-ts/src/main.ts   |  8 ++++++--
 .../create-vite/template-vanilla-ts/src/style.css |  3 +++
 packages/create-vite/template-vanilla/main.js     |  8 ++++++--
 packages/create-vite/template-vanilla/style.css   |  3 +++
 packages/create-vite/template-vue-ts/src/App.vue  |  7 +++++--
 packages/create-vite/template-vue/src/App.vue     |  7 +++++--
 20 files changed, 80 insertions(+), 36 deletions(-)

diff --git a/packages/create-vite/template-lit-ts/package.json b/packages/create-vite/template-lit-ts/package.json
index 57358902f93458..b9e56a3b526d9c 100644
--- a/packages/create-vite/template-lit-ts/package.json
+++ b/packages/create-vite/template-lit-ts/package.json
@@ -3,9 +3,9 @@
   "private": true,
   "version": "0.0.0",
   "type": "module",
-  "main": "dist/my-element.es.mjs",
+  "main": "dist/my-element.es.js",
   "exports": {
-    ".": "./dist/my-element.es.mjs"
+    ".": "./dist/my-element.es.js"
   },
   "types": "types/my-element.d.ts",
   "files": [
diff --git a/packages/create-vite/template-lit-ts/src/my-element.ts b/packages/create-vite/template-lit-ts/src/my-element.ts
index fe5707212e5bdd..ba01ce52154a0d 100644
--- a/packages/create-vite/template-lit-ts/src/my-element.ts
+++ b/packages/create-vite/template-lit-ts/src/my-element.ts
@@ -26,12 +26,12 @@ export class MyElement extends LitElement {
   render() {
     return html`
       <div>
-        <a href="https://vitejs.dev" target="_blank"
-          ><img src="${viteLogo}" class="logo" alt="Vite logo"
-        /></a>
-        <a href="https://lit.dev" target="_blank"
-          ><img src=${litLogo} class="logo" alt="Lit logo"
-        /></a>
+        <a href="https://vitejs.dev" target="_blank">
+          <img src="${viteLogo}" class="logo" alt="Vite logo" />
+        </a>
+        <a href="https://lit.dev" target="_blank">
+          <img src=${litLogo} class="logo lit" alt="Lit logo" />
+        </a>
       </div>
       <slot></slot>
       <div class="card">
@@ -63,6 +63,9 @@ export class MyElement extends LitElement {
     .logo:hover {
       filter: drop-shadow(0 0 2em #646cffaa);
     }
+    .logo.lit:hover {
+      filter: drop-shadow(0 0 2em #325cffaa);
+    }
 
     .card {
       padding: 2em;
diff --git a/packages/create-vite/template-lit/package.json b/packages/create-vite/template-lit/package.json
index 0ef4af046dfa8d..4eafb31f76de30 100644
--- a/packages/create-vite/template-lit/package.json
+++ b/packages/create-vite/template-lit/package.json
@@ -3,9 +3,9 @@
   "private": true,
   "version": "0.0.0",
   "type": "module",
-  "main": "dist/my-element.es.mjs",
+  "main": "dist/my-element.es.js",
   "exports": {
-    ".": "./dist/my-element.es.mjs"
+    ".": "./dist/my-element.es.js"
   },
   "files": [
     "dist"
diff --git a/packages/create-vite/template-lit/src/my-element.js b/packages/create-vite/template-lit/src/my-element.js
index f5ea09b7d1ea22..74fde11f608122 100644
--- a/packages/create-vite/template-lit/src/my-element.js
+++ b/packages/create-vite/template-lit/src/my-element.js
@@ -32,12 +32,12 @@ export class MyElement extends LitElement {
   render() {
     return html`
       <div>
-        <a href="https://vitejs.dev" target="_blank"
-          ><img src="${viteLogo}" class="logo" alt="Vite logo"
-        /></a>
-        <a href="https://lit.dev" target="_blank"
-          ><img src=${litLogo} class="logo" alt="Lit logo"
-        /></a>
+        <a href="https://vitejs.dev" target="_blank">
+          <img src="${viteLogo}" class="logo" alt="Vite logo" />
+        </a>
+        <a href="https://lit.dev" target="_blank">
+          <img src=${litLogo} class="logo lit" alt="Lit logo" />
+        </a>
       </div>
       <slot></slot>
       <div class="card">
@@ -70,6 +70,9 @@ export class MyElement extends LitElement {
       .logo:hover {
         filter: drop-shadow(0 0 2em #646cffaa);
       }
+      .logo.lit:hover {
+        filter: drop-shadow(0 0 2em #325cffaa);
+      }
 
       .card {
         padding: 2em;
diff --git a/packages/create-vite/template-preact-ts/src/app.css b/packages/create-vite/template-preact-ts/src/app.css
index 9e9f9c9c6884c9..088ed3ace55196 100644
--- a/packages/create-vite/template-preact-ts/src/app.css
+++ b/packages/create-vite/template-preact-ts/src/app.css
@@ -12,6 +12,9 @@
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
 }
+.logo.preact:hover {
+  filter: drop-shadow(0 0 2em #673ab8aa);
+}
 
 .card {
   padding: 2em;
diff --git a/packages/create-vite/template-preact-ts/src/app.tsx b/packages/create-vite/template-preact-ts/src/app.tsx
index db652c2630f10b..13cf0b1b01f2fc 100644
--- a/packages/create-vite/template-preact-ts/src/app.tsx
+++ b/packages/create-vite/template-preact-ts/src/app.tsx
@@ -13,7 +13,7 @@ export function App() {
           <img src={viteLogo} class="logo" alt="Vite logo" />
         </a>
         <a href="https://preactjs.com" target="_blank">
-          <img src={preactLogo} class="logo" alt="Preact logo" />
+          <img src={preactLogo} class="logo preact" alt="Preact logo" />
         </a>
       </div>
       <h1>Vite + Preact</h1>
diff --git a/packages/create-vite/template-preact/src/app.css b/packages/create-vite/template-preact/src/app.css
index 9e9f9c9c6884c9..088ed3ace55196 100644
--- a/packages/create-vite/template-preact/src/app.css
+++ b/packages/create-vite/template-preact/src/app.css
@@ -12,6 +12,9 @@
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
 }
+.logo.preact:hover {
+  filter: drop-shadow(0 0 2em #673ab8aa);
+}
 
 .card {
   padding: 2em;
diff --git a/packages/create-vite/template-preact/src/app.jsx b/packages/create-vite/template-preact/src/app.jsx
index c2ce201061e5bd..717cc480198df8 100644
--- a/packages/create-vite/template-preact/src/app.jsx
+++ b/packages/create-vite/template-preact/src/app.jsx
@@ -13,7 +13,7 @@ export function App() {
           <img src={viteLogo} class="logo" alt="Vite logo" />
         </a>
         <a href="https://preactjs.com" target="_blank">
-          <img src={preactLogo} class="logo" alt="Preact logo" />
+          <img src={preactLogo} class="logo preact" alt="Preact logo" />
         </a>
       </div>
       <h1>Vite + Preact</h1>
diff --git a/packages/create-vite/template-react-ts/src/App.css b/packages/create-vite/template-react-ts/src/App.css
index 514d6bff3fbc88..2c5e2ef5cd1a2e 100644
--- a/packages/create-vite/template-react-ts/src/App.css
+++ b/packages/create-vite/template-react-ts/src/App.css
@@ -13,6 +13,9 @@
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
 }
+.logo.react:hover {
+  filter: drop-shadow(0 0 2em #61dafbaa);
+}
 
 @keyframes logo-spin {
   from {
diff --git a/packages/create-vite/template-react-ts/src/App.tsx b/packages/create-vite/template-react-ts/src/App.tsx
index 8cfb82d3fbf3c2..dfe8ceddf40982 100644
--- a/packages/create-vite/template-react-ts/src/App.tsx
+++ b/packages/create-vite/template-react-ts/src/App.tsx
@@ -13,7 +13,7 @@ function App() {
           <img src={viteLogo} className="logo" alt="Vite logo" />
         </a>
         <a href="https://reactjs.org" target="_blank">
-          <img src={reactLogo} className="logo" alt="React logo" />
+          <img src={reactLogo} className="logo react" alt="React logo" />
         </a>
       </div>
       <h1>Vite + React</h1>
diff --git a/packages/create-vite/template-react/src/App.css b/packages/create-vite/template-react/src/App.css
index 514d6bff3fbc88..2c5e2ef5cd1a2e 100644
--- a/packages/create-vite/template-react/src/App.css
+++ b/packages/create-vite/template-react/src/App.css
@@ -13,6 +13,9 @@
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
 }
+.logo.react:hover {
+  filter: drop-shadow(0 0 2em #61dafbaa);
+}
 
 @keyframes logo-spin {
   from {
diff --git a/packages/create-vite/template-react/src/App.jsx b/packages/create-vite/template-react/src/App.jsx
index 78ced9c794224d..14be1971f75675 100644
--- a/packages/create-vite/template-react/src/App.jsx
+++ b/packages/create-vite/template-react/src/App.jsx
@@ -13,7 +13,7 @@ function App() {
           <img src={viteLogo} className="logo" alt="Vite logo" />
         </a>
         <a href="https://reactjs.org" target="_blank">
-          <img src={reactLogo} className="logo" alt="React logo" />
+          <img src={reactLogo} className="logo react" alt="React logo" />
         </a>
       </div>
       <h1>Vite + React</h1>
diff --git a/packages/create-vite/template-svelte-ts/src/App.svelte b/packages/create-vite/template-svelte-ts/src/App.svelte
index dcc7939896dd46..480e1d072d5a2e 100644
--- a/packages/create-vite/template-svelte-ts/src/App.svelte
+++ b/packages/create-vite/template-svelte-ts/src/App.svelte
@@ -7,10 +7,10 @@
 <main>
   <div>
     <a href="https://vitejs.dev" target="_blank"> 
-      <img src={viteLogo} alt="Vite Logo" />
+      <img src={viteLogo} class="logo" alt="Vite Logo" />
     </a>
     <a href="https://svelte.dev" target="_blank"> 
-      <img src={svelteLogo} alt="Svelte Logo" />
+      <img src={svelteLogo} class="logo svelte" alt="Svelte Logo" />
     </a>
   </div>
   <h1>Vite + Svelte</h1>
@@ -29,14 +29,17 @@
 </main>
 
 <style>
-  img {
+  .logo {
     height: 6em;
     padding: 1.5em;
     will-change: filter;
   }
-  img:hover {
+  .logo:hover {
     filter: drop-shadow(0 0 2em #646cffaa);
   }
+  .logo.svelte:hover {
+    filter: drop-shadow(0 0 2em #ff3e00aa);
+  }
   .read-the-docs {
     color: #888;
   }
diff --git a/packages/create-vite/template-svelte/src/App.svelte b/packages/create-vite/template-svelte/src/App.svelte
index 415b6429ae04a8..b2eb01b52ac2de 100644
--- a/packages/create-vite/template-svelte/src/App.svelte
+++ b/packages/create-vite/template-svelte/src/App.svelte
@@ -7,10 +7,10 @@
 <main>
   <div>
     <a href="https://vitejs.dev" target="_blank"> 
-      <img src={viteLogo} alt="Vite Logo" />
+      <img src={viteLogo} class="logo" alt="Vite Logo" />
     </a>
     <a href="https://svelte.dev" target="_blank"> 
-      <img src={svelteLogo} alt="Svelte Logo" />
+      <img src={svelteLogo} class="logo svelte" alt="Svelte Logo" />
     </a>
   </div>
   <h1>Vite + Svelte</h1>
@@ -29,14 +29,17 @@
 </main>
 
 <style>
-  img {
+  .logo {
     height: 6em;
     padding: 1.5em;
     will-change: filter;
   }
-  img:hover {
+  .logo:hover {
     filter: drop-shadow(0 0 2em #646cffaa);
   }
+  .logo.svelte:hover {
+    filter: drop-shadow(0 0 2em #ff3e00aa);
+  }
   .read-the-docs {
     color: #888;
   }
diff --git a/packages/create-vite/template-vanilla-ts/src/main.ts b/packages/create-vite/template-vanilla-ts/src/main.ts
index 8dd51bd53cd550..b4a91405cdee25 100644
--- a/packages/create-vite/template-vanilla-ts/src/main.ts
+++ b/packages/create-vite/template-vanilla-ts/src/main.ts
@@ -5,8 +5,12 @@ import { setupCounter } from './counter'
 
 document.querySelector<HTMLDivElement>('#app')!.innerHTML = `
   <div>
-    <a href="https://vitejs.dev" target="_blank"><img class="logo" alt="Vite logo" src="${viteLogo}" /></a>
-    <a href="https://www.typescriptlang.org/" target="_blank"><img class="logo" alt="TypeScript logo" src="${typescriptLogo}" /></a>
+    <a href="https://vitejs.dev" target="_blank">
+      <img src="${viteLogo}" class="logo" alt="Vite logo" />
+    </a>
+    <a href="https://www.typescriptlang.org/" target="_blank">
+      <img src="${typescriptLogo}" class="logo vanilla" alt="TypeScript logo" />
+    </a>
     <h1>Vite + TypeScript</h1>
     <div class="card">
       <button id="counter" type="button"></button>
diff --git a/packages/create-vite/template-vanilla-ts/src/style.css b/packages/create-vite/template-vanilla-ts/src/style.css
index bbba76e52c2fdd..12320801d3635d 100644
--- a/packages/create-vite/template-vanilla-ts/src/style.css
+++ b/packages/create-vite/template-vanilla-ts/src/style.css
@@ -52,6 +52,9 @@ h1 {
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
 }
+.logo.vanilla:hover {
+  filter: drop-shadow(0 0 2em #f7df1eaa);
+}
 
 .card {
   padding: 2em;
diff --git a/packages/create-vite/template-vanilla/main.js b/packages/create-vite/template-vanilla/main.js
index 35c67ecd6283eb..bbdb9004d5f3d8 100644
--- a/packages/create-vite/template-vanilla/main.js
+++ b/packages/create-vite/template-vanilla/main.js
@@ -5,8 +5,12 @@ import { setupCounter } from './counter.js'
 
 document.querySelector('#app').innerHTML = `
   <div>
-    <a href="https://vitejs.dev" target="_blank"><img class="logo" alt="Vite logo" src="${viteLogo}" /></a>
-    <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript" target="_blank"><img class="logo" alt="JavaScript logo" src="${javascriptLogo}" /></a>
+    <a href="https://vitejs.dev" target="_blank">
+      <img src="${viteLogo}" class="logo" alt="Vite logo" />
+    </a>
+    <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript" target="_blank">
+      <img src="${javascriptLogo}" class="logo vanilla" alt="JavaScript logo" />
+    </a>
     <h1>Hello Vite!</h1>
     <div class="card">
       <button id="counter" type="button"></button>
diff --git a/packages/create-vite/template-vanilla/style.css b/packages/create-vite/template-vanilla/style.css
index bbba76e52c2fdd..12320801d3635d 100644
--- a/packages/create-vite/template-vanilla/style.css
+++ b/packages/create-vite/template-vanilla/style.css
@@ -52,6 +52,9 @@ h1 {
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
 }
+.logo.vanilla:hover {
+  filter: drop-shadow(0 0 2em #f7df1eaa);
+}
 
 .card {
   padding: 2em;
diff --git a/packages/create-vite/template-vue-ts/src/App.vue b/packages/create-vite/template-vue-ts/src/App.vue
index adce760c87dfdf..76ebf08602f448 100644
--- a/packages/create-vite/template-vue-ts/src/App.vue
+++ b/packages/create-vite/template-vue-ts/src/App.vue
@@ -7,10 +7,10 @@ import HelloWorld from './components/HelloWorld.vue'
 <template>
   <div>
     <a href="https://vitejs.dev" target="_blank">
-      <img class="logo" alt="Vite logo" src="/vite.svg" />
+      <img src="/vite.svg" class="logo" alt="Vite logo" />
     </a>
     <a href="https://vuejs.org/" target="_blank">
-      <img class="logo" alt="Vue logo" src="./assets/vue.svg" />
+      <img src="./assets/vue.svg" class="logo vue" alt="Vue logo" />
     </a>
   </div>
   <HelloWorld msg="Vite + Vue" />
@@ -25,4 +25,7 @@ import HelloWorld from './components/HelloWorld.vue'
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
 }
+.logo.vue:hover {
+  filter: drop-shadow(0 0 2em #42b883aa);
+}
 </style>
diff --git a/packages/create-vite/template-vue/src/App.vue b/packages/create-vite/template-vue/src/App.vue
index 417581c657f3e6..6febdb7581ea83 100644
--- a/packages/create-vite/template-vue/src/App.vue
+++ b/packages/create-vite/template-vue/src/App.vue
@@ -7,10 +7,10 @@ import HelloWorld from './components/HelloWorld.vue'
 <template>
   <div>
     <a href="https://vitejs.dev" target="_blank">
-      <img class="logo" alt="Vite logo" src="/vite.svg" />
+      <img src="/vite.svg" class="logo" alt="Vite logo" />
     </a>
     <a href="https://vuejs.org/" target="_blank">
-      <img class="logo" alt="Vue logo" src="./assets/vue.svg" />
+      <img src="./assets/vue.svg" class="logo vue" alt="Vue logo" />
     </a>
   </div>
   <HelloWorld msg="Vite + Vue" />
@@ -25,4 +25,7 @@ import HelloWorld from './components/HelloWorld.vue'
 .logo:hover {
   filter: drop-shadow(0 0 2em #646cffaa);
 }
+.logo.vue:hover {
+  filter: drop-shadow(0 0 2em #42b883aa);
+}
 </style>

From 3d8f52f7d468ca72f24388b550dc70edc7c30c9d Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Sat, 11 Jun 2022 12:20:53 +0200
Subject: [PATCH 28/72] test: fix style link after HMR (#8538)

---
 .../backend-integration/__tests__/backend-integration.spec.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playground/backend-integration/__tests__/backend-integration.spec.ts b/playground/backend-integration/__tests__/backend-integration.spec.ts
index e8059c7d20f13c..314ccfb0582680 100644
--- a/playground/backend-integration/__tests__/backend-integration.spec.ts
+++ b/playground/backend-integration/__tests__/backend-integration.spec.ts
@@ -52,7 +52,7 @@ describe.runIf(isServe)('serve', () => {
     await untilUpdated(() => getColor('body'), 'red') // successful HMR
 
     // Verify that the base (/dev/) was added during the css-update
-    const link = await page.$('link[rel="stylesheet"]')
+    const link = await page.$('link[rel="stylesheet"]:last-of-type')
     expect(await link.getAttribute('href')).toContain('/dev/global.css?t=')
   })
 

From 63b523a78bef7cc6552cebf8a88dfc88f8559669 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Sun, 12 Jun 2022 03:15:11 +0800
Subject: [PATCH 29/72] chore: refactor interop named imports (#8544)

---
 .../vite/src/node/plugins/importAnalysis.ts   |  4 +--
 .../src/node/plugins/importAnalysisBuild.ts   | 28 ++-----------------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
index 023740efc33b0b..b4f5fbfa442407 100644
--- a/packages/vite/src/node/plugins/importAnalysis.ts
+++ b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -638,12 +638,12 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
   }
 }
 
-function interopNamedImports(
+export function interopNamedImports(
   str: MagicString,
   importSpecifier: ImportSpecifier,
   rewrittenUrl: string,
   importIndex: number
-) {
+): void {
   const source = str.original
   const {
     s: start,
diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts
index 9de2e066624e2a..0895bf5cb8f8a4 100644
--- a/packages/vite/src/node/plugins/importAnalysisBuild.ts
+++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts
@@ -19,7 +19,7 @@ import type { ResolvedConfig } from '../config'
 import { genSourceMapUrl } from '../server/sourcemap'
 import { getDepsOptimizer, optimizedDepNeedsInterop } from '../optimizer'
 import { removedPureCssFilesCache } from './css'
-import { transformCjsImport } from './importAnalysis'
+import { interopNamedImports } from './importAnalysis'
 
 /**
  * A flag for injected helpers. This flag will be set to `false` if the output
@@ -283,31 +283,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
                 }
               } else if (needsInterop) {
                 // config.logger.info(`${url} needs interop`)
-                if (isDynamicImport) {
-                  // rewrite `import('package')` to expose the default directly
-                  str().overwrite(
-                    expStart,
-                    expEnd,
-                    `import('${file}').then(m => m.default && m.default.__esModule ? m.default : ({ ...m.default, default: m.default }))`,
-                    { contentOnly: true }
-                  )
-                } else {
-                  const exp = source.slice(expStart, expEnd)
-                  const rewritten = transformCjsImport(
-                    exp,
-                    file,
-                    specifier,
-                    index
-                  )
-                  if (rewritten) {
-                    str().overwrite(expStart, expEnd, rewritten, {
-                      contentOnly: true
-                    })
-                  } else {
-                    // #1439 export * from '...'
-                    str().overwrite(start, end, file, { contentOnly: true })
-                  }
-                }
+                interopNamedImports(str(), imports[index], url, index)
                 rewriteDone = true
               }
               if (!rewriteDone) {

From d6418605577319b2f92ea37081e34376bb47b286 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Sun, 12 Jun 2022 03:17:03 +0800
Subject: [PATCH 30/72] chore: remove unused timestamp option (#8545)

---
 packages/vite/src/node/optimizer/optimizer.ts | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/packages/vite/src/node/optimizer/optimizer.ts b/packages/vite/src/node/optimizer/optimizer.ts
index a75eb9090aa109..5dbccae6a73db3 100644
--- a/packages/vite/src/node/optimizer/optimizer.ts
+++ b/packages/vite/src/node/optimizer/optimizer.ts
@@ -135,9 +135,7 @@ export async function initDepsOptimizer(
 
       setTimeout(async () => {
         try {
-          debug(colors.green(`scanning for dependencies...`), {
-            timestamp: true
-          })
+          debug(colors.green(`scanning for dependencies...`))
 
           const { metadata } = depsOptimizer
 
@@ -157,10 +155,7 @@ export async function initDepsOptimizer(
           debug(
             colors.green(
               `dependencies found: ${depsLogString(Object.keys(discovered))}`
-            ),
-            {
-              timestamp: true
-            }
+            )
           )
 
           scanPhaseProcessing.resolve()
@@ -325,9 +320,7 @@ export async function initDepsOptimizer(
             logNewlyDiscoveredDeps()
           }, 2 * debounceMs)
         } else {
-          debug(colors.green(`✨ optimized dependencies unchanged`), {
-            timestamp: true
-          })
+          debug(colors.green(`✨ optimized dependencies unchanged`))
         }
       } else {
         if (newDepsDiscovered) {
@@ -340,10 +333,7 @@ export async function initDepsOptimizer(
           debug(
             colors.green(
               `✨ delaying reload as new dependencies have been found...`
-            ),
-            {
-              timestamp: true
-            }
+            )
           )
         } else {
           await commitProcessing()
@@ -412,9 +402,7 @@ export async function initDepsOptimizer(
     // optimizeDeps processing is finished
     const deps = Object.keys(depsOptimizer.metadata.discovered)
     const depsString = depsLogString(deps)
-    debug(colors.green(`new dependencies found: ${depsString}`), {
-      timestamp: true
-    })
+    debug(colors.green(`new dependencies found: ${depsString}`))
     runOptimizer()
   }
 

From f09299ce13b55d51456985b96d4c3b3a1f131acb Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Sun, 12 Jun 2022 20:11:29 +0800
Subject: [PATCH 31/72] fix(plugin-react): apply manual runtime interop (#8546)

---
 packages/plugin-react/package.json      |  3 +-
 packages/plugin-react/src/index.ts      | 55 +++++++++++++++----------
 playground/react/App.jsx                |  2 +
 playground/react/jsx-entry/Button.jsx   |  5 +++
 playground/react/jsx-entry/package.json |  6 +++
 playground/react/package.json           |  1 +
 playground/react/vite.config.ts         |  1 +
 pnpm-lock.yaml                          | 13 +++++-
 8 files changed, 61 insertions(+), 25 deletions(-)
 create mode 100644 playground/react/jsx-entry/Button.jsx
 create mode 100644 playground/react/jsx-entry/package.json

diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json
index 25ab4a39d72044..4e4e0173630c21 100644
--- a/packages/plugin-react/package.json
+++ b/packages/plugin-react/package.json
@@ -45,8 +45,7 @@
     "@babel/plugin-transform-react-jsx-self": "^7.17.12",
     "@babel/plugin-transform-react-jsx-source": "^7.16.7",
     "@rollup/pluginutils": "^4.2.1",
-    "react-refresh": "^0.13.0",
-    "resolve": "^1.22.0"
+    "react-refresh": "^0.13.0"
   },
   "peerDependencies": {
     "vite": "^3.0.0-alpha"
diff --git a/packages/plugin-react/src/index.ts b/packages/plugin-react/src/index.ts
index 763534ca2ef182..4f3f745096fb36 100644
--- a/packages/plugin-react/src/index.ts
+++ b/packages/plugin-react/src/index.ts
@@ -361,7 +361,10 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
     }
   }
 
-  // const runtimeId = 'react/jsx-runtime'
+  const reactJsxRuntimeId = 'react/jsx-runtime'
+  const reactJsxDevRuntimeId = 'react/jsx-dev-runtime'
+  const virtualReactJsxRuntimeId = '\0' + reactJsxRuntimeId
+  const virtualReactJsxDevRuntimeId = '\0' + reactJsxDevRuntimeId
   // Adapted from https://github.com/alloc/vite-react-jsx
   const viteReactJsx: Plugin = {
     name: 'vite:react-jsx',
@@ -369,32 +372,42 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
     config() {
       return {
         optimizeDeps: {
-          include: ['react/jsx-dev-runtime']
+          include: [reactJsxRuntimeId, reactJsxDevRuntimeId]
         }
       }
-    }
-    // TODO: this optimization may not be necesary and it is breacking esbuild+rollup compat,
-    // see https://github.com/vitejs/vite/pull/7246#discussion_r861552185
-    // We could still do the same trick and resolve to the optimized dependency here
-    /*
-    resolveId(id: string) {
-      return id === runtimeId ? id : null
     },
-    load(id: string) {
-      if (id === runtimeId) {
-        const runtimePath = resolve.sync(runtimeId, {
-          basedir: projectRoot
-        })
-        const exports = ['jsx', 'jsxs', 'Fragment']
+    resolveId(id, importer) {
+      // Resolve runtime to a virtual path to be interoped.
+      // Since the interop code re-imports `id`, we need to prevent re-resolving
+      // to the virtual id if the importer is already the virtual id.
+      if (id === reactJsxRuntimeId && importer !== virtualReactJsxRuntimeId) {
+        return virtualReactJsxRuntimeId
+      }
+      if (
+        id === reactJsxDevRuntimeId &&
+        importer !== virtualReactJsxDevRuntimeId
+      ) {
+        return virtualReactJsxDevRuntimeId
+      }
+    },
+    load(id) {
+      // Apply manual interop
+      if (id === virtualReactJsxRuntimeId) {
         return [
-          `import * as jsxRuntime from ${JSON.stringify(runtimePath)}`,
-          // We can't use `export * from` or else any callsite that uses
-          // this module will be compiled to `jsxRuntime.exports.jsx`
-          // instead of the more concise `jsx` alias.
-          ...exports.map((name) => `export const ${name} = jsxRuntime.${name}`)
+          `import * as jsxRuntime from ${JSON.stringify(reactJsxRuntimeId)}`,
+          `export const Fragment = jsxRuntime.Fragment`,
+          `export const jsx = jsxRuntime.jsx`,
+          `export const jsxs = jsxRuntime.jsxs`
         ].join('\n')
       }
-    } */
+      if (id === virtualReactJsxDevRuntimeId) {
+        return [
+          `import * as jsxRuntime from ${JSON.stringify(reactJsxDevRuntimeId)}`,
+          `export const Fragment = jsxRuntime.Fragment`,
+          `export const jsxDEV = jsxRuntime.jsxDEV`
+        ].join('\n')
+      }
+    }
   }
 
   return [viteBabel, viteReactRefresh, useAutomaticRuntime && viteReactJsx]
diff --git a/playground/react/App.jsx b/playground/react/App.jsx
index 70d1f961b8cce9..3ec29ba38d893b 100644
--- a/playground/react/App.jsx
+++ b/playground/react/App.jsx
@@ -1,5 +1,6 @@
 import { useState } from 'react'
 import Dummy from './components/Dummy?qs-should-not-break-plugin-react'
+import Button from 'jsx-entry'
 
 function App() {
   const [count, setCount] = useState(0)
@@ -26,6 +27,7 @@ function App() {
       </header>
 
       <Dummy />
+      <Button>button</Button>
     </div>
   )
 }
diff --git a/playground/react/jsx-entry/Button.jsx b/playground/react/jsx-entry/Button.jsx
new file mode 100644
index 00000000000000..4f7f2b91a7dd8b
--- /dev/null
+++ b/playground/react/jsx-entry/Button.jsx
@@ -0,0 +1,5 @@
+const Button = ({ children }) => {
+  return <button>{children}</button>
+}
+
+export default Button
diff --git a/playground/react/jsx-entry/package.json b/playground/react/jsx-entry/package.json
new file mode 100644
index 00000000000000..4bfa33570ce162
--- /dev/null
+++ b/playground/react/jsx-entry/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "jsx-entry",
+  "private": true,
+  "version": "0.0.0",
+  "main": "Button.jsx"
+}
diff --git a/playground/react/package.json b/playground/react/package.json
index 2ae46f1288af28..bd4aed9e79157f 100644
--- a/playground/react/package.json
+++ b/playground/react/package.json
@@ -9,6 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "jsx-entry": "file:./jsx-entry",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
diff --git a/playground/react/vite.config.ts b/playground/react/vite.config.ts
index c6955a131d375f..cd4aaee2d3432c 100644
--- a/playground/react/vite.config.ts
+++ b/playground/react/vite.config.ts
@@ -2,6 +2,7 @@ import react from '@vitejs/plugin-react'
 import type { UserConfig } from 'vite'
 
 const config: UserConfig = {
+  mode: 'development',
   plugins: [react()],
   build: {
     // to make tests faster
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0e072489df63e2..f7ee98f09c7ecc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -164,7 +164,6 @@ importers:
       '@babel/plugin-transform-react-jsx-source': ^7.16.7
       '@rollup/pluginutils': ^4.2.1
       react-refresh: ^0.13.0
-      resolve: ^1.22.0
       vite: workspace:*
     dependencies:
       '@babel/core': 7.18.2
@@ -174,7 +173,6 @@ importers:
       '@babel/plugin-transform-react-jsx-source': 7.16.7_@babel+core@7.18.2
       '@rollup/pluginutils': 4.2.1
       react-refresh: 0.13.0
-      resolve: 1.22.0
     devDependencies:
       vite: link:../vite
 
@@ -720,9 +718,11 @@ importers:
   playground/react:
     specifiers:
       '@vitejs/plugin-react': workspace:*
+      jsx-entry: file:./jsx-entry
       react: ^17.0.2
       react-dom: ^17.0.2
     dependencies:
+      jsx-entry: file:playground/react/jsx-entry
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
     devDependencies:
@@ -747,6 +747,9 @@ importers:
       '@emotion/babel-plugin': 11.9.2
       '@vitejs/plugin-react': link:../../packages/plugin-react
 
+  playground/react/jsx-entry:
+    specifiers: {}
+
   playground/resolve:
     specifiers:
       '@babel/runtime': ^7.18.3
@@ -8962,6 +8965,12 @@ packages:
     version: 0.0.0
     dev: false
 
+  file:playground/react/jsx-entry:
+    resolution: {directory: playground/react/jsx-entry, type: directory}
+    name: jsx-entry
+    version: 0.0.0
+    dev: false
+
   file:playground/ssr-deps/define-properties-exports:
     resolution: {directory: playground/ssr-deps/define-properties-exports, type: directory}
     name: define-properties-exports

From 05b91cd5b5e72b84adea82cbb7cb463a9b17b0c0 Mon Sep 17 00:00:00 2001
From: Alec Larson <1925840+aleclarson@users.noreply.github.com>
Date: Sun, 12 Jun 2022 08:24:07 -0400
Subject: [PATCH 32/72] fix(plugin-react): support import namespace in
 `parseReactAlias` (#5313)

---
 .../src/jsx-runtime/restore-jsx.spec.ts       | 63 ++++++++++++++++++-
 .../src/jsx-runtime/restore-jsx.ts            |  6 +-
 2 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/packages/plugin-react/src/jsx-runtime/restore-jsx.spec.ts b/packages/plugin-react/src/jsx-runtime/restore-jsx.spec.ts
index fcad0f78c3373b..7d5b14bfc9cfd4 100644
--- a/packages/plugin-react/src/jsx-runtime/restore-jsx.spec.ts
+++ b/packages/plugin-react/src/jsx-runtime/restore-jsx.spec.ts
@@ -1,6 +1,67 @@
 import * as babel from '@babel/core'
 import { describe, expect, it } from 'vitest'
-import { restoreJSX } from './restore-jsx'
+import { parseReactAlias, restoreJSX } from './restore-jsx'
+
+describe('parseReactAlias', () => {
+  it('handles cjs require', () => {
+    expect(parseReactAlias(`const React = require("react")`))
+      .toMatchInlineSnapshot(`
+        [
+          "React",
+          true,
+        ]
+      `)
+  })
+
+  it('handles cjs require (minified)', () => {
+    expect(parseReactAlias(`var F=require('foo');var R=require('react')`))
+      .toMatchInlineSnapshot(`
+        [
+          "R",
+          true,
+        ]
+      `)
+  })
+
+  it('does not handle destructured cjs require', () => {
+    expect(parseReactAlias(`var {createElement} = require("react")`))
+      .toMatchInlineSnapshot(`
+        [
+          undefined,
+          false,
+        ]
+      `)
+  })
+
+  it('handles esm import', () => {
+    expect(parseReactAlias(`import React from 'react'`)).toMatchInlineSnapshot(`
+      [
+        "React",
+        false,
+      ]
+    `)
+  })
+
+  it('handles esm import namespace', () => {
+    expect(parseReactAlias(`import * as React from "react"`))
+      .toMatchInlineSnapshot(`
+        [
+          "React",
+          false,
+        ]
+      `)
+  })
+
+  it('does not handle destructured esm import', () => {
+    expect(parseReactAlias(`import {createElement} from "react"`))
+      .toMatchInlineSnapshot(`
+        [
+          undefined,
+          false,
+        ]
+      `)
+  })
+})
 
 async function jsx(sourceCode: string) {
   const [ast] = await restoreJSX(babel, sourceCode, 'test.js')
diff --git a/packages/plugin-react/src/jsx-runtime/restore-jsx.ts b/packages/plugin-react/src/jsx-runtime/restore-jsx.ts
index 4acb6bb64f5e1b..d67a54e8f08aad 100644
--- a/packages/plugin-react/src/jsx-runtime/restore-jsx.ts
+++ b/packages/plugin-react/src/jsx-runtime/restore-jsx.ts
@@ -79,16 +79,16 @@ export async function restoreJSX(
   return [result?.ast, isCommonJS]
 }
 
-function parseReactAlias(
+export function parseReactAlias(
   code: string
 ): [alias: string | undefined, isCommonJS: boolean] {
   let match = code.match(
-    /\b(var|let|const) +(\w+) *= *require\(["']react["']\)/
+    /\b(var|let|const)\s+([^=\{\s]+)\s*=\s*require\(["']react["']\)/
   )
   if (match) {
     return [match[2], true]
   }
-  match = code.match(/^import (\w+).+? from ["']react["']/m)
+  match = code.match(/^import\s+(?:\*\s+as\s+)?(\w+).+?\bfrom\s*["']react["']/m)
   if (match) {
     return [match[1], false]
   }

From 18d74aa145a8b68b94438f5e7c0e2b8bd6d78c93 Mon Sep 17 00:00:00 2001
From: patak-dev <matias.capeletto@gmail.com>
Date: Sun, 12 Jun 2022 14:52:25 +0200
Subject: [PATCH 33/72] release: plugin-react@2.0.0-alpha.3

---
 packages/plugin-react/CHANGELOG.md | 9 +++++++++
 packages/plugin-react/package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/plugin-react/CHANGELOG.md b/packages/plugin-react/CHANGELOG.md
index d5f0d5195e707a..2690d9fb85a4f1 100644
--- a/packages/plugin-react/CHANGELOG.md
+++ b/packages/plugin-react/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 2.0.0-alpha.3 (2022-06-12)
+
+* fix(deps): update all non-major dependencies (#8391) ([842f995](https://github.com/vitejs/vite/commit/842f995)), closes [#8391](https://github.com/vitejs/vite/issues/8391)
+* fix(plugin-react): apply manual runtime interop (#8546) ([f09299c](https://github.com/vitejs/vite/commit/f09299c)), closes [#8546](https://github.com/vitejs/vite/issues/8546)
+* fix(plugin-react): support import namespace in `parseReactAlias` (#5313) ([05b91cd](https://github.com/vitejs/vite/commit/05b91cd)), closes [#5313](https://github.com/vitejs/vite/issues/5313)
+* refactor: remove hooks ssr param support (#8491) ([f59adf8](https://github.com/vitejs/vite/commit/f59adf8)), closes [#8491](https://github.com/vitejs/vite/issues/8491)
+
+
+
 ## 2.0.0-alpha.2 (2022-05-26)
 
 * feat: non-blocking esbuild optimization at build time (#8280) ([909cf9c](https://github.com/vitejs/vite/commit/909cf9c)), closes [#8280](https://github.com/vitejs/vite/issues/8280)
diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json
index 4e4e0173630c21..2dbd0d2890afea 100644
--- a/packages/plugin-react/package.json
+++ b/packages/plugin-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-react",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.3",
   "license": "MIT",
   "author": "Evan You",
   "contributors": [

From c6f43ddd161a3a527f4051785ea04459aef991d5 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Sun, 12 Jun 2022 22:20:29 +0800
Subject: [PATCH 34/72] fix: dont handle sigterm in middleware mode (#8550)

Co-authored-by: patak <matias.capeletto@gmail.com>
---
 packages/vite/src/node/server/index.ts | 32 +++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
index 33565d7390d601..fc66b909a33989 100644
--- a/packages/vite/src/node/server/index.ts
+++ b/packages/vite/src/node/server/index.ts
@@ -299,7 +299,6 @@ export async function createServer(
   const container = await createPluginContainer(config, moduleGraph, watcher)
   const closeHttpServer = createServerCloseFn(httpServer)
 
-  // eslint-disable-next-line prefer-const
   let exitProcess: () => void
 
   const server: ViteDevServer = {
@@ -342,10 +341,11 @@ export async function createServer(
       return startServer(server, port, isRestart)
     },
     async close() {
-      process.off('SIGTERM', exitProcess)
-
-      if (!middlewareMode && process.env.CI !== 'true') {
-        process.stdin.off('end', exitProcess)
+      if (!middlewareMode) {
+        process.off('SIGTERM', exitProcess)
+        if (process.env.CI !== 'true') {
+          process.stdin.off('end', exitProcess)
+        }
       }
 
       await Promise.all([
@@ -382,18 +382,18 @@ export async function createServer(
 
   server.transformIndexHtml = createDevHtmlTransformFn(server)
 
-  exitProcess = async () => {
-    try {
-      await server.close()
-    } finally {
-      process.exit()
+  if (!middlewareMode) {
+    exitProcess = async () => {
+      try {
+        await server.close()
+      } finally {
+        process.exit()
+      }
+    }
+    process.once('SIGTERM', exitProcess)
+    if (process.env.CI !== 'true') {
+      process.stdin.on('end', exitProcess)
     }
-  }
-
-  process.once('SIGTERM', exitProcess)
-
-  if (!middlewareMode && process.env.CI !== 'true') {
-    process.stdin.on('end', exitProcess)
   }
 
   const { packageCache } = config

From 9a1fd4ccf8986dd92b85563e7304b2591f782365 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 Jun 2022 07:26:37 +0200
Subject: [PATCH 35/72] fix(deps): update all non-major dependencies (#8558)

---
 package.json                                  |  18 +-
 .../create-vite/template-lit-ts/package.json  |   2 +-
 .../create-vite/template-lit/package.json     |   2 +-
 .../template-preact-ts/package.json           |   2 +-
 .../create-vite/template-preact/package.json  |   2 +-
 .../template-react-ts/package.json            |   2 +-
 .../create-vite/template-react/package.json   |   2 +-
 .../template-svelte-ts/package.json           |   4 +-
 .../create-vite/template-svelte/package.json  |   4 +-
 .../template-vanilla-ts/package.json          |   2 +-
 .../create-vite/template-vanilla/package.json |   2 +-
 .../create-vite/template-vue-ts/package.json  |   4 +-
 .../create-vite/template-vue/package.json     |   2 +-
 packages/vite/package.json                    |   8 +-
 playground/css-sourcemap/package.json         |   4 +-
 playground/css/package.json                   |   4 +-
 playground/legacy/package.json                |   2 +-
 playground/multiple-entrypoints/package.json  |   2 +-
 playground/preload/package.json               |   4 +-
 playground/react-emotion/package.json         |   4 +-
 playground/ssr-vue/package.json               |   2 +-
 playground/tailwind-sourcemap/package.json    |   2 +-
 playground/tailwind/package.json              |   2 +-
 playground/vue-sourcemap/package.json         |   4 +-
 playground/vue/package.json                   |   4 +-
 pnpm-lock.yaml                                | 402 +++++++++---------
 26 files changed, 253 insertions(+), 239 deletions(-)

diff --git a/package.json b/package.json
index b44e7ddfa99091..5de01da5f99422 100644
--- a/package.json
+++ b/package.json
@@ -35,8 +35,8 @@
   },
   "devDependencies": {
     "@babel/types": "^7.18.4",
-    "@microsoft/api-extractor": "^7.24.2",
-    "@rollup/plugin-typescript": "^8.3.2",
+    "@microsoft/api-extractor": "^7.25.0",
+    "@rollup/plugin-typescript": "^8.3.3",
     "@types/babel__core": "^7.1.19",
     "@types/babel__standalone": "^7.1.4",
     "@types/convert-source-map": "^1.5.2",
@@ -57,26 +57,26 @@
     "@types/semver": "^7.3.9",
     "@types/stylus": "^0.48.38",
     "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.27.0",
-    "@typescript-eslint/parser": "^5.27.0",
+    "@typescript-eslint/eslint-plugin": "^5.27.1",
+    "@typescript-eslint/parser": "^5.27.1",
     "conventional-changelog-cli": "^2.2.2",
     "cross-env": "^7.0.3",
     "esbuild": "^0.14.38",
     "eslint": "^8.17.0",
-    "eslint-define-config": "^1.5.0",
+    "eslint-define-config": "^1.5.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "esno": "^0.16.3",
     "execa": "^5.1.1",
     "fs-extra": "^10.1.0",
     "kill-port": "^1.6.1",
-    "lint-staged": "^13.0.0",
+    "lint-staged": "^13.0.1",
     "minimist": "^1.2.6",
     "node-fetch": "^2.6.7",
     "npm-run-all": "^4.1.5",
     "picocolors": "^1.0.0",
     "playwright-chromium": "^1.22.2",
-    "pnpm": "^7.1.9",
+    "pnpm": "^7.2.1",
     "prettier": "2.6.2",
     "prompts": "^2.4.2",
     "rimraf": "^3.0.2",
@@ -89,7 +89,7 @@
     "unbuild": "^0.7.4",
     "vite": "workspace:*",
     "vitepress": "1.0.0-draft.8",
-    "vitest": "^0.14.1",
+    "vitest": "^0.14.2",
     "vue": "^3.2.37"
   },
   "simple-git-hooks": {
@@ -110,7 +110,7 @@
       "eslint --fix"
     ]
   },
-  "packageManager": "pnpm@7.1.9",
+  "packageManager": "pnpm@7.2.1",
   "pnpm": {
     "overrides": {
       "vite": "workspace:*",
diff --git a/packages/create-vite/template-lit-ts/package.json b/packages/create-vite/template-lit-ts/package.json
index b9e56a3b526d9c..42b05efd7e8a5d 100644
--- a/packages/create-vite/template-lit-ts/package.json
+++ b/packages/create-vite/template-lit-ts/package.json
@@ -21,6 +21,6 @@
   },
   "devDependencies": {
     "typescript": "^4.6.4",
-    "vite": "^2.9.9"
+    "vite": "^2.9.12"
   }
 }
diff --git a/packages/create-vite/template-lit/package.json b/packages/create-vite/template-lit/package.json
index 4eafb31f76de30..5d5ed85a4fc57c 100644
--- a/packages/create-vite/template-lit/package.json
+++ b/packages/create-vite/template-lit/package.json
@@ -18,6 +18,6 @@
     "lit": "^2.2.5"
   },
   "devDependencies": {
-    "vite": "^2.9.9"
+    "vite": "^2.9.12"
   }
 }
diff --git a/packages/create-vite/template-preact-ts/package.json b/packages/create-vite/template-preact-ts/package.json
index 1f3d95c2b2f74e..ff7efa97a7b0ae 100644
--- a/packages/create-vite/template-preact-ts/package.json
+++ b/packages/create-vite/template-preact-ts/package.json
@@ -14,6 +14,6 @@
   "devDependencies": {
     "@preact/preset-vite": "^2.2.0",
     "typescript": "^4.6.4",
-    "vite": "^2.9.9"
+    "vite": "^2.9.12"
   }
 }
diff --git a/packages/create-vite/template-preact/package.json b/packages/create-vite/template-preact/package.json
index a2bcbdbd2aa6da..327f2d0e1dcaa4 100644
--- a/packages/create-vite/template-preact/package.json
+++ b/packages/create-vite/template-preact/package.json
@@ -13,6 +13,6 @@
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.2.0",
-    "vite": "^2.9.9"
+    "vite": "^2.9.12"
   }
 }
diff --git a/packages/create-vite/template-react-ts/package.json b/packages/create-vite/template-react-ts/package.json
index 09683bac609c91..ce427c4eb447a5 100644
--- a/packages/create-vite/template-react-ts/package.json
+++ b/packages/create-vite/template-react-ts/package.json
@@ -17,6 +17,6 @@
     "@types/react-dom": "^18.0.5",
     "@vitejs/plugin-react": "^1.3.2",
     "typescript": "^4.6.4",
-    "vite": "^2.9.9"
+    "vite": "^2.9.12"
   }
 }
diff --git a/packages/create-vite/template-react/package.json b/packages/create-vite/template-react/package.json
index 034891165e9d92..e49194201425da 100644
--- a/packages/create-vite/template-react/package.json
+++ b/packages/create-vite/template-react/package.json
@@ -16,6 +16,6 @@
     "@types/react": "^18.0.12",
     "@types/react-dom": "^18.0.5",
     "@vitejs/plugin-react": "^1.3.2",
-    "vite": "^2.9.9"
+    "vite": "^2.9.12"
   }
 }
diff --git a/packages/create-vite/template-svelte-ts/package.json b/packages/create-vite/template-svelte-ts/package.json
index cae318abece338..35754a8efcd2e1 100644
--- a/packages/create-vite/template-svelte-ts/package.json
+++ b/packages/create-vite/template-svelte-ts/package.json
@@ -10,13 +10,13 @@
     "check": "svelte-check --tsconfig ./tsconfig.json"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.47",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.49",
     "@tsconfig/svelte": "^3.0.0",
     "svelte": "^3.48.0",
     "svelte-check": "^2.7.2",
     "svelte-preprocess": "^4.10.7",
     "tslib": "^2.4.0",
     "typescript": "^4.6.4",
-    "vite": "^2.9.9"
+    "vite": "^2.9.12"
   }
 }
diff --git a/packages/create-vite/template-svelte/package.json b/packages/create-vite/template-svelte/package.json
index 0f7550c9ac713b..7b4bb4e615b5a7 100644
--- a/packages/create-vite/template-svelte/package.json
+++ b/packages/create-vite/template-svelte/package.json
@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.47",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.49",
     "svelte": "^3.48.0",
-    "vite": "^2.9.9"
+    "vite": "^2.9.12"
   }
 }
diff --git a/packages/create-vite/template-vanilla-ts/package.json b/packages/create-vite/template-vanilla-ts/package.json
index ff74d1a70ac3aa..d1df1e67eeb8b6 100644
--- a/packages/create-vite/template-vanilla-ts/package.json
+++ b/packages/create-vite/template-vanilla-ts/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "typescript": "^4.6.4",
-    "vite": "^2.9.9"
+    "vite": "^2.9.12"
   }
 }
diff --git a/packages/create-vite/template-vanilla/package.json b/packages/create-vite/template-vanilla/package.json
index 470ae1e4770149..52837e6d7c0ecc 100644
--- a/packages/create-vite/template-vanilla/package.json
+++ b/packages/create-vite/template-vanilla/package.json
@@ -9,6 +9,6 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "vite": "^2.9.9"
+    "vite": "^2.9.12"
   }
 }
diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json
index ca1cdd385ef710..208f8126f74c7a 100644
--- a/packages/create-vite/template-vue-ts/package.json
+++ b/packages/create-vite/template-vue-ts/package.json
@@ -14,7 +14,7 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "^2.3.3",
     "typescript": "^4.6.4",
-    "vite": "^2.9.9",
-    "vue-tsc": "^0.37.0"
+    "vite": "^2.9.12",
+    "vue-tsc": "^0.37.5"
   }
 }
diff --git a/packages/create-vite/template-vue/package.json b/packages/create-vite/template-vue/package.json
index 9f70700a3a6134..f2f7dee1baaf9d 100644
--- a/packages/create-vite/template-vue/package.json
+++ b/packages/create-vite/template-vue/package.json
@@ -13,6 +13,6 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^2.3.3",
-    "vite": "^2.9.9"
+    "vite": "^2.9.12"
   }
 }
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 5d30d6f3bef105..56087413ae7908 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -75,7 +75,7 @@
     "@rollup/plugin-dynamic-import-vars": "^1.4.3",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",
-    "@rollup/plugin-typescript": "^8.3.2",
+    "@rollup/plugin-typescript": "^8.3.3",
     "@rollup/pluginutils": "^4.2.1",
     "@vue/compiler-dom": "^3.2.37",
     "acorn": "^8.7.1",
@@ -99,7 +99,7 @@
     "launch-editor-middleware": "^2.4.0",
     "magic-string": "^0.26.2",
     "micromatch": "^4.0.5",
-    "mrmime": "^1.0.0",
+    "mrmime": "^1.0.1",
     "node-forge": "^1.3.1",
     "okie": "^1.0.1",
     "open": "^8.4.0",
@@ -109,7 +109,7 @@
     "postcss-load-config": "^3.1.4",
     "postcss-modules": "^4.3.1",
     "resolve.exports": "^1.1.0",
-    "rollup-plugin-license": "^2.8.0",
+    "rollup-plugin-license": "^2.8.1",
     "sirv": "^2.0.2",
     "source-map-js": "^1.0.2",
     "source-map-support": "^0.5.21",
@@ -119,7 +119,7 @@
     "tslib": "^2.4.0",
     "types": "link:./types",
     "ufo": "^0.8.4",
-    "ws": "^8.7.0"
+    "ws": "^8.8.0"
   },
   "peerDependencies": {
     "less": "*",
diff --git a/playground/css-sourcemap/package.json b/playground/css-sourcemap/package.json
index bfa9e5934c1d7a..f7a7d480c8ec22 100644
--- a/playground/css-sourcemap/package.json
+++ b/playground/css-sourcemap/package.json
@@ -9,9 +9,9 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "less": "^4.1.2",
+    "less": "^4.1.3",
     "magic-string": "^0.26.2",
-    "sass": "^1.52.2",
+    "sass": "^1.52.3",
     "stylus": "^0.58.1"
   }
 }
diff --git a/playground/css/package.json b/playground/css/package.json
index 29b1318945a93c..d78baa07c8d752 100644
--- a/playground/css/package.json
+++ b/playground/css/package.json
@@ -11,9 +11,9 @@
   "devDependencies": {
     "css-dep": "link:./css-dep",
     "fast-glob": "^3.2.11",
-    "less": "^4.1.2",
+    "less": "^4.1.3",
     "postcss-nested": "^5.0.6",
-    "sass": "^1.52.2",
+    "sass": "^1.52.3",
     "stylus": "^0.58.1"
   }
 }
diff --git a/playground/legacy/package.json b/playground/legacy/package.json
index 347e410e2bf4d6..7ba9c0e8a47953 100644
--- a/playground/legacy/package.json
+++ b/playground/legacy/package.json
@@ -13,6 +13,6 @@
   "devDependencies": {
     "@vitejs/plugin-legacy": "workspace:*",
     "express": "^4.18.1",
-    "terser": "^5.13.1"
+    "terser": "^5.14.1"
   }
 }
diff --git a/playground/multiple-entrypoints/package.json b/playground/multiple-entrypoints/package.json
index c33ca1e5a099c3..555d5b9021ab2c 100644
--- a/playground/multiple-entrypoints/package.json
+++ b/playground/multiple-entrypoints/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "fast-glob": "^3.2.11",
-    "sass": "^1.52.2"
+    "sass": "^1.52.3"
   }
 }
diff --git a/playground/preload/package.json b/playground/preload/package.json
index cb160b90482524..2b76252c1e04ff 100644
--- a/playground/preload/package.json
+++ b/playground/preload/package.json
@@ -10,10 +10,10 @@
   },
   "dependencies": {
     "vue": "^3.2.37",
-    "vue-router": "^4.0.15"
+    "vue-router": "^4.0.16"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*",
-    "terser": "^5.13.1"
+    "terser": "^5.14.1"
   }
 }
diff --git a/playground/react-emotion/package.json b/playground/react-emotion/package.json
index 7ffa5d454b8151..ee12bf20dbcc00 100644
--- a/playground/react-emotion/package.json
+++ b/playground/react-emotion/package.json
@@ -9,10 +9,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@emotion/react": "^11.9.0",
+    "@emotion/react": "^11.9.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-switch": "^6.0.0"
+    "react-switch": "^6.1.0"
   },
   "devDependencies": {
     "@babel/plugin-proposal-pipeline-operator": "^7.18.2",
diff --git a/playground/ssr-vue/package.json b/playground/ssr-vue/package.json
index 085aa145f399ac..cbd56ca0104571 100644
--- a/playground/ssr-vue/package.json
+++ b/playground/ssr-vue/package.json
@@ -17,7 +17,7 @@
   "dependencies": {
     "example-external-component": "file:example-external-component",
     "vue": "^3.2.37",
-    "vue-router": "^4.0.15",
+    "vue-router": "^4.0.16",
     "vuex": "^4.0.2"
   },
   "devDependencies": {
diff --git a/playground/tailwind-sourcemap/package.json b/playground/tailwind-sourcemap/package.json
index 10c02556713d1c..2ce6ae88d68cf0 100644
--- a/playground/tailwind-sourcemap/package.json
+++ b/playground/tailwind-sourcemap/package.json
@@ -9,6 +9,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "tailwindcss": "^3.0.24"
+    "tailwindcss": "^3.1.2"
   }
 }
diff --git a/playground/tailwind/package.json b/playground/tailwind/package.json
index b67102570f338b..aa87248c0e8c43 100644
--- a/playground/tailwind/package.json
+++ b/playground/tailwind/package.json
@@ -12,7 +12,7 @@
     "autoprefixer": "^10.4.7",
     "tailwindcss": "^2.2.19",
     "vue": "^3.2.37",
-    "vue-router": "^4.0.15"
+    "vue-router": "^4.0.16"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*",
diff --git a/playground/vue-sourcemap/package.json b/playground/vue-sourcemap/package.json
index 40bd2fecc788a0..9530a527f2398d 100644
--- a/playground/vue-sourcemap/package.json
+++ b/playground/vue-sourcemap/package.json
@@ -10,9 +10,9 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*",
-    "less": "^4.1.2",
+    "less": "^4.1.3",
     "postcss-nested": "^5.0.6",
-    "sass": "^1.52.2"
+    "sass": "^1.52.3"
   },
   "dependencies": {
     "vue": "^3.2.37"
diff --git a/playground/vue/package.json b/playground/vue/package.json
index a4911f76cc6e84..97d4e0fa1879ff 100644
--- a/playground/vue/package.json
+++ b/playground/vue/package.json
@@ -15,9 +15,9 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*",
     "js-yaml": "^4.1.0",
-    "less": "^4.1.2",
+    "less": "^4.1.3",
     "pug": "^3.0.2",
-    "sass": "^1.52.2",
+    "sass": "^1.52.3",
     "stylus": "^0.58.1"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f7ee98f09c7ecc..8c161a5cdc3fff 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,8 +11,8 @@ importers:
   .:
     specifiers:
       '@babel/types': ^7.18.4
-      '@microsoft/api-extractor': ^7.24.2
-      '@rollup/plugin-typescript': ^8.3.2
+      '@microsoft/api-extractor': ^7.25.0
+      '@rollup/plugin-typescript': ^8.3.3
       '@types/babel__core': ^7.1.19
       '@types/babel__standalone': ^7.1.4
       '@types/convert-source-map': ^1.5.2
@@ -33,26 +33,26 @@ importers:
       '@types/semver': ^7.3.9
       '@types/stylus': ^0.48.38
       '@types/ws': ^8.5.3
-      '@typescript-eslint/eslint-plugin': ^5.27.0
-      '@typescript-eslint/parser': ^5.27.0
+      '@typescript-eslint/eslint-plugin': ^5.27.1
+      '@typescript-eslint/parser': ^5.27.1
       conventional-changelog-cli: ^2.2.2
       cross-env: ^7.0.3
       esbuild: ^0.14.38
       eslint: ^8.17.0
-      eslint-define-config: ^1.5.0
+      eslint-define-config: ^1.5.1
       eslint-plugin-import: ^2.26.0
       eslint-plugin-node: ^11.1.0
       esno: ^0.16.3
       execa: ^5.1.1
       fs-extra: ^10.1.0
       kill-port: ^1.6.1
-      lint-staged: ^13.0.0
+      lint-staged: ^13.0.1
       minimist: ^1.2.6
       node-fetch: ^2.6.7
       npm-run-all: ^4.1.5
       picocolors: ^1.0.0
       playwright-chromium: ^1.22.2
-      pnpm: ^7.1.9
+      pnpm: ^7.2.1
       prettier: 2.6.2
       prompts: ^2.4.2
       rimraf: ^3.0.2
@@ -65,12 +65,12 @@ importers:
       unbuild: ^0.7.4
       vite: workspace:*
       vitepress: 1.0.0-draft.8
-      vitest: ^0.14.1
+      vitest: ^0.14.2
       vue: ^3.2.37
     devDependencies:
       '@babel/types': 7.18.4
-      '@microsoft/api-extractor': 7.24.2
-      '@rollup/plugin-typescript': 8.3.2_dsrqihoegvzgycupzno43pt4sq
+      '@microsoft/api-extractor': 7.25.0
+      '@rollup/plugin-typescript': 8.3.3_dsrqihoegvzgycupzno43pt4sq
       '@types/babel__core': 7.1.19
       '@types/babel__standalone': 7.1.4
       '@types/convert-source-map': 1.5.2
@@ -91,26 +91,26 @@ importers:
       '@types/semver': 7.3.9
       '@types/stylus': 0.48.38
       '@types/ws': 8.5.3
-      '@typescript-eslint/eslint-plugin': 5.27.0_bmkwjfsdzl3qsmmksash2s7t5q
-      '@typescript-eslint/parser': 5.27.0_pm7osnb22e4oktq33hptgspr5i
+      '@typescript-eslint/eslint-plugin': 5.27.1_bnfefdnvqpcyokeggdz5sotnli
+      '@typescript-eslint/parser': 5.27.1_pm7osnb22e4oktq33hptgspr5i
       conventional-changelog-cli: 2.2.2
       cross-env: 7.0.3
       esbuild: 0.14.38
       eslint: 8.17.0
-      eslint-define-config: 1.5.0
-      eslint-plugin-import: 2.26.0_er3f6f6cekbq4lwnvn7afiwhn4
+      eslint-define-config: 1.5.1
+      eslint-plugin-import: 2.26.0_pv5w3e62ssxduf5aiwxbc3knra
       eslint-plugin-node: 11.1.0_eslint@8.17.0
       esno: 0.16.3
       execa: 5.1.1
       fs-extra: 10.1.0
       kill-port: 1.6.1
-      lint-staged: 13.0.0
+      lint-staged: 13.0.1
       minimist: 1.2.6
       node-fetch: 2.6.7
       npm-run-all: 4.1.5
       picocolors: 1.0.0
       playwright-chromium: 1.22.2
-      pnpm: 7.1.9
+      pnpm: 7.2.1
       prettier: 2.6.2
       prompts: 2.4.2
       rimraf: 3.0.2
@@ -123,7 +123,7 @@ importers:
       unbuild: 0.7.4
       vite: link:packages/vite
       vitepress: 1.0.0-draft.8
-      vitest: 0.14.1
+      vitest: 0.14.2
       vue: 3.2.37
 
   packages/create-vite:
@@ -227,7 +227,7 @@ importers:
       '@rollup/plugin-dynamic-import-vars': ^1.4.3
       '@rollup/plugin-json': ^4.1.0
       '@rollup/plugin-node-resolve': 13.3.0
-      '@rollup/plugin-typescript': ^8.3.2
+      '@rollup/plugin-typescript': ^8.3.3
       '@rollup/pluginutils': ^4.2.1
       '@vue/compiler-dom': ^3.2.37
       acorn: ^8.7.1
@@ -253,7 +253,7 @@ importers:
       launch-editor-middleware: ^2.4.0
       magic-string: ^0.26.2
       micromatch: ^4.0.5
-      mrmime: ^1.0.0
+      mrmime: ^1.0.1
       node-forge: ^1.3.1
       okie: ^1.0.1
       open: ^8.4.0
@@ -266,7 +266,7 @@ importers:
       resolve: ^1.22.0
       resolve.exports: ^1.1.0
       rollup: ^2.72.1
-      rollup-plugin-license: ^2.8.0
+      rollup-plugin-license: ^2.8.1
       sirv: ^2.0.2
       source-map-js: ^1.0.2
       source-map-support: ^0.5.21
@@ -276,7 +276,7 @@ importers:
       tslib: ^2.4.0
       types: link:./types
       ufo: ^0.8.4
-      ws: ^8.7.0
+      ws: ^8.8.0
     dependencies:
       esbuild: 0.14.38
       postcss: 8.4.14
@@ -294,7 +294,7 @@ importers:
       '@rollup/plugin-dynamic-import-vars': 1.4.3_rollup@2.72.1
       '@rollup/plugin-json': 4.1.0_rollup@2.72.1
       '@rollup/plugin-node-resolve': 13.3.0_rollup@2.72.1
-      '@rollup/plugin-typescript': 8.3.2_rollup@2.72.1+tslib@2.4.0
+      '@rollup/plugin-typescript': 8.3.3_rollup@2.72.1+tslib@2.4.0
       '@rollup/pluginutils': 4.2.1
       '@vue/compiler-dom': 3.2.37
       acorn: 8.7.1
@@ -318,7 +318,7 @@ importers:
       launch-editor-middleware: 2.4.0
       magic-string: 0.26.2
       micromatch: 4.0.5
-      mrmime: 1.0.0
+      mrmime: 1.0.1
       node-forge: 1.3.1
       okie: 1.0.1
       open: 8.4.0
@@ -328,7 +328,7 @@ importers:
       postcss-load-config: 3.1.4_postcss@8.4.14
       postcss-modules: 4.3.1_postcss@8.4.14
       resolve.exports: 1.1.0
-      rollup-plugin-license: 2.8.0_rollup@2.72.1
+      rollup-plugin-license: 2.8.1_rollup@2.72.1
       sirv: 2.0.2
       source-map-js: 1.0.2
       source-map-support: 0.5.21
@@ -338,7 +338,7 @@ importers:
       tslib: 2.4.0
       types: link:types
       ufo: 0.8.4
-      ws: 8.7.0
+      ws: 8.8.0
 
   playground:
     specifiers:
@@ -384,16 +384,16 @@ importers:
     specifiers:
       css-dep: link:./css-dep
       fast-glob: ^3.2.11
-      less: ^4.1.2
+      less: ^4.1.3
       postcss-nested: ^5.0.6
-      sass: ^1.52.2
+      sass: ^1.52.3
       stylus: ^0.58.1
     devDependencies:
       css-dep: link:css-dep
       fast-glob: 3.2.11
-      less: 4.1.2
+      less: 4.1.3
       postcss-nested: 5.0.6
-      sass: 1.52.2
+      sass: 1.52.3
       stylus: 0.58.1
 
   playground/css-codesplit:
@@ -404,14 +404,14 @@ importers:
 
   playground/css-sourcemap:
     specifiers:
-      less: ^4.1.2
+      less: ^4.1.3
       magic-string: ^0.26.2
-      sass: ^1.52.2
+      sass: ^1.52.3
       stylus: ^0.58.1
     devDependencies:
-      less: 4.1.2
+      less: 4.1.3
       magic-string: 0.26.2
-      sass: 1.52.2
+      sass: 1.52.3
       stylus: 0.58.1
 
   playground/css/css-dep:
@@ -501,11 +501,11 @@ importers:
     specifiers:
       '@vitejs/plugin-legacy': workspace:*
       express: ^4.18.1
-      terser: ^5.13.1
+      terser: ^5.14.1
     devDependencies:
       '@vitejs/plugin-legacy': link:../../packages/plugin-legacy
       express: 4.18.1
-      terser: 5.14.0
+      terser: 5.14.1
 
   playground/lib:
     specifiers: {}
@@ -513,10 +513,10 @@ importers:
   playground/multiple-entrypoints:
     specifiers:
       fast-glob: ^3.2.11
-      sass: ^1.52.2
+      sass: ^1.52.3
     devDependencies:
       fast-glob: 3.2.11
-      sass: 1.52.2
+      sass: 1.52.3
 
   playground/nested-deps:
     specifiers:
@@ -696,15 +696,15 @@ importers:
   playground/preload:
     specifiers:
       '@vitejs/plugin-vue': workspace:*
-      terser: ^5.13.1
+      terser: ^5.14.1
       vue: ^3.2.37
-      vue-router: ^4.0.15
+      vue-router: ^4.0.16
     dependencies:
       vue: 3.2.37
-      vue-router: 4.0.15_vue@3.2.37
+      vue-router: 4.0.16_vue@3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
-      terser: 5.14.0
+      terser: 5.14.1
 
   playground/preserve-symlinks:
     specifiers:
@@ -732,16 +732,16 @@ importers:
     specifiers:
       '@babel/plugin-proposal-pipeline-operator': ^7.18.2
       '@emotion/babel-plugin': ^11.9.2
-      '@emotion/react': ^11.9.0
+      '@emotion/react': ^11.9.3
       '@vitejs/plugin-react': workspace:*
       react: ^17.0.2
       react-dom: ^17.0.2
-      react-switch: ^6.0.0
+      react-switch: ^6.1.0
     dependencies:
-      '@emotion/react': 11.9.0_react@17.0.2
+      '@emotion/react': 11.9.3_react@17.0.2
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
-      react-switch: 6.0.0_sfoxds7t5ydpegc3knd667wn6m
+      react-switch: 6.1.0_sfoxds7t5ydpegc3knd667wn6m
     devDependencies:
       '@babel/plugin-proposal-pipeline-operator': 7.18.2
       '@emotion/babel-plugin': 11.9.2
@@ -915,12 +915,12 @@ importers:
       express: ^4.18.1
       serve-static: ^1.15.0
       vue: ^3.2.37
-      vue-router: ^4.0.15
+      vue-router: ^4.0.16
       vuex: ^4.0.2
     dependencies:
       example-external-component: file:playground/ssr-vue/example-external-component
       vue: 3.2.37
-      vue-router: 4.0.15_vue@3.2.37
+      vue-router: 4.0.16_vue@3.2.37
       vuex: 4.0.2_vue@3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
@@ -955,21 +955,21 @@ importers:
       tailwindcss: ^2.2.19
       ts-node: ^10.8.1
       vue: ^3.2.37
-      vue-router: ^4.0.15
+      vue-router: ^4.0.16
     dependencies:
       autoprefixer: 10.4.7
       tailwindcss: 2.2.19_lbvqn3ypbknass5qgyhojko2ui
       vue: 3.2.37
-      vue-router: 4.0.15_vue@3.2.37
+      vue-router: 4.0.16_vue@3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
       ts-node: 10.8.1
 
   playground/tailwind-sourcemap:
     specifiers:
-      tailwindcss: ^3.0.24
+      tailwindcss: ^3.1.2
     dependencies:
-      tailwindcss: 3.0.24
+      tailwindcss: 3.1.2
 
   playground/tsconfig-json:
     specifiers: {}
@@ -981,10 +981,10 @@ importers:
     specifiers:
       '@vitejs/plugin-vue': workspace:*
       js-yaml: ^4.1.0
-      less: ^4.1.2
+      less: ^4.1.3
       lodash-es: ^4.17.21
       pug: ^3.0.2
-      sass: ^1.52.2
+      sass: ^1.52.3
       stylus: ^0.58.1
       vue: ^3.2.37
     dependencies:
@@ -993,9 +993,9 @@ importers:
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
       js-yaml: 4.1.0
-      less: 4.1.2
+      less: 4.1.3
       pug: 3.0.2
-      sass: 1.52.2
+      sass: 1.52.3
       stylus: 0.58.1
 
   playground/vue-jsx:
@@ -1030,17 +1030,17 @@ importers:
   playground/vue-sourcemap:
     specifiers:
       '@vitejs/plugin-vue': workspace:*
-      less: ^4.1.2
+      less: ^4.1.3
       postcss-nested: ^5.0.6
-      sass: ^1.52.2
+      sass: ^1.52.3
       vue: ^3.2.37
     dependencies:
       vue: 3.2.37
     devDependencies:
       '@vitejs/plugin-vue': link:../../packages/plugin-vue
-      less: 4.1.2
+      less: 4.1.3
       postcss-nested: 5.0.6
-      sass: 1.52.2
+      sass: 1.52.3
 
   playground/wasm:
     specifiers: {}
@@ -1733,11 +1733,11 @@ packages:
       source-map: 0.5.7
       stylis: 4.0.13
 
-  /@emotion/cache/11.7.1:
-    resolution: {integrity: sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==}
+  /@emotion/cache/11.9.3:
+    resolution: {integrity: sha512-0dgkI/JKlCXa+lEXviaMtGBL0ynpx4osh7rjOXE71q9bIF8G+XhJgvi+wDu0B0IdCVx37BffiwXlN9I3UuzFvg==}
     dependencies:
       '@emotion/memoize': 0.7.5
-      '@emotion/sheet': 1.1.0
+      '@emotion/sheet': 1.1.1
       '@emotion/utils': 1.1.0
       '@emotion/weak-memoize': 0.2.5
       stylis: 4.0.13
@@ -1749,8 +1749,8 @@ packages:
   /@emotion/memoize/0.7.5:
     resolution: {integrity: sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==}
 
-  /@emotion/react/11.9.0_react@17.0.2:
-    resolution: {integrity: sha512-lBVSF5d0ceKtfKCDQJveNAtkC7ayxpVlgOohLgXqRwqWr9bOf4TZAFFyIcNngnV6xK6X4x2ZeXq7vliHkoVkxQ==}
+  /@emotion/react/11.9.3_react@17.0.2:
+    resolution: {integrity: sha512-g9Q1GcTOlzOEjqwuLF/Zd9LC+4FljjPjDfxSM7KmEakm+hsHXk+bYZ2q+/hTJzr0OUNkujo72pXLQvXj6H+GJQ==}
     peerDependencies:
       '@babel/core': ^7.0.0
       '@types/react': '*'
@@ -1761,10 +1761,10 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.17.9
+      '@babel/runtime': 7.18.3
       '@emotion/babel-plugin': 11.9.2
-      '@emotion/cache': 11.7.1
-      '@emotion/serialize': 1.0.3
+      '@emotion/cache': 11.9.3
+      '@emotion/serialize': 1.0.4
       '@emotion/utils': 1.1.0
       '@emotion/weak-memoize': 0.2.5
       hoist-non-react-statics: 3.3.2
@@ -1780,8 +1780,18 @@ packages:
       '@emotion/utils': 1.1.0
       csstype: 3.0.11
 
-  /@emotion/sheet/1.1.0:
-    resolution: {integrity: sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==}
+  /@emotion/serialize/1.0.4:
+    resolution: {integrity: sha512-1JHamSpH8PIfFwAMryO2bNka+y8+KA5yga5Ocf2d7ZEiJjb7xlLW7aknBGZqJLajuLOvJ+72vN+IBSwPlXD1Pg==}
+    dependencies:
+      '@emotion/hash': 0.8.0
+      '@emotion/memoize': 0.7.5
+      '@emotion/unitless': 0.7.5
+      '@emotion/utils': 1.1.0
+      csstype: 3.0.11
+    dev: false
+
+  /@emotion/sheet/1.1.1:
+    resolution: {integrity: sha512-J3YPccVRMiTZxYAY0IOq3kd+hUP8idY8Kz6B/Cyo+JuXq52Ek+zbPbSQUrVQp95aJ+lsAW7DPL1P2Z+U1jGkKA==}
     dev: false
 
   /@emotion/unitless/0.7.5:
@@ -1919,19 +1929,19 @@ packages:
       - supports-color
     dev: false
 
-  /@microsoft/api-extractor-model/7.17.3:
-    resolution: {integrity: sha512-ETslFxVEZTEK6mrOARxM34Ll2W/5H2aTk9Pe9dxsMCnthE8O/CaStV4WZAGsvvZKyjelSWgPVYGowxGVnwOMlQ==}
+  /@microsoft/api-extractor-model/7.18.0:
+    resolution: {integrity: sha512-Q7ZhD6zKQd/J5ayNNChFCCgHZ8tw3ibljm6nXP/JEmiEFFbpKKtWMPVCaN8Y+8/qFmrz7mblLrupcKmUu8cF4A==}
     dependencies:
       '@microsoft/tsdoc': 0.14.1
       '@microsoft/tsdoc-config': 0.16.1
       '@rushstack/node-core-library': 3.45.5
     dev: true
 
-  /@microsoft/api-extractor/7.24.2:
-    resolution: {integrity: sha512-QWZh9aQZvBAdRVK+Go8NiW8YNMN//OGiNqgA3iZ2sEy8imUqkRBCybXgmw2HkEYyPnn55CFoMKvnAHvV9+4B/A==}
+  /@microsoft/api-extractor/7.25.0:
+    resolution: {integrity: sha512-GS1XOY2RgLthUkfcTR4CLPvCIvpFYj+2MfJMZ3J4NX8H64BWSHGaDUvVV6QvjKNpt/RHdLyyJZ+j7dQveBAZnA==}
     hasBin: true
     dependencies:
-      '@microsoft/api-extractor-model': 7.17.3
+      '@microsoft/api-extractor-model': 7.18.0
       '@microsoft/tsdoc': 0.14.1
       '@microsoft/tsdoc-config': 0.16.1
       '@rushstack/node-core-library': 3.45.5
@@ -2105,13 +2115,16 @@ packages:
       rollup: 2.72.1
     dev: true
 
-  /@rollup/plugin-typescript/8.3.2_dsrqihoegvzgycupzno43pt4sq:
-    resolution: {integrity: sha512-MtgyR5LNHZr3GyN0tM7gNO9D0CS+Y+vflS4v/PHmrX17JCkHUYKvQ5jN5o3cz1YKllM3duXUqu3yOHwMPUxhDg==}
+  /@rollup/plugin-typescript/8.3.3_dsrqihoegvzgycupzno43pt4sq:
+    resolution: {integrity: sha512-55L9SyiYu3r/JtqdjhwcwaECXP7JeJ9h1Sg1VWRJKIutla2MdZQodTgcCNybXLMCnqpNLEhS2vGENww98L1npg==}
     engines: {node: '>=8.0.0'}
     peerDependencies:
       rollup: ^2.14.0
       tslib: '*'
       typescript: '>=3.7.0'
+    peerDependenciesMeta:
+      tslib:
+        optional: true
     dependencies:
       '@rollup/pluginutils': 3.1.0_rollup@2.72.1
       resolve: 1.22.0
@@ -2120,13 +2133,16 @@ packages:
       typescript: 4.6.4
     dev: true
 
-  /@rollup/plugin-typescript/8.3.2_rollup@2.72.1+tslib@2.4.0:
-    resolution: {integrity: sha512-MtgyR5LNHZr3GyN0tM7gNO9D0CS+Y+vflS4v/PHmrX17JCkHUYKvQ5jN5o3cz1YKllM3duXUqu3yOHwMPUxhDg==}
+  /@rollup/plugin-typescript/8.3.3_rollup@2.72.1+tslib@2.4.0:
+    resolution: {integrity: sha512-55L9SyiYu3r/JtqdjhwcwaECXP7JeJ9h1Sg1VWRJKIutla2MdZQodTgcCNybXLMCnqpNLEhS2vGENww98L1npg==}
     engines: {node: '>=8.0.0'}
     peerDependencies:
       rollup: ^2.14.0
       tslib: '*'
       typescript: '>=3.7.0'
+    peerDependenciesMeta:
+      tslib:
+        optional: true
     dependencies:
       '@rollup/pluginutils': 3.1.0_rollup@2.72.1
       resolve: 1.22.0
@@ -2383,8 +2399,8 @@ packages:
       '@types/node': 17.0.32
     dev: true
 
-  /@typescript-eslint/eslint-plugin/5.27.0_bmkwjfsdzl3qsmmksash2s7t5q:
-    resolution: {integrity: sha512-DDrIA7GXtmHXr1VCcx9HivA39eprYBIFxbQEHI6NyraRDxCGpxAFiYQAT/1Y0vh1C+o2vfBiy4IuPoXxtTZCAQ==}
+  /@typescript-eslint/eslint-plugin/5.27.1_bnfefdnvqpcyokeggdz5sotnli:
+    resolution: {integrity: sha512-6dM5NKT57ZduNnJfpY81Phe9nc9wolnMCnknb1im6brWi1RYv84nbMS3olJa27B6+irUVV1X/Wb+Am0FjJdGFw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^5.0.0
@@ -2394,10 +2410,10 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.27.0_pm7osnb22e4oktq33hptgspr5i
-      '@typescript-eslint/scope-manager': 5.27.0
-      '@typescript-eslint/type-utils': 5.27.0_pm7osnb22e4oktq33hptgspr5i
-      '@typescript-eslint/utils': 5.27.0_pm7osnb22e4oktq33hptgspr5i
+      '@typescript-eslint/parser': 5.27.1_pm7osnb22e4oktq33hptgspr5i
+      '@typescript-eslint/scope-manager': 5.27.1
+      '@typescript-eslint/type-utils': 5.27.1_pm7osnb22e4oktq33hptgspr5i
+      '@typescript-eslint/utils': 5.27.1_pm7osnb22e4oktq33hptgspr5i
       debug: 4.3.4
       eslint: 8.17.0
       functional-red-black-tree: 1.0.1
@@ -2410,8 +2426,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.27.0_pm7osnb22e4oktq33hptgspr5i:
-    resolution: {integrity: sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==}
+  /@typescript-eslint/parser/5.27.1_pm7osnb22e4oktq33hptgspr5i:
+    resolution: {integrity: sha512-7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -2420,9 +2436,9 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 5.27.0
-      '@typescript-eslint/types': 5.27.0
-      '@typescript-eslint/typescript-estree': 5.27.0_typescript@4.6.4
+      '@typescript-eslint/scope-manager': 5.27.1
+      '@typescript-eslint/types': 5.27.1
+      '@typescript-eslint/typescript-estree': 5.27.1_typescript@4.6.4
       debug: 4.3.4
       eslint: 8.17.0
       typescript: 4.6.4
@@ -2430,16 +2446,16 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/5.27.0:
-    resolution: {integrity: sha512-VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g==}
+  /@typescript-eslint/scope-manager/5.27.1:
+    resolution: {integrity: sha512-fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.27.0
-      '@typescript-eslint/visitor-keys': 5.27.0
+      '@typescript-eslint/types': 5.27.1
+      '@typescript-eslint/visitor-keys': 5.27.1
     dev: true
 
-  /@typescript-eslint/type-utils/5.27.0_pm7osnb22e4oktq33hptgspr5i:
-    resolution: {integrity: sha512-vpTvRRchaf628Hb/Xzfek+85o//zEUotr1SmexKvTfs7czXfYjXVT/a5yDbpzLBX1rhbqxjDdr1Gyo0x1Fc64g==}
+  /@typescript-eslint/type-utils/5.27.1_pm7osnb22e4oktq33hptgspr5i:
+    resolution: {integrity: sha512-+UC1vVUWaDHRnC2cQrCJ4QtVjpjjCgjNFpg8b03nERmkHv9JV9X5M19D7UFMd+/G7T/sgFwX2pGmWK38rqyvXw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
@@ -2448,7 +2464,7 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/utils': 5.27.0_pm7osnb22e4oktq33hptgspr5i
+      '@typescript-eslint/utils': 5.27.1_pm7osnb22e4oktq33hptgspr5i
       debug: 4.3.4
       eslint: 8.17.0
       tsutils: 3.21.0_typescript@4.6.4
@@ -2457,13 +2473,13 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/types/5.27.0:
-    resolution: {integrity: sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==}
+  /@typescript-eslint/types/5.27.1:
+    resolution: {integrity: sha512-LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.27.0_typescript@4.6.4:
-    resolution: {integrity: sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==}
+  /@typescript-eslint/typescript-estree/5.27.1_typescript@4.6.4:
+    resolution: {integrity: sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
@@ -2471,8 +2487,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 5.27.0
-      '@typescript-eslint/visitor-keys': 5.27.0
+      '@typescript-eslint/types': 5.27.1
+      '@typescript-eslint/visitor-keys': 5.27.1
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
@@ -2483,16 +2499,16 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.27.0_pm7osnb22e4oktq33hptgspr5i:
-    resolution: {integrity: sha512-nZvCrkIJppym7cIbP3pOwIkAefXOmfGPnCM0LQfzNaKxJHI6VjI8NC662uoiPlaf5f6ymkTy9C3NQXev2mdXmA==}
+  /@typescript-eslint/utils/5.27.1_pm7osnb22e4oktq33hptgspr5i:
+    resolution: {integrity: sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       '@types/json-schema': 7.0.11
-      '@typescript-eslint/scope-manager': 5.27.0
-      '@typescript-eslint/types': 5.27.0
-      '@typescript-eslint/typescript-estree': 5.27.0_typescript@4.6.4
+      '@typescript-eslint/scope-manager': 5.27.1
+      '@typescript-eslint/types': 5.27.1
+      '@typescript-eslint/typescript-estree': 5.27.1_typescript@4.6.4
       eslint: 8.17.0
       eslint-scope: 5.1.1
       eslint-utils: 3.0.0_eslint@8.17.0
@@ -2501,11 +2517,11 @@ packages:
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.27.0:
-    resolution: {integrity: sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==}
+  /@typescript-eslint/visitor-keys/5.27.1:
+    resolution: {integrity: sha512-xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.27.0
+      '@typescript-eslint/types': 5.27.1
       eslint-visitor-keys: 3.3.0
     dev: true
 
@@ -3330,8 +3346,8 @@ packages:
       color-string: 1.9.1
     dev: false
 
-  /colorette/2.0.16:
-    resolution: {integrity: sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==}
+  /colorette/2.0.17:
+    resolution: {integrity: sha512-hJo+3Bkn0NCHybn9Tu35fIeoOKGOk5OCC32y4Hz2It+qlCO2Q3DeQ1hRn/tDDMQKRYUEzqsl7jbF6dYKjlE60g==}
     dev: true
 
   /colors/1.2.5:
@@ -3847,7 +3863,7 @@ packages:
     dev: true
 
   /defined/1.0.0:
-    resolution: {integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=}
+    resolution: {integrity: sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==}
     dev: false
 
   /defu/5.0.1:
@@ -3901,6 +3917,16 @@ packages:
       minimist: 1.2.6
     dev: false
 
+  /detective/5.2.1:
+    resolution: {integrity: sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==}
+    engines: {node: '>=0.8.0'}
+    hasBin: true
+    dependencies:
+      acorn-node: 1.8.2
+      defined: 1.0.0
+      minimist: 1.2.6
+    dev: false
+
   /dicer/0.3.0:
     resolution: {integrity: sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==}
     engines: {node: '>=4.5.0'}
@@ -4448,8 +4474,8 @@ packages:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
 
-  /eslint-define-config/1.5.0:
-    resolution: {integrity: sha512-2C6tmeMRAXQ+y5vxbXsOjn/CTmMseJ0eRXsK+ThFEjeibSpMmurPq2SjBGzl5Ha4pTpVSMJQc0lzE8Y3hPYbHQ==}
+  /eslint-define-config/1.5.1:
+    resolution: {integrity: sha512-6gxrmN7aKGffaO8dCtMMKyo3IxbWymMQ248p4lf8GbaFRcLsqOXHFdUhhM0Hcy1NudvnpwHcfbDf7Nh9pIm1TA==}
     engines: {node: '>= 14.6.0', npm: '>= 6.0.0', pnpm: '>= 7.0.0'}
     dev: true
 
@@ -4462,7 +4488,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils/2.7.3_nd4nb6nccnlbwilvit6hlaep3q:
+  /eslint-module-utils/2.7.3_5uhabtgzo3akfzi73a5jap3i6a:
     resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -4480,7 +4506,7 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.27.0_pm7osnb22e4oktq33hptgspr5i
+      '@typescript-eslint/parser': 5.27.1_pm7osnb22e4oktq33hptgspr5i
       debug: 3.2.7
       eslint-import-resolver-node: 0.3.6
       find-up: 2.1.0
@@ -4499,7 +4525,7 @@ packages:
       regexpp: 3.2.0
     dev: true
 
-  /eslint-plugin-import/2.26.0_er3f6f6cekbq4lwnvn7afiwhn4:
+  /eslint-plugin-import/2.26.0_pv5w3e62ssxduf5aiwxbc3knra:
     resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -4509,14 +4535,14 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.27.0_pm7osnb22e4oktq33hptgspr5i
+      '@typescript-eslint/parser': 5.27.1_pm7osnb22e4oktq33hptgspr5i
       array-includes: 3.1.5
       array.prototype.flat: 1.3.0
       debug: 2.6.9
       doctrine: 2.1.0
       eslint: 8.17.0
       eslint-import-resolver-node: 0.3.6
-      eslint-module-utils: 2.7.3_nd4nb6nccnlbwilvit6hlaep3q
+      eslint-module-utils: 2.7.3_5uhabtgzo3akfzi73a5jap3i6a
       has: 1.0.3
       is-core-module: 2.9.0
       is-glob: 4.0.3
@@ -5304,6 +5330,14 @@ packages:
       safer-buffer: 2.1.2
     dev: true
 
+  /iconv-lite/0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      safer-buffer: 2.1.2
+    dev: true
+    optional: true
+
   /icss-replace-symbols/1.1.0:
     resolution: {integrity: sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=}
     dev: true
@@ -5478,7 +5512,7 @@ packages:
     dev: true
 
   /is-extglob/2.1.1:
-    resolution: {integrity: sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=}
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
 
   /is-fullwidth-code-point/3.0.0:
@@ -5742,8 +5776,8 @@ packages:
       shell-quote: 1.7.3
     dev: true
 
-  /less/4.1.2:
-    resolution: {integrity: sha512-EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA==}
+  /less/4.1.3:
+    resolution: {integrity: sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==}
     engines: {node: '>=6'}
     hasBin: true
     dependencies:
@@ -5756,7 +5790,7 @@ packages:
       image-size: 0.5.5
       make-dir: 2.1.0
       mime: 1.6.0
-      needle: 2.9.1
+      needle: 3.1.0
       source-map: 0.6.1
     transitivePeerDependencies:
       - supports-color
@@ -5777,13 +5811,13 @@ packages:
   /lines-and-columns/1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
-  /lint-staged/13.0.0:
-    resolution: {integrity: sha512-vWban5utFt78VZohbosUxNIa46KKJ+KOQTDWTQ8oSl1DLEEVl9zhUtaQbiiydAmx+h2wKJK2d0+iMaRmknuWRQ==}
+  /lint-staged/13.0.1:
+    resolution: {integrity: sha512-Ykaf4QTi0a02BF7cnq7JIPGOJxH4TkNMWhSlJdH9wOekd0X+gog47Jfh/0L31DqZe5AiydLGC7LkPqpaNm+Kvg==}
     engines: {node: ^14.13.1 || >=16.0.0}
     hasBin: true
     dependencies:
       cli-truncate: 3.1.0
-      colorette: 2.0.16
+      colorette: 2.0.17
       commander: 9.3.0
       debug: 4.3.4
       execa: 6.1.0
@@ -5792,7 +5826,7 @@ packages:
       micromatch: 4.0.5
       normalize-path: 3.0.0
       object-inspect: 1.12.2
-      pidtree: 0.5.0
+      pidtree: 0.6.0
       string-argv: 0.3.1
       yaml: 2.1.1
     transitivePeerDependencies:
@@ -5810,7 +5844,7 @@ packages:
         optional: true
     dependencies:
       cli-truncate: 2.1.0
-      colorette: 2.0.16
+      colorette: 2.0.17
       log-update: 4.0.0
       p-map: 4.0.0
       rfdc: 1.3.0
@@ -6208,8 +6242,8 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /mrmime/1.0.0:
-    resolution: {integrity: sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==}
+  /mrmime/1.0.1:
+    resolution: {integrity: sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==}
     engines: {node: '>=10'}
     dev: true
 
@@ -6238,14 +6272,14 @@ packages:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
     dev: true
 
-  /needle/2.9.1:
-    resolution: {integrity: sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==}
+  /needle/3.1.0:
+    resolution: {integrity: sha512-gCE9weDhjVGCRqS8dwDR/D3GTAeyXLXuqp7I8EzH6DllZGXSUyxuqqLh+YX9rMAWaaTFyVAg6rHGL25dqvczKw==}
     engines: {node: '>= 4.4.x'}
     hasBin: true
     requiresBuild: true
     dependencies:
       debug: 3.2.7
-      iconv-lite: 0.4.24
+      iconv-lite: 0.6.3
       sax: 1.2.4
     transitivePeerDependencies:
       - supports-color
@@ -6609,7 +6643,7 @@ packages:
     engines: {node: '>=0.10.0'}
 
   /path-key/2.0.1:
-    resolution: {integrity: sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=}
+    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
     engines: {node: '>=4'}
     dev: true
 
@@ -6679,8 +6713,8 @@ packages:
     hasBin: true
     dev: true
 
-  /pidtree/0.5.0:
-    resolution: {integrity: sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==}
+  /pidtree/0.6.0:
+    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
     engines: {node: '>=0.10'}
     hasBin: true
     dev: true
@@ -6688,7 +6722,6 @@ packages:
   /pify/2.3.0:
     resolution: {integrity: sha1-7RQaasBDqEnqWISY59yosVMw6Qw=}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /pify/3.0.0:
     resolution: {integrity: sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=}
@@ -6724,9 +6757,9 @@ packages:
     hasBin: true
     dev: true
 
-  /pnpm/7.1.9:
-    resolution: {integrity: sha512-YWA+iqayHb0MndHTyqvVPKQVYVCOoBYlQNLP3hAf2DT/Iw2EHVcP18yCT+xnsPNvkC4VYfQepE6AZvySQue1TA==}
-    engines: {node: '>=14.19'}
+  /pnpm/7.2.1:
+    resolution: {integrity: sha512-Z2Wg7YHxeit2U+0aSj+doBPF9+ER0e3VLOGuJOQbk8rzIxK6zMtrQ0ICieCUGPWRM0Vbwj8yIcTKzO22Yhs/Cg==}
+    engines: {node: '>=14.6'}
     hasBin: true
     dev: true
 
@@ -6740,7 +6773,6 @@ packages:
       postcss-value-parser: 4.2.0
       read-cache: 1.0.0
       resolve: 1.22.0
-    dev: true
 
   /postcss-js/3.0.3:
     resolution: {integrity: sha512-gWnoWQXKFw65Hk/mi2+WTQTHdPD5UJdDXZmX073EY/B3BWnYjO4F4t0VneTCnCGQ5E5GsCdMkzPaTXwl3r5dJw==}
@@ -6750,14 +6782,14 @@ packages:
       postcss: 8.4.13
     dev: false
 
-  /postcss-js/4.0.0_postcss@8.4.13:
+  /postcss-js/4.0.0_postcss@8.4.14:
     resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==}
     engines: {node: ^12 || ^14 || >= 16}
     peerDependencies:
       postcss: ^8.3.3
     dependencies:
       camelcase-css: 2.0.1
-      postcss: 8.4.13
+      postcss: 8.4.14
     dev: false
 
   /postcss-load-config/3.1.4:
@@ -6776,23 +6808,6 @@ packages:
       yaml: 1.10.2
     dev: false
 
-  /postcss-load-config/3.1.4_postcss@8.4.13:
-    resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
-    engines: {node: '>= 10'}
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      lilconfig: 2.0.5
-      postcss: 8.4.13
-      yaml: 1.10.2
-    dev: false
-
   /postcss-load-config/3.1.4_postcss@8.4.14:
     resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
     engines: {node: '>= 10'}
@@ -6808,7 +6823,6 @@ packages:
       lilconfig: 2.0.5
       postcss: 8.4.14
       yaml: 1.10.2
-    dev: true
 
   /postcss-load-config/3.1.4_ts-node@10.8.1:
     resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
@@ -6892,13 +6906,13 @@ packages:
     dependencies:
       postcss-selector-parser: 6.0.10
 
-  /postcss-nested/5.0.6_postcss@8.4.13:
+  /postcss-nested/5.0.6_postcss@8.4.14:
     resolution: {integrity: sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==}
     engines: {node: '>=12.0'}
     peerDependencies:
       postcss: ^8.2.14
     dependencies:
-      postcss: 8.4.13
+      postcss: 8.4.14
       postcss-selector-parser: 6.0.10
     dev: false
 
@@ -6992,7 +7006,7 @@ packages:
     dev: true
 
   /prr/1.0.1:
-    resolution: {integrity: sha1-0/wRS6BplaRexok/SEzrHXj19HY=}
+    resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==}
     dev: true
     optional: true
 
@@ -7216,11 +7230,11 @@ packages:
       tiny-warning: 1.0.3
     dev: false
 
-  /react-switch/6.0.0_sfoxds7t5ydpegc3knd667wn6m:
-    resolution: {integrity: sha512-QV3/6eRK5/5epdQzIqvDAHRoGLbCv/wDpHUi6yBMXY1Xco5XGuIZxvB49PHoV1v/SpEgOCJLD/Zo43iic+aEIw==}
+  /react-switch/6.1.0_sfoxds7t5ydpegc3knd667wn6m:
+    resolution: {integrity: sha512-cOwQkxtHCOGtoK0KN3kZBPTQjt8P1TTpaor+TS0AJRLfFBIRkgjVIUCwAfvVlW32Bi1BK333rk9y/14suD38SA==}
     peerDependencies:
-      react: ^15.3.0 || ^16.0.0 || ^17.0.0
-      react-dom: ^15.3.0 || ^16.0.0 || ^17.0.0
+      react: ^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
     dependencies:
       prop-types: 15.8.1
       react: 17.0.2
@@ -7239,7 +7253,6 @@ packages:
     resolution: {integrity: sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=}
     dependencies:
       pify: 2.3.0
-    dev: true
 
   /read-pkg-up/3.0.0:
     resolution: {integrity: sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=}
@@ -7460,8 +7473,8 @@ packages:
       - supports-color
     dev: true
 
-  /rollup-plugin-license/2.8.0_rollup@2.72.1:
-    resolution: {integrity: sha512-P+CM6tlgahnpnOFKeirABCcs3Eez4AQsm2fC7rvVR3aMIWd/KgSNAImmcfGS+Pmd0dGFmjE1tYgflnTINxNpIQ==}
+  /rollup-plugin-license/2.8.1_rollup@2.72.1:
+    resolution: {integrity: sha512-VYd9pzaNL7NN6xQp93XiiCV2UoduXgSmTcz6rl9bHPdiifT6yH3Zw/omEr73Rq8TIyN4nqJACBbKIT/2eE66wg==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       rollup: ^1.0.0 || ^2.0.0
@@ -7512,8 +7525,8 @@ packages:
       truncate-utf8-bytes: 1.0.2
     dev: true
 
-  /sass/1.52.2:
-    resolution: {integrity: sha512-mfHB2VSeFS7sZlPv9YohB9GB7yWIgQNTGniQwfQ04EoQN0wsQEv7SwpCwy/x48Af+Z3vDeFXz+iuXM3HK/phZQ==}
+  /sass/1.52.3:
+    resolution: {integrity: sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==}
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
@@ -7677,7 +7690,7 @@ packages:
     engines: {node: '>= 10'}
     dependencies:
       '@polka/url': 1.0.0-next.21
-      mrmime: 1.0.0
+      mrmime: 1.0.1
       totalist: 3.0.0
     dev: true
 
@@ -7816,7 +7829,7 @@ packages:
     dev: true
 
   /sprintf-js/1.0.3:
-    resolution: {integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=}
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
     dev: true
 
   /stack-trace/0.0.10:
@@ -8079,15 +8092,15 @@ packages:
       - ts-node
     dev: false
 
-  /tailwindcss/3.0.24:
-    resolution: {integrity: sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==}
+  /tailwindcss/3.1.2:
+    resolution: {integrity: sha512-yJ6L5s1U5AeS5g7HHy212zdQfjwD426FBfm59pet/JsyneuZuD4C2W7PpJEg4ppisiB21uLqtNagv8KXury3+Q==}
     engines: {node: '>=12.13.0'}
     hasBin: true
     dependencies:
       arg: 5.0.1
       chokidar: 3.5.3
       color-name: 1.1.4
-      detective: 5.2.0
+      detective: 5.2.1
       didyoumean: 1.2.2
       dlv: 1.1.3
       fast-glob: 3.2.11
@@ -8097,10 +8110,11 @@ packages:
       normalize-path: 3.0.0
       object-hash: 3.0.0
       picocolors: 1.0.0
-      postcss: 8.4.13
-      postcss-js: 4.0.0_postcss@8.4.13
-      postcss-load-config: 3.1.4_postcss@8.4.13
-      postcss-nested: 5.0.6_postcss@8.4.13
+      postcss: 8.4.14
+      postcss-import: 14.1.0_postcss@8.4.14
+      postcss-js: 4.0.0_postcss@8.4.14
+      postcss-load-config: 3.1.4_postcss@8.4.14
+      postcss-nested: 5.0.6_postcss@8.4.14
       postcss-selector-parser: 6.0.10
       postcss-value-parser: 4.2.0
       quick-lru: 5.1.1
@@ -8134,8 +8148,8 @@ packages:
       uuid: 3.4.0
     dev: true
 
-  /terser/5.14.0:
-    resolution: {integrity: sha512-JC6qfIEkPBd9j1SMO3Pfn+A6w2kQV54tv+ABQLgZr7dA3k/DL/OBoYSWxzVpZev3J+bUHXfr55L8Mox7AaNo6g==}
+  /terser/5.14.1:
+    resolution: {integrity: sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
@@ -8155,7 +8169,7 @@ packages:
     dev: true
 
   /through/2.3.8:
-    resolution: {integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=}
+    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
     dev: true
 
   /through2/2.0.5:
@@ -8172,7 +8186,7 @@ packages:
     dev: true
 
   /timsort/0.3.0:
-    resolution: {integrity: sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=}
+    resolution: {integrity: sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==}
     dev: true
 
   /tiny-emitter/2.1.0:
@@ -8502,7 +8516,7 @@ packages:
     dev: true
 
   /util-deprecate/1.0.2:
-    resolution: {integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=}
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
   /utils-merge/1.0.1:
     resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=}
@@ -8564,8 +8578,8 @@ packages:
       - react-dom
     dev: true
 
-  /vitest/0.14.1:
-    resolution: {integrity: sha512-2UUm6jYgkwh7Y3VKSRR8OuaNCm+iA5LPDnal7jyITN39maZK9L+JVxqjtQ39PSFo5Fl3/BgaJvER6GGHX9JLxg==}
+  /vitest/0.14.2:
+    resolution: {integrity: sha512-vXQUl8OUCqHmxKWscMGL+6Xl1pBJmYHZ8N85iNpLGrirAC2vhspu7b73ShRcLonmZT44BYZW+LBAVvn0L4jyVA==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
     peerDependencies:
@@ -8623,8 +8637,8 @@ packages:
       vue: 3.2.33
     dev: true
 
-  /vue-router/4.0.15_vue@3.2.37:
-    resolution: {integrity: sha512-xa+pIN9ZqORdIW1MkN2+d9Ui2pCM1b/UMgwYUCZOiFYHAvz/slKKBDha8DLrh5aCG/RibtrpyhKjKOZ85tYyWg==}
+  /vue-router/4.0.16_vue@3.2.37:
+    resolution: {integrity: sha512-JcO7cb8QJLBWE+DfxGUL3xUDOae/8nhM1KVdnudadTAORbuxIC/xAydC5Zr/VLHUDQi1ppuTF5/rjBGzgzrJNA==}
     peerDependencies:
       vue: ^3.2.0
     dependencies:
@@ -8782,8 +8796,8 @@ packages:
         optional: true
     dev: true
 
-  /ws/8.7.0:
-    resolution: {integrity: sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==}
+  /ws/8.8.0:
+    resolution: {integrity: sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1

From 2548dd367ff97fbe094a02128b08840a492ef24a Mon Sep 17 00:00:00 2001
From: CHOYSEN <choysen@qq.com>
Date: Mon, 13 Jun 2022 14:25:08 +0800
Subject: [PATCH 36/72] fix(config): only rewrite .js loader in
 `loadConfigFromBundledFile` (#8556)

---
 packages/vite/src/node/config.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
index ce897d745d2e27..99ec143fa85f0f 100644
--- a/packages/vite/src/node/config.ts
+++ b/packages/vite/src/node/config.ts
@@ -837,10 +837,9 @@ async function loadConfigFromBundledFile(
   fileName: string,
   bundledCode: string
 ): Promise<UserConfig> {
-  const extension = path.extname(fileName)
   const realFileName = fs.realpathSync(fileName)
-  const defaultLoader = _require.extensions[extension]!
-  _require.extensions[extension] = (module: NodeModule, filename: string) => {
+  const defaultLoader = _require.extensions['.js']
+  _require.extensions['.js'] = (module: NodeModule, filename: string) => {
     if (filename === realFileName) {
       ;(module as NodeModuleWithCompile)._compile(bundledCode, filename)
     } else {
@@ -850,9 +849,8 @@ async function loadConfigFromBundledFile(
   // clear cache in case of server restart
   delete _require.cache[_require.resolve(fileName)]
   const raw = _require(fileName)
-  const config = raw.__esModule ? raw.default : raw
-  _require.extensions[extension] = defaultLoader
-  return config
+  _require.extensions['.js'] = defaultLoader
+  return raw.__esModule ? raw.default : raw
 }
 
 export function isDepsOptimizerEnabled(config: ResolvedConfig): boolean {

From 9a88afa6077286c03e180e4f983b1d194d03b338 Mon Sep 17 00:00:00 2001
From: Manu MA <manu.valladolid@gmail.com>
Date: Mon, 13 Jun 2022 13:11:40 +0100
Subject: [PATCH 37/72] fix(ssr): dont replace rollup input (#7275)

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

diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
index 705465400ca5ca..6fe156e3b4e89c 100644
--- a/packages/vite/src/node/build.ts
+++ b/packages/vite/src/node/build.ts
@@ -407,7 +407,6 @@ async function doBuild(
   }
 
   const rollupOptions: RollupOptions = {
-    input,
     context: 'globalThis',
     preserveEntrySignatures: ssr
       ? 'allow-extension'
@@ -415,6 +414,7 @@ async function doBuild(
       ? 'strict'
       : false,
     ...options.rollupOptions,
+    input,
     plugins,
     external,
     onwarn(warning, warn) {

From 2dfc0152be6ed531fdebe7dc76314ac9f80b7b1d Mon Sep 17 00:00:00 2001
From: Alex Kozack <cawa-93@users.noreply.github.com>
Date: Mon, 13 Jun 2022 15:38:32 +0300
Subject: [PATCH 38/72] fix: add missed JPEG file extensions to
 `KNOWN_ASSET_TYPES` (#8565)

---
 packages/vite/client.d.ts           | 12 ++++++++++++
 packages/vite/src/node/constants.ts |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/packages/vite/client.d.ts b/packages/vite/client.d.ts
index 948d66d1d7ad74..e99b4a526b7a58 100644
--- a/packages/vite/client.d.ts
+++ b/packages/vite/client.d.ts
@@ -74,6 +74,18 @@ declare module '*.jpeg' {
   const src: string
   export default src
 }
+declare module '*.jfif' {
+  const src: string
+  export default src
+}
+declare module '*.pjpeg' {
+  const src: string
+  export default src
+}
+declare module '*.pjp' {
+  const src: string
+  export default src
+}
 declare module '*.png' {
   const src: string
   export default src
diff --git a/packages/vite/src/node/constants.ts b/packages/vite/src/node/constants.ts
index 4e5d3da96f50da..09b8c314149b03 100644
--- a/packages/vite/src/node/constants.ts
+++ b/packages/vite/src/node/constants.ts
@@ -67,6 +67,9 @@ export const KNOWN_ASSET_TYPES = [
   // images
   'png',
   'jpe?g',
+  'jfif',
+  'pjpeg',
+  'pjp',
   'gif',
   'svg',
   'ico',

From acf3024779308b05626d254189a786c74363fb9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Mon, 13 Jun 2022 22:58:50 +0900
Subject: [PATCH 39/72] fix: mime missing extensions (#8568)

---
 packages/vite/src/node/constants.ts        |  5 ++++-
 packages/vite/src/node/plugins/asset.ts    | 20 ++++++++++++++++----
 playground/assets/__tests__/assets.spec.ts |  6 ++++++
 playground/assets/index.html               |  6 ++++++
 playground/assets/nested/foo.unknown       |  1 +
 playground/assets/vite.config.js           |  1 +
 6 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 playground/assets/nested/foo.unknown

diff --git a/packages/vite/src/node/constants.ts b/packages/vite/src/node/constants.ts
index 09b8c314149b03..acd067908a598c 100644
--- a/packages/vite/src/node/constants.ts
+++ b/packages/vite/src/node/constants.ts
@@ -62,7 +62,10 @@ export const CLIENT_DIR = path.dirname(CLIENT_ENTRY)
 
 // ** READ THIS ** before editing `KNOWN_ASSET_TYPES`.
 //   If you add an asset to `KNOWN_ASSET_TYPES`, make sure to also add it
-//   to the TypeScript declaration file `packages/vite/client.d.ts`.
+//   to the TypeScript declaration file `packages/vite/client.d.ts` and
+//   add a mime type to the `registerCustomMime` in
+//   `packages/vite/src/node/plugin/assets.ts` if mime type cannot be
+//   looked up by mrmime.
 export const KNOWN_ASSET_TYPES = [
   // images
   'png',
diff --git a/packages/vite/src/node/plugins/asset.ts b/packages/vite/src/node/plugins/asset.ts
index 4c1bcfea0fd50b..9e99629c8144e9 100644
--- a/packages/vite/src/node/plugins/asset.ts
+++ b/packages/vite/src/node/plugins/asset.ts
@@ -23,6 +23,18 @@ const assetHashToFilenameMap = new WeakMap<
 // save hashes of the files that has been emitted in build watch
 const emittedHashMap = new WeakMap<ResolvedConfig, Set<string>>()
 
+// add own dictionary entry by directly assigning mrmime
+export function registerCustomMime(): void {
+  // https://github.com/lukeed/mrmime/issues/3
+  mrmime.mimes['ico'] = 'image/x-icon'
+  // https://developer.mozilla.org/en-US/docs/Web/Media/Formats/Containers#flac
+  mrmime.mimes['flac'] = 'audio/flac'
+  // mrmime and mime-db is not released yet: https://github.com/jshttp/mime-db/commit/c9242a9b7d4bb25d7a0c9244adec74aeef08d8a1
+  mrmime.mimes['aac'] = 'audio/aac'
+  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
+  mrmime.mimes['eot'] = 'application/vnd.ms-fontobject'
+}
+
 /**
  * Also supports loading plain strings with import text from './foo.txt?raw'
  */
@@ -31,9 +43,8 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
   assetHashToFilenameMap.set(config, new Map())
   const relativeBase = isRelativeBase(config.base)
 
-  // add own dictionary entry by directly assigning mrmine
-  // https://github.com/lukeed/mrmime/issues/3
-  mrmime.mimes['ico'] = 'image/x-icon'
+  registerCustomMime()
+
   return {
     name: 'vite:asset',
 
@@ -338,8 +349,9 @@ async function fileToBuiltUrl(
     (!file.endsWith('.svg') &&
       content.length < Number(config.build.assetsInlineLimit))
   ) {
+    const mimeType = mrmime.lookup(file) ?? 'application/octet-stream'
     // base64 inlined as a string
-    url = `data:${mrmime.lookup(file)};base64,${content.toString('base64')}`
+    url = `data:${mimeType};base64,${content.toString('base64')}`
   } else {
     // emit as asset
     // rollup supports `import.meta.ROLLUP_FILE_URL_*`, but it generates code
diff --git a/playground/assets/__tests__/assets.spec.ts b/playground/assets/__tests__/assets.spec.ts
index 20040c173c7f87..fda5e4e4c83ef1 100644
--- a/playground/assets/__tests__/assets.spec.ts
+++ b/playground/assets/__tests__/assets.spec.ts
@@ -218,6 +218,12 @@ describe('svg fragments', () => {
   })
 })
 
+test('Unknown extension assets import', async () => {
+  expect(await page.textContent('.unknown-ext')).toMatch(
+    isBuild ? 'data:application/octet-stream;' : '/nested/foo.unknown'
+  )
+})
+
 test('?raw import', async () => {
   expect(await page.textContent('.raw')).toMatch('SVG')
 })
diff --git a/playground/assets/index.html b/playground/assets/index.html
index 418cc06f05bcd1..a741379e82013e 100644
--- a/playground/assets/index.html
+++ b/playground/assets/index.html
@@ -166,6 +166,9 @@ <h2>SVG Fragments via JS Import</h2>
   <img class="svg-frag-import" alt="" />
 </div>
 
+<h2>Unknown extension assets import</h2>
+<code class="unknown-ext"></code>
+
 <h2>?raw import</h2>
 <code class="raw"></code>
 
@@ -318,6 +321,9 @@ <h3>style in svg</h3>
   text('.svg-frag-import-path', svgFrag)
   document.querySelector('.svg-frag-import').src = svgFrag + '#icon-heart-view'
 
+  import unknownExtUrl from './nested/foo.unknown'
+  text('.unknown-ext', unknownExtUrl)
+
   import rawSvg from './nested/fragment.svg?raw'
   text('.raw', rawSvg)
 
diff --git a/playground/assets/nested/foo.unknown b/playground/assets/nested/foo.unknown
new file mode 100644
index 00000000000000..e24f83b664c55c
--- /dev/null
+++ b/playground/assets/nested/foo.unknown
@@ -0,0 +1 @@
+custom file
diff --git a/playground/assets/vite.config.js b/playground/assets/vite.config.js
index e44ddda7995185..c9d821ae3d73ee 100644
--- a/playground/assets/vite.config.js
+++ b/playground/assets/vite.config.js
@@ -11,6 +11,7 @@ module.exports = {
       '@': path.resolve(__dirname, 'nested')
     }
   },
+  assetsInclude: ['**/*.unknown'],
   build: {
     outDir: 'dist/foo',
     assetsInlineLimit: 8192, // 8kb

From 19d7ea949164f7c2d0c4c7b2b6c847dfb9aa970d Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Mon, 13 Jun 2022 16:45:10 +0200
Subject: [PATCH 40/72] test: avoid flaky worker test (#8570)

---
 playground/worker/my-worker.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playground/worker/my-worker.ts b/playground/worker/my-worker.ts
index 5d45a833497fd7..7207a0ea5a077e 100644
--- a/playground/worker/my-worker.ts
+++ b/playground/worker/my-worker.ts
@@ -1,10 +1,10 @@
 import { mode, msg } from './modules/workerImport'
 import { bundleWithPlugin } from './modules/test-plugin'
-import { msg as msgFromDep } from 'dep-to-optimize'
+// import { msg as msgFromDep } from 'dep-to-optimize'
 
 self.onmessage = (e) => {
   if (e.data === 'ping') {
-    self.postMessage({ msg, mode, bundleWithPlugin, msgFromDep })
+    self.postMessage({ msg, mode, bundleWithPlugin }) // TODO: fix darwin, and add back: msgFromDep })
   }
 }
 

From d357e33846d08879f14f97bacc686475615d3725 Mon Sep 17 00:00:00 2001
From: KonpekiCode <512054675@qq.com>
Date: Mon, 13 Jun 2022 22:50:44 +0800
Subject: [PATCH 41/72] fix: default export module transformation for vitest
 spy (#8567)

---
 packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts | 6 +++---
 packages/vite/src/node/ssr/ssrTransform.ts                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts
index f759a51e60ff58..fbf7bb7bbd22ad 100644
--- a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts
+++ b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts
@@ -306,7 +306,7 @@ test('should declare variable for imported super class', async () => {
     class A extends Foo {}
     class B extends Foo {}
     Object.defineProperty(__vite_ssr_exports__, \\"B\\", { enumerable: true, configurable: true, get(){ return B }});
-    Object.defineProperty(__vite_ssr_exports__, \\"default\\", { enumerable: true, value: A });"
+    Object.defineProperty(__vite_ssr_exports__, \\"default\\", { enumerable: true, configurable: true, value: A });"
   `)
 })
 
@@ -338,7 +338,7 @@ test('should handle default export variants', async () => {
   ).toMatchInlineSnapshot(`
     "function foo() {}
     foo.prototype = Object.prototype;
-    Object.defineProperty(__vite_ssr_exports__, \\"default\\", { enumerable: true, value: foo });"
+    Object.defineProperty(__vite_ssr_exports__, \\"default\\", { enumerable: true, configurable: true, value: foo });"
   `)
   // default named classes
   expect(
@@ -353,7 +353,7 @@ test('should handle default export variants', async () => {
     "class A {}
     class B extends A {}
     Object.defineProperty(__vite_ssr_exports__, \\"B\\", { enumerable: true, configurable: true, get(){ return B }});
-    Object.defineProperty(__vite_ssr_exports__, \\"default\\", { enumerable: true, value: A });"
+    Object.defineProperty(__vite_ssr_exports__, \\"default\\", { enumerable: true, configurable: true, value: A });"
   `)
 })
 
diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts
index d7dc610cb82f47..e7f0ef6b4aab3b 100644
--- a/packages/vite/src/node/ssr/ssrTransform.ts
+++ b/packages/vite/src/node/ssr/ssrTransform.ts
@@ -188,7 +188,7 @@ async function ssrTransformScript(
         s.remove(node.start, node.start + 15 /* 'export default '.length */)
         s.append(
           `\nObject.defineProperty(${ssrModuleExportsKey}, "default", ` +
-            `{ enumerable: true, value: ${name} });`
+            `{ enumerable: true, configurable: true, value: ${name} });`
         )
       } else {
         // anonymous default exports

From c5c424a93cf97e254dae46a35ad6de46ec350a16 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Mon, 13 Jun 2022 16:52:16 +0200
Subject: [PATCH 42/72] feat: expose createFilter util (#8562)

---
 docs/guide/api-plugin.md                      |  4 ++++
 packages/plugin-react/package.json            |  1 -
 packages/plugin-react/src/index.ts            |  3 +--
 packages/plugin-vue-jsx/package.json          |  1 -
 packages/plugin-vue-jsx/src/index.ts          |  2 +-
 packages/plugin-vue-jsx/src/types.ts          |  2 +-
 packages/plugin-vue/package.json              |  3 ---
 packages/plugin-vue/src/index.ts              |  2 +-
 packages/plugin-vue/src/main.ts               |  3 +--
 packages/vite/LICENSE.md                      | 22 +++++++++++++++++++
 packages/vite/rollup.config.ts                |  2 +-
 packages/vite/src/node/config.ts              |  2 +-
 packages/vite/src/node/index.ts               |  1 +
 packages/vite/src/node/packages.ts            |  3 +--
 .../src/node/plugins/dynamicImportVars.ts     |  2 +-
 packages/vite/src/node/plugins/esbuild.ts     |  2 +-
 packages/vite/src/node/publicUtils.ts         |  2 +-
 packages/vite/src/node/ssr/ssrExternal.ts     |  2 +-
 packages/vite/src/node/utils.ts               | 15 +++++++++++++
 pnpm-lock.yaml                                |  8 +------
 20 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/docs/guide/api-plugin.md b/docs/guide/api-plugin.md
index 735a30d3266909..51dc3ef6e0f78f 100644
--- a/docs/guide/api-plugin.md
+++ b/docs/guide/api-plugin.md
@@ -517,6 +517,10 @@ normalizePath('foo\\bar') // 'foo/bar'
 normalizePath('foo/bar') // 'foo/bar'
 ```
 
+## Filtering, include/exclude pattern
+
+Vite exposes [`@rollup/pluginutils`'s `createFilter`](https://github.com/rollup/plugins/tree/master/packages/pluginutils#createfilter) function to encourage Vite specific plugins and integrations to use the standard include/exclude filtering pattern, which is also used in Vite core itself.
+
 ## Client-server Communication
 
 Since Vite 2.9, we provide some utilities for plugins to help handle the communication with clients.
diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json
index 2dbd0d2890afea..07d5586dcc93b1 100644
--- a/packages/plugin-react/package.json
+++ b/packages/plugin-react/package.json
@@ -44,7 +44,6 @@
     "@babel/plugin-transform-react-jsx-development": "^7.16.7",
     "@babel/plugin-transform-react-jsx-self": "^7.17.12",
     "@babel/plugin-transform-react-jsx-source": "^7.16.7",
-    "@rollup/pluginutils": "^4.2.1",
     "react-refresh": "^0.13.0"
   },
   "peerDependencies": {
diff --git a/packages/plugin-react/src/index.ts b/packages/plugin-react/src/index.ts
index 4f3f745096fb36..77ce68a630f631 100644
--- a/packages/plugin-react/src/index.ts
+++ b/packages/plugin-react/src/index.ts
@@ -1,8 +1,7 @@
 import path from 'path'
 import type { ParserOptions, TransformOptions, types as t } from '@babel/core'
 import * as babel from '@babel/core'
-import { createFilter } from '@rollup/pluginutils'
-import { normalizePath } from 'vite'
+import { createFilter, normalizePath } from 'vite'
 import type { Plugin, PluginOption, ResolvedConfig } from 'vite'
 import {
   addRefreshWrapper,
diff --git a/packages/plugin-vue-jsx/package.json b/packages/plugin-vue-jsx/package.json
index 1e345081113256..474bfa48e4f24c 100644
--- a/packages/plugin-vue-jsx/package.json
+++ b/packages/plugin-vue-jsx/package.json
@@ -38,7 +38,6 @@
     "@babel/core": "^7.18.2",
     "@babel/plugin-syntax-import-meta": "^7.10.4",
     "@babel/plugin-transform-typescript": "^7.18.4",
-    "@rollup/pluginutils": "^4.2.1",
     "@vue/babel-plugin-jsx": "^1.1.1"
   },
   "devDependencies": {
diff --git a/packages/plugin-vue-jsx/src/index.ts b/packages/plugin-vue-jsx/src/index.ts
index c3edb77c5b0e6e..48de3da46448ce 100644
--- a/packages/plugin-vue-jsx/src/index.ts
+++ b/packages/plugin-vue-jsx/src/index.ts
@@ -5,7 +5,7 @@ import * as babel from '@babel/core'
 import jsx from '@vue/babel-plugin-jsx'
 // @ts-expect-error missing type
 import importMeta from '@babel/plugin-syntax-import-meta'
-import { createFilter, normalizePath } from '@rollup/pluginutils'
+import { createFilter, normalizePath } from 'vite'
 import type { ComponentOptions } from 'vue'
 import type { Plugin } from 'vite'
 import type { Options } from './types'
diff --git a/packages/plugin-vue-jsx/src/types.ts b/packages/plugin-vue-jsx/src/types.ts
index aa30b7435329f4..a3be580859ea00 100644
--- a/packages/plugin-vue-jsx/src/types.ts
+++ b/packages/plugin-vue-jsx/src/types.ts
@@ -1,5 +1,5 @@
 import type { VueJSXPluginOptions } from '@vue/babel-plugin-jsx'
-import type { FilterPattern } from '@rollup/pluginutils'
+import type { FilterPattern } from 'vite'
 
 export interface FilterOptions {
   include?: FilterPattern
diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json
index d1ca5fd8f9ce46..eee3183d9a4fc5 100644
--- a/packages/plugin-vue/package.json
+++ b/packages/plugin-vue/package.json
@@ -47,8 +47,5 @@
     "source-map": "^0.6.1",
     "vite": "workspace:*",
     "vue": "^3.2.37"
-  },
-  "dependencies": {
-    "@rollup/pluginutils": "^4.2.1"
   }
 }
diff --git a/packages/plugin-vue/src/index.ts b/packages/plugin-vue/src/index.ts
index 6ccbe7bf06da80..3e1b2c3be1b7f5 100644
--- a/packages/plugin-vue/src/index.ts
+++ b/packages/plugin-vue/src/index.ts
@@ -1,6 +1,6 @@
 import fs from 'fs'
 import type { Plugin, ViteDevServer } from 'vite'
-import { createFilter } from '@rollup/pluginutils'
+import { createFilter } from 'vite'
 /* eslint-disable import/no-duplicates */
 import type {
   SFCBlock,
diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts
index be11de7e33a23a..dda9c75d04ec78 100644
--- a/packages/plugin-vue/src/main.ts
+++ b/packages/plugin-vue/src/main.ts
@@ -1,13 +1,12 @@
 import path from 'path'
 import type { SFCBlock, SFCDescriptor } from 'vue/compiler-sfc'
 import type { PluginContext, SourceMap, TransformPluginContext } from 'rollup'
-import { normalizePath } from '@rollup/pluginutils'
 import type { RawSourceMap } from 'source-map'
 import type { EncodedSourceMap as TraceEncodedSourceMap } from '@jridgewell/trace-mapping'
 import { TraceMap, eachMapping } from '@jridgewell/trace-mapping'
 import type { EncodedSourceMap as GenEncodedSourceMap } from '@jridgewell/gen-mapping'
 import { addMapping, fromMap, toEncodedMap } from '@jridgewell/gen-mapping'
-import { transformWithEsbuild } from 'vite'
+import { normalizePath, transformWithEsbuild } from 'vite'
 import {
   createDescriptor,
   getPrevDescriptor,
diff --git a/packages/vite/LICENSE.md b/packages/vite/LICENSE.md
index e65a09826f0f4a..b2991927dc51cf 100644
--- a/packages/vite/LICENSE.md
+++ b/packages/vite/LICENSE.md
@@ -535,6 +535,28 @@ License: MIT
 By: Rich Harris
 Repository: rollup/plugins
 
+> The MIT License (MIT)
+> 
+> Copyright (c) 2019 RollupJS Plugin Contributors (https://github.com/rollup/plugins/graphs/contributors)
+> 
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+> 
+> The above copyright notice and this permission notice shall be included in
+> all copies or substantial portions of the Software.
+> 
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+> THE SOFTWARE.
+
 ---------------------------------------
 
 ## @vue/compiler-core
diff --git a/packages/vite/rollup.config.ts b/packages/vite/rollup.config.ts
index 62f14f7790fa1d..bdf8c94220bb74 100644
--- a/packages/vite/rollup.config.ts
+++ b/packages/vite/rollup.config.ts
@@ -208,7 +208,7 @@ function createCjsConfig(isProduction: boolean) {
       ...Object.keys(pkg.dependencies),
       ...(isProduction ? [] : Object.keys(pkg.devDependencies))
     ],
-    plugins: [...createNodePlugins(false, false, false), bundleSizeLimit(55)]
+    plugins: [...createNodePlugins(false, false, false), bundleSizeLimit(120)]
   })
 }
 
diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
index 99ec143fa85f0f..6bfe9eed759859 100644
--- a/packages/vite/src/node/config.ts
+++ b/packages/vite/src/node/config.ts
@@ -5,7 +5,6 @@ import { performance } from 'perf_hooks'
 import { createRequire } from 'module'
 import colors from 'picocolors'
 import type { Alias, AliasOptions } from 'types/alias'
-import { createFilter } from '@rollup/pluginutils'
 import aliasPlugin from '@rollup/plugin-alias'
 import { build } from 'esbuild'
 import type { RollupOptions } from 'rollup'
@@ -19,6 +18,7 @@ import { resolvePreviewOptions } from './preview'
 import type { CSSOptions } from './plugins/css'
 import {
   createDebugger,
+  createFilter,
   dynamicImport,
   isExternalUrl,
   isObject,
diff --git a/packages/vite/src/node/index.ts b/packages/vite/src/node/index.ts
index 2eb69befb4ee2a..38952e8a466b62 100644
--- a/packages/vite/src/node/index.ts
+++ b/packages/vite/src/node/index.ts
@@ -10,6 +10,7 @@ export { resolvePackageData } from './packages'
 export * from './publicUtils'
 
 // additional types
+export type { FilterPattern } from './utils'
 export type { CorsOptions, CorsOrigin, CommonServerOptions } from './http'
 export type {
   ViteDevServer,
diff --git a/packages/vite/src/node/packages.ts b/packages/vite/src/node/packages.ts
index 1fb2e7b4a21c06..e1c0c18eb5a119 100644
--- a/packages/vite/src/node/packages.ts
+++ b/packages/vite/src/node/packages.ts
@@ -1,7 +1,6 @@
 import fs from 'fs'
 import path from 'path'
-import { createFilter } from '@rollup/pluginutils'
-import { createDebugger, resolveFrom } from './utils'
+import { createDebugger, createFilter, resolveFrom } from './utils'
 import type { ResolvedConfig } from './config'
 import type { Plugin } from './plugin'
 
diff --git a/packages/vite/src/node/plugins/dynamicImportVars.ts b/packages/vite/src/node/plugins/dynamicImportVars.ts
index b6047aa59e138d..ff20c5725dc341 100644
--- a/packages/vite/src/node/plugins/dynamicImportVars.ts
+++ b/packages/vite/src/node/plugins/dynamicImportVars.ts
@@ -3,11 +3,11 @@ import MagicString from 'magic-string'
 import { init, parse as parseImports } from 'es-module-lexer'
 import type { ImportSpecifier } from 'es-module-lexer'
 import { parse as parseJS } from 'acorn'
-import { createFilter } from '@rollup/pluginutils'
 import { dynamicImportToGlob } from '@rollup/plugin-dynamic-import-vars'
 import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '../config'
 import {
+  createFilter,
   normalizePath,
   parseRequest,
   requestQuerySplitRE,
diff --git a/packages/vite/src/node/plugins/esbuild.ts b/packages/vite/src/node/plugins/esbuild.ts
index 11f5ea4dd6cec0..c423edca92f9c1 100644
--- a/packages/vite/src/node/plugins/esbuild.ts
+++ b/packages/vite/src/node/plugins/esbuild.ts
@@ -9,13 +9,13 @@ import type {
 import { transform } from 'esbuild'
 import type { RawSourceMap } from '@ampproject/remapping'
 import type { SourceMap } from 'rollup'
-import { createFilter } from '@rollup/pluginutils'
 import type { TSConfckParseOptions, TSConfckParseResult } from 'tsconfck'
 import { TSConfckParseError, findAll, parse } from 'tsconfck'
 import {
   cleanUrl,
   combineSourcemaps,
   createDebugger,
+  createFilter,
   ensureWatchedFile,
   generateCodeFrame,
   toUpperCaseDriveLetter
diff --git a/packages/vite/src/node/publicUtils.ts b/packages/vite/src/node/publicUtils.ts
index 31c7135965a3d8..664b9375275403 100644
--- a/packages/vite/src/node/publicUtils.ts
+++ b/packages/vite/src/node/publicUtils.ts
@@ -8,7 +8,7 @@ export {
   splitVendorChunkPlugin,
   splitVendorChunk
 } from './plugins/splitVendorChunk'
-export { normalizePath, mergeConfig, mergeAlias } from './utils'
+export { normalizePath, mergeConfig, mergeAlias, createFilter } from './utils'
 export { send } from './server/send'
 export { createLogger } from './logger'
 export { searchForWorkspaceRoot } from './server/searchRoot'
diff --git a/packages/vite/src/node/ssr/ssrExternal.ts b/packages/vite/src/node/ssr/ssrExternal.ts
index fbba0e735f7df1..de0dd5bab031e4 100644
--- a/packages/vite/src/node/ssr/ssrExternal.ts
+++ b/packages/vite/src/node/ssr/ssrExternal.ts
@@ -1,12 +1,12 @@
 import fs from 'fs'
 import path from 'path'
 import { createRequire } from 'module'
-import { createFilter } from '@rollup/pluginutils'
 import type { InternalResolveOptions } from '../plugins/resolve'
 import { tryNodeResolve } from '../plugins/resolve'
 import {
   bareImportRE,
   createDebugger,
+  createFilter,
   isBuiltin,
   isDefined,
   lookupFile,
diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
index 4840cc413eb378..fff0d714770c8d 100644
--- a/packages/vite/src/node/utils.ts
+++ b/packages/vite/src/node/utils.ts
@@ -16,6 +16,7 @@ import type { Alias, AliasOptions } from 'types/alias'
 import type MagicString from 'magic-string'
 
 import type { TransformResult } from 'rollup'
+import { createFilter as _createFilter } from '@rollup/pluginutils'
 import {
   CLIENT_ENTRY,
   CLIENT_PUBLIC_PATH,
@@ -26,6 +27,20 @@ import {
 } from './constants'
 import type { ResolvedConfig } from '.'
 
+/**
+ * Inlined to keep `@rollup/pluginutils` in devDependencies
+ */
+export type FilterPattern =
+  | ReadonlyArray<string | RegExp>
+  | string
+  | RegExp
+  | null
+export const createFilter = _createFilter as (
+  include?: FilterPattern,
+  exclude?: FilterPattern,
+  options?: { resolve?: string | false | null }
+) => (id: string | unknown) => boolean
+
 export function slash(p: string): string {
   return p.replace(/\\/g, '/')
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8c161a5cdc3fff..c06e0ef94d7bfb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -162,7 +162,6 @@ importers:
       '@babel/plugin-transform-react-jsx-development': ^7.16.7
       '@babel/plugin-transform-react-jsx-self': ^7.17.12
       '@babel/plugin-transform-react-jsx-source': ^7.16.7
-      '@rollup/pluginutils': ^4.2.1
       react-refresh: ^0.13.0
       vite: workspace:*
     dependencies:
@@ -171,7 +170,6 @@ importers:
       '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.18.2
       '@babel/plugin-transform-react-jsx-self': 7.17.12_@babel+core@7.18.2
       '@babel/plugin-transform-react-jsx-source': 7.16.7_@babel+core@7.18.2
-      '@rollup/pluginutils': 4.2.1
       react-refresh: 0.13.0
     devDependencies:
       vite: link:../vite
@@ -180,15 +178,12 @@ importers:
     specifiers:
       '@jridgewell/gen-mapping': ^0.3.1
       '@jridgewell/trace-mapping': ^0.3.13
-      '@rollup/pluginutils': ^4.2.1
       debug: ^4.3.4
       rollup: ^2.72.1
       slash: ^4.0.0
       source-map: ^0.6.1
       vite: workspace:*
       vue: ^3.2.37
-    dependencies:
-      '@rollup/pluginutils': 4.2.1
     devDependencies:
       '@jridgewell/gen-mapping': 0.3.1
       '@jridgewell/trace-mapping': 0.3.13
@@ -204,14 +199,12 @@ importers:
       '@babel/core': ^7.18.2
       '@babel/plugin-syntax-import-meta': ^7.10.4
       '@babel/plugin-transform-typescript': ^7.18.4
-      '@rollup/pluginutils': ^4.2.1
       '@vue/babel-plugin-jsx': ^1.1.1
       vite: workspace:*
     dependencies:
       '@babel/core': 7.18.2
       '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.18.2
       '@babel/plugin-transform-typescript': 7.18.4_@babel+core@7.18.2
-      '@rollup/pluginutils': 4.2.1
       '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.18.2
     devDependencies:
       vite: link:../vite
@@ -2168,6 +2161,7 @@ packages:
     dependencies:
       estree-walker: 2.0.2
       picomatch: 2.3.1
+    dev: true
 
   /@rushstack/node-core-library/3.45.5:
     resolution: {integrity: sha512-KbN7Hp9vH3bD3YJfv6RnVtzzTAwGYIBl7y2HQLY4WEQqRbvE3LgI78W9l9X+cTAXCX//p0EeoiUYNTFdqJrMZg==}

From b85802a3b6060542c7073f4e949f1dbbf5908c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Mon, 13 Jun 2022 23:52:33 +0900
Subject: [PATCH 43/72] chore: remove rollup `namespaceToStringTag` (#8569)

---
 packages/vite/src/node/build.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
index 6fe156e3b4e89c..c3d59d88a0549b 100644
--- a/packages/vite/src/node/build.ts
+++ b/packages/vite/src/node/build.ts
@@ -460,6 +460,9 @@ async function doBuild(
         exports: cjsSsrBuild ? 'named' : 'auto',
         sourcemap: options.sourcemap,
         name: libOptions ? libOptions.name : undefined,
+        // es2015 enables `generatedCode.symbols`
+        // - #764 add `Symbol.toStringTag` when build es module into cjs chunk
+        // - #1048 add `Symbol.toStringTag` for module default export
         generatedCode: 'es2015',
         entryFileNames: ssr
           ? `[name].${jsExt}`
@@ -472,9 +475,6 @@ async function doBuild(
         assetFileNames: libOptions
           ? `[name].[ext]`
           : path.posix.join(options.assetsDir, `[name].[hash].[ext]`),
-        // #764 add `Symbol.toStringTag` when build es module into cjs chunk
-        // #1048 add `Symbol.toStringTag` for module default export
-        namespaceToStringTag: true,
         inlineDynamicImports:
           output.format === 'umd' ||
           output.format === 'iife' ||

From 26ecd5a7179cef6e132e73a77939ac14fd926b49 Mon Sep 17 00:00:00 2001
From: yoho <panyoho@gmail.com>
Date: Tue, 14 Jun 2022 01:34:46 +0800
Subject: [PATCH 44/72] fix: objurl for type module, and concurrent tests
 (#8541)

---
 packages/vite/src/node/plugins/worker.ts      |   2 +-
 .../relative-base-assets.spec.ts              |   6 +-
 .../assets/vite.config-relative-base.js       |   8 +-
 playground/assets/vite.config.js              |   3 +-
 playground/test-utils.ts                      |   6 +-
 playground/vitestGlobalSetup.ts               |   4 +-
 playground/vitestSetup.ts                     |  41 ++++--
 .../worker/__tests__/es/es-worker.spec.ts     | 119 +++++++++--------
 .../{worker.spec.ts => iife-worker.spec.ts}   |  68 ++++------
 .../relative-base-worker.spec.ts              | 122 ++++++++++--------
 .../sourcemap-worker.spec.ts.snap             |   2 +-
 playground/worker/index.html                  |  44 ++++---
 playground/worker/my-shared-worker.ts         |  18 +--
 playground/worker/my-worker.ts                |   5 +-
 .../worker/possible-ts-output-worker.mjs      |   8 +-
 playground/worker/vite.config-es.js           |   3 +-
 .../worker/vite.config-relative-base.js       |  11 +-
 playground/worker/vite.config-sourcemap.js    |  21 ++-
 playground/worker/vite.config.js              |  21 ++-
 playground/worker/worker/main-module.js       |  21 +--
 20 files changed, 301 insertions(+), 232 deletions(-)
 rename playground/worker/__tests__/iife/{worker.spec.ts => iife-worker.spec.ts} (54%)

diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
index 2f50acfcdfa0fe..848d118ba0eb64 100644
--- a/packages/vite/src/node/plugins/worker.ts
+++ b/packages/vite/src/node/plugins/worker.ts
@@ -281,7 +281,7 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
             export default function WorkerWrapper() {
               const objURL = blob && (window.URL || window.webkitURL).createObjectURL(blob);
               try {
-                return objURL ? new ${workerConstructor}(objURL${workerOptions}) : new ${workerConstructor}("data:application/javascript;base64," + encodedJs${workerOptions});
+                return objURL ? new ${workerConstructor}(objURL) : new ${workerConstructor}("data:application/javascript;base64," + encodedJs${workerOptions});
               } finally {
                 objURL && (window.URL || window.webkitURL).revokeObjectURL(objURL);
               }
diff --git a/playground/assets/__tests__/relative-base/relative-base-assets.spec.ts b/playground/assets/__tests__/relative-base/relative-base-assets.spec.ts
index a09116c88a7ea6..828ece5ea27c5f 100644
--- a/playground/assets/__tests__/relative-base/relative-base-assets.spec.ts
+++ b/playground/assets/__tests__/relative-base/relative-base-assets.spec.ts
@@ -5,7 +5,8 @@ import {
   getBg,
   getColor,
   isBuild,
-  page
+  page,
+  viteConfig
 } from '~utils'
 
 const absoluteAssetMatch = isBuild
@@ -137,7 +138,8 @@ describe('css url() references', () => {
 describe.runIf(isBuild)('index.css URLs', () => {
   let css: string
   beforeAll(() => {
-    css = findAssetFile(/index.*\.css$/, '', 'other-assets')
+    const base = viteConfig ? viteConfig?.testConfig?.baseRoute : ''
+    css = findAssetFile(/index.*\.css$/, base, 'other-assets')
   })
 
   test('relative asset URL', () => {
diff --git a/playground/assets/vite.config-relative-base.js b/playground/assets/vite.config-relative-base.js
index ba624964d3e0e3..12c3132f79a9b0 100644
--- a/playground/assets/vite.config-relative-base.js
+++ b/playground/assets/vite.config-relative-base.js
@@ -8,7 +8,7 @@ module.exports = {
   base: './', // relative base to make dist portable
   build: {
     ...baseConfig.build,
-    outDir: 'dist',
+    outDir: 'dist/relative-base',
     watch: false,
     minify: false,
     assetsInlineLimit: 0,
@@ -19,5 +19,9 @@ module.exports = {
         assetFileNames: 'other-assets/[name].[hash][extname]'
       }
     }
-  }
+  },
+  testConfig: {
+    baseRoute: '/relative-base/'
+  },
+  cacheDir: 'node_modules/.vite/relative-base'
 }
diff --git a/playground/assets/vite.config.js b/playground/assets/vite.config.js
index c9d821ae3d73ee..23bd11908130cd 100644
--- a/playground/assets/vite.config.js
+++ b/playground/assets/vite.config.js
@@ -17,5 +17,6 @@ module.exports = {
     assetsInlineLimit: 8192, // 8kb
     manifest: true,
     watch: {}
-  }
+  },
+  cacheDir: 'node_modules/.vite/foo'
 }
diff --git a/playground/test-utils.ts b/playground/test-utils.ts
index 2e0eafeda4191e..28534a78655127 100644
--- a/playground/test-utils.ts
+++ b/playground/test-utils.ts
@@ -150,7 +150,7 @@ export async function untilUpdated(
   runInBuild = false
 ): Promise<void> {
   if (isBuild && !runInBuild) return
-  const maxTries = process.env.CI ? 100 : 50
+  const maxTries = process.env.CI ? 200 : 50
   for (let tries = 0; tries < maxTries; tries++) {
     const actual = (await poll()) ?? ''
     if (actual.indexOf(expected) > -1 || tries === maxTries - 1) {
@@ -162,12 +162,12 @@ export async function untilUpdated(
   }
 }
 
-export const extractSourcemap = (content: string) => {
+export const extractSourcemap = (content: string): any => {
   const lines = content.trim().split('\n')
   return fromComment(lines[lines.length - 1]).toObject()
 }
 
-export const formatSourcemapForSnapshot = (map: any) => {
+export const formatSourcemapForSnapshot = (map: any): any => {
   const root = normalizePath(testDir)
   const m = { ...map }
   delete m.file
diff --git a/playground/vitestGlobalSetup.ts b/playground/vitestGlobalSetup.ts
index 52b49d01f38fda..ec598ce6b8d6a3 100644
--- a/playground/vitestGlobalSetup.ts
+++ b/playground/vitestGlobalSetup.ts
@@ -8,7 +8,7 @@ const DIR = path.join(os.tmpdir(), 'vitest_playwright_global_setup')
 
 let browserServer: BrowserServer | undefined
 
-export async function setup() {
+export async function setup(): Promise<void> {
   browserServer = await chromium.launchServer({
     headless: !process.env.VITE_DEBUG_SERVE,
     args: process.env.CI
@@ -41,7 +41,7 @@ export async function setup() {
     })
 }
 
-export async function teardown() {
+export async function teardown(): Promise<void> {
   browserServer?.close()
   if (!process.env.VITE_PRESERVE_BUILD_ARTIFACTS) {
     fs.removeSync(path.resolve(__dirname, '../playground-temp'))
diff --git a/playground/vitestSetup.ts b/playground/vitestSetup.ts
index 13e7592ad380f2..39533fc8b099b7 100644
--- a/playground/vitestSetup.ts
+++ b/playground/vitestSetup.ts
@@ -1,7 +1,6 @@
 import * as http from 'http'
-import { dirname, resolve } from 'path'
+import path, { dirname, resolve } from 'path'
 import os from 'os'
-import path from 'path'
 import sirv from 'sirv'
 import fs from 'fs-extra'
 import { chromium } from 'playwright-chromium'
@@ -25,7 +24,10 @@ export const workspaceRoot = path.resolve(__dirname, '../')
 export const isBuild = !!process.env.VITE_TEST_BUILD
 export const isServe = !isBuild
 export const isWindows = process.platform === 'win32'
-export const viteBinPath = path.join(workspaceRoot, 'packages/vite/bin/vite.js')
+export const viteBinPath = path.posix.join(
+  workspaceRoot,
+  'packages/vite/bin/vite.js'
+)
 
 // #endregion
 
@@ -49,6 +51,11 @@ export let testDir: string
  * Test folder name
  */
 export let testName: string
+/**
+ * current test using vite inline config
+ * when using server.js is not possible to get the config
+ */
+export let viteConfig: InlineConfig | undefined
 
 export const serverLogs: string[] = []
 export const browserLogs: string[] = []
@@ -61,7 +68,17 @@ export let browser: Browser = undefined!
 export let viteTestUrl: string = ''
 export let watcher: RollupWatcher | undefined = undefined
 
-export function setViteUrl(url: string) {
+declare module 'vite' {
+  interface InlineConfig {
+    testConfig?: {
+      // relative base output use relative path
+      // rewrite the url to truth file path
+      baseRoute: string
+    }
+  }
+}
+
+export function setViteUrl(url: string): void {
   viteTestUrl = url
 }
 
@@ -156,7 +173,7 @@ beforeAll(async (s) => {
   }
 })
 
-export async function startDefaultServe() {
+export async function startDefaultServe(): Promise<void> {
   const testCustomConfig = resolve(dirname(testPath), 'vite.config.js')
   let config: InlineConfig | undefined
   if (fs.existsSync(testCustomConfig)) {
@@ -193,9 +210,9 @@ export async function startDefaultServe() {
 
   if (!isBuild) {
     process.env.VITE_INLINE = 'inline-serve'
-    server = await (
-      await createServer(mergeConfig(options, config || {}))
-    ).listen()
+    const testConfig = mergeConfig(options, config || {})
+    viteConfig = testConfig
+    server = await (await createServer(testConfig)).listen()
     // use resolved port/base from server
     const base = server.config.base === '/' ? '' : server.config.base
     viteTestUrl = `http://localhost:${server.config.server.port}${base}`
@@ -210,7 +227,9 @@ export async function startDefaultServe() {
       }
     })
     options.plugins = [resolvedPlugin()]
-    const rollupOutput = await build(mergeConfig(options, config || {}))
+    const testConfig = mergeConfig(options, config || {})
+    viteConfig = testConfig
+    const rollupOutput = await build(testConfig)
     const isWatch = !!resolvedConfig!.build.watch
     // in build watch,call startStaticServer after the build is complete
     if (isWatch) {
@@ -245,11 +264,15 @@ function startStaticServer(config?: InlineConfig): Promise<string> {
 
   // start static file server
   const serve = sirv(resolve(rootDir, 'dist'), { dev: !!config?.build?.watch })
+  const baseDir = config?.testConfig?.baseRoute
   const httpServer = (server = http.createServer((req, res) => {
     if (req.url === '/ping') {
       res.statusCode = 200
       res.end('pong')
     } else {
+      if (baseDir) {
+        req.url = path.posix.join(baseDir, req.url)
+      }
       serve(req, res)
     }
   }))
diff --git a/playground/worker/__tests__/es/es-worker.spec.ts b/playground/worker/__tests__/es/es-worker.spec.ts
index 9959cc29aef0bd..1520670e2b602f 100644
--- a/playground/worker/__tests__/es/es-worker.spec.ts
+++ b/playground/worker/__tests__/es/es-worker.spec.ts
@@ -1,63 +1,48 @@
 import fs from 'fs'
 import path from 'path'
-import type { Page } from 'playwright-chromium'
 import { isBuild, page, testDir, untilUpdated } from '~utils'
 
 test('normal', async () => {
-  await page.click('.ping')
-  await untilUpdated(() => page.textContent('.pong'), 'pong')
+  await untilUpdated(() => page.textContent('.pong'), 'pong', true)
   await untilUpdated(
     () => page.textContent('.mode'),
-    process.env.NODE_ENV // match workerImport.js
+    process.env.NODE_ENV,
+    true
   )
   await untilUpdated(
     () => page.textContent('.bundle-with-plugin'),
-    'worker bundle with plugin success!'
+    'worker bundle with plugin success!',
+    true
   )
 })
 
 test('TS output', async () => {
-  await page.click('.ping-ts-output')
-  await untilUpdated(() => page.textContent('.pong-ts-output'), 'pong')
+  await untilUpdated(() => page.textContent('.pong-ts-output'), 'pong', true)
 })
 
 test('inlined', async () => {
-  await page.click('.ping-inline')
-  await untilUpdated(() => page.textContent('.pong-inline'), 'pong')
+  await untilUpdated(() => page.textContent('.pong-inline'), 'pong', true)
 })
 
-const waitSharedWorkerTick = (
-  (resolvedSharedWorkerCount: number) => async (page: Page) => {
-    await untilUpdated(async () => {
-      const count = await page.textContent('.tick-count')
-      // ignore the initial 0
-      return count === '1' ? 'page loaded' : ''
-    }, 'page loaded')
-    // test.concurrent sequential is not guaranteed
-    // force page to wait to ensure two pages overlap in time
-    resolvedSharedWorkerCount++
-    if (resolvedSharedWorkerCount < 2) return
-
-    await untilUpdated(() => {
-      return resolvedSharedWorkerCount === 2 ? 'all pages loaded' : ''
-    }, 'all pages loaded')
-  }
-)(0)
-
-test.each([[true], [false]])('shared worker', async (doTick) => {
-  if (doTick) {
-    await page.click('.tick-shared')
-  }
-  await waitSharedWorkerTick(page)
+test('shared worker', async () => {
+  await untilUpdated(() => page.textContent('.tick-count'), 'pong', true)
 })
 
 test('worker emitted and import.meta.url in nested worker (serve)', async () => {
-  expect(await page.textContent('.nested-worker')).toMatch(
-    'worker-nested-worker'
+  await untilUpdated(
+    () => page.textContent('.nested-worker'),
+    'worker-nested-worker',
+    true
   )
-  expect(await page.textContent('.nested-worker-module')).toMatch('sub-worker')
-  expect(await page.textContent('.nested-worker-constructor')).toMatch(
-    '"type":"constructor"'
+  await untilUpdated(
+    () => page.textContent('.nested-worker-module'),
+    'sub-worker',
+    true
+  )
+  await untilUpdated(
+    () => page.textContent('.nested-worker-constructor'),
+    '"type":"constructor"',
+    true
   )
 })
 
@@ -87,45 +72,73 @@ describe.runIf(isBuild)('build', () => {
   })
 
   test('worker emitted and import.meta.url in nested worker (build)', async () => {
-    expect(await page.textContent('.nested-worker-module')).toMatch(
-      '"type":"module"'
+    await untilUpdated(
+      () => page.textContent('.nested-worker-module'),
+      '"type":"module"',
+      true
     )
-    expect(await page.textContent('.nested-worker-constructor')).toMatch(
-      '"type":"constructor"'
+    await untilUpdated(
+      () => page.textContent('.nested-worker-constructor'),
+      '"type":"constructor"',
+      true
     )
   })
 })
 
 test('module worker', async () => {
-  expect(await page.textContent('.shared-worker-import-meta-url')).toMatch(
-    'A string'
+  await untilUpdated(
+    () => page.textContent('.shared-worker-import-meta-url'),
+    'A string',
+    true
   )
 })
 
 test('classic worker', async () => {
-  expect(await page.textContent('.classic-worker')).toMatch('A classic')
-  expect(await page.textContent('.classic-shared-worker')).toMatch('A classic')
+  await untilUpdated(
+    () => page.textContent('.classic-worker'),
+    'A classic',
+    true
+  )
+  await untilUpdated(
+    () => page.textContent('.classic-shared-worker'),
+    'A classic',
+    true
+  )
 })
 
 test('emit chunk', async () => {
-  expect(await page.textContent('.emit-chunk-worker')).toMatch(
-    '["A string",{"type":"emit-chunk-sub-worker","data":"A string"},{"type":"module-and-worker:worker","data":"A string"},{"type":"module-and-worker:module","data":"module and worker"},{"type":"emit-chunk-sub-worker","data":{"module":"module and worker","msg1":"module1","msg2":"module2","msg3":"module3"}}]'
+  await untilUpdated(
+    () => page.textContent('.emit-chunk-worker'),
+    '["A string",{"type":"emit-chunk-sub-worker","data":"A string"},{"type":"module-and-worker:worker","data":"A string"},{"type":"module-and-worker:module","data":"module and worker"},{"type":"emit-chunk-sub-worker","data":{"module":"module and worker","msg1":"module1","msg2":"module2","msg3":"module3"}}]',
+    true
   )
-  expect(await page.textContent('.emit-chunk-dynamic-import-worker')).toMatch(
-    '"A string/es/"'
+  await untilUpdated(
+    () => page.textContent('.emit-chunk-dynamic-import-worker'),
+    '"A string/es/"',
+    true
   )
 })
 
 test('url query worker', async () => {
-  expect(await page.textContent('.simple-worker-url')).toMatch(
-    'Hello from simple worker!'
+  await untilUpdated(
+    () => page.textContent('.simple-worker-url'),
+    'Hello from simple worker!',
+    true
   )
 })
 
 test('import.meta.glob in worker', async () => {
-  expect(await page.textContent('.importMetaGlob-worker')).toMatch('["')
+  await untilUpdated(
+    () => page.textContent('.importMetaGlob-worker'),
+    '["',
+    true
+  )
 })
 
 test('import.meta.glob with eager in worker', async () => {
-  expect(await page.textContent('.importMetaGlobEager-worker')).toMatch('["')
+  await untilUpdated(
+    () => page.textContent('.importMetaGlobEager-worker'),
+    '["',
+    true
+  )
 })
diff --git a/playground/worker/__tests__/iife/worker.spec.ts b/playground/worker/__tests__/iife/iife-worker.spec.ts
similarity index 54%
rename from playground/worker/__tests__/iife/worker.spec.ts
rename to playground/worker/__tests__/iife/iife-worker.spec.ts
index d7b437c8a3272d..8483a206036bf0 100644
--- a/playground/worker/__tests__/iife/worker.spec.ts
+++ b/playground/worker/__tests__/iife/iife-worker.spec.ts
@@ -1,16 +1,11 @@
 import fs from 'fs'
 import path from 'path'
-import type { Page } from 'playwright-chromium'
 import { test } from 'vitest'
 import { isBuild, page, testDir, untilUpdated } from '~utils'
 
 test('normal', async () => {
-  await page.click('.ping')
   await untilUpdated(() => page.textContent('.pong'), 'pong')
-  await untilUpdated(
-    () => page.textContent('.mode'),
-    process.env.NODE_ENV // match workerImport.js
-  )
+  await untilUpdated(() => page.textContent('.mode'), process.env.NODE_ENV)
   await untilUpdated(
     () => page.textContent('.bundle-with-plugin'),
     'worker bundle with plugin success!'
@@ -18,44 +13,25 @@ test('normal', async () => {
 })
 
 test('TS output', async () => {
-  await page.click('.ping-ts-output')
   await untilUpdated(() => page.textContent('.pong-ts-output'), 'pong')
 })
 
 test('inlined', async () => {
-  await page.click('.ping-inline')
   await untilUpdated(() => page.textContent('.pong-inline'), 'pong')
 })
 
-const waitSharedWorkerTick = (
-  (resolvedSharedWorkerCount: number) => async (page: Page) => {
-    await untilUpdated(async () => {
-      const count = await page.textContent('.tick-count')
-      // ignore the initial 0
-      return count === '1' ? 'page loaded' : ''
-    }, 'page loaded')
-    // test.concurrent sequential is not guaranteed
-    // force page to wait to ensure two pages overlap in time
-    resolvedSharedWorkerCount++
-    if (resolvedSharedWorkerCount < 2) return
-
-    await untilUpdated(() => {
-      return resolvedSharedWorkerCount === 2 ? 'all pages loaded' : ''
-    }, 'all pages loaded')
-  }
-)(0)
-
-test.each([[true], [false]])('shared worker', async (doTick) => {
-  if (doTick) {
-    await page.click('.tick-shared')
-  }
-  await waitSharedWorkerTick(page)
+test('shared worker', async () => {
+  await untilUpdated(() => page.textContent('.tick-count'), 'pong')
 })
 
 test('worker emitted and import.meta.url in nested worker (serve)', async () => {
-  expect(await page.textContent('.nested-worker')).toMatch('/worker-nested')
-  expect(await page.textContent('.nested-worker-module')).toMatch('/sub-worker')
-  expect(await page.textContent('.nested-worker-constructor')).toMatch(
+  await untilUpdated(() => page.textContent('.nested-worker'), '/worker-nested')
+  await untilUpdated(
+    () => page.textContent('.nested-worker-module'),
+    '/sub-worker'
+  )
+  await untilUpdated(
+    () => page.textContent('.nested-worker-constructor'),
     '"type":"constructor"'
   )
 })
@@ -86,32 +62,42 @@ describe.runIf(isBuild)('build', () => {
   })
 
   test('worker emitted and import.meta.url in nested worker (build)', async () => {
-    expect(await page.textContent('.nested-worker-module')).toMatch(
+    await untilUpdated(
+      () => page.textContent('.nested-worker-module'),
       '"type":"module"'
     )
-    expect(await page.textContent('.nested-worker-constructor')).toMatch(
+    await untilUpdated(
+      () => page.textContent('.nested-worker-constructor'),
       '"type":"constructor"'
     )
   })
 })
 
 test('module worker', async () => {
-  expect(await page.textContent('.shared-worker-import-meta-url')).toMatch(
+  await untilUpdated(
+    () => page.textContent('.shared-worker-import-meta-url'),
     'A string'
   )
 })
 
 test('classic worker', async () => {
-  expect(await page.textContent('.classic-worker')).toMatch('A classic')
-  expect(await page.textContent('.classic-shared-worker')).toMatch('A classic')
+  await untilUpdated(() => page.textContent('.classic-worker'), 'A classic')
+  await untilUpdated(
+    () => page.textContent('.classic-shared-worker'),
+    'A classic'
+  )
 })
 
 test('url query worker', async () => {
-  expect(await page.textContent('.simple-worker-url')).toMatch(
+  await untilUpdated(
+    () => page.textContent('.simple-worker-url'),
     'Hello from simple worker!'
   )
 })
 
 test('import.meta.glob eager in worker', async () => {
-  expect(await page.textContent('.importMetaGlobEager-worker')).toMatch('["')
+  await untilUpdated(
+    () => page.textContent('.importMetaGlobEager-worker'),
+    '["'
+  )
 })
diff --git a/playground/worker/__tests__/relative-base/relative-base-worker.spec.ts b/playground/worker/__tests__/relative-base/relative-base-worker.spec.ts
index 2b146075f38146..b93513264b126e 100644
--- a/playground/worker/__tests__/relative-base/relative-base-worker.spec.ts
+++ b/playground/worker/__tests__/relative-base/relative-base-worker.spec.ts
@@ -1,74 +1,62 @@
 import fs from 'fs'
 import path from 'path'
-import type { Page } from 'playwright-chromium'
 import { isBuild, page, testDir, untilUpdated } from '~utils'
 
 test('normal', async () => {
-  await page.click('.ping')
-  await untilUpdated(() => page.textContent('.pong'), 'pong')
+  await untilUpdated(() => page.textContent('.pong'), 'pong', true)
   await untilUpdated(
     () => page.textContent('.mode'),
-    process.env.NODE_ENV // match workerImport.js
+    process.env.NODE_ENV,
+    true
   )
   await untilUpdated(
     () => page.textContent('.bundle-with-plugin'),
-    'worker bundle with plugin success!'
+    'worker bundle with plugin success!',
+    true
   )
 })
 
 test('TS output', async () => {
-  await page.click('.ping-ts-output')
-  await untilUpdated(() => page.textContent('.pong-ts-output'), 'pong')
+  await untilUpdated(() => page.textContent('.pong-ts-output'), 'pong', true)
 })
 
 test('inlined', async () => {
-  await page.click('.ping-inline')
-  await untilUpdated(() => page.textContent('.pong-inline'), 'pong')
+  await untilUpdated(() => page.textContent('.pong-inline'), 'pong', true)
 })
 
-const waitSharedWorkerTick = (
-  (resolvedSharedWorkerCount: number) => async (page: Page) => {
-    await untilUpdated(async () => {
-      const count = await page.textContent('.tick-count')
-      // ignore the initial 0
-      return count === '1' ? 'page loaded' : ''
-    }, 'page loaded')
-    // test.concurrent sequential is not guaranteed
-    // force page to wait to ensure two pages overlap in time
-    resolvedSharedWorkerCount++
-    if (resolvedSharedWorkerCount < 2) return
-
-    await untilUpdated(() => {
-      return resolvedSharedWorkerCount === 2 ? 'all pages loaded' : ''
-    }, 'all pages loaded')
-  }
-)(0)
-
-test.each([[true], [false]])('shared worker', async (doTick) => {
-  if (doTick) {
-    await page.click('.tick-shared')
-  }
-  await waitSharedWorkerTick(page)
+test('shared worker', async () => {
+  await untilUpdated(() => page.textContent('.tick-count'), 'pong', true)
 })
 
 test('worker emitted and import.meta.url in nested worker (serve)', async () => {
-  expect(await page.textContent('.nested-worker')).toMatch(
-    'worker-nested-worker'
+  await untilUpdated(
+    () => page.textContent('.nested-worker'),
+    'worker-nested-worker',
+    true
   )
-  expect(await page.textContent('.nested-worker-module')).toMatch('sub-worker')
-  expect(await page.textContent('.nested-worker-constructor')).toMatch(
-    '"type":"constructor"'
+  await untilUpdated(
+    () => page.textContent('.nested-worker-module'),
+    'sub-worker',
+    true
+  )
+  await untilUpdated(
+    () => page.textContent('.nested-worker-constructor'),
+    '"type":"constructor"',
+    true
   )
 })
 
 describe.runIf(isBuild)('build', () => {
   // assert correct files
-  test('inlined code generation', async () => {
-    const chunksDir = path.resolve(testDir, 'dist/chunks')
+  test('inlined code generation', () => {
+    const chunksDir = path.resolve(testDir, 'dist/relative-base/chunks')
     const files = fs.readdirSync(chunksDir)
     const index = files.find((f) => f.includes('main-module'))
     const content = fs.readFileSync(path.resolve(chunksDir, index), 'utf-8')
-    const workerEntriesDir = path.resolve(testDir, 'dist/worker-entries')
+    const workerEntriesDir = path.resolve(
+      testDir,
+      'dist/relative-base/worker-entries'
+    )
     const workerFiles = fs.readdirSync(workerEntriesDir)
     const worker = workerFiles.find((f) => f.includes('worker_entry.my-worker'))
     const workerContent = fs.readFileSync(
@@ -88,39 +76,65 @@ describe.runIf(isBuild)('build', () => {
   })
 
   test('worker emitted and import.meta.url in nested worker (build)', async () => {
-    expect(await page.textContent('.nested-worker-module')).toMatch(
-      '"type":"module"'
+    await untilUpdated(
+      () => page.textContent('.nested-worker-module'),
+      '"type":"module"',
+      true
     )
-    expect(await page.textContent('.nested-worker-constructor')).toMatch(
-      '"type":"constructor"'
+    await untilUpdated(
+      () => page.textContent('.nested-worker-constructor'),
+      '"type":"constructor"',
+      true
     )
   })
 })
 
 test('module worker', async () => {
-  expect(await page.textContent('.shared-worker-import-meta-url')).toMatch(
-    'A string'
+  await untilUpdated(
+    () => page.textContent('.shared-worker-import-meta-url'),
+    'A string',
+    true
   )
 })
 
 test.runIf(isBuild)('classic worker', async () => {
-  expect(await page.textContent('.classic-worker')).toMatch('A classic')
-  expect(await page.textContent('.classic-shared-worker')).toMatch('A classic')
+  await untilUpdated(
+    () => page.textContent('.classic-worker'),
+    'A classic',
+    true
+  )
+  await untilUpdated(
+    () => page.textContent('.classic-shared-worker'),
+    'A classic',
+    true
+  )
 })
 
 test.runIf(isBuild)('emit chunk', async () => {
-  expect(await page.textContent('.emit-chunk-worker')).toMatch(
-    '["A string",{"type":"emit-chunk-sub-worker","data":"A string"},{"type":"module-and-worker:worker","data":"A string"},{"type":"module-and-worker:module","data":"module and worker"},{"type":"emit-chunk-sub-worker","data":{"module":"module and worker","msg1":"module1","msg2":"module2","msg3":"module3"}}]'
+  await untilUpdated(
+    () => page.textContent('.emit-chunk-worker'),
+    '["A string",{"type":"emit-chunk-sub-worker","data":"A string"},{"type":"module-and-worker:worker","data":"A string"},{"type":"module-and-worker:module","data":"module and worker"},{"type":"emit-chunk-sub-worker","data":{"module":"module and worker","msg1":"module1","msg2":"module2","msg3":"module3"}}]',
+    true
   )
-  expect(await page.textContent('.emit-chunk-dynamic-import-worker')).toMatch(
-    '"A string./"'
+  await untilUpdated(
+    () => page.textContent('.emit-chunk-dynamic-import-worker'),
+    '"A string./"',
+    true
   )
 })
 
 test('import.meta.glob in worker', async () => {
-  expect(await page.textContent('.importMetaGlob-worker')).toMatch('["')
+  await untilUpdated(
+    () => page.textContent('.importMetaGlob-worker'),
+    '["',
+    true
+  )
 })
 
 test('import.meta.glob with eager in worker', async () => {
-  expect(await page.textContent('.importMetaGlobEager-worker')).toMatch('["')
+  await untilUpdated(
+    () => page.textContent('.importMetaGlobEager-worker'),
+    '["',
+    true
+  )
 })
diff --git a/playground/worker/__tests__/sourcemap/__snapshots__/sourcemap-worker.spec.ts.snap b/playground/worker/__tests__/sourcemap/__snapshots__/sourcemap-worker.spec.ts.snap
index 71ea7527a69d51..3895aae40ad402 100644
--- a/playground/worker/__tests__/sourcemap/__snapshots__/sourcemap-worker.spec.ts.snap
+++ b/playground/worker/__tests__/sourcemap/__snapshots__/sourcemap-worker.spec.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`serve:worker-sourcemap > nested worker 1`] = `
 {
-  "mappings": "AAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,uCAAsB,CAAC;AAClD;AACA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AACH,CAAC;AACD;AACA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;",
+  "mappings": "AAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,uCAAsB,CAAC;AAClD;AACA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjC,CAAC;AACD;AACA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/B;AACA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;",
   "sources": [
     "/root/possible-ts-output-worker.mjs?worker_file",
   ],
diff --git a/playground/worker/index.html b/playground/worker/index.html
index 1fd387d5a9c08b..d444f2ab878b98 100644
--- a/playground/worker/index.html
+++ b/playground/worker/index.html
@@ -1,30 +1,40 @@
+<h2 class="format-iife">format iife:</h2>
+<div>Expected values: <span class="mode-true"></span></div>
+
 <p>worker template error match:</p>
 <code>
   const worker = new Worker(new URL('./worker.js', import.meta.url))
 </code>
 
-<h2 class="format-iife">format iife:</h2>
-<div>Expected values: <span class="mode-true"></span></div>
-<button class="ping">Ping</button>
+<p>
+  import myWorker from '../my-worker?worker'
+  <span class="classname">.pong</span>
+  <span class="classname">.mode</span>
+  <span class="classname">.bundle-with-plugin</span>
+</p>
 <div>
-  Response from worker: <span class="pong"></span><span class="mode"></span>
+  <div>Response from worker: <span class="pong"></span></div>
+  <div>mode: <span class="mode"></span></div>
+  <div>bundle-with-plugin: <span class="bundle-with-plugin"></span></div>
 </div>
-<div>bundle-with-plugin: <span class="bundle-with-plugin"></span></div>
 
-<button class="ping-inline">Ping Inline Worker</button>
-<div>Response from inline worker: <span class="pong-inline"></span></div>
+<p>
+  import InlineWorker from '../my-worker?worker&inline'
+  <span class="classname">.pong-inline</span>
+</p>
+<code class="pong-inline"></code>
 
-<button class="ping-ts-output">Ping Possible Compiled TS Worker</button>
-<div>
-  Response from worker imported from code that might be compiled TS:
-  <span class="pong-ts-output"></span>
-</div>
+<p>
+  import TSOutputWorker from '../possible-ts-output-worker?worker'
+  <span class="classname">.pong-ts-output</span>
+</p>
+<code class="pong-ts-output"></code>
 
-<button class="tick-shared">Tick Shared Worker</button>
-<div>
-  Tick from shared worker, it syncs between pages:
-  <span class="tick-count">0</span>
-</div>
+<p>
+  import mySharedWorker from '../my-shared-worker?sharedworker&name=shared'
+  <span class="classname">.tick-count</span>
+</p>
+<code class="tick-count"></code>
 
 <p>
   new Worker(new URL('./url-worker.js', import.meta.url), { type: 'module' })
diff --git a/playground/worker/my-shared-worker.ts b/playground/worker/my-shared-worker.ts
index 8d2099a7636459..2c77f0fd56c701 100644
--- a/playground/worker/my-shared-worker.ts
+++ b/playground/worker/my-shared-worker.ts
@@ -1,22 +1,16 @@
-let count = 0
 const ports = new Set()
 
 // @ts-expect-error
-onconnect = (event) => {
+self.onconnect = (event) => {
   const port = event.ports[0]
   ports.add(port)
-  port.postMessage(count)
-  port.onmessage = (message) => {
-    if (message.data === 'tick') {
-      count++
-      ports.forEach((p: any) => {
-        p.postMessage(count)
-      })
-    }
+  port.postMessage('pong')
+  port.onmessage = () => {
+    ports.forEach((p: any) => {
+      p.postMessage('pong')
+    })
   }
 }
 
 // for sourcemap
 console.log('my-shared-worker.js')
-
-export {}
diff --git a/playground/worker/my-worker.ts b/playground/worker/my-worker.ts
index 7207a0ea5a077e..8c91d49d70ba5c 100644
--- a/playground/worker/my-worker.ts
+++ b/playground/worker/my-worker.ts
@@ -1,12 +1,13 @@
 import { mode, msg } from './modules/workerImport'
 import { bundleWithPlugin } from './modules/test-plugin'
-// import { msg as msgFromDep } from 'dep-to-optimize'
+import { msg as msgFromDep } from 'dep-to-optimize'
 
 self.onmessage = (e) => {
   if (e.data === 'ping') {
-    self.postMessage({ msg, mode, bundleWithPlugin }) // TODO: fix darwin, and add back: msgFromDep })
+    self.postMessage({ msg, mode, bundleWithPlugin })
   }
 }
+self.postMessage({ msg, mode, bundleWithPlugin, msgFromDep })
 
 // for sourcemap
 console.log('my-worker.js')
diff --git a/playground/worker/possible-ts-output-worker.mjs b/playground/worker/possible-ts-output-worker.mjs
index db76614bc78267..e51c26e76c09b2 100644
--- a/playground/worker/possible-ts-output-worker.mjs
+++ b/playground/worker/possible-ts-output-worker.mjs
@@ -1,10 +1,10 @@
-import { msg, mode } from './modules/workerImport'
+import { mode, msg } from './modules/workerImport'
 
 self.onmessage = (e) => {
-  if (e.data === 'ping') {
-    self.postMessage({ msg, mode })
-  }
+  self.postMessage({ msg, mode })
 }
 
+self.postMessage({ msg, mode })
+
 // for sourcemap
 console.log('possible-ts-output-worker.mjs')
diff --git a/playground/worker/vite.config-es.js b/playground/worker/vite.config-es.js
index 6d6704de0bc213..0d28d241ca8d42 100644
--- a/playground/worker/vite.config-es.js
+++ b/playground/worker/vite.config-es.js
@@ -38,5 +38,6 @@ module.exports = vite.defineConfig({
         }
       }
     }
-  ]
+  ],
+  cacheDir: 'node_modules/.vite/es'
 })
diff --git a/playground/worker/vite.config-relative-base.js b/playground/worker/vite.config-relative-base.js
index dd10caa205f60b..64c2b7983fb527 100644
--- a/playground/worker/vite.config-relative-base.js
+++ b/playground/worker/vite.config-relative-base.js
@@ -1,10 +1,9 @@
+const path = require('path')
 const vueJsx = require('@vitejs/plugin-vue-jsx')
 const vite = require('vite')
-const path = require('path')
 
 module.exports = vite.defineConfig({
   base: './',
-  enforce: 'pre',
   worker: {
     format: 'es',
     plugins: [vueJsx()],
@@ -17,7 +16,7 @@ module.exports = vite.defineConfig({
     }
   },
   build: {
-    outDir: 'dist',
+    outDir: 'dist/relative-base',
     rollupOptions: {
       output: {
         assetFileNames: 'other-assets/[name]-[hash].[ext]',
@@ -26,6 +25,9 @@ module.exports = vite.defineConfig({
       }
     }
   },
+  testConfig: {
+    baseRoute: '/relative-base/'
+  },
   plugins: [
     {
       name: 'resolve-format-es',
@@ -38,5 +40,6 @@ module.exports = vite.defineConfig({
         }
       }
     }
-  ]
+  ],
+  cacheDir: 'node_modules/.vite/relative-base'
 })
diff --git a/playground/worker/vite.config-sourcemap.js b/playground/worker/vite.config-sourcemap.js
index ea1c66a33a44d7..a84d8e6699af14 100644
--- a/playground/worker/vite.config-sourcemap.js
+++ b/playground/worker/vite.config-sourcemap.js
@@ -12,13 +12,30 @@ module.exports = vite.defineConfig((sourcemap) => {
     }/`,
     worker: {
       format: 'iife',
-      plugins: [vueJsx()]
+      plugins: [vueJsx()],
+      rollupOptions: {
+        output: {
+          assetFileNames: 'assets/[name].worker_asset[hash].[ext]',
+          chunkFileNames: 'assets/[name].worker_chunk[hash].js',
+          entryFileNames: 'assets/[name].worker_entry[hash].js'
+        }
+      }
     },
+    cacheDir: `node_modules/.vite/iife-${
+      typeof sourcemap === 'boolean' ? 'sourcemap' : 'sourcemap-' + sourcemap
+    }`,
     build: {
       outDir: `dist/iife-${
         typeof sourcemap === 'boolean' ? 'sourcemap' : 'sourcemap-' + sourcemap
       }/`,
-      sourcemap: sourcemap
+      sourcemap: sourcemap,
+      rollupOptions: {
+        output: {
+          assetFileNames: 'assets/[name].[hash].[ext]',
+          chunkFileNames: 'assets/[name].[hash].js',
+          entryFileNames: 'assets/[name].[hash].js'
+        }
+      }
     }
   }
 })
diff --git a/playground/worker/vite.config.js b/playground/worker/vite.config.js
index b7760bc4d7a240..f937372c6e0012 100644
--- a/playground/worker/vite.config.js
+++ b/playground/worker/vite.config.js
@@ -5,9 +5,24 @@ module.exports = vite.defineConfig({
   base: '/iife/',
   worker: {
     format: 'iife',
-    plugins: [vueJsx()]
+    plugins: [vueJsx()],
+    rollupOptions: {
+      output: {
+        assetFileNames: 'assets/worker_asset.[name].[ext]',
+        chunkFileNames: 'assets/worker_chunk.[name].js',
+        entryFileNames: 'assets/worker_entry.[name].js'
+      }
+    }
   },
   build: {
-    outDir: 'dist/iife'
-  }
+    outDir: 'dist/iife',
+    rollupOptions: {
+      output: {
+        assetFileNames: 'assets/[name].[ext]',
+        chunkFileNames: 'assets/[name].js',
+        entryFileNames: 'assets/[name].js'
+      }
+    }
+  },
+  cacheDir: 'node_modules/.vite/iife'
 })
diff --git a/playground/worker/worker/main-module.js b/playground/worker/worker/main-module.js
index 81e639341d9d5b..4f6fa8dd7b6334 100644
--- a/playground/worker/worker/main-module.js
+++ b/playground/worker/worker/main-module.js
@@ -12,46 +12,31 @@ function text(el, text) {
 document.querySelector('.mode-true').textContent = mode
 
 const worker = new myWorker()
+worker.postMessage('ping')
 worker.addEventListener('message', (e) => {
   text('.pong', e.data.msg)
   text('.mode', e.data.mode)
   text('.bundle-with-plugin', e.data.bundleWithPlugin)
 })
 
-document.querySelector('.ping').addEventListener('click', () => {
-  worker.postMessage('ping')
-})
-
 const inlineWorker = new InlineWorker()
+inlineWorker.postMessage('ping')
 inlineWorker.addEventListener('message', (e) => {
   text('.pong-inline', e.data.msg)
 })
 
-document.querySelector('.ping-inline').addEventListener('click', () => {
-  console.log('111')
-  inlineWorker.postMessage('ping')
-})
-
 const sharedWorker = new mySharedWorker()
-document.querySelector('.tick-shared').addEventListener('click', () => {
-  sharedWorker.port.postMessage('tick')
-})
-
 sharedWorker.port.addEventListener('message', (event) => {
   text('.tick-count', event.data)
 })
-
 sharedWorker.port.start()
 
 const tsOutputWorker = new TSOutputWorker()
+tsOutputWorker.postMessage('ping')
 tsOutputWorker.addEventListener('message', (e) => {
   text('.pong-ts-output', e.data.msg)
 })
 
-document.querySelector('.ping-ts-output').addEventListener('click', () => {
-  tsOutputWorker.postMessage('ping')
-})
-
 const nestedWorker = new NestedWorker()
 nestedWorker.addEventListener('message', (ev) => {
   if (typeof ev.data === 'string') {

From 0e20949dbf0ba38bdaefbf32a36764fe29858e20 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Tue, 14 Jun 2022 02:26:27 +0800
Subject: [PATCH 45/72] chore: update major deps (#8572)

---
 .eslintrc.cjs                                 |   2 +-
 .github/renovate.json5                        |   8 +-
 package.json                                  |  10 +-
 packages/create-vite/__tests__/cli.spec.ts    |   4 +-
 packages/plugin-legacy/package.json           |   6 +-
 packages/plugin-react/package.json            |   2 +-
 packages/plugin-vue-jsx/package.json          |   2 +-
 packages/plugin-vue/package.json              |   2 +-
 packages/vite/LICENSE.md                      |   6 +-
 packages/vite/package.json                    |  16 +-
 packages/vite/rollup.config.ts                |   5 -
 packages/vite/src/node/ssr/ssrTransform.ts    |   2 +
 playground/cli-module/__tests__/serve.ts      |   6 +-
 playground/cli/__tests__/serve.ts             |   6 +-
 .../__tests__/resolve-config.spec.ts          |   4 +-
 playground/ssr-react/package.json             |   4 +-
 playground/test-utils.ts                      |   4 +-
 pnpm-lock.yaml                                | 787 +++++++++++-------
 scripts/releaseUtils.ts                       |   2 +-
 19 files changed, 529 insertions(+), 349 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index edc202b5e539df..f0b3be9e03a8bb 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -155,7 +155,7 @@ module.exports = defineConfig({
       }
     },
     {
-      files: ['*.js'],
+      files: ['playground/**', '*.js'],
       rules: {
         '@typescript-eslint/explicit-module-boundary-types': 'off'
       }
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 05c1c02ab4cb12..1f12ef5dc54a5c 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -19,15 +19,11 @@
     "typescript",
 
     // breaking changes
-    "cac", // `cac:v6.7.10+` has breaking changes
     "react-router", // `react-router:v6.0.0+` has breaking changes
     "react-router-dom", // `react-router-dom:v6.0.0+` has breaking changes
     "source-map", // `source-map:v0.7.0+` needs more investigation
     "dotenv-expand", // `dotenv-expand:6.0.0+` has breaking changes (#6858)
-
-    // ESM Only => https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c#how-can-i-move-my-commonjs-project-to-esm
-    "node-fetch",
-    "periscopic",
-    "strip-ansi"
+    "kill-port", // `kill-port:^2.0.0 has perf issues (#8392)
+    "miniflare" // `miniflare:v2.0.0+` only supports node 16.7
   ]
 }
diff --git a/package.json b/package.json
index 5de01da5f99422..44ddf5e1ac23b9 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "@types/micromatch": "^4.0.2",
     "@types/mime": "^2.0.3",
     "@types/minimist": "^1.2.2",
-    "@types/node": "^17.0.31",
+    "@types/node": "^17.0.42",
     "@types/prompts": "^2.4.0",
     "@types/resolve": "^1.20.2",
     "@types/sass": "~1.43.1",
@@ -61,18 +61,18 @@
     "@typescript-eslint/parser": "^5.27.1",
     "conventional-changelog-cli": "^2.2.2",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.14.38",
+    "esbuild": "^0.14.43",
     "eslint": "^8.17.0",
     "eslint-define-config": "^1.5.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "esno": "^0.16.3",
-    "execa": "^5.1.1",
+    "execa": "^6.1.0",
     "fs-extra": "^10.1.0",
     "kill-port": "^1.6.1",
     "lint-staged": "^13.0.1",
     "minimist": "^1.2.6",
-    "node-fetch": "^2.6.7",
+    "node-fetch": "^3.2.6",
     "npm-run-all": "^4.1.5",
     "picocolors": "^1.0.0",
     "playwright-chromium": "^1.22.2",
@@ -80,7 +80,7 @@
     "prettier": "2.6.2",
     "prompts": "^2.4.2",
     "rimraf": "^3.0.2",
-    "rollup": "^2.72.1",
+    "rollup": "^2.75.6",
     "semver": "^7.3.7",
     "simple-git-hooks": "^2.8.0",
     "sirv": "^2.0.2",
diff --git a/packages/create-vite/__tests__/cli.spec.ts b/packages/create-vite/__tests__/cli.spec.ts
index f9172aeece98d2..39ac7e1e547a36 100644
--- a/packages/create-vite/__tests__/cli.spec.ts
+++ b/packages/create-vite/__tests__/cli.spec.ts
@@ -1,6 +1,6 @@
 import { join } from 'path'
 import type { ExecaSyncReturnValue, SyncOptions } from 'execa'
-import { commandSync } from 'execa'
+import { execaCommandSync } from 'execa'
 import { mkdirpSync, readdirSync, remove, writeFileSync } from 'fs-extra'
 import { afterEach, beforeAll, expect, test } from 'vitest'
 
@@ -13,7 +13,7 @@ const run = (
   args: string[],
   options: SyncOptions<string> = {}
 ): ExecaSyncReturnValue<string> => {
-  return commandSync(`node ${CLI_PATH} ${args.join(' ')}`, options)
+  return execaCommandSync(`node ${CLI_PATH} ${args.join(' ')}`, options)
 }
 
 // Helper to create a non-empty directory
diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json
index 0c77100be3b56f..9f854eb34d4228 100644
--- a/packages/plugin-legacy/package.json
+++ b/packages/plugin-legacy/package.json
@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "dependencies": {
-    "@babel/standalone": "^7.18.4",
+    "@babel/standalone": "^7.18.5",
     "core-js": "^3.22.8",
     "magic-string": "^0.26.2",
     "regenerator-runtime": "^0.13.9",
@@ -46,7 +46,7 @@
     "vite": "^3.0.0-alpha"
   },
   "devDependencies": {
-    "vite": "workspace:*",
-    "@babel/core": "^7.18.2"
+    "@babel/core": "^7.18.5",
+    "vite": "workspace:*"
   }
 }
diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json
index 07d5586dcc93b1..40cf3e60d72d6a 100644
--- a/packages/plugin-react/package.json
+++ b/packages/plugin-react/package.json
@@ -39,7 +39,7 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-react#readme",
   "dependencies": {
-    "@babel/core": "^7.18.2",
+    "@babel/core": "^7.18.5",
     "@babel/plugin-transform-react-jsx": "^7.17.12",
     "@babel/plugin-transform-react-jsx-development": "^7.16.7",
     "@babel/plugin-transform-react-jsx-self": "^7.17.12",
diff --git a/packages/plugin-vue-jsx/package.json b/packages/plugin-vue-jsx/package.json
index 474bfa48e4f24c..e4e483dda373f6 100644
--- a/packages/plugin-vue-jsx/package.json
+++ b/packages/plugin-vue-jsx/package.json
@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-vue-jsx#readme",
   "dependencies": {
-    "@babel/core": "^7.18.2",
+    "@babel/core": "^7.18.5",
     "@babel/plugin-syntax-import-meta": "^7.10.4",
     "@babel/plugin-transform-typescript": "^7.18.4",
     "@vue/babel-plugin-jsx": "^1.1.1"
diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json
index eee3183d9a4fc5..7a5195fbf36703 100644
--- a/packages/plugin-vue/package.json
+++ b/packages/plugin-vue/package.json
@@ -42,7 +42,7 @@
     "@jridgewell/gen-mapping": "^0.3.1",
     "@jridgewell/trace-mapping": "^0.3.13",
     "debug": "^4.3.4",
-    "rollup": "^2.72.1",
+    "rollup": "^2.75.6",
     "slash": "^4.0.0",
     "source-map": "^0.6.1",
     "vite": "workspace:*",
diff --git a/packages/vite/LICENSE.md b/packages/vite/LICENSE.md
index b2991927dc51cf..995c28ad9fad20 100644
--- a/packages/vite/LICENSE.md
+++ b/packages/vite/LICENSE.md
@@ -682,7 +682,7 @@ Repository: chalk/ansi-regex
 
 > MIT License
 > 
-> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 > 
 > Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 > 
@@ -3477,7 +3477,7 @@ Repository: chalk/strip-ansi
 
 > MIT License
 > 
-> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 > 
 > Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 > 
@@ -3854,7 +3854,7 @@ License: ISC
 By: Eemeli Aro
 Repository: github:eemeli/yaml
 
-> Copyright 2018 Eemeli Aro <eemeli@gmail.com>
+> Copyright Eemeli Aro <eemeli@gmail.com>
 > 
 > Permission to use, copy, modify, and/or distribute this software for any purpose
 > with or without fee is hereby granted, provided that the above copyright notice
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 56087413ae7908..ab4ae1235eb3ed 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -57,17 +57,17 @@
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.14.38",
+    "esbuild": "^0.14.43",
     "postcss": "^8.4.14",
     "resolve": "^1.22.0",
-    "rollup": "^2.72.1"
+    "rollup": "^2.75.6"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.0",
-    "@babel/parser": "^7.18.4",
+    "@babel/parser": "^7.18.5",
     "@babel/types": "^7.18.4",
     "@jridgewell/trace-mapping": "^0.3.13",
     "@rollup/plugin-alias": "^3.1.9",
@@ -79,7 +79,7 @@
     "@rollup/pluginutils": "^4.2.1",
     "@vue/compiler-dom": "^3.2.37",
     "acorn": "^8.7.1",
-    "cac": "6.7.9",
+    "cac": "^6.7.12",
     "chokidar": "^3.5.3",
     "connect": "^3.7.0",
     "connect-history-api-fallback": "^1.6.0",
@@ -91,7 +91,7 @@
     "dotenv-expand": "^5.1.0",
     "es-module-lexer": "^0.10.5",
     "esno": "^0.16.3",
-    "estree-walker": "^2.0.2",
+    "estree-walker": "^3.0.1",
     "etag": "^1.8.1",
     "fast-glob": "^3.2.11",
     "http-proxy": "^1.18.1",
@@ -103,17 +103,17 @@
     "node-forge": "^1.3.1",
     "okie": "^1.0.1",
     "open": "^8.4.0",
-    "periscopic": "^2.0.3",
+    "periscopic": "^3.0.4",
     "picocolors": "^1.0.0",
     "postcss-import": "^14.1.0",
-    "postcss-load-config": "^3.1.4",
+    "postcss-load-config": "^4.0.1",
     "postcss-modules": "^4.3.1",
     "resolve.exports": "^1.1.0",
     "rollup-plugin-license": "^2.8.1",
     "sirv": "^2.0.2",
     "source-map-js": "^1.0.2",
     "source-map-support": "^0.5.21",
-    "strip-ansi": "^6.0.1",
+    "strip-ansi": "^7.0.1",
     "strip-literal": "^0.3.0",
     "tsconfck": "^2.0.1",
     "tslib": "^2.4.0",
diff --git a/packages/vite/rollup.config.ts b/packages/vite/rollup.config.ts
index bdf8c94220bb74..0e321956a0d287 100644
--- a/packages/vite/rollup.config.ts
+++ b/packages/vite/rollup.config.ts
@@ -123,11 +123,6 @@ function createNodePlugins(
           src: `require('fsevents')`,
           replacement: `__require('fsevents')`
         },
-        // cac re-assigns module.exports even in its mjs dist
-        'cac/dist/index.mjs': {
-          src: `if (typeof module !== "undefined") {`,
-          replacement: `if (false) {`
-        },
         // postcss-import -> sugarss
         'process-content.js': {
           src: 'require("sugarss")',
diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts
index e7f0ef6b4aab3b..e6f0d8b3a4562c 100644
--- a/packages/vite/src/node/ssr/ssrTransform.ts
+++ b/packages/vite/src/node/ssr/ssrTransform.ts
@@ -8,6 +8,8 @@ import type {
   Node as _Node
 } from 'estree'
 import { extract_names as extractNames } from 'periscopic'
+// `eslint-plugin-node` doesn't support package without main
+// eslint-disable-next-line node/no-missing-import
 import { walk as eswalk } from 'estree-walker'
 import type { RawSourceMap } from '@ampproject/remapping'
 import type { TransformResult } from '../server/transformRequest'
diff --git a/playground/cli-module/__tests__/serve.ts b/playground/cli-module/__tests__/serve.ts
index 5d40149300f6a5..698cbd048851d1 100644
--- a/playground/cli-module/__tests__/serve.ts
+++ b/playground/cli-module/__tests__/serve.ts
@@ -1,7 +1,7 @@
 // this is automatically detected by playground/vitestSetup.ts and will replace
 // the default e2e test serve behavior
 
-import execa from 'execa'
+import { execaCommand } from 'execa'
 import kill from 'kill-port'
 import {
   isBuild,
@@ -45,7 +45,7 @@ export async function serve() {
   if (isBuild) {
     const buildCommand = `${viteBinPath} build`
     try {
-      const buildProcess = execa.command(buildCommand, {
+      const buildProcess = execaCommand(buildCommand, {
         cwd: rootDir,
         stdio: 'pipe'
       })
@@ -67,7 +67,7 @@ export async function serve() {
     viteServerArgs.unshift('preview')
   }
   const serverCommand = `${viteBinPath} ${viteServerArgs.join(' ')}`
-  const serverProcess = execa.command(serverCommand, {
+  const serverProcess = execaCommand(serverCommand, {
     cwd: rootDir,
     stdio: 'pipe'
   })
diff --git a/playground/cli/__tests__/serve.ts b/playground/cli/__tests__/serve.ts
index 6dbc05708d9cec..66f00677169f2a 100644
--- a/playground/cli/__tests__/serve.ts
+++ b/playground/cli/__tests__/serve.ts
@@ -1,7 +1,7 @@
 // this is automatically detected by playground/vitestSetup.ts and will replace
 // the default e2e test serve behavior
 
-import execa from 'execa'
+import { execaCommand } from 'execa'
 import kill from 'kill-port'
 import {
   isBuild,
@@ -45,7 +45,7 @@ export async function serve() {
   if (isBuild) {
     const buildCommand = `${viteBinPath} build`
     try {
-      const buildProcess = execa.command(buildCommand, {
+      const buildProcess = execaCommand(buildCommand, {
         cwd: rootDir,
         stdio: 'pipe'
       })
@@ -67,7 +67,7 @@ export async function serve() {
     viteServerArgs.unshift('preview')
   }
   const serverCommand = `${viteBinPath} ${viteServerArgs.join(' ')}`
-  const serverProcess = execa.command(serverCommand, {
+  const serverProcess = execaCommand(serverCommand, {
     cwd: rootDir,
     stdio: 'pipe'
   })
diff --git a/playground/resolve-config/__tests__/resolve-config.spec.ts b/playground/resolve-config/__tests__/resolve-config.spec.ts
index be76872929f698..5f256fbdd3810b 100644
--- a/playground/resolve-config/__tests__/resolve-config.spec.ts
+++ b/playground/resolve-config/__tests__/resolve-config.spec.ts
@@ -1,12 +1,12 @@
 import fs from 'fs'
 import path from 'path'
-import { commandSync } from 'execa'
+import { execaCommandSync } from 'execa'
 import { isBuild, testDir, viteBinPath } from '~utils'
 
 const fromTestDir = (...p: string[]) => path.resolve(testDir, ...p)
 
 const build = (configName: string) => {
-  commandSync(`${viteBinPath} build`, { cwd: fromTestDir(configName) })
+  execaCommandSync(`${viteBinPath} build`, { cwd: fromTestDir(configName) })
 }
 
 const getDistFile = (configName: string, extension: string) => {
diff --git a/playground/ssr-react/package.json b/playground/ssr-react/package.json
index f280db9a1c4676..2c5265163c5be4 100644
--- a/playground/ssr-react/package.json
+++ b/playground/ssr-react/package.json
@@ -15,8 +15,8 @@
   "dependencies": {
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router": "^5.3.1",
-    "react-router-dom": "^5.3.1"
+    "react-router": "^5.3.3",
+    "react-router-dom": "^5.3.3"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "workspace:*",
diff --git a/playground/test-utils.ts b/playground/test-utils.ts
index 28534a78655127..ebf055e42e97d5 100644
--- a/playground/test-utils.ts
+++ b/playground/test-utils.ts
@@ -182,8 +182,8 @@ export async function killProcess(
 ): Promise<void> {
   if (isWindows) {
     try {
-      const { default: execa } = await import('execa')
-      execa.commandSync(`taskkill /pid ${serverProcess.pid} /T /F`)
+      const { execaCommandSync } = await import('execa')
+      execaCommandSync(`taskkill /pid ${serverProcess.pid} /T /F`)
     } catch (e) {
       console.error('failed to taskkill:', e)
     }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c06e0ef94d7bfb..0720264b376893 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,7 +26,7 @@ importers:
       '@types/micromatch': ^4.0.2
       '@types/mime': ^2.0.3
       '@types/minimist': ^1.2.2
-      '@types/node': ^17.0.31
+      '@types/node': ^17.0.42
       '@types/prompts': ^2.4.0
       '@types/resolve': ^1.20.2
       '@types/sass': ~1.43.1
@@ -37,18 +37,18 @@ importers:
       '@typescript-eslint/parser': ^5.27.1
       conventional-changelog-cli: ^2.2.2
       cross-env: ^7.0.3
-      esbuild: ^0.14.38
+      esbuild: ^0.14.43
       eslint: ^8.17.0
       eslint-define-config: ^1.5.1
       eslint-plugin-import: ^2.26.0
       eslint-plugin-node: ^11.1.0
       esno: ^0.16.3
-      execa: ^5.1.1
+      execa: ^6.1.0
       fs-extra: ^10.1.0
       kill-port: ^1.6.1
       lint-staged: ^13.0.1
       minimist: ^1.2.6
-      node-fetch: ^2.6.7
+      node-fetch: ^3.2.6
       npm-run-all: ^4.1.5
       picocolors: ^1.0.0
       playwright-chromium: ^1.22.2
@@ -56,7 +56,7 @@ importers:
       prettier: 2.6.2
       prompts: ^2.4.2
       rimraf: ^3.0.2
-      rollup: ^2.72.1
+      rollup: ^2.75.6
       semver: ^7.3.7
       simple-git-hooks: ^2.8.0
       sirv: ^2.0.2
@@ -70,7 +70,7 @@ importers:
     devDependencies:
       '@babel/types': 7.18.4
       '@microsoft/api-extractor': 7.25.0
-      '@rollup/plugin-typescript': 8.3.3_dsrqihoegvzgycupzno43pt4sq
+      '@rollup/plugin-typescript': 8.3.3_uct5nfewsakxkk4livyn3qaf3e
       '@types/babel__core': 7.1.19
       '@types/babel__standalone': 7.1.4
       '@types/convert-source-map': 1.5.2
@@ -84,7 +84,7 @@ importers:
       '@types/micromatch': 4.0.2
       '@types/mime': 2.0.3
       '@types/minimist': 1.2.2
-      '@types/node': 17.0.32
+      '@types/node': 17.0.42
       '@types/prompts': 2.4.0
       '@types/resolve': 1.20.2
       '@types/sass': 1.43.1
@@ -95,18 +95,18 @@ importers:
       '@typescript-eslint/parser': 5.27.1_pm7osnb22e4oktq33hptgspr5i
       conventional-changelog-cli: 2.2.2
       cross-env: 7.0.3
-      esbuild: 0.14.38
+      esbuild: 0.14.43
       eslint: 8.17.0
       eslint-define-config: 1.5.1
       eslint-plugin-import: 2.26.0_pv5w3e62ssxduf5aiwxbc3knra
       eslint-plugin-node: 11.1.0_eslint@8.17.0
       esno: 0.16.3
-      execa: 5.1.1
+      execa: 6.1.0
       fs-extra: 10.1.0
       kill-port: 1.6.1
       lint-staged: 13.0.1
       minimist: 1.2.6
-      node-fetch: 2.6.7
+      node-fetch: 3.2.6
       npm-run-all: 4.1.5
       picocolors: 1.0.0
       playwright-chromium: 1.22.2
@@ -114,7 +114,7 @@ importers:
       prettier: 2.6.2
       prompts: 2.4.2
       rimraf: 3.0.2
-      rollup: 2.72.1
+      rollup: 2.75.6
       semver: 7.3.7
       simple-git-hooks: 2.8.0
       sirv: 2.0.2
@@ -138,26 +138,26 @@ importers:
 
   packages/plugin-legacy:
     specifiers:
-      '@babel/core': ^7.18.2
-      '@babel/standalone': ^7.18.4
+      '@babel/core': ^7.18.5
+      '@babel/standalone': ^7.18.5
       core-js: ^3.22.8
       magic-string: ^0.26.2
       regenerator-runtime: ^0.13.9
       systemjs: ^6.12.1
       vite: workspace:*
     dependencies:
-      '@babel/standalone': 7.18.4
+      '@babel/standalone': 7.18.5
       core-js: 3.22.8
       magic-string: 0.26.2
       regenerator-runtime: 0.13.9
       systemjs: 6.12.1
     devDependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.5
       vite: link:../vite
 
   packages/plugin-react:
     specifiers:
-      '@babel/core': ^7.18.2
+      '@babel/core': ^7.18.5
       '@babel/plugin-transform-react-jsx': ^7.17.12
       '@babel/plugin-transform-react-jsx-development': ^7.16.7
       '@babel/plugin-transform-react-jsx-self': ^7.17.12
@@ -165,11 +165,11 @@ importers:
       react-refresh: ^0.13.0
       vite: workspace:*
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/plugin-transform-react-jsx': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-react-jsx-self': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-react-jsx-source': 7.16.7_@babel+core@7.18.2
+      '@babel/core': 7.18.5
+      '@babel/plugin-transform-react-jsx': 7.17.12_@babel+core@7.18.5
+      '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.18.5
+      '@babel/plugin-transform-react-jsx-self': 7.17.12_@babel+core@7.18.5
+      '@babel/plugin-transform-react-jsx-source': 7.16.7_@babel+core@7.18.5
       react-refresh: 0.13.0
     devDependencies:
       vite: link:../vite
@@ -179,7 +179,7 @@ importers:
       '@jridgewell/gen-mapping': ^0.3.1
       '@jridgewell/trace-mapping': ^0.3.13
       debug: ^4.3.4
-      rollup: ^2.72.1
+      rollup: ^2.75.6
       slash: ^4.0.0
       source-map: ^0.6.1
       vite: workspace:*
@@ -188,7 +188,7 @@ importers:
       '@jridgewell/gen-mapping': 0.3.1
       '@jridgewell/trace-mapping': 0.3.13
       debug: 4.3.4
-      rollup: 2.72.1
+      rollup: 2.75.6
       slash: 4.0.0
       source-map: 0.6.1
       vite: link:../vite
@@ -196,23 +196,23 @@ importers:
 
   packages/plugin-vue-jsx:
     specifiers:
-      '@babel/core': ^7.18.2
+      '@babel/core': ^7.18.5
       '@babel/plugin-syntax-import-meta': ^7.10.4
       '@babel/plugin-transform-typescript': ^7.18.4
       '@vue/babel-plugin-jsx': ^1.1.1
       vite: workspace:*
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.18.2
-      '@babel/plugin-transform-typescript': 7.18.4_@babel+core@7.18.2
-      '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.18.2
+      '@babel/core': 7.18.5
+      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.18.5
+      '@babel/plugin-transform-typescript': 7.18.4_@babel+core@7.18.5
+      '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.18.5
     devDependencies:
       vite: link:../vite
 
   packages/vite:
     specifiers:
       '@ampproject/remapping': ^2.2.0
-      '@babel/parser': ^7.18.4
+      '@babel/parser': ^7.18.5
       '@babel/types': ^7.18.4
       '@jridgewell/trace-mapping': ^0.3.13
       '@rollup/plugin-alias': ^3.1.9
@@ -224,7 +224,7 @@ importers:
       '@rollup/pluginutils': ^4.2.1
       '@vue/compiler-dom': ^3.2.37
       acorn: ^8.7.1
-      cac: 6.7.9
+      cac: ^6.7.12
       chokidar: ^3.5.3
       connect: ^3.7.0
       connect-history-api-fallback: ^1.6.0
@@ -235,9 +235,9 @@ importers:
       dotenv: ^14.3.2
       dotenv-expand: ^5.1.0
       es-module-lexer: ^0.10.5
-      esbuild: ^0.14.38
+      esbuild: ^0.14.43
       esno: ^0.16.3
-      estree-walker: ^2.0.2
+      estree-walker: ^3.0.1
       etag: ^1.8.1
       fast-glob: ^3.2.11
       fsevents: ~2.3.2
@@ -250,20 +250,20 @@ importers:
       node-forge: ^1.3.1
       okie: ^1.0.1
       open: ^8.4.0
-      periscopic: ^2.0.3
+      periscopic: ^3.0.4
       picocolors: ^1.0.0
       postcss: ^8.4.14
       postcss-import: ^14.1.0
-      postcss-load-config: ^3.1.4
+      postcss-load-config: ^4.0.1
       postcss-modules: ^4.3.1
       resolve: ^1.22.0
       resolve.exports: ^1.1.0
-      rollup: ^2.72.1
+      rollup: ^2.75.6
       rollup-plugin-license: ^2.8.1
       sirv: ^2.0.2
       source-map-js: ^1.0.2
       source-map-support: ^0.5.21
-      strip-ansi: ^6.0.1
+      strip-ansi: ^7.0.1
       strip-literal: ^0.3.0
       tsconfck: ^2.0.1
       tslib: ^2.4.0
@@ -271,27 +271,27 @@ importers:
       ufo: ^0.8.4
       ws: ^8.8.0
     dependencies:
-      esbuild: 0.14.38
+      esbuild: 0.14.43
       postcss: 8.4.14
       resolve: 1.22.0
-      rollup: 2.72.1
+      rollup: 2.75.6
     optionalDependencies:
       fsevents: 2.3.2
     devDependencies:
       '@ampproject/remapping': 2.2.0
-      '@babel/parser': 7.18.4
+      '@babel/parser': 7.18.5
       '@babel/types': 7.18.4
       '@jridgewell/trace-mapping': 0.3.13
-      '@rollup/plugin-alias': 3.1.9_rollup@2.72.1
-      '@rollup/plugin-commonjs': 21.1.0_rollup@2.72.1
-      '@rollup/plugin-dynamic-import-vars': 1.4.3_rollup@2.72.1
-      '@rollup/plugin-json': 4.1.0_rollup@2.72.1
-      '@rollup/plugin-node-resolve': 13.3.0_rollup@2.72.1
-      '@rollup/plugin-typescript': 8.3.3_rollup@2.72.1+tslib@2.4.0
+      '@rollup/plugin-alias': 3.1.9_rollup@2.75.6
+      '@rollup/plugin-commonjs': 21.1.0_rollup@2.75.6
+      '@rollup/plugin-dynamic-import-vars': 1.4.3_rollup@2.75.6
+      '@rollup/plugin-json': 4.1.0_rollup@2.75.6
+      '@rollup/plugin-node-resolve': 13.3.0_rollup@2.75.6
+      '@rollup/plugin-typescript': 8.3.3_rollup@2.75.6+tslib@2.4.0
       '@rollup/pluginutils': 4.2.1
       '@vue/compiler-dom': 3.2.37
       acorn: 8.7.1
-      cac: 6.7.9
+      cac: 6.7.12
       chokidar: 3.5.3
       connect: 3.7.0
       connect-history-api-fallback: 1.6.0
@@ -303,7 +303,7 @@ importers:
       dotenv-expand: 5.1.0
       es-module-lexer: 0.10.5
       esno: 0.16.3
-      estree-walker: 2.0.2
+      estree-walker: 3.0.1
       etag: 1.8.1
       fast-glob: 3.2.11
       http-proxy: 1.18.1_debug@4.3.4
@@ -315,17 +315,17 @@ importers:
       node-forge: 1.3.1
       okie: 1.0.1
       open: 8.4.0
-      periscopic: 2.0.3
+      periscopic: 3.0.4
       picocolors: 1.0.0
       postcss-import: 14.1.0_postcss@8.4.14
-      postcss-load-config: 3.1.4_postcss@8.4.14
+      postcss-load-config: 4.0.1_postcss@8.4.14
       postcss-modules: 4.3.1_postcss@8.4.14
       resolve.exports: 1.1.0
-      rollup-plugin-license: 2.8.1_rollup@2.72.1
+      rollup-plugin-license: 2.8.1_rollup@2.75.6
       sirv: 2.0.2
       source-map-js: 1.0.2
       source-map-support: 0.5.21
-      strip-ansi: 6.0.1
+      strip-ansi: 7.0.1
       strip-literal: 0.3.0
       tsconfck: 2.0.1
       tslib: 2.4.0
@@ -882,14 +882,14 @@ importers:
       express: ^4.18.1
       react: ^17.0.2
       react-dom: ^17.0.2
-      react-router: ^5.3.1
-      react-router-dom: ^5.3.1
+      react-router: ^5.3.3
+      react-router-dom: ^5.3.3
       serve-static: ^1.15.0
     dependencies:
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
-      react-router: 5.3.1_react@17.0.2
-      react-router-dom: 5.3.1_react@17.0.2
+      react-router: 5.3.3_react@17.0.2
+      react-router-dom: 5.3.3_react@17.0.2
     devDependencies:
       '@vitejs/plugin-react': link:../../packages/plugin-react
       compression: 1.7.4
@@ -1179,42 +1179,19 @@ packages:
     resolution: {integrity: sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/core/7.17.10:
-    resolution: {integrity: sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@ampproject/remapping': 2.2.0
-      '@babel/code-frame': 7.16.7
-      '@babel/generator': 7.17.10
-      '@babel/helper-compilation-targets': 7.17.10_@babel+core@7.17.10
-      '@babel/helper-module-transforms': 7.17.7
-      '@babel/helpers': 7.17.9
-      '@babel/parser': 7.17.10
-      '@babel/template': 7.16.7
-      '@babel/traverse': 7.17.10
-      '@babel/types': 7.18.4
-      convert-source-map: 1.8.0
-      debug: 4.3.4
-      gensync: 1.0.0-beta.2
-      json5: 2.2.1
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/core/7.18.2:
-    resolution: {integrity: sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==}
+  /@babel/core/7.18.5:
+    resolution: {integrity: sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@ampproject/remapping': 2.2.0
       '@babel/code-frame': 7.16.7
       '@babel/generator': 7.18.2
-      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.2
+      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.5
       '@babel/helper-module-transforms': 7.18.0
       '@babel/helpers': 7.18.2
-      '@babel/parser': 7.18.0
+      '@babel/parser': 7.18.5
       '@babel/template': 7.16.7
-      '@babel/traverse': 7.18.2
+      '@babel/traverse': 7.18.5
       '@babel/types': 7.18.4
       convert-source-map: 1.8.0
       debug: 4.3.4
@@ -1231,6 +1208,7 @@ packages:
       '@babel/types': 7.18.4
       '@jridgewell/gen-mapping': 0.1.1
       jsesc: 2.5.2
+    dev: false
 
   /@babel/generator/7.18.2:
     resolution: {integrity: sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==}
@@ -1247,38 +1225,25 @@ packages:
       '@babel/types': 7.18.0
     dev: false
 
-  /@babel/helper-compilation-targets/7.17.10_@babel+core@7.17.10:
-    resolution: {integrity: sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/compat-data': 7.17.10
-      '@babel/core': 7.17.10
-      '@babel/helper-validator-option': 7.16.7
-      browserslist: 4.20.3
-      semver: 6.3.0
-    dev: true
-
-  /@babel/helper-compilation-targets/7.18.2_@babel+core@7.18.2:
+  /@babel/helper-compilation-targets/7.18.2_@babel+core@7.18.5:
     resolution: {integrity: sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
       '@babel/compat-data': 7.17.10
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.5
       '@babel/helper-validator-option': 7.16.7
       browserslist: 4.20.3
       semver: 6.3.0
 
-  /@babel/helper-create-class-features-plugin/7.18.0_@babel+core@7.18.2:
+  /@babel/helper-create-class-features-plugin/7.18.0_@babel+core@7.18.5:
     resolution: {integrity: sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.5
       '@babel/helper-annotate-as-pure': 7.16.7
       '@babel/helper-environment-visitor': 7.16.7
       '@babel/helper-function-name': 7.17.9
@@ -1326,22 +1291,6 @@ packages:
     dependencies:
       '@babel/types': 7.17.10
 
-  /@babel/helper-module-transforms/7.17.7:
-    resolution: {integrity: sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-environment-visitor': 7.16.7
-      '@babel/helper-module-imports': 7.16.7
-      '@babel/helper-simple-access': 7.17.7
-      '@babel/helper-split-export-declaration': 7.16.7
-      '@babel/helper-validator-identifier': 7.16.7
-      '@babel/template': 7.16.7
-      '@babel/traverse': 7.17.10
-      '@babel/types': 7.18.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/helper-module-transforms/7.18.0:
     resolution: {integrity: sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==}
     engines: {node: '>=6.9.0'}
@@ -1352,7 +1301,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.16.7
       '@babel/helper-validator-identifier': 7.16.7
       '@babel/template': 7.16.7
-      '@babel/traverse': 7.18.2
+      '@babel/traverse': 7.18.5
       '@babel/types': 7.18.4
     transitivePeerDependencies:
       - supports-color
@@ -1406,23 +1355,12 @@ packages:
     resolution: {integrity: sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helpers/7.17.9:
-    resolution: {integrity: sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.16.7
-      '@babel/traverse': 7.17.10
-      '@babel/types': 7.18.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/helpers/7.18.2:
     resolution: {integrity: sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/template': 7.16.7
-      '@babel/traverse': 7.18.2
+      '@babel/traverse': 7.18.5
       '@babel/types': 7.18.4
     transitivePeerDependencies:
       - supports-color
@@ -1435,22 +1373,8 @@ packages:
       chalk: 2.4.2
       js-tokens: 4.0.0
 
-  /@babel/parser/7.17.10:
-    resolution: {integrity: sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.18.4
-
-  /@babel/parser/7.18.0:
-    resolution: {integrity: sha512-AqDccGC+m5O/iUStSJy3DGRIUFu7WbY/CppZYwrEUB4N0tZlnI8CSTsgL7v5fHVFmUbRv2sd+yy27o8Ydt4MGg==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.18.4
-
-  /@babel/parser/7.18.4:
-    resolution: {integrity: sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==}
+  /@babel/parser/7.18.5:
+    resolution: {integrity: sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
@@ -1466,12 +1390,12 @@ packages:
       '@babel/plugin-syntax-pipeline-operator': 7.17.12
     dev: true
 
-  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.2:
+  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.5:
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.5
       '@babel/helper-plugin-utils': 7.16.7
     dev: false
 
@@ -1483,23 +1407,23 @@ packages:
     dependencies:
       '@babel/helper-plugin-utils': 7.17.12
 
-  /@babel/plugin-syntax-jsx/7.16.7_@babel+core@7.18.2:
+  /@babel/plugin-syntax-jsx/7.16.7_@babel+core@7.18.5:
     resolution: {integrity: sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.5
       '@babel/helper-plugin-utils': 7.17.12
     dev: false
 
-  /@babel/plugin-syntax-jsx/7.17.12_@babel+core@7.18.2:
+  /@babel/plugin-syntax-jsx/7.17.12_@babel+core@7.18.5:
     resolution: {integrity: sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.5
       '@babel/helper-plugin-utils': 7.17.12
     dev: false
 
@@ -1512,70 +1436,70 @@ packages:
       '@babel/helper-plugin-utils': 7.17.12
     dev: true
 
-  /@babel/plugin-syntax-typescript/7.17.12_@babel+core@7.18.2:
+  /@babel/plugin-syntax-typescript/7.17.12_@babel+core@7.18.5:
     resolution: {integrity: sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.5
       '@babel/helper-plugin-utils': 7.17.12
     dev: false
 
-  /@babel/plugin-transform-react-jsx-development/7.16.7_@babel+core@7.18.2:
+  /@babel/plugin-transform-react-jsx-development/7.16.7_@babel+core@7.18.5:
     resolution: {integrity: sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/plugin-transform-react-jsx': 7.17.12_@babel+core@7.18.2
+      '@babel/core': 7.18.5
+      '@babel/plugin-transform-react-jsx': 7.17.12_@babel+core@7.18.5
     dev: false
 
-  /@babel/plugin-transform-react-jsx-self/7.17.12_@babel+core@7.18.2:
+  /@babel/plugin-transform-react-jsx-self/7.17.12_@babel+core@7.18.5:
     resolution: {integrity: sha512-7S9G2B44EnYOx74mue02t1uD8ckWZ/ee6Uz/qfdzc35uWHX5NgRy9i+iJSb2LFRgMd+QV9zNcStQaazzzZ3n3Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.5
       '@babel/helper-plugin-utils': 7.17.12
     dev: false
 
-  /@babel/plugin-transform-react-jsx-source/7.16.7_@babel+core@7.18.2:
+  /@babel/plugin-transform-react-jsx-source/7.16.7_@babel+core@7.18.5:
     resolution: {integrity: sha512-rONFiQz9vgbsnaMtQlZCjIRwhJvlrPET8TabIUK2hzlXw9B9s2Ieaxte1SCOOXMbWRHodbKixNf3BLcWVOQ8Bw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.5
       '@babel/helper-plugin-utils': 7.16.7
     dev: false
 
-  /@babel/plugin-transform-react-jsx/7.17.12_@babel+core@7.18.2:
+  /@babel/plugin-transform-react-jsx/7.17.12_@babel+core@7.18.5:
     resolution: {integrity: sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.5
       '@babel/helper-annotate-as-pure': 7.16.7
       '@babel/helper-module-imports': 7.16.7
       '@babel/helper-plugin-utils': 7.17.12
-      '@babel/plugin-syntax-jsx': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-syntax-jsx': 7.17.12_@babel+core@7.18.5
       '@babel/types': 7.18.0
     dev: false
 
-  /@babel/plugin-transform-typescript/7.18.4_@babel+core@7.18.2:
+  /@babel/plugin-transform-typescript/7.18.4_@babel+core@7.18.5:
     resolution: {integrity: sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
+      '@babel/core': 7.18.5
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.5
       '@babel/helper-plugin-utils': 7.17.12
-      '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.5
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -1593,22 +1517,16 @@ packages:
       regenerator-runtime: 0.13.9
     dev: false
 
-  /@babel/standalone/7.17.11:
-    resolution: {integrity: sha512-47wVYBeTktYHwtzlFuK7qqV/H5X6mU4MUNqpQ9iiJOqnP8rWL0eX0GWLKRsv8D8suYzhuS1K/dtwgGr+26U7Gg==}
+  /@babel/standalone/7.18.5:
+    resolution: {integrity: sha512-3RlzTl3JSvbY1bvaRmuHf3fM2BSy7IbX0zqpVFjsiGO7678KE/LytwvJN+f5MGrarnUFUz2DNcCdetumWdIAKA==}
     engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/standalone/7.18.4:
-    resolution: {integrity: sha512-3dDouWyjdS8sJTm6hf8KkJq7fr9ORWMlWGNcMV/Uz2rNnoI6uu8wJGhZ7E65J+x6v8ta9yPbzkUT2YBFcWUbWg==}
-    engines: {node: '>=6.9.0'}
-    dev: false
 
   /@babel/template/7.16.7:
     resolution: {integrity: sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.16.7
-      '@babel/parser': 7.17.10
+      '@babel/parser': 7.18.5
       '@babel/types': 7.18.4
 
   /@babel/traverse/7.17.10:
@@ -1621,12 +1539,13 @@ packages:
       '@babel/helper-function-name': 7.17.9
       '@babel/helper-hoist-variables': 7.16.7
       '@babel/helper-split-export-declaration': 7.16.7
-      '@babel/parser': 7.17.10
+      '@babel/parser': 7.18.5
       '@babel/types': 7.18.4
       debug: 4.3.4
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /@babel/traverse/7.18.2:
     resolution: {integrity: sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==}
@@ -1638,7 +1557,25 @@ packages:
       '@babel/helper-function-name': 7.17.9
       '@babel/helper-hoist-variables': 7.16.7
       '@babel/helper-split-export-declaration': 7.16.7
-      '@babel/parser': 7.18.0
+      '@babel/parser': 7.18.5
+      '@babel/types': 7.18.4
+      debug: 4.3.4
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@babel/traverse/7.18.5:
+    resolution: {integrity: sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      '@babel/generator': 7.18.2
+      '@babel/helper-environment-visitor': 7.18.2
+      '@babel/helper-function-name': 7.17.9
+      '@babel/helper-hoist-variables': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/parser': 7.18.5
       '@babel/types': 7.18.4
       debug: 4.3.4
       globals: 11.12.0
@@ -2020,33 +1957,33 @@ packages:
     resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==}
     dev: true
 
-  /@rollup/plugin-alias/3.1.9_rollup@2.72.1:
+  /@rollup/plugin-alias/3.1.9_rollup@2.75.6:
     resolution: {integrity: sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw==}
     engines: {node: '>=8.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0
     dependencies:
-      rollup: 2.72.1
+      rollup: 2.75.6
       slash: 3.0.0
     dev: true
 
-  /@rollup/plugin-commonjs/21.1.0_rollup@2.72.1:
+  /@rollup/plugin-commonjs/21.1.0_rollup@2.75.6:
     resolution: {integrity: sha512-6ZtHx3VHIp2ReNNDxHjuUml6ur+WcQ28N1yHgCQwsbNkQg2suhxGMDQGJOn/KuDxKtd1xuZP5xSTwBA4GQ8hbA==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
       rollup: ^2.38.3
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.72.1
+      '@rollup/pluginutils': 3.1.0_rollup@2.75.6
       commondir: 1.0.1
       estree-walker: 2.0.2
       glob: 7.2.0
       is-reference: 1.2.1
       magic-string: 0.25.9
       resolve: 1.22.0
-      rollup: 2.72.1
+      rollup: 2.75.6
     dev: true
 
-  /@rollup/plugin-dynamic-import-vars/1.4.3_rollup@2.72.1:
+  /@rollup/plugin-dynamic-import-vars/1.4.3_rollup@2.75.6:
     resolution: {integrity: sha512-VYP9BBVI0pcYpLp/DkFT8YP+EmqmWFMmWXoTObDH6OouERxJyPsIj0tC3HxhjNBOKgcRc7eV75IQItzELt7QSg==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
@@ -2056,59 +1993,59 @@ packages:
       estree-walker: 2.0.2
       fast-glob: 3.2.11
       magic-string: 0.25.9
-      rollup: 2.72.1
+      rollup: 2.75.6
     dev: true
 
-  /@rollup/plugin-json/4.1.0_rollup@2.72.1:
+  /@rollup/plugin-json/4.1.0_rollup@2.75.6:
     resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==}
     peerDependencies:
       rollup: ^1.20.0 || ^2.0.0
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.72.1
-      rollup: 2.72.1
+      '@rollup/pluginutils': 3.1.0_rollup@2.75.6
+      rollup: 2.75.6
     dev: true
 
-  /@rollup/plugin-node-resolve/13.2.1_rollup@2.72.1:
+  /@rollup/plugin-node-resolve/13.2.1_rollup@2.75.6:
     resolution: {integrity: sha512-btX7kzGvp1JwShQI9V6IM841YKNPYjKCvUbNrQ2EcVYbULtUd/GH6wZ/qdqH13j9pOHBER+EZXNN2L8RSJhVRA==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
       rollup: ^2.42.0
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.72.1
+      '@rollup/pluginutils': 3.1.0_rollup@2.75.6
       '@types/resolve': 1.17.1
       builtin-modules: 3.2.0
       deepmerge: 4.2.2
       is-module: 1.0.0
       resolve: 1.22.0
-      rollup: 2.72.1
+      rollup: 2.75.6
     dev: true
 
-  /@rollup/plugin-node-resolve/13.3.0_rollup@2.72.1:
+  /@rollup/plugin-node-resolve/13.3.0_rollup@2.75.6:
     resolution: {integrity: sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
       rollup: ^2.42.0
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.72.1
+      '@rollup/pluginutils': 3.1.0_rollup@2.75.6
       '@types/resolve': 1.17.1
       deepmerge: 4.2.2
       is-builtin-module: 3.1.0
       is-module: 1.0.0
       resolve: 1.22.0
-      rollup: 2.72.1
+      rollup: 2.75.6
     dev: true
 
-  /@rollup/plugin-replace/4.0.0_rollup@2.72.1:
+  /@rollup/plugin-replace/4.0.0_rollup@2.75.6:
     resolution: {integrity: sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==}
     peerDependencies:
       rollup: ^1.20.0 || ^2.0.0
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.72.1
+      '@rollup/pluginutils': 3.1.0_rollup@2.75.6
       magic-string: 0.25.9
-      rollup: 2.72.1
+      rollup: 2.75.6
     dev: true
 
-  /@rollup/plugin-typescript/8.3.3_dsrqihoegvzgycupzno43pt4sq:
+  /@rollup/plugin-typescript/8.3.3_rollup@2.75.6+tslib@2.4.0:
     resolution: {integrity: sha512-55L9SyiYu3r/JtqdjhwcwaECXP7JeJ9h1Sg1VWRJKIutla2MdZQodTgcCNybXLMCnqpNLEhS2vGENww98L1npg==}
     engines: {node: '>=8.0.0'}
     peerDependencies:
@@ -2119,14 +2056,13 @@ packages:
       tslib:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.72.1
+      '@rollup/pluginutils': 3.1.0_rollup@2.75.6
       resolve: 1.22.0
-      rollup: 2.72.1
+      rollup: 2.75.6
       tslib: 2.4.0
-      typescript: 4.6.4
     dev: true
 
-  /@rollup/plugin-typescript/8.3.3_rollup@2.72.1+tslib@2.4.0:
+  /@rollup/plugin-typescript/8.3.3_uct5nfewsakxkk4livyn3qaf3e:
     resolution: {integrity: sha512-55L9SyiYu3r/JtqdjhwcwaECXP7JeJ9h1Sg1VWRJKIutla2MdZQodTgcCNybXLMCnqpNLEhS2vGENww98L1npg==}
     engines: {node: '>=8.0.0'}
     peerDependencies:
@@ -2137,13 +2073,14 @@ packages:
       tslib:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.72.1
+      '@rollup/pluginutils': 3.1.0_rollup@2.75.6
       resolve: 1.22.0
-      rollup: 2.72.1
+      rollup: 2.75.6
       tslib: 2.4.0
+      typescript: 4.6.4
     dev: true
 
-  /@rollup/pluginutils/3.1.0_rollup@2.72.1:
+  /@rollup/pluginutils/3.1.0_rollup@2.75.6:
     resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
@@ -2152,7 +2089,7 @@ packages:
       '@types/estree': 0.0.39
       estree-walker: 1.0.1
       picomatch: 2.3.1
-      rollup: 2.72.1
+      rollup: 2.75.6
     dev: true
 
   /@rollup/pluginutils/4.2.1:
@@ -2216,7 +2153,7 @@ packages:
   /@types/babel__core/7.1.19:
     resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==}
     dependencies:
-      '@babel/parser': 7.17.10
+      '@babel/parser': 7.18.5
       '@babel/types': 7.18.4
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
@@ -2232,7 +2169,7 @@ packages:
   /@types/babel__standalone/7.1.4:
     resolution: {integrity: sha512-HijIDmcNl3Wmo0guqjYkQvMzyRCM6zMCkYcdG8f+2X7mPBNa9ikSeaQlWs2Yg18KN1klOJzyupX5BPOf+7ahaw==}
     dependencies:
-      '@babel/core': 7.17.10
+      '@babel/core': 7.18.5
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -2240,7 +2177,7 @@ packages:
   /@types/babel__template/7.4.1:
     resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
-      '@babel/parser': 7.17.10
+      '@babel/parser': 7.18.5
       '@babel/types': 7.18.4
     dev: true
 
@@ -2271,7 +2208,7 @@ packages:
   /@types/cross-spawn/6.0.2:
     resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==}
     dependencies:
-      '@types/node': 17.0.32
+      '@types/node': 17.0.42
     dev: true
 
   /@types/debug/4.1.7:
@@ -2291,13 +2228,13 @@ packages:
   /@types/etag/1.8.1:
     resolution: {integrity: sha512-bsKkeSqN7HYyYntFRAmzcwx/dKW4Wa+KVMTInANlI72PWLQmOpZu96j0OqHZGArW4VQwCmJPteQlXaUDeOB0WQ==}
     dependencies:
-      '@types/node': 17.0.32
+      '@types/node': 17.0.42
     dev: true
 
   /@types/fs-extra/9.0.13:
     resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==}
     dependencies:
-      '@types/node': 17.0.32
+      '@types/node': 17.0.42
     dev: true
 
   /@types/hash-sum/1.0.0:
@@ -2342,8 +2279,8 @@ packages:
     resolution: {integrity: sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==}
     dev: true
 
-  /@types/node/17.0.32:
-    resolution: {integrity: sha512-eAIcfAvhf/BkHcf4pkLJ7ECpBAhh9kcxRBpip9cTiO+hf+aJrsxYxBeS6OXvOd9WqNAJmavXVpZvY1rBjNsXmw==}
+  /@types/node/17.0.42:
+    resolution: {integrity: sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ==}
     dev: true
 
   /@types/normalize-package-data/2.4.1:
@@ -2360,7 +2297,7 @@ packages:
   /@types/resolve/1.17.1:
     resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==}
     dependencies:
-      '@types/node': 17.0.32
+      '@types/node': 17.0.42
     dev: true
 
   /@types/resolve/1.20.2:
@@ -2370,7 +2307,7 @@ packages:
   /@types/sass/1.43.1:
     resolution: {integrity: sha512-BPdoIt1lfJ6B7rw35ncdwBZrAssjcwzI5LByIrYs+tpXlj/CAkuVdRsgZDdP4lq5EjyWzwxZCqAoFyHKFwp32g==}
     dependencies:
-      '@types/node': 17.0.32
+      '@types/node': 17.0.42
     dev: true
 
   /@types/semver/7.3.9:
@@ -2384,13 +2321,13 @@ packages:
   /@types/stylus/0.48.38:
     resolution: {integrity: sha512-B5otJekvD6XM8iTrnO6e2twoTY2tKL9VkL/57/2Lo4tv3EatbCaufdi68VVtn/h4yjO+HVvYEyrNQd0Lzj6riw==}
     dependencies:
-      '@types/node': 17.0.32
+      '@types/node': 17.0.42
     dev: true
 
   /@types/ws/8.5.3:
     resolution: {integrity: sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==}
     dependencies:
-      '@types/node': 17.0.32
+      '@types/node': 17.0.42
     dev: true
 
   /@typescript-eslint/eslint-plugin/5.27.1_bnfefdnvqpcyokeggdz5sotnli:
@@ -2523,11 +2460,11 @@ packages:
     resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==}
     dev: false
 
-  /@vue/babel-plugin-jsx/1.1.1_@babel+core@7.18.2:
+  /@vue/babel-plugin-jsx/1.1.1_@babel+core@7.18.5:
     resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==}
     dependencies:
       '@babel/helper-module-imports': 7.16.7
-      '@babel/plugin-syntax-jsx': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-syntax-jsx': 7.16.7_@babel+core@7.18.5
       '@babel/template': 7.16.7
       '@babel/traverse': 7.17.10
       '@babel/types': 7.17.10
@@ -2543,7 +2480,7 @@ packages:
   /@vue/compiler-core/3.2.33:
     resolution: {integrity: sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==}
     dependencies:
-      '@babel/parser': 7.18.0
+      '@babel/parser': 7.18.5
       '@vue/shared': 3.2.33
       estree-walker: 2.0.2
       source-map: 0.6.1
@@ -2552,7 +2489,7 @@ packages:
   /@vue/compiler-core/3.2.37:
     resolution: {integrity: sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==}
     dependencies:
-      '@babel/parser': 7.18.4
+      '@babel/parser': 7.18.5
       '@vue/shared': 3.2.37
       estree-walker: 2.0.2
       source-map: 0.6.1
@@ -2573,7 +2510,7 @@ packages:
   /@vue/compiler-sfc/3.2.33:
     resolution: {integrity: sha512-H8D0WqagCr295pQjUYyO8P3IejM3vEzeCO1apzByAEaAR/WimhMYczHfZVvlCE/9yBaEu/eu9RdiWr0kF8b71Q==}
     dependencies:
-      '@babel/parser': 7.18.0
+      '@babel/parser': 7.18.5
       '@vue/compiler-core': 3.2.33
       '@vue/compiler-dom': 3.2.33
       '@vue/compiler-ssr': 3.2.33
@@ -2588,7 +2525,7 @@ packages:
   /@vue/compiler-sfc/3.2.37:
     resolution: {integrity: sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==}
     dependencies:
-      '@babel/parser': 7.18.4
+      '@babel/parser': 7.18.5
       '@vue/compiler-core': 3.2.37
       '@vue/compiler-dom': 3.2.37
       '@vue/compiler-ssr': 3.2.37
@@ -2619,7 +2556,7 @@ packages:
   /@vue/reactivity-transform/3.2.33:
     resolution: {integrity: sha512-4UL5KOIvSQb254aqenW4q34qMXbfZcmEsV/yVidLUgvwYQQ/D21bGX3DlgPUGI3c4C+iOnNmDCkIxkILoX/Pyw==}
     dependencies:
-      '@babel/parser': 7.18.0
+      '@babel/parser': 7.18.5
       '@vue/compiler-core': 3.2.33
       '@vue/shared': 3.2.33
       estree-walker: 2.0.2
@@ -2629,7 +2566,7 @@ packages:
   /@vue/reactivity-transform/3.2.37:
     resolution: {integrity: sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==}
     dependencies:
-      '@babel/parser': 7.18.4
+      '@babel/parser': 7.18.5
       '@vue/compiler-core': 3.2.37
       '@vue/shared': 3.2.37
       estree-walker: 2.0.2
@@ -3130,8 +3067,8 @@ packages:
     resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
     engines: {node: '>= 0.8'}
 
-  /cac/6.7.9:
-    resolution: {integrity: sha512-XN5qEpfNQCJ8jRaZgitSkkukjMRCGio+X3Ks5KUbGGlPbV+pSem1l9VuzooCBXOiMFshUZgyYqg6rgN8rjkb/w==}
+  /cac/6.7.12:
+    resolution: {integrity: sha512-rM7E2ygtMkJqD9c7WnFU6fruFcN3xe4FM5yUmgxhZzIKJk4uHl9U/fhwdajGFQbQuv43FAUo1Fe8gX/oIKDeSA==}
     engines: {node: '>=8'}
     dev: true
 
@@ -3454,7 +3391,7 @@ packages:
   /constantinople/4.0.1:
     resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==}
     dependencies:
-      '@babel/parser': 7.17.10
+      '@babel/parser': 7.18.5
       '@babel/types': 7.17.10
     dev: true
 
@@ -3772,6 +3709,11 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /data-uri-to-buffer/4.0.0:
+    resolution: {integrity: sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==}
+    engines: {node: '>= 12'}
+    dev: true
+
   /dateformat/3.0.3:
     resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==}
     dev: true
@@ -4111,6 +4053,15 @@ packages:
     cpu: [x64]
     os: [android]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-android-64/0.14.43:
+    resolution: {integrity: sha512-kqFXAS72K6cNrB6RiM7YJ5lNvmWRDSlpi7ZuRZ1hu1S3w0zlwcoCxWAyM23LQUyZSs1PbjHgdbbfYAN8IGh6xg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
     optional: true
 
   /esbuild-android-arm64/0.13.15:
@@ -4127,6 +4078,15 @@ packages:
     cpu: [arm64]
     os: [android]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-android-arm64/0.14.43:
+    resolution: {integrity: sha512-bKS2BBFh+7XZY9rpjiHGRNA7LvWYbZWP87pLehggTG7tTaCDvj8qQGOU/OZSjCSKDYbgY7Q+oDw8RlYQ2Jt2BA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
     optional: true
 
   /esbuild-darwin-64/0.13.15:
@@ -4143,6 +4103,15 @@ packages:
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-darwin-64/0.14.43:
+    resolution: {integrity: sha512-/3PSilx011ttoieRGkSZ0XV8zjBf2C9enV4ScMMbCT4dpx0mFhMOpFnCHkOK0pWGB8LklykFyHrWk2z6DENVUg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
     optional: true
 
   /esbuild-darwin-arm64/0.13.15:
@@ -4159,6 +4128,15 @@ packages:
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-darwin-arm64/0.14.43:
+    resolution: {integrity: sha512-1HyFUKs8DMCBOvw1Qxpr5Vv/ThNcVIFb5xgXWK3pyT40WPvgYIiRTwJCvNs4l8i5qWF8/CK5bQxJVDjQvtv0Yw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
     optional: true
 
   /esbuild-freebsd-64/0.13.15:
@@ -4175,6 +4153,15 @@ packages:
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-freebsd-64/0.14.43:
+    resolution: {integrity: sha512-FNWc05TPHYgaXjbPZO5/rJKSBslfG6BeMSs8GhwnqAKP56eEhvmzwnIz1QcC9cRVyO+IKqWNfmHFkCa1WJTULA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
     optional: true
 
   /esbuild-freebsd-arm64/0.13.15:
@@ -4191,6 +4178,15 @@ packages:
     cpu: [arm64]
     os: [freebsd]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-freebsd-arm64/0.14.43:
+    resolution: {integrity: sha512-amrYopclz3VohqisOPR6hA3GOWA3LZC1WDLnp21RhNmoERmJ/vLnOpnrG2P/Zao+/erKTCUqmrCIPVtj58DRoA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
     optional: true
 
   /esbuild-linux-32/0.13.15:
@@ -4207,6 +4203,15 @@ packages:
     cpu: [ia32]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-32/0.14.43:
+    resolution: {integrity: sha512-KoxoEra+9O3AKVvgDFvDkiuddCds6q71owSQEYwjtqRV7RwbPzKxJa6+uyzUulHcyGVq0g15K0oKG5CFBcvYDw==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /esbuild-linux-64/0.13.15:
@@ -4223,6 +4228,15 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-64/0.14.43:
+    resolution: {integrity: sha512-EwINwGMyiJMgBby5/SbMqKcUhS5AYAZ2CpEBzSowsJPNBJEdhkCTtEjk757TN/wxgbu3QklqDM6KghY660QCUw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /esbuild-linux-arm/0.13.15:
@@ -4239,6 +4253,15 @@ packages:
     cpu: [arm]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-arm/0.14.43:
+    resolution: {integrity: sha512-e6YzQUoDxxtyamuF12eVzzRC7bbEFSZohJ6igQB9tBqnNmIQY3fI6Cns3z2wxtbZ3f2o6idkD2fQnlvs2902Dg==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /esbuild-linux-arm64/0.13.15:
@@ -4255,6 +4278,15 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-arm64/0.14.43:
+    resolution: {integrity: sha512-UlSpjMWllAc70zYbHxWuDS3FJytyuR/gHJYBr8BICcTNb/TSOYVBg6U7b3jZ3mILTrgzwJUHwhEwK18FZDouUQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /esbuild-linux-mips64le/0.13.15:
@@ -4271,6 +4303,15 @@ packages:
     cpu: [mips64el]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-mips64le/0.14.43:
+    resolution: {integrity: sha512-f+v8cInPEL1/SDP//CfSYzcDNgE4CY3xgDV81DWm3KAPWzhvxARrKxB1Pstf5mB56yAslJDxu7ryBUPX207EZA==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /esbuild-linux-ppc64le/0.13.15:
@@ -4287,6 +4328,15 @@ packages:
     cpu: [ppc64]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-ppc64le/0.14.43:
+    resolution: {integrity: sha512-5wZYMDGAL/K2pqkdIsW+I4IR41kyfHr/QshJcNpUfK3RjB3VQcPWOaZmc+74rm4ZjVirYrtz+jWw0SgxtxRanA==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /esbuild-linux-riscv64/0.14.38:
@@ -4295,6 +4345,15 @@ packages:
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-riscv64/0.14.43:
+    resolution: {integrity: sha512-lYcAOUxp85hC7lSjycJUVSmj4/9oEfSyXjb/ua9bNl8afonaduuqtw7hvKMoKuYnVwOCDw4RSfKpcnIRDWq+Bw==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /esbuild-linux-s390x/0.14.38:
@@ -4303,6 +4362,15 @@ packages:
     cpu: [s390x]
     os: [linux]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-s390x/0.14.43:
+    resolution: {integrity: sha512-27e43ZhHvhFE4nM7HqtUbMRu37I/4eNSUbb8FGZWszV+uLzMIsHDwLoBiJmw7G9N+hrehNPeQ4F5Ujad0DrUKQ==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
     optional: true
 
   /esbuild-netbsd-64/0.13.15:
@@ -4319,6 +4387,15 @@ packages:
     cpu: [x64]
     os: [netbsd]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-netbsd-64/0.14.43:
+    resolution: {integrity: sha512-2mH4QF6hHBn5zzAfxEI/2eBC0mspVsZ6UVo821LpAJKMvLJPBk3XJO5xwg7paDqSqpl7p6IRrAenW999AEfJhQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
     optional: true
 
   /esbuild-openbsd-64/0.13.15:
@@ -4335,6 +4412,15 @@ packages:
     cpu: [x64]
     os: [openbsd]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-openbsd-64/0.14.43:
+    resolution: {integrity: sha512-ZhQpiZjvqCqO8jKdGp9+8k9E/EHSA+zIWOg+grwZasI9RoblqJ1QiZqqi7jfd6ZrrG1UFBNGe4m0NFxCFbMVbg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
     optional: true
 
   /esbuild-sunos-64/0.13.15:
@@ -4351,6 +4437,15 @@ packages:
     cpu: [x64]
     os: [sunos]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-sunos-64/0.14.43:
+    resolution: {integrity: sha512-DgxSi9DaHReL9gYuul2rrQCAapgnCJkh3LSHPKsY26zytYppG0HgkgVF80zjIlvEsUbGBP/GHQzBtrezj/Zq1Q==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
     optional: true
 
   /esbuild-windows-32/0.13.15:
@@ -4367,6 +4462,15 @@ packages:
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-windows-32/0.14.43:
+    resolution: {integrity: sha512-Ih3+2O5oExiqm0mY6YYE5dR0o8+AspccQ3vIAtRodwFvhuyGLjb0Hbmzun/F3Lw19nuhPMu3sW2fqIJ5xBxByw==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
     optional: true
 
   /esbuild-windows-64/0.13.15:
@@ -4383,6 +4487,15 @@ packages:
     cpu: [x64]
     os: [win32]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-windows-64/0.14.43:
+    resolution: {integrity: sha512-8NsuNfI8xwFuJbrCuI+aBqNTYkrWErejFO5aYM+yHqyHuL8mmepLS9EPzAzk8rvfaJrhN0+RvKWAcymViHOKEw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
     optional: true
 
   /esbuild-windows-arm64/0.13.15:
@@ -4399,6 +4512,15 @@ packages:
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-windows-arm64/0.14.43:
+    resolution: {integrity: sha512-7ZlD7bo++kVRblJEoG+cepljkfP8bfuTPz5fIXzptwnPaFwGS6ahvfoYzY7WCf5v/1nX2X02HDraVItTgbHnKw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
     optional: true
 
   /esbuild/0.13.15:
@@ -4451,6 +4573,34 @@ packages:
       esbuild-windows-32: 0.14.38
       esbuild-windows-64: 0.14.38
       esbuild-windows-arm64: 0.14.38
+    dev: true
+
+  /esbuild/0.14.43:
+    resolution: {integrity: sha512-Uf94+kQmy/5jsFwKWiQB4hfo/RkM9Dh7b79p8yqd1tshULdr25G2szLz631NoH3s2ujnKEKVD16RmOxvCNKRFA==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      esbuild-android-64: 0.14.43
+      esbuild-android-arm64: 0.14.43
+      esbuild-darwin-64: 0.14.43
+      esbuild-darwin-arm64: 0.14.43
+      esbuild-freebsd-64: 0.14.43
+      esbuild-freebsd-arm64: 0.14.43
+      esbuild-linux-32: 0.14.43
+      esbuild-linux-64: 0.14.43
+      esbuild-linux-arm: 0.14.43
+      esbuild-linux-arm64: 0.14.43
+      esbuild-linux-mips64le: 0.14.43
+      esbuild-linux-ppc64le: 0.14.43
+      esbuild-linux-riscv64: 0.14.43
+      esbuild-linux-s390x: 0.14.43
+      esbuild-netbsd-64: 0.14.43
+      esbuild-openbsd-64: 0.14.43
+      esbuild-sunos-64: 0.14.43
+      esbuild-windows-32: 0.14.43
+      esbuild-windows-64: 0.14.43
+      esbuild-windows-arm64: 0.14.43
 
   /escalade/3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
@@ -4704,6 +4854,10 @@ packages:
   /estree-walker/2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
 
+  /estree-walker/3.0.1:
+    resolution: {integrity: sha512-woY0RUD87WzMBUiZLx8NsYr23N5BKsOMZHhu2hoNRVh6NXGfoiT1KOL8G3UHlJAnEDGmfa5ubNA/AacfG+Kb0g==}
+    dev: true
+
   /esutils/2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
@@ -4723,21 +4877,6 @@ packages:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
 
-  /execa/5.1.1:
-    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
-    engines: {node: '>=10'}
-    dependencies:
-      cross-spawn: 7.0.3
-      get-stream: 6.0.1
-      human-signals: 2.1.0
-      is-stream: 2.0.1
-      merge-stream: 2.0.0
-      npm-run-path: 4.0.1
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-      strip-final-newline: 2.0.0
-    dev: true
-
   /execa/6.1.0:
     resolution: {integrity: sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -4825,6 +4964,14 @@ packages:
     dependencies:
       reusify: 1.0.4
 
+  /fetch-blob/3.1.5:
+    resolution: {integrity: sha512-N64ZpKqoLejlrwkIAnb9iLSA3Vx/kjgzpcDhygcqJ2KKjky8nCgUQ+dzXtbrLaWZGZNmNfQTsiQ0weZ1svglHg==}
+    engines: {node: ^12.20 || >= 14.13}
+    dependencies:
+      node-domexception: 1.0.0
+      web-streams-polyfill: 3.2.1
+    dev: true
+
   /file-entry-cache/6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -4906,6 +5053,19 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dev: false
+
+  /follow-redirects/1.15.0_debug@4.3.4:
+    resolution: {integrity: sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+    dependencies:
+      debug: 4.3.4
+    dev: true
 
   /form-data/4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
@@ -4923,6 +5083,13 @@ packages:
       mime-types: 2.1.29
     dev: true
 
+  /formdata-polyfill/4.0.10:
+    resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
+    engines: {node: '>=12.20.0'}
+    dependencies:
+      fetch-blob: 3.1.5
+    dev: true
+
   /forwarded/0.2.0:
     resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
     engines: {node: '>= 0.6'}
@@ -5165,7 +5332,7 @@ packages:
       source-map: 0.6.1
       wordwrap: 1.0.0
     optionalDependencies:
-      uglify-js: 3.15.5
+      uglify-js: 3.16.0
     dev: true
 
   /hard-rejection/2.1.0:
@@ -5291,7 +5458,7 @@ packages:
     engines: {node: '>=8.0.0'}
     dependencies:
       eventemitter3: 4.0.7
-      follow-redirects: 1.15.0
+      follow-redirects: 1.15.0_debug@4.3.4
       requires-port: 1.0.0
     transitivePeerDependencies:
       - debug
@@ -5307,11 +5474,6 @@ packages:
       - supports-color
     dev: false
 
-  /human-signals/2.1.0:
-    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
-    engines: {node: '>=10.17.0'}
-    dev: true
-
   /human-signals/3.0.1:
     resolution: {integrity: sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==}
     engines: {node: '>=12.20.0'}
@@ -5564,6 +5726,12 @@ packages:
       '@types/estree': 0.0.51
     dev: true
 
+  /is-reference/3.0.0:
+    resolution: {integrity: sha512-Eo1W3wUoHWoCoVM4GVl/a+K0IgiqE5aIo4kJABFyMum1ZORlPkC+UC357sSQUL5w5QCE5kCC9upl75b7+7CY/Q==}
+    dependencies:
+      '@types/estree': 0.0.51
+    dev: true
+
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
     engines: {node: '>= 0.4'}
@@ -5578,11 +5746,6 @@ packages:
       call-bind: 1.0.2
     dev: true
 
-  /is-stream/2.0.1:
-    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
-    engines: {node: '>=8'}
-    dev: true
-
   /is-stream/3.0.0:
     resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -6310,6 +6473,11 @@ packages:
       tz-offset: 0.0.1
     dev: true
 
+  /node-domexception/1.0.0:
+    resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
+    engines: {node: '>=10.5.0'}
+    dev: true
+
   /node-emoji/1.11.0:
     resolution: {integrity: sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==}
     dependencies:
@@ -6326,6 +6494,16 @@ packages:
         optional: true
     dependencies:
       whatwg-url: 5.0.0
+    dev: false
+
+  /node-fetch/3.2.6:
+    resolution: {integrity: sha512-LAy/HZnLADOVkVPubaxHDft29booGglPFDr2Hw0J1AercRh01UiVFm++KMDnJeH9sHgNB4hsXPii7Sgym/sTbw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      data-uri-to-buffer: 4.0.0
+      fetch-blob: 3.1.5
+      formdata-polyfill: 4.0.10
+    dev: true
 
   /node-forge/0.10.0:
     resolution: {integrity: sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==}
@@ -6396,13 +6574,6 @@ packages:
       string.prototype.padend: 3.1.3
     dev: true
 
-  /npm-run-path/4.0.1:
-    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
-    engines: {node: '>=8'}
-    dependencies:
-      path-key: 3.1.1
-    dev: true
-
   /npm-run-path/5.1.0:
     resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -6683,11 +6854,11 @@ packages:
     resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
     dev: true
 
-  /periscopic/2.0.3:
-    resolution: {integrity: sha512-FuCZe61mWxQOJAQFEfmt9FjzebRlcpFz8sFPbyaCKtdusPkMEbA9ey0eARnRav5zAhmXznhaQkKGFAPn7X9NUw==}
+  /periscopic/3.0.4:
+    resolution: {integrity: sha512-SFx68DxCv0Iyo6APZuw/AKewkkThGwssmU0QWtTlvov3VAtPX+QJ4CadwSaz8nrT5jPIuxdvJWB4PnD2KNDxQg==}
     dependencies:
-      estree-walker: 2.0.2
-      is-reference: 1.2.1
+      estree-walker: 3.0.1
+      is-reference: 3.0.0
     dev: true
 
   /phoenix/1.6.10:
@@ -6817,6 +6988,7 @@ packages:
       lilconfig: 2.0.5
       postcss: 8.4.14
       yaml: 1.10.2
+    dev: false
 
   /postcss-load-config/3.1.4_ts-node@10.8.1:
     resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
@@ -6835,6 +7007,23 @@ packages:
       yaml: 1.10.2
     dev: false
 
+  /postcss-load-config/4.0.1_postcss@8.4.14:
+    resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==}
+    engines: {node: '>= 14'}
+    peerDependencies:
+      postcss: '>=8.0.9'
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      postcss:
+        optional: true
+      ts-node:
+        optional: true
+    dependencies:
+      lilconfig: 2.0.5
+      postcss: 8.4.14
+      yaml: 2.1.1
+    dev: true
+
   /postcss-modules-extract-imports/3.0.0_postcss@8.4.14:
     resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
     engines: {node: ^10 || ^12 || >= 14}
@@ -7191,8 +7380,8 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /react-router-dom/5.3.1_react@17.0.2:
-    resolution: {integrity: sha512-f0pj/gMAbv9e8gahTmCEY20oFhxhrmHwYeIwH5EO5xu0qme+wXtsdB8YfUOAZzUz4VaXmb58m3ceiLtjMhqYmQ==}
+  /react-router-dom/5.3.3_react@17.0.2:
+    resolution: {integrity: sha512-Ov0tGPMBgqmbu5CDmN++tv2HQ9HlWDuWIIqn4b88gjlAN5IHI+4ZUZRcpz9Hl0azFIwihbLDYw1OiHGRo7ZIng==}
     peerDependencies:
       react: '>=15'
     dependencies:
@@ -7201,13 +7390,13 @@ packages:
       loose-envify: 1.4.0
       prop-types: 15.8.1
       react: 17.0.2
-      react-router: 5.3.1_react@17.0.2
+      react-router: 5.3.3_react@17.0.2
       tiny-invariant: 1.2.0
       tiny-warning: 1.0.3
     dev: false
 
-  /react-router/5.3.1_react@17.0.2:
-    resolution: {integrity: sha512-v+zwjqb7bakqgF+wMVKlAPTca/cEmPOvQ9zt7gpSNyPXau1+0qvuYZ5BWzzNDP1y6s15zDwgb9rPN63+SIniRQ==}
+  /react-router/5.3.3_react@17.0.2:
+    resolution: {integrity: sha512-mzQGUvS3bM84TnbtMYR8ZjKnuPJ71IjSzR+DE6UkUqvN4czWIqEs17yLL8xkAycv4ev0AiN+IGrWu88vJs/p2w==}
     peerDependencies:
       react: '>=15'
     dependencies:
@@ -7435,7 +7624,7 @@ packages:
     dependencies:
       glob: 7.2.0
 
-  /rollup-plugin-dts/4.2.1_pz6niy2zrvqhgxfup3pdyir4yu:
+  /rollup-plugin-dts/4.2.1_7tpfgeokwovvsnuai4vwqwidpi:
     resolution: {integrity: sha512-eaxQZNUJ5iQcxNGlpJ1CUgG4OSVqWjDZ3nNSWBIoGrpcote2aNphSe1RJOaSYkb8dwn3o+rYm1vvld/5z3EGSQ==}
     engines: {node: '>=v12.22.11'}
     peerDependencies:
@@ -7443,13 +7632,13 @@ packages:
       typescript: ^4.6
     dependencies:
       magic-string: 0.26.1
-      rollup: 2.72.1
+      rollup: 2.75.6
       typescript: 4.6.4
     optionalDependencies:
       '@babel/code-frame': 7.16.7
     dev: true
 
-  /rollup-plugin-esbuild/4.9.1_pnyrwy4zazm4ltxxkdqkpc4vuy:
+  /rollup-plugin-esbuild/4.9.1_2uefy6dldbldonrghlgjus4ieu:
     resolution: {integrity: sha512-qn/x7Wz9p3Xnva99qcb+nopH0d2VJwVnsxJTGEg+Sh2Z3tqQl33MhOwzekVo1YTKgv+yAmosjcBRJygMfGrtLw==}
     engines: {node: '>=12'}
     peerDependencies:
@@ -7459,15 +7648,15 @@ packages:
       '@rollup/pluginutils': 4.2.1
       debug: 4.3.4
       es-module-lexer: 0.9.3
-      esbuild: 0.14.38
+      esbuild: 0.14.43
       joycon: 3.1.1
       jsonc-parser: 3.0.0
-      rollup: 2.72.1
+      rollup: 2.75.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /rollup-plugin-license/2.8.1_rollup@2.72.1:
+  /rollup-plugin-license/2.8.1_rollup@2.75.6:
     resolution: {integrity: sha512-VYd9pzaNL7NN6xQp93XiiCV2UoduXgSmTcz6rl9bHPdiifT6yH3Zw/omEr73Rq8TIyN4nqJACBbKIT/2eE66wg==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
@@ -7480,13 +7669,13 @@ packages:
       mkdirp: 1.0.4
       moment: 2.29.3
       package-name-regex: 2.0.6
-      rollup: 2.72.1
+      rollup: 2.75.6
       spdx-expression-validate: 2.0.0
       spdx-satisfies: 5.0.1
     dev: true
 
-  /rollup/2.72.1:
-    resolution: {integrity: sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==}
+  /rollup/2.75.6:
+    resolution: {integrity: sha512-OEf0TgpC9vU6WGROJIk1JA3LR5vk/yvqlzxqdrE2CzzXnqKXNzbAwlWUXis8RS3ZPe7LAq+YUxsRa0l3r27MLA==}
     engines: {node: '>=10.0.0'}
     hasBin: true
     optionalDependencies:
@@ -7929,11 +8118,6 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /strip-final-newline/2.0.0:
-    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
-    engines: {node: '>=6'}
-    dev: true
-
   /strip-final-newline/3.0.0:
     resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
     engines: {node: '>=12'}
@@ -8238,6 +8422,7 @@ packages:
 
   /tr46/0.0.3:
     resolution: {integrity: sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=}
+    dev: false
 
   /tr46/2.1.0:
     resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==}
@@ -8415,8 +8600,8 @@ packages:
     resolution: {integrity: sha512-/+BmBDe8GvlB2nIflWasLLAInjYG0bC9HRnfEpNi4sw77J2AJNnEVnTDReVrehoh825+Q/evF3THXTAweyam2g==}
     dev: true
 
-  /uglify-js/3.15.5:
-    resolution: {integrity: sha512-hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ==}
+  /uglify-js/3.16.0:
+    resolution: {integrity: sha512-FEikl6bR30n0T3amyBh3LoiBdqHRy/f4H80+My34HOesOKyHfOsxAPAxOoqC0JUnC1amnO0IwkYC3sko51caSw==}
     engines: {node: '>=0.8.0'}
     hasBin: true
     requiresBuild: true
@@ -8436,16 +8621,16 @@ packages:
     resolution: {integrity: sha512-gJvfMw4h5Q7xieMCeW/d3wtNKZDpFyDR9651s8kL+AGp95sMNhAFRLxy24AUKC3b5EQbB74vaDoU5R+XwsZC6A==}
     hasBin: true
     dependencies:
-      '@rollup/plugin-alias': 3.1.9_rollup@2.72.1
-      '@rollup/plugin-commonjs': 21.1.0_rollup@2.72.1
-      '@rollup/plugin-json': 4.1.0_rollup@2.72.1
-      '@rollup/plugin-node-resolve': 13.2.1_rollup@2.72.1
-      '@rollup/plugin-replace': 4.0.0_rollup@2.72.1
+      '@rollup/plugin-alias': 3.1.9_rollup@2.75.6
+      '@rollup/plugin-commonjs': 21.1.0_rollup@2.75.6
+      '@rollup/plugin-json': 4.1.0_rollup@2.75.6
+      '@rollup/plugin-node-resolve': 13.2.1_rollup@2.75.6
+      '@rollup/plugin-replace': 4.0.0_rollup@2.75.6
       '@rollup/pluginutils': 4.2.1
       chalk: 5.0.1
       consola: 2.15.3
       defu: 6.0.0
-      esbuild: 0.14.38
+      esbuild: 0.14.43
       hookable: 5.1.1
       jiti: 1.13.0
       magic-string: 0.26.1
@@ -8457,9 +8642,9 @@ packages:
       pkg-types: 0.3.2
       pretty-bytes: 6.0.0
       rimraf: 3.0.2
-      rollup: 2.72.1
-      rollup-plugin-dts: 4.2.1_pz6niy2zrvqhgxfup3pdyir4yu
-      rollup-plugin-esbuild: 4.9.1_pnyrwy4zazm4ltxxkdqkpc4vuy
+      rollup: 2.75.6
+      rollup-plugin-dts: 4.2.1_7tpfgeokwovvsnuai4vwqwidpi
+      rollup-plugin-esbuild: 4.9.1_2uefy6dldbldonrghlgjus4ieu
       scule: 0.2.1
       typescript: 4.6.4
       untyped: 0.4.4
@@ -8484,8 +8669,8 @@ packages:
   /untyped/0.4.4:
     resolution: {integrity: sha512-sY6u8RedwfLfBis0copfU/fzROieyAndqPs8Kn2PfyzTjtA88vCk81J1b5z+8/VJc+cwfGy23/AqOCpvAbkNVw==}
     dependencies:
-      '@babel/core': 7.17.10
-      '@babel/standalone': 7.17.11
+      '@babel/core': 7.18.5
+      '@babel/standalone': 7.18.5
       '@babel/types': 7.18.4
       scule: 0.2.1
     transitivePeerDependencies:
@@ -8685,6 +8870,7 @@ packages:
 
   /webidl-conversions/3.0.1:
     resolution: {integrity: sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=}
+    dev: false
 
   /webidl-conversions/6.1.0:
     resolution: {integrity: sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==}
@@ -8696,6 +8882,7 @@ packages:
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
+    dev: false
 
   /whatwg-url/8.7.0:
     resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==}
@@ -8741,7 +8928,7 @@ packages:
     resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==}
     engines: {node: '>= 10.0.0'}
     dependencies:
-      '@babel/parser': 7.17.10
+      '@babel/parser': 7.18.5
       '@babel/types': 7.17.10
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
diff --git a/scripts/releaseUtils.ts b/scripts/releaseUtils.ts
index ea6987e1fe5c27..3d886d39f5332b 100644
--- a/scripts/releaseUtils.ts
+++ b/scripts/releaseUtils.ts
@@ -5,7 +5,7 @@ import { existsSync, readdirSync, writeFileSync } from 'fs'
 import path from 'path'
 import colors from 'picocolors'
 import type { Options as ExecaOptions, ExecaReturnValue } from 'execa'
-import execa from 'execa'
+import { execa } from 'execa'
 import type { ReleaseType } from 'semver'
 import semver from 'semver'
 import fs from 'fs-extra'

From 49c089662916bb2c0ae2aae649c7c8b714509922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Tue, 14 Jun 2022 14:53:40 +0900
Subject: [PATCH 46/72] fix: default host to `localhost` instead of `127.0.0.1`
 (#8543)

---
 docs/config/server-options.md                 |  2 +-
 docs/guide/migration.md                       |  2 ++
 .../vite/src/node/__tests__/utils.spec.ts     | 25 +++++++++++--
 packages/vite/src/node/constants.ts           | 12 +++++++
 packages/vite/src/node/http.ts                | 12 +++++--
 packages/vite/src/node/logger.ts              | 36 +++++++++++++++----
 packages/vite/src/node/utils.ts               | 14 +++-----
 playground/css/postcss-caching/css.spec.ts    |  2 +-
 8 files changed, 84 insertions(+), 21 deletions(-)

diff --git a/docs/config/server-options.md b/docs/config/server-options.md
index cf59ab27644656..a3f82aa0f12b79 100644
--- a/docs/config/server-options.md
+++ b/docs/config/server-options.md
@@ -3,7 +3,7 @@
 ## server.host
 
 - **Type:** `string | boolean`
-- **Default:** `'127.0.0.1'`
+- **Default:** `'localhost'`
 
 Specify which IP addresses the server should listen on.
 Set this to `0.0.0.0` or `true` to listen on all addresses, including LAN and public addresses.
diff --git a/docs/guide/migration.md b/docs/guide/migration.md
index 78b738afb82ddf..c3e7be3a8a2c27 100644
--- a/docs/guide/migration.md
+++ b/docs/guide/migration.md
@@ -31,6 +31,8 @@ A small fraction of users will now require using [@vitejs/plugin-legacy](https:/
 
 Vite's default dev server port is now 5173. You can use [`server.port`](../config/server-options.md#server-port) to set it to 3000.
 
+Vite's default dev server host is now `localhost`. You can use [`server.host`](../config/server-options.md#server-host) to set it to `127.0.0.1`.
+
 Vite optimizes dependencies with esbuild to both convert CJS-only deps to ESM and to reduce the number of modules the browser needs to request. In v3, the default strategy to discover and batch dependencies has changed. Vite no longer pre-scans user code with esbuild to get an initial list of dependencies on cold start. Instead, it delays the first dependency optimization run until every imported user module on load is processed.
 
 To get back the v2 strategy, you can use [`optimizeDeps.devScan`](../config/dep-optimization-options.md#optimizedepsdevscan).
diff --git a/packages/vite/src/node/__tests__/utils.spec.ts b/packages/vite/src/node/__tests__/utils.spec.ts
index c8a824bbb3d28f..5a6ea4d55de30c 100644
--- a/packages/vite/src/node/__tests__/utils.spec.ts
+++ b/packages/vite/src/node/__tests__/utils.spec.ts
@@ -49,9 +49,9 @@ describe('injectQuery', () => {
 })
 
 describe('resolveHostname', () => {
-  test('defaults to 127.0.0.1', () => {
+  test('defaults to localhost', () => {
     expect(resolveHostname(undefined)).toEqual({
-      host: '127.0.0.1',
+      host: 'localhost',
       name: 'localhost'
     })
   })
@@ -62,6 +62,27 @@ describe('resolveHostname', () => {
       name: 'localhost'
     })
   })
+
+  test('accepts 0.0.0.0', () => {
+    expect(resolveHostname('0.0.0.0')).toEqual({
+      host: '0.0.0.0',
+      name: 'localhost'
+    })
+  })
+
+  test('accepts ::', () => {
+    expect(resolveHostname('::')).toEqual({
+      host: '::',
+      name: 'localhost'
+    })
+  })
+
+  test('accepts 0000:0000:0000:0000:0000:0000:0000:0000', () => {
+    expect(resolveHostname('0000:0000:0000:0000:0000:0000:0000:0000')).toEqual({
+      host: '0000:0000:0000:0000:0000:0000:0000:0000',
+      name: 'localhost'
+    })
+  })
 })
 
 test('ts import of file with .js extension', () => {
diff --git a/packages/vite/src/node/constants.ts b/packages/vite/src/node/constants.ts
index acd067908a598c..3b4d496e30bd3c 100644
--- a/packages/vite/src/node/constants.ts
+++ b/packages/vite/src/node/constants.ts
@@ -105,3 +105,15 @@ export const DEFAULT_ASSETS_RE = new RegExp(
 )
 
 export const DEP_VERSION_RE = /[\?&](v=[\w\.-]+)\b/
+
+export const loopbackHosts = new Set([
+  'localhost',
+  '127.0.0.1',
+  '::1',
+  '0000:0000:0000:0000:0000:0000:0000:0001'
+])
+export const wildcardHosts = new Set([
+  '0.0.0.0',
+  '::',
+  '0000:0000:0000:0000:0000:0000:0000:0000'
+])
diff --git a/packages/vite/src/node/http.ts b/packages/vite/src/node/http.ts
index 2a1c7c920b8ea9..c2757f36477600 100644
--- a/packages/vite/src/node/http.ts
+++ b/packages/vite/src/node/http.ts
@@ -5,6 +5,7 @@ import type {
   OutgoingHttpHeaders as HttpServerHeaders
 } from 'http'
 import type { ServerOptions as HttpsServerOptions } from 'https'
+import { promises as dns } from 'dns'
 import type { Connect } from 'types/connect'
 import { isObject } from './utils'
 import type { ProxyOptions } from './server/middlewares/proxy'
@@ -184,9 +185,16 @@ export async function httpServerStart(
     logger: Logger
   }
 ): Promise<number> {
-  return new Promise((resolve, reject) => {
-    let { port, strictPort, host, logger } = serverOptions
+  let { port, strictPort, host, logger } = serverOptions
+
+  // This could be removed when Vite only supports Node 17+ because verbatim=true is default
+  // https://github.com/nodejs/node/pull/39987
+  if (host === 'localhost') {
+    const addr = await dns.lookup('localhost', { verbatim: true })
+    host = addr.address
+  }
 
+  return new Promise((resolve, reject) => {
     const onError = (e: Error & { code?: string }) => {
       if (e.code === 'EADDRINUSE') {
         if (strictPort) {
diff --git a/packages/vite/src/node/logger.ts b/packages/vite/src/node/logger.ts
index 1176a265a4fcbe..d3ed4ce896d6fb 100644
--- a/packages/vite/src/node/logger.ts
+++ b/packages/vite/src/node/logger.ts
@@ -8,6 +8,7 @@ import type { RollupError } from 'rollup'
 import type { CommonServerOptions } from './http'
 import type { Hostname } from './utils'
 import { resolveHostname } from './utils'
+import { loopbackHosts, wildcardHosts } from './constants'
 import type { ResolvedConfig } from '.'
 
 export type LogType = 'error' | 'warn' | 'info'
@@ -173,15 +174,23 @@ function printServerUrls(
 ): void {
   const urls: Array<{ label: string; url: string }> = []
 
-  if (hostname.host === '127.0.0.1') {
+  if (hostname.host && loopbackHosts.has(hostname.host)) {
+    let hostnameName = hostname.name
+    if (
+      hostnameName === '::1' ||
+      hostnameName === '0000:0000:0000:0000:0000:0000:0000:0001'
+    ) {
+      hostnameName = `[${hostnameName}]`
+    }
+
     urls.push({
       label: 'Local',
       url: colors.cyan(
-        `${protocol}://${hostname.name}:${colors.bold(port)}${base}`
+        `${protocol}://${hostnameName}:${colors.bold(port)}${base}`
       )
     })
 
-    if (hostname.name !== '127.0.0.1') {
+    if (hostname.name === 'localhost') {
       urls.push({
         label: 'Network',
         url: colors.dim(`use ${colors.white(colors.bold('--host'))} to expose`)
@@ -212,11 +221,26 @@ function printServerUrls(
     (length, { label }) => Math.max(length, label.length),
     0
   )
-  urls.forEach(({ label, url: text }) => {
+  const print = (
+    iconWithColor: string,
+    label: string,
+    messageWithColor: string
+  ) => {
     info(
-      `  ${colors.green('➜')}  ${colors.bold(label)}: ${' '.repeat(
+      `  ${iconWithColor}  ${colors.bold(label)}: ${' '.repeat(
         length - label.length
-      )}${text}`
+      )}${messageWithColor}`
     )
+  }
+
+  urls.forEach(({ label, url: text }) => {
+    print(colors.green('➜'), label, text)
   })
+  if (!hostname.host || wildcardHosts.has(hostname.host)) {
+    print(
+      colors.bold(colors.blue('ⓘ')),
+      'Note',
+      colors.dim('You are using a wildcard host. Ports might be overriden.')
+    )
+  }
 }
diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
index fff0d714770c8d..e36e33c3cb7225 100644
--- a/packages/vite/src/node/utils.ts
+++ b/packages/vite/src/node/utils.ts
@@ -23,7 +23,8 @@ import {
   DEFAULT_EXTENSIONS,
   ENV_PUBLIC_PATH,
   FS_PREFIX,
-  VALID_ID_PREFIX
+  VALID_ID_PREFIX,
+  wildcardHosts
 } from './constants'
 import type { ResolvedConfig } from '.'
 
@@ -747,7 +748,7 @@ export function resolveHostname(
   let host: string | undefined
   if (optionsHost === undefined || optionsHost === false) {
     // Use a secure default
-    host = '127.0.0.1'
+    host = 'localhost'
   } else if (optionsHost === true) {
     // If passed --host in the CLI without arguments
     host = undefined // undefined typically means 0.0.0.0 or :: (listen on all IPs)
@@ -755,14 +756,9 @@ export function resolveHostname(
     host = optionsHost
   }
 
-  // Set host name to localhost when possible, unless the user explicitly asked for '127.0.0.1'
+  // Set host name to localhost when possible
   const name =
-    (optionsHost !== '127.0.0.1' && host === '127.0.0.1') ||
-    host === '0.0.0.0' ||
-    host === '::' ||
-    host === undefined
-      ? 'localhost'
-      : host
+    host === undefined || wildcardHosts.has(host) ? 'localhost' : host
 
   return { host, name }
 }
diff --git a/playground/css/postcss-caching/css.spec.ts b/playground/css/postcss-caching/css.spec.ts
index bbffdb618280e4..45e8aadaa5489c 100644
--- a/playground/css/postcss-caching/css.spec.ts
+++ b/playground/css/postcss-caching/css.spec.ts
@@ -36,7 +36,7 @@ test('postcss config', async () => {
     blueApp = null
 
     greenApp = await startServer(greenAppDir)
-    await page.goto(`http://localhost:${port}`)
+    await page.reload() // hmr reloads it automatically but reload here for consistency
     const greenA = await page.$('.postcss-a')
     expect(await getColor(greenA)).toBe('black')
     const greenB = await page.$('.postcss-b')

From 98ccc0b243f0ead1dc488f89bb338366bc434c2d Mon Sep 17 00:00:00 2001
From: patak-dev <matias.capeletto@gmail.com>
Date: Tue, 14 Jun 2022 09:03:08 +0200
Subject: [PATCH 47/72] release: v3.0.0-alpha.11

---
 packages/vite/CHANGELOG.md | 21 +++++++++++++++++++++
 packages/vite/package.json |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md
index 92a05ffb43ea64..5f0f19a5f034e6 100644
--- a/packages/vite/CHANGELOG.md
+++ b/packages/vite/CHANGELOG.md
@@ -1,3 +1,24 @@
+## 3.0.0-alpha.11 (2022-06-14)
+
+* fix: add missed JPEG file extensions to `KNOWN_ASSET_TYPES` (#8565) ([2dfc015](https://github.com/vitejs/vite/commit/2dfc015)), closes [#8565](https://github.com/vitejs/vite/issues/8565)
+* fix: default export module transformation for vitest spy (#8567) ([d357e33](https://github.com/vitejs/vite/commit/d357e33)), closes [#8567](https://github.com/vitejs/vite/issues/8567)
+* fix: default host to `localhost` instead of `127.0.0.1` (#8543) ([49c0896](https://github.com/vitejs/vite/commit/49c0896)), closes [#8543](https://github.com/vitejs/vite/issues/8543)
+* fix: dont handle sigterm in middleware mode (#8550) ([c6f43dd](https://github.com/vitejs/vite/commit/c6f43dd)), closes [#8550](https://github.com/vitejs/vite/issues/8550)
+* fix: mime missing extensions (#8568) ([acf3024](https://github.com/vitejs/vite/commit/acf3024)), closes [#8568](https://github.com/vitejs/vite/issues/8568)
+* fix: objurl for type module, and concurrent tests (#8541) ([26ecd5a](https://github.com/vitejs/vite/commit/26ecd5a)), closes [#8541](https://github.com/vitejs/vite/issues/8541)
+* fix: outdated optimized dep removed from module graph (#8533) ([3f4d22d](https://github.com/vitejs/vite/commit/3f4d22d)), closes [#8533](https://github.com/vitejs/vite/issues/8533)
+* fix(config): only rewrite .js loader in `loadConfigFromBundledFile` (#8556) ([2548dd3](https://github.com/vitejs/vite/commit/2548dd3)), closes [#8556](https://github.com/vitejs/vite/issues/8556)
+* fix(deps): update all non-major dependencies (#8558) ([9a1fd4c](https://github.com/vitejs/vite/commit/9a1fd4c)), closes [#8558](https://github.com/vitejs/vite/issues/8558)
+* fix(ssr): dont replace rollup input (#7275) ([9a88afa](https://github.com/vitejs/vite/commit/9a88afa)), closes [#7275](https://github.com/vitejs/vite/issues/7275)
+* chore: include 2.9.10-2.9.12 changelog in main (#8535) ([87f58ad](https://github.com/vitejs/vite/commit/87f58ad)), closes [#8535](https://github.com/vitejs/vite/issues/8535)
+* chore: refactor interop named imports (#8544) ([63b523a](https://github.com/vitejs/vite/commit/63b523a)), closes [#8544](https://github.com/vitejs/vite/issues/8544)
+* chore: remove rollup `namespaceToStringTag` (#8569) ([b85802a](https://github.com/vitejs/vite/commit/b85802a)), closes [#8569](https://github.com/vitejs/vite/issues/8569)
+* chore: remove unused timestamp option (#8545) ([d641860](https://github.com/vitejs/vite/commit/d641860)), closes [#8545](https://github.com/vitejs/vite/issues/8545)
+* chore: update major deps (#8572) ([0e20949](https://github.com/vitejs/vite/commit/0e20949)), closes [#8572](https://github.com/vitejs/vite/issues/8572)
+* feat: expose createFilter util (#8562) ([c5c424a](https://github.com/vitejs/vite/commit/c5c424a)), closes [#8562](https://github.com/vitejs/vite/issues/8562)
+
+
+
 ## 3.0.0-alpha.10 (2022-06-10)
 
 * fix: deps optimizer idle logic for workers (fix #8479) (#8511) ([1e05548](https://github.com/vitejs/vite/commit/1e05548)), closes [#8479](https://github.com/vitejs/vite/issues/8479) [#8511](https://github.com/vitejs/vite/issues/8511)
diff --git a/packages/vite/package.json b/packages/vite/package.json
index ab4ae1235eb3ed..4e8adc9642fcb8 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.0.0-alpha.10",
+  "version": "3.0.0-alpha.11",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",

From c0c5e1a26d2099acd65a062fcfc790b85dc94db5 Mon Sep 17 00:00:00 2001
From: yoho <panyoho@gmail.com>
Date: Tue, 14 Jun 2022 15:12:39 +0800
Subject: [PATCH 48/72] docs: worker related notes (#8554)

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
---
 docs/config/worker-options.md    | 2 +-
 docs/guide/features.md           | 6 ++++++
 packages/vite/src/node/config.ts | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/config/worker-options.md b/docs/config/worker-options.md
index c0c13bf4133adb..c506d249a24932 100644
--- a/docs/config/worker-options.md
+++ b/docs/config/worker-options.md
@@ -11,7 +11,7 @@ Output format for worker bundle.
 
 - **Type:** [`(Plugin | Plugin[])[]`](./shared-options#plugins)
 
-Vite plugins that apply to worker bundle
+Vite plugins that apply to worker bundle. Note that [config.plugins](./shared-options#plugins) does not apply to workers, it should be configured here instead.
 
 ## worker.rollupOptions
 
diff --git a/docs/guide/features.md b/docs/guide/features.md
index 57d1e5a71e4a82..65d01f9b6c7239 100644
--- a/docs/guide/features.md
+++ b/docs/guide/features.md
@@ -511,6 +511,12 @@ By default, the worker script will be emitted as a separate chunk in the product
 import MyWorker from './worker?worker&inline'
 ```
 
+If you wish to retrieve the worker as a URL, add the `url` query:
+
+```js
+import MyWorker from './worker?worker&url'
+```
+
 See [Worker Options](/config/#worker-options) for details on configuring the bundling of all workers.
 
 ## Build Optimizations
diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
index 6bfe9eed759859..3b733fc4032f80 100644
--- a/packages/vite/src/node/config.ts
+++ b/packages/vite/src/node/config.ts
@@ -253,6 +253,7 @@ export type ResolvedConfig = Readonly<
     command: 'build' | 'serve'
     mode: string
     isWorker: boolean
+    // in nested worker bundle to find the main config
     /** @internal */
     mainConfig: ResolvedConfig | null
     isProduction: boolean
@@ -521,7 +522,9 @@ export async function resolveConfig(
     spa: config.spa ?? true
   }
 
-  // flat config.worker.plugin
+  // Some plugins that aren't intended to work in the bundling of workers (doing post-processing at build time for example).
+  // And Plugins may also have cached that could be corrupted by being used in these extra rollup calls.
+  // So we need to separate the worker plugin from the plugin that vite needs to run.
   const [workerPrePlugins, workerNormalPlugins, workerPostPlugins] =
     sortUserPlugins(config.worker?.plugins as Plugin[])
   const workerResolved: ResolvedConfig = {

From e8eb0b6db11f28a8d45a50235ad088620e3ca310 Mon Sep 17 00:00:00 2001
From: Kia King Ishii <kia.king.08@gmail.com>
Date: Tue, 14 Jun 2022 21:59:48 +0900
Subject: [PATCH 49/72] docs: update vitepress to alpha.2 (#8583)

---
 docs/.vitepress/config.ts |   4 +-
 package.json              |   2 +-
 pnpm-lock.yaml            | 364 ++++++++++++++------------------------
 3 files changed, 131 insertions(+), 239 deletions(-)

diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
index 9c3150eb1d0c1b..55b4657af24288 100644
--- a/docs/.vitepress/config.ts
+++ b/docs/.vitepress/config.ts
@@ -14,9 +14,7 @@ export default defineConfig({
     logo: '/logo.svg',
 
     editLink: {
-      repo: 'vitejs/vite',
-      branch: 'main',
-      dir: 'docs',
+      pattern: 'https://github.com/vitejs/vite/edit/main/docs/:path',
       text: 'Suggest changes to this page'
     },
 
diff --git a/package.json b/package.json
index 44ddf5e1ac23b9..d4b32487f48797 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "typescript": "^4.6.4",
     "unbuild": "^0.7.4",
     "vite": "workspace:*",
-    "vitepress": "1.0.0-draft.8",
+    "vitepress": "^1.0.0-alpha.2",
     "vitest": "^0.14.2",
     "vue": "^3.2.37"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0720264b376893..de2c44762c9a07 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -64,7 +64,7 @@ importers:
       typescript: ^4.6.4
       unbuild: ^0.7.4
       vite: workspace:*
-      vitepress: 1.0.0-draft.8
+      vitepress: ^1.0.0-alpha.2
       vitest: ^0.14.2
       vue: ^3.2.37
     devDependencies:
@@ -122,7 +122,7 @@ importers:
       typescript: 4.6.4
       unbuild: 0.7.4
       vite: link:packages/vite
-      vitepress: 1.0.0-draft.8
+      vitepress: 1.0.0-alpha.2
       vitest: 0.14.2
       vue: 3.2.37
 
@@ -1052,114 +1052,104 @@ importers:
 
 packages:
 
-  /@algolia/autocomplete-core/1.5.2:
-    resolution: {integrity: sha512-DY0bhyczFSS1b/CqJlTE/nQRtnTAHl6IemIkBy0nEWnhDzRDdtdx4p5Uuk3vwAFxwEEgi1WqKwgSSMx6DpNL4A==}
+  /@algolia/autocomplete-core/1.6.3:
+    resolution: {integrity: sha512-dqQqRt01fX3YuVFrkceHsoCnzX0bLhrrg8itJI1NM68KjrPYQPYsE+kY8EZTCM4y8VDnhqJErR73xe/ZsV+qAA==}
     dependencies:
-      '@algolia/autocomplete-shared': 1.5.2
+      '@algolia/autocomplete-shared': 1.6.3
     dev: true
 
-  /@algolia/autocomplete-preset-algolia/1.5.2_algoliasearch@4.13.0:
-    resolution: {integrity: sha512-3MRYnYQFJyovANzSX2CToS6/5cfVjbLLqFsZTKcvF3abhQzxbqwwaMBlJtt620uBUOeMzhdfasKhCc40+RHiZw==}
-    peerDependencies:
-      '@algolia/client-search': ^4.9.1
-      algoliasearch: ^4.9.1
-    dependencies:
-      '@algolia/autocomplete-shared': 1.5.2
-      algoliasearch: 4.13.0
-    dev: true
-
-  /@algolia/autocomplete-shared/1.5.2:
-    resolution: {integrity: sha512-ylQAYv5H0YKMfHgVWX0j0NmL8XBcAeeeVQUmppnnMtzDbDnca6CzhKj3Q8eF9cHCgcdTDdb5K+3aKyGWA0obug==}
+  /@algolia/autocomplete-shared/1.6.3:
+    resolution: {integrity: sha512-UV46bnkTztyADFaETfzFC5ryIdGVb2zpAoYgu0tfcuYWjhg1KbLXveFffZIrGVoboqmAk1b+jMrl6iCja1i3lg==}
     dev: true
 
-  /@algolia/cache-browser-local-storage/4.13.0:
-    resolution: {integrity: sha512-nj1vHRZauTqP/bluwkRIgEADEimqojJgoTRCel5f6q8WCa9Y8QeI4bpDQP28FoeKnDRYa3J5CauDlN466jqRhg==}
+  /@algolia/cache-browser-local-storage/4.13.1:
+    resolution: {integrity: sha512-UAUVG2PEfwd/FfudsZtYnidJ9eSCpS+LW9cQiesePQLz41NAcddKxBak6eP2GErqyFagSlnVXe/w2E9h2m2ttg==}
     dependencies:
-      '@algolia/cache-common': 4.13.0
+      '@algolia/cache-common': 4.13.1
     dev: true
 
-  /@algolia/cache-common/4.13.0:
-    resolution: {integrity: sha512-f9mdZjskCui/dA/fA/5a+6hZ7xnHaaZI5tM/Rw9X8rRB39SUlF/+o3P47onZ33n/AwkpSbi5QOyhs16wHd55kA==}
+  /@algolia/cache-common/4.13.1:
+    resolution: {integrity: sha512-7Vaf6IM4L0Jkl3sYXbwK+2beQOgVJ0mKFbz/4qSxKd1iy2Sp77uTAazcX+Dlexekg1fqGUOSO7HS4Sx47ZJmjA==}
     dev: true
 
-  /@algolia/cache-in-memory/4.13.0:
-    resolution: {integrity: sha512-hHdc+ahPiMM92CQMljmObE75laYzNFYLrNOu0Q3/eyvubZZRtY2SUsEEgyUEyzXruNdzrkcDxFYa7YpWBJYHAg==}
+  /@algolia/cache-in-memory/4.13.1:
+    resolution: {integrity: sha512-pZzybCDGApfA/nutsFK1P0Sbsq6fYJU3DwIvyKg4pURerlJM4qZbB9bfLRef0FkzfQu7W11E4cVLCIOWmyZeuQ==}
     dependencies:
-      '@algolia/cache-common': 4.13.0
+      '@algolia/cache-common': 4.13.1
     dev: true
 
-  /@algolia/client-account/4.13.0:
-    resolution: {integrity: sha512-FzFqFt9b0g/LKszBDoEsW+dVBuUe1K3scp2Yf7q6pgHWM1WqyqUlARwVpLxqyc+LoyJkTxQftOKjyFUqddnPKA==}
+  /@algolia/client-account/4.13.1:
+    resolution: {integrity: sha512-TFLiZ1KqMiir3FNHU+h3b0MArmyaHG+eT8Iojio6TdpeFcAQ1Aiy+2gb3SZk3+pgRJa/BxGmDkRUwE5E/lv3QQ==}
     dependencies:
-      '@algolia/client-common': 4.13.0
-      '@algolia/client-search': 4.13.0
-      '@algolia/transporter': 4.13.0
+      '@algolia/client-common': 4.13.1
+      '@algolia/client-search': 4.13.1
+      '@algolia/transporter': 4.13.1
     dev: true
 
-  /@algolia/client-analytics/4.13.0:
-    resolution: {integrity: sha512-klmnoq2FIiiMHImkzOm+cGxqRLLu9CMHqFhbgSy9wtXZrqb8BBUIUE2VyBe7azzv1wKcxZV2RUyNOMpFqmnRZA==}
+  /@algolia/client-analytics/4.13.1:
+    resolution: {integrity: sha512-iOS1JBqh7xaL5x00M5zyluZ9+9Uy9GqtYHv/2SMuzNW1qP7/0doz1lbcsP3S7KBbZANJTFHUOfuqyRLPk91iFA==}
     dependencies:
-      '@algolia/client-common': 4.13.0
-      '@algolia/client-search': 4.13.0
-      '@algolia/requester-common': 4.13.0
-      '@algolia/transporter': 4.13.0
+      '@algolia/client-common': 4.13.1
+      '@algolia/client-search': 4.13.1
+      '@algolia/requester-common': 4.13.1
+      '@algolia/transporter': 4.13.1
     dev: true
 
-  /@algolia/client-common/4.13.0:
-    resolution: {integrity: sha512-GoXfTp0kVcbgfSXOjfrxx+slSipMqGO9WnNWgeMmru5Ra09MDjrcdunsiiuzF0wua6INbIpBQFTC2Mi5lUNqGA==}
+  /@algolia/client-common/4.13.1:
+    resolution: {integrity: sha512-LcDoUE0Zz3YwfXJL6lJ2OMY2soClbjrrAKB6auYVMNJcoKZZ2cbhQoFR24AYoxnGUYBER/8B+9sTBj5bj/Gqbg==}
     dependencies:
-      '@algolia/requester-common': 4.13.0
-      '@algolia/transporter': 4.13.0
+      '@algolia/requester-common': 4.13.1
+      '@algolia/transporter': 4.13.1
     dev: true
 
-  /@algolia/client-personalization/4.13.0:
-    resolution: {integrity: sha512-KneLz2WaehJmNfdr5yt2HQETpLaCYagRdWwIwkTqRVFCv4DxRQ2ChPVW9jeTj4YfAAhfzE6F8hn7wkQ/Jfj6ZA==}
+  /@algolia/client-personalization/4.13.1:
+    resolution: {integrity: sha512-1CqrOW1ypVrB4Lssh02hP//YxluoIYXAQCpg03L+/RiXJlCs+uIqlzC0ctpQPmxSlTK6h07kr50JQoYH/TIM9w==}
     dependencies:
-      '@algolia/client-common': 4.13.0
-      '@algolia/requester-common': 4.13.0
-      '@algolia/transporter': 4.13.0
+      '@algolia/client-common': 4.13.1
+      '@algolia/requester-common': 4.13.1
+      '@algolia/transporter': 4.13.1
     dev: true
 
-  /@algolia/client-search/4.13.0:
-    resolution: {integrity: sha512-blgCKYbZh1NgJWzeGf+caKE32mo3j54NprOf0LZVCubQb3Kx37tk1Hc8SDs9bCAE8hUvf3cazMPIg7wscSxspA==}
+  /@algolia/client-search/4.13.1:
+    resolution: {integrity: sha512-YQKYA83MNRz3FgTNM+4eRYbSmHi0WWpo019s5SeYcL3HUan/i5R09VO9dk3evELDFJYciiydSjbsmhBzbpPP2A==}
     dependencies:
-      '@algolia/client-common': 4.13.0
-      '@algolia/requester-common': 4.13.0
-      '@algolia/transporter': 4.13.0
+      '@algolia/client-common': 4.13.1
+      '@algolia/requester-common': 4.13.1
+      '@algolia/transporter': 4.13.1
     dev: true
 
-  /@algolia/logger-common/4.13.0:
-    resolution: {integrity: sha512-8yqXk7rMtmQJ9wZiHOt/6d4/JDEg5VCk83gJ39I+X/pwUPzIsbKy9QiK4uJ3aJELKyoIiDT1hpYVt+5ia+94IA==}
+  /@algolia/logger-common/4.13.1:
+    resolution: {integrity: sha512-L6slbL/OyZaAXNtS/1A8SAbOJeEXD5JcZeDCPYDqSTYScfHu+2ePRTDMgUTY4gQ7HsYZ39N1LujOd8WBTmM2Aw==}
     dev: true
 
-  /@algolia/logger-console/4.13.0:
-    resolution: {integrity: sha512-YepRg7w2/87L0vSXRfMND6VJ5d6699sFJBRWzZPOlek2p5fLxxK7O0VncYuc/IbVHEgeApvgXx0WgCEa38GVuQ==}
+  /@algolia/logger-console/4.13.1:
+    resolution: {integrity: sha512-7jQOTftfeeLlnb3YqF8bNgA2GZht7rdKkJ31OCeSH2/61haO0tWPoNRjZq9XLlgMQZH276pPo0NdiArcYPHjCA==}
     dependencies:
-      '@algolia/logger-common': 4.13.0
+      '@algolia/logger-common': 4.13.1
     dev: true
 
-  /@algolia/requester-browser-xhr/4.13.0:
-    resolution: {integrity: sha512-Dj+bnoWR5MotrnjblzGKZ2kCdQi2cK/VzPURPnE616NU/il7Ypy6U6DLGZ/ZYz+tnwPa0yypNf21uqt84fOgrg==}
+  /@algolia/requester-browser-xhr/4.13.1:
+    resolution: {integrity: sha512-oa0CKr1iH6Nc7CmU6RE7TnXMjHnlyp7S80pP/LvZVABeJHX3p/BcSCKovNYWWltgTxUg0U1o+2uuy8BpMKljwA==}
     dependencies:
-      '@algolia/requester-common': 4.13.0
+      '@algolia/requester-common': 4.13.1
     dev: true
 
-  /@algolia/requester-common/4.13.0:
-    resolution: {integrity: sha512-BRTDj53ecK+gn7ugukDWOOcBRul59C4NblCHqj4Zm5msd5UnHFjd/sGX+RLOEoFMhetILAnmg6wMrRrQVac9vw==}
+  /@algolia/requester-common/4.13.1:
+    resolution: {integrity: sha512-eGVf0ID84apfFEuXsaoSgIxbU3oFsIbz4XiotU3VS8qGCJAaLVUC5BUJEkiFENZIhon7hIB4d0RI13HY4RSA+w==}
     dev: true
 
-  /@algolia/requester-node-http/4.13.0:
-    resolution: {integrity: sha512-9b+3O4QFU4azLhGMrZAr/uZPydvzOR4aEZfSL8ZrpLZ7fbbqTO0S/5EVko+QIgglRAtVwxvf8UJ1wzTD2jvKxQ==}
+  /@algolia/requester-node-http/4.13.1:
+    resolution: {integrity: sha512-7C0skwtLdCz5heKTVe/vjvrqgL/eJxmiEjHqXdtypcE5GCQCYI15cb+wC4ytYioZDMiuDGeVYmCYImPoEgUGPw==}
     dependencies:
-      '@algolia/requester-common': 4.13.0
+      '@algolia/requester-common': 4.13.1
     dev: true
 
-  /@algolia/transporter/4.13.0:
-    resolution: {integrity: sha512-8tSQYE+ykQENAdeZdofvtkOr5uJ9VcQSWgRhQ9h01AehtBIPAczk/b2CLrMsw5yQZziLs5cZ3pJ3478yI+urhA==}
+  /@algolia/transporter/4.13.1:
+    resolution: {integrity: sha512-pICnNQN7TtrcYJqqPEXByV8rJ8ZRU2hCiIKLTLRyNpghtQG3VAFk6fVtdzlNfdUGZcehSKGarPIZEHlQXnKjgw==}
     dependencies:
-      '@algolia/cache-common': 4.13.0
-      '@algolia/logger-common': 4.13.0
-      '@algolia/requester-common': 4.13.0
+      '@algolia/cache-common': 4.13.1
+      '@algolia/logger-common': 4.13.1
+      '@algolia/requester-common': 4.13.1
     dev: true
 
   /@ampproject/remapping/2.2.0:
@@ -1613,36 +1603,33 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       '@jridgewell/trace-mapping': 0.3.9
+    dev: true
 
-  /@docsearch/css/3.0.0:
-    resolution: {integrity: sha512-1kkV7tkAsiuEd0shunYRByKJe3xQDG2q7wYg24SOw1nV9/2lwEd4WrUYRJC/ukGTl2/kHeFxsaUvtiOy0y6fFA==}
+  /@docsearch/css/3.1.0:
+    resolution: {integrity: sha512-bh5IskwkkodbvC0FzSg1AxMykfDl95hebEKwxNoq4e5QaGzOXSBgW8+jnMFZ7JU4sTBiB04vZWoUSzNrPboLZA==}
     dev: true
 
-  /@docsearch/js/3.0.0:
-    resolution: {integrity: sha512-j3tUJWlgW3slYqzGB8fm7y05kh2qqrIK1dZOXHeMUm/5gdKE85fiz/ltfCPMDFb/MXF+bLZChJXSMzqY0Ck30Q==}
+  /@docsearch/js/3.1.0:
+    resolution: {integrity: sha512-5XSK+xbP0hcTIp54MECqxkWLs6kf7Ug4nWdxWNtx8cUpLiFNFnKXDxCb35wnyNpjukmrx7Q9DkO5tFFsmNVxng==}
     dependencies:
-      '@docsearch/react': 3.0.0
-      preact: 10.7.2
+      '@docsearch/react': 3.1.0
+      preact: 10.7.3
     transitivePeerDependencies:
-      - '@algolia/client-search'
       - '@types/react'
       - react
       - react-dom
     dev: true
 
-  /@docsearch/react/3.0.0:
-    resolution: {integrity: sha512-yhMacqS6TVQYoBh/o603zszIb5Bl8MIXuOc6Vy617I74pirisDzzcNh0NEaYQt50fVVR3khUbeEhUEWEWipESg==}
+  /@docsearch/react/3.1.0:
+    resolution: {integrity: sha512-bjB6ExnZzf++5B7Tfoi6UXgNwoUnNOfZ1NyvnvPhWgCMy5V/biAtLL4o7owmZSYdAKeFSvZ5Lxm0is4su/dBWg==}
     peerDependencies:
-      '@types/react': '>= 16.8.0 < 18.0.0'
-      react: '>= 16.8.0 < 18.0.0'
-      react-dom: '>= 16.8.0 < 18.0.0'
-    dependencies:
-      '@algolia/autocomplete-core': 1.5.2
-      '@algolia/autocomplete-preset-algolia': 1.5.2_algoliasearch@4.13.0
-      '@docsearch/css': 3.0.0
-      algoliasearch: 4.13.0
-    transitivePeerDependencies:
-      - '@algolia/client-search'
+      '@types/react': '>= 16.8.0 < 19.0.0'
+      react: '>= 16.8.0 < 19.0.0'
+      react-dom: '>= 16.8.0 < 19.0.0'
+    dependencies:
+      '@algolia/autocomplete-core': 1.6.3
+      '@docsearch/css': 3.1.0
+      algoliasearch: 4.13.1
     dev: true
 
   /@emotion/babel-plugin/11.9.2:
@@ -1840,6 +1827,7 @@ packages:
     dependencies:
       '@jridgewell/resolve-uri': 3.0.7
       '@jridgewell/sourcemap-codec': 1.4.13
+    dev: true
 
   /@mapbox/node-pre-gyp/1.0.9:
     resolution: {integrity: sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==}
@@ -2132,15 +2120,19 @@ packages:
 
   /@tsconfig/node10/1.0.8:
     resolution: {integrity: sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==}
+    dev: true
 
   /@tsconfig/node12/1.0.9:
     resolution: {integrity: sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==}
+    dev: true
 
   /@tsconfig/node14/1.0.1:
     resolution: {integrity: sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==}
+    dev: true
 
   /@tsconfig/node16/1.0.2:
     resolution: {integrity: sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==}
+    dev: true
 
   /@types/argparse/1.0.38:
     resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==}
@@ -2477,15 +2469,6 @@ packages:
       - supports-color
     dev: false
 
-  /@vue/compiler-core/3.2.33:
-    resolution: {integrity: sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==}
-    dependencies:
-      '@babel/parser': 7.18.5
-      '@vue/shared': 3.2.33
-      estree-walker: 2.0.2
-      source-map: 0.6.1
-    dev: true
-
   /@vue/compiler-core/3.2.37:
     resolution: {integrity: sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==}
     dependencies:
@@ -2494,34 +2477,12 @@ packages:
       estree-walker: 2.0.2
       source-map: 0.6.1
 
-  /@vue/compiler-dom/3.2.33:
-    resolution: {integrity: sha512-GhiG1C8X98Xz9QUX/RlA6/kgPBWJkjq0Rq6//5XTAGSYrTMBgcLpP9+CnlUg1TFxnnCVughAG+KZl28XJqw8uQ==}
-    dependencies:
-      '@vue/compiler-core': 3.2.33
-      '@vue/shared': 3.2.33
-    dev: true
-
   /@vue/compiler-dom/3.2.37:
     resolution: {integrity: sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==}
     dependencies:
       '@vue/compiler-core': 3.2.37
       '@vue/shared': 3.2.37
 
-  /@vue/compiler-sfc/3.2.33:
-    resolution: {integrity: sha512-H8D0WqagCr295pQjUYyO8P3IejM3vEzeCO1apzByAEaAR/WimhMYczHfZVvlCE/9yBaEu/eu9RdiWr0kF8b71Q==}
-    dependencies:
-      '@babel/parser': 7.18.5
-      '@vue/compiler-core': 3.2.33
-      '@vue/compiler-dom': 3.2.33
-      '@vue/compiler-ssr': 3.2.33
-      '@vue/reactivity-transform': 3.2.33
-      '@vue/shared': 3.2.33
-      estree-walker: 2.0.2
-      magic-string: 0.25.9
-      postcss: 8.4.14
-      source-map: 0.6.1
-    dev: true
-
   /@vue/compiler-sfc/3.2.37:
     resolution: {integrity: sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==}
     dependencies:
@@ -2536,13 +2497,6 @@ packages:
       postcss: 8.4.14
       source-map: 0.6.1
 
-  /@vue/compiler-ssr/3.2.33:
-    resolution: {integrity: sha512-XQh1Xdk3VquDpXsnoCd7JnMoWec9CfAzQDQsaMcSU79OrrO2PNR0ErlIjm/mGq3GmBfkQjzZACV+7GhfRB8xMQ==}
-    dependencies:
-      '@vue/compiler-dom': 3.2.33
-      '@vue/shared': 3.2.33
-    dev: true
-
   /@vue/compiler-ssr/3.2.37:
     resolution: {integrity: sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==}
     dependencies:
@@ -2551,17 +2505,6 @@ packages:
 
   /@vue/devtools-api/6.1.4:
     resolution: {integrity: sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ==}
-    dev: false
-
-  /@vue/reactivity-transform/3.2.33:
-    resolution: {integrity: sha512-4UL5KOIvSQb254aqenW4q34qMXbfZcmEsV/yVidLUgvwYQQ/D21bGX3DlgPUGI3c4C+iOnNmDCkIxkILoX/Pyw==}
-    dependencies:
-      '@babel/parser': 7.18.5
-      '@vue/compiler-core': 3.2.33
-      '@vue/shared': 3.2.33
-      estree-walker: 2.0.2
-      magic-string: 0.25.9
-    dev: true
 
   /@vue/reactivity-transform/3.2.37:
     resolution: {integrity: sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==}
@@ -2572,38 +2515,17 @@ packages:
       estree-walker: 2.0.2
       magic-string: 0.25.9
 
-  /@vue/reactivity/3.2.33:
-    resolution: {integrity: sha512-62Sq0mp9/0bLmDuxuLD5CIaMG2susFAGARLuZ/5jkU1FCf9EDbwUuF+BO8Ub3Rbodx0ziIecM/NsmyjardBxfQ==}
-    dependencies:
-      '@vue/shared': 3.2.33
-    dev: true
-
   /@vue/reactivity/3.2.37:
     resolution: {integrity: sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==}
     dependencies:
       '@vue/shared': 3.2.37
 
-  /@vue/runtime-core/3.2.33:
-    resolution: {integrity: sha512-N2D2vfaXsBPhzCV3JsXQa2NECjxP3eXgZlFqKh4tgakp3iX6LCGv76DLlc+IfFZq+TW10Y8QUfeihXOupJ1dGw==}
-    dependencies:
-      '@vue/reactivity': 3.2.33
-      '@vue/shared': 3.2.33
-    dev: true
-
   /@vue/runtime-core/3.2.37:
     resolution: {integrity: sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==}
     dependencies:
       '@vue/reactivity': 3.2.37
       '@vue/shared': 3.2.37
 
-  /@vue/runtime-dom/3.2.33:
-    resolution: {integrity: sha512-LSrJ6W7CZTSUygX5s8aFkraDWlO6K4geOwA3quFF2O+hC3QuAMZt/0Xb7JKE3C4JD4pFwCSO7oCrZmZ0BIJUnw==}
-    dependencies:
-      '@vue/runtime-core': 3.2.33
-      '@vue/shared': 3.2.33
-      csstype: 2.6.20
-    dev: true
-
   /@vue/runtime-dom/3.2.37:
     resolution: {integrity: sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==}
     dependencies:
@@ -2611,16 +2533,6 @@ packages:
       '@vue/shared': 3.2.37
       csstype: 2.6.20
 
-  /@vue/server-renderer/3.2.33_vue@3.2.33:
-    resolution: {integrity: sha512-4jpJHRD4ORv8PlbYi+/MfP8ec1okz6rybe36MdpkDrGIdEItHEUyaHSKvz+ptNEyQpALmmVfRteHkU9F8vxOew==}
-    peerDependencies:
-      vue: 3.2.33
-    dependencies:
-      '@vue/compiler-ssr': 3.2.33
-      '@vue/shared': 3.2.33
-      vue: 3.2.33
-    dev: true
-
   /@vue/server-renderer/3.2.37_vue@3.2.37:
     resolution: {integrity: sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==}
     peerDependencies:
@@ -2630,15 +2542,11 @@ packages:
       '@vue/shared': 3.2.37
       vue: 3.2.37
 
-  /@vue/shared/3.2.33:
-    resolution: {integrity: sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==}
-    dev: true
-
   /@vue/shared/3.2.37:
     resolution: {integrity: sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==}
 
-  /@vueuse/core/8.5.0_vue@3.2.33:
-    resolution: {integrity: sha512-VEJ6sGNsPlUp0o9BGda2YISvDZbhWJSOJu5zlp2TufRGVrLcYUKr31jyFEOj6RXzG3k/H4aCYeZyjpItfU8glw==}
+  /@vueuse/core/8.6.0_vue@3.2.37:
+    resolution: {integrity: sha512-VirzExCm/N+QdrEWT7J4uSrvJ5hquKIAU9alQ37kUvIJk9XxCLxmfRnmekYc1kz2+6BnoyuKYXVmrMV351CB4w==}
     peerDependencies:
       '@vue/composition-api': ^1.1.0
       vue: ^2.6.0 || ^3.2.0
@@ -2648,18 +2556,18 @@ packages:
       vue:
         optional: true
     dependencies:
-      '@vueuse/metadata': 8.5.0
-      '@vueuse/shared': 8.5.0_vue@3.2.33
-      vue: 3.2.33
-      vue-demi: 0.12.5_vue@3.2.33
+      '@vueuse/metadata': 8.6.0
+      '@vueuse/shared': 8.6.0_vue@3.2.37
+      vue: 3.2.37
+      vue-demi: 0.13.1_vue@3.2.37
     dev: true
 
-  /@vueuse/metadata/8.5.0:
-    resolution: {integrity: sha512-WxsD+Cd+bn+HcjpY6Dl9FJ8ywTRTT9pTwk3bCQpzEhXVYAyNczKDSahk50fCfIJKeWHhyI4B2+/ZEOxQAkUr0g==}
+  /@vueuse/metadata/8.6.0:
+    resolution: {integrity: sha512-F+CKPvaExsm7QgRr8y+ZNJFwXasn89rs5wth/HeX9lJ1q8XEt+HJ16Q5Sxh4rfG5YSKXrStveVge8TKvPjMjFA==}
     dev: true
 
-  /@vueuse/shared/8.5.0_vue@3.2.33:
-    resolution: {integrity: sha512-qKG+SZb44VvGD4dU5cQ63z4JE2Yk39hQUecR0a9sEdJA01cx+XrxAvFKJfPooxwoiqalAVw/ktWK6xbyc/jS3g==}
+  /@vueuse/shared/8.6.0_vue@3.2.37:
+    resolution: {integrity: sha512-Y/IVywZo7IfEoSSEtCYpkVEmPV7pU35mEIxV7PbD/D3ly18B3mEsBaPbtDkNM/QP3zAZ5mn4nEkOfddX4uwuIA==}
     peerDependencies:
       '@vue/composition-api': ^1.1.0
       vue: ^2.6.0 || ^3.2.0
@@ -2669,8 +2577,8 @@ packages:
       vue:
         optional: true
     dependencies:
-      vue: 3.2.33
-      vue-demi: 0.12.5_vue@3.2.33
+      vue: 3.2.37
+      vue-demi: 0.13.1_vue@3.2.37
     dev: true
 
   /@wessberg/stringutil/1.0.19:
@@ -2722,6 +2630,7 @@ packages:
   /acorn-walk/8.2.0:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
+    dev: true
 
   /acorn/7.4.1:
     resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
@@ -2732,6 +2641,7 @@ packages:
     resolution: {integrity: sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==}
     engines: {node: '>=0.4.0'}
     hasBin: true
+    dev: true
 
   /add-stream/1.0.0:
     resolution: {integrity: sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=}
@@ -2763,23 +2673,23 @@ packages:
       uri-js: 4.4.1
     dev: true
 
-  /algoliasearch/4.13.0:
-    resolution: {integrity: sha512-oHv4faI1Vl2s+YC0YquwkK/TsaJs79g2JFg5FDm2rKN12VItPTAeQ7hyJMHarOPPYuCnNC5kixbtcqvb21wchw==}
+  /algoliasearch/4.13.1:
+    resolution: {integrity: sha512-dtHUSE0caWTCE7liE1xaL+19AFf6kWEcyn76uhcitWpntqvicFHXKFoZe5JJcv9whQOTRM6+B8qJz6sFj+rDJA==}
     dependencies:
-      '@algolia/cache-browser-local-storage': 4.13.0
-      '@algolia/cache-common': 4.13.0
-      '@algolia/cache-in-memory': 4.13.0
-      '@algolia/client-account': 4.13.0
-      '@algolia/client-analytics': 4.13.0
-      '@algolia/client-common': 4.13.0
-      '@algolia/client-personalization': 4.13.0
-      '@algolia/client-search': 4.13.0
-      '@algolia/logger-common': 4.13.0
-      '@algolia/logger-console': 4.13.0
-      '@algolia/requester-browser-xhr': 4.13.0
-      '@algolia/requester-common': 4.13.0
-      '@algolia/requester-node-http': 4.13.0
-      '@algolia/transporter': 4.13.0
+      '@algolia/cache-browser-local-storage': 4.13.1
+      '@algolia/cache-common': 4.13.1
+      '@algolia/cache-in-memory': 4.13.1
+      '@algolia/client-account': 4.13.1
+      '@algolia/client-analytics': 4.13.1
+      '@algolia/client-common': 4.13.1
+      '@algolia/client-personalization': 4.13.1
+      '@algolia/client-search': 4.13.1
+      '@algolia/logger-common': 4.13.1
+      '@algolia/logger-console': 4.13.1
+      '@algolia/requester-browser-xhr': 4.13.1
+      '@algolia/requester-common': 4.13.1
+      '@algolia/requester-node-http': 4.13.1
+      '@algolia/transporter': 4.13.1
     dev: true
 
   /ansi-escapes/4.3.2:
@@ -2836,6 +2746,7 @@ packages:
 
   /arg/4.1.3:
     resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
+    dev: true
 
   /arg/5.0.1:
     resolution: {integrity: sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==}
@@ -3630,6 +3541,7 @@ packages:
 
   /create-require/1.1.1:
     resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
+    dev: true
 
   /cross-env/7.0.3:
     resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
@@ -3877,6 +3789,7 @@ packages:
   /diff/4.0.2:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
+    dev: true
 
   /dir-glob/3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
@@ -5053,19 +4966,6 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
-    dev: false
-
-  /follow-redirects/1.15.0_debug@4.3.4:
-    resolution: {integrity: sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dependencies:
-      debug: 4.3.4
-    dev: true
 
   /form-data/4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
@@ -5458,7 +5358,7 @@ packages:
     engines: {node: '>=8.0.0'}
     dependencies:
       eventemitter3: 4.0.7
-      follow-redirects: 1.15.0_debug@4.3.4
+      follow-redirects: 1.15.0
       requires-port: 1.0.0
     transitivePeerDependencies:
       - debug
@@ -6158,6 +6058,7 @@ packages:
 
   /make-error/1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
+    dev: true
 
   /map-obj/1.0.1:
     resolution: {integrity: sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=}
@@ -7130,8 +7031,8 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
-  /preact/10.7.2:
-    resolution: {integrity: sha512-GLjn0I3r6ka+NvxJUppsVFqb4V0qDTEHT/QxHlidPuClGaxF/4AI2Qti4a0cv3XMh5n1+D3hLScW10LRIm5msQ==}
+  /preact/10.7.3:
+    resolution: {integrity: sha512-giqJXP8VbtA1tyGa3f1n9wiN7PrHtONrDyE3T+ifjr/tTkg+2N4d/6sjC9WyJKv8wM7rOYDveqy5ZoFmYlwo4w==}
     dev: true
 
   /prelude-ls/1.2.1:
@@ -8469,6 +8370,7 @@ packages:
       make-error: 1.3.6
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
+    dev: true
 
   /tsconfck/2.0.1:
     resolution: {integrity: sha512-/ipap2eecmVBmBlsQLBRbUmUNFwNJV/z2E+X0FPtHNjPwroMZQ7m39RMaCywlCulBheYXgMdUlWDd9rzxwMA0Q==}
@@ -8710,6 +8612,7 @@ packages:
 
   /v8-compile-cache-lib/3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
+    dev: true
 
   /v8-compile-cache/2.3.0:
     resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
@@ -8736,21 +8639,21 @@ packages:
     engines: {node: '>= 0.8'}
     dev: true
 
-  /vitepress/1.0.0-draft.8:
-    resolution: {integrity: sha512-r1cphHgtJ/KFwtph3cyusGWjRyX0NHvwfBboKnG5mRJpOP/JyvX5q5+NIiRYElPgdFXU7Roxkl8BcJbxWht56Q==}
+  /vitepress/1.0.0-alpha.2:
+    resolution: {integrity: sha512-twSsmx2DI/3XgZZ8KLyRAH8RgK2Zj4kJx/kwhZhimwndYqQDrtcIaAcuV+P3FKukZ+cYtm9yt9qohz631jKx4A==}
     engines: {node: '>=14.6.0'}
     hasBin: true
     dependencies:
-      '@docsearch/css': 3.0.0
-      '@docsearch/js': 3.0.0
+      '@docsearch/css': 3.1.0
+      '@docsearch/js': 3.1.0
       '@vitejs/plugin-vue': link:packages/plugin-vue
-      '@vueuse/core': 8.5.0_vue@3.2.33
+      '@vue/devtools-api': 6.1.4
+      '@vueuse/core': 8.6.0_vue@3.2.37
       body-scroll-lock: 4.0.0-beta.0
       shiki: 0.10.1
       vite: link:packages/vite
-      vue: 3.2.33
+      vue: 3.2.37
     transitivePeerDependencies:
-      - '@algolia/client-search'
       - '@types/react'
       - '@vue/composition-api'
       - react
@@ -8801,8 +8704,8 @@ packages:
     resolution: {integrity: sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==}
     dev: true
 
-  /vue-demi/0.12.5_vue@3.2.33:
-    resolution: {integrity: sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==}
+  /vue-demi/0.13.1_vue@3.2.37:
+    resolution: {integrity: sha512-xmkJ56koG3ptpLnpgmIzk9/4nFf4CqduSJbUM0OdPoU87NwRuZ6x49OLhjSa/fC15fV+5CbEnrxU4oyE022svg==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
@@ -8813,7 +8716,7 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 3.2.33
+      vue: 3.2.37
     dev: true
 
   /vue-router/4.0.16_vue@3.2.37:
@@ -8825,16 +8728,6 @@ packages:
       vue: 3.2.37
     dev: false
 
-  /vue/3.2.33:
-    resolution: {integrity: sha512-si1ExAlDUrLSIg/V7D/GgA4twJwfsfgG+t9w10z38HhL/HA07132pUQ2KuwAo8qbCyMJ9e6OqrmWrOCr+jW7ZQ==}
-    dependencies:
-      '@vue/compiler-dom': 3.2.33
-      '@vue/compiler-sfc': 3.2.33
-      '@vue/runtime-dom': 3.2.33
-      '@vue/server-renderer': 3.2.33_vue@3.2.33
-      '@vue/shared': 3.2.33
-    dev: true
-
   /vue/3.2.37:
     resolution: {integrity: sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==}
     dependencies:
@@ -9032,6 +8925,7 @@ packages:
   /yn/3.1.1:
     resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
     engines: {node: '>=6'}
+    dev: true
 
   /youch/2.2.2:
     resolution: {integrity: sha512-/FaCeG3GkuJwaMR34GHVg0l8jCbafZLHiFowSjqLlqhC6OMyf2tPJBu8UirF7/NI9X/R5ai4QfEKUCOxMAGxZQ==}

From 3aa54f7bce81b9d1336b45bd1780a6ff9aad9fd2 Mon Sep 17 00:00:00 2001
From: Shinigami <chrissi92@hotmail.de>
Date: Tue, 14 Jun 2022 15:01:02 +0200
Subject: [PATCH 50/72] chore(deps): update dependency prettier to v2.7 (#8581)

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

diff --git a/package.json b/package.json
index d4b32487f48797..bff4025a81a5f0 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "picocolors": "^1.0.0",
     "playwright-chromium": "^1.22.2",
     "pnpm": "^7.2.1",
-    "prettier": "2.6.2",
+    "prettier": "2.7.0",
     "prompts": "^2.4.2",
     "rimraf": "^3.0.2",
     "rollup": "^2.75.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index de2c44762c9a07..dab7d063a19ec4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -53,7 +53,7 @@ importers:
       picocolors: ^1.0.0
       playwright-chromium: ^1.22.2
       pnpm: ^7.2.1
-      prettier: 2.6.2
+      prettier: 2.7.0
       prompts: ^2.4.2
       rimraf: ^3.0.2
       rollup: ^2.75.6
@@ -111,7 +111,7 @@ importers:
       picocolors: 1.0.0
       playwright-chromium: 1.22.2
       pnpm: 7.2.1
-      prettier: 2.6.2
+      prettier: 2.7.0
       prompts: 2.4.2
       rimraf: 3.0.2
       rollup: 2.75.6
@@ -7040,8 +7040,8 @@ packages:
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /prettier/2.6.2:
-    resolution: {integrity: sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==}
+  /prettier/2.7.0:
+    resolution: {integrity: sha512-nwoX4GMFgxoPC6diHvSwmK/4yU8FFH3V8XWtLQrbj4IBsK2pkYhG4kf/ljF/haaZ/aii+wNJqISrCDPgxGWDVQ==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     dev: true

From 73e17750022749515efd9413480ae02fb9244bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= <bugs@bergstroem.nu>
Date: Tue, 14 Jun 2022 09:14:14 -0400
Subject: [PATCH 51/72] feat: 500 response if the node proxy request fails
 (#7398)

---
 packages/vite/src/node/server/middlewares/proxy.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/vite/src/node/server/middlewares/proxy.ts b/packages/vite/src/node/server/middlewares/proxy.ts
index 5c447435911ecd..9cd529a0dbba7b 100644
--- a/packages/vite/src/node/server/middlewares/proxy.ts
+++ b/packages/vite/src/node/server/middlewares/proxy.ts
@@ -43,11 +43,16 @@ export function proxyMiddleware(
     }
     const proxy = httpProxy.createProxyServer(opts) as HttpProxy.Server
 
-    proxy.on('error', (err) => {
+    proxy.on('error', (err, req, res) => {
       config.logger.error(`${colors.red(`http proxy error:`)}\n${err.stack}`, {
         timestamp: true,
         error: err
       })
+      res
+        .writeHead(500, {
+          'Content-Type': 'text/plain'
+        })
+        .end()
     })
 
     if (opts.configure) {

From 3439132a06d2e71a0250d5961b739bd1499b4b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Tue, 14 Jun 2022 22:30:57 +0900
Subject: [PATCH 52/72] chore: tweak server start output (#8582)

---
 packages/vite/src/node/logger.ts | 33 +++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/packages/vite/src/node/logger.ts b/packages/vite/src/node/logger.ts
index d3ed4ce896d6fb..70a6ee49a80bf2 100644
--- a/packages/vite/src/node/logger.ts
+++ b/packages/vite/src/node/logger.ts
@@ -173,6 +173,7 @@ function printServerUrls(
   info: Logger['info']
 ): void {
   const urls: Array<{ label: string; url: string }> = []
+  const notes: Array<{ label: string; message: string }> = []
 
   if (hostname.host && loopbackHosts.has(hostname.host)) {
     let hostnameName = hostname.name
@@ -191,9 +192,11 @@ function printServerUrls(
     })
 
     if (hostname.name === 'localhost') {
-      urls.push({
-        label: 'Network',
-        url: colors.dim(`use ${colors.white(colors.bold('--host'))} to expose`)
+      notes.push({
+        label: 'Hint',
+        message: colors.dim(
+          `Use ${colors.white(colors.bold('--host'))} to expose to network.`
+        )
       })
     }
   } else {
@@ -217,9 +220,17 @@ function printServerUrls(
       })
   }
 
-  const length = urls.reduce(
-    (length, { label }) => Math.max(length, label.length),
-    0
+  if (!hostname.host || wildcardHosts.has(hostname.host)) {
+    notes.push({
+      label: 'Note',
+      message: colors.dim(
+        'You are using a wildcard host. Ports might be overriden.'
+      )
+    })
+  }
+
+  const length = Math.max(
+    ...[...urls, ...notes].map(({ label }) => label.length)
   )
   const print = (
     iconWithColor: string,
@@ -236,11 +247,7 @@ function printServerUrls(
   urls.forEach(({ label, url: text }) => {
     print(colors.green('➜'), label, text)
   })
-  if (!hostname.host || wildcardHosts.has(hostname.host)) {
-    print(
-      colors.bold(colors.blue('ⓘ')),
-      'Note',
-      colors.dim('You are using a wildcard host. Ports might be overriden.')
-    )
-  }
+  notes.forEach(({ label, message: text }) => {
+    print(colors.white('❖'), label, text)
+  })
 }

From d1ba0590a43f3c25a25522b1b2c9bf51a17fbde4 Mon Sep 17 00:00:00 2001
From: dayuan <2191516303@qq.com>
Date: Tue, 14 Jun 2022 21:40:40 +0800
Subject: [PATCH 53/72] chore(create-vite): use Type assertion in preact-ts
 (#8579)

---
 packages/create-vite/template-preact-ts/src/main.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/create-vite/template-preact-ts/src/main.tsx b/packages/create-vite/template-preact-ts/src/main.tsx
index 812f602e33bc95..e0ce3e9980eecd 100644
--- a/packages/create-vite/template-preact-ts/src/main.tsx
+++ b/packages/create-vite/template-preact-ts/src/main.tsx
@@ -2,4 +2,4 @@ import { render } from 'preact'
 import { App } from './app'
 import './index.css'
 
-render(<App />, document.getElementById('app')!)
+render(<App />, document.getElementById('app') as HTMLElement)

From eb47b1e2580cd6f8285dadba8f943e1b667ec390 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Tue, 14 Jun 2022 22:44:00 +0800
Subject: [PATCH 54/72] fix(plugin-legacy): don't include SystemJS in modern
 polyfills (#6902)

Co-authored-by: sapphi-red <green@sapphi.red>
---
 packages/plugin-legacy/src/index.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/plugin-legacy/src/index.ts b/packages/plugin-legacy/src/index.ts
index 4aaab1aab2412d..0c9fb1c8c68d33 100644
--- a/packages/plugin-legacy/src/index.ts
+++ b/packages/plugin-legacy/src/index.ts
@@ -134,7 +134,7 @@ function viteLegacyPlugin(options: Options = {}): Plugin[] {
           config.build,
           'es',
           opts,
-          options.externalSystemJS
+          true
         )
         return
       }
@@ -566,7 +566,7 @@ async function buildPolyfillChunk(
   buildOptions: BuildOptions,
   format: 'iife' | 'es',
   rollupOutputOptions: NormalizedOutputOptions,
-  externalSystemJS?: boolean
+  excludeSystemJS?: boolean
 ) {
   let { minify, assetsDir } = buildOptions
   minify = minify ? 'terser' : false
@@ -575,7 +575,7 @@ async function buildPolyfillChunk(
     root: path.dirname(fileURLToPath(import.meta.url)),
     configFile: false,
     logLevel: 'error',
-    plugins: [polyfillsPlugin(imports, externalSystemJS)],
+    plugins: [polyfillsPlugin(imports, excludeSystemJS)],
     build: {
       write: false,
       target: false,
@@ -614,7 +614,7 @@ const polyfillId = '\0vite/legacy-polyfills'
 
 function polyfillsPlugin(
   imports: Set<string>,
-  externalSystemJS?: boolean
+  excludeSystemJS?: boolean
 ): Plugin {
   return {
     name: 'vite:legacy-polyfills',
@@ -627,7 +627,7 @@ function polyfillsPlugin(
       if (id === polyfillId) {
         return (
           [...imports].map((i) => `import "${i}";`).join('') +
-          (externalSystemJS ? '' : `import "systemjs/dist/s.min.js";`)
+          (excludeSystemJS ? '' : `import "systemjs/dist/s.min.js";`)
         )
       }
     }

From d7beaebbfcf448e5f24222c3ec5dba748490ee9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Wed, 15 Jun 2022 01:15:41 +0900
Subject: [PATCH 55/72] chore: enable eslint and prettier cache (#8585)

---
 .gitignore                 |  1 +
 package.json               | 12 ++++++------
 packages/vite/package.json |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9194d44b544c4e..7f1cab0e1f4356 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ node_modules
 playground-temp
 temp
 TODOs.md
+.eslintcache
diff --git a/package.json b/package.json
index bff4025a81a5f0..d9923fa7b80bf4 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
   ],
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "format": "prettier --write .",
-    "lint": "eslint packages/*/{src,types,__tests__}/** playground/**/__tests__/**/*.ts scripts/**",
+    "format": "prettier --write --cache .",
+    "lint": "eslint --cache packages/*/{src,types,__tests__}/** playground/**/__tests__/**/*.ts scripts/**",
     "typecheck": "tsc -p scripts --noEmit && tsc -p playground --noEmit",
     "test": "run-s test-unit test-serve test-build",
     "test-serve": "vitest run -c vitest.config.e2e.ts",
@@ -98,16 +98,16 @@
   },
   "lint-staged": {
     "*": [
-      "prettier --write --ignore-unknown"
+      "prettier --write --cache --ignore-unknown"
     ],
     "packages/*/{src,types}/**/*.ts": [
-      "eslint --fix"
+      "eslint --cache --fix"
     ],
     "packages/**/*.d.ts": [
-      "eslint --fix"
+      "eslint --cache --fix"
     ],
     "playground/**/__tests__/**/*.ts": [
-      "eslint --fix"
+      "eslint --cache --fix"
     ]
   },
   "packageManager": "pnpm@7.2.1",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 4e8adc9642fcb8..b30f184906058a 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -51,8 +51,8 @@
     "patch-types": "esno scripts/patchTypes.ts",
     "roll-types": "api-extractor run && rimraf temp",
     "check-dist-types": "tsc --project tsconfig.check.json",
-    "lint": "eslint --ext .ts src/**",
-    "format": "prettier --write --parser typescript \"src/**/*.ts\"",
+    "lint": "eslint --cache --ext .ts src/**",
+    "format": "prettier --write --cache --parser typescript \"src/**/*.ts\"",
     "prepublishOnly": "npm run build"
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",

From 649c7f60525ec4755f147312475cb473b80d7d5e Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Wed, 15 Jun 2022 02:13:46 +0800
Subject: [PATCH 56/72] fix: sequential injection of tags in transformIndexHtml
 (#5851) (#6901)

Co-authored-by: sapphi-red <green@sapphi.red>
---
 packages/vite/src/node/plugins/html.ts | 34 ++++++++++++--------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts
index 9d06d6e168f2e1..a66a6288f8e8c2 100644
--- a/packages/vite/src/node/plugins/html.ts
+++ b/packages/vite/src/node/plugins/html.ts
@@ -767,11 +767,6 @@ export async function applyHtmlTransforms(
   hooks: IndexHtmlTransformHook[],
   ctx: IndexHtmlTransformContext
 ): Promise<string> {
-  const headTags: HtmlTagDescriptor[] = []
-  const headPrependTags: HtmlTagDescriptor[] = []
-  const bodyTags: HtmlTagDescriptor[] = []
-  const bodyPrependTags: HtmlTagDescriptor[] = []
-
   for (const hook of hooks) {
     const res = await hook(html, ctx)
     if (!res) {
@@ -787,6 +782,12 @@ export async function applyHtmlTransforms(
         html = res.html || html
         tags = res.tags
       }
+
+      const headTags: HtmlTagDescriptor[] = []
+      const headPrependTags: HtmlTagDescriptor[] = []
+      const bodyTags: HtmlTagDescriptor[] = []
+      const bodyPrependTags: HtmlTagDescriptor[] = []
+
       for (const tag of tags) {
         if (tag.injectTo === 'body') {
           bodyTags.push(tag)
@@ -798,21 +799,12 @@ export async function applyHtmlTransforms(
           headPrependTags.push(tag)
         }
       }
-    }
-  }
 
-  // inject tags
-  if (headPrependTags.length) {
-    html = injectToHead(html, headPrependTags, true)
-  }
-  if (headTags.length) {
-    html = injectToHead(html, headTags)
-  }
-  if (bodyPrependTags.length) {
-    html = injectToBody(html, bodyPrependTags, true)
-  }
-  if (bodyTags.length) {
-    html = injectToBody(html, bodyTags)
+      html = injectToHead(html, headPrependTags, true)
+      html = injectToHead(html, headTags)
+      html = injectToBody(html, bodyPrependTags, true)
+      html = injectToBody(html, bodyTags)
+    }
   }
 
   return html
@@ -859,6 +851,8 @@ function injectToHead(
   tags: HtmlTagDescriptor[],
   prepend = false
 ) {
+  if (tags.length === 0) return html
+
   if (prepend) {
     // inject as the first element of head
     if (headPrependInjectRE.test(html)) {
@@ -893,6 +887,8 @@ function injectToBody(
   tags: HtmlTagDescriptor[],
   prepend = false
 ) {
+  if (tags.length === 0) return html
+
   if (prepend) {
     // inject after body open
     if (bodyPrependInjectRE.test(html)) {

From ed12ed1b1d40ae106fdc9403fd581f316b20f560 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Wed, 15 Jun 2022 02:42:52 +0800
Subject: [PATCH 57/72] docs: update config jsdoc style (#8590)

---
 docs/config/index.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/docs/config/index.md b/docs/config/index.md
index 5daf5e7f714275..73a20082295304 100644
--- a/docs/config/index.md
+++ b/docs/config/index.md
@@ -41,14 +41,10 @@ const func = () => {
 Since Vite ships with TypeScript typings, you can leverage your IDE's intellisense with jsdoc type hints:
 
 ```js
-/**
- * @type {import('vite').UserConfig}
- */
-const config = {
+/** @type {import('vite').UserConfig} */
+export default {
   // ...
 }
-
-export default config
 ```
 
 Alternatively, you can use the `defineConfig` helper which should provide intellisense without the need for jsdoc annotations:

From b4bddb92003e6e7cd7ad412d1ea09cbec08bb922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Wed, 15 Jun 2022 03:53:14 +0900
Subject: [PATCH 58/72] docs: add some changes to "Migration from v2" (#8591)

---
 docs/guide/migration.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/guide/migration.md b/docs/guide/migration.md
index c3e7be3a8a2c27..9885dec7117742 100644
--- a/docs/guide/migration.md
+++ b/docs/guide/migration.md
@@ -52,6 +52,10 @@ If using ESM for SSR isn't possible in your project, you can set `ssr.format: 'c
 ## General Changes
 
 - JS file extensions in SSR and lib mode now use a valid extension (`js`, `mjs`, or `cjs`) for output JS entries and chunks based on their format and the package type.
+- Terser is now an optional dependency. If you are using `build.minify: 'terser'`, you need to install it.
+  ```shell
+  npm add -D terser
+  ```
 
 ### `import.meta.glob`
 
@@ -95,6 +99,8 @@ There are some changes which only affects plugin/tool creators.
   - `printHttpServerUrls` is removed
   - `server.app`, `server.transformWithEsbuild` are removed
   - `import.meta.hot.acceptDeps` is removed
+- [[#6901] fix: sequential injection of tags in transformIndexHtml](https://github.com/vitejs/vite/pull/6901)
+  - `transformIndexHtml` now gets the correct content modified by earlier plugins, so the order of the injected tags now works as expected.
 - [[#7995] chore: do not fixStacktrace](https://github.com/vitejs/vite/pull/7995)
   - `ssrLoadModule`'s `fixStacktrace` option's default is now `false`
 - [[#8178] feat!: migrate to ESM](https://github.com/vitejs/vite/pull/8178)
@@ -107,8 +113,12 @@ Also there are other breaking changes which only affect few users.
   - Transpile to ES5 is now necessary even if the user code only includes ES5.
 - [[#7877] fix: vite client types](https://github.com/vitejs/vite/pull/7877)
   - `/// <reference lib="dom" />` is removed from `vite/client.d.ts`. `{ "lib": ["dom"] }` or `{ "lib": ["webworker"] }` is necessary in `tsconfig.json`.
+- [[#8090] feat: preserve process env vars in lib build](https://github.com/vitejs/vite/pull/8090)
+  - `process.env.*` is now preserved in library mode
 - [[#8280] feat: non-blocking esbuild optimization at build time](https://github.com/vitejs/vite/pull/8280)
   - `server.force` option was removed in favor of `force` option.
+- [[#8550] fix: dont handle sigterm in middleware mode](https://github.com/vitejs/vite/pull/8550)
+  - When running in middleware mode, Vite no longer kills process on `SIGTERM`.
 
 ## Migration from v1
 

From b1baca769d0ee2501ea56c32e70a72f494c7e831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Wed, 15 Jun 2022 03:55:02 +0900
Subject: [PATCH 59/72] ci: only install chromium for playwright (#8589)

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 248bb3fbedd101..55a556686dfa68 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,8 +59,9 @@ jobs:
       - name: Install deps
         run: pnpm install
 
+      # This could be removed when https://github.com/pnpm/pnpm/issues/4888 is resolved
       - name: Install Playwright
-        run: pnpm playwright install
+        run: pnpm playwright install chromium
 
       - name: Build
         run: pnpm run build

From 5151e7466bdb86066991b77df8db6ada066bb71f Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Tue, 14 Jun 2022 15:39:23 -0400
Subject: [PATCH 60/72] fix(css): escape pattern chars from base path in
 postcss dir-dependency messages (#7081)

Co-authored-by: sapphi-red <green@sapphi.red>
---
 packages/vite/src/node/plugins/css.ts        |  4 +++-
 playground/css/__tests__/css.spec.ts         |  9 +++++++++
 playground/css/glob-dep/nested (dir)/baz.css |  3 +++
 playground/css/index.html                    |  3 +++
 playground/css/postcss.config.js             | 10 +++++++++-
 5 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 playground/css/glob-dep/nested (dir)/baz.css

diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
index ce068ac6104f81..45af9233bf4560 100644
--- a/packages/vite/src/node/plugins/css.ts
+++ b/packages/vite/src/node/plugins/css.ts
@@ -861,7 +861,9 @@ async function compileCSS(
       // https://github.com/postcss/postcss/blob/main/docs/guidelines/plugin.md#3-dependencies
       const { dir, glob: globPattern = '**' } = message
       const pattern =
-        normalizePath(path.resolve(path.dirname(id), dir)) + `/` + globPattern
+        glob.escapePath(normalizePath(path.resolve(path.dirname(id), dir))) +
+        `/` +
+        globPattern
       const files = glob.sync(pattern, {
         ignore: ['**/node_modules/**']
       })
diff --git a/playground/css/__tests__/css.spec.ts b/playground/css/__tests__/css.spec.ts
index e9d1fccac61d6e..564f0665bf0cea 100644
--- a/playground/css/__tests__/css.spec.ts
+++ b/playground/css/__tests__/css.spec.ts
@@ -317,9 +317,11 @@ test('treeshaken async chunk', async () => {
 test('PostCSS dir-dependency', async () => {
   const el1 = await page.$('.dir-dep')
   const el2 = await page.$('.dir-dep-2')
+  const el3 = await page.$('.dir-dep-3')
 
   expect(await getColor(el1)).toBe('grey')
   expect(await getColor(el2)).toBe('grey')
+  expect(await getColor(el3)).toBe('grey')
 
   if (!isBuild) {
     editFile('glob-dep/foo.css', (code) =>
@@ -334,6 +336,13 @@ test('PostCSS dir-dependency', async () => {
     await untilUpdated(() => getColor(el2), 'red')
     expect(await getColor(el1)).toBe('blue')
 
+    editFile('glob-dep/nested (dir)/baz.css', (code) =>
+      code.replace('color: grey', 'color: green')
+    )
+    await untilUpdated(() => getColor(el3), 'green')
+    expect(await getColor(el1)).toBe('blue')
+    expect(await getColor(el2)).toBe('red')
+
     // test add/remove
     removeFile('glob-dep/bar.css')
     await untilUpdated(() => getColor(el2), 'black')
diff --git a/playground/css/glob-dep/nested (dir)/baz.css b/playground/css/glob-dep/nested (dir)/baz.css
new file mode 100644
index 00000000000000..9a8b0f0ba47dc5
--- /dev/null
+++ b/playground/css/glob-dep/nested (dir)/baz.css	
@@ -0,0 +1,3 @@
+.dir-dep-3 {
+  color: grey;
+}
diff --git a/playground/css/index.html b/playground/css/index.html
index 15e81192cec7f1..4310967b6ca65b 100644
--- a/playground/css/index.html
+++ b/playground/css/index.html
@@ -113,6 +113,9 @@ <h1>CSS</h1>
   <p class="dir-dep-2">
     PostCSS dir-dependency (file 2): this should be grey too
   </p>
+  <p class="dir-dep-3">
+    PostCSS dir-dependency (file 3): this should be grey too
+  </p>
 
   <p class="url-separated">
     URL separation preservation: should have valid background-image
diff --git a/playground/css/postcss.config.js b/playground/css/postcss.config.js
index 33058023541515..b30209bff42097 100644
--- a/playground/css/postcss.config.js
+++ b/playground/css/postcss.config.js
@@ -16,7 +16,7 @@ function testDirDep() {
     AtRule(atRule, { result, Comment }) {
       if (atRule.name === 'test') {
         const pattern = normalizePath(
-          path.resolve(path.dirname(result.opts.from), './glob-dep/*.css')
+          path.resolve(path.dirname(result.opts.from), './glob-dep/**/*.css')
         )
         const files = glob.sync(pattern)
         const text = files.map((f) => fs.readFileSync(f, 'utf-8')).join('\n')
@@ -30,6 +30,14 @@ function testDirDep() {
           glob: '*.css',
           parent: result.opts.from
         })
+
+        result.messages.push({
+          type: 'dir-dependency',
+          plugin: 'dir-dep',
+          dir: './glob-dep/nested (dir)', // includes special characters in glob
+          glob: '*.css',
+          parent: result.opts.from
+        })
       }
     }
   }

From 4e6c26f6c355ec3aac2a277961c3280f8eaa21b0 Mon Sep 17 00:00:00 2001
From: cyitao <36476221+inkyMountain@users.noreply.github.com>
Date: Wed, 15 Jun 2022 13:03:38 +0800
Subject: [PATCH 61/72] fix(asset): respect assetFileNames if
 rollupOptions.output is an array (#8561)

Co-authored-by: patak-dev <matias.capeletto@gmail.com>
---
 packages/vite/src/node/config.ts              | 23 +++++++++++++++
 packages/vite/src/node/plugins/asset.ts       | 19 ++++++++++---
 playground/legacy/main.js                     |  1 +
 playground/legacy/package.json                |  1 +
 .../legacy/vite.config-multiple-output.js     | 28 +++++++++++++++++++
 playground/legacy/vite.svg                    |  1 +
 6 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 playground/legacy/vite.config-multiple-output.js
 create mode 100644 playground/legacy/vite.svg

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
index 3b733fc4032f80..24b0e67fc9d390 100644
--- a/packages/vite/src/node/config.ts
+++ b/packages/vite/src/node/config.ts
@@ -569,6 +569,29 @@ export async function resolveConfig(
     )
   }
 
+  // Check if all assetFileNames have the same reference.
+  // If not, display a warn for user.
+  const outputOption = config.build?.rollupOptions?.output ?? []
+  // Use isArray to narrow its type to array
+  if (Array.isArray(outputOption)) {
+    const assetFileNamesList = outputOption.map(
+      (output) => output.assetFileNames
+    )
+    if (assetFileNamesList.length > 1) {
+      const firstAssetFileNames = assetFileNamesList[0]
+      const hasDifferentReference = assetFileNamesList.some(
+        (assetFileNames) => assetFileNames !== firstAssetFileNames
+      )
+      if (hasDifferentReference) {
+        resolved.logger.warn(
+          colors.yellow(`
+assetFileNames isn't equal for every build.rollupOptions.output. A single pattern across all outputs is supported by Vite.
+`)
+        )
+      }
+    }
+  }
+
   return resolved
 }
 
diff --git a/packages/vite/src/node/plugins/asset.ts b/packages/vite/src/node/plugins/asset.ts
index 9e99629c8144e9..2a119808a4eb72 100644
--- a/packages/vite/src/node/plugins/asset.ts
+++ b/packages/vite/src/node/plugins/asset.ts
@@ -365,11 +365,22 @@ async function fileToBuiltUrl(
     const { search, hash } = parseUrl(id)
     const postfix = (search || '') + (hash || '')
     const output = config.build?.rollupOptions?.output
-    const assetFileNames =
+
+    const defaultAssetFileNames = path.posix.join(
+      config.build.assetsDir,
+      '[name].[hash][extname]'
+    )
+    // Steps to determine which assetFileNames will be actually used.
+    // First, if output is an object or string, use assetFileNames in it.
+    // And a default assetFileNames as fallback.
+    let assetFileNames: Exclude<OutputOptions['assetFileNames'], undefined> =
       (output && !Array.isArray(output) ? output.assetFileNames : undefined) ??
-      // defaults to '<assetsDir>/[name].[hash][extname]'
-      // slightly different from rollup's one ('assets/[name]-[hash][extname]')
-      path.posix.join(config.build.assetsDir, '[name].[hash][extname]')
+      defaultAssetFileNames
+    if (output && Array.isArray(output)) {
+      // Second, if output is an array, adopt assetFileNames in the first object.
+      assetFileNames = output[0].assetFileNames ?? assetFileNames
+    }
+
     const fileName = assetFileNamesToFileName(
       assetFileNames,
       file,
diff --git a/playground/legacy/main.js b/playground/legacy/main.js
index 157b6c8448e9c3..24959b129f28f2 100644
--- a/playground/legacy/main.js
+++ b/playground/legacy/main.js
@@ -1,4 +1,5 @@
 import './style.css'
+import './vite.svg'
 
 async function run() {
   const { fn } = await import('./async.js')
diff --git a/playground/legacy/package.json b/playground/legacy/package.json
index 7ba9c0e8a47953..53657df1c6b84f 100644
--- a/playground/legacy/package.json
+++ b/playground/legacy/package.json
@@ -7,6 +7,7 @@
     "build": "vite build --debug legacy",
     "build:custom-filename": "vite --config ./vite.config-custom-filename.js build  --debug legacy",
     "build:dynamic-css": "vite --config ./vite.config-dynamic-css.js build  --debug legacy",
+    "build:multiple-output": "vite --config ./vite.config-multiple-output.js build",
     "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
   },
diff --git a/playground/legacy/vite.config-multiple-output.js b/playground/legacy/vite.config-multiple-output.js
new file mode 100644
index 00000000000000..6d958bd892d621
--- /dev/null
+++ b/playground/legacy/vite.config-multiple-output.js
@@ -0,0 +1,28 @@
+import legacy from '@vitejs/plugin-legacy'
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  plugins: [legacy({ modernPolyfills: true })],
+  build: {
+    manifest: true,
+    minify: false,
+    rollupOptions: {
+      output: [
+        {
+          assetFileNames() {
+            return 'assets/subdir/[name].[hash][extname]'
+          },
+          entryFileNames: `assets/subdir/[name].js`,
+          chunkFileNames: `assets/subdir/[name].js`
+        },
+        {
+          assetFileNames() {
+            return 'assets/subdir/[name].[hash][extname]'
+          },
+          entryFileNames: `assets/anotherSubdir/[name].js`,
+          chunkFileNames: `assets/anotherSubdir/[name].js`
+        }
+      ]
+    }
+  }
+})
diff --git a/playground/legacy/vite.svg b/playground/legacy/vite.svg
new file mode 100644
index 00000000000000..e7b8dfb1b2a60b
--- /dev/null
+++ b/playground/legacy/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file

From 6234bcdc7172e8c71c754c9370c42c769678001e Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Wed, 15 Jun 2022 20:54:40 +0800
Subject: [PATCH 62/72] chore: upgrade playground deps (#8587)

---
 .github/renovate.json5                        |   2 -
 playground/backend-integration/package.json   |   2 +-
 .../backend-integration/tailwind.config.js    |   4 +-
 playground/file-delete-restore/index.html     |   6 +-
 playground/file-delete-restore/package.json   |   4 +-
 playground/optimize-deps/cjs-dynamic.js       |   7 +-
 playground/optimize-deps/cjs.js               |   6 +-
 playground/optimize-deps/dedupe.js            |   6 +-
 .../dep-linked-include/package.json           |   2 +-
 playground/optimize-deps/package.json         |   4 +-
 playground/react-emotion/index.html           |   6 +-
 playground/react-emotion/package.json         |   6 +-
 playground/react/index.html                   |   6 +-
 playground/react/package.json                 |   4 +-
 playground/ssr-react/package.json             |   7 +-
 playground/ssr-react/src/App.jsx              |  12 +-
 playground/ssr-react/src/entry-client.jsx     |   8 +-
 playground/ssr-react/src/entry-server.jsx     |   2 +-
 playground/ssr-webworker/package.json         |   2 +-
 playground/tailwind/package.json              |   2 +-
 playground/tailwind/tailwind.config.js        |   4 +-
 pnpm-lock.yaml                                | 485 ++++--------------
 22 files changed, 144 insertions(+), 443 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 1f12ef5dc54a5c..0014c768519180 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -19,8 +19,6 @@
     "typescript",
 
     // breaking changes
-    "react-router", // `react-router:v6.0.0+` has breaking changes
-    "react-router-dom", // `react-router-dom:v6.0.0+` has breaking changes
     "source-map", // `source-map:v0.7.0+` needs more investigation
     "dotenv-expand", // `dotenv-expand:6.0.0+` has breaking changes (#6858)
     "kill-port", // `kill-port:^2.0.0 has perf issues (#8392)
diff --git a/playground/backend-integration/package.json b/playground/backend-integration/package.json
index c1419548cb3bd3..a9c2b4f2bca63d 100644
--- a/playground/backend-integration/package.json
+++ b/playground/backend-integration/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "tailwindcss": "^2.2.19"
+    "tailwindcss": "^3.1.2"
   },
   "devDependencies": {
     "fast-glob": "^3.2.11"
diff --git a/playground/backend-integration/tailwind.config.js b/playground/backend-integration/tailwind.config.js
index 6e72a7e5d9d87b..0c3ae11de7565e 100644
--- a/playground/backend-integration/tailwind.config.js
+++ b/playground/backend-integration/tailwind.config.js
@@ -1,7 +1,5 @@
 module.exports = {
-  mode: 'jit',
-  purge: [__dirname + '/frontend/**/*.{css,html,ts,js}'],
-  darkMode: false, // or 'media' or 'class'
+  content: [__dirname + '/frontend/**/*.{css,html,ts,js}'],
   theme: {
     extend: {}
   },
diff --git a/playground/file-delete-restore/index.html b/playground/file-delete-restore/index.html
index ce1b9213c82763..f0015ceb9829a3 100644
--- a/playground/file-delete-restore/index.html
+++ b/playground/file-delete-restore/index.html
@@ -1,8 +1,10 @@
 <div id="app"></div>
 <script type="module">
   import React from 'react'
-  import ReactDOM from 'react-dom'
+  import ReactDOM from 'react-dom/client'
   import App from './App.jsx'
 
-  ReactDOM.render(React.createElement(App), document.getElementById('app'))
+  ReactDOM.createRoot(document.getElementById('app')).render(
+    React.createElement(App)
+  )
 </script>
diff --git a/playground/file-delete-restore/package.json b/playground/file-delete-restore/package.json
index b9c511aacfa62e..2282c4d3ce72e0 100644
--- a/playground/file-delete-restore/package.json
+++ b/playground/file-delete-restore/package.json
@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "workspace:*"
diff --git a/playground/optimize-deps/cjs-dynamic.js b/playground/optimize-deps/cjs-dynamic.js
index 91dc5a964d5481..21aec63fe27098 100644
--- a/playground/optimize-deps/cjs-dynamic.js
+++ b/playground/optimize-deps/cjs-dynamic.js
@@ -4,7 +4,7 @@
 ;(async () => {
   const { useState } = await import('react')
   const React = (await import('react')).default
-  const ReactDOM = await import('react-dom')
+  const ReactDOM = await import('react-dom/client')
 
   const clip = await import('clipboard')
   if (typeof clip.default === 'function') {
@@ -42,9 +42,8 @@
     )
   }
 
-  ReactDOM.render(
-    React.createElement(App),
-    document.querySelector('.cjs-dynamic')
+  ReactDOM.createRoot(document.querySelector('.cjs-dynamic')).render(
+    React.createElement(App)
   )
 
   function text(el, text) {
diff --git a/playground/optimize-deps/cjs.js b/playground/optimize-deps/cjs.js
index 9dc613c4b3ba71..53da284e0dc8d2 100644
--- a/playground/optimize-deps/cjs.js
+++ b/playground/optimize-deps/cjs.js
@@ -2,7 +2,7 @@
 // React is the ultimate test of this because its dynamic exports assignments
 // are not statically detectable by @rollup/plugin-commonjs.
 import React, { useState } from 'react'
-import ReactDOM from 'react-dom'
+import ReactDOM from 'react-dom/client'
 import { Socket } from 'phoenix'
 import clip from 'clipboard'
 
@@ -28,7 +28,9 @@ function App() {
   )
 }
 
-ReactDOM.render(React.createElement(App), document.querySelector('.cjs'))
+ReactDOM.createRoot(document.querySelector('.cjs')).render(
+  React.createElement(App)
+)
 
 function text(el, text) {
   document.querySelector(el).textContent = text
diff --git a/playground/optimize-deps/dedupe.js b/playground/optimize-deps/dedupe.js
index d04726330a6138..7299fb9d3bb6c8 100644
--- a/playground/optimize-deps/dedupe.js
+++ b/playground/optimize-deps/dedupe.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import ReactDOM from 'react-dom'
+import ReactDOM from 'react-dom/client'
 
 // #1302: The linked package has a different version of React in its deps
 // and is itself optimized. Without `dedupe`, the linked package is optimized
@@ -20,4 +20,6 @@ function App() {
   )
 }
 
-ReactDOM.render(React.createElement(App), document.querySelector('.dedupe'))
+ReactDOM.createRoot(document.querySelector('.dedupe')).render(
+  React.createElement(App)
+)
diff --git a/playground/optimize-deps/dep-linked-include/package.json b/playground/optimize-deps/dep-linked-include/package.json
index 0cfabdb9a2f2b9..274eb64092bbda 100644
--- a/playground/optimize-deps/dep-linked-include/package.json
+++ b/playground/optimize-deps/dep-linked-include/package.json
@@ -4,6 +4,6 @@
   "version": "0.0.0",
   "main": "index.mjs",
   "dependencies": {
-    "react": "17.0.2"
+    "react": "18.1.0"
   }
 }
diff --git a/playground/optimize-deps/package.json b/playground/optimize-deps/package.json
index d8302ff0e23cc7..3cabd98fa8ea4b 100644
--- a/playground/optimize-deps/package.json
+++ b/playground/optimize-deps/package.json
@@ -26,8 +26,8 @@
     "lodash-es": "^4.17.21",
     "nested-exclude": "file:./nested-exclude",
     "phoenix": "^1.6.10",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
     "resolve-linked": "workspace:0.0.0",
     "url": "^0.11.0",
     "vue": "^3.2.37",
diff --git a/playground/react-emotion/index.html b/playground/react-emotion/index.html
index ce1b9213c82763..f0015ceb9829a3 100644
--- a/playground/react-emotion/index.html
+++ b/playground/react-emotion/index.html
@@ -1,8 +1,10 @@
 <div id="app"></div>
 <script type="module">
   import React from 'react'
-  import ReactDOM from 'react-dom'
+  import ReactDOM from 'react-dom/client'
   import App from './App.jsx'
 
-  ReactDOM.render(React.createElement(App), document.getElementById('app'))
+  ReactDOM.createRoot(document.getElementById('app')).render(
+    React.createElement(App)
+  )
 </script>
diff --git a/playground/react-emotion/package.json b/playground/react-emotion/package.json
index ee12bf20dbcc00..dfff6bd21b1e32 100644
--- a/playground/react-emotion/package.json
+++ b/playground/react-emotion/package.json
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@emotion/react": "^11.9.3",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-switch": "^6.1.0"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
+    "react-switch": "^7.0.0"
   },
   "devDependencies": {
     "@babel/plugin-proposal-pipeline-operator": "^7.18.2",
diff --git a/playground/react/index.html b/playground/react/index.html
index ce1b9213c82763..f0015ceb9829a3 100644
--- a/playground/react/index.html
+++ b/playground/react/index.html
@@ -1,8 +1,10 @@
 <div id="app"></div>
 <script type="module">
   import React from 'react'
-  import ReactDOM from 'react-dom'
+  import ReactDOM from 'react-dom/client'
   import App from './App.jsx'
 
-  ReactDOM.render(React.createElement(App), document.getElementById('app'))
+  ReactDOM.createRoot(document.getElementById('app')).render(
+    React.createElement(App)
+  )
 </script>
diff --git a/playground/react/package.json b/playground/react/package.json
index bd4aed9e79157f..b5b6a0ede20831 100644
--- a/playground/react/package.json
+++ b/playground/react/package.json
@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "jsx-entry": "file:./jsx-entry",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "workspace:*"
diff --git a/playground/ssr-react/package.json b/playground/ssr-react/package.json
index 2c5265163c5be4..cbab9914048237 100644
--- a/playground/ssr-react/package.json
+++ b/playground/ssr-react/package.json
@@ -13,10 +13,9 @@
     "debug": "node --inspect-brk server"
   },
   "dependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-router": "^5.3.3",
-    "react-router-dom": "^5.3.3"
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
+    "react-router-dom": "^6.3.0"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "workspace:*",
diff --git a/playground/ssr-react/src/App.jsx b/playground/ssr-react/src/App.jsx
index 59e14cd5c3eea0..6be6af9a8fb0ab 100644
--- a/playground/ssr-react/src/App.jsx
+++ b/playground/ssr-react/src/App.jsx
@@ -1,4 +1,4 @@
-import { Link, Route, Switch } from 'react-router-dom'
+import { Link, Route, Routes } from 'react-router-dom'
 
 // Auto generates routes from files under ./pages
 // https://vitejs.dev/guide/features.html#glob-import
@@ -27,15 +27,11 @@ export function App() {
           })}
         </ul>
       </nav>
-      <Switch>
+      <Routes>
         {routes.map(({ path, component: RouteComp }) => {
-          return (
-            <Route key={path} path={path}>
-              <RouteComp />
-            </Route>
-          )
+          return <Route key={path} path={path} element={<RouteComp />}></Route>
         })}
-      </Switch>
+      </Routes>
     </>
   )
 }
diff --git a/playground/ssr-react/src/entry-client.jsx b/playground/ssr-react/src/entry-client.jsx
index 8757bdc929d0e4..d2caee5e04cf6f 100644
--- a/playground/ssr-react/src/entry-client.jsx
+++ b/playground/ssr-react/src/entry-client.jsx
@@ -1,10 +1,10 @@
-import ReactDOM from 'react-dom'
+import ReactDOM from 'react-dom/client'
 import { BrowserRouter } from 'react-router-dom'
 import { App } from './App'
 
-ReactDOM.hydrate(
+ReactDOM.hydrateRoot(
+  document.getElementById('app'),
   <BrowserRouter>
     <App />
-  </BrowserRouter>,
-  document.getElementById('app')
+  </BrowserRouter>
 )
diff --git a/playground/ssr-react/src/entry-server.jsx b/playground/ssr-react/src/entry-server.jsx
index 56d4810d11ba3c..ea1b86aebd4716 100644
--- a/playground/ssr-react/src/entry-server.jsx
+++ b/playground/ssr-react/src/entry-server.jsx
@@ -1,5 +1,5 @@
 import ReactDOMServer from 'react-dom/server'
-import { StaticRouter } from 'react-router-dom'
+import { StaticRouter } from 'react-router-dom/server'
 import { App } from './App'
 
 export function render(url, context) {
diff --git a/playground/ssr-webworker/package.json b/playground/ssr-webworker/package.json
index 00439576fbac69..b05a50a542bfd4 100644
--- a/playground/ssr-webworker/package.json
+++ b/playground/ssr-webworker/package.json
@@ -8,7 +8,7 @@
     "build:worker": "vite build --ssr src/entry-worker.jsx --outDir dist/worker"
   },
   "dependencies": {
-    "react": "^17.0.2"
+    "react": "^18.1.0"
   },
   "devDependencies": {
     "miniflare": "^1.4.1",
diff --git a/playground/tailwind/package.json b/playground/tailwind/package.json
index aa87248c0e8c43..bfa138db748f50 100644
--- a/playground/tailwind/package.json
+++ b/playground/tailwind/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "autoprefixer": "^10.4.7",
-    "tailwindcss": "^2.2.19",
+    "tailwindcss": "^3.1.2",
     "vue": "^3.2.37",
     "vue-router": "^4.0.16"
   },
diff --git a/playground/tailwind/tailwind.config.js b/playground/tailwind/tailwind.config.js
index 64a2b1a2499bb4..d346b0549e2b35 100644
--- a/playground/tailwind/tailwind.config.js
+++ b/playground/tailwind/tailwind.config.js
@@ -1,12 +1,10 @@
 module.exports = {
-  mode: 'jit',
-  purge: [
+  content: [
     // Before editing this section, make sure no paths are matching with `/src/App.vue`
     // Look https://github.com/vitejs/vite/pull/6959 for more details
     __dirname + '/src/{components,views}/**/*.vue',
     __dirname + '/src/App.vue'
   ],
-  darkMode: false, // or 'media' or 'class'
   theme: {
     extend: {}
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dab7d063a19ec4..811e48b4ec9a0a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -361,9 +361,9 @@ importers:
   playground/backend-integration:
     specifiers:
       fast-glob: ^3.2.11
-      tailwindcss: ^2.2.19
+      tailwindcss: ^3.1.2
     dependencies:
-      tailwindcss: 2.2.19
+      tailwindcss: 3.1.2
     devDependencies:
       fast-glob: 3.2.11
 
@@ -452,11 +452,11 @@ importers:
   playground/file-delete-restore:
     specifiers:
       '@vitejs/plugin-react': workspace:*
-      react: ^17.0.2
-      react-dom: ^17.0.2
+      react: ^18.1.0
+      react-dom: ^18.1.0
     dependencies:
-      react: 17.0.2
-      react-dom: 17.0.2_react@17.0.2
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
     devDependencies:
       '@vitejs/plugin-react': link:../../packages/plugin-react
 
@@ -582,8 +582,8 @@ importers:
       lodash.clonedeep: ^4.5.0
       nested-exclude: file:./nested-exclude
       phoenix: ^1.6.10
-      react: ^17.0.2
-      react-dom: ^17.0.2
+      react: ^18.1.0
+      react-dom: ^18.1.0
       resolve-linked: workspace:0.0.0
       url: ^0.11.0
       vue: ^3.2.37
@@ -608,8 +608,8 @@ importers:
       lodash.clonedeep: 4.5.0
       nested-exclude: file:playground/optimize-deps/nested-exclude
       phoenix: 1.6.10
-      react: 17.0.2
-      react-dom: 17.0.2_react@17.0.2
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
       resolve-linked: link:../resolve-linked
       url: 0.11.0
       vue: 3.2.37
@@ -640,9 +640,9 @@ importers:
 
   playground/optimize-deps/dep-linked-include:
     specifiers:
-      react: 17.0.2
+      react: 18.1.0
     dependencies:
-      react: 17.0.2
+      react: 18.1.0
 
   playground/optimize-deps/dep-node-env:
     specifiers: {}
@@ -712,12 +712,12 @@ importers:
     specifiers:
       '@vitejs/plugin-react': workspace:*
       jsx-entry: file:./jsx-entry
-      react: ^17.0.2
-      react-dom: ^17.0.2
+      react: ^18.1.0
+      react-dom: ^18.1.0
     dependencies:
       jsx-entry: file:playground/react/jsx-entry
-      react: 17.0.2
-      react-dom: 17.0.2_react@17.0.2
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
     devDependencies:
       '@vitejs/plugin-react': link:../../packages/plugin-react
 
@@ -727,14 +727,14 @@ importers:
       '@emotion/babel-plugin': ^11.9.2
       '@emotion/react': ^11.9.3
       '@vitejs/plugin-react': workspace:*
-      react: ^17.0.2
-      react-dom: ^17.0.2
-      react-switch: ^6.1.0
-    dependencies:
-      '@emotion/react': 11.9.3_react@17.0.2
-      react: 17.0.2
-      react-dom: 17.0.2_react@17.0.2
-      react-switch: 6.1.0_sfoxds7t5ydpegc3knd667wn6m
+      react: ^18.1.0
+      react-dom: ^18.1.0
+      react-switch: ^7.0.0
+    dependencies:
+      '@emotion/react': 11.9.3_react@18.1.0
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+      react-switch: 7.0.0_ef5jwxihqo6n7gxfmzogljlgcm
     devDependencies:
       '@babel/plugin-proposal-pipeline-operator': 7.18.2
       '@emotion/babel-plugin': 11.9.2
@@ -880,16 +880,14 @@ importers:
       compression: ^1.7.4
       cross-env: ^7.0.3
       express: ^4.18.1
-      react: ^17.0.2
-      react-dom: ^17.0.2
-      react-router: ^5.3.3
-      react-router-dom: ^5.3.3
+      react: ^18.1.0
+      react-dom: ^18.1.0
+      react-router-dom: ^6.3.0
       serve-static: ^1.15.0
     dependencies:
-      react: 17.0.2
-      react-dom: 17.0.2_react@17.0.2
-      react-router: 5.3.3_react@17.0.2
-      react-router-dom: 5.3.3_react@17.0.2
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+      react-router-dom: 6.3.0_ef5jwxihqo6n7gxfmzogljlgcm
     devDependencies:
       '@vitejs/plugin-react': link:../../packages/plugin-react
       compression: 1.7.4
@@ -933,10 +931,10 @@ importers:
   playground/ssr-webworker:
     specifiers:
       miniflare: ^1.4.1
-      react: ^17.0.2
+      react: ^18.1.0
       resolve-linked: workspace:*
     dependencies:
-      react: 17.0.2
+      react: 18.1.0
     devDependencies:
       miniflare: 1.4.1
       resolve-linked: link:../resolve-linked
@@ -945,13 +943,13 @@ importers:
     specifiers:
       '@vitejs/plugin-vue': workspace:*
       autoprefixer: ^10.4.7
-      tailwindcss: ^2.2.19
+      tailwindcss: ^3.1.2
       ts-node: ^10.8.1
       vue: ^3.2.37
       vue-router: ^4.0.16
     dependencies:
       autoprefixer: 10.4.7
-      tailwindcss: 2.2.19_lbvqn3ypbknass5qgyhojko2ui
+      tailwindcss: 3.1.2_ts-node@10.8.1
       vue: 3.2.37
       vue-router: 4.0.16_vue@3.2.37
     devDependencies:
@@ -1603,7 +1601,6 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       '@jridgewell/trace-mapping': 0.3.9
-    dev: true
 
   /@docsearch/css/3.1.0:
     resolution: {integrity: sha512-bh5IskwkkodbvC0FzSg1AxMykfDl95hebEKwxNoq4e5QaGzOXSBgW8+jnMFZ7JU4sTBiB04vZWoUSzNrPboLZA==}
@@ -1666,7 +1663,7 @@ packages:
   /@emotion/memoize/0.7.5:
     resolution: {integrity: sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==}
 
-  /@emotion/react/11.9.3_react@17.0.2:
+  /@emotion/react/11.9.3_react@18.1.0:
     resolution: {integrity: sha512-g9Q1GcTOlzOEjqwuLF/Zd9LC+4FljjPjDfxSM7KmEakm+hsHXk+bYZ2q+/hTJzr0OUNkujo72pXLQvXj6H+GJQ==}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -1685,7 +1682,7 @@ packages:
       '@emotion/utils': 1.1.0
       '@emotion/weak-memoize': 0.2.5
       hoist-non-react-statics: 3.3.2
-      react: 17.0.2
+      react: 18.1.0
     dev: false
 
   /@emotion/serialize/1.0.3:
@@ -1827,7 +1824,6 @@ packages:
     dependencies:
       '@jridgewell/resolve-uri': 3.0.7
       '@jridgewell/sourcemap-codec': 1.4.13
-    dev: true
 
   /@mapbox/node-pre-gyp/1.0.9:
     resolution: {integrity: sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==}
@@ -2120,19 +2116,15 @@ packages:
 
   /@tsconfig/node10/1.0.8:
     resolution: {integrity: sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==}
-    dev: true
 
   /@tsconfig/node12/1.0.9:
     resolution: {integrity: sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==}
-    dev: true
 
   /@tsconfig/node14/1.0.1:
     resolution: {integrity: sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==}
-    dev: true
 
   /@tsconfig/node16/1.0.2:
     resolution: {integrity: sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==}
-    dev: true
 
   /@types/argparse/1.0.38:
     resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==}
@@ -2630,7 +2622,6 @@ packages:
   /acorn-walk/8.2.0:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
-    dev: true
 
   /acorn/7.4.1:
     resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
@@ -2641,7 +2632,6 @@ packages:
     resolution: {integrity: sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==}
     engines: {node: '>=0.4.0'}
     hasBin: true
-    dev: true
 
   /add-stream/1.0.0:
     resolution: {integrity: sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=}
@@ -2719,6 +2709,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       color-convert: 2.0.1
+    dev: true
 
   /ansi-styles/6.1.0:
     resolution: {integrity: sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==}
@@ -2746,7 +2737,6 @@ packages:
 
   /arg/4.1.3:
     resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
-    dev: true
 
   /arg/5.0.1:
     resolution: {integrity: sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==}
@@ -2977,6 +2967,7 @@ packages:
   /bytes/3.1.2:
     resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
     engines: {node: '>= 0.8'}
+    dev: true
 
   /cac/6.7.12:
     resolution: {integrity: sha512-rM7E2ygtMkJqD9c7WnFU6fruFcN3xe4FM5yUmgxhZzIKJk4uHl9U/fhwdajGFQbQuv43FAUo1Fe8gX/oIKDeSA==}
@@ -3048,6 +3039,7 @@ packages:
     dependencies:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
+    dev: true
 
   /chalk/5.0.1:
     resolution: {integrity: sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==}
@@ -3161,6 +3153,7 @@ packages:
     engines: {node: '>=7.0.0'}
     dependencies:
       color-name: 1.1.4
+    dev: true
 
   /color-name/1.1.3:
     resolution: {integrity: sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=}
@@ -3168,26 +3161,11 @@ packages:
   /color-name/1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
 
-  /color-string/1.9.1:
-    resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==}
-    dependencies:
-      color-name: 1.1.4
-      simple-swizzle: 0.2.2
-    dev: false
-
   /color-support/1.1.3:
     resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
     hasBin: true
     dev: false
 
-  /color/4.2.3:
-    resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==}
-    engines: {node: '>=12.5.0'}
-    dependencies:
-      color-convert: 2.0.1
-      color-string: 1.9.1
-    dev: false
-
   /colorette/2.0.17:
     resolution: {integrity: sha512-hJo+3Bkn0NCHybn9Tu35fIeoOKGOk5OCC32y4Hz2It+qlCO2Q3DeQ1hRn/tDDMQKRYUEzqsl7jbF6dYKjlE60g==}
     dev: true
@@ -3214,11 +3192,6 @@ packages:
     engines: {node: '>= 10'}
     dev: true
 
-  /commander/8.3.0:
-    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
-    engines: {node: '>= 12'}
-    dev: false
-
   /commander/9.3.0:
     resolution: {integrity: sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==}
     engines: {node: ^12.20.0 || >=14}
@@ -3528,20 +3501,8 @@ packages:
       path-type: 4.0.0
       yaml: 1.10.2
 
-  /cosmiconfig/7.0.1:
-    resolution: {integrity: sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      '@types/parse-json': 4.0.0
-      import-fresh: 3.3.0
-      parse-json: 5.2.0
-      path-type: 4.0.0
-      yaml: 1.10.2
-    dev: false
-
   /create-require/1.1.1:
     resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
-    dev: true
 
   /cross-env/7.0.3:
     resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
@@ -3578,18 +3539,10 @@ packages:
       '@types/node': 15.14.9
     dev: true
 
-  /css-color-names/0.0.4:
-    resolution: {integrity: sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=}
-    dev: false
-
   /css-color-names/1.0.1:
     resolution: {integrity: sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==}
     dev: true
 
-  /css-unit-converter/1.1.2:
-    resolution: {integrity: sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==}
-    dev: false
-
   /css/3.0.0:
     resolution: {integrity: sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==}
     dependencies:
@@ -3755,16 +3708,6 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
-  /detective/5.2.0:
-    resolution: {integrity: sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==}
-    engines: {node: '>=0.8.0'}
-    hasBin: true
-    dependencies:
-      acorn-node: 1.8.2
-      defined: 1.0.0
-      minimist: 1.2.6
-    dev: false
-
   /detective/5.2.1:
     resolution: {integrity: sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==}
     engines: {node: '>=0.8.0'}
@@ -3789,7 +3732,6 @@ packages:
   /diff/4.0.2:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
-    dev: true
 
   /dir-glob/3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
@@ -5011,6 +4953,7 @@ packages:
       graceful-fs: 4.2.10
       jsonfile: 6.1.0
       universalify: 2.0.0
+    dev: true
 
   /fs-extra/7.0.1:
     resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
@@ -5221,6 +5164,7 @@ packages:
 
   /graceful-fs/4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
+    dev: true
 
   /handlebars/4.7.7:
     resolution: {integrity: sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==}
@@ -5251,6 +5195,7 @@ packages:
   /has-flag/4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
+    dev: true
 
   /has-property-descriptors/1.0.0:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
@@ -5285,19 +5230,10 @@ packages:
     engines: {node: '>=10.0.0'}
     dev: true
 
-  /hex-color-regex/1.1.0:
-    resolution: {integrity: sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==}
-    dev: false
-
-  /history/4.10.1:
-    resolution: {integrity: sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==}
+  /history/5.3.0:
+    resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==}
     dependencies:
-      '@babel/runtime': 7.17.9
-      loose-envify: 1.4.0
-      resolve-pathname: 3.0.0
-      tiny-invariant: 1.2.0
-      tiny-warning: 1.0.3
-      value-equal: 1.0.1
+      '@babel/runtime': 7.18.3
     dev: false
 
   /hoist-non-react-statics/3.3.2:
@@ -5321,14 +5257,6 @@ packages:
       lru-cache: 6.0.0
     dev: true
 
-  /hsl-regex/1.0.0:
-    resolution: {integrity: sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=}
-    dev: false
-
-  /hsla-regex/1.0.0:
-    resolution: {integrity: sha1-wc56MWjIxmFAM6S194d/OyJfnDg=}
-    dev: false
-
   /html-rewriter-wasm/0.3.2:
     resolution: {integrity: sha512-b+pOh+bs00uRVNIZoTgGBREjUKN47pchTNwkxKuP4ecQTFcOA6KJIW+jjvjjXrkSRURZsideLxFKqX7hnxdegQ==}
     dev: true
@@ -5495,10 +5423,6 @@ packages:
   /is-arrayish/0.2.1:
     resolution: {integrity: sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=}
 
-  /is-arrayish/0.3.2:
-    resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
-    dev: false
-
   /is-bigint/1.0.4:
     resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
     dependencies:
@@ -5531,17 +5455,6 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-color-stop/1.1.0:
-    resolution: {integrity: sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=}
-    dependencies:
-      css-color-names: 0.0.4
-      hex-color-regex: 1.1.0
-      hsl-regex: 1.0.0
-      hsla-regex: 1.0.0
-      rgb-regex: 1.0.1
-      rgba-regex: 1.0.0
-    dev: false
-
   /is-core-module/2.9.0:
     resolution: {integrity: sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==}
     dependencies:
@@ -5689,10 +5602,6 @@ packages:
       is-docker: 2.2.1
     dev: true
 
-  /isarray/0.0.1:
-    resolution: {integrity: sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=}
-    dev: false
-
   /isarray/1.0.0:
     resolution: {integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=}
     dev: true
@@ -5781,6 +5690,7 @@ packages:
       universalify: 2.0.0
     optionalDependencies:
       graceful-fs: 4.2.10
+    dev: true
 
   /jsonparse/1.3.1:
     resolution: {integrity: sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=}
@@ -5985,10 +5895,6 @@ packages:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
-  /lodash.topath/4.5.2:
-    resolution: {integrity: sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak=}
-    dev: false
-
   /lodash/4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
@@ -6058,7 +5964,6 @@ packages:
 
   /make-error/1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
-    dev: true
 
   /map-obj/1.0.1:
     resolution: {integrity: sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=}
@@ -6164,18 +6069,6 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /mini-create-react-context/0.4.1_at7mkepldmzoo6silmqc5bca74:
-    resolution: {integrity: sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==}
-    peerDependencies:
-      prop-types: ^15.0.0
-      react: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-    dependencies:
-      '@babel/runtime': 7.17.9
-      prop-types: 15.8.1
-      react: 17.0.2
-      tiny-warning: 1.0.3
-    dev: false
-
   /miniflare/1.4.1:
     resolution: {integrity: sha512-hJkMbTEM+sSiAo2yuPOucrdFYINLU7vvl9uVkRzAQ/h0CjmkYOCoyBn4jYzWtDZeQ0XrkyS6PGUCO277B5TsXA==}
     engines: {node: '>=10.12.0'}
@@ -6281,11 +6174,6 @@ packages:
       pkg-types: 0.3.2
     dev: true
 
-  /modern-normalize/1.1.0:
-    resolution: {integrity: sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA==}
-    engines: {node: '>=6'}
-    dev: false
-
   /modify-values/1.0.1:
     resolution: {integrity: sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==}
     engines: {node: '>=0.10.0'}
@@ -6379,12 +6267,6 @@ packages:
     engines: {node: '>=10.5.0'}
     dev: true
 
-  /node-emoji/1.11.0:
-    resolution: {integrity: sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==}
-    dependencies:
-      lodash: 4.17.21
-    dev: false
-
   /node-fetch/2.6.7:
     resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
     engines: {node: 4.x || >=6.0.0}
@@ -6492,14 +6374,9 @@ packages:
     dev: false
 
   /object-assign/4.1.1:
-    resolution: {integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=}
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
 
-  /object-hash/2.2.0:
-    resolution: {integrity: sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==}
-    engines: {node: '>= 6'}
-    dev: false
-
   /object-hash/3.0.0:
     resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
     engines: {node: '>= 6'}
@@ -6730,12 +6607,6 @@ packages:
     resolution: {integrity: sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=}
     dev: true
 
-  /path-to-regexp/1.8.0:
-    resolution: {integrity: sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==}
-    dependencies:
-      isarray: 0.0.1
-    dev: false
-
   /path-type/3.0.0:
     resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
     engines: {node: '>=4'}
@@ -6840,14 +6711,6 @@ packages:
       read-cache: 1.0.0
       resolve: 1.22.0
 
-  /postcss-js/3.0.3:
-    resolution: {integrity: sha512-gWnoWQXKFw65Hk/mi2+WTQTHdPD5UJdDXZmX073EY/B3BWnYjO4F4t0VneTCnCGQ5E5GsCdMkzPaTXwl3r5dJw==}
-    engines: {node: '>=10.0'}
-    dependencies:
-      camelcase-css: 2.0.1
-      postcss: 8.4.13
-    dev: false
-
   /postcss-js/4.0.0_postcss@8.4.14:
     resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==}
     engines: {node: ^12 || ^14 || >= 16}
@@ -6858,7 +6721,7 @@ packages:
       postcss: 8.4.14
     dev: false
 
-  /postcss-load-config/3.1.4:
+  /postcss-load-config/3.1.4_apxnowcr5uhxb4jlsbpuejnlvi:
     resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
     engines: {node: '>= 10'}
     peerDependencies:
@@ -6871,6 +6734,8 @@ packages:
         optional: true
     dependencies:
       lilconfig: 2.0.5
+      postcss: 8.4.14
+      ts-node: 10.8.1
       yaml: 1.10.2
     dev: false
 
@@ -6891,23 +6756,6 @@ packages:
       yaml: 1.10.2
     dev: false
 
-  /postcss-load-config/3.1.4_ts-node@10.8.1:
-    resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
-    engines: {node: '>= 10'}
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      lilconfig: 2.0.5
-      ts-node: 10.8.1
-      yaml: 1.10.2
-    dev: false
-
   /postcss-load-config/4.0.1_postcss@8.4.14:
     resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==}
     engines: {node: '>= 14'}
@@ -6989,6 +6837,7 @@ packages:
       postcss: ^8.2.14
     dependencies:
       postcss-selector-parser: 6.0.10
+    dev: true
 
   /postcss-nested/5.0.6_postcss@8.4.14:
     resolution: {integrity: sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==}
@@ -7007,22 +6856,9 @@ packages:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
 
-  /postcss-value-parser/3.3.1:
-    resolution: {integrity: sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==}
-    dev: false
-
   /postcss-value-parser/4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
-  /postcss/8.4.13:
-    resolution: {integrity: sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.4
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-    dev: false
-
   /postcss/8.4.14:
     resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==}
     engines: {node: ^10 || ^12 || >=14}
@@ -7051,11 +6887,6 @@ packages:
     engines: {node: ^14.13.1 || >=16.0.0}
     dev: true
 
-  /pretty-hrtime/1.0.3:
-    resolution: {integrity: sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=}
-    engines: {node: '>= 0.8'}
-    dev: false
-
   /process-nextick-args/2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
     dev: true
@@ -7194,16 +7025,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /purgecss/4.1.3:
-    resolution: {integrity: sha512-99cKy4s+VZoXnPxaoM23e5ABcP851nC2y2GROkkjS8eJaJtlciGavd7iYAw2V84WeBqggZ12l8ef44G99HmTaw==}
-    hasBin: true
-    dependencies:
-      commander: 8.3.0
-      glob: 7.2.0
-      postcss: 8.4.13
-      postcss-selector-parser: 6.0.10
-    dev: false
-
   /pvtsutils/1.3.2:
     resolution: {integrity: sha512-+Ipe2iNUyrZz+8K/2IOo+kKikdtfhRKzNpQbruF2URmqPtoqAs8g3xS7TJvFF2GcPXjh7DkqMnpVveRFq4PgEQ==}
     dependencies:
@@ -7261,15 +7082,14 @@ packages:
       unpipe: 1.0.0
     dev: true
 
-  /react-dom/17.0.2_react@17.0.2:
-    resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==}
+  /react-dom/18.1.0_react@18.1.0:
+    resolution: {integrity: sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==}
     peerDependencies:
-      react: 17.0.2
+      react: ^18.1.0
     dependencies:
       loose-envify: 1.4.0
-      object-assign: 4.1.1
-      react: 17.0.2
-      scheduler: 0.20.2
+      react: 18.1.0
+      scheduler: 0.22.0
     dev: false
 
   /react-is/16.13.1:
@@ -7281,56 +7101,43 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /react-router-dom/5.3.3_react@17.0.2:
-    resolution: {integrity: sha512-Ov0tGPMBgqmbu5CDmN++tv2HQ9HlWDuWIIqn4b88gjlAN5IHI+4ZUZRcpz9Hl0azFIwihbLDYw1OiHGRo7ZIng==}
+  /react-router-dom/6.3.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==}
     peerDependencies:
-      react: '>=15'
+      react: '>=16.8'
+      react-dom: '>=16.8'
     dependencies:
-      '@babel/runtime': 7.17.9
-      history: 4.10.1
-      loose-envify: 1.4.0
-      prop-types: 15.8.1
-      react: 17.0.2
-      react-router: 5.3.3_react@17.0.2
-      tiny-invariant: 1.2.0
-      tiny-warning: 1.0.3
+      history: 5.3.0
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+      react-router: 6.3.0_react@18.1.0
     dev: false
 
-  /react-router/5.3.3_react@17.0.2:
-    resolution: {integrity: sha512-mzQGUvS3bM84TnbtMYR8ZjKnuPJ71IjSzR+DE6UkUqvN4czWIqEs17yLL8xkAycv4ev0AiN+IGrWu88vJs/p2w==}
+  /react-router/6.3.0_react@18.1.0:
+    resolution: {integrity: sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==}
     peerDependencies:
-      react: '>=15'
+      react: '>=16.8'
     dependencies:
-      '@babel/runtime': 7.17.9
-      history: 4.10.1
-      hoist-non-react-statics: 3.3.2
-      loose-envify: 1.4.0
-      mini-create-react-context: 0.4.1_at7mkepldmzoo6silmqc5bca74
-      path-to-regexp: 1.8.0
-      prop-types: 15.8.1
-      react: 17.0.2
-      react-is: 16.13.1
-      tiny-invariant: 1.2.0
-      tiny-warning: 1.0.3
+      history: 5.3.0
+      react: 18.1.0
     dev: false
 
-  /react-switch/6.1.0_sfoxds7t5ydpegc3knd667wn6m:
-    resolution: {integrity: sha512-cOwQkxtHCOGtoK0KN3kZBPTQjt8P1TTpaor+TS0AJRLfFBIRkgjVIUCwAfvVlW32Bi1BK333rk9y/14suD38SA==}
+  /react-switch/7.0.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-KkDeW+cozZXI6knDPyUt3KBN1rmhoVYgAdCJqAh7st7tk8YE6N0iR89zjCWO8T8dUTeJGTR0KU+5CHCRMRffiA==}
     peerDependencies:
       react: ^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
       react-dom: ^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
     dependencies:
       prop-types: 15.8.1
-      react: 17.0.2
-      react-dom: 17.0.2_react@17.0.2
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
     dev: false
 
-  /react/17.0.2:
-    resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
+  /react/18.1.0:
+    resolution: {integrity: sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       loose-envify: 1.4.0
-      object-assign: 4.1.1
     dev: false
 
   /read-cache/1.0.0:
@@ -7424,13 +7231,6 @@ packages:
       redis-errors: 1.2.0
     dev: true
 
-  /reduce-css-calc/2.1.8:
-    resolution: {integrity: sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==}
-    dependencies:
-      css-unit-converter: 1.1.2
-      postcss-value-parser: 3.3.1
-    dev: false
-
   /regenerator-runtime/0.13.9:
     resolution: {integrity: sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==}
 
@@ -7465,10 +7265,6 @@ packages:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
 
-  /resolve-pathname/3.0.0:
-    resolution: {integrity: sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==}
-    dev: false
-
   /resolve.exports/1.1.0:
     resolution: {integrity: sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==}
     engines: {node: '>=10'}
@@ -7511,14 +7307,6 @@ packages:
     resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
     dev: true
 
-  /rgb-regex/1.0.1:
-    resolution: {integrity: sha1-wODWiC3w4jviVKR16O3UGRX+rrE=}
-    dev: false
-
-  /rgba-regex/1.0.0:
-    resolution: {integrity: sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=}
-    dev: false
-
   /rimraf/3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
     hasBin: true
@@ -7623,11 +7411,10 @@ packages:
     resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
     dev: true
 
-  /scheduler/0.20.2:
-    resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==}
+  /scheduler/0.22.0:
+    resolution: {integrity: sha512-6QAm1BgQI88NPYymgGQLCZgvep4FyePDWFpXVK+zNSUgHwlqpJy8VEh8Et0KxTACS4VWwMousBElAZOH9nkkoQ==}
     dependencies:
       loose-envify: 1.4.0
-      object-assign: 4.1.1
     dev: false
 
   /scule/0.2.1:
@@ -7763,12 +7550,6 @@ packages:
     requiresBuild: true
     dev: true
 
-  /simple-swizzle/0.2.2:
-    resolution: {integrity: sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=}
-    dependencies:
-      is-arrayish: 0.3.2
-    dev: false
-
   /sirv/2.0.2:
     resolution: {integrity: sha512-4Qog6aE29nIjAOKe/wowFTxOdmbEZKb+3tsLljaBRzJwtqto0BChD2zzH0LhgCSXiI+V7X+Y45v14wBZQ1TK3w==}
     engines: {node: '>= 10'}
@@ -8069,6 +7850,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       has-flag: 4.0.0
+    dev: true
 
   /supports-preserve-symlinks-flag/1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
@@ -8082,96 +7864,38 @@ packages:
     resolution: {integrity: sha512-hqTN6kW+pN6/qro6G9OZ7ceDQOcYno020zBQKpZQLsJhYTDMCMNfXi/Y8duF5iW+4WWZr42ry0MMkcRGpbwG2A==}
     dev: false
 
-  /tailwindcss/2.2.19:
-    resolution: {integrity: sha512-6Ui7JSVtXadtTUo2NtkBBacobzWiQYVjYW0ZnKaP9S1ZCKQ0w7KVNz+YSDI/j7O7KCMHbOkz94ZMQhbT9pOqjw==}
-    engines: {node: '>=12.13.0'}
-    hasBin: true
-    peerDependencies:
-      autoprefixer: ^10.0.2
-      postcss: ^8.0.9
-    dependencies:
-      arg: 5.0.1
-      bytes: 3.1.2
-      chalk: 4.1.2
-      chokidar: 3.5.3
-      color: 4.2.3
-      cosmiconfig: 7.0.1
-      detective: 5.2.0
-      didyoumean: 1.2.2
-      dlv: 1.1.3
-      fast-glob: 3.2.11
-      fs-extra: 10.1.0
-      glob-parent: 6.0.2
-      html-tags: 3.2.0
-      is-color-stop: 1.1.0
-      is-glob: 4.0.3
-      lodash: 4.17.21
-      lodash.topath: 4.5.2
-      modern-normalize: 1.1.0
-      node-emoji: 1.11.0
-      normalize-path: 3.0.0
-      object-hash: 2.2.0
-      postcss-js: 3.0.3
-      postcss-load-config: 3.1.4
-      postcss-nested: 5.0.6
-      postcss-selector-parser: 6.0.10
-      postcss-value-parser: 4.2.0
-      pretty-hrtime: 1.0.3
-      purgecss: 4.1.3
-      quick-lru: 5.1.1
-      reduce-css-calc: 2.1.8
-      resolve: 1.22.0
-      tmp: 0.2.1
-    transitivePeerDependencies:
-      - ts-node
-    dev: false
-
-  /tailwindcss/2.2.19_lbvqn3ypbknass5qgyhojko2ui:
-    resolution: {integrity: sha512-6Ui7JSVtXadtTUo2NtkBBacobzWiQYVjYW0ZnKaP9S1ZCKQ0w7KVNz+YSDI/j7O7KCMHbOkz94ZMQhbT9pOqjw==}
+  /tailwindcss/3.1.2:
+    resolution: {integrity: sha512-yJ6L5s1U5AeS5g7HHy212zdQfjwD426FBfm59pet/JsyneuZuD4C2W7PpJEg4ppisiB21uLqtNagv8KXury3+Q==}
     engines: {node: '>=12.13.0'}
     hasBin: true
-    peerDependencies:
-      autoprefixer: ^10.0.2
-      postcss: ^8.0.9
     dependencies:
       arg: 5.0.1
-      autoprefixer: 10.4.7
-      bytes: 3.1.2
-      chalk: 4.1.2
       chokidar: 3.5.3
-      color: 4.2.3
-      cosmiconfig: 7.0.1
-      detective: 5.2.0
+      color-name: 1.1.4
+      detective: 5.2.1
       didyoumean: 1.2.2
       dlv: 1.1.3
       fast-glob: 3.2.11
-      fs-extra: 10.1.0
       glob-parent: 6.0.2
-      html-tags: 3.2.0
-      is-color-stop: 1.1.0
       is-glob: 4.0.3
-      lodash: 4.17.21
-      lodash.topath: 4.5.2
-      modern-normalize: 1.1.0
-      node-emoji: 1.11.0
+      lilconfig: 2.0.5
       normalize-path: 3.0.0
-      object-hash: 2.2.0
-      postcss-js: 3.0.3
-      postcss-load-config: 3.1.4_ts-node@10.8.1
-      postcss-nested: 5.0.6
+      object-hash: 3.0.0
+      picocolors: 1.0.0
+      postcss: 8.4.14
+      postcss-import: 14.1.0_postcss@8.4.14
+      postcss-js: 4.0.0_postcss@8.4.14
+      postcss-load-config: 3.1.4_postcss@8.4.14
+      postcss-nested: 5.0.6_postcss@8.4.14
       postcss-selector-parser: 6.0.10
       postcss-value-parser: 4.2.0
-      pretty-hrtime: 1.0.3
-      purgecss: 4.1.3
       quick-lru: 5.1.1
-      reduce-css-calc: 2.1.8
       resolve: 1.22.0
-      tmp: 0.2.1
     transitivePeerDependencies:
       - ts-node
     dev: false
 
-  /tailwindcss/3.1.2:
+  /tailwindcss/3.1.2_ts-node@10.8.1:
     resolution: {integrity: sha512-yJ6L5s1U5AeS5g7HHy212zdQfjwD426FBfm59pet/JsyneuZuD4C2W7PpJEg4ppisiB21uLqtNagv8KXury3+Q==}
     engines: {node: '>=12.13.0'}
     hasBin: true
@@ -8192,7 +7916,7 @@ packages:
       postcss: 8.4.14
       postcss-import: 14.1.0_postcss@8.4.14
       postcss-js: 4.0.0_postcss@8.4.14
-      postcss-load-config: 3.1.4_postcss@8.4.14
+      postcss-load-config: 3.1.4_apxnowcr5uhxb4jlsbpuejnlvi
       postcss-nested: 5.0.6_postcss@8.4.14
       postcss-selector-parser: 6.0.10
       postcss-value-parser: 4.2.0
@@ -8272,14 +7996,6 @@ packages:
     resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==}
     dev: false
 
-  /tiny-invariant/1.2.0:
-    resolution: {integrity: sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==}
-    dev: false
-
-  /tiny-warning/1.0.3:
-    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
-    dev: false
-
   /tinypool/0.1.3:
     resolution: {integrity: sha512-2IfcQh7CP46XGWGGbdyO4pjcKqsmVqFAPcXfPxcPXmOWt9cYkTP9HcDmGgsfijYoAEc4z9qcpM/BaBz46Y9/CQ==}
     engines: {node: '>=14.0.0'}
@@ -8290,13 +8006,6 @@ packages:
     engines: {node: '>=14.0.0'}
     dev: true
 
-  /tmp/0.2.1:
-    resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==}
-    engines: {node: '>=8.17.0'}
-    dependencies:
-      rimraf: 3.0.2
-    dev: false
-
   /to-fast-properties/2.0.0:
     resolution: {integrity: sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=}
     engines: {node: '>=4'}
@@ -8370,7 +8079,6 @@ packages:
       make-error: 1.3.6
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
-    dev: true
 
   /tsconfck/2.0.1:
     resolution: {integrity: sha512-/ipap2eecmVBmBlsQLBRbUmUNFwNJV/z2E+X0FPtHNjPwroMZQ7m39RMaCywlCulBheYXgMdUlWDd9rzxwMA0Q==}
@@ -8562,6 +8270,7 @@ packages:
   /universalify/2.0.0:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
     engines: {node: '>= 10.0.0'}
+    dev: true
 
   /unpipe/1.0.0:
     resolution: {integrity: sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=}
@@ -8612,7 +8321,6 @@ packages:
 
   /v8-compile-cache-lib/3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
-    dev: true
 
   /v8-compile-cache/2.3.0:
     resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
@@ -8630,10 +8338,6 @@ packages:
     engines: {node: '>= 0.10'}
     dev: true
 
-  /value-equal/1.0.1:
-    resolution: {integrity: sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==}
-    dev: false
-
   /vary/1.1.2:
     resolution: {integrity: sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=}
     engines: {node: '>= 0.8'}
@@ -8925,7 +8629,6 @@ packages:
   /yn/3.1.1:
     resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
     engines: {node: '>=6'}
-    dev: true
 
   /youch/2.2.2:
     resolution: {integrity: sha512-/FaCeG3GkuJwaMR34GHVg0l8jCbafZLHiFowSjqLlqhC6OMyf2tPJBu8UirF7/NI9X/R5ai4QfEKUCOxMAGxZQ==}

From 7157b15205e27b6d8d2e30c3717ae80244b2c266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Thu, 16 Jun 2022 01:07:41 +0900
Subject: [PATCH 63/72] ci: cache playwright binary correctly (#8599)

---
 .github/workflows/ci.yml | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55a556686dfa68..f190529faa247d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,8 @@ env:
   # 7 GiB by default on GitHub, setting to 6 GiB
   # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
   NODE_OPTIONS: --max-old-space-size=6144
+  # install playwright binary manually (because pnpm only runs install script once)
+  PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1"
 
 on:
   push:
@@ -38,10 +40,6 @@ jobs:
             node_version: 16
       fail-fast: false
 
-    env:
-      # Install playwright's binray under node_modules so it will be cached together
-      PLAYWRIGHT_BROWSERS_PATH: "0"
-
     name: "Build&Test: node-${{ matrix.node_version }}, ${{ matrix.os }}"
     steps:
       - name: Checkout
@@ -59,8 +57,24 @@ jobs:
       - name: Install deps
         run: pnpm install
 
-      # This could be removed when https://github.com/pnpm/pnpm/issues/4888 is resolved
+      # Install playwright's binary under custom directory to cache
+      - name: Set Playwright path (non-windows)
+        if: runner.os != 'Windows'
+        run: echo "PLAYWRIGHT_BROWSERS_PATH=$HOME/.cache/playwright-bin" >> $GITHUB_ENV
+      - name: Set Playwright path (windows)
+        if: runner.os == 'Windows'
+        run: echo "PLAYWRIGHT_BROWSERS_PATH=$HOME\.cache\playwright-bin" >> $env:GITHUB_ENV
+
+      - name: Cache Playwright's binary
+        uses: actions/cache@v3
+        with:
+          # Playwright removes unused browsers automatically
+          # So does not need to add playwright version to key
+          key: ${{ runner.os }}-playwright-bin-v1
+          path: ${{ env.PLAYWRIGHT_BROWSERS_PATH }}
+
       - name: Install Playwright
+        # does not need to explictly set chromium after https://github.com/microsoft/playwright/issues/14862 is solved
         run: pnpm playwright install chromium
 
       - name: Build
@@ -98,8 +112,6 @@ jobs:
 
       - name: Install deps
         run: pnpm install
-        env:
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1"
 
       - name: Build
         run: pnpm run build

From 739175b2f65d7ce46ce3b79cfc1efd416651c2a5 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Thu, 16 Jun 2022 09:52:28 +0200
Subject: [PATCH 64/72] fix: avoid replacing defines and NODE_ENV in optimized
 deps (fix #8593) (#8606)

---
 packages/vite/src/node/optimizer/index.ts   | 16 +++++-----------
 playground/define/__tests__/define.spec.ts  |  3 +++
 playground/define/commonjs-dep/index.js     |  1 +
 playground/define/commonjs-dep/package.json |  6 ++++++
 playground/define/index.html                |  4 ++++
 playground/define/package.json              |  3 +++
 playground/define/vite.config.js            |  3 ++-
 pnpm-lock.yaml                              | 12 ++++++++++++
 8 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 playground/define/commonjs-dep/index.js
 create mode 100644 playground/define/commonjs-dep/package.json

diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts
index 8160ee0b0d83a0..f005a521a97a52 100644
--- a/packages/vite/src/node/optimizer/index.ts
+++ b/packages/vite/src/node/optimizer/index.ts
@@ -385,6 +385,7 @@ export async function runOptimizeDeps(
   resolvedConfig: ResolvedConfig,
   depsInfo: Record<string, OptimizedDepInfo>
 ): Promise<DepOptimizationResult> {
+  const isBuild = resolvedConfig.command === 'build'
   const config: ResolvedConfig = {
     ...resolvedConfig,
     command: 'build'
@@ -471,20 +472,15 @@ export async function runOptimizeDeps(
     flatIdToExports[flatId] = exportsData
   }
 
-  const define: Record<string, string> = {
-    'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || config.mode)
-  }
-  for (const key in config.define) {
-    const value = config.define[key]
-    define[key] = typeof value === 'string' ? value : JSON.stringify(value)
-  }
-
   const start = performance.now()
 
   const result = await build({
     absWorkingDir: process.cwd(),
     entryPoints: Object.keys(flatIdDeps),
     bundle: true,
+    // Ensure resolution is handled by esbuildDepPlugin and
+    // avoid replacing `process.env.NODE_ENV` for 'browser'
+    platform: 'neutral',
     format: 'esm',
     target: config.build.target || undefined,
     external: config.optimizeDeps?.exclude,
@@ -492,9 +488,8 @@ export async function runOptimizeDeps(
     splitting: true,
     sourcemap: true,
     outdir: processingCacheDir,
-    ignoreAnnotations: resolvedConfig.command !== 'build',
+    ignoreAnnotations: !isBuild,
     metafile: true,
-    define,
     plugins: [
       ...plugins,
       esbuildDepPlugin(flatIdDeps, flatIdToExports, config)
@@ -887,7 +882,6 @@ export function getDepHash(config: ResolvedConfig): string {
     {
       mode: process.env.NODE_ENV || config.mode,
       root: config.root,
-      define: config.define,
       resolve: config.resolve,
       buildTarget: config.build.target,
       assetsInclude: config.assetsInclude,
diff --git a/playground/define/__tests__/define.spec.ts b/playground/define/__tests__/define.spec.ts
index 695d210a822ed6..76b1dfef5feb39 100644
--- a/playground/define/__tests__/define.spec.ts
+++ b/playground/define/__tests__/define.spec.ts
@@ -40,4 +40,7 @@ test('string', async () => {
   // html would't need to define replacement
   expect(await page.textContent('.exp-define')).toBe('__EXP__')
   expect(await page.textContent('.import-json')).toBe('__EXP__')
+  expect(await page.textContent('.define-in-dep')).toBe(
+    defines.__STRINGIFIED_OBJ__
+  )
 })
diff --git a/playground/define/commonjs-dep/index.js b/playground/define/commonjs-dep/index.js
new file mode 100644
index 00000000000000..23e0bf1b32e32f
--- /dev/null
+++ b/playground/define/commonjs-dep/index.js
@@ -0,0 +1 @@
+module.exports = { defined: __STRINGIFIED_OBJ__ }
diff --git a/playground/define/commonjs-dep/package.json b/playground/define/commonjs-dep/package.json
new file mode 100644
index 00000000000000..3047ae68c9f75a
--- /dev/null
+++ b/playground/define/commonjs-dep/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "commonjs-dep",
+  "private": true,
+  "version": "1.0.0",
+  "type": "commonjs"
+}
diff --git a/playground/define/index.html b/playground/define/index.html
index 1260b119149d28..c4f4c598aba563 100644
--- a/playground/define/index.html
+++ b/playground/define/index.html
@@ -16,6 +16,7 @@ <h1>Define</h1>
 <p>no identifier substring: <span class="no-identifier-substring"></span></p>
 <p>define variable in html: <code class="exp-define">__EXP__</code></p>
 <p>import json: <code class="import-json"></code></p>
+<p>define in dep: <code class="define-in-dep"></code></p>
 
 <script type="module">
   const __VAR_NAME__ = true // ensure define doesn't replace var name
@@ -50,6 +51,9 @@ <h1>Define</h1>
   function text(el, text) {
     document.querySelector(el).textContent = text
   }
+
+  import { defined } from 'dep'
+  text('.define-in-dep', JSON.stringify(defined))
 </script>
 
 <style>
diff --git a/playground/define/package.json b/playground/define/package.json
index 7c46b3020125fe..987330d432c9a9 100644
--- a/playground/define/package.json
+++ b/playground/define/package.json
@@ -7,5 +7,8 @@
     "build": "vite build",
     "debug": "node --inspect-brk ../../packages/vite/bin/vite",
     "preview": "vite preview"
+  },
+  "dependencies": {
+    "dep": "file:./commonjs-dep"
   }
 }
diff --git a/playground/define/vite.config.js b/playground/define/vite.config.js
index ec4a76136e8f47..7650603e046419 100644
--- a/playground/define/vite.config.js
+++ b/playground/define/vite.config.js
@@ -19,6 +19,7 @@ module.exports = {
     'process.env.SOMEVAR': '"SOMEVAR"',
     $DOLLAR: 456,
     ÖUNICODE_LETTERɵ: 789,
-    __VAR_NAME__: false
+    __VAR_NAME__: false,
+    __STRINGIFIED_OBJ__: JSON.stringify({ foo: true })
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 811e48b4ec9a0a..c72f8028f1b324 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -423,6 +423,12 @@ importers:
     specifiers: {}
 
   playground/define:
+    specifiers:
+      dep: file:./commonjs-dep
+    dependencies:
+      dep: file:playground/define/commonjs-dep
+
+  playground/define/commonjs-dep:
     specifiers: {}
 
   playground/dynamic-import:
@@ -8657,6 +8663,12 @@ packages:
     version: 0.0.0
     dev: false
 
+  file:playground/define/commonjs-dep:
+    resolution: {directory: playground/define/commonjs-dep, type: directory}
+    name: commonjs-dep
+    version: 1.0.0
+    dev: false
+
   file:playground/dynamic-import/pkg:
     resolution: {directory: playground/dynamic-import/pkg, type: directory}
     name: pkg

From 2dd0b49bb1c7fb479bb535f28bbefcd3e57fa23d Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Thu, 16 Jun 2022 09:56:03 +0200
Subject: [PATCH 65/72] fix: allow cache overlap in parallel builds (#8592)

---
 packages/vite/src/node/optimizer/index.ts      | 6 +++++-
 playground/assets/vite.config-relative-base.js | 3 +--
 playground/assets/vite.config.js               | 3 +--
 playground/worker/vite.config-es.js            | 3 +--
 playground/worker/vite.config-relative-base.js | 3 +--
 playground/worker/vite.config-sourcemap.js     | 3 ---
 playground/worker/vite.config.js               | 3 +--
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts
index f005a521a97a52..b5e3f1d0b13565 100644
--- a/packages/vite/src/node/optimizer/index.ts
+++ b/packages/vite/src/node/optimizer/index.ts
@@ -615,7 +615,11 @@ export function getOptimizedDepPath(
 function getDepsCacheSuffix(config: ResolvedConfig): string {
   let suffix = ''
   if (config.command === 'build') {
-    suffix += '_build'
+    // Differentiate build caches depending on outDir to allow parallel builds
+    const { outDir } = config.build
+    const buildId =
+      outDir.length > 8 || outDir.includes('/') ? getHash(outDir) : outDir
+    suffix += `_build-${buildId}`
     if (config.build.ssr) {
       suffix += '_ssr'
     }
diff --git a/playground/assets/vite.config-relative-base.js b/playground/assets/vite.config-relative-base.js
index 12c3132f79a9b0..ae09766c0768ac 100644
--- a/playground/assets/vite.config-relative-base.js
+++ b/playground/assets/vite.config-relative-base.js
@@ -22,6 +22,5 @@ module.exports = {
   },
   testConfig: {
     baseRoute: '/relative-base/'
-  },
-  cacheDir: 'node_modules/.vite/relative-base'
+  }
 }
diff --git a/playground/assets/vite.config.js b/playground/assets/vite.config.js
index 23bd11908130cd..c9d821ae3d73ee 100644
--- a/playground/assets/vite.config.js
+++ b/playground/assets/vite.config.js
@@ -17,6 +17,5 @@ module.exports = {
     assetsInlineLimit: 8192, // 8kb
     manifest: true,
     watch: {}
-  },
-  cacheDir: 'node_modules/.vite/foo'
+  }
 }
diff --git a/playground/worker/vite.config-es.js b/playground/worker/vite.config-es.js
index 0d28d241ca8d42..6d6704de0bc213 100644
--- a/playground/worker/vite.config-es.js
+++ b/playground/worker/vite.config-es.js
@@ -38,6 +38,5 @@ module.exports = vite.defineConfig({
         }
       }
     }
-  ],
-  cacheDir: 'node_modules/.vite/es'
+  ]
 })
diff --git a/playground/worker/vite.config-relative-base.js b/playground/worker/vite.config-relative-base.js
index 64c2b7983fb527..8002883ca4abf1 100644
--- a/playground/worker/vite.config-relative-base.js
+++ b/playground/worker/vite.config-relative-base.js
@@ -40,6 +40,5 @@ module.exports = vite.defineConfig({
         }
       }
     }
-  ],
-  cacheDir: 'node_modules/.vite/relative-base'
+  ]
 })
diff --git a/playground/worker/vite.config-sourcemap.js b/playground/worker/vite.config-sourcemap.js
index a84d8e6699af14..c4cf61f6dea586 100644
--- a/playground/worker/vite.config-sourcemap.js
+++ b/playground/worker/vite.config-sourcemap.js
@@ -21,9 +21,6 @@ module.exports = vite.defineConfig((sourcemap) => {
         }
       }
     },
-    cacheDir: `node_modules/.vite/iife-${
-      typeof sourcemap === 'boolean' ? 'sourcemap' : 'sourcemap-' + sourcemap
-    }`,
     build: {
       outDir: `dist/iife-${
         typeof sourcemap === 'boolean' ? 'sourcemap' : 'sourcemap-' + sourcemap
diff --git a/playground/worker/vite.config.js b/playground/worker/vite.config.js
index f937372c6e0012..d62d6c4f6d6d36 100644
--- a/playground/worker/vite.config.js
+++ b/playground/worker/vite.config.js
@@ -23,6 +23,5 @@ module.exports = vite.defineConfig({
         entryFileNames: 'assets/[name].js'
       }
     }
-  },
-  cacheDir: 'node_modules/.vite/iife'
+  }
 })

From ccfccecc951da146f2b3ad2f3faac5ac969848e2 Mon Sep 17 00:00:00 2001
From: meteorlxy <meteor.lxy@foxmail.com>
Date: Thu, 16 Jun 2022 15:59:11 +0800
Subject: [PATCH 66/72] fix(plugin-vue): fix sourcemap when no script block in
 sfc (close #8601) (#8604)

---
 packages/plugin-vue/src/main.ts               | 82 ++++++++++---------
 playground/vue-sourcemap/Main.vue             |  4 +
 playground/vue-sourcemap/NoScript.vue         |  3 +
 playground/vue-sourcemap/NoTemplate.vue       |  7 ++
 .../vue-sourcemap/__tests__/serve.spec.ts     | 50 +++++++++++
 5 files changed, 108 insertions(+), 38 deletions(-)
 create mode 100644 playground/vue-sourcemap/NoScript.vue
 create mode 100644 playground/vue-sourcemap/NoTemplate.vue

diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts
index dda9c75d04ec78..e92c48673a680e 100644
--- a/packages/plugin-vue/src/main.ts
+++ b/packages/plugin-vue/src/main.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 import type { SFCBlock, SFCDescriptor } from 'vue/compiler-sfc'
-import type { PluginContext, SourceMap, TransformPluginContext } from 'rollup'
+import type { PluginContext, TransformPluginContext } from 'rollup'
 import type { RawSourceMap } from 'source-map'
 import type { EncodedSourceMap as TraceEncodedSourceMap } from '@jridgewell/trace-mapping'
 import { TraceMap, eachMapping } from '@jridgewell/trace-mapping'
@@ -46,7 +46,7 @@ export async function transformMain(
   const hasScoped = descriptor.styles.some((s) => s.scoped)
 
   // script
-  const { code: scriptCode, map } = await genScriptCode(
+  const { code: scriptCode, map: scriptMap } = await genScriptCode(
     descriptor,
     options,
     pluginContext,
@@ -58,7 +58,7 @@ export async function transformMain(
     descriptor.template && !isUseInlineTemplate(descriptor, !devServer)
 
   let templateCode = ''
-  let templateMap: RawSourceMap | undefined
+  let templateMap: RawSourceMap | undefined = undefined
   if (hasTemplateImport) {
     ;({ code: templateCode, map: templateMap } = await genTemplateCode(
       descriptor,
@@ -156,40 +156,46 @@ export async function transformMain(
     )
   }
 
-  // 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 = options.sourceMap ? map : undefined
-  if (resolvedMap && templateMap) {
-    const gen = fromMap(
-      // version property of result.map is declared as string
-      // but actually it is `3`
-      map as Omit<RawSourceMap, 'version'> as TraceEncodedSourceMap
-    )
-    const tracer = new TraceMap(
-      // same above
-      templateMap as Omit<RawSourceMap, 'version'> as TraceEncodedSourceMap
-    )
-    const offset = (scriptCode.match(/\r?\n/g)?.length ?? 0) + 1
-    eachMapping(tracer, (m) => {
-      if (m.source == null) return
-      addMapping(gen, {
-        source: m.source,
-        original: { line: m.originalLine, column: m.originalColumn },
-        generated: {
-          line: m.generatedLine + offset,
-          column: m.generatedColumn
-        }
+  let resolvedMap: RawSourceMap | undefined = undefined
+  if (options.sourceMap) {
+    if (scriptMap && templateMap) {
+      // if the template is inlined into the main module (indicated by the presence
+      // of templateMap, we need to concatenate the two source maps.
+
+      const gen = fromMap(
+        // version property of result.map is declared as string
+        // but actually it is `3`
+        scriptMap as Omit<RawSourceMap, 'version'> as TraceEncodedSourceMap
+      )
+      const tracer = new TraceMap(
+        // same above
+        templateMap as Omit<RawSourceMap, 'version'> as TraceEncodedSourceMap
+      )
+      const offset = (scriptCode.match(/\r?\n/g)?.length ?? 0) + 1
+      eachMapping(tracer, (m) => {
+        if (m.source == null) return
+        addMapping(gen, {
+          source: m.source,
+          original: { line: m.originalLine, column: m.originalColumn },
+          generated: {
+            line: m.generatedLine + offset,
+            column: m.generatedColumn
+          }
+        })
       })
-    })
 
-    // same above
-    resolvedMap = toEncodedMap(gen) as Omit<
-      GenEncodedSourceMap,
-      'version'
-    > as RawSourceMap
-    // 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
+      // same above
+      resolvedMap = toEncodedMap(gen) as Omit<
+        GenEncodedSourceMap,
+        'version'
+      > as RawSourceMap
+      // 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
+    } else {
+      // if one of `scriptMap` and `templateMap` is empty, use the other one
+      resolvedMap = scriptMap ?? templateMap
+    }
   }
 
   if (!attachedProps.length) {
@@ -287,10 +293,10 @@ async function genScriptCode(
   ssr: boolean
 ): Promise<{
   code: string
-  map: RawSourceMap
+  map: RawSourceMap | undefined
 }> {
   let scriptCode = `const _sfc_main = {}`
-  let map: RawSourceMap | SourceMap | undefined
+  let map: RawSourceMap | undefined
 
   const script = resolveScript(descriptor, options, ssr)
   if (script) {
@@ -322,7 +328,7 @@ async function genScriptCode(
   }
   return {
     code: scriptCode,
-    map: map as any
+    map
   }
 }
 
diff --git a/playground/vue-sourcemap/Main.vue b/playground/vue-sourcemap/Main.vue
index b9b03596f5aea5..8b092e88d94aef 100644
--- a/playground/vue-sourcemap/Main.vue
+++ b/playground/vue-sourcemap/Main.vue
@@ -7,6 +7,8 @@
   <SassWithImport />
   <Less />
   <SrcImport />
+  <NoScript />
+  <NoTemplate />
 </template>
 
 <script setup lang="ts">
@@ -17,4 +19,6 @@ import Sass from './Sass.vue'
 import SassWithImport from './SassWithImport.vue'
 import Less from './Less.vue'
 import SrcImport from './src-import/SrcImport.vue'
+import NoScript from './NoScript.vue'
+import NoTemplate from './NoTemplate.vue'
 </script>
diff --git a/playground/vue-sourcemap/NoScript.vue b/playground/vue-sourcemap/NoScript.vue
new file mode 100644
index 00000000000000..77e2de3414d1ea
--- /dev/null
+++ b/playground/vue-sourcemap/NoScript.vue
@@ -0,0 +1,3 @@
+<template>
+  <p>&lt;no-script&gt;</p>
+</template>
diff --git a/playground/vue-sourcemap/NoTemplate.vue b/playground/vue-sourcemap/NoTemplate.vue
new file mode 100644
index 00000000000000..9414a2913d68f4
--- /dev/null
+++ b/playground/vue-sourcemap/NoTemplate.vue
@@ -0,0 +1,7 @@
+<script>
+console.log('script')
+</script>
+
+<script setup>
+console.log('setup')
+</script>
diff --git a/playground/vue-sourcemap/__tests__/serve.spec.ts b/playground/vue-sourcemap/__tests__/serve.spec.ts
index e02243c94c8873..ba2ba168e9a220 100644
--- a/playground/vue-sourcemap/__tests__/serve.spec.ts
+++ b/playground/vue-sourcemap/__tests__/serve.spec.ts
@@ -334,4 +334,54 @@ describe.runIf(isServe)('serve:vue-sourcemap', () => {
       }
     `)
   })
+
+  test('no script', async () => {
+    const res = await page.request.get(
+      new URL('./NoScript.vue', page.url()).href
+    )
+    const js = await res.text()
+    const map = extractSourcemap(js)
+    expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(`
+      {
+        "mappings": ";;;wBACE",
+        "sources": [
+          "/root/NoScript.vue",
+        ],
+        "sourcesContent": [
+          "<template>
+        <p>&lt;no-script&gt;</p>
+      </template>
+      ",
+        ],
+        "version": 3,
+      }
+    `)
+  })
+
+  test('no template', async () => {
+    const res = await page.request.get(
+      new URL('./NoTemplate.vue', page.url()).href
+    )
+    const js = await res.text()
+    const map = extractSourcemap(js)
+    expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(`
+      {
+        "mappings": "2IACA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;;;;;;AAGP;AACd,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC",
+        "sources": [
+          "/root/NoTemplate.vue",
+        ],
+        "sourcesContent": [
+          "<script>
+      console.log('script')
+      </script>
+
+      <script setup>
+      console.log('setup')
+      </script>
+      ",
+        ],
+        "version": 3,
+      }
+    `)
+  })
 })

From c1c7af3cb95acca117e1fea0f8441548c39a51ce Mon Sep 17 00:00:00 2001
From: swandir <swandir@icloud.com>
Date: Thu, 16 Jun 2022 11:00:07 +0300
Subject: [PATCH 67/72] fix(optimizer): browser mapping for yarn pnp (#6493)

---
 .../src/node/optimizer/esbuildDepPlugin.ts    | 51 ++++++++++++-------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
index fbfb658e9f7505..6ab689f856df55 100644
--- a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
+++ b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
@@ -80,6 +80,24 @@ export function esbuildDepPlugin(
     return resolver(id, _importer, undefined)
   }
 
+  const resolveResult = (id: string, resolved: string) => {
+    if (resolved.startsWith(browserExternalId)) {
+      return {
+        path: id,
+        namespace: 'browser-external'
+      }
+    }
+    if (isExternalUrl(resolved)) {
+      return {
+        path: resolved,
+        external: true
+      }
+    }
+    return {
+      path: path.resolve(resolved)
+    }
+  }
+
   return {
     name: 'vite:dep-pre-bundle',
     setup(build) {
@@ -156,21 +174,7 @@ export function esbuildDepPlugin(
           // use vite's own resolver
           const resolved = await resolve(id, importer, kind)
           if (resolved) {
-            if (resolved.startsWith(browserExternalId)) {
-              return {
-                path: id,
-                namespace: 'browser-external'
-              }
-            }
-            if (isExternalUrl(resolved)) {
-              return {
-                path: resolved,
-                external: true
-              }
-            }
-            return {
-              path: path.resolve(resolved)
-            }
+            return resolveResult(id, resolved)
           }
         }
       )
@@ -258,11 +262,20 @@ module.exports = Object.create(new Proxy({}, {
       if (isRunningWithYarnPnp) {
         build.onResolve(
           { filter: /.*/ },
-          async ({ path, importer, kind, resolveDir }) => ({
-            // pass along resolveDir for entries
-            path: await resolve(path, importer, kind, resolveDir)
-          })
+          async ({ path: id, importer, kind, resolveDir, namespace }) => {
+            const resolved = await resolve(
+              id,
+              importer,
+              kind,
+              // pass along resolveDir for entries
+              namespace === 'dep' ? resolveDir : undefined
+            )
+            if (resolved) {
+              return resolveResult(id, resolved)
+            }
+          }
         )
+
         build.onLoad({ filter: /.*/ }, async (args) => ({
           contents: await fs.readFile(args.path),
           loader: 'default'

From 13d05bd216309503e077c39842abc8e4cf6f4cf7 Mon Sep 17 00:00:00 2001
From: Asko Kauppi <akauppi@gmail.com>
Date: Thu, 16 Jun 2022 11:07:32 +0300
Subject: [PATCH 68/72] chore: correct typo in console message (#8618)

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

diff --git a/packages/vite/src/node/logger.ts b/packages/vite/src/node/logger.ts
index 70a6ee49a80bf2..0518d86b271ac7 100644
--- a/packages/vite/src/node/logger.ts
+++ b/packages/vite/src/node/logger.ts
@@ -224,7 +224,7 @@ function printServerUrls(
     notes.push({
       label: 'Note',
       message: colors.dim(
-        'You are using a wildcard host. Ports might be overriden.'
+        'You are using a wildcard host. Ports might be overridden.'
       )
     })
   }

From d402ad3ae2b724fde7702eb255af502db7ca94d4 Mon Sep 17 00:00:00 2001
From: patak-dev <matias.capeletto@gmail.com>
Date: Thu, 16 Jun 2022 10:10:27 +0200
Subject: [PATCH 69/72] release: v3.0.0-alpha.12

---
 packages/vite/CHANGELOG.md | 16 ++++++++++++++++
 packages/vite/package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md
index 5f0f19a5f034e6..03b7be90f66c65 100644
--- a/packages/vite/CHANGELOG.md
+++ b/packages/vite/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 3.0.0-alpha.12 (2022-06-16)
+
+* chore: correct typo in console message (#8618) ([13d05bd](https://github.com/vitejs/vite/commit/13d05bd)), closes [#8618](https://github.com/vitejs/vite/issues/8618)
+* chore: enable eslint and prettier cache (#8585) ([d7beaeb](https://github.com/vitejs/vite/commit/d7beaeb)), closes [#8585](https://github.com/vitejs/vite/issues/8585)
+* chore: tweak server start output (#8582) ([3439132](https://github.com/vitejs/vite/commit/3439132)), closes [#8582](https://github.com/vitejs/vite/issues/8582)
+* fix: allow cache overlap in parallel builds (#8592) ([2dd0b49](https://github.com/vitejs/vite/commit/2dd0b49)), closes [#8592](https://github.com/vitejs/vite/issues/8592)
+* fix: avoid replacing defines and NODE_ENV in optimized deps (fix #8593) (#8606) ([739175b](https://github.com/vitejs/vite/commit/739175b)), closes [#8593](https://github.com/vitejs/vite/issues/8593) [#8606](https://github.com/vitejs/vite/issues/8606)
+* fix: sequential injection of tags in transformIndexHtml (#5851) (#6901) ([649c7f6](https://github.com/vitejs/vite/commit/649c7f6)), closes [#5851](https://github.com/vitejs/vite/issues/5851) [#6901](https://github.com/vitejs/vite/issues/6901)
+* fix(asset): respect assetFileNames if rollupOptions.output is an array (#8561) ([4e6c26f](https://github.com/vitejs/vite/commit/4e6c26f)), closes [#8561](https://github.com/vitejs/vite/issues/8561)
+* fix(css): escape pattern chars from base path in postcss dir-dependency messages (#7081) ([5151e74](https://github.com/vitejs/vite/commit/5151e74)), closes [#7081](https://github.com/vitejs/vite/issues/7081)
+* fix(optimizer): browser mapping for yarn pnp (#6493) ([c1c7af3](https://github.com/vitejs/vite/commit/c1c7af3)), closes [#6493](https://github.com/vitejs/vite/issues/6493)
+* feat: 500 response if the node proxy request fails (#7398) ([73e1775](https://github.com/vitejs/vite/commit/73e1775)), closes [#7398](https://github.com/vitejs/vite/issues/7398)
+* docs: worker related notes (#8554) ([c0c5e1a](https://github.com/vitejs/vite/commit/c0c5e1a)), closes [#8554](https://github.com/vitejs/vite/issues/8554)
+
+
+
 ## 3.0.0-alpha.11 (2022-06-14)
 
 * fix: add missed JPEG file extensions to `KNOWN_ASSET_TYPES` (#8565) ([2dfc015](https://github.com/vitejs/vite/commit/2dfc015)), closes [#8565](https://github.com/vitejs/vite/issues/8565)
diff --git a/packages/vite/package.json b/packages/vite/package.json
index b30f184906058a..805d6485d53acd 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.0.0-alpha.11",
+  "version": "3.0.0-alpha.12",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",

From a32c4bad5fd937874dc721fbcfb96ba1d4de4122 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Fri, 17 Jun 2022 14:02:56 +0800
Subject: [PATCH 70/72] fix(optimizer): use simple browser external shim in
 prod (#8630)

---
 .../src/node/optimizer/esbuildDepPlugin.ts    | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
index 6ab689f856df55..aacabbdf9b1a3c 100644
--- a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
+++ b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
@@ -224,24 +224,29 @@ export function esbuildDepPlugin(
       build.onLoad(
         { filter: /.*/, namespace: 'browser-external' },
         ({ path }) => {
-          return {
-            // Return in CJS to intercept named imports. Use `Object.create` to
-            // create the Proxy in the prototype to workaround esbuild issue. Why?
-            //
-            // In short, esbuild cjs->esm flow:
-            // 1. Create empty object using `Object.create(Object.getPrototypeOf(module.exports))`.
-            // 2. Assign props of `module.exports` to the object.
-            // 3. Return object for ESM use.
-            //
-            // If we do `module.exports = new Proxy({}, {})`, step 1 returns empty object,
-            // step 2 does nothing as there's no props for `module.exports`. The final object
-            // is just an empty object.
-            //
-            // Creating the Proxy in the prototype satisfies step 1 immediately, which means
-            // the returned object is a Proxy that we can intercept.
-            //
-            // Note: Skip keys that are accessed by esbuild and browser devtools.
-            contents: `\
+          if (config.isProduction) {
+            return {
+              contents: 'module.exports = {}'
+            }
+          } else {
+            return {
+              // Return in CJS to intercept named imports. Use `Object.create` to
+              // create the Proxy in the prototype to workaround esbuild issue. Why?
+              //
+              // In short, esbuild cjs->esm flow:
+              // 1. Create empty object using `Object.create(Object.getPrototypeOf(module.exports))`.
+              // 2. Assign props of `module.exports` to the object.
+              // 3. Return object for ESM use.
+              //
+              // If we do `module.exports = new Proxy({}, {})`, step 1 returns empty object,
+              // step 2 does nothing as there's no props for `module.exports`. The final object
+              // is just an empty object.
+              //
+              // Creating the Proxy in the prototype satisfies step 1 immediately, which means
+              // the returned object is a Proxy that we can intercept.
+              //
+              // Note: Skip keys that are accessed by esbuild and browser devtools.
+              contents: `\
 module.exports = Object.create(new Proxy({}, {
   get(_, key) {
     if (
@@ -254,6 +259,7 @@ module.exports = Object.create(new Proxy({}, {
     }
   }
 }))`
+            }
           }
         }
       )

From e10530ba2c76374943b2e012800697cd30852fe6 Mon Sep 17 00:00:00 2001
From: zhenzhenChange <1506678296@qq.com>
Date: Fri, 17 Jun 2022 15:20:57 +0800
Subject: [PATCH 71/72] fix: filter of BOM tags in json plugin (#8628)

---
 packages/vite/src/node/plugins/importAnalysis.ts | 6 ++----
 packages/vite/src/node/plugins/json.ts           | 3 +++
 packages/vite/src/node/utils.ts                  | 9 +++++++++
 playground/json/index.html                       | 6 ++++++
 playground/json/json-bom/has-bom.json            | 4 ++++
 5 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 playground/json/json-bom/has-bom.json

diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
index b4f5fbfa442407..22797c1c0d8230 100644
--- a/packages/vite/src/node/plugins/importAnalysis.ts
+++ b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -36,6 +36,7 @@ import {
   normalizePath,
   prettifyUrl,
   removeImportQuery,
+  stripBomTag,
   timeFrom,
   transformResult,
   unwrapId
@@ -142,10 +143,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       const start = performance.now()
       await init
       let imports: readonly ImportSpecifier[] = []
-      // strip UTF-8 BOM
-      if (source.charCodeAt(0) === 0xfeff) {
-        source = source.slice(1)
-      }
+      source = stripBomTag(source)
       try {
         imports = parseImports(source)[0]
       } catch (e: any) {
diff --git a/packages/vite/src/node/plugins/json.ts b/packages/vite/src/node/plugins/json.ts
index 9c142501ff651e..216679a22148cd 100644
--- a/packages/vite/src/node/plugins/json.ts
+++ b/packages/vite/src/node/plugins/json.ts
@@ -9,6 +9,7 @@
 import { dataToEsm } from '@rollup/pluginutils'
 import { SPECIAL_QUERY_RE } from '../constants'
 import type { Plugin } from '../plugin'
+import { stripBomTag } from '../utils'
 
 export interface JsonOptions {
   /**
@@ -43,6 +44,8 @@ export function jsonPlugin(
       if (!jsonExtRE.test(id)) return null
       if (SPECIAL_QUERY_RE.test(id)) return null
 
+      json = stripBomTag(json)
+
       try {
         if (options.stringify) {
           if (isBuild) {
diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
index e36e33c3cb7225..c3c58696921dc9 100644
--- a/packages/vite/src/node/utils.ts
+++ b/packages/vite/src/node/utils.ts
@@ -1014,3 +1014,12 @@ export function transformResult(
     map: needSourceMap ? s.generateMap({ hires: true, source: id }) : null
   }
 }
+
+// strip UTF-8 BOM
+export function stripBomTag(content: string): string {
+  if (content.charCodeAt(0) === 0xfeff) {
+    return content.slice(1)
+  }
+
+  return content
+}
diff --git a/playground/json/index.html b/playground/json/index.html
index cf16636f91cb68..4c93436522e6c8 100644
--- a/playground/json/index.html
+++ b/playground/json/index.html
@@ -22,6 +22,9 @@ <h2>Raw Import</h2>
 <h2>JSON Module</h2>
 <pre class="module"></pre>
 
+<h2>Has BOM Tag</h2>
+<pre class="bom"></pre>
+
 <script type="module">
   import json, { hello } from './test.json'
   import deepJson, { name } from 'vue/package.json'
@@ -52,6 +55,9 @@ <h2>JSON Module</h2>
   import moduleJSON from 'json-module'
   text('.module', JSON.stringify(moduleJSON))
 
+  import hasBomJson from './json-bom/has-bom.json'
+  text('.bom', JSON.stringify(hasBomJson))
+
   function text(sel, text) {
     document.querySelector(sel).textContent = text
   }
diff --git a/playground/json/json-bom/has-bom.json b/playground/json/json-bom/has-bom.json
new file mode 100644
index 00000000000000..8145b3da51e442
--- /dev/null
+++ b/playground/json/json-bom/has-bom.json
@@ -0,0 +1,4 @@
+{
+  "description": "This file is marked with BOM.",
+  "message": "If the parsing is successful, the BOM tag has been removed."
+}

From f586b14c20874c869f363f068e5e9fc0ff79d354 Mon Sep 17 00:00:00 2001
From: Yehyoung Kang <keepyourhonor+github@gmail.com>
Date: Fri, 17 Jun 2022 17:50:27 +0900
Subject: [PATCH 72/72] fix(wasm): support inlined WASM in Node < v16 (fix
 #8620) (#8622)

---
 packages/vite/src/node/plugins/wasm.ts | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/vite/src/node/plugins/wasm.ts b/packages/vite/src/node/plugins/wasm.ts
index 56aa56402df8e2..19bb9a0e541892 100644
--- a/packages/vite/src/node/plugins/wasm.ts
+++ b/packages/vite/src/node/plugins/wasm.ts
@@ -7,11 +7,21 @@ const wasmHelperId = '/__vite-wasm-helper'
 const wasmHelper = async (opts = {}, url: string) => {
   let result
   if (url.startsWith('data:')) {
-    // @ts-ignore
-    const binaryString = atob(url.replace(/^data:.*?base64,/, ''))
-    const bytes = new Uint8Array(binaryString.length)
-    for (let i = 0; i < binaryString.length; i++) {
-      bytes[i] = binaryString.charCodeAt(i)
+    const urlContent = url.replace(/^data:.*?base64,/, '')
+    let bytes
+    if (typeof Buffer === 'function' && typeof Buffer.from === 'function') {
+      bytes = Buffer.from(urlContent, 'base64')
+    } else if (typeof atob === 'function') {
+      // @ts-ignore
+      const binaryString = atob(urlContent)
+      bytes = new Uint8Array(binaryString.length)
+      for (let i = 0; i < binaryString.length; i++) {
+        bytes[i] = binaryString.charCodeAt(i)
+      }
+    } else {
+      throw new Error(
+        'Failed to decode base64-encoded data URL, Buffer and atob are not supported'
+      )
     }
     // @ts-ignore
     result = await WebAssembly.instantiate(bytes, opts)