@scayle/storefront-nuxt 7.79.0 → 7.80.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @scayle/storefront-nuxt
 
+## 7.80.0
+
+### Minor Changes
+
+- Do not set session cookie for cached pages
+
+### Patch Changes
+
+- Updated to `nuxt@3.12.2`
+- Fix the the type off `publicShopData` in the config. This restores it to `(keyof ShopConfig)[]` instead of `string[]`, allowing its elements to be used to index a `ShopConfig`
+
+## 7.79.1
+
+### Patch Changes
+
+- Import `useNitroApp` from `#imports`
+
 ## 7.79.0
 
 ### Minor 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.2c3f3a8a.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.282cc1d9.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.2c3f3a8a.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.282cc1d9.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.2c3f3a8a.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.2c3f3a8a.mjs';
+import { M as ModuleBaseOptions } from './shared/storefront-nuxt.282cc1d9.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.282cc1d9.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.2c3f3a8a.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.2c3f3a8a.js';
+import { M as ModuleBaseOptions } from './shared/storefront-nuxt.282cc1d9.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.282cc1d9.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.78.1",
+  "version": "7.79.1",
   "configKey": "storefront",
   "compatibility": {
     "nuxt": "^3.9.0"

package/dist/module.mjs

@@ -65,7 +65,7 @@ export default {
 }`;
 }
 const PACKAGE_NAME = "@scayle/storefront-nuxt";
-const PACKAGE_VERSION = "7.78.1";
+const PACKAGE_VERSION = "7.79.1";
 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.2c3f3a8a.mjs';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.282cc1d9.mjs';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
 import 'zod';

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.2c3f3a8a.js';
+import { P as PublicShopConfig } from './shared/storefront-nuxt.282cc1d9.js';
 import '@scayle/unstorage-compression-driver';
 import 'unstorage';
 import 'zod';

package/dist/runtime/api/rpcHandler.mjs

@@ -3,7 +3,7 @@ import { purifySensitiveData } from "@scayle/storefront-core";
 import { trace, SpanStatusCode } from "@opentelemetry/api";
 import { handler } from "../handler.mjs";
 import { resolveError } from "../error/handler.mjs";
-import { useNitroApp } from "nitropack/runtime/app";
+import { useNitroApp } from "#imports";
 const tracer = trace.getTracer(
   "storefront-nuxt",
   "__sfc_version"

package/dist/runtime/composables/core/useIDP.d.ts

@@ -2,7 +2,7 @@ import { type MaybeRefOrGetter } from 'vue';
 import type { RpcMethodParameters } from '@scayle/storefront-core';
 export declare function useIDP(params?: MaybeRefOrGetter<RpcMethodParameters<'getExternalIdpRedirect'>>, key?: string): import("nuxt/dist/app/composables/asyncData")._AsyncData<{
     [k: string]: string;
-}, import("nuxt/app").NuxtError<unknown> | null> & {
+}, any> & {
     fetching: import("vue").Ref<boolean>;
     fetch: (opts?: import("nuxt/dist/app/composables/asyncData").AsyncDataExecuteOptions) => Promise<void>;
 } & {
@@ -13,7 +13,7 @@ export declare function useIDP(params?: MaybeRefOrGetter<RpcMethodParameters<'ge
     }>;
 } & Promise<import("nuxt/dist/app/composables/asyncData")._AsyncData<{
     [k: string]: string;
-}, import("nuxt/app").NuxtError<unknown> | null> & {
+}, any> & {
     fetching: import("vue").Ref<boolean>;
     fetch: (opts?: import("nuxt/dist/app/composables/asyncData").AsyncDataExecuteOptions) => Promise<void>;
 } & {

package/dist/runtime/composables/core/useUser.d.ts

@@ -15,7 +15,7 @@ export declare function useUser(options?: ExtendedUseUserParams): {
     forceRefresh: () => Promise<void>;
     updateUser: (payload: Partial<ShopUser>) => Promise<void>;
     updatePassword: (payload: UpdatePasswordParams) => Promise<void>;
-    error: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    error: import("vue").Ref<any>;
     status: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
 } & Promise<{
     user: import("vue").ComputedRef<ShopUser | undefined>;
@@ -26,6 +26,6 @@ export declare function useUser(options?: ExtendedUseUserParams): {
     forceRefresh: () => Promise<void>;
     updateUser: (payload: Partial<ShopUser>) => Promise<void>;
     updatePassword: (payload: UpdatePasswordParams) => Promise<void>;
-    error: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    error: import("vue").Ref<any>;
     status: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
 }>;

package/dist/runtime/composables/storefront/useBasket.d.ts

@@ -5,7 +5,7 @@ type UseBasketOptions = Partial<{
     params: MaybeRefOrGetter<RpcMethodParameters<'getBasket'>>;
     key: string;
 }>;
-export declare function useBasket({ params, key, }?: UseBasketOptions): import("nuxt/dist/app/composables/asyncData")._AsyncData<BasketResponseData<import("@scayle/storefront-api").Product, import("@scayle/storefront-api").Variant>, import("nuxt/app").NuxtError<unknown> | null> & {
+export declare function useBasket({ params, key, }?: UseBasketOptions): import("nuxt/dist/app/composables/asyncData")._AsyncData<BasketResponseData<import("@scayle/storefront-api").Product, import("@scayle/storefront-api").Variant>, any> & {
     fetching: import("vue").Ref<boolean>;
     fetch: (opts?: import("nuxt/dist/app/composables/asyncData").AsyncDataExecuteOptions) => Promise<void>;
 } & {
@@ -61,9 +61,9 @@ export declare function useBasket({ params, key, }?: UseBasketOptions): import("
         readonly basket: BasketResponseData<import("@scayle/storefront-api").Product, import("@scayle/storefront-api").Variant>;
         readonly errors: import("@scayle/storefront-api").AddOrUpdateItemError[];
     } | undefined>;
-    error: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    error: import("vue").Ref<any>;
     status: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
-} & Promise<import("nuxt/dist/app/composables/asyncData")._AsyncData<BasketResponseData<import("@scayle/storefront-api").Product, import("@scayle/storefront-api").Variant>, import("nuxt/app").NuxtError<unknown> | null> & {
+} & Promise<import("nuxt/dist/app/composables/asyncData")._AsyncData<BasketResponseData<import("@scayle/storefront-api").Product, import("@scayle/storefront-api").Variant>, any> & {
     fetching: import("vue").Ref<boolean>;
     fetch: (opts?: import("nuxt/dist/app/composables/asyncData").AsyncDataExecuteOptions) => Promise<void>;
 } & {
@@ -119,7 +119,7 @@ export declare function useBasket({ params, key, }?: UseBasketOptions): import("
         readonly basket: BasketResponseData<import("@scayle/storefront-api").Product, import("@scayle/storefront-api").Variant>;
         readonly errors: import("@scayle/storefront-api").AddOrUpdateItemError[];
     } | undefined>;
-    error: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    error: import("vue").Ref<any>;
     status: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
 }>;
 export {};

package/dist/runtime/composables/storefront/useCategories.d.ts

@@ -13,7 +13,7 @@ export declare function useCategories({ params, options, key: _key, }?: Options,
 } | {
     categories: import("@scayle/storefront-api").Category;
     activeNode: import("@scayle/storefront-api").Category;
-}, import("nuxt/app").NuxtError<unknown> | null> & {
+}, any> & {
     fetching: import("vue").Ref<boolean>;
     fetch: (opts?: import("nuxt/dist/app/composables/asyncData").AsyncDataExecuteOptions) => Promise<void>;
 } & {
@@ -24,7 +24,7 @@ export declare function useCategories({ params, options, key: _key, }?: Options,
 } | {
     categories: import("@scayle/storefront-api").Category;
     activeNode: import("@scayle/storefront-api").Category;
-}, import("nuxt/app").NuxtError<unknown> | null> & {
+}, any> & {
     fetching: import("vue").Ref<boolean>;
     fetch: (opts?: import("nuxt/dist/app/composables/asyncData").AsyncDataExecuteOptions) => Promise<void>;
 } & {

package/dist/runtime/composables/storefront/useFacet.d.ts

@@ -19,13 +19,13 @@ export declare function useFacet({ key: optionsKey, params, }?: Options, _key?:
     filtersFetching: import("vue").Ref<boolean>;
     unfilteredCount: import("vue").ComputedRef<number>;
     filterStatus: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
-    filterError: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    filterError: import("vue").Ref<any>;
     productCountData: import("vue").Ref<{
         count: number;
     }>;
     refreshProductCount: ({ where, }?: FilterParams) => Promise<void>;
     productCountFetching: import("vue").Ref<boolean>;
-    productCountError: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    productCountError: import("vue").Ref<any>;
     productCountStatus: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
     products: import("vue").ComputedRef<import("@scayle/storefront-api").Product[]>;
     pagination: import("vue").ComputedRef<{
@@ -40,12 +40,12 @@ export declare function useFacet({ key: optionsKey, params, }?: Options, _key?:
     }>;
     productsFetching: import("vue").Ref<boolean>;
     filterProducts: ({ where, page, sort, orFiltersOperator, }: FilterParams) => Promise<void>;
-    productError: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    productError: import("vue").Ref<any>;
     productStatus: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
     categories: import("vue").ComputedRef<import("@scayle/storefront-api").Category | import("@scayle/storefront-api").Category[]>;
     selectedCategory: import("vue").ComputedRef<import("@scayle/storefront-api").Category | undefined>;
     categoriesFetching: import("vue").Ref<boolean>;
-    categoriesError: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    categoriesError: import("vue").Ref<any>;
     categoriesStatus: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
     fetchProducts: ({ path, page, perPage, where, sort, pricePromotionKey, cache, orFiltersOperator, }: FilterParams & {
         path: string;
@@ -58,13 +58,13 @@ export declare function useFacet({ key: optionsKey, params, }?: Options, _key?:
     filtersFetching: import("vue").Ref<boolean>;
     unfilteredCount: import("vue").ComputedRef<number>;
     filterStatus: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
-    filterError: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    filterError: import("vue").Ref<any>;
     productCountData: import("vue").Ref<{
         count: number;
     }>;
     refreshProductCount: ({ where, }?: FilterParams) => Promise<void>;
     productCountFetching: import("vue").Ref<boolean>;
-    productCountError: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    productCountError: import("vue").Ref<any>;
     productCountStatus: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
     products: import("vue").ComputedRef<import("@scayle/storefront-api").Product[]>;
     pagination: import("vue").ComputedRef<{
@@ -79,12 +79,12 @@ export declare function useFacet({ key: optionsKey, params, }?: Options, _key?:
     }>;
     productsFetching: import("vue").Ref<boolean>;
     filterProducts: ({ where, page, sort, orFiltersOperator, }: FilterParams) => Promise<void>;
-    productError: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    productError: import("vue").Ref<any>;
     productStatus: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
     categories: import("vue").ComputedRef<import("@scayle/storefront-api").Category | import("@scayle/storefront-api").Category[]>;
     selectedCategory: import("vue").ComputedRef<import("@scayle/storefront-api").Category | undefined>;
     categoriesFetching: import("vue").Ref<boolean>;
-    categoriesError: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    categoriesError: import("vue").Ref<any>;
     categoriesStatus: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
     fetchProducts: ({ path, page, perPage, where, sort, pricePromotionKey, cache, orFiltersOperator, }: FilterParams & {
         path: string;

package/dist/runtime/composables/storefront/useOrder.d.ts

@@ -11,7 +11,7 @@ export declare function useOrder<P = {
     [k: string]: unknown;
 }, V = {
     [k: string]: unknown;
-}>({ params, options, key: _key }?: Options, key?: string): import("nuxt/dist/app/composables/asyncData")._AsyncData<Order, import("nuxt/app").NuxtError<unknown> | null> & {
+}>({ params, options, key: _key }?: Options, key?: string): import("nuxt/dist/app/composables/asyncData")._AsyncData<Order, any> & {
     fetching: import("vue").Ref<boolean>;
     fetch: (opts?: import("nuxt/dist/app/composables/asyncData").AsyncDataExecuteOptions) => Promise<void>;
 } & {
@@ -85,7 +85,7 @@ export declare function useOrder<P = {
             variant: V;
         })[];
     }>;
-} & Promise<import("nuxt/dist/app/composables/asyncData")._AsyncData<Order, import("nuxt/app").NuxtError<unknown> | null> & {
+} & Promise<import("nuxt/dist/app/composables/asyncData")._AsyncData<Order, any> & {
     fetching: import("vue").Ref<boolean>;
     fetch: (opts?: import("nuxt/dist/app/composables/asyncData").AsyncDataExecuteOptions) => Promise<void>;
 } & {

package/dist/runtime/composables/storefront/useOrderConfirmation.d.ts

@@ -11,7 +11,7 @@ export declare function useOrderConfirmation<P = {
     [k: string]: unknown;
 }, V = {
     [k: string]: unknown;
-}>({ params, options, key: _key }?: Options, key?: string): import("nuxt/dist/app/composables/asyncData")._AsyncData<Order | undefined, import("nuxt/app").NuxtError<unknown> | null> & {
+}>({ params, options, key: _key }?: Options, key?: string): import("nuxt/dist/app/composables/asyncData")._AsyncData<Order | undefined, any> & {
     fetching: import("vue").Ref<boolean>;
     fetch: (opts?: import("nuxt/dist/app/composables/asyncData").AsyncDataExecuteOptions) => Promise<void>;
 } & {
@@ -85,7 +85,7 @@ export declare function useOrderConfirmation<P = {
             variant: V;
         })[];
     }>;
-} & Promise<import("nuxt/dist/app/composables/asyncData")._AsyncData<Order | undefined, import("nuxt/app").NuxtError<unknown> | null> & {
+} & Promise<import("nuxt/dist/app/composables/asyncData")._AsyncData<Order | undefined, any> & {
     fetching: import("vue").Ref<boolean>;
     fetch: (opts?: import("nuxt/dist/app/composables/asyncData").AsyncDataExecuteOptions) => Promise<void>;
 } & {

package/dist/runtime/composables/storefront/useWishlist.d.ts

@@ -40,7 +40,7 @@ export declare function useWishlist({ params, key, }?: Options): {
     } | {
         productId: number;
     }) => boolean;
-    error: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    error: import("vue").Ref<any>;
     status: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
 } & Promise<{
     data: import("vue").Ref<WishlistResponseData>;
@@ -78,7 +78,7 @@ export declare function useWishlist({ params, key, }?: Options): {
     } | {
         productId: number;
     }) => boolean;
-    error: import("vue").Ref<import("nuxt/app").NuxtError<unknown> | null>;
+    error: import("vue").Ref<any>;
     status: import("vue").Ref<import("nuxt/app").AsyncDataRequestStatus>;
 }>;
 export {};

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

@@ -58,42 +58,53 @@ async function bootstrap(event, $shopConfig, $storefrontConfig, apiBasePath, con
     $shopConfig.shopId,
     log
   );
-  bootstrapLog.debug("Attaching session to request");
-  try {
-    const cookieName = sessionConfig?.cookieName ?? "$session";
-    const secret = sessionConfig?.secret ?? "current-secret";
-    const oldSessionData = await getOldSessionData(
-      event,
-      cookieName,
-      sessionStorage,
-      secret
-    );
-    await useSession(event, {
-      ...sessionConfig,
-      store: sessionStorage,
-      genid: generateSessionId,
-      saveUninitialized: true,
-      cookie: {
-        maxAge: sessionConfig?.maxAge,
-        // secure: sessionConfig.isHttps, TODO
-        sameSite: sessionConfig.sameSite,
-        domain: sessionConfig?.domain
-      },
-      name: `${cookieName}-${$shopConfig.shopId}`,
-      secret
-    });
-    if (oldSessionData) {
-      event.context.session.data = oldSessionData;
-      event.context.session.save();
-    }
-    const oldSessionCookie = getCookie(event, cookieName);
-    if (oldSessionCookie) {
-      deleteCookie(event, cookieName, {
-        path: $storefrontConfig.shopSelector === "path" && $shopConfig.path ? `/${$shopConfig.path}` : void 0
+  const routeRules = event.context._nitro.routeRules;
+  const cacheableRoute = routeRules.cache || routeRules.isr || routeRules.swr;
+  bootstrapLog.debug({
+    rules: event.context._nitro.routeRules,
+    cacheableRoute,
+    path: event.path
+  });
+  if (!cacheableRoute) {
+    bootstrapLog.debug("Attaching session to request");
+    try {
+      const cookieName = sessionConfig?.cookieName ?? "$session";
+      const secret = sessionConfig?.secret ?? "current-secret";
+      const oldSessionData = await getOldSessionData(
+        event,
+        cookieName,
+        sessionStorage,
+        secret
+      );
+      await useSession(event, {
+        ...sessionConfig,
+        store: sessionStorage,
+        genid: generateSessionId,
+        saveUninitialized: true,
+        cookie: {
+          maxAge: sessionConfig?.maxAge,
+          // secure: sessionConfig.isHttps, TODO
+          sameSite: sessionConfig.sameSite,
+          domain: sessionConfig?.domain
+        },
+        name: `${cookieName}-${$shopConfig.shopId}`,
+        secret
       });
+      if (oldSessionData) {
+        event.context.session.data = oldSessionData;
+        event.context.session.save();
+      }
+      const oldSessionCookie = getCookie(event, cookieName);
+      if (oldSessionCookie) {
+        deleteCookie(event, cookieName, {
+          path: $storefrontConfig.shopSelector === "path" && $shopConfig.path ? `/${$shopConfig.path}` : void 0
+        });
+      }
+    } catch (e) {
+      bootstrapLog.error("Error attaching session: ", e);
     }
-  } catch (e) {
-    bootstrapLog.error("Error attaching session: ", e);
+  } else {
+    bootstrapLog.debug("Skipping session for cached request");
   }
   event.context.$currentShop = getPublicShopData(
     $shopConfig,
@@ -111,10 +122,6 @@ async function bootstrap(event, $shopConfig, $storefrontConfig, apiBasePath, con
   );
   event.context.$cache = $cache;
   bootstrapLog.debug("Building context for request");
-  const cacheableRoute = !!event.context._nitro.routeRules.cache;
-  if (cacheableRoute) {
-    bootstrapLog.debug("Skipping session for cached request");
-  }
   event.context.$rpcContext = await buildContext({
     $cache,
     $shopConfig,

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

@@ -591,6 +591,7 @@ declare const ShopConfigSchema: z.ZodObject<{
     isDefault?: string | boolean | undefined;
 }>;
 declare const ShopSelectorSchema: z.ZodEnum<["path", "domain", "path_or_default"]>;
+type ShopConfigType = z.infer<typeof ShopConfigSchema>;
 declare const StorefrontConfigSchema: z.ZodObject<{
     session: z.ZodOptional<z.ZodObject<{
         /**
@@ -809,7 +810,7 @@ declare const StorefrontConfigSchema: z.ZodObject<{
         };
         enabled?: boolean | undefined;
     }>>;
-    publicShopData: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    publicShopData: z.ZodOptional<z.ZodArray<z.ZodType<("locale" | "checkout" | "shopId" | "auth" | "currency") | ("domain" | "storeCampaignKeyword" | "idp" | "path" | "redis" | "apiBasePath" | "appKeys" | "currencyFractionDigits" | "isEnabled" | "sessionConfig" | "bapi" | "storage" | "isDefault") | "paymentProviders", z.ZodTypeDef, ("locale" | "checkout" | "shopId" | "auth" | "currency") | ("domain" | "storeCampaignKeyword" | "idp" | "path" | "redis" | "apiBasePath" | "appKeys" | "currencyFractionDigits" | "isEnabled" | "sessionConfig" | "bapi" | "storage" | "isDefault") | "paymentProviders">, "many">>;
     idp: z.ZodOptional<z.ZodObject<{
         enabled: z.ZodBoolean;
         idpKeys: z.ZodArray<z.ZodString, "many">;
@@ -935,7 +936,7 @@ declare const StorefrontConfigSchema: z.ZodObject<{
             tls?: boolean | undefined;
         } | undefined;
     } | undefined;
-    publicShopData?: string[] | undefined;
+    publicShopData?: (("locale" | "checkout" | "shopId" | "auth" | "currency") | ("domain" | "storeCampaignKeyword" | "idp" | "path" | "redis" | "apiBasePath" | "appKeys" | "currencyFractionDigits" | "isEnabled" | "sessionConfig" | "bapi" | "storage" | "isDefault") | "paymentProviders")[] | undefined;
 }, {
     oauth: {
         apiHost: string;
@@ -1010,7 +1011,7 @@ declare const StorefrontConfigSchema: z.ZodObject<{
             tls?: boolean | undefined;
         } | undefined;
     } | undefined;
-    publicShopData?: string[] | undefined;
+    publicShopData?: (("locale" | "checkout" | "shopId" | "auth" | "currency") | ("domain" | "storeCampaignKeyword" | "idp" | "path" | "redis" | "apiBasePath" | "appKeys" | "currencyFractionDigits" | "isEnabled" | "sessionConfig" | "bapi" | "storage" | "isDefault") | "paymentProviders")[] | undefined;
 }>;
 declare const PublicRuntimeConfigSchema: z.ZodObject<{
     log: z.ZodObject<{
@@ -1253,7 +1254,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
             };
             enabled?: boolean | undefined;
         }>>;
-        publicShopData: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        publicShopData: z.ZodOptional<z.ZodArray<z.ZodType<("locale" | "checkout" | "shopId" | "auth" | "currency") | ("domain" | "storeCampaignKeyword" | "idp" | "path" | "redis" | "apiBasePath" | "appKeys" | "currencyFractionDigits" | "isEnabled" | "sessionConfig" | "bapi" | "storage" | "isDefault") | "paymentProviders", z.ZodTypeDef, ("locale" | "checkout" | "shopId" | "auth" | "currency") | ("domain" | "storeCampaignKeyword" | "idp" | "path" | "redis" | "apiBasePath" | "appKeys" | "currencyFractionDigits" | "isEnabled" | "sessionConfig" | "bapi" | "storage" | "isDefault") | "paymentProviders">, "many">>;
         idp: z.ZodOptional<z.ZodObject<{
             enabled: z.ZodBoolean;
             idpKeys: z.ZodArray<z.ZodString, "many">;
@@ -1379,7 +1380,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 tls?: boolean | undefined;
             } | undefined;
         } | undefined;
-        publicShopData?: string[] | undefined;
+        publicShopData?: (("locale" | "checkout" | "shopId" | "auth" | "currency") | ("domain" | "storeCampaignKeyword" | "idp" | "path" | "redis" | "apiBasePath" | "appKeys" | "currencyFractionDigits" | "isEnabled" | "sessionConfig" | "bapi" | "storage" | "isDefault") | "paymentProviders")[] | undefined;
     }, {
         oauth: {
             apiHost: string;
@@ -1454,7 +1455,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 tls?: boolean | undefined;
             } | undefined;
         } | undefined;
-        publicShopData?: string[] | undefined;
+        publicShopData?: (("locale" | "checkout" | "shopId" | "auth" | "currency") | ("domain" | "storeCampaignKeyword" | "idp" | "path" | "redis" | "apiBasePath" | "appKeys" | "currencyFractionDigits" | "isEnabled" | "sessionConfig" | "bapi" | "storage" | "isDefault") | "paymentProviders")[] | undefined;
     }>, z.ZodObject<{
         shopSelector: z.ZodEnum<["path", "domain", "path_or_default"]>;
         stores: z.ZodRecord<z.ZodString, z.ZodObject<{
@@ -2186,7 +2187,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 tls?: boolean | undefined;
             } | undefined;
         } | undefined;
-        publicShopData?: string[] | undefined;
+        publicShopData?: (("locale" | "checkout" | "shopId" | "auth" | "currency") | ("domain" | "storeCampaignKeyword" | "idp" | "path" | "redis" | "apiBasePath" | "appKeys" | "currencyFractionDigits" | "isEnabled" | "sessionConfig" | "bapi" | "storage" | "isDefault") | "paymentProviders")[] | undefined;
     } | {
         shopSelector: "domain" | "path" | "path_or_default";
         stores: Record<string, {
@@ -2359,7 +2360,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 tls?: boolean | undefined;
             } | undefined;
         } | undefined;
-        publicShopData?: string[] | undefined;
+        publicShopData?: (("locale" | "checkout" | "shopId" | "auth" | "currency") | ("domain" | "storeCampaignKeyword" | "idp" | "path" | "redis" | "apiBasePath" | "appKeys" | "currencyFractionDigits" | "isEnabled" | "sessionConfig" | "bapi" | "storage" | "isDefault") | "paymentProviders")[] | undefined;
     } | {
         shopSelector: "domain" | "path" | "path_or_default";
         stores: Record<string, {
@@ -2462,7 +2463,6 @@ type CheckoutShopConfigType = z.infer<typeof CheckoutShopConfigSchema>;
 type SessionType = z.infer<typeof SessionSchema>;
 type StorageType = z.infer<typeof StorageSchema>;
 type BapiConfigType = z.infer<typeof BapiSchema>;
-type ShopConfigType = z.infer<typeof ShopConfigSchema>;
 type StorefrontConfigType = z.infer<typeof StorefrontConfigSchema>;
 type ShopSelectorType = z.infer<typeof ShopSelectorSchema>;
 type RedirectType = z.infer<typeof RedirectsSchema>;

package/dist/runtime/utils/zodSchema.mjs

@@ -131,7 +131,9 @@ const StorefrontConfigSchema = z.object({
   appKeys: AppKeysSchema,
   apiBasePath: z.string().optional(),
   cache: CacheSchema.optional(),
-  publicShopData: z.array(z.string()).optional(),
+  publicShopData: z.array(
+    z.custom()
+  ).optional(),
   idp: IdpSchema.optional(),
   /** @deprecated Global storefront.redis config is being removed in favor of `storefront.storage` config */
   redis: RedisConfigSchema.optional()