@weaverse/hydrogen 1.0.35 → 1.0.36

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Weaverse } from '@weaverse/core';
 import { LoaderArgs } from '@shopify/remix-oxygen';
 
@@ -42,12 +41,12 @@ declare function weaverseLoader({ request, context: { env, storefront, waitUntil
     };
 }): Promise<any>;
 
-declare let WeaverseHydrogenRoot: React.MemoExoticComponent<({ components, data, }: {
+declare let WeaverseHydrogenRoot: ({ components, data, }: {
     components: WeaverseComponentsType;
     data: {
         [key: string]: any;
         weaverseData: any;
     };
-}) => JSX.Element>;
+}) => JSX.Element;
 
 export { WeaverseComponentLoaderArgs, WeaverseHydrogenRoot, fetchWithServerCache, hashKey, useStudio, weaverseLoader };

package/dist/index.js

@@ -37,55 +37,23 @@ __export(src_exports, {
   weaverseLoader: () => weaverseLoader
 });
 module.exports = __toCommonJS(src_exports);
-
-// src/utils.ts
-var import_core = require("@weaverse/core");
-var import_react = require("react");
-var useStudio = (weaverseCore) => {
-  (0, import_react.useEffect)(() => {
-    if (weaverseCore.isDesignMode && import_core.isIframe && !window.weaverseStudioInitialized) {
-      window.weaverseStudioInitialized = true;
-      let host = weaverseCore.weaverseHost;
-      let version = weaverseCore.weaverseVersion || Date.now();
-      (0, import_core.loadScript)(`${host}/assets/studio/studio-bridge.js?v=${version}`).then(
-        () => {
-          window?.createWeaverseStudioBridge(weaverseCore);
-          setTimeout(() => {
-            weaverseCore.triggerUpdate();
-          }, 2e3);
-        }
-      );
-    }
-    setTimeout(() => {
-      window.__weaverse = weaverseCore;
-    }, 1);
-  }, []);
-};
-
-// src/index.tsx
-var import_react3 = __toESM(require("react"));
-var import_react4 = require("@weaverse/react");
+var import_react3 = require("@weaverse/react");
+var import_react4 = __toESM(require("react"));
 
 // src/context.ts
