@vue-storefront/next 1.0.1 → 1.1.0

package/CHANGELOG.md

@@ -1,9 +1,39 @@
 # Change log
 
+## 1.1.0
+
+- **[ADDED]** `middlewareModule` to `createSdk` params.
+
+```diff [sdk.config.ts]
+- import { UnifiedApiExtension } from "storefront-middleware/types"
++ import { UnifiedEndpoints } from "storefront-middleware/types"
+
+export const { getSdk } = createSdk(
+  options,
+-  ({ buildModule, middlewareUrl, getRequestHeaders }) => ({
+-    commerce: buildModule(unifiedModule<UnifiedApiExtension>, {
+-      apiUrl: `${middlewareUrl}/commerce`,
+-      requestOptions: {
+-        headers: getRequestHeaders,
++  ({ buildModule, middlewareModule, middlewareUrl, getRequestHeaders }) => ({
++    commerce: buildModule(middlewareModule<UnifiedEndpoints>, {
++      apiUrl: `${middlewareUrl}/commerce`,
++      defaultRequestConfig: {
++        headers: getRequestHeaders(),
+      },
+    }),
+  })
+);
+```
+
+## 1.0.2
+
+- **[FIXED]** Multi-store URL calculation, now working correctly in the browser.
+
 ## 1.0.1
 
 - **[CHANGED]** Set `@vue-storefront/sdk` as a dependency instead of a peer dependency
 
 ## 1.0.0
 
-- Initialized the package
+- Initialized the package

package/dist/client.d.mts

@@ -1,6 +1,6 @@
 import { SDKApi } from '@vue-storefront/sdk';
 import React from 'react';
