Create a new cart if Spree can't find the current using a token

framework/spree/cart/use-cart.tsx

@@ -8,6 +8,7 @@ import type { GraphQLFetcherResult } from '@commerce/api'
 import type { IOrder } from '@spree/storefront-api-v2-sdk/types/interfaces/Order'
 import type { IToken } from '@spree/storefront-api-v2-sdk/types/interfaces/Token'
 import setCartToken from '@framework/utils/set-cart-token'
+import { FetcherError } from '@commerce/utils/errors'
 
 export default useCart as UseCart<typeof handler>
 
@@ -35,6 +36,8 @@ export const handler: SWRHook<GetCartHook> = {
       spreeCartResponse = null
     } else {
       const spreeToken: IToken = { orderToken: cartToken }
+
+      try {
         const {
           data: { data: spreeCartShowSuccessResponse },
         } = await fetch<GraphQLFetcherResult<{ data: IOrder }>>({
@@ -58,6 +61,16 @@ export const handler: SWRHook<GetCartHook> = {
         })
 
         spreeCartResponse = spreeCartShowSuccessResponse
+      } catch (fetchCartError) {
+        if (
+          !(fetchCartError instanceof FetcherError) ||
+          fetchCartError.status !== 404
+        ) {
+          throw fetchCartError
+        }
+
+        spreeCartResponse = null
+      }
     }
 
     if (!spreeCartResponse || spreeCartResponse?.data.attributes.completed_at) {

framework/spree/utils/create-customized-fetch-fetcher.ts

@@ -60,6 +60,10 @@ const createCustomizedFetchFetcher: CreateCustomizedFetchFetcher = (
             data: Object.setPrototypeOf({ data }, { response }),
           }
         } catch (error) {
+          if (error instanceof FetchError) {
+            throw error
+          }
+
           throw new FetchError(null, request, null, error.message)
         }
       } catch (error) {