@weaverse/hydrogen 1.0.46 → 1.0.48

package/dist/index.d.ts

@@ -78,6 +78,13 @@ interface HydrogenPageData {
     page: any;
     configs: HydrogenPageConfigs;
 }
+interface WeaverseHydrogenRootProps {
+    components: Record<string, HydrogenComponent>;
+    data: {
+        weaverseData?: HydrogenPageData;
+        [key: string]: any;
+    };
+}
 
 /**
  * Fetch with server cache requires a storefront.cache instance which is Cloudflare Cache and a waitUntil function, otherwise it will just fetch the url.
@@ -90,13 +97,6 @@ declare let fetchWithServerCache: ({ url, options, context, }: {
 
 declare function weaverseLoader(args: LoaderArgs, components: Record<string, HydrogenComponent>): Promise<HydrogenPageData | null>;
 
-interface WeaverseHydrogenRootProps {
-    components: Record<string, HydrogenComponent>;
-    data: {
-        weaverseData: HydrogenPageData;
-        [key: string]: any;
-    };
-}
 declare let WeaverseHydrogenRoot: (props: WeaverseHydrogenRootProps) => React.JSX.Element;
 
-export { ComponentFlags, HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentProps, HydrogenComponentSchema, HydrogenComponentTemplate, HydrogenElement, HydrogenPageConfigs, HydrogenPageData, TODO, WeaverseHydrogen, WeaverseHydrogenRoot, WeaverseLoaderArgs, fetchWithServerCache, weaverseLoader };
+export { ComponentFlags, HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentProps, HydrogenComponentSchema, HydrogenComponentTemplate, HydrogenElement, HydrogenPageConfigs, HydrogenPageData, TODO, WeaverseHydrogen, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseLoaderArgs, fetchWithServerCache, weaverseLoader };

package/dist/index.js

@@ -41,15 +41,16 @@ var import_react4 = __toESM(require("react"));
 
 // src/context.ts
 var import_react = require("@weaverse/react");
+var createRootContext = (init) => new import_react.Weaverse(init);
 function createCachedContext(init) {
   if (import_react.isBrowser && init.pageId) {
     window.__weaverses = window.__weaverses || {};
     if (!window.__weaverses[init.pageId]) {
-      window.__weaverses[init.pageId] = (0, import_react.createRootContext)(init);
+      window.__weaverses[init.pageId] = createRootContext(init);
     }
     return window.__weaverses[init.pageId];
   }
-  return (0, import_react.createRootContext)(init);
+  return createRootContext(init);
 }
 function createWeaverseHydrogenContext({ weaverseData }, components) {
   let { page = {}, configs = {} } = weaverseData || {};
@@ -549,15 +550,10 @@ var WeaverseItemStore = class {
   constructor(itemData, weaverse) {
     this.listeners = /* @__PURE__ */ new Set();
     this.ref = { current: null };
-    this.platformType = "shopify-section";
     this.stitchesClass = "";
     this._store = { id: "", type: "" };
     this.setData = (update) => {
-      if (this.platformType === "shopify-hydrogen") {
-        this.data = update;
-      } else {
-        this.data = Object.assign(this.data, update);
-      }
+      this.data = Object.assign(this.data, update);
       this.triggerUpdate();
       return this.data;
     };
@@ -574,10 +570,14 @@ var WeaverseItemStore = class {
     };
     let { type, id } = itemData;
     this.weaverse = weaverse;
-    this.platformType = weaverse.platformType;
     if (id && type) {
       weaverse.itemInstances.set(id, this);
-      this._store = { ...itemData };
+      if (weaverse.platformType === "shopify-hydrogen") {
+        let { data, ...rest } = itemData;
+        this._store = { ...data, ...rest };
+      } else {
+        this._store = { ...itemData };
+      }
     }
   }
   get _id() {
@@ -593,33 +593,18 @@ var WeaverseItemStore = class {
     return this.weaverse.elementInstances.get(this._store.type);
   }
   set data(update) {
-    if (this.platformType === "shopify-hydrogen") {
-      let { children, ...rest } = update;
-      if (children) {
-        this._store.children = children;
-      }
-      this._store.data = merge(this._store.data, rest);
-    } else {
-      this._store = { ...this.data, ...update };
-    }
+    this._store = { ...this.data, ...update };
   }
   get data() {
     let defaultProps = { ...this.Element?.Component?.defaultProps };
-    if (this.platformType === "shopify-hydrogen") {
-      return {
-        ...this._store,
-        data: { ...defaultProps?.data, ...this._store.data }
-      };
-    } else {
-      let defaultCss = this.Element?.defaultCss || {};
-      let currentCss = this._store.css || {};
-      let css = merge(defaultCss, currentCss);
-      let extraData = this.Element?.extraData;
-      return { ...defaultProps, ...extraData, ...this._store, css };
-    }
+    let defaultCss = this.Element?.defaultCss || {};
+    let currentCss = this._store.css || {};
+    let css = merge(defaultCss, currentCss);
+    let extraData = this.Element?.extraData;
+    return { ...defaultProps, ...extraData, ...this._store, css };
   }
 };