-import { S as SdkProviderProps } from './types-m9jwrtV3.mjs';
+import { S as SdkProviderProps } from './types-C6rAwI5a.mjs';
 
 /**
  * Creates a new SDK context. This function is dedicated for the client-side usage.

package/dist/client.d.ts

@@ -1,6 +1,6 @@
 import { SDKApi } from '@vue-storefront/sdk';
 import React from 'react';
-import { S as SdkProviderProps } from './types-m9jwrtV3.js';
+import { S as SdkProviderProps } from './types-C6rAwI5a.js';
 
 /**
  * Creates a new SDK context. This function is dedicated for the client-side usage.

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { C as Config, a as CreateSdkReturn } from './types-m9jwrtV3.mjs';
+import { C as Config, a as CreateSdkReturn } from './types-C6rAwI5a.mjs';
 import '@vue-storefront/sdk';
 import 'react';
 
@@ -34,13 +34,9 @@ interface CreateSdkOptions {
  * @returns An object containing the `getSdk` function.
  * @example
  * ```tsx
- * import {
- *   contentfulModule,
- *   ContentfulModuleType,
- * } from "@vsf-enterprise/contentful-sdk";
- * import { unifiedModule } from "@vsf-enterprise/unified-sdk";
+ * import { contentfulModule } from "@vsf-enterprise/contentful-sdk";
  * import { CreateSdkOptions, createSdk } from "@vue-storefront/next";
- * import type { UnifiedApiExtension } from "../storefront-middleware/middleware.config";
+ * import type { UnifiedApiEndpoints } from "../storefront-middleware/types";
  *
  * const options: CreateSdkOptions = {
  *   middleware: {
@@ -50,14 +46,14 @@ interface CreateSdkOptions {
  *
  * export const { getSdk, createSdkContext } = createSdk(
  *   options,
- *   ({ buildModule, middlewareUrl, getRequestHeaders }) => ({
- *     unified: buildModule(unifiedModule<UnifiedApiExtension>, {
+ *   ({ buildModule, middlewareModule, middlewareUrl, getRequestHeaders }) => ({
+ *     unified: buildModule(middlewareModule<UnifiedApiEndpoints>, {
  *       apiUrl: middlewareUrl + "/commerce",
- *       requestOptions: {
- *         headers: getRequestHeaders,
+ *       defaultRequestConfig: {
+ *         headers: getRequestHeaders(),
  *       },
  *     }),
- *     contentful: buildModule<ContentfulModuleType>(contentfulModule, {
+ *     contentful: buildModule(contentfulModule, {
  *       apiUrl: middlewareUrl + "/cntf",
  *     }),
  *   }),

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { C as Config, a as CreateSdkReturn } from './types-m9jwrtV3.js';
+import { C as Config, a as CreateSdkReturn } from './types-C6rAwI5a.js';
 import '@vue-storefront/sdk';
 import 'react';
 
@@ -34,13 +34,9 @@ interface CreateSdkOptions {
  * @returns An object containing the `getSdk` function.
  * @example
  * ```tsx
- * import {
- *   contentfulModule,
- *   ContentfulModuleType,
- * } from "@vsf-enterprise/contentful-sdk";
- * import { unifiedModule } from "@vsf-enterprise/unified-sdk";
+ * import { contentfulModule } from "@vsf-enterprise/contentful-sdk";
  * import { CreateSdkOptions, createSdk } from "@vue-storefront/next";
- * import type { UnifiedApiExtension } from "../storefront-middleware/middleware.config";
+ * import type { UnifiedApiEndpoints } from "../storefront-middleware/types";
  *
  * const options: CreateSdkOptions = {
  *   middleware: {
@@ -50,14 +46,14 @@ interface CreateSdkOptions {
  *
  * export const { getSdk, createSdkContext } = createSdk(
  *   options,
- *   ({ buildModule, middlewareUrl, getRequestHeaders }) => ({
- *     unified: buildModule(unifiedModule<UnifiedApiExtension>, {
+ *   ({ buildModule, middlewareModule, middlewareUrl, getRequestHeaders }) => ({
+ *     unified: buildModule(middlewareModule<UnifiedApiEndpoints>, {
  *       apiUrl: middlewareUrl + "/commerce",
- *       requestOptions: {
- *         headers: getRequestHeaders,
+ *       defaultRequestConfig: {
+ *         headers: getRequestHeaders(),
  *       },
  *     }),
- *     contentful: buildModule<ContentfulModuleType>(contentfulModule, {
+ *     contentful: buildModule(contentfulModule, {
  *       apiUrl: middlewareUrl + "/cntf",
  *     }),
  *   }),

package/dist/index.js

@@ -45,18 +45,23 @@ function calculateMiddlewareUrl({
   options,
   headers
 }) {
-  var _a, _b;
+  var _a, _b, _c;
   const { apiUrl, ssrApiUrl } = options.middleware;
   if (typeof window !== "undefined") {
+    if ((_a = options.multistore) == null ? void 0 : _a.enabled) {
+      const url2 = new URL(apiUrl);
+      url2.host = window.location.host;
+      return url2.href;
+    }
     return apiUrl;
   }
   if (ssrApiUrl) {
     return ssrApiUrl;
   }
-  if (!((_a = options.multistore) == null ? void 0 : _a.enabled)) {
+  if (!((_b = options.multistore) == null ? void 0 : _b.enabled)) {
     return apiUrl;
   }
-  const forwardedHost = (_b = headers["x-forwarded-host"]) != null ? _b : headers.host;
+  const forwardedHost = (_c = headers["x-forwarded-host"]) != null ? _c : headers.host;
   const resolvedForwardedHost = forwardedHost && Array.isArray(forwardedHost) ? forwardedHost[0] : forwardedHost;
   const url = new URL(apiUrl);
   url.host = resolvedForwardedHost || new URL(apiUrl).host;
@@ -106,6 +111,7 @@ function createSdk(options, configDefinition) {
     });
     const resolvedConfig = configDefinition({
       buildModule: import_sdk.buildModule,
+      middlewareModule: import_sdk.middlewareModule,
       getRequestHeaders,
       middlewareUrl
     });

package/dist/index.mjs

@@ -8,18 +8,23 @@ function calculateMiddlewareUrl({
   options,
   headers
 }) {
-  var _a, _b;
+  var _a, _b, _c;
   const { apiUrl, ssrApiUrl } = options.middleware;
   if (typeof window !== "undefined") {
+    if ((_a = options.multistore) == null ? void 0 : _a.enabled) {
+      const url2 = new URL(apiUrl);
+      url2.host = window.location.host;
+      return url2.href;
+    }
     return apiUrl;
   }
   if (ssrApiUrl) {
     return ssrApiUrl;
   }
-  if (!((_a = options.multistore) == null ? void 0 : _a.enabled)) {
+  if (!((_b = options.multistore) == null ? void 0 : _b.enabled)) {
     return apiUrl;
   }
-  const forwardedHost = (_b = headers["x-forwarded-host"]) != null ? _b : headers.host;
+  const forwardedHost = (_c = headers["x-forwarded-host"]) != null ? _c : headers.host;
   const resolvedForwardedHost = forwardedHost && Array.isArray(forwardedHost) ? forwardedHost[0] : forwardedHost;
   const url = new URL(apiUrl);
   url.host = resolvedForwardedHost || new URL(apiUrl).host;
@@ -37,7 +42,7 @@ function composeMiddlewareUrl({
 }
 
 // src/sdk/index.tsx
-import { buildModule, initSDK } from "@vue-storefront/sdk";
+import { buildModule, initSDK, middlewareModule } from "@vue-storefront/sdk";
 
 // src/sdk/helpers/resolveDynamicContext.ts
 var BLACKLISTED_HEADERS = /* @__PURE__ */ new Set(["host"]);
