@moonbase.sh/vue 0.2.51 → 0.2.54

package/dist/index.cjs

@@ -134,10 +134,9 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
     this.configuration = configuration;
     this.client = client;
     this.stateFactory = stateFactory;
-    this.hasUtm = (0, import_vue.computed)(() => !!this.utm.value && Object.values(this.utm.value).some((v) => !!v));
     this.currentUser = (0, import_vue.ref)(null);
     this.loadedUser = (0, import_vue.ref)(false);
-    this.debouncedPushOrderContent = debounce((order) => this.client.orders.pushContent(order, void 0, this.hasUtm.value ? this.utm.value : void 0), 500);
+    this.debouncedPushOrderContent = debounce((order) => this.client.orders.pushContent(order, void 0, this.hasUtm ? this.utm.value : void 0), 500);
     var _a;
     if (typeof window === "undefined") {
       this.currentOrder = (0, import_vue.ref)({
@@ -153,11 +152,12 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
         products: []
       });
       this.loadedStorefront = stateFactory(`${_StorefrontContextImpl.storefrontKey}_loaded`, false);
-      this.utm = stateFactory(`${_StorefrontContextImpl.storefrontKey}_utm`, void 0);
+      this.utm = stateFactory(_StorefrontContextImpl.utmKey, void 0);
       return;
     }
+    window.addEventListener("storage", (event) => this.handleStorageUpdate(event));
     const urlParams = new URLSearchParams(window.location.search);
-    this.utm = stateFactory(`${_StorefrontContextImpl.storefrontKey}_utm`, {
+    this.utm = stateFactory(_StorefrontContextImpl.utmKey, {
       referrer: ((_a = window.document.referrer) == null ? void 0 : _a.replace(/https?:\/\//g, "").split("/")[0]) || void 0,
       source: urlParams.get("utm_source") || void 0,
       medium: urlParams.get("utm_medium") || void 0,
@@ -165,7 +165,17 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
       term: urlParams.get("utm_term") || void 0,
       content: urlParams.get("utm_content") || void 0
     });
-    window.addEventListener("storage", (event) => this.handleStorageUpdate(event));
+    if (this.hasUtm) {
+      localStorage.setItem(_StorefrontContextImpl.utmKey, JSON.stringify(this.utm.value));
+    } else {
+      const cachedUtm = localStorage.getItem(_StorefrontContextImpl.utmKey);
+      if (cachedUtm) {
+        try {
+          this.utm = stateFactory(_StorefrontContextImpl.utmKey, JSON.parse(cachedUtm));
+        } catch (e) {
+        }
+      }
+    }
     const cachedOrderJson = localStorage.getItem(_StorefrontContextImpl.sessionKey);
     if (cachedOrderJson) {
       this.currentOrder = (0, import_vue.ref)(JSON.parse(cachedOrderJson));
@@ -220,6 +230,9 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
       }, { immediate: true });
     });
   }