-var import_react2 = require("@weaverse/react");
+var import_react = require("@weaverse/react");
 var createCachedWeaverseContext = (init) => {
-  if (import_react2.isBrowser && init.pageId) {
+  if (import_react.isBrowser && init.pageId) {
     window.__weaverses = window.__weaverses || {};
     if (!window.__weaverses[init.pageId]) {
-      window.__weaverses[init.pageId] = (0, import_react2.createRootContext)(init);
+      window.__weaverses[init.pageId] = (0, import_react.createRootContext)(init);
     }
-    console.log("createRootContext cached", window.__weaverses[init.pageId]);
     return window.__weaverses[init.pageId];
   }
-  console.log("createRootContext not cached");
-  return (0, import_react2.createRootContext)(init);
+  return (0, import_react.createRootContext)(init);
 };
-var createWeaverseHydrogenContext = ({
-  weaverseData: { pageData, config } = {
-    pageData: {},
-    config: {}
-  }
-}, components) => {
+var createWeaverseHydrogenContext = ({ weaverseData }, components) => {
+  let { pageData = {}, config = {} } = weaverseData || {};
   let weaverse = createCachedWeaverseContext({
     ...config,
     data: pageData,
@@ -105,6 +73,30 @@ var createWeaverseHydrogenContext = ({
   return weaverse;
 };
 
+// src/utils.ts
+var import_core = require("@weaverse/core");
+var import_react2 = require("react");
+var useStudio = (weaverseCore) => {
+  (0, import_react2.useEffect)(() => {
+    if (weaverseCore.isDesignMode && import_core.isIframe && !window.weaverseStudioInitialized) {
+      window.weaverseStudioInitialized = true;
+      let host = weaverseCore.weaverseHost;
+      let version = Date.now();
+      (0, import_core.loadScript)(`${host}/assets/studio/studio-bridge.js?v=${version}`).then(
+        () => {
+          window?.createWeaverseStudioBridge(weaverseCore);
+          setTimeout(() => {
+            weaverseCore.triggerUpdate();
+          }, 2e3);
+        }
+      );
+    }
+    setTimeout(() => {
+      window.__weaverse = weaverseCore;
+    }, 1);
+  }, []);
+};
+
 // src/weaverse-loader.ts
 var import_hydrogen = require("@shopify/hydrogen");
 function hashKey(queryKey) {
@@ -139,7 +131,6 @@ var fetchWithServerCache = async ({
     let cacheControl = (0, import_hydrogen.generateCacheControlHeader)({
       ...(0, import_hydrogen.CacheShort)()
     });
-    console.log("fetchWithServerCache", cacheControl);
     response = await fetch(url, {
       ...options,
       headers: {
@@ -167,10 +158,6 @@ async function weaverseLoader({
     projectId,
     weaverseHost
   };
-  let fetchBody = {
-    projectId,
-    url: request.url
-  };
   try {
     let pageData = await fetchWithServerCache({
       url: `${weaverseHost}/api/public/project`,
@@ -179,12 +166,15 @@ async function weaverseLoader({
         headers: {
           "Content-Type": "application/json"
         },
-        body: JSON.stringify(fetchBody)
+        body: JSON.stringify({
+          projectId,
+          url: request.url
+        })
       },
       storefront,
       waitUntil
     }).then((r) => r.json()).catch((err) => {
-      console.error(err);
+      console.log(`\u274C Error fetching page data: ${err?.toString()}`);
       return {};
     });
     if (pageData?.items) {
@@ -220,23 +210,21 @@ async function weaverseLoader({
 }
 
 // src/index.tsx
-var WeaverseHydrogenRoot = (0, import_react3.memo)(
-  ({
-    components,
-    data
-  }) => {
-    let weaverse = createWeaverseHydrogenContext(data, components);
-    useStudio(weaverse);
-    if (!weaverse?.data) {
-      return /* @__PURE__ */ import_react3.default.createElement("div", null, "404");
-    }
-    return /* @__PURE__ */ import_react3.default.createElement(import_react3.default.Fragment, null, /* @__PURE__ */ import_react3.default.createElement(import_react4.WeaverseRoot, { context: weaverse }), weaverse.isDesignMode ? null : /* @__PURE__ */ import_react3.default.createElement(StitchesStyle, { weaverse }));
+var WeaverseHydrogenRoot = ({
+  components,
+  data
+}) => {
+  let weaverse = createWeaverseHydrogenContext(data, components);
+  useStudio(weaverse);
+  if (!weaverse?.data) {
+    return /* @__PURE__ */ import_react4.default.createElement("div", null, "404");
   }
-);
-var StitchesStyle = (0, import_react3.memo)(
+  return /* @__PURE__ */ import_react4.default.createElement(import_react4.default.Fragment, null, /* @__PURE__ */ import_react4.default.createElement("div", null, "Render weaverse root"), /* @__PURE__ */ import_react4.default.createElement(import_react3.WeaverseRoot, { context: weaverse }), weaverse.isDesignMode ? null : /* @__PURE__ */ import_react4.default.createElement(StitchesStyle, { weaverse }));
+};
+var StitchesStyle = (0, import_react4.memo)(
   ({ weaverse }) => {
     console.log("stitches", weaverse.stitchesInstance?.getCssText());
-    return /* @__PURE__ */ import_react3.default.createElement(
+    return /* @__PURE__ */ import_react4.default.createElement(
       "style",
       {
         id: "stitches",

package/dist/index.mjs

@@ -1,30 +1,6 @@
-// src/utils.ts
-import { isIframe, loadScript } from "@weaverse/core";
-import { useEffect } from "react";
-var useStudio = (weaverseCore) => {
-  useEffect(() => {
-    if (weaverseCore.isDesignMode && isIframe && !window.weaverseStudioInitialized) {
-      window.weaverseStudioInitialized = true;
-      let host = weaverseCore.weaverseHost;
-      let version = weaverseCore.weaverseVersion || Date.now();
-      loadScript(`${host}/assets/studio/studio-bridge.js?v=${version}`).then(
-        () => {
-          window?.createWeaverseStudioBridge(weaverseCore);
-          setTimeout(() => {
-            weaverseCore.triggerUpdate();
-          }, 2e3);
-        }
-      );
-    }
-    setTimeout(() => {
-      window.__weaverse = weaverseCore;
-    }, 1);
-  }, []);
-};
-
 // src/index.tsx
-import React, { memo } from "react";
 import { WeaverseRoot } from "@weaverse/react";
+import React, { memo } from "react";
 
 // src/context.ts
 import { createRootContext, isBrowser } from "@weaverse/react";
@@ -34,18 +10,12 @@ var createCachedWeaverseContext = (init) => {
     if (!window.__weaverses[init.pageId]) {
       window.__weaverses[init.pageId] = createRootContext(init);
     }
-    console.log("createRootContext cached", window.__weaverses[init.pageId]);
     return window.__weaverses[init.pageId];
   }
-  console.log("createRootContext not cached");
   return createRootContext(init);
 };
-var createWeaverseHydrogenContext = ({
-  weaverseData: { pageData, config } = {
-    pageData: {},
-    config: {}
-  }
-}, components) => {
+var createWeaverseHydrogenContext = ({ weaverseData }, components) => {
+  let { pageData = {}, config = {} } = weaverseData || {};
   let weaverse = createCachedWeaverseContext({
     ...config,
     data: pageData,
@@ -65,6 +35,30 @@ var createWeaverseHydrogenContext = ({
   return weaverse;
 };
 
+// src/utils.ts
+import { isIframe, loadScript } from "@weaverse/core";
+import { useEffect } from "react";
+var useStudio = (weaverseCore) => {
+  useEffect(() => {
+    if (weaverseCore.isDesignMode && isIframe && !window.weaverseStudioInitialized) {
+      window.weaverseStudioInitialized = true;
+      let host = weaverseCore.weaverseHost;
+      let version = Date.now();
+      loadScript(`${host}/assets/studio/studio-bridge.js?v=${version}`).then(
+        () => {
+          window?.createWeaverseStudioBridge(weaverseCore);
+          setTimeout(() => {
+            weaverseCore.triggerUpdate();
+          }, 2e3);
+        }
+      );
+    }
+    setTimeout(() => {
+      window.__weaverse = weaverseCore;
+    }, 1);
+  }, []);
+};
+
 // src/weaverse-loader.ts
 import {
   CacheShort,
@@ -102,7 +96,6 @@ var fetchWithServerCache = async ({
     let cacheControl = generateCacheControlHeader({
       ...CacheShort()
     });
-    console.log("fetchWithServerCache", cacheControl);
     response = await fetch(url, {
       ...options,
       headers: {
@@ -130,10 +123,6 @@ async function weaverseLoader({
     projectId,
     weaverseHost
   };
-  let fetchBody = {
-    projectId,
-    url: request.url
-  };
   try {
     let pageData = await fetchWithServerCache({
       url: `${weaverseHost}/api/public/project`,
@@ -142,12 +131,15 @@ async function weaverseLoader({
         headers: {
           "Content-Type": "application/json"
         },
-        body: JSON.stringify(fetchBody)
+        body: JSON.stringify({
+          projectId,
+          url: request.url
+        })
       },
       storefront,
       waitUntil
     }).then((r) => r.json()).catch((err) => {
-      console.error(err);
+      console.log(`\u274C Error fetching page data: ${err?.toString()}`);
       return {};
     });
     if (pageData?.items) {
@@ -183,19 +175,17 @@ async function weaverseLoader({
 }
 
 // src/index.tsx
-var WeaverseHydrogenRoot = memo(
-  ({
-    components,
-    data
-  }) => {
-    let weaverse = createWeaverseHydrogenContext(data, components);
-    useStudio(weaverse);
-    if (!weaverse?.data) {
-      return /* @__PURE__ */ React.createElement("div", null, "404");
-    }
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(WeaverseRoot, { context: weaverse }), weaverse.isDesignMode ? null : /* @__PURE__ */ React.createElement(StitchesStyle, { weaverse }));
+var WeaverseHydrogenRoot = ({
+  components,
+  data
+}) => {
+  let weaverse = createWeaverseHydrogenContext(data, components);
+  useStudio(weaverse);
+  if (!weaverse?.data) {
+    return /* @__PURE__ */ React.createElement("div", null, "404");
   }
-);
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", null, "Render weaverse root"), /* @__PURE__ */ React.createElement(WeaverseRoot, { context: weaverse }), weaverse.isDesignMode ? null : /* @__PURE__ */ React.createElement(StitchesStyle, { weaverse }));
+};
 var StitchesStyle = memo(
   ({ weaverse }) => {
     console.log("stitches", weaverse.stitchesInstance?.getCssText());

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.35",
+  "version": "1.0.36",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -33,8 +33,8 @@
   "author": "Weaverse Team",
   "dependencies": {
     "@shopify/hydrogen": "2023.4.0",
-    "@weaverse/core": "1.0.35",
-    "@weaverse/react": "1.0.35"
+    "@weaverse/core": "1.0.36",
+    "@weaverse/react": "1.0.36"
   },
   "devDependencies": {
     "@shopify/remix-oxygen": "^1.0.5"