-var Weaverse = class {
+var Weaverse2 = class {
   /**
    * constructor
    * @param weaverseHost {string} Weaverse base URL that can provide by user/developer. for local development, use localhost:3000
@@ -634,7 +619,7 @@ var Weaverse = class {
   constructor(params = {}) {
     this.elementInstances = /* @__PURE__ */ new Map();
     this.itemInstances = /* @__PURE__ */ new Map();
-    this.weaverseHost = "https://studio.weaverse.io";
+    this.weaverseHost = "https://weaverse.io";
     this.weaverseVersion = "";
     this.projectId = "";
     this.pageId = "";
@@ -715,13 +700,13 @@ var Weaverse = class {
     if (data?.items) {
       data.items.forEach((item) => {
         if (!this.itemInstances.get(item.id)) {
-          new WeaverseItemStore(item, this);
+          return new WeaverseItemStore(item, this);
         }
       });
     }
   }
 };
-Weaverse.WeaverseItemStore = WeaverseItemStore;
+Weaverse2.WeaverseItemStore = WeaverseItemStore;
 
 // src/hooks/use-studio.ts
 var import_react2 = require("react");
@@ -879,24 +864,8 @@ var WeaverseHydrogenRoot = (props) => {
   useStudio(weaverse);
   if (!weaverse?.data)
     return /* @__PURE__ */ import_react4.default.createElement("div", null, "No Weaverse data!");
-  return /* @__PURE__ */ import_react4.default.createElement(import_react4.default.Fragment, null, /* @__PURE__ */ import_react4.default.createElement(import_react3.WeaverseRoot, { context: weaverse }), weaverse.isDesignMode ? null : /* @__PURE__ */ import_react4.default.createElement(StitchesStyle, { weaverse }));
+  return /* @__PURE__ */ import_react4.default.createElement(import_react3.WeaverseRoot, { context: weaverse });
 };
-var StitchesStyle = (0, import_react4.memo)(
-  ({ weaverse }) => {
-    return /* @__PURE__ */ import_react4.default.createElement(
-      "style",
-      {
-        id: "stitches",
-        key: "stitches",
-        suppressHydrationWarning: true,
-        dangerouslySetInnerHTML: {
-          __html: weaverse.stitchesInstance?.getCssText() || ""
-        }
-      }
-    );
-  },
-  () => true
-);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   WeaverseHydrogenRoot,

package/dist/index.mjs

@@ -1,9 +1,10 @@
 // src/index.tsx
 import { WeaverseRoot } from "@weaverse/react";
-import React, { memo } from "react";
+import React from "react";
 
 // src/context.ts
-import { createRootContext, isBrowser } from "@weaverse/react";
+import { Weaverse, isBrowser } from "@weaverse/react";
+var createRootContext = (init) => new Weaverse(init);
 function createCachedContext(init) {
   if (isBrowser && init.pageId) {
     window.__weaverses = window.__weaverses || {};
@@ -512,15 +513,10 @@ var WeaverseItemStore = class {
   constructor(itemData, weaverse) {
     this.listeners = /* @__PURE__ */ new Set();
     this.ref = { current: null };
-    this.platformType = "shopify-section";
     this.stitchesClass = "";
     this._store = { id: "", type: "" };
     this.setData = (update) => {
-      if (this.platformType === "shopify-hydrogen") {
-        this.data = update;
-      } else {
-        this.data = Object.assign(this.data, update);
-      }
+      this.data = Object.assign(this.data, update);
       this.triggerUpdate();
       return this.data;
     };
@@ -537,10 +533,14 @@ var WeaverseItemStore = class {
     };
     let { type, id } = itemData;
     this.weaverse = weaverse;
-    this.platformType = weaverse.platformType;
     if (id && type) {
       weaverse.itemInstances.set(id, this);
-      this._store = { ...itemData };
+      if (weaverse.platformType === "shopify-hydrogen") {
+        let { data, ...rest } = itemData;
+        this._store = { ...data, ...rest };
+      } else {
+        this._store = { ...itemData };
+      }
     }
   }
   get _id() {
@@ -556,33 +556,18 @@ var WeaverseItemStore = class {
     return this.weaverse.elementInstances.get(this._store.type);
   }
   set data(update) {
-    if (this.platformType === "shopify-hydrogen") {
-      let { children, ...rest } = update;
-      if (children) {
-        this._store.children = children;
-      }
-      this._store.data = merge(this._store.data, rest);
-    } else {
-      this._store = { ...this.data, ...update };
-    }
+    this._store = { ...this.data, ...update };
   }
   get data() {
     let defaultProps = { ...this.Element?.Component?.defaultProps };
-    if (this.platformType === "shopify-hydrogen") {
-      return {
-        ...this._store,
-        data: { ...defaultProps?.data, ...this._store.data }
-      };
-    } else {
-      let defaultCss = this.Element?.defaultCss || {};
-      let currentCss = this._store.css || {};
-      let css = merge(defaultCss, currentCss);
-      let extraData = this.Element?.extraData;
-      return { ...defaultProps, ...extraData, ...this._store, css };
-    }
+    let defaultCss = this.Element?.defaultCss || {};
+    let currentCss = this._store.css || {};
+    let css = merge(defaultCss, currentCss);
+    let extraData = this.Element?.extraData;
+    return { ...defaultProps, ...extraData, ...this._store, css };
   }
 };
-var Weaverse = class {
+var Weaverse2 = class {
   /**
    * constructor
    * @param weaverseHost {string} Weaverse base URL that can provide by user/developer. for local development, use localhost:3000
@@ -597,7 +582,7 @@ var Weaverse = class {
   constructor(params = {}) {
     this.elementInstances = /* @__PURE__ */ new Map();
     this.itemInstances = /* @__PURE__ */ new Map();
-    this.weaverseHost = "https://studio.weaverse.io";
+    this.weaverseHost = "https://weaverse.io";
     this.weaverseVersion = "";
     this.projectId = "";
     this.pageId = "";
@@ -678,13 +663,13 @@ var Weaverse = class {
     if (data?.items) {
       data.items.forEach((item) => {
         if (!this.itemInstances.get(item.id)) {
-          new WeaverseItemStore(item, this);
+          return new WeaverseItemStore(item, this);
         }
       });
     }
   }
 };
-Weaverse.WeaverseItemStore = WeaverseItemStore;
+Weaverse2.WeaverseItemStore = WeaverseItemStore;
 
 // src/hooks/use-studio.ts
 import { useEffect } from "react";
@@ -842,24 +827,8 @@ var WeaverseHydrogenRoot = (props) => {
   useStudio(weaverse);
   if (!weaverse?.data)
     return /* @__PURE__ */ React.createElement("div", null, "No Weaverse data!");
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(WeaverseRoot, { context: weaverse }), weaverse.isDesignMode ? null : /* @__PURE__ */ React.createElement(StitchesStyle, { weaverse }));
+  return /* @__PURE__ */ React.createElement(WeaverseRoot, { context: weaverse });
 };
-var StitchesStyle = memo(
-  ({ weaverse }) => {
-    return /* @__PURE__ */ React.createElement(
-      "style",
-      {
-        id: "stitches",
-        key: "stitches",
-        suppressHydrationWarning: true,
-        dangerouslySetInnerHTML: {
-          __html: weaverse.stitchesInstance?.getCssText() || ""
-        }
-      }
-    );
-  },
-  () => true
-);
 export {
   WeaverseHydrogenRoot,
   fetchWithServerCache,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.46",
+  "version": "1.0.48",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -33,7 +33,7 @@
   "author": "Weaverse Team",
   "dependencies": {
     "@shopify/hydrogen": "2023.4.3",
-    "@weaverse/react": "1.0.46"
+    "@weaverse/react": "1.0.48"
   },
   "devDependencies": {
     "@shopify/remix-oxygen": "^1.0.7"