From 085f90a3d357129499f8585e1e4166924a97d30a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 9 Oct 2022 21:11:47 +0100
Subject: [PATCH 01/13] chore(deps): update dependency unplugin to ^0.9.6
 (#8070)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 packages/nuxt/package.json    | 2 +-
 packages/vite/package.json    | 2 +-
 packages/webpack/package.json | 2 +-
 yarn.lock                     | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index b8c947d7120..6519a18a177 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -70,7 +70,7 @@
     "unctx": "^2.0.2",
     "unenv": "^0.6.2",
     "unimport": "^0.6.8",
-    "unplugin": "^0.9.2",
+    "unplugin": "^0.9.6",
     "untyped": "^0.5.0",
     "vue": "^3.2.40",
     "vue-bundle-renderer": "^0.4.3",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index a6809b40f74..37dc8d26a32 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -47,7 +47,7 @@
     "rollup": "^2.79.1",
     "rollup-plugin-visualizer": "^5.8.2",
     "ufo": "^0.8.5",
-    "unplugin": "^0.9.2",
+    "unplugin": "^0.9.6",
     "vite": "~3.1.6",
     "vite-node": "^0.24.0",
     "vite-plugin-checker": "^0.5.1",
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index c6b90b2a6ed..bff59149780 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -45,7 +45,7 @@
     "style-resources-loader": "^1.5.0",
     "time-fix-plugin": "^2.0.7",
     "ufo": "^0.8.5",
-    "unplugin": "^0.9.2",
+    "unplugin": "^0.9.6",
     "url-loader": "^4.1.1",
     "vue-bundle-renderer": "^0.4.3",
     "vue-loader": "^17.0.0",
diff --git a/yarn.lock b/yarn.lock
index 596cbc7ccc4..a548d18649c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1980,7 +1980,7 @@ __metadata:
     rollup-plugin-visualizer: ^5.8.2
     ufo: ^0.8.5
     unbuild: latest
-    unplugin: ^0.9.2
+    unplugin: ^0.9.6
     vite: ~3.1.6
     vite-node: ^0.24.0
     vite-plugin-checker: ^0.5.1
@@ -2032,7 +2032,7 @@ __metadata:
     time-fix-plugin: ^2.0.7
     ufo: ^0.8.5
     unbuild: latest
-    unplugin: ^0.9.2
+    unplugin: ^0.9.6
     url-loader: ^4.1.1
     vue: 3.2.40
     vue-bundle-renderer: ^0.4.3
@@ -10919,7 +10919,7 @@ __metadata:
     unctx: ^2.0.2
     unenv: ^0.6.2
     unimport: ^0.6.8
-    unplugin: ^0.9.2
+    unplugin: ^0.9.6
     untyped: ^0.5.0
     vue: ^3.2.40
     vue-bundle-renderer: ^0.4.3
@@ -14160,7 +14160,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unplugin@npm:^0.9.0, unplugin@npm:^0.9.2, unplugin@npm:^0.9.5":
+"unplugin@npm:^0.9.0, unplugin@npm:^0.9.5":
   version: 0.9.5
   resolution: "unplugin@npm:0.9.5"
   dependencies:

From e94c3b37040ceea11197bc485d050fa7c05e29ec Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 10 Oct 2022 11:04:58 +0100
Subject: [PATCH 02/13] fix(schema): evaluate env variables when resolving
 values (#8079)

---
 packages/schema/src/config/_app.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/schema/src/config/_app.ts b/packages/schema/src/config/_app.ts
index a11bdd5e087..46adadd8948 100644
--- a/packages/schema/src/config/_app.ts
+++ b/packages/schema/src/config/_app.ts
@@ -51,10 +51,14 @@ export default defineUntypedSchema({
      * NUXT_APP_BASE_URL=/prefix/ node .output/server/index.mjs
      * ```
      */
-    baseURL: process.env.NUXT_APP_BASE_URL || '/',
+    baseURL: {
+      $resolve: async (val) => val || process.env.NUXT_APP_BASE_URL || '/',
+    },
 
     /** The folder name for the built site assets, relative to `baseURL` (or `cdnURL` if set). This is set at build time and should not be customized at runtime. */
-    buildAssetsDir: process.env.NUXT_APP_BUILD_ASSETS_DIR || '/_nuxt/',
+    buildAssetsDir: {
+      $resolve: async (val) => val || process.env.NUXT_APP_BUILD_ASSETS_DIR || '/_nuxt/',
+    },
 
     /**
      * The folder name for the built site assets, relative to `baseURL` (or `cdnURL` if set).

From 75f4a54f7ef63951a8ce93b0a37fac1aec26a2f9 Mon Sep 17 00:00:00 2001
From: Daniil Chudo <daniil4udo@gmail.com>
Date: Mon, 10 Oct 2022 14:12:36 +0400
Subject: [PATCH 03/13] feat(nuxt): add default slot to
 `<NuxtLoadingIndicator>` (#7128)

Co-authored-by: Alexander Lichter <github@lichter.io>
---
 docs/content/3.api/2.components/4.nuxt-loading-indicator.md | 4 ++++
 packages/nuxt/src/app/components/nuxt-loading-indicator.ts  | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/content/3.api/2.components/4.nuxt-loading-indicator.md b/docs/content/3.api/2.components/4.nuxt-loading-indicator.md
index 7209f482328..c95f4491186 100644
--- a/docs/content/3.api/2.components/4.nuxt-loading-indicator.md
+++ b/docs/content/3.api/2.components/4.nuxt-loading-indicator.md
@@ -19,6 +19,10 @@ Add `<NuxtLoadingIndicator/>` in your `app.vue` or layouts.
 
 :button-link[Open on StackBlitz]{href="https://stackblitz.com/github/nuxt/framework/tree/main/examples/routing/pages?terminal=dev&file=/app.vue" blank}
 
+## Slots
+
+You can pass custom HTML or components through the loading indicator's default slot.
+
 ## Props
 
 - **color**: The color of the loading bar.
diff --git a/packages/nuxt/src/app/components/nuxt-loading-indicator.ts b/packages/nuxt/src/app/components/nuxt-loading-indicator.ts
index 391c9ce8911..30cfc82e8be 100644
--- a/packages/nuxt/src/app/components/nuxt-loading-indicator.ts
+++ b/packages/nuxt/src/app/components/nuxt-loading-indicator.ts
@@ -21,7 +21,7 @@ export default defineComponent({
       default: 'repeating-linear-gradient(to right,#00dc82 0%,#34cdfe 50%,#0047e1 100%)'
     }
   },
-  setup (props) {
+  setup (props, { slots }) {
     const indicator = useLoadingIndicator({
       duration: props.duration,
       throttle: props.throttle
@@ -50,7 +50,7 @@ export default defineComponent({
         transition: 'width 0.1s, height 0.4s, opacity 0.4s',
         zIndex: 999999
       }
-    })
+    }, slots)
   }
 })
 

From 829a5505809748083feb06892a9895299af5e4a4 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 10 Oct 2022 11:18:20 +0100
Subject: [PATCH 04/13] feat(pages): add `validate` hook for `definePageMeta`
 (#7870)

---
 docs/content/1.getting-started/5.routing.md   | 22 +++++++++++++++++++
 .../content/3.api/3.utils/define-page-meta.md | 13 ++++-------
 .../7.migration/7.component-options.md        | 20 ++++++++---------
 packages/nuxt/src/app/plugins/router.ts       |  3 ++-
 packages/nuxt/src/pages/module.ts             |  5 +++++
 .../nuxt/src/pages/runtime/composables.ts     | 12 +++++++++-
 packages/nuxt/src/pages/runtime/router.ts     |  3 ++-
 packages/nuxt/src/pages/runtime/validate.ts   | 12 ++++++++++
 test/basic.test.ts                            |  5 +++++
 test/fixtures/basic/pages/[...slug].vue       |  6 +++++
 10 files changed, 78 insertions(+), 23 deletions(-)
 create mode 100644 packages/nuxt/src/pages/runtime/validate.ts

diff --git a/docs/content/1.getting-started/5.routing.md b/docs/content/1.getting-started/5.routing.md
index 4973eebab44..e59a1220360 100644
--- a/docs/content/1.getting-started/5.routing.md
+++ b/docs/content/1.getting-started/5.routing.md
@@ -117,3 +117,25 @@ definePageMeta({
 ::
 
 :ReadMore{link="/guide/directory-structure/middleware"}
+
+## Route Validation
+
+Nuxt offers route validation via the `validate` property in [`definePageMeta`](/api/utils/define-page-meta) in each page you wish to validate.
+
+The `validate` property accepts the `route` as an argument. You can return a boolean value to determine whether or not this is a valid route to be rendered with this page. If you return false and another match can't be found, this will mean a 404. You can also directly return an object with `statusCode`/`statusMessage` to respond immediately with an error (other matches will not be checked).
+
+If you have a more complex use case, then you can use anonymous route middleware instead.
+
+:StabilityEdge
+
+```vue [pages/post/[id].vue]
+<script setup>
+definePageMeta({
+  validate: async (route) => {
+    const nuxtApp = useNuxtApp()
+    // Check if the id is made up of digits
+    return /^\d+$/.test(params.id)
+  }
+})
+</script>
+```
diff --git a/docs/content/3.api/3.utils/define-page-meta.md b/docs/content/3.api/3.utils/define-page-meta.md
index ef4982ca763..c8b835f0563 100644
--- a/docs/content/3.api/3.utils/define-page-meta.md
+++ b/docs/content/3.api/3.utils/define-page-meta.md
@@ -23,6 +23,7 @@ title: "definePageMeta"
 definePageMeta(meta: PageMeta) => void
 
 interface PageMeta {
+  validate?: (route: RouteLocationNormalized) => boolean | Promise<boolean> | Partial<NuxtError> | Promise<Partial<NuxtError>>
   redirect?: RouteRecordRedirectOption
   alias?: string | string[]
   pageTransition?: boolean | TransitionProps
@@ -79,20 +80,14 @@ interface PageMeta {
 
     Define anonymous or named middleware directly within `definePageMeta`. Learn more about [route middleware](/docs/directory-structure/middleware).
 
-  **`redirect`**
+  **`validate`**
 
-  - **Type**: [`RouteRecordRedirectOption`](https://router.vuejs.org/guide/essentials/redirect-and-alias.html#redirect-and-alias)
+  - **Type**: `(route: RouteLocationNormalized) => boolean | Promise<boolean> | Partial<NuxtError> | Promise<Partial<NuxtError>>`
 
-    Where to redirect if the route is directly matched. The redirection happens before any navigation guard and triggers a new navigation with the new target location.
+    Validate whether a given route can validly be rendered with this page. Return true if it is valid, or false if not. If another match can't be found, this will mean a 404. You can also directly return an object with `statusCode`/`statusMessage` to respond immediately with an error (other matches will not be checked).
 
     :StabilityEdge
 
-  **`alias`**
-
-  - **Type**: `string | string[]`
-  
-    Aliases for the record. Allows defining extra paths that will behave like a copy of the record. Allows having paths shorthands like `/users/:id` and `/u/:id`. All `alias` and `path` values must share the same params.
-
   **`[key: string]`**
 
   - **Type**: `any`
diff --git a/docs/content/7.migration/7.component-options.md b/docs/content/7.migration/7.component-options.md
index f6e725690f6..15fbedd864b 100644
--- a/docs/content/7.migration/7.component-options.md
+++ b/docs/content/7.migration/7.component-options.md
@@ -112,25 +112,23 @@ See [layout migration](/migration/pages-and-layouts).
 
 ## `validate`
 
-There is no longer a validate hook in Nuxt 3. Instead, you can create a custom middleware function, or directly throw an error in the setup function of the page.
+The validate hook in Nuxt 3 only accepts a single argument, the `route`. Just as in Nuxt 2, you can return a boolean value. If you return false and another match can't be found, this will mean a 404. You can also directly return an object with `statusCode`/`statusMessage` to respond immediately with an error (other matches will not be checked).
+
+:StabilityEdge
 
 ```diff [pages/users/[id].vue]
 - <script>
 - export default {
--   async validate({ params, query, store }) {
--     return true // if valid
+-   async validate({ params }) {
+-     return /^\d+$/.test(params.id)
 -   }
 - }
 + <script setup>
 + definePageMeta({
-+   middleware: [
-+     async function (to, from) {
-+       const nuxtApp = useNuxtApp()
-+       if (!valid) {
-+         return abortNavigation('Page not found')
-+       }
-+     }
-+   ]
++   validate: async (route) => {
++     const nuxtApp = useNuxtApp()
++     return /^\d+$/.test(params.id)
++   }
 + })
   </script>
 ```
diff --git a/packages/nuxt/src/app/plugins/router.ts b/packages/nuxt/src/app/plugins/router.ts
index 46ed26c2898..abb3ad4f779 100644
--- a/packages/nuxt/src/app/plugins/router.ts
+++ b/packages/nuxt/src/app/plugins/router.ts
@@ -234,7 +234,8 @@ export default defineNuxtPlugin<{ route: Route, router: Router }>((nuxtApp) => {
         if (process.server) {
           if (result === false || result instanceof Error) {
             const error = result || createError({
-              statusMessage: `Route navigation aborted: ${initialURL}`
+              statusCode: 404,
+              statusMessage: `Page Not Found: ${initialURL}`
             })
             return callWithNuxt(nuxtApp, showError, [error])
           }
diff --git a/packages/nuxt/src/pages/module.ts b/packages/nuxt/src/pages/module.ts
index 0388c3a032d..2975d76e533 100644
--- a/packages/nuxt/src/pages/module.ts
+++ b/packages/nuxt/src/pages/module.ts
@@ -50,6 +50,11 @@ export default defineNuxtModule({
       if (app.mainComponent!.includes('@nuxt/ui-templates')) {
         app.mainComponent = resolve(runtimeDir, 'app.vue')
       }
+      app.middleware.unshift({
+        name: 'validate',
+        path: resolve(runtimeDir, 'validate'),
+        global: true
+      })
     })
 
     // Prerender all non-dynamic page routes when generating app
diff --git a/packages/nuxt/src/pages/runtime/composables.ts b/packages/nuxt/src/pages/runtime/composables.ts
index 2b6e0e67303..ca977dd23ed 100644
--- a/packages/nuxt/src/pages/runtime/composables.ts
+++ b/packages/nuxt/src/pages/runtime/composables.ts
@@ -1,8 +1,18 @@
 import { KeepAliveProps, TransitionProps, UnwrapRef } from 'vue'
-import type { RouteLocationNormalizedLoaded, RouteRecordRedirectOption } from 'vue-router'
+import type { RouteLocationNormalized, RouteLocationNormalizedLoaded, RouteRecordRedirectOption } from 'vue-router'
+import type { NuxtError } from '#app'
 
 export interface PageMeta {
   [key: string]: any
+  /**
+   * Validate whether a given route can validly be rendered with this page.
+   *
+   * Return true if it is valid, or false if not. If another match can't be found,
+   * this will mean a 404. You can also directly return an object with
+   * statusCode/statusMessage to respond immediately with an error (other matches
+   * will not be checked).
+   */
+  validate?: (route: RouteLocationNormalized) => boolean | Promise<boolean> | Partial<NuxtError> | Promise<Partial<NuxtError>>
   /**
    * Where to redirect if the route is directly matched. The redirection happens
    * before any navigation guard and triggers a new navigation with the new
diff --git a/packages/nuxt/src/pages/runtime/router.ts b/packages/nuxt/src/pages/runtime/router.ts
index 03bc591227c..15dc5bc0742 100644
--- a/packages/nuxt/src/pages/runtime/router.ts
+++ b/packages/nuxt/src/pages/runtime/router.ts
@@ -159,7 +159,8 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       if (process.server || (!nuxtApp.payload.serverRendered && nuxtApp.isHydrating)) {
         if (result === false || result instanceof Error) {
           const error = result || createError({
-            statusMessage: `Route navigation aborted: ${initialURL}`
+            statusCode: 404,
+            statusMessage: `Page Not Found: ${initialURL}`
           })
           return callWithNuxt(nuxtApp, showError, [error])
         }
diff --git a/packages/nuxt/src/pages/runtime/validate.ts b/packages/nuxt/src/pages/runtime/validate.ts
new file mode 100644
index 00000000000..14d5a8aeddc
--- /dev/null
+++ b/packages/nuxt/src/pages/runtime/validate.ts
@@ -0,0 +1,12 @@
+import { createError, defineNuxtRouteMiddleware } from '#app'
+
+export default defineNuxtRouteMiddleware(async (to) => {
+  if (!to.meta?.validate) { return }
+
+  const result = await Promise.resolve(to.meta.validate(to))
+  if (typeof result === 'boolean') {
+    return result
+  }
+
+  return createError(result)
+})
diff --git a/test/basic.test.ts b/test/basic.test.ts
index 9a590cafdbd..3a40675be7d 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -65,6 +65,11 @@ describe('pages', () => {
     expect(headers.get('location')).toEqual('/')
   })
 
+  it('validates routes', async () => {
+    const { status } = await fetch('/forbidden')
+    expect(status).toEqual(404)
+  })
+
   it('render 404', async () => {
     const html = await $fetch('/not-found')
 
diff --git a/test/fixtures/basic/pages/[...slug].vue b/test/fixtures/basic/pages/[...slug].vue
index 47a02c1123a..a805ed7aea9 100644
--- a/test/fixtures/basic/pages/[...slug].vue
+++ b/test/fixtures/basic/pages/[...slug].vue
@@ -4,3 +4,9 @@
     <div>404 at {{ $route.params.slug[0] }}</div>
   </div>
 </template>
+
+<script setup lang="ts">
+definePageMeta({
+  validate: to => to.path !== '/forbidden'
+})
+</script>

From 385674494d816873b567e5fe3a93726bbd906456 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 10 Oct 2022 11:33:16 +0100
Subject: [PATCH 05/13] feat(nuxt): refresh override for data fetching
 composables (#7864)

---
 .../1.getting-started/6.data-fetching.md      |  6 ++++
 .../3.api/1.composables/use-async-data.md     |  2 +-
 docs/content/3.api/1.composables/use-fetch.md |  2 +-
 .../nuxt/src/app/composables/asyncData.ts     | 24 +++++++++++--
 packages/nuxt/src/app/composables/fetch.ts    |  6 +++-
 test/basic.test.ts                            |  4 +++
 .../basic/pages/useAsyncData/override.vue     | 36 +++++++++++++++++++
 7 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 test/fixtures/basic/pages/useAsyncData/override.vue

diff --git a/docs/content/1.getting-started/6.data-fetching.md b/docs/content/1.getting-started/6.data-fetching.md
index a34b2624c26..5bc3086b6f3 100644
--- a/docs/content/1.getting-started/6.data-fetching.md
+++ b/docs/content/1.getting-started/6.data-fetching.md
@@ -152,6 +152,12 @@ function next() {
 
 The key to making this work is to call the `refresh()` method returned from the `useFetch()` composable when a query parameter has changed.
 
+By default, `refresh()` will not make a new request if one is already pending. You can override any pending requests with the override option. Previous requests will not be cancelled, but their result will not update the data or pending state - and any previously awaited promises will not resolve until this new request resolves.
+
+```js
+refresh({ override: true })
+```
+
 ### `refreshNuxtData`
 
 Invalidate the cache of `useAsyncData`, `useLazyAsyncData`, `useFetch` and `useLazyFetch` and trigger the refetch.
diff --git a/docs/content/3.api/1.composables/use-async-data.md b/docs/content/3.api/1.composables/use-async-data.md
index c462022791f..bdb6a8c1dbf 100644
--- a/docs/content/3.api/1.composables/use-async-data.md
+++ b/docs/content/3.api/1.composables/use-async-data.md
@@ -30,7 +30,7 @@ type AsyncDataOptions<DataT> = {
 }
 
 interface RefreshOptions {
-  _initial?: boolean
+  override?: boolean
 }
 
 type AsyncData<DataT, ErrorT> = {
diff --git a/docs/content/3.api/1.composables/use-fetch.md b/docs/content/3.api/1.composables/use-fetch.md
index 8d5e296c5dc..a40aafba38a 100644
--- a/docs/content/3.api/1.composables/use-fetch.md
+++ b/docs/content/3.api/1.composables/use-fetch.md
@@ -32,7 +32,7 @@ type UseFetchOptions = {
 type AsyncData<DataT> = {
   data: Ref<DataT>
   pending: Ref<boolean>
-  refresh: () => Promise<void>
+  refresh: (opts?: { override?: boolean }) => Promise<void>
   execute: () => Promise<void>
   error: Ref<Error | boolean>
 }
diff --git a/packages/nuxt/src/app/composables/asyncData.ts b/packages/nuxt/src/app/composables/asyncData.ts
index 51a338619e3..5fe425d11ca 100644
--- a/packages/nuxt/src/app/composables/asyncData.ts
+++ b/packages/nuxt/src/app/composables/asyncData.ts
@@ -34,6 +34,12 @@ export interface AsyncDataOptions<
 
 export interface AsyncDataExecuteOptions {
   _initial?: boolean
+  /**
+   * Force a refresh, even if there is already a pending request. Previous requests will
+   * not be cancelled, but their result will not affect the data/pending state - and any
+   * previously awaited promises will not resolve until this new request resolves.
+   */
+  override?: boolean
 }
 
 export interface _AsyncData<DataT, ErrorT> {
@@ -115,9 +121,12 @@ export function useAsyncData<
   const asyncData = { ...nuxt._asyncData[key] } as AsyncData<DataT, DataE>
 
   asyncData.refresh = asyncData.execute = (opts = {}) => {
-    // Avoid fetching same key more than once at a time
     if (nuxt._asyncDataPromises[key]) {
-      return nuxt._asyncDataPromises[key]
+      if (!opts.override) {
+        // Avoid fetching same key more than once at a time
+        return nuxt._asyncDataPromises[key]
+      }
+      (nuxt._asyncDataPromises[key] as any).cancelled = true
     }
     // Avoid fetching same key that is already fetched
     if (opts._initial && useInitialCache()) {
@@ -125,7 +134,7 @@ export function useAsyncData<
     }
     asyncData.pending.value = true
     // TODO: Cancel previous promise
-    nuxt._asyncDataPromises[key] = new Promise<DataT>(
+    const promise = new Promise<DataT>(
       (resolve, reject) => {
         try {
           resolve(handler(nuxt))
@@ -134,6 +143,9 @@ export function useAsyncData<
         }
       })
       .then((result) => {
+        // If this request is cancelled, resolve to the latest request.
+        if ((promise as any).cancelled) { return nuxt._asyncDataPromises[key] }
+
         if (options.transform) {
           result = options.transform(result)
         }
@@ -144,10 +156,15 @@ export function useAsyncData<
         asyncData.error.value = null
       })
       .catch((error: any) => {
+        // If this request is cancelled, resolve to the latest request.
+        if ((promise as any).cancelled) { return nuxt._asyncDataPromises[key] }
+
         asyncData.error.value = error
         asyncData.data.value = unref(options.default?.() ?? null)
       })
       .finally(() => {
+        if ((promise as any).cancelled) { return }
+
         asyncData.pending.value = false
         nuxt.payload.data[key] = asyncData.data.value
         if (asyncData.error.value) {
@@ -155,6 +172,7 @@ export function useAsyncData<
         }
         delete nuxt._asyncDataPromises[key]
       })
+    nuxt._asyncDataPromises[key] = promise
     return nuxt._asyncDataPromises[key]
   }
 
diff --git a/packages/nuxt/src/app/composables/fetch.ts b/packages/nuxt/src/app/composables/fetch.ts
index 9b2b0294d10..229617c9d01 100644
--- a/packages/nuxt/src/app/composables/fetch.ts
+++ b/packages/nuxt/src/app/composables/fetch.ts
@@ -86,8 +86,12 @@ export function useFetch<
     ]
   }
 
+  let controller: AbortController
+
   const asyncData = useAsyncData<_ResT, ErrorT, Transform, PickKeys>(key, () => {
-    return $fetch(_request.value, _fetchOptions) as Promise<_ResT>
+    controller?.abort?.()
+    controller = typeof AbortController !== 'undefined' ? new AbortController() : {} as AbortController
+    return $fetch(_request.value, { signal: controller.signal, ..._fetchOptions }) as Promise<_ResT>
   }, _asyncDataOptions)
 
   return asyncData
diff --git a/test/basic.test.ts b/test/basic.test.ts
index 3a40675be7d..c288fc1244c 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -824,6 +824,10 @@ describe.skipIf(isWindows)('useAsyncData', () => {
     await $fetch('/useAsyncData/refresh')
   })
 
+  it('requests can be cancelled/overridden', async () => {
+    await expectNoClientErrors('/useAsyncData/override')
+  })
+
   it('two requests made at once resolve and sync', async () => {
     await expectNoClientErrors('/useAsyncData/promise-all')
   })
diff --git a/test/fixtures/basic/pages/useAsyncData/override.vue b/test/fixtures/basic/pages/useAsyncData/override.vue
new file mode 100644
index 00000000000..82d69866733
--- /dev/null
+++ b/test/fixtures/basic/pages/useAsyncData/override.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    Override
+    {{ data }}
+  </div>
+</template>
+
+<script setup lang="ts">
+let count = 0
+let timeout = 0
+const { data, refresh } = await useAsyncData(() => process.server ? Promise.resolve(1) : new Promise(resolve => setTimeout(() => resolve(++count), timeout)))
+
+if (count || data.value !== 1) {
+  throw new Error('Data should be unset')
+}
+
+timeout = 100
+const p = refresh()
+
+if (process.client && (count !== 0 || data.value !== 1)) {
+  throw new Error('count should start at 0')
+}
+
+timeout = 0
+await refresh({ override: true })
+
+if (process.client && (count !== 1 || data.value !== 1)) {
+  throw new Error('override should execute')
+}
+
+await p
+
+if (process.client && (count !== 2 || data.value !== 1)) {
+  throw new Error('cancelled promise should not affect data')
+}
+</script>

From 81a8a258340374affc827d5cd323b978288df758 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 10 Oct 2022 11:49:44 +0100
Subject: [PATCH 06/13] feat(schema, nuxt): allow user-configurable `serverDir`
 (#7868)

---
 packages/nuxt/src/core/nitro.ts       |  4 ++--
 packages/schema/src/config/_common.ts | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts
index d473a3a9ae2..57d5394cdf3 100644
--- a/packages/nuxt/src/core/nitro.ts
+++ b/packages/nuxt/src/core/nitro.ts
@@ -19,7 +19,7 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
   const nitroConfig: NitroConfig = defu(_nitroConfig, <NitroConfig>{
     rootDir: nuxt.options.rootDir,
     workspaceDir: nuxt.options.workspaceDir,
-    srcDir: join(nuxt.options.srcDir, 'server'),
+    srcDir: nuxt.options.serverDir,
     dev: nuxt.options.dev,
     preset: nuxt.options.dev ? 'nitro-dev' : undefined,
     buildDir: nuxt.options.buildDir,
@@ -28,7 +28,7 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
       projectRoot: nuxt.options.rootDir,
       filename: join(nuxt.options.rootDir, '.nuxt/stats', '{name}.html')
     },
-    scanDirs: nuxt.options._layers.map(layer => layer.config.srcDir).filter(Boolean).map(dir => join(dir!, 'server')),
+    scanDirs: nuxt.options._layers.map(layer => (layer.config.serverDir || layer.config.srcDir) && resolve(layer.cwd, layer.config.serverDir || resolve(layer.config.srcDir, 'server'))).filter(Boolean),
     renderer: resolve(distDir, 'core/runtime/nitro/renderer'),
     errorHandler: resolve(distDir, 'core/runtime/nitro/error'),
     nodeModulesDirs: nuxt.options.modulesDir,
diff --git a/packages/schema/src/config/_common.ts b/packages/schema/src/config/_common.ts
index 903a3ec82ab..ed043c8d541 100644
--- a/packages/schema/src/config/_common.ts
+++ b/packages/schema/src/config/_common.ts
@@ -100,6 +100,18 @@ export default defineUntypedSchema({
     $resolve: async (val, get) => resolve(await get('rootDir'), val || '.')
   },
 
+  /**
+   * Define the server directory of your Nuxt application, where Nitro
+   * routes, middleware and plugins are kept.
+   *
+   * If a relative path is specified, it will be relative to your `rootDir`.
+   *
+   * @version 3
+   */
+  serverDir: {
+    $resolve: async (val, get) => resolve(await get('rootDir'), val || resolve(await get('srcDir'), 'server'))
+  },
+
   /**
    * Define the directory where your built Nuxt files will be placed.
    *

From c3cda557f3148d69ed54d761435d78546eb2c038 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Oct 2022 11:51:29 +0100
Subject: [PATCH 07/13] chore(deps): update all non-major dependencies (#8073)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json                  |   6 +-
 packages/nuxt/package.json    |   2 +-
 packages/schema/package.json  |   2 +-
 packages/vite/package.json    |   4 +-
 packages/webpack/package.json |   2 +-
 yarn.lock                     | 867 +++++++++++++++++-----------------
 6 files changed, 441 insertions(+), 442 deletions(-)

diff --git a/package.json b/package.json
index 4cf73717265..e313bc1f92b 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.1.6",
+    "vite": "^3.1.7",
     "unbuild": "^0.8.11"
   },
   "devDependencies": {
@@ -64,7 +64,7 @@
     "expect-type": "^0.14.2",
     "globby": "^13.1.2",
     "jiti": "^1.16.0",
-    "lerna": "^5.6.1",
+    "lerna": "^5.6.2",
     "markdownlint-cli": "^0.32.2",
     "ohmyfetch": "^0.4.19",
     "pathe": "^0.3.9",
@@ -74,7 +74,7 @@
     "typescript": "^4.8.4",
     "ufo": "^0.8.5",
     "unbuild": "^0.8.11",
-    "vite": "^3.1.6",
+    "vite": "^3.1.7",
     "vitest": "~0.19.1",
     "vue-tsc": "^1.0.3"
   },
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 6519a18a177..f1a03d1a1eb 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -56,7 +56,7 @@
     "hash-sum": "^2.0.0",
     "hookable": "^5.3.0",
     "knitwork": "^0.1.2",
-    "magic-string": "^0.26.6",
+    "magic-string": "^0.26.7",
     "mlly": "^0.5.16",
     "nitropack": "^0.5.4",
     "nuxi": "3.0.0-rc.11",
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 849050ceaeb..553bc596110 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -18,7 +18,7 @@
     "@types/semver": "^7",
     "@vitejs/plugin-vue": "^3.1.2",
     "unbuild": "latest",
-    "vite": "~3.1.6"
+    "vite": "~3.1.7"
   },
   "dependencies": {
     "c12": "^0.2.13",
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 37dc8d26a32..6c8e864b4bd 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -35,7 +35,7 @@
     "get-port-please": "^2.6.1",
     "h3": "^0.7.21",
     "knitwork": "^0.1.2",
-    "magic-string": "^0.26.6",
+    "magic-string": "^0.26.7",
     "mlly": "^0.5.16",
     "ohash": "^0.1.5",
     "pathe": "^0.3.9",
@@ -48,7 +48,7 @@
     "rollup-plugin-visualizer": "^5.8.2",
     "ufo": "^0.8.5",
     "unplugin": "^0.9.6",
-    "vite": "~3.1.6",
+    "vite": "~3.1.7",
     "vite-node": "^0.24.0",
     "vite-plugin-checker": "^0.5.1",
     "vue-bundle-renderer": "^0.4.3"
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index bff59149780..ba555e99f8d 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -31,7 +31,7 @@
     "fs-extra": "^10.1.0",
     "hash-sum": "^2.0.0",
     "lodash-es": "^4.17.21",
-    "magic-string": "^0.26.6",
+    "magic-string": "^0.26.7",
     "memfs": "^3.4.7",
     "mini-css-extract-plugin": "^2.6.1",
     "mlly": "^0.5.16",
diff --git a/yarn.lock b/yarn.lock
index a548d18649c..c542865f751 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -712,40 +712,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lerna/add@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/add@npm:5.6.1"
-  dependencies:
-    "@lerna/bootstrap": 5.6.1
-    "@lerna/command": 5.6.1
-    "@lerna/filter-options": 5.6.1
-    "@lerna/npm-conf": 5.6.1
-    "@lerna/validation-error": 5.6.1
+"@lerna/add@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/add@npm:5.6.2"
+  dependencies:
+    "@lerna/bootstrap": 5.6.2
+    "@lerna/command": 5.6.2
+    "@lerna/filter-options": 5.6.2
+    "@lerna/npm-conf": 5.6.2
+    "@lerna/validation-error": 5.6.2
     dedent: ^0.7.0
     npm-package-arg: 8.1.1
     p-map: ^4.0.0
     pacote: ^13.6.1
     semver: ^7.3.4
-  checksum: 043a0af415e920ffa56f13cd16a5dbea597e55d9bae37374bc34a70b0b1f88633d7d1ac2b0126a52ee7783fb3f0786932be5fbf6d7ff7dc68d087f25dd6f6def
-  languageName: node
-  linkType: hard
-
-"@lerna/bootstrap@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/bootstrap@npm:5.6.1"
-  dependencies:
-    "@lerna/command": 5.6.1
-    "@lerna/filter-options": 5.6.1
-    "@lerna/has-npm-version": 5.6.1
-    "@lerna/npm-install": 5.6.1
-    "@lerna/package-graph": 5.6.1
-    "@lerna/pulse-till-done": 5.6.1
-    "@lerna/rimraf-dir": 5.6.1
-    "@lerna/run-lifecycle": 5.6.1
-    "@lerna/run-topologically": 5.6.1
-    "@lerna/symlink-binary": 5.6.1
-    "@lerna/symlink-dependencies": 5.6.1
-    "@lerna/validation-error": 5.6.1
+  checksum: a6e9a6270f3145cb24da1b90a312cbbe0f3a0c556943c7e7b8cf4bfbb0912db4de7e7dc248321dd26955b3b8dbf8ede8c9481e2a0f3107c8a5cd917bfe187976
+  languageName: node
+  linkType: hard
+
+"@lerna/bootstrap@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/bootstrap@npm:5.6.2"
+  dependencies:
+    "@lerna/command": 5.6.2
+    "@lerna/filter-options": 5.6.2
+    "@lerna/has-npm-version": 5.6.2
+    "@lerna/npm-install": 5.6.2
+    "@lerna/package-graph": 5.6.2
+    "@lerna/pulse-till-done": 5.6.2
+    "@lerna/rimraf-dir": 5.6.2
+    "@lerna/run-lifecycle": 5.6.2
+    "@lerna/run-topologically": 5.6.2
+    "@lerna/symlink-binary": 5.6.2
+    "@lerna/symlink-dependencies": 5.6.2
+    "@lerna/validation-error": 5.6.2
     "@npmcli/arborist": 5.3.0
     dedent: ^0.7.0
     get-port: ^5.1.1
@@ -756,119 +756,119 @@ __metadata:
     p-map-series: ^2.1.0
     p-waterfall: ^2.1.1
     semver: ^7.3.4
-  checksum: b81fac94d0dd567fc16d725daf498757f0c301e041edf0ff2645c6722ff33da5d1dcb34cbcb17f9d036bc3f32e0a6599a4e4711705b82da470c301ddd9593671
+  checksum: 5b416f2276077348a72c4079d96b35729502a8bc3f91144cf3109b1ea5966245c809769304414a9b038de0980e783ed2a8da898fd05802879e8186e35a8a14cf
   languageName: node
   linkType: hard
 
-"@lerna/changed@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/changed@npm:5.6.1"
+"@lerna/changed@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/changed@npm:5.6.2"
   dependencies:
-    "@lerna/collect-updates": 5.6.1
-    "@lerna/command": 5.6.1
-    "@lerna/listable": 5.6.1
-    "@lerna/output": 5.6.1
-  checksum: 42e6d5691ef7e42160813dcf3a61d293ec226eefcb76eaf61f04b50de8cfaf46517f79e2cc35bcf24d6e38dd759de1818e298ce6ac3673cdb01114137bb55ce9
+    "@lerna/collect-updates": 5.6.2
+    "@lerna/command": 5.6.2
+    "@lerna/listable": 5.6.2
+    "@lerna/output": 5.6.2
+  checksum: 69a86cf3b3124553dee5de03988e7e7ecbf3f9084685ff13da1a1c9dfd4dcc3991145db4937cc0a72dde029da6cd37b3614bd21b7b461f8d5724a2f38b6c56d7
   languageName: node
   linkType: hard
 
-"@lerna/check-working-tree@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/check-working-tree@npm:5.6.1"
+"@lerna/check-working-tree@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/check-working-tree@npm:5.6.2"
   dependencies:
-    "@lerna/collect-uncommitted": 5.6.1
-    "@lerna/describe-ref": 5.6.1
-    "@lerna/validation-error": 5.6.1
-  checksum: aab5e54a4161d695df183422a870bcde067d29d41c289e855b9cc873e899fc37fd29dda6a7a7f0ca0a9941b16c1c5031d14a1ba323c0fc84a38d36288dcc1401
+    "@lerna/collect-uncommitted": 5.6.2
+    "@lerna/describe-ref": 5.6.2
+    "@lerna/validation-error": 5.6.2
+  checksum: 46a30143ab3f73f8e70c76bdffa66d521b787251c986800f60335188a62375186a380c0d772439b0fa9cf057da2f028780674744d684636e84e6974b9a4193e5
   languageName: node
   linkType: hard
 
-"@lerna/child-process@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/child-process@npm:5.6.1"
+"@lerna/child-process@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/child-process@npm:5.6.2"
   dependencies:
     chalk: ^4.1.0
     execa: ^5.0.0
     strong-log-transformer: ^2.1.0
-  checksum: 9baa3c434c33080812e34599a9ecef5b4fe35a5bb9898c10fdff261a64d8a7be4853e88fe3ec7178d09d78fc3635bb78f5a37685c2b10fa0493fc6ec64bfb0d5
+  checksum: 94e9c03119b3177cb41e210ac8a4bf04386857192e3a99c8bdd3d2ae913eda1538f813138de03693681ee360644cab9a0584658df9e2acbd04eb52a2e3a761cf
   languageName: node
   linkType: hard
 
-"@lerna/clean@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/clean@npm:5.6.1"
+"@lerna/clean@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/clean@npm:5.6.2"
   dependencies:
-    "@lerna/command": 5.6.1
-    "@lerna/filter-options": 5.6.1
-    "@lerna/prompt": 5.6.1
-    "@lerna/pulse-till-done": 5.6.1
-    "@lerna/rimraf-dir": 5.6.1
+    "@lerna/command": 5.6.2
+    "@lerna/filter-options": 5.6.2
+    "@lerna/prompt": 5.6.2
+    "@lerna/pulse-till-done": 5.6.2
+    "@lerna/rimraf-dir": 5.6.2
     p-map: ^4.0.0
     p-map-series: ^2.1.0
     p-waterfall: ^2.1.1
-  checksum: cb5577c9a7351af0e4ca34eb7963adf8768bf8e23747ad134a4eb61155e19d08101bf50619d8903a4e8da90f03f153587c3814482a06d95df202ea7cb5d3e235
+  checksum: b20aa2d5c0ace554dcb2ce37915b6a172627e1d26f54a6be33ae8b59d2b31ac1c4c70fa99ca5bffefc9a725ef798059b3b83f751728f6471e9edee1cb901d8b9
   languageName: node
   linkType: hard
 
-"@lerna/cli@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/cli@npm:5.6.1"
+"@lerna/cli@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/cli@npm:5.6.2"
   dependencies:
-    "@lerna/global-options": 5.6.1
+    "@lerna/global-options": 5.6.2
     dedent: ^0.7.0
     npmlog: ^6.0.2
     yargs: ^16.2.0
-  checksum: b623529baf45a8ef6353f8758a694533c4474cb7467962af2b28423a9625785fa72a95b01f41094bec27e4c5d322d497e0e9a5ef788d88bc214dcd49823289a4
+  checksum: e0b853feafe6d572056ea61a18fed4acb0ad62bcd99c3b5d753a8b8e8b69e5275f5eb7e102e7d09340d8f8e0e73a038b203acb4c77437d7edcf835470917b296
   languageName: node
   linkType: hard
 
-"@lerna/collect-uncommitted@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/collect-uncommitted@npm:5.6.1"
+"@lerna/collect-uncommitted@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/collect-uncommitted@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
+    "@lerna/child-process": 5.6.2
     chalk: ^4.1.0
     npmlog: ^6.0.2
-  checksum: b04d2d998d083f674020ba73aa3d37f9fb27bb73e74170eee6accb4d3753ddac43a5fa89d3e1112837ba2d6631fce6af2dd9a6afc285ef25663a36365d1eb9d0
+  checksum: 9c9298bc447629819634dc5fa697caa6a4b33c4e9fd61ae7ad4108a42d916ef9193ea4cb72d6cf766fc6863e350211ab9b1fcde6a8fb75b75f43aa5e4a1afeb4
   languageName: node
   linkType: hard
 
-"@lerna/collect-updates@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/collect-updates@npm:5.6.1"
+"@lerna/collect-updates@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/collect-updates@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
-    "@lerna/describe-ref": 5.6.1
+    "@lerna/child-process": 5.6.2
+    "@lerna/describe-ref": 5.6.2
     minimatch: ^3.0.4
     npmlog: ^6.0.2
     slash: ^3.0.0
-  checksum: f29083be2bb64ccacecd3fc7bf578bcb53ab4a414cc2023d7f5ea5346f7fb52f55bba26219d53917c7d741ea9eefe17018204e9c40f943965290e046ed5bfc77
+  checksum: 44149466c60e63f495bb09a3a8fd6c1d91f55de9dfcaac3adcefaf27c690adb6ac2c2a9b6bf5c9f8e430cb41db7c6994c9506b28945f5bb46a47e78f2829425d
   languageName: node
   linkType: hard
 
-"@lerna/command@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/command@npm:5.6.1"
+"@lerna/command@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/command@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
-    "@lerna/package-graph": 5.6.1
-    "@lerna/project": 5.6.1
-    "@lerna/validation-error": 5.6.1
-    "@lerna/write-log-file": 5.6.1
+    "@lerna/child-process": 5.6.2
+    "@lerna/package-graph": 5.6.2
+    "@lerna/project": 5.6.2
+    "@lerna/validation-error": 5.6.2
+    "@lerna/write-log-file": 5.6.2
     clone-deep: ^4.0.1
     dedent: ^0.7.0
     execa: ^5.0.0
     is-ci: ^2.0.0
     npmlog: ^6.0.2
-  checksum: e80b897796e28f1c00d32c17ca61a8a44cf4cf68168902575f3dcf2b378c6a694f725614f88d1667d27e950911ec8a6aefbe611a9108f2d6dcb133803719ea1e
+  checksum: 6a3bdef20658b474476a3750862e2d4753284d0023faf755b39d403a7dc71f6c5c46bc68f79ba27af1a12eb8add391f3afb82aee08b93e02141aa44f939cd668
   languageName: node
   linkType: hard
 
-"@lerna/conventional-commits@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/conventional-commits@npm:5.6.1"
+"@lerna/conventional-commits@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/conventional-commits@npm:5.6.2"
   dependencies:
-    "@lerna/validation-error": 5.6.1
+    "@lerna/validation-error": 5.6.2
     conventional-changelog-angular: ^5.0.12
     conventional-changelog-core: ^4.2.4
     conventional-recommended-bump: ^6.1.0
@@ -878,32 +878,31 @@ __metadata:
     npmlog: ^6.0.2
     pify: ^5.0.0
     semver: ^7.3.4
-  checksum: f55171e98a156528c468f6a1e5999773e03f55eda6a70a26bd6c1467adc12fc8ba7f6c8b3cb951001a77d3da591e211fbfe5943e18544c5030aca65759d29f77
+  checksum: a8dbcd4bbb697aebb6c1b045f8597f019b754cf42b5abaf6a77da7379e212107bb46e8c9747a7bc1b41de640109036f71bc97df0b1066ca6c719172dd5d8b563
   languageName: node
   linkType: hard
 
-"@lerna/create-symlink@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/create-symlink@npm:5.6.1"
+"@lerna/create-symlink@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/create-symlink@npm:5.6.2"
   dependencies:
     cmd-shim: ^5.0.0
     fs-extra: ^9.1.0
     npmlog: ^6.0.2
-  checksum: 9b2f10c45afa6141201491ae27b67d196d6d063219a3518e4fe027f7abcd00ab8709651d65678786cfecbce16913b33b302f92afba7349887f9cb1d24bbcdaf3
+  checksum: 1848bd60d5f3227cf66103571779d8c12c363c54ade93aaddcb10b7bba00adaf263faccee15fd05ac87ee5514feecd0e20e42b79b798a457609af1e77e734762
   languageName: node
   linkType: hard
 
-"@lerna/create@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/create@npm:5.6.1"
+"@lerna/create@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/create@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
-    "@lerna/command": 5.6.1
-    "@lerna/npm-conf": 5.6.1
-    "@lerna/validation-error": 5.6.1
+    "@lerna/child-process": 5.6.2
+    "@lerna/command": 5.6.2
+    "@lerna/npm-conf": 5.6.2
+    "@lerna/validation-error": 5.6.2
     dedent: ^0.7.0
     fs-extra: ^9.1.0
-    globby: ^11.0.2
     init-package-json: ^3.0.2
     npm-package-arg: 8.1.1
     p-reduce: ^2.1.0
@@ -914,367 +913,367 @@ __metadata:
     validate-npm-package-license: ^3.0.4
     validate-npm-package-name: ^4.0.0
     yargs-parser: 20.2.4
-  checksum: 78c3ac40fa8106c73d2b88922372b7ee2d30ab9497803f8b1f897205b78f346bba80e2dabb0086c43680b9afab30eb63df5b93660fa986a1961bb23d6ba42354
+  checksum: 94706188839a8cd0b8c20fb593a0cb4375bd350e2b6587a29933786bdd8c83417a1d651e5f53fb69e0939bad4f97dd013f5a4c901557e3c20fc360bbd0590806
   languageName: node
   linkType: hard
 
-"@lerna/describe-ref@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/describe-ref@npm:5.6.1"
+"@lerna/describe-ref@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/describe-ref@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
+    "@lerna/child-process": 5.6.2
     npmlog: ^6.0.2
-  checksum: a21a284bb49b78ef23d130695c956b845d50d8db3e2db43b9fd93b87eabe2c2a2cc0f106da88e26a4f19cb592c742687b79e84bda2020ed644e0a91a0cafe5a1
+  checksum: 510814bd0004859475cf62917a3145b010b33b519be3b80f30170b98500e176285d8f4b0aa9e5928b80798be90bc65f1591d6c72e26fee70d46e0f006996d69e
   languageName: node
   linkType: hard
 
-"@lerna/diff@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/diff@npm:5.6.1"
+"@lerna/diff@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/diff@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
-    "@lerna/command": 5.6.1
-    "@lerna/validation-error": 5.6.1
+    "@lerna/child-process": 5.6.2
+    "@lerna/command": 5.6.2
+    "@lerna/validation-error": 5.6.2
     npmlog: ^6.0.2
-  checksum: c7c613dd670f05d269b695b7a47c69df491c834cf6d1dadebc858af73180e4673166e550f8be33f21255952839dd94140e0d13ef50aecaa546d15b0430682d0c
+  checksum: 0731f5819da8c7bb2a210a9514541e7f7cdde8ddf1802e3ec5e40bd689f3c546d6fba12b9c72cd48aa97d179ff767c658bdfe26bf9590056307ee738b5b44052
   languageName: node
   linkType: hard
 
-"@lerna/exec@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/exec@npm:5.6.1"
+"@lerna/exec@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/exec@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
-    "@lerna/command": 5.6.1
-    "@lerna/filter-options": 5.6.1
-    "@lerna/profiler": 5.6.1
-    "@lerna/run-topologically": 5.6.1
-    "@lerna/validation-error": 5.6.1
+    "@lerna/child-process": 5.6.2
+    "@lerna/command": 5.6.2
+    "@lerna/filter-options": 5.6.2
+    "@lerna/profiler": 5.6.2
+    "@lerna/run-topologically": 5.6.2
+    "@lerna/validation-error": 5.6.2
     p-map: ^4.0.0
-  checksum: 41a7bbd68bc1a1f895f8e5729107477e59c634eba29132e0cbfc8014590f8a8131602f2e3a03f2d80040cb35febb7bddc6ae24d479016dd18dae10098a493a13
+  checksum: 30255cffbb67bc6a89290c1755e0e832fe9be1de0a98a2a6553a0baf0e1f509e0268318eeb3da4441bad2aa5517268b522f57dc3aefc49d122b301dd06ff6086
   languageName: node
   linkType: hard
 
-"@lerna/filter-options@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/filter-options@npm:5.6.1"
+"@lerna/filter-options@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/filter-options@npm:5.6.2"
   dependencies:
-    "@lerna/collect-updates": 5.6.1
-    "@lerna/filter-packages": 5.6.1
+    "@lerna/collect-updates": 5.6.2
+    "@lerna/filter-packages": 5.6.2
     dedent: ^0.7.0
     npmlog: ^6.0.2
-  checksum: 36026c94b6bc746ef1a753ea8245809df46bb8e38f1e677e0490feffd6ff0ab76da739e5bd56a15513be7157a715901214e76425603acd835cc2eaec656ba27e
+  checksum: c1b4ce4973bd8fff66a1632891f69ce4c20858d304cc02502df1576235b879cb4d3dd04b4be4b1835058f445c44d572554b206cf35ec4c1a3b76de396949bff1
   languageName: node
   linkType: hard
 
-"@lerna/filter-packages@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/filter-packages@npm:5.6.1"
+"@lerna/filter-packages@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/filter-packages@npm:5.6.2"
   dependencies:
-    "@lerna/validation-error": 5.6.1
+    "@lerna/validation-error": 5.6.2
     multimatch: ^5.0.0
     npmlog: ^6.0.2
-  checksum: 789710671939ce8fa7fa3f0e3e311453748634d798b33b2684e47917c9fc879bbed8c91fe798890b65bb9d09b25cf5282830bfdf93202b490a74a60387dbe6d3
+  checksum: b5b4c3b1d1ae6d889802ead0e682aecb8a12c1cbb3738a95e68013e9c7fd04cc0e495e249ef69eb52e65c69bca760d357d265642b1e066857c898ff1415978bd
   languageName: node
   linkType: hard
 
-"@lerna/get-npm-exec-opts@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/get-npm-exec-opts@npm:5.6.1"
+"@lerna/get-npm-exec-opts@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/get-npm-exec-opts@npm:5.6.2"
   dependencies:
     npmlog: ^6.0.2
-  checksum: 917efb098b63af55b98008e5bc3cc51dd17f82d531b22dcdba5908e2abfab75a3898a14172157924e39e42c6d583b1765cf2b9383c00d241db75184b9343c1e7
+  checksum: 3430e602db853e075490e6b080d46340940acf354fb5513da19af2a8ad60c8fa397de7cbcbe0bda8a4266e9d995bc7cba1698d092933c5feaef134585eef9f08
   languageName: node
   linkType: hard
 
-"@lerna/get-packed@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/get-packed@npm:5.6.1"
+"@lerna/get-packed@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/get-packed@npm:5.6.2"
   dependencies:
     fs-extra: ^9.1.0
     ssri: ^9.0.1
     tar: ^6.1.0
-  checksum: 65e85f9007818049a919da00738d6acca05e77293d17b5473a515b9e6a72b85d507909e492a702fc879d8dc46fb62984060694889ac9f9d74dfae92866ee277c
+  checksum: 12637d74cf654214fb6adfe444370d90d66f5aa2fdbcfc6bedd4168e24a8e91346ad22f1386630b635452b3a0089c91cd3ea141f6cddfd8d111ba7b94dbbaac8
   languageName: node
   linkType: hard
 
-"@lerna/github-client@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/github-client@npm:5.6.1"
+"@lerna/github-client@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/github-client@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
+    "@lerna/child-process": 5.6.2
     "@octokit/plugin-enterprise-rest": ^6.0.1
     "@octokit/rest": ^19.0.3
     git-url-parse: ^13.1.0
     npmlog: ^6.0.2
-  checksum: 6b0848014a52c7ae6b40a7da708d174c1bca2540c6f0a74bd2134671a9227ce81f3826daf6daf6d83d8af44a479364ac54320b99aa45313728753507fc36515d
+  checksum: 08a7386af70bacec5b1c2ec7ba09a0cae407e54c65d33c89444b4460df48dc325772fe77b38ce7c5355295e24ba64d0d64e53ae3ca76ddd4b930af1f5b38507c
   languageName: node
   linkType: hard
 
-"@lerna/gitlab-client@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/gitlab-client@npm:5.6.1"
+"@lerna/gitlab-client@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/gitlab-client@npm:5.6.2"
   dependencies:
     node-fetch: ^2.6.1
     npmlog: ^6.0.2
-  checksum: b66b8c0aa5f7367a24e61b76d05d2e7252b29e21b07475f407226a8bb06d38de867a5bd262e322fd7749f58a11db622db432123f3a7c3be364a74080506e14b7
+  checksum: ad9e45621b727858f4ea87a5d624da41cd6784e616d247b86275fb08fbfb4c9974c5f698f59ac0272ec1d0a848bba5f04ef2fbc32c62ca3a77ecd3b0415bd298
   languageName: node
   linkType: hard
 
-"@lerna/global-options@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/global-options@npm:5.6.1"
-  checksum: 5bd3fe7c0474f20f0f0e1de2d50a0b2e61ce47613cc7d4c42e023a2fc7aa386ce6fbece63b67c8fec6d63b92ab4a27cc39fbf9a3e032ae42bfd5cfdabf4e62f9
+"@lerna/global-options@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/global-options@npm:5.6.2"
+  checksum: 7cb542edef4f06c98dc5a1f797a442e4a1f8bde444046bc5258b0908ecd888ac7fe75902c90c20898feb90e685dee2e3518dc5c85a8155504373ec3f4634f3db
   languageName: node
   linkType: hard
 
-"@lerna/has-npm-version@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/has-npm-version@npm:5.6.1"
+"@lerna/has-npm-version@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/has-npm-version@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
+    "@lerna/child-process": 5.6.2
     semver: ^7.3.4
-  checksum: b95e412f55e68d6b6a4ab65e6e299403ef731209052b7668675fcf25b0f73ebb35a0e3469064fa1fd83e3df3bc3bc9686357d8181cbb2632e9538dcbe4bd3625
+  checksum: 98ca1161618a84e0509b9c988f3dd2e147225564d31820ea7b94332388afb7650b510ad902919c5ec9a0ec95b27aab81b4c3067769d106c801426620018a7aa4
   languageName: node
   linkType: hard
 
-"@lerna/import@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/import@npm:5.6.1"
+"@lerna/import@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/import@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
-    "@lerna/command": 5.6.1
-    "@lerna/prompt": 5.6.1
-    "@lerna/pulse-till-done": 5.6.1
-    "@lerna/validation-error": 5.6.1
+    "@lerna/child-process": 5.6.2
+    "@lerna/command": 5.6.2
+    "@lerna/prompt": 5.6.2
+    "@lerna/pulse-till-done": 5.6.2
+    "@lerna/validation-error": 5.6.2
     dedent: ^0.7.0
     fs-extra: ^9.1.0
     p-map-series: ^2.1.0
-  checksum: a1f185c4f60b38f9d977af151cb83f4947a4d2eb205a6d9408dba15fbe2d93e9fddc4eb571782ab007e53ccff07b3e0c780f407c9906adaf02f038b8a6852c97
+  checksum: fdcecfd29de36488f78d51776d0edaf4e789bcedad57fe72818ab2e8416578396cfdf142f57095490eefcdd0d3d63a55b23a5e03cf42e5b97878a997025b6b86
   languageName: node
   linkType: hard
 
-"@lerna/info@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/info@npm:5.6.1"
+"@lerna/info@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/info@npm:5.6.2"
   dependencies:
-    "@lerna/command": 5.6.1
-    "@lerna/output": 5.6.1
+    "@lerna/command": 5.6.2
+    "@lerna/output": 5.6.2
     envinfo: ^7.7.4
-  checksum: f9025ec2409e21c0673f17b5d187acc7184f5736947514cc4ae5c658f2aafc122dafb6cec521643c9e7e1672404094fa1fea8ad8329860447e83b3e09515f7b5
+  checksum: 0124b7b1fe75e9bee4f4d4e13216a61869ad918ac9dfbad79aa49e3dd4657a67945aceae6632452b08580d1370823af0ce15ac6fd7134b9042f69624c531be57
   languageName: node
   linkType: hard
 
-"@lerna/init@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/init@npm:5.6.1"
+"@lerna/init@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/init@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
-    "@lerna/command": 5.6.1
-    "@lerna/project": 5.6.1
+    "@lerna/child-process": 5.6.2
+    "@lerna/command": 5.6.2
+    "@lerna/project": 5.6.2
     fs-extra: ^9.1.0
     p-map: ^4.0.0
     write-json-file: ^4.3.0
-  checksum: 53ec23057bbdb7c6fc5ba107d70d8e226b74707a5c6cf58fdedbf7f888f2b0cba6640417a9dd1c3ef9114f444304b55cc550b9869bbca523f4dca250e9bbacdc
+  checksum: 15e9cfee4ec7c0a09ed0426a38c4cdd2d85b1b005bc5c499f69464e7fe4f5dc4ec1dab0e0fae260508f100f68a84ae54d1b8ab556bdd17938f3db8862290eec9
   languageName: node
   linkType: hard
 
-"@lerna/link@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/link@npm:5.6.1"
+"@lerna/link@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/link@npm:5.6.2"
   dependencies:
-    "@lerna/command": 5.6.1
-    "@lerna/package-graph": 5.6.1
-    "@lerna/symlink-dependencies": 5.6.1
-    "@lerna/validation-error": 5.6.1
+    "@lerna/command": 5.6.2
+    "@lerna/package-graph": 5.6.2
+    "@lerna/symlink-dependencies": 5.6.2
+    "@lerna/validation-error": 5.6.2
     p-map: ^4.0.0
     slash: ^3.0.0
-  checksum: 8388b8008031f973dcef48f233dd60595c97761bc82fc1b6837fd20f2d21eba246dbe73d38c38dcf8ea1ff66c9eb6387bb5c7a782ab40b95e5378b33d014ebb0
+  checksum: 5d4d3cf7cd90e30797cd0961d835984f5f4f01de508c89cd4870462bd64b65f6a2cf01a2f0df738ce612f45154d3ba4fbfbe73d24f21c0b0015d8c3263b93a80
   languageName: node
   linkType: hard
 
-"@lerna/list@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/list@npm:5.6.1"
+"@lerna/list@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/list@npm:5.6.2"
   dependencies:
-    "@lerna/command": 5.6.1
-    "@lerna/filter-options": 5.6.1
-    "@lerna/listable": 5.6.1
-    "@lerna/output": 5.6.1
-  checksum: 926659b26a0538dfabe6371f6c6e5a8b02f62b7b892c9d52d4a1d98aebadff76f323fb268f62e2fa29ac6d4530fcb71480256242f7249a3b8653d52322ab6060
+    "@lerna/command": 5.6.2
+    "@lerna/filter-options": 5.6.2
+    "@lerna/listable": 5.6.2
+    "@lerna/output": 5.6.2
+  checksum: 969b4a458e26bb12533549577fc3c95b62f7a982e04c77bf0755b99a1280d51a0b6288d9a42f1cb05d2f84e852c0fac6a388a5ab735daf1eaa478d9a5e4244f3
   languageName: node
   linkType: hard
 
-"@lerna/listable@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/listable@npm:5.6.1"
+"@lerna/listable@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/listable@npm:5.6.2"
   dependencies:
-    "@lerna/query-graph": 5.6.1
+    "@lerna/query-graph": 5.6.2
     chalk: ^4.1.0
     columnify: ^1.6.0
-  checksum: 2bbada134bc581771143ace83f88b0faef95e69333bb10b30f7cd0e4b94f23e865ac5270f48018bcc822d9134ce94cffc6de307ec65eed92e86a2b4756c0d83a
+  checksum: 3c94647582cd976117c636799e10cea486d171b9c7c20554ffc68c0dd5e33f0d847667264c19a40fbf44a697902dc11e55ca01e74d12f536fb67e338c124381e
   languageName: node
   linkType: hard
 
-"@lerna/log-packed@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/log-packed@npm:5.6.1"
+"@lerna/log-packed@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/log-packed@npm:5.6.2"
   dependencies:
     byte-size: ^7.0.0
     columnify: ^1.6.0
     has-unicode: ^2.0.1
     npmlog: ^6.0.2
-  checksum: 51b5155c80748489f9efb4989fd91deeda78678267f386d47374a7007107ee8ea741b46840087f2d806df31894cba644c1d473c3f160af0932264d318928181d
+  checksum: bbb43bd521bd431298048556a0ca1b83819d6352a06c4792a121403ab5cc2a467c7e89848cec72c7e348af12d3eac1e65e95d1372bedad2ef4a68aaa5d624e5a
   languageName: node
   linkType: hard
 
-"@lerna/npm-conf@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/npm-conf@npm:5.6.1"
+"@lerna/npm-conf@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/npm-conf@npm:5.6.2"
   dependencies:
     config-chain: ^1.1.12
     pify: ^5.0.0
-  checksum: f539247ccf98aa1d3e1abde9377f0aa36c1f28d97d64bf0eb0a91e9a62873bb670d3623ba0fa5398710bd438b0c65d16916df2db722d675368676ba4626e20f5
+  checksum: ee79c50b57859c918e597b48f44483c00c47fc84e61440c21d756981e8ff0d2721ff068e9539fabc50c073710d5c8fee469aa9e6620c0ecbf4dfce9db4979f94
   languageName: node
   linkType: hard
 
-"@lerna/npm-dist-tag@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/npm-dist-tag@npm:5.6.1"
+"@lerna/npm-dist-tag@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/npm-dist-tag@npm:5.6.2"
   dependencies:
-    "@lerna/otplease": 5.6.1
+    "@lerna/otplease": 5.6.2
     npm-package-arg: 8.1.1
     npm-registry-fetch: ^13.3.0
     npmlog: ^6.0.2
-  checksum: 3ff247af36f8d6722f87b080635715a0839c35993638b6bfc7f07b9ea0c3fea4833e6ab9f9bf5cd850e0422619755c5456ca129756a4c662bf3c850491946196
+  checksum: f50f8b090d197b773b467853d54f2993dd99721cfd8dc17f4af587bc0f53a6c1d879175673f34471d2778b114bc97fcb86bfade1d1aafa349ade92f78878dbf5
   languageName: node
   linkType: hard
 
-"@lerna/npm-install@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/npm-install@npm:5.6.1"
+"@lerna/npm-install@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/npm-install@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
-    "@lerna/get-npm-exec-opts": 5.6.1
+    "@lerna/child-process": 5.6.2
+    "@lerna/get-npm-exec-opts": 5.6.2
     fs-extra: ^9.1.0
     npm-package-arg: 8.1.1
     npmlog: ^6.0.2
     signal-exit: ^3.0.3
     write-pkg: ^4.0.0
-  checksum: 4606c9021bf4b84cef8953eda89a5844bab8d89a6ace2f19393d86081e76f1e6f3dcffcba54a8885966ef9da372eb5f98bfb5e88b78ff47f7bb04f4fc865ac20
+  checksum: 6878ee7420edb0353ae8b755b10ae33100980b108cbeaa5848f4b5d2c19c836dbe2d93b401365fe05baf080808c8ad259a05bb78d52b177fc21d6c24bdf41b27
   languageName: node
   linkType: hard
 
-"@lerna/npm-publish@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/npm-publish@npm:5.6.1"
+"@lerna/npm-publish@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/npm-publish@npm:5.6.2"
   dependencies:
-    "@lerna/otplease": 5.6.1
-    "@lerna/run-lifecycle": 5.6.1
+    "@lerna/otplease": 5.6.2
+    "@lerna/run-lifecycle": 5.6.2
     fs-extra: ^9.1.0
     libnpmpublish: ^6.0.4
     npm-package-arg: 8.1.1
     npmlog: ^6.0.2
     pify: ^5.0.0
     read-package-json: ^5.0.1
-  checksum: c9d0c724dd2b4cbc90a6bbf061f20f01dd761a602fcc40b723fcaa7fb08e16ed6bf01aeb2be63f1cdd6d93340683152c3f54a7fb97d957221c6c37ebd2d7d5b0
+  checksum: 87ec165e2c5976fd04e41bbed0cf796317813d4ef50cc42a1c96c25d96f761333d34fa575702f2979b3c828ea7df87d21064521fc4137da9d16f67803192c902
   languageName: node
   linkType: hard
 
-"@lerna/npm-run-script@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/npm-run-script@npm:5.6.1"
+"@lerna/npm-run-script@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/npm-run-script@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
-    "@lerna/get-npm-exec-opts": 5.6.1
+    "@lerna/child-process": 5.6.2
+    "@lerna/get-npm-exec-opts": 5.6.2
     npmlog: ^6.0.2
-  checksum: 45aad8eea2344cc48ef0bb952e4bbb8f3e18f42106c76a986c7a76a088e274d4eddad4b77a32be01709a9b67a90bb5c28adec1358827d03d4a1d6d6cf7669d4a
+  checksum: b8319fe926484afd28f7fa68d92cca438a6429841bec06c843ca673bff044da15380c0077530bc7dd11b10c413a7404c6f7597f0ec15a33137ff5dbb1b9f98f2
   languageName: node
   linkType: hard
 
-"@lerna/otplease@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/otplease@npm:5.6.1"
+"@lerna/otplease@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/otplease@npm:5.6.2"
   dependencies:
-    "@lerna/prompt": 5.6.1
-  checksum: 3758b8d0e937e1580c9662b10f9ef6f5d89502e4047142bec3a2a69b3657b9f17f340bf46ff6f6662b28507ee041ba2eccfa0abd3d73166a6328c01c70b5a6e0
+    "@lerna/prompt": 5.6.2
+  checksum: a8eaf9a3104d2d869dac773001e7b82b5825ae1753e1ed5ec953f11930bfc61ec7131a3e802a735cf88e6d61c945ac7bf52a5ae3a3937c40be11ef34b0f85a06
   languageName: node
   linkType: hard
 
-"@lerna/output@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/output@npm:5.6.1"
+"@lerna/output@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/output@npm:5.6.2"
   dependencies:
     npmlog: ^6.0.2
-  checksum: 7cfb72ecb2216527d03894dec5a71091b3852783ebb8074d416842ec959bba215e5db1e2a527f17dbdf104045095a87c41fd332f33071e626ee8ee3ce902f96a
+  checksum: 34494135cf13cf024bb325c85f91e33f1d295df941afa659bdab3896862a9b69165ad6afdefc30945576577960f83c8e2374d2d5feb79e9a34b757ccffce2d9f
   languageName: node
   linkType: hard
 
-"@lerna/pack-directory@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/pack-directory@npm:5.6.1"
+"@lerna/pack-directory@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/pack-directory@npm:5.6.2"
   dependencies:
-    "@lerna/get-packed": 5.6.1
-    "@lerna/package": 5.6.1
-    "@lerna/run-lifecycle": 5.6.1
-    "@lerna/temp-write": 5.6.1
+    "@lerna/get-packed": 5.6.2
+    "@lerna/package": 5.6.2
+    "@lerna/run-lifecycle": 5.6.2
+    "@lerna/temp-write": 5.6.2
     npm-packlist: ^5.1.1
     npmlog: ^6.0.2
     tar: ^6.1.0
-  checksum: a198e7eb698f7b613fc7384ea8801288a545d061784f09ed9a64cc29003bf0bcc0e43d890dde3d9e05f8abc78c1618437b23f0c3de3b859d8c5b7ee92dc5738d
+  checksum: 1231c9d0d1573267616364a50ef736be6edfdcf82600aee0d89ba8ddae891a32ad8d6d041af92ea685dee95ab7d4662098d62c61201d071a8ec9b4e19dd28e80
   languageName: node
   linkType: hard
 
-"@lerna/package-graph@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/package-graph@npm:5.6.1"
+"@lerna/package-graph@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/package-graph@npm:5.6.2"
   dependencies:
-    "@lerna/prerelease-id-from-version": 5.6.1
-    "@lerna/validation-error": 5.6.1
+    "@lerna/prerelease-id-from-version": 5.6.2
+    "@lerna/validation-error": 5.6.2
     npm-package-arg: 8.1.1
     npmlog: ^6.0.2
     semver: ^7.3.4
-  checksum: 2602d0131d8ba1b5a6f4f2d20679428474f1385bffcee8efaf9341b70fcd9b8f8264df61216dc6ae98d4ee521a3a179d8f08c1ecd3d58c2a3f1128a393122a3b
+  checksum: 1627c2de7bad648f6579ebf5cfdeedf3d4eb1931d8dfde10f9ee60663f38b9286b29292b135337f9c4976c4c444b27d341b4ced408f8a067ba97d66ac1efe203
   languageName: node
   linkType: hard
 
-"@lerna/package@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/package@npm:5.6.1"
+"@lerna/package@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/package@npm:5.6.2"
   dependencies:
     load-json-file: ^6.2.0
     npm-package-arg: 8.1.1
     write-pkg: ^4.0.0
-  checksum: 35f8c558fbd22edfd9da199039fc9d69bcaf084eae7c18898f7d12255594a65a2bfdbb0837ac53d09b21b00dbe1ed40dd9559ac738b8670fb04daf5585114b1d
+  checksum: 7f0d32cf4a74c76d932633a06ace58eca7ea46a2624ef304101b6b882ebe4ec1c683c6836784b790132d29e68e396f6490703db3070af3cff02ef32260f0fb52
   languageName: node
   linkType: hard
 
-"@lerna/prerelease-id-from-version@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/prerelease-id-from-version@npm:5.6.1"
+"@lerna/prerelease-id-from-version@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/prerelease-id-from-version@npm:5.6.2"
   dependencies:
     semver: ^7.3.4
-  checksum: 46ed22c0b373ab2e2d7831468d103c86e35d7bb6caffa7b23e4804f7db6703fef07dec230acdc4a084e46fc8de8a84550f5b85c9cc893cd198700faee1b10bde
+  checksum: 0b48944fc17941061036d7ed93829ca9555897b5073177cb6435cda852da433095df4a76c0b37842788ea5a4536a5300adec2bc23d55daeb8a0b0ca53de16268
   languageName: node
   linkType: hard
 
-"@lerna/profiler@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/profiler@npm:5.6.1"
+"@lerna/profiler@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/profiler@npm:5.6.2"
   dependencies:
     fs-extra: ^9.1.0
     npmlog: ^6.0.2
     upath: ^2.0.1
-  checksum: d078c03c8b3f8caea1528c297dfddd68fdc0a1cdeb0f99b19dda3078e799279959bf610575ff4f0de6230955eda1c5648b3d492551848cf51f72456eeb26e9ce
+  checksum: a66e0c763b1b0477cdfb0d8c06da0693bf142aaa4cd694022e35a9f7b016126780b685494c862cc3f3a175b14f31f1fc9902f924aa48d1243ad3e41088a661f1
   languageName: node
   linkType: hard
 
-"@lerna/project@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/project@npm:5.6.1"
+"@lerna/project@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/project@npm:5.6.2"
   dependencies:
-    "@lerna/package": 5.6.1
-    "@lerna/validation-error": 5.6.1
+    "@lerna/package": 5.6.2
+    "@lerna/validation-error": 5.6.2
     cosmiconfig: ^7.0.0
     dedent: ^0.7.0
     dot-prop: ^6.0.1
@@ -1286,43 +1285,43 @@ __metadata:
     p-map: ^4.0.0
     resolve-from: ^5.0.0
     write-json-file: ^4.3.0
-  checksum: 9201c13c7a28a5459fdfb59429d0729c001a91ed3404cacd1d4d3ce9c4b503f115842fd2d7e2d30c53d7285e83dc0267cc842418f4b0c05360d38f9fdc3c94d0
+  checksum: 26ba2daa219bc033fe06770f3f539ca801c96993a7e2e95d0a2ad72646f43746d5efe67e8a407306b2de6ebfa8220c6682b8a6fd72ec4402ce3af21cdec54f20
   languageName: node
   linkType: hard
 
-"@lerna/prompt@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/prompt@npm:5.6.1"
+"@lerna/prompt@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/prompt@npm:5.6.2"
   dependencies:
     inquirer: ^8.2.4
     npmlog: ^6.0.2
-  checksum: 296a3fc4f7378c1ac087937012e98f667d857058c56dc90504684f3e2418dfb2945f303d4468a0c02efa257c82a128537ffbf1995977f6f431c2524a76ec7fd3
-  languageName: node
-  linkType: hard
-
-"@lerna/publish@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/publish@npm:5.6.1"
-  dependencies:
-    "@lerna/check-working-tree": 5.6.1
-    "@lerna/child-process": 5.6.1
-    "@lerna/collect-updates": 5.6.1
-    "@lerna/command": 5.6.1
-    "@lerna/describe-ref": 5.6.1
-    "@lerna/log-packed": 5.6.1
-    "@lerna/npm-conf": 5.6.1
-    "@lerna/npm-dist-tag": 5.6.1
-    "@lerna/npm-publish": 5.6.1
-    "@lerna/otplease": 5.6.1
-    "@lerna/output": 5.6.1
-    "@lerna/pack-directory": 5.6.1
-    "@lerna/prerelease-id-from-version": 5.6.1
-    "@lerna/prompt": 5.6.1
-    "@lerna/pulse-till-done": 5.6.1
-    "@lerna/run-lifecycle": 5.6.1
-    "@lerna/run-topologically": 5.6.1
-    "@lerna/validation-error": 5.6.1
-    "@lerna/version": 5.6.1
+  checksum: a6f9352f223493d2eeb975f0eeb8981184a6981e2166a49bed792cebd811bf896234bf818b6e8260a6cf2cb2e5e0e26bf3c25475a159dc9b044f3708252b52b8
+  languageName: node
+  linkType: hard
+
+"@lerna/publish@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/publish@npm:5.6.2"
+  dependencies:
+    "@lerna/check-working-tree": 5.6.2
+    "@lerna/child-process": 5.6.2
+    "@lerna/collect-updates": 5.6.2
+    "@lerna/command": 5.6.2
+    "@lerna/describe-ref": 5.6.2
+    "@lerna/log-packed": 5.6.2
+    "@lerna/npm-conf": 5.6.2
+    "@lerna/npm-dist-tag": 5.6.2
+    "@lerna/npm-publish": 5.6.2
+    "@lerna/otplease": 5.6.2
+    "@lerna/output": 5.6.2
+    "@lerna/pack-directory": 5.6.2
+    "@lerna/prerelease-id-from-version": 5.6.2
+    "@lerna/prompt": 5.6.2
+    "@lerna/pulse-till-done": 5.6.2
+    "@lerna/run-lifecycle": 5.6.2
+    "@lerna/run-topologically": 5.6.2
+    "@lerna/validation-error": 5.6.2
+    "@lerna/version": 5.6.2
     fs-extra: ^9.1.0
     libnpmaccess: ^6.0.3
     npm-package-arg: 8.1.1
@@ -1332,164 +1331,164 @@ __metadata:
     p-pipe: ^3.1.0
     pacote: ^13.6.1
     semver: ^7.3.4
-  checksum: 41cad0181e0ca2dc31a622e86497910357eb1650e6f87dd113eb689b6a95bdc03ca66be1eab8d0a5af7ebf2dfe91e42ff431503883190706f4e9fda8a7c267b3
+  checksum: dce481b6e6ec168e75bc9c08bd075169b299fdf345abebf14029fa717029ddf2fc1464c65653234830807fb881ef0999a0af0f094a143c38865dd9d0dfb74ffd
   languageName: node
   linkType: hard
 
-"@lerna/pulse-till-done@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/pulse-till-done@npm:5.6.1"
+"@lerna/pulse-till-done@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/pulse-till-done@npm:5.6.2"
   dependencies:
     npmlog: ^6.0.2
-  checksum: 7aec35473835267b4e26a418ad94fd34e5cc992c262b4e3c73adc8c2c422c93a36ef08b8e1ad976c6084ae8b056aa496a2d3db696c545890f63bef7d7f437960
+  checksum: 923995424e6399947fa752d0eb7b33852e6f77d0c17280c2fef43e757f47f28e07227708bc2ce1d8dc81c8afee2e1509cee1d7c3d08ab8f615498770974f8f0d
   languageName: node
   linkType: hard
 
-"@lerna/query-graph@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/query-graph@npm:5.6.1"
+"@lerna/query-graph@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/query-graph@npm:5.6.2"
   dependencies:
-    "@lerna/package-graph": 5.6.1
-  checksum: b1d15ea6d3f7ddc777f09c082d28814185db00493e0fde3a01eb41b3020ccfa09c33473a01a4870ecdfec907cb7e184470b7bfbb3fd65d892917ed876684103f
+    "@lerna/package-graph": 5.6.2
+  checksum: a582795283760828417e3554ec015c68c815690bb7b29d7cf368a3a9d82f5150b8e6dbf02356cf4e4539b581d9879609876577ec87f3e4cc7a4caf605b2a042d
   languageName: node
   linkType: hard
 
-"@lerna/resolve-symlink@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/resolve-symlink@npm:5.6.1"
+"@lerna/resolve-symlink@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/resolve-symlink@npm:5.6.2"
   dependencies:
     fs-extra: ^9.1.0
     npmlog: ^6.0.2
     read-cmd-shim: ^3.0.0
-  checksum: f1e2ef78ea29099fb2e2fd84bce0f6d9fa71ac861b6e25435df7efdf24e54e768cf5f62845a1f334fcc32547a1d4124336ab80d8a0ad81f861fc5d222001e709
+  checksum: 19a95bb295ff9154f3661d36b54abfd5e415c0fb85a669a2fc7b600a180de13877b310d230c7782d8d5441324c5527c311f7a4afef57d6b8be04cbce5cd94927
   languageName: node
   linkType: hard
 
-"@lerna/rimraf-dir@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/rimraf-dir@npm:5.6.1"
+"@lerna/rimraf-dir@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/rimraf-dir@npm:5.6.2"
   dependencies:
-    "@lerna/child-process": 5.6.1
+    "@lerna/child-process": 5.6.2
     npmlog: ^6.0.2
     path-exists: ^4.0.0
     rimraf: ^3.0.2
-  checksum: 333858b38a753dd080fb023c40f25a65247a77f7c5fcb778c4fcaeaf58e2a2abdf319c39a6e95f062d88079adaeb6fe452df68f03a0b392e9986f6fecb5fa9ee
+  checksum: b0ec7dc69e3caa4c4eae88b8feedf248feff603e50d082a5f363fc0a1f604fc7b76d2067d69c79fdaa20675e3d5a87b59baaab6225c73dc1322b8705ce58030b
   languageName: node
   linkType: hard
 
-"@lerna/run-lifecycle@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/run-lifecycle@npm:5.6.1"
+"@lerna/run-lifecycle@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/run-lifecycle@npm:5.6.2"
   dependencies:
-    "@lerna/npm-conf": 5.6.1
+    "@lerna/npm-conf": 5.6.2
     "@npmcli/run-script": ^4.1.7
     npmlog: ^6.0.2
     p-queue: ^6.6.2
-  checksum: 592b81e4555a3544b42925065740faa87af7ee64d77a0bae60c513c1ccc1aaa7b22dc6ec08eb7d4ac7f46590d0371ccdc982ab8db4869a508e3a9294f1b4e0ab
+  checksum: 3c05af8ddd442a2fba007a41daeac3157dbfe845c3123f106b738843e2615e2a7350c8381622a6b4a793e675340c5671baabef95e6c63398c39b2fcedcafe6fb
   languageName: node
   linkType: hard
 
-"@lerna/run-topologically@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/run-topologically@npm:5.6.1"
+"@lerna/run-topologically@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/run-topologically@npm:5.6.2"
   dependencies:
-    "@lerna/query-graph": 5.6.1
+    "@lerna/query-graph": 5.6.2
     p-queue: ^6.6.2
-  checksum: d830a110e4a77c28687ad50a2f7e8ec4a965dd2818a542636abd8b3a5edf03bd2e4e1fca7a9a14590f2a9da1a280e827d8cf63a2650242525dd3aa97549316b3
+  checksum: d10b59ddff43c0f8387bcd7f9618d135ae6f33ba23d74d9d2fa16cece4209759f8ada46e1050cff07ad82388eda4774a7f0a1690bac4b36ce8f3a23c2718d0d3
   languageName: node
   linkType: hard
 
-"@lerna/run@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/run@npm:5.6.1"
+"@lerna/run@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/run@npm:5.6.2"
   dependencies:
-    "@lerna/command": 5.6.1
-    "@lerna/filter-options": 5.6.1
-    "@lerna/npm-run-script": 5.6.1
-    "@lerna/output": 5.6.1
-    "@lerna/profiler": 5.6.1
-    "@lerna/run-topologically": 5.6.1
-    "@lerna/timer": 5.6.1
-    "@lerna/validation-error": 5.6.1
+    "@lerna/command": 5.6.2
+    "@lerna/filter-options": 5.6.2
+    "@lerna/npm-run-script": 5.6.2
+    "@lerna/output": 5.6.2
+    "@lerna/profiler": 5.6.2
+    "@lerna/run-topologically": 5.6.2
+    "@lerna/timer": 5.6.2
+    "@lerna/validation-error": 5.6.2
     fs-extra: ^9.1.0
     p-map: ^4.0.0
-  checksum: b9b66e3e0c0e46be7398a42bc2ba645c5558a61c00542b07db51bbc223d7f6c88cb24551ab630ef5e8d261cfe5f5e91e59d036a1aaba913e3bfb8907283f03d9
+  checksum: a3ed53fea86b2b80d0c95aa2a9f007e524cde35422ebad312e21adaeae8564475f3d2a5ab40612ab8be1bfe8e935b61115808833e3e281ab93240f1b38b7d69a
   languageName: node
   linkType: hard
 
-"@lerna/symlink-binary@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/symlink-binary@npm:5.6.1"
+"@lerna/symlink-binary@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/symlink-binary@npm:5.6.2"
   dependencies:
-    "@lerna/create-symlink": 5.6.1
-    "@lerna/package": 5.6.1
+    "@lerna/create-symlink": 5.6.2
+    "@lerna/package": 5.6.2
     fs-extra: ^9.1.0
     p-map: ^4.0.0
-  checksum: b4266cebc9fd503980e029fade3b22e1eb0096034addcd49eb35d3554896a781acb199cd0ed53095c8cc6035b7cfa2dfe46d1e17816077dcf5fdb19100972558
+  checksum: f4d633677cde5b27e580c064ffca60b46be6808afcab5bd327e3c4e4d0cb7a924d79d5022f87f1e2209014687c75cb7c59d8514cab3911f4e14a5b5bbbf96fec
   languageName: node
   linkType: hard
 
-"@lerna/symlink-dependencies@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/symlink-dependencies@npm:5.6.1"
+"@lerna/symlink-dependencies@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/symlink-dependencies@npm:5.6.2"
   dependencies:
-    "@lerna/create-symlink": 5.6.1
-    "@lerna/resolve-symlink": 5.6.1
-    "@lerna/symlink-binary": 5.6.1
+    "@lerna/create-symlink": 5.6.2
+    "@lerna/resolve-symlink": 5.6.2
+    "@lerna/symlink-binary": 5.6.2
     fs-extra: ^9.1.0
     p-map: ^4.0.0
     p-map-series: ^2.1.0
-  checksum: da4b57629f7b7a55c8c5520535014fc5d99002fe38e52f246c368683d8a9822397a2cedd14045ba8614ef7a52813ce741c5acea5f96acbde9088f31ddafa427c
+  checksum: f1de8b38288f42647a0c663b8d6c701bf80acadaaf566830f736d3aae4b9f6dc0bac2fb3a771a266c62bcc72dd3b02b9ab5c2b4ccba40ad9e91894c08a168df8
   languageName: node
   linkType: hard
 
-"@lerna/temp-write@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/temp-write@npm:5.6.1"
+"@lerna/temp-write@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/temp-write@npm:5.6.2"
   dependencies:
     graceful-fs: ^4.1.15
     is-stream: ^2.0.0
     make-dir: ^3.0.0
     temp-dir: ^1.0.0
     uuid: ^8.3.2
-  checksum: f1c18658f1317edc3bdb1507bc5857debb5b2965ac5b72d37413e2cc2a28cc1e12f438a7da17132cceafa1b6a5682158ac42c7dfb38c123ca9ce78f5c6d72558
+  checksum: 9a3ef13e08230a88de046aaaba0efdc2b5e27f16abd97af03b395bc2cf40ec52d8b6850d25a913b955046f52013c4a99b3e75a48397356d0a9a86b0f97afa905
   languageName: node
   linkType: hard
 
-"@lerna/timer@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/timer@npm:5.6.1"
-  checksum: 36048c9ab2ebac803dff8d5538d58b7a8b4baad0c8d5451c5d773a625d9cf625873eee200e0c85eced33c77a4f5cb97fb88ce62e6b857576db7e91be211a3dd5
+"@lerna/timer@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/timer@npm:5.6.2"
+  checksum: 3eb43f371f5e357a42ec0a69722b13feff3967c88057334562366ffae40ce5ee7750718a498037e1f0ab9d438274357c4033561f068a76b1a6f98861a5eeae0c
   languageName: node
   linkType: hard
 
-"@lerna/validation-error@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/validation-error@npm:5.6.1"
+"@lerna/validation-error@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/validation-error@npm:5.6.2"
   dependencies:
     npmlog: ^6.0.2
-  checksum: ba68f38534ff7a408eb0fdbb3515d6162d67da7298bf3ad2af65d2e7e6f98fb1290505220ec852218beae37c0c8571d30294cb9547f8c39781fcf1d6e0707b1d
-  languageName: node
-  linkType: hard
-
-"@lerna/version@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/version@npm:5.6.1"
-  dependencies:
-    "@lerna/check-working-tree": 5.6.1
-    "@lerna/child-process": 5.6.1
-    "@lerna/collect-updates": 5.6.1
-    "@lerna/command": 5.6.1
-    "@lerna/conventional-commits": 5.6.1
-    "@lerna/github-client": 5.6.1
-    "@lerna/gitlab-client": 5.6.1
-    "@lerna/output": 5.6.1
-    "@lerna/prerelease-id-from-version": 5.6.1
-    "@lerna/prompt": 5.6.1
-    "@lerna/run-lifecycle": 5.6.1
-    "@lerna/run-topologically": 5.6.1
-    "@lerna/temp-write": 5.6.1
-    "@lerna/validation-error": 5.6.1
+  checksum: 3871cbacc7668ab2b0498f3d394ea65fa721257402cffa89efb97f6bed89d11504f554d25007d079e679181bcbbf773432745733654f8415e901c7d08a6ae06b
+  languageName: node
+  linkType: hard
+
+"@lerna/version@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/version@npm:5.6.2"
+  dependencies:
+    "@lerna/check-working-tree": 5.6.2
+    "@lerna/child-process": 5.6.2
+    "@lerna/collect-updates": 5.6.2
+    "@lerna/command": 5.6.2
+    "@lerna/conventional-commits": 5.6.2
+    "@lerna/github-client": 5.6.2
+    "@lerna/gitlab-client": 5.6.2
+    "@lerna/output": 5.6.2
+    "@lerna/prerelease-id-from-version": 5.6.2
+    "@lerna/prompt": 5.6.2
+    "@lerna/run-lifecycle": 5.6.2
+    "@lerna/run-topologically": 5.6.2
+    "@lerna/temp-write": 5.6.2
+    "@lerna/validation-error": 5.6.2
     "@nrwl/devkit": ">=14.8.1 < 16"
     chalk: ^4.1.0
     dedent: ^0.7.0
@@ -1503,17 +1502,17 @@ __metadata:
     semver: ^7.3.4
     slash: ^3.0.0
     write-json-file: ^4.3.0
-  checksum: 8a8a609dee49a1ecddc1471fcdbc8837d36e2c54eae5b152d83a3ed20754920fe3ce09f6ee8554e7eea74269c15100b7e478a4fbf4fb5ac53e0e42e0d78be1de
+  checksum: da0e0b822af685b0553dac95aa1355b5bfb9abde208d1afcc1a0e38134c49e7d3dc1430d0c951ffad236032bba5c242025754494dd6ceb5ad913f3cc8b9113b3
   languageName: node
   linkType: hard
 
-"@lerna/write-log-file@npm:5.6.1":
-  version: 5.6.1
-  resolution: "@lerna/write-log-file@npm:5.6.1"
+"@lerna/write-log-file@npm:5.6.2":
+  version: 5.6.2
+  resolution: "@lerna/write-log-file@npm:5.6.2"
   dependencies:
     npmlog: ^6.0.2
     write-file-atomic: ^4.0.1
-  checksum: 692b7ee0db2e4c150d983b8d588c7635ddc19b5f9e76fa948cf48437fa3950aa784127d87d55c125317892e22d755f09ec8fc01c9ac45647d72344a6415ad5da
+  checksum: 814e9cf20ac28be49b22720be7bef8f708b28c344d54a0664cb8c44bbcb11387c4f89abf1050cfc81b41fa770099c748ac97fdb99d8a016c9e2c3ca801f27a30
   languageName: node
   linkType: hard
 
@@ -1849,7 +1848,7 @@ __metadata:
     unbuild: latest
     unimport: ^0.6.8
     untyped: ^0.5.0
-    vite: ~3.1.6
+    vite: ~3.1.7
   languageName: unknown
   linkType: soft
 
@@ -1967,7 +1966,7 @@ __metadata:
     get-port-please: ^2.6.1
     h3: ^0.7.21
     knitwork: ^0.1.2
-    magic-string: ^0.26.6
+    magic-string: ^0.26.7
     mlly: ^0.5.16
     ohash: ^0.1.5
     pathe: ^0.3.9
@@ -1981,7 +1980,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unplugin: ^0.9.6
-    vite: ~3.1.6
+    vite: ~3.1.7
     vite-node: ^0.24.0
     vite-plugin-checker: ^0.5.1
     vue: 3.2.40
@@ -2017,7 +2016,7 @@ __metadata:
     fs-extra: ^10.1.0
     hash-sum: ^2.0.0
     lodash-es: ^4.17.21
-    magic-string: ^0.26.6
+    magic-string: ^0.26.7
     memfs: ^3.4.7
     mini-css-extract-plugin: ^2.6.1
     mlly: ^0.5.16
@@ -9314,27 +9313,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lerna@npm:^5.6.1":
-  version: 5.6.1
-  resolution: "lerna@npm:5.6.1"
-  dependencies:
-    "@lerna/add": 5.6.1
-    "@lerna/bootstrap": 5.6.1
-    "@lerna/changed": 5.6.1
-    "@lerna/clean": 5.6.1
-    "@lerna/cli": 5.6.1
-    "@lerna/command": 5.6.1
-    "@lerna/create": 5.6.1
-    "@lerna/diff": 5.6.1
-    "@lerna/exec": 5.6.1
-    "@lerna/import": 5.6.1
-    "@lerna/info": 5.6.1
-    "@lerna/init": 5.6.1
-    "@lerna/link": 5.6.1
-    "@lerna/list": 5.6.1
-    "@lerna/publish": 5.6.1
-    "@lerna/run": 5.6.1
-    "@lerna/version": 5.6.1
+"lerna@npm:^5.6.2":
+  version: 5.6.2
+  resolution: "lerna@npm:5.6.2"
+  dependencies:
+    "@lerna/add": 5.6.2
+    "@lerna/bootstrap": 5.6.2
+    "@lerna/changed": 5.6.2
+    "@lerna/clean": 5.6.2
+    "@lerna/cli": 5.6.2
+    "@lerna/command": 5.6.2
+    "@lerna/create": 5.6.2
+    "@lerna/diff": 5.6.2
+    "@lerna/exec": 5.6.2
+    "@lerna/import": 5.6.2
+    "@lerna/info": 5.6.2
+    "@lerna/init": 5.6.2
+    "@lerna/link": 5.6.2
+    "@lerna/list": 5.6.2
+    "@lerna/publish": 5.6.2
+    "@lerna/run": 5.6.2
+    "@lerna/version": 5.6.2
     "@nrwl/devkit": ">=14.8.1 < 16"
     import-local: ^3.0.2
     inquirer: ^8.2.4
@@ -9343,7 +9342,7 @@ __metadata:
     typescript: ^3 || ^4
   bin:
     lerna: cli.js
-  checksum: cc0c609cab72bd8d008ecdd5cda10216d2b0d4292d612905e471d701149f1ee66a2a115e79937ef8d4ab3fe032962def12a86c4cd3381b930cff56a8211fab64
+  checksum: 5e06ac9f1e47e414231aa9d9e6a74f6ea7eef62e0110941b1ac1a73635cfaaae3802047e16c33c9682f5932e72653b959b2895cc49da334afbae51ff718baca3
   languageName: node
   linkType: hard
 
@@ -9765,12 +9764,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"magic-string@npm:^0.26.6":
-  version: 0.26.6
-  resolution: "magic-string@npm:0.26.6"
+"magic-string@npm:^0.26.7":
+  version: 0.26.7
+  resolution: "magic-string@npm:0.26.7"
   dependencies:
     sourcemap-codec: ^1.4.8
-  checksum: 0147380c7a21af9dc661fb5282f0bb06854da6ababdc58a669ec0054093cd1afcfb454a0603495587b5f308bad9efcaceeb17b60887df87c51d692ec01ce4a8a
+  checksum: 89b0d60cbb32bbf3d1e23c46ea93db082d18a8230b972027aecb10a40bba51be519ecce0674f995571e3affe917b76b09f59d8dbc9a1b2c9c4102a2b6e8a2b01
   languageName: node
   linkType: hard
 
@@ -10850,7 +10849,7 @@ __metadata:
     expect-type: ^0.14.2
     globby: ^13.1.2
     jiti: ^1.16.0
-    lerna: ^5.6.1
+    lerna: ^5.6.2
     markdownlint-cli: ^0.32.2
     ohmyfetch: ^0.4.19
     pathe: ^0.3.9
@@ -10860,7 +10859,7 @@ __metadata:
     typescript: ^4.8.4
     ufo: ^0.8.5
     unbuild: ^0.8.11
-    vite: ^3.1.6
+    vite: ^3.1.7
     vitest: ~0.19.1
     vue-tsc: ^1.0.3
   languageName: unknown
@@ -10904,7 +10903,7 @@ __metadata:
     hash-sum: ^2.0.0
     hookable: ^5.3.0
     knitwork: ^0.1.2
-    magic-string: ^0.26.6
+    magic-string: ^0.26.7
     mlly: ^0.5.16
     nitropack: ^0.5.4
     nuxi: 3.0.0-rc.11
@@ -14398,9 +14397,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^3.1.6":
-  version: 3.1.6
-  resolution: "vite@npm:3.1.6"
+"vite@npm:^3.1.7":
+  version: 3.1.7
+  resolution: "vite@npm:3.1.7"
   dependencies:
     esbuild: ^0.15.9
     fsevents: ~2.3.2
@@ -14426,7 +14425,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 393369af4da85aef8718d2236fceb238410c130cc740462c317c6ae4d9c04c519c1591cf8fef2ccc61195e41db54c0d892b3f9a10d3ed0e3c8ae8f0cffaa46ed
+  checksum: cd0a0bb11777d9006f408a67ef1063c1771baaf091f9e4f102f0fdaec77559784b76788e80a398ac8fe2fc90027e83712ae860ed51510b81c4153d8c5ca5fb37
   languageName: node
   linkType: hard
 

From 9521fc723453085c4b9a9545a63863b66e95b1f5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Oct 2022 12:01:08 +0100
Subject: [PATCH 08/13] chore(deps): update dependency @nuxt/telemetry to
 ^2.1.6 (#8084)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 packages/nuxt/package.json |  2 +-
 yarn.lock                  | 65 ++++++++++++++++++++++++++------------
 2 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index f1a03d1a1eb..afc03527aa7 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -39,7 +39,7 @@
     "@nuxt/devalue": "^2.0.0",
     "@nuxt/kit": "3.0.0-rc.11",
     "@nuxt/schema": "3.0.0-rc.11",
-    "@nuxt/telemetry": "^2.1.5",
+    "@nuxt/telemetry": "^2.1.6",
     "@nuxt/ui-templates": "^0.4.0",
     "@nuxt/vite-builder": "3.0.0-rc.11",
     "@vue/reactivity": "^3.2.40",
diff --git a/yarn.lock b/yarn.lock
index c542865f751..253f7e85087 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1852,33 +1852,33 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@nuxt/telemetry@npm:^2.1.5":
-  version: 2.1.5
-  resolution: "@nuxt/telemetry@npm:2.1.5"
+"@nuxt/telemetry@npm:^2.1.6":
+  version: 2.1.6
+  resolution: "@nuxt/telemetry@npm:2.1.6"
   dependencies:
-    "@nuxt/kit": ^3.0.0-rc.9
-    chalk: ^5.0.1
-    ci-info: ^3.3.2
+    "@nuxt/kit": ^3.0.0-rc.11
+    chalk: ^5.1.0
+    ci-info: ^3.5.0
     consola: ^2.15.3
     create-require: ^1.1.1
     defu: ^6.1.0
     destr: ^1.1.1
-    dotenv: ^16.0.2
+    dotenv: ^16.0.3
     fs-extra: ^10.1.0
-    git-url-parse: ^13.0.0
-    inquirer: ^9.1.1
+    git-url-parse: ^13.1.0
+    inquirer: ^9.1.3
     is-docker: ^3.0.0
-    jiti: ^1.14.0
+    jiti: ^1.16.0
     mri: ^1.2.0
     nanoid: ^4.0.0
     node-fetch: ^3.2.10
-    ohmyfetch: ^0.4.18
+    ohmyfetch: ^0.4.19
     parse-git-config: ^3.0.0
     rc9: ^1.2.2
     std-env: ^3.2.1
   bin:
     nuxt-telemetry: bin/nuxt-telemetry.mjs
-  checksum: a12d5bddd2767d9fc4f4a3686bfbdeec06c446cc9f127daaff2e2691b69caa87cf8d9e3408066f6ae9a8f3483a34b8a481fc43d61b08ec5abce5a60244f94f0a
+  checksum: d419d65c4e0496dc96ed13bf365890d94ffe4ac27495f578c9a7aba11b1fac9a903a30bcb49f070d46cf2355283e18a1c8130439736ad469404ed0d747f94daa
   languageName: node
   linkType: hard
 
@@ -4610,6 +4610,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chalk@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "chalk@npm:5.1.0"
+  checksum: c1aa0bf0064a5a59bc06e3e385685fdcc5bb122159152bb57755fc48f9ef93c30cb3a36c9a2c39ead23e5261d787c87c4c097e1a889e1370478102a0112fe0e0
+  languageName: node
+  linkType: hard
+
 "changelogen@npm:^0.3.2":
   version: 0.3.2
   resolution: "changelogen@npm:0.3.2"
@@ -4712,7 +4719,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ci-info@npm:^3.2.0":
+"ci-info@npm:^3.2.0, ci-info@npm:^3.5.0":
   version: 3.5.0
   resolution: "ci-info@npm:3.5.0"
   checksum: 7def3789706ec18db3dc371dc699bd0df12057d54b796201f50ba87200e0849d3d83c68da00ab2ab8cdd738d91b25ab9e31620588f8d7e64ffaa1f760fd121cf
@@ -5861,6 +5868,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dotenv@npm:^16.0.3":
+  version: 16.0.3
+  resolution: "dotenv@npm:16.0.3"
+  checksum: afcf03f373d7a6d62c7e9afea6328e62851d627a4e73f2e12d0a8deae1cd375892004f3021883f8aec85932cd2834b091f568ced92b4774625b321db83b827f8
+  languageName: node
+  linkType: hard
+
 "dotenv@npm:~10.0.0":
   version: 10.0.0
   resolution: "dotenv@npm:10.0.0"
@@ -7930,7 +7944,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"git-url-parse@npm:^13.0.0, git-url-parse@npm:^13.1.0":
+"git-url-parse@npm:^13.1.0":
   version: 13.1.0
   resolution: "git-url-parse@npm:13.1.0"
   dependencies:
@@ -8569,9 +8583,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inquirer@npm:^9.1.1":
-  version: 9.1.2
-  resolution: "inquirer@npm:9.1.2"
+"inquirer@npm:^9.1.3":
+  version: 9.1.3
+  resolution: "inquirer@npm:9.1.3"
   dependencies:
     ansi-escapes: ^5.0.0
     chalk: ^5.0.1
@@ -8583,12 +8597,12 @@ __metadata:
     mute-stream: 0.0.8
     ora: ^6.1.2
     run-async: ^2.4.0
-    rxjs: ^7.5.6
+    rxjs: ^7.5.7
     string-width: ^5.1.2
     strip-ansi: ^7.0.1
     through: ^2.3.6
     wrap-ansi: ^8.0.1
-  checksum: c1efd2a8a85b351ea6c6dece159c3eef8f499ce4b52b6c1888499edaa585235a92d2f8bad935b6302731234bbe9f4fb4adcebdd8645d8ac442315b5a8227ed2e
+  checksum: 77ff36f5baf2e3191d448a414a2fdb983ff62bdeb19e3b5703d3f243ba72485ec154f1f1942f76b916e2eedf47e8d9c7027644f1aadace73b032f683e85e8bd9
   languageName: node
   linkType: hard
 
@@ -10884,7 +10898,7 @@ __metadata:
     "@nuxt/devalue": ^2.0.0
     "@nuxt/kit": 3.0.0-rc.11
     "@nuxt/schema": 3.0.0-rc.11
-    "@nuxt/telemetry": ^2.1.5
+    "@nuxt/telemetry": ^2.1.6
     "@nuxt/ui-templates": ^0.4.0
     "@nuxt/vite-builder": 3.0.0-rc.11
     "@types/fs-extra": ^9.0.13
@@ -12719,7 +12733,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:^7.5.5, rxjs@npm:^7.5.6":
+"rxjs@npm:^7.5.5":
   version: 7.5.6
   resolution: "rxjs@npm:7.5.6"
   dependencies:
@@ -12728,6 +12742,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rxjs@npm:^7.5.7":
+  version: 7.5.7
+  resolution: "rxjs@npm:7.5.7"
+  dependencies:
+    tslib: ^2.1.0
+  checksum: edabcdb73b0f7e0f5f6e05c2077aff8c52222ac939069729704357d6406438acca831c24210db320aba269e86dbe1a400f3769c89101791885121a342fb15d9c
+  languageName: node
+  linkType: hard
+
 "safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"

From 5a2616cfee4c3ca2838785536c43d6dcdb780ee8 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 10 Oct 2022 12:02:35 +0100
Subject: [PATCH 09/13] perf(nitro): respond with early hints in node-based
 environments (#7893)

---
 packages/nuxt/src/core/runtime/nitro/renderer.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/nuxt/src/core/runtime/nitro/renderer.ts b/packages/nuxt/src/core/runtime/nitro/renderer.ts
index fcb56a73f75..828aec1a84f 100644
--- a/packages/nuxt/src/core/runtime/nitro/renderer.ts
+++ b/packages/nuxt/src/core/runtime/nitro/renderer.ts
@@ -1,4 +1,4 @@
-import { createRenderer } from 'vue-bundle-renderer/runtime'
+import { createRenderer, renderResourceHeaders } from 'vue-bundle-renderer/runtime'
 import type { RenderResponse } from 'nitropack'
 import type { Manifest } from 'vite'
 import { appendHeader, getQuery } from 'h3'
@@ -100,7 +100,10 @@ const getSPARenderer = lazyCachedFunction(async () => {
     return Promise.resolve(result)
   }
 
-  return { renderToString }
+  return {
+    rendererContext: renderer.rendererContext,
+    renderToString
+  }
 })
 
 const PAYLOAD_CACHE = (process.env.NUXT_PAYLOAD_EXTRACTION && process.env.prerender) ? new Map() : null // TODO: Use LRU cache
@@ -150,6 +153,14 @@ export default defineRenderHandler(async (event) => {
 
   // Render app
   const renderer = (process.env.NUXT_NO_SSR || ssrContext.noSSR) ? await getSPARenderer() : await getSSRRenderer()
+
+  // Render 103 Early Hints
+  if (!isRenderingPayload && !process.env.prerender && event.res.socket) {
+    const { link } = renderResourceHeaders({}, renderer.rendererContext)
+    // TODO: use https://github.com/nodejs/node/pull/44180 when we drop support for node 16
+    event.res.socket!.write(`HTTP/1.1 103 Early Hints\r\nLink: ${link}\r\n\r\n`, 'utf-8')
+  }
+
   const _rendered = await renderer.renderToString(ssrContext).catch((err) => {
     if (!ssrError) {
       // Use explicitly thrown error in preference to subsequent rendering errors

From 26b1c9ca0ece63d4ea6731d75b83fbe253022485 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 10 Oct 2022 16:48:23 +0100
Subject: [PATCH 10/13] feat(nuxt): parse html to treeshake client-only
 components (#7527)

---
 packages/nuxt/package.json                 |  1 +
 packages/nuxt/src/components/tree-shake.ts | 49 ++++++++++++++++------
 yarn.lock                                  |  8 ++++
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index afc03527aa7..ff063a267f1 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -67,6 +67,7 @@
     "scule": "^0.3.2",
     "strip-literal": "^0.4.2",
     "ufo": "^0.8.5",
+    "ultrahtml": "^0.1.1",
     "unctx": "^2.0.2",
     "unenv": "^0.6.2",
     "unimport": "^0.6.8",
diff --git a/packages/nuxt/src/components/tree-shake.ts b/packages/nuxt/src/components/tree-shake.ts
index 23d869ddde9..263fb489750 100644
--- a/packages/nuxt/src/components/tree-shake.ts
+++ b/packages/nuxt/src/components/tree-shake.ts
@@ -1,6 +1,7 @@
 import { pathToFileURL } from 'node:url'
 import { parseURL } from 'ufo'
 import MagicString from 'magic-string'
+import { parse, walk, ELEMENT_NODE, Node } from 'ultrahtml'
 import { createUnplugin } from 'unplugin'
 import type { Component } from '@nuxt/schema'
 
@@ -9,8 +10,10 @@ interface TreeShakeTemplatePluginOptions {
   getComponents (): Component[]
 }
 
+const PLACEHOLDER_RE = /^(v-slot|#)(fallback|placeholder)/
+
 export const TreeShakeTemplatePlugin = createUnplugin((options: TreeShakeTemplatePluginOptions) => {
-  const regexpMap = new WeakMap<Component[], RegExp>()
+  const regexpMap = new WeakMap<Component[], [RegExp, string[]]>()
   return {
     name: 'nuxt:tree-shake-template',
     enforce: 'pre',
@@ -18,28 +21,48 @@ export const TreeShakeTemplatePlugin = createUnplugin((options: TreeShakeTemplat
       const { pathname } = parseURL(decodeURIComponent(pathToFileURL(id).href))
       return pathname.endsWith('.vue')
     },
-    transform (code, id) {
+    async transform (code, id) {
+      const template = code.match(/<template>([\s\S]*)<\/template>/)
+      if (!template) { return }
+
       const components = options.getComponents()
 
       if (!regexpMap.has(components)) {
         const clientOnlyComponents = components
           .filter(c => c.mode === 'client' && !components.some(other => other.mode !== 'client' && other.pascalName === c.pascalName))
-          .map(c => `${c.pascalName}|${c.kebabName}`)
-          .concat('ClientOnly|client-only')
-          .map(component => `<(${component})(| [^>]*)>[\\s\\S]*?<\\/(${component})>`)
+          .flatMap(c => [c.pascalName, c.kebabName])
+          .concat(['ClientOnly', 'client-only'])
+        const tags = clientOnlyComponents
+          .map(component => `<(${component})[^>]*>[\\s\\S]*?<\\/(${component})>`)
 
-        regexpMap.set(components, new RegExp(`(${clientOnlyComponents.join('|')})`, 'g'))
+        regexpMap.set(components, [new RegExp(`(${tags.join('|')})`, 'g'), clientOnlyComponents])
       }
 
-      const COMPONENTS_RE = regexpMap.get(components)!
+      const [COMPONENTS_RE, clientOnlyComponents] = regexpMap.get(components)!
+      if (!COMPONENTS_RE.test(code)) { return }
+
       const s = new MagicString(code)
 
-      // Do not render client-only slots on SSR, but preserve attributes and fallback/placeholder slots
-      s.replace(COMPONENTS_RE, r => r.replace(/<([^>]*[^/])\/?>[\s\S]*$/, (chunk: string, el: string) => {
-        const fallback = chunk.match(/<template[^>]*(#|v-slot:)(fallback|placeholder)[^>]*>[\s\S]*?<\/template>/)?.[0] || ''
-        const tag = el.split(' ').shift()
-        return `<${el}>${fallback}</${tag}>`
-      }))
+      const ast = parse(template[0])
+      await walk(ast, (node) => {
+        if (node.type !== ELEMENT_NODE || !clientOnlyComponents.includes(node.name) || !node.children?.length) {
+          return
+        }
+
+        const fallback = node.children.find(
+          (n: Node) => n.name === 'template' &&
+            Object.entries(n.attributes as Record<string, string>)?.flat().some(attr => PLACEHOLDER_RE.test(attr))
+        )
+
+        try {
+          // Replace node content
+          const text = fallback ? code.slice(template.index + fallback.loc[0].start, template.index + fallback.loc[fallback.loc.length - 1].end) : ''
+          s.overwrite(template.index + node.loc[0].end, template.index + node.loc[node.loc.length - 1].start, text)
+        } catch (err) {
+          // This may fail if we have a nested client-only component and are trying
+          // to replace some text that has already been replaced
+        }
+      })
 
       if (s.hasChanged()) {
         return {
diff --git a/yarn.lock b/yarn.lock
index 253f7e85087..6154a08f77f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10928,6 +10928,7 @@ __metadata:
     scule: ^0.3.2
     strip-literal: ^0.4.2
     ufo: ^0.8.5
+    ultrahtml: ^0.1.1
     unbuild: latest
     unctx: ^2.0.2
     unenv: ^0.6.2
@@ -13992,6 +13993,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ultrahtml@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "ultrahtml@npm:0.1.1"
+  checksum: a074b6d41e942b0ae3a4ea7372043bee32f5bad08009278adff04a96d784b316e68085d5f44b52c5c03ac0bf1d2a142090e58e555f953d9c69eb9639fd2f70d5
+  languageName: node
+  linkType: hard
+
 "unbox-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "unbox-primitive@npm:1.0.2"

From 6119fbcf767773da5415be945b0be551d42bab94 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Oct 2022 16:48:48 +0100
Subject: [PATCH 11/13] chore(deps): update dependency @rollup/plugin-replace
 to v5 (#8086)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 packages/vite/package.json |  2 +-
 yarn.lock                  | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/vite/package.json b/packages/vite/package.json
index 6c8e864b4bd..7fa81be96bd 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@nuxt/kit": "3.0.0-rc.11",
-    "@rollup/plugin-replace": "^4.0.0",
+    "@rollup/plugin-replace": "^5.0.0",
     "@vitejs/plugin-vue": "^3.1.2",
     "@vitejs/plugin-vue-jsx": "^2.0.1",
     "autoprefixer": "^10.4.12",
diff --git a/yarn.lock b/yarn.lock
index 6154a08f77f..66f188a2d70 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1950,7 +1950,7 @@ __metadata:
   dependencies:
     "@nuxt/kit": 3.0.0-rc.11
     "@nuxt/schema": 3.0.0-rc.11
-    "@rollup/plugin-replace": ^4.0.0
+    "@rollup/plugin-replace": ^5.0.0
     "@types/cssnano": ^5
     "@vitejs/plugin-vue": ^3.1.2
     "@vitejs/plugin-vue-jsx": ^2.0.1
@@ -2367,6 +2367,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/plugin-replace@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@rollup/plugin-replace@npm:5.0.0"
+  dependencies:
+    "@rollup/pluginutils": ^4.2.1
+    magic-string: ^0.26.4
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: fdf128d2db100d909ea2635192fe6412272bb953efc991c337914029a9ac554abb6c45e6d623277ed8490049b8b6eaad661034bcc88e81a60ffa8b111a8bb239
+  languageName: node
+  linkType: hard
+
 "@rollup/plugin-wasm@npm:^5.2.0":
   version: 5.2.0
   resolution: "@rollup/plugin-wasm@npm:5.2.0"

From ed1c704835c280cd2d7ad795452f2da9c8401e2a Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 11 Oct 2022 06:26:38 +0100
Subject: [PATCH 12/13] fix(vite): prevent overlap between vite assets and app
 routes (#7989)

---
 packages/vite/src/client.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/vite/src/client.ts b/packages/vite/src/client.ts
index 9f7df783b45..76e71183c94 100644
--- a/packages/vite/src/client.ts
+++ b/packages/vite/src/client.ts
@@ -5,8 +5,7 @@ import viteJsxPlugin from '@vitejs/plugin-vue-jsx'
 import type { Connect, ServerOptions } from 'vite'
 import { logger } from '@nuxt/kit'
 import { getPort } from 'get-port-please'
-import { joinURL, withLeadingSlash, withoutLeadingSlash, withTrailingSlash } from 'ufo'
-import escapeRE from 'escape-string-regexp'
+import { joinURL, withoutLeadingSlash } from 'ufo'
 import defu from 'defu'
 import type { OutputOptions } from 'rollup'
 import { cacheDirPlugin } from './plugins/cache-dir'
@@ -110,12 +109,12 @@ 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 baseURL = joinURL(ctx.nuxt.options.app.baseURL.replace(/^\./, '') || '/', ctx.nuxt.options.app.buildAssetsDir)
-    const BASE_RE = new RegExp(`^${escapeRE(withTrailingSlash(withLeadingSlash(baseURL)))}`)
     const viteMiddleware: Connect.NextHandleFunction = (req, res, next) => {
       // Workaround: vite devmiddleware modifies req.url
       const originalURL = req.url!
-      req.url = originalURL.replace(BASE_RE, '/')
+      if (!originalURL.startsWith('/__nuxt_vite_node__') && !originalURL.startsWith(clientConfig.base!)) {
+        req.url = joinURL('/__url', originalURL)
+      }
       viteServer.middlewares.handle(req, res, (err: unknown) => {
         req.url = originalURL
         next(err)

From 2aa097310cd5a490963239b8693e058d7cfef25c Mon Sep 17 00:00:00 2001
From: miketromba <mike.tromba@gmail.com>
Date: Tue, 11 Oct 2022 08:14:18 -0400
Subject: [PATCH 13/13] docs: Add recommendation for controlling plugin
 registration order. (#8096)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sébastien Chopin <seb@nuxtjs.com>
---
 .../2.guide/2.directory-structure/1.plugins.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/docs/content/2.guide/2.directory-structure/1.plugins.md b/docs/content/2.guide/2.directory-structure/1.plugins.md
index 27576e17c15..15e0d61782d 100644
--- a/docs/content/2.guide/2.directory-structure/1.plugins.md
+++ b/docs/content/2.guide/2.directory-structure/1.plugins.md
@@ -40,6 +40,22 @@ export default defineNuxtPlugin(nuxtApp => {
 })
 ```
 
+## Plugin Registration Order
+
+You can control the order in which plugins are registered by prefixing a number to the file names.
+
+For example:
+
+```bash
+plugins/
+ | - 1.myPlugin.ts
+ | - 2.myOtherPlugin.ts
+```
+
+In this example, `2.myOtherPlugin.ts` will be able to access anything that was injected by `1.myPlugin.ts`.
+
+This is useful in situations where you have a plugin that depends on another plugin.
+
 ## Using Composables Within Plugins
 
 You can use [composables](/guide/directory-structure/composables) within Nuxt plugins:
@@ -54,7 +70,7 @@ However, keep in mind there are some limitations and differences:
 
 **If a composable depends on another plugin registered later, it might not work.**
 
-**Reason:** Plugins are called in order sequencially and before everything else. You might use a composable that dependants on another plugin which is not called yet.
+**Reason:** Plugins are called in order sequentially and before everything else. You might use a composable that depends on another plugin which has not been called yet.
 
 **If a composable depends on the Vue.js lifecycle, it won't work.**