@weaverse/hydrogen 2.8.12 → 2.10.0

package/dist/index.d.mts

@@ -329,6 +329,7 @@ declare function getWeaverseConfigs(request: Request, env: HydrogenThemeEnv): We
 
 declare function getSelectedProductOptions(request: Request): _shopify_hydrogen_react_storefront_api_types.SelectedOptionInput[];
 
+declare let registerComponents: (components: HydrogenComponent[]) => void;
 declare class WeaverseHydrogen extends Weaverse {
     platformType: PlatformTypeEnum;
     pageId: string;
@@ -338,15 +339,13 @@ declare class WeaverseHydrogen extends Weaverse {
     data: HydrogenPageData;
     static itemInstances: Map<string, WeaverseHydrogenItem>;
     static elementRegistry: Map<string, HydrogenElement>;
-    constructor(params: WeaverseHydrogenParams, components: HydrogenComponent[]);
-    registerComponents: (components: HydrogenComponent[]) => void;
+    constructor(params: WeaverseHydrogenParams);
 }
 declare class WeaverseHydrogenItem extends WeaverseItemStore {
     weaverse: WeaverseHydrogen;
     constructor(initialData: HydrogenComponentData, weaverse: WeaverseHydrogen);
     get Element(): HydrogenElement;
-    get data(): HydrogenComponentData;
-    set data(update: HydrogenComponentData);
+    getDefaultData: () => Record<string, any> | undefined;
 }
 
-export { type AllCacheOptions, type BasicInput, type ComponentLoaderArgs, type CreateWeaverseClientArgs, type FetchProjectPayload, type FetchProjectRequestBody, type FetchWithCacheOptions, type HeadingInput, type HeadingInputType, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentLoaderFunction, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageConfigs, type HydrogenPageData, type HydrogenProjectConfig, type HydrogenProjectType, type HydrogenThemeEnv, type HydrogenThemeInfo, type HydrogenThemeSchema, type HydrogenThemeSettings, type HydrogenToolbarAction, type I18nLocale, type InspectorGroup, type LoadPageParams, type Locale, type Localizations, type PageAssignmentParams, type PageType, type PublicEnv, type RootRouteData, type RouteLoaderArgs, ThemeSettingsStore, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseHydrogenRootProps, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStorefrontData, type WeaverseStudioQueries, type WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, useThemeSettings, withWeaverse };
+export { type AllCacheOptions, type BasicInput, type ComponentLoaderArgs, type CreateWeaverseClientArgs, type FetchProjectPayload, type FetchProjectRequestBody, type FetchWithCacheOptions, type HeadingInput, type HeadingInputType, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentLoaderFunction, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageConfigs, type HydrogenPageData, type HydrogenProjectConfig, type HydrogenProjectType, type HydrogenThemeEnv, type HydrogenThemeInfo, type HydrogenThemeSchema, type HydrogenThemeSettings, type HydrogenToolbarAction, type I18nLocale, type InspectorGroup, type LoadPageParams, type Locale, type Localizations, type PageAssignmentParams, type PageType, type PublicEnv, type RootRouteData, type RouteLoaderArgs, ThemeSettingsStore, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseHydrogenRootProps, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStorefrontData, type WeaverseStudioQueries, type WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, registerComponents, useThemeSettings, withWeaverse };

package/dist/index.d.ts

@@ -329,6 +329,7 @@ declare function getWeaverseConfigs(request: Request, env: HydrogenThemeEnv): We
 
 declare function getSelectedProductOptions(request: Request): _shopify_hydrogen_react_storefront_api_types.SelectedOptionInput[];
 
+declare let registerComponents: (components: HydrogenComponent[]) => void;
 declare class WeaverseHydrogen extends Weaverse {
     platformType: PlatformTypeEnum;
     pageId: string;
@@ -338,15 +339,13 @@ declare class WeaverseHydrogen extends Weaverse {
     data: HydrogenPageData;
     static itemInstances: Map<string, WeaverseHydrogenItem>;
     static elementRegistry: Map<string, HydrogenElement>;
-    constructor(params: WeaverseHydrogenParams, components: HydrogenComponent[]);
-    registerComponents: (components: HydrogenComponent[]) => void;
+    constructor(params: WeaverseHydrogenParams);
 }
 declare class WeaverseHydrogenItem extends WeaverseItemStore {
     weaverse: WeaverseHydrogen;
     constructor(initialData: HydrogenComponentData, weaverse: WeaverseHydrogen);
     get Element(): HydrogenElement;
-    get data(): HydrogenComponentData;
-    set data(update: HydrogenComponentData);
+    getDefaultData: () => Record<string, any> | undefined;
 }
 
-export { type AllCacheOptions, type BasicInput, type ComponentLoaderArgs, type CreateWeaverseClientArgs, type FetchProjectPayload, type FetchProjectRequestBody, type FetchWithCacheOptions, type HeadingInput, type HeadingInputType, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentLoaderFunction, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageConfigs, type HydrogenPageData, type HydrogenProjectConfig, type HydrogenProjectType, type HydrogenThemeEnv, type HydrogenThemeInfo, type HydrogenThemeSchema, type HydrogenThemeSettings, type HydrogenToolbarAction, type I18nLocale, type InspectorGroup, type LoadPageParams, type Locale, type Localizations, type PageAssignmentParams, type PageType, type PublicEnv, type RootRouteData, type RouteLoaderArgs, ThemeSettingsStore, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseHydrogenRootProps, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStorefrontData, type WeaverseStudioQueries, type WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, useThemeSettings, withWeaverse };
+export { type AllCacheOptions, type BasicInput, type ComponentLoaderArgs, type CreateWeaverseClientArgs, type FetchProjectPayload, type FetchProjectRequestBody, type FetchWithCacheOptions, type HeadingInput, type HeadingInputType, type HydrogenComponent, type HydrogenComponentData, type HydrogenComponentLoaderFunction, type HydrogenComponentPresets, type HydrogenComponentProps, type HydrogenComponentSchema, type HydrogenElement, type HydrogenPageAssignment, type HydrogenPageConfigs, type HydrogenPageData, type HydrogenProjectConfig, type HydrogenProjectType, type HydrogenThemeEnv, type HydrogenThemeInfo, type HydrogenThemeSchema, type HydrogenThemeSettings, type HydrogenToolbarAction, type I18nLocale, type InspectorGroup, type LoadPageParams, type Locale, type Localizations, type PageAssignmentParams, type PageType, type PublicEnv, type RootRouteData, type RouteLoaderArgs, ThemeSettingsStore, type WeaverseArticle, type WeaverseBlog, WeaverseClient, type WeaverseClientArgs, type WeaverseCollection, WeaverseHydrogen, WeaverseHydrogenItem, type WeaverseHydrogenParams, WeaverseHydrogenRoot, type WeaverseHydrogenRootProps, type WeaverseInternal, type WeaverseLoaderData, type WeaverseLoaderRequestInfo, type WeaverseProduct, type WeaverseProjectConfigs, type WeaverseStorefrontData, type WeaverseStudioQueries, type WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, registerComponents, useThemeSettings, withWeaverse };

package/dist/index.js

@@ -38,6 +38,7 @@ __export(src_exports, {
   getRequestQueries: () => getRequestQueries,
   getSelectedProductOptions: () => getSelectedProductOptions,
   getWeaverseConfigs: () => getWeaverseConfigs,
+  registerComponents: () => registerComponents,
   useChildInstances: () => import_react14.useChildInstances,
   useItemInstance: () => import_react14.useItemInstance,
   useParentInstance: () => import_react14.useParentInstance,
@@ -48,6 +49,16 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_react14 = require("@weaverse/react");
 
+// src/WeaverseHydrogenRoot.tsx
+var import_react11 = require("@remix-run/react");
+var import_react12 = require("@weaverse/react");
+var import_react13 = __toESM(require("react"));
+var import_react_error_boundary = require("react-error-boundary");
+
+// src/context.ts
+var import_react2 = require("@weaverse/react");
+var import_react3 = require("react");
+
 // src/components/main.tsx
 var main_exports = {};
 __export(main_exports, {
@@ -80,39 +91,32 @@ var schema = {
 // src/components/index.ts
 var defaultComponents = [main_exports];
 
-// src/WeaverseHydrogenRoot.tsx
-var import_react11 = require("@remix-run/react");
-var import_react12 = require("@weaverse/react");
-var import_react13 = __toESM(require("react"));
-var import_react_error_boundary = require("react-error-boundary");
-
 // src/context.ts
-var import_react2 = require("@weaverse/react");
-var import_react3 = require("react");
-function createCachedWeaverseInstance(params, components) {
+function createCachedWeaverseInstance(params) {
   if (import_react2.isBrowser) {
     window.__weaverses = window.__weaverses || {};
     let weaverse = window.__weaverses[params.pageId];
     if (!weaverse) {
-      weaverse = new WeaverseHydrogen(params, components);
+      weaverse = new WeaverseHydrogen(params);
       window.__weaverses[params.pageId] = weaverse;
     } else if (weaverse.isDesignMode) {
       window.weaverseStudio?.refresh(params);
     }
     return weaverse;
   }
-  return new WeaverseHydrogen(params, components);
+  return new WeaverseHydrogen(params);
 }
 function createWeaverseInstance(weaverseData, components) {
   let { page, configs, project, pageAssignment } = weaverseData || {};
+  registerComponents(components);
+  registerComponents(defaultComponents);
   return createCachedWeaverseInstance(
     {
       ...configs,
       data: page || {},
       pageId: page?.id,
       internal: { project, pageAssignment }
-    },
-    components
+    }
   );
 }
 var ThemeProvider = (0, import_react3.createContext)(null);
@@ -359,8 +363,8 @@ var WeaverseClient = class {
     let cacheKey = [url, options.body];
     let {
       strategy = this.storefront.CacheCustom({
-        maxAge: 10,
-        sMaxAge: 10,
+        maxAge: 2,
+        sMaxAge: 2,
         staleWhileRevalidate: 82800
       }),
       ...reqInit
@@ -544,53 +548,46 @@ function getSelectedProductOptions(request) {
 }
 
 // src/index.ts
+var registerComponents = (components) => {
+  components.forEach((comp) => {
+    WeaverseHydrogen.registerElement({
+      type: comp?.schema?.type,
+      Component: comp?.default,
+      schema: comp?.schema,
+      loader: comp?.loader
+    });
+  });
+};
 var WeaverseHydrogen = class extends import_react14.Weaverse {
   platformType = "shopify-hydrogen";
   pageId;
   internal;
   requestInfo;
-  constructor(params, components) {
-    console.log("\u{1F4BF} New WeaverseHydrogen", params);
+  constructor(params) {
     let { internal, pageId, requestInfo, ...coreParams } = params;
     super({ ...coreParams, ItemConstructor: WeaverseHydrogenItem });
     this.internal = internal;
     this.pageId = pageId;
     this.requestInfo = requestInfo;
-    this.registerComponents(components);
-    this.registerComponents(defaultComponents);
   }
-  registerComponents = (components) => {
-    components.forEach((comp) => {
-      import_react14.Weaverse.registerElement({
-        type: comp?.schema?.type,
-        Component: comp?.default,
-        schema: comp?.schema,
-        loader: comp?.loader
-      });
-    });
-  };
 };
 var WeaverseHydrogenItem = class extends import_react14.WeaverseItemStore {
   constructor(initialData, weaverse) {
     super(initialData, weaverse);
     let { data, ...rest } = initialData;
-    this._store = { ...data, ...rest };
+    this._store = { ...this.getDefaultData, ...data, ...rest };
   }
   get Element() {
     return super.Element;
   }
-  get data() {
-    let defaultData = this.Element?.schema?.inspector?.flatMap((group) => group.inputs).reduce((a, { defaultValue, name }) => {
+  getDefaultData = () => {
+    return this.Element?.schema?.inspector?.flatMap((group) => group.inputs).reduce((a, { defaultValue, name }) => {
       if (name && defaultValue !== null && defaultValue !== void 0) {
         a[name] = defaultValue;
       }
       return a;
     }, {});
-    return { ...defaultData, ...super.data };
-  }
-  set data(update) {
-    super.data = update;
-  }
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -602,6 +599,7 @@ var WeaverseHydrogenItem = class extends import_react14.WeaverseItemStore {
   getRequestQueries,
   getSelectedProductOptions,
   getWeaverseConfigs,
+  registerComponents,
   useChildInstances,
   useItemInstance,
   useParentInstance,

package/dist/index.mjs

@@ -6,14 +6,24 @@ var __export = (target, all) => {
 
 // src/index.ts
 import {
-  Weaverse,
-  WeaverseItemStore,
-  useItemInstance,
   useChildInstances,
+  useItemInstance,
   useParentInstance,
-  useWeaverse
+  useWeaverse,
+  Weaverse,
+  WeaverseItemStore
 } from "@weaverse/react";
 
+// src/WeaverseHydrogenRoot.tsx
+import { Await, useLoaderData, useRouteLoaderData } from "@remix-run/react";
+import { WeaverseRoot } from "@weaverse/react";
+import React2, { memo as memo2, Suspense } from "react";
+import { ErrorBoundary } from "react-error-boundary";
+
+// src/context.ts
+import { isBrowser } from "@weaverse/react";
+import { createContext } from "react";
+
 // src/components/main.tsx
 var main_exports = {};
 __export(main_exports, {
@@ -46,39 +56,32 @@ var schema = {
 // src/components/index.ts
 var defaultComponents = [main_exports];
 
-// src/WeaverseHydrogenRoot.tsx
-import { Await, useLoaderData, useRouteLoaderData } from "@remix-run/react";
-import { WeaverseRoot } from "@weaverse/react";
-import React2, { memo as memo2, Suspense } from "react";
-import { ErrorBoundary } from "react-error-boundary";
-
 // src/context.ts
-import { isBrowser } from "@weaverse/react";
-import { createContext } from "react";
-function createCachedWeaverseInstance(params, components) {
+function createCachedWeaverseInstance(params) {
   if (isBrowser) {
     window.__weaverses = window.__weaverses || {};
     let weaverse = window.__weaverses[params.pageId];
     if (!weaverse) {
-      weaverse = new WeaverseHydrogen(params, components);
+      weaverse = new WeaverseHydrogen(params);
       window.__weaverses[params.pageId] = weaverse;
     } else if (weaverse.isDesignMode) {
       window.weaverseStudio?.refresh(params);
     }
     return weaverse;
   }
-  return new WeaverseHydrogen(params, components);
+  return new WeaverseHydrogen(params);
 }
 function createWeaverseInstance(weaverseData, components) {
   let { page, configs, project, pageAssignment } = weaverseData || {};
+  registerComponents(components);
+  registerComponents(defaultComponents);
   return createCachedWeaverseInstance(
     {
       ...configs,
       data: page || {},
       pageId: page?.id,
       internal: { project, pageAssignment }
-    },
-    components
+    }
   );
 }
 var ThemeProvider = createContext(null);
@@ -325,8 +328,8 @@ var WeaverseClient = class {
     let cacheKey = [url, options.body];
     let {
       strategy = this.storefront.CacheCustom({
-        maxAge: 10,
-        sMaxAge: 10,
+        maxAge: 2,
+        sMaxAge: 2,
         staleWhileRevalidate: 82800
       }),
       ...reqInit
@@ -510,53 +513,46 @@ function getSelectedProductOptions(request) {
 }
 
 // src/index.ts
+var registerComponents = (components) => {
+  components.forEach((comp) => {
+    WeaverseHydrogen.registerElement({
+      type: comp?.schema?.type,
+      Component: comp?.default,
+      schema: comp?.schema,
+      loader: comp?.loader
+    });
+  });
+};
 var WeaverseHydrogen = class extends Weaverse {
   platformType = "shopify-hydrogen";
   pageId;
   internal;
   requestInfo;
-  constructor(params, components) {
-    console.log("\u{1F4BF} New WeaverseHydrogen", params);
+  constructor(params) {
     let { internal, pageId, requestInfo, ...coreParams } = params;
     super({ ...coreParams, ItemConstructor: WeaverseHydrogenItem });
     this.internal = internal;
     this.pageId = pageId;
     this.requestInfo = requestInfo;
-    this.registerComponents(components);
-    this.registerComponents(defaultComponents);
   }
-  registerComponents = (components) => {
-    components.forEach((comp) => {
-      Weaverse.registerElement({
-        type: comp?.schema?.type,
-        Component: comp?.default,
-        schema: comp?.schema,
-        loader: comp?.loader
-      });
-    });
-  };
 };
 var WeaverseHydrogenItem = class extends WeaverseItemStore {
   constructor(initialData, weaverse) {
     super(initialData, weaverse);
     let { data, ...rest } = initialData;
-    this._store = { ...data, ...rest };
+    this._store = { ...this.getDefaultData, ...data, ...rest };
   }
   get Element() {
     return super.Element;
   }
-  get data() {
-    let defaultData = this.Element?.schema?.inspector?.flatMap((group) => group.inputs).reduce((a, { defaultValue, name }) => {
+  getDefaultData = () => {
+    return this.Element?.schema?.inspector?.flatMap((group) => group.inputs).reduce((a, { defaultValue, name }) => {
       if (name && defaultValue !== null && defaultValue !== void 0) {
         a[name] = defaultValue;
       }
       return a;
     }, {});
-    return { ...defaultData, ...super.data };
-  }
-  set data(update) {
-    super.data = update;
-  }
+  };
 };
 export {
   ThemeSettingsStore,
@@ -567,6 +563,7 @@ export {
   getRequestQueries,
   getSelectedProductOptions,
   getWeaverseConfigs,
+  registerComponents,
   useChildInstances,
   useItemInstance,
   useParentInstance,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@weaverse/hydrogen",
   "author": "Weaverse Team",
   "description": "Components, hooks, and utilities for building Shopify Hydrogen websites with Weaverse",
-  "version": "2.8.12",
+  "version": "2.10.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -22,8 +22,8 @@
     "node": ">=18"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.1.0",
-    "@shopify/hydrogen": "^2023.10.2",
+    "@remix-run/react": "^2",
+    "@shopify/hydrogen": "^2023.10",
     "react": ">=18",
     "react-dom": ">=18"
   },
@@ -33,11 +33,11 @@
     "singleQuote": true
   },
   "dependencies": {
-    "@weaverse/react": "2.8.12",
-    "react-error-boundary": "^4.0.11"
+    "@weaverse/react": "2.10.0",
+    "react-error-boundary": "^4.0.12"
   },
   "devDependencies": {
-    "@shopify/remix-oxygen": "^2.0.1"
+    "@shopify/remix-oxygen": "^2"
   },
   "scripts": {
     "start": "npm run dev",