@scayle/storefront-nuxt 7.77.3 → 7.78.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @scayle/storefront-nuxt
 
+## 7.78.1
+
+### Patch Changes
+
+- Import `useNitroApp` from `#imports`
+
+## 7.78.0
+
+### Minor Changes
+
+- Support shops with multiple paths
+
+  The `path` property in the shop config can now be defined as an array of strings. If this is the case, multiple path prefixes will point to the same shop. For example, with the config `{ path: ['en', 'en-US'], shopId: 1001 }` both `example.com/en` and `example.com/en-US` will use shop 1001. Because it is the same shop, `/en` and `/en-US` will have the same locale and share user sessions, baskets and wishlists. The first path in the array will be considered the default path and used for API calls.
+
 ## 7.77.3
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, M as ModuleBaseOptions, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.134d6654.mjs';
+export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, M as ModuleBaseOptions, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.b2288199.mjs';
 export { rpcCall } from './rpc.mjs';
 export * from '@scayle/storefront-core';
 export { LogLevel } from '@scayle/storefront-core';

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, M as ModuleBaseOptions, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.134d6654.js';
+export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, M as ModuleBaseOptions, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.b2288199.js';
 export { rpcCall } from './rpc.js';
 export * from '@scayle/storefront-core';
 export { LogLevel } from '@scayle/storefront-core';

package/dist/module.d.mts

@@ -1,6 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { M as ModuleBaseOptions } from './shared/storefront-nuxt.134d6654.mjs';
-export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.134d6654.mjs';
+import { M as ModuleBaseOptions } from './shared/storefront-nuxt.b2288199.mjs';
+export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.b2288199.mjs';
 export { LogLevel } from '@scayle/storefront-core';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';

package/dist/module.d.ts

@@ -1,6 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { M as ModuleBaseOptions } from './shared/storefront-nuxt.134d6654.js';
-export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.134d6654.js';
+import { M as ModuleBaseOptions } from './shared/storefront-nuxt.b2288199.js';
+export { d as AdditionalShopConfig, A as AppKeys, B as BapiConfig, h as CheckoutEvent, C as CheckoutShopConfig, i as ModulePublicRuntimeConfig, P as PublicShopConfig, R as RedisConfig, a as SessionConfig, e as ShopConfig, f as ShopConfigIndexed, c as StorageConfig, b as StorageEntity, S as StorageProvider, g as StorefrontConfig } from './shared/storefront-nuxt.b2288199.js';
 export { LogLevel } from '@scayle/storefront-core';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';

package/dist/module.json

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

package/dist/module.mjs

