@weaverse/hydrogen 5.14.1 → 5.15.1

package/dist/index.d.mts

@@ -293,6 +293,7 @@ declare function withWeaverse(Component: ComponentType<any>, options?: WithWeave
  */
 declare function useThemeSettings<T = HydrogenThemeSettings>(): T;
 
+type BuilderApiCacheTarget = 'custom-pages' | 'merchant-overrides' | 'project' | 'theme-settings';
 declare class WeaverseClient {
     API: "v1";
     basePageConfigs: Omit<WeaverseProjectConfigs, 'requestInfo'>;
@@ -413,6 +414,7 @@ declare class WeaverseClient {
      * ```
      */
     fetchWithCache: <T = unknown>(url: string, options?: RequestInit & {
+        cacheTarget?: BuilderApiCacheTarget;
         strategy?: CachingStrategy;
     }) => Promise<T>;
     /**

package/dist/index.d.ts

@@ -293,6 +293,7 @@ declare function withWeaverse(Component: ComponentType<any>, options?: WithWeave
  */
 declare function useThemeSettings<T = HydrogenThemeSettings>(): T;
 
+type BuilderApiCacheTarget = 'custom-pages' | 'merchant-overrides' | 'project' | 'theme-settings';
 declare class WeaverseClient {
     API: "v1";
     basePageConfigs: Omit<WeaverseProjectConfigs, 'requestInfo'>;
@@ -413,6 +414,7 @@ declare class WeaverseClient {
      * ```
      */
     fetchWithCache: <T = unknown>(url: string, options?: RequestInit & {
+        cacheTarget?: BuilderApiCacheTarget;
         strategy?: CachingStrategy;
     }) => Promise<T>;
     /**

package/dist/index.js

@@ -529,8 +529,8 @@ function getQueriesFromSearch(search) {
   }
   return queries;
 }
-function normalizeDesignModeRequestInfo(params, browserLocation = getBrowserLocation()) {
-  if (!(params.isDesignMode && browserLocation)) {
+function normalizeRequestInfo(params, browserLocation = getBrowserLocation()) {
+  if (!browserLocation) {
     return params;
   }
   let { pathname, search } = browserLocation;
@@ -547,6 +547,27 @@ function normalizeDesignModeRequestInfo(params, browserLocation = getBrowserLoca
     }
   };
 }
+
+// src/utils/sync-reused-instance.ts
+function syncReusedInstance(weaverse, params) {
+  weaverse.requestInfo = params.requestInfo;
+  weaverse.internal = params.internal;
+  let dataChanged = JSON.stringify(weaverse.data) !== JSON.stringify(params.data);
+  let contextChanged = JSON.stringify(weaverse.dataContext ?? null) !== JSON.stringify(params.dataContext ?? null);
+  if (contextChanged) {
+    weaverse.dataContext = params.dataContext ?? null;
+  }
+  if (dataChanged) {
+    weaverse.setProjectData(params.data);
+  } else if (contextChanged) {
+    for (const { id } of params.data?.items || []) {
+      weaverse.itemInstances.get(id)?.setData({});
+    }
+  }
+  if (dataChanged || contextChanged) {
+    weaverse.triggerUpdate();
+  }
+}
 var ThemeSettingsStore = class {
   settings = {};
   schema;
@@ -651,6 +672,24 @@ function useThemeSettingsStore() {
 }
 
 // src/utils/use-studio.ts
+var STUDIO_READY_POLL_MS = 50;
+var STUDIO_READY_TIMEOUT_MS = 5e3;
+function waitForStudio() {
+  return new Promise((resolve) => {
+    let startedAt = Date.now();
+    function check() {
+      if (hasWeaverseStudio(window)) {
+        return resolve(window.weaverseStudio);
+      }
+      if (Date.now() - startedAt >= STUDIO_READY_TIMEOUT_MS) {
+        console.warn("[Weaverse] Studio script did not initialize in time");
+        return resolve(null);
+      }
+      setTimeout(check, STUDIO_READY_POLL_MS);
+    }
+    check();
+  });
+}
 function useStudio(weaverse) {
   let { revalidate } = reactRouter.useRevalidator();
   let navigation = reactRouter.useNavigation();
@@ -680,11 +719,7 @@ function useStudio(weaverse) {
           themeTextStore
         };
         let studioSrc = `${weaverseHost}/static/studio/hydrogen/index.js?v=${weaverseVersion}`;
-        react.loadScript(studioSrc).then(() => {
-          if (hasWeaverseStudio(window)) {
-            window.weaverseStudio.init(weaverse);
-          }
-        }).catch(console.error);
+        react.loadScript(studioSrc).then(waitForStudio).then((studio) => studio?.init(weaverse)).catch(console.error);
       }
     }
   }, [pathname, search, navigation.state]);
@@ -866,19 +901,20 @@ var WeaverseHydrogen = class extends react.Weaverse {
   };
 };
 function createWeaverseInstance(params) {
-  const normalizedParams = normalizeDesignModeRequestInfo(params);
+  const normalizedParams = normalizeRequestInfo(params);
   if (react.isBrowser) {
     window.__weaverses = window.__weaverses || {};
-    let weaverse = window.__weaverses[normalizedParams.pageId];
-    if (!weaverse || weaverse?.requestInfo?.pathname !== normalizedParams.requestInfo.pathname || weaverse?.requestInfo?.search !== normalizedParams.requestInfo.search) {
-      weaverse = new WeaverseHydrogen(normalizedParams);
-      window.__weaverses[normalizedParams.pageId] = weaverse;
-    }
-    if (weaverse?.isDesignMode) {
+    const existing = window.__weaverses[normalizedParams.pageId];
+    const isReused = existing?.requestInfo?.pathname === normalizedParams.requestInfo.pathname && existing?.requestInfo?.search === normalizedParams.requestInfo.search;
+    const weaverse = isReused ? existing : new WeaverseHydrogen(normalizedParams);
+    window.__weaverses[normalizedParams.pageId] = weaverse;
+    if (weaverse.isDesignMode) {
       weaverse.requestInfo = normalizedParams.requestInfo;
       if (hasWeaverseStudio(window)) {
         window.weaverseStudio.refreshStudio(normalizedParams);
       }
+    } else if (isReused) {
+      syncReusedInstance(weaverse, normalizedParams);
     }
     return weaverse;
   }
@@ -994,20 +1030,54 @@ function useThemeSettings() {
   );
   return settings;
 }
+
+// src/utils/normalize-page-url.ts
+var KEPT_PARAM_RE = /^(?:__revisionId|isDesignMode|weaverse)/;
+function normalizePageUrl(url) {
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    return url;
+  }
+  const kept = [...parsed.searchParams].filter(
+    ([key]) => KEPT_PARAM_RE.test(key)
+  );
+  kept.sort(([a], [b]) => a.localeCompare(b));
+  const search = new URLSearchParams(kept).toString();
+  return `${parsed.origin}${parsed.pathname}${search ? `?${search}` : ""}`;
+}
+
+// src/weaverse-client.ts
 var CACHE_DURATIONS = {
-  /** Short cache for frequently changing content (10 seconds) */
-  SHORT: 10,
-  /** Long cache duration - 23 hours to maximize CDN hits before daily refresh */
-  LONG: 82800
+  /** Short browser freshness for content that can change in Builder */
+  SHORT: 60,
+  /** Shared cache freshness for anonymous storefront traffic */
+  SHARED_SHORT: 300,
+  /** Long stale window so slow Builder responses do not block storefront rendering */
+  LONG: 86400,
+  /** Extra freshness for sitemap-like index data */
+  STATIC: 3600
 };
 var DEFAULT_FETCH_TIMEOUT_MS = 1e4;
 var API_PATH = "v1";
 var DEFAULT_CACHE_STRATEGY = {
   maxAge: CACHE_DURATIONS.SHORT,
-  sMaxAge: CACHE_DURATIONS.SHORT,
+  sMaxAge: CACHE_DURATIONS.SHARED_SHORT,
   staleWhileRevalidate: CACHE_DURATIONS.LONG,
   staleIfError: CACHE_DURATIONS.LONG
 };
+var SMART_CACHE_STRATEGIES = {
+  project: DEFAULT_CACHE_STRATEGY,
+  "theme-settings": DEFAULT_CACHE_STRATEGY,
+  "merchant-overrides": DEFAULT_CACHE_STRATEGY,
+  "custom-pages": {
+    maxAge: CACHE_DURATIONS.SHORT,
+    sMaxAge: CACHE_DURATIONS.STATIC,
+    staleWhileRevalidate: CACHE_DURATIONS.LONG,
+    staleIfError: CACHE_DURATIONS.LONG
+  }
+};
 var WeaverseClient = class {
   API = API_PATH;
   basePageConfigs;
@@ -1349,19 +1419,23 @@ var WeaverseClient = class {
    * ```
    */
   fetchWithCache = async (url, options = {}) => {
-    const strategy = options.strategy || hydrogen.CacheCustom(DEFAULT_CACHE_STRATEGY);
+    const { cacheTarget, strategy: strategyOverride, ...fetchOptions } = options;
+    const strategy = strategyOverride || hydrogen.CacheCustom(
+      cacheTarget ? SMART_CACHE_STRATEGIES[cacheTarget] : DEFAULT_CACHE_STRATEGY
+    );
     const cacheKey = [
       "weaverse-fetch",
       url,
       options.method || "GET",
-      options.body,
-      this.configs.projectId
+      fetchOptions.body,
+      this.configs.projectId,
+      cacheTarget || "default"
     ];
     let result;
-    if (this.configs.isDesignMode) {
-      result = await this.directFetch(url, options);
+    if (this.configs.isDesignMode || this.configs.isRevisionPreview) {
+      result = await this.directFetch(url, fetchOptions);
     } else {
-      result = await this.withCache.fetch(url, options, {
+      result = await this.withCache.fetch(url, fetchOptions, {
         cacheKey,
         cacheStrategy: strategy,
         shouldCacheResponse: (response) => {
@@ -1398,6 +1472,7 @@ var WeaverseClient = class {
       const [data, merchantOverrides] = await Promise.all([
         this.fetchWithCache(url, {
           method: "POST",
+          cacheTarget: "theme-settings",
           strategy,
           body,
           headers: {
@@ -1492,6 +1567,7 @@ var WeaverseClient = class {
         url,
         {
           method: "GET",
+          cacheTarget: "merchant-overrides",
           strategy,
           headers: {
             Accept: "application/json"
@@ -1555,7 +1631,7 @@ var WeaverseClient = class {
       const qs = params.toString();
       const url = `${weaverseHost}/api/public/v1/projects/${projectId}/custom-pages${qs ? `?${qs}` : ""}`;
       try {
-        const result = await this.fetchWithCache(url);
+        const result = await this.fetchWithCache(url, { cacheTarget: "custom-pages" });
         entries.push(...result.data || []);
         if (!result.nextCursor) {
           return entries;
@@ -1640,7 +1716,9 @@ var WeaverseClient = class {
         projectId: effectiveProjectId,
         // Use effective (potentially overridden) projectId
         params: pageLoadParams,
-        url: request.url
+        // Stripped to pathname + Weaverse params — tracking params would
+        // fragment the subrequest cache key (see normalizePageUrl).
+        url: normalizePageUrl(request.url)
       };
       const reqInit = {
         method: "POST",
@@ -1655,6 +1733,7 @@ var WeaverseClient = class {
       const url = this.getApiUrl("project");
       const projectData = await this.fetchWithCache(url, {
         ...reqInit,
+        cacheTarget: "project",
         strategy
       });
       if (hasError(projectData)) {