@weaverse/hydrogen 5.15.2 → 5.16.0

package/dist/index.d.mts

@@ -396,6 +396,7 @@ declare class WeaverseClient {
      */
     private readonly directFetch;
     private getApiUrl;
+    private isExternalPublicApiUrl;
     /**
      * Fetch data with caching support for both design mode and production.
      * Uses direct fetch in design mode, Hydrogen's withCache in production.
@@ -567,6 +568,12 @@ interface WeaverseHydrogenParams extends Omit<WeaverseCoreParams, 'ItemConstruct
     weaverseApiBase: string;
     weaverseApiKey: string;
     weaverseHost: string;
+    /**
+     * Public data API origin. Keep `weaverseHost` for Studio scripts/editor
+     * assets; point this at the Cloudflare proxy (`https://api.weaverse.io`)
+     * when edge caching is enabled.
+     */
+    weaversePublicApiBase?: string;
     weaverseVersion?: string;
 }
 type HydrogenComponent<T extends HydrogenComponentProps = any> = {
@@ -592,6 +599,7 @@ type WeaverseProjectConfigs = {
     projectId: string;
     weaverseHost: string;
     weaverseApiBase: string;
+    weaversePublicApiBase?: string;
     weaverseApiKey: string;
     weaverseVersion?: string;
     isDesignMode?: boolean;
@@ -935,6 +943,7 @@ declare module '@shopify/hydrogen' {
         WEAVERSE_API_KEY: string;
         WEAVERSE_HOST?: string;
         WEAVERSE_PROJECT_ID: string;
+        WEAVERSE_PUBLIC_API_BASE?: string;
     }
 }
 /**

package/dist/index.d.ts

@@ -396,6 +396,7 @@ declare class WeaverseClient {
      */
     private readonly directFetch;
     private getApiUrl;
+    private isExternalPublicApiUrl;
     /**
      * Fetch data with caching support for both design mode and production.
      * Uses direct fetch in design mode, Hydrogen's withCache in production.
@@ -567,6 +568,12 @@ interface WeaverseHydrogenParams extends Omit<WeaverseCoreParams, 'ItemConstruct
     weaverseApiBase: string;
     weaverseApiKey: string;
     weaverseHost: string;
+    /**
+     * Public data API origin. Keep `weaverseHost` for Studio scripts/editor
+     * assets; point this at the Cloudflare proxy (`https://api.weaverse.io`)
+     * when edge caching is enabled.
+     */
+    weaversePublicApiBase?: string;
     weaverseVersion?: string;
 }
 type HydrogenComponent<T extends HydrogenComponentProps = any> = {
@@ -592,6 +599,7 @@ type WeaverseProjectConfigs = {
     projectId: string;
     weaverseHost: string;
     weaverseApiBase: string;
+    weaversePublicApiBase?: string;
     weaverseApiKey: string;
     weaverseVersion?: string;
     isDesignMode?: boolean;
@@ -935,6 +943,7 @@ declare module '@shopify/hydrogen' {
         WEAVERSE_API_KEY: string;
         WEAVERSE_HOST?: string;
         WEAVERSE_PROJECT_ID: string;
+        WEAVERSE_PUBLIC_API_BASE?: string;
     }
 }
 /**

package/dist/index.js

@@ -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,
@@ -955,15 +959,21 @@ var StudioBridge = react$1.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({
@@ -988,7 +998,10 @@ var WeaverseHydrogenRoot = react$1.memo(
     errorComponent: ErrorComponent = ({ error }) => /* @__PURE__ */ jsxRuntime.jsx("div", { children: error instanceof Error ? error.message : "An unexpected error occurred" })
   }) => {
     const matches = reactRouter.useMatches();
-    const enhancedDataContext = createWeaverseDataContext(matches);
+    const enhancedDataContext = react$1.useMemo(
+      () => createWeaverseDataContext(matches),
+      [matches]
+    );
     const ownLoaderData = reactRouter.useLoaderData();
     const weaverseData = react$1.useMemo(
       () => pickWeaverseData(dataProp, ownLoaderData, matches),
@@ -1429,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.
@@ -1463,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, {
@@ -1644,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;
@@ -1660,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 || []);