@scayle/storefront-nuxt 8.2.1 → 8.3.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @scayle/storefront-nuxt
 
+## 8.3.0
+
+### Minor Changes
+
+- Complete removal of shop-prefixed API endpoints. In version 8.0.0, support for shop-prefixed API endpoints was dropped. However, not all the code was removed until now.
+
 ## 8.2.1
 
 ### Patch Changes

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-nuxt",
-  "version": "8.2.1",
+  "version": "8.3.0",
   "configKey": "storefront",
   "compatibility": {
     "nuxt": "^3.9.0"

package/dist/module.mjs

@@ -4,7 +4,7 @@ import { defu } from 'defu';
 import { genImport, genSafeVariableName } from 'knitwork';
 import { builtinDrivers } from 'unstorage';
 import { createConsola } from 'consola';
-import { convertShopsToList, getApiBasePath } from '../dist/runtime/server/middleware/bootstrap-utils.js';
+import { getApiBasePath } from '../dist/runtime/server/middleware/bootstrap-utils.js';
 
 function stringToBoolean(value, defaultValue = false) {
   return value ? value.toLowerCase() === "true" : defaultValue;
@@ -45,7 +45,7 @@ export default {
 }`;
 }
 const PACKAGE_NAME = "@scayle/storefront-nuxt";
-const PACKAGE_VERSION = "8.2.1";
+const PACKAGE_VERSION = "8.3.0";
 const logger = createConsola({
   fancy: true,
   formatOptions: {
@@ -129,7 +129,7 @@ const module = defineNuxtModule({
       middleware: true,
       handler: resolve("./runtime/server/middleware/bootstrap")
     });
-    const apiBasePath = nuxt.options.runtimeConfig.storefront.apiBasePath || "/api";
+    const apiBasePath = getApiBasePath(options, "/");
     const rpcMethodNames = new Set(Object.keys(rpcMethods));
     const overridenRPCMethodNames = new Set(options.rpcMethodOverrides);
     for (const rpcMethodName of options.rpcMethodNames ?? []) {
@@ -154,47 +154,23 @@ Specified RPC which were supposed to be overriden but are not. This indicates an
 Missing RPC Overrides: ${Array.from(overridenRPCMethodNames).map((name) => `'${name}'`).join(", ")}
 `);
     }
