From 806976172c08c5cdc544f3ee328fcda7b0ef9a2d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 10 Jun 2022 12:03:01 +0100
Subject: [PATCH 01/51] chore: upgrade vite to alpha

---
 package.json               |   2 +-
 packages/vite/package.json |   6 +-
 yarn.lock                  | 611 +++++++++++++++++++++++++++++++++++--
 3 files changed, 590 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index f38f730f97e..1b51207113a 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "^2.9.14",
+    "vite": "3.0.0-alpha.10",
     "unbuild": "^0.7.4"
   },
   "devDependencies": {
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 14c441248cf..51ddf35e5e3 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@nuxt/kit": "^3.0.0-rc.4",
     "@rollup/plugin-replace": "^4.0.0",
-    "@vitejs/plugin-vue": "^2.3.3",
-    "@vitejs/plugin-vue-jsx": "^1.3.10",
+    "@vitejs/plugin-vue": "3.0.0-alpha.1",
+    "@vitejs/plugin-vue-jsx": "2.0.0-alpha.1",
     "autoprefixer": "^10.4.7",
     "chokidar": "^3.5.3",
     "cssnano": "^5.1.12",
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "^2.9.14",
+    "vite": "3.0.0-alpha.10",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index 909ff21c756..ba56d6277ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,6 +1,3 @@
-# This file is generated by running "yarn install" inside your project.
-# Manual changes might be lost - proceed with caution!
-
 __metadata:
   version: 6
   cacheKey: 8
@@ -48,6 +45,52 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/core@npm:^7.17.10, @babel/core@npm:^7.17.7, @babel/core@npm:^7.18.2":
+  version: 7.18.2
+  resolution: "@babel/core@npm:7.18.2"
+  dependencies:
+    "@ampproject/remapping": ^2.1.0
+    "@babel/code-frame": ^7.16.7
+    "@babel/generator": ^7.18.2
+    "@babel/helper-compilation-targets": ^7.18.2
+    "@babel/helper-module-transforms": ^7.18.0
+    "@babel/helpers": ^7.18.2
+    "@babel/parser": ^7.18.5
+    "@babel/template": ^7.16.7
+    "@babel/traverse": ^7.18.5
+    "@babel/types": ^7.18.4
+    convert-source-map: ^1.7.0
+    debug: ^4.1.0
+    gensync: ^1.0.0-beta.2
+    json5: ^2.2.1
+    semver: ^6.3.0
+  checksum: e20c3d69a07eb564408d611b827c2f5db56f05f1ca7cb3046f3823a1cf6b13c032f02d4b8ffe1e4593699e86e0f25ca1aee6228486c1ebea48d21aaeb28e6718
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:^7.17.7, @babel/core@npm:^7.17.9, @babel/core@npm:^7.18.5":
+  version: 7.18.5
+  resolution: "@babel/core@npm:7.18.5"
+  dependencies:
+    "@ampproject/remapping": ^2.1.0
+    "@babel/code-frame": ^7.18.6
+    "@babel/generator": ^7.18.6
+    "@babel/helper-compilation-targets": ^7.18.6
+    "@babel/helper-module-transforms": ^7.18.6
+    "@babel/helpers": ^7.18.6
+    "@babel/parser": ^7.18.6
+    "@babel/template": ^7.18.6
+    "@babel/traverse": ^7.18.6
+    "@babel/types": ^7.18.6
+    convert-source-map: ^1.7.0
+    debug: ^4.1.0
+    gensync: ^1.0.0-beta.2
+    json5: ^2.2.1
+    semver: ^6.3.0
+  checksum: 711459ebf7afab7b8eff88b7155c3f4a62690545f1c8c2eb6ba5ebaed01abeecb984cf9657847a2151ad24a5645efce765832aa343ce0f0386f311b67b59589a
+  languageName: node
+  linkType: hard
+
 "@babel/core@npm:^7.17.7, @babel/core@npm:^7.17.9, @babel/core@npm:^7.18.6":
   version: 7.18.6
   resolution: "@babel/core@npm:7.18.6"
@@ -1767,8 +1810,8 @@ __metadata:
     "@nuxt/schema": ^3.0.0-rc.4
     "@rollup/plugin-replace": ^4.0.0
     "@types/cssnano": ^5
-    "@vitejs/plugin-vue": ^2.3.3
-    "@vitejs/plugin-vue-jsx": ^1.3.10
+    "@vitejs/plugin-vue": 3.0.0-alpha.1
+    "@vitejs/plugin-vue-jsx": 2.0.0-alpha.1
     autoprefixer: ^10.4.7
     chokidar: ^3.5.3
     cssnano: ^5.1.12
@@ -1793,10 +1836,10 @@ __metadata:
     rollup-plugin-visualizer: ^5.6.0
     ufo: ^0.8.5
     unbuild: latest
-    unplugin: ^0.7.2
-    vite: ^2.9.14
-    vite-node: ^0.18.0
-    vite-plugin-checker: ^0.4.9
+    unplugin: ^0.7.0
+    vite: 3.0.0-alpha.10
+    vite-node: ^0.14.2
+    vite-plugin-checker: ^0.4.6
     vue: 3.2.37
   peerDependencies:
     vue: ^3.2.37
@@ -2894,27 +2937,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue-jsx@npm:^1.3.10":
-  version: 1.3.10
-  resolution: "@vitejs/plugin-vue-jsx@npm:1.3.10"
+"@vitejs/plugin-vue-jsx@npm:2.0.0-alpha.1":
+  version: 2.0.0-alpha.1
+  resolution: "@vitejs/plugin-vue-jsx@npm:2.0.0-alpha.1"
   dependencies:
-    "@babel/core": ^7.17.9
+    "@babel/core": ^7.17.10
     "@babel/plugin-syntax-import-meta": ^7.10.4
     "@babel/plugin-transform-typescript": ^7.16.8
-    "@rollup/pluginutils": ^4.2.0
+    "@rollup/pluginutils": ^4.2.1
     "@vue/babel-plugin-jsx": ^1.1.1
-    hash-sum: ^2.0.0
-  checksum: 868e90363e1234be43c3ced5097c8da430b9feed526c1f6c2dcc8a0546182e942018e6b5e1a0c16c66810b82cd17fa3a8e04ba969db6f253c6f7c490dce83a0b
+  peerDependencies:
+    vite: ^3.0.0-alpha
+    vue: ^3.0.0
+  checksum: 8b92f50ba16bbcad88c7a6870f615d2d79523499a5a105733822b2110849f633b512ac25fed0fa0784d8de7daec0621c76bfae13fe2b041ac76c6fde6079aec1
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue@npm:^2.3.3":
-  version: 2.3.3
-  resolution: "@vitejs/plugin-vue@npm:2.3.3"
+"@vitejs/plugin-vue@npm:3.0.0-alpha.1":
+  version: 3.0.0-alpha.1
+  resolution: "@vitejs/plugin-vue@npm:3.0.0-alpha.1"
+  dependencies:
+    "@rollup/pluginutils": ^4.2.1
   peerDependencies:
-    vite: ^2.5.10
+    vite: ^3.0.0-alpha
     vue: ^3.2.25
-  checksum: 9303dcb9c8580d0ee9b33542639ac1a36ad9cc0e773a1f9b9b05623d74574f6a901ce781918b53f5a58eb3c6218ba96c27ef6efbf3e7ef6be16864fc1cae1626
+  checksum: 584dc77a914263bc6801e4da0bbf5c1b97f79f75a8607105aaf8c5bbb8f3ce1b783e981416bcf9082daa0891e3d082c07068510a5620e175c95bfa4342916528
   languageName: node
   linkType: hard
 
@@ -5588,6 +5635,77 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild@npm:^0.14.27, esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.47":
+  version: 0.14.47
+  resolution: "esbuild@npm:0.14.47"
+  dependencies:
+    esbuild-android-64: 0.14.47
+    esbuild-android-arm64: 0.14.47
+    esbuild-darwin-64: 0.14.47
+    esbuild-darwin-arm64: 0.14.47
+    esbuild-freebsd-64: 0.14.47
+    esbuild-freebsd-arm64: 0.14.47
+    esbuild-linux-32: 0.14.47
+    esbuild-linux-64: 0.14.47
+    esbuild-linux-arm: 0.14.47
+    esbuild-linux-arm64: 0.14.47
+    esbuild-linux-mips64le: 0.14.47
+    esbuild-linux-ppc64le: 0.14.47
+    esbuild-linux-riscv64: 0.14.47
+    esbuild-linux-s390x: 0.14.47
+    esbuild-netbsd-64: 0.14.47
+    esbuild-openbsd-64: 0.14.47
+    esbuild-sunos-64: 0.14.47
+    esbuild-windows-32: 0.14.47
+    esbuild-windows-64: 0.14.47
+    esbuild-windows-arm64: 0.14.47
+  dependenciesMeta:
+    esbuild-android-64:
+      optional: true
+    esbuild-android-arm64:
+      optional: true
+    esbuild-darwin-64:
+      optional: true
+    esbuild-darwin-arm64:
+      optional: true
+    esbuild-freebsd-64:
+      optional: true
+    esbuild-freebsd-arm64:
+      optional: true
+    esbuild-linux-32:
+      optional: true
+    esbuild-linux-64:
+      optional: true
+    esbuild-linux-arm:
+      optional: true
+    esbuild-linux-arm64:
+      optional: true
+    esbuild-linux-mips64le:
+      optional: true
+    esbuild-linux-ppc64le:
+      optional: true
+    esbuild-linux-riscv64:
+      optional: true
+    esbuild-linux-s390x:
+      optional: true
+    esbuild-netbsd-64:
+      optional: true
+    esbuild-openbsd-64:
+      optional: true
+    esbuild-sunos-64:
+      optional: true
+    esbuild-windows-32:
+      optional: true
+    esbuild-windows-64:
+      optional: true
+    esbuild-windows-arm64:
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 77a8bff8c3fe52dc9d2823448843b0f53c9a9f3701e3637a54e396270c9ca04cc46a4b08ef86cbaa8d202854e02c790f61683bfa75ebff540b1e24414f536e91
+  languageName: node
+  linkType: hard
+
 "esbuild@npm:^0.14.27, esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.47, esbuild@npm:^0.14.49":
   version: 0.14.49
   resolution: "esbuild@npm:0.14.49"
@@ -5659,6 +5777,290 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild@npm:^0.14.36, esbuild@npm:^0.14.38, esbuild@npm:^0.14.39, esbuild@npm:^0.14.43":
+  version: 0.14.43
+  resolution: "esbuild@npm:0.14.43"
+  dependencies:
+    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
+  dependenciesMeta:
+    esbuild-android-64:
+      optional: true
+    esbuild-android-arm64:
+      optional: true
+    esbuild-darwin-64:
+      optional: true
+    esbuild-darwin-arm64:
+      optional: true
+    esbuild-freebsd-64:
+      optional: true
+    esbuild-freebsd-arm64:
+      optional: true
+    esbuild-linux-32:
+      optional: true
+    esbuild-linux-64:
+      optional: true
+    esbuild-linux-arm:
+      optional: true
+    esbuild-linux-arm64:
+      optional: true
+    esbuild-linux-mips64le:
+      optional: true
+    esbuild-linux-ppc64le:
+      optional: true
+    esbuild-linux-riscv64:
+      optional: true
+    esbuild-linux-s390x:
+      optional: true
+    esbuild-netbsd-64:
+      optional: true
+    esbuild-openbsd-64:
+      optional: true
+    esbuild-sunos-64:
+      optional: true
+    esbuild-windows-32:
+      optional: true
+    esbuild-windows-64:
+      optional: true
+    esbuild-windows-arm64:
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: c5988ba9d3b62c794aaf6752ca4cf0f009d0dc127a19d21c1bbeb2fe6d983c7fe39f3d330e2c00d5a9b6de4a71bfb0f5f347e69c37eb545ab61dc4824b5b2bb3
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:^0.14.47":
+  version: 0.14.47
+  resolution: "esbuild@npm:0.14.47"
+  dependencies:
+    esbuild-android-64: 0.14.47
+    esbuild-android-arm64: 0.14.47
+    esbuild-darwin-64: 0.14.47
+    esbuild-darwin-arm64: 0.14.47
+    esbuild-freebsd-64: 0.14.47
+    esbuild-freebsd-arm64: 0.14.47
+    esbuild-linux-32: 0.14.47
+    esbuild-linux-64: 0.14.47
+    esbuild-linux-arm: 0.14.47
+    esbuild-linux-arm64: 0.14.47
+    esbuild-linux-mips64le: 0.14.47
+    esbuild-linux-ppc64le: 0.14.47
+    esbuild-linux-riscv64: 0.14.47
+    esbuild-linux-s390x: 0.14.47
+    esbuild-netbsd-64: 0.14.47
+    esbuild-openbsd-64: 0.14.47
+    esbuild-sunos-64: 0.14.47
+    esbuild-windows-32: 0.14.47
+    esbuild-windows-64: 0.14.47
+    esbuild-windows-arm64: 0.14.47
+  dependenciesMeta:
+    esbuild-android-64:
+      optional: true
+    esbuild-android-arm64:
+      optional: true
+    esbuild-darwin-64:
+      optional: true
+    esbuild-darwin-arm64:
+      optional: true
+    esbuild-freebsd-64:
+      optional: true
+    esbuild-freebsd-arm64:
+      optional: true
+    esbuild-linux-32:
+      optional: true
+    esbuild-linux-64:
+      optional: true
+    esbuild-linux-arm:
+      optional: true
+    esbuild-linux-arm64:
+      optional: true
+    esbuild-linux-mips64le:
+      optional: true
+    esbuild-linux-ppc64le:
+      optional: true
+    esbuild-linux-riscv64:
+      optional: true
+    esbuild-linux-s390x:
+      optional: true
+    esbuild-netbsd-64:
+      optional: true
+    esbuild-openbsd-64:
+      optional: true
+    esbuild-sunos-64:
+      optional: true
+    esbuild-windows-32:
+      optional: true
+    esbuild-windows-64:
+      optional: true
+    esbuild-windows-arm64:
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 77a8bff8c3fe52dc9d2823448843b0f53c9a9f3701e3637a54e396270c9ca04cc46a4b08ef86cbaa8d202854e02c790f61683bfa75ebff540b1e24414f536e91
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:^0.14.48":
+  version: 0.14.48
+  resolution: "esbuild@npm:0.14.48"
+  dependencies:
+    esbuild-android-64: 0.14.49
+    esbuild-android-arm64: 0.14.49
+    esbuild-darwin-64: 0.14.49
+    esbuild-darwin-arm64: 0.14.49
+    esbuild-freebsd-64: 0.14.49
+    esbuild-freebsd-arm64: 0.14.49
+    esbuild-linux-32: 0.14.49
+    esbuild-linux-64: 0.14.49
+    esbuild-linux-arm: 0.14.49
+    esbuild-linux-arm64: 0.14.49
+    esbuild-linux-mips64le: 0.14.49
+    esbuild-linux-ppc64le: 0.14.49
+    esbuild-linux-riscv64: 0.14.49
+    esbuild-linux-s390x: 0.14.49
+    esbuild-netbsd-64: 0.14.49
+    esbuild-openbsd-64: 0.14.49
+    esbuild-sunos-64: 0.14.49
+    esbuild-windows-32: 0.14.49
+    esbuild-windows-64: 0.14.49
+    esbuild-windows-arm64: 0.14.49
+  dependenciesMeta:
+    esbuild-android-64:
+      optional: true
+    esbuild-android-arm64:
+      optional: true
+    esbuild-darwin-64:
+      optional: true
+    esbuild-darwin-arm64:
+      optional: true
+    esbuild-freebsd-64:
+      optional: true
+    esbuild-freebsd-arm64:
+      optional: true
+    esbuild-linux-32:
+      optional: true
+    esbuild-linux-64:
+      optional: true
+    esbuild-linux-arm:
+      optional: true
+    esbuild-linux-arm64:
+      optional: true
+    esbuild-linux-mips64le:
+      optional: true
+    esbuild-linux-ppc64le:
+      optional: true
+    esbuild-linux-riscv64:
+      optional: true
+    esbuild-linux-s390x:
+      optional: true
+    esbuild-netbsd-64:
+      optional: true
+    esbuild-openbsd-64:
+      optional: true
+    esbuild-sunos-64:
+      optional: true
+    esbuild-windows-32:
+      optional: true
+    esbuild-windows-64:
+      optional: true
+    esbuild-windows-arm64:
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: b718f4c9eaf2f83bb26f2cdb18d82d70365179ae8d1d88636afc3073a0c328364340695798b9a6322ae15e31b90e1f71266151f61637412649fb31bb3ecb2e0a
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:^0.14.49":
+  version: 0.14.49
+  resolution: "esbuild@npm:0.14.49"
+  dependencies:
+    esbuild-android-64: 0.14.49
+    esbuild-android-arm64: 0.14.49
+    esbuild-darwin-64: 0.14.49
+    esbuild-darwin-arm64: 0.14.49
+    esbuild-freebsd-64: 0.14.49
+    esbuild-freebsd-arm64: 0.14.49
+    esbuild-linux-32: 0.14.49
+    esbuild-linux-64: 0.14.49
+    esbuild-linux-arm: 0.14.49
+    esbuild-linux-arm64: 0.14.49
+    esbuild-linux-mips64le: 0.14.49
+    esbuild-linux-ppc64le: 0.14.49
+    esbuild-linux-riscv64: 0.14.49
+    esbuild-linux-s390x: 0.14.49
+    esbuild-netbsd-64: 0.14.49
+    esbuild-openbsd-64: 0.14.49
+    esbuild-sunos-64: 0.14.49
+    esbuild-windows-32: 0.14.49
+    esbuild-windows-64: 0.14.49
+    esbuild-windows-arm64: 0.14.49
+  dependenciesMeta:
+    esbuild-android-64:
+      optional: true
+    esbuild-android-arm64:
+      optional: true
+    esbuild-darwin-64:
+      optional: true
+    esbuild-darwin-arm64:
+      optional: true
+    esbuild-freebsd-64:
+      optional: true
+    esbuild-freebsd-arm64:
+      optional: true
+    esbuild-linux-32:
+      optional: true
+    esbuild-linux-64:
+      optional: true
+    esbuild-linux-arm:
+      optional: true
+    esbuild-linux-arm64:
+      optional: true
+    esbuild-linux-mips64le:
+      optional: true
+    esbuild-linux-ppc64le:
+      optional: true
+    esbuild-linux-riscv64:
+      optional: true
+    esbuild-linux-s390x:
+      optional: true
+    esbuild-netbsd-64:
+      optional: true
+    esbuild-openbsd-64:
+      optional: true
+    esbuild-sunos-64:
+      optional: true
+    esbuild-windows-32:
+      optional: true
+    esbuild-windows-64:
+      optional: true
+    esbuild-windows-arm64:
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: b718f4c9eaf2f83bb26f2cdb18d82d70365179ae8d1d88636afc3073a0c328364340695798b9a6322ae15e31b90e1f71266151f61637412649fb31bb3ecb2e0a
+  languageName: node
+  linkType: hard
+
 "escalade@npm:^3.1.1":
   version: 3.1.1
   resolution: "escalade@npm:3.1.1"
@@ -11358,6 +11760,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup@npm:^2.59.0, rollup@npm:^2.70.1, rollup@npm:^2.75.7":
+  version: 2.75.7
+  resolution: "rollup@npm:2.75.7"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: a6331d46b01062b184efdcb42ce12caf2e1575f989963944534b02f5855f6f3bc239ed0c1a18893572d7695af6d83166f3aef59dbd0365084e1531cb67824674
+  languageName: node
+  linkType: hard
+
 "rollup@npm:^2.59.0, rollup@npm:^2.70.1, rollup@npm:^2.75.7, rollup@npm:^2.76.0":
   version: 2.76.0
   resolution: "rollup@npm:2.76.0"
@@ -11372,6 +11788,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup@npm:^2.70.1, rollup@npm:^2.72.1, rollup@npm:^2.75.6":
+  version: 2.75.6
+  resolution: "rollup@npm:2.75.6"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: df83c6d43a144a296daf82bed7f12f2dfcc6c495a64245e840d15fd21f2ab8b66bb3423e61c974875b33ccf53fb659d2ed099f272937ecf23af48815277c6cd5
+  languageName: node
+  linkType: hard
+
+"rollup@npm:^2.75.7":
+  version: 2.75.7
+  resolution: "rollup@npm:2.75.7"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: a6331d46b01062b184efdcb42ce12caf2e1575f989963944534b02f5855f6f3bc239ed0c1a18893572d7695af6d83166f3aef59dbd0365084e1531cb67824674
+  languageName: node
+  linkType: hard
+
+"rollup@npm:^2.76.0":
+  version: 2.76.0
+  resolution: "rollup@npm:2.76.0"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 58293e1c63c11d4afcfcf619601d5c5136dd3d0c9d3bd6a0b6141fede32027edc1eb53873bbb9a9c1e95e86c67f6ad66185720031b6eadf325972174d1d8fbcb
+  languageName: node
+  linkType: hard
+
 "run-async@npm:^2.4.0":
   version: 2.4.1
   resolution: "run-async@npm:2.4.1"
@@ -13031,19 +13489,84 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vite@npm:3.0.0-alpha.10":
+  version: 3.0.0-alpha.10
+  resolution: "vite@npm:3.0.0-alpha.10"
+  dependencies:
+    esbuild: ^0.14.38
+    fsevents: ~2.3.2
+    postcss: ^8.4.14
+    resolve: ^1.22.0
+    rollup: ^2.72.1
+  peerDependencies:
+    less: "*"
+    sass: "*"
+    stylus: "*"
+    terser: ^5.4.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    less:
+      optional: true
+    sass:
+      optional: true
+    stylus:
+      optional: true
+    terser:
+      optional: true
+  bin:
+    vite: bin/vite.js
+  checksum: 640fdc5a3e58aee542ab738efc0ffbf0845a271fdaeb9750c42d78ed542db0bf89082de63865ddc831997cae6652cf023da7d4e6ddb8514363eb66604ec4e6c8
+  languageName: node
+  linkType: hard
+
+"vite@npm:^2.9.13":
+  version: 2.9.13
+  resolution: "vite@npm:2.9.13"
+  dependencies:
+    esbuild: ^0.14.38
+    fsevents: ~2.3.2
+    postcss: ^8.4.14
+    resolve: ^1.22.0
+    rollup: ^2.72.1
+  peerDependencies:
+    less: "*"
+    sass: "*"
+    stylus: "*"
+    terser: ^5.4.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    less:
+      optional: true
+    sass:
+      optional: true
+    stylus:
+      optional: true
+    terser:
+      optional: true
+  bin:
+    vite: bin/vite.js
+  checksum: f78b54f58482ea97d385e36873ae1aa4744c5e467c1d6d4e0835bd55494d2d8f6ce763f17c241c66104be687d5ee535b8e1e96c14210c9ba0c343fe78c58f694
+  languageName: node
+  linkType: hard
+
 "vite@npm:^2.9.14":
   version: 2.9.14
   resolution: "vite@npm:2.9.14"
   dependencies:
-    esbuild: ^0.14.27
+    esbuild: ^0.14.38
     fsevents: ~2.3.2
-    postcss: ^8.4.13
+    postcss: ^8.4.14
     resolve: ^1.22.0
-    rollup: ^2.59.0
+    rollup: ^2.72.1
   peerDependencies:
     less: "*"
     sass: "*"
     stylus: "*"
+    terser: ^5.4.0
   dependenciesMeta:
     fsevents:
       optional: true
@@ -13054,9 +13577,47 @@ __metadata:
       optional: true
     stylus:
       optional: true
+    terser:
+      optional: true
   bin:
     vite: bin/vite.js
-  checksum: f78b54f58482ea97d385e36873ae1aa4744c5e467c1d6d4e0835bd55494d2d8f6ce763f17c241c66104be687d5ee535b8e1e96c14210c9ba0c343fe78c58f694
+  checksum: 640fdc5a3e58aee542ab738efc0ffbf0845a271fdaeb9750c42d78ed542db0bf89082de63865ddc831997cae6652cf023da7d4e6ddb8514363eb66604ec4e6c8
+  languageName: node
+  linkType: hard
+
+"vitest@npm:^0.17.1":
+  version: 0.17.1
+  resolution: "vitest@npm:0.17.1"
+  dependencies:
+    "@types/chai": ^4.3.1
+    "@types/chai-subset": ^1.3.3
+    "@types/node": "*"
+    chai: ^4.3.6
+    debug: ^4.3.4
+    local-pkg: ^0.4.1
+    tinypool: ^0.2.1
+    tinyspy: ^0.3.3
+    vite: ^2.9.12 || ^3.0.0-0
+  peerDependencies:
+    "@edge-runtime/vm": "*"
+    "@vitest/ui": "*"
+    c8: "*"
+    happy-dom: "*"
+    jsdom: "*"
+  peerDependenciesMeta:
+    "@edge-runtime/vm":
+      optional: true
+    "@vitest/ui":
+      optional: true
+    c8:
+      optional: true
+    happy-dom:
+      optional: true
+    jsdom:
+      optional: true
+  bin:
+    vitest: vitest.mjs
+  checksum: 20e76b0de9f02dd09a412b11e5898d1ec7c5c9f9287da40a79fde98f6bd100db6f777fb5f1370496a2c153277cc5eb6738e176435101332fce1c87a565e62d5f
   languageName: node
   linkType: hard
 

From 45700fa0cf4c616f67b1a6d006b13bb40d734136 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 10 Jun 2022 12:07:32 +0100
Subject: [PATCH 02/51] test: update vitest config

---
 vitest.config.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/vitest.config.ts b/vitest.config.ts
index 77c147dbb35..88f9411f64f 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -3,9 +3,11 @@ import { defineConfig } from 'vite'
 import { isWindows } from 'std-env'
 
 export default defineConfig({
-  alias: {
-    '#app': resolve('./packages/nuxt/src/app/index.ts'),
-    '@nuxt/test-utils': resolve('./packages/test-utils/src/index.ts')
+  resolve: {
+    alias: {
+      '#app': resolve('./packages/nuxt/src/app/index.ts'),
+      '@nuxt/test-utils': resolve('./packages/test-utils/src/index.ts')
+    }
   },
   esbuild: {
     tsconfigRaw: '{}'

From e63cd9366186a96375be0568888e2af6d80cf5cf Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 10 Jun 2022 15:52:58 +0100
Subject: [PATCH 03/51] fix(vite): use replace for `typeof` replacements

---
 packages/vite/src/server.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index b995fe7dff4..89600b707c1 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -6,6 +6,7 @@ import { logger, resolveModule, isIgnored } from '@nuxt/kit'
 import fse from 'fs-extra'
 import { debounce } from 'perfect-debounce'
 import { withoutTrailingSlash } from 'ufo'
+import replace from '@rollup/plugin-replace'
 import { ViteBuildContext, ViteOptions } from './vite'
 import { wpfs } from './utils/wpfs'
 import { cacheDirPlugin } from './plugins/cache-dir'
@@ -20,12 +21,7 @@ export async function buildServer (ctx: ViteBuildContext) {
   const serverConfig: vite.InlineConfig = vite.mergeConfig(ctx.config, {
     define: {
       'process.server': true,
-      'process.client': false,
-      'typeof window': '"undefined"',
-      'typeof document': '"undefined"',
-      'typeof navigator': '"undefined"',
-      'typeof location': '"undefined"',
-      'typeof XMLHttpRequest': '"undefined"'
+      'process.client': false
     },
     resolve: {
       alias: {
@@ -86,6 +82,14 @@ export async function buildServer (ctx: ViteBuildContext) {
       cacheDirPlugin(ctx.nuxt.options.rootDir, 'server'),
       RelativeAssetPlugin(),
       vuePlugin(ctx.config.vue),
+      replace({
+        'typeof window': '"undefined"',
+        'typeof document': '"undefined"',
+        'typeof navigator': '"undefined"',
+        'typeof location': '"undefined"',
+        'typeof XMLHttpRequest': '"undefined"',
+        preventAssignment: true
+      }),
       viteJsxPlugin()
     ]
   } as ViteOptions)

From d24879b29afa3186f3d8a9d0a7b5d1abcf4e3892 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 13 Jun 2022 10:41:21 +0100
Subject: [PATCH 04/51] fix: use `externalVue` for now

---
 test/fixtures/basic/nuxt.config.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
index 93c21696cd7..f92b66c4c7b 100644
--- a/test/fixtures/basic/nuxt.config.ts
+++ b/test/fixtures/basic/nuxt.config.ts
@@ -28,6 +28,8 @@ export default defineNuxtConfig({
     }
   },
   experimental: {
+    // TODO: enable by default or work around the need for this
+    externalVue: true,
     reactivityTransform: true
   }
 })

From d2d8175c057d39ac456b3328cf0c65376b3b5cd6 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 13 Jun 2022 10:41:56 +0100
Subject: [PATCH 05/51] fix: add `#internal/nitro/utils` explicitly to
 externals

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

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 89600b707c1..90c2e55b6a9 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -40,7 +40,7 @@ export async function buildServer (ctx: ViteBuildContext) {
       }
     },
     ssr: {
-      external: ctx.nuxt.options.experimental.externalVue ? ['#internal/nitro', 'vue', 'vue-router'] : ['#internal/nitro'],
+      external: ctx.nuxt.options.experimental.externalVue ? ['#internal/nitro', '#internal/nitro/utils', 'vue', 'vue-router'] : ['#internal/nitro', '#internal/nitro/utils'],
       noExternal: [
         ...ctx.nuxt.options.build.transpile,
         // TODO: Use externality for production (rollup) build

From f885c2a9deebadbf17235698064615605fd03d16 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 20 Jun 2022 14:00:42 +0100
Subject: [PATCH 06/51] chore: alpha 13 and new jiti

---
 package.json               |    3 +-
 packages/vite/package.json |    6 +-
 yarn.lock                  | 1074 ++++++++++++++++++++++++++++++++----
 3 files changed, 983 insertions(+), 100 deletions(-)

diff --git a/package.json b/package.json
index 1b51207113a..a4370e4769a 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,8 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "3.0.0-alpha.10",
+    "vite": "^3.0.0-alpha.13",
+    "@vitejs/plugin-vue": "^3.0.0-alpha.2",
     "unbuild": "^0.7.4"
   },
   "devDependencies": {
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 51ddf35e5e3..a1ba4545083 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@nuxt/kit": "^3.0.0-rc.4",
     "@rollup/plugin-replace": "^4.0.0",
-    "@vitejs/plugin-vue": "3.0.0-alpha.1",
-    "@vitejs/plugin-vue-jsx": "2.0.0-alpha.1",
+    "@vitejs/plugin-vue": "^3.0.0-alpha.2",
+    "@vitejs/plugin-vue-jsx": "^2.0.0-alpha.1",
     "autoprefixer": "^10.4.7",
     "chokidar": "^3.5.3",
     "cssnano": "^5.1.12",
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "3.0.0-alpha.10",
+    "vite": "^3.0.0-alpha.13",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index ba56d6277ae..10ee584a5bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -45,30 +45,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.17.10, @babel/core@npm:^7.17.7, @babel/core@npm:^7.18.2":
-  version: 7.18.2
-  resolution: "@babel/core@npm:7.18.2"
-  dependencies:
-    "@ampproject/remapping": ^2.1.0
-    "@babel/code-frame": ^7.16.7
-    "@babel/generator": ^7.18.2
-    "@babel/helper-compilation-targets": ^7.18.2
-    "@babel/helper-module-transforms": ^7.18.0
-    "@babel/helpers": ^7.18.2
-    "@babel/parser": ^7.18.5
-    "@babel/template": ^7.16.7
-    "@babel/traverse": ^7.18.5
-    "@babel/types": ^7.18.4
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.2.1
-    semver: ^6.3.0
-  checksum: e20c3d69a07eb564408d611b827c2f5db56f05f1ca7cb3046f3823a1cf6b13c032f02d4b8ffe1e4593699e86e0f25ca1aee6228486c1ebea48d21aaeb28e6718
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.17.7, @babel/core@npm:^7.17.9, @babel/core@npm:^7.18.5":
+"@babel/core@npm:^7.17.10, @babel/core@npm:^7.17.7, @babel/core@npm:^7.18.5":
   version: 7.18.5
   resolution: "@babel/core@npm:7.18.5"
   dependencies:
@@ -1810,8 +1787,8 @@ __metadata:
     "@nuxt/schema": ^3.0.0-rc.4
     "@rollup/plugin-replace": ^4.0.0
     "@types/cssnano": ^5
-    "@vitejs/plugin-vue": 3.0.0-alpha.1
-    "@vitejs/plugin-vue-jsx": 2.0.0-alpha.1
+    "@vitejs/plugin-vue": ^3.0.0-alpha.2
+    "@vitejs/plugin-vue-jsx": ^2.0.0-alpha.1
     autoprefixer: ^10.4.7
     chokidar: ^3.5.3
     cssnano: ^5.1.12
@@ -1837,8 +1814,8 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unplugin: ^0.7.0
-    vite: 3.0.0-alpha.10
-    vite-node: ^0.14.2
+    vite: ^3.0.0-alpha.13
+    vite-node: ^0.15.1
     vite-plugin-checker: ^0.4.6
     vue: 3.2.37
   peerDependencies:
@@ -1989,6 +1966,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@octokit/openapi-types@npm:^12.1.0":
+  version: 12.1.0
+  resolution: "@octokit/openapi-types@npm:12.1.0"
+  checksum: 449f21166d53bb6c88f9b01b45d8ac730aa4ce1aa4d8ca86fc7c06b552c94e7f01281c9a73b2902a4cd2e5ce88d24766e0338109d5aa35a8e0bfc514c6cfd2d7
+  languageName: node
+  linkType: hard
+
+"@octokit/openapi-types@npm:^12.5.0":
+  version: 12.5.0
+  resolution: "@octokit/openapi-types@npm:12.5.0"
+  checksum: 66d950ed3da5f583ab19f5eba74be8f086faa8cf9a2e9dc71bf1be67a40bbc4e47e8215ca5b6c2c56c5cb0e82f10992f6011851dd1dd3c90623106a01b93a672
+  languageName: node
+  linkType: hard
+
 "@octokit/openapi-types@npm:^12.7.0":
   version: 12.8.0
   resolution: "@octokit/openapi-types@npm:12.8.0"
@@ -2004,13 +1995,13 @@ __metadata:
   linkType: hard
 
 "@octokit/plugin-paginate-rest@npm:^2.16.8":
-  version: 2.21.2
-  resolution: "@octokit/plugin-paginate-rest@npm:2.21.2"
+  version: 2.18.0
+  resolution: "@octokit/plugin-paginate-rest@npm:2.18.0"
   dependencies:
-    "@octokit/types": ^6.39.0
+    "@octokit/types": ^6.35.0
   peerDependencies:
-    "@octokit/core": ">=4"
-  checksum: 386727fb2e39be589dc66e2de31da6a4b7f2039ec1829552b64165b435cbb0bddd8431578c8b73ea063209d2f695a5391ad0d3214027349480c39ebdd5fdf09a
+    "@octokit/core": ">=2"
+  checksum: e804e44f92a16a0cf5b32a4a05e1acb908d96c63b0e4340355a7f99876b2aee998f636b5ac11a360a4e33ab05ee1c1a384fa48c7f63a78ea5992bc2d8a55e4ce
   languageName: node
   linkType: hard
 
@@ -2024,14 +2015,14 @@ __metadata:
   linkType: hard
 
 "@octokit/plugin-rest-endpoint-methods@npm:^5.12.0":
-  version: 5.16.2
-  resolution: "@octokit/plugin-rest-endpoint-methods@npm:5.16.2"
+  version: 5.14.0
+  resolution: "@octokit/plugin-rest-endpoint-methods@npm:5.14.0"
   dependencies:
-    "@octokit/types": ^6.39.0
+    "@octokit/types": ^6.35.0
     deprecation: ^2.3.1
   peerDependencies:
     "@octokit/core": ">=3"
-  checksum: 30fcc50c335d1093f03573d9fa3a4b7d027fc98b215c43e07e82ee8dabfa0af0cf1b963feb542312ae32d897a2f68dc671577206f30850215517bebedc5a2c73
+  checksum: 3fbd33aadcd136dbf45175fe24795d2aaab39a3ae6d6832bf49883089f08fb000d1b97ddd293e4a6d694f44c62cc1abaa239551b613b7a226f6f62a074ece6dc
   languageName: node
   linkType: hard
 
@@ -2072,6 +2063,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.35.0":
+  version: 6.35.0
+  resolution: "@octokit/types@npm:6.35.0"
+  dependencies:
+    "@octokit/openapi-types": ^12.1.0
+  checksum: 0f1949aece03733d1a45a9ee1c2162f8f35d58814e66ed2e00929b0fbb7cb315625203bf748ea7cb855b20b1c794c7f1add7203508a186289f489b7fb1143924
+  languageName: node
+  linkType: hard
+
+"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.38.0, @octokit/types@npm:^6.38.1":
+  version: 6.38.1
+  resolution: "@octokit/types@npm:6.38.1"
+  dependencies:
+    "@octokit/openapi-types": ^12.7.0
+  checksum: 0e3d55e4bdef41e652a2e99a304cebada90f23a90619c49ab892a76ae908c4281316738453348c9ba30b32250ef5eda0a939c2af3aec5ca808acdf9922da420c
+  languageName: node
+  linkType: hard
+
 "@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.39.0":
   version: 6.39.0
   resolution: "@octokit/types@npm:6.39.0"
@@ -2581,12 +2590,12 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^5.21.0":
-  version: 5.30.6
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.30.6"
+  version: 5.28.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:5.28.0"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.30.6
-    "@typescript-eslint/type-utils": 5.30.6
-    "@typescript-eslint/utils": 5.30.6
+    "@typescript-eslint/scope-manager": 5.28.0
+    "@typescript-eslint/type-utils": 5.28.0
+    "@typescript-eslint/utils": 5.28.0
     debug: ^4.3.4
     functional-red-black-tree: ^1.0.1
     ignore: ^5.2.0
@@ -2599,24 +2608,34 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: ee020a171c057a99061ca70583473df1beb0df3229b4c9404b85d4a6ce96b03708935e2aa4418d74a877337d407ca30cdf53c9cf2f7b9eec0d79288d245267d1
+  checksum: 49e08865abd35acdc44829b929f2cd01d01a1f91d3c3c357963b6980e938de365f178efcec21e0ed6ec13a2ad9373f52b73001ddd5cdc7b0245fcf02b9564dd3
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^5.21.0":
-  version: 5.30.6
-  resolution: "@typescript-eslint/parser@npm:5.30.6"
+  version: 5.28.0
+  resolution: "@typescript-eslint/parser@npm:5.28.0"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.30.6
-    "@typescript-eslint/types": 5.30.6
-    "@typescript-eslint/typescript-estree": 5.30.6
+    "@typescript-eslint/scope-manager": 5.28.0
+    "@typescript-eslint/types": 5.28.0
+    "@typescript-eslint/typescript-estree": 5.28.0
     debug: ^4.3.4
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 3e02bb447d21af65adefbaddb46380ced3fb88045ef2e122d6522cc354d414898cd2222b4ce05fa0ee1fbc8c01e9a7833fe57e52b844e3fba30c89d20e006b56
+  checksum: cb18ff47b0a10373ba1c05c90901d08f5f99180e624f3f2faa85f13d1048fc59601a3cab6b852f72d13287b314d94c4d4997129ff6c639496a9144c762f6d31e
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/scope-manager@npm:5.28.0":
+  version: 5.28.0
+  resolution: "@typescript-eslint/scope-manager@npm:5.28.0"
+  dependencies:
+    "@typescript-eslint/types": 5.28.0
+    "@typescript-eslint/visitor-keys": 5.28.0
+  checksum: f187fd295d152508aa85233ef3ac89031952300fbbe277e188dfba3fbfd82656b15d3d8daa6d85984970ce00a30fdf75da912c4024df982004b24f3a95420b8f
   languageName: node
   linkType: hard
 
@@ -2630,6 +2649,38 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/type-utils@npm:5.28.0":
+  version: 5.28.0
+  resolution: "@typescript-eslint/type-utils@npm:5.28.0"
+  dependencies:
+    "@typescript-eslint/utils": 5.28.0
+    debug: ^4.3.4
+    tsutils: ^3.21.0
+  peerDependencies:
+    eslint: "*"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 05563dab5414a42b7781f5ce65ee540b10a946c419bde3fbc45593aa3b1225b2a70558581f311720d670dc82ab699a3f9ecb4b1447d6fd557bd330cf8890d8ca
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/type-utils@npm:5.30.0":
+  version: 5.30.0
+  resolution: "@typescript-eslint/type-utils@npm:5.30.0"
+  dependencies:
+    "@typescript-eslint/utils": 5.30.6
+    debug: ^4.3.4
+    tsutils: ^3.21.0
+  peerDependencies:
+    eslint: "*"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 19b9479961c07e66230d73f9a396e5352bcdf6fa3f5fc175fad86ac617783fa61a5db53c872025974c196a44452b3b10afb0dd10b661dce37d04b2b86ee25ba2
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/type-utils@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/type-utils@npm:5.30.6"
@@ -2646,6 +2697,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:5.28.0":
+  version: 5.28.0
+  resolution: "@typescript-eslint/types@npm:5.28.0"
+  checksum: e948915d6f24ece98043763a48e34ced5e16a1aa88cc86ea7d9057010ed92ce39457a753dd7a140be52f9b546b27f8a3b33bdc7d671427a386aa1aa381d908ef
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/types@npm:5.30.0":
+  version: 5.30.0
+  resolution: "@typescript-eslint/types@npm:5.30.0"
+  checksum: f83a506880d78419283a86e8aeb6c744b1d1a7fc3a366625125805daf0f9a7640a778537113b8865a4cdd985dcde53066820ea044a750126bc8b478eb93d4d12
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/types@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/types@npm:5.30.6"
@@ -2653,6 +2718,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/typescript-estree@npm:5.28.0":
+  version: 5.28.0
+  resolution: "@typescript-eslint/typescript-estree@npm:5.28.0"
+  dependencies:
+    "@typescript-eslint/types": 5.28.0
+    "@typescript-eslint/visitor-keys": 5.28.0
+    debug: ^4.3.4
+    globby: ^11.1.0
+    is-glob: ^4.0.3
+    semver: ^7.3.7
+    tsutils: ^3.21.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: e7be6e9ff778ab2728bdc545713f29cd40bbe1282662461453fe46bc18f676f9b33c60e3514347fbc4e5e94d764525c20b8ef3d47baa62fec6bd3ce05fdde6eb
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/typescript-estree@npm:5.30.0":
+  version: 5.30.0
+  resolution: "@typescript-eslint/typescript-estree@npm:5.30.0"
+  dependencies:
+    "@typescript-eslint/types": 5.30.6
+    "@typescript-eslint/visitor-keys": 5.30.6
+    debug: ^4.3.4
+    globby: ^11.1.0
+    is-glob: ^4.0.3
+    semver: ^7.3.7
+    tsutils: ^3.21.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 5621c03f1a6ca8866d91014cd30b53a37f9c4d664eb97bc2740294bcbf7efc0178e8699def752b86c97472e7b1b0cd9b6c0d9aa07a04decfe78bd16c21f93c4b
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/typescript-estree@npm:5.30.6"
@@ -2671,6 +2772,38 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/utils@npm:5.28.0":
+  version: 5.28.0
+  resolution: "@typescript-eslint/utils@npm:5.28.0"
+  dependencies:
+    "@types/json-schema": ^7.0.9
+    "@typescript-eslint/scope-manager": 5.28.0
+    "@typescript-eslint/types": 5.28.0
+    "@typescript-eslint/typescript-estree": 5.28.0
+    eslint-scope: ^5.1.1
+    eslint-utils: ^3.0.0
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: d30958552470c3f46b2183b690fa8c922a375a84ef83ccfda4785148b8dafb7bf428ab01de6608f67cefbcae35c6a2b0c54b5a6a89bba31566ec3b41f098c02e
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/utils@npm:5.30.0":
+  version: 5.30.0
+  resolution: "@typescript-eslint/utils@npm:5.30.0"
+  dependencies:
+    "@types/json-schema": ^7.0.9
+    "@typescript-eslint/scope-manager": 5.30.6
+    "@typescript-eslint/types": 5.30.6
+    "@typescript-eslint/typescript-estree": 5.30.6
+    eslint-scope: ^5.1.1
+    eslint-utils: ^3.0.0
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: fc6f9ccf558d658cbeaa85c63bc1853385630c9522c8ae42524b652a6b3c69689fba67a49d79ce1fae2b4ec9c45e5aa9b791ac027d205edef27984d088ed1c3a
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/utils@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/utils@npm:5.30.6"
@@ -2687,6 +2820,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:5.28.0":
+  version: 5.28.0
+  resolution: "@typescript-eslint/visitor-keys@npm:5.28.0"
+  dependencies:
+    "@typescript-eslint/types": 5.28.0
+    eslint-visitor-keys: ^3.3.0
+  checksum: e97251968ea273ce33fa0de8a9c04426499b797f6f7800379ff880c4be6e6e02fe023038be0092c595be394a8636f73ee8911974214d5232b3d59492a50771bf
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/visitor-keys@npm:5.30.0":
+  version: 5.30.0
+  resolution: "@typescript-eslint/visitor-keys@npm:5.30.0"
+  dependencies:
+    "@typescript-eslint/types": 5.30.6
+    eslint-visitor-keys: ^3.3.0
+  checksum: e4ec0541d685d211274724c9f1887b6cdd03c7fc4fbdd1ea74c18311c3a5a9a2d4c676448ea714687ca13cc881ec5c73605de75fbf38f302ba8ea86d2b77897f
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/visitor-keys@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/visitor-keys@npm:5.30.6"
@@ -2937,7 +3090,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue-jsx@npm:2.0.0-alpha.1":
+"@vitejs/plugin-vue-jsx@npm:^2.0.0-alpha.1":
   version: 2.0.0-alpha.1
   resolution: "@vitejs/plugin-vue-jsx@npm:2.0.0-alpha.1"
   dependencies:
@@ -2953,15 +3106,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue@npm:3.0.0-alpha.1":
-  version: 3.0.0-alpha.1
-  resolution: "@vitejs/plugin-vue@npm:3.0.0-alpha.1"
-  dependencies:
-    "@rollup/pluginutils": ^4.2.1
+"@vitejs/plugin-vue@npm:^3.0.0-alpha.2":
+  version: 3.0.0-alpha.2
+  resolution: "@vitejs/plugin-vue@npm:3.0.0-alpha.2"
   peerDependencies:
     vite: ^3.0.0-alpha
     vue: ^3.2.25
-  checksum: 584dc77a914263bc6801e4da0bbf5c1b97f79f75a8607105aaf8c5bbb8f3ce1b783e981416bcf9082daa0891e3d082c07068510a5620e175c95bfa4342916528
+  checksum: f8f7c6e4ce6016a5b8cc7ab2c499cd1e6872eeebb5da4ab4b99a94e2b78b8f24c244acab7400bf82ea6edcc1c88a9f4eb04a42f0586f4aba92921ab11d560017
   languageName: node
   linkType: hard
 
@@ -3150,6 +3301,45 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vueuse/core@npm:8.7.3, @vueuse/core@npm:^8.2.6":
+  version: 8.7.3
+  resolution: "@vueuse/core@npm:8.7.3"
+  dependencies:
+    "@vueuse/metadata": 8.7.3
+    "@vueuse/shared": 8.7.3
+    vue-demi: "*"
+  peerDependencies:
+    "@vue/composition-api": ^1.1.0
+    vue: ^2.6.0 || ^3.2.0
+  peerDependenciesMeta:
+    "@vue/composition-api":
+      optional: true
+    vue:
+      optional: true
+  checksum: 76057184eeba1404494d0772e2d6c3c8afe9fa5a533bd31a28bcd491e10b5738d2b2990b6c41b497072e57098e319fb2d16a57b320e0a5f6ea333892f5b66b61
+  languageName: node
+  linkType: hard
+
+"@vueuse/core@npm:8.7.5, @vueuse/core@npm:^8.2.6":
+  version: 8.7.5
+  resolution: "@vueuse/core@npm:8.7.5"
+  dependencies:
+    "@types/web-bluetooth": ^0.0.14
+    "@vueuse/metadata": 8.9.2
+    "@vueuse/shared": 8.9.2
+    vue-demi: "*"
+  peerDependencies:
+    "@vue/composition-api": ^1.1.0
+    vue: ^2.6.0 || ^3.2.0
+  peerDependenciesMeta:
+    "@vue/composition-api":
+      optional: true
+    vue:
+      optional: true
+  checksum: 9d9d694c78468fcbecb8485807f673c035c272ad690e266b7b7c2e79023c0a6ee25c0318242737a87f6ca39ed43ea15d683ec66b991ae56b91cf6175e577c726
+  languageName: node
+  linkType: hard
+
 "@vueuse/core@npm:8.9.2, @vueuse/core@npm:^8.9.2":
   version: 8.9.2
   resolution: "@vueuse/core@npm:8.9.2"
@@ -3179,6 +3369,49 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vueuse/integrations@npm:^8.2.6":
+  version: 8.7.3
+  resolution: "@vueuse/integrations@npm:8.7.3"
+  dependencies:
+    "@vueuse/core": 8.7.3
+    "@vueuse/shared": 8.7.3
+    vue-demi: "*"
+  peerDependencies:
+    async-validator: "*"
+    axios: "*"
+    change-case: "*"
+    drauu: "*"
+    focus-trap: "*"
+    fuse.js: "*"
+    jwt-decode: "*"
+    nprogress: "*"
+    qrcode: "*"
+    universal-cookie: "*"
+  peerDependenciesMeta:
+    async-validator:
+      optional: true
+    axios:
+      optional: true
+    change-case:
+      optional: true
+    drauu:
+      optional: true
+    focus-trap:
+      optional: true
+    fuse.js:
+      optional: true
+    jwt-decode:
+      optional: true
+    nprogress:
+      optional: true
+    qrcode:
+      optional: true
+    universal-cookie:
+      optional: true
+  checksum: d446076c7f3c73be85a99c6a773c6216306c2618ccb7c213d7d1d9aa08babc1c993653ad431342a1c2789808350f8c1fcbaf17156b2519b87804cbabd5cd14d4
+  languageName: node
+  linkType: hard
+
 "@vueuse/integrations@npm:^8.9.2":
   version: 8.9.2
   resolution: "@vueuse/integrations@npm:8.9.2"
@@ -3222,6 +3455,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vueuse/metadata@npm:8.7.3":
+  version: 8.7.3
+  resolution: "@vueuse/metadata@npm:8.7.3"
+  checksum: f81c9b855c6dee37da74152cdc283f618cafcb7ae757cf5bde06483138ceb402d139efc8f59f565fec9f87dbaf1f7c61bf7945940936a79bad98fc6a5c50081b
+  languageName: node
+  linkType: hard
+
 "@vueuse/metadata@npm:8.9.2":
   version: 8.9.2
   resolution: "@vueuse/metadata@npm:8.9.2"
@@ -3229,6 +3469,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vueuse/nuxt@npm:^8.2.6":
+  version: 8.7.3
+  resolution: "@vueuse/nuxt@npm:8.7.3"
+  dependencies:
+    "@nuxt/kit": ^3.0.0-rc.4
+    "@vueuse/core": 8.7.3
+    "@vueuse/metadata": 8.7.3
+    local-pkg: ^0.4.1
+    vue-demi: "*"
+  checksum: 41a97f04fd9760e732fdf56078688de8440462ff3dc22b9f979fe945300777f22bbf4aa926172f962b2b632063a39feb65a6fcb69ec22ad2ac5b9721dd44d222
+  languageName: node
+  linkType: hard
+
 "@vueuse/nuxt@npm:^8.9.2":
   version: 8.9.2
   resolution: "@vueuse/nuxt@npm:8.9.2"
@@ -3242,6 +3495,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vueuse/shared@npm:8.7.3":
+  version: 8.7.3
+  resolution: "@vueuse/shared@npm:8.7.3"
+  dependencies:
+    vue-demi: "*"
+  peerDependencies:
+    "@vue/composition-api": ^1.1.0
+    vue: ^2.6.0 || ^3.2.0
+  peerDependenciesMeta:
+    "@vue/composition-api":
+      optional: true
+    vue:
+      optional: true
+  checksum: a5ee09074a77b9fd3189a5897d07eb78e68215f6623014132afc6530f3486ec8e5b8318931049eb01e35aabd1559ad700ad21be188dcc67f9402275433864359
+  languageName: node
+  linkType: hard
+
 "@vueuse/shared@npm:8.9.2":
   version: 8.9.2
   resolution: "@vueuse/shared@npm:8.9.2"
@@ -4128,6 +4398,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001335, caniuse-lite@npm:^1.0.30001349":
+  version: 1.0.30001355
+  resolution: "caniuse-lite@npm:1.0.30001355"
+  checksum: 4154cabab0ae87d804007b1fc9109a532914dcd5dc4beeec8e1d3616f22971a0e96ed7fe0b00996c5104a4fe7ea7935c8e2878e06324c0ccfdcd6c69570e4ae1
+  languageName: node
+  linkType: hard
+
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001335, caniuse-lite@npm:^1.0.30001359":
   version: 1.0.30001365
   resolution: "caniuse-lite@npm:1.0.30001365"
@@ -5279,6 +5556,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"electron-to-chromium@npm:^1.4.147":
+  version: 1.4.160
+  resolution: "electron-to-chromium@npm:1.4.160"
+  checksum: cd1058ddf8c4d1a38d2826938f9e99945bb45f96ea5eca5af96a2df4a40f23eec19e187cda739b4438174352129bcb733950f366a494d0a923385a46868a0d38
+  languageName: node
+  linkType: hard
+
 "electron-to-chromium@npm:^1.4.172":
   version: 1.4.186
   resolution: "electron-to-chromium@npm:1.4.186"
@@ -5479,6 +5763,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-android-64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-android-64@npm:0.14.45"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-android-64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-android-64@npm:0.14.47"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-android-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-android-64@npm:0.14.49"
@@ -5486,6 +5784,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-android-arm64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-android-arm64@npm:0.13.15"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"esbuild-android-arm64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-android-arm64@npm:0.14.45"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"esbuild-android-arm64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-android-arm64@npm:0.14.47"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-android-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-android-arm64@npm:0.14.49"
@@ -5493,6 +5812,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-darwin-64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-darwin-64@npm:0.13.15"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-darwin-64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-darwin-64@npm:0.14.45"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-darwin-64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-darwin-64@npm:0.14.47"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-darwin-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-darwin-64@npm:0.14.49"
@@ -5500,6 +5840,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-darwin-arm64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-darwin-arm64@npm:0.13.15"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"esbuild-darwin-arm64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-darwin-arm64@npm:0.14.45"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"esbuild-darwin-arm64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-darwin-arm64@npm:0.14.47"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-darwin-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-darwin-arm64@npm:0.14.49"
@@ -5507,6 +5868,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-freebsd-64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-freebsd-64@npm:0.13.15"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-freebsd-64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-freebsd-64@npm:0.14.45"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-freebsd-64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-freebsd-64@npm:0.14.47"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-freebsd-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-freebsd-64@npm:0.14.49"
@@ -5514,6 +5896,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-freebsd-arm64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-freebsd-arm64@npm:0.13.15"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"esbuild-freebsd-arm64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-freebsd-arm64@npm:0.14.45"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"esbuild-freebsd-arm64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-freebsd-arm64@npm:0.14.47"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-freebsd-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-freebsd-arm64@npm:0.14.49"
@@ -5521,6 +5924,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-32@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-linux-32@npm:0.13.15"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-32@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-linux-32@npm:0.14.45"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-32@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-linux-32@npm:0.14.47"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-32@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-32@npm:0.14.49"
@@ -5528,6 +5952,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-linux-64@npm:0.13.15"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-linux-64@npm:0.14.45"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-linux-64@npm:0.14.47"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-64@npm:0.14.49"
@@ -5535,6 +5980,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-arm64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-linux-arm64@npm:0.13.15"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-arm64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-linux-arm64@npm:0.14.45"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-arm64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-linux-arm64@npm:0.14.47"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-arm64@npm:0.14.49"
@@ -5542,6 +6008,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-arm@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-linux-arm@npm:0.13.15"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-arm@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-linux-arm@npm:0.14.45"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-arm@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-linux-arm@npm:0.14.47"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-arm@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-arm@npm:0.14.49"
@@ -5549,6 +6036,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-mips64le@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-linux-mips64le@npm:0.13.15"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-mips64le@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-linux-mips64le@npm:0.14.45"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-mips64le@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-linux-mips64le@npm:0.14.47"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-mips64le@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-mips64le@npm:0.14.49"
@@ -5556,6 +6064,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-ppc64le@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-linux-ppc64le@npm:0.13.15"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-ppc64le@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-linux-ppc64le@npm:0.14.45"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-ppc64le@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-linux-ppc64le@npm:0.14.47"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-ppc64le@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-ppc64le@npm:0.14.49"
@@ -5563,10 +6092,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-riscv64@npm:0.14.49":
-  version: 0.14.49
-  resolution: "esbuild-linux-riscv64@npm:0.14.49"
-  conditions: os=linux & cpu=riscv64
+"esbuild-linux-riscv64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-linux-riscv64@npm:0.14.45"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-riscv64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-linux-riscv64@npm:0.14.47"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-riscv64@npm:0.14.49":
+  version: 0.14.49
+  resolution: "esbuild-linux-riscv64@npm:0.14.49"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-s390x@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-linux-s390x@npm:0.14.45"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
+"esbuild-linux-s390x@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-linux-s390x@npm:0.14.47"
+  conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
 
@@ -5593,6 +6150,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-netbsd-64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-netbsd-64@npm:0.13.15"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-netbsd-64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-netbsd-64@npm:0.14.45"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-netbsd-64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-netbsd-64@npm:0.14.47"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-netbsd-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-netbsd-64@npm:0.14.49"
@@ -5600,6 +6178,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-openbsd-64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-openbsd-64@npm:0.13.15"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-openbsd-64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-openbsd-64@npm:0.14.45"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-openbsd-64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-openbsd-64@npm:0.14.47"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-openbsd-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-openbsd-64@npm:0.14.49"
@@ -5607,6 +6206,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-sunos-64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-sunos-64@npm:0.13.15"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-sunos-64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-sunos-64@npm:0.14.45"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-sunos-64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-sunos-64@npm:0.14.47"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-sunos-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-sunos-64@npm:0.14.49"
@@ -5614,6 +6234,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-windows-32@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-windows-32@npm:0.13.15"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"esbuild-windows-32@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-windows-32@npm:0.14.45"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"esbuild-windows-32@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-windows-32@npm:0.14.47"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-32@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-windows-32@npm:0.14.49"
@@ -5621,6 +6262,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-windows-64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-windows-64@npm:0.13.15"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-windows-64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-windows-64@npm:0.14.45"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-windows-64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-windows-64@npm:0.14.47"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-windows-64@npm:0.14.49"
@@ -5628,6 +6290,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-windows-arm64@npm:0.13.15":
+  version: 0.13.15
+  resolution: "esbuild-windows-arm64@npm:0.13.15"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"esbuild-windows-arm64@npm:0.14.45":
+  version: 0.14.45
+  resolution: "esbuild-windows-arm64@npm:0.14.45"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"esbuild-windows-arm64@npm:0.14.47":
+  version: 0.14.47
+  resolution: "esbuild-windows-arm64@npm:0.14.47"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-windows-arm64@npm:0.14.49"
@@ -5781,26 +6464,97 @@ __metadata:
   version: 0.14.43
   resolution: "esbuild@npm:0.14.43"
   dependencies:
-    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
+    esbuild-android-64: 0.14.45
+    esbuild-android-arm64: 0.14.45
+    esbuild-darwin-64: 0.14.45
+    esbuild-darwin-arm64: 0.14.45
+    esbuild-freebsd-64: 0.14.45
+    esbuild-freebsd-arm64: 0.14.45
+    esbuild-linux-32: 0.14.45
+    esbuild-linux-64: 0.14.45
+    esbuild-linux-arm: 0.14.45
+    esbuild-linux-arm64: 0.14.45
+    esbuild-linux-mips64le: 0.14.45
+    esbuild-linux-ppc64le: 0.14.45
+    esbuild-linux-riscv64: 0.14.45
+    esbuild-linux-s390x: 0.14.45
+    esbuild-netbsd-64: 0.14.45
+    esbuild-openbsd-64: 0.14.45
+    esbuild-sunos-64: 0.14.45
+    esbuild-windows-32: 0.14.45
+    esbuild-windows-64: 0.14.45
+    esbuild-windows-arm64: 0.14.45
+  dependenciesMeta:
+    esbuild-android-64:
+      optional: true
+    esbuild-android-arm64:
+      optional: true
+    esbuild-darwin-64:
+      optional: true
+    esbuild-darwin-arm64:
+      optional: true
+    esbuild-freebsd-64:
+      optional: true
+    esbuild-freebsd-arm64:
+      optional: true
+    esbuild-linux-32:
+      optional: true
+    esbuild-linux-64:
+      optional: true
+    esbuild-linux-arm:
+      optional: true
+    esbuild-linux-arm64:
+      optional: true
+    esbuild-linux-mips64le:
+      optional: true
+    esbuild-linux-ppc64le:
+      optional: true
+    esbuild-linux-riscv64:
+      optional: true
+    esbuild-linux-s390x:
+      optional: true
+    esbuild-netbsd-64:
+      optional: true
+    esbuild-openbsd-64:
+      optional: true
+    esbuild-sunos-64:
+      optional: true
+    esbuild-windows-32:
+      optional: true
+    esbuild-windows-64:
+      optional: true
+    esbuild-windows-arm64:
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 8b359f73564896aa82fc4b11f596d576becd7de8b408d6dbc8751fe6026dccefe3a920ce1ee7eb6b2c4078f45c42395692bf50a7d498acfc0571148cdb9e5461
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.43":
+  version: 0.14.45
+  resolution: "esbuild@npm:0.14.45"
+  dependencies:
+    esbuild-android-64: 0.14.45
+    esbuild-android-arm64: 0.14.45
+    esbuild-darwin-64: 0.14.45
+    esbuild-darwin-arm64: 0.14.45
+    esbuild-freebsd-64: 0.14.45
+    esbuild-freebsd-arm64: 0.14.45
+    esbuild-linux-32: 0.14.45
+    esbuild-linux-64: 0.14.45
+    esbuild-linux-arm: 0.14.45
+    esbuild-linux-arm64: 0.14.45
+    esbuild-linux-mips64le: 0.14.45
+    esbuild-linux-ppc64le: 0.14.45
+    esbuild-linux-riscv64: 0.14.45
+    esbuild-linux-s390x: 0.14.45
+    esbuild-netbsd-64: 0.14.45
+    esbuild-openbsd-64: 0.14.45
+    esbuild-sunos-64: 0.14.45
+    esbuild-windows-32: 0.14.45
+    esbuild-windows-64: 0.14.45
+    esbuild-windows-arm64: 0.14.45
   dependenciesMeta:
     esbuild-android-64:
       optional: true
@@ -5844,7 +6598,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: c5988ba9d3b62c794aaf6752ca4cf0f009d0dc127a19d21c1bbeb2fe6d983c7fe39f3d330e2c00d5a9b6de4a71bfb0f5f347e69c37eb545ab61dc4824b5b2bb3
+  checksum: 8b359f73564896aa82fc4b11f596d576becd7de8b408d6dbc8751fe6026dccefe3a920ce1ee7eb6b2c4078f45c42395692bf50a7d498acfc0571148cdb9e5461
   languageName: node
   linkType: hard
 
@@ -7491,7 +8245,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"h3@npm:^0.7.10":
+"h3@npm:^0.7.10, h3@npm:^0.7.9":
   version: 0.7.10
   resolution: "h3@npm:0.7.10"
   dependencies:
@@ -8639,6 +9393,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"listhen@npm:^0.2.11, listhen@npm:^0.2.12, listhen@npm:^0.2.13":
+  version: 0.2.13
+  resolution: "listhen@npm:0.2.13"
+  dependencies:
+    clipboardy: ^3.0.0
+    colorette: ^2.0.16
+    defu: ^6.0.0
+    get-port-please: ^2.5.0
+    http-shutdown: ^1.2.2
+    selfsigned: ^2.0.1
+    ufo: ^0.8.4
+  checksum: a6399861a9ee81e0505e94aa5d723e26989e10c939266edeff28a4789e753449b1833bfe01490fa43390aa286785ada36cbfee668b00b44097c73f53483c30c4
+  languageName: node
+  linkType: hard
+
 "listhen@npm:^0.2.13":
   version: 0.2.13
   resolution: "listhen@npm:0.2.13"
@@ -9440,6 +10209,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mlly@npm:^0.3.6":
+  version: 0.3.19
+  resolution: "mlly@npm:0.3.19"
+  checksum: 85d646936d5d94b6783e12257adb64ceac9ece32ccaa33d911d44f0c265a91d4f34092beb39641cd108c14a4228f56fc591af60412f65964c72561fbd244ad36
+  languageName: node
+  linkType: hard
+
+"mlly@npm:^0.5.1, mlly@npm:^0.5.2, mlly@npm:^0.5.3":
+  version: 0.5.3
+  resolution: "mlly@npm:0.5.3"
+  dependencies:
+    pathe: ^0.2.0
+    pkg-types: ^0.3.2
+  checksum: 05b76d2167c9e195ae3952ef116b9a00f81af06772e0f27080b95bf57693916447af7b8313d48911fdeb7185bed6c8e8fc45b311c55599a29a1a451a8f8c103c
+  languageName: node
+  linkType: hard
+
+"mlly@npm:^0.5.1, mlly@npm:^0.5.2, mlly@npm:^0.5.3, mlly@npm:^0.5.4":
+  version: 0.5.4
+  resolution: "mlly@npm:0.5.4"
+  dependencies:
+    pathe: ^0.3.1
+    pkg-types: ^0.3.3
+  checksum: fb756e817aaf5edb94f3cd238bf608c59bb1e0f505fa4b9bd38d13a151e4120c561e8689bff4265602b0fea37cc43902b0d8e6754301b36c4ca5167926e75709
+  languageName: node
+  linkType: hard
+
 "mlly@npm:^0.5.2, mlly@npm:^0.5.3, mlly@npm:^0.5.4":
   version: 0.5.4
   resolution: "mlly@npm:0.5.4"
@@ -11802,6 +12598,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup@npm:^2.70.1, rollup@npm:^2.75.6":
+  version: 2.75.6
+  resolution: "rollup@npm:2.75.6"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: df83c6d43a144a296daf82bed7f12f2dfcc6c495a64245e840d15fd21f2ab8b66bb3423e61c974875b33ccf53fb659d2ed099f272937ecf23af48815277c6cd5
+  languageName: node
+  linkType: hard
+
 "rollup@npm:^2.75.7":
   version: 2.75.7
   resolution: "rollup@npm:2.75.7"
@@ -13489,9 +14299,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:3.0.0-alpha.10":
-  version: 3.0.0-alpha.10
-  resolution: "vite@npm:3.0.0-alpha.10"
+"vite@npm:^2.9.13":
+  version: 2.9.13
+  resolution: "vite@npm:2.9.13"
   dependencies:
     esbuild: ^0.14.38
     fsevents: ~2.3.2
@@ -13517,13 +14327,13 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 640fdc5a3e58aee542ab738efc0ffbf0845a271fdaeb9750c42d78ed542db0bf89082de63865ddc831997cae6652cf023da7d4e6ddb8514363eb66604ec4e6c8
+  checksum: f78b54f58482ea97d385e36873ae1aa4744c5e467c1d6d4e0835bd55494d2d8f6ce763f17c241c66104be687d5ee535b8e1e96c14210c9ba0c343fe78c58f694
   languageName: node
   linkType: hard
 
-"vite@npm:^2.9.13":
-  version: 2.9.13
-  resolution: "vite@npm:2.9.13"
+"vite@npm:^2.9.14":
+  version: 2.9.14
+  resolution: "vite@npm:2.9.14"
   dependencies:
     esbuild: ^0.14.38
     fsevents: ~2.3.2
@@ -13549,19 +14359,19 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: f78b54f58482ea97d385e36873ae1aa4744c5e467c1d6d4e0835bd55494d2d8f6ce763f17c241c66104be687d5ee535b8e1e96c14210c9ba0c343fe78c58f694
+  checksum: 640fdc5a3e58aee542ab738efc0ffbf0845a271fdaeb9750c42d78ed542db0bf89082de63865ddc831997cae6652cf023da7d4e6ddb8514363eb66604ec4e6c8
   languageName: node
   linkType: hard
 
-"vite@npm:^2.9.14":
-  version: 2.9.14
-  resolution: "vite@npm:2.9.14"
+"vite@npm:^3.0.0-alpha.13":
+  version: 3.0.0-alpha.13
+  resolution: "vite@npm:3.0.0-alpha.13"
   dependencies:
-    esbuild: ^0.14.38
+    esbuild: ^0.14.43
     fsevents: ~2.3.2
     postcss: ^8.4.14
     resolve: ^1.22.0
-    rollup: ^2.72.1
+    rollup: ^2.75.6
   peerDependencies:
     less: "*"
     sass: "*"
@@ -13581,7 +14391,79 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 640fdc5a3e58aee542ab738efc0ffbf0845a271fdaeb9750c42d78ed542db0bf89082de63865ddc831997cae6652cf023da7d4e6ddb8514363eb66604ec4e6c8
+  checksum: 96c359f2654298c100c5f49494071b2c3bc64f768805c7e128c08d8d7b2a5a5d34d1eac0c81d5086a0bf8be029a7bb5a1d617467dfdcf87f1d8e15011822a428
+  languageName: node
+  linkType: hard
+
+"vitest@npm:^0.16.0":
+  version: 0.16.0
+  resolution: "vitest@npm:0.16.0"
+  dependencies:
+    "@types/chai": ^4.3.1
+    "@types/chai-subset": ^1.3.3
+    "@types/node": "*"
+    chai: ^4.3.6
+    debug: ^4.3.4
+    local-pkg: ^0.4.1
+    tinypool: ^0.2.1
+    tinyspy: ^0.3.3
+    vite: ^2.9.12 || ^3.0.0-0
+  peerDependencies:
+    "@edge-runtime/vm": "*"
+    "@vitest/ui": "*"
+    c8: "*"
+    happy-dom: "*"
+    jsdom: "*"
+  peerDependenciesMeta:
+    "@edge-runtime/vm":
+      optional: true
+    "@vitest/ui":
+      optional: true
+    c8:
+      optional: true
+    happy-dom:
+      optional: true
+    jsdom:
+      optional: true
+  bin:
+    vitest: vitest.mjs
+  checksum: 1f664f82551f876a2b2b30deba0f9d6d8f7e4d70cbe96debca1a810d1c8a5b68b8a446495d37c14e5e9e21d7bde13e96a6eef7c8e7c77c502e0058f59be192b4
+  languageName: node
+  linkType: hard
+
+"vitest@npm:^0.17.0":
+  version: 0.17.0
+  resolution: "vitest@npm:0.17.0"
+  dependencies:
+    "@types/chai": ^4.3.1
+    "@types/chai-subset": ^1.3.3
+    "@types/node": "*"
+    chai: ^4.3.6
+    debug: ^4.3.4
+    local-pkg: ^0.4.1
+    tinypool: ^0.2.1
+    tinyspy: ^0.3.3
+    vite: ^2.9.12 || ^3.0.0-0
+  peerDependencies:
+    "@edge-runtime/vm": "*"
+    "@vitest/ui": "*"
+    c8: "*"
+    happy-dom: "*"
+    jsdom: "*"
+  peerDependenciesMeta:
+    "@edge-runtime/vm":
+      optional: true
+    "@vitest/ui":
+      optional: true
+    c8:
+      optional: true
+    happy-dom:
+      optional: true
+    jsdom:
+      optional: true
+  bin:
+    vitest: vitest.mjs
+  checksum: eae2d024d97a46ba08f3cc7e0703a330c92dc0a6f4c7a9bc20ec8a5129bf787d8ebabd14bf31ae810897c1813e29178af59f63ec8b24b5944cfa62e225cd207c
   languageName: node
   linkType: hard
 

From 596f047546fbd404f529fa84a036782ac6ef4448 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 20 Jun 2022 14:12:46 +0100
Subject: [PATCH 07/51] fix: use custom appType

https://github.com/vitejs/vite/pull/8452
---
 packages/vite/src/client.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/vite/src/client.ts b/packages/vite/src/client.ts
index 2cb3f03ebbf..cd96a17d9a8 100644
--- a/packages/vite/src/client.ts
+++ b/packages/vite/src/client.ts
@@ -48,6 +48,7 @@ export async function buildClient (ctx: ViteBuildContext) {
       }),
       viteNodePlugin(ctx)
     ],
+    appType: 'custom',
     server: {
       middlewareMode: true
     }

From f4d2cb3f111868baf575bd5733679669945381e2 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 20 Jun 2022 14:51:28 +0100
Subject: [PATCH 08/51] fix: do not alias any vue deps - and don't convert to
 file urls

---
 packages/vite/src/dev-bundler.ts |  4 ++--
 packages/vite/src/server.ts      | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/vite/src/dev-bundler.ts b/packages/vite/src/dev-bundler.ts
index 3ff06b9bd33..fb52850d1cd 100644
--- a/packages/vite/src/dev-bundler.ts
+++ b/packages/vite/src/dev-bundler.ts
@@ -1,7 +1,7 @@
 import { pathToFileURL } from 'node:url'
 import { existsSync } from 'node:fs'
 import { builtinModules } from 'node:module'
-import { resolve } from 'pathe'
+import { isAbsolute, resolve } from 'pathe'
 import * as vite from 'vite'
 import { ExternalsOptions, isExternal as _isExternal, ExternalsDefaults } from 'externality'
 import { genDynamicImport, genObjectFromRawEntries } from 'knitwork'
@@ -77,7 +77,7 @@ async function transformRequest (opts: TransformOptions, id: string) {
   if (await isExternal(opts, withoutVersionQuery)) {
     const path = builtinModules.includes(withoutVersionQuery.split('node:').pop())
       ? withoutVersionQuery
-      : pathToFileURL(withoutVersionQuery).href
+      : isAbsolute(withoutVersionQuery) ? pathToFileURL(withoutVersionQuery).href : withoutVersionQuery
     return {
       code: `(global, module, _, exports, importMeta, ssrImport, ssrDynamicImport, ssrExportAll) =>
 ${genDynamicImport(path, { wrapper: false })}
diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 90c2e55b6a9..f40370fbb43 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -26,17 +26,16 @@ export async function buildServer (ctx: ViteBuildContext) {
     resolve: {
       alias: {
         '#build/plugins': resolve(ctx.nuxt.options.buildDir, 'plugins/server'),
-        // Alias vue to ensure we're using the same context in development
-        'vue/server-renderer': _resolve('vue/server-renderer'),
-        'vue/compiler-sfc': _resolve('vue/compiler-sfc'),
         ...ctx.nuxt.options.experimental.externalVue
           ? {}
           : {
               '@vue/reactivity': _resolve(`@vue/reactivity/dist/reactivity.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
               '@vue/shared': _resolve(`@vue/shared/dist/shared.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
-              'vue-router': _resolve(`vue-router/dist/vue-router.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`)
-            },
-        vue: _resolve(`vue/dist/vue.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`)
+              'vue-router': _resolve(`vue-router/dist/vue-router.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
+              'vue/server-renderer': _resolve('vue/server-renderer'),
+              'vue/compiler-sfc': _resolve('vue/compiler-sfc'),
+              vue: _resolve(`vue/dist/vue.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`)
+            }
       }
     },
     ssr: {

From 5149f4bebf3ecf9ec83d4e3324cb028d73ec8652 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 20 Jun 2022 15:03:10 +0100
Subject: [PATCH 09/51] fix: only create ws server for client build

---
 packages/vite/src/client.ts | 18 ++++++++++++++++++
 packages/vite/src/vite.ts   | 14 --------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/packages/vite/src/client.ts b/packages/vite/src/client.ts
index cd96a17d9a8..7d0f0af9717 100644
--- a/packages/vite/src/client.ts
+++ b/packages/vite/src/client.ts
@@ -5,6 +5,7 @@ import viteJsxPlugin from '@vitejs/plugin-vue-jsx'
 import type { Connect } from 'vite'
 import { logger } from '@nuxt/kit'
 import { joinURL } from 'ufo'
+import { getPort } from 'get-port-please'
 import { cacheDirPlugin } from './plugins/cache-dir'
 import { analyzePlugin } from './plugins/analyze'
 import { wpfs } from './utils/wpfs'
@@ -15,6 +16,11 @@ import { RelativeAssetPlugin } from './plugins/dynamic-base'
 import { viteNodePlugin } from './vite-node'
 
 export async function buildClient (ctx: ViteBuildContext) {
+  const hmrPortDefault = 5173 // Vite's default HMR port
+  const hmrPort = await getPort({
+    port: hmrPortDefault,
+    ports: Array.from({ length: 20 }, (_, i) => hmrPortDefault + 1 + i)
+  })
   const clientConfig: vite.InlineConfig = vite.mergeConfig(ctx.config, {
     define: {
       'process.server': false,
@@ -50,10 +56,22 @@ export async function buildClient (ctx: ViteBuildContext) {
     ],
     appType: 'custom',
     server: {
+      hmr: {
+        // https://github.com/nuxt/framework/issues/4191
+        protocol: 'ws',
+        clientPort: hmrPort,
+        port: hmrPort
+      },
       middlewareMode: true
     }
   } as ViteOptions)
 
+  // In build mode we explicitly override any vite options that vite is relying on
+  // to detect whether to inject production or development code (such as HMR code)
+  if (!ctx.nuxt.options.dev) {
+    clientConfig.server.hmr = false
+  }
+
   // Add analyze plugin if needed
   if (ctx.nuxt.options.build.analyze) {
     clientConfig.plugins.push(...analyzePlugin(ctx))
diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts
index 29187cd8579..ab714c0b737 100644
--- a/packages/vite/src/vite.ts
+++ b/packages/vite/src/vite.ts
@@ -6,7 +6,6 @@ import { logger, isIgnored } from '@nuxt/kit'
 import type { Options } from '@vitejs/plugin-vue'
 import replace from '@rollup/plugin-replace'
 import { sanitizeFilePath } from 'mlly'
-import { getPort } from 'get-port-please'
 import { buildClient } from './client'
 import { buildServer } from './server'
 import virtual from './plugins/virtual'
@@ -28,12 +27,6 @@ export interface ViteBuildContext {
 }
 
 export async function bundle (nuxt: Nuxt) {
-  const hmrPortDefault = 24678 // Vite's default HMR port
-  const hmrPort = await getPort({
-    port: hmrPortDefault,
-    ports: Array.from({ length: 20 }, (_, i) => hmrPortDefault + 1 + i)
-  })
-
   const ctx: ViteBuildContext = {
     nuxt,
     config: vite.mergeConfig(
@@ -79,12 +72,6 @@ export async function bundle (nuxt: Nuxt) {
         },
         server: {
           watch: { ignored: isIgnored },
-          hmr: {
-            // https://github.com/nuxt/framework/issues/4191
-            protocol: 'ws',
-            clientPort: hmrPort,
-            port: hmrPort
-          },
           fs: {
             allow: [
               nuxt.options.appDir
@@ -99,7 +86,6 @@ export async function bundle (nuxt: Nuxt) {
   // In build mode we explicitly override any vite options that vite is relying on
   // to detect whether to inject production or development code (such as HMR code)
   if (!nuxt.options.dev) {
-    ctx.config.server.hmr = false
     ctx.config.server.watch = undefined
   }
 

From e15f8ce67cadd3c15424c3a31de8dcd81fc3a439 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 20 Jun 2022 15:07:57 +0100
Subject: [PATCH 10/51] ci: force cache refresh

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e23dc8d9704..ce3da688e7c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn'
+          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn'
+          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -74,7 +74,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn'
+          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -98,7 +98,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn'
+          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -130,7 +130,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn'
+          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -156,7 +156,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn'
+          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -194,7 +194,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn'
+          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable

From aaf3c8d08dc23f6f3d6becc758f15a686d02813b Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 20 Jun 2022 15:09:44 +0100
Subject: [PATCH 11/51] ci: remove cache

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce3da688e7c..a98b45b444c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,6 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -53,7 +52,6 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -74,7 +72,6 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -98,7 +95,6 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -130,7 +126,6 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -156,7 +151,6 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -194,7 +188,6 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-          cache: 'yarn-bump'
 
       - name: Install dependencies
         run: yarn --immutable

From 5bc276876f0b6a921f8089a8116329697a527532 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 20 Jun 2022 15:17:16 +0100
Subject: [PATCH 12/51] chore: force jiti 1.14.0

---
 .github/workflows/ci.yml | 7 +++++++
 package.json             | 1 +
 yarn.lock                | 9 +++++++++
 3 files changed, 17 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a98b45b444c..e23dc8d9704 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,6 +26,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
+          cache: 'yarn'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -52,6 +53,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
+          cache: 'yarn'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -72,6 +74,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
+          cache: 'yarn'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -95,6 +98,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
+          cache: 'yarn'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -126,6 +130,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
+          cache: 'yarn'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -151,6 +156,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
+          cache: 'yarn'
 
       - name: Install dependencies
         run: yarn --immutable
@@ -188,6 +194,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
+          cache: 'yarn'
 
       - name: Install dependencies
         run: yarn --immutable
diff --git a/package.json b/package.json
index a4370e4769a..698b91b296e 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "@nuxt/test-utils": "link:./packages/test-utils",
     "@nuxt/vite": "link:./packages/vite",
     "@nuxt/webpack": "link:./packages/webpack",
+    "jiti": "^1.14.0",
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
diff --git a/yarn.lock b/yarn.lock
index 10ee584a5bc..c1e0f950c5e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9112,6 +9112,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jiti@npm:^1.14.0":
+  version: 1.14.0
+  resolution: "jiti@npm:1.14.0"
+  bin:
+    jiti: bin/jiti.js
+  checksum: 61e7123caa397b8a53068120b7496b95048b96feba3cc1a263265e9b0bcfb375e90a182e07643a29e5380d92c485918d5e7db3805cc9511404e7e9c93234725b
+  languageName: node
+  linkType: hard
+
 "joycon@npm:^3.0.1":
   version: 3.1.1
   resolution: "joycon@npm:3.1.1"

From d923b26205b2c336e60f0b49ad2a67c626185485 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 20 Jun 2022 15:20:23 +0100
Subject: [PATCH 13/51] chore: revert port change

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

diff --git a/packages/vite/src/client.ts b/packages/vite/src/client.ts
index 7d0f0af9717..8e9cb536ac5 100644
--- a/packages/vite/src/client.ts
+++ b/packages/vite/src/client.ts
@@ -16,7 +16,7 @@ import { RelativeAssetPlugin } from './plugins/dynamic-base'
 import { viteNodePlugin } from './vite-node'
 
 export async function buildClient (ctx: ViteBuildContext) {
-  const hmrPortDefault = 5173 // Vite's default HMR port
+  const hmrPortDefault = 24678 // Vite's default HMR port
   const hmrPort = await getPort({
     port: hmrPortDefault,
     ports: Array.from({ length: 20 }, (_, i) => hmrPortDefault + 1 + i)

From ce0a5d23b606fa59a0add34532666beeeb85a89e Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 20 Jun 2022 15:43:07 +0100
Subject: [PATCH 14/51] fix: use legacy commonjs transform plugin

---
 packages/vite/src/server.ts        | 6 ++++--
 packages/vite/src/vite.ts          | 3 +++
 test/fixtures/basic/nuxt.config.ts | 2 --
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index f40370fbb43..059f64f7f7e 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -26,7 +26,7 @@ export async function buildServer (ctx: ViteBuildContext) {
     resolve: {
       alias: {
         '#build/plugins': resolve(ctx.nuxt.options.buildDir, 'plugins/server'),
-        ...ctx.nuxt.options.experimental.externalVue
+        ...ctx.nuxt.options.experimental.externalVue || ctx.nuxt.options.dev
           ? {}
           : {
               '@vue/reactivity': _resolve(`@vue/reactivity/dist/reactivity.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
@@ -39,7 +39,9 @@ export async function buildServer (ctx: ViteBuildContext) {
       }
     },
     ssr: {
-      external: ctx.nuxt.options.experimental.externalVue ? ['#internal/nitro', '#internal/nitro/utils', 'vue', 'vue-router'] : ['#internal/nitro', '#internal/nitro/utils'],
+      external: ctx.nuxt.options.experimental.externalVue
+        ? ['#internal/nitro', '#internal/nitro/utils', 'vue', 'vue-router']
+        : ['#internal/nitro', '#internal/nitro/utils'],
       noExternal: [
         ...ctx.nuxt.options.build.transpile,
         // TODO: Use externality for production (rollup) build
diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts
index ab714c0b737..ea332234b2e 100644
--- a/packages/vite/src/vite.ts
+++ b/packages/vite/src/vite.ts
@@ -31,6 +31,9 @@ export async function bundle (nuxt: Nuxt) {
     nuxt,
     config: vite.mergeConfig(
       {
+        legacy: {
+          buildRollupPluginCommonjs: !nuxt.options.experimental.externalVue
+        },
         resolve: {
           alias: {
             ...nuxt.options.alias,
diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
index f92b66c4c7b..93c21696cd7 100644
--- a/test/fixtures/basic/nuxt.config.ts
+++ b/test/fixtures/basic/nuxt.config.ts
@@ -28,8 +28,6 @@ export default defineNuxtConfig({
     }
   },
   experimental: {
-    // TODO: enable by default or work around the need for this
-    externalVue: true,
     reactivityTransform: true
   }
 })

From 76c4df123502e87d04e171fe28ade0616de9aa36 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 20 Jun 2022 15:52:30 +0100
Subject: [PATCH 15/51] fix: don't need cjs transform in dev either

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

diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts
index ea332234b2e..800957fc0d9 100644
--- a/packages/vite/src/vite.ts
+++ b/packages/vite/src/vite.ts
@@ -32,7 +32,7 @@ export async function bundle (nuxt: Nuxt) {
     config: vite.mergeConfig(
       {
         legacy: {
-          buildRollupPluginCommonjs: !nuxt.options.experimental.externalVue
+          buildRollupPluginCommonjs: !nuxt.options.experimental.externalVue && !nuxt.options.dev
         },
         resolve: {
           alias: {

From facab42ffbb7b0ced9020f77b0a50720f0d6434b Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 21 Jun 2022 00:20:24 +0100
Subject: [PATCH 16/51] fix: use `buildAssets` dir and relative base for client

---
 packages/nuxt/src/core/nitro.ts           |  5 +--
 packages/vite/src/client.ts               | 12 +++----
 packages/vite/src/manifest.ts             | 15 ++++++++-
 packages/vite/src/plugins/dynamic-base.ts | 19 +++++++----
 packages/vite/src/server.ts               | 41 +++--------------------
 packages/vite/src/vite.ts                 |  4 +--
 packages/webpack/src/presets/base.ts      |  2 +-
 7 files changed, 40 insertions(+), 58 deletions(-)

diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts
index 0d7d8470507..9d10c56de2a 100644
--- a/packages/nuxt/src/core/nitro.ts
+++ b/packages/nuxt/src/core/nitro.ts
@@ -41,10 +41,7 @@ export async function initNitro (nuxt: Nuxt) {
       generateTsConfig: false
     },
     publicAssets: [
-      {
-        baseURL: nuxt.options.app.buildAssetsDir,
-        dir: resolve(nuxt.options.buildDir, 'dist/client')
-      },
+      { dir: resolve(nuxt.options.buildDir, 'dist/client') },
       ...nuxt.options._layers
         .map(layer => join(layer.config.srcDir, layer.config.dir?.public || 'public'))
         .filter(dir => existsSync(dir))
diff --git a/packages/vite/src/client.ts b/packages/vite/src/client.ts
index 8e9cb536ac5..234e4a0d7a1 100644
--- a/packages/vite/src/client.ts
+++ b/packages/vite/src/client.ts
@@ -1,18 +1,17 @@
-import { resolve } from 'pathe'
+import { join, resolve } from 'pathe'
 import * as vite from 'vite'
 import vuePlugin from '@vitejs/plugin-vue'
 import viteJsxPlugin from '@vitejs/plugin-vue-jsx'
 import type { Connect } from 'vite'
 import { logger } from '@nuxt/kit'
-import { joinURL } from 'ufo'
 import { getPort } from 'get-port-please'
+import { joinURL, withoutLeadingSlash } from 'ufo'
 import { cacheDirPlugin } from './plugins/cache-dir'
 import { analyzePlugin } from './plugins/analyze'
 import { wpfs } from './utils/wpfs'
 import type { ViteBuildContext, ViteOptions } from './vite'
 import { writeManifest } from './manifest'
 import { devStyleSSRPlugin } from './plugins/dev-ssr-css'
-import { RelativeAssetPlugin } from './plugins/dynamic-base'
 import { viteNodePlugin } from './vite-node'
 
 export async function buildClient (ctx: ViteBuildContext) {
@@ -22,6 +21,7 @@ export async function buildClient (ctx: ViteBuildContext) {
     ports: Array.from({ length: 20 }, (_, i) => hmrPortDefault + 1 + i)
   })
   const clientConfig: vite.InlineConfig = vite.mergeConfig(ctx.config, {
+    base: ctx.nuxt.options.dev ? undefined : './',
     define: {
       'process.server': false,
       'process.client': true,
@@ -36,8 +36,9 @@ export async function buildClient (ctx: ViteBuildContext) {
     build: {
       rollupOptions: {
         output: {
-          chunkFileNames: ctx.nuxt.options.dev ? undefined : '[name]-[hash].mjs',
-          entryFileNames: ctx.nuxt.options.dev ? 'entry.mjs' : '[name]-[hash].mjs'
+          assetFileNames: ctx.nuxt.options.dev ? undefined : withoutLeadingSlash(join(ctx.nuxt.options.app.buildAssetsDir, '[name].[hash].[ext]')),
+          chunkFileNames: ctx.nuxt.options.dev ? undefined : withoutLeadingSlash(join(ctx.nuxt.options.app.buildAssetsDir, '[name].[hash].mjs')),
+          entryFileNames: ctx.nuxt.options.dev ? 'entry.mjs' : withoutLeadingSlash(join(ctx.nuxt.options.app.buildAssetsDir, '[name].[hash].mjs'))
         }
       },
       manifest: true,
@@ -47,7 +48,6 @@ export async function buildClient (ctx: ViteBuildContext) {
       cacheDirPlugin(ctx.nuxt.options.rootDir, 'client'),
       vuePlugin(ctx.config.vue),
       viteJsxPlugin(),
-      RelativeAssetPlugin(),
       devStyleSSRPlugin({
         rootDir: ctx.nuxt.options.rootDir,
         buildAssetsURL: joinURL(ctx.nuxt.options.app.baseURL, ctx.nuxt.options.app.buildAssetsDir)
diff --git a/packages/vite/src/manifest.ts b/packages/vite/src/manifest.ts
index 123922032cb..fdd705e410f 100644
--- a/packages/vite/src/manifest.ts
+++ b/packages/vite/src/manifest.ts
@@ -1,6 +1,7 @@
 import fse from 'fs-extra'
 import { resolve } from 'pathe'
-import { joinURL } from 'ufo'
+import { joinURL, withoutLeadingSlash, withTrailingSlash } from 'ufo'
+import escapeRE from 'escape-string-regexp'
 import type { ViteBuildContext } from './vite'
 
 export async function writeManifest (ctx: ViteBuildContext, extraEntries: string[] = []) {
@@ -27,6 +28,18 @@ export async function writeManifest (ctx: ViteBuildContext, extraEntries: string
     ? devClientManifest
     : await fse.readJSON(resolve(clientDist, 'manifest.json'))
 
+  const BASE_RE = new RegExp(`^${escapeRE(withTrailingSlash(withoutLeadingSlash(joinURL(ctx.nuxt.options.app.baseURL, ctx.nuxt.options.app.buildAssetsDir))))}`)
+  for (const key in clientManifest) {
+    if (clientManifest[key].file) {
+      clientManifest[key].file = clientManifest[key].file.replace(BASE_RE, '')
+    }
+    for (const item of ['css', 'assets']) {
+      if (clientManifest[key][item]) {
+        clientManifest[key][item] = clientManifest[key][item].map(i => i.replace(BASE_RE, ''))
+      }
+    }
+  }
+
   await fse.mkdirp(serverDist)
   await fse.writeFile(resolve(serverDist, 'client.manifest.json'), JSON.stringify(clientManifest, null, 2), 'utf8')
   await fse.writeFile(resolve(serverDist, 'client.manifest.mjs'), 'export default ' + JSON.stringify(clientManifest, null, 2), 'utf8')
diff --git a/packages/vite/src/plugins/dynamic-base.ts b/packages/vite/src/plugins/dynamic-base.ts
index 9a55d694589..b955fef6e53 100644
--- a/packages/vite/src/plugins/dynamic-base.ts
+++ b/packages/vite/src/plugins/dynamic-base.ts
@@ -2,18 +2,23 @@ import { createUnplugin } from 'unplugin'
 import escapeRE from 'escape-string-regexp'
 import type { Plugin } from 'vite'
 import MagicString from 'magic-string'
+import { joinURL, withoutTrailingSlash } from 'ufo'
 
 interface DynamicBasePluginOptions {
   globalPublicPath?: string
   sourcemap?: boolean
 }
 
-export const RelativeAssetPlugin = function (): Plugin {
+interface RelativeAssetPluginOptions {
+  buildAssetsDir: string
+}
+
+export const RelativeAssetPlugin = function (options: RelativeAssetPluginOptions): Plugin {
   return {
     name: 'nuxt:vite-relative-asset',
     generateBundle (_, bundle) {
-      const generatedAssets = Object.entries(bundle).filter(([_, asset]) => asset.type === 'asset').map(([key]) => escapeRE(key))
-      const assetRE = new RegExp(`\\/__NUXT_BASE__\\/(${generatedAssets.join('|')})`, 'g')
+      const assetBaseRE = new RegExp(`${escapeRE(withoutTrailingSlash(joinURL('/__NUXT_BASE__', options.buildAssetsDir)))}`, 'g')
+      const publicBaseRE = /\/__NUXT_BASE__/g
 
       for (const file in bundle) {
         const asset = bundle[file]
@@ -28,11 +33,11 @@ export const RelativeAssetPlugin = function (): Plugin {
         }
         if (asset.type === 'asset' && typeof asset.source === 'string' && asset.fileName.endsWith('.css')) {
           const depth = file.split('/').length - 1
-          const assetBase = depth === 0 ? '.' : Array.from({ length: depth }).map(() => '..').join('/')
-          const publicBase = Array.from({ length: depth + 1 }).map(() => '..').join('/')
+          const assetBase = depth === 1 ? '.' : Array.from({ length: depth - 1 }).map(() => '..').join('/')
+          const publicBase = Array.from({ length: depth }).map(() => '..').join('/')
           asset.source = asset.source
-            .replace(assetRE, r => r.replace(/\/__NUXT_BASE__/g, assetBase))
-            .replace(/\/__NUXT_BASE__/g, publicBase)
+            .replace(assetBaseRE, assetBase)
+            .replace(publicBaseRE, publicBase)
         }
         if (asset.type === 'chunk' && typeof asset.code === 'string') {
           asset.code = asset.code
diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 059f64f7f7e..342420b229b 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -1,20 +1,19 @@
-import { resolve, join, normalize } from 'pathe'
+import { resolve, normalize } from 'pathe'
 import * as vite from 'vite'
 import vuePlugin from '@vitejs/plugin-vue'
 import viteJsxPlugin from '@vitejs/plugin-vue-jsx'
 import { logger, resolveModule, isIgnored } from '@nuxt/kit'
 import fse from 'fs-extra'
 import { debounce } from 'perfect-debounce'
-import { withoutTrailingSlash } from 'ufo'
 import replace from '@rollup/plugin-replace'
 import { ViteBuildContext, ViteOptions } from './vite'
 import { wpfs } from './utils/wpfs'
 import { cacheDirPlugin } from './plugins/cache-dir'
 import { prepareDevServerEntry } from './vite-node'
-import { isCSS, isDirectory, readDirRecursively } from './utils'
+import { isCSS } from './utils'
 import { bundleRequest } from './dev-bundler'
 import { writeManifest } from './manifest'
-import { RelativeAssetPlugin } from './plugins/dynamic-base'
+import { DynamicBasePlugin, RelativeAssetPlugin } from './plugins/dynamic-base'
 
 export async function buildServer (ctx: ViteBuildContext) {
   const _resolve = id => resolveModule(id, { paths: ctx.nuxt.options.modulesDir })
@@ -81,7 +80,8 @@ export async function buildServer (ctx: ViteBuildContext) {
     },
     plugins: [
       cacheDirPlugin(ctx.nuxt.options.rootDir, 'server'),
-      RelativeAssetPlugin(),
+      RelativeAssetPlugin({ buildAssetsDir: ctx.nuxt.options.app.buildAssetsDir }),
+      DynamicBasePlugin.vite({ sourcemap: ctx.nuxt.options.sourcemap }),
       vuePlugin(ctx.config.vue),
       replace({
         'typeof window': '"undefined"',
@@ -103,37 +103,6 @@ export async function buildServer (ctx: ViteBuildContext) {
 
   await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true })
 
-  ctx.nuxt.hook('nitro:build:before', async () => {
-    if (ctx.nuxt.options.dev) {
-      return
-    }
-    const clientDist = resolve(ctx.nuxt.options.buildDir, 'dist/client')
-
-    // Remove public files that have been duplicated into buildAssetsDir
-    // TODO: Add option to configure this behavior in vite
-    const publicDir = join(ctx.nuxt.options.srcDir, ctx.nuxt.options.dir.public)
-    let publicFiles: string[] = []
-    if (await isDirectory(publicDir)) {
-      publicFiles = readDirRecursively(publicDir).map(r => r.replace(publicDir, ''))
-      for (const file of publicFiles) {
-        try {
-          fse.rmSync(join(clientDist, file))
-        } catch {}
-      }
-    }
-
-    // Copy doubly-nested /_nuxt/_nuxt files into buildAssetsDir
-    // TODO: Workaround vite issue
-    if (await isDirectory(clientDist)) {
-      const nestedAssetsPath = withoutTrailingSlash(join(clientDist, ctx.nuxt.options.app.buildAssetsDir))
-
-      if (await isDirectory(nestedAssetsPath)) {
-        await fse.copy(nestedAssetsPath, clientDist, { recursive: true })
-        await fse.remove(nestedAssetsPath)
-      }
-    }
-  })
-
   const onBuild = () => ctx.nuxt.callHook('build:resources', wpfs)
 
   // Production build
diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts
index 800957fc0d9..952b0c65cba 100644
--- a/packages/vite/src/vite.ts
+++ b/packages/vite/src/vite.ts
@@ -9,7 +9,6 @@ import { sanitizeFilePath } from 'mlly'
 import { buildClient } from './client'
 import { buildServer } from './server'
 import virtual from './plugins/virtual'
-import { DynamicBasePlugin } from './plugins/dynamic-base'
 import { warmupViteServer } from './utils/warmup'
 import { resolveCSSOptions } from './css'
 import { composableKeysPlugin } from './plugins/composable-keys'
@@ -67,8 +66,7 @@ export async function bundle (nuxt: Nuxt) {
             ...Object.fromEntries([';', '(', '{', '}', ' ', '\t', '\n'].map(d => [`${d}global.`, `${d}globalThis.`])),
             preventAssignment: true
           }),
-          virtual(nuxt.vfs),
-          DynamicBasePlugin.vite({ sourcemap: nuxt.options.sourcemap })
+          virtual(nuxt.vfs)
         ],
         vue: {
           reactivityTransform: nuxt.options.experimental.reactivityTransform
diff --git a/packages/webpack/src/presets/base.ts b/packages/webpack/src/presets/base.ts
index 05396551402..171eeeb3bcf 100644
--- a/packages/webpack/src/presets/base.ts
+++ b/packages/webpack/src/presets/base.ts
@@ -196,7 +196,7 @@ function getOutput (ctx: WebpackConfigContext): webpack.Configuration['output']
   const { options } = ctx
 
   return {
-    path: resolve(options.buildDir, 'dist', ctx.isServer ? 'server' : 'client'),
+    path: resolve(options.buildDir, 'dist', ctx.isServer ? 'server' : joinURL('client', options.app.buildAssetsDir)),
     filename: fileName(ctx, 'app'),
     chunkFilename: fileName(ctx, 'chunk'),
     publicPath: joinURL(options.app.baseURL, options.app.buildAssetsDir)

From 8d690e11ffea62d56350ccbad62960674cb4ebf9 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 21 Jun 2022 00:20:49 +0100
Subject: [PATCH 17/51] feat: use new advanced build urls to replace custom
 plugin

---
 packages/nuxt/src/core/templates.ts          |   5 +-
 packages/schema/src/config/vite.ts           |   7 +-
 packages/vite/src/client.ts                  |   6 +-
 packages/vite/src/plugins/dynamic-base.ts    | 109 -------------------
 packages/vite/src/server.ts                  |  13 ++-
 packages/webpack/src/plugins/dynamic-base.ts |  28 +++++
 packages/webpack/src/webpack.ts              |   2 +-
 7 files changed, 48 insertions(+), 122 deletions(-)
 delete mode 100644 packages/vite/src/plugins/dynamic-base.ts
 create mode 100644 packages/webpack/src/plugins/dynamic-base.ts

diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
index 81a5e95b4e7..7cee01a840e 100644
--- a/packages/nuxt/src/core/templates.ts
+++ b/packages/nuxt/src/core/templates.ts
@@ -211,7 +211,10 @@ export const publicPathTemplate: NuxtTemplate = {
       'export const publicAssetsURL = (...path) => {',
       '  const publicBase = appConfig.cdnURL || appConfig.baseURL',
       '  return path.length ? joinURL(publicBase, ...path) : publicBase',
-      '}'
+      '}',
+
+      'globalThis.buildAssetsURL = buildAssetsURL',
+      'globalThis.publicAssetsURL = publicAssetsURL'
     ].filter(Boolean).join('\n')
   }
 }
diff --git a/packages/schema/src/config/vite.ts b/packages/schema/src/config/vite.ts
index 9351d79c3ca..12bbcbb5420 100644
--- a/packages/schema/src/config/vite.ts
+++ b/packages/schema/src/config/vite.ts
@@ -28,11 +28,6 @@ export default {
     resolve: {
       extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue'],
     },
-    base: {
-      $resolve: (val, get) => val ?? get('dev')
-      ? joinURL(get('app').baseURL, get('app').buildAssetsDir)
-      : '/__NUXT_BASE__/',
-    },
     publicDir: {
       $resolve: (val, get) => val ?? resolve(get('srcDir'), get('dir').public),
     },
@@ -61,7 +56,7 @@ export default {
     clearScreen: false,
     build: {
       assetsDir: {
-        $resolve: (val, get) => val ?? get('dev') ? withoutLeadingSlash(get('app').buildAssetsDir) : '.',
+        $resolve: (val, get) => val ?? withoutLeadingSlash(get('app').buildAssetsDir),
       },
       emptyOutDir: false,
     },
diff --git a/packages/vite/src/client.ts b/packages/vite/src/client.ts
index 234e4a0d7a1..3b293e48aba 100644
--- a/packages/vite/src/client.ts
+++ b/packages/vite/src/client.ts
@@ -5,7 +5,8 @@ import viteJsxPlugin from '@vitejs/plugin-vue-jsx'
 import type { Connect } from 'vite'
 import { logger } from '@nuxt/kit'
 import { getPort } from 'get-port-please'
-import { joinURL, withoutLeadingSlash } from 'ufo'
+import { joinURL, withLeadingSlash, withoutLeadingSlash, withTrailingSlash } from 'ufo'
+import escapeRE from 'escape-string-regexp'
 import { cacheDirPlugin } from './plugins/cache-dir'
 import { analyzePlugin } from './plugins/analyze'
 import { wpfs } from './utils/wpfs'
@@ -82,10 +83,11 @@ export async function buildClient (ctx: ViteBuildContext) {
   const viteServer = await vite.createServer(clientConfig)
   ctx.clientServer = viteServer
   await ctx.nuxt.callHook('vite:serverCreated', viteServer, { isClient: true, isServer: false })
-
+  const BASE_RE = new RegExp(`^${escapeRE(withTrailingSlash(withLeadingSlash(joinURL(ctx.nuxt.options.app.baseURL, ctx.nuxt.options.app.buildAssetsDir))))}`)
   const viteMiddleware: Connect.NextHandleFunction = (req, res, next) => {
     // Workaround: vite devmiddleware modifies req.url
     const originalURL = req.url
+    req.url = req.url.replace(BASE_RE, '/')
     viteServer.middlewares.handle(req, res, (err) => {
       req.url = originalURL
       next(err)
diff --git a/packages/vite/src/plugins/dynamic-base.ts b/packages/vite/src/plugins/dynamic-base.ts
deleted file mode 100644
index b955fef6e53..00000000000
--- a/packages/vite/src/plugins/dynamic-base.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { createUnplugin } from 'unplugin'
-import escapeRE from 'escape-string-regexp'
-import type { Plugin } from 'vite'
-import MagicString from 'magic-string'
-import { joinURL, withoutTrailingSlash } from 'ufo'
-
-interface DynamicBasePluginOptions {
-  globalPublicPath?: string
-  sourcemap?: boolean
-}
-
-interface RelativeAssetPluginOptions {
-  buildAssetsDir: string
-}
-
-export const RelativeAssetPlugin = function (options: RelativeAssetPluginOptions): Plugin {
-  return {
-    name: 'nuxt:vite-relative-asset',
-    generateBundle (_, bundle) {
-      const assetBaseRE = new RegExp(`${escapeRE(withoutTrailingSlash(joinURL('/__NUXT_BASE__', options.buildAssetsDir)))}`, 'g')
-      const publicBaseRE = /\/__NUXT_BASE__/g
-
-      for (const file in bundle) {
-        const asset = bundle[file]
-        if (asset.fileName.includes('legacy') && asset.type === 'chunk' && asset.code.includes('innerHTML')) {
-          for (const delimiter of ['`', '"', "'"]) {
-            asset.code = asset.code.replace(
-              new RegExp(`(?<=innerHTML=)${delimiter}([^${delimiter}]*)\\/__NUXT_BASE__\\/([^${delimiter}]*)${delimiter}`, 'g'),
-              /* eslint-disable-next-line no-template-curly-in-string */
-              '`$1${(window?.__NUXT__?.config.app.cdnURL || window?.__NUXT__?.config.app.baseURL) + window?.__NUXT__?.config.app.buildAssetsDir.slice(1)}$2`'
-            )
-          }
-        }
-        if (asset.type === 'asset' && typeof asset.source === 'string' && asset.fileName.endsWith('.css')) {
-          const depth = file.split('/').length - 1
-          const assetBase = depth === 1 ? '.' : Array.from({ length: depth - 1 }).map(() => '..').join('/')
-          const publicBase = Array.from({ length: depth }).map(() => '..').join('/')
-          asset.source = asset.source
-            .replace(assetBaseRE, assetBase)
-            .replace(publicBaseRE, publicBase)
-        }
-        if (asset.type === 'chunk' && typeof asset.code === 'string') {
-          asset.code = asset.code
-            .replace(/`\$\{(_?_?publicAssetsURL|buildAssetsURL|)\(\)\}([^`]*)`/g, '$1(`$2`)')
-            .replace(/"\/__NUXT_BASE__\/([^"]*)"\.replace\("\/__NUXT_BASE__", ""\)/g, '"$1"')
-            .replace(/'\/__NUXT_BASE__\/([^']*)'\.replace\("\/__NUXT_BASE__", ""\)/g, '"$1"')
-        }
-      }
-    }
-  }
-}
-
-const VITE_ASSET_RE = /^export default ["'](__VITE_ASSET.*)["']$/
-
-export const DynamicBasePlugin = createUnplugin(function (options: DynamicBasePluginOptions = {}) {
-  return {
-    name: 'nuxt:dynamic-base-path',
-    resolveId (id) {
-      if (id.startsWith('/__NUXT_BASE__')) {
-        return id.replace('/__NUXT_BASE__', '')
-      }
-      if (id === '#internal/nitro') { return '#internal/nitro' }
-      return null
-    },
-    enforce: 'post',
-    transform (code, id) {
-      const s = new MagicString(code)
-
-      if (options.globalPublicPath && id.includes('paths.mjs') && code.includes('const appConfig = ')) {
-        s.append(`${options.globalPublicPath} = buildAssetsURL();\n`)
-      }
-
-      const assetId = code.match(VITE_ASSET_RE)
-      if (assetId) {
-        s.overwrite(0, code.length,
-          [
-            'import { buildAssetsURL } from \'#build/paths.mjs\';',
-            `export default buildAssetsURL("${assetId[1]}".replace("/__NUXT_BASE__", ""));`
-          ].join('\n')
-        )
-      }
-
-      if (!id.includes('paths.mjs') && code.includes('NUXT_BASE') && !code.includes('import { publicAssetsURL as __publicAssetsURL }')) {
-        s.prepend('import { publicAssetsURL as __publicAssetsURL } from \'#build/paths.mjs\';\n')
-      }
-
-      if (id === 'vite/preload-helper') {
-        // Define vite base path as buildAssetsUrl (i.e. including _nuxt/)
-        s.prepend('import { buildAssetsURL } from \'#build/paths.mjs\';\n')
-        s.replace(/const base = ['"]\/__NUXT_BASE__\/['"]/, 'const base = buildAssetsURL()')
-      }
-
-      // Sanitize imports
-      s.replace(/from *['"]\/__NUXT_BASE__(\/[^'"]*)['"]/g, 'from "$1"')
-
-      // Dynamically compute string URLs featuring baseURL
-      const delimiterRE = /(?<!(const base = |from *))((?<!\\)`([^`]*)\/__NUXT_BASE__\/([^`]*)(?<!\\)`|(?<!\\)'([^\n']*)\/__NUXT_BASE__\/([^\n']*)(?<!\\)'|(?<!\\)"([^\n"]*)\/__NUXT_BASE__\/([^\n"]*)(?<!\\)")/g
-      /* eslint-disable-next-line no-template-curly-in-string */
-      s.replace(delimiterRE, r => '`' + r.replace(/\/__NUXT_BASE__\//g, '${__publicAssetsURL()}').slice(1, -1) + '`')
-
-      if (s.hasChanged()) {
-        return {
-          code: s.toString(),
-          map: options.sourcemap && s.generateMap({ source: id, includeContent: true })
-        }
-      }
-    }
-  }
-})
diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 342420b229b..e86fe42ee12 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -6,6 +6,7 @@ import { logger, resolveModule, isIgnored } from '@nuxt/kit'
 import fse from 'fs-extra'
 import { debounce } from 'perfect-debounce'
 import replace from '@rollup/plugin-replace'
+import { joinURL } from 'ufo'
 import { ViteBuildContext, ViteOptions } from './vite'
 import { wpfs } from './utils/wpfs'
 import { cacheDirPlugin } from './plugins/cache-dir'
@@ -13,11 +14,19 @@ import { prepareDevServerEntry } from './vite-node'
 import { isCSS } from './utils'
 import { bundleRequest } from './dev-bundler'
 import { writeManifest } from './manifest'
-import { DynamicBasePlugin, RelativeAssetPlugin } from './plugins/dynamic-base'
 
 export async function buildServer (ctx: ViteBuildContext) {
   const _resolve = id => resolveModule(id, { paths: ctx.nuxt.options.modulesDir })
   const serverConfig: vite.InlineConfig = vite.mergeConfig(ctx.config, {
+    base: ctx.nuxt.options.dev
+      ? joinURL(ctx.nuxt.options.app.baseURL, ctx.nuxt.options.app.buildAssetsDir)
+      : undefined,
+    experimental: {
+      buildAdvancedBaseOptions: {
+        assets: { runtime: (url: string) => `buildAssetsURL(${url})` },
+        public: { runtime: (url: string) => `publicAssetsURL(${url})` }
+      }
+    },
     define: {
       'process.server': true,
       'process.client': false
@@ -80,8 +89,6 @@ export async function buildServer (ctx: ViteBuildContext) {
     },
     plugins: [
       cacheDirPlugin(ctx.nuxt.options.rootDir, 'server'),
-      RelativeAssetPlugin({ buildAssetsDir: ctx.nuxt.options.app.buildAssetsDir }),
-      DynamicBasePlugin.vite({ sourcemap: ctx.nuxt.options.sourcemap }),
       vuePlugin(ctx.config.vue),
       replace({
         'typeof window': '"undefined"',
diff --git a/packages/webpack/src/plugins/dynamic-base.ts b/packages/webpack/src/plugins/dynamic-base.ts
new file mode 100644
index 00000000000..469220c9837
--- /dev/null
+++ b/packages/webpack/src/plugins/dynamic-base.ts
@@ -0,0 +1,28 @@
+import { createUnplugin } from 'unplugin'
+import MagicString from 'magic-string'
+
+interface DynamicBasePluginOptions {
+  globalPublicPath?: string
+  sourcemap?: boolean
+}
+
+export const DynamicBasePlugin = createUnplugin(function (options: DynamicBasePluginOptions = {}) {
+  return {
+    name: 'nuxt:dynamic-base-path',
+    enforce: 'post',
+    transform (code, id) {
+      const s = new MagicString(code)
+
+      if (options.globalPublicPath && id.includes('paths.mjs') && code.includes('const appConfig = ')) {
+        s.append(`${options.globalPublicPath} = buildAssetsURL();\n`)
+      }
+
+      if (s.hasChanged()) {
+        return {
+          code: s.toString(),
+          map: options.sourcemap && s.generateMap({ source: id, includeContent: true })
+        }
+      }
+    }
+  }
+})
diff --git a/packages/webpack/src/webpack.ts b/packages/webpack/src/webpack.ts
index 4696a289012..fb90f2f0c90 100644
--- a/packages/webpack/src/webpack.ts
+++ b/packages/webpack/src/webpack.ts
@@ -8,8 +8,8 @@ import type { Compiler, Watching } from 'webpack'
 import type { Nuxt } from '@nuxt/schema'
 import { joinURL } from 'ufo'
 import { logger, useNuxt } from '@nuxt/kit'
-import { DynamicBasePlugin } from '../../vite/src/plugins/dynamic-base'
 import { composableKeysPlugin } from '../../vite/src/plugins/composable-keys'
+import { DynamicBasePlugin } from './plugins/dynamic-base'
 import { createMFS } from './utils/mfs'
 import { registerVirtualModules } from './virtual-modules'
 import { client, server } from './configs'

From ddf51f60e93ab86a70c27a6108ff4d52a419ac29 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 21 Jun 2022 00:23:25 +0100
Subject: [PATCH 18/51] chore: upgrade vite to latest alpha

---
 package.json               |  2 +-
 packages/vite/package.json |  2 +-
 yarn.lock                  | 38 ++++++++++++++++++++++++++++++++------
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 698b91b296e..0724ec56625 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "^3.0.0-alpha.13",
+    "vite": "^3.0.0-alpha.14",
     "@vitejs/plugin-vue": "^3.0.0-alpha.2",
     "unbuild": "^0.7.4"
   },
diff --git a/packages/vite/package.json b/packages/vite/package.json
index a1ba4545083..690924abbed 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "^3.0.0-alpha.13",
+    "vite": "^3.0.0-alpha.14",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index c1e0f950c5e..1d168fdab09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1814,7 +1814,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unplugin: ^0.7.0
-    vite: ^3.0.0-alpha.13
+    vite: ^3.0.0-alpha.14
     vite-node: ^0.15.1
     vite-plugin-checker: ^0.4.6
     vue: 3.2.37
@@ -12435,6 +12435,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve@npm:^1.22.1":
+  version: 1.22.1
+  resolution: "resolve@npm:1.22.1"
+  dependencies:
+    is-core-module: ^2.9.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: 07af5fc1e81aa1d866cbc9e9460fbb67318a10fa3c4deadc35c3ad8a898ee9a71a86a65e4755ac3195e0ea0cfbe201eb323ebe655ce90526fd61917313a34e4e
+  languageName: node
+  linkType: hard
+
 "resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>":
   version: 1.22.1
   resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
@@ -12448,6 +12461,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>":
+  version: 1.22.1
+  resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
+  dependencies:
+    is-core-module: ^2.9.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: 5656f4d0bedcf8eb52685c1abdf8fbe73a1603bb1160a24d716e27a57f6cecbe2432ff9c89c2bd57542c3a7b9d14b1882b73bfe2e9d7849c9a4c0b8b39f02b8b
+  languageName: node
+  linkType: hard
+
 "restore-cursor@npm:^3.1.0":
   version: 3.1.0
   resolution: "restore-cursor@npm:3.1.0"
@@ -14372,14 +14398,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^3.0.0-alpha.13":
-  version: 3.0.0-alpha.13
-  resolution: "vite@npm:3.0.0-alpha.13"
+"vite@npm:^3.0.0-alpha.14":
+  version: 3.0.0-alpha.14
+  resolution: "vite@npm:3.0.0-alpha.14"
   dependencies:
     esbuild: ^0.14.43
     fsevents: ~2.3.2
     postcss: ^8.4.14
-    resolve: ^1.22.0
+    resolve: ^1.22.1
     rollup: ^2.75.6
   peerDependencies:
     less: "*"
@@ -14400,7 +14426,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 96c359f2654298c100c5f49494071b2c3bc64f768805c7e128c08d8d7b2a5a5d34d1eac0c81d5086a0bf8be029a7bb5a1d617467dfdcf87f1d8e15011822a428
+  checksum: 55f7867d73b31b72522533253e1d77ef1f429bbc257ed9f5d48da89c4c5fd2ee460c27c1276adce7b82e39984984e35a91cb93af870ffdda8caf6c3914be0f31
   languageName: node
   linkType: hard
 

From 7af2fff973a840b3c1c1b7ab1077875818e0c9d0 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 21 Jun 2022 00:31:57 +0100
Subject: [PATCH 19/51] fix: remove unused import

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

diff --git a/packages/schema/src/config/vite.ts b/packages/schema/src/config/vite.ts
index 12bbcbb5420..232197f4ba5 100644
--- a/packages/schema/src/config/vite.ts
+++ b/packages/schema/src/config/vite.ts
@@ -1,5 +1,5 @@
 import { resolve } from 'pathe'
-import { joinURL, withoutLeadingSlash } from 'ufo'
+import { withoutLeadingSlash } from 'ufo'
 
 export default {
   /**

From 19331ea52f9af881fbfd116ae4490fb79e8414f7 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 21 Jun 2022 15:07:24 +0100
Subject: [PATCH 20/51] chore: bump vite to beta

---
 package.json                 |  5 +--
 packages/schema/package.json |  2 +-
 packages/vite/package.json   |  6 ++--
 yarn.lock                    | 66 +++++++++++++++++++++---------------
 4 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 0724ec56625..4d86272994e 100644
--- a/package.json
+++ b/package.json
@@ -43,8 +43,9 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "^3.0.0-alpha.14",
-    "@vitejs/plugin-vue": "^3.0.0-alpha.2",
+    "vite": "^3.0.0-beta.0",
+    "@vitejs/plugin-vue": "^3.0.0-beta.0",
+    "@vitejs/plugin-vue-jsx": "^2.0.0-beta.0",
     "unbuild": "^0.7.4"
   },
   "devDependencies": {
diff --git a/packages/schema/package.json b/packages/schema/package.json
index bf391eb9b4b..cd34d7eca68 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "vite": "^2.9.14"
+    "vite": "^3.0.0-beta.0"
   },
   "dependencies": {
     "c12": "^0.2.8",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 690924abbed..b68b2c84cda 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@nuxt/kit": "^3.0.0-rc.4",
     "@rollup/plugin-replace": "^4.0.0",
-    "@vitejs/plugin-vue": "^3.0.0-alpha.2",
-    "@vitejs/plugin-vue-jsx": "^2.0.0-alpha.1",
+    "@vitejs/plugin-vue": "^3.0.0-beta.0",
+    "@vitejs/plugin-vue-jsx": "^2.0.0-beta.0",
     "autoprefixer": "^10.4.7",
     "chokidar": "^3.5.3",
     "cssnano": "^5.1.12",
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "^3.0.0-alpha.14",
+    "vite": "^3.0.0-beta.0",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index 1d168fdab09..59df924a7d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -45,9 +45,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.17.10, @babel/core@npm:^7.17.7, @babel/core@npm:^7.18.5":
-  version: 7.18.5
-  resolution: "@babel/core@npm:7.18.5"
+"@babel/core@npm:^7.17.7, @babel/core@npm:^7.17.9, @babel/core@npm:^7.18.6":
+  version: 7.18.6
+  resolution: "@babel/core@npm:7.18.6"
   dependencies:
     "@ampproject/remapping": ^2.1.0
     "@babel/code-frame": ^7.18.6
@@ -68,9 +68,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.17.7, @babel/core@npm:^7.17.9, @babel/core@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/core@npm:7.18.6"
+"@babel/core@npm:^7.17.7, @babel/core@npm:^7.18.5":
+  version: 7.18.5
+  resolution: "@babel/core@npm:7.18.5"
   dependencies:
     "@ampproject/remapping": ^2.1.0
     "@babel/code-frame": ^7.18.6
@@ -340,6 +340,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-typescript@npm:^7.18.4":
+  version: 7.18.4
+  resolution: "@babel/plugin-transform-typescript@npm:7.18.4"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/plugin-syntax-typescript": ^7.18.6
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 9dc070304688dd183b2abb6bdac6f4b1939df7cc8caf32c57327bf90de26abce2130c5d807e82e25287d3a3e23f7532c9f7afd44a2e7bb815cae92015d352925
+  languageName: node
+  linkType: hard
+
 "@babel/standalone@npm:^7.17.7":
   version: 7.18.8
   resolution: "@babel/standalone@npm:7.18.8"
@@ -1695,8 +1708,8 @@ __metadata:
     std-env: ^3.1.1
     ufo: ^0.8.5
     unbuild: latest
-    unimport: ^0.4.4
-    vite: ^2.9.14
+    unimport: ^0.3.0
+    vite: ^3.0.0-beta.0
   languageName: unknown
   linkType: soft
 
@@ -1787,8 +1800,8 @@ __metadata:
     "@nuxt/schema": ^3.0.0-rc.4
     "@rollup/plugin-replace": ^4.0.0
     "@types/cssnano": ^5
-    "@vitejs/plugin-vue": ^3.0.0-alpha.2
-    "@vitejs/plugin-vue-jsx": ^2.0.0-alpha.1
+    "@vitejs/plugin-vue": ^3.0.0-beta.0
+    "@vitejs/plugin-vue-jsx": ^2.0.0-beta.0
     autoprefixer: ^10.4.7
     chokidar: ^3.5.3
     cssnano: ^5.1.12
@@ -1814,8 +1827,8 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unplugin: ^0.7.0
-    vite: ^3.0.0-alpha.14
-    vite-node: ^0.15.1
+    vite: ^3.0.0-beta.0
+    vite-node: ^0.15.2
     vite-plugin-checker: ^0.4.6
     vue: 3.2.37
   peerDependencies:
@@ -3090,29 +3103,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue-jsx@npm:^2.0.0-alpha.1":
-  version: 2.0.0-alpha.1
-  resolution: "@vitejs/plugin-vue-jsx@npm:2.0.0-alpha.1"
+"@vitejs/plugin-vue-jsx@npm:^2.0.0-beta.0":
+  version: 2.0.0-beta.0
+  resolution: "@vitejs/plugin-vue-jsx@npm:2.0.0-beta.0"
   dependencies:
-    "@babel/core": ^7.17.10
+    "@babel/core": ^7.18.5
     "@babel/plugin-syntax-import-meta": ^7.10.4
-    "@babel/plugin-transform-typescript": ^7.16.8
-    "@rollup/pluginutils": ^4.2.1
+    "@babel/plugin-transform-typescript": ^7.18.4
     "@vue/babel-plugin-jsx": ^1.1.1
   peerDependencies:
     vite: ^3.0.0-alpha
     vue: ^3.0.0
-  checksum: 8b92f50ba16bbcad88c7a6870f615d2d79523499a5a105733822b2110849f633b512ac25fed0fa0784d8de7daec0621c76bfae13fe2b041ac76c6fde6079aec1
+  checksum: eda947b9447f56779b0835eed3c6d2741d1de6fa9eeb25995c20d28d39885fc7e41761018cff7eb69a641f29e16070111e45d90044114e9287ec61da146c5452
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue@npm:^3.0.0-alpha.2":
-  version: 3.0.0-alpha.2
-  resolution: "@vitejs/plugin-vue@npm:3.0.0-alpha.2"
+"@vitejs/plugin-vue@npm:^3.0.0-beta.0":
+  version: 3.0.0-beta.0
+  resolution: "@vitejs/plugin-vue@npm:3.0.0-beta.0"
   peerDependencies:
     vite: ^3.0.0-alpha
     vue: ^3.2.25
-  checksum: f8f7c6e4ce6016a5b8cc7ab2c499cd1e6872eeebb5da4ab4b99a94e2b78b8f24c244acab7400bf82ea6edcc1c88a9f4eb04a42f0586f4aba92921ab11d560017
+  checksum: bee67c397cd2b618385c59c85ce07557af68200215708b5809e2c4255edeeffd73ca17ebc158eb01adbaa941ab2a6dea3f202b050a713b1e39ff3dd1587e2f97
   languageName: node
   linkType: hard
 
@@ -14398,9 +14410,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^3.0.0-alpha.14":
-  version: 3.0.0-alpha.14
-  resolution: "vite@npm:3.0.0-alpha.14"
+"vite@npm:^3.0.0-beta.0":
+  version: 3.0.0-beta.0
+  resolution: "vite@npm:3.0.0-beta.0"
   dependencies:
     esbuild: ^0.14.43
     fsevents: ~2.3.2
@@ -14426,7 +14438,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 55f7867d73b31b72522533253e1d77ef1f429bbc257ed9f5d48da89c4c5fd2ee460c27c1276adce7b82e39984984e35a91cb93af870ffdda8caf6c3914be0f31
+  checksum: 83fe4d96cbe747e689bcbe8c2d0e6bd72c3598553bff36b7dad12e6a60a22083d37fe8556dc76d6a280c3505f2d31df2d1915948ed72a55bb98b0caeab692715
   languageName: node
   linkType: hard
 

From b90a4263661a35b95eec6feb1a5ba9f9153c21a2 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 22 Jun 2022 11:32:21 +0100
Subject: [PATCH 21/51] chore: revert jiti resolution

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

diff --git a/package.json b/package.json
index 4d86272994e..e4068d16859 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,6 @@
     "@nuxt/test-utils": "link:./packages/test-utils",
     "@nuxt/vite": "link:./packages/vite",
     "@nuxt/webpack": "link:./packages/webpack",
-    "jiti": "^1.14.0",
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",

From 8e8f2c22fb86020afaa890f7e1f4dadc07026ee1 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 22 Jun 2022 11:36:04 +0100
Subject: [PATCH 22/51] chore: use caret version of vite packages

---
 package.json                 | 6 +++---
 packages/schema/package.json | 2 +-
 packages/vite/package.json   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e4068d16859..b77b95c91dd 100644
--- a/package.json
+++ b/package.json
@@ -42,9 +42,9 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "^3.0.0-beta.0",
-    "@vitejs/plugin-vue": "^3.0.0-beta.0",
-    "@vitejs/plugin-vue-jsx": "^2.0.0-beta.0",
+    "vite": "~3.0.0-beta.0",
+    "@vitejs/plugin-vue": "~3.0.0-beta.0",
+    "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
     "unbuild": "^0.7.4"
   },
   "devDependencies": {
diff --git a/packages/schema/package.json b/packages/schema/package.json
index cd34d7eca68..b06686401a3 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "vite": "^3.0.0-beta.0"
+    "vite": "~3.0.0-beta.0"
   },
   "dependencies": {
     "c12": "^0.2.8",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index b68b2c84cda..de3b82db5b5 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@nuxt/kit": "^3.0.0-rc.4",
     "@rollup/plugin-replace": "^4.0.0",
-    "@vitejs/plugin-vue": "^3.0.0-beta.0",
-    "@vitejs/plugin-vue-jsx": "^2.0.0-beta.0",
+    "@vitejs/plugin-vue": "~3.0.0-beta.0",
+    "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
     "autoprefixer": "^10.4.7",
     "chokidar": "^3.5.3",
     "cssnano": "^5.1.12",
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "^3.0.0-beta.0",
+    "vite": "~3.0.0-beta.0",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },

From 41b378eda47075a552a8249b1d0cefb3497c3997 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 22 Jun 2022 18:11:42 +0100
Subject: [PATCH 23/51] chore: bump to beta 1

---
 package.json                 |  2 +-
 packages/schema/package.json |  2 +-
 packages/vite/package.json   |  2 +-
 yarn.lock                    | 20 ++++++++++----------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index b77b95c91dd..7e56504af0a 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "~3.0.0-beta.0",
+    "vite": "~3.0.0-beta.1",
     "@vitejs/plugin-vue": "~3.0.0-beta.0",
     "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
     "unbuild": "^0.7.4"
diff --git a/packages/schema/package.json b/packages/schema/package.json
index b06686401a3..29da07eb57a 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "vite": "~3.0.0-beta.0"
+    "vite": "~3.0.0-beta.1"
   },
   "dependencies": {
     "c12": "^0.2.8",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index de3b82db5b5..feddda55af4 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "~3.0.0-beta.0",
+    "vite": "~3.0.0-beta.1",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index 59df924a7d1..17919545f16 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1709,7 +1709,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unimport: ^0.3.0
-    vite: ^3.0.0-beta.0
+    vite: ~3.0.0-beta.1
   languageName: unknown
   linkType: soft
 
@@ -1800,8 +1800,8 @@ __metadata:
     "@nuxt/schema": ^3.0.0-rc.4
     "@rollup/plugin-replace": ^4.0.0
     "@types/cssnano": ^5
-    "@vitejs/plugin-vue": ^3.0.0-beta.0
-    "@vitejs/plugin-vue-jsx": ^2.0.0-beta.0
+    "@vitejs/plugin-vue": ~3.0.0-beta.0
+    "@vitejs/plugin-vue-jsx": ~2.0.0-beta.0
     autoprefixer: ^10.4.7
     chokidar: ^3.5.3
     cssnano: ^5.1.12
@@ -1827,7 +1827,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unplugin: ^0.7.0
-    vite: ^3.0.0-beta.0
+    vite: ~3.0.0-beta.1
     vite-node: ^0.15.2
     vite-plugin-checker: ^0.4.6
     vue: 3.2.37
@@ -3103,7 +3103,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue-jsx@npm:^2.0.0-beta.0":
+"@vitejs/plugin-vue-jsx@npm:~2.0.0-beta.0":
   version: 2.0.0-beta.0
   resolution: "@vitejs/plugin-vue-jsx@npm:2.0.0-beta.0"
   dependencies:
@@ -3118,7 +3118,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue@npm:^3.0.0-beta.0":
+"@vitejs/plugin-vue@npm:~3.0.0-beta.0":
   version: 3.0.0-beta.0
   resolution: "@vitejs/plugin-vue@npm:3.0.0-beta.0"
   peerDependencies:
@@ -14410,9 +14410,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^3.0.0-beta.0":
-  version: 3.0.0-beta.0
-  resolution: "vite@npm:3.0.0-beta.0"
+"vite@npm:~3.0.0-beta.1":
+  version: 3.0.0-beta.1
+  resolution: "vite@npm:3.0.0-beta.1"
   dependencies:
     esbuild: ^0.14.43
     fsevents: ~2.3.2
@@ -14438,7 +14438,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 83fe4d96cbe747e689bcbe8c2d0e6bd72c3598553bff36b7dad12e6a60a22083d37fe8556dc76d6a280c3505f2d31df2d1915948ed72a55bb98b0caeab692715
+  checksum: 9a2ec7a25d35ef8af2107da010f8994d373726d3a275bdf0378c58e853a7acd1d59ce4c8d073eac609ddee8f66882b1a89b3898c964808827615eaf20c3bdbf6
   languageName: node
   linkType: hard
 

From c29dab6007a43b5921bb9a06a4dc89718a6e440d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 28 Jun 2022 14:11:10 +0100
Subject: [PATCH 24/51] refactor: use new `renderBuiltUrl` API

---
 package.json                        |  2 +-
 packages/nuxt/src/core/templates.ts |  4 ++--
 packages/schema/package.json        |  2 +-
 packages/vite/package.json          |  2 +-
 packages/vite/src/client.ts         | 10 +++++++++-
 packages/vite/src/server.ts         | 18 ++++++++++++++----
 yarn.lock                           | 14 +++++++-------
 7 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 7e56504af0a..46a15f68448 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "~3.0.0-beta.1",
+    "vite": "~3.0.0-beta.5",
     "@vitejs/plugin-vue": "~3.0.0-beta.0",
     "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
     "unbuild": "^0.7.4"
diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
index 7cee01a840e..061e9572a33 100644
--- a/packages/nuxt/src/core/templates.ts
+++ b/packages/nuxt/src/core/templates.ts
@@ -213,8 +213,8 @@ export const publicPathTemplate: NuxtTemplate = {
       '  return path.length ? joinURL(publicBase, ...path) : publicBase',
       '}',
 
-      'globalThis.buildAssetsURL = buildAssetsURL',
-      'globalThis.publicAssetsURL = publicAssetsURL'
+      'globalThis.__buildAssetsURL = buildAssetsURL',
+      'globalThis.__publicAssetsURL = publicAssetsURL'
     ].filter(Boolean).join('\n')
   }
 }
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 29da07eb57a..1743e3aded2 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "vite": "~3.0.0-beta.1"
+    "vite": "~3.0.0-beta.5"
   },
   "dependencies": {
     "c12": "^0.2.8",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index feddda55af4..792e7a01921 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "~3.0.0-beta.1",
+    "vite": "~3.0.0-beta.5",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/packages/vite/src/client.ts b/packages/vite/src/client.ts
index 3b293e48aba..cfd22842066 100644
--- a/packages/vite/src/client.ts
+++ b/packages/vite/src/client.ts
@@ -22,7 +22,15 @@ export async function buildClient (ctx: ViteBuildContext) {
     ports: Array.from({ length: 20 }, (_, i) => hmrPortDefault + 1 + i)
   })
   const clientConfig: vite.InlineConfig = vite.mergeConfig(ctx.config, {
-    base: ctx.nuxt.options.dev ? undefined : './',
+    experimental: {
+      renderBuiltUrl: (filename, { type, hostType }) => {
+        if (hostType !== 'js' || type === 'asset') {
+          // In CSS we only use relative paths until we craft a clever runtime CSS hack
+          return { relative: true }
+        }
+        return { runtime: `__publicAssetsURL(${JSON.stringify(filename)})` }
+      }
+    },
     define: {
       'process.server': false,
       'process.client': true,
diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index e86fe42ee12..12925fb931d 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -6,7 +6,7 @@ import { logger, resolveModule, isIgnored } from '@nuxt/kit'
 import fse from 'fs-extra'
 import { debounce } from 'perfect-debounce'
 import replace from '@rollup/plugin-replace'
-import { joinURL } from 'ufo'
+import { joinURL, withoutLeadingSlash, withTrailingSlash } from 'ufo'
 import { ViteBuildContext, ViteOptions } from './vite'
 import { wpfs } from './utils/wpfs'
 import { cacheDirPlugin } from './plugins/cache-dir'
@@ -22,9 +22,19 @@ export async function buildServer (ctx: ViteBuildContext) {
       ? joinURL(ctx.nuxt.options.app.baseURL, ctx.nuxt.options.app.buildAssetsDir)
       : undefined,
     experimental: {
-      buildAdvancedBaseOptions: {
-        assets: { runtime: (url: string) => `buildAssetsURL(${url})` },
-        public: { runtime: (url: string) => `publicAssetsURL(${url})` }
+      renderBuiltUrl: (filename, { type, hostType }) => {
+        if (hostType !== 'js') {
+          // In CSS we only use relative paths until we craft a clever runtime CSS hack
+          return { relative: true }
+        }
+        switch (type) {
+          case 'public':
+            return { runtime: `__publicAssetsURL(${JSON.stringify(filename)})` }
+          case 'asset': {
+            const relativeFilename = filename.replace(withTrailingSlash(withoutLeadingSlash(ctx.nuxt.options.app.buildAssetsDir)), '')
+            return { runtime: `__buildAssetsURL(${JSON.stringify(relativeFilename)})` }
+          }
+        }
       }
     },
     define: {
diff --git a/yarn.lock b/yarn.lock
index 17919545f16..a974b9dc11d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1709,7 +1709,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unimport: ^0.3.0
-    vite: ~3.0.0-beta.1
+    vite: ~3.0.0-beta.5
   languageName: unknown
   linkType: soft
 
@@ -1827,7 +1827,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unplugin: ^0.7.0
-    vite: ~3.0.0-beta.1
+    vite: ~3.0.0-beta.5
     vite-node: ^0.15.2
     vite-plugin-checker: ^0.4.6
     vue: 3.2.37
@@ -14410,11 +14410,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:~3.0.0-beta.1":
-  version: 3.0.0-beta.1
-  resolution: "vite@npm:3.0.0-beta.1"
+"vite@npm:~3.0.0-beta.5":
+  version: 3.0.0-beta.5
+  resolution: "vite@npm:3.0.0-beta.5"
   dependencies:
-    esbuild: ^0.14.43
+    esbuild: ^0.14.47
     fsevents: ~2.3.2
     postcss: ^8.4.14
     resolve: ^1.22.1
@@ -14438,7 +14438,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 9a2ec7a25d35ef8af2107da010f8994d373726d3a275bdf0378c58e853a7acd1d59ce4c8d073eac609ddee8f66882b1a89b3898c964808827615eaf20c3bdbf6
+  checksum: 93a19bae089007236813e2ee95f9fdf342b8abc76a3c39ef2fd08f2bdbe2801bfb3473c7c1812253aad04fd2bda198b5e77bf24b4fb525d72b0003ee15fb4d42
   languageName: node
   linkType: hard
 

From 707028177c241c5f1958cda082951e29fb19ebe0 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Thu, 30 Jun 2022 11:03:02 +0100
Subject: [PATCH 25/51] fix: only enable `buildRollupPluginCommonjs` for vite
 server

---
 packages/vite/src/server.ts | 3 +++
 packages/vite/src/vite.ts   | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 12925fb931d..963954ee65a 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -41,6 +41,9 @@ export async function buildServer (ctx: ViteBuildContext) {
       'process.server': true,
       'process.client': false
     },
+    legacy: {
+      buildRollupPluginCommonjs: !ctx.nuxt.options.experimental.externalVue && !ctx.nuxt.options.dev
+    },
     resolve: {
       alias: {
         '#build/plugins': resolve(ctx.nuxt.options.buildDir, 'plugins/server'),
diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts
index 952b0c65cba..5c52d44b989 100644
--- a/packages/vite/src/vite.ts
+++ b/packages/vite/src/vite.ts
@@ -30,9 +30,6 @@ export async function bundle (nuxt: Nuxt) {
     nuxt,
     config: vite.mergeConfig(
       {
-        legacy: {
-          buildRollupPluginCommonjs: !nuxt.options.experimental.externalVue && !nuxt.options.dev
-        },
         resolve: {
           alias: {
             ...nuxt.options.alias,

From b5460377d906365dfbfd37878dd3a52faa0e9caa Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 4 Jul 2022 09:30:25 +0100
Subject: [PATCH 26/51] chore: upgrade to beta 6

---
 package.json                 |   2 +-
 packages/schema/package.json |   2 +-
 packages/vite/package.json   |   2 +-
 yarn.lock                    | 526 ++++++++++++++++++++++++++---------
 4 files changed, 405 insertions(+), 127 deletions(-)

diff --git a/package.json b/package.json
index 46a15f68448..e0945327811 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "~3.0.0-beta.5",
+    "vite": "~3.0.0-beta.6",
     "@vitejs/plugin-vue": "~3.0.0-beta.0",
     "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
     "unbuild": "^0.7.4"
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 1743e3aded2..cb71a18a737 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "vite": "~3.0.0-beta.5"
+    "vite": "~3.0.0-beta.6"
   },
   "dependencies": {
     "c12": "^0.2.8",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 792e7a01921..5ff547b9cb4 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "~3.0.0-beta.5",
+    "vite": "~3.0.0-beta.6",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index a974b9dc11d..fbef03cd81e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -45,9 +45,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.17.7, @babel/core@npm:^7.17.9, @babel/core@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/core@npm:7.18.6"
+"@babel/core@npm:^7.17.7, @babel/core@npm:^7.18.5":
+  version: 7.18.5
+  resolution: "@babel/core@npm:7.18.5"
   dependencies:
     "@ampproject/remapping": ^2.1.0
     "@babel/code-frame": ^7.18.6
@@ -68,9 +68,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.17.7, @babel/core@npm:^7.18.5":
-  version: 7.18.5
-  resolution: "@babel/core@npm:7.18.5"
+"@babel/core@npm:^7.17.7, @babel/core@npm:^7.18.5, @babel/core@npm:^7.18.6":
+  version: 7.18.6
+  resolution: "@babel/core@npm:7.18.6"
   dependencies:
     "@ampproject/remapping": ^2.1.0
     "@babel/code-frame": ^7.18.6
@@ -91,6 +91,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/generator@npm:^7.18.6":
+  version: 7.18.7
+  resolution: "@babel/generator@npm:7.18.7"
+  dependencies:
+    "@babel/types": ^7.18.7
+    "@jridgewell/gen-mapping": ^0.3.2
+    jsesc: ^2.5.1
+  checksum: aad4b6873130165e9483af2888bce5a3a5ad9cca0757fc90ae11a0396757d0b295a3bff49282c8df8ab01b31972cc855ae88fd9ddc9ab00d9427dc0e01caeea9
+  languageName: node
+  linkType: hard
+
 "@babel/generator@npm:^7.18.6, @babel/generator@npm:^7.18.7":
   version: 7.18.7
   resolution: "@babel/generator@npm:7.18.7"
@@ -341,15 +352,15 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-typescript@npm:^7.18.4":
-  version: 7.18.4
-  resolution: "@babel/plugin-transform-typescript@npm:7.18.4"
+  version: 7.18.6
+  resolution: "@babel/plugin-transform-typescript@npm:7.18.6"
   dependencies:
     "@babel/helper-create-class-features-plugin": ^7.18.6
     "@babel/helper-plugin-utils": ^7.18.6
     "@babel/plugin-syntax-typescript": ^7.18.6
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9dc070304688dd183b2abb6bdac6f4b1939df7cc8caf32c57327bf90de26abce2130c5d807e82e25287d3a3e23f7532c9f7afd44a2e7bb815cae92015d352925
+  checksum: 627211f1658870274fcabf38a71bb08ae219e3ac672423083574fabe2c857f28d39243cb7279adada8468c912a7beebc0622770ed66885a1e33b84ccc8bfd7df
   languageName: node
   linkType: hard
 
@@ -1708,8 +1719,8 @@ __metadata:
     std-env: ^3.1.1
     ufo: ^0.8.5
     unbuild: latest
-    unimport: ^0.3.0
-    vite: ~3.0.0-beta.5
+    unimport: ^0.4.1
+    vite: ~3.0.0-beta.6
   languageName: unknown
   linkType: soft
 
@@ -1826,10 +1837,10 @@ __metadata:
     rollup-plugin-visualizer: ^5.6.0
     ufo: ^0.8.5
     unbuild: latest
-    unplugin: ^0.7.0
-    vite: ~3.0.0-beta.5
-    vite-node: ^0.15.2
-    vite-plugin-checker: ^0.4.6
+    unplugin: ^0.7.1
+    vite: ~3.0.0-beta.6
+    vite-node: ^0.16.0
+    vite-plugin-checker: ^0.4.7
     vue: 3.2.37
   peerDependencies:
     vue: ^3.2.37
@@ -1979,13 +1990,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/openapi-types@npm:^12.1.0":
-  version: 12.1.0
-  resolution: "@octokit/openapi-types@npm:12.1.0"
-  checksum: 449f21166d53bb6c88f9b01b45d8ac730aa4ce1aa4d8ca86fc7c06b552c94e7f01281c9a73b2902a4cd2e5ce88d24766e0338109d5aa35a8e0bfc514c6cfd2d7
-  languageName: node
-  linkType: hard
-
 "@octokit/openapi-types@npm:^12.5.0":
   version: 12.5.0
   resolution: "@octokit/openapi-types@npm:12.5.0"
@@ -2077,15 +2081,6 @@ __metadata:
   linkType: hard
 
 "@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.35.0":
-  version: 6.35.0
-  resolution: "@octokit/types@npm:6.35.0"
-  dependencies:
-    "@octokit/openapi-types": ^12.1.0
-  checksum: 0f1949aece03733d1a45a9ee1c2162f8f35d58814e66ed2e00929b0fbb7cb315625203bf748ea7cb855b20b1c794c7f1add7203508a186289f489b7fb1143924
-  languageName: node
-  linkType: hard
-
-"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.38.0, @octokit/types@npm:^6.38.1":
   version: 6.38.1
   resolution: "@octokit/types@npm:6.38.1"
   dependencies:
@@ -2863,6 +2858,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@unocss/cli@npm:0.31.17":
+  version: 0.31.17
+  resolution: "@unocss/cli@npm:0.31.17"
+  dependencies:
+    "@typescript-eslint/types": 5.30.6
+    eslint-visitor-keys: ^3.3.0
+  checksum: e4ec0541d685d211274724c9f1887b6cdd03c7fc4fbdd1ea74c18311c3a5a9a2d4c676448ea714687ca13cc881ec5c73605de75fbf38f302ba8ea86d2b77897f
+  languageName: node
+  linkType: hard
+
 "@unocss/cli@npm:0.44.1":
   version: 0.44.1
   resolution: "@unocss/cli@npm:0.44.1"
@@ -3313,7 +3318,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vueuse/core@npm:8.7.3, @vueuse/core@npm:^8.2.6":
+"@vueuse/core@npm:8.7.3":
   version: 8.7.3
   resolution: "@vueuse/core@npm:8.7.3"
   dependencies:
@@ -3332,9 +3337,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vueuse/core@npm:8.7.5, @vueuse/core@npm:^8.2.6":
-  version: 8.7.5
-  resolution: "@vueuse/core@npm:8.7.5"
+"@vueuse/core@npm:8.9.2, @vueuse/core@npm:^8.9.2":
+  version: 8.9.2
+  resolution: "@vueuse/core@npm:8.9.2"
   dependencies:
     "@types/web-bluetooth": ^0.0.14
     "@vueuse/metadata": 8.9.2
@@ -3352,9 +3357,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vueuse/core@npm:8.9.2, @vueuse/core@npm:^8.9.2":
-  version: 8.9.2
-  resolution: "@vueuse/core@npm:8.9.2"
+"@vueuse/core@npm:^8.2.6":
+  version: 8.7.5
+  resolution: "@vueuse/core@npm:8.7.5"
   dependencies:
     "@types/web-bluetooth": ^0.0.14
     "@vueuse/metadata": 8.9.2
@@ -4410,13 +4415,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001335, caniuse-lite@npm:^1.0.30001349":
-  version: 1.0.30001355
-  resolution: "caniuse-lite@npm:1.0.30001355"
-  checksum: 4154cabab0ae87d804007b1fc9109a532914dcd5dc4beeec8e1d3616f22971a0e96ed7fe0b00996c5104a4fe7ea7935c8e2878e06324c0ccfdcd6c69570e4ae1
-  languageName: node
-  linkType: hard
-
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001335, caniuse-lite@npm:^1.0.30001359":
   version: 1.0.30001365
   resolution: "caniuse-lite@npm:1.0.30001365"
@@ -5568,13 +5566,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.147":
-  version: 1.4.160
-  resolution: "electron-to-chromium@npm:1.4.160"
-  checksum: cd1058ddf8c4d1a38d2826938f9e99945bb45f96ea5eca5af96a2df4a40f23eec19e187cda739b4438174352129bcb733950f366a494d0a923385a46868a0d38
-  languageName: node
-  linkType: hard
-
 "electron-to-chromium@npm:^1.4.172":
   version: 1.4.186
   resolution: "electron-to-chromium@npm:1.4.186"
@@ -5789,6 +5780,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-android-64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-android-64@npm:0.14.48"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-android-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-android-64@npm:0.14.49"
@@ -5817,6 +5815,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-android-arm64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-android-arm64@npm:0.14.48"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-android-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-android-arm64@npm:0.14.49"
@@ -5845,6 +5850,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-darwin-64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-darwin-64@npm:0.14.48"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-darwin-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-darwin-64@npm:0.14.49"
@@ -5873,6 +5885,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-darwin-arm64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-darwin-arm64@npm:0.14.48"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-darwin-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-darwin-arm64@npm:0.14.49"
@@ -5901,6 +5920,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-freebsd-64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-freebsd-64@npm:0.14.48"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-freebsd-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-freebsd-64@npm:0.14.49"
@@ -5929,6 +5955,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-freebsd-arm64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-freebsd-arm64@npm:0.14.48"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-freebsd-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-freebsd-arm64@npm:0.14.49"
@@ -5957,6 +5990,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-32@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-linux-32@npm:0.14.48"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-32@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-32@npm:0.14.49"
@@ -5985,6 +6025,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-linux-64@npm:0.14.48"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-64@npm:0.14.49"
@@ -6013,6 +6060,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-arm64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-linux-arm64@npm:0.14.48"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-arm64@npm:0.14.49"
@@ -6041,6 +6095,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-arm@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-linux-arm@npm:0.14.48"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-arm@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-arm@npm:0.14.49"
@@ -6069,6 +6130,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-mips64le@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-linux-mips64le@npm:0.14.48"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-mips64le@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-mips64le@npm:0.14.49"
@@ -6097,6 +6165,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-ppc64le@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-linux-ppc64le@npm:0.14.48"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-ppc64le@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-ppc64le@npm:0.14.49"
@@ -6118,6 +6193,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-riscv64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-linux-riscv64@npm:0.14.48"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-riscv64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-riscv64@npm:0.14.49"
@@ -6139,6 +6221,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-linux-s390x@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-linux-s390x@npm:0.14.48"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
 "esbuild-linux-s390x@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-s390x@npm:0.14.49"
@@ -6183,6 +6272,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-netbsd-64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-netbsd-64@npm:0.14.48"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-netbsd-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-netbsd-64@npm:0.14.49"
@@ -6211,6 +6307,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-openbsd-64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-openbsd-64@npm:0.14.48"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-openbsd-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-openbsd-64@npm:0.14.49"
@@ -6239,6 +6342,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-sunos-64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-sunos-64@npm:0.14.48"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-sunos-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-sunos-64@npm:0.14.49"
@@ -6267,6 +6377,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-windows-32@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-windows-32@npm:0.14.48"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-32@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-windows-32@npm:0.14.49"
@@ -6295,6 +6412,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-windows-64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-windows-64@npm:0.14.48"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-windows-64@npm:0.14.49"
@@ -6323,6 +6447,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild-windows-arm64@npm:0.14.48":
+  version: 0.14.48
+  resolution: "esbuild-windows-arm64@npm:0.14.48"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "esbuild-windows-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-windows-arm64@npm:0.14.49"
@@ -6614,6 +6745,77 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.47, esbuild@npm:^0.14.48":
+  version: 0.14.48
+  resolution: "esbuild@npm:0.14.48"
+  dependencies:
+    esbuild-android-64: 0.14.49
+    esbuild-android-arm64: 0.14.49
+    esbuild-darwin-64: 0.14.49
+    esbuild-darwin-arm64: 0.14.49
+    esbuild-freebsd-64: 0.14.49
+    esbuild-freebsd-arm64: 0.14.49
+    esbuild-linux-32: 0.14.49
+    esbuild-linux-64: 0.14.49
+    esbuild-linux-arm: 0.14.49
+    esbuild-linux-arm64: 0.14.49
+    esbuild-linux-mips64le: 0.14.49
+    esbuild-linux-ppc64le: 0.14.49
+    esbuild-linux-riscv64: 0.14.49
+    esbuild-linux-s390x: 0.14.49
+    esbuild-netbsd-64: 0.14.49
+    esbuild-openbsd-64: 0.14.49
+    esbuild-sunos-64: 0.14.49
+    esbuild-windows-32: 0.14.49
+    esbuild-windows-64: 0.14.49
+    esbuild-windows-arm64: 0.14.49
+  dependenciesMeta:
+    esbuild-android-64:
+      optional: true
+    esbuild-android-arm64:
+      optional: true
+    esbuild-darwin-64:
+      optional: true
+    esbuild-darwin-arm64:
+      optional: true
+    esbuild-freebsd-64:
+      optional: true
+    esbuild-freebsd-arm64:
+      optional: true
+    esbuild-linux-32:
+      optional: true
+    esbuild-linux-64:
+      optional: true
+    esbuild-linux-arm:
+      optional: true
+    esbuild-linux-arm64:
+      optional: true
+    esbuild-linux-mips64le:
+      optional: true
+    esbuild-linux-ppc64le:
+      optional: true
+    esbuild-linux-riscv64:
+      optional: true
+    esbuild-linux-s390x:
+      optional: true
+    esbuild-netbsd-64:
+      optional: true
+    esbuild-openbsd-64:
+      optional: true
+    esbuild-sunos-64:
+      optional: true
+    esbuild-windows-32:
+      optional: true
+    esbuild-windows-64:
+      optional: true
+    esbuild-windows-arm64:
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: b718f4c9eaf2f83bb26f2cdb18d82d70365179ae8d1d88636afc3073a0c328364340695798b9a6322ae15e31b90e1f71266151f61637412649fb31bb3ecb2e0a
+  languageName: node
+  linkType: hard
+
 "esbuild@npm:^0.14.47":
   version: 0.14.47
   resolution: "esbuild@npm:0.14.47"
@@ -8257,7 +8459,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"h3@npm:^0.7.10, h3@npm:^0.7.9":
+"h3@npm:^0.7.10":
   version: 0.7.10
   resolution: "h3@npm:0.7.10"
   dependencies:
@@ -9414,21 +9616,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"listhen@npm:^0.2.11, listhen@npm:^0.2.12, listhen@npm:^0.2.13":
-  version: 0.2.13
-  resolution: "listhen@npm:0.2.13"
-  dependencies:
-    clipboardy: ^3.0.0
-    colorette: ^2.0.16
-    defu: ^6.0.0
-    get-port-please: ^2.5.0
-    http-shutdown: ^1.2.2
-    selfsigned: ^2.0.1
-    ufo: ^0.8.4
-  checksum: a6399861a9ee81e0505e94aa5d723e26989e10c939266edeff28a4789e753449b1833bfe01490fa43390aa286785ada36cbfee668b00b44097c73f53483c30c4
-  languageName: node
-  linkType: hard
-
 "listhen@npm:^0.2.13":
   version: 0.2.13
   resolution: "listhen@npm:0.2.13"
@@ -10230,33 +10417,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mlly@npm:^0.3.6":
-  version: 0.3.19
-  resolution: "mlly@npm:0.3.19"
-  checksum: 85d646936d5d94b6783e12257adb64ceac9ece32ccaa33d911d44f0c265a91d4f34092beb39641cd108c14a4228f56fc591af60412f65964c72561fbd244ad36
-  languageName: node
-  linkType: hard
-
-"mlly@npm:^0.5.1, mlly@npm:^0.5.2, mlly@npm:^0.5.3":
-  version: 0.5.3
-  resolution: "mlly@npm:0.5.3"
-  dependencies:
-    pathe: ^0.2.0
-    pkg-types: ^0.3.2
-  checksum: 05b76d2167c9e195ae3952ef116b9a00f81af06772e0f27080b95bf57693916447af7b8313d48911fdeb7185bed6c8e8fc45b311c55599a29a1a451a8f8c103c
-  languageName: node
-  linkType: hard
-
-"mlly@npm:^0.5.1, mlly@npm:^0.5.2, mlly@npm:^0.5.3, mlly@npm:^0.5.4":
-  version: 0.5.4
-  resolution: "mlly@npm:0.5.4"
-  dependencies:
-    pathe: ^0.3.1
-    pkg-types: ^0.3.3
-  checksum: fb756e817aaf5edb94f3cd238bf608c59bb1e0f505fa4b9bd38d13a151e4120c561e8689bff4265602b0fea37cc43902b0d8e6754301b36c4ca5167926e75709
-  languageName: node
-  linkType: hard
-
 "mlly@npm:^0.5.2, mlly@npm:^0.5.3, mlly@npm:^0.5.4":
   version: 0.5.4
   resolution: "mlly@npm:0.5.4"
@@ -12434,20 +12594,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0":
-  version: 1.22.1
-  resolution: "resolve@npm:1.22.1"
-  dependencies:
-    is-core-module: ^2.9.0
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
-  bin:
-    resolve: bin/resolve
-  checksum: 07af5fc1e81aa1d866cbc9e9460fbb67318a10fa3c4deadc35c3ad8a898ee9a71a86a65e4755ac3195e0ea0cfbe201eb323ebe655ce90526fd61917313a34e4e
-  languageName: node
-  linkType: hard
-
-"resolve@npm:^1.22.1":
+"resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1":
   version: 1.22.1
   resolution: "resolve@npm:1.22.1"
   dependencies:
@@ -12460,20 +12607,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>":
-  version: 1.22.1
-  resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
-  dependencies:
-    is-core-module: ^2.9.0
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
-  bin:
-    resolve: bin/resolve
-  checksum: 5656f4d0bedcf8eb52685c1abdf8fbe73a1603bb1160a24d716e27a57f6cecbe2432ff9c89c2bd57542c3a7b9d14b1882b73bfe2e9d7849c9a4c0b8b39f02b8b
-  languageName: node
-  linkType: hard
-
-"resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>":
   version: 1.22.1
   resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
   dependencies:
@@ -12659,6 +12793,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup@npm:^2.70.1, rollup@npm:^2.75.6, rollup@npm:^2.75.7":
+  version: 2.75.7
+  resolution: "rollup@npm:2.75.7"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: a6331d46b01062b184efdcb42ce12caf2e1575f989963944534b02f5855f6f3bc239ed0c1a18893572d7695af6d83166f3aef59dbd0365084e1531cb67824674
+  languageName: node
+  linkType: hard
+
 "rollup@npm:^2.75.7":
   version: 2.75.7
   resolution: "rollup@npm:2.75.7"
@@ -14031,6 +14179,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unimport@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "unimport@npm:0.4.0"
+  dependencies:
+    "@rollup/pluginutils": ^4.2.1
+    escape-string-regexp: ^5.0.0
+    fast-glob: ^3.2.11
+    local-pkg: ^0.4.1
+    magic-string: ^0.26.2
+    mlly: ^0.5.3
+    pathe: ^0.3.0
+    scule: ^0.2.1
+    strip-literal: ^0.4.0
+    unplugin: ^0.7.0
+  checksum: 0ef652822966e8ce6ed8de6adc2d6a18f29903c9e4f56579c06766fee3445dcac956328b7c0b7d3d5c0da5e81d62589ffb43a6a08a98e627f5220afa559d35cf
+  languageName: node
+  linkType: hard
+
+"unimport@npm:^0.4.0, unimport@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "unimport@npm:0.4.1"
+  dependencies:
+    "@rollup/pluginutils": ^4.2.1
+    escape-string-regexp: ^5.0.0
+    fast-glob: ^3.2.11
+    local-pkg: ^0.4.1
+    magic-string: ^0.26.2
+    mlly: ^0.5.4
+    pathe: ^0.3.2
+    scule: ^0.2.1
+    strip-literal: ^0.4.0
+    unplugin: ^0.7.1
+  checksum: f4215eb7d5c9b6ef09f7a239780da904b5908a0f05bfd71f540d39440ef72b53f8cdde4a6c6267844dcc028fbf28afd74142abd8c005590134400bd4c85f4f15
+  languageName: node
+  linkType: hard
+
 "unimport@npm:^0.4.0, unimport@npm:^0.4.4":
   version: 0.4.4
   resolution: "unimport@npm:0.4.4"
@@ -14049,6 +14233,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unimport@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "unimport@npm:0.4.3"
+  dependencies:
+    "@rollup/pluginutils": ^4.2.1
+    escape-string-regexp: ^5.0.0
+    fast-glob: ^3.2.11
+    local-pkg: ^0.4.1
+    magic-string: ^0.26.2
+    mlly: ^0.5.4
+    pathe: ^0.3.2
+    scule: ^0.2.1
+    strip-literal: ^0.4.0
+    unplugin: ^0.7.1
+  checksum: d8a7421001a9781cd1244b8bf040b084e6085a9df3f0d4ff9bc8db543e4a898e1bea6870108ff4e65813eb65c42b877b0730a380f8dc51c3db92b422d79d2657
+  languageName: node
+  linkType: hard
+
+"unimport@npm:^0.4.4":
+  version: 0.4.4
+  resolution: "unimport@npm:0.4.4"
+  dependencies:
+    "@rollup/pluginutils": ^4.2.1
+    escape-string-regexp: ^5.0.0
+    fast-glob: ^3.2.11
+    local-pkg: ^0.4.1
+    magic-string: ^0.26.2
+    mlly: ^0.5.4
+    pathe: ^0.3.2
+    scule: ^0.2.1
+    strip-literal: ^0.4.0
+    unplugin: ^0.7.1
+  checksum: d8a7421001a9781cd1244b8bf040b084e6085a9df3f0d4ff9bc8db543e4a898e1bea6870108ff4e65813eb65c42b877b0730a380f8dc51c3db92b422d79d2657
+  languageName: node
+  linkType: hard
+
 "unique-filename@npm:^1.1.1":
   version: 1.1.1
   resolution: "unique-filename@npm:1.1.1"
@@ -14176,6 +14396,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unplugin@npm:^0.7.1":
+  version: 0.7.1
+  resolution: "unplugin@npm:0.7.1"
+  dependencies:
+    acorn: ^8.7.1
+    chokidar: ^3.5.3
+    webpack-sources: ^3.2.3
+    webpack-virtual-modules: ^0.4.4
+  peerDependencies:
+    esbuild: ">=0.13"
+    rollup: ^2.50.0
+    vite: ^2.3.0 || ^3.0.0-0
+    webpack: 4 || 5
+  peerDependenciesMeta:
+    esbuild:
+      optional: true
+    rollup:
+      optional: true
+    vite:
+      optional: true
+    webpack:
+      optional: true
+  checksum: 5449e8cff143b3c8a47f91a9274e2c9d42bdaa7ab5c95a0ea10db87d8bbde9cd85fca9c63d3c319c5b8730e8a490ce49706620151b69b9566172283c980f44bd
+  languageName: node
+  linkType: hard
+
 "unstorage@npm:^0.5.3":
   version: 0.5.4
   resolution: "unstorage@npm:0.5.4"
@@ -14438,7 +14684,39 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 93a19bae089007236813e2ee95f9fdf342b8abc76a3c39ef2fd08f2bdbe2801bfb3473c7c1812253aad04fd2bda198b5e77bf24b4fb525d72b0003ee15fb4d42
+  checksum: d20b28cf5f5486020368f0d5d87079f095cf3437397f296c8aa4e0d009405992db958c14b4586e1c016e7e7e2de46a56bfe03ae544ce8d0c61560c3f6dd97e93
+  languageName: node
+  linkType: hard
+
+"vite@npm:~3.0.0-beta.6":
+  version: 3.0.0-beta.6
+  resolution: "vite@npm:3.0.0-beta.6"
+  dependencies:
+    esbuild: ^0.14.47
+    fsevents: ~2.3.2
+    postcss: ^8.4.14
+    resolve: ^1.22.1
+    rollup: ^2.75.6
+  peerDependencies:
+    less: "*"
+    sass: "*"
+    stylus: "*"
+    terser: ^5.4.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    less:
+      optional: true
+    sass:
+      optional: true
+    stylus:
+      optional: true
+    terser:
+      optional: true
+  bin:
+    vite: bin/vite.js
+  checksum: d20b28cf5f5486020368f0d5d87079f095cf3437397f296c8aa4e0d009405992db958c14b4586e1c016e7e7e2de46a56bfe03ae544ce8d0c61560c3f6dd97e93
   languageName: node
   linkType: hard
 

From b06694cdc5f9a21938bbe350bdb34a9d62f077f4 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 6 Jul 2022 16:34:53 +0100
Subject: [PATCH 27/51] chore: bump to beta 7

---
 package.json                 |  4 +--
 packages/schema/package.json |  2 +-
 packages/vite/package.json   |  4 +--
 yarn.lock                    | 64 +++++++++++++++++-------------------
 4 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index e0945327811..686ceb89616 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,8 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "~3.0.0-beta.6",
-    "@vitejs/plugin-vue": "~3.0.0-beta.0",
+    "vite": "~3.0.0-beta.7",
+    "@vitejs/plugin-vue": "~3.0.0-beta.1",
     "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
     "unbuild": "^0.7.4"
   },
diff --git a/packages/schema/package.json b/packages/schema/package.json
index cb71a18a737..847d2a6e287 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "vite": "~3.0.0-beta.6"
+    "vite": "~3.0.0-beta.7"
   },
   "dependencies": {
     "c12": "^0.2.8",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 5ff547b9cb4..08d14f6faa3 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "@nuxt/kit": "^3.0.0-rc.4",
     "@rollup/plugin-replace": "^4.0.0",
-    "@vitejs/plugin-vue": "~3.0.0-beta.0",
+    "@vitejs/plugin-vue": "~3.0.0-beta.1",
     "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
     "autoprefixer": "^10.4.7",
     "chokidar": "^3.5.3",
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "~3.0.0-beta.6",
+    "vite": "~3.0.0-beta.7",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index fbef03cd81e..928cb27ee70 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1720,7 +1720,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unimport: ^0.4.1
-    vite: ~3.0.0-beta.6
+    vite: ~3.0.0-beta.7
   languageName: unknown
   linkType: soft
 
@@ -1811,7 +1811,7 @@ __metadata:
     "@nuxt/schema": ^3.0.0-rc.4
     "@rollup/plugin-replace": ^4.0.0
     "@types/cssnano": ^5
-    "@vitejs/plugin-vue": ~3.0.0-beta.0
+    "@vitejs/plugin-vue": ~3.0.0-beta.1
     "@vitejs/plugin-vue-jsx": ~2.0.0-beta.0
     autoprefixer: ^10.4.7
     chokidar: ^3.5.3
@@ -1838,8 +1838,8 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unplugin: ^0.7.1
-    vite: ~3.0.0-beta.6
-    vite-node: ^0.16.0
+    vite: ~3.0.0-beta.7
+    vite-node: ^0.17.0
     vite-plugin-checker: ^0.4.7
     vue: 3.2.37
   peerDependencies:
@@ -3123,13 +3123,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue@npm:~3.0.0-beta.0":
-  version: 3.0.0-beta.0
-  resolution: "@vitejs/plugin-vue@npm:3.0.0-beta.0"
+"@vitejs/plugin-vue@npm:~3.0.0-beta.1":
+  version: 3.0.0-beta.1
+  resolution: "@vitejs/plugin-vue@npm:3.0.0-beta.1"
   peerDependencies:
     vite: ^3.0.0-alpha
     vue: ^3.2.25
-  checksum: bee67c397cd2b618385c59c85ce07557af68200215708b5809e2c4255edeeffd73ca17ebc158eb01adbaa941ab2a6dea3f202b050a713b1e39ff3dd1587e2f97
+  checksum: 82b02f91ad5b0765bffc7af2d315d713bea13a30bd1935ba2ae6bf80bf9051975b4b1c36dd002c725f737a9855de647adf047bc7fada69a86358f75c70a9756e
   languageName: node
   linkType: hard
 
@@ -14716,43 +14716,39 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: d20b28cf5f5486020368f0d5d87079f095cf3437397f296c8aa4e0d009405992db958c14b4586e1c016e7e7e2de46a56bfe03ae544ce8d0c61560c3f6dd97e93
+  checksum: 04e670f1bc332d50a0b7d7a2bc3fc7b01370e2a7e1a706d27f9ed57b681558beca06a8681da45b393eeaa6725fb84457176acad4c7c7bb653167d5eea50425d8
   languageName: node
   linkType: hard
 
-"vitest@npm:^0.16.0":
-  version: 0.16.0
-  resolution: "vitest@npm:0.16.0"
+"vite@npm:~3.0.0-beta.7":
+  version: 3.0.0-beta.7
+  resolution: "vite@npm:3.0.0-beta.7"
   dependencies:
-    "@types/chai": ^4.3.1
-    "@types/chai-subset": ^1.3.3
-    "@types/node": "*"
-    chai: ^4.3.6
-    debug: ^4.3.4
-    local-pkg: ^0.4.1
-    tinypool: ^0.2.1
-    tinyspy: ^0.3.3
-    vite: ^2.9.12 || ^3.0.0-0
+    esbuild: ^0.14.47
+    fsevents: ~2.3.2
+    postcss: ^8.4.14
+    resolve: ^1.22.1
+    rollup: ^2.75.6
   peerDependencies:
-    "@edge-runtime/vm": "*"
-    "@vitest/ui": "*"
-    c8: "*"
-    happy-dom: "*"
-    jsdom: "*"
-  peerDependenciesMeta:
-    "@edge-runtime/vm":
+    less: "*"
+    sass: "*"
+    stylus: "*"
+    terser: ^5.4.0
+  dependenciesMeta:
+    fsevents:
       optional: true
-    "@vitest/ui":
+  peerDependenciesMeta:
+    less:
       optional: true
-    c8:
+    sass:
       optional: true
-    happy-dom:
+    stylus:
       optional: true
-    jsdom:
+    terser:
       optional: true
   bin:
-    vitest: vitest.mjs
-  checksum: 1f664f82551f876a2b2b30deba0f9d6d8f7e4d70cbe96debca1a810d1c8a5b68b8a446495d37c14e5e9e21d7bde13e96a6eef7c8e7c77c502e0058f59be192b4
+    vite: bin/vite.js
+  checksum: 04e670f1bc332d50a0b7d7a2bc3fc7b01370e2a7e1a706d27f9ed57b681558beca06a8681da45b393eeaa6725fb84457176acad4c7c7bb653167d5eea50425d8
   languageName: node
   linkType: hard
 

From 6c6e14f5a34c35755465f4e64111fb6dee5c11c9 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 8 Jul 2022 11:57:13 +0100
Subject: [PATCH 28/51] chore: upgrade to beta 8 (reverting to use commonjs
 plugin by default)

---
 package.json                 |  2 +-
 packages/schema/package.json |  2 +-
 packages/vite/package.json   |  2 +-
 packages/vite/src/server.ts  |  3 ---
 yarn.lock                    | 38 +++++++++++++++++++++++++++++++++---
 5 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 686ceb89616..7dda5701904 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "~3.0.0-beta.7",
+    "vite": "~3.0.0-beta.8",
     "@vitejs/plugin-vue": "~3.0.0-beta.1",
     "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
     "unbuild": "^0.7.4"
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 847d2a6e287..855a6771d51 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "vite": "~3.0.0-beta.7"
+    "vite": "~3.0.0-beta.8"
   },
   "dependencies": {
     "c12": "^0.2.8",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 08d14f6faa3..167d33f4e08 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "~3.0.0-beta.7",
+    "vite": "~3.0.0-beta.8",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 963954ee65a..12925fb931d 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -41,9 +41,6 @@ export async function buildServer (ctx: ViteBuildContext) {
       'process.server': true,
       'process.client': false
     },
-    legacy: {
-      buildRollupPluginCommonjs: !ctx.nuxt.options.experimental.externalVue && !ctx.nuxt.options.dev
-    },
     resolve: {
       alias: {
         '#build/plugins': resolve(ctx.nuxt.options.buildDir, 'plugins/server'),
diff --git a/yarn.lock b/yarn.lock
index 928cb27ee70..e80a9d63405 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1720,7 +1720,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unimport: ^0.4.1
-    vite: ~3.0.0-beta.7
+    vite: ~3.0.0-beta.8
   languageName: unknown
   linkType: soft
 
@@ -1838,7 +1838,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unplugin: ^0.7.1
-    vite: ~3.0.0-beta.7
+    vite: ~3.0.0-beta.8
     vite-node: ^0.17.0
     vite-plugin-checker: ^0.4.7
     vue: 3.2.37
@@ -14748,7 +14748,39 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 04e670f1bc332d50a0b7d7a2bc3fc7b01370e2a7e1a706d27f9ed57b681558beca06a8681da45b393eeaa6725fb84457176acad4c7c7bb653167d5eea50425d8
+  checksum: 22c66cbcf69a428c0844d76158ac8e65337915b741105e68461427b880dd345eb1f8573c766bdfdeb4c2d3df7b84f85833663b4b3fe8f20f7d7b381f952c4726
+  languageName: node
+  linkType: hard
+
+"vite@npm:~3.0.0-beta.8":
+  version: 3.0.0-beta.8
+  resolution: "vite@npm:3.0.0-beta.8"
+  dependencies:
+    esbuild: ^0.14.47
+    fsevents: ~2.3.2
+    postcss: ^8.4.14
+    resolve: ^1.22.1
+    rollup: ^2.75.6
+  peerDependencies:
+    less: "*"
+    sass: "*"
+    stylus: "*"
+    terser: ^5.4.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    less:
+      optional: true
+    sass:
+      optional: true
+    stylus:
+      optional: true
+    terser:
+      optional: true
+  bin:
+    vite: bin/vite.js
+  checksum: 22c66cbcf69a428c0844d76158ac8e65337915b741105e68461427b880dd345eb1f8573c766bdfdeb4c2d3df7b84f85833663b4b3fe8f20f7d7b381f952c4726
   languageName: node
   linkType: hard
 

From d052426df3c8d9f3f4d986cf623baa3d2fa5e178 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 8 Jul 2022 12:02:27 +0100
Subject: [PATCH 29/51] feat: use `optimizeDeps` at build-time

---
 packages/vite/src/vite.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts
index 5c52d44b989..0cb2413e155 100644
--- a/packages/vite/src/vite.ts
+++ b/packages/vite/src/vite.ts
@@ -45,10 +45,11 @@ export async function bundle (nuxt: Nuxt) {
           }
         },
         optimizeDeps: {
+          disabled: false,
           entries: [
             resolve(nuxt.options.appDir, 'entry.ts')
           ],
-          include: ['vue']
+          include: ['vue', 'vue-router']
         },
         css: resolveCSSOptions(nuxt),
         build: {

From 8c83444119430687649e75252a582064dcad7545 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 8 Jul 2022 13:18:16 +0100
Subject: [PATCH 30/51] chore: update lockfile

---
 yarn.lock | 484 +++++++++++++++++++++++-------------------------------
 1 file changed, 203 insertions(+), 281 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e80a9d63405..88bffdd92e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -91,17 +91,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.18.6":
-  version: 7.18.7
-  resolution: "@babel/generator@npm:7.18.7"
-  dependencies:
-    "@babel/types": ^7.18.7
-    "@jridgewell/gen-mapping": ^0.3.2
-    jsesc: ^2.5.1
-  checksum: aad4b6873130165e9483af2888bce5a3a5ad9cca0757fc90ae11a0396757d0b295a3bff49282c8df8ab01b31972cc855ae88fd9ddc9ab00d9427dc0e01caeea9
-  languageName: node
-  linkType: hard
-
 "@babel/generator@npm:^7.18.6, @babel/generator@npm:^7.18.7":
   version: 7.18.7
   resolution: "@babel/generator@npm:7.18.7"
@@ -352,8 +341,8 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-typescript@npm:^7.18.4":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-typescript@npm:7.18.6"
+  version: 7.18.8
+  resolution: "@babel/plugin-transform-typescript@npm:7.18.8"
   dependencies:
     "@babel/helper-create-class-features-plugin": ^7.18.6
     "@babel/helper-plugin-utils": ^7.18.6
@@ -1719,7 +1708,7 @@ __metadata:
     std-env: ^3.1.1
     ufo: ^0.8.5
     unbuild: latest
-    unimport: ^0.4.1
+    unimport: ^0.4.4
     vite: ~3.0.0-beta.8
   languageName: unknown
   linkType: soft
@@ -1839,8 +1828,8 @@ __metadata:
     unbuild: latest
     unplugin: ^0.7.1
     vite: ~3.0.0-beta.8
-    vite-node: ^0.17.0
-    vite-plugin-checker: ^0.4.7
+    vite-node: ^0.17.1
+    vite-plugin-checker: ^0.4.8
     vue: 3.2.37
   peerDependencies:
     vue: ^3.2.37
@@ -1990,13 +1979,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/openapi-types@npm:^12.5.0":
-  version: 12.5.0
-  resolution: "@octokit/openapi-types@npm:12.5.0"
-  checksum: 66d950ed3da5f583ab19f5eba74be8f086faa8cf9a2e9dc71bf1be67a40bbc4e47e8215ca5b6c2c56c5cb0e82f10992f6011851dd1dd3c90623106a01b93a672
-  languageName: node
-  linkType: hard
-
 "@octokit/openapi-types@npm:^12.7.0":
   version: 12.8.0
   resolution: "@octokit/openapi-types@npm:12.8.0"
@@ -2012,13 +1994,13 @@ __metadata:
   linkType: hard
 
 "@octokit/plugin-paginate-rest@npm:^2.16.8":
-  version: 2.18.0
-  resolution: "@octokit/plugin-paginate-rest@npm:2.18.0"
+  version: 2.21.1
+  resolution: "@octokit/plugin-paginate-rest@npm:2.21.1"
   dependencies:
-    "@octokit/types": ^6.35.0
+    "@octokit/types": ^6.38.2
   peerDependencies:
     "@octokit/core": ">=2"
-  checksum: e804e44f92a16a0cf5b32a4a05e1acb908d96c63b0e4340355a7f99876b2aee998f636b5ac11a360a4e33ab05ee1c1a384fa48c7f63a78ea5992bc2d8a55e4ce
+  checksum: 2941d0320ec6891cbb0248afe8f8ba019e2971704c6b975a01b99358c432ed84c2920f52d095fc912616e43a59ef582c1df6b868d59a39e2bf095476306ba6f1
   languageName: node
   linkType: hard
 
@@ -2032,14 +2014,14 @@ __metadata:
   linkType: hard
 
 "@octokit/plugin-rest-endpoint-methods@npm:^5.12.0":
-  version: 5.14.0
-  resolution: "@octokit/plugin-rest-endpoint-methods@npm:5.14.0"
+  version: 5.16.2
+  resolution: "@octokit/plugin-rest-endpoint-methods@npm:5.16.2"
   dependencies:
-    "@octokit/types": ^6.35.0
+    "@octokit/types": ^6.39.0
     deprecation: ^2.3.1
   peerDependencies:
     "@octokit/core": ">=3"
-  checksum: 3fbd33aadcd136dbf45175fe24795d2aaab39a3ae6d6832bf49883089f08fb000d1b97ddd293e4a6d694f44c62cc1abaa239551b613b7a226f6f62a074ece6dc
+  checksum: 30fcc50c335d1093f03573d9fa3a4b7d027fc98b215c43e07e82ee8dabfa0af0cf1b963feb542312ae32d897a2f68dc671577206f30850215517bebedc5a2c73
   languageName: node
   linkType: hard
 
@@ -2080,9 +2062,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.35.0":
-  version: 6.38.1
-  resolution: "@octokit/types@npm:6.38.1"
+"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.38.2, @octokit/types@npm:^6.39.0":
+  version: 6.39.0
+  resolution: "@octokit/types@npm:6.39.0"
   dependencies:
     "@octokit/openapi-types": ^12.7.0
   checksum: 0e3d55e4bdef41e652a2e99a304cebada90f23a90619c49ab892a76ae908c4281316738453348c9ba30b32250ef5eda0a939c2af3aec5ca808acdf9922da420c
@@ -2598,12 +2580,12 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^5.21.0":
-  version: 5.28.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.28.0"
+  version: 5.30.5
+  resolution: "@typescript-eslint/eslint-plugin@npm:5.30.5"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.28.0
-    "@typescript-eslint/type-utils": 5.28.0
-    "@typescript-eslint/utils": 5.28.0
+    "@typescript-eslint/scope-manager": 5.30.5
+    "@typescript-eslint/type-utils": 5.30.5
+    "@typescript-eslint/utils": 5.30.5
     debug: ^4.3.4
     functional-red-black-tree: ^1.0.1
     ignore: ^5.2.0
@@ -2616,34 +2598,34 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 49e08865abd35acdc44829b929f2cd01d01a1f91d3c3c357963b6980e938de365f178efcec21e0ed6ec13a2ad9373f52b73001ddd5cdc7b0245fcf02b9564dd3
+  checksum: cf763fb091dcdfd6c25843251a220b654ca83968b17266e0f343771f489085c6afc4e41fcf2187b4c72c4d12a787070c64b5e5367069460f95a8174573f48905
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^5.21.0":
-  version: 5.28.0
-  resolution: "@typescript-eslint/parser@npm:5.28.0"
+  version: 5.30.5
+  resolution: "@typescript-eslint/parser@npm:5.30.5"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.28.0
-    "@typescript-eslint/types": 5.28.0
-    "@typescript-eslint/typescript-estree": 5.28.0
+    "@typescript-eslint/scope-manager": 5.30.5
+    "@typescript-eslint/types": 5.30.5
+    "@typescript-eslint/typescript-estree": 5.30.5
     debug: ^4.3.4
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: cb18ff47b0a10373ba1c05c90901d08f5f99180e624f3f2faa85f13d1048fc59601a3cab6b852f72d13287b314d94c4d4997129ff6c639496a9144c762f6d31e
+  checksum: 6c16821e122b891420a538f200f6e576ad1167855a67e87f9a7d3a08c0513fe26006f6411b8ba6f4662a81526bd0339ae37c47dd88fa5943e6f27ff70da9f989
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.28.0":
-  version: 5.28.0
-  resolution: "@typescript-eslint/scope-manager@npm:5.28.0"
+"@typescript-eslint/scope-manager@npm:5.30.5":
+  version: 5.30.5
+  resolution: "@typescript-eslint/scope-manager@npm:5.30.5"
   dependencies:
-    "@typescript-eslint/types": 5.28.0
-    "@typescript-eslint/visitor-keys": 5.28.0
-  checksum: f187fd295d152508aa85233ef3ac89031952300fbbe277e188dfba3fbfd82656b15d3d8daa6d85984970ce00a30fdf75da912c4024df982004b24f3a95420b8f
+    "@typescript-eslint/types": 5.30.5
+    "@typescript-eslint/visitor-keys": 5.30.5
+  checksum: 509bee6d62cca1716e8f4792d9180c189974992ba13d8103ca04423a64006cf184c4b2c606d55c776305458140c798a3a9a414d07a60790b83dd714f56c457b0
   languageName: node
   linkType: hard
 
@@ -2661,7 +2643,7 @@ __metadata:
   version: 5.28.0
   resolution: "@typescript-eslint/type-utils@npm:5.28.0"
   dependencies:
-    "@typescript-eslint/utils": 5.28.0
+    "@typescript-eslint/utils": 5.30.5
     debug: ^4.3.4
     tsutils: ^3.21.0
   peerDependencies:
@@ -2669,7 +2651,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 05563dab5414a42b7781f5ce65ee540b10a946c419bde3fbc45593aa3b1225b2a70558581f311720d670dc82ab699a3f9ecb4b1447d6fd557bd330cf8890d8ca
+  checksum: 080cc1231729c34b778395658374e32d034474056f9b777dbc89d20d15eb93d93d0959328ad47c2a6623d40c6552364ababadce439842a944bce001f55b731b3
   languageName: node
   linkType: hard
 
@@ -2689,6 +2671,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/type-utils@npm:5.30.5":
+  version: 5.30.5
+  resolution: "@typescript-eslint/type-utils@npm:5.30.5"
+  dependencies:
+    "@typescript-eslint/utils": 5.30.5
+    debug: ^4.3.4
+    tsutils: ^3.21.0
+  peerDependencies:
+    eslint: "*"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 080cc1231729c34b778395658374e32d034474056f9b777dbc89d20d15eb93d93d0959328ad47c2a6623d40c6552364ababadce439842a944bce001f55b731b3
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/type-utils@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/type-utils@npm:5.30.6"
@@ -2719,6 +2717,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:5.30.5":
+  version: 5.30.5
+  resolution: "@typescript-eslint/types@npm:5.30.5"
+  checksum: c70420618cb875d4e964a20a3fa4cf40cb97a8ad3123e24860e3d829edf3b081c77fa1fe25644700499d27e44aee5783abc7765deee61e2ef59a928db96b2175
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/types@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/types@npm:5.30.6"
@@ -2730,8 +2735,8 @@ __metadata:
   version: 5.28.0
   resolution: "@typescript-eslint/typescript-estree@npm:5.28.0"
   dependencies:
-    "@typescript-eslint/types": 5.28.0
-    "@typescript-eslint/visitor-keys": 5.28.0
+    "@typescript-eslint/types": 5.30.5
+    "@typescript-eslint/visitor-keys": 5.30.5
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
@@ -2740,7 +2745,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: e7be6e9ff778ab2728bdc545713f29cd40bbe1282662461453fe46bc18f676f9b33c60e3514347fbc4e5e94d764525c20b8ef3d47baa62fec6bd3ce05fdde6eb
+  checksum: 19dce426c826cddd4aadf2fa15be943c6ad7d2038685cc2665749486a5f44a47819aab5d260b54f8a4babf6acf2500e9f62e709d61fce337b12d5468ff285277
   languageName: node
   linkType: hard
 
@@ -2762,6 +2767,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/typescript-estree@npm:5.30.5":
+  version: 5.30.5
+  resolution: "@typescript-eslint/typescript-estree@npm:5.30.5"
+  dependencies:
+    "@typescript-eslint/types": 5.30.5
+    "@typescript-eslint/visitor-keys": 5.30.5
+    debug: ^4.3.4
+    globby: ^11.1.0
+    is-glob: ^4.0.3
+    semver: ^7.3.7
+    tsutils: ^3.21.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 19dce426c826cddd4aadf2fa15be943c6ad7d2038685cc2665749486a5f44a47819aab5d260b54f8a4babf6acf2500e9f62e709d61fce337b12d5468ff285277
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/typescript-estree@npm:5.30.6"
@@ -2785,14 +2808,14 @@ __metadata:
   resolution: "@typescript-eslint/utils@npm:5.28.0"
   dependencies:
     "@types/json-schema": ^7.0.9
-    "@typescript-eslint/scope-manager": 5.28.0
-    "@typescript-eslint/types": 5.28.0
-    "@typescript-eslint/typescript-estree": 5.28.0
+    "@typescript-eslint/scope-manager": 5.30.5
+    "@typescript-eslint/types": 5.30.5
+    "@typescript-eslint/typescript-estree": 5.30.5
     eslint-scope: ^5.1.1
     eslint-utils: ^3.0.0
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: d30958552470c3f46b2183b690fa8c922a375a84ef83ccfda4785148b8dafb7bf428ab01de6608f67cefbcae35c6a2b0c54b5a6a89bba31566ec3b41f098c02e
+  checksum: 12f68cb34a150d39708f4e09a54964360f29589885cd50f119a2061660011752ec72eff3d90111f0e597575d32aae7250a6e2c730a84963e5e30352759d5f1f4
   languageName: node
   linkType: hard
 
@@ -2812,6 +2835,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/utils@npm:5.30.5":
+  version: 5.30.5
+  resolution: "@typescript-eslint/utils@npm:5.30.5"
+  dependencies:
+    "@types/json-schema": ^7.0.9
+    "@typescript-eslint/scope-manager": 5.30.5
+    "@typescript-eslint/types": 5.30.5
+    "@typescript-eslint/typescript-estree": 5.30.5
+    eslint-scope: ^5.1.1
+    eslint-utils: ^3.0.0
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: 12f68cb34a150d39708f4e09a54964360f29589885cd50f119a2061660011752ec72eff3d90111f0e597575d32aae7250a6e2c730a84963e5e30352759d5f1f4
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/utils@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/utils@npm:5.30.6"
@@ -2832,9 +2871,9 @@ __metadata:
   version: 5.28.0
   resolution: "@typescript-eslint/visitor-keys@npm:5.28.0"
   dependencies:
-    "@typescript-eslint/types": 5.28.0
+    "@typescript-eslint/types": 5.30.5
     eslint-visitor-keys: ^3.3.0
-  checksum: e97251968ea273ce33fa0de8a9c04426499b797f6f7800379ff880c4be6e6e02fe023038be0092c595be394a8636f73ee8911974214d5232b3d59492a50771bf
+  checksum: c0de9ae48378eec2682b860a059518bed213ea29575aad538d8d2f8137875e7279e375a7f23d38c1c183466fdd9cf1ca1db4ed5a1d374968f9460d83e48b2437
   languageName: node
   linkType: hard
 
@@ -2848,6 +2887,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:5.30.5":
+  version: 5.30.5
+  resolution: "@typescript-eslint/visitor-keys@npm:5.30.5"
+  dependencies:
+    "@typescript-eslint/types": 5.30.5
+    eslint-visitor-keys: ^3.3.0
+  checksum: c0de9ae48378eec2682b860a059518bed213ea29575aad538d8d2f8137875e7279e375a7f23d38c1c183466fdd9cf1ca1db4ed5a1d374968f9460d83e48b2437
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/visitor-keys@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/visitor-keys@npm:5.30.6"
@@ -3337,6 +3386,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vueuse/core@npm:8.9.1, @vueuse/core@npm:^8.2.6":
+  version: 8.9.1
+  resolution: "@vueuse/core@npm:8.9.1"
+  dependencies:
+    "@types/web-bluetooth": ^0.0.14
+    "@vueuse/metadata": 8.9.1
+    "@vueuse/shared": 8.9.1
+    vue-demi: "*"
+  peerDependencies:
+    "@vue/composition-api": ^1.1.0
+    vue: ^2.6.0 || ^3.2.0
+  peerDependenciesMeta:
+    "@vue/composition-api":
+      optional: true
+    vue:
+      optional: true
+  checksum: 83a803407963b8d44f4d036b8091e81cd82683898f17817ed68088d806ea9af369d2e036e4eb8d192adf2b84fa5cbc1c31bcc6e1e37f599b9588ca61cde6c5bf
+  languageName: node
+  linkType: hard
+
 "@vueuse/core@npm:8.9.2, @vueuse/core@npm:^8.9.2":
   version: 8.9.2
   resolution: "@vueuse/core@npm:8.9.2"
@@ -3387,11 +3456,11 @@ __metadata:
   linkType: hard
 
 "@vueuse/integrations@npm:^8.2.6":
-  version: 8.7.3
-  resolution: "@vueuse/integrations@npm:8.7.3"
+  version: 8.9.1
+  resolution: "@vueuse/integrations@npm:8.9.1"
   dependencies:
-    "@vueuse/core": 8.7.3
-    "@vueuse/shared": 8.7.3
+    "@vueuse/core": 8.9.1
+    "@vueuse/shared": 8.9.1
     vue-demi: "*"
   peerDependencies:
     async-validator: "*"
@@ -3425,7 +3494,7 @@ __metadata:
       optional: true
     universal-cookie:
       optional: true
-  checksum: d446076c7f3c73be85a99c6a773c6216306c2618ccb7c213d7d1d9aa08babc1c993653ad431342a1c2789808350f8c1fcbaf17156b2519b87804cbabd5cd14d4
+  checksum: 8264e4d4a2805dc6fccf76ca15546f989318800d54db4591b9d92012fbfa497f4631837cbb245da0c0ad3caca0f8bb287c20491863436c832b36684ef11eab23
   languageName: node
   linkType: hard
 
@@ -3479,6 +3548,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vueuse/metadata@npm:8.9.1":
+  version: 8.9.1
+  resolution: "@vueuse/metadata@npm:8.9.1"
+  checksum: 06023a9bfbe68f0a837820bf808acdc7d14eb1c301dc0b861e1bd70b430c47636c6a42e2dcd57f33e82f383a91f2624f676fa8a906e787f805fb1cc630784ce4
+  languageName: node
+  linkType: hard
+
 "@vueuse/metadata@npm:8.9.2":
   version: 8.9.2
   resolution: "@vueuse/metadata@npm:8.9.2"
@@ -3487,15 +3563,15 @@ __metadata:
   linkType: hard
 
 "@vueuse/nuxt@npm:^8.2.6":
-  version: 8.7.3
-  resolution: "@vueuse/nuxt@npm:8.7.3"
+  version: 8.9.1
+  resolution: "@vueuse/nuxt@npm:8.9.1"
   dependencies:
     "@nuxt/kit": ^3.0.0-rc.4
-    "@vueuse/core": 8.7.3
-    "@vueuse/metadata": 8.7.3
+    "@vueuse/core": 8.9.1
+    "@vueuse/metadata": 8.9.1
     local-pkg: ^0.4.1
     vue-demi: "*"
-  checksum: 41a97f04fd9760e732fdf56078688de8440462ff3dc22b9f979fe945300777f22bbf4aa926172f962b2b632063a39feb65a6fcb69ec22ad2ac5b9721dd44d222
+  checksum: c61036b5ef2e8956f794d0fea5f3e87bc069d6f7fcc2317cec431d33c8304e49936353d6336dd67661daf59b36fe70ab0f787536cb4b78e659ff327054866b37
   languageName: node
   linkType: hard
 
@@ -3529,6 +3605,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vueuse/shared@npm:8.9.1":
+  version: 8.9.1
+  resolution: "@vueuse/shared@npm:8.9.1"
+  dependencies:
+    vue-demi: "*"
+  peerDependencies:
+    "@vue/composition-api": ^1.1.0
+    vue: ^2.6.0 || ^3.2.0
+  peerDependenciesMeta:
+    "@vue/composition-api":
+      optional: true
+    vue:
+      optional: true
+  checksum: 0c5b22e5d721784db19955571a602cf9ac1ada71ffa4b2bf5b5d1a62299fcdecee920e824b53ada58191d00515520c85d64d4925663074ea70d272dd3c968eab
+  languageName: node
+  linkType: hard
+
 "@vueuse/shared@npm:8.9.2":
   version: 8.9.2
   resolution: "@vueuse/shared@npm:8.9.2"
@@ -4416,9 +4509,9 @@ __metadata:
   linkType: hard
 
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001335, caniuse-lite@npm:^1.0.30001359":
-  version: 1.0.30001365
-  resolution: "caniuse-lite@npm:1.0.30001365"
-  checksum: 5d043006e9bd9de1ae06c0e12c31997f0ed26f889f47ea6403dc2d08f46a5bd4bf0fe1a5b1099561fc447201ddf13083f277de68829e77fd238ff2af8c05e0a6
+  version: 1.0.30001363
+  resolution: "caniuse-lite@npm:1.0.30001363"
+  checksum: 8dfcb2fa97724349cbbe61d988810bd90bfb40106a289ed6613188fa96dd1f5885c7e9924e46bb30a641bd1579ec34096fdc2b21b47d8500f8a2bfb0db069323
   languageName: node
   linkType: hard
 
@@ -5567,9 +5660,9 @@ __metadata:
   linkType: hard
 
 "electron-to-chromium@npm:^1.4.172":
-  version: 1.4.186
-  resolution: "electron-to-chromium@npm:1.4.186"
-  checksum: 9f87db963070473702c0a999dc4066fdd12abff0b2b98dfae1c7492b62fe3feb42bae64ff7fd837e4e347dab043a411e82cab64ada902726b782c60bf9fc40de
+  version: 1.4.184
+  resolution: "electron-to-chromium@npm:1.4.184"
+  checksum: 9bcbe2b2405d9907fa40fc1472074cf591027de1dc447c3f3c6a2a6fa7d4525c68d0943e66054e55f57b5b15e83c2e10521fe9c1481e4322f28ff9e5b240fd53
   languageName: node
   linkType: hard
 
@@ -12807,6 +12900,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup@npm:^2.70.1, rollup@npm:^2.75.6, rollup@npm:^2.75.7, rollup@npm:^2.76.0":
+  version: 2.76.0
+  resolution: "rollup@npm:2.76.0"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 58293e1c63c11d4afcfcf619601d5c5136dd3d0c9d3bd6a0b6141fede32027edc1eb53873bbb9a9c1e95e86c67f6ad66185720031b6eadf325972174d1d8fbcb
+  languageName: node
+  linkType: hard
+
 "rollup@npm:^2.75.7":
   version: 2.75.7
   resolution: "rollup@npm:2.75.7"
@@ -14137,6 +14244,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unconfig@npm:^0.3.3":
+  version: 0.3.5
+  resolution: "unconfig@npm:0.3.5"
+  dependencies:
+    "@antfu/utils": ^0.5.2
+    defu: ^6.0.0
+    jiti: ^1.14.0
+  checksum: 3a685ef473598e8367bfb8e954708667a98d3d4ed3d0752ed2063d256062e69090681cf25a7f81695e6d014cd8828d789aa8c0c84fe3b4684b1488307689eb59
+  languageName: node
+  linkType: hard
+
 "unconfig@npm:^0.3.4":
   version: 0.3.5
   resolution: "unconfig@npm:0.3.5"
@@ -14161,9 +14279,9 @@ __metadata:
   linkType: hard
 
 "undici@npm:^5.2.0":
-  version: 5.7.0
-  resolution: "undici@npm:5.7.0"
-  checksum: 3a8133697ee7124f4998c01dcb2255206a85bdf99cc75e97d2535d752bc853a9b39e149e7292479c6c170602947c7c77403081ced10ffbffcbe9fb077e40c6fb
+  version: 5.6.0
+  resolution: "undici@npm:5.6.0"
+  checksum: b9052c2cb9c44b000d375468c266b629032fc72d2024fb07b2988fd42d54937bedb54f44e76bb0ee6ca4c4960c0eee0e77573d178c156647da7ebaa088174baf
   languageName: node
   linkType: hard
 
@@ -14592,166 +14710,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^2.9.13":
-  version: 2.9.13
-  resolution: "vite@npm:2.9.13"
-  dependencies:
-    esbuild: ^0.14.38
-    fsevents: ~2.3.2
-    postcss: ^8.4.14
-    resolve: ^1.22.0
-    rollup: ^2.72.1
-  peerDependencies:
-    less: "*"
-    sass: "*"
-    stylus: "*"
-    terser: ^5.4.0
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  peerDependenciesMeta:
-    less:
-      optional: true
-    sass:
-      optional: true
-    stylus:
-      optional: true
-    terser:
-      optional: true
-  bin:
-    vite: bin/vite.js
-  checksum: f78b54f58482ea97d385e36873ae1aa4744c5e467c1d6d4e0835bd55494d2d8f6ce763f17c241c66104be687d5ee535b8e1e96c14210c9ba0c343fe78c58f694
-  languageName: node
-  linkType: hard
-
-"vite@npm:^2.9.14":
-  version: 2.9.14
-  resolution: "vite@npm:2.9.14"
-  dependencies:
-    esbuild: ^0.14.38
-    fsevents: ~2.3.2
-    postcss: ^8.4.14
-    resolve: ^1.22.0
-    rollup: ^2.72.1
-  peerDependencies:
-    less: "*"
-    sass: "*"
-    stylus: "*"
-    terser: ^5.4.0
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  peerDependenciesMeta:
-    less:
-      optional: true
-    sass:
-      optional: true
-    stylus:
-      optional: true
-    terser:
-      optional: true
-  bin:
-    vite: bin/vite.js
-  checksum: 640fdc5a3e58aee542ab738efc0ffbf0845a271fdaeb9750c42d78ed542db0bf89082de63865ddc831997cae6652cf023da7d4e6ddb8514363eb66604ec4e6c8
-  languageName: node
-  linkType: hard
-
-"vite@npm:~3.0.0-beta.5":
-  version: 3.0.0-beta.5
-  resolution: "vite@npm:3.0.0-beta.5"
-  dependencies:
-    esbuild: ^0.14.47
-    fsevents: ~2.3.2
-    postcss: ^8.4.14
-    resolve: ^1.22.1
-    rollup: ^2.75.6
-  peerDependencies:
-    less: "*"
-    sass: "*"
-    stylus: "*"
-    terser: ^5.4.0
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  peerDependenciesMeta:
-    less:
-      optional: true
-    sass:
-      optional: true
-    stylus:
-      optional: true
-    terser:
-      optional: true
-  bin:
-    vite: bin/vite.js
-  checksum: d20b28cf5f5486020368f0d5d87079f095cf3437397f296c8aa4e0d009405992db958c14b4586e1c016e7e7e2de46a56bfe03ae544ce8d0c61560c3f6dd97e93
-  languageName: node
-  linkType: hard
-
-"vite@npm:~3.0.0-beta.6":
-  version: 3.0.0-beta.6
-  resolution: "vite@npm:3.0.0-beta.6"
-  dependencies:
-    esbuild: ^0.14.47
-    fsevents: ~2.3.2
-    postcss: ^8.4.14
-    resolve: ^1.22.1
-    rollup: ^2.75.6
-  peerDependencies:
-    less: "*"
-    sass: "*"
-    stylus: "*"
-    terser: ^5.4.0
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  peerDependenciesMeta:
-    less:
-      optional: true
-    sass:
-      optional: true
-    stylus:
-      optional: true
-    terser:
-      optional: true
-  bin:
-    vite: bin/vite.js
-  checksum: 04e670f1bc332d50a0b7d7a2bc3fc7b01370e2a7e1a706d27f9ed57b681558beca06a8681da45b393eeaa6725fb84457176acad4c7c7bb653167d5eea50425d8
-  languageName: node
-  linkType: hard
-
-"vite@npm:~3.0.0-beta.7":
-  version: 3.0.0-beta.7
-  resolution: "vite@npm:3.0.0-beta.7"
-  dependencies:
-    esbuild: ^0.14.47
-    fsevents: ~2.3.2
-    postcss: ^8.4.14
-    resolve: ^1.22.1
-    rollup: ^2.75.6
-  peerDependencies:
-    less: "*"
-    sass: "*"
-    stylus: "*"
-    terser: ^5.4.0
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  peerDependenciesMeta:
-    less:
-      optional: true
-    sass:
-      optional: true
-    stylus:
-      optional: true
-    terser:
-      optional: true
-  bin:
-    vite: bin/vite.js
-  checksum: 22c66cbcf69a428c0844d76158ac8e65337915b741105e68461427b880dd345eb1f8573c766bdfdeb4c2d3df7b84f85833663b4b3fe8f20f7d7b381f952c4726
-  languageName: node
-  linkType: hard
-
 "vite@npm:~3.0.0-beta.8":
   version: 3.0.0-beta.8
   resolution: "vite@npm:3.0.0-beta.8"
@@ -14784,42 +14742,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vitest@npm:^0.17.0":
-  version: 0.17.0
-  resolution: "vitest@npm:0.17.0"
-  dependencies:
-    "@types/chai": ^4.3.1
-    "@types/chai-subset": ^1.3.3
-    "@types/node": "*"
-    chai: ^4.3.6
-    debug: ^4.3.4
-    local-pkg: ^0.4.1
-    tinypool: ^0.2.1
-    tinyspy: ^0.3.3
-    vite: ^2.9.12 || ^3.0.0-0
-  peerDependencies:
-    "@edge-runtime/vm": "*"
-    "@vitest/ui": "*"
-    c8: "*"
-    happy-dom: "*"
-    jsdom: "*"
-  peerDependenciesMeta:
-    "@edge-runtime/vm":
-      optional: true
-    "@vitest/ui":
-      optional: true
-    c8:
-      optional: true
-    happy-dom:
-      optional: true
-    jsdom:
-      optional: true
-  bin:
-    vitest: vitest.mjs
-  checksum: eae2d024d97a46ba08f3cc7e0703a330c92dc0a6f4c7a9bc20ec8a5129bf787d8ebabd14bf31ae810897c1813e29178af59f63ec8b24b5944cfa62e225cd207c
-  languageName: node
-  linkType: hard
-
 "vitest@npm:^0.17.1":
   version: 0.17.1
   resolution: "vitest@npm:0.17.1"
@@ -14962,8 +14884,8 @@ __metadata:
   linkType: hard
 
 "vue-demi@npm:*":
-  version: 0.13.4
-  resolution: "vue-demi@npm:0.13.4"
+  version: 0.13.2
+  resolution: "vue-demi@npm:0.13.2"
   peerDependencies:
     "@vue/composition-api": ^1.0.0-rc.1
     vue: ^3.0.0-0 || ^2.6.0
@@ -14973,7 +14895,7 @@ __metadata:
   bin:
     vue-demi-fix: bin/vue-demi-fix.js
     vue-demi-switch: bin/vue-demi-switch.js
-  checksum: f6279d76ea215c3bce362317982fadcb6e6308d1c3461669599af257c166e31b2f377ff4d9b1349d6c82519d5eae5cd804bdc8e53f18d3d189b6d6bfcc5e8298
+  checksum: 085dbab000609d90837d730ccef33328caa7e381f1afe27e6b71c37a3be4be24843b692968805aee3d8079576ab54f554d5c5b1ec6bc823a70d668007dab3fc8
   languageName: node
   linkType: hard
 

From dffbddc4d07f0ade151152396994b3852b62b8e7 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 8 Jul 2022 13:43:05 +0100
Subject: [PATCH 31/51] fix: disable `optimizeDeps` at build-time (testing
 windows ci)

---
 packages/vite/src/vite.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts
index 0cb2413e155..42c91b815e0 100644
--- a/packages/vite/src/vite.ts
+++ b/packages/vite/src/vite.ts
@@ -45,7 +45,6 @@ export async function bundle (nuxt: Nuxt) {
           }
         },
         optimizeDeps: {
-          disabled: false,
           entries: [
             resolve(nuxt.options.appDir, 'entry.ts')
           ],

From c94533fd0156d87d1a5936ecac4c136ac77e3772 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 8 Jul 2022 15:09:25 +0100
Subject: [PATCH 32/51] fix: try normalizing specifier

---
 packages/nuxt/src/pages/macros.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/pages/macros.ts b/packages/nuxt/src/pages/macros.ts
index 965a54b00b3..1ce288df028 100644
--- a/packages/nuxt/src/pages/macros.ts
+++ b/packages/nuxt/src/pages/macros.ts
@@ -48,7 +48,7 @@ export const TransformMacroPlugin = createUnplugin((options: TransformMacroPlugi
       if (scriptImport) {
         // https://github.com/vuejs/vue-loader/pull/1911
         // https://github.com/vitejs/vite/issues/8473
-        const parsed = parseURL(scriptImport.specifier.replace('?macro=true', ''))
+        const parsed = parseURL(decodeURIComponent(pathToFileURL(scriptImport.specifier.replace('?macro=true', '')).href))
         const specifier = withQuery(parsed.pathname, { macro: 'true', ...parseQuery(parsed.search) })
         s.overwrite(0, code.length, `export { meta } from "${specifier}"`)
         return result()

From c685283408eca8f6a11b61762cbf8a0657dd0bef Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 8 Jul 2022 15:43:54 +0100
Subject: [PATCH 33/51] fix: hotfix hashing chunk code rather than id

-> revert once https://github.com/unjs/ohash/issues/11 resolved
---
 packages/vite/src/dev-bundler.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vite/src/dev-bundler.ts b/packages/vite/src/dev-bundler.ts
index fb52850d1cd..a22dd82697d 100644
--- a/packages/vite/src/dev-bundler.ts
+++ b/packages/vite/src/dev-bundler.ts
@@ -140,7 +140,7 @@ export async function bundleRequest (opts: TransformOptions, entryURL: string) {
 // Parents: \n${listIds(chunk.parents)}
 // Dependencies: \n${listIds(chunk.deps)}
 // --------------------
-const ${hashId(chunk.id)} = ${chunk.code}
+const ${hashId(chunk.code)} = ${chunk.code}
 `).join('\n')
 
   const manifestCode = `const __modules__ = ${

From 6c56217eac29cdd6357b23f160f2162c15b47e9a Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 8 Jul 2022 15:48:47 +0100
Subject: [PATCH 34/51] fix: include id in hash

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

diff --git a/packages/vite/src/dev-bundler.ts b/packages/vite/src/dev-bundler.ts
index a22dd82697d..fb52435b6b3 100644
--- a/packages/vite/src/dev-bundler.ts
+++ b/packages/vite/src/dev-bundler.ts
@@ -140,7 +140,7 @@ export async function bundleRequest (opts: TransformOptions, entryURL: string) {
 // Parents: \n${listIds(chunk.parents)}
 // Dependencies: \n${listIds(chunk.deps)}
 // --------------------
-const ${hashId(chunk.code)} = ${chunk.code}
+const ${hashId(chunk.id + '-' + chunk.code)} = ${chunk.code}
 `).join('\n')
 
   const manifestCode = `const __modules__ = ${

From de7e8fea9ce2dc994af6c995becc7d892d732f95 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 8 Jul 2022 16:55:05 +0100
Subject: [PATCH 35/51] fix: exclude relative paths from new approach

---
 packages/nuxt/src/pages/macros.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nuxt/src/pages/macros.ts b/packages/nuxt/src/pages/macros.ts
index 1ce288df028..2ddc9197695 100644
--- a/packages/nuxt/src/pages/macros.ts
+++ b/packages/nuxt/src/pages/macros.ts
@@ -3,6 +3,7 @@ import { createUnplugin } from 'unplugin'
 import { parseQuery, parseURL, withQuery } from 'ufo'
 import { findStaticImports, findExports } from 'mlly'
 import MagicString from 'magic-string'
+import { isAbsolute } from 'pathe'
 
 export interface TransformMacroPluginOptions {
   macros: Record<string, string>
@@ -48,7 +49,8 @@ export const TransformMacroPlugin = createUnplugin((options: TransformMacroPlugi
       if (scriptImport) {
         // https://github.com/vuejs/vue-loader/pull/1911
         // https://github.com/vitejs/vite/issues/8473
-        const parsed = parseURL(decodeURIComponent(pathToFileURL(scriptImport.specifier.replace('?macro=true', '')).href))
+        const url = isAbsolute(scriptImport.specifier) ? pathToFileURL(scriptImport.specifier).href : scriptImport.specifier
+        const parsed = parseURL(decodeURIComponent(url).replace('?macro=true', ''))
         const specifier = withQuery(parsed.pathname, { macro: 'true', ...parseQuery(parsed.search) })
         s.overwrite(0, code.length, `export { meta } from "${specifier}"`)
         return result()

From c16a56a097331ba8d02ffcb913cf5f25eb981aff Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 8 Jul 2022 17:05:13 +0100
Subject: [PATCH 36/51] fix: hash manifest as well

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

diff --git a/packages/vite/src/dev-bundler.ts b/packages/vite/src/dev-bundler.ts
index fb52435b6b3..a8ed9e17ff8 100644
--- a/packages/vite/src/dev-bundler.ts
+++ b/packages/vite/src/dev-bundler.ts
@@ -144,7 +144,7 @@ const ${hashId(chunk.id + '-' + chunk.code)} = ${chunk.code}
 `).join('\n')
 
   const manifestCode = `const __modules__ = ${
-    genObjectFromRawEntries(chunks.map(chunk => [chunk.id, hashId(chunk.id)]))
+    genObjectFromRawEntries(chunks.map(chunk => [chunk.id, hashId(chunk.id + '-' + chunk.code)]))
   }`
 
   // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/ssr/ssrModuleLoader.ts

From b91ff93d7ef7e0fc99b7920680cee93918e1a16d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 8 Jul 2022 18:58:30 +0100
Subject: [PATCH 37/51] chore: upgrade to beta 9

---
 package.json                 |  2 +-
 packages/schema/package.json |  2 +-
 packages/vite/package.json   |  2 +-
 yarn.lock                    | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 7dda5701904..f3921bdd34b 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "~3.0.0-beta.8",
+    "vite": "~3.0.0-beta.9",
     "@vitejs/plugin-vue": "~3.0.0-beta.1",
     "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
     "unbuild": "^0.7.4"
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 855a6771d51..d7e2d5422c2 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "vite": "~3.0.0-beta.8"
+    "vite": "~3.0.0-beta.9"
   },
   "dependencies": {
     "c12": "^0.2.8",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 167d33f4e08..d67dcbb563c 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "~3.0.0-beta.8",
+    "vite": "~3.0.0-beta.9",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index 88bffdd92e5..88156e179c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1709,7 +1709,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unimport: ^0.4.4
-    vite: ~3.0.0-beta.8
+    vite: ~3.0.0-beta.9
   languageName: unknown
   linkType: soft
 
@@ -1827,7 +1827,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unplugin: ^0.7.1
-    vite: ~3.0.0-beta.8
+    vite: ~3.0.0-beta.9
     vite-node: ^0.17.1
     vite-plugin-checker: ^0.4.8
     vue: 3.2.37
@@ -14710,9 +14710,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:~3.0.0-beta.8":
-  version: 3.0.0-beta.8
-  resolution: "vite@npm:3.0.0-beta.8"
+"vite@npm:~3.0.0-beta.9":
+  version: 3.0.0-beta.9
+  resolution: "vite@npm:3.0.0-beta.9"
   dependencies:
     esbuild: ^0.14.47
     fsevents: ~2.3.2
@@ -14738,7 +14738,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 22c66cbcf69a428c0844d76158ac8e65337915b741105e68461427b880dd345eb1f8573c766bdfdeb4c2d3df7b84f85833663b4b3fe8f20f7d7b381f952c4726
+  checksum: 287ead2b4cd3e4c015cc515d2c5eac55727098967bd21622610dc05a05984bb6b35f69e50b6b9874345efe86332915762477e38f03d15fa120d1245c9b606032
   languageName: node
   linkType: hard
 

From b37cfb4e8000a714038d9fbae2ed92ba18b98235 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 12 Jul 2022 09:34:31 +0100
Subject: [PATCH 38/51] chore: bump vite to beta 10

---
 package.json                 |   2 +-
 packages/schema/package.json |   2 +-
 packages/vite/package.json   |   2 +-
 yarn.lock                    | 884 +++++++++--------------------------
 4 files changed, 216 insertions(+), 674 deletions(-)

diff --git a/package.json b/package.json
index f3921bdd34b..eee77965163 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "~3.0.0-beta.9",
+    "vite": "~3.0.0-beta.10",
     "@vitejs/plugin-vue": "~3.0.0-beta.1",
     "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
     "unbuild": "^0.7.4"
diff --git a/packages/schema/package.json b/packages/schema/package.json
index d7e2d5422c2..59d06244e9c 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "vite": "~3.0.0-beta.9"
+    "vite": "~3.0.0-beta.10"
   },
   "dependencies": {
     "c12": "^0.2.8",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index d67dcbb563c..4fdb6a74129 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "~3.0.0-beta.9",
+    "vite": "~3.0.0-beta.10",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index 88156e179c7..fea1d1d0c25 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1709,7 +1709,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unimport: ^0.4.4
-    vite: ~3.0.0-beta.9
+    vite: ~3.0.0-beta.10
   languageName: unknown
   linkType: soft
 
@@ -1827,8 +1827,8 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unplugin: ^0.7.1
-    vite: ~3.0.0-beta.9
-    vite-node: ^0.17.1
+    vite: ~3.0.0-beta.10
+    vite-node: ^0.18.0
     vite-plugin-checker: ^0.4.8
     vue: 3.2.37
   peerDependencies:
@@ -1994,13 +1994,13 @@ __metadata:
   linkType: hard
 
 "@octokit/plugin-paginate-rest@npm:^2.16.8":
-  version: 2.21.1
-  resolution: "@octokit/plugin-paginate-rest@npm:2.21.1"
+  version: 2.21.2
+  resolution: "@octokit/plugin-paginate-rest@npm:2.21.2"
   dependencies:
-    "@octokit/types": ^6.38.2
+    "@octokit/types": ^6.39.0
   peerDependencies:
-    "@octokit/core": ">=2"
-  checksum: 2941d0320ec6891cbb0248afe8f8ba019e2971704c6b975a01b99358c432ed84c2920f52d095fc912616e43a59ef582c1df6b868d59a39e2bf095476306ba6f1
+    "@octokit/core": ">=4"
+  checksum: 386727fb2e39be589dc66e2de31da6a4b7f2039ec1829552b64165b435cbb0bddd8431578c8b73ea063209d2f695a5391ad0d3214027349480c39ebdd5fdf09a
   languageName: node
   linkType: hard
 
@@ -2062,15 +2062,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.38.2, @octokit/types@npm:^6.39.0":
-  version: 6.39.0
-  resolution: "@octokit/types@npm:6.39.0"
-  dependencies:
-    "@octokit/openapi-types": ^12.7.0
-  checksum: 0e3d55e4bdef41e652a2e99a304cebada90f23a90619c49ab892a76ae908c4281316738453348c9ba30b32250ef5eda0a939c2af3aec5ca808acdf9922da420c
-  languageName: node
-  linkType: hard
-
 "@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.39.0":
   version: 6.39.0
   resolution: "@octokit/types@npm:6.39.0"
@@ -2580,12 +2571,12 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^5.21.0":
-  version: 5.30.5
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.30.5"
+  version: 5.30.6
+  resolution: "@typescript-eslint/eslint-plugin@npm:5.30.6"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.30.5
-    "@typescript-eslint/type-utils": 5.30.5
-    "@typescript-eslint/utils": 5.30.5
+    "@typescript-eslint/scope-manager": 5.30.6
+    "@typescript-eslint/type-utils": 5.30.6
+    "@typescript-eslint/utils": 5.30.6
     debug: ^4.3.4
     functional-red-black-tree: ^1.0.1
     ignore: ^5.2.0
@@ -2598,34 +2589,24 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: cf763fb091dcdfd6c25843251a220b654ca83968b17266e0f343771f489085c6afc4e41fcf2187b4c72c4d12a787070c64b5e5367069460f95a8174573f48905
+  checksum: ee020a171c057a99061ca70583473df1beb0df3229b4c9404b85d4a6ce96b03708935e2aa4418d74a877337d407ca30cdf53c9cf2f7b9eec0d79288d245267d1
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^5.21.0":
-  version: 5.30.5
-  resolution: "@typescript-eslint/parser@npm:5.30.5"
+  version: 5.30.6
+  resolution: "@typescript-eslint/parser@npm:5.30.6"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.30.5
-    "@typescript-eslint/types": 5.30.5
-    "@typescript-eslint/typescript-estree": 5.30.5
+    "@typescript-eslint/scope-manager": 5.30.6
+    "@typescript-eslint/types": 5.30.6
+    "@typescript-eslint/typescript-estree": 5.30.6
     debug: ^4.3.4
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 6c16821e122b891420a538f200f6e576ad1167855a67e87f9a7d3a08c0513fe26006f6411b8ba6f4662a81526bd0339ae37c47dd88fa5943e6f27ff70da9f989
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/scope-manager@npm:5.30.5":
-  version: 5.30.5
-  resolution: "@typescript-eslint/scope-manager@npm:5.30.5"
-  dependencies:
-    "@typescript-eslint/types": 5.30.5
-    "@typescript-eslint/visitor-keys": 5.30.5
-  checksum: 509bee6d62cca1716e8f4792d9180c189974992ba13d8103ca04423a64006cf184c4b2c606d55c776305458140c798a3a9a414d07a60790b83dd714f56c457b0
+  checksum: 3e02bb447d21af65adefbaddb46380ced3fb88045ef2e122d6522cc354d414898cd2222b4ce05fa0ee1fbc8c01e9a7833fe57e52b844e3fba30c89d20e006b56
   languageName: node
   linkType: hard
 
@@ -2675,7 +2656,7 @@ __metadata:
   version: 5.30.5
   resolution: "@typescript-eslint/type-utils@npm:5.30.5"
   dependencies:
-    "@typescript-eslint/utils": 5.30.5
+    "@typescript-eslint/utils": 5.30.6
     debug: ^4.3.4
     tsutils: ^3.21.0
   peerDependencies:
@@ -2683,7 +2664,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 080cc1231729c34b778395658374e32d034474056f9b777dbc89d20d15eb93d93d0959328ad47c2a6623d40c6552364ababadce439842a944bce001f55b731b3
+  checksum: 19b9479961c07e66230d73f9a396e5352bcdf6fa3f5fc175fad86ac617783fa61a5db53c872025974c196a44452b3b10afb0dd10b661dce37d04b2b86ee25ba2
   languageName: node
   linkType: hard
 
@@ -2771,8 +2752,8 @@ __metadata:
   version: 5.30.5
   resolution: "@typescript-eslint/typescript-estree@npm:5.30.5"
   dependencies:
-    "@typescript-eslint/types": 5.30.5
-    "@typescript-eslint/visitor-keys": 5.30.5
+    "@typescript-eslint/types": 5.30.6
+    "@typescript-eslint/visitor-keys": 5.30.6
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
@@ -2781,7 +2762,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 19dce426c826cddd4aadf2fa15be943c6ad7d2038685cc2665749486a5f44a47819aab5d260b54f8a4babf6acf2500e9f62e709d61fce337b12d5468ff285277
+  checksum: 5621c03f1a6ca8866d91014cd30b53a37f9c4d664eb97bc2740294bcbf7efc0178e8699def752b86c97472e7b1b0cd9b6c0d9aa07a04decfe78bd16c21f93c4b
   languageName: node
   linkType: hard
 
@@ -2840,14 +2821,14 @@ __metadata:
   resolution: "@typescript-eslint/utils@npm:5.30.5"
   dependencies:
     "@types/json-schema": ^7.0.9
-    "@typescript-eslint/scope-manager": 5.30.5
-    "@typescript-eslint/types": 5.30.5
-    "@typescript-eslint/typescript-estree": 5.30.5
+    "@typescript-eslint/scope-manager": 5.30.6
+    "@typescript-eslint/types": 5.30.6
+    "@typescript-eslint/typescript-estree": 5.30.6
     eslint-scope: ^5.1.1
     eslint-utils: ^3.0.0
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 12f68cb34a150d39708f4e09a54964360f29589885cd50f119a2061660011752ec72eff3d90111f0e597575d32aae7250a6e2c730a84963e5e30352759d5f1f4
+  checksum: fc6f9ccf558d658cbeaa85c63bc1853385630c9522c8ae42524b652a6b3c69689fba67a49d79ce1fae2b4ec9c45e5aa9b791ac027d205edef27984d088ed1c3a
   languageName: node
   linkType: hard
 
@@ -2891,9 +2872,9 @@ __metadata:
   version: 5.30.5
   resolution: "@typescript-eslint/visitor-keys@npm:5.30.5"
   dependencies:
-    "@typescript-eslint/types": 5.30.5
+    "@typescript-eslint/types": 5.30.6
     eslint-visitor-keys: ^3.3.0
-  checksum: c0de9ae48378eec2682b860a059518bed213ea29575aad538d8d2f8137875e7279e375a7f23d38c1c183466fdd9cf1ca1db4ed5a1d374968f9460d83e48b2437
+  checksum: e4ec0541d685d211274724c9f1887b6cdd03c7fc4fbdd1ea74c18311c3a5a9a2d4c676448ea714687ca13cc881ec5c73605de75fbf38f302ba8ea86d2b77897f
   languageName: node
   linkType: hard
 
@@ -3063,6 +3044,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@unocss/reset@npm:0.31.17, @unocss/reset@npm:^0.31.6":
+  version: 0.31.17
+  resolution: "@unocss/reset@npm:0.31.17"
+  checksum: 3a11e343e648fcd4894b2941c1daa8dd4076dcce3fd3f624f1b1e97c82fecb5200132835ac4936b1927ac709bc3b1d8b15f9fae8570ae75046a90902ac807bf8
+  languageName: node
+  linkType: hard
+
 "@unocss/reset@npm:0.44.1, @unocss/reset@npm:^0.44.1":
   version: 0.44.1
   resolution: "@unocss/reset@npm:0.44.1"
@@ -3070,6 +3058,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@unocss/reset@npm:^0.44.0":
+  version: 0.44.1
+  resolution: "@unocss/reset@npm:0.44.1"
+  checksum: ffb7c55059382e515aaa59da574dd97b03d2d0beb33f909a9768d10098064dcf144a2b24c1eb402ed2c00747884a75e2b511989c00adf5b58d466f5f51740b03
+  languageName: node
+  linkType: hard
+
+"@unocss/scope@npm:0.31.17":
+  version: 0.31.17
+  resolution: "@unocss/scope@npm:0.31.17"
+  checksum: 6936fe948d682f7e5b00200032d2d92814c6867d53c3cd1e23e3c5eb4d84279217c4fa7b9b49e25db04ffab181b18d5674618eb53d5e893acb5c655aab2d8cc9
+  languageName: node
+  linkType: hard
+
 "@unocss/scope@npm:0.44.1":
   version: 0.44.1
   resolution: "@unocss/scope@npm:0.44.1"
@@ -3086,6 +3088,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@unocss/transformer-directives@npm:0.31.17":
+  version: 0.31.17
+  resolution: "@unocss/transformer-directives@npm:0.31.17"
+  dependencies:
+    "@unocss/core": 0.44.1
+    "@unocss/preset-mini": 0.44.1
+  checksum: ac8d50aa9b597cef1529e700a8452e6f2ffe2d103e0f33ac64c8cabb9966a46e96bfe903c80c2a7087a5e36538b691cf3be3370e5677e5d26e7108eabad792aa
+  languageName: node
+  linkType: hard
+
 "@unocss/transformer-directives@npm:0.44.1":
   version: 0.44.1
   resolution: "@unocss/transformer-directives@npm:0.44.1"
@@ -3391,8 +3403,8 @@ __metadata:
   resolution: "@vueuse/core@npm:8.9.1"
   dependencies:
     "@types/web-bluetooth": ^0.0.14
-    "@vueuse/metadata": 8.9.1
-    "@vueuse/shared": 8.9.1
+    "@vueuse/metadata": 8.9.2
+    "@vueuse/shared": 8.9.2
     vue-demi: "*"
   peerDependencies:
     "@vue/composition-api": ^1.1.0
@@ -3402,7 +3414,27 @@ __metadata:
       optional: true
     vue:
       optional: true
-  checksum: 83a803407963b8d44f4d036b8091e81cd82683898f17817ed68088d806ea9af369d2e036e4eb8d192adf2b84fa5cbc1c31bcc6e1e37f599b9588ca61cde6c5bf
+  checksum: 9d9d694c78468fcbecb8485807f673c035c272ad690e266b7b7c2e79023c0a6ee25c0318242737a87f6ca39ed43ea15d683ec66b991ae56b91cf6175e577c726
+  languageName: node
+  linkType: hard
+
+"@vueuse/core@npm:8.9.2, @vueuse/core@npm:^8.2.6":
+  version: 8.9.2
+  resolution: "@vueuse/core@npm:8.9.2"
+  dependencies:
+    "@types/web-bluetooth": ^0.0.14
+    "@vueuse/metadata": 8.9.2
+    "@vueuse/shared": 8.9.2
+    vue-demi: "*"
+  peerDependencies:
+    "@vue/composition-api": ^1.1.0
+    vue: ^2.6.0 || ^3.2.0
+  peerDependenciesMeta:
+    "@vue/composition-api":
+      optional: true
+    vue:
+      optional: true
+  checksum: 9d9d694c78468fcbecb8485807f673c035c272ad690e266b7b7c2e79023c0a6ee25c0318242737a87f6ca39ed43ea15d683ec66b991ae56b91cf6175e577c726
   languageName: node
   linkType: hard
 
@@ -3456,11 +3488,11 @@ __metadata:
   linkType: hard
 
 "@vueuse/integrations@npm:^8.2.6":
-  version: 8.9.1
-  resolution: "@vueuse/integrations@npm:8.9.1"
+  version: 8.9.2
+  resolution: "@vueuse/integrations@npm:8.9.2"
   dependencies:
-    "@vueuse/core": 8.9.1
-    "@vueuse/shared": 8.9.1
+    "@vueuse/core": 8.9.2
+    "@vueuse/shared": 8.9.2
     vue-demi: "*"
   peerDependencies:
     async-validator: "*"
@@ -3494,7 +3526,7 @@ __metadata:
       optional: true
     universal-cookie:
       optional: true
-  checksum: 8264e4d4a2805dc6fccf76ca15546f989318800d54db4591b9d92012fbfa497f4631837cbb245da0c0ad3caca0f8bb287c20491863436c832b36684ef11eab23
+  checksum: 1c3256bb44e061763a454661362f170a0f28bd609440117e80445f6be3b64c3f946b1cdbb0758df4550c30a01504c747f52859a0527cbb3460a111e7c6f47839
   languageName: node
   linkType: hard
 
@@ -3563,15 +3595,15 @@ __metadata:
   linkType: hard
 
 "@vueuse/nuxt@npm:^8.2.6":
-  version: 8.9.1
-  resolution: "@vueuse/nuxt@npm:8.9.1"
+  version: 8.9.2
+  resolution: "@vueuse/nuxt@npm:8.9.2"
   dependencies:
     "@nuxt/kit": ^3.0.0-rc.4
-    "@vueuse/core": 8.9.1
-    "@vueuse/metadata": 8.9.1
+    "@vueuse/core": 8.9.2
+    "@vueuse/metadata": 8.9.2
     local-pkg: ^0.4.1
     vue-demi: "*"
-  checksum: c61036b5ef2e8956f794d0fea5f3e87bc069d6f7fcc2317cec431d33c8304e49936353d6336dd67661daf59b36fe70ab0f787536cb4b78e659ff327054866b37
+  checksum: 454c45c20dd262e8b613a90e0c8d49ae298b8118b47b14d0eaeb66763407c5d203ef8aeced36a8d4f171c9c03caf38cd47b415199a2cbffffbaac3a9c24b40ef
   languageName: node
   linkType: hard
 
@@ -3618,7 +3650,7 @@ __metadata:
       optional: true
     vue:
       optional: true
-  checksum: 0c5b22e5d721784db19955571a602cf9ac1ada71ffa4b2bf5b5d1a62299fcdecee920e824b53ada58191d00515520c85d64d4925663074ea70d272dd3c968eab
+  checksum: e6085a9c19a4be4edd40775656958e4f8fdb82e338442e09c30aada0d7e1abc55c58393fbbf0dc782a59ff7594d93b125a4aef1ccadda84479c41dd013d5ac11
   languageName: node
   linkType: hard
 
@@ -4509,9 +4541,9 @@ __metadata:
   linkType: hard
 
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001335, caniuse-lite@npm:^1.0.30001359":
-  version: 1.0.30001363
-  resolution: "caniuse-lite@npm:1.0.30001363"
-  checksum: 8dfcb2fa97724349cbbe61d988810bd90bfb40106a289ed6613188fa96dd1f5885c7e9924e46bb30a641bd1579ec34096fdc2b21b47d8500f8a2bfb0db069323
+  version: 1.0.30001365
+  resolution: "caniuse-lite@npm:1.0.30001365"
+  checksum: 5d043006e9bd9de1ae06c0e12c31997f0ed26f889f47ea6403dc2d08f46a5bd4bf0fe1a5b1099561fc447201ddf13083f277de68829e77fd238ff2af8c05e0a6
   languageName: node
   linkType: hard
 
@@ -5660,9 +5692,9 @@ __metadata:
   linkType: hard
 
 "electron-to-chromium@npm:^1.4.172":
-  version: 1.4.184
-  resolution: "electron-to-chromium@npm:1.4.184"
-  checksum: 9bcbe2b2405d9907fa40fc1472074cf591027de1dc447c3f3c6a2a6fa7d4525c68d0943e66054e55f57b5b15e83c2e10521fe9c1481e4322f28ff9e5b240fd53
+  version: 1.4.186
+  resolution: "electron-to-chromium@npm:1.4.186"
+  checksum: 9f87db963070473702c0a999dc4066fdd12abff0b2b98dfae1c7492b62fe3feb42bae64ff7fd837e4e347dab043a411e82cab64ada902726b782c60bf9fc40de
   languageName: node
   linkType: hard
 
@@ -5859,27 +5891,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-android-64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-android-64@npm:0.14.45"
-  conditions: os=android & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-android-64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-android-64@npm:0.14.47"
-  conditions: os=android & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-android-64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-android-64@npm:0.14.48"
-  conditions: os=android & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-android-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-android-64@npm:0.14.49"
@@ -5887,34 +5898,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-android-arm64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-android-arm64@npm:0.13.15"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-android-arm64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-android-arm64@npm:0.14.45"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-android-arm64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-android-arm64@npm:0.14.47"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-android-arm64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-android-arm64@npm:0.14.48"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "esbuild-android-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-android-arm64@npm:0.14.49"
@@ -5922,34 +5905,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-darwin-64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-darwin-64@npm:0.13.15"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-darwin-64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-darwin-64@npm:0.14.45"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-darwin-64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-darwin-64@npm:0.14.47"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-darwin-64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-darwin-64@npm:0.14.48"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-darwin-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-darwin-64@npm:0.14.49"
@@ -5957,34 +5912,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-darwin-arm64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-darwin-arm64@npm:0.13.15"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-darwin-arm64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-darwin-arm64@npm:0.14.45"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-darwin-arm64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-darwin-arm64@npm:0.14.47"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-darwin-arm64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-darwin-arm64@npm:0.14.48"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "esbuild-darwin-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-darwin-arm64@npm:0.14.49"
@@ -5992,34 +5919,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-freebsd-64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-freebsd-64@npm:0.13.15"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-freebsd-64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-freebsd-64@npm:0.14.45"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-freebsd-64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-freebsd-64@npm:0.14.47"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-freebsd-64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-freebsd-64@npm:0.14.48"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-freebsd-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-freebsd-64@npm:0.14.49"
@@ -6027,34 +5926,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-freebsd-arm64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-freebsd-arm64@npm:0.13.15"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-freebsd-arm64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-freebsd-arm64@npm:0.14.45"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-freebsd-arm64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-freebsd-arm64@npm:0.14.47"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-freebsd-arm64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-freebsd-arm64@npm:0.14.48"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "esbuild-freebsd-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-freebsd-arm64@npm:0.14.49"
@@ -6062,34 +5933,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-32@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-linux-32@npm:0.13.15"
-  conditions: os=linux & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-32@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-linux-32@npm:0.14.45"
-  conditions: os=linux & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-32@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-linux-32@npm:0.14.47"
-  conditions: os=linux & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-32@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-linux-32@npm:0.14.48"
-  conditions: os=linux & cpu=ia32
-  languageName: node
-  linkType: hard
-
 "esbuild-linux-32@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-32@npm:0.14.49"
@@ -6097,34 +5940,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-linux-64@npm:0.13.15"
-  conditions: os=linux & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-linux-64@npm:0.14.45"
-  conditions: os=linux & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-linux-64@npm:0.14.47"
-  conditions: os=linux & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-linux-64@npm:0.14.48"
-  conditions: os=linux & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-linux-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-64@npm:0.14.49"
@@ -6132,192 +5947,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-arm64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-linux-arm64@npm:0.13.15"
-  conditions: os=linux & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-arm64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-linux-arm64@npm:0.14.45"
-  conditions: os=linux & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-arm64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-linux-arm64@npm:0.14.47"
-  conditions: os=linux & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-arm64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-linux-arm64@npm:0.14.48"
-  conditions: os=linux & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "esbuild-linux-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-linux-arm64@npm:0.14.49"
-  conditions: os=linux & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-arm@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-linux-arm@npm:0.13.15"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-arm@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-linux-arm@npm:0.14.45"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-arm@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-linux-arm@npm:0.14.47"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-arm@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-linux-arm@npm:0.14.48"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-arm@npm:0.14.49":
-  version: 0.14.49
-  resolution: "esbuild-linux-arm@npm:0.14.49"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-mips64le@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-linux-mips64le@npm:0.13.15"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-mips64le@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-linux-mips64le@npm:0.14.45"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-mips64le@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-linux-mips64le@npm:0.14.47"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-mips64le@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-linux-mips64le@npm:0.14.48"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-mips64le@npm:0.14.49":
-  version: 0.14.49
-  resolution: "esbuild-linux-mips64le@npm:0.14.49"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-ppc64le@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-linux-ppc64le@npm:0.13.15"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-ppc64le@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-linux-ppc64le@npm:0.14.45"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-ppc64le@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-linux-ppc64le@npm:0.14.47"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-ppc64le@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-linux-ppc64le@npm:0.14.48"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-ppc64le@npm:0.14.49":
-  version: 0.14.49
-  resolution: "esbuild-linux-ppc64le@npm:0.14.49"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-riscv64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-linux-riscv64@npm:0.14.45"
-  conditions: os=linux & cpu=riscv64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-riscv64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-linux-riscv64@npm:0.14.47"
-  conditions: os=linux & cpu=riscv64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-riscv64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-linux-riscv64@npm:0.14.48"
-  conditions: os=linux & cpu=riscv64
+  conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"esbuild-linux-riscv64@npm:0.14.49":
+"esbuild-linux-arm@npm:0.14.49":
   version: 0.14.49
-  resolution: "esbuild-linux-riscv64@npm:0.14.49"
-  conditions: os=linux & cpu=riscv64
+  resolution: "esbuild-linux-arm@npm:0.14.49"
+  conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"esbuild-linux-s390x@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-linux-s390x@npm:0.14.45"
-  conditions: os=linux & cpu=s390x
+"esbuild-linux-mips64le@npm:0.14.49":
+  version: 0.14.49
+  resolution: "esbuild-linux-mips64le@npm:0.14.49"
+  conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
 
-"esbuild-linux-s390x@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-linux-s390x@npm:0.14.47"
-  conditions: os=linux & cpu=s390x
+"esbuild-linux-ppc64le@npm:0.14.49":
+  version: 0.14.49
+  resolution: "esbuild-linux-ppc64le@npm:0.14.49"
+  conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
 
-"esbuild-linux-s390x@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-linux-s390x@npm:0.14.48"
-  conditions: os=linux & cpu=s390x
+"esbuild-linux-riscv64@npm:0.14.49":
+  version: 0.14.49
+  resolution: "esbuild-linux-riscv64@npm:0.14.49"
+  conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
 
@@ -6344,34 +6005,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-netbsd-64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-netbsd-64@npm:0.13.15"
-  conditions: os=netbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-netbsd-64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-netbsd-64@npm:0.14.45"
-  conditions: os=netbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-netbsd-64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-netbsd-64@npm:0.14.47"
-  conditions: os=netbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-netbsd-64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-netbsd-64@npm:0.14.48"
-  conditions: os=netbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-netbsd-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-netbsd-64@npm:0.14.49"
@@ -6379,34 +6012,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-openbsd-64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-openbsd-64@npm:0.13.15"
-  conditions: os=openbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-openbsd-64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-openbsd-64@npm:0.14.45"
-  conditions: os=openbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-openbsd-64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-openbsd-64@npm:0.14.47"
-  conditions: os=openbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-openbsd-64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-openbsd-64@npm:0.14.48"
-  conditions: os=openbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-openbsd-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-openbsd-64@npm:0.14.49"
@@ -6414,34 +6019,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-sunos-64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-sunos-64@npm:0.13.15"
-  conditions: os=sunos & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-sunos-64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-sunos-64@npm:0.14.45"
-  conditions: os=sunos & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-sunos-64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-sunos-64@npm:0.14.47"
-  conditions: os=sunos & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-sunos-64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-sunos-64@npm:0.14.48"
-  conditions: os=sunos & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-sunos-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-sunos-64@npm:0.14.49"
@@ -6449,34 +6026,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-windows-32@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-windows-32@npm:0.13.15"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-32@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-windows-32@npm:0.14.45"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-32@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-windows-32@npm:0.14.47"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-32@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-windows-32@npm:0.14.48"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
 "esbuild-windows-32@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-windows-32@npm:0.14.49"
@@ -6484,34 +6033,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-windows-64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-windows-64@npm:0.13.15"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-windows-64@npm:0.14.45"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-windows-64@npm:0.14.47"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-windows-64@npm:0.14.48"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-windows-64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-windows-64@npm:0.14.49"
@@ -6519,34 +6040,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-windows-arm64@npm:0.13.15":
-  version: 0.13.15
-  resolution: "esbuild-windows-arm64@npm:0.13.15"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-arm64@npm:0.14.45":
-  version: 0.14.45
-  resolution: "esbuild-windows-arm64@npm:0.14.45"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-arm64@npm:0.14.47":
-  version: 0.14.47
-  resolution: "esbuild-windows-arm64@npm:0.14.47"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-arm64@npm:0.14.48":
-  version: 0.14.48
-  resolution: "esbuild-windows-arm64@npm:0.14.48"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "esbuild-windows-arm64@npm:0.14.49":
   version: 0.14.49
   resolution: "esbuild-windows-arm64@npm:0.14.49"
@@ -6909,6 +6402,77 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.47, esbuild@npm:^0.14.49":
+  version: 0.14.49
+  resolution: "esbuild@npm:0.14.49"
+  dependencies:
+    esbuild-android-64: 0.14.49
+    esbuild-android-arm64: 0.14.49
+    esbuild-darwin-64: 0.14.49
+    esbuild-darwin-arm64: 0.14.49
+    esbuild-freebsd-64: 0.14.49
+    esbuild-freebsd-arm64: 0.14.49
+    esbuild-linux-32: 0.14.49
+    esbuild-linux-64: 0.14.49
+    esbuild-linux-arm: 0.14.49
+    esbuild-linux-arm64: 0.14.49
+    esbuild-linux-mips64le: 0.14.49
+    esbuild-linux-ppc64le: 0.14.49
+    esbuild-linux-riscv64: 0.14.49
+    esbuild-linux-s390x: 0.14.49
+    esbuild-netbsd-64: 0.14.49
+    esbuild-openbsd-64: 0.14.49
+    esbuild-sunos-64: 0.14.49
+    esbuild-windows-32: 0.14.49
+    esbuild-windows-64: 0.14.49
+    esbuild-windows-arm64: 0.14.49
+  dependenciesMeta:
+    esbuild-android-64:
+      optional: true
+    esbuild-android-arm64:
+      optional: true
+    esbuild-darwin-64:
+      optional: true
+    esbuild-darwin-arm64:
+      optional: true
+    esbuild-freebsd-64:
+      optional: true
+    esbuild-freebsd-arm64:
+      optional: true
+    esbuild-linux-32:
+      optional: true
+    esbuild-linux-64:
+      optional: true
+    esbuild-linux-arm:
+      optional: true
+    esbuild-linux-arm64:
+      optional: true
+    esbuild-linux-mips64le:
+      optional: true
+    esbuild-linux-ppc64le:
+      optional: true
+    esbuild-linux-riscv64:
+      optional: true
+    esbuild-linux-s390x:
+      optional: true
+    esbuild-netbsd-64:
+      optional: true
+    esbuild-openbsd-64:
+      optional: true
+    esbuild-sunos-64:
+      optional: true
+    esbuild-windows-32:
+      optional: true
+    esbuild-windows-64:
+      optional: true
+    esbuild-windows-arm64:
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: b718f4c9eaf2f83bb26f2cdb18d82d70365179ae8d1d88636afc3073a0c328364340695798b9a6322ae15e31b90e1f71266151f61637412649fb31bb3ecb2e0a
+  languageName: node
+  linkType: hard
+
 "esbuild@npm:^0.14.47":
   version: 0.14.47
   resolution: "esbuild@npm:0.14.47"
@@ -11888,6 +11452,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-loader@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "postcss-loader@npm:7.0.1"
+  dependencies:
+    cosmiconfig: ^7.0.0
+    klona: ^2.0.5
+    semver: ^7.3.7
+  peerDependencies:
+    postcss: ^7.0.0 || ^8.0.1
+    webpack: ^5.0.0
+  checksum: 2a3cbcaaade598d4919824d384ae34ffbfc14a9c8db6cc3b154582356f4f44a1c9af9e731b81cf1947b089accf7d0ab7a0c51c717946985f89aa1708d2b4304d
+  languageName: node
+  linkType: hard
+
 "postcss-loader@npm:^7.0.1":
   version: 7.0.1
   resolution: "postcss-loader@npm:7.0.1"
@@ -14279,9 +13857,9 @@ __metadata:
   linkType: hard
 
 "undici@npm:^5.2.0":
-  version: 5.6.0
-  resolution: "undici@npm:5.6.0"
-  checksum: b9052c2cb9c44b000d375468c266b629032fc72d2024fb07b2988fd42d54937bedb54f44e76bb0ee6ca4c4960c0eee0e77573d178c156647da7ebaa088174baf
+  version: 5.6.1
+  resolution: "undici@npm:5.6.1"
+  checksum: 0e993519815964ce8dbb627b8a6bc2078c921e1e575d4d5c6a9cff51bb7b78716edfe9f8b619ce8fe7879a334d7fcd503aae548eeb10020967555f9a8b1bebff
   languageName: node
   linkType: hard
 
@@ -14710,9 +14288,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:~3.0.0-beta.9":
-  version: 3.0.0-beta.9
-  resolution: "vite@npm:3.0.0-beta.9"
+"vite@npm:~3.0.0-beta.10":
+  version: 3.0.0-beta.10
+  resolution: "vite@npm:3.0.0-beta.10"
   dependencies:
     esbuild: ^0.14.47
     fsevents: ~2.3.2
@@ -14738,43 +14316,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 287ead2b4cd3e4c015cc515d2c5eac55727098967bd21622610dc05a05984bb6b35f69e50b6b9874345efe86332915762477e38f03d15fa120d1245c9b606032
-  languageName: node
-  linkType: hard
-
-"vitest@npm:^0.17.1":
-  version: 0.17.1
-  resolution: "vitest@npm:0.17.1"
-  dependencies:
-    "@types/chai": ^4.3.1
-    "@types/chai-subset": ^1.3.3
-    "@types/node": "*"
-    chai: ^4.3.6
-    debug: ^4.3.4
-    local-pkg: ^0.4.1
-    tinypool: ^0.2.1
-    tinyspy: ^0.3.3
-    vite: ^2.9.12 || ^3.0.0-0
-  peerDependencies:
-    "@edge-runtime/vm": "*"
-    "@vitest/ui": "*"
-    c8: "*"
-    happy-dom: "*"
-    jsdom: "*"
-  peerDependenciesMeta:
-    "@edge-runtime/vm":
-      optional: true
-    "@vitest/ui":
-      optional: true
-    c8:
-      optional: true
-    happy-dom:
-      optional: true
-    jsdom:
-      optional: true
-  bin:
-    vitest: vitest.mjs
-  checksum: 20e76b0de9f02dd09a412b11e5898d1ec7c5c9f9287da40a79fde98f6bd100db6f777fb5f1370496a2c153277cc5eb6738e176435101332fce1c87a565e62d5f
+  checksum: 2b27107dac3e240c7fd5bc5be40e62befce6de6d31220f8cc0d25e1c583e9e00c259c5eaa423c58e0ee87ab7bc46b5e07dd774d081f6439a3e747ee908e375b0
   languageName: node
   linkType: hard
 
@@ -14884,8 +14426,8 @@ __metadata:
   linkType: hard
 
 "vue-demi@npm:*":
-  version: 0.13.2
-  resolution: "vue-demi@npm:0.13.2"
+  version: 0.13.4
+  resolution: "vue-demi@npm:0.13.4"
   peerDependencies:
     "@vue/composition-api": ^1.0.0-rc.1
     vue: ^3.0.0-0 || ^2.6.0
@@ -14895,7 +14437,7 @@ __metadata:
   bin:
     vue-demi-fix: bin/vue-demi-fix.js
     vue-demi-switch: bin/vue-demi-switch.js
-  checksum: 085dbab000609d90837d730ccef33328caa7e381f1afe27e6b71c37a3be4be24843b692968805aee3d8079576ab54f554d5c5b1ec6bc823a70d668007dab3fc8
+  checksum: f6279d76ea215c3bce362317982fadcb6e6308d1c3461669599af257c166e31b2f377ff4d9b1349d6c82519d5eae5cd804bdc8e53f18d3d189b6d6bfcc5e8298
   languageName: node
   linkType: hard
 

From 8c36c27a99476c50e343ce21ef6ffa3d9fcd58fd Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 12 Jul 2022 09:46:03 +0100
Subject: [PATCH 39/51] fix: revert unneeded changes

---
 packages/vite/src/server.ts | 2 +-
 packages/vite/src/vite.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 12925fb931d..713eb9af883 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -44,7 +44,7 @@ export async function buildServer (ctx: ViteBuildContext) {
     resolve: {
       alias: {
         '#build/plugins': resolve(ctx.nuxt.options.buildDir, 'plugins/server'),
-        ...ctx.nuxt.options.experimental.externalVue || ctx.nuxt.options.dev
+        ...ctx.nuxt.options.experimental.externalVue
           ? {}
           : {
               '@vue/reactivity': _resolve(`@vue/reactivity/dist/reactivity.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts
index 42c91b815e0..5c52d44b989 100644
--- a/packages/vite/src/vite.ts
+++ b/packages/vite/src/vite.ts
@@ -48,7 +48,7 @@ export async function bundle (nuxt: Nuxt) {
           entries: [
             resolve(nuxt.options.appDir, 'entry.ts')
           ],
-          include: ['vue', 'vue-router']
+          include: ['vue']
         },
         css: resolveCSSOptions(nuxt),
         build: {

From 7a5fa228d4c2570a76f70cddec405c7b8f6efc09 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 12 Jul 2022 09:50:06 +0100
Subject: [PATCH 40/51] docs: add link to source

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

diff --git a/packages/vite/src/client.ts b/packages/vite/src/client.ts
index cfd22842066..3411cb5cbaf 100644
--- a/packages/vite/src/client.ts
+++ b/packages/vite/src/client.ts
@@ -45,6 +45,7 @@ export async function buildClient (ctx: ViteBuildContext) {
     build: {
       rollupOptions: {
         output: {
+          // https://github.com/vitejs/vite/tree/main/packages/vite/src/node/build.ts#L464-L478
           assetFileNames: ctx.nuxt.options.dev ? undefined : withoutLeadingSlash(join(ctx.nuxt.options.app.buildAssetsDir, '[name].[hash].[ext]')),
           chunkFileNames: ctx.nuxt.options.dev ? undefined : withoutLeadingSlash(join(ctx.nuxt.options.app.buildAssetsDir, '[name].[hash].mjs')),
           entryFileNames: ctx.nuxt.options.dev ? 'entry.mjs' : withoutLeadingSlash(join(ctx.nuxt.options.app.buildAssetsDir, '[name].[hash].mjs'))

From bdca0b73a071e72d9223b6051fe2aa4551c06a22 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 12 Jul 2022 10:16:29 +0100
Subject: [PATCH 41/51] fix: don't alias vue deps in dev mode

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

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 713eb9af883..12925fb931d 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -44,7 +44,7 @@ export async function buildServer (ctx: ViteBuildContext) {
     resolve: {
       alias: {
         '#build/plugins': resolve(ctx.nuxt.options.buildDir, 'plugins/server'),
-        ...ctx.nuxt.options.experimental.externalVue
+        ...ctx.nuxt.options.experimental.externalVue || ctx.nuxt.options.dev
           ? {}
           : {
               '@vue/reactivity': _resolve(`@vue/reactivity/dist/reactivity.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),

From bdde1fde798ca99bb28045016db17ed582b0685d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 13 Jul 2022 13:35:40 +0100
Subject: [PATCH 42/51] chore: use released vite 3 packages

---
 package.json                 |    4 +-
 packages/schema/package.json |    2 +-
 packages/vite/package.json   |    6 +-
 yarn.lock                    | 1512 +++-------------------------------
 4 files changed, 133 insertions(+), 1391 deletions(-)

diff --git a/package.json b/package.json
index eee77965163..ad2a44e1e67 100644
--- a/package.json
+++ b/package.json
@@ -42,9 +42,7 @@
     "nuxi": "link:./packages/nuxi",
     "nuxt": "link:./packages/nuxt",
     "nuxt3": "link:./packages/nuxt",
-    "vite": "~3.0.0-beta.10",
-    "@vitejs/plugin-vue": "~3.0.0-beta.1",
-    "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
+    "vite": "~3.0.0",
     "unbuild": "^0.7.4"
   },
   "devDependencies": {
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 59d06244e9c..9a185a77fa9 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "vite": "~3.0.0-beta.10"
+    "vite": "~3.0.0"
   },
   "dependencies": {
     "c12": "^0.2.8",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 4fdb6a74129..e13068c3afd 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@nuxt/kit": "^3.0.0-rc.4",
     "@rollup/plugin-replace": "^4.0.0",
-    "@vitejs/plugin-vue": "~3.0.0-beta.1",
-    "@vitejs/plugin-vue-jsx": "~2.0.0-beta.0",
+    "@vitejs/plugin-vue": "^3.0.0",
+    "@vitejs/plugin-vue-jsx": "^2.0.0",
     "autoprefixer": "^10.4.7",
     "chokidar": "^3.5.3",
     "cssnano": "^5.1.12",
@@ -47,7 +47,7 @@
     "rollup-plugin-visualizer": "^5.6.0",
     "ufo": "^0.8.5",
     "unplugin": "^0.7.2",
-    "vite": "~3.0.0-beta.10",
+    "vite": "~3.0.0",
     "vite-node": "^0.18.0",
     "vite-plugin-checker": "^0.4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index fea1d1d0c25..0250a5be5d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,3 +1,6 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
 __metadata:
   version: 6
   cacheKey: 8
@@ -45,30 +48,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.17.7, @babel/core@npm:^7.18.5":
-  version: 7.18.5
-  resolution: "@babel/core@npm:7.18.5"
-  dependencies:
-    "@ampproject/remapping": ^2.1.0
-    "@babel/code-frame": ^7.18.6
-    "@babel/generator": ^7.18.6
-    "@babel/helper-compilation-targets": ^7.18.6
-    "@babel/helper-module-transforms": ^7.18.6
-    "@babel/helpers": ^7.18.6
-    "@babel/parser": ^7.18.6
-    "@babel/template": ^7.18.6
-    "@babel/traverse": ^7.18.6
-    "@babel/types": ^7.18.6
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.2.1
-    semver: ^6.3.0
-  checksum: 711459ebf7afab7b8eff88b7155c3f4a62690545f1c8c2eb6ba5ebaed01abeecb984cf9657847a2151ad24a5645efce765832aa343ce0f0386f311b67b59589a
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.17.7, @babel/core@npm:^7.18.5, @babel/core@npm:^7.18.6":
+"@babel/core@npm:^7.17.7, @babel/core@npm:^7.18.6":
   version: 7.18.6
   resolution: "@babel/core@npm:7.18.6"
   dependencies:
@@ -327,20 +307,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:^7.16.8":
-  version: 7.18.8
-  resolution: "@babel/plugin-transform-typescript@npm:7.18.8"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-typescript": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 627211f1658870274fcabf38a71bb08ae219e3ac672423083574fabe2c857f28d39243cb7279adada8468c912a7beebc0622770ed66885a1e33b84ccc8bfd7df
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typescript@npm:^7.18.4":
+"@babel/plugin-transform-typescript@npm:^7.18.8":
   version: 7.18.8
   resolution: "@babel/plugin-transform-typescript@npm:7.18.8"
   dependencies:
@@ -1619,15 +1586,15 @@ __metadata:
   linkType: hard
 
 "@npmcli/run-script@npm:^4.1.0":
-  version: 4.1.5
-  resolution: "@npmcli/run-script@npm:4.1.5"
+  version: 4.1.7
+  resolution: "@npmcli/run-script@npm:4.1.7"
   dependencies:
     "@npmcli/node-gyp": ^2.0.0
     "@npmcli/promise-spawn": ^3.0.0
     node-gyp: ^9.0.0
     read-package-json-fast: ^2.0.3
     which: ^2.0.2
-  checksum: a71736c628c747edd3275861a60bf8d76f8e954d0ab9561f0364d07f7a24ebf81159d0826a2c85705eae6391ffae6328bae6ca581264b5b3f3ca029510201387
+  checksum: 87c32b12fed981fe8a48de985dd1ae0350bcda2830ca4a35efe4b2b96932905cccd04e6e2de5bfea8ed4e2bf3b6f8315630ff9a09c72f80ff3c49f19a9fc80ff
   languageName: node
   linkType: hard
 
@@ -1709,7 +1676,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unimport: ^0.4.4
-    vite: ~3.0.0-beta.10
+    vite: ~3.0.0
   languageName: unknown
   linkType: soft
 
@@ -1800,8 +1767,8 @@ __metadata:
     "@nuxt/schema": ^3.0.0-rc.4
     "@rollup/plugin-replace": ^4.0.0
     "@types/cssnano": ^5
-    "@vitejs/plugin-vue": ~3.0.0-beta.1
-    "@vitejs/plugin-vue-jsx": ~2.0.0-beta.0
+    "@vitejs/plugin-vue": ^3.0.0
+    "@vitejs/plugin-vue-jsx": ^2.0.0
     autoprefixer: ^10.4.7
     chokidar: ^3.5.3
     cssnano: ^5.1.12
@@ -1826,10 +1793,10 @@ __metadata:
     rollup-plugin-visualizer: ^5.6.0
     ufo: ^0.8.5
     unbuild: latest
-    unplugin: ^0.7.1
-    vite: ~3.0.0-beta.10
+    unplugin: ^0.7.2
+    vite: ~3.0.0
     vite-node: ^0.18.0
-    vite-plugin-checker: ^0.4.8
+    vite-plugin-checker: ^0.4.9
     vue: 3.2.37
   peerDependencies:
     vue: ^3.2.37
@@ -2290,9 +2257,9 @@ __metadata:
   linkType: hard
 
 "@types/estree@npm:*":
-  version: 0.0.52
-  resolution: "@types/estree@npm:0.0.52"
-  checksum: d1cba22160e7aebf865ea0dbc30807bee272fdafdb57d8dd25749f4b312cd9a99e9e933340b7b26284d7a47c8805aba43bb46cf5f1df00cdaaec67bbdc894d4a
+  version: 1.0.0
+  resolution: "@types/estree@npm:1.0.0"
+  checksum: 910d97fb7092c6738d30a7430ae4786a38542023c6302b95d46f49420b797f21619cdde11fa92b338366268795884111c2eb10356e4bd2c8ad5b92941e9e6443
   languageName: node
   linkType: hard
 
@@ -2620,54 +2587,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.28.0":
-  version: 5.28.0
-  resolution: "@typescript-eslint/type-utils@npm:5.28.0"
-  dependencies:
-    "@typescript-eslint/utils": 5.30.5
-    debug: ^4.3.4
-    tsutils: ^3.21.0
-  peerDependencies:
-    eslint: "*"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 080cc1231729c34b778395658374e32d034474056f9b777dbc89d20d15eb93d93d0959328ad47c2a6623d40c6552364ababadce439842a944bce001f55b731b3
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/type-utils@npm:5.30.0":
-  version: 5.30.0
-  resolution: "@typescript-eslint/type-utils@npm:5.30.0"
-  dependencies:
-    "@typescript-eslint/utils": 5.30.6
-    debug: ^4.3.4
-    tsutils: ^3.21.0
-  peerDependencies:
-    eslint: "*"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 19b9479961c07e66230d73f9a396e5352bcdf6fa3f5fc175fad86ac617783fa61a5db53c872025974c196a44452b3b10afb0dd10b661dce37d04b2b86ee25ba2
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/type-utils@npm:5.30.5":
-  version: 5.30.5
-  resolution: "@typescript-eslint/type-utils@npm:5.30.5"
-  dependencies:
-    "@typescript-eslint/utils": 5.30.6
-    debug: ^4.3.4
-    tsutils: ^3.21.0
-  peerDependencies:
-    eslint: "*"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 19b9479961c07e66230d73f9a396e5352bcdf6fa3f5fc175fad86ac617783fa61a5db53c872025974c196a44452b3b10afb0dd10b661dce37d04b2b86ee25ba2
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/type-utils@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/type-utils@npm:5.30.6"
@@ -2684,27 +2603,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.28.0":
-  version: 5.28.0
-  resolution: "@typescript-eslint/types@npm:5.28.0"
-  checksum: e948915d6f24ece98043763a48e34ced5e16a1aa88cc86ea7d9057010ed92ce39457a753dd7a140be52f9b546b27f8a3b33bdc7d671427a386aa1aa381d908ef
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/types@npm:5.30.0":
-  version: 5.30.0
-  resolution: "@typescript-eslint/types@npm:5.30.0"
-  checksum: f83a506880d78419283a86e8aeb6c744b1d1a7fc3a366625125805daf0f9a7640a778537113b8865a4cdd985dcde53066820ea044a750126bc8b478eb93d4d12
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/types@npm:5.30.5":
-  version: 5.30.5
-  resolution: "@typescript-eslint/types@npm:5.30.5"
-  checksum: c70420618cb875d4e964a20a3fa4cf40cb97a8ad3123e24860e3d829edf3b081c77fa1fe25644700499d27e44aee5783abc7765deee61e2ef59a928db96b2175
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/types@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/types@npm:5.30.6"
@@ -2712,60 +2610,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.28.0":
-  version: 5.28.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.28.0"
-  dependencies:
-    "@typescript-eslint/types": 5.30.5
-    "@typescript-eslint/visitor-keys": 5.30.5
-    debug: ^4.3.4
-    globby: ^11.1.0
-    is-glob: ^4.0.3
-    semver: ^7.3.7
-    tsutils: ^3.21.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 19dce426c826cddd4aadf2fa15be943c6ad7d2038685cc2665749486a5f44a47819aab5d260b54f8a4babf6acf2500e9f62e709d61fce337b12d5468ff285277
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/typescript-estree@npm:5.30.0":
-  version: 5.30.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.30.0"
-  dependencies:
-    "@typescript-eslint/types": 5.30.6
-    "@typescript-eslint/visitor-keys": 5.30.6
-    debug: ^4.3.4
-    globby: ^11.1.0
-    is-glob: ^4.0.3
-    semver: ^7.3.7
-    tsutils: ^3.21.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 5621c03f1a6ca8866d91014cd30b53a37f9c4d664eb97bc2740294bcbf7efc0178e8699def752b86c97472e7b1b0cd9b6c0d9aa07a04decfe78bd16c21f93c4b
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/typescript-estree@npm:5.30.5":
-  version: 5.30.5
-  resolution: "@typescript-eslint/typescript-estree@npm:5.30.5"
-  dependencies:
-    "@typescript-eslint/types": 5.30.6
-    "@typescript-eslint/visitor-keys": 5.30.6
-    debug: ^4.3.4
-    globby: ^11.1.0
-    is-glob: ^4.0.3
-    semver: ^7.3.7
-    tsutils: ^3.21.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 5621c03f1a6ca8866d91014cd30b53a37f9c4d664eb97bc2740294bcbf7efc0178e8699def752b86c97472e7b1b0cd9b6c0d9aa07a04decfe78bd16c21f93c4b
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/typescript-estree@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/typescript-estree@npm:5.30.6"
@@ -2784,54 +2628,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.28.0":
-  version: 5.28.0
-  resolution: "@typescript-eslint/utils@npm:5.28.0"
-  dependencies:
-    "@types/json-schema": ^7.0.9
-    "@typescript-eslint/scope-manager": 5.30.5
-    "@typescript-eslint/types": 5.30.5
-    "@typescript-eslint/typescript-estree": 5.30.5
-    eslint-scope: ^5.1.1
-    eslint-utils: ^3.0.0
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 12f68cb34a150d39708f4e09a54964360f29589885cd50f119a2061660011752ec72eff3d90111f0e597575d32aae7250a6e2c730a84963e5e30352759d5f1f4
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/utils@npm:5.30.0":
-  version: 5.30.0
-  resolution: "@typescript-eslint/utils@npm:5.30.0"
-  dependencies:
-    "@types/json-schema": ^7.0.9
-    "@typescript-eslint/scope-manager": 5.30.6
-    "@typescript-eslint/types": 5.30.6
-    "@typescript-eslint/typescript-estree": 5.30.6
-    eslint-scope: ^5.1.1
-    eslint-utils: ^3.0.0
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: fc6f9ccf558d658cbeaa85c63bc1853385630c9522c8ae42524b652a6b3c69689fba67a49d79ce1fae2b4ec9c45e5aa9b791ac027d205edef27984d088ed1c3a
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/utils@npm:5.30.5":
-  version: 5.30.5
-  resolution: "@typescript-eslint/utils@npm:5.30.5"
-  dependencies:
-    "@types/json-schema": ^7.0.9
-    "@typescript-eslint/scope-manager": 5.30.6
-    "@typescript-eslint/types": 5.30.6
-    "@typescript-eslint/typescript-estree": 5.30.6
-    eslint-scope: ^5.1.1
-    eslint-utils: ^3.0.0
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: fc6f9ccf558d658cbeaa85c63bc1853385630c9522c8ae42524b652a6b3c69689fba67a49d79ce1fae2b4ec9c45e5aa9b791ac027d205edef27984d088ed1c3a
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/utils@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/utils@npm:5.30.6"
@@ -2848,36 +2644,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.28.0":
-  version: 5.28.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.28.0"
-  dependencies:
-    "@typescript-eslint/types": 5.30.5
-    eslint-visitor-keys: ^3.3.0
-  checksum: c0de9ae48378eec2682b860a059518bed213ea29575aad538d8d2f8137875e7279e375a7f23d38c1c183466fdd9cf1ca1db4ed5a1d374968f9460d83e48b2437
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/visitor-keys@npm:5.30.0":
-  version: 5.30.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.30.0"
-  dependencies:
-    "@typescript-eslint/types": 5.30.6
-    eslint-visitor-keys: ^3.3.0
-  checksum: e4ec0541d685d211274724c9f1887b6cdd03c7fc4fbdd1ea74c18311c3a5a9a2d4c676448ea714687ca13cc881ec5c73605de75fbf38f302ba8ea86d2b77897f
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/visitor-keys@npm:5.30.5":
-  version: 5.30.5
-  resolution: "@typescript-eslint/visitor-keys@npm:5.30.5"
-  dependencies:
-    "@typescript-eslint/types": 5.30.6
-    eslint-visitor-keys: ^3.3.0
-  checksum: e4ec0541d685d211274724c9f1887b6cdd03c7fc4fbdd1ea74c18311c3a5a9a2d4c676448ea714687ca13cc881ec5c73605de75fbf38f302ba8ea86d2b77897f
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:5.30.6":
   version: 5.30.6
   resolution: "@typescript-eslint/visitor-keys@npm:5.30.6"
@@ -2888,16 +2654,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@unocss/cli@npm:0.31.17":
-  version: 0.31.17
-  resolution: "@unocss/cli@npm:0.31.17"
-  dependencies:
-    "@typescript-eslint/types": 5.30.6
-    eslint-visitor-keys: ^3.3.0
-  checksum: e4ec0541d685d211274724c9f1887b6cdd03c7fc4fbdd1ea74c18311c3a5a9a2d4c676448ea714687ca13cc881ec5c73605de75fbf38f302ba8ea86d2b77897f
-  languageName: node
-  linkType: hard
-
 "@unocss/cli@npm:0.44.1":
   version: 0.44.1
   resolution: "@unocss/cli@npm:0.44.1"
@@ -3044,13 +2800,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@unocss/reset@npm:0.31.17, @unocss/reset@npm:^0.31.6":
-  version: 0.31.17
-  resolution: "@unocss/reset@npm:0.31.17"
-  checksum: 3a11e343e648fcd4894b2941c1daa8dd4076dcce3fd3f624f1b1e97c82fecb5200132835ac4936b1927ac709bc3b1d8b15f9fae8570ae75046a90902ac807bf8
-  languageName: node
-  linkType: hard
-
 "@unocss/reset@npm:0.44.1, @unocss/reset@npm:^0.44.1":
   version: 0.44.1
   resolution: "@unocss/reset@npm:0.44.1"
@@ -3058,20 +2807,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@unocss/reset@npm:^0.44.0":
-  version: 0.44.1
-  resolution: "@unocss/reset@npm:0.44.1"
-  checksum: ffb7c55059382e515aaa59da574dd97b03d2d0beb33f909a9768d10098064dcf144a2b24c1eb402ed2c00747884a75e2b511989c00adf5b58d466f5f51740b03
-  languageName: node
-  linkType: hard
-
-"@unocss/scope@npm:0.31.17":
-  version: 0.31.17
-  resolution: "@unocss/scope@npm:0.31.17"
-  checksum: 6936fe948d682f7e5b00200032d2d92814c6867d53c3cd1e23e3c5eb4d84279217c4fa7b9b49e25db04ffab181b18d5674618eb53d5e893acb5c655aab2d8cc9
-  languageName: node
-  linkType: hard
-
 "@unocss/scope@npm:0.44.1":
   version: 0.44.1
   resolution: "@unocss/scope@npm:0.44.1"
@@ -3088,16 +2823,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@unocss/transformer-directives@npm:0.31.17":
-  version: 0.31.17
-  resolution: "@unocss/transformer-directives@npm:0.31.17"
-  dependencies:
-    "@unocss/core": 0.44.1
-    "@unocss/preset-mini": 0.44.1
-  checksum: ac8d50aa9b597cef1529e700a8452e6f2ffe2d103e0f33ac64c8cabb9966a46e96bfe903c80c2a7087a5e36538b691cf3be3370e5677e5d26e7108eabad792aa
-  languageName: node
-  linkType: hard
-
 "@unocss/transformer-directives@npm:0.44.1":
   version: 0.44.1
   resolution: "@unocss/transformer-directives@npm:0.44.1"
@@ -3169,28 +2894,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue-jsx@npm:~2.0.0-beta.0":
-  version: 2.0.0-beta.0
-  resolution: "@vitejs/plugin-vue-jsx@npm:2.0.0-beta.0"
+"@vitejs/plugin-vue-jsx@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@vitejs/plugin-vue-jsx@npm:2.0.0"
   dependencies:
-    "@babel/core": ^7.18.5
+    "@babel/core": ^7.18.6
     "@babel/plugin-syntax-import-meta": ^7.10.4
-    "@babel/plugin-transform-typescript": ^7.18.4
+    "@babel/plugin-transform-typescript": ^7.18.8
     "@vue/babel-plugin-jsx": ^1.1.1
   peerDependencies:
-    vite: ^3.0.0-alpha
+    vite: ^3.0.0
     vue: ^3.0.0
-  checksum: eda947b9447f56779b0835eed3c6d2741d1de6fa9eeb25995c20d28d39885fc7e41761018cff7eb69a641f29e16070111e45d90044114e9287ec61da146c5452
+  checksum: 197b0dd0263b5b7df22a055155da6d9b7f21098f7de43e94589ce8daa494c12c9850157bc4e228a766fbe602aafa5935e4bef0edec9158a0507cee5581f0a067
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue@npm:~3.0.0-beta.1":
-  version: 3.0.0-beta.1
-  resolution: "@vitejs/plugin-vue@npm:3.0.0-beta.1"
+"@vitejs/plugin-vue@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@vitejs/plugin-vue@npm:3.0.0"
   peerDependencies:
-    vite: ^3.0.0-alpha
+    vite: ^3.0.0
     vue: ^3.2.25
-  checksum: 82b02f91ad5b0765bffc7af2d315d713bea13a30bd1935ba2ae6bf80bf9051975b4b1c36dd002c725f737a9855de647adf047bc7fada69a86358f75c70a9756e
+  checksum: e2c3e31afc39f83b16174ef4742e88e07b5516688f02dcbe9814afd62c859925173ec2d6a9f088c6098eb45cdae926122308596a8ece90028ffea169f15c685f
   languageName: node
   linkType: hard
 
@@ -3311,9 +3036,9 @@ __metadata:
   linkType: hard
 
 "@vue/devtools-api@npm:^6.0.0":
-  version: 6.2.0
-  resolution: "@vue/devtools-api@npm:6.2.0"
-  checksum: 20cc7a3393af1992e02dfdd21c494b33fc1ed00b7b6b57bea92ae360b43f938a416759e8c3c1a269ba44fe8ae4436b9520419a7a3f1a6d65fb3cf4d56c2e8763
+  version: 6.2.1
+  resolution: "@vue/devtools-api@npm:6.2.1"
+  checksum: 34765af0be9b0cc7e3def73b2792b1514e3c348852c5a7503fe07d013f0e907af6c27c0a32c0637dd748caf37c075af8e53ca3220433e0bd34b6f3405f358272
   languageName: node
   linkType: hard
 
@@ -3379,28 +3104,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vueuse/core@npm:8.7.3":
-  version: 8.7.3
-  resolution: "@vueuse/core@npm:8.7.3"
-  dependencies:
-    "@vueuse/metadata": 8.7.3
-    "@vueuse/shared": 8.7.3
-    vue-demi: "*"
-  peerDependencies:
-    "@vue/composition-api": ^1.1.0
-    vue: ^2.6.0 || ^3.2.0
-  peerDependenciesMeta:
-    "@vue/composition-api":
-      optional: true
-    vue:
-      optional: true
-  checksum: 76057184eeba1404494d0772e2d6c3c8afe9fa5a533bd31a28bcd491e10b5738d2b2990b6c41b497072e57098e319fb2d16a57b320e0a5f6ea333892f5b66b61
-  languageName: node
-  linkType: hard
-
-"@vueuse/core@npm:8.9.1, @vueuse/core@npm:^8.2.6":
-  version: 8.9.1
-  resolution: "@vueuse/core@npm:8.9.1"
+"@vueuse/core@npm:8.9.2, @vueuse/core@npm:^8.9.2":
+  version: 8.9.2
+  resolution: "@vueuse/core@npm:8.9.2"
   dependencies:
     "@types/web-bluetooth": ^0.0.14
     "@vueuse/metadata": 8.9.2
@@ -3418,123 +3124,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vueuse/core@npm:8.9.2, @vueuse/core@npm:^8.2.6":
-  version: 8.9.2
-  resolution: "@vueuse/core@npm:8.9.2"
-  dependencies:
-    "@types/web-bluetooth": ^0.0.14
-    "@vueuse/metadata": 8.9.2
-    "@vueuse/shared": 8.9.2
-    vue-demi: "*"
+"@vueuse/head@npm:^0.7.6":
+  version: 0.7.6
+  resolution: "@vueuse/head@npm:0.7.6"
   peerDependencies:
-    "@vue/composition-api": ^1.1.0
-    vue: ^2.6.0 || ^3.2.0
-  peerDependenciesMeta:
-    "@vue/composition-api":
-      optional: true
-    vue:
-      optional: true
-  checksum: 9d9d694c78468fcbecb8485807f673c035c272ad690e266b7b7c2e79023c0a6ee25c0318242737a87f6ca39ed43ea15d683ec66b991ae56b91cf6175e577c726
+    vue: ">=3"
+  checksum: d8f49f5c2894b0d517231424a73e0efc42c6887cf2cc9e9dce7190229ac736a1864bc60d952080be3fa620e1309dd120b34595ae7a02800f29c44949f1590a21
   languageName: node
   linkType: hard
 
-"@vueuse/core@npm:8.9.2, @vueuse/core@npm:^8.9.2":
+"@vueuse/integrations@npm:^8.9.2":
   version: 8.9.2
-  resolution: "@vueuse/core@npm:8.9.2"
+  resolution: "@vueuse/integrations@npm:8.9.2"
   dependencies:
-    "@types/web-bluetooth": ^0.0.14
-    "@vueuse/metadata": 8.9.2
-    "@vueuse/shared": 8.9.2
-    vue-demi: "*"
-  peerDependencies:
-    "@vue/composition-api": ^1.1.0
-    vue: ^2.6.0 || ^3.2.0
-  peerDependenciesMeta:
-    "@vue/composition-api":
-      optional: true
-    vue:
-      optional: true
-  checksum: 9d9d694c78468fcbecb8485807f673c035c272ad690e266b7b7c2e79023c0a6ee25c0318242737a87f6ca39ed43ea15d683ec66b991ae56b91cf6175e577c726
-  languageName: node
-  linkType: hard
-
-"@vueuse/core@npm:^8.2.6":
-  version: 8.7.5
-  resolution: "@vueuse/core@npm:8.7.5"
-  dependencies:
-    "@types/web-bluetooth": ^0.0.14
-    "@vueuse/metadata": 8.9.2
-    "@vueuse/shared": 8.9.2
-    vue-demi: "*"
-  peerDependencies:
-    "@vue/composition-api": ^1.1.0
-    vue: ^2.6.0 || ^3.2.0
-  peerDependenciesMeta:
-    "@vue/composition-api":
-      optional: true
-    vue:
-      optional: true
-  checksum: 9d9d694c78468fcbecb8485807f673c035c272ad690e266b7b7c2e79023c0a6ee25c0318242737a87f6ca39ed43ea15d683ec66b991ae56b91cf6175e577c726
-  languageName: node
-  linkType: hard
-
-"@vueuse/head@npm:^0.7.6":
-  version: 0.7.6
-  resolution: "@vueuse/head@npm:0.7.6"
-  peerDependencies:
-    vue: ">=3"
-  checksum: d8f49f5c2894b0d517231424a73e0efc42c6887cf2cc9e9dce7190229ac736a1864bc60d952080be3fa620e1309dd120b34595ae7a02800f29c44949f1590a21
-  languageName: node
-  linkType: hard
-
-"@vueuse/integrations@npm:^8.2.6":
-  version: 8.9.2
-  resolution: "@vueuse/integrations@npm:8.9.2"
-  dependencies:
-    "@vueuse/core": 8.9.2
-    "@vueuse/shared": 8.9.2
-    vue-demi: "*"
-  peerDependencies:
-    async-validator: "*"
-    axios: "*"
-    change-case: "*"
-    drauu: "*"
-    focus-trap: "*"
-    fuse.js: "*"
-    jwt-decode: "*"
-    nprogress: "*"
-    qrcode: "*"
-    universal-cookie: "*"
-  peerDependenciesMeta:
-    async-validator:
-      optional: true
-    axios:
-      optional: true
-    change-case:
-      optional: true
-    drauu:
-      optional: true
-    focus-trap:
-      optional: true
-    fuse.js:
-      optional: true
-    jwt-decode:
-      optional: true
-    nprogress:
-      optional: true
-    qrcode:
-      optional: true
-    universal-cookie:
-      optional: true
-  checksum: 1c3256bb44e061763a454661362f170a0f28bd609440117e80445f6be3b64c3f946b1cdbb0758df4550c30a01504c747f52859a0527cbb3460a111e7c6f47839
-  languageName: node
-  linkType: hard
-
-"@vueuse/integrations@npm:^8.9.2":
-  version: 8.9.2
-  resolution: "@vueuse/integrations@npm:8.9.2"
-  dependencies:
-    "@vueuse/core": 8.9.2
+    "@vueuse/core": 8.9.2
     "@vueuse/shared": 8.9.2
     vue-demi: "*"
   peerDependencies:
@@ -3573,20 +3176,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vueuse/metadata@npm:8.7.3":
-  version: 8.7.3
-  resolution: "@vueuse/metadata@npm:8.7.3"
-  checksum: f81c9b855c6dee37da74152cdc283f618cafcb7ae757cf5bde06483138ceb402d139efc8f59f565fec9f87dbaf1f7c61bf7945940936a79bad98fc6a5c50081b
-  languageName: node
-  linkType: hard
-
-"@vueuse/metadata@npm:8.9.1":
-  version: 8.9.1
-  resolution: "@vueuse/metadata@npm:8.9.1"
-  checksum: 06023a9bfbe68f0a837820bf808acdc7d14eb1c301dc0b861e1bd70b430c47636c6a42e2dcd57f33e82f383a91f2624f676fa8a906e787f805fb1cc630784ce4
-  languageName: node
-  linkType: hard
-
 "@vueuse/metadata@npm:8.9.2":
   version: 8.9.2
   resolution: "@vueuse/metadata@npm:8.9.2"
@@ -3594,19 +3183,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vueuse/nuxt@npm:^8.2.6":
-  version: 8.9.2
-  resolution: "@vueuse/nuxt@npm:8.9.2"
-  dependencies:
-    "@nuxt/kit": ^3.0.0-rc.4
-    "@vueuse/core": 8.9.2
-    "@vueuse/metadata": 8.9.2
-    local-pkg: ^0.4.1
-    vue-demi: "*"
-  checksum: 454c45c20dd262e8b613a90e0c8d49ae298b8118b47b14d0eaeb66763407c5d203ef8aeced36a8d4f171c9c03caf38cd47b415199a2cbffffbaac3a9c24b40ef
-  languageName: node
-  linkType: hard
-
 "@vueuse/nuxt@npm:^8.9.2":
   version: 8.9.2
   resolution: "@vueuse/nuxt@npm:8.9.2"
@@ -3620,40 +3196,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vueuse/shared@npm:8.7.3":
-  version: 8.7.3
-  resolution: "@vueuse/shared@npm:8.7.3"
-  dependencies:
-    vue-demi: "*"
-  peerDependencies:
-    "@vue/composition-api": ^1.1.0
-    vue: ^2.6.0 || ^3.2.0
-  peerDependenciesMeta:
-    "@vue/composition-api":
-      optional: true
-    vue:
-      optional: true
-  checksum: a5ee09074a77b9fd3189a5897d07eb78e68215f6623014132afc6530f3486ec8e5b8318931049eb01e35aabd1559ad700ad21be188dcc67f9402275433864359
-  languageName: node
-  linkType: hard
-
-"@vueuse/shared@npm:8.9.1":
-  version: 8.9.1
-  resolution: "@vueuse/shared@npm:8.9.1"
-  dependencies:
-    vue-demi: "*"
-  peerDependencies:
-    "@vue/composition-api": ^1.1.0
-    vue: ^2.6.0 || ^3.2.0
-  peerDependenciesMeta:
-    "@vue/composition-api":
-      optional: true
-    vue:
-      optional: true
-  checksum: e6085a9c19a4be4edd40775656958e4f8fdb82e338442e09c30aada0d7e1abc55c58393fbbf0dc782a59ff7594d93b125a4aef1ccadda84479c41dd013d5ac11
-  languageName: node
-  linkType: hard
-
 "@vueuse/shared@npm:8.9.2":
   version: 8.9.2
   resolution: "@vueuse/shared@npm:8.9.2"
@@ -4541,9 +4083,9 @@ __metadata:
   linkType: hard
 
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001335, caniuse-lite@npm:^1.0.30001359":
-  version: 1.0.30001365
-  resolution: "caniuse-lite@npm:1.0.30001365"
-  checksum: 5d043006e9bd9de1ae06c0e12c31997f0ed26f889f47ea6403dc2d08f46a5bd4bf0fe1a5b1099561fc447201ddf13083f277de68829e77fd238ff2af8c05e0a6
+  version: 1.0.30001366
+  resolution: "caniuse-lite@npm:1.0.30001366"
+  checksum: eeb878e0be4090a4247dd3de5392ff1a864d086e5401790c7c81697918ce6ce3dac75956a21f9404b5ac770bfdabdb18619d0f920dc2295f3211ee893355f697
   languageName: node
   linkType: hard
 
@@ -5692,9 +5234,9 @@ __metadata:
   linkType: hard
 
 "electron-to-chromium@npm:^1.4.172":
-  version: 1.4.186
-  resolution: "electron-to-chromium@npm:1.4.186"
-  checksum: 9f87db963070473702c0a999dc4066fdd12abff0b2b98dfae1c7492b62fe3feb42bae64ff7fd837e4e347dab043a411e82cab64ada902726b782c60bf9fc40de
+  version: 1.4.187
+  resolution: "electron-to-chromium@npm:1.4.187"
+  checksum: 258be88d92b3f34ffba8ea1d90ecc918f6aa74954af67d0439a649648a17738dad3042ef3f26be141177f5ffb0c5c90dfcaa18ae4dba7bc2937ff21d64a9acb6
   languageName: node
   linkType: hard
 
@@ -5994,628 +5536,60 @@ __metadata:
   resolution: "esbuild-loader@npm:2.19.0"
   dependencies:
     esbuild: ^0.14.39
-    joycon: ^3.0.1
-    json5: ^2.2.0
-    loader-utils: ^2.0.0
-    tapable: ^2.2.0
-    webpack-sources: ^2.2.0
-  peerDependencies:
-    webpack: ^4.40.0 || ^5.0.0
-  checksum: 7dc8deca3ab6f8684437359ce6d407d18622ba7cb7f0a22f44861f72b34405431070a6137e366232bea2418e37a54fe04299951a588fec54058f047e65616adc
-  languageName: node
-  linkType: hard
-
-"esbuild-netbsd-64@npm:0.14.49":
-  version: 0.14.49
-  resolution: "esbuild-netbsd-64@npm:0.14.49"
-  conditions: os=netbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-openbsd-64@npm:0.14.49":
-  version: 0.14.49
-  resolution: "esbuild-openbsd-64@npm:0.14.49"
-  conditions: os=openbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-sunos-64@npm:0.14.49":
-  version: 0.14.49
-  resolution: "esbuild-sunos-64@npm:0.14.49"
-  conditions: os=sunos & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-32@npm:0.14.49":
-  version: 0.14.49
-  resolution: "esbuild-windows-32@npm:0.14.49"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-64@npm:0.14.49":
-  version: 0.14.49
-  resolution: "esbuild-windows-64@npm:0.14.49"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-windows-arm64@npm:0.14.49":
-  version: 0.14.49
-  resolution: "esbuild-windows-arm64@npm:0.14.49"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.14.27, esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.47":
-  version: 0.14.47
-  resolution: "esbuild@npm:0.14.47"
-  dependencies:
-    esbuild-android-64: 0.14.47
-    esbuild-android-arm64: 0.14.47
-    esbuild-darwin-64: 0.14.47
-    esbuild-darwin-arm64: 0.14.47
-    esbuild-freebsd-64: 0.14.47
-    esbuild-freebsd-arm64: 0.14.47
-    esbuild-linux-32: 0.14.47
-    esbuild-linux-64: 0.14.47
-    esbuild-linux-arm: 0.14.47
-    esbuild-linux-arm64: 0.14.47
-    esbuild-linux-mips64le: 0.14.47
-    esbuild-linux-ppc64le: 0.14.47
-    esbuild-linux-riscv64: 0.14.47
-    esbuild-linux-s390x: 0.14.47
-    esbuild-netbsd-64: 0.14.47
-    esbuild-openbsd-64: 0.14.47
-    esbuild-sunos-64: 0.14.47
-    esbuild-windows-32: 0.14.47
-    esbuild-windows-64: 0.14.47
-    esbuild-windows-arm64: 0.14.47
-  dependenciesMeta:
-    esbuild-android-64:
-      optional: true
-    esbuild-android-arm64:
-      optional: true
-    esbuild-darwin-64:
-      optional: true
-    esbuild-darwin-arm64:
-      optional: true
-    esbuild-freebsd-64:
-      optional: true
-    esbuild-freebsd-arm64:
-      optional: true
-    esbuild-linux-32:
-      optional: true
-    esbuild-linux-64:
-      optional: true
-    esbuild-linux-arm:
-      optional: true
-    esbuild-linux-arm64:
-      optional: true
-    esbuild-linux-mips64le:
-      optional: true
-    esbuild-linux-ppc64le:
-      optional: true
-    esbuild-linux-riscv64:
-      optional: true
-    esbuild-linux-s390x:
-      optional: true
-    esbuild-netbsd-64:
-      optional: true
-    esbuild-openbsd-64:
-      optional: true
-    esbuild-sunos-64:
-      optional: true
-    esbuild-windows-32:
-      optional: true
-    esbuild-windows-64:
-      optional: true
-    esbuild-windows-arm64:
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: 77a8bff8c3fe52dc9d2823448843b0f53c9a9f3701e3637a54e396270c9ca04cc46a4b08ef86cbaa8d202854e02c790f61683bfa75ebff540b1e24414f536e91
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.14.27, esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.47, esbuild@npm:^0.14.49":
-  version: 0.14.49
-  resolution: "esbuild@npm:0.14.49"
-  dependencies:
-    esbuild-android-64: 0.14.49
-    esbuild-android-arm64: 0.14.49
-    esbuild-darwin-64: 0.14.49
-    esbuild-darwin-arm64: 0.14.49
-    esbuild-freebsd-64: 0.14.49
-    esbuild-freebsd-arm64: 0.14.49
-    esbuild-linux-32: 0.14.49
-    esbuild-linux-64: 0.14.49
-    esbuild-linux-arm: 0.14.49
-    esbuild-linux-arm64: 0.14.49
-    esbuild-linux-mips64le: 0.14.49
-    esbuild-linux-ppc64le: 0.14.49
-    esbuild-linux-riscv64: 0.14.49
-    esbuild-linux-s390x: 0.14.49
-    esbuild-netbsd-64: 0.14.49
-    esbuild-openbsd-64: 0.14.49
-    esbuild-sunos-64: 0.14.49
-    esbuild-windows-32: 0.14.49
-    esbuild-windows-64: 0.14.49
-    esbuild-windows-arm64: 0.14.49
-  dependenciesMeta:
-    esbuild-android-64:
-      optional: true
-    esbuild-android-arm64:
-      optional: true
-    esbuild-darwin-64:
-      optional: true
-    esbuild-darwin-arm64:
-      optional: true
-    esbuild-freebsd-64:
-      optional: true
-    esbuild-freebsd-arm64:
-      optional: true
-    esbuild-linux-32:
-      optional: true
-    esbuild-linux-64:
-      optional: true
-    esbuild-linux-arm:
-      optional: true
-    esbuild-linux-arm64:
-      optional: true
-    esbuild-linux-mips64le:
-      optional: true
-    esbuild-linux-ppc64le:
-      optional: true
-    esbuild-linux-riscv64:
-      optional: true
-    esbuild-linux-s390x:
-      optional: true
-    esbuild-netbsd-64:
-      optional: true
-    esbuild-openbsd-64:
-      optional: true
-    esbuild-sunos-64:
-      optional: true
-    esbuild-windows-32:
-      optional: true
-    esbuild-windows-64:
-      optional: true
-    esbuild-windows-arm64:
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: b718f4c9eaf2f83bb26f2cdb18d82d70365179ae8d1d88636afc3073a0c328364340695798b9a6322ae15e31b90e1f71266151f61637412649fb31bb3ecb2e0a
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.14.36, esbuild@npm:^0.14.38, esbuild@npm:^0.14.39, esbuild@npm:^0.14.43":
-  version: 0.14.43
-  resolution: "esbuild@npm:0.14.43"
-  dependencies:
-    esbuild-android-64: 0.14.45
-    esbuild-android-arm64: 0.14.45
-    esbuild-darwin-64: 0.14.45
-    esbuild-darwin-arm64: 0.14.45
-    esbuild-freebsd-64: 0.14.45
-    esbuild-freebsd-arm64: 0.14.45
-    esbuild-linux-32: 0.14.45
-    esbuild-linux-64: 0.14.45
-    esbuild-linux-arm: 0.14.45
-    esbuild-linux-arm64: 0.14.45
-    esbuild-linux-mips64le: 0.14.45
-    esbuild-linux-ppc64le: 0.14.45
-    esbuild-linux-riscv64: 0.14.45
-    esbuild-linux-s390x: 0.14.45
-    esbuild-netbsd-64: 0.14.45
-    esbuild-openbsd-64: 0.14.45
-    esbuild-sunos-64: 0.14.45
-    esbuild-windows-32: 0.14.45
-    esbuild-windows-64: 0.14.45
-    esbuild-windows-arm64: 0.14.45
-  dependenciesMeta:
-    esbuild-android-64:
-      optional: true
-    esbuild-android-arm64:
-      optional: true
-    esbuild-darwin-64:
-      optional: true
-    esbuild-darwin-arm64:
-      optional: true
-    esbuild-freebsd-64:
-      optional: true
-    esbuild-freebsd-arm64:
-      optional: true
-    esbuild-linux-32:
-      optional: true
-    esbuild-linux-64:
-      optional: true
-    esbuild-linux-arm:
-      optional: true
-    esbuild-linux-arm64:
-      optional: true
-    esbuild-linux-mips64le:
-      optional: true
-    esbuild-linux-ppc64le:
-      optional: true
-    esbuild-linux-riscv64:
-      optional: true
-    esbuild-linux-s390x:
-      optional: true
-    esbuild-netbsd-64:
-      optional: true
-    esbuild-openbsd-64:
-      optional: true
-    esbuild-sunos-64:
-      optional: true
-    esbuild-windows-32:
-      optional: true
-    esbuild-windows-64:
-      optional: true
-    esbuild-windows-arm64:
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: 8b359f73564896aa82fc4b11f596d576becd7de8b408d6dbc8751fe6026dccefe3a920ce1ee7eb6b2c4078f45c42395692bf50a7d498acfc0571148cdb9e5461
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.43":
-  version: 0.14.45
-  resolution: "esbuild@npm:0.14.45"
-  dependencies:
-    esbuild-android-64: 0.14.45
-    esbuild-android-arm64: 0.14.45
-    esbuild-darwin-64: 0.14.45
-    esbuild-darwin-arm64: 0.14.45
-    esbuild-freebsd-64: 0.14.45
-    esbuild-freebsd-arm64: 0.14.45
-    esbuild-linux-32: 0.14.45
-    esbuild-linux-64: 0.14.45
-    esbuild-linux-arm: 0.14.45
-    esbuild-linux-arm64: 0.14.45
-    esbuild-linux-mips64le: 0.14.45
-    esbuild-linux-ppc64le: 0.14.45
-    esbuild-linux-riscv64: 0.14.45
-    esbuild-linux-s390x: 0.14.45
-    esbuild-netbsd-64: 0.14.45
-    esbuild-openbsd-64: 0.14.45
-    esbuild-sunos-64: 0.14.45
-    esbuild-windows-32: 0.14.45
-    esbuild-windows-64: 0.14.45
-    esbuild-windows-arm64: 0.14.45
-  dependenciesMeta:
-    esbuild-android-64:
-      optional: true
-    esbuild-android-arm64:
-      optional: true
-    esbuild-darwin-64:
-      optional: true
-    esbuild-darwin-arm64:
-      optional: true
-    esbuild-freebsd-64:
-      optional: true
-    esbuild-freebsd-arm64:
-      optional: true
-    esbuild-linux-32:
-      optional: true
-    esbuild-linux-64:
-      optional: true
-    esbuild-linux-arm:
-      optional: true
-    esbuild-linux-arm64:
-      optional: true
-    esbuild-linux-mips64le:
-      optional: true
-    esbuild-linux-ppc64le:
-      optional: true
-    esbuild-linux-riscv64:
-      optional: true
-    esbuild-linux-s390x:
-      optional: true
-    esbuild-netbsd-64:
-      optional: true
-    esbuild-openbsd-64:
-      optional: true
-    esbuild-sunos-64:
-      optional: true
-    esbuild-windows-32:
-      optional: true
-    esbuild-windows-64:
-      optional: true
-    esbuild-windows-arm64:
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: 8b359f73564896aa82fc4b11f596d576becd7de8b408d6dbc8751fe6026dccefe3a920ce1ee7eb6b2c4078f45c42395692bf50a7d498acfc0571148cdb9e5461
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.47, esbuild@npm:^0.14.48":
-  version: 0.14.48
-  resolution: "esbuild@npm:0.14.48"
-  dependencies:
-    esbuild-android-64: 0.14.49
-    esbuild-android-arm64: 0.14.49
-    esbuild-darwin-64: 0.14.49
-    esbuild-darwin-arm64: 0.14.49
-    esbuild-freebsd-64: 0.14.49
-    esbuild-freebsd-arm64: 0.14.49
-    esbuild-linux-32: 0.14.49
-    esbuild-linux-64: 0.14.49
-    esbuild-linux-arm: 0.14.49
-    esbuild-linux-arm64: 0.14.49
-    esbuild-linux-mips64le: 0.14.49
-    esbuild-linux-ppc64le: 0.14.49
-    esbuild-linux-riscv64: 0.14.49
-    esbuild-linux-s390x: 0.14.49
-    esbuild-netbsd-64: 0.14.49
-    esbuild-openbsd-64: 0.14.49
-    esbuild-sunos-64: 0.14.49
-    esbuild-windows-32: 0.14.49
-    esbuild-windows-64: 0.14.49
-    esbuild-windows-arm64: 0.14.49
-  dependenciesMeta:
-    esbuild-android-64:
-      optional: true
-    esbuild-android-arm64:
-      optional: true
-    esbuild-darwin-64:
-      optional: true
-    esbuild-darwin-arm64:
-      optional: true
-    esbuild-freebsd-64:
-      optional: true
-    esbuild-freebsd-arm64:
-      optional: true
-    esbuild-linux-32:
-      optional: true
-    esbuild-linux-64:
-      optional: true
-    esbuild-linux-arm:
-      optional: true
-    esbuild-linux-arm64:
-      optional: true
-    esbuild-linux-mips64le:
-      optional: true
-    esbuild-linux-ppc64le:
-      optional: true
-    esbuild-linux-riscv64:
-      optional: true
-    esbuild-linux-s390x:
-      optional: true
-    esbuild-netbsd-64:
-      optional: true
-    esbuild-openbsd-64:
-      optional: true
-    esbuild-sunos-64:
-      optional: true
-    esbuild-windows-32:
-      optional: true
-    esbuild-windows-64:
-      optional: true
-    esbuild-windows-arm64:
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: b718f4c9eaf2f83bb26f2cdb18d82d70365179ae8d1d88636afc3073a0c328364340695798b9a6322ae15e31b90e1f71266151f61637412649fb31bb3ecb2e0a
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.47, esbuild@npm:^0.14.49":
-  version: 0.14.49
-  resolution: "esbuild@npm:0.14.49"
-  dependencies:
-    esbuild-android-64: 0.14.49
-    esbuild-android-arm64: 0.14.49
-    esbuild-darwin-64: 0.14.49
-    esbuild-darwin-arm64: 0.14.49
-    esbuild-freebsd-64: 0.14.49
-    esbuild-freebsd-arm64: 0.14.49
-    esbuild-linux-32: 0.14.49
-    esbuild-linux-64: 0.14.49
-    esbuild-linux-arm: 0.14.49
-    esbuild-linux-arm64: 0.14.49
-    esbuild-linux-mips64le: 0.14.49
-    esbuild-linux-ppc64le: 0.14.49
-    esbuild-linux-riscv64: 0.14.49
-    esbuild-linux-s390x: 0.14.49
-    esbuild-netbsd-64: 0.14.49
-    esbuild-openbsd-64: 0.14.49
-    esbuild-sunos-64: 0.14.49
-    esbuild-windows-32: 0.14.49
-    esbuild-windows-64: 0.14.49
-    esbuild-windows-arm64: 0.14.49
-  dependenciesMeta:
-    esbuild-android-64:
-      optional: true
-    esbuild-android-arm64:
-      optional: true
-    esbuild-darwin-64:
-      optional: true
-    esbuild-darwin-arm64:
-      optional: true
-    esbuild-freebsd-64:
-      optional: true
-    esbuild-freebsd-arm64:
-      optional: true
-    esbuild-linux-32:
-      optional: true
-    esbuild-linux-64:
-      optional: true
-    esbuild-linux-arm:
-      optional: true
-    esbuild-linux-arm64:
-      optional: true
-    esbuild-linux-mips64le:
-      optional: true
-    esbuild-linux-ppc64le:
-      optional: true
-    esbuild-linux-riscv64:
-      optional: true
-    esbuild-linux-s390x:
-      optional: true
-    esbuild-netbsd-64:
-      optional: true
-    esbuild-openbsd-64:
-      optional: true
-    esbuild-sunos-64:
-      optional: true
-    esbuild-windows-32:
-      optional: true
-    esbuild-windows-64:
-      optional: true
-    esbuild-windows-arm64:
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: b718f4c9eaf2f83bb26f2cdb18d82d70365179ae8d1d88636afc3073a0c328364340695798b9a6322ae15e31b90e1f71266151f61637412649fb31bb3ecb2e0a
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.14.47":
-  version: 0.14.47
-  resolution: "esbuild@npm:0.14.47"
-  dependencies:
-    esbuild-android-64: 0.14.47
-    esbuild-android-arm64: 0.14.47
-    esbuild-darwin-64: 0.14.47
-    esbuild-darwin-arm64: 0.14.47
-    esbuild-freebsd-64: 0.14.47
-    esbuild-freebsd-arm64: 0.14.47
-    esbuild-linux-32: 0.14.47
-    esbuild-linux-64: 0.14.47
-    esbuild-linux-arm: 0.14.47
-    esbuild-linux-arm64: 0.14.47
-    esbuild-linux-mips64le: 0.14.47
-    esbuild-linux-ppc64le: 0.14.47
-    esbuild-linux-riscv64: 0.14.47
-    esbuild-linux-s390x: 0.14.47
-    esbuild-netbsd-64: 0.14.47
-    esbuild-openbsd-64: 0.14.47
-    esbuild-sunos-64: 0.14.47
-    esbuild-windows-32: 0.14.47
-    esbuild-windows-64: 0.14.47
-    esbuild-windows-arm64: 0.14.47
-  dependenciesMeta:
-    esbuild-android-64:
-      optional: true
-    esbuild-android-arm64:
-      optional: true
-    esbuild-darwin-64:
-      optional: true
-    esbuild-darwin-arm64:
-      optional: true
-    esbuild-freebsd-64:
-      optional: true
-    esbuild-freebsd-arm64:
-      optional: true
-    esbuild-linux-32:
-      optional: true
-    esbuild-linux-64:
-      optional: true
-    esbuild-linux-arm:
-      optional: true
-    esbuild-linux-arm64:
-      optional: true
-    esbuild-linux-mips64le:
-      optional: true
-    esbuild-linux-ppc64le:
-      optional: true
-    esbuild-linux-riscv64:
-      optional: true
-    esbuild-linux-s390x:
-      optional: true
-    esbuild-netbsd-64:
-      optional: true
-    esbuild-openbsd-64:
-      optional: true
-    esbuild-sunos-64:
-      optional: true
-    esbuild-windows-32:
-      optional: true
-    esbuild-windows-64:
-      optional: true
-    esbuild-windows-arm64:
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: 77a8bff8c3fe52dc9d2823448843b0f53c9a9f3701e3637a54e396270c9ca04cc46a4b08ef86cbaa8d202854e02c790f61683bfa75ebff540b1e24414f536e91
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.14.48":
-  version: 0.14.48
-  resolution: "esbuild@npm:0.14.48"
-  dependencies:
-    esbuild-android-64: 0.14.49
-    esbuild-android-arm64: 0.14.49
-    esbuild-darwin-64: 0.14.49
-    esbuild-darwin-arm64: 0.14.49
-    esbuild-freebsd-64: 0.14.49
-    esbuild-freebsd-arm64: 0.14.49
-    esbuild-linux-32: 0.14.49
-    esbuild-linux-64: 0.14.49
-    esbuild-linux-arm: 0.14.49
-    esbuild-linux-arm64: 0.14.49
-    esbuild-linux-mips64le: 0.14.49
-    esbuild-linux-ppc64le: 0.14.49
-    esbuild-linux-riscv64: 0.14.49
-    esbuild-linux-s390x: 0.14.49
-    esbuild-netbsd-64: 0.14.49
-    esbuild-openbsd-64: 0.14.49
-    esbuild-sunos-64: 0.14.49
-    esbuild-windows-32: 0.14.49
-    esbuild-windows-64: 0.14.49
-    esbuild-windows-arm64: 0.14.49
-  dependenciesMeta:
-    esbuild-android-64:
-      optional: true
-    esbuild-android-arm64:
-      optional: true
-    esbuild-darwin-64:
-      optional: true
-    esbuild-darwin-arm64:
-      optional: true
-    esbuild-freebsd-64:
-      optional: true
-    esbuild-freebsd-arm64:
-      optional: true
-    esbuild-linux-32:
-      optional: true
-    esbuild-linux-64:
-      optional: true
-    esbuild-linux-arm:
-      optional: true
-    esbuild-linux-arm64:
-      optional: true
-    esbuild-linux-mips64le:
-      optional: true
-    esbuild-linux-ppc64le:
-      optional: true
-    esbuild-linux-riscv64:
-      optional: true
-    esbuild-linux-s390x:
-      optional: true
-    esbuild-netbsd-64:
-      optional: true
-    esbuild-openbsd-64:
-      optional: true
-    esbuild-sunos-64:
-      optional: true
-    esbuild-windows-32:
-      optional: true
-    esbuild-windows-64:
-      optional: true
-    esbuild-windows-arm64:
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: b718f4c9eaf2f83bb26f2cdb18d82d70365179ae8d1d88636afc3073a0c328364340695798b9a6322ae15e31b90e1f71266151f61637412649fb31bb3ecb2e0a
+    joycon: ^3.0.1
+    json5: ^2.2.0
+    loader-utils: ^2.0.0
+    tapable: ^2.2.0
+    webpack-sources: ^2.2.0
+  peerDependencies:
+    webpack: ^4.40.0 || ^5.0.0
+  checksum: 7dc8deca3ab6f8684437359ce6d407d18622ba7cb7f0a22f44861f72b34405431070a6137e366232bea2418e37a54fe04299951a588fec54058f047e65616adc
+  languageName: node
+  linkType: hard
+
+"esbuild-netbsd-64@npm:0.14.49":
+  version: 0.14.49
+  resolution: "esbuild-netbsd-64@npm:0.14.49"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-openbsd-64@npm:0.14.49":
+  version: 0.14.49
+  resolution: "esbuild-openbsd-64@npm:0.14.49"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-sunos-64@npm:0.14.49":
+  version: 0.14.49
+  resolution: "esbuild-sunos-64@npm:0.14.49"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-windows-32@npm:0.14.49":
+  version: 0.14.49
+  resolution: "esbuild-windows-32@npm:0.14.49"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"esbuild-windows-64@npm:0.14.49":
+  version: 0.14.49
+  resolution: "esbuild-windows-64@npm:0.14.49"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"esbuild-windows-arm64@npm:0.14.49":
+  version: 0.14.49
+  resolution: "esbuild-windows-arm64@npm:0.14.49"
+  conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.14.49":
+"esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.47, esbuild@npm:^0.14.49":
   version: 0.14.49
   resolution: "esbuild@npm:0.14.49"
   dependencies:
@@ -8983,15 +7957,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jiti@npm:^1.14.0":
-  version: 1.14.0
-  resolution: "jiti@npm:1.14.0"
-  bin:
-    jiti: bin/jiti.js
-  checksum: 61e7123caa397b8a53068120b7496b95048b96feba3cc1a263265e9b0bcfb375e90a182e07643a29e5380d92c485918d5e7db3805cc9511404e7e9c93234725b
-  languageName: node
-  linkType: hard
-
 "joycon@npm:^3.0.1":
   version: 3.1.1
   resolution: "joycon@npm:3.1.1"
@@ -9525,9 +8490,9 @@ __metadata:
   linkType: hard
 
 "lru-cache@npm:^7.4.4, lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1":
-  version: 7.12.0
-  resolution: "lru-cache@npm:7.12.0"
-  checksum: fdb62262978393df7a4bd46a072bc5c3808c50ca5a347a82bb9459410efd841b7bae50655c3cf9004c70d12c756cf6d018f6bff155a16cdde9eba9a82899b5eb
+  version: 7.13.0
+  resolution: "lru-cache@npm:7.13.0"
+  checksum: 95a13e0f3691db9be3e78b597e347c2a4911f7303a514076dbc185b472683fa6e06dcaad74b5fc35fa1192c2cfe4b0bbaf3778b5066503eedd1b92bfec864c4c
   languageName: node
   linkType: hard
 
@@ -10184,8 +9149,8 @@ __metadata:
   linkType: hard
 
 "nitropack@npm:^0.4.9":
-  version: 0.4.9
-  resolution: "nitropack@npm:0.4.9"
+  version: 0.4.10
+  resolution: "nitropack@npm:0.4.10"
   dependencies:
     "@cloudflare/kv-asset-handler": ^0.2.0
     "@netlify/functions": ^1.0.0
@@ -10200,7 +9165,7 @@ __metadata:
     "@types/jsdom": ^16.2.14
     "@vercel/nft": ^0.20.1
     archiver: ^5.3.1
-    c12: ^0.2.7
+    c12: ^0.2.8
     chalk: ^5.0.1
     chokidar: ^3.5.3
     consola: ^2.15.3
@@ -10208,7 +9173,7 @@ __metadata:
     defu: ^6.0.0
     destr: ^1.1.1
     dot-prop: ^7.2.0
-    esbuild: ^0.14.47
+    esbuild: ^0.14.49
     escape-string-regexp: ^5.0.0
     etag: ^1.8.1
     fs-extra: ^10.1.0
@@ -10227,12 +9192,12 @@ __metadata:
     node-fetch-native: ^0.1.4
     ohash: ^0.1.0
     ohmyfetch: ^0.4.18
-    pathe: ^0.3.1
+    pathe: ^0.3.2
     perfect-debounce: ^0.1.3
     pkg-types: ^0.3.3
     pretty-bytes: ^6.0.0
     radix3: ^0.1.2
-    rollup: ^2.75.7
+    rollup: ^2.76.0
     rollup-plugin-terser: ^7.0.2
     rollup-plugin-visualizer: ^5.6.0
     scule: ^0.2.1
@@ -10242,14 +9207,14 @@ __metadata:
     source-map-support: ^0.5.21
     std-env: ^3.1.1
     table: ^6.8.0
-    ufo: ^0.8.4
+    ufo: ^0.8.5
     unenv: ^0.5.2
-    unimport: ^0.4.0
-    unstorage: ^0.5.3
+    unimport: ^0.4.4
+    unstorage: ^0.5.4
   bin:
     nitro: dist/cli.mjs
     nitropack: dist/cli.mjs
-  checksum: c333e468dcfa1a00214a454651267a2606c155d42f43f5944772e454ee577e1201c1cb4edf31e5d7fc9e45e97bdb07034dfe978a1038ac7e0ca0860bce38a29f
+  checksum: 3f8538485c3160aec56135f7dbece37431cb4c710a7d3d0a5c4c1963e60507fbcb52fed3338dd6fd6a1ffb06e93fddbb38abadb0e736afe0708a00d31408fc0f
   languageName: node
   linkType: hard
 
@@ -10282,13 +9247,13 @@ __metadata:
   linkType: hard
 
 "node-fetch@npm:^3.2.3":
-  version: 3.2.7
-  resolution: "node-fetch@npm:3.2.7"
+  version: 3.2.8
+  resolution: "node-fetch@npm:3.2.8"
   dependencies:
     data-uri-to-buffer: ^4.0.0
     fetch-blob: ^3.1.4
     formdata-polyfill: ^4.0.10
-  checksum: 834210e704341558b78bb13d71e593ce2a3a6485a1bf357ae27c7fc1be581e388dee5aa1214e05da53e2a4aace7101a46d3298772666ede11ed049f782788e6c
+  checksum: 2f7fc3e59fbede43a273e988d2f2a3dd68160618114e32ad537477db253808b65221f1dbfd666b8fb33ff07bf1de9d6448035b0f8ada5ef876c5afec93b27318
   languageName: node
   linkType: hard
 
@@ -10528,8 +9493,8 @@ __metadata:
   linkType: hard
 
 "npm-registry-fetch@npm:^13.0.0, npm-registry-fetch@npm:^13.0.1":
-  version: 13.1.1
-  resolution: "npm-registry-fetch@npm:13.1.1"
+  version: 13.2.0
+  resolution: "npm-registry-fetch@npm:13.2.0"
   dependencies:
     make-fetch-happen: ^10.0.6
     minipass: ^3.1.6
@@ -10538,7 +9503,7 @@ __metadata:
     minizlib: ^2.1.2
     npm-package-arg: ^9.0.1
     proc-log: ^2.0.0
-  checksum: e085faf5cdc1cfe9b8f825065a0823531b2a28799d84614b3971e344dde087f9089c0f0220360771a81f110c5444978c6f7309084ff7d7d396252b068148bb44
+  checksum: be5f53dede252d051137897c4efc615102c27fb250671564feaf03394d0532c24d57c7b3e374b943b28988f2e9381c0b10a57146b0f5adb68d93ccfcbfb802ed
   languageName: node
   linkType: hard
 
@@ -11452,20 +10417,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-loader@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "postcss-loader@npm:7.0.1"
-  dependencies:
-    cosmiconfig: ^7.0.0
-    klona: ^2.0.5
-    semver: ^7.3.7
-  peerDependencies:
-    postcss: ^7.0.0 || ^8.0.1
-    webpack: ^5.0.0
-  checksum: 2a3cbcaaade598d4919824d384ae34ffbfc14a9c8db6cc3b154582356f4f44a1c9af9e731b81cf1947b089accf7d0ab7a0c51c717946985f89aa1708d2b4304d
-  languageName: node
-  linkType: hard
-
 "postcss-loader@npm:^7.0.1":
   version: 7.0.1
   resolution: "postcss-loader@npm:7.0.1"
@@ -12408,105 +11359,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^2.59.0, rollup@npm:^2.70.1, rollup@npm:^2.75.7":
-  version: 2.75.7
-  resolution: "rollup@npm:2.75.7"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: a6331d46b01062b184efdcb42ce12caf2e1575f989963944534b02f5855f6f3bc239ed0c1a18893572d7695af6d83166f3aef59dbd0365084e1531cb67824674
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^2.59.0, rollup@npm:^2.70.1, rollup@npm:^2.75.7, rollup@npm:^2.76.0":
-  version: 2.76.0
-  resolution: "rollup@npm:2.76.0"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: 58293e1c63c11d4afcfcf619601d5c5136dd3d0c9d3bd6a0b6141fede32027edc1eb53873bbb9a9c1e95e86c67f6ad66185720031b6eadf325972174d1d8fbcb
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^2.70.1, rollup@npm:^2.72.1, rollup@npm:^2.75.6":
-  version: 2.75.6
-  resolution: "rollup@npm:2.75.6"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: df83c6d43a144a296daf82bed7f12f2dfcc6c495a64245e840d15fd21f2ab8b66bb3423e61c974875b33ccf53fb659d2ed099f272937ecf23af48815277c6cd5
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^2.70.1, rollup@npm:^2.75.6":
-  version: 2.75.6
-  resolution: "rollup@npm:2.75.6"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: df83c6d43a144a296daf82bed7f12f2dfcc6c495a64245e840d15fd21f2ab8b66bb3423e61c974875b33ccf53fb659d2ed099f272937ecf23af48815277c6cd5
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^2.70.1, rollup@npm:^2.75.6, rollup@npm:^2.75.7":
-  version: 2.75.7
-  resolution: "rollup@npm:2.75.7"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: a6331d46b01062b184efdcb42ce12caf2e1575f989963944534b02f5855f6f3bc239ed0c1a18893572d7695af6d83166f3aef59dbd0365084e1531cb67824674
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^2.70.1, rollup@npm:^2.75.6, rollup@npm:^2.75.7, rollup@npm:^2.76.0":
-  version: 2.76.0
-  resolution: "rollup@npm:2.76.0"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: 58293e1c63c11d4afcfcf619601d5c5136dd3d0c9d3bd6a0b6141fede32027edc1eb53873bbb9a9c1e95e86c67f6ad66185720031b6eadf325972174d1d8fbcb
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^2.75.7":
-  version: 2.75.7
-  resolution: "rollup@npm:2.75.7"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: a6331d46b01062b184efdcb42ce12caf2e1575f989963944534b02f5855f6f3bc239ed0c1a18893572d7695af6d83166f3aef59dbd0365084e1531cb67824674
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^2.76.0":
+"rollup@npm:^2.70.1, rollup@npm:^2.75.6, rollup@npm:^2.76.0":
   version: 2.76.0
   resolution: "rollup@npm:2.76.0"
   dependencies:
@@ -13822,17 +12675,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unconfig@npm:^0.3.3":
-  version: 0.3.5
-  resolution: "unconfig@npm:0.3.5"
-  dependencies:
-    "@antfu/utils": ^0.5.2
-    defu: ^6.0.0
-    jiti: ^1.14.0
-  checksum: 3a685ef473598e8367bfb8e954708667a98d3d4ed3d0752ed2063d256062e69090681cf25a7f81695e6d014cd8828d789aa8c0c84fe3b4684b1488307689eb59
-  languageName: node
-  linkType: hard
-
 "unconfig@npm:^0.3.4":
   version: 0.3.5
   resolution: "unconfig@npm:0.3.5"
@@ -13857,9 +12699,9 @@ __metadata:
   linkType: hard
 
 "undici@npm:^5.2.0":
-  version: 5.6.1
-  resolution: "undici@npm:5.6.1"
-  checksum: 0e993519815964ce8dbb627b8a6bc2078c921e1e575d4d5c6a9cff51bb7b78716edfe9f8b619ce8fe7879a334d7fcd503aae548eeb10020967555f9a8b1bebff
+  version: 5.7.0
+  resolution: "undici@npm:5.7.0"
+  checksum: 3a8133697ee7124f4998c01dcb2255206a85bdf99cc75e97d2535d752bc853a9b39e149e7292479c6c170602947c7c77403081ced10ffbffcbe9fb077e40c6fb
   languageName: node
   linkType: hard
 
@@ -13875,78 +12717,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unimport@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "unimport@npm:0.4.0"
-  dependencies:
-    "@rollup/pluginutils": ^4.2.1
-    escape-string-regexp: ^5.0.0
-    fast-glob: ^3.2.11
-    local-pkg: ^0.4.1
-    magic-string: ^0.26.2
-    mlly: ^0.5.3
-    pathe: ^0.3.0
-    scule: ^0.2.1
-    strip-literal: ^0.4.0
-    unplugin: ^0.7.0
-  checksum: 0ef652822966e8ce6ed8de6adc2d6a18f29903c9e4f56579c06766fee3445dcac956328b7c0b7d3d5c0da5e81d62589ffb43a6a08a98e627f5220afa559d35cf
-  languageName: node
-  linkType: hard
-
-"unimport@npm:^0.4.0, unimport@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "unimport@npm:0.4.1"
-  dependencies:
-    "@rollup/pluginutils": ^4.2.1
-    escape-string-regexp: ^5.0.0
-    fast-glob: ^3.2.11
-    local-pkg: ^0.4.1
-    magic-string: ^0.26.2
-    mlly: ^0.5.4
-    pathe: ^0.3.2
-    scule: ^0.2.1
-    strip-literal: ^0.4.0
-    unplugin: ^0.7.1
-  checksum: f4215eb7d5c9b6ef09f7a239780da904b5908a0f05bfd71f540d39440ef72b53f8cdde4a6c6267844dcc028fbf28afd74142abd8c005590134400bd4c85f4f15
-  languageName: node
-  linkType: hard
-
-"unimport@npm:^0.4.0, unimport@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "unimport@npm:0.4.4"
-  dependencies:
-    "@rollup/pluginutils": ^4.2.1
-    escape-string-regexp: ^5.0.0
-    fast-glob: ^3.2.11
-    local-pkg: ^0.4.1
-    magic-string: ^0.26.2
-    mlly: ^0.5.4
-    pathe: ^0.3.2
-    scule: ^0.2.1
-    strip-literal: ^0.4.0
-    unplugin: ^0.7.1
-  checksum: d8a7421001a9781cd1244b8bf040b084e6085a9df3f0d4ff9bc8db543e4a898e1bea6870108ff4e65813eb65c42b877b0730a380f8dc51c3db92b422d79d2657
-  languageName: node
-  linkType: hard
-
-"unimport@npm:^0.4.3":
-  version: 0.4.3
-  resolution: "unimport@npm:0.4.3"
-  dependencies:
-    "@rollup/pluginutils": ^4.2.1
-    escape-string-regexp: ^5.0.0
-    fast-glob: ^3.2.11
-    local-pkg: ^0.4.1
-    magic-string: ^0.26.2
-    mlly: ^0.5.4
-    pathe: ^0.3.2
-    scule: ^0.2.1
-    strip-literal: ^0.4.0
-    unplugin: ^0.7.1
-  checksum: d8a7421001a9781cd1244b8bf040b084e6085a9df3f0d4ff9bc8db543e4a898e1bea6870108ff4e65813eb65c42b877b0730a380f8dc51c3db92b422d79d2657
-  languageName: node
-  linkType: hard
-
 "unimport@npm:^0.4.4":
   version: 0.4.4
   resolution: "unimport@npm:0.4.4"
@@ -14092,33 +12862,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unplugin@npm:^0.7.1":
-  version: 0.7.1
-  resolution: "unplugin@npm:0.7.1"
-  dependencies:
-    acorn: ^8.7.1
-    chokidar: ^3.5.3
-    webpack-sources: ^3.2.3
-    webpack-virtual-modules: ^0.4.4
-  peerDependencies:
-    esbuild: ">=0.13"
-    rollup: ^2.50.0
-    vite: ^2.3.0 || ^3.0.0-0
-    webpack: 4 || 5
-  peerDependenciesMeta:
-    esbuild:
-      optional: true
-    rollup:
-      optional: true
-    vite:
-      optional: true
-    webpack:
-      optional: true
-  checksum: 5449e8cff143b3c8a47f91a9274e2c9d42bdaa7ab5c95a0ea10db87d8bbde9cd85fca9c63d3c319c5b8730e8a490ce49706620151b69b9566172283c980f44bd
-  languageName: node
-  linkType: hard
-
-"unstorage@npm:^0.5.3":
+"unstorage@npm:^0.5.4":
   version: 0.5.4
   resolution: "unstorage@npm:0.5.4"
   dependencies:
@@ -14288,9 +13032,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:~3.0.0-beta.10":
-  version: 3.0.0-beta.10
-  resolution: "vite@npm:3.0.0-beta.10"
+"vite@npm:~3.0.0":
+  version: 3.0.0
+  resolution: "vite@npm:3.0.0"
   dependencies:
     esbuild: ^0.14.47
     fsevents: ~2.3.2
@@ -14316,7 +13060,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 2b27107dac3e240c7fd5bc5be40e62befce6de6d31220f8cc0d25e1c583e9e00c259c5eaa423c58e0ee87ab7bc46b5e07dd774d081f6439a3e747ee908e375b0
+  checksum: 4920b5b0a4d4bd4a003121b2eb6ed41ac2ab69e6ab055db645e678c14e68d6eef780362d4d482cf439b576c37fb65dc9a7ebbbf90354e7ae362034a28eac9130
   languageName: node
   linkType: hard
 

From f4bdd6253c4ef55ba031781aedc8211093fe87ce Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 13 Jul 2022 18:16:42 +0100
Subject: [PATCH 43/51] Update packages/vite/src/client.ts

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

diff --git a/packages/vite/src/client.ts b/packages/vite/src/client.ts
index 3411cb5cbaf..24a49014c57 100644
--- a/packages/vite/src/client.ts
+++ b/packages/vite/src/client.ts
@@ -28,7 +28,7 @@ export async function buildClient (ctx: ViteBuildContext) {
           // In CSS we only use relative paths until we craft a clever runtime CSS hack
           return { relative: true }
         }
-        return { runtime: `__publicAssetsURL(${JSON.stringify(filename)})` }
+        return { runtime: `globalThis.__publicAssetsURL(${JSON.stringify(filename)})` }
       }
     },
     define: {

From c740bd2adc709a018b0e64a3a2676bb4ccc92a1a Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 13 Jul 2022 18:16:52 +0100
Subject: [PATCH 44/51] Update packages/vite/src/server.ts

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

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 12925fb931d..40bbc7487af 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -32,7 +32,7 @@ export async function buildServer (ctx: ViteBuildContext) {
             return { runtime: `__publicAssetsURL(${JSON.stringify(filename)})` }
           case 'asset': {
             const relativeFilename = filename.replace(withTrailingSlash(withoutLeadingSlash(ctx.nuxt.options.app.buildAssetsDir)), '')
-            return { runtime: `__buildAssetsURL(${JSON.stringify(relativeFilename)})` }
+            return { runtime: `globalThis.__buildAssetsURL(${JSON.stringify(relativeFilename)})` }
           }
         }
       }

From f46330b2fd4ca20ad966366bf438297c33b33d5d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 13 Jul 2022 18:17:00 +0100
Subject: [PATCH 45/51] Update packages/vite/src/server.ts

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

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 40bbc7487af..db23ae2051a 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -29,7 +29,7 @@ export async function buildServer (ctx: ViteBuildContext) {
         }
         switch (type) {
           case 'public':
-            return { runtime: `__publicAssetsURL(${JSON.stringify(filename)})` }
+            return { runtime: `globalThis.__publicAssetsURL(${JSON.stringify(filename)})` }
           case 'asset': {
             const relativeFilename = filename.replace(withTrailingSlash(withoutLeadingSlash(ctx.nuxt.options.app.buildAssetsDir)), '')
             return { runtime: `globalThis.__buildAssetsURL(${JSON.stringify(relativeFilename)})` }

From c4f451be00dada72fd46337ce98af701ff21b952 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 18 Jul 2022 13:08:56 +0100
Subject: [PATCH 46/51] fix(components): transform `<script setup>` blocks with
 new vite vue plugin

---
 packages/nuxt/src/components/loader.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/nuxt/src/components/loader.ts b/packages/nuxt/src/components/loader.ts
index acda7f7fdc3..f28520f8a5b 100644
--- a/packages/nuxt/src/components/loader.ts
+++ b/packages/nuxt/src/components/loader.ts
@@ -31,8 +31,8 @@ export const loaderPlugin = createUnplugin((options: LoaderOptions) => {
       const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href))
       const query = parseQuery(search)
       // we only transform render functions
-      // from `type=template` (in Webpack) and bare `.vue` file (in Vite)
-      return pathname.endsWith('.vue') && (query.type === 'template' || !!query.macro || !search)
+      // from `type=template` (in Webpack), bare `.vue` file and setup=true (Vite 2/3)
+      return pathname.endsWith('.vue') && (query.type === 'template' || !!query.macro || query.setup || !search)
     },
     transform (code, id) {
       const components = options.getComponents()
@@ -69,6 +69,9 @@ export const loaderPlugin = createUnplugin((options: LoaderOptions) => {
         s.prepend([...imports, ''].join('\n'))
       }
 
+      if (id.includes('app.vue')) {
+        console.log({ plugin: 'components', code: s.toString() })
+      }
       if (s.hasChanged()) {
         return {
           code: s.toString(),

From 616ab1edf83aafd9354dbdad040f2a4e06a5b895 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 18 Jul 2022 13:19:35 +0100
Subject: [PATCH 47/51] fix: type error

---
 packages/nuxt/src/components/loader.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/components/loader.ts b/packages/nuxt/src/components/loader.ts
index f28520f8a5b..89da9d95640 100644
--- a/packages/nuxt/src/components/loader.ts
+++ b/packages/nuxt/src/components/loader.ts
@@ -32,7 +32,7 @@ export const loaderPlugin = createUnplugin((options: LoaderOptions) => {
       const query = parseQuery(search)
       // we only transform render functions
       // from `type=template` (in Webpack), bare `.vue` file and setup=true (Vite 2/3)
-      return pathname.endsWith('.vue') && (query.type === 'template' || !!query.macro || query.setup || !search)
+      return pathname.endsWith('.vue') && (query.type === 'template' || !!query.macro || !!query.setup || !search)
     },
     transform (code, id) {
       const components = options.getComponents()

From 376b87e45a8dfbfbb5e915892515e26c7cd6309c Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Thu, 21 Jul 2022 10:04:35 +0100
Subject: [PATCH 48/51] fix: remove debugging code

---
 packages/nuxt/src/components/loader.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/nuxt/src/components/loader.ts b/packages/nuxt/src/components/loader.ts
index 89da9d95640..6e3488bf52a 100644
--- a/packages/nuxt/src/components/loader.ts
+++ b/packages/nuxt/src/components/loader.ts
@@ -69,9 +69,6 @@ export const loaderPlugin = createUnplugin((options: LoaderOptions) => {
         s.prepend([...imports, ''].join('\n'))
       }
 
-      if (id.includes('app.vue')) {
-        console.log({ plugin: 'components', code: s.toString() })
-      }
       if (s.hasChanged()) {
         return {
           code: s.toString(),

From b23d738eb94f05f85efffff6ee558e5c3d8aae16 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Thu, 21 Jul 2022 10:08:49 +0100
Subject: [PATCH 49/51] fix: revert change from define -> replace

---
 packages/vite/src/server.ts | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 7a3b9eef2cb..ea5c50b1b8f 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -5,7 +5,6 @@ import viteJsxPlugin from '@vitejs/plugin-vue-jsx'
 import { logger, resolveModule, isIgnored } from '@nuxt/kit'
 import fse from 'fs-extra'
 import { debounce } from 'perfect-debounce'
-import replace from '@rollup/plugin-replace'
 import { joinURL, withoutLeadingSlash, withTrailingSlash } from 'ufo'
 import { ViteBuildContext, ViteOptions } from './vite'
 import { wpfs } from './utils/wpfs'
@@ -39,7 +38,12 @@ export async function buildServer (ctx: ViteBuildContext) {
     },
     define: {
       'process.server': true,
-      'process.client': false
+      'process.client': false,
+      'typeof window': '"undefined"',
+      'typeof document': '"undefined"',
+      'typeof navigator': '"undefined"',
+      'typeof location': '"undefined"',
+      'typeof XMLHttpRequest': '"undefined"'
     },
     resolve: {
       alias: {
@@ -97,14 +101,6 @@ export async function buildServer (ctx: ViteBuildContext) {
     plugins: [
       cacheDirPlugin(ctx.nuxt.options.rootDir, 'server'),
       vuePlugin(ctx.config.vue),
-      replace({
-        'typeof window': '"undefined"',
-        'typeof document': '"undefined"',
-        'typeof navigator': '"undefined"',
-        'typeof location': '"undefined"',
-        'typeof XMLHttpRequest': '"undefined"',
-        preventAssignment: true
-      }),
       viteJsxPlugin()
     ]
   } as ViteOptions)

From d0a3babe3695ee0d8d464fdb3f170886248b3369 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 21 Jul 2022 11:30:30 +0200
Subject: [PATCH 50/51] refactor: use simple if

---
 packages/vite/src/server.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index ea5c50b1b8f..0e76e49aef5 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -26,13 +26,12 @@ export async function buildServer (ctx: ViteBuildContext) {
           // In CSS we only use relative paths until we craft a clever runtime CSS hack
           return { relative: true }
         }
-        switch (type) {
-          case 'public':
-            return { runtime: `globalThis.__publicAssetsURL(${JSON.stringify(filename)})` }
-          case 'asset': {
-            const relativeFilename = filename.replace(withTrailingSlash(withoutLeadingSlash(ctx.nuxt.options.app.buildAssetsDir)), '')
-            return { runtime: `globalThis.__buildAssetsURL(${JSON.stringify(relativeFilename)})` }
-          }
+        if (type === 'public') {
+          return { runtime: `globalThis.__publicAssetsURL(${JSON.stringify(filename)})` }
+        }
+        if (type === 'asset') {
+          const relativeFilename = filename.replace(withTrailingSlash(withoutLeadingSlash(ctx.nuxt.options.app.buildAssetsDir)), '')
+          return { runtime: `globalThis.__buildAssetsURL(${JSON.stringify(relativeFilename)})` }
         }
       }
     },

From b8329535e7112323edee1d4b6012ad3bf02b13f7 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 21 Jul 2022 12:20:16 +0200
Subject: [PATCH 51/51] refactor webpack plugin

---
 packages/webpack/src/plugins/dynamic-base.ts | 25 +++++++++++---------
 packages/webpack/src/webpack.ts              |  3 +--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/webpack/src/plugins/dynamic-base.ts b/packages/webpack/src/plugins/dynamic-base.ts
index 469220c9837..8fd6ccf9c1b 100644
--- a/packages/webpack/src/plugins/dynamic-base.ts
+++ b/packages/webpack/src/plugins/dynamic-base.ts
@@ -6,22 +6,25 @@ interface DynamicBasePluginOptions {
   sourcemap?: boolean
 }
 
-export const DynamicBasePlugin = createUnplugin(function (options: DynamicBasePluginOptions = {}) {
+const defaults: DynamicBasePluginOptions = {
+  globalPublicPath: '__webpack_public_path__',
+  sourcemap: true
+}
+
+export const DynamicBasePlugin = createUnplugin((options: DynamicBasePluginOptions = {}) => {
+  options = { ...defaults, ...options }
   return {
     name: 'nuxt:dynamic-base-path',
     enforce: 'post',
     transform (code, id) {
-      const s = new MagicString(code)
-
-      if (options.globalPublicPath && id.includes('paths.mjs') && code.includes('const appConfig = ')) {
-        s.append(`${options.globalPublicPath} = buildAssetsURL();\n`)
+      if (!id.includes('paths.mjs') || !code.includes('const appConfig = ')) {
+        return
       }
-
-      if (s.hasChanged()) {
-        return {
-          code: s.toString(),
-          map: options.sourcemap && s.generateMap({ source: id, includeContent: true })
-        }
+      const s = new MagicString(code)
+      s.append(`${options.globalPublicPath} = buildAssetsURL();\n`)
+      return {
+        code: s.toString(),
+        map: options.sourcemap && s.generateMap({ source: id, includeContent: true })
       }
     }
   }
diff --git a/packages/webpack/src/webpack.ts b/packages/webpack/src/webpack.ts
index fb90f2f0c90..0952f56d447 100644
--- a/packages/webpack/src/webpack.ts
+++ b/packages/webpack/src/webpack.ts
@@ -35,8 +35,7 @@ export async function bundle (nuxt: Nuxt) {
   // Configure compilers
   const compilers = webpackConfigs.map((config) => {
     config.plugins.push(DynamicBasePlugin.webpack({
-      sourcemap: nuxt.options.sourcemap,
-      globalPublicPath: '__webpack_public_path__'
+      sourcemap: nuxt.options.sourcemap
     }))
     config.plugins.push(composableKeysPlugin.webpack({
       sourcemap: nuxt.options.sourcemap,