@@ -69,6 +74,7 @@ function createSdk(options, configDefinition) {
     });
     const resolvedConfig = configDefinition({
       buildModule,
+      middlewareModule,
       getRequestHeaders,
       middlewareUrl
     });

package/dist/{types-m9jwrtV3.d.mts → types-C6rAwI5a.d.mts}

@@ -1,4 +1,4 @@
-import { SDKApi, buildModule } from '@vue-storefront/sdk';
+import { SDKApi, buildModule, middlewareModule } from '@vue-storefront/sdk';
 import { ReactNode } from 'react';
 
 type GetSdkContext = {
@@ -12,6 +12,7 @@ type DynamicContext = {
 };
 type StaticContext = {
     buildModule: typeof buildModule;
+    middlewareModule: typeof middlewareModule;
     middlewareUrl: string;
 };
 type InjectedContext = DynamicContext & StaticContext;

package/dist/{types-m9jwrtV3.d.ts → types-C6rAwI5a.d.ts}

@@ -1,4 +1,4 @@
-import { SDKApi, buildModule } from '@vue-storefront/sdk';
+import { SDKApi, buildModule, middlewareModule } from '@vue-storefront/sdk';
 import { ReactNode } from 'react';
 
 type GetSdkContext = {
@@ -12,6 +12,7 @@ type DynamicContext = {
 };
 type StaticContext = {
     buildModule: typeof buildModule;
+    middlewareModule: typeof middlewareModule;
     middlewareUrl: string;
 };
 type InjectedContext = DynamicContext & StaticContext;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@vue-storefront/next",
   "description": "Vue Storefront dedicated features for Next.js",
   "license": "MIT",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "exports": {
     ".": {
       "import": "./dist/index.mjs",
@@ -36,14 +36,14 @@
     "dev:pages-router": "cd __tests__/apps/pages-router && yarn dev",
     "dev:middleware": "cd ../../shared/src/__tests__/middleware && yarn dev",
     "lint": "eslint . --ext .ts",
-    "test:app-router": "start-server-and-test dev:middleware localhost:4000/test_integration/success dev:app-router localhost:3000 \"yarn test:e2e\"",
-    "test:pages-router": "start-server-and-test dev:middleware localhost:4000/test_integration/success dev:pages-router localhost:3000 \"yarn test:e2e\"",
+    "test:app-router": "start-server-and-test dev:middleware localhost:4000/test_integration/getSuccess dev:app-router localhost:3000 \"yarn test:e2e\"",
+    "test:pages-router": "start-server-and-test dev:middleware localhost:4000/test_integration/getSuccess dev:pages-router localhost:3000 \"yarn test:e2e\"",
     "test": "yarn test:app-router && yarn test:pages-router",
     "test:e2e": "cd ../../shared/ && yarn test:e2e",
     "test:unit": "vitest run"
   },
   "dependencies": {
-    "@vue-storefront/sdk": "^1.0.0"
+    "@vue-storefront/sdk": "^1.4.0"
   },
   "devDependencies": {
     "@types/react": "^18.2.31",