@vue-storefront/nuxt 3.0.3 → 3.1.1

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.0.0"
   },
-  "version": "3.0.3"
+  "version": "3.1.1"
 }

package/dist/module.mjs

@@ -1,5 +1,6 @@
 import { defineNuxtModule, createResolver, addTypeTemplate, addImports, addTemplate, addPluginTemplate, addImportsSources } from '@nuxt/kit';
 import { genInlineTypeImport } from 'knitwork';
+import { defu } from 'defu';
 
 const module = defineNuxtModule({
   meta: {
@@ -22,6 +23,10 @@ const module = defineNuxtModule({
     const projectRootResolver = createResolver(projectLayer.config.rootDir);
     const buildDirResolver = createResolver(nuxt.options.buildDir);
     const localResolver = createResolver(import.meta.url);
+    nuxt.options.runtimeConfig.public.vsf = defu(
+      nuxt.options.runtimeConfig.public?.vsf,
+      options
+    );
     nuxt.options.app.head.meta = [
       ...nuxt.options.app.head.meta ?? [],
       {

package/dist/runtime/defineSdkConfig.template

@@ -1,11 +1,17 @@
-import { buildModule } from "@vue-storefront/sdk";
+import { buildModule, middlewareModule } from "@vue-storefront/sdk";
 import { composeMiddlewareUrl, useNuxtApp, useRequestHeaders } from "#imports";
 import { SdkModuleOptions } from "./vsfModule";
 
 type InjectedContext = {
   buildModule: typeof buildModule;
+  middlewareModule: typeof middlewareModule;
   middlewareUrl: string;
+  /**
+   * @deprecated
+   * Use `getRequestHeaders` instead.
+   */
   getCookieHeader: () => Record<string, string>;
+  getRequestHeaders: () => Record<string, string>;
 };
 
 type Config<TConfig> = (context: InjectedContext) => TConfig;
@@ -23,18 +29,15 @@ const moduleConfig: SdkModuleOptions = <%= options.moduleConfig %>;
   *   contentfulModule,
   *   ContentfulModuleType,
   * } from "@vsf-enterprise/contentful-sdk";
-  * import { unifiedModule } from "@vsf-enterprise/unified-sdk";
-  * import type { UnifiedApiExtension } from "../storefront-middleware/middleware.config";
-  * 
+  * import type { UnifiedApiEndpoints } from "../storefront-middleware/types";
+  *
   * export default defineSdkConfig(
-  *   ({ buildModule, middlewareUrl, getCookieHeader }) => ({
-  *     unified: buildModule(unifiedModule<UnifiedApiExtension>, {
+  *   ({ buildModule, middlewareModule, middlewareUrl, getCookieHeader }) => ({
+  *     unified: buildModule(middlewareModule<UnifiedApiEndpoints>, {
   *       apiUrl: middlewareUrl + "/commerce",
-  *       requestOptions: {
-  *         headers: getCookieHeader,
-  *       },
+  *       defaultRequestConfig: { headers: { ...getCookieHeader() } },
   *     }),
-  *     contentful: buildModule<ContentfulModuleType>(contentfulModule, {
+  *     contentful: buildModule(contentfulModule, {
   *       apiUrl: middlewareUrl + "/cntf",
   *     }),
   *   }),
@@ -45,24 +48,22 @@ export function defineSdkConfig<TConfig>(config: Config<TConfig>) {
   return () => {
     const nuxtApp = useNuxtApp()
     const runtimeConfig = useRuntimeConfig();
-    const { middleware, multistore } = runtimeConfig.public;
-    const resolvedOptions = {
-      middleware: middleware ?? moduleConfig.middleware,
-      multistore: multistore ?? moduleConfig.multistore,
-    }
 
     const requestHeaders = useRequestHeaders(["x-forwarded-host", "host"]);
     const middlewareUrl = composeMiddlewareUrl({
-      options: resolvedOptions,
+      options: runtimeConfig.public.vsf,
       headers: requestHeaders,
     });
 
     const getCookieHeader = () => useRequestHeaders(["cookie"]);
+    const getRequestHeaders = () => useRequestHeaders();
 
     return config({
       buildModule,
+      middlewareModule,
       middlewareUrl,
-      getCookieHeader
+      getCookieHeader,
+      getRequestHeaders
     });
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/nuxt",
-  "version": "3.0.3",
+  "version": "3.1.1",
   "description": "Vue Storefront dedicated features for Nuxt",
   "license": "MIT",
   "type": "module",
@@ -20,26 +20,25 @@
     "build": "nuxt-module-build build && yarn build:app",
     "build:app": "cd __tests__/app && yarn build",
     "dev": "cd __tests__/app && yarn dev",
-    "dev:middleware": "cd ../../shared/src/__tests__/middleware && yarn dev",
+    "dev:middleware": "cd ../shared/src/__tests__/middleware && yarn dev",
     "lint": "eslint --ext .vue,.js,.ts .",
-    "test": "start-server-and-test dev:middleware localhost:4000/test_integration/success dev localhost:3000/ssr \"yarn test:e2e\"",
-    "test:e2e": "cd ../../shared/ && yarn test:e2e",
+    "test:e2e:run": "start-server-and-test dev:middleware localhost:4000/test_integration/getSuccess dev localhost:3000/ssr \"yarn test:e2e\"",
+    "test:e2e": "cd ../shared/ && yarn test:e2e",
     "test:watch": "vitest watch",
     "prepare": "nuxi prepare"
   },
   "dependencies": {
     "@nuxt/kit": "^3.7.4",
     "@nuxt/schema": "^3.7.4",
-    "@vue-storefront/sdk": "^1.0.0",
-    "knitwork": "^1.0.0"
+    "@vue-storefront/sdk": "^1.4.0",
+    "knitwork": "^1.0.0",
+    "defu": "^6.0.0"
   },
   "devDependencies": {
     "@types/node": "^18.11.17",
     "@nuxt/devtools": "^1.0.0",
     "@nuxt/module-builder": "0.5.2",
-    "@nuxt/schema": "3.7.4",
     "@nuxt/test-utils": "3.7.4",
-    "@vue-storefront/sdk": "*",
     "nuxt": "3.7.4",
     "start-server-and-test": "^2.0.3",
     "vitest": "^0.34.6"

package/CHANGELOG.md

@@ -1,17 +0,0 @@
-# Change log
-
-## 3.0.3
-
-- **[CHANGED]** `@nuxt/kit` locked `3.7.4` version to `@nuxt/kit@^3.7.4`
-
-## 3.0.2
-
-- **[FIXED]** Multi-store URL calculation, now working correctly in the browser.
-
-## 3.0.1
-
-- **[CHANGED]** Set `@vue-storefront/sdk` as a dependency instead of a peer dependency
-
-## 3.0.0
-
-- **[BREAKING]** Rewritten from scratch. Now the package exports a Nuxt module which allows to initialize the Vue Storefront SDK.