@weaverse/hydrogen 5.14.0 → 5.14.1

package/dist/index.d.mts

@@ -930,7 +930,6 @@ declare module '@shopify/hydrogen' {
         PUBLIC_SHOPIFY_INBOX_SHOP_ID: string;
         PUBLIC_STORE_DOMAIN: string;
         PUBLIC_STOREFRONT_API_TOKEN: string;
-        WEAVERSE_API_BASE?: string;
         WEAVERSE_API_KEY: string;
         WEAVERSE_HOST?: string;
         WEAVERSE_PROJECT_ID: string;

package/dist/index.d.ts

@@ -930,7 +930,6 @@ declare module '@shopify/hydrogen' {
         PUBLIC_SHOPIFY_INBOX_SHOP_ID: string;
         PUBLIC_STORE_DOMAIN: string;
         PUBLIC_STOREFRONT_API_TOKEN: string;
-        WEAVERSE_API_BASE?: string;
         WEAVERSE_API_KEY: string;
         WEAVERSE_HOST?: string;
         WEAVERSE_PROJECT_ID: string;

package/dist/index.js

@@ -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 react.Weaverse {
   };
 };
 function createWeaverseInstance(params) {
+  const normalizedParams = normalizeDesignModeRequestInfo(params);
   if (react.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 = react$1.memo(({ context }) => {
   useStudio(context);
@@ -1286,11 +1327,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}`;
   }
   /**