From 3a1a4833e40b0c563a1a0b9e05fff99aab581277 Mon Sep 17 00:00:00 2001 From: sebbejohansson Date: Mon, 27 Feb 2023 21:51:42 +0100 Subject: [PATCH 1/3] fix: correctly checks so that error value exists before trying to show one in useAsyncStoryblok --- .../runtime/composables/useAsyncStoryblok.ts | 2 ++ playground/package.json | 2 +- playground/pages/[...slug].vue | 20 +++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 playground/pages/[...slug].vue diff --git a/lib/src/runtime/composables/useAsyncStoryblok.ts b/lib/src/runtime/composables/useAsyncStoryblok.ts index 18f7b8c0..8eaa6d70 100644 --- a/lib/src/runtime/composables/useAsyncStoryblok.ts +++ b/lib/src/runtime/composables/useAsyncStoryblok.ts @@ -28,6 +28,8 @@ export const useAsyncStoryblok = async ( if (error.value?.response.status >= 400 && error.value?.response.status < 600) { throw createError({ statusCode: error.value?.response.status, statusMessage: error.value?.message.message }); + if (error.value?.response && error.value?.response.status >= 400 && error.value?.response.status < 600) { + throw createError({ statusCode: error.value?.response.status, statusMessage: error.value?.message?.message || 'Something went wrong when fetching from storyblok.' }); } story.value = data.value?.data.story; diff --git a/playground/package.json b/playground/package.json index a1c2ddcf..9a186073 100644 --- a/playground/package.json +++ b/playground/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "nuxt": "^3.0.0", - "@storyblok/nuxt": "^0.0.1" + "@storyblok/nuxt": "file:../" } } diff --git a/playground/pages/[...slug].vue b/playground/pages/[...slug].vue new file mode 100644 index 00000000..9542780c --- /dev/null +++ b/playground/pages/[...slug].vue @@ -0,0 +1,20 @@ + + + From aa05a32cd2f03ef52876f67b9b9ec8d5fc408bad Mon Sep 17 00:00:00 2001 From: Sebastian Johansson Date: Thu, 2 Mar 2023 09:23:34 +0100 Subject: [PATCH 2/3] fix: reverts change for playground dependency --- playground/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playground/package.json b/playground/package.json index 9a186073..a1c2ddcf 100644 --- a/playground/package.json +++ b/playground/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "nuxt": "^3.0.0", - "@storyblok/nuxt": "file:../" + "@storyblok/nuxt": "^0.0.1" } } From 6979258aedad3881b9c9d389a91b6c888233ade5 Mon Sep 17 00:00:00 2001 From: Sebastian Johansson Date: Thu, 2 Mar 2023 10:12:02 +0100 Subject: [PATCH 3/3] fix: corrects regression with useAsyncStoryblok --- lib/src/runtime/composables/useAsyncStoryblok.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/src/runtime/composables/useAsyncStoryblok.ts b/lib/src/runtime/composables/useAsyncStoryblok.ts index 8eaa6d70..5ad6df80 100644 --- a/lib/src/runtime/composables/useAsyncStoryblok.ts +++ b/lib/src/runtime/composables/useAsyncStoryblok.ts @@ -26,8 +26,6 @@ export const useAsyncStoryblok = async ( () => storyblokApiInstance.get(`cdn/stories/${url}`, apiOptions), ); - if (error.value?.response.status >= 400 && error.value?.response.status < 600) { - throw createError({ statusCode: error.value?.response.status, statusMessage: error.value?.message.message }); if (error.value?.response && error.value?.response.status >= 400 && error.value?.response.status < 600) { throw createError({ statusCode: error.value?.response.status, statusMessage: error.value?.message?.message || 'Something went wrong when fetching from storyblok.' }); }