@plentymarkets/shop-core 1.6.8 → 1.7.0

package/dist/module.d.mts

@@ -6,4 +6,5 @@ interface ModuleOptions {
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
 
-export { type ModuleOptions, _default as default };
+export { _default as default };
+export type { ModuleOptions };

package/dist/module.d.ts

@@ -6,4 +6,5 @@ interface ModuleOptions {
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
 
-export { type ModuleOptions, _default as default };
+export { _default as default };
+export type { ModuleOptions };

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "shop-core",
   "configKey": "shopCore",
-  "version": "1.6.8",
+  "version": "1.7.0",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/runtime/composables/__tests__/useSdk.spec.js

@@ -2,6 +2,7 @@ import { describe } from "node:test";
 import { expect, it, vi } from "vitest";
 import { mockNuxtImport } from "@nuxt/test-utils/runtime";
 import { useSdk } from "../useSdk.js";
+import { ref, reactive } from "vue";
 const { useRuntimeConfig } = vi.hoisted(() => {
   return {
     useRuntimeConfig: vi.fn().mockImplementation(() => {
@@ -15,6 +16,58 @@ const { useRuntimeConfig } = vi.hoisted(() => {
     })
   };
 });
+const { useNuxtApp } = vi.hoisted(() => {
+  return {
+    useNuxtApp: vi.fn().mockImplementation(() => {
+      return {
+        $router: {
+          currentRoute: {
+            value: {
+              query: {
+                ReferrerID: "123",
+                noCache: "true"
+              }
+            }
+          }
+        },
+        $i18n: {
+          locale: {
+            value: "en"
+          }
+        }
+      };
+    })
+  };
+});
+const { useCookie } = vi.hoisted(() => {
+  return {
+    useCookie: vi.fn().mockImplementation(() => {
+      return {
+        value: "pwa-edit-hash"
+      };
+    })
+  };
+});
+const { useState } = vi.hoisted(() => {
+  return {
+    useState: vi.fn().mockImplementation(() => {
+      return reactive({
+        value: {
+          token: ref("csrf-token")
+        }
+      });
+    })
+  };
+});
+mockNuxtImport("useCookie", () => {
+  return useCookie;
+});
+mockNuxtImport("useState", () => {
+  return useState;
+});
+mockNuxtImport("useNuxtApp", () => {
+  return useNuxtApp;
+});
 mockNuxtImport("useRuntimeConfig", () => {
   return useRuntimeConfig;
 });

package/dist/runtime/composables/sdk.client.js

@@ -1,34 +1,5 @@
 import axios from "axios";
 import { ApiError } from "@plentymarkets/shop-api";
-import { useCsrfToken } from "./useCsrfToken.js";
-import { tryUseNuxtApp, useCookie, useNuxtApp, useRuntimeConfig } from "#imports";
-const createHttpClient = () => {
-  const client = axios.create({ withCredentials: true });
-  if (tryUseNuxtApp()) {
-    const { token } = useCsrfToken();
-    const { $router, $i18n } = useNuxtApp();
-    const locale = $i18n.locale.value;
-    const runtimeConfig = useRuntimeConfig();
-    const referrerId = $router.currentRoute.value.query?.ReferrerID?.toString() ?? "";
-    const noCache = runtimeConfig.public.noCache || $router.currentRoute.value.query?.noCache?.toString() || "";
-    const configId = runtimeConfig.public.configId;
-    const pwaHashCookie = useCookie("pwa");
-    client.interceptors.request.use((request) => {
-      if (token.value) request.headers["x-csrf-token"] = token.value;
-      if (referrerId) request.headers["referrerID"] = referrerId;
-      if (noCache) request.headers["noCache"] = noCache;
-      if (configId) request.headers["x-config-id"] = configId;
-      if (pwaHashCookie.value) request.headers["x-pwa-edit-hash"] = pwaHashCookie.value;
-      request.headers["locale"] = locale;
-      return request;
-    });
-    client.interceptors.response.use((response) => {
-      if (response.headers["x-csrf-token"]) token.value = response.headers["x-csrf-token"];
-      return response;
-    });
-  }
-  return client;
-};
 const handleHttpError = (error) => {
   const axiosError = error;
   const data = axiosError?.response?.data?.data || axiosError?.response?.data;
@@ -44,9 +15,12 @@ const handleHttpError = (error) => {
 };
 export const httpClient = async (url, params, config) => {
   try {
-    const client = createHttpClient();
-    const { data } = await client(url, { ...config, data: params });
-    return data;
+    const client = axios.create({ withCredentials: true });
+    const response = await client(url, { ...config, data: params });
+    if (response.headers["x-csrf-token"] && response.data) {
+      response.data.csrfToken = response.headers["x-csrf-token"];
+    }
+    return response.data;
   } catch (error) {
     handleHttpError(error);
   }

package/dist/runtime/composables/useSdk.d.ts

@@ -8,5 +8,9 @@ export declare const useSdk: () => import("@vue-storefront/sdk").SDKApi<{
         context: {
             requestSender: import("@vue-storefront/sdk").RequestSender;
         };
-    } & object;
+    } & {
+        subscribers: {
+            '*_after': (payload: any) => void;
+        };
+    };
 }>;

package/dist/runtime/composables/useSdk.js

@@ -1,16 +1,46 @@
 import { initSDK, buildModule, middlewareModule } from "@vue-storefront/sdk";
 import { httpClient } from "./sdk.client.js";
-import { useRequestHeaders, useRuntimeConfig } from "#imports";
+import { useCookie, useNuxtApp, useRequestHeaders, useRuntimeConfig } from "#imports";
+import { useCsrfToken } from "./useCsrfToken.js";
 export const useSdk = () => {
-  const config = useRuntimeConfig().public.shopCore;
+  const runtimeConfig = useRuntimeConfig();
+  const moduleConfig = runtimeConfig.public.shopCore;
+  const { $router, $i18n } = useNuxtApp();
+  const locale = $i18n.locale.value;
+  const referrerId = $router.currentRoute.value.query?.ReferrerID?.toString() ?? "";
+  const noCache = runtimeConfig.public.noCache || $router.currentRoute.value.query?.noCache?.toString() || "";
+  const configId = runtimeConfig.public.configId?.toString();
+  const pwaHashCookie = useCookie("pwa");
+  const { token } = useCsrfToken();
+  const headers = {
+    ...configId && { "x-config-id": configId },
+    ...token.value && { "x-csrf-token": token.value },
+    ...pwaHashCookie.value && { "x-pwa-edit-hash": pwaHashCookie.value },
+    ...locale && { locale },
+    ...referrerId && { referrerID: referrerId },
+    ...noCache && { noCache },
+    ...useRequestHeaders()
+  };
   const sdkConfig = {
-    plentysystems: buildModule(middlewareModule, {
-      apiUrl: config.apiUrl + "/plentysystems",
-      defaultRequestConfig: {
-        headers: useRequestHeaders()
+    plentysystems: buildModule(
+      middlewareModule,
+      {
+        apiUrl: moduleConfig.apiUrl + "/plentysystems",
+        defaultRequestConfig: {
+          headers
+        },
+        httpClient
       },
-      httpClient
-    })
+      () => ({
+        subscribers: {
+          "*_after": (payload) => {
+            if (payload.csrfToken) {
+              token.value = payload.csrfToken;
+            }
+          }
+        }
+      })
+    )
   };
   return initSDK(sdkConfig);
 };

package/dist/types.d.mts

@@ -1 +1,7 @@
+import type { NuxtModule } from '@nuxt/schema'
+
+import type { default as Module } from './module.js'
+
+export type ModuleOptions = typeof Module extends NuxtModule<infer O> ? Partial<O> : Record<string, any>
+
 export { type Cookie, type CookieGroup, type CookieGroupFromNuxtConfig, type Events, type JsonCookie, type Notification, type PaymentButtonComponent, type PaymentButtonComponentProps } from './module.js'

package/dist/types.d.ts

@@ -1 +1,7 @@
+import type { NuxtModule } from '@nuxt/schema'
+
+import type { default as Module } from './module'
+
+export type ModuleOptions = typeof Module extends NuxtModule<infer O> ? Partial<O> : Record<string, any>
+
 export { type Cookie, type CookieGroup, type CookieGroupFromNuxtConfig, type Events, type JsonCookie, type Notification, type PaymentButtonComponent, type PaymentButtonComponentProps } from './module'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plentymarkets/shop-core",
-  "version": "1.6.8",
+  "version": "1.7.0",
   "description": "Core module for PlentyONE Shop",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "dist"
   ],
   "scripts": {
-    "go": "bun dev:prepare && bun prepack",
+    "go": "npm run dev:prepare && npm run prepack",
     "prepack": "nuxt-module-build build",
     "dev": "nuxi dev playground",
     "dev:build": "nuxi build playground",
@@ -42,12 +42,15 @@
     "test:types": "vue-tsc --noEmit && cd playground && vue-tsc --noEmit"
   },
   "dependencies": {
-    "@plentymarkets/shop-api": "^0.119.0",
+    "@plentymarkets/shop-api": "^0.120.0",
     "@vue-storefront/sdk": "^3.4.1",
     "js-sha256": "^0.11.0",
     "mitt": "^3.0.1",
     "resolve": "^1.22.10"
   },
+  "overrides": {
+    "prettier": "^3.6.2"
+  },
   "devDependencies": {
     "@nuxt/devtools": "^1.7.0",
     "@nuxt/eslint-config": "^0.7.6",
@@ -57,7 +60,7 @@
     "@nuxt/test-utils": "^3.19.0",
     "@nuxtjs/i18n": "9.5.4",
     "@types/node": "latest",
-    "@vitest/coverage-v8": "2.1.8",
+    "@vitest/coverage-v8": "^3.2.4",
     "@vue-storefront/eslint-config": "^4.1.0",
     "@vue/test-utils": "^2.4.6",
     "changelogen": "^0.5.7",
@@ -65,9 +68,11 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-vuejs-accessibility": "^2.4.1",
     "happy-dom": "^16.8.1",
-    "nuxt": "^3.17.4",
+    "nuxi": "3.17.2",
+    "nuxt": "3.17.4",
+    "prettier": "^3.6.2",
     "typescript": "~5.7.3",
-    "vitest": "^2.1.9",
+    "vitest": "^3.2.4",
     "vue-tsc": "^2.2.8"
   }
 }