@scayle/storefront-nuxt 8.6.0 → 8.6.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @scayle/storefront-nuxt
 
+## 8.6.1
+
+### Patch Changes
+
+- Consider `baseURL` configuration when bootstrapping error pages. This ensures error pages have the correct `currentShop`.
+
 ## 8.6.0
 
 ### Minor Changes

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 SCAYLE GmbH
+Copyright (c) 2025 SCAYLE GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-nuxt",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "configKey": "storefront",
   "compatibility": {
     "nuxt": "^3.9.0"

package/dist/module.mjs

@@ -45,7 +45,7 @@ export default {
 }`;
 }
 const PACKAGE_NAME = "@scayle/storefront-nuxt";
-const PACKAGE_VERSION = "8.6.0";
+const PACKAGE_VERSION = "8.6.1";
 const logger = createConsola({
   fancy: true,
   formatOptions: {

package/dist/runtime/server/middleware/bootstrap-utils.d.ts

@@ -5,7 +5,7 @@ type BootstrapPath = {
     path: string;
     originalPath: string;
 };
-export declare function getBootstrapPath(event: H3Event): BootstrapPath;
+export declare function getBootstrapPath(url: URL, baseUrl: string): BootstrapPath;
 export declare const getShopByPath: (event: H3Event, shops: ShopConfig[], appBasePath: string) => ShopConfig | undefined;
 export declare const convertShopsToList: (shops: ShopConfig[] | ShopConfigIndexed) => ShopConfig[];
 export declare function getApiBasePath(storefrontConfig: ModuleBaseOptions, baseUrl: string): string;

package/dist/runtime/server/middleware/bootstrap-utils.js

@@ -4,9 +4,9 @@ import {
   getRequestURL
 } from "h3";
 import { joinURL } from "ufo";
-export function getBootstrapPath(event) {
-  const url = getRequestURL(event);
-  const path = url.pathname === "/__nuxt_error" ? url.searchParams.get("url") ?? url.pathname : url.pathname;
+export function getBootstrapPath(url, baseUrl) {
+  const queryUrl = url.searchParams.get("url");
+  const path = url.pathname === joinURL(baseUrl, "/__nuxt_error") && queryUrl ? joinURL(baseUrl, queryUrl) : url.pathname;
   return { path, originalPath: url.pathname };
 }
 const getShopByDomain = (event, shops) => {
@@ -14,7 +14,8 @@ const getShopByDomain = (event, shops) => {
   return shops.find((s) => s.domain === host);
 };
 export const getShopByPath = (event, shops, appBasePath) => {
-  const { path } = getBootstrapPath(event);
+  const url = getRequestURL(event);
+  const { path } = getBootstrapPath(url, appBasePath);
   const localeIndex = appBasePath !== "/" ? 2 : 1;
   const prefix = path.split("/")?.[localeIndex];
   const matchesShopPrefix = (shop) => Array.isArray(shop.path) ? shop.path.includes(prefix) : shop.path === prefix;

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

@@ -1,4 +1,4 @@
-import { defineEventHandler, getCookie, deleteCookie } from "h3";
+import { defineEventHandler, getCookie, deleteCookie, getRequestURL } from "h3";
 import { decodeJwt } from "jose";
 import { randomUUID } from "uncrypto";
 import {
@@ -6,6 +6,7 @@ import {
   unsignCookie
 } from "@scayle/h3-session";
 import { trace, SpanStatusCode } from "@opentelemetry/api";
+import { joinURL } from "ufo";
 import { buildContext } from "../../context.js";
 import { useCacheStorage, useSessionStorage } from "../utils/cacheStorage.js";
 import {
@@ -139,14 +140,15 @@ async function bootstrap(event, $shopConfig, $storefrontConfig, apiBasePath, con
   });
 }
 export default defineEventHandler(async (event) => {
-  const { path, originalPath } = getBootstrapPath(event);
-  if (path.startsWith("/__nuxt")) {
+  const config = useRuntimeConfig(event);
+  const url = getRequestURL(event);
+  const { path, originalPath } = getBootstrapPath(url, config.app.baseURL);
+  if (path.startsWith(joinURL(config.app.baseURL, "/__nuxt"))) {
     return;
   }
   if (path === "/favicon.ico") {
     return;
   }
-  const config = useRuntimeConfig(event);
   const $storefrontConfig = config.storefront;
   if (path === `${$storefrontConfig.apiBasePath ?? "/api"}/up`) {
     return;
@@ -187,7 +189,7 @@ export default defineEventHandler(async (event) => {
             config
           );
         }
-        if ($storefrontConfig.redirects?.enabled && !path.startsWith(apiBasePath) && originalPath !== "/__nuxt_error") {
+        if ($storefrontConfig.redirects?.enabled && !path.startsWith(apiBasePath) && originalPath !== joinURL(config.app.baseURL, "/__nuxt_error")) {
           await tracer.startActiveSpan(
             `storefront-nuxt.middleware/redirects`,
             {},

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@scayle/storefront-nuxt",
   "type": "module",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "description": "Nuxt integration for the SCAYLE Commerce Engine and Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -90,27 +90,27 @@
     "schema-dts": "1.1.2"
   },
   "devDependencies": {
-    "@nuxt/eslint": "0.7.5",
+    "@nuxt/eslint": "1.0.0",
     "@nuxt/kit": "3.14.1592",
     "@nuxt/module-builder": "0.8.4",
     "@nuxt/schema": "3.14.1592",
     "@nuxt/test-utils": "3.15.4",
     "@scayle/eslint-config-storefront": "4.4.1",
     "@scayle/eslint-plugin-vue-composable": "0.2.1",
-    "@types/node": "22.10.10",
-    "dprint": "0.48.0",
-    "eslint": "9.18.0",
+    "@types/node": "22.13.1",
+    "dprint": "0.49.0",
+    "eslint": "9.19.0",
     "eslint-formatter-gitlab": "5.1.0",
-    "fishery": "2.2.2",
+    "fishery": "2.2.3",
     "h3": "1.14.0",
     "nitropack": "2.9.7",
     "node-mocks-http": "1.16.2",
-    "nuxi": "3.20.0",
+    "nuxi": "3.21.1",
     "nuxt": "3.14.1592",
     "publint": "0.2.12",
     "typescript": "5.7.3",
     "vue-tsc": "2.2.0",
-    "vitest": "2.1.8"
+    "vitest": "2.1.9"
   },
   "peerDependencies": {
     "@nuxt/kit": "^3.12.2",
@@ -128,6 +128,6 @@
     "@nuxt/schema": "3.14.1592"
   },
   "volta": {
-    "node": "22.13.0"
+    "node": "22.13.1"
   }
 }