-    function addRPCServerHandlers(base) {
-      rpcMethodNames.forEach((methodName) => {
-        addServerHandler({
-          route: `${base}/rpc/${methodName}`,
-          handler: resolve("./runtime/api/rpcHandler"),
-          method: "post"
-        });
-      });
-    }
-    function addCacheServerHandlers(base) {
+    rpcMethodNames.forEach((methodName) => {
       addServerHandler({
-        route: `${base}/purge/all`,
-        handler: resolve("./runtime/api/purgeAll"),
+        route: `${apiBasePath}/rpc/${methodName}`,
+        handler: resolve("./runtime/api/rpcHandler"),
         method: "post"
       });
-      addServerHandler({
-        route: `${base}/purge/tags`,
-        handler: resolve("./runtime/api/purgeTags"),
-        method: "post"
-      });
-    }
-    const shops = convertShopsToList(
-      nuxt.options.runtimeConfig.storefront.shops ?? {}
-    );
-    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,
-          // Nuxt/Nitro automatically adds `NUXT_APP_BASE_URL` to the path when registering the handler, so we don't need to pass it here.
-          // https://github.com/unjs/nitro/blob/011280178d59fa863b90d63f89f29beb47b520b7/src/runtime/internal/app.ts#L149C13-L149C27
-          "/"
-        );
-        addCacheServerHandlers(base);
-        addRPCServerHandlers(base);
-      });
-    } else {
-      addCacheServerHandlers(apiBasePath);
-      addRPCServerHandlers(apiBasePath);
-    }
+    });
+    addServerHandler({
+      route: `${apiBasePath}/purge/all`,
+      handler: resolve("./runtime/api/purgeAll"),
+      method: "post"
+    });
+    addServerHandler({
+      route: `${apiBasePath}/purge/tags`,
+      handler: resolve("./runtime/api/purgeTags"),
+      method: "post"
+    });
     addServerHandler({
       route: `${apiBasePath}/up`,
       handler: resolve("./runtime/api/up")

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

@@ -8,7 +8,7 @@ type BootstrapPath = {
 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 getApiBasePath(storefrontConfig: ModuleBaseOptions, baseUrl: string): string;
 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

@@ -31,19 +31,8 @@ export const convertShopsToList = (shops) => {
   }
   return Object.values(shops);
 };
-export function getApiBasePath(storefrontConfig, shop, baseUrl) {
-  const path = Array.isArray(shop.path) ? shop.path[0] : shop.path;
-  const apiPath = shop.apiBasePath || storefrontConfig.apiBasePath || "/api";
-  if (storefrontConfig.shopSelector === "path") {
-    const pathElements = [path, apiPath].filter(Boolean);
-    return joinURL(baseUrl, ...pathElements);
-  } else if (storefrontConfig.shopSelector === "path_or_default") {
-    if (shop.isDefault) {
-      return joinURL(baseUrl, apiPath);
-    }
-    const pathElements = [path, apiPath].filter(Boolean);
-    return joinURL(baseUrl, ...pathElements);
-  }
+export function getApiBasePath(storefrontConfig, baseUrl) {
+  const apiPath = storefrontConfig.apiBasePath || "/api";
   return joinURL(baseUrl, apiPath);
 }
 export function getCurrentShopConfigForRequest(event, storefrontConfig, runtimeConfig) {

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

@@ -175,7 +175,6 @@ export default defineEventHandler(async (event) => {
         }
         const apiBasePath = getApiBasePath(
           $storefrontConfig,
-          $shopConfig,
           config.app.baseURL
         );
         if (!event.context.$rpcContext) {

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

@@ -140,7 +140,6 @@ declare const ShopConfigSchema: z.ZodObject<{
     }>>;
     shopId: z.ZodNumber;
     path: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
-    apiBasePath: z.ZodOptional<z.ZodString>;
     domain: z.ZodOptional<z.ZodString>;
     locale: z.ZodString;
     auth: z.ZodObject<{
@@ -376,7 +375,6 @@ declare const ShopConfigSchema: z.ZodObject<{
         idpRedirectURL: string;
     } | undefined;
     path?: string | string[] | undefined;
-    apiBasePath?: string | undefined;
     appKeys?: {
         wishlistKey: string;
         basketKey: string;
@@ -444,7 +442,6 @@ declare const ShopConfigSchema: z.ZodObject<{
         idpRedirectURL: string;
     } | undefined;
     path?: string | string[] | undefined;
-    apiBasePath?: string | undefined;
     appKeys?: {
         wishlistKey: string;
         basketKey: string;
@@ -756,7 +753,6 @@ declare const StorefrontConfigSchema: z.ZodObject<{
         idpRedirectURL: string;
     } | undefined;
     internalAccessHeader?: string | undefined;
-    apiBasePath?: string | undefined;
     session?: {
         domain?: string | undefined;
         sameSite?: "lax" | "strict" | "none" | undefined;
@@ -797,6 +793,7 @@ declare const StorefrontConfigSchema: z.ZodObject<{
             tls?: boolean | undefined;
         } | undefined;
     } | undefined;
+    apiBasePath?: string | undefined;
     publicShopData?: string[] | undefined;
     legacy?: {
         enableSessionMigration?: boolean | undefined;
@@ -822,7 +819,6 @@ declare const StorefrontConfigSchema: z.ZodObject<{
         idpRedirectURL: string;
     } | undefined;
     internalAccessHeader?: string | undefined;
-    apiBasePath?: string | undefined;
     session?: {
         domain?: string | undefined;
         sameSite?: "lax" | "strict" | "none" | undefined;
@@ -863,6 +859,7 @@ declare const StorefrontConfigSchema: z.ZodObject<{
             tls?: boolean | undefined;
         } | undefined;
     } | undefined;
+    apiBasePath?: string | undefined;
     publicShopData?: string[] | undefined;
     legacy?: {
         enableSessionMigration?: boolean | undefined;
@@ -933,7 +930,6 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
             }>>;
             shopId: z.ZodNumber;
             path: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
-            apiBasePath: z.ZodOptional<z.ZodString>;
             domain: z.ZodOptional<z.ZodString>;
             locale: z.ZodString;
             auth: z.ZodObject<{
@@ -1169,7 +1165,6 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpRedirectURL: string;
             } | undefined;
             path?: string | string[] | undefined;
-            apiBasePath?: string | undefined;
             appKeys?: {
                 wishlistKey: string;
                 basketKey: string;
@@ -1237,7 +1232,6 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpRedirectURL: string;
             } | undefined;
             path?: string | string[] | undefined;
-            apiBasePath?: string | undefined;
             appKeys?: {
                 wishlistKey: string;
                 basketKey: string;
@@ -1308,7 +1302,6 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpRedirectURL: string;
             } | undefined;
             path?: string | string[] | undefined;
-            apiBasePath?: string | undefined;
             appKeys?: {
                 wishlistKey: string;
                 basketKey: string;
@@ -1383,7 +1376,6 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpRedirectURL: string;
             } | undefined;
             path?: string | string[] | undefined;
-            apiBasePath?: string | undefined;
             appKeys?: {
                 wishlistKey: string;
                 basketKey: string;
@@ -1697,7 +1689,6 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
             idpRedirectURL: string;
         } | undefined;
         internalAccessHeader?: string | undefined;
-        apiBasePath?: string | undefined;
         session?: {
             domain?: string | undefined;
             sameSite?: "lax" | "strict" | "none" | undefined;
@@ -1738,6 +1729,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 tls?: boolean | undefined;
             } | undefined;
         } | undefined;
+        apiBasePath?: string | undefined;
         publicShopData?: string[] | undefined;
         legacy?: {
             enableSessionMigration?: boolean | undefined;
@@ -1763,7 +1755,6 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
             idpRedirectURL: string;
         } | undefined;
         internalAccessHeader?: string | undefined;
-        apiBasePath?: string | undefined;
         session?: {
             domain?: string | undefined;
             sameSite?: "lax" | "strict" | "none" | undefined;
@@ -1804,6 +1795,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 tls?: boolean | undefined;
             } | undefined;
         } | undefined;
+        apiBasePath?: string | undefined;
         publicShopData?: string[] | undefined;
         legacy?: {
             enableSessionMigration?: boolean | undefined;
@@ -1892,7 +1884,6 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpRedirectURL: string;
             } | undefined;
             path?: string | string[] | undefined;
-            apiBasePath?: string | undefined;
             appKeys?: {
                 wishlistKey: string;
                 basketKey: string;
@@ -1964,7 +1955,6 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
             idpRedirectURL: string;
         } | undefined;
         internalAccessHeader?: string | undefined;
-        apiBasePath?: string | undefined;
         session?: {
             domain?: string | undefined;
             sameSite?: "lax" | "strict" | "none" | undefined;
@@ -2005,6 +1995,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 tls?: boolean | undefined;
             } | undefined;
         } | undefined;
+        apiBasePath?: string | undefined;
         publicShopData?: string[] | undefined;
         legacy?: {
             enableSessionMigration?: boolean | undefined;
@@ -2046,7 +2037,6 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 idpRedirectURL: string;
             } | undefined;
             path?: string | string[] | undefined;
-            apiBasePath?: string | undefined;
             appKeys?: {
                 wishlistKey: string;
                 basketKey: string;
@@ -2118,7 +2108,6 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
             idpRedirectURL: string;
         } | undefined;
         internalAccessHeader?: string | undefined;
-        apiBasePath?: string | undefined;
         session?: {
             domain?: string | undefined;
             sameSite?: "lax" | "strict" | "none" | undefined;
@@ -2159,6 +2148,7 @@ export declare const RuntimeConfigSchema: z.ZodObject<{
                 tls?: boolean | undefined;
             } | undefined;
         } | undefined;
+        apiBasePath?: string | undefined;
         publicShopData?: string[] | undefined;
         legacy?: {
             enableSessionMigration?: boolean | undefined;

package/dist/runtime/utils/zodSchema.js

@@ -79,7 +79,6 @@ const ShopConfigSchema = z.object({
   idp: IdpSchema.optional(),
   shopId: z.number(),
   path: z.string().or(z.array(z.string())).optional(),
-  apiBasePath: z.string().optional(),
   domain: z.string().optional(),
   locale: z.string(),
   auth: z.object({

package/package.json

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