@scayle/storefront-nuxt 7.70.0 → 7.71.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @scayle/storefront-nuxt
 
+## 7.71.0
+
+### Minor Changes
+
+- Add new shopSelector mode `path_or_default`
+
+  The `path_or_default` mode is similar to `path`, but loading the root will open the default shop instead of redirecting to the first shop. So you can have a shop at `example.com/` and `example.com/de` instead of `example.com/en` and `example.com/de`. To set a default shop, add `isDefault: true` to the shop's configuration in the `nuxt.config`. When using `nuxt-i18n` the `strategy` option should be set to `prefix_except_default`. (This is the default value.)
+
 ## 7.70.0
 
 ### Minor Changes

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.c7df291d.mjs';
+export { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.b9f5584c.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 { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.c7df291d.js';
+export { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.b9f5584c.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 ModuleOptions } from './shared/storefront-nuxt.c7df291d.mjs';
-export { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.c7df291d.mjs';
+import { M as ModuleOptions } from './shared/storefront-nuxt.b9f5584c.mjs';
+export { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.b9f5584c.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 ModuleOptions } from './shared/storefront-nuxt.c7df291d.js';
-export { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.c7df291d.js';
+import { M as ModuleOptions } from './shared/storefront-nuxt.b9f5584c.js';
+export { f as AdditionalShopConfig, A as AppKeys, B as BapiConfig, b as CacheConfig, j as CheckoutEvent, C as CheckoutShopConfig, k as ModulePublicRuntimeConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, g as ShopConfig, h as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, i as StorefrontConfig } from './shared/storefront-nuxt.b9f5584c.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.69.1",
+  "version": "7.70.0",
   "configKey": "storefront",
   "compatibility": {
     "nuxt": "^3.9.0"

package/dist/module.mjs

@@ -4,6 +4,26 @@ import { rpcMethods } from '@scayle/storefront-core';
 import { defu } from 'defu';
 import { genImport, genSafeVariableName } from 'knitwork';
 import { builtinDrivers } from 'unstorage';
+import 'h3';
+
+const convertShopsToList = (stores) => {
+  if (Array.isArray(stores)) {
+    return stores;
+  }
+  return Object.values(stores);
+};
+function getApiBasePath(storefrontConfig, shop) {
+  const apiPath = shop.apiBasePath || storefrontConfig.apiBasePath || "/api";
+  if (storefrontConfig.shopSelector === "path") {
+    return `/${shop.path}${apiPath}`;
+  } else if (storefrontConfig.shopSelector === "path_or_default") {
+    if (shop.isDefault) {
+      return apiPath;
+    }
+    return `/${shop.path}${apiPath}`;
+  }
+  return apiPath;
+}
 
 function getUsedDrivers(options) {
   const drivers = /* @__PURE__ */ new Set();
@@ -40,7 +60,7 @@ export default {
 }`;
 }
 const PACKAGE_NAME = "@scayle/storefront-nuxt";
-const PACKAGE_VERSION = "7.69.1";
+const PACKAGE_VERSION = "7.70.0";
 const module = defineNuxtModule({
   meta: {
     name: PACKAGE_NAME,
@@ -138,10 +158,13 @@ const module = defineNuxtModule({
         method: "post"
       });
     }
-    if (nuxt.options.runtimeConfig.storefront.shopSelector === "path") {
-      const stores = Array.isArray(nuxt.options.runtimeConfig.storefront.stores) ? nuxt.options.runtimeConfig.storefront.stores : Object.values(nuxt.options.runtimeConfig.storefront.stores);
-      stores.forEach((iteratedStore) => {
-        const base = `/${iteratedStore.path}${apiBasePath}`;
+    const shops = convertShopsToList(
+      nuxt.options.runtimeConfig.storefront.stores
+    );
+    const shopSelector = nuxt.options.runtimeConfig.storefront.shopSelector;
+    if (shopSelector === "path" || shopSelector === "path_or_default") {
+      shops.forEach((shop) => {
+        const base = getApiBasePath(nuxt.options.runtimeConfig.storefront, shop);
         addCacheServerHandlers(base);
         addRPCServerHandlers(base);
       });

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.c7df291d.mjs';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.b9f5584c.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.c7df291d.js';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.b9f5584c.js';
 import '@nuxt/schema';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';

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

@@ -8,10 +8,11 @@ import {
 import { buildContext } from "../../context.mjs";
 import { useCacheStorage, useSessionStorage } from "../utils/cacheStorage.mjs";
 import {
-  convertStoresToList,
+  convertShopsToList,
   getCurrentShopConfigForRequest,
   getPublicShopData,
-  getBootstrapPath
+  getBootstrapPath,
+  getApiBasePath
 } from "./bootstrap.utils.mjs";
 import { useRedirects } from "./redirects.mjs";
 import { useRuntimeConfig } from "#imports";
@@ -100,7 +101,7 @@ async function bootstrap(event, $shopConfig, $storefrontConfig, apiBasePath, con
     apiBasePath,
     $storefrontConfig.publicShopData
   );
-  event.context.$availableShops = convertStoresToList($storefrontConfig.stores).filter((store) => store.isEnabled !== false).map(
+  event.context.$availableShops = convertShopsToList($storefrontConfig.stores).filter((store) => store.isEnabled !== false).map(
     (config2) => getPublicShopData(
       config2,
       $shopConfig.shopId,
@@ -150,7 +151,7 @@ export default defineEventHandler(async (event) => {
       );
       return;
     }
-    const apiBasePath = ($storefrontConfig.shopSelector === "path" && $shopConfig.path ? `/${$shopConfig.path}` : "") + ($shopConfig.apiBasePath || $storefrontConfig.apiBasePath || "/api");
+    const apiBasePath = getApiBasePath($storefrontConfig, $shopConfig);
     if (!event.context.$rpcContext) {
       event.context.$log.debug("Bootstrapping request: " + path);
       await bootstrap(

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

@@ -5,7 +5,8 @@ type BootstrapPath = {
     originalPath: string;
 };
 export declare function getBootstrapPath(event: H3Event): BootstrapPath;
-export declare const convertStoresToList: (stores: ShopConfig[] | ShopConfigIndexed) => ShopConfig[];
+export declare const convertShopsToList: (stores: ShopConfig[] | ShopConfigIndexed) => ShopConfig[];
+export declare function getApiBasePath(storefrontConfig: ModuleOptions, shop: ShopConfig): string;
 export declare function getCurrentShopConfigForRequest(event: H3Event, config: Pick<ModuleOptions, 'stores' | 'shopSelector'>): ShopConfig | undefined;
 export declare function getPublicShopData(data: ShopConfig, currentShopId: number, apiBasePath: string, publicShopData?: (keyof ShopConfig)[]): PublicShopConfig & {
     isActive: boolean;

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

@@ -3,39 +3,57 @@ import {
   getRequestHost,
   getRequestURL
 } from "h3";
-import { isArray, listify } from "radash";
 export function getBootstrapPath(event) {
   const url = getRequestURL(event);
   const path = url.pathname === "/__nuxt_error" ? url.searchParams.get("url") ?? url.pathname : url.pathname;
   return { path, originalPath: url.pathname };
 }
-const getStoreByDomain = (event, stores) => {
+const getShopByDomain = (event, shops) => {
   const host = getRequestHost(event, { xForwardedHost: true });
-  return stores.find((s) => s.domain === host);
+  return shops.find((s) => s.domain === host);
 };
-const getStoreByPath = (event, stores) => {
+const getShopByPath = (event, shops) => {
   const { path } = getBootstrapPath(event);
   const prefix = path.split("/")[1];
-  return stores.find((shop) => prefix === shop.path);
+  return shops.find((shop) => prefix === shop.path);
 };
-export const convertStoresToList = (stores) => {
-  if (isArray(stores)) {
+const getShopByPathOrDefault = (event, shops) => {
+  const defaultShop = shops.find((shop) => shop.isDefault);
+  const otherShops = shops.filter((shop) => !shop.isDefault);
+  return getShopByPath(event, otherShops) ?? defaultShop;
+};
+export const convertShopsToList = (stores) => {
+  if (Array.isArray(stores)) {
     return stores;
   }
-  return listify(stores, (_key, value) => ({ ...value }));
+  return Object.values(stores);
 };
+export function getApiBasePath(storefrontConfig, shop) {
+  const apiPath = shop.apiBasePath || storefrontConfig.apiBasePath || "/api";
+  if (storefrontConfig.shopSelector === "path") {
+    return `/${shop.path}${apiPath}`;
+  } else if (storefrontConfig.shopSelector === "path_or_default") {
+    if (shop.isDefault) {
+      return apiPath;
+    }
+    return `/${shop.path}${apiPath}`;
+  }
+  return apiPath;
+}
 export function getCurrentShopConfigForRequest(event, config) {
   let $shopConfig;
   const { shopSelector, stores } = config;
-  const storesList = convertStoresToList(stores);
+  const shopsList = convertShopsToList(stores);
   const headers = getRequestHeaders(event);
   const shopId = headers["x-shop-id"];
   if (shopId) {
-    $shopConfig = storesList.find((s) => s.shopId === Number(shopId));
+    $shopConfig = shopsList.find((s) => s.shopId === Number(shopId));
   } else if (shopSelector === "domain") {
-    $shopConfig = getStoreByDomain(event, storesList);
+    $shopConfig = getShopByDomain(event, shopsList);
   } else if (shopSelector === "path") {
-    $shopConfig = getStoreByPath(event, storesList);
+    $shopConfig = getShopByPath(event, shopsList);
+  } else if (shopSelector === "path_or_default") {
+    $shopConfig = getShopByPathOrDefault(event, shopsList);
   }
   return $shopConfig;
 }

package/dist/shared/{storefront-nuxt.c7df291d.d.mts → storefront-nuxt.b9f5584c.d.mts}

@@ -111,6 +111,7 @@ interface ShopConfig extends AdditionalShopConfig {
     currencyFractionDigits?: number;
     storeCampaignKeyword?: string;
     isEnabled?: boolean;
+    isDefault?: boolean;
     checkout: CheckoutShopConfig;
     sessionConfig?: SessionConfig;
     auth: {
@@ -144,7 +145,7 @@ interface StorefrontConfig {
     idp?: IDPConfig;
 }
 type ModuleOptions = StorefrontConfig & {
-    shopSelector: 'domain' | 'path';
+    shopSelector: 'domain' | 'path' | 'path_or_default';
     stores: ShopConfigIndexed;
     rpcDir?: string;
     rpcMethodNames?: string[];

package/dist/shared/{storefront-nuxt.c7df291d.d.ts → storefront-nuxt.b9f5584c.d.ts}

@@ -111,6 +111,7 @@ interface ShopConfig extends AdditionalShopConfig {
     currencyFractionDigits?: number;
     storeCampaignKeyword?: string;
     isEnabled?: boolean;
+    isDefault?: boolean;
     checkout: CheckoutShopConfig;
     sessionConfig?: SessionConfig;
     auth: {
@@ -144,7 +145,7 @@ interface StorefrontConfig {
     idp?: IDPConfig;
 }
 type ModuleOptions = StorefrontConfig & {
-    shopSelector: 'domain' | 'path';
+    shopSelector: 'domain' | 'path' | 'path_or_default';
     stores: ShopConfigIndexed;
     rpcDir?: string;
     rpcMethodNames?: string[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@scayle/storefront-nuxt",
   "type": "module",
-  "version": "7.70.0",
+  "version": "7.71.0",
   "description": "Nuxt integration for the SCAYLE Commerce Engine and Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",