@weaverse/hydrogen 5.14.0 → 5.15.0

package/dist/index.mjs

@@ -297,7 +297,6 @@ function getWeaverseConfigs(request, env) {
     WEAVERSE_PROJECT_ID,
     WEAVERSE_API_KEY,
     WEAVERSE_HOST,
-    WEAVERSE_API_BASE,
     PUBLIC_STORE_DOMAIN,
     PUBLIC_STOREFRONT_API_TOKEN
   } = env || {};
@@ -313,10 +312,11 @@ function getWeaverseConfigs(request, env) {
   } = queries;
   let url = new URL(request.url);
   let isRevisionPreview = url.searchParams.has("__revisionId");
+  let resolvedWeaverseHost = weaverseHost || WEAVERSE_HOST || envFromProcess.WEAVERSE_HOST || "https://studio.weaverse.io";
   return {
     projectId: weaverseProjectId || WEAVERSE_PROJECT_ID || envFromProcess.WEAVERSE_PROJECT_ID || "",
-    weaverseHost: weaverseHost || WEAVERSE_HOST || envFromProcess.WEAVERSE_HOST || "https://studio.weaverse.io",
-    weaverseApiBase: WEAVERSE_API_BASE || envFromProcess.WEAVERSE_API_BASE || WEAVERSE_HOST || envFromProcess.WEAVERSE_HOST || "https://api.weaverse.io",
+    weaverseHost: resolvedWeaverseHost,
+    weaverseApiBase: resolvedWeaverseHost,
     weaverseApiKey: weaverseApiKey || WEAVERSE_API_KEY || envFromProcess.WEAVERSE_API_KEY || "",
     weaverseVersion: weaverseVersion || "",
     isDesignMode,
@@ -507,6 +507,46 @@ function hasWeaverseData(value) {
   }
   return value.weaverseData !== void 0;
 }
+
+// src/utils/studio-request-info.ts
+function getBrowserLocation() {
+  if (typeof window === "undefined") {
+    return;
+  }
+  return window.location;
+}
+function getQueriesFromSearch(search) {
+  let queries = {};
+  let params = new URLSearchParams(search);
+  for (let [key, value] of params.entries()) {
+    if (value === "true") {
+      queries[key] = true;
+    } else if (value === "false") {
+      queries[key] = false;
+    } else {
+      queries[key] = value;
+    }
+  }
+  return queries;
+}
+function normalizeDesignModeRequestInfo(params, browserLocation = getBrowserLocation()) {
+  if (!(params.isDesignMode && browserLocation)) {
+    return params;
+  }
+  let { pathname, search } = browserLocation;
+  if (params.requestInfo.pathname === pathname && params.requestInfo.search === search) {
+    return params;
+  }
+  return {
+    ...params,
+    requestInfo: {
+      ...params.requestInfo,
+      pathname,
+      queries: getQueriesFromSearch(search),
+      search
+    }
+  };
+}
 var ThemeSettingsStore = class {
   settings = {};
   schema;
@@ -826,22 +866,23 @@ var WeaverseHydrogen = class extends Weaverse {
   };
 };
 function createWeaverseInstance(params) {
+  const normalizedParams = normalizeDesignModeRequestInfo(params);
   if (isBrowser) {
     window.__weaverses = window.__weaverses || {};
-    let weaverse = window.__weaverses[params.pageId];
-    if (!weaverse || weaverse?.requestInfo?.pathname !== params.requestInfo.pathname || weaverse?.requestInfo?.search !== params.requestInfo.search) {
-      weaverse = new WeaverseHydrogen(params);
-      window.__weaverses[params.pageId] = weaverse;
+    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) {
-      weaverse.requestInfo = params.requestInfo;
+      weaverse.requestInfo = normalizedParams.requestInfo;
       if (hasWeaverseStudio(window)) {
-        window.weaverseStudio.refreshStudio(params);
+        window.weaverseStudio.refreshStudio(normalizedParams);
       }
     }
     return weaverse;
   }
-  return new WeaverseHydrogen(params);
+  return new WeaverseHydrogen(normalizedParams);
 }
 var StudioBridge = memo(({ context }) => {
   useStudio(context);
@@ -954,19 +995,34 @@ function useThemeSettings() {
   return settings;
 }
 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;
@@ -1286,11 +1342,8 @@ var WeaverseClient = class {
     }
   };
   // Helper method for building API URLs consistently
-  getApiUrl(endpoint, useProxy = !this.configs.isDesignMode) {
-    const { weaverseHost, weaverseApiBase, projectId } = this.configs;
-    if (useProxy) {
-      return `${weaverseApiBase}/v1/${endpoint}?projectId=${projectId}`;
-    }
+  getApiUrl(endpoint) {
+    const { weaverseHost } = this.configs;
     return `${weaverseHost}/api/public/${endpoint}`;
   }
   /**
@@ -1311,19 +1364,23 @@ var WeaverseClient = class {
    * ```
    */
   fetchWithCache = async (url, options = {}) => {
-    const strategy = options.strategy || CacheCustom(DEFAULT_CACHE_STRATEGY);
+    const { cacheTarget, strategy: strategyOverride, ...fetchOptions } = options;
+    const strategy = strategyOverride || 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) => {
@@ -1360,6 +1417,7 @@ var WeaverseClient = class {
       const [data, merchantOverrides] = await Promise.all([
         this.fetchWithCache(url, {
           method: "POST",
+          cacheTarget: "theme-settings",
           strategy,
           body,
           headers: {
@@ -1454,6 +1512,7 @@ var WeaverseClient = class {
         url,
         {
           method: "GET",
+          cacheTarget: "merchant-overrides",
           strategy,
           headers: {
             Accept: "application/json"
@@ -1517,7 +1576,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;
@@ -1617,6 +1676,7 @@ var WeaverseClient = class {
       const url = this.getApiUrl("project");
       const projectData = await this.fetchWithCache(url, {
         ...reqInit,
+        cacheTarget: "project",
         strategy
       });
       if (hasError(projectData)) {