From 0c3d833ed3fd6cc3cda225cba6afa9712c9d2048 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Tue, 18 Oct 2022 19:13:13 +0200 Subject: [PATCH 1/4] fix: only override status message if is set --- packages/nuxt/src/core/runtime/nitro/error.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/nuxt/src/core/runtime/nitro/error.ts b/packages/nuxt/src/core/runtime/nitro/error.ts index 896c5179fa4..ea557cea492 100644 --- a/packages/nuxt/src/core/runtime/nitro/error.ts +++ b/packages/nuxt/src/core/runtime/nitro/error.ts @@ -20,9 +20,10 @@ export default async function errorhandler (error: H3Error, } // Set response code and message - event.res.statusCode = errorObject.statusCode as any as number - event.res.statusMessage = errorObject.statusMessage - + event.res.statusCode = (errorObject.statusCode !== 200 && errorObject.statusCode) as any as number || 500 + if (errorObject.statusMessage) { + event.res.statusMessage = errorObject.statusMessage + } // Console output if (error.unhandled || error.fatal) { const tags = [ From e5771ec0be75018a586a10f82d60b2936ce373b9 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Tue, 18 Oct 2022 19:14:27 +0200 Subject: [PATCH 2/4] disable cache for nuxt_error via rules --- packages/nuxt/src/core/nitro.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index c8e59f87171..0fc7dcc1f95 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -37,6 +37,9 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) { devHandlers: [], baseURL: nuxt.options.app.baseURL, virtual: {}, + routeRules: { + '/__nuxt_error': { cache: false } + }, runtimeConfig: { ...nuxt.options.runtimeConfig, nitro: { From 3254ae4d0da7ad9819333ffb00db7cb17ee42bb8 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Tue, 18 Oct 2022 19:15:09 +0200 Subject: [PATCH 3/4] update nitropack --- packages/nuxt/package.json | 2 +- packages/schema/package.json | 2 +- pnpm-lock.yaml | 24 ++++++++++++++++-------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 15d3a5bf323..14ff67855c1 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -58,7 +58,7 @@ "knitwork": "^0.1.2", "magic-string": "^0.26.7", "mlly": "^0.5.16", - "nitropack": "npm:nitropack-edge@0.6.0-27767213.0be380d", + "nitropack": "npm:nitropack-edge@0.6.0-27768554.81d744d", "nuxi": "3.0.0-rc.11", "ohash": "^0.1.5", "ohmyfetch": "^0.4.20", diff --git a/packages/schema/package.json b/packages/schema/package.json index 0b4c62e5fb7..6c553728eef 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -18,7 +18,7 @@ "@types/semver": "^7", "@vitejs/plugin-vue": "^3.1.2", "@vueuse/head": "~1.0.0-rc.9", - "nitropack": "npm:nitropack-edge@0.6.0-27767213.0be380d", + "nitropack": "npm:nitropack-edge@0.6.0-27768554.81d744d", "unbuild": "latest", "vite": "~3.1.8" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2510421085d..752336be10a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -429,7 +429,7 @@ importers: knitwork: ^0.1.2 magic-string: ^0.26.7 mlly: ^0.5.16 - nitropack: npm:nitropack-edge@0.6.0-27767213.0be380d + nitropack: npm:nitropack-edge@0.6.0-27768554.81d744d nuxi: workspace:* ohash: ^0.1.5 ohmyfetch: ^0.4.20 @@ -473,7 +473,7 @@ importers: knitwork: 0.1.2 magic-string: 0.26.7 mlly: 0.5.16 - nitropack: /nitropack-edge/0.6.0-27767213.0be380d + nitropack: /nitropack-edge/0.6.0-27768554.81d744d nuxi: link:../nuxi ohash: 0.1.5 ohmyfetch: 0.4.20 @@ -508,7 +508,7 @@ importers: create-require: ^1.1.1 defu: ^6.1.0 jiti: ^1.16.0 - nitropack: npm:nitropack-edge@0.6.0-27767213.0be380d + nitropack: npm:nitropack-edge@0.6.0-27768554.81d744d pathe: ^0.3.9 pkg-types: ^0.3.5 postcss-import-resolver: ^2.0.0 @@ -537,7 +537,7 @@ importers: '@types/semver': 7.3.12 '@vitejs/plugin-vue': 3.1.2_vite@3.1.8 '@vueuse/head': 1.0.0-rc.9 - nitropack: /nitropack-edge/0.6.0-27767213.0be380d + nitropack: /nitropack-edge/0.6.0-27768554.81d744d unbuild: 0.9.4 vite: 3.1.8 @@ -5416,6 +5416,14 @@ packages: radix3: 0.2.1 ufo: 0.8.6 + /h3/0.8.4: + resolution: {integrity: sha512-U7ZD/Te+LBS1IpUvsZRe+E+ZiA3zQS0u43DMrZ+raiVObeYe0G5F4Kr/g6Fn2fH92Np0ROkij/wEhkAMbUsBdQ==} + dependencies: + cookie-es: 0.5.0 + destr: 1.1.1 + radix3: 0.2.1 + ufo: 0.8.6 + /har-schema/2.0.0: resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==} engines: {node: '>=4'} @@ -6449,8 +6457,8 @@ packages: /neo-async/2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - /nitropack-edge/0.6.0-27767213.0be380d: - resolution: {integrity: sha512-LDnqyO8+BtFvoYFJKF88REhXaM3mQF6k3qdvOumNJC0uMFmg7mbirTuNTbGf1TAs1Zn2S90T1r+04ZiCTG2vKQ==} + /nitropack-edge/0.6.0-27768554.81d744d: + resolution: {integrity: sha512-yW6q9tHcv1HDw12/LcRPaWSWWHBtBAjXnM9dCcgMfv823qKeAefzoaiHvPPiAwekTB4k04tD968Y4IyaWLMS4A==} engines: {node: ^14.16.0 || ^16.11.0 || ^17.0.0 || ^18.0.0} hasBin: true dependencies: @@ -6480,7 +6488,7 @@ packages: fs-extra: 10.1.0 globby: 13.1.2 gzip-size: 7.0.0 - h3: 0.8.3 + h3: 0.8.4 hookable: 5.4.1 http-proxy: 1.18.1 is-primitive: 3.0.1 @@ -8429,7 +8437,7 @@ packages: anymatch: 3.1.2 chokidar: 3.5.3 destr: 1.1.1 - h3: 0.8.3 + h3: 0.8.4 ioredis: 5.2.3 listhen: 0.3.4 mkdir: 0.0.2 From b429283d504df8fc2f101ac310e703aa4c85f684 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Tue, 18 Oct 2022 19:43:39 +0200 Subject: [PATCH 4/4] update nitro --- packages/nuxt/package.json | 2 +- packages/schema/package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 14ff67855c1..e652b48c8df 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -58,7 +58,7 @@ "knitwork": "^0.1.2", "magic-string": "^0.26.7", "mlly": "^0.5.16", - "nitropack": "npm:nitropack-edge@0.6.0-27768554.81d744d", + "nitropack": "npm:nitropack-edge@0.6.0-27768582.4603279", "nuxi": "3.0.0-rc.11", "ohash": "^0.1.5", "ohmyfetch": "^0.4.20", diff --git a/packages/schema/package.json b/packages/schema/package.json index 6c553728eef..0cd8324321c 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -18,7 +18,7 @@ "@types/semver": "^7", "@vitejs/plugin-vue": "^3.1.2", "@vueuse/head": "~1.0.0-rc.9", - "nitropack": "npm:nitropack-edge@0.6.0-27768554.81d744d", + "nitropack": "npm:nitropack-edge@0.6.0-27768582.4603279", "unbuild": "latest", "vite": "~3.1.8" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 752336be10a..e7af84839a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -429,7 +429,7 @@ importers: knitwork: ^0.1.2 magic-string: ^0.26.7 mlly: ^0.5.16 - nitropack: npm:nitropack-edge@0.6.0-27768554.81d744d + nitropack: npm:nitropack-edge@0.6.0-27768582.4603279 nuxi: workspace:* ohash: ^0.1.5 ohmyfetch: ^0.4.20 @@ -473,7 +473,7 @@ importers: knitwork: 0.1.2 magic-string: 0.26.7 mlly: 0.5.16 - nitropack: /nitropack-edge/0.6.0-27768554.81d744d + nitropack: /nitropack-edge/0.6.0-27768582.4603279 nuxi: link:../nuxi ohash: 0.1.5 ohmyfetch: 0.4.20 @@ -508,7 +508,7 @@ importers: create-require: ^1.1.1 defu: ^6.1.0 jiti: ^1.16.0 - nitropack: npm:nitropack-edge@0.6.0-27768554.81d744d + nitropack: npm:nitropack-edge@0.6.0-27768582.4603279 pathe: ^0.3.9 pkg-types: ^0.3.5 postcss-import-resolver: ^2.0.0 @@ -537,7 +537,7 @@ importers: '@types/semver': 7.3.12 '@vitejs/plugin-vue': 3.1.2_vite@3.1.8 '@vueuse/head': 1.0.0-rc.9 - nitropack: /nitropack-edge/0.6.0-27768554.81d744d + nitropack: /nitropack-edge/0.6.0-27768582.4603279 unbuild: 0.9.4 vite: 3.1.8 @@ -6457,8 +6457,8 @@ packages: /neo-async/2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - /nitropack-edge/0.6.0-27768554.81d744d: - resolution: {integrity: sha512-yW6q9tHcv1HDw12/LcRPaWSWWHBtBAjXnM9dCcgMfv823qKeAefzoaiHvPPiAwekTB4k04tD968Y4IyaWLMS4A==} + /nitropack-edge/0.6.0-27768582.4603279: + resolution: {integrity: sha512-pyKJG/xE8F3g/Z7vkyvSS2dEIDAII8mp4GMcUfxxR6+PubNy2nI87udKGKqQF2DFlEIlw5VLr+DqET7+FqwMOQ==} engines: {node: ^14.16.0 || ^16.11.0 || ^17.0.0 || ^18.0.0} hasBin: true dependencies: