@weaverse/hydrogen 5.15.1 → 5.16.0

package/dist/index.mjs

@@ -297,6 +297,7 @@ function getWeaverseConfigs(request, env) {
     WEAVERSE_PROJECT_ID,
     WEAVERSE_API_KEY,
     WEAVERSE_HOST,
+    WEAVERSE_PUBLIC_API_BASE,
     PUBLIC_STORE_DOMAIN,
     PUBLIC_STOREFRONT_API_TOKEN
   } = env || {};
@@ -312,11 +313,14 @@ 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";
+  let configuredWeaverseHost = WEAVERSE_HOST || envFromProcess.WEAVERSE_HOST;
+  let resolvedWeaverseHost = weaverseHost || configuredWeaverseHost || "https://studio.weaverse.io";
+  let resolvedWeaverseApiBase = weaverseHost ? weaverseHost : WEAVERSE_PUBLIC_API_BASE || envFromProcess.WEAVERSE_PUBLIC_API_BASE || (configuredWeaverseHost && configuredWeaverseHost !== "https://studio.weaverse.io" ? configuredWeaverseHost : "https://api.weaverse.io");
   return {
     projectId: weaverseProjectId || WEAVERSE_PROJECT_ID || envFromProcess.WEAVERSE_PROJECT_ID || "",
     weaverseHost: resolvedWeaverseHost,
-    weaverseApiBase: resolvedWeaverseHost,
+    weaverseApiBase: resolvedWeaverseApiBase,
+    weaversePublicApiBase: resolvedWeaverseApiBase,
     weaverseApiKey: weaverseApiKey || WEAVERSE_API_KEY || envFromProcess.WEAVERSE_API_KEY || "",
     weaverseVersion: weaverseVersion || "",
     isDesignMode,
@@ -568,6 +572,32 @@ function syncReusedInstance(weaverse, params) {
     weaverse.triggerUpdate();
   }
 }
+
+// src/utils/pixel.ts
+var currentNavigationKey = null;
+var firedPageIds = /* @__PURE__ */ new Set();
+var mountedInstances = 0;
+function shouldFirePixel(navigationKey, pageId) {
+  if (navigationKey !== currentNavigationKey) {
+    currentNavigationKey = navigationKey;
+    firedPageIds.clear();
+  }
+  if (firedPageIds.has(pageId)) {
+    return false;
+  }
+  firedPageIds.add(pageId);
+  return true;
+}
+function registerPixelInstance() {
+  mountedInstances += 1;
+  return () => {
+    mountedInstances -= 1;
+    if (mountedInstances === 0) {
+      currentNavigationKey = null;
+      firedPageIds.clear();
+    }
+  };
+}
 var ThemeSettingsStore = class {
   settings = {};
   schema;
@@ -727,13 +757,18 @@ function useStudio(weaverse) {
 }
 function usePixel(context) {
   let { projectId, pageId, isDesignMode, weaverseHost } = context;
+  let { key: navigationKey } = useLocation();
   useEffect(() => {
     if (!(projectId && pageId) || isDesignMode) {
       return;
     }
-    let img = new Image();
-    img.onload = () => img.remove();
-    img.src = `${weaverseHost}/api/public/px?projectId=${projectId}&pageId=${pageId}`;
+    let unregister = registerPixelInstance();
+    if (shouldFirePixel(navigationKey, pageId)) {
+      let img = new Image();
+      img.onload = () => img.remove();
+      img.src = `${weaverseHost}/api/public/px?projectId=${projectId}&pageId=${pageId}`;
+    }
+    return unregister;
   }, []);
 }
 var WeaverseHydrogenItem = class extends WeaverseItemStore {
@@ -924,15 +959,21 @@ var StudioBridge = memo(({ context }) => {
   useStudio(context);
   return null;
 });
+var registeredComponentLists = /* @__PURE__ */ new WeakSet();
 function RenderRoot(props) {
   const { data, components, dataContext } = props;
-  for (const comp of [...components, ...defaultComponents]) {
-    comp?.schema?.type && registerComponent({
-      type: comp?.schema.type,
-      Component: comp.default,
-      schema: comp.schema,
-      loader: comp.loader
-    });
+  if (!registeredComponentLists.has(components)) {
+    for (const comp of [...components, ...defaultComponents]) {
+      if (comp?.schema?.type) {
+        registerComponent({
+          type: comp.schema.type,
+          Component: comp.default,
+          schema: comp.schema,
+          loader: comp.loader
+        });
+      }
+    }
+    registeredComponentLists.add(components);
   }
   const { page, configs, project, pageAssignment } = data || {};
   const weaverse = createWeaverseInstance({
@@ -957,7 +998,10 @@ var WeaverseHydrogenRoot = memo(
     errorComponent: ErrorComponent = ({ error }) => /* @__PURE__ */ jsx("div", { children: error instanceof Error ? error.message : "An unexpected error occurred" })
   }) => {
     const matches = useMatches();
-    const enhancedDataContext = createWeaverseDataContext(matches);
+    const enhancedDataContext = useMemo(
+      () => createWeaverseDataContext(matches),
+      [matches]
+    );
     const ownLoaderData = useLoaderData();
     const weaverseData = useMemo(
       () => pickWeaverseData(dataProp, ownLoaderData, matches),
@@ -1398,8 +1442,12 @@ var WeaverseClient = class {
   };
   // Helper method for building API URLs consistently
   getApiUrl(endpoint) {
-    const { weaverseHost } = this.configs;
-    return `${weaverseHost}/api/public/${endpoint}`;
+    const { weaverseApiBase } = this.configs;
+    return `${weaverseApiBase}/api/public/${endpoint}`;
+  }
+  isExternalPublicApiUrl(url) {
+    const { weaverseApiBase, weaverseHost } = this.configs;
+    return weaverseApiBase !== weaverseHost && url.startsWith(`${weaverseApiBase}/api/public/`);
   }
   /**
    * Fetch data with caching support for both design mode and production.
@@ -1432,7 +1480,7 @@ var WeaverseClient = class {
       cacheTarget || "default"
     ];
     let result;
-    if (this.configs.isDesignMode || this.configs.isRevisionPreview) {
+    if (this.configs.isDesignMode || this.configs.isRevisionPreview || this.isExternalPublicApiUrl(url)) {
       result = await this.directFetch(url, fetchOptions);
     } else {
       result = await this.withCache.fetch(url, fetchOptions, {
@@ -1613,7 +1661,7 @@ var WeaverseClient = class {
    * Paginates automatically, never throws, returns accumulated results on partial failure.
    */
   async fetchCustomPages(opts) {
-    const { weaverseHost, projectId } = this.configs;
+    const { weaverseApiBase, projectId } = this.configs;
     const entries = [];
     const MAX_PAGES = 100;
     let cursor = null;
@@ -1629,7 +1677,7 @@ var WeaverseClient = class {
         params.set("cursor", cursor);
       }
       const qs = params.toString();
-      const url = `${weaverseHost}/api/public/v1/projects/${projectId}/custom-pages${qs ? `?${qs}` : ""}`;
+      const url = `${weaverseApiBase}/api/public/v1/projects/${projectId}/custom-pages${qs ? `?${qs}` : ""}`;
       try {
         const result = await this.fetchWithCache(url, { cacheTarget: "custom-pages" });
         entries.push(...result.data || []);