@scayle/storefront-nuxt 7.62.1 → 7.62.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @scayle/storefront-nuxt
 
+## 7.62.2
+
+### Patch Changes
+
+- Error pages should be bootstrapped based on the URL where the error occurred
+
+  This resolves an issue where context properties such as `currentShop` and `availableShops` were not available on the error page.
+
 ## 7.62.1
 
 ### Patch Changes

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.9.0"
   },
-  "version": "7.62.0"
+  "version": "7.62.1"
 }

package/dist/runtime/server/middleware/bootstrap.mjs

@@ -27,10 +27,9 @@ const generateSessionId = (event) => {
   }
   return userId ? `${userId}:${randomUUID()}` : randomUUID();
 };
-async function bootstrap(event, url, $shopConfig, $storefrontConfig, apiBasePath, config) {
+async function bootstrap(event, $shopConfig, $storefrontConfig, apiBasePath, config) {
   const log = event.context.$log;
   const bootstrapLog = log.space("bootstrap");
-  bootstrapLog.debug("Bootstrapping request: " + url.toString());
   const $cache = useCacheStorage(
     String($shopConfig.shopId),
     $shopConfig.shopId,
@@ -104,30 +103,37 @@ async function bootstrap(event, url, $shopConfig, $storefrontConfig, apiBasePath
     event
   });
 }
+function getBootstrapPath(event) {
+  const url = getRequestURL(event);
+  if (url.pathname === "/__nuxt_error") {
+    return url.searchParams.get("url") ?? url.pathname;
+  }
+  return url.pathname;
+}
 export default defineEventHandler(async (event) => {
   try {
-    const url = getRequestURL(event);
-    if (url.pathname.startsWith("/__nuxt")) {
+    const path = getBootstrapPath(event);
+    if (path.startsWith("/__nuxt")) {
       return;
     }
     const config = useRuntimeConfig();
     const $storefrontConfig = config.storefront;
-    if (url.pathname === `${$storefrontConfig.apiBasePath ?? "/api"}/up`) {
+    if (path === `${$storefrontConfig.apiBasePath ?? "/api"}/up`) {
       return;
     }
     const $shopConfig = getShopConfig(event, config);
     const apiBasePath = ($storefrontConfig.shopSelector === "path" && $shopConfig.path ? `/${$shopConfig.path}` : "") + ($shopConfig.apiBasePath || $storefrontConfig.apiBasePath || "/api");
     if (!event.context.$rpcContext) {
+      event.context.$log.debug("Bootstrapping request: " + path);
       await bootstrap(
         event,
-        url,
         $shopConfig,
         $storefrontConfig,
         apiBasePath,
         config
       );
     }
-    if ($storefrontConfig.redirects?.enabled && !url.pathname.startsWith(apiBasePath)) {
+    if ($storefrontConfig.redirects?.enabled && !path.startsWith(apiBasePath)) {
       await useRedirects(event);
     }
   } catch (e) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@scayle/storefront-nuxt",
   "type": "module",
-  "version": "7.62.1",
+  "version": "7.62.2",
   "description": "Nuxt integration for the SCAYLE Commerce Engine and Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -71,7 +71,7 @@
     "jose": "^5.2.0",
     "knitwork": "1.0.0",
     "nitropack": "2.9.4",
-    "ofetch": "1.3.3",
+    "ofetch": "1.3.4",
     "radash": "12.1.0",
     "uncrypto": "0.1.3",
     "unstorage": "1.10.2",