@scayle/storefront-nuxt 7.42.1 → 7.42.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @scayle/storefront-nuxt
 
+## 7.42.3
+
+### Patch Changes
+
+- Fix incorrect parsing of legacy config
+- Include missing unstorage drivers in final build
+- Updated dependencies
+  - @scayle/storefront-core@7.28.2
+
+## 7.42.2
+
+### Patch Changes
+
+- Ensure `useNuxtApp` is only called from a composable context in `useCategories`
+
 ## 7.42.1
 
 ### Patch Changes

package/dist/module.json

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

package/dist/module.mjs

@@ -2,7 +2,29 @@ import { defineNuxtModule, createResolver, extendViteConfig, addServerHandler, a
 import yn from 'yn';
 import { rpcMethods } from '@scayle/storefront-core';
 import { defu } from 'defu';
+import { genImport, genSafeVariableName } from 'knitwork';
+import { builtinDrivers } from 'unstorage';
 
+function getUsedDrivers(options) {
+  const drivers = /* @__PURE__ */ new Set();
+  drivers.add("memory");
+  if (options.redis || Object.values(options.stores).some((store) => store.redis)) {
+    drivers.add("redis");
+  }
+  const addDriver = (config) => {
+    if (config?.cache?.driver) {
+      drivers.add(config.cache.driver);
+    }
+    if (config?.session?.driver) {
+      drivers.add(config.session.driver);
+    }
+  };
+  addDriver(options.storage);
+  Object.values(options.stores).forEach((store) => {
+    addDriver(store.storage);
+  });
+  return Array.from(drivers);
+}
 const module = defineNuxtModule({
   meta: {
     name: "@scayle/storefront-nuxt",
@@ -173,6 +195,19 @@ const module = defineNuxtModule({
       nitroConfig.replace["process.env.SFC_OMIT_MD5"] = yn(
         process.env.SFC_OMIT_MD5
       );
+      const usedDrivers = getUsedDrivers(options);
+      nitroConfig.virtual = {
+        ...nitroConfig.virtual,
+        "#virtual/storage-drivers": `
+${usedDrivers.map(
+          (driver) => genImport(builtinDrivers[driver], genSafeVariableName(driver))
+        ).join("\n")}
+
+export default {
+  ${usedDrivers.map((driver) => '"' + driver + '":' + genSafeVariableName(driver) + ",").join("\n")}
+}
+`
+      };
     });
     nuxt.options.alias["#rpcMethods"] = appResolve(
       options.rpcDir ?? "./rpcMethods"

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

@@ -8,6 +8,7 @@ export async function useCategories({
   key = "useCategories"
 } = {}) {
   const currentShop = useCurrentShop();
+  const nuxtApp = useNuxtApp();
   const { data, fetching, fetch, error, status } = await useRpc(
     "getCategoriesByPath",
     key,
@@ -15,7 +16,7 @@ export async function useCategories({
     options
   );
   const getCategoryById = rpcCall(
-    useNuxtApp(),
+    nuxtApp,
     "getCategoryById",
     currentShop.value ?? void 0
   );

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

@@ -1,34 +1,31 @@
 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 drivers from "#virtual/storage-drivers";
 import { defineNitroPlugin, useRuntimeConfig, useStorage } from "#imports";
-async function createMountDriver(options) {
+function createMountDriver(options) {
   if (options?.driver) {
-    const driver = await import(
-      // @ts-ignore
-      builtinDrivers[options.driver] || options.driver
-    ).then((r) => r.default || r);
+    const driver = drivers[options.driver ?? "memory"];
     return driver(options ?? {});
   }
   return memoryDriver();
 }
-async function mountStorage(storage, options) {
+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));
+      storage.mount(base, createMountDriver(config));
     } else {
-      storage.mount(base, await createMountDriver());
+      storage.mount(base, createMountDriver());
     }
   }
 }
-function transformLegacyConfig(provider = "memory", mode, log, redis, shopId = void 0) {
+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.`
   );
@@ -115,7 +112,7 @@ function getShopSessionConfig(config, shop, log) {
     shop.shopId
   );
 }
-export default defineNitroPlugin(async () => {
+export default defineNitroPlugin(() => {
   const storage = useStorage();
   const config = useRuntimeConfig();
   const log = createLog(
@@ -126,12 +123,12 @@ export default defineNitroPlugin(async () => {
   const shops = config.storefront.stores;
   try {
     const globalCacheConfig = getCacheConfig(config, log);
-    await mountStorage(storage, {
+    mountStorage(storage, {
       base: STORAGE_MOUNT_CACHE,
       config: globalCacheConfig
     });
     const globalSessionConfig = getSessionConfig(config, log);
-    await mountStorage(storage, {
+    mountStorage(storage, {
       base: STORAGE_MOUNT_SESSION,
       config: globalSessionConfig
     });
@@ -140,14 +137,14 @@ export default defineNitroPlugin(async () => {
       const shopSessionMount = `${STORAGE_MOUNT_SESSION}:${shop.shopId}`;
       const cacheConfig = getShopCacheConfig(config, shop, log);
       if (cacheConfig) {
-        await mountStorage(storage, {
+        mountStorage(storage, {
           base: shopCacheMount,
           config: cacheConfig
         });
       }
       const sessionConfig = getShopSessionConfig(config, shop, log);
       if (sessionConfig) {
-        await mountStorage(storage, {
+        mountStorage(storage, {
           base: shopSessionMount,
           config: sessionConfig
         });

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

@@ -44,7 +44,7 @@ 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());
+  bootstrapLog.debug("Bootstrapping request: " + url.toString());
   const $cache = useCacheStorage(
     String($shopConfig.shopId),
     $shopConfig.shopId,

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

@@ -7,14 +7,9 @@ async function updateSession(event, data) {
 }
 const updateUser = async (event) => {
   const session = event.context.session;
-  const checkoutUrl = event.context.$rpcContext.checkout.url;
-  const shopId = event.context.$currentShop.shopId;
   const user = await rpcMethods.fetchUser(
     { accessToken: session.data.accessToken, callback: "" },
-    {
-      checkoutUrl,
-      shopId
-    }
+    event.context.$rpcContext
   );
   await updateSession(event, {
     user
@@ -64,14 +59,9 @@ const revokeTokensAndDestroySession = async (event, log) => {
 };
 const updateSessionWithUser = async (event, sessionData, log) => {
   try {
-    const checkoutUrl = event.context.$rpcContext.checkout.url;
-    const shopId = event.context.$currentShop.shopId;
     const user = await rpcMethods.fetchUser(
       { accessToken: sessionData.accessToken, callback: "" },
-      {
-        checkoutUrl,
-        shopId
-      }
+      event.context.$rpcContext
     );
     await updateSession(event, {
       user

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@scayle/storefront-nuxt",
   "type": "module",
-  "version": "7.42.1",
+  "version": "7.42.3",
   "description": "Nuxt integration for the SCAYLE Commerce Engine and Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -62,13 +62,14 @@
   "dependencies": {
     "@nuxt/kit": "3.8.2",
     "@scayle/h3-session": "0.3.4",
-    "@scayle/storefront-core": "7.28.1",
-    "@vueuse/core": "10.6.1",
+    "@scayle/storefront-core": "7.28.2",
+    "@vueuse/core": "10.7.0",
     "consola": "3.2.3",
-    "core-js": "3.33.3",
+    "core-js": "3.34.0",
     "defu": "6.1.3",
     "h3": "1.9.0",
     "jose": "4.15.4",
+    "knitwork": "1.0.0",
     "nitropack": "2.8.1",
     "ofetch": "1.3.3",
     "radash": "11.0.0",
@@ -83,15 +84,15 @@
     "@nuxt/test-utils": "3.8.1",
     "@scayle/eslint-config-storefront": "3.2.5",
     "@scayle/prettier-config-storefront": "2.0.2",
-    "@types/node": "20.10.1",
-    "eslint": "8.54.0",
+    "@types/node": "20.10.4",
+    "eslint": "8.55.0",
     "eslint-formatter-gitlab": "5.1.0",
     "node-mocks-http": "1.13.0",
     "nuxt": "3.8.2",
     "prettier": "3.0.0",
-    "publint": "0.2.5",
-    "vitest": "0.34.6",
-    "vue-tsc": "1.8.24"
+    "publint": "0.2.6",
+    "vitest": "1.0.1",
+    "vue-tsc": "1.8.25"
   },
   "peerDependencies": {
     "nuxt": ">=3.8.1",