@weaverse/hydrogen 5.8.4 → 5.8.5

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { SelectedOptionInput } from '@shopify/hydrogen/storefront-api-types';
-import { EventEmitter, Weaverse, PlatformTypeEnum, WeaverseItemStore, ElementData, WeaverseElement, WeaverseProjectDataType, WeaverseCoreParams, WeaverseResourcePickerData } from '@weaverse/react';
+import { Weaverse, WeaverseItemStore, ElementData, WeaverseElement, WeaverseProjectDataType, WeaverseCoreParams, WeaverseResourcePickerData } from '@weaverse/react';
 export { PositionInputValue, WeaverseImage, WeaverseVideo, isBrowser, isIframe, useChildInstances, useItemInstance, useParentInstance, useWeaverse } from '@weaverse/react';
 import { PageType, InspectorGroup, SchemaType, ComponentPresets, SchemaValidationResult } from '@weaverse/schema';
 export * from '@weaverse/schema';
@@ -17,14 +17,20 @@ type WeaverseThemeData = {
     schema?: HydrogenThemeSchema;
     publicEnv?: PublicEnv;
 };
-declare class ThemeSettingsStore extends EventEmitter {
+declare class ThemeSettingsStore {
     settings: HydrogenThemeSettings;
     schema?: HydrogenThemeSchema;
     publicEnv?: PublicEnv;
+    private listeners;
+    private readonly MAX_LISTENERS;
+    private isDestroyed;
     constructor(data: WeaverseThemeData);
     updateThemeSettings: (newSettings: HydrogenThemeSettings) => void;
     getSnapshot: () => HydrogenThemeSettings;
     getServerSnapshot: () => HydrogenThemeSettings;
+    subscribe: (callback: () => void) => () => void;
+    private emit;
+    destroy: () => void;
 }
 
 declare class WeaverseHydrogenItem extends WeaverseItemStore {
@@ -33,7 +39,6 @@ declare class WeaverseHydrogenItem extends WeaverseItemStore {
     get Element(): HydrogenElement;
 }
 declare class WeaverseHydrogen extends Weaverse {
-    platformType: PlatformTypeEnum;
     pageId: string;
     internal: Partial<WeaverseInternal>;
     requestInfo: WeaverseLoaderRequestInfo;
@@ -55,7 +60,7 @@ declare function registerComponent(element: HydrogenElement): void;
 declare const WeaverseHydrogenRoot: React$1.MemoExoticComponent<({ components, errorComponent: ErrorComponent, }: {
     components: HydrogenComponent[];
     errorComponent?: React.FC<{
-        error: any;
+        error: Error | unknown;
     }>;
 }) => react_jsx_runtime.JSX.Element>;
 declare function withWeaverse(Component: ComponentType<any>): (props: JSX.IntrinsicAttributes) => react_jsx_runtime.JSX.Element;
@@ -162,7 +167,6 @@ declare class WeaverseClient {
      * Includes 10-second timeout to prevent hanging requests.
      */
     private readonly directFetch;
-    private isLocalhost;
     private getApiUrl;
     fetchWithCache: <T = unknown>(url: string, options?: RequestInit & {
         strategy?: CachingStrategy;
@@ -182,10 +186,11 @@ interface RouteLoaderArgs extends LoaderFunctionArgs {
         weaverse: WeaverseClient;
     };
 }
+type ComponentDataValue = string | number | boolean | undefined | null;
 interface HydrogenComponentData extends ElementData {
-    data?: {
-        [key: string]: any;
-    };
+    id: string;
+    type: string;
+    data?: Record<string, ComponentDataValue | Record<string, unknown>>;
     children?: {
         id: string;
     }[];
@@ -564,11 +569,18 @@ type CreateHydrogenSchemaOptions = {
 };
 declare global {
     interface Window {
-        __weaverse: WeaverseHydrogen;
-        __weaverses: Record<string, WeaverseHydrogen>;
-        __weaverseThemeSettingsStore: ThemeSettingsStore;
+        __weaverse?: WeaverseHydrogen;
+        __weaverses?: Record<string, WeaverseHydrogen>;
+        __weaverseThemeSettingsStore?: ThemeSettingsStore;
     }
 }
+interface WeaverseStudio {
+    init: (weaverse: WeaverseHydrogen) => void;
+    refreshStudio: (params: WeaverseHydrogenParams) => void;
+}
+declare function hasWeaverseStudio(window: Window): window is Window & {
+    weaverseStudio: WeaverseStudio;
+};
 declare module '@shopify/remix-oxygen' {
     interface AppLoadContext {
         weaverse: WeaverseClient;
@@ -774,4 +786,4 @@ declare const IMAGES_PLACEHOLDERS: {
     product_18: string;
 };
 
-export { type CacheResponseValidator, type ComponentLoaderArgs, type CreateHydrogenSchemaOptions, type DirectFetchResponse, type FetchProjectPayload, type FetchProjectRequestBody, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageData, type HydrogenProjectType, type HydrogenSchemaValidationResult, type HydrogenThemeSchema, type HydrogenThemeSettings, IMAGES_PLACEHOLDERS, type LoadPageParams, type ProjectIdValidationResult, type ProjectIdValue, type PublicEnv, type RouteLoaderArgs, type ThemeSettingsResponse, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, type WeaverseDataContext, WeaverseError, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseI18n, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseMetaObject, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStudioQueries, type WithCacheFetchResponse, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useWeaverseDataContext, withWeaverse };
+export { type CacheResponseValidator, type ComponentDataValue, type ComponentLoaderArgs, type CreateHydrogenSchemaOptions, type DirectFetchResponse, type FetchProjectPayload, type FetchProjectRequestBody, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageData, type HydrogenProjectType, type HydrogenSchemaValidationResult, type HydrogenThemeSchema, type HydrogenThemeSettings, IMAGES_PLACEHOLDERS, type LoadPageParams, type ProjectIdValidationResult, type ProjectIdValue, type PublicEnv, type RouteLoaderArgs, type ThemeSettingsResponse, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, type WeaverseDataContext, WeaverseError, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseI18n, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseMetaObject, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStudioQueries, type WithCacheFetchResponse, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, hasWeaverseStudio, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useWeaverseDataContext, withWeaverse };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { SelectedOptionInput } from '@shopify/hydrogen/storefront-api-types';
-import { EventEmitter, Weaverse, PlatformTypeEnum, WeaverseItemStore, ElementData, WeaverseElement, WeaverseProjectDataType, WeaverseCoreParams, WeaverseResourcePickerData } from '@weaverse/react';
+import { Weaverse, WeaverseItemStore, ElementData, WeaverseElement, WeaverseProjectDataType, WeaverseCoreParams, WeaverseResourcePickerData } from '@weaverse/react';
 export { PositionInputValue, WeaverseImage, WeaverseVideo, isBrowser, isIframe, useChildInstances, useItemInstance, useParentInstance, useWeaverse } from '@weaverse/react';
 import { PageType, InspectorGroup, SchemaType, ComponentPresets, SchemaValidationResult } from '@weaverse/schema';
 export * from '@weaverse/schema';
@@ -17,14 +17,20 @@ type WeaverseThemeData = {
     schema?: HydrogenThemeSchema;
     publicEnv?: PublicEnv;
 };
-declare class ThemeSettingsStore extends EventEmitter {
+declare class ThemeSettingsStore {
     settings: HydrogenThemeSettings;
     schema?: HydrogenThemeSchema;
     publicEnv?: PublicEnv;
+    private listeners;
+    private readonly MAX_LISTENERS;
+    private isDestroyed;
     constructor(data: WeaverseThemeData);
     updateThemeSettings: (newSettings: HydrogenThemeSettings) => void;
     getSnapshot: () => HydrogenThemeSettings;
     getServerSnapshot: () => HydrogenThemeSettings;
+    subscribe: (callback: () => void) => () => void;
+    private emit;
+    destroy: () => void;
 }
 
 declare class WeaverseHydrogenItem extends WeaverseItemStore {
@@ -33,7 +39,6 @@ declare class WeaverseHydrogenItem extends WeaverseItemStore {
     get Element(): HydrogenElement;
 }
 declare class WeaverseHydrogen extends Weaverse {
-    platformType: PlatformTypeEnum;
     pageId: string;
     internal: Partial<WeaverseInternal>;
     requestInfo: WeaverseLoaderRequestInfo;
@@ -55,7 +60,7 @@ declare function registerComponent(element: HydrogenElement): void;
 declare const WeaverseHydrogenRoot: React$1.MemoExoticComponent<({ components, errorComponent: ErrorComponent, }: {
     components: HydrogenComponent[];
     errorComponent?: React.FC<{
-        error: any;
+        error: Error | unknown;
     }>;
 }) => react_jsx_runtime.JSX.Element>;
 declare function withWeaverse(Component: ComponentType<any>): (props: JSX.IntrinsicAttributes) => react_jsx_runtime.JSX.Element;
@@ -162,7 +167,6 @@ declare class WeaverseClient {
      * Includes 10-second timeout to prevent hanging requests.
      */
     private readonly directFetch;
-    private isLocalhost;
     private getApiUrl;
     fetchWithCache: <T = unknown>(url: string, options?: RequestInit & {
         strategy?: CachingStrategy;
@@ -182,10 +186,11 @@ interface RouteLoaderArgs extends LoaderFunctionArgs {
         weaverse: WeaverseClient;
     };
 }
+type ComponentDataValue = string | number | boolean | undefined | null;
 interface HydrogenComponentData extends ElementData {
-    data?: {
-        [key: string]: any;
-    };
+    id: string;
+    type: string;
+    data?: Record<string, ComponentDataValue | Record<string, unknown>>;
     children?: {
         id: string;
     }[];
@@ -564,11 +569,18 @@ type CreateHydrogenSchemaOptions = {
 };
 declare global {
     interface Window {
-        __weaverse: WeaverseHydrogen;
-        __weaverses: Record<string, WeaverseHydrogen>;
-        __weaverseThemeSettingsStore: ThemeSettingsStore;
+        __weaverse?: WeaverseHydrogen;
+        __weaverses?: Record<string, WeaverseHydrogen>;
+        __weaverseThemeSettingsStore?: ThemeSettingsStore;
     }
 }
+interface WeaverseStudio {
+    init: (weaverse: WeaverseHydrogen) => void;
+    refreshStudio: (params: WeaverseHydrogenParams) => void;
+}
+declare function hasWeaverseStudio(window: Window): window is Window & {
+    weaverseStudio: WeaverseStudio;
+};
 declare module '@shopify/remix-oxygen' {
     interface AppLoadContext {
         weaverse: WeaverseClient;
@@ -774,4 +786,4 @@ declare const IMAGES_PLACEHOLDERS: {
     product_18: string;
 };
 
-export { type CacheResponseValidator, type ComponentLoaderArgs, type CreateHydrogenSchemaOptions, type DirectFetchResponse, type FetchProjectPayload, type FetchProjectRequestBody, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageData, type HydrogenProjectType, type HydrogenSchemaValidationResult, type HydrogenThemeSchema, type HydrogenThemeSettings, IMAGES_PLACEHOLDERS, type LoadPageParams, type ProjectIdValidationResult, type ProjectIdValue, type PublicEnv, type RouteLoaderArgs, type ThemeSettingsResponse, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, type WeaverseDataContext, WeaverseError, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseI18n, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseMetaObject, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStudioQueries, type WithCacheFetchResponse, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useWeaverseDataContext, withWeaverse };
+export { type CacheResponseValidator, type ComponentDataValue, type ComponentLoaderArgs, type CreateHydrogenSchemaOptions, type DirectFetchResponse, type FetchProjectPayload, type FetchProjectRequestBody, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageData, type HydrogenProjectType, type HydrogenSchemaValidationResult, type HydrogenThemeSchema, type HydrogenThemeSettings, IMAGES_PLACEHOLDERS, type LoadPageParams, type ProjectIdValidationResult, type ProjectIdValue, type PublicEnv, type RouteLoaderArgs, type ThemeSettingsResponse, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, type WeaverseDataContext, WeaverseError, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseI18n, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseMetaObject, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStudioQueries, type WithCacheFetchResponse, createWeaverseDataContext, defaultComponents, generateDataFromSchema, getPreviewData, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, hasError, hasWeaverseStudio, isFetchProjectPayload, isProjectIdFunction, isThemeSettingsResponse, isValidHydrogenSchema, isWithCacheFetchResponse, registerComponent, useThemeSettings, useWeaverseDataContext, withWeaverse };

package/dist/index.js

@@ -8,18 +8,7 @@ var reactRouter = require('react-router');
 var react$1 = require('react');
 var reactErrorBoundary = require('react-error-boundary');
 
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-
-// src/components/main.tsx
-var main_exports = {};
-__export(main_exports, {
-  default: () => main_default,
-  schema: () => schema
-});
+// src/index.ts
 function Main(props) {
   let { children, dangerouslySetInnerHTML, ...rest } = props;
   return /* @__PURE__ */ jsxRuntime.jsx(
@@ -38,7 +27,12 @@ var schema = schema$1.createSchema({
 });
 
 // src/components/index.ts
-var defaultComponents = [main_exports];
+var defaultComponents = [
+  {
+    default: main_default,
+    schema
+  }
+];
 function createFlatDataContext(matches) {
   const context = {};
   for (const match of matches) {
@@ -92,6 +86,9 @@ function isThemeSettingsResponse(data) {
 function isValidHydrogenSchema(schema2) {
   return schema$1.isValidSchema(schema2);
 }
+function hasWeaverseStudio(window2) {
+  return "weaverseStudio" in window2 && typeof window2.weaverseStudio === "object";
+}
 
 // src/utils/index.ts
 var warnedTypes = /* @__PURE__ */ new Set();
@@ -292,13 +289,15 @@ function getPreviewData(type, components, weaverseHost) {
     }
   };
 }
-var ThemeSettingsStore = class extends react.EventEmitter {
+var ThemeSettingsStore = class {
   settings = {};
   schema;
   publicEnv;
+  listeners = /* @__PURE__ */ new Set();
+  MAX_LISTENERS = 100;
+  isDestroyed = false;
   constructor(data) {
-    super();
-    let { theme, schema: schema2, publicEnv } = data || {};
+    const { theme, schema: schema2, publicEnv } = data || {};
     this.settings = { ...theme };
     this.schema = schema2;
     this.publicEnv = publicEnv;
@@ -307,17 +306,59 @@ var ThemeSettingsStore = class extends react.EventEmitter {
     }
   }
   updateThemeSettings = (newSettings) => {
+    if (this.isDestroyed) {
+      console.warn("ThemeSettingsStore: Cannot update destroyed store");
+      return;
+    }
     this.settings = {
       ...this.settings,
       ...newSettings
     };
-    this.emit(this.settings);
+    this.emit();
   };
   getSnapshot = () => this.settings;
   getServerSnapshot = () => this.settings;
+  subscribe = (callback) => {
+    if (this.isDestroyed) {
+      console.warn("ThemeSettingsStore: Cannot subscribe to destroyed store");
+      return () => {
+      };
+    }
+    if (this.listeners.size >= this.MAX_LISTENERS) {
+      console.warn(
+        `ThemeSettingsStore: Maximum listeners (${this.MAX_LISTENERS}) exceeded. Possible memory leak detected.`
+      );
+      return () => {
+      };
+    }
+    this.listeners.add(callback);
+    return () => {
+      this.listeners.delete(callback);
+    };
+  };
+  emit = () => {
+    if (this.isDestroyed) return;
+    const currentListeners = Array.from(this.listeners);
+    for (const listener of currentListeners) {
+      try {
+        listener();
+      } catch (error) {
+        console.error("ThemeSettingsStore: Listener error", error);
+      }
+    }
+  };
+  // Method to properly clean up the store
+  destroy = () => {
+    if (this.isDestroyed) return;
+    this.listeners.clear();
+    this.isDestroyed = true;
+    if (react.isBrowser && window.__weaverseThemeSettingsStore === this) {
+      window.__weaverseThemeSettingsStore = void 0;
+    }
+  };
 };
 function useThemeSettingsStore() {
-  let data = reactRouter.useRouteLoaderData("root");
+  const data = reactRouter.useRouteLoaderData("root");
   if (react.isBrowser && window.__weaverseThemeSettingsStore) {
     return window.__weaverseThemeSettingsStore;
   }
@@ -332,9 +373,12 @@ function useStudio(weaverse) {
   let navigate = reactRouter.useNavigate();
   let themeSettingsStore = useThemeSettingsStore();
   let { isDesignMode, weaverseHost, weaverseVersion, isPreviewMode } = weaverse;
+  let searchParams = new URLSearchParams(search);
+  let revisionId = searchParams.get("__revisionId");
+  let isRevisionPreview = !!revisionId;
   react$1.useEffect(() => {
     if (navigation.state === "idle") {
-      if (isPreviewMode) {
+      if (isRevisionPreview || isPreviewMode) {
         let previewSrc = `${weaverseHost}/static/studio/hydrogen/preview.js?v=${weaverseVersion}`;
         react.loadScript(previewSrc).catch(console.error);
       } else if (isDesignMode) {
@@ -346,7 +390,9 @@ function useStudio(weaverse) {
         };
         let studioSrc = `${weaverseHost}/static/studio/hydrogen/index.js?v=${weaverseVersion}`;
         react.loadScript(studioSrc).then(() => {
-          window.weaverseStudio?.init(weaverse);
+          if (hasWeaverseStudio(window)) {
+            window.weaverseStudio.init(weaverse);
+          }
         }).catch(console.error);
       }
     }
@@ -381,7 +427,6 @@ var WeaverseHydrogenItem = class extends react.WeaverseItemStore {
 };
 react.Weaverse.ItemConstructor = WeaverseHydrogenItem;
 var WeaverseHydrogen = class extends react.Weaverse {
-  platformType = "shopify-hydrogen";
   pageId;
   internal;
   requestInfo;
@@ -421,7 +466,9 @@ function createWeaverseInstance(params) {
     }
     if (weaverse?.isDesignMode) {
       weaverse.requestInfo = params.requestInfo;
-      window.weaverseStudio?.refreshStudio(params);
+      if (hasWeaverseStudio(window)) {
+        window.weaverseStudio.refreshStudio(params);
+      }
     }
     return weaverse;
   }
@@ -460,7 +507,7 @@ function registerComponent(element) {
 var WeaverseHydrogenRoot = react$1.memo(
   ({
     components,
-    errorComponent: ErrorComponent = ({ error }) => /* @__PURE__ */ jsxRuntime.jsx("div", { children: error?.message || "An unexpected error occurred" })
+    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);
@@ -849,13 +896,8 @@ var WeaverseClient = class {
       }
     }
   };
-  // Helper method to detect if request is from localhost
-  isLocalhost() {
-    const hostname = this.parsedUrl.hostname;
-    return hostname === "localhost" || hostname === "127.0.0.1";
-  }
   // Helper method for building API URLs consistently
-  getApiUrl(endpoint, useProxy = !(this.configs.isDesignMode || this.isLocalhost())) {
+  getApiUrl(endpoint, useProxy = !this.configs.isDesignMode) {
     const { weaverseHost, weaverseApiBase, projectId } = this.configs;
     if (useProxy) {
       return `${weaverseApiBase}/v1/${endpoint}?projectId=${projectId}`;
@@ -1207,6 +1249,7 @@ exports.getRequestQueries = getRequestQueries;
 exports.getSelectedProductOptions = getSelectedProductOptions;
 exports.getWeaverseConfigs = getWeaverseConfigs;
 exports.hasError = hasError;
+exports.hasWeaverseStudio = hasWeaverseStudio;
 exports.isFetchProjectPayload = isFetchProjectPayload;
 exports.isProjectIdFunction = isProjectIdFunction;
 exports.isThemeSettingsResponse = isThemeSettingsResponse;