@weaverse/hydrogen 2.7.1-pre.2 → 2.7.2

package/dist/index.js

@@ -38,15 +38,15 @@ __export(src_exports, {
   getRequestQueries: () => getRequestQueries,
   getSelectedProductOptions: () => getSelectedProductOptions,
   getWeaverseConfigs: () => getWeaverseConfigs,
-  useChildInstances: () => import_react13.useChildInstances,
-  useItemInstance: () => import_react13.useItemInstance,
-  useParentInstance: () => import_react13.useParentInstance,
+  useChildInstances: () => import_react14.useChildInstances,
+  useItemInstance: () => import_react14.useItemInstance,
+  useParentInstance: () => import_react14.useParentInstance,
   useThemeSettings: () => useThemeSettings,
-  useWeaverse: () => import_react13.useWeaverse,
+  useWeaverse: () => import_react14.useWeaverse,
   withWeaverse: () => withWeaverse
 });
 module.exports = __toCommonJS(src_exports);
-var import_react13 = require("@weaverse/react");
+var import_react14 = require("@weaverse/react");
 
 // src/components/main.tsx
 var main_exports = {};
@@ -69,9 +69,9 @@ var schema = {
 var defaultComponents = [main_exports];
 
 // src/WeaverseHydrogenRoot.tsx
-var import_react10 = require("@remix-run/react");
-var import_react11 = require("@weaverse/react");
-var import_react12 = __toESM(require("react"));
+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
@@ -81,7 +81,7 @@ function createCachedWeaverseInstance(params, components) {
   if (import_react2.isBrowser) {
     window.__weaverses = window.__weaverses || [];
     let weaverse = window.__weaverses.find((w) => {
-      let { pathname, search } = w.requestInfo;
+      let { pathname } = w.requestInfo;
       return pathname === params.requestInfo.pathname;
     });
     if (!weaverse) {
@@ -208,23 +208,36 @@ function useStudio(weaverse) {
   }, [weaverse.requestInfo]);
 }
 
+// src/pixel.tsx
+var import_react10 = __toESM(require("react"));
+var Pixel = ({ baseUrl, projectId, pageId }) => {
+  const url = `${baseUrl}/api/public/px?projectId=${projectId}&pageId=${pageId}`;
+  return /* @__PURE__ */ import_react10.default.createElement("img", { src: url, alt: "weaverse pixel", style: { display: "none" } });
+};
+var WeaversePixel = ({ context }) => {
+  let { projectId, pageId, weaverseHost, isDesignMode } = context;
+  if (isDesignMode || !projectId || !pageId || !weaverseHost)
+    return null;
+  return /* @__PURE__ */ import_react10.default.createElement(Pixel, { baseUrl: weaverseHost, projectId, pageId });
+};
+
 // src/WeaverseHydrogenRoot.tsx
-var WeaverseHydrogenRoot = (0, import_react12.memo)(
+var WeaverseHydrogenRoot = (0, import_react13.memo)(
   ({
     errorComponent: ErrorComponent = FallbackError,
     components
   }) => {
-    let loaderData = (0, import_react10.useLoaderData)();
+    let loaderData = (0, import_react11.useLoaderData)();
     let data = loaderData?.weaverseData;
     if (data) {
       if (data instanceof Promise) {
-        return /* @__PURE__ */ import_react12.default.createElement(import_react_error_boundary.ErrorBoundary, { fallbackRender: ErrorComponent }, /* @__PURE__ */ import_react12.default.createElement(import_react12.Suspense, null, /* @__PURE__ */ import_react12.default.createElement(import_react10.Await, { resolve: data }, (resolvedData) => {
-          return /* @__PURE__ */ import_react12.default.createElement(RenderRoot, { data: resolvedData, components });
+        return /* @__PURE__ */ import_react13.default.createElement(import_react_error_boundary.ErrorBoundary, { fallbackRender: ErrorComponent }, /* @__PURE__ */ import_react13.default.createElement(import_react13.Suspense, null, /* @__PURE__ */ import_react13.default.createElement(import_react11.Await, { resolve: data }, (resolvedData) => {
+          return /* @__PURE__ */ import_react13.default.createElement(RenderRoot, { data: resolvedData, components });
         })));
       }
-      return /* @__PURE__ */ import_react12.default.createElement(RenderRoot, { data, components });
+      return /* @__PURE__ */ import_react13.default.createElement(RenderRoot, { data, components });
     }
-    return /* @__PURE__ */ import_react12.default.createElement(
+    return /* @__PURE__ */ import_react13.default.createElement(
       ErrorComponent,
       {
         error: { message: "No Weaverse data return from route loader!" }
@@ -236,17 +249,17 @@ function RenderRoot(props) {
   let { data, components } = props;
   let weaverse = createWeaverseInstance(data, components);
   useStudio(weaverse);
-  return /* @__PURE__ */ import_react12.default.createElement(import_react11.WeaverseRoot, { context: weaverse });
+  return /* @__PURE__ */ import_react13.default.createElement(import_react13.default.Fragment, null, /* @__PURE__ */ import_react13.default.createElement(import_react12.WeaverseRoot, { context: weaverse }), /* @__PURE__ */ import_react13.default.createElement(WeaversePixel, { context: weaverse }));
 }
 function withWeaverse(Component) {
   return (props) => {
-    let loaderData = (0, import_react10.useRouteLoaderData)("root");
+    let loaderData = (0, import_react11.useRouteLoaderData)("root");
     let themeSettingsStore = new ThemeSettingsStore(loaderData?.weaverseTheme);
-    return /* @__PURE__ */ import_react12.default.createElement(ThemeProvider.Provider, { value: themeSettingsStore }, /* @__PURE__ */ import_react12.default.createElement(Component, { ...props }));
+    return /* @__PURE__ */ import_react13.default.createElement(ThemeProvider.Provider, { value: themeSettingsStore }, /* @__PURE__ */ import_react13.default.createElement(Component, { ...props }));
   };
 }
 function FallbackError({ error }) {
-  return /* @__PURE__ */ import_react12.default.createElement("div", null, error?.message || "An unexpected error occurred");
+  return /* @__PURE__ */ import_react13.default.createElement("div", null, error?.message || "An unexpected error occurred");
 }
 
 // src/weaverse-client.ts
@@ -257,7 +270,7 @@ var package_default = {
   name: "@weaverse/hydrogen",
   author: "Weaverse Team",
   description: "Components, hooks, and utilities for building Shopify Hydrogen websites with Weaverse",
-  version: "2.7.1-pre.2",
+  version: "2.7.2",
   license: "MIT",
   main: "dist/index.js",
   typings: "dist/index.d.ts",
@@ -295,7 +308,7 @@ var package_default = {
     singleQuote: true
   },
   dependencies: {
-    "@weaverse/react": "2.6.3",
+    "@weaverse/react": "2.7.2",
     "react-error-boundary": "^4.0.11"
   },
   devDependencies: {
@@ -400,7 +413,6 @@ var WeaverseClient = class {
     } = options;
     let res = this.withCache(cacheKey, strategy, async () => {
       let cacheControlHeader = (0, import_hydrogen.generateCacheControlHeader)(strategy);
-      console.log("cacheControlHeader1", cacheControlHeader);
       let response = await fetch(url, { ...reqInit, headers: {
         "Cache-Control": cacheControlHeader,
         ...reqInit.headers
@@ -414,34 +426,6 @@ var WeaverseClient = class {
     });
     return res;
   };
-  // incrementCacheHits = async () => {
-  //   if (!this.cache) {
-  //     return '1'
-  //   }
-  //   // Increment the cacheHits count in the cache
-  //   const currentHitsResponse = await this.cache.match(CACHE_HITS_KEY)
-  //   const currentHits = currentHitsResponse
-  //     ? parseInt(await currentHitsResponse.text())
-  //     : 0
-  //   const newHitsCount = currentHits + 1
-  //   const newHitsResponse = new Response(newHitsCount.toString(), {
-  //     headers: {
-  //       'Cache-Control': 'max-age=3600',
-  //     },
-  //   })
-  //
-  //   await this.cache.put(CACHE_HITS_KEY, newHitsResponse)
-  //
-  //   return newHitsCount.toString()
-  // }
-  // resetCacheHits = async () => {
-  //   if (!this.cache) {
-  //     return
-  //   }
-  //   // Reset the cacheHits count in the cache
-  //   const resetHitsResponse = new Response('0')
-  //   await this.cache.put(CACHE_HITS_KEY, resetHitsResponse)
-  // }
   loadThemeSettings = async (strategy) => {
     try {
       let { API, configs } = this;
@@ -517,7 +501,6 @@ var WeaverseClient = class {
         } else {
           payload = await this.fetchWithCache(url, {
             ...reqInit,
-            // headers,
             strategy
           });
         }
@@ -587,7 +570,7 @@ function getSelectedProductOptions(request) {
 }
 
 // src/index.ts
-var WeaverseHydrogen = class extends import_react13.Weaverse {
+var WeaverseHydrogen = class extends import_react14.Weaverse {
   platformType = "shopify-hydrogen";
   pageId;
   internal;
@@ -603,7 +586,7 @@ var WeaverseHydrogen = class extends import_react13.Weaverse {
   }
   registerComponents = (components) => {
     components.forEach((comp) => {
-      import_react13.Weaverse.registerElement({
+      import_react14.Weaverse.registerElement({
         type: comp?.schema?.type,
         Component: comp?.default,
         schema: comp?.schema,
@@ -612,7 +595,7 @@ var WeaverseHydrogen = class extends import_react13.Weaverse {
     });
   };
 };
-var WeaverseHydrogenItem = class extends import_react13.WeaverseItemStore {
+var WeaverseHydrogenItem = class extends import_react14.WeaverseItemStore {
   constructor(initialData, weaverse) {
     super(initialData, weaverse);
     let { data, ...rest } = initialData;

package/dist/index.mjs

@@ -37,7 +37,7 @@ var defaultComponents = [main_exports];
 // src/WeaverseHydrogenRoot.tsx
 import { Await, useLoaderData, useRouteLoaderData } from "@remix-run/react";
 import { WeaverseRoot } from "@weaverse/react";
-import React2, { memo, Suspense } from "react";
+import React3, { memo, Suspense } from "react";
 import { ErrorBoundary } from "react-error-boundary";
 
 // src/context.ts
@@ -47,7 +47,7 @@ function createCachedWeaverseInstance(params, components) {
   if (isBrowser) {
     window.__weaverses = window.__weaverses || [];
     let weaverse = window.__weaverses.find((w) => {
-      let { pathname, search } = w.requestInfo;
+      let { pathname } = w.requestInfo;
       return pathname === params.requestInfo.pathname;
     });
     if (!weaverse) {
@@ -174,6 +174,19 @@ function useStudio(weaverse) {
   }, [weaverse.requestInfo]);
 }
 
+// src/pixel.tsx
+import React2 from "react";
+var Pixel = ({ baseUrl, projectId, pageId }) => {
+  const url = `${baseUrl}/api/public/px?projectId=${projectId}&pageId=${pageId}`;
+  return /* @__PURE__ */ React2.createElement("img", { src: url, alt: "weaverse pixel", style: { display: "none" } });
+};
+var WeaversePixel = ({ context }) => {
+  let { projectId, pageId, weaverseHost, isDesignMode } = context;
+  if (isDesignMode || !projectId || !pageId || !weaverseHost)
+    return null;
+  return /* @__PURE__ */ React2.createElement(Pixel, { baseUrl: weaverseHost, projectId, pageId });
+};
+
 // src/WeaverseHydrogenRoot.tsx
 var WeaverseHydrogenRoot = memo(
   ({
@@ -184,13 +197,13 @@ var WeaverseHydrogenRoot = memo(
     let data = loaderData?.weaverseData;
     if (data) {
       if (data instanceof Promise) {
-        return /* @__PURE__ */ React2.createElement(ErrorBoundary, { fallbackRender: ErrorComponent }, /* @__PURE__ */ React2.createElement(Suspense, null, /* @__PURE__ */ React2.createElement(Await, { resolve: data }, (resolvedData) => {
-          return /* @__PURE__ */ React2.createElement(RenderRoot, { data: resolvedData, components });
+        return /* @__PURE__ */ React3.createElement(ErrorBoundary, { fallbackRender: ErrorComponent }, /* @__PURE__ */ React3.createElement(Suspense, null, /* @__PURE__ */ React3.createElement(Await, { resolve: data }, (resolvedData) => {
+          return /* @__PURE__ */ React3.createElement(RenderRoot, { data: resolvedData, components });
         })));
       }
-      return /* @__PURE__ */ React2.createElement(RenderRoot, { data, components });
+      return /* @__PURE__ */ React3.createElement(RenderRoot, { data, components });
     }
-    return /* @__PURE__ */ React2.createElement(
+    return /* @__PURE__ */ React3.createElement(
       ErrorComponent,
       {
         error: { message: "No Weaverse data return from route loader!" }
@@ -202,17 +215,17 @@ function RenderRoot(props) {
   let { data, components } = props;
   let weaverse = createWeaverseInstance(data, components);
   useStudio(weaverse);
-  return /* @__PURE__ */ React2.createElement(WeaverseRoot, { context: weaverse });
+  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(WeaverseRoot, { context: weaverse }), /* @__PURE__ */ React3.createElement(WeaversePixel, { context: weaverse }));
 }
 function withWeaverse(Component) {
   return (props) => {
     let loaderData = useRouteLoaderData("root");
     let themeSettingsStore = new ThemeSettingsStore(loaderData?.weaverseTheme);
-    return /* @__PURE__ */ React2.createElement(ThemeProvider.Provider, { value: themeSettingsStore }, /* @__PURE__ */ React2.createElement(Component, { ...props }));
+    return /* @__PURE__ */ React3.createElement(ThemeProvider.Provider, { value: themeSettingsStore }, /* @__PURE__ */ React3.createElement(Component, { ...props }));
   };
 }
 function FallbackError({ error }) {
-  return /* @__PURE__ */ React2.createElement("div", null, error?.message || "An unexpected error occurred");
+  return /* @__PURE__ */ React3.createElement("div", null, error?.message || "An unexpected error occurred");
 }
 
 // src/weaverse-client.ts
@@ -223,7 +236,7 @@ var package_default = {
   name: "@weaverse/hydrogen",
   author: "Weaverse Team",
   description: "Components, hooks, and utilities for building Shopify Hydrogen websites with Weaverse",
-  version: "2.7.1-pre.2",
+  version: "2.7.2",
   license: "MIT",
   main: "dist/index.js",
   typings: "dist/index.d.ts",
@@ -261,7 +274,7 @@ var package_default = {
     singleQuote: true
   },
   dependencies: {
-    "@weaverse/react": "2.6.3",
+    "@weaverse/react": "2.7.2",
     "react-error-boundary": "^4.0.11"
   },
   devDependencies: {
@@ -366,7 +379,6 @@ var WeaverseClient = class {
     } = options;
     let res = this.withCache(cacheKey, strategy, async () => {
       let cacheControlHeader = generateCacheControlHeader(strategy);
-      console.log("cacheControlHeader1", cacheControlHeader);
       let response = await fetch(url, { ...reqInit, headers: {
         "Cache-Control": cacheControlHeader,
         ...reqInit.headers
@@ -380,34 +392,6 @@ var WeaverseClient = class {
     });
     return res;
   };
-  // incrementCacheHits = async () => {
-  //   if (!this.cache) {
-  //     return '1'
-  //   }
-  //   // Increment the cacheHits count in the cache
-  //   const currentHitsResponse = await this.cache.match(CACHE_HITS_KEY)
-  //   const currentHits = currentHitsResponse
-  //     ? parseInt(await currentHitsResponse.text())
-  //     : 0
-  //   const newHitsCount = currentHits + 1
-  //   const newHitsResponse = new Response(newHitsCount.toString(), {
-  //     headers: {
-  //       'Cache-Control': 'max-age=3600',
-  //     },
-  //   })
-  //
-  //   await this.cache.put(CACHE_HITS_KEY, newHitsResponse)
-  //
-  //   return newHitsCount.toString()
-  // }
-  // resetCacheHits = async () => {
-  //   if (!this.cache) {
-  //     return
-  //   }
-  //   // Reset the cacheHits count in the cache
-  //   const resetHitsResponse = new Response('0')
-  //   await this.cache.put(CACHE_HITS_KEY, resetHitsResponse)
-  // }
   loadThemeSettings = async (strategy) => {
     try {
       let { API, configs } = this;
@@ -483,7 +467,6 @@ var WeaverseClient = class {
         } else {
           payload = await this.fetchWithCache(url, {
             ...reqInit,
-            // headers,
             strategy
           });
         }

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.7.1-pre.2",
+  "version": "2.7.2",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -40,7 +40,7 @@
     "singleQuote": true
   },
   "dependencies": {
-    "@weaverse/react": "2.6.3",
+    "@weaverse/react": "2.7.2",
     "react-error-boundary": "^4.0.11"
   },
   "devDependencies": {