@@ -15,15 +15,16 @@ const convertShopsToList = (stores) => {
   return Object.values(stores);
 };
 function getApiBasePath(storefrontConfig, shop, baseUrl) {
+  const path = Array.isArray(shop.path) ? shop.path[0] : shop.path;
   const apiPath = shop.apiBasePath || storefrontConfig.apiBasePath || "/api";
   if (storefrontConfig.shopSelector === "path") {
-    const pathElements = [shop.path, apiPath].filter(Boolean);
+    const pathElements = [path, apiPath].filter(Boolean);
     return joinURL(baseUrl, ...pathElements);
   } else if (storefrontConfig.shopSelector === "path_or_default") {
     if (shop.isDefault) {
       return joinURL(baseUrl, apiPath);
     }
-    const pathElements = [shop.path, apiPath].filter(Boolean);
+    const pathElements = [path, apiPath].filter(Boolean);
     return joinURL(baseUrl, ...pathElements);
   }
   return joinURL(baseUrl, apiPath);
@@ -64,7 +65,7 @@ export default {
 }`;
 }
 const PACKAGE_NAME = "@scayle/storefront-nuxt";
-const PACKAGE_VERSION = "7.77.2";
+const PACKAGE_VERSION = "7.78.0";
 const logger = createConsola({
   fancy: true,
   formatOptions: {

package/dist/rpc.d.mts

@@ -1,6 +1,6 @@
 import { RpcMethodName, RpcMethodParameters, RpcMethodReturnType, RpcContext } from '@scayle/storefront-core';
 import { NuxtApp } from 'nuxt/app';
-import { P as PublicShopConfig } from './shared/storefront-nuxt.134d6654.mjs';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.b2288199.mjs';
 import '@nuxt/schema';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';

package/dist/rpc.d.ts

@@ -1,6 +1,6 @@
 import { RpcMethodName, RpcMethodParameters, RpcMethodReturnType, RpcContext } from '@scayle/storefront-core';
 import { NuxtApp } from 'nuxt/app';
-import { P as PublicShopConfig } from './shared/storefront-nuxt.134d6654.js';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.b2288199.js';
 import '@nuxt/schema';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';

package/dist/runtime/context.mjs

@@ -8,7 +8,7 @@ import {
   generateBasketKey,
   generateWishlistKey
 } from "@scayle/storefront-core/dist/utils/keys";
-import { useNitroApp } from "nitropack/runtime/app";
+import { useNitroApp } from "#imports";
 import { fetchCampaignKey } from "./campaignKey.mjs";
 async function getWishlistKey(appKeys, session, $log, $shopConfig) {
   return session.data.user ? await generateWishlistKey({

package/dist/runtime/plugin/log.server.d.ts

@@ -1,8 +1,8 @@
 declare const _default: import("nuxt/app").Plugin<{
-    log: any;
-    coreLog: any;
+    log: import("@scayle/storefront-core").Log;
+    coreLog: import("@scayle/storefront-core").Log;
 }> & import("nuxt/app").ObjectPlugin<{
-    log: any;
-    coreLog: any;
+    log: import("@scayle/storefront-core").Log;
+    coreLog: import("@scayle/storefront-core").Log;
 }>;
 export default _default;

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

@@ -6,6 +6,7 @@ type BootstrapPath = {
     originalPath: string;
 };
 export declare function getBootstrapPath(event: H3Event): BootstrapPath;
+export declare const getShopByPath: (event: H3Event, shops: ShopConfig[], appBasePath: string) => ShopConfig | undefined;
 export declare const convertShopsToList: (stores: ShopConfig[] | ShopConfigIndexed) => ShopConfig[];
 export declare function getApiBasePath(storefrontConfig: ModuleBaseOptions, shop: ShopConfig, baseUrl: string): string;
 export declare function getCurrentShopConfigForRequest(event: H3Event, config: Pick<ModuleBaseOptions, 'stores' | 'shopSelector'>, runtimeConfig: NitroRuntimeConfig): ShopConfig | undefined;

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

@@ -13,11 +13,12 @@ const getShopByDomain = (event, shops) => {
   const host = getRequestHost(event, { xForwardedHost: true });
   return shops.find((s) => s.domain === host);
 };
-const getShopByPath = (event, shops, appBasePath) => {
+export const getShopByPath = (event, shops, appBasePath) => {
   const { path } = getBootstrapPath(event);
   const localeIndex = appBasePath !== "/" ? 2 : 1;
   const prefix = path.split("/")?.[localeIndex];
-  return shops.find((shop) => prefix === shop.path);
+  const matchesShopPrefix = (shop) => Array.isArray(shop.path) ? shop.path.includes(prefix) : shop.path === prefix;
+  return shops.find(matchesShopPrefix);
 };
 const getShopByPathOrDefault = (event, shops, appBasePath) => {
   const defaultShop = shops.find((shop) => shop.isDefault);
@@ -31,15 +32,16 @@ export const convertShopsToList = (stores) => {
   return Object.values(stores);
 };
 export function getApiBasePath(storefrontConfig, shop, baseUrl) {
+  const path = Array.isArray(shop.path) ? shop.path[0] : shop.path;
   const apiPath = shop.apiBasePath || storefrontConfig.apiBasePath || "/api";
   if (storefrontConfig.shopSelector === "path") {
-    const pathElements = [shop.path, apiPath].filter(Boolean);
+    const pathElements = [path, apiPath].filter(Boolean);
     return joinURL(baseUrl, ...pathElements);
   } else if (storefrontConfig.shopSelector === "path_or_default") {
     if (shop.isDefault) {
       return joinURL(baseUrl, apiPath);
     }
-    const pathElements = [shop.path, apiPath].filter(Boolean);
+    const pathElements = [path, apiPath].filter(Boolean);
     return joinURL(baseUrl, ...pathElements);
   }
   return joinURL(baseUrl, apiPath);
@@ -70,7 +72,7 @@ export function getPublicShopData(data, currentShopId, apiBasePath, publicShopDa
   publicShopData.forEach((key) => additionalShopData[key] = data[key]);
   return {
     domain: data.domain,
-    path: data.path,
+    path: Array.isArray(data.path) ? data.path[0] : data.path,
     locale: data.locale,
     shopId: data.shopId,
     currency: data.currency,

package/dist/runtime/utils/zodSchema.d.ts

@@ -176,7 +176,7 @@ declare const ShopConfigSchema: z.ZodObject<{
         idpRedirectURL: string;
     }>>;
     shopId: z.ZodNumber;
-    path: z.ZodOptional<z.ZodString>;
+    path: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
     apiBasePath: z.ZodOptional<z.ZodString>;
     domain: z.ZodOptional<z.ZodString>;
     locale: z.ZodString;
@@ -448,7 +448,7 @@ declare const ShopConfigSchema: z.ZodObject<{
         idpKeys: string[];
         idpRedirectURL: string;
     } | undefined;
-    path?: string | undefined;
+    path?: string | string[] | undefined;
     redis?: {
         port?: number | undefined;
         host?: string | undefined;
@@ -529,7 +529,7 @@ declare const ShopConfigSchema: z.ZodObject<{
         idpKeys: string[];
         idpRedirectURL: string;
     } | undefined;
-    path?: string | undefined;
+    path?: string | string[] | undefined;
     redis?: {
         port?: number | undefined;
         host?: string | undefined;
@@ -1472,7 +1472,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpRedirectURL: string;
             }>>;
             shopId: z.ZodNumber;
-            path: z.ZodOptional<z.ZodString>;
+            path: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
             apiBasePath: z.ZodOptional<z.ZodString>;
             domain: z.ZodOptional<z.ZodString>;
             locale: z.ZodString;
@@ -1744,7 +1744,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpKeys: string[];
                 idpRedirectURL: string;
             } | undefined;
-            path?: string | undefined;
+            path?: string | string[] | undefined;
             redis?: {
                 port?: number | undefined;
                 host?: string | undefined;
@@ -1825,7 +1825,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpKeys: string[];
                 idpRedirectURL: string;
             } | undefined;
-            path?: string | undefined;
+            path?: string | string[] | undefined;
             redis?: {
                 port?: number | undefined;
                 host?: string | undefined;
@@ -1919,7 +1919,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpKeys: string[];
                 idpRedirectURL: string;
             } | undefined;
-            path?: string | undefined;
+            path?: string | string[] | undefined;
             redis?: {
                 port?: number | undefined;
                 host?: string | undefined;
@@ -2007,7 +2007,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpKeys: string[];
                 idpRedirectURL: string;
             } | undefined;
-            path?: string | undefined;
+            path?: string | string[] | undefined;
             redis?: {
                 port?: number | undefined;
                 host?: string | undefined;
@@ -2210,7 +2210,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpKeys: string[];
                 idpRedirectURL: string;
             } | undefined;
-            path?: string | undefined;
+            path?: string | string[] | undefined;
             redis?: {
                 port?: number | undefined;
                 host?: string | undefined;
@@ -2383,7 +2383,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpKeys: string[];
                 idpRedirectURL: string;
             } | undefined;
-            path?: string | undefined;
+            path?: string | string[] | undefined;
             redis?: {
                 port?: number | undefined;
                 host?: string | undefined;

package/dist/runtime/utils/zodSchema.mjs

@@ -89,7 +89,7 @@ const emptyString = z.string().refine((val) => val === "", {
 const ShopConfigSchema = z.object({
   idp: IdpSchema.optional(),
   shopId: z.number(),
-  path: z.string().optional(),
+  path: z.string().or(z.array(z.string())).optional(),
   apiBasePath: z.string().optional(),
   domain: z.string().optional(),
   locale: z.string(),

package/dist/shared/{storefront-nuxt.134d6654.d.mts → storefront-nuxt.b2288199.d.mts}

@@ -180,7 +180,7 @@ declare const ShopConfigSchema: z.ZodObject<{
         idpRedirectURL: string;
     }>>;
     shopId: z.ZodNumber;
-    path: z.ZodOptional<z.ZodString>;
+    path: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
     apiBasePath: z.ZodOptional<z.ZodString>;
     domain: z.ZodOptional<z.ZodString>;
     locale: z.ZodString;
@@ -445,7 +445,7 @@ declare const ShopConfigSchema: z.ZodObject<{
         token: string;
         cbdExpiration?: number | undefined;
     };
-    path?: string | undefined;
+    path?: string | string[] | undefined;
     domain?: string | undefined;
     redis?: {
         port?: number | undefined;
@@ -526,7 +526,7 @@ declare const ShopConfigSchema: z.ZodObject<{
         token: string;
         cbdExpiration?: number | undefined;
     };
-    path?: string | undefined;
+    path?: string | string[] | undefined;
     domain?: string | undefined;
     redis?: {
         port?: number | undefined;
@@ -1088,10 +1088,11 @@ interface AdditionalShopConfig {
 interface ShopConfig extends ShopConfigType, AdditionalShopConfig {
 }
 type ShopConfigIndexed = Record<string, ShopConfig>;
-interface PublicShopConfig extends Pick<ShopConfig, 'shopId' | 'domain' | 'path' | 'locale' | 'currency' | 'currencyFractionDigits'> {
+interface PublicShopConfig extends Pick<ShopConfig, 'shopId' | 'domain' | 'locale' | 'currency' | 'currencyFractionDigits'> {
     checkout: Pick<CheckoutShopConfig, 'host'>;
     apiBasePath: string;
     idp?: IdpType;
+    path?: string;
 }
 interface StorefrontConfig extends StorefrontConfigType {
     withParams?: WithParams;

package/dist/shared/{storefront-nuxt.134d6654.d.ts → storefront-nuxt.b2288199.d.ts}

@@ -180,7 +180,7 @@ declare const ShopConfigSchema: z.ZodObject<{
         idpRedirectURL: string;
     }>>;
     shopId: z.ZodNumber;
-    path: z.ZodOptional<z.ZodString>;
+    path: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
     apiBasePath: z.ZodOptional<z.ZodString>;
     domain: z.ZodOptional<z.ZodString>;
     locale: z.ZodString;
@@ -445,7 +445,7 @@ declare const ShopConfigSchema: z.ZodObject<{
         token: string;
         cbdExpiration?: number | undefined;
     };
-    path?: string | undefined;
+    path?: string | string[] | undefined;
     domain?: string | undefined;
     redis?: {
         port?: number | undefined;
@@ -526,7 +526,7 @@ declare const ShopConfigSchema: z.ZodObject<{
         token: string;
         cbdExpiration?: number | undefined;
     };
-    path?: string | undefined;
+    path?: string | string[] | undefined;
     domain?: string | undefined;
     redis?: {
         port?: number | undefined;
@@ -1088,10 +1088,11 @@ interface AdditionalShopConfig {
 interface ShopConfig extends ShopConfigType, AdditionalShopConfig {
 }
 type ShopConfigIndexed = Record<string, ShopConfig>;
-interface PublicShopConfig extends Pick<ShopConfig, 'shopId' | 'domain' | 'path' | 'locale' | 'currency' | 'currencyFractionDigits'> {
+interface PublicShopConfig extends Pick<ShopConfig, 'shopId' | 'domain' | 'locale' | 'currency' | 'currencyFractionDigits'> {
     checkout: Pick<CheckoutShopConfig, 'host'>;
     apiBasePath: string;
     idp?: IdpType;
+    path?: string;
 }
 interface StorefrontConfig extends StorefrontConfigType {
     withParams?: WithParams;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@scayle/storefront-nuxt",
   "type": "module",
-  "version": "7.77.3",
+  "version": "7.78.1",
   "description": "Nuxt integration for the SCAYLE Commerce Engine and Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -68,7 +68,7 @@
     "defu": "6.1.4",
     "jose": "^5.2.0",
     "knitwork": "1.1.0",
-    "nitropack": "2.9.6",
+    "nitropack": "2.9.7",
     "ofetch": "1.3.4",
     "radash": "12.1.0",
     "ufo": "1.5.3",
@@ -87,7 +87,7 @@
     "@scayle/eslint-plugin-vue-composable": "0.2.0",
     "@types/node": "20.14.9",
     "dprint": "0.46.3",
-    "eslint": "9.5.0",
+    "eslint": "9.6.0",
     "eslint-formatter-gitlab": "5.1.0",
     "fishery": "2.2.2",
     "h3": "1.12.0",
@@ -96,7 +96,7 @@
     "nuxt": "3.11.2",
     "publint": "0.2.8",
     "vitest": "1.6.0",
-    "vue-tsc": "2.0.22"
+    "vue-tsc": "2.0.24"
   },
   "peerDependencies": {
     "h3": "^1.10.0",
@@ -106,7 +106,7 @@
   },
   "resolutions": {
     "h3": "1.12.0",
-    "vue": "3.4.27",
+    "vue": "3.4.31",
     "@nuxt/kit": "3.11.2",
     "@nuxt/schema": "3.11.2"
   },