+  get hasUtm() {
+    return !!this.utm.value && Object.values(this.utm.value).some((v) => !!v);
+  }
   get loadedUserPromise() {
     return new Promise((resolve) => {
       (0, import_vue.watch)(this.loadedUser, (isLoaded) => {
@@ -253,7 +266,7 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
     return this.currentUser.value;
   }
   async updateStorefront() {
-    const latestStorefront = await this.client.storefront.get(this.hasUtm.value ? this.utm.value : void 0);
+    const latestStorefront = await this.client.storefront.get(this.hasUtm ? this.utm.value : void 0);
     if (latestStorefront) {
       if (typeof window !== "undefined")
         localStorage.setItem(_StorefrontContextImpl.storefrontKey, JSON.stringify(latestStorefront));
@@ -306,8 +319,10 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
       items: [],
       couponsApplied: []
     };
-    if (typeof window !== "undefined")
+    if (typeof window !== "undefined") {
       localStorage.removeItem(_StorefrontContextImpl.sessionKey);
+      localStorage.removeItem(_StorefrontContextImpl.utmKey);
+    }
   }
   async surrenderOrder() {
     try {
@@ -323,6 +338,7 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
 _StorefrontContextImpl.userKey = "moonbase_user";
 _StorefrontContextImpl.sessionKey = "moonbase_session";
 _StorefrontContextImpl.storefrontKey = "moonbase_storefront";
+_StorefrontContextImpl.utmKey = "moonbase_utm";
 var StorefrontContextImpl = _StorefrontContextImpl;
 
 // src/index.ts
@@ -647,7 +663,7 @@ function useCart(context) {
       const absoluteReturnUrl = new URL((_a = options.returnUrl) != null ? _a : fallbackPath, document.baseURI).href;
       const updatedOrder = await storefront.client.orders.pushContent(storefront.currentOrder.value, {
         returnUrl: absoluteReturnUrl
-      });
+      }, storefront.hasUtm ? storefront.utm.value : void 0);
       if (!options.redirect && updatedOrder.embeddedCheckoutUrl && typeof window !== "undefined") {
         const embeddedUrl = updatedOrder.embeddedCheckoutUrl;
         return new Promise((resolve) => {

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as _moonbase_sh_storefront_api from '@moonbase.sh/storefront-api';
-import { MoonbaseConfiguration, Storefront, Order, User, MoonbaseClient, CompletedOrder, StorefrontBundle, StorefrontProduct, ActivationMethod, Activation, Download, ActivationRequest, PricingVariation, CommunicationPreferences, LineItem } from '@moonbase.sh/storefront-api';
+import { MoonbaseConfiguration, Storefront, Order, User, UrchinTrackingModule, MoonbaseClient, CompletedOrder, StorefrontBundle, StorefrontProduct, ActivationMethod, Activation, Download, ActivationRequest, PricingVariation, CommunicationPreferences, LineItem } from '@moonbase.sh/storefront-api';
 export * from '@moonbase.sh/storefront-api';
 import * as vue from 'vue';
 import { Plugin, Ref, App, UnwrapRef, InjectionKey } from 'vue';
@@ -15,6 +15,8 @@ interface StorefrontContext extends Pick<Plugin, keyof Plugin> {
     currentUser: Ref<User | null>;
     loadedUser: Ref<boolean>;
     loadedUserPromise: Promise<void>;
+    utm: Ref<UrchinTrackingModule | undefined>;
+    hasUtm: boolean;
     client: MoonbaseClient;
     updateUser: () => Promise<User | null>;
     updateStorefront: () => Promise<Storefront>;
@@ -643,12 +645,12 @@ declare function useCart(context?: StorefrontContext): {
         variationId: string;
         bundleId: string;
         price?: Record<string, number> | undefined;
+        partial?: boolean | undefined;
         bundle?: {
             id: string;
             name: string;
             tagline: string;
             iconUrl: string | null;
-            partial: boolean;
             products: ({
                 id: string;
                 name: string;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _moonbase_sh_storefront_api from '@moonbase.sh/storefront-api';
-import { MoonbaseConfiguration, Storefront, Order, User, MoonbaseClient, CompletedOrder, StorefrontBundle, StorefrontProduct, ActivationMethod, Activation, Download, ActivationRequest, PricingVariation, CommunicationPreferences, LineItem } from '@moonbase.sh/storefront-api';
+import { MoonbaseConfiguration, Storefront, Order, User, UrchinTrackingModule, MoonbaseClient, CompletedOrder, StorefrontBundle, StorefrontProduct, ActivationMethod, Activation, Download, ActivationRequest, PricingVariation, CommunicationPreferences, LineItem } from '@moonbase.sh/storefront-api';
 export * from '@moonbase.sh/storefront-api';
 import * as vue from 'vue';
 import { Plugin, Ref, App, UnwrapRef, InjectionKey } from 'vue';
@@ -15,6 +15,8 @@ interface StorefrontContext extends Pick<Plugin, keyof Plugin> {
     currentUser: Ref<User | null>;
     loadedUser: Ref<boolean>;
     loadedUserPromise: Promise<void>;
+    utm: Ref<UrchinTrackingModule | undefined>;
+    hasUtm: boolean;
     client: MoonbaseClient;
     updateUser: () => Promise<User | null>;
     updateStorefront: () => Promise<Storefront>;
@@ -643,12 +645,12 @@ declare function useCart(context?: StorefrontContext): {
         variationId: string;
         bundleId: string;
         price?: Record<string, number> | undefined;
+        partial?: boolean | undefined;
         bundle?: {
             id: string;
             name: string;
             tagline: string;
             iconUrl: string | null;
-            partial: boolean;
             products: ({
                 id: string;
                 name: string;

package/dist/index.js

@@ -4,7 +4,7 @@ import { ref as ref2 } from "vue";
 
 // src/context.ts
 import { v4 as uuidv4 } from "uuid";
-import { computed, ref, watch } from "vue";
+import { ref, watch } from "vue";
 import { NotAuthenticatedError, NotFoundError, OrderStatus } from "@moonbase.sh/storefront-api";
 
 // src/symbols.ts
@@ -99,10 +99,9 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
     this.configuration = configuration;
     this.client = client;
     this.stateFactory = stateFactory;
-    this.hasUtm = computed(() => !!this.utm.value && Object.values(this.utm.value).some((v) => !!v));
     this.currentUser = ref(null);
     this.loadedUser = ref(false);
-    this.debouncedPushOrderContent = debounce((order) => this.client.orders.pushContent(order, void 0, this.hasUtm.value ? this.utm.value : void 0), 500);
+    this.debouncedPushOrderContent = debounce((order) => this.client.orders.pushContent(order, void 0, this.hasUtm ? this.utm.value : void 0), 500);
     var _a;
     if (typeof window === "undefined") {
       this.currentOrder = ref({
@@ -118,11 +117,12 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
         products: []
       });
       this.loadedStorefront = stateFactory(`${_StorefrontContextImpl.storefrontKey}_loaded`, false);
-      this.utm = stateFactory(`${_StorefrontContextImpl.storefrontKey}_utm`, void 0);
+      this.utm = stateFactory(_StorefrontContextImpl.utmKey, void 0);
       return;
     }
+    window.addEventListener("storage", (event) => this.handleStorageUpdate(event));
     const urlParams = new URLSearchParams(window.location.search);
-    this.utm = stateFactory(`${_StorefrontContextImpl.storefrontKey}_utm`, {
+    this.utm = stateFactory(_StorefrontContextImpl.utmKey, {
       referrer: ((_a = window.document.referrer) == null ? void 0 : _a.replace(/https?:\/\//g, "").split("/")[0]) || void 0,
       source: urlParams.get("utm_source") || void 0,
       medium: urlParams.get("utm_medium") || void 0,
@@ -130,7 +130,17 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
       term: urlParams.get("utm_term") || void 0,
       content: urlParams.get("utm_content") || void 0
     });
-    window.addEventListener("storage", (event) => this.handleStorageUpdate(event));
+    if (this.hasUtm) {
+      localStorage.setItem(_StorefrontContextImpl.utmKey, JSON.stringify(this.utm.value));
+    } else {
+      const cachedUtm = localStorage.getItem(_StorefrontContextImpl.utmKey);
+      if (cachedUtm) {
+        try {
+          this.utm = stateFactory(_StorefrontContextImpl.utmKey, JSON.parse(cachedUtm));
+        } catch (e) {
+        }
+      }
+    }
     const cachedOrderJson = localStorage.getItem(_StorefrontContextImpl.sessionKey);
     if (cachedOrderJson) {
       this.currentOrder = ref(JSON.parse(cachedOrderJson));
@@ -185,6 +195,9 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
       }, { immediate: true });
     });
   }
+  get hasUtm() {
+    return !!this.utm.value && Object.values(this.utm.value).some((v) => !!v);
+  }
   get loadedUserPromise() {
     return new Promise((resolve) => {
       watch(this.loadedUser, (isLoaded) => {
@@ -218,7 +231,7 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
     return this.currentUser.value;
   }
   async updateStorefront() {
-    const latestStorefront = await this.client.storefront.get(this.hasUtm.value ? this.utm.value : void 0);
+    const latestStorefront = await this.client.storefront.get(this.hasUtm ? this.utm.value : void 0);
     if (latestStorefront) {
       if (typeof window !== "undefined")
         localStorage.setItem(_StorefrontContextImpl.storefrontKey, JSON.stringify(latestStorefront));
@@ -271,8 +284,10 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
       items: [],
       couponsApplied: []
     };
-    if (typeof window !== "undefined")
+    if (typeof window !== "undefined") {
       localStorage.removeItem(_StorefrontContextImpl.sessionKey);
+      localStorage.removeItem(_StorefrontContextImpl.utmKey);
+    }
   }
   async surrenderOrder() {
     try {
@@ -288,6 +303,7 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
 _StorefrontContextImpl.userKey = "moonbase_user";
 _StorefrontContextImpl.sessionKey = "moonbase_session";
 _StorefrontContextImpl.storefrontKey = "moonbase_storefront";
+_StorefrontContextImpl.utmKey = "moonbase_utm";
 var StorefrontContextImpl = _StorefrontContextImpl;
 
 // src/index.ts
@@ -612,7 +628,7 @@ function useCart(context) {
       const absoluteReturnUrl = new URL((_a = options.returnUrl) != null ? _a : fallbackPath, document.baseURI).href;
       const updatedOrder = await storefront.client.orders.pushContent(storefront.currentOrder.value, {
         returnUrl: absoluteReturnUrl
-      });
+      }, storefront.hasUtm ? storefront.utm.value : void 0);
       if (!options.redirect && updatedOrder.embeddedCheckoutUrl && typeof window !== "undefined") {
         const embeddedUrl = updatedOrder.embeddedCheckoutUrl;
         return new Promise((resolve) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/vue",
   "type": "module",
-  "version": "0.2.51",
+  "version": "0.2.54",
   "description": "Package to let you build vue.js storefronts with Moonbase.sh as payment and delivery provider",
   "author": "Tobias Lønnerød Madsen <m@dsen.tv>",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@vue/devtools-api": "^6.6.3",
     "uuid": "^9.0.1",
     "zod": "^3.23.8",
-    "@moonbase.sh/storefront-api": "0.2.51"
+    "@moonbase.sh/storefront-api": "0.2.54"
   },
   "devDependencies": {
     "@types/uuid": "^9.0.8",