@weaverse/hydrogen 1.0.32 → 1.0.34

package/dist/index.js

@@ -74,8 +74,10 @@ var createCachedWeaverseContext = (init) => {
     if (!window.__weaverses[init.pageId]) {
       window.__weaverses[init.pageId] = (0, import_react2.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);
 };
 var createWeaverseHydrogenContext = ({
@@ -225,25 +227,29 @@ var WeaverseHydrogenRoot = (0, import_react3.memo)(
   }) => {
     let weaverse = createWeaverseHydrogenContext(data, components);
     useStudio(weaverse);
-    useEnsureStitchesWorking(weaverse);
     if (!weaverse?.data) {
       return /* @__PURE__ */ import_react3.default.createElement("div", null, "404");
     }
-    return /* @__PURE__ */ import_react3.default.createElement(import_react4.WeaverseRoot, { context: weaverse });
+    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 useEnsureStitchesWorking = (weaverse) => {
-  (0, import_react3.useEffect)(() => {
-    let stitchesInstance = weaverse.stitchesInstance;
-    if (stitchesInstance && !stitchesInstance.sheet?.sheet?.ownerNode) {
-      console.warn("stitches instance is not working, re-creating it");
-      delete weaverse.stitchesInstance;
-      weaverse.initStitches({ nounce: Date.now() });
-      weaverse.triggerUpdate();
-      weaverse.refreshAllItems();
-    }
-  }, []);
-};
+var StitchesStyle = (0, import_react3.memo)(
+  ({ weaverse }) => {
+    console.log("stitches", weaverse.stitchesInstance?.getCssText());
+    return /* @__PURE__ */ import_react3.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

@@ -23,7 +23,7 @@ var useStudio = (weaverseCore) => {
 };
 
 // src/index.tsx
-import React, { memo, useEffect as useEffect2 } from "react";
+import React, { memo } from "react";
 import { WeaverseRoot } from "@weaverse/react";
 
 // src/context.ts
@@ -34,8 +34,10 @@ 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 = ({
@@ -188,25 +190,29 @@ var WeaverseHydrogenRoot = memo(
   }) => {
     let weaverse = createWeaverseHydrogenContext(data, components);
     useStudio(weaverse);
-    useEnsureStitchesWorking(weaverse);
     if (!weaverse?.data) {
       return /* @__PURE__ */ React.createElement("div", null, "404");
     }
-    return /* @__PURE__ */ React.createElement(WeaverseRoot, { context: weaverse });
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(WeaverseRoot, { context: weaverse }), weaverse.isDesignMode ? null : /* @__PURE__ */ React.createElement(StitchesStyle, { weaverse }));
   }
 );
-var useEnsureStitchesWorking = (weaverse) => {
-  useEffect2(() => {
-    let stitchesInstance = weaverse.stitchesInstance;
-    if (stitchesInstance && !stitchesInstance.sheet?.sheet?.ownerNode) {
-      console.warn("stitches instance is not working, re-creating it");
-      delete weaverse.stitchesInstance;
-      weaverse.initStitches({ nounce: Date.now() });
-      weaverse.triggerUpdate();
-      weaverse.refreshAllItems();
-    }
-  }, []);
-};
+var StitchesStyle = memo(
+  ({ weaverse }) => {
+    console.log("stitches", weaverse.stitchesInstance?.getCssText());
+    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.32",
+  "version": "1.0.34",
   "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.32",
-    "@weaverse/react": "1.0.32"
+    "@weaverse/core": "1.0.34",
+    "@weaverse/react": "1.0.34"
   },
   "devDependencies": {
     "@shopify/remix-oxygen": "^1.0.5"