From 654566794321e299a7d938b7ded0b7a977e51322 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 22 Apr 2022 16:21:37 +0100
Subject: [PATCH 01/34] feat(nuxt): support creating errors directly from
 `throwError`

---
 packages/nuxt/src/app/composables/error.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index cdee4541c7b..68d0395c66a 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -1,3 +1,4 @@
+import { createError, H3Error } from 'h3'
 import { useNuxtApp, useState } from '#app'
 
 export const useError = () => {
@@ -5,10 +6,10 @@ export const useError = () => {
   return useState('error', () => process.server ? nuxtApp.ssrContext.error : nuxtApp.payload.error)
 }
 
-export const throwError = (_err: string | Error) => {
+export const throwError = (_err: string | Error | Partial<H3Error>) => {
   const nuxtApp = useNuxtApp()
   const error = useError()
-  const err = typeof _err === 'string' ? new Error(_err) : _err
+  const err = typeof _err === 'string' ? new Error(_err) : _err && typeof _err === 'object' ? createError(_err) : _err
   nuxtApp.callHook('app:error', err)
   if (process.server) {
     nuxtApp.ssrContext.error = nuxtApp.ssrContext.error || err

From ab3bca37742f8cca04108de368548e99821ed937 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 22 Apr 2022 16:43:01 +0100
Subject: [PATCH 02/34] fix(nuxt): clear errors _after_ route resolves

---
 packages/nuxt/src/app/plugins/router.ts   | 9 ++++-----
 packages/nuxt/src/pages/runtime/router.ts | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/nuxt/src/app/plugins/router.ts b/packages/nuxt/src/app/plugins/router.ts
index 3fcbc18d674..f00c743eafe 100644
--- a/packages/nuxt/src/app/plugins/router.ts
+++ b/packages/nuxt/src/app/plugins/router.ts
@@ -106,11 +106,6 @@ export default defineNuxtPlugin<{ route: Route, router: Router }>((nuxtApp) => {
       // Resolve route
       const to = getRouteFromPath(url)
 
-      if (process.client && !nuxtApp.isHydrating) {
-      // Clear any existing errors
-        await callWithNuxt(nuxtApp, clearError)
-      }
-
       // Run beforeEach hooks
       for (const middleware of hooks['navigate:before']) {
         const result = await middleware(to, route)
@@ -127,6 +122,10 @@ export default defineNuxtPlugin<{ route: Route, router: Router }>((nuxtApp) => {
       Object.assign(route, to)
       if (process.client) {
         window.history[replace ? 'replaceState' : 'pushState']({}, '', url)
+        if (!nuxtApp.isHydrating) {
+        // Clear any existing errors
+          await callWithNuxt(nuxtApp, clearError)
+        }
       }
       // Run afterEach hooks
       for (const middleware of hooks['navigate:after']) {
diff --git a/packages/nuxt/src/pages/runtime/router.ts b/packages/nuxt/src/pages/runtime/router.ts
index 9b3e6d68542..29b75e29990 100644
--- a/packages/nuxt/src/pages/runtime/router.ts
+++ b/packages/nuxt/src/pages/runtime/router.ts
@@ -125,11 +125,6 @@ export default defineNuxtPlugin((nuxtApp) => {
       }
     }
 
-    if (process.client && !nuxtApp.isHydrating) {
-      // Clear any existing errors
-      await callWithNuxt(nuxtApp, clearError)
-    }
-
     for (const entry of middlewareEntries) {
       const middleware = typeof entry === 'string' ? nuxtApp._middleware.named[entry] || await namedMiddleware[entry]?.().then(r => r.default || r) : entry
 
@@ -152,6 +147,10 @@ export default defineNuxtPlugin((nuxtApp) => {
 
   router.afterEach(() => {
     delete nuxtApp._processingMiddleware
+    if (process.client && !nuxtApp.isHydrating) {
+      // Clear any existing errors
+      callWithNuxt(nuxtApp, clearError)
+    }
   })
 
   nuxtApp.hook('app:created', async () => {

From 1481e0081860ed2948e8a04a9a252731913443ac Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 22 Apr 2022 16:53:48 +0100
Subject: [PATCH 03/34] docs: update documentation

---
 .../2.guide/2.features/7.error-handling.md    | 14 ++++++++++++-
 docs/content/3.api/3.utils/throw-error.md     | 20 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/docs/content/2.guide/2.features/7.error-handling.md b/docs/content/2.guide/2.features/7.error-handling.md
index c65ed759f82..bc511ac5cbf 100644
--- a/docs/content/2.guide/2.features/7.error-handling.md
+++ b/docs/content/2.guide/2.features/7.error-handling.md
@@ -82,10 +82,22 @@ This function will return the global Nuxt error that is being handled.
 
 ### `throwError`
 
-* `function throwError (err: string | Error): Error`
+* `function throwError (err: string | Error | Partial<H3Error>): Error`
 
 You can call this function at any point on client-side, or (on server side) directly within middleware, plugins or `setup()` functions. It will trigger a full-screen error page (as above) which you can clear with `clearError`.
 
+### Example
+
+```vue [pages/movies/[slug].vue]
+<script setup>
+const route = useRoute()
+const { data: movie } = await useFetch(`/api/movies/${route.params.slug}`)
+if (!movie.value) {
+  throwError({ statusCode: 404, statusMessage: 'Page Not Found' })
+}
+</script>
+```
+
 ::ReadMore{link="/api/utils/throw-error"}
 ::
 
diff --git a/docs/content/3.api/3.utils/throw-error.md b/docs/content/3.api/3.utils/throw-error.md
index 7a9306def28..9a83651b2b7 100644
--- a/docs/content/3.api/3.utils/throw-error.md
+++ b/docs/content/3.api/3.utils/throw-error.md
@@ -6,10 +6,11 @@ Within your pages, components and plugins you can use `throwError` to throw an e
 
 **Parameters:**
 
-- `error`: `string | Error`
+- `error`: `string | Error | Partial<H3Error>`
 
 ```js
 throwError("😱 Oh no, an error has been thrown.")
+throwError({ statusCode: 404, statusMessage: "Page Not Found" })
 ```
 
 The thrown error is set in the state using [`useError()`](/api/composables/use-error) to create a reactive and SSR-friendly shared error state across components.
@@ -18,3 +19,20 @@ The thrown error is set in the state using [`useError()`](/api/composables/use-e
 
 ::ReadMore{link="/guide/features/error-handling"}
 ::
+
+## Throwing errors in API routes
+
+You can use `createError` from [`h3`](https://github.com/unjs/h3) package to trigger error handling in server API routes.
+
+**Example:**
+
+```js
+import { createError } from 'h3'
+
+export default eventHandler(() => {
+  return createError({
+    statusCode: 404,
+    statusMessage: 'Page Not Found'
+  })
+}
+```

From 4c899c74c0cdc17d32f5d7c499137abb8977061c Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 22 Apr 2022 16:54:42 +0100
Subject: [PATCH 04/34] style: spacing

---
 packages/nuxt/src/app/plugins/router.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/app/plugins/router.ts b/packages/nuxt/src/app/plugins/router.ts
index f00c743eafe..a9dad4d6560 100644
--- a/packages/nuxt/src/app/plugins/router.ts
+++ b/packages/nuxt/src/app/plugins/router.ts
@@ -123,7 +123,7 @@ export default defineNuxtPlugin<{ route: Route, router: Router }>((nuxtApp) => {
       if (process.client) {
         window.history[replace ? 'replaceState' : 'pushState']({}, '', url)
         if (!nuxtApp.isHydrating) {
-        // Clear any existing errors
+          // Clear any existing errors
           await callWithNuxt(nuxtApp, clearError)
         }
       }

From 3b205cab6ef0979505938571f4de04c2fdfd9fe9 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 22 Apr 2022 17:07:39 +0100
Subject: [PATCH 05/34] fix: don't re-create errors

---
 packages/nuxt/src/app/components/nuxt-error-page.vue | 2 +-
 packages/nuxt/src/app/composables/error.ts           | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/nuxt/src/app/components/nuxt-error-page.vue b/packages/nuxt/src/app/components/nuxt-error-page.vue
index 9ccb8c1379b..35bcbffbc9d 100644
--- a/packages/nuxt/src/app/components/nuxt-error-page.vue
+++ b/packages/nuxt/src/app/components/nuxt-error-page.vue
@@ -34,7 +34,7 @@ const stacktrace = (error.stack || '')
 const statusCode = String(error.statusCode || 500)
 const is404 = statusCode === '404'
 
-const statusMessage = error.statusMessage ?? is404 ? 'Page Not Found' : 'Internal Server Error'
+const statusMessage = error.statusMessage ?? (is404 ? 'Page Not Found' : 'Internal Server Error')
 const description = error.message || error.toString()
 const stack = process.dev && !is404 ? error.description || `<pre>${stacktrace}</pre>` : undefined
 
diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index 68d0395c66a..956574e3406 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -9,7 +9,12 @@ export const useError = () => {
 export const throwError = (_err: string | Error | Partial<H3Error>) => {
   const nuxtApp = useNuxtApp()
   const error = useError()
-  const err = typeof _err === 'string' ? new Error(_err) : _err && typeof _err === 'object' ? createError(_err) : _err
+  console.log({ _err })
+  const err = typeof _err === 'string'
+    ? new Error(_err)
+    : _err && typeof _err === 'object' && !(_err instanceof Error)
+      ? createError(_err)
+      : _err
   nuxtApp.callHook('app:error', err)
   if (process.server) {
     nuxtApp.ssrContext.error = nuxtApp.ssrContext.error || err

From 5a8bcb64abcc3d477aa326e2223a54d678385cbd Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 22 Apr 2022 17:20:19 +0100
Subject: [PATCH 06/34] Update
 docs/content/2.guide/2.features/7.error-handling.md

Co-authored-by: pooya parsa <pyapar@gmail.com>
---
 docs/content/2.guide/2.features/7.error-handling.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/content/2.guide/2.features/7.error-handling.md b/docs/content/2.guide/2.features/7.error-handling.md
index bc511ac5cbf..7b10d18e878 100644
--- a/docs/content/2.guide/2.features/7.error-handling.md
+++ b/docs/content/2.guide/2.features/7.error-handling.md
@@ -93,7 +93,7 @@ You can call this function at any point on client-side, or (on server side) dire
 const route = useRoute()
 const { data: movie } = await useFetch(`/api/movies/${route.params.slug}`)
 if (!movie.value) {
-  throwError({ statusCode: 404, statusMessage: 'Page Not Found' })
+  return throwError({ statusCode: 404, statusMessage: 'Page Not Found' })
 }
 </script>
 ```

From d224281f9b7990afb7ab41ab16bd2012d82cea2c Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 22 Apr 2022 17:26:37 +0100
Subject: [PATCH 07/34] Update docs/content/3.api/3.utils/throw-error.md

Co-authored-by: pooya parsa <pyapar@gmail.com>
---
 docs/content/3.api/3.utils/throw-error.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/content/3.api/3.utils/throw-error.md b/docs/content/3.api/3.utils/throw-error.md
index 9a83651b2b7..4875db9ca2e 100644
--- a/docs/content/3.api/3.utils/throw-error.md
+++ b/docs/content/3.api/3.utils/throw-error.md
@@ -30,7 +30,7 @@ You can use `createError` from [`h3`](https://github.com/unjs/h3) package to tri
 import { createError } from 'h3'
 
 export default eventHandler(() => {
-  return createError({
+  throw createError({
     statusCode: 404,
     statusMessage: 'Page Not Found'
   })

From 727e58529c754a9bf1de3b4b32db36890990d4f1 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 22 Apr 2022 17:28:07 +0100
Subject: [PATCH 08/34] Update
 docs/content/2.guide/2.features/7.error-handling.md

Co-authored-by: pooya parsa <pyapar@gmail.com>
---
 docs/content/2.guide/2.features/7.error-handling.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/content/2.guide/2.features/7.error-handling.md b/docs/content/2.guide/2.features/7.error-handling.md
index 7b10d18e878..aa20e9fd813 100644
--- a/docs/content/2.guide/2.features/7.error-handling.md
+++ b/docs/content/2.guide/2.features/7.error-handling.md
@@ -82,7 +82,7 @@ This function will return the global Nuxt error that is being handled.
 
 ### `throwError`
 
-* `function throwError (err: string | Error | Partial<H3Error>): Error`
+* `function throwError (err: string | Error | { statusCode, statusMessage }>): Error`
 
 You can call this function at any point on client-side, or (on server side) directly within middleware, plugins or `setup()` functions. It will trigger a full-screen error page (as above) which you can clear with `clearError`.
 

From 3983e87ec73889e41321ec41699c4e82f42477e6 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 22 Apr 2022 17:29:39 +0100
Subject: [PATCH 09/34] Update packages/nuxt/src/app/composables/error.ts

Co-authored-by: pooya parsa <pyapar@gmail.com>
---
 packages/nuxt/src/app/composables/error.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index 956574e3406..e6a3ff1747c 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -9,7 +9,6 @@ export const useError = () => {
 export const throwError = (_err: string | Error | Partial<H3Error>) => {
   const nuxtApp = useNuxtApp()
   const error = useError()
-  console.log({ _err })
   const err = typeof _err === 'string'
     ? new Error(_err)
     : _err && typeof _err === 'object' && !(_err instanceof Error)

From 75466e6110c356fc6f35dc79bc6f7fd7d7bea08f Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 22 Apr 2022 17:57:41 +0100
Subject: [PATCH 10/34] docs: check error value

---
 docs/content/2.guide/2.features/7.error-handling.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/content/2.guide/2.features/7.error-handling.md b/docs/content/2.guide/2.features/7.error-handling.md
index aa20e9fd813..e04245b849d 100644
--- a/docs/content/2.guide/2.features/7.error-handling.md
+++ b/docs/content/2.guide/2.features/7.error-handling.md
@@ -91,8 +91,8 @@ You can call this function at any point on client-side, or (on server side) dire
 ```vue [pages/movies/[slug].vue]
 <script setup>
 const route = useRoute()
-const { data: movie } = await useFetch(`/api/movies/${route.params.slug}`)
-if (!movie.value) {
+const { data, error } = await useFetch(`/api/movies/${route.params.slug}`)
+if (error.value) {
   return throwError({ statusCode: 404, statusMessage: 'Page Not Found' })
 }
 </script>

From 5f4a112bd2a7fbc80481beef4e59118b429f611e Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 3 May 2022 07:55:52 +0100
Subject: [PATCH 11/34] fix: restore code missed in merge

---
 packages/nuxt/src/pages/runtime/router.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/nuxt/src/pages/runtime/router.ts b/packages/nuxt/src/pages/runtime/router.ts
index 1d38023583a..1819e37cb59 100644
--- a/packages/nuxt/src/pages/runtime/router.ts
+++ b/packages/nuxt/src/pages/runtime/router.ts
@@ -107,7 +107,11 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     named: {}
   }
 
-  router.afterEach((to) => {
+  router.afterEach(async (to) => {
+    if (process.client && !nuxtApp.isHydrating) {
+      // Clear any existing errors
+      await callWithNuxt(nuxtApp, clearError)
+    }
     if (to.matched.length === 0) {
       callWithNuxt(nuxtApp, throwError, [createError({
         statusCode: 404,

From aede51c32395647654651fe228299b719ae17851 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 3 May 2022 09:34:21 +0100
Subject: [PATCH 12/34] fix: support `throw createError()` directly

---
 .../2.guide/2.features/7.error-handling.md    | 20 +++++++++++++------
 .../nuxt/src/app/components/nuxt-root.vue     |  4 +++-
 packages/nuxt/src/app/composables/error.ts    |  2 +-
 packages/nuxt/src/auto-imports/presets.ts     |  6 ++++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/docs/content/2.guide/2.features/7.error-handling.md b/docs/content/2.guide/2.features/7.error-handling.md
index e04245b849d..59262b2318d 100644
--- a/docs/content/2.guide/2.features/7.error-handling.md
+++ b/docs/content/2.guide/2.features/7.error-handling.md
@@ -80,24 +80,32 @@ This function will return the global Nuxt error that is being handled.
 ::ReadMore{link="/api/composables/use-error"}
 ::
 
-### `throwError`
+### `createError`
+
+* `function createError (err: { cause, data, message, name, stack, statusCode, statusMessage }): Error`
 
-* `function throwError (err: string | Error | { statusCode, statusMessage }>): Error`
+You can use this function to create an error object with additional metadata. It is usable in both the Vue and Nitro portions of your app, and is meant to be thrown.
 
-You can call this function at any point on client-side, or (on server side) directly within middleware, plugins or `setup()` functions. It will trigger a full-screen error page (as above) which you can clear with `clearError`.
+If you throw an error created with `createError`, it will trigger a full-screen error page which you can clear with `clearError`.
 
 ### Example
 
 ```vue [pages/movies/[slug].vue]
 <script setup>
 const route = useRoute()
-const { data, error } = await useFetch(`/api/movies/${route.params.slug}`)
-if (error.value) {
-  return throwError({ statusCode: 404, statusMessage: 'Page Not Found' })
+const { data } = await useFetch(`/api/movies/${route.params.slug}`)
+if (!data.value) {
+  throw createError({ statusCode: 404, statusMessage: 'Page Not Found' })
 }
 </script>
 ```
 
+### `throwError`
+
+* `function throwError (err: string | Error | { statusCode, statusMessage }): Error`
+
+You can call this function at any point on client-side, or (on server side) directly within middleware, plugins or `setup()` functions. It will trigger a full-screen error page which you can clear with `clearError`.
+
 ::ReadMore{link="/api/utils/throw-error"}
 ::
 
diff --git a/packages/nuxt/src/app/components/nuxt-root.vue b/packages/nuxt/src/app/components/nuxt-root.vue
index 9279c810129..387b6c5a890 100644
--- a/packages/nuxt/src/app/components/nuxt-root.vue
+++ b/packages/nuxt/src/app/components/nuxt-root.vue
@@ -7,6 +7,7 @@
 
 <script setup>
 import { onErrorCaptured } from 'vue'
+import { H3Error } from 'h3'
 import { callWithNuxt, throwError, useError, useNuxtApp } from '#app'
 // @ts-ignore
 import ErrorComponent from '#build/error-component.mjs'
@@ -24,7 +25,8 @@ if (process.dev && results && results.some(i => i && 'then' in i)) {
 const error = useError()
 onErrorCaptured((err, target, info) => {
   nuxtApp.hooks.callHook('vue:error', err, target, info).catch(hookError => console.error('[nuxt] Error in `vue:error` hook', hookError))
-  if (process.server) {
+  if (process.server || err instanceof H3Error) {
+    err.__nuxt_error = true
     callWithNuxt(nuxtApp, throwError, [err])
   }
 })
diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index e6a3ff1747c..9929a970a15 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -11,7 +11,7 @@ export const throwError = (_err: string | Error | Partial<H3Error>) => {
   const error = useError()
   const err = typeof _err === 'string'
     ? new Error(_err)
-    : _err && typeof _err === 'object' && !(_err instanceof Error)
+    : _err && typeof _err === 'object' && !('__nuxt_error' in _err)
       ? createError(_err)
       : _err
   nuxtApp.callHook('app:error', err)
diff --git a/packages/nuxt/src/auto-imports/presets.ts b/packages/nuxt/src/auto-imports/presets.ts
index cf2fd30dea5..8afab85c308 100644
--- a/packages/nuxt/src/auto-imports/presets.ts
+++ b/packages/nuxt/src/auto-imports/presets.ts
@@ -16,6 +16,12 @@ export const commonPresets: Preset[] = [
       'isVue2',
       'isVue3'
     ]
+  }),
+  defineUnimportPreset({
+    from: 'h3',
+    imports: [
+      'createError'
+    ]
   })
 ]
 

From 8c7849d57a9eee57c66c84b5c63a38383f3be2ca Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 13 May 2022 13:49:15 +0100
Subject: [PATCH 13/34] fix: export/auto-import `createError` from composables

---
 packages/nuxt/src/app/composables/error.ts | 2 ++
 packages/nuxt/src/auto-imports/presets.ts  | 7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index 9929a970a15..9adb540cba4 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -33,3 +33,5 @@ export const clearError = async (options: { redirect?: string } = {}) => {
   }
   error.value = null
 }
+
+export { createError }
diff --git a/packages/nuxt/src/auto-imports/presets.ts b/packages/nuxt/src/auto-imports/presets.ts
index 8afab85c308..f9bdb847507 100644
--- a/packages/nuxt/src/auto-imports/presets.ts
+++ b/packages/nuxt/src/auto-imports/presets.ts
@@ -16,12 +16,6 @@ export const commonPresets: Preset[] = [
       'isVue2',
       'isVue3'
     ]
-  }),
-  defineUnimportPreset({
-    from: 'h3',
-    imports: [
-      'createError'
-    ]
   })
 ]
 
@@ -51,6 +45,7 @@ export const appPreset = defineUnimportPreset({
     'throwError',
     'clearError',
     'useError',
+    'createError',
     'defineNuxtLink'
   ]
 })

From b0b5a9178cce35b2b085cdc54355893eb2dccb46 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 13 May 2022 14:13:41 +0100
Subject: [PATCH 14/34] fix: implement fuller wrapper

---
 packages/nuxt/src/app/composables/error.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index 9adb540cba4..5ad7b10510a 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -1,4 +1,4 @@
-import { createError, H3Error } from 'h3'
+import { createError as _createError, H3Error } from 'h3'
 import { useNuxtApp, useState } from '#app'
 
 export const useError = () => {
@@ -6,13 +6,15 @@ export const useError = () => {
   return useState('error', () => process.server ? nuxtApp.ssrContext.error : nuxtApp.payload.error)
 }
 
-export const throwError = (_err: string | Error | Partial<H3Error>) => {
+export interface NuxtError extends H3Error {}
+
+export const throwError = (_err: string | Error | Partial<NuxtError>) => {
   const nuxtApp = useNuxtApp()
   const error = useError()
   const err = typeof _err === 'string'
     ? new Error(_err)
     : _err && typeof _err === 'object' && !('__nuxt_error' in _err)
-      ? createError(_err)
+      ? _createError(_err)
       : _err
   nuxtApp.callHook('app:error', err)
   if (process.server) {
@@ -34,4 +36,6 @@ export const clearError = async (options: { redirect?: string } = {}) => {
   error.value = null
 }
 
-export { createError }
+export const createError = (err: Partial<NuxtError>): NuxtError => {
+  return _createError(err)
+}

From 6ffa0802f147b1fdb41df205e270adc0e9d7d521 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 13 May 2022 14:18:00 +0100
Subject: [PATCH 15/34] fix: export `createError`

---
 packages/nuxt/src/app/composables/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/app/composables/index.ts b/packages/nuxt/src/app/composables/index.ts
index 2780a248ca6..4e74f1a6cf1 100644
--- a/packages/nuxt/src/app/composables/index.ts
+++ b/packages/nuxt/src/app/composables/index.ts
@@ -3,7 +3,7 @@ export { useAsyncData, useLazyAsyncData, refreshNuxtData } from './asyncData'
 export type { AsyncDataOptions, AsyncData } from './asyncData'
 export { useHydration } from './hydrate'
 export { useState } from './state'
-export { clearError, throwError, useError } from './error'
+export { clearError, createError, throwError, useError } from './error'
 export { useFetch, useLazyFetch } from './fetch'
 export type { FetchResult, UseFetchOptions } from './fetch'
 export { useCookie } from './cookie'

From d846c00b0dd16d5225a6f81183918a7db7b75063 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 8 Jun 2022 13:56:46 +0100
Subject: [PATCH 16/34] docs: show underlying options for error

---
 docs/content/3.api/3.utils/throw-error.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/content/3.api/3.utils/throw-error.md b/docs/content/3.api/3.utils/throw-error.md
index 4875db9ca2e..74c9f5945e3 100644
--- a/docs/content/3.api/3.utils/throw-error.md
+++ b/docs/content/3.api/3.utils/throw-error.md
@@ -6,7 +6,7 @@ Within your pages, components and plugins you can use `throwError` to throw an e
 
 **Parameters:**
 
-- `error`: `string | Error | Partial<H3Error>`
+- `error`: `string | Error | Partial<{ cause, data, message, name, stack, statusCode, statusMessage }>`
 
 ```js
 throwError("😱 Oh no, an error has been thrown.")

From 2124e3fb7c22ced8df77e3c56e7f223b00b9dd91 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 8 Jun 2022 14:02:48 +0100
Subject: [PATCH 17/34] fix: move checks into `createError`

---
 packages/nuxt/src/app/composables/error.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index 5ad7b10510a..1a7ba7adcc2 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -11,11 +11,7 @@ export interface NuxtError extends H3Error {}
 export const throwError = (_err: string | Error | Partial<NuxtError>) => {
   const nuxtApp = useNuxtApp()
   const error = useError()
-  const err = typeof _err === 'string'
-    ? new Error(_err)
-    : _err && typeof _err === 'object' && !('__nuxt_error' in _err)
-      ? _createError(_err)
-      : _err
+  const err = typeof _err === 'string' ? new Error(_err) : createError(_err)
   nuxtApp.callHook('app:error', err)
   if (process.server) {
     nuxtApp.ssrContext.error = nuxtApp.ssrContext.error || err
@@ -37,5 +33,7 @@ export const clearError = async (options: { redirect?: string } = {}) => {
 }
 
 export const createError = (err: Partial<NuxtError>): NuxtError => {
-  return _createError(err)
+  return err && typeof err === 'object' && !('__nuxt_error' in err)
+    ? _createError(err)
+    : err as NuxtError
 }

From bbafd5e75e91ab2387f756b6122316246423bb85 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 10 Jun 2022 12:54:04 +0100
Subject: [PATCH 18/34] fix: use `isError` from `h3` rather than instanceof

... though note that this utility uses `instanceof` under the hood
---
 packages/nuxt/src/app/components/nuxt-root.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nuxt/src/app/components/nuxt-root.vue b/packages/nuxt/src/app/components/nuxt-root.vue
index 387b6c5a890..639a171bb81 100644
--- a/packages/nuxt/src/app/components/nuxt-root.vue
+++ b/packages/nuxt/src/app/components/nuxt-root.vue
@@ -7,7 +7,7 @@
 
 <script setup>
 import { onErrorCaptured } from 'vue'
-import { H3Error } from 'h3'
+import { isError as isH3Error } from 'h3'
 import { callWithNuxt, throwError, useError, useNuxtApp } from '#app'
 // @ts-ignore
 import ErrorComponent from '#build/error-component.mjs'
@@ -25,7 +25,7 @@ if (process.dev && results && results.some(i => i && 'then' in i)) {
 const error = useError()
 onErrorCaptured((err, target, info) => {
   nuxtApp.hooks.callHook('vue:error', err, target, info).catch(hookError => console.error('[nuxt] Error in `vue:error` hook', hookError))
-  if (process.server || err instanceof H3Error) {
+  if (process.server || isH3Error(err)) {
     err.__nuxt_error = true
     callWithNuxt(nuxtApp, throwError, [err])
   }

From 09fc189f3e8129847d8566f04734b1b3906eb80d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 10 Jun 2022 14:14:42 +0100
Subject: [PATCH 19/34] docs: remove createError import

---
 docs/content/3.api/3.utils/throw-error.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/content/3.api/3.utils/throw-error.md b/docs/content/3.api/3.utils/throw-error.md
index 74c9f5945e3..44607aeea64 100644
--- a/docs/content/3.api/3.utils/throw-error.md
+++ b/docs/content/3.api/3.utils/throw-error.md
@@ -22,13 +22,11 @@ The thrown error is set in the state using [`useError()`](/api/composables/use-e
 
 ## Throwing errors in API routes
 
-You can use `createError` from [`h3`](https://github.com/unjs/h3) package to trigger error handling in server API routes.
+You can use the auto-imported `createError` from [`h3`](https://github.com/unjs/h3) package to trigger error handling in server API routes.
 
 **Example:**
 
 ```js
-import { createError } from 'h3'
-
 export default eventHandler(() => {
   throw createError({
     statusCode: 404,

From 1e75c8ce858fd90a3f151b18719dda27b64d93c2 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 10 Jun 2022 14:17:45 +0100
Subject: [PATCH 20/34] refactor: isNuxtError

---
 packages/nuxt/src/app/composables/error.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index 1a7ba7adcc2..072e986d5fa 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -32,8 +32,8 @@ export const clearError = async (options: { redirect?: string } = {}) => {
   error.value = null
 }
 
+const isNuxtError = (err: object): err is NuxtError => err && typeof err === 'object' && ('__nuxt_error' in err)
+
 export const createError = (err: Partial<NuxtError>): NuxtError => {
-  return err && typeof err === 'object' && !('__nuxt_error' in err)
-    ? _createError(err)
-    : err as NuxtError
+  return isNuxtError(err) ? err : _createError(err)
 }

From 88a42faa23478645b4f2f974eb13099473ad2b8e Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 10 Jun 2022 14:18:36 +0100
Subject: [PATCH 21/34] docs: add blank `createError` page

---
 docs/content/3.api/3.utils/create-error.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 docs/content/3.api/3.utils/create-error.md

diff --git a/docs/content/3.api/3.utils/create-error.md b/docs/content/3.api/3.utils/create-error.md
new file mode 100644
index 00000000000..223d966b691
--- /dev/null
+++ b/docs/content/3.api/3.utils/create-error.md
@@ -0,0 +1,7 @@
+# `createError`
+
+::ReadMore{link="/guide/features/error-handling"}
+::
+
+::NeedContribution
+::

From 18ebba3418d13082846aec7bee47854f1db057d9 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 10 Jun 2022 14:30:02 +0100
Subject: [PATCH 22/34] fix: use native createError support for strings

---
 packages/nuxt/package.json                 |  2 +-
 packages/nuxt/src/app/composables/error.ts |  6 +++---
 packages/vite/package.json                 |  2 +-
 yarn.lock                                  | 16 ++++++++++++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 5d8fda0730d..c143891368f 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -46,7 +46,7 @@
     "escape-string-regexp": "^5.0.0",
     "fs-extra": "^10.1.0",
     "globby": "^13.1.1",
-    "h3": "^0.7.8",
+    "h3": "^0.7.9",
     "hash-sum": "^2.0.0",
     "hookable": "^5.1.1",
     "knitwork": "^0.1.2",
diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index 072e986d5fa..8c9ca9bbf91 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -11,7 +11,7 @@ export interface NuxtError extends H3Error {}
 export const throwError = (_err: string | Error | Partial<NuxtError>) => {
   const nuxtApp = useNuxtApp()
   const error = useError()
-  const err = typeof _err === 'string' ? new Error(_err) : createError(_err)
+  const err = createError(_err)
   nuxtApp.callHook('app:error', err)
   if (process.server) {
     nuxtApp.ssrContext.error = nuxtApp.ssrContext.error || err
@@ -32,8 +32,8 @@ export const clearError = async (options: { redirect?: string } = {}) => {
   error.value = null
 }
 
-const isNuxtError = (err: object): err is NuxtError => err && typeof err === 'object' && ('__nuxt_error' in err)
+const isNuxtError = (err?: string | object): err is NuxtError => err && typeof err === 'object' && ('__nuxt_error' in err)
 
-export const createError = (err: Partial<NuxtError>): NuxtError => {
+export const createError = (err: string | Partial<NuxtError>): NuxtError => {
   return isNuxtError(err) ? err : _createError(err)
 }
diff --git a/packages/vite/package.json b/packages/vite/package.json
index f3108d8e05c..8d3305c3276 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -32,7 +32,7 @@
     "externality": "^0.2.2",
     "fs-extra": "^10.1.0",
     "get-port-please": "^2.5.0",
-    "h3": "^0.7.8",
+    "h3": "^0.7.9",
     "knitwork": "^0.1.2",
     "magic-string": "^0.26.2",
     "mlly": "^0.5.2",
diff --git a/yarn.lock b/yarn.lock
index 057df060656..f5bc99de187 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1765,7 +1765,7 @@ __metadata:
     externality: ^0.2.2
     fs-extra: ^10.1.0
     get-port-please: ^2.5.0
-    h3: ^0.7.8
+    h3: ^0.7.9
     knitwork: ^0.1.2
     magic-string: ^0.26.2
     mlly: ^0.5.2
@@ -7297,6 +7297,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"h3@npm:^0.7.9":
+  version: 0.7.9
+  resolution: "h3@npm:0.7.9"
+  dependencies:
+    cookie-es: ^0.5.0
+    destr: ^1.1.1
+    radix3: ^0.1.2
+    ufo: ^0.8.4
+  checksum: 0b73231e23f95583c17cfb3ef5e66ca451c1eda903cfaf5b2f7ab0c3ec0a69d2fe209a8bd97e85f2df38a663550f489d4de3debf0f43d197517fb0a23a50c481
+  languageName: node
+  linkType: hard
+
 "handlebars@npm:^4.7.7":
   version: 4.7.7
   resolution: "handlebars@npm:4.7.7"
@@ -9977,7 +9989,7 @@ __metadata:
     escape-string-regexp: ^5.0.0
     fs-extra: ^10.1.0
     globby: ^13.1.1
-    h3: ^0.7.8
+    h3: ^0.7.9
     hash-sum: ^2.0.0
     hookable: ^5.1.1
     knitwork: ^0.1.2

From a82450a3d001410409567640502a0ae783fd2c24 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 15 Jun 2022 14:14:35 +0100
Subject: [PATCH 23/34] fix: set default `statusMessage` if one is not provided

---
 packages/nuxt/src/app/components/nuxt-root.vue | 6 ++----
 packages/nuxt/src/app/composables/error.ts     | 9 +++++++--
 packages/nuxt/src/app/composables/index.ts     | 3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/nuxt/src/app/components/nuxt-root.vue b/packages/nuxt/src/app/components/nuxt-root.vue
index 639a171bb81..ea9b344fe82 100644
--- a/packages/nuxt/src/app/components/nuxt-root.vue
+++ b/packages/nuxt/src/app/components/nuxt-root.vue
@@ -7,8 +7,7 @@
 
 <script setup>
 import { onErrorCaptured } from 'vue'
-import { isError as isH3Error } from 'h3'
-import { callWithNuxt, throwError, useError, useNuxtApp } from '#app'
+import { callWithNuxt, isNuxtError, throwError, useError, useNuxtApp } from '#app'
 // @ts-ignore
 import ErrorComponent from '#build/error-component.mjs'
 
@@ -25,8 +24,7 @@ if (process.dev && results && results.some(i => i && 'then' in i)) {
 const error = useError()
 onErrorCaptured((err, target, info) => {
   nuxtApp.hooks.callHook('vue:error', err, target, info).catch(hookError => console.error('[nuxt] Error in `vue:error` hook', hookError))
-  if (process.server || isH3Error(err)) {
-    err.__nuxt_error = true
+  if (process.server || isNuxtError(err)) {
     callWithNuxt(nuxtApp, throwError, [err])
   }
 })
diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index 8c9ca9bbf91..2a85e58a232 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -32,8 +32,13 @@ export const clearError = async (options: { redirect?: string } = {}) => {
   error.value = null
 }
 
-const isNuxtError = (err?: string | object): err is NuxtError => err && typeof err === 'object' && ('__nuxt_error' in err)
+export const isNuxtError = (err?: string | object): err is NuxtError => err && typeof err === 'object' && ('__nuxt_error' in err)
 
 export const createError = (err: string | Partial<NuxtError>): NuxtError => {
-  return isNuxtError(err) ? err : _createError(err)
+  const _err: NuxtError = _createError(err)
+  if (typeof err === 'string' || (!isNuxtError(err) && !err.statusMessage)) {
+    _err.statusMessage = 'Internal Server Error'
+  }
+  ;(_err as any).__nuxt_error = true
+  return _err
 }
diff --git a/packages/nuxt/src/app/composables/index.ts b/packages/nuxt/src/app/composables/index.ts
index 4e74f1a6cf1..e60d2dde8de 100644
--- a/packages/nuxt/src/app/composables/index.ts
+++ b/packages/nuxt/src/app/composables/index.ts
@@ -3,7 +3,8 @@ export { useAsyncData, useLazyAsyncData, refreshNuxtData } from './asyncData'
 export type { AsyncDataOptions, AsyncData } from './asyncData'
 export { useHydration } from './hydrate'
 export { useState } from './state'
-export { clearError, createError, throwError, useError } from './error'
+export { clearError, createError, isNuxtError, throwError, useError } from './error'
+export type { NuxtError } from './error'
 export { useFetch, useLazyFetch } from './fetch'
 export type { FetchResult, UseFetchOptions } from './fetch'
 export { useCookie } from './cookie'

From 8bdcee9601161ac54d5639a4a99e1a49112edfc9 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 17 Jun 2022 09:51:52 +0100
Subject: [PATCH 24/34] chore: upgrade h3

---
 packages/nuxt/package.json                 |  2 +-
 packages/nuxt/src/app/composables/error.ts |  3 ---
 packages/vite/package.json                 |  2 +-
 yarn.lock                                  | 16 ++++++++++++++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 6d023a64291..b63d5988366 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -46,7 +46,7 @@
     "escape-string-regexp": "^5.0.0",
     "fs-extra": "^10.1.0",
     "globby": "^13.1.2",
-    "h3": "^0.7.9",
+    "h3": "^0.7.10",
     "hash-sum": "^2.0.0",
     "hookable": "^5.1.1",
     "knitwork": "^0.1.2",
diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index 2a85e58a232..44261489b5c 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -36,9 +36,6 @@ export const isNuxtError = (err?: string | object): err is NuxtError => err && t
 
 export const createError = (err: string | Partial<NuxtError>): NuxtError => {
   const _err: NuxtError = _createError(err)
-  if (typeof err === 'string' || (!isNuxtError(err) && !err.statusMessage)) {
-    _err.statusMessage = 'Internal Server Error'
-  }
   ;(_err as any).__nuxt_error = true
   return _err
 }
diff --git a/packages/vite/package.json b/packages/vite/package.json
index a972e5d5d3c..b0f361a1450 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -32,7 +32,7 @@
     "externality": "^0.2.2",
     "fs-extra": "^10.1.0",
     "get-port-please": "^2.5.0",
-    "h3": "^0.7.9",
+    "h3": "^0.7.10",
     "knitwork": "^0.1.2",
     "magic-string": "^0.26.2",
     "mlly": "^0.5.2",
diff --git a/yarn.lock b/yarn.lock
index bb7a4d9ce14..b84912cc35d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1765,7 +1765,7 @@ __metadata:
     externality: ^0.2.2
     fs-extra: ^10.1.0
     get-port-please: ^2.5.0
-    h3: ^0.7.9
+    h3: ^0.7.10
     knitwork: ^0.1.2
     magic-string: ^0.26.2
     mlly: ^0.5.2
@@ -7281,6 +7281,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"h3@npm:^0.7.10":
+  version: 0.7.10
+  resolution: "h3@npm:0.7.10"
+  dependencies:
+    cookie-es: ^0.5.0
+    destr: ^1.1.1
+    radix3: ^0.1.2
+    ufo: ^0.8.4
+  checksum: 81493bc7373bc6d934d947434a929197820661ea7126c5da4c6d9e0ea9a3bd1c67b895cb7afb1e6692fa573e23a8b69cfba1786c6aa3b99256835821bb3473c5
+  languageName: node
+  linkType: hard
+
 "h3@npm:^0.7.9":
   version: 0.7.9
   resolution: "h3@npm:0.7.9"
@@ -9971,7 +9983,7 @@ __metadata:
     escape-string-regexp: ^5.0.0
     fs-extra: ^10.1.0
     globby: ^13.1.2
-    h3: ^0.7.9
+    h3: ^0.7.10
     hash-sum: ^2.0.0
     hookable: ^5.1.1
     knitwork: ^0.1.2

From 57202553a51c733806d038f3c88eea20ea799686 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 17 Jun 2022 09:54:18 +0100
Subject: [PATCH 25/34] chore: dedupe h3

---
 yarn.lock | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c4f4f1c42c3..901affde732 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7492,7 +7492,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"h3@npm:^0.7.10":
+"h3@npm:^0.7.10, h3@npm:^0.7.9":
   version: 0.7.10
   resolution: "h3@npm:0.7.10"
   dependencies:
@@ -7504,18 +7504,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"h3@npm:^0.7.9":
-  version: 0.7.9
-  resolution: "h3@npm:0.7.9"
-  dependencies:
-    cookie-es: ^0.5.0
-    destr: ^1.1.1
-    radix3: ^0.1.2
-    ufo: ^0.8.4
-  checksum: 0b73231e23f95583c17cfb3ef5e66ca451c1eda903cfaf5b2f7ab0c3ec0a69d2fe209a8bd97e85f2df38a663550f489d4de3debf0f43d197517fb0a23a50c481
-  languageName: node
-  linkType: hard
-
 "handlebars@npm:^4.7.7":
   version: 4.7.7
   resolution: "handlebars@npm:4.7.7"

From 3d66ed76cab506dbfcc75b7ac4c93a92e6b6d195 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 22 Jun 2022 11:25:01 +0100
Subject: [PATCH 26/34] chore: dedupe

---
 yarn.lock | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3698fc7d6f2..58a25870cc5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,3 +1,6 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
 __metadata:
   version: 6
   cacheKey: 8
@@ -7553,18 +7556,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"h3@npm:^0.7.10, h3@npm:^0.7.9":
-  version: 0.7.10
-  resolution: "h3@npm:0.7.10"
-  dependencies:
-    cookie-es: ^0.5.0
-    destr: ^1.1.1
-    radix3: ^0.1.2
-    ufo: ^0.8.4
-  checksum: 81493bc7373bc6d934d947434a929197820661ea7126c5da4c6d9e0ea9a3bd1c67b895cb7afb1e6692fa573e23a8b69cfba1786c6aa3b99256835821bb3473c5
-  languageName: node
-  linkType: hard
-
 "h3@npm:^0.7.9":
   version: 0.7.9
   resolution: "h3@npm:0.7.9"
@@ -7573,7 +7564,7 @@ __metadata:
     destr: ^1.1.1
     radix3: ^0.1.2
     ufo: ^0.8.4
-  checksum: 81493bc7373bc6d934d947434a929197820661ea7126c5da4c6d9e0ea9a3bd1c67b895cb7afb1e6692fa573e23a8b69cfba1786c6aa3b99256835821bb3473c5
+  checksum: 0b73231e23f95583c17cfb3ef5e66ca451c1eda903cfaf5b2f7ab0c3ec0a69d2fe209a8bd97e85f2df38a663550f489d4de3debf0f43d197517fb0a23a50c481
   languageName: node
   linkType: hard
 

From 95852e52f743830990afd932e407726cb784c18d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 22 Jun 2022 11:36:22 +0100
Subject: [PATCH 27/34] chore: dedupe for real

---
 yarn.lock | 465 ++----------------------------------------------------
 1 file changed, 14 insertions(+), 451 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 58a25870cc5..d65a7781584 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4387,14 +4387,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.10, colorette@npm:^2.0.16":
-  version: 2.0.17
-  resolution: "colorette@npm:2.0.17"
-  checksum: 693a56d816846e0e213f92c8061b65eb5025030b28a113f90c539fe34c860abc41132c03599af26bcbc213170a31bac1bf2d4c535ccad5ac7b5cb3248f9d98a8
-  languageName: node
-  linkType: hard
-
-"colorette@npm:^2.0.19":
+"colorette@npm:^2.0.10, colorette@npm:^2.0.16, colorette@npm:^2.0.19":
   version: 2.0.19
   resolution: "colorette@npm:2.0.19"
   checksum: 888cf5493f781e5fcf54ce4d49e9d7d698f96ea2b2ef67906834bb319a392c667f9ec69f4a10e268d2946d13a9503d2d19b3abaaaf174e3451bfe91fb9d82427
@@ -4700,7 +4693,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-declaration-sorter@npm:^6.2.2, css-declaration-sorter@npm:^6.3.0":
+"css-declaration-sorter@npm:^6.3.0":
   version: 6.3.0
   resolution: "css-declaration-sorter@npm:6.3.0"
   peerDependencies:
@@ -4801,45 +4794,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^5.2.11":
-  version: 5.2.11
-  resolution: "cssnano-preset-default@npm:5.2.11"
-  dependencies:
-    css-declaration-sorter: ^6.2.2
-    cssnano-utils: ^3.1.0
-    postcss-calc: ^8.2.3
-    postcss-colormin: ^5.3.0
-    postcss-convert-values: ^5.1.2
-    postcss-discard-comments: ^5.1.2
-    postcss-discard-duplicates: ^5.1.0
-    postcss-discard-empty: ^5.1.1
-    postcss-discard-overridden: ^5.1.0
-    postcss-merge-longhand: ^5.1.5
-    postcss-merge-rules: ^5.1.2
-    postcss-minify-font-values: ^5.1.0
-    postcss-minify-gradients: ^5.1.1
-    postcss-minify-params: ^5.1.3
-    postcss-minify-selectors: ^5.2.1
-    postcss-normalize-charset: ^5.1.0
-    postcss-normalize-display-values: ^5.1.0
-    postcss-normalize-positions: ^5.1.0
-    postcss-normalize-repeat-style: ^5.1.0
-    postcss-normalize-string: ^5.1.0
-    postcss-normalize-timing-functions: ^5.1.0
-    postcss-normalize-unicode: ^5.1.0
-    postcss-normalize-url: ^5.1.0
-    postcss-normalize-whitespace: ^5.1.1
-    postcss-ordered-values: ^5.1.2
-    postcss-reduce-initial: ^5.1.0
-    postcss-reduce-transforms: ^5.1.0
-    postcss-svgo: ^5.1.0
-    postcss-unique-selectors: ^5.1.1
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 827a823d12847423d6f1c7a206c35711755dc8289e4c62e930c94c112e41f54dc5bda1b46098fa1e02804c7709f694be915d75c92759dd2c0eba7ee9d4d3fc57
-  languageName: node
-  linkType: hard
-
 "cssnano-preset-default@npm:^5.2.12":
   version: 5.2.12
   resolution: "cssnano-preset-default@npm:5.2.12"
@@ -4888,7 +4842,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano@npm:^5.1.12":
+"cssnano@npm:^5.1.12, cssnano@npm:^5.1.8":
   version: 5.1.12
   resolution: "cssnano@npm:5.1.12"
   dependencies:
@@ -4901,19 +4855,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano@npm:^5.1.8":
-  version: 5.1.11
-  resolution: "cssnano@npm:5.1.11"
-  dependencies:
-    cssnano-preset-default: ^5.2.11
-    lilconfig: ^2.0.3
-    yaml: ^1.10.2
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 0fa4dec39c4d646032c2008e817643cad8d430d5063ecf6e7a076d7e5f9fa8ade24ba2adffcd44c7882fd8caeeb13b052b283e73c4fa7f58ca8626f35834ffe0
-  languageName: node
-  linkType: hard
-
 "csso@npm:^4.2.0":
   version: 4.2.0
   resolution: "csso@npm:4.2.0"
@@ -5505,13 +5446,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-android-64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-android-64@npm:0.14.43"
-  conditions: os=android & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-android-64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-android-64@npm:0.14.46"
@@ -5526,13 +5460,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-android-arm64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-android-arm64@npm:0.14.43"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "esbuild-android-arm64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-android-arm64@npm:0.14.46"
@@ -5547,13 +5474,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-darwin-64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-darwin-64@npm:0.14.43"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-darwin-64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-darwin-64@npm:0.14.46"
@@ -5568,13 +5488,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-darwin-arm64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-darwin-arm64@npm:0.14.43"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "esbuild-darwin-arm64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-darwin-arm64@npm:0.14.46"
@@ -5589,13 +5502,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-freebsd-64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-freebsd-64@npm:0.14.43"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-freebsd-64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-freebsd-64@npm:0.14.46"
@@ -5610,13 +5516,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-freebsd-arm64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-freebsd-arm64@npm:0.14.43"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "esbuild-freebsd-arm64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-freebsd-arm64@npm:0.14.46"
@@ -5631,13 +5530,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-32@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-linux-32@npm:0.14.43"
-  conditions: os=linux & cpu=ia32
-  languageName: node
-  linkType: hard
-
 "esbuild-linux-32@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-linux-32@npm:0.14.46"
@@ -5652,13 +5544,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-linux-64@npm:0.14.43"
-  conditions: os=linux & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-linux-64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-linux-64@npm:0.14.46"
@@ -5673,13 +5558,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-arm64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-linux-arm64@npm:0.14.43"
-  conditions: os=linux & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "esbuild-linux-arm64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-linux-arm64@npm:0.14.46"
@@ -5694,13 +5572,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-arm@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-linux-arm@npm:0.14.43"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
 "esbuild-linux-arm@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-linux-arm@npm:0.14.46"
@@ -5715,13 +5586,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-mips64le@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-linux-mips64le@npm:0.14.43"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
 "esbuild-linux-mips64le@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-linux-mips64le@npm:0.14.46"
@@ -5736,13 +5600,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-ppc64le@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-linux-ppc64le@npm:0.14.43"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
 "esbuild-linux-ppc64le@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-linux-ppc64le@npm:0.14.46"
@@ -5750,13 +5607,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-riscv64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-linux-riscv64@npm:0.14.43"
-  conditions: os=linux & cpu=riscv64
-  languageName: node
-  linkType: hard
-
 "esbuild-linux-riscv64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-linux-riscv64@npm:0.14.46"
@@ -5764,13 +5614,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-linux-s390x@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-linux-s390x@npm:0.14.43"
-  conditions: os=linux & cpu=s390x
-  languageName: node
-  linkType: hard
-
 "esbuild-linux-s390x@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-linux-s390x@npm:0.14.46"
@@ -5801,13 +5644,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-netbsd-64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-netbsd-64@npm:0.14.43"
-  conditions: os=netbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-netbsd-64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-netbsd-64@npm:0.14.46"
@@ -5822,13 +5658,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-openbsd-64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-openbsd-64@npm:0.14.43"
-  conditions: os=openbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-openbsd-64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-openbsd-64@npm:0.14.46"
@@ -5843,13 +5672,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-sunos-64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-sunos-64@npm:0.14.43"
-  conditions: os=sunos & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-sunos-64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-sunos-64@npm:0.14.46"
@@ -5864,13 +5686,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-windows-32@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-windows-32@npm:0.14.43"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
 "esbuild-windows-32@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-windows-32@npm:0.14.46"
@@ -5885,13 +5700,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-windows-64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-windows-64@npm:0.14.43"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
 "esbuild-windows-64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-windows-64@npm:0.14.46"
@@ -5906,13 +5714,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-windows-arm64@npm:0.14.43":
-  version: 0.14.43
-  resolution: "esbuild-windows-arm64@npm:0.14.43"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "esbuild-windows-arm64@npm:0.14.46":
   version: 0.14.46
   resolution: "esbuild-windows-arm64@npm:0.14.46"
@@ -5982,78 +5783,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.14.27, esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.43":
-  version: 0.14.43
-  resolution: "esbuild@npm:0.14.43"
-  dependencies:
-    esbuild-android-64: 0.14.43
-    esbuild-android-arm64: 0.14.43
-    esbuild-darwin-64: 0.14.43
-    esbuild-darwin-arm64: 0.14.43
-    esbuild-freebsd-64: 0.14.43
-    esbuild-freebsd-arm64: 0.14.43
-    esbuild-linux-32: 0.14.43
-    esbuild-linux-64: 0.14.43
-    esbuild-linux-arm: 0.14.43
-    esbuild-linux-arm64: 0.14.43
-    esbuild-linux-mips64le: 0.14.43
-    esbuild-linux-ppc64le: 0.14.43
-    esbuild-linux-riscv64: 0.14.43
-    esbuild-linux-s390x: 0.14.43
-    esbuild-netbsd-64: 0.14.43
-    esbuild-openbsd-64: 0.14.43
-    esbuild-sunos-64: 0.14.43
-    esbuild-windows-32: 0.14.43
-    esbuild-windows-64: 0.14.43
-    esbuild-windows-arm64: 0.14.43
-  dependenciesMeta:
-    esbuild-android-64:
-      optional: true
-    esbuild-android-arm64:
-      optional: true
-    esbuild-darwin-64:
-      optional: true
-    esbuild-darwin-arm64:
-      optional: true
-    esbuild-freebsd-64:
-      optional: true
-    esbuild-freebsd-arm64:
-      optional: true
-    esbuild-linux-32:
-      optional: true
-    esbuild-linux-64:
-      optional: true
-    esbuild-linux-arm:
-      optional: true
-    esbuild-linux-arm64:
-      optional: true
-    esbuild-linux-mips64le:
-      optional: true
-    esbuild-linux-ppc64le:
-      optional: true
-    esbuild-linux-riscv64:
-      optional: true
-    esbuild-linux-s390x:
-      optional: true
-    esbuild-netbsd-64:
-      optional: true
-    esbuild-openbsd-64:
-      optional: true
-    esbuild-sunos-64:
-      optional: true
-    esbuild-windows-32:
-      optional: true
-    esbuild-windows-64:
-      optional: true
-    esbuild-windows-arm64:
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: c5988ba9d3b62c794aaf6752ca4cf0f009d0dc127a19d21c1bbeb2fe6d983c7fe39f3d330e2c00d5a9b6de4a71bfb0f5f347e69c37eb545ab61dc4824b5b2bb3
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.14.46":
+"esbuild@npm:^0.14.27, esbuild@npm:^0.14.36, esbuild@npm:^0.14.39, esbuild@npm:^0.14.43, esbuild@npm:^0.14.46":
   version: 0.14.46
   resolution: "esbuild@npm:0.14.46"
   dependencies:
@@ -7120,7 +6850,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-monkey@npm:1.0.3, fs-monkey@npm:^1.0.3":
+"fs-monkey@npm:^1.0.3":
   version: 1.0.3
   resolution: "fs-monkey@npm:1.0.3"
   checksum: cf50804833f9b88a476911ae911fe50f61a98d986df52f890bd97e7262796d023698cb2309fa9b74fdd8974f04315b648748a0a8ee059e7d5257b293bfc409c0
@@ -7544,7 +7274,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"h3@npm:^0.7.10":
+"h3@npm:^0.7.10, h3@npm:^0.7.9":
   version: 0.7.10
   resolution: "h3@npm:0.7.10"
   dependencies:
@@ -7556,18 +7286,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"h3@npm:^0.7.9":
-  version: 0.7.9
-  resolution: "h3@npm:0.7.9"
-  dependencies:
-    cookie-es: ^0.5.0
-    destr: ^1.1.1
-    radix3: ^0.1.2
-    ufo: ^0.8.4
-  checksum: 0b73231e23f95583c17cfb3ef5e66ca451c1eda903cfaf5b2f7ab0c3ec0a69d2fe209a8bd97e85f2df38a663550f489d4de3debf0f43d197517fb0a23a50c481
-  languageName: node
-  linkType: hard
-
 "handlebars@npm:^4.7.7":
   version: 4.7.7
   resolution: "handlebars@npm:4.7.7"
@@ -8423,16 +8141,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jiti@npm:^1.12.14, jiti@npm:^1.12.9, jiti@npm:^1.13.0":
-  version: 1.13.0
-  resolution: "jiti@npm:1.13.0"
-  bin:
-    jiti: bin/jiti.js
-  checksum: 1e74d99b9a551df952057b8bce56f744caccca0044aa05021643e6ce0837ed47bc2d5b290fecb462e32988c6bf318afe77e341310c5ecf6bb63c19c80c929cb6
-  languageName: node
-  linkType: hard
-
-"jiti@npm:^1.14.0":
+"jiti@npm:^1.12.14, jiti@npm:^1.12.9, jiti@npm:^1.13.0, jiti@npm:^1.14.0":
   version: 1.14.0
   resolution: "jiti@npm:1.14.0"
   bin:
@@ -8715,36 +8424,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"listhen@npm:^0.2.11":
-  version: 0.2.11
-  resolution: "listhen@npm:0.2.11"
-  dependencies:
-    clipboardy: ^3.0.0
-    colorette: ^2.0.16
-    defu: ^6.0.0
-    get-port-please: ^2.5.0
-    http-shutdown: ^1.2.2
-    selfsigned: ^2.0.1
-  checksum: c4b7e6f9574643d685577c519f31bf4f24cd3daccb7d9bbace23948a356b068fcd5758d4da154799aca18a032a27aeca5e98b3288369060eb2b939ddc510927d
-  languageName: node
-  linkType: hard
-
-"listhen@npm:^0.2.12":
-  version: 0.2.12
-  resolution: "listhen@npm:0.2.12"
-  dependencies:
-    clipboardy: ^3.0.0
-    colorette: ^2.0.16
-    defu: ^6.0.0
-    get-port-please: ^2.5.0
-    http-shutdown: ^1.2.2
-    selfsigned: ^2.0.1
-    ufo: ^0.8.4
-  checksum: b28557589f31abde0e11f60651e2a8c573c8c23b578636f5e686eb78d3d7187cffb99ae92165fbd0a0b02ec3ca99f7f166958e7a19709cd2ecfec55434127c88
-  languageName: node
-  linkType: hard
-
-"listhen@npm:^0.2.13":
+"listhen@npm:^0.2.11, listhen@npm:^0.2.12, listhen@npm:^0.2.13":
   version: 0.2.13
   resolution: "listhen@npm:0.2.13"
   dependencies:
@@ -9196,16 +8876,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"memfs@npm:^3.4.1, memfs@npm:^3.4.3":
-  version: 3.4.4
-  resolution: "memfs@npm:3.4.4"
-  dependencies:
-    fs-monkey: 1.0.3
-  checksum: c91d5a3f7e57c6b4a7ddbb28b4ccbce9f6ba15c478d2257d9c495f05ef8ca16ebbe18c8bc0f89dc79aeaba9854c89ac72a09ebfd99aeeeae1d9cd13a57cf4573
-  languageName: node
-  linkType: hard
-
-"memfs@npm:^3.4.6":
+"memfs@npm:^3.4.1, memfs@npm:^3.4.3, memfs@npm:^3.4.6":
   version: 3.4.6
   resolution: "memfs@npm:3.4.6"
   dependencies:
@@ -9554,24 +9225,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mlly@npm:^0.3.6":
-  version: 0.3.19
-  resolution: "mlly@npm:0.3.19"
-  checksum: 85d646936d5d94b6783e12257adb64ceac9ece32ccaa33d911d44f0c265a91d4f34092beb39641cd108c14a4228f56fc591af60412f65964c72561fbd244ad36
-  languageName: node
-  linkType: hard
-
-"mlly@npm:^0.5.1, mlly@npm:^0.5.2":
-  version: 0.5.2
-  resolution: "mlly@npm:0.5.2"
-  dependencies:
-    pathe: ^0.2.0
-    pkg-types: ^0.3.2
-  checksum: 8a369b0b6333e704bff297ab2ac886ebaf67af8ba2c1967a6f55b6771eb7f5a96a2aeaeb6e3329cd7e9360a2fc59226ada41fa2a8aa76c1f4325e92cbc6bc0f3
-  languageName: node
-  linkType: hard
-
-"mlly@npm:^0.5.3":
+"mlly@npm:^0.5.1, mlly@npm:^0.5.2, mlly@npm:^0.5.3":
   version: 0.5.3
   resolution: "mlly@npm:0.5.3"
   dependencies:
@@ -10884,18 +10538,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pkg-types@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "pkg-types@npm:0.3.2"
-  dependencies:
-    jsonc-parser: ^3.0.0
-    mlly: ^0.3.6
-    pathe: ^0.2.0
-  checksum: 55942a816772137fda954ea1ad86cb972e63da42e445a0532cd6bfc31def6ed22f28bf5746fcea39cedd128494079212ee1ab51edcf206280b9e4eb8c3468bd4
-  languageName: node
-  linkType: hard
-
-"pkg-types@npm:^0.3.3":
+"pkg-types@npm:^0.3.2, pkg-types@npm:^0.3.3":
   version: 0.3.3
   resolution: "pkg-types@npm:0.3.3"
   dependencies:
@@ -11043,18 +10686,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^5.1.5":
-  version: 5.1.5
-  resolution: "postcss-merge-longhand@npm:5.1.5"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-    stylehacks: ^5.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 1d51e3d6a10f799473e46009ea69ce53c4a82eb2861fd58e6eab17bde3022a3350f440a1d2237a4fa65dde49fa5173f2ffae7781cf4f4e9c5cd15d0d88c7c3d7
-  languageName: node
-  linkType: hard
-
 "postcss-merge-longhand@npm:^5.1.6":
   version: 5.1.6
   resolution: "postcss-merge-longhand@npm:5.1.6"
@@ -11193,17 +10824,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-positions@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-positions@npm:5.1.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 08a1f12cc8e192120c1ee14dc93e603546be507d826a75c2c6ef3224b5e3a17628a42a952317e8349b2708ffdef0560b84dcc20521104317eaa62291cca009f6
-  languageName: node
-  linkType: hard
-
 "postcss-normalize-positions@npm:^5.1.1":
   version: 5.1.1
   resolution: "postcss-normalize-positions@npm:5.1.1"
@@ -11215,17 +10835,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-repeat-style@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-repeat-style@npm:5.1.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 65176c37741d3321fd346586bf42c292a9dab1e4b77a1004d9cde2ae9e015f6fe330c57b44d0ca854a48bd7db0b169875b8d2b5ca501ac9b5381068c337aac19
-  languageName: node
-  linkType: hard
-
 "postcss-normalize-repeat-style@npm:^5.1.1":
   version: 5.1.1
   resolution: "postcss-normalize-repeat-style@npm:5.1.1"
@@ -11294,18 +10903,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-ordered-values@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "postcss-ordered-values@npm:5.1.2"
-  dependencies:
-    cssnano-utils: ^3.1.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 0a795b14c44486d80c0df731ba51e9565e5c650fd43bc17cd6488fb2121a3ebdc75d4a0edc0df52c8bc9ac289e7fb94b7225a9bba06e57f2b536661e813e5fe2
-  languageName: node
-  linkType: hard
-
 "postcss-ordered-values@npm:^5.1.3":
   version: 5.1.3
   resolution: "postcss-ordered-values@npm:5.1.3"
@@ -12024,21 +11621,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^2.59.0, rollup@npm:^2.70.1, rollup@npm:^2.75.6":
-  version: 2.75.6
-  resolution: "rollup@npm:2.75.6"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: df83c6d43a144a296daf82bed7f12f2dfcc6c495a64245e840d15fd21f2ab8b66bb3423e61c974875b33ccf53fb659d2ed099f272937ecf23af48815277c6cd5
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^2.75.7":
+"rollup@npm:^2.59.0, rollup@npm:^2.70.1, rollup@npm:^2.75.6, rollup@npm:^2.75.7":
   version: 2.75.7
   resolution: "rollup@npm:2.75.7"
   dependencies:
@@ -13296,17 +12879,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^4.6.3":
-  version: 4.7.3
-  resolution: "typescript@npm:4.7.3"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: fd13a1ce53790a36bb8350e1f5e5e384b5f6cb9b0635114a6d01d49cb99916abdcfbc13c7521cdae2f2d3f6d8bc4a8ae7625edf645a04ee940588cd5e7597b2f
-  languageName: node
-  linkType: hard
-
-"typescript@npm:^4.7.4":
+"typescript@npm:^4.6.3, typescript@npm:^4.7.4":
   version: 4.7.4
   resolution: "typescript@npm:4.7.4"
   bin:
@@ -13316,17 +12889,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@^4.6.3#~builtin<compat/typescript>":
-  version: 4.7.3
-  resolution: "typescript@patch:typescript@npm%3A4.7.3#~builtin<compat/typescript>::version=4.7.3&hash=7ad353"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 137d18a77f52254a284960b16ab53d0619f57b69b5d585804b8413f798a1175ce3e774fb95e6a101868577aafe357d8fcfc9171f0dc9fc0c210e9ae59d107cc0
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@^4.7.4#~builtin<compat/typescript>":
+"typescript@patch:typescript@^4.6.3#~builtin<compat/typescript>, typescript@patch:typescript@^4.7.4#~builtin<compat/typescript>":
   version: 4.7.4
   resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=7ad353"
   bin:

From 0dfe1e5114b77c4878497f2284c7647dada8d3c9 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 4 Jul 2022 17:53:40 +0100
Subject: [PATCH 28/34] fix: auto import `isNuxtError`

---
 packages/nuxt/src/auto-imports/presets.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nuxt/src/auto-imports/presets.ts b/packages/nuxt/src/auto-imports/presets.ts
index f9bdb847507..95688f50355 100644
--- a/packages/nuxt/src/auto-imports/presets.ts
+++ b/packages/nuxt/src/auto-imports/presets.ts
@@ -44,6 +44,7 @@ export const appPreset = defineUnimportPreset({
     'addRouteMiddleware',
     'throwError',
     'clearError',
+    'isNuxtError',
     'useError',
     'createError',
     'defineNuxtLink'

From f72cff33ec013b3e3b45466f4491f6084034bfb9 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Thu, 21 Jul 2022 11:03:52 +0100
Subject: [PATCH 29/34] fix: errors are not fatal by default on client-side
 unless `fatal: true`

* throwError falls back to normal error even if no context
---
 .../2.guide/2.features/7.error-handling.md    |  9 +++++--
 .../nuxt/src/app/components/nuxt-root.vue     |  2 +-
 packages/nuxt/src/app/composables/error.ts    | 27 +++++++++++++------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/docs/content/2.guide/2.features/7.error-handling.md b/docs/content/2.guide/2.features/7.error-handling.md
index 59262b2318d..7281ba3fdc3 100644
--- a/docs/content/2.guide/2.features/7.error-handling.md
+++ b/docs/content/2.guide/2.features/7.error-handling.md
@@ -82,11 +82,14 @@ This function will return the global Nuxt error that is being handled.
 
 ### `createError`
 
-* `function createError (err: { cause, data, message, name, stack, statusCode, statusMessage }): Error`
+* `function createError (err: { cause, data, message, name, stack, statusCode, statusMessage, fatal }): Error`
 
 You can use this function to create an error object with additional metadata. It is usable in both the Vue and Nitro portions of your app, and is meant to be thrown.
 
-If you throw an error created with `createError`, it will trigger a full-screen error page which you can clear with `clearError`.
+If you throw an error created with `createError`:
+
+* on server-side, it will trigger a full-screen error page on which you can clear with `clearError`.
+* on client-side, it will throw a non-fatal error for you to handle. If you need to trigger a full-screen error page, then you can do this by setting `fatal: true`.
 
 ### Example
 
@@ -106,6 +109,8 @@ if (!data.value) {
 
 You can call this function at any point on client-side, or (on server side) directly within middleware, plugins or `setup()` functions. It will trigger a full-screen error page which you can clear with `clearError`.
 
+It is recommended instead to use `throw createError()`.
+
 ::ReadMore{link="/api/utils/throw-error"}
 ::
 
diff --git a/packages/nuxt/src/app/components/nuxt-root.vue b/packages/nuxt/src/app/components/nuxt-root.vue
index ea9b344fe82..5e184bce7c7 100644
--- a/packages/nuxt/src/app/components/nuxt-root.vue
+++ b/packages/nuxt/src/app/components/nuxt-root.vue
@@ -24,7 +24,7 @@ if (process.dev && results && results.some(i => i && 'then' in i)) {
 const error = useError()
 onErrorCaptured((err, target, info) => {
   nuxtApp.hooks.callHook('vue:error', err, target, info).catch(hookError => console.error('[nuxt] Error in `vue:error` hook', hookError))
-  if (process.server || isNuxtError(err)) {
+  if (process.server || (isNuxtError(err) && err.fatal)) {
     callWithNuxt(nuxtApp, throwError, [err])
   }
 })
diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index 44261489b5c..df108233715 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -6,17 +6,25 @@ export const useError = () => {
   return useState('error', () => process.server ? nuxtApp.ssrContext.error : nuxtApp.payload.error)
 }
 
-export interface NuxtError extends H3Error {}
+export interface NuxtError extends H3Error {
+  fatal?: boolean
+}
 
 export const throwError = (_err: string | Error | Partial<NuxtError>) => {
-  const nuxtApp = useNuxtApp()
-  const error = useError()
   const err = createError(_err)
-  nuxtApp.callHook('app:error', err)
-  if (process.server) {
-    nuxtApp.ssrContext.error = nuxtApp.ssrContext.error || err
-  } else {
-    error.value = error.value || err
+  err.fatal = true
+
+  try {
+    const nuxtApp = useNuxtApp()
+    nuxtApp.callHook('app:error', err)
+    if (process.server) {
+      nuxtApp.ssrContext.error = nuxtApp.ssrContext.error || err
+    } else {
+      const error = useError()
+      error.value = error.value || err
+    }
+  } catch {
+    throw err
   }
 
   return err
@@ -36,6 +44,9 @@ export const isNuxtError = (err?: string | object): err is NuxtError => err && t
 
 export const createError = (err: string | Partial<NuxtError>): NuxtError => {
   const _err: NuxtError = _createError(err)
+  if (err && typeof err === 'object' && err.fatal) {
+    _err.fatal = true
+  }
   ;(_err as any).__nuxt_error = true
   return _err
 }

From 992a0f713657aeb5d99cb28c8a35a9a5e5f61e94 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Thu, 21 Jul 2022 11:06:34 +0100
Subject: [PATCH 30/34] docs: remove stray wor

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

diff --git a/docs/content/2.guide/2.features/7.error-handling.md b/docs/content/2.guide/2.features/7.error-handling.md
index 632f3c5f969..c6c7afedf76 100644
--- a/docs/content/2.guide/2.features/7.error-handling.md
+++ b/docs/content/2.guide/2.features/7.error-handling.md
@@ -88,7 +88,7 @@ You can use this function to create an error object with additional metadata. It
 
 If you throw an error created with `createError`:
 
-* on server-side, it will trigger a full-screen error page on which you can clear with `clearError`.
+* on server-side, it will trigger a full-screen error page which you can clear with `clearError`.
 * on client-side, it will throw a non-fatal error for you to handle. If you need to trigger a full-screen error page, then you can do this by setting `fatal: true`.
 
 ### Example

From 9bba60623c252e7c4094d054849a285caf363867 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Thu, 21 Jul 2022 11:24:04 +0100
Subject: [PATCH 31/34] refactor: rename `throwError` -> `showError`,
 deprecating old name

---
 .../2.guide/2.features/7.error-handling.md    |  6 +--
 docs/content/3.api/3.utils/create-error.md    | 43 +++++++++++++++++--
 docs/content/3.api/3.utils/show-error.md      | 21 +++++++++
 docs/content/3.api/3.utils/throw-error.md     | 36 ----------------
 examples/app/error-handling/app.vue           |  4 +-
 .../error-handling/middleware/error.global.ts |  2 +-
 .../nuxt/src/app/components/nuxt-root.vue     |  4 +-
 packages/nuxt/src/app/composables/error.ts    |  5 ++-
 packages/nuxt/src/app/composables/index.ts    |  2 +-
 packages/nuxt/src/app/plugins/router.ts       |  4 +-
 packages/nuxt/src/auto-imports/presets.ts     |  1 +
 packages/nuxt/src/pages/runtime/router.ts     | 10 ++---
 12 files changed, 82 insertions(+), 56 deletions(-)
 create mode 100644 docs/content/3.api/3.utils/show-error.md
 delete mode 100644 docs/content/3.api/3.utils/throw-error.md

diff --git a/docs/content/2.guide/2.features/7.error-handling.md b/docs/content/2.guide/2.features/7.error-handling.md
index c6c7afedf76..c514237ffde 100644
--- a/docs/content/2.guide/2.features/7.error-handling.md
+++ b/docs/content/2.guide/2.features/7.error-handling.md
@@ -103,15 +103,15 @@ if (!data.value) {
 </script>
 ```
 
-### `throwError`
+### `showError`
 
-* `function throwError (err: string | Error | { statusCode, statusMessage }): Error`
+* `function showError (err: string | Error | { statusCode, statusMessage }): Error`
 
 You can call this function at any point on client-side, or (on server side) directly within middleware, plugins or `setup()` functions. It will trigger a full-screen error page which you can clear with `clearError`.
 
 It is recommended instead to use `throw createError()`.
 
-::ReadMore{link="/api/utils/throw-error"}
+::ReadMore{link="/api/utils/show-error"}
 ::
 
 ### `clearError`
diff --git a/docs/content/3.api/3.utils/create-error.md b/docs/content/3.api/3.utils/create-error.md
index 223d966b691..480b1bf7fca 100644
--- a/docs/content/3.api/3.utils/create-error.md
+++ b/docs/content/3.api/3.utils/create-error.md
@@ -1,7 +1,44 @@
 # `createError`
 
-::ReadMore{link="/guide/features/error-handling"}
-::
+You can use this function to create an error object with additional metadata. It is usable in both the Vue and Nitro portions of your app, and is meant to be thrown.
+
+**Parameters:**
+
+* err: { cause, data, message, name, stack, statusCode, statusMessage, fatal }
+
+## Throwing errors in your Vue app
+
+If you throw an error created with `createError`:
+
+* on server-side, it will trigger a full-screen error page which you can clear with `clearError`.
+* on client-side, it will throw a non-fatal error for you to handle. If you need to trigger a full-screen error page, then you can do this by setting `fatal: true`.
 
-::NeedContribution
+### Example
+
+```vue [pages/movies/[slug].vue]
+<script setup>
+const route = useRoute()
+const { data } = await useFetch(`/api/movies/${route.params.slug}`)
+if (!data.value) {
+  throw createError({ statusCode: 404, statusMessage: 'Page Not Found' })
+}
+</script>
+```
+
+## Throwing errors in API routes
+
+You can use `createError` to trigger error handling in server API routes.
+
+### Example
+
+```js
+export default eventHandler(() => {
+  throw createError({
+    statusCode: 404,
+    statusMessage: 'Page Not Found'
+  })
+}
+```
+
+::ReadMore{link="/guide/features/error-handling"}
 ::
diff --git a/docs/content/3.api/3.utils/show-error.md b/docs/content/3.api/3.utils/show-error.md
new file mode 100644
index 00000000000..ff128c9b0bd
--- /dev/null
+++ b/docs/content/3.api/3.utils/show-error.md
@@ -0,0 +1,21 @@
+# `showError`
+
+Nuxt provides a quick and simple way to show a full screen error page if needed.
+
+Within your pages, components and plugins you can use `showError` to show an error error.
+
+**Parameters:**
+
+- `error`: `string | Error | Partial<{ cause, data, message, name, stack, statusCode, statusMessage }>`
+
+```js
+showError("😱 Oh no, an error has been thrown.")
+showError({ statusCode: 404, statusMessage: "Page Not Found" })
+```
+
+The error is set in the state using [`useError()`](/api/composables/use-error) to create a reactive and SSR-friendly shared error state across components.
+
+`showError` calls the `app:error` hook.
+
+::ReadMore{link="/guide/features/error-handling"}
+::
diff --git a/docs/content/3.api/3.utils/throw-error.md b/docs/content/3.api/3.utils/throw-error.md
deleted file mode 100644
index 44607aeea64..00000000000
--- a/docs/content/3.api/3.utils/throw-error.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# `throwError`
-
-Nuxt provides a quick and simple way to throw errors.
-
-Within your pages, components and plugins you can use `throwError` to throw an error.
-
-**Parameters:**
-
-- `error`: `string | Error | Partial<{ cause, data, message, name, stack, statusCode, statusMessage }>`
-
-```js
-throwError("😱 Oh no, an error has been thrown.")
-throwError({ statusCode: 404, statusMessage: "Page Not Found" })
-```
-
-The thrown error is set in the state using [`useError()`](/api/composables/use-error) to create a reactive and SSR-friendly shared error state across components.
-
-`throwError` calls the `app:error` hook.
-
-::ReadMore{link="/guide/features/error-handling"}
-::
-
-## Throwing errors in API routes
-
-You can use the auto-imported `createError` from [`h3`](https://github.com/unjs/h3) package to trigger error handling in server API routes.
-
-**Example:**
-
-```js
-export default eventHandler(() => {
-  throw createError({
-    statusCode: 404,
-    statusMessage: 'Page Not Found'
-  })
-}
-```
diff --git a/examples/app/error-handling/app.vue b/examples/app/error-handling/app.vue
index 66f9ee9c715..bbd937d8ded 100644
--- a/examples/app/error-handling/app.vue
+++ b/examples/app/error-handling/app.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { throwError } from '#app'
+import { showError } from '#app'
 const route = useRoute()
 if ('setup' in route.query) {
   throw new Error('error in setup')
@@ -30,7 +30,7 @@ function triggerError () {
         <NuxtLink to="/?middleware" class="n-link-base">
           Middleware
         </NuxtLink>
-        <button class="n-link-base" @click="throwError">
+        <button class="n-link-base" @click="showError">
           Trigger fatal error
         </button>
         <button class="n-link-base" @click="triggerError">
diff --git a/examples/app/error-handling/middleware/error.global.ts b/examples/app/error-handling/middleware/error.global.ts
index a8d658adf09..4d3927f4e6e 100644
--- a/examples/app/error-handling/middleware/error.global.ts
+++ b/examples/app/error-handling/middleware/error.global.ts
@@ -1,5 +1,5 @@
 export default defineNuxtRouteMiddleware((to) => {
   if ('middleware' in to.query) {
-    return throwError('error in middleware')
+    return showError('error in middleware')
   }
 })
diff --git a/packages/nuxt/src/app/components/nuxt-root.vue b/packages/nuxt/src/app/components/nuxt-root.vue
index 0e045f403bb..cab16e7aa9e 100644
--- a/packages/nuxt/src/app/components/nuxt-root.vue
+++ b/packages/nuxt/src/app/components/nuxt-root.vue
@@ -7,7 +7,7 @@
 
 <script setup>
 import { defineAsyncComponent, onErrorCaptured } from 'vue'
-import { callWithNuxt, isNuxtError, throwError, useError, useNuxtApp } from '#app'
+import { callWithNuxt, isNuxtError, showError, useError, useNuxtApp } from '#app'
 
 const ErrorComponent = defineAsyncComponent(() => import('#build/error-component.mjs'))
 
@@ -25,7 +25,7 @@ const error = useError()
 onErrorCaptured((err, target, info) => {
   nuxtApp.hooks.callHook('vue:error', err, target, info).catch(hookError => console.error('[nuxt] Error in `vue:error` hook', hookError))
   if (process.server || (isNuxtError(err) && err.fatal)) {
-    callWithNuxt(nuxtApp, throwError, [err])
+    callWithNuxt(nuxtApp, showError, [err])
   }
 })
 </script>
diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index df108233715..d5a29a7c5b0 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -10,7 +10,7 @@ export interface NuxtError extends H3Error {
   fatal?: boolean
 }
 
-export const throwError = (_err: string | Error | Partial<NuxtError>) => {
+export const showError = (_err: string | Error | Partial<NuxtError>) => {
   const err = createError(_err)
   err.fatal = true
 
@@ -30,6 +30,9 @@ export const throwError = (_err: string | Error | Partial<NuxtError>) => {
   return err
 }
 
+/** @deprecated Use `throw createError()` or `showError` */
+export const throwError = showError
+
 export const clearError = async (options: { redirect?: string } = {}) => {
   const nuxtApp = useNuxtApp()
   const error = useError()
diff --git a/packages/nuxt/src/app/composables/index.ts b/packages/nuxt/src/app/composables/index.ts
index e60d2dde8de..cb3eb864379 100644
--- a/packages/nuxt/src/app/composables/index.ts
+++ b/packages/nuxt/src/app/composables/index.ts
@@ -3,7 +3,7 @@ export { useAsyncData, useLazyAsyncData, refreshNuxtData } from './asyncData'
 export type { AsyncDataOptions, AsyncData } from './asyncData'
 export { useHydration } from './hydrate'
 export { useState } from './state'
-export { clearError, createError, isNuxtError, throwError, useError } from './error'
+export { clearError, createError, isNuxtError, throwError, showError, useError } from './error'
 export type { NuxtError } from './error'
 export { useFetch, useLazyFetch } from './fetch'
 export type { FetchResult, UseFetchOptions } from './fetch'
diff --git a/packages/nuxt/src/app/plugins/router.ts b/packages/nuxt/src/app/plugins/router.ts
index 50e5d6bae1e..bde980db0c7 100644
--- a/packages/nuxt/src/app/plugins/router.ts
+++ b/packages/nuxt/src/app/plugins/router.ts
@@ -3,7 +3,7 @@ import { parseURL, parseQuery, withoutBase, isEqual, joinURL } from 'ufo'
 import { createError } from 'h3'
 import { defineNuxtPlugin } from '..'
 import { callWithNuxt } from '../nuxt'
-import { clearError, navigateTo, throwError, useRuntimeConfig } from '#app'
+import { clearError, navigateTo, showError, useRuntimeConfig } from '#app'
 // @ts-ignore
 import { globalMiddleware } from '#build/middleware'
 
@@ -228,7 +228,7 @@ export default defineNuxtPlugin<{ route: Route, router: Router }>((nuxtApp) => {
             const error = result || createError({
               statusMessage: `Route navigation aborted: ${initialURL}`
             })
-            return callWithNuxt(nuxtApp, throwError, [error])
+            return callWithNuxt(nuxtApp, showError, [error])
           }
         }
         if (result || result === false) { return result }
diff --git a/packages/nuxt/src/auto-imports/presets.ts b/packages/nuxt/src/auto-imports/presets.ts
index 95688f50355..f2640359034 100644
--- a/packages/nuxt/src/auto-imports/presets.ts
+++ b/packages/nuxt/src/auto-imports/presets.ts
@@ -43,6 +43,7 @@ export const appPreset = defineUnimportPreset({
     'abortNavigation',
     'addRouteMiddleware',
     'throwError',
+    'showError',
     'clearError',
     'isNuxtError',
     'useError',
diff --git a/packages/nuxt/src/pages/runtime/router.ts b/packages/nuxt/src/pages/runtime/router.ts
index 824dddeeaea..2ab21f2a261 100644
--- a/packages/nuxt/src/pages/runtime/router.ts
+++ b/packages/nuxt/src/pages/runtime/router.ts
@@ -9,7 +9,7 @@ import {
 import { createError } from 'h3'
 import { withoutBase, isEqual } from 'ufo'
 import NuxtPage from './page'
-import { callWithNuxt, defineNuxtPlugin, useRuntimeConfig, throwError, clearError, navigateTo, useError } from '#app'
+import { callWithNuxt, defineNuxtPlugin, useRuntimeConfig, showError, clearError, navigateTo, useError } from '#app'
 // @ts-ignore
 import routes from '#build/routes'
 // @ts-ignore
@@ -117,7 +117,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     await router.isReady()
   } catch (error) {
     // We'll catch 404s here
-    callWithNuxt(nuxtApp, throwError, [error])
+    callWithNuxt(nuxtApp, showError, [error])
   }
 
   router.beforeEach(async (to, from) => {
@@ -154,7 +154,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
           const error = result || createError({
             statusMessage: `Route navigation aborted: ${initialURL}`
           })
-          return callWithNuxt(nuxtApp, throwError, [error])
+          return callWithNuxt(nuxtApp, showError, [error])
         }
       }
       if (result || result === false) { return result }
@@ -169,7 +169,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       await callWithNuxt(nuxtApp, clearError)
     }
     if (to.matched.length === 0) {
-      callWithNuxt(nuxtApp, throwError, [createError({
+      callWithNuxt(nuxtApp, showError, [createError({
         statusCode: 404,
         statusMessage: `Page not found: ${to.fullPath}`
       })])
@@ -192,7 +192,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       })
     } catch (error) {
       // We'll catch middleware errors or deliberate exceptions here
-      callWithNuxt(nuxtApp, throwError, [error])
+      callWithNuxt(nuxtApp, showError, [error])
     }
   })
 

From f61e13cd5b0c2eb712c97fdbc18cbd814f93d4d5 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 21 Jul 2022 14:12:14 +0200
Subject: [PATCH 32/34] upgrade h3 and reuse fatal

---
 packages/nuxt/package.json                     |  2 +-
 packages/nuxt/src/app/components/nuxt-root.vue |  2 +-
 packages/nuxt/src/app/composables/error.ts     |  7 +------
 packages/vite/package.json                     |  2 +-
 yarn.lock                                      | 16 ++++++++++++++--
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index b3f4af3846e..5b320350f48 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -46,7 +46,7 @@
     "escape-string-regexp": "^5.0.0",
     "fs-extra": "^10.1.0",
     "globby": "^13.1.2",
-    "h3": "^0.7.10",
+    "h3": "^0.7.12",
     "hash-sum": "^2.0.0",
     "hookable": "^5.1.1",
     "knitwork": "^0.1.2",
diff --git a/packages/nuxt/src/app/components/nuxt-root.vue b/packages/nuxt/src/app/components/nuxt-root.vue
index cab16e7aa9e..da58c152a93 100644
--- a/packages/nuxt/src/app/components/nuxt-root.vue
+++ b/packages/nuxt/src/app/components/nuxt-root.vue
@@ -24,7 +24,7 @@ if (process.dev && results && results.some(i => i && 'then' in i)) {
 const error = useError()
 onErrorCaptured((err, target, info) => {
   nuxtApp.hooks.callHook('vue:error', err, target, info).catch(hookError => console.error('[nuxt] Error in `vue:error` hook', hookError))
-  if (process.server || (isNuxtError(err) && err.fatal)) {
+  if (process.server || (isNuxtError(err) && (err.fatal || err.unhandled))) {
     callWithNuxt(nuxtApp, showError, [err])
   }
 })
diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index d5a29a7c5b0..e50c8b72500 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -6,9 +6,7 @@ export const useError = () => {
   return useState('error', () => process.server ? nuxtApp.ssrContext.error : nuxtApp.payload.error)
 }
 
-export interface NuxtError extends H3Error {
-  fatal?: boolean
-}
+export interface NuxtError extends H3Error {}
 
 export const showError = (_err: string | Error | Partial<NuxtError>) => {
   const err = createError(_err)
@@ -47,9 +45,6 @@ export const isNuxtError = (err?: string | object): err is NuxtError => err && t
 
 export const createError = (err: string | Partial<NuxtError>): NuxtError => {
   const _err: NuxtError = _createError(err)
-  if (err && typeof err === 'object' && err.fatal) {
-    _err.fatal = true
-  }
   ;(_err as any).__nuxt_error = true
   return _err
 }
diff --git a/packages/vite/package.json b/packages/vite/package.json
index 850d442c002..86095d430a3 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -33,7 +33,7 @@
     "externality": "^0.2.2",
     "fs-extra": "^10.1.0",
     "get-port-please": "^2.5.0",
-    "h3": "^0.7.10",
+    "h3": "^0.7.12",
     "knitwork": "^0.1.2",
     "magic-string": "^0.26.2",
     "mlly": "^0.5.5",
diff --git a/yarn.lock b/yarn.lock
index 715932666f7..b8bb76af15a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1908,7 +1908,7 @@ __metadata:
     externality: ^0.2.2
     fs-extra: ^10.1.0
     get-port-please: ^2.5.0
-    h3: ^0.7.10
+    h3: ^0.7.12
     knitwork: ^0.1.2
     magic-string: ^0.26.2
     mlly: ^0.5.5
@@ -7223,6 +7223,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"h3@npm:^0.7.12":
+  version: 0.7.12
+  resolution: "h3@npm:0.7.12"
+  dependencies:
+    cookie-es: ^0.5.0
+    destr: ^1.1.1
+    radix3: ^0.1.2
+    ufo: ^0.8.5
+  checksum: cde4a733910a06a36fb9a26222a624bdd51314bd4a82c7f3830405d76f152cbaf59bbf8438207d76ce5e49a8d23807ba14055965bad64f9e11c598002aeafd1a
+  languageName: node
+  linkType: hard
+
 "handlebars@npm:^4.7.7":
   version: 4.7.7
   resolution: "handlebars@npm:4.7.7"
@@ -9814,7 +9826,7 @@ __metadata:
     escape-string-regexp: ^5.0.0
     fs-extra: ^10.1.0
     globby: ^13.1.2
-    h3: ^0.7.10
+    h3: ^0.7.12
     hash-sum: ^2.0.0
     hookable: ^5.1.1
     knitwork: ^0.1.2

From b04dda0f7bcfd792feccbeab55a3b51bc785fca3 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 21 Jul 2022 14:46:05 +0200
Subject: [PATCH 33/34] only log unhandled errors

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

diff --git a/packages/nuxt/src/core/runtime/nitro/error.ts b/packages/nuxt/src/core/runtime/nitro/error.ts
index 381832fb500..a34db5c670d 100644
--- a/packages/nuxt/src/core/runtime/nitro/error.ts
+++ b/packages/nuxt/src/core/runtime/nitro/error.ts
@@ -24,8 +24,8 @@ export default <NitroErrorHandler> async function errorhandler (_error, event) {
   event.res.statusMessage = errorObject.statusMessage
 
   // Console output
-  if (errorObject.statusCode !== 404) {
-    console.error('[nuxt] [request error]', errorObject.message + '\n' + stack.map(l => '  ' + l.text).join('  \n'))
+  if ((_error as any).unhandled) {
+    console.error('[nuxt] [unhandled request error]', errorObject.message + '\n' + stack.map(l => '  ' + l.text).join('  \n'))
   }
 
   // JSON response

From e69bdf86e6a559689c092f301910d5b7940526cc Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 21 Jul 2022 14:49:19 +0200
Subject: [PATCH 34/34] update ui templates

---
 packages/nuxt/package.json |  2 +-
 yarn.lock                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 5b320350f48..cab9fe52870 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -34,7 +34,7 @@
     "@nuxt/kit": "^3.0.0-rc.6",
     "@nuxt/schema": "^3.0.0-rc.6",
     "@nuxt/telemetry": "^2.1.3",
-    "@nuxt/ui-templates": "^0.2.1",
+    "@nuxt/ui-templates": "^0.3.0",
     "@nuxt/vite-builder": "^3.0.0-rc.6",
     "@vue/reactivity": "^3.2.37",
     "@vue/shared": "^3.2.37",
diff --git a/yarn.lock b/yarn.lock
index b8bb76af15a..e3994371681 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1858,10 +1858,10 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@nuxt/ui-templates@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "@nuxt/ui-templates@npm:0.2.1"
-  checksum: a79315c2777b175b007106b51c2db0a56c815e6c6c24f276eaf8fa86dbb34cac135b8c03ed59f8adaeacbcefe02deefa182fc9cb5d1ab04222bc0aec1b2e8222
+"@nuxt/ui-templates@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@nuxt/ui-templates@npm:0.3.0"
+  checksum: 075ccb9aa6c781b752a81c1866673623e9f8509b587701352b53620e092a54c943e853d984bf6951295f0c9a999098f5fc2f25fc3df72c7f2b17dcc9eb619bc9
   languageName: node
   linkType: hard
 
@@ -9812,7 +9812,7 @@ __metadata:
     "@nuxt/kit": ^3.0.0-rc.6
     "@nuxt/schema": ^3.0.0-rc.6
     "@nuxt/telemetry": ^2.1.3
-    "@nuxt/ui-templates": ^0.2.1
+    "@nuxt/ui-templates": ^0.3.0
     "@nuxt/vite-builder": ^3.0.0-rc.6
     "@types/fs-extra": ^9.0.13
     "@types/hash-sum": ^1.0.0