@scayle/storefront-nuxt 7.95.4 → 8.0.0

package/dist/runtime/context.js

@@ -80,7 +80,7 @@ async function sessionProperties(context) {
 }
 export const buildContext = async (context) => {
   const { $cache, $shopConfig, $storefront, $log, config, event } = context;
-  const sapiConfig = $shopConfig.sapi ?? $shopConfig.bapi ?? $storefront.sapi ?? $storefront.bapi;
+  const sapiConfig = $shopConfig.sapi ?? $storefront.sapi;
   const appKeys = $shopConfig.appKeys ?? $storefront.appKeys;
   const idpConfig = $shopConfig.idp ?? $storefront.idp;
   const sapiClient = new StorefrontAPIClient({
@@ -98,7 +98,6 @@ export const buildContext = async (context) => {
   const { hooks } = useNitroApp();
   const baseContext = {
     cached,
-    bapiClient: sapiClient,
     sapiClient,
     auth: {
       resetPasswordUrl: $shopConfig.auth?.resetPasswordUrl
@@ -133,16 +132,13 @@ export const buildContext = async (context) => {
       hashAlgorithm: appKeys.hashAlgorithm,
       log: $log
     }),
-    isCmsPreview: false,
     locale: $shopConfig.locale,
     shopId: $shopConfig.shopId,
     domain: $shopConfig.domain,
     withParams: $storefront.withParams,
-    storeCampaignKeyword: $shopConfig.storeCampaignKeyword,
     campaignKey: await fetchCampaignKey(
       sapiClient,
       cached,
-      $shopConfig.storeCampaignKeyword,
       $log
     ),
     runtimeConfiguration: config,

package/dist/runtime/createLog.d.ts

@@ -1,4 +1,4 @@
 import type { ConsolaInstance, ConsolaOptions } from 'consola';
-import type { LogLevel } from '../types/module.js';
+import type { LogLevel } from '../index.js';
 import { Log } from '@scayle/storefront-core';
 export default function createLog(createConsola: (options?: Partial<ConsolaOptions>) => ConsolaInstance, space: string | undefined, level: LogLevel): Log;

package/dist/runtime/error/handler.d.ts

@@ -1,5 +1,5 @@
 declare const resolveError: (error: Error | unknown) => {
-    statusCode: 100 | 101 | 102 | 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 | 226 | 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451 | 500 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 510 | 511;
+    statusCode: 100 | 101 | 102 | 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 | 226 | 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451 | 500 | 501 | 502 | 503 | 504 | 506 | 507 | 508 | 510 | 511 | 306 | 505;
     statusMessage: string;
     name: string;
 };

package/dist/runtime/error/handler.js

@@ -1,10 +1,4 @@
-import {
-  BAPIError,
-  BaseError,
-  HttpStatusCode,
-  HttpStatusMessage,
-  BAPIFetchError
-} from "@scayle/storefront-core";
+import { HttpStatusCode, HttpStatusMessage } from "@scayle/storefront-core";
 import { FetchError } from "ofetch";
 const parseErrorData = (error) => {
   if (error instanceof FetchError) {
@@ -15,27 +9,6 @@ const parseErrorData = (error) => {
       url
     };
   }
-  if (error instanceof BAPIFetchError) {
-    const url = error.response.url;
-    return {
-      statusCode: error.response.status ?? HttpStatusCode.INTERNAL_SERVER_ERROR,
-      statusMessage: error.response.statusText ?? HttpStatusMessage.INTERNAL_SERVER_ERROR,
-      url
-    };
-  }
-  if (error instanceof BAPIError) {
-    return {
-      statusCode: error.statusCode ?? HttpStatusCode.INTERNAL_SERVER_ERROR,
-      statusMessage: error.message ?? HttpStatusMessage.INTERNAL_SERVER_ERROR,
-      url: error.url
-    };
-  }
-  if (error instanceof BaseError) {
-    return {
-      statusCode: error.statusCode ?? HttpStatusCode.INTERNAL_SERVER_ERROR,
-      statusMessage: error.message ?? HttpStatusMessage.INTERNAL_SERVER_ERROR
-    };
-  }
   if (error instanceof Error) {
     return {
       statusCode: HttpStatusCode.INTERNAL_SERVER_ERROR,

package/dist/runtime/nitro/plugins/nitroRuntimeStorageConfig.js

@@ -33,107 +33,19 @@ function mountStorage(storage, options) {
     }
   }
 }
-function transformLegacyConfig(provider = "redis", mode, log, redis, shopId = void 0) {
-  log.warn(
-    `${shopId ? "Shop " + shopId + " Storage" : "Global Storage"}: Using legacy storage config for ${mode}. The \`provider\` and \`redis\` options are deprecated.`
-  );
-  return {
-    driver: provider,
-    ...redis,
-    // For backwards compatability. Sessions previously used a hardcoded db 1 for sessions
-    ...mode === "session" ? { db: 1 } : {}
-  };
-}
-function getCacheConfig(config, log) {
-  if (config.storefront.storage?.cache) {
-    return config.storefront.storage?.cache;
-  }
-  if (!config.storefront.cache?.provider && !config.storefront?.redis) {
-    log.error(
-      `Failed to initialize global cache storage configuration. Neither new 'storefront.storage.cache' option nor legacy 'storefront.cache.provider' is set.`
-    );
-    return void 0;
-  }
-  return transformLegacyConfig(
-    config.storefront.cache?.provider,
-    "cache",
-    log,
-    config.storefront?.redis ?? {}
-  );
-}
-function getSessionConfig(config, log) {
-  if (config.storefront.storage?.session) {
-    return config.storefront.storage?.session;
-  }
-  if (!config.storefront.session?.provider && !config.storefront?.redis) {
-    log.error(
-      `Failed to initialize global session storage configuration. Neither new 'storefront.storage.session' option nor legacy 'storefront.session.provider' is set.`
-    );
-    return void 0;
-  }
-  return transformLegacyConfig(
-    config.storefront.session?.provider,
-    "session",
-    log,
-    config.storefront?.redis ?? {}
-  );
-}
-function getShopCacheConfig(config, shop, log) {
-  const storageConfig = shop.storage?.cache ?? config.storefront.storage?.cache;
-  if (storageConfig) {
-    return storageConfig;
-  }
-  const cacheProvider = config.storefront.cache?.provider;
-  const useLegacyShopConfig = !!cacheProvider || !!shop.redis || !!config.storefront.redis;
-  if (!useLegacyShopConfig) {
-    log.error(
-      `Failed to initialize shop ${shop.shopId} cache storage configuration. Neither new 'storefront.storage.session' option nor legacy 'storefront.session.provider' is set.`
-    );
-    return void 0;
-  }
-  return transformLegacyConfig(
-    cacheProvider,
-    "cache",
-    log,
-    shop.redis ?? config.storefront.redis ?? {},
-    shop.shopId
-  );
-}
-function getShopSessionConfig(config, shop, log) {
-  const storageConfig = shop.storage?.session ?? config.storefront.storage?.session;
-  if (storageConfig) {
-    return storageConfig;
-  }
-  const sessionProvider = shop.sessionConfig?.provider ?? config.storefront.session?.provider;
-  const useLegacyShopConfig = !!sessionProvider || !!shop.redis || !!config.storefront.redis;
-  if (!useLegacyShopConfig) {
-    log.error(
-      `Failed to initialize shop ${shop.shopId} session storage configuration. Neither new 'storefront.storage.session' option nor legacy 'storefront.session.provider' is set.`
-    );
-    return void 0;
-  }
-  return transformLegacyConfig(
-    sessionProvider,
-    "session",
-    log,
-    shop.redis ?? config.storefront.redis ?? {},
-    shop.shopId
-  );
-}
 export default defineNitroPlugin(() => {
   const storage = useStorage();
   const config = useRuntimeConfig();
-  const storefront = config.storefront;
+  const { shops } = config.storefront;
   const logConfig = config.public.storefront.log;
   const log = createLog(createConsola, logConfig.name, logConfig.level);
-  const shops = "shops" in storefront ? storefront.shops : storefront.stores;
   try {
-    const globalCacheConfig = getCacheConfig(config, log);
+    const globalCacheConfig = config.storefront.storage?.cache;
     mountStorage(storage, {
       base: STORAGE_MOUNT_CACHE,
       config: globalCacheConfig
     });
-    const globalSessionConfig = getSessionConfig(config, log);
+    const globalSessionConfig = config.storefront.storage?.session;
     mountStorage(storage, {
       base: STORAGE_MOUNT_SESSION,
       config: globalSessionConfig
@@ -141,14 +53,14 @@ export default defineNitroPlugin(() => {
     for (const shop of Object.values(shops)) {
       const shopCacheMount = `${STORAGE_MOUNT_CACHE}:${shop.shopId}`;
       const shopSessionMount = `${STORAGE_MOUNT_SESSION}:${shop.shopId}`;
-      const cacheConfig = getShopCacheConfig(config, shop, log);
+      const cacheConfig = shop.storage?.cache ?? config.storefront.storage?.cache;
       if (cacheConfig) {
         mountStorage(storage, {
           base: shopCacheMount,
           config: cacheConfig
         });
       }
-      const sessionConfig = getShopSessionConfig(config, shop, log);
+      const sessionConfig = shop.storage?.session ?? config.storefront.storage?.session;
       if (sessionConfig) {
         mountStorage(storage, {
           base: shopSessionMount,

package/dist/runtime/plugin/shop.d.ts

@@ -1,8 +1,8 @@
 declare const _default: import("nuxt/app").Plugin<{
-    currentShop: import("../../module").PublicShopConfig;
-    availableShops: import("../../module").PublicShopConfig[];
+    currentShop: import("../..").PublicShopConfig;
+    availableShops: import("../..").PublicShopConfig[];
 }> & import("nuxt/app").ObjectPlugin<{
-    currentShop: import("../../module").PublicShopConfig;
-    availableShops: import("../../module").PublicShopConfig[];
+    currentShop: import("../..").PublicShopConfig;
+    availableShops: import("../..").PublicShopConfig[];
 }>;
 export default _default;

package/dist/runtime/rpc/rpcCall.d.ts

@@ -1,6 +1,6 @@
 import type { RpcContext, RpcMethodName, RpcMethodParameters, RpcMethodReturnType } from '@scayle/storefront-core';
 import type { NuxtApp } from 'nuxt/app';
-import type { PublicShopConfig } from '../../types/module.js';
+import type { PublicShopConfig } from '../../index.js';
 /**
  * rpcCall can be used to invoke an RPC method either on the client or server
  * It makes an HTTP request on the client and direct call on the server using $fetch

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

@@ -9,11 +9,7 @@ export declare function getBootstrapPath(event: H3Event): 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, shop: ShopConfig, baseUrl: string): string;
-export declare function getCurrentShopConfigForRequest(event: H3Event, storefrontConfig: Pick<Extract<ModuleBaseOptions, {
-    shops: ShopConfigIndexed;
-}>, 'shops' | 'shopSelector'> | Pick<Extract<ModuleBaseOptions, {
-    stores: ShopConfigIndexed;
-}>, 'stores' | 'shopSelector'>, runtimeConfig: NitroRuntimeConfigApp): ShopConfig | undefined;
+export declare function getCurrentShopConfigForRequest(event: H3Event, storefrontConfig: Pick<ModuleBaseOptions, 'shops' | 'shopSelector'>, runtimeConfig: NitroRuntimeConfigApp): 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.js

@@ -48,10 +48,8 @@ export function getApiBasePath(storefrontConfig, shop, baseUrl) {
 }
 export function getCurrentShopConfigForRequest(event, storefrontConfig, runtimeConfig) {
   let $shopConfig;
-  const { shopSelector } = storefrontConfig;
-  const shopsList = convertShopsToList(
-    "shops" in storefrontConfig ? storefrontConfig.shops : storefrontConfig.stores
-  );
+  const { shopSelector, shops } = storefrontConfig;
+  const shopsList = convertShopsToList(shops);
   const headers = getRequestHeaders(event);
   const shopId = headers["x-shop-id"];
   if (shopId) {

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

@@ -70,12 +70,12 @@ async function bootstrap(event, $shopConfig, $storefrontConfig, apiBasePath, con
     try {
       const cookieName = sessionConfig?.cookieName ?? "$session";
       const secret = sessionConfig?.secret ?? "current-secret";
-      const oldSessionData = await getOldSessionData(
+      const oldSessionData = $storefrontConfig.legacy?.enableSessionMigration ? await getOldSessionData(
         event,
         cookieName,
         sessionStorage,
         secret
-      );
+      ) : void 0;
       await useSession(event, {
         ...sessionConfig,
         store: sessionStorage,
@@ -112,9 +112,7 @@ async function bootstrap(event, $shopConfig, $storefrontConfig, apiBasePath, con
     apiBasePath,
     $storefrontConfig.publicShopData
   );
-  event.context.$availableShops = convertShopsToList(
-    "shops" in $storefrontConfig ? $storefrontConfig.shops : $storefrontConfig.stores
-  ).filter((store) => store.isEnabled !== false).map(
+  event.context.$availableShops = convertShopsToList($storefrontConfig.shops).filter((store) => store.isEnabled !== false).map(
     (config2) => getPublicShopData(
       config2,
       $shopConfig.shopId,

package/dist/runtime/server/utils/cacheStorage.d.ts

@@ -1,7 +1,7 @@
 import type { Log } from '@scayle/storefront-core';
 import { UnstorageCache } from '@scayle/storefront-core/dist/cache/providers/unstorage';
 import { type SessionStore } from '@scayle/h3-session';
-import type { SessionConfig } from '../../../types/module.js';
+import type { SessionConfig } from '../../../index.js';
 export declare const STORAGE_MOUNT_BASE = "storefront";
 export declare const STORAGE_MOUNT_CACHE = "storefront-cache";
 export declare const STORAGE_MOUNT_SESSION = "storefront-session";

package/dist/runtime/server/utils/cacheStorage.js

@@ -1,11 +1,11 @@
 import { UnstorageCache } from "@scayle/storefront-core/dist/cache/providers/unstorage";
 import { UnstorageSessionStore } from "@scayle/h3-session";
-import { useStorage } from "#imports";
+import { useStorage } from "nitropack/runtime/storage";
 export const STORAGE_MOUNT_BASE = "storefront";
 export const STORAGE_MOUNT_CACHE = `${STORAGE_MOUNT_BASE}-cache`;
 export const STORAGE_MOUNT_SESSION = `${STORAGE_MOUNT_BASE}-session`;
 function checkInMemoryProviderAndShowWarning(provider, mountpoint, log) {
-  if (provider !== "memory") {
+  if (!provider || provider !== "memory") {
     return;
   }
   log.warn(