@scayle/storefront-nuxt 7.41.0 → 7.42.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @scayle/storefront-nuxt
 
+## 7.42.1
+
+### Patch Changes
+
+- Ensure useNuxtApp is only called from a composable context
+
+## 7.42.0
+
+### Minor Changes
+
+- Unify Storefront Core cache handling using the [Nitro Storage Layer - Mountpoints](https://www.nitropack.org/guide/storage#mountpoints)
+
+  This release changes how cache and session storage is managed in Storefront Core. Storefront Core will now use the `storefront-cache` mountpoint as the root for its cache storage, and `storefront-session` for sessions storage. These can be manually configured through Nitro, but Storefront Core also now includes `storefront.storage.cache` and `storefront.storage.session` config options to automatically create these mountpoints.
+
+  `storefront.storage.cache` is used to configure the primary global cache storage mounted under `storefront-cache`. If not configured, a dedicated memory driver is used.
+
+  `storefront.storage.session` is used to configure the global session storage mounted under `storefront-session`. If not configured, a dedicated memory driver is used.
+
+  The config options `storefront.redis`, `storefront.stores[X].redis`, `storefront.session.provider` and `storefront.cache.provider` have been deprecated in favor of the new `storage` config. In a future version, they will be replaced.
+
+### Patch Changes
+
+- Update to Nuxt `v3.8.2` (See [Nuxt v3.8.2 Release notes](https://github.com/nuxt/nuxt/releases/tag/v3.8.2) for details.)
+
 ## 7.41.0
 
 ### Minor Changes

package/dist/index.d.mts

@@ -1,7 +1,8 @@
-export { e as AdditionalShopConfig, A as AppKeys, d as AuthenticationConfig, B as BapiConfig, b as CacheConfig, i as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, O as OauthConfig, P as PublicShopConfig, c as RedirectsConfig, R as RedisConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.1cbf9601.mjs';
+export { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.180408c8.mjs';
 export { rpcCall } from './rpc.mjs';
 export * from '@scayle/storefront-core';
 export { LogLevel } from '@scayle/storefront-core';
+import 'unstorage';
 import 'nuxt/app';
 
 interface RpcMethodsStorefront {

package/dist/index.d.ts

@@ -1,7 +1,8 @@
-export { e as AdditionalShopConfig, A as AppKeys, d as AuthenticationConfig, B as BapiConfig, b as CacheConfig, i as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, O as OauthConfig, P as PublicShopConfig, c as RedirectsConfig, R as RedisConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.1cbf9601.js';
+export { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, M as ModuleOptions, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.180408c8.js';
 export { rpcCall } from './rpc.js';
 export * from '@scayle/storefront-core';
 export { LogLevel } from '@scayle/storefront-core';
+import 'unstorage';
 import 'nuxt/app';
 
 interface RpcMethodsStorefront {

package/dist/module.d.mts

@@ -1,7 +1,8 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { M as ModuleOptions } from './shared/storefront-nuxt.1cbf9601.mjs';
-export { e as AdditionalShopConfig, A as AppKeys, d as AuthenticationConfig, B as BapiConfig, b as CacheConfig, i as CheckoutEvent, C as CheckoutShopConfig, O as OauthConfig, P as PublicShopConfig, c as RedirectsConfig, R as RedisConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.1cbf9601.mjs';
+import { M as ModuleOptions } from './shared/storefront-nuxt.180408c8.mjs';
+export { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.180408c8.mjs';
 export { LogLevel } from '@scayle/storefront-core';
+import 'unstorage';
 
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 

package/dist/module.d.ts

@@ -1,7 +1,8 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { M as ModuleOptions } from './shared/storefront-nuxt.1cbf9601.js';
-export { e as AdditionalShopConfig, A as AppKeys, d as AuthenticationConfig, B as BapiConfig, b as CacheConfig, i as CheckoutEvent, C as CheckoutShopConfig, O as OauthConfig, P as PublicShopConfig, c as RedirectsConfig, R as RedisConfig, a as SessionConfig, f as ShopConfig, g as ShopConfigIndexed, S as StorageProvider, h as StorefrontConfig } from './shared/storefront-nuxt.1cbf9601.js';
+import { M as ModuleOptions } from './shared/storefront-nuxt.180408c8.js';
+export { g as AdditionalShopConfig, A as AppKeys, f as AuthenticationConfig, B as BapiConfig, b as CacheConfig, k as CheckoutEvent, C as CheckoutShopConfig, O as OauthConfig, P as PublicShopConfig, e as RedirectsConfig, R as RedisConfig, a as SessionConfig, h as ShopConfig, i as ShopConfigIndexed, d as StorageConfig, c as StorageEntity, S as StorageProvider, j as StorefrontConfig } from './shared/storefront-nuxt.180408c8.js';
 export { LogLevel } from '@scayle/storefront-core';
+import 'unstorage';
 
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.7.0"
   },
-  "version": "7.40.6"
+  "version": "7.42.0"
 }

package/dist/module.mjs

@@ -28,10 +28,6 @@ const module = defineNuxtModule({
       host: "https://bapi.scayle.cloud/",
       token: ""
     },
-    redis: {
-      port: 6379,
-      host: "localhost"
-    },
     shopSelector: "domain",
     stores: {},
     log: {
@@ -146,6 +142,9 @@ const module = defineNuxtModule({
     nuxt.hook("prepare:types", ({ references }) => {
       references.push({ path: template.dst });
     });
+    addServerPlugin(
+      resolve("./runtime/nitro/plugins/nitroRuntimeStorageConfig")
+    );
     addServerPlugin(resolve("./runtime/nitro/plugins/nitroSetXPoweredByHeader"));
     nuxt.hooks.hook("nitro:config", (nitroConfig) => {
       nitroConfig.externals = nitroConfig.externals || {};
@@ -162,6 +161,8 @@ const module = defineNuxtModule({
         "server/middleware/oauth",
         "server/middleware/redirects",
         "server/middleware/cache",
+        "server/utils/cacheStorage",
+        "nitro/plugins/nitroRuntimeStorageConfig",
         "nitro/plugins/nitroSetXPoweredByHeader"
       ];
       runtimePaths.forEach((path) => {

package/dist/rpc.d.mts

@@ -1,6 +1,7 @@
 import { RpcMethodName, RpcMethodParameters, RpcMethodReturnType, RpcContext } from '@scayle/storefront-core';
 import { NuxtApp } from 'nuxt/app';
-import { P as PublicShopConfig } from './shared/storefront-nuxt.1cbf9601.mjs';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.180408c8.mjs';
+import 'unstorage';
 
 /**
  * rpcCall can be used to invoke an RPC method either on the client or server

package/dist/rpc.d.ts

@@ -1,6 +1,7 @@
 import { RpcMethodName, RpcMethodParameters, RpcMethodReturnType, RpcContext } from '@scayle/storefront-core';
 import { NuxtApp } from 'nuxt/app';
-import { P as PublicShopConfig } from './shared/storefront-nuxt.1cbf9601.js';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.180408c8.js';
+import 'unstorage';
 
 /**
  * rpcCall can be used to invoke an RPC method either on the client or server

package/dist/runtime/composables/core/useRpc.mjs

@@ -13,6 +13,7 @@ function getFetch(nuxtApp, log) {
 export const useRpc = async (method, key, params, options = { autoFetch: true, lazy: false }) => {
   const currentShop = useCurrentShop();
   const log = useCoreLog("rpc");
+  const nuxtApp = useNuxtApp();
   const isAutoFetchEnabled = options?.autoFetch ?? true;
   log.debug(`useRpc: ${method}`);
   const data = useState(`${method}-${key}-data`);
@@ -27,7 +28,7 @@ export const useRpc = async (method, key, params, options = { autoFetch: true, l
       status.value = "pending";
       fetching.value = true;
       const apiBasePath = currentShop.value?.apiBasePath ?? "/api";
-      const fetch2 = getFetch(useNuxtApp(), log);
+      const fetch2 = getFetch(nuxtApp, log);
       data.value = await fetch2(`/rpc/${method}`, {
         // @ts-ignore
         method: "POST",

package/dist/runtime/composables/storefront/useSearch.mjs

@@ -6,6 +6,7 @@ export const useSearch = ({ params, key = "search" } = {}) => {
     `${key}-data`,
     () => void 0
   );
+  const nuxtApp = useNuxtApp();
   const searchQuery = useState(`${key}-searchQuery`, () => "");
   const pending = useState(`${key}-pending`, () => false);
   const error = useState(`${key}-error`, () => void 0);
@@ -19,7 +20,7 @@ export const useSearch = ({ params, key = "search" } = {}) => {
     }
     try {
       data.value = await rpcCall(
-        useNuxtApp(),
+        nuxtApp,
         "searchProducts",
         toValue(shop)
       )({

package/dist/runtime/nitro/plugins/nitroRuntimeStorageConfig.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

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

@@ -0,0 +1,159 @@
+import memoryDriver from "unstorage/drivers/memory";
+import { builtinDrivers } from "unstorage";
+import { createConsola } from "consola";
+import {
+  STORAGE_MOUNT_CACHE,
+  STORAGE_MOUNT_SESSION
+} from "../../server/utils/cacheStorage.mjs";
+import createLog from "../../createLog.mjs";
+import { defineNitroPlugin, useRuntimeConfig, useStorage } from "#imports";
+async function createMountDriver(options) {
+  if (options?.driver) {
+    const driver = await import(
+      // @ts-ignore
+      builtinDrivers[options.driver] || options.driver
+    ).then((r) => r.default || r);
+    return driver(options ?? {});
+  }
+  return memoryDriver();
+}
+async function mountStorage(storage, options) {
+  const { config, base } = options;
+  const mounts = storage.getMounts().map((existingMount) => existingMount.base.replace(":", ""));
+  if (!mounts.includes(base)) {
+    if (config) {
+      storage.mount(base, await createMountDriver(config));
+    } else {
+      storage.mount(base, await createMountDriver());
+    }
+  }
+}
+function transformLegacyConfig(provider = "memory", 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 {};
+  }
+  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 {};
+  }
+  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 {};
+  }
+  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 {};
+  }
+  return transformLegacyConfig(
+    sessionProvider,
+    "session",
+    log,
+    shop.redis ?? config.storefront.redis ?? {},
+    shop.shopId
+  );
+}
+export default defineNitroPlugin(async () => {
+  const storage = useStorage();
+  const config = useRuntimeConfig();
+  const log = createLog(
+    createConsola,
+    config.storefront.log.name,
+    config.storefront.log.level
+  );
+  const shops = config.storefront.stores;
+  try {
+    const globalCacheConfig = getCacheConfig(config, log);
+    await mountStorage(storage, {
+      base: STORAGE_MOUNT_CACHE,
+      config: globalCacheConfig
+    });
+    const globalSessionConfig = getSessionConfig(config, log);
+    await mountStorage(storage, {
+      base: STORAGE_MOUNT_SESSION,
+      config: globalSessionConfig
+    });
+    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);
+      if (cacheConfig) {
+        await mountStorage(storage, {
+          base: shopCacheMount,
+          config: cacheConfig
+        });
+      }
+      const sessionConfig = getShopSessionConfig(config, shop, log);
+      if (sessionConfig) {
+        await mountStorage(storage, {
+          base: shopSessionMount,
+          config: sessionConfig
+        });
+      }
+    }
+  } catch (error) {
+    log.error("Unable to create required cache driver during startup.", error);
+  }
+});

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

@@ -2,12 +2,10 @@ import { defineEventHandler, getRequestURL } from "h3";
 import { createConsola } from "consola";
 import { createRemoteJWKSet, decodeJwt } from "jose";
 import { randomUUID } from "uncrypto";
-import redisDriver from "unstorage/drivers/redis";
-import memoryDriver from "unstorage/drivers/memory";
-import { createStorage } from "unstorage";
-import { useSession, UnstorageSessionStore } from "@scayle/h3-session";
+import { useSession } from "@scayle/h3-session";
 import { buildContext } from "../../context.mjs";
 import createLog from "../../createLog.mjs";
+import { useCacheStorage, useSessionStorage } from "../utils/cacheStorage.mjs";
 import {
   convertStoresToList,
   getCurrentShopForRequest,
@@ -15,7 +13,6 @@ import {
 } from "./bootstrap.utils.mjs";
 import { useOauth } from "./oauth.mjs";
 import { useRedirects } from "./redirects.mjs";
-import { createCache } from "./cache.mjs";
 import { useRuntimeConfig } from "#imports";
 const getShopConfig = (event, config) => {
   const storefrontConfig = config.storefront;
@@ -25,41 +22,6 @@ const getShopConfig = (event, config) => {
   );
   return $shopConfig;
 };
-const memoryStorage = memoryDriver();
-function createSessionStore(sessionConfig, redisConfig, log) {
-  const ioredisConfig = {
-    ..."user" in redisConfig && {
-      username: redisConfig.user
-    },
-    ..."password" in redisConfig && {
-      password: redisConfig.password
-    },
-    host: redisConfig.host,
-    port: redisConfig.port,
-    db: 1,
-    tls: redisConfig.sslTransit ? {} : void 0
-  };
-  if (sessionConfig.provider === "memory") {
-    log.warn("Creating in-memory session storage");
-    log.warn("In-memory storage should not be used in production");
-    return new UnstorageSessionStore(
-      createStorage({
-        driver: memoryStorage
-      })
-    );
-  }
-  log.debug(
-    `Creating redis session storage. host: ${ioredisConfig.host} port: ${ioredisConfig.port} db: ${ioredisConfig.db} tls: ${ioredisConfig.tls}`
-  );
-  return new UnstorageSessionStore(
-    createStorage({
-      driver: redisDriver(ioredisConfig)
-    }),
-    {
-      ttl: sessionConfig?.maxAge ?? 60 * 60 * 24
-    }
-  );
-}
 async function handleOauth(event, storefrontConfig, log) {
   if (!storefrontConfig.oauth.apiHost) {
     log.error("oauth.apiHost must be set in the module options.");
@@ -83,12 +45,10 @@ async function handleOauth(event, storefrontConfig, log) {
 async function bootstrap(event, log, url, $shopConfig, $storefrontConfig, apiBasePath, config) {
   const bootstrapLog = log.space("bootstrap");
   bootstrapLog.debug("Bootstrapping request: ", url.toString());
-  const redisConfig = $shopConfig.redis ?? $storefrontConfig.redis;
-  const $cache = createCache(
-    $storefrontConfig.cache?.provider ?? "redis",
+  const $cache = useCacheStorage(
     String($shopConfig.shopId),
-    bootstrapLog,
-    { redis: redisConfig }
+    $shopConfig.shopId,
+    bootstrapLog
   );
   const sessionDefaults = {
     maxAge: void 0,
@@ -101,7 +61,11 @@ async function bootstrap(event, log, url, $shopConfig, $storefrontConfig, apiBas
     ...$storefrontConfig.session,
     ...$shopConfig.sessionConfig
   };
-  const sessionStorage = createSessionStore(sessionConfig, redisConfig, log);
+  const sessionStorage = useSessionStorage(
+    sessionConfig,
+    $shopConfig.shopId,
+    log
+  );
   const generateSessionId = (event2) => {
     let userId;
     if (event2?.context.session?.data?.accessToken) {

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

@@ -0,0 +1,21 @@
+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';
+export declare const STORAGE_MOUNT_BASE = "storefront";
+export declare const STORAGE_MOUNT_CACHE = "storefront-cache";
+export declare const STORAGE_MOUNT_SESSION = "storefront-session";
+/**
+ * Create an unstorage-backed cache interface
+ * @param prefix
+ * @param shopId
+ * @param log
+ */
+export declare function useCacheStorage(prefix: string, shopId: number, log: Log): UnstorageCache;
+/**
+ * Create an unstorage-backed session cache interface
+ * @param sessionConfig
+ * @param shopId
+ * @param log
+ */
+export declare function useSessionStorage(sessionConfig: SessionConfig, shopId: number, log: Log): SessionStore;

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

@@ -0,0 +1,37 @@
+import { UnstorageCache } from "@scayle/storefront-core/dist/cache/providers/unstorage";
+import { UnstorageSessionStore } from "@scayle/h3-session";
+import { useStorage } from "#imports";
+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") {
+    return;
+  }
+  log.warn(
+    `Using in-memory cache for mountpoint ${mountpoint}. In-memory storage should not be used in production`
+  );
+}
+export function useCacheStorage(prefix, shopId, log) {
+  const storageBase = STORAGE_MOUNT_CACHE;
+  const mountPoint = `${storageBase}:${shopId}`;
+  const storage = useStorage(mountPoint);
+  const provider = storage.getMount(mountPoint)?.driver.name;
+  checkInMemoryProviderAndShowWarning(provider, mountPoint, log);
+  log.debug(
+    `Using '${provider}' on mount '${mountPoint}' as cache storage driver`
+  );
+  return new UnstorageCache(storage, prefix);
+}
+export function useSessionStorage(sessionConfig, shopId, log) {
+  const storageBase = STORAGE_MOUNT_SESSION;
+  const mountPoint = `${storageBase}:${shopId}`;
+  const storage = useStorage(mountPoint);
+  const provider = storage.getMount(mountPoint)?.driver.name;
+  const ttl = sessionConfig?.maxAge ?? 60 * 60 * 24;
+  checkInMemoryProviderAndShowWarning(provider, mountPoint, log);
+  log.debug(
+    `Using '${provider}' on mount '${mountPoint}' as session storage driver`
+  );
+  return new UnstorageSessionStore(storage, { ttl });
+}

package/dist/shared/{storefront-nuxt.1cbf9601.d.mts → storefront-nuxt.180408c8.d.mts}

@@ -1,4 +1,5 @@
 import { LogLevel, HashAlgorithm, WithParams, ShopUser } from '@scayle/storefront-core';
+import { BuiltinDriverName, BuiltinDriverOptions } from 'unstorage';
 
 type StorageProvider = 'memory' | 'redis';
 type CheckoutShopConfig = {
@@ -38,18 +39,22 @@ type SessionConfig = Partial<{
     domain: string;
     /**
      * The provider to use for the persistent storage.
+     * @deprecated Storefront Core is now relying on a unified cache configuration. Use the storage option instead.
      */
-    provider: StorageProvider;
+    provider?: StorageProvider;
 }>;
 interface CacheConfig {
+    /** @deprecated Storefront Core is now relying on a unified cache configuration. Use the storage option instead. */
     provider?: StorageProvider;
     auth?: {
         username: string;
         password: string;
     };
-    ssr?: {};
     enabled?: boolean;
 }
+/**
+ * @deprecated
+ */
 type RedisConfig = {
     port?: number;
     host?: string;
@@ -63,6 +68,16 @@ type RedisConfig = {
     user: string;
     password: string;
 };
+type CustomDriverName = string & {
+    _custom?: any;
+};
+type StorageEntity<Driver extends BuiltinDriverName | CustomDriverName = any, DriverOptions = Driver extends keyof BuiltinDriverOptions ? BuiltinDriverOptions[Driver] : any> = {
+    driver: Driver;
+} & DriverOptions;
+interface StorageConfig {
+    cache?: StorageEntity;
+    session?: StorageEntity;
+}
 interface BapiConfig {
     host: string;
     token: string;
@@ -104,9 +119,11 @@ interface ShopConfig extends AdditionalShopConfig {
     auth: {
         resetPasswordUrl: string;
     };
+    /** @deprecated shop-specific storefront.redis config is being removed in favor of global nitro.storage config */
     redis?: RedisConfig;
     bapi?: BapiConfig;
     appKeys?: AppKeys;
+    storage?: StorageConfig;
 }
 type ShopConfigIndexed = Record<string, ShopConfig>;
 interface PublicShopConfig extends Pick<ShopConfig, 'shopId' | 'domain' | 'path' | 'locale' | 'currency' | 'currencyFractionDigits'> {
@@ -116,7 +133,9 @@ interface PublicShopConfig extends Pick<ShopConfig, 'shopId' | 'domain' | 'path'
 interface StorefrontConfig {
     session?: SessionConfig;
     bapi: BapiConfig;
-    redis: RedisConfig;
+    /** @deprecated Global storefront.redis config is being removed in favor of `storefront.storage` config */
+    redis?: RedisConfig;
+    storage?: StorageConfig;
     auth: AuthenticationConfig;
     oauth: OauthConfig;
     appKeys: AppKeys;
@@ -160,4 +179,4 @@ declare module '@nuxt/schema' {
     }
 }
 
-export type { AppKeys as A, BapiConfig as B, CheckoutShopConfig as C, ModuleOptions as M, OauthConfig as O, PublicShopConfig as P, RedisConfig as R, StorageProvider as S, SessionConfig as a, CacheConfig as b, RedirectsConfig as c, AuthenticationConfig as d, AdditionalShopConfig as e, ShopConfig as f, ShopConfigIndexed as g, StorefrontConfig as h, CheckoutEvent as i };
+export type { AppKeys as A, BapiConfig as B, CheckoutShopConfig as C, ModuleOptions as M, OauthConfig as O, PublicShopConfig as P, RedisConfig as R, StorageProvider as S, SessionConfig as a, CacheConfig as b, StorageEntity as c, StorageConfig as d, RedirectsConfig as e, AuthenticationConfig as f, AdditionalShopConfig as g, ShopConfig as h, ShopConfigIndexed as i, StorefrontConfig as j, CheckoutEvent as k };

package/dist/shared/{storefront-nuxt.1cbf9601.d.ts → storefront-nuxt.180408c8.d.ts}

@@ -1,4 +1,5 @@
 import { LogLevel, HashAlgorithm, WithParams, ShopUser } from '@scayle/storefront-core';
+import { BuiltinDriverName, BuiltinDriverOptions } from 'unstorage';
 
 type StorageProvider = 'memory' | 'redis';
 type CheckoutShopConfig = {
@@ -38,18 +39,22 @@ type SessionConfig = Partial<{
     domain: string;
     /**
      * The provider to use for the persistent storage.
+     * @deprecated Storefront Core is now relying on a unified cache configuration. Use the storage option instead.
      */
-    provider: StorageProvider;
+    provider?: StorageProvider;
 }>;
 interface CacheConfig {
+    /** @deprecated Storefront Core is now relying on a unified cache configuration. Use the storage option instead. */
     provider?: StorageProvider;
     auth?: {
         username: string;
         password: string;
     };
-    ssr?: {};
     enabled?: boolean;
 }
+/**
+ * @deprecated
+ */
 type RedisConfig = {
     port?: number;
     host?: string;
@@ -63,6 +68,16 @@ type RedisConfig = {
     user: string;
     password: string;
 };
+type CustomDriverName = string & {
+    _custom?: any;
+};
+type StorageEntity<Driver extends BuiltinDriverName | CustomDriverName = any, DriverOptions = Driver extends keyof BuiltinDriverOptions ? BuiltinDriverOptions[Driver] : any> = {
+    driver: Driver;
+} & DriverOptions;
+interface StorageConfig {
+    cache?: StorageEntity;
+    session?: StorageEntity;
+}
 interface BapiConfig {
     host: string;
     token: string;
@@ -104,9 +119,11 @@ interface ShopConfig extends AdditionalShopConfig {
     auth: {
         resetPasswordUrl: string;
     };
+    /** @deprecated shop-specific storefront.redis config is being removed in favor of global nitro.storage config */
     redis?: RedisConfig;
     bapi?: BapiConfig;
     appKeys?: AppKeys;
+    storage?: StorageConfig;
 }
 type ShopConfigIndexed = Record<string, ShopConfig>;
 interface PublicShopConfig extends Pick<ShopConfig, 'shopId' | 'domain' | 'path' | 'locale' | 'currency' | 'currencyFractionDigits'> {
@@ -116,7 +133,9 @@ interface PublicShopConfig extends Pick<ShopConfig, 'shopId' | 'domain' | 'path'
 interface StorefrontConfig {
     session?: SessionConfig;
     bapi: BapiConfig;
-    redis: RedisConfig;
+    /** @deprecated Global storefront.redis config is being removed in favor of `storefront.storage` config */
+    redis?: RedisConfig;
+    storage?: StorageConfig;
     auth: AuthenticationConfig;
     oauth: OauthConfig;
     appKeys: AppKeys;
@@ -160,4 +179,4 @@ declare module '@nuxt/schema' {
     }
 }
 
-export type { AppKeys as A, BapiConfig as B, CheckoutShopConfig as C, ModuleOptions as M, OauthConfig as O, PublicShopConfig as P, RedisConfig as R, StorageProvider as S, SessionConfig as a, CacheConfig as b, RedirectsConfig as c, AuthenticationConfig as d, AdditionalShopConfig as e, ShopConfig as f, ShopConfigIndexed as g, StorefrontConfig as h, CheckoutEvent as i };
+export type { AppKeys as A, BapiConfig as B, CheckoutShopConfig as C, ModuleOptions as M, OauthConfig as O, PublicShopConfig as P, RedisConfig as R, StorageProvider as S, SessionConfig as a, CacheConfig as b, StorageEntity as c, StorageConfig as d, RedirectsConfig as e, AuthenticationConfig as f, AdditionalShopConfig as g, ShopConfig as h, ShopConfigIndexed as i, StorefrontConfig as j, CheckoutEvent as k };

package/dist/types.d.mts

@@ -13,4 +13,4 @@ declare module 'nuxt/schema' {
 }
 
 
-export type { AdditionalShopConfig, AppKeys, AuthenticationConfig, BapiConfig, CacheConfig, CheckoutEvent, CheckoutShopConfig, OauthConfig, PublicShopConfig, RedirectsConfig, RedisConfig, SessionConfig, ShopConfig, ShopConfigIndexed, StorageProvider, StorefrontConfig } from './module'
+export type { AdditionalShopConfig, AppKeys, AuthenticationConfig, BapiConfig, CacheConfig, CheckoutEvent, CheckoutShopConfig, OauthConfig, PublicShopConfig, RedirectsConfig, RedisConfig, SessionConfig, ShopConfig, ShopConfigIndexed, StorageConfig, StorageEntity, StorageProvider, StorefrontConfig } from './module'

package/dist/types.d.ts

@@ -13,4 +13,4 @@ declare module 'nuxt/schema' {
 }
 
 
-export type { AdditionalShopConfig, AppKeys, AuthenticationConfig, BapiConfig, CacheConfig, CheckoutEvent, CheckoutShopConfig, OauthConfig, PublicShopConfig, RedirectsConfig, RedisConfig, SessionConfig, ShopConfig, ShopConfigIndexed, StorageProvider, StorefrontConfig } from './module'
+export type { AdditionalShopConfig, AppKeys, AuthenticationConfig, BapiConfig, CacheConfig, CheckoutEvent, CheckoutShopConfig, OauthConfig, PublicShopConfig, RedirectsConfig, RedisConfig, SessionConfig, ShopConfig, ShopConfigIndexed, StorageConfig, StorageEntity, StorageProvider, StorefrontConfig } from './module'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@scayle/storefront-nuxt",
   "type": "module",
-  "version": "7.41.0",
+  "version": "7.42.1",
   "description": "Nuxt integration for the SCAYLE Commerce Engine and Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -60,7 +60,7 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@nuxt/kit": "3.8.1",
+    "@nuxt/kit": "3.8.2",
     "@scayle/h3-session": "0.3.4",
     "@scayle/storefront-core": "7.28.1",
     "@vueuse/core": "10.6.1",
@@ -69,29 +69,29 @@
     "defu": "6.1.3",
     "h3": "1.9.0",
     "jose": "4.15.4",
-    "nitropack": "2.8.0",
+    "nitropack": "2.8.1",
     "ofetch": "1.3.3",
     "radash": "11.0.0",
     "uncrypto": "0.1.3",
+    "unstorage": "1.10.1",
     "vue-router": "4.2.5",
     "yn": "5.0.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "0.5.4",
-    "@nuxt/schema": "3.8.1",
+    "@nuxt/schema": "3.8.2",
     "@nuxt/test-utils": "3.8.1",
     "@scayle/eslint-config-storefront": "3.2.5",
     "@scayle/prettier-config-storefront": "2.0.2",
-    "@types/node": "20.10.0",
+    "@types/node": "20.10.1",
     "eslint": "8.54.0",
     "eslint-formatter-gitlab": "5.1.0",
     "node-mocks-http": "1.13.0",
-    "nuxt": "3.8.1",
+    "nuxt": "3.8.2",
     "prettier": "3.0.0",
     "publint": "0.2.5",
-    "unstorage": "1.10.1",
     "vitest": "0.34.6",
-    "vue-tsc": "1.8.22"
+    "vue-tsc": "1.8.24"
   },
   "peerDependencies": {
     "nuxt": ">=3.8.1",
@@ -99,16 +99,16 @@
     "vue": ">=3.3.0"
   },
   "resolutions": {
-    "@vue/compiler-core": "3.3.8",
-    "@vue/shared": "3.3.8",
-    "@vue/compiler-dom": "3.3.8",
-    "@vue/compiler-sfc": "3.3.8",
-    "@vue/compiler-ssr": "3.3.8",
-    "@vue/reactivity-transform": "3.3.8",
-    "@vue/reactivity": "3.3.8",
-    "@vue/runtime-core": "3.3.8",
-    "@vue/runtime-dom": "3.3.8",
-    "@vue/server-renderer": "3.3.8"
+    "@vue/compiler-core": "3.3.9",
+    "@vue/shared": "3.3.9",
+    "@vue/compiler-dom": "3.3.9",
+    "@vue/compiler-sfc": "3.3.9",
+    "@vue/compiler-ssr": "3.3.9",
+    "@vue/reactivity-transform": "3.3.9",
+    "@vue/reactivity": "3.3.9",
+    "@vue/runtime-core": "3.3.9",
+    "@vue/runtime-dom": "3.3.9",
+    "@vue/server-renderer": "3.3.9"
   },
   "volta": {
     "node": "20.10.0"

package/dist/runtime/server/middleware/cache.d.ts

@@ -1,13 +0,0 @@
-import type { Log } from '@scayle/storefront-core';
-import { UnstorageCache } from '@scayle/storefront-core/dist/cache/providers/unstorage';
-import type { RedisConfig, StorageProvider } from '../../../types/module';
-/**
- * Create an unstorage-backed cache interface
- * @param provider
- * @param prefix
- * @param log
- * @param options
- */
-export declare function createCache(provider: StorageProvider, prefix: string, log: Log, options?: {
-    redis?: RedisConfig;
-}): UnstorageCache;

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

@@ -1,44 +0,0 @@
-import redisDriver from "unstorage/drivers/redis";
-import memoryDriver from "unstorage/drivers/memory";
-import { UnstorageCache } from "@scayle/storefront-core/dist/cache/providers/unstorage";
-import { createStorage } from "unstorage";
-const memoryStorage = memoryDriver();
-export function createCache(provider, prefix, log, options) {
-  if (provider === "memory") {
-    log.warn("Creating in-memory redirect cache");
-    log.warn("In-memory storage should not be used in production");
-    return new UnstorageCache(
-      createStorage({
-        driver: memoryStorage
-      }),
-      prefix
-    );
-  }
-  if (provider === "redis") {
-    const redisConfig = options?.redis;
-    if (!redisConfig) {
-      throw Error("options.redis must be specified for the redis provider");
-    }
-    const ioredisConfig = {
-      ..."user" in redisConfig && {
-        username: redisConfig.user
-      },
-      ..."password" in redisConfig && {
-        password: redisConfig.password
-      },
-      host: redisConfig.host,
-      port: redisConfig.port,
-      tls: redisConfig.sslTransit ? {} : void 0
-    };
-    log.debug(
-      `Creating redis redirect cache. host: ${ioredisConfig.host} port: ${ioredisConfig.port} db: ${ioredisConfig.db} tls: ${ioredisConfig.tls}`
-    );
-    return new UnstorageCache(
-      createStorage({
-        driver: redisDriver(ioredisConfig)
-      }),
-      prefix
-    );
-  }
-  throw Error("Unknown cache provider");
-}