@weaverse/hydrogen 2.7.4 → 2.8.0

package/dist/index.d.mts

@@ -140,7 +140,6 @@ type WeaverseLoaderRequestInfo = {
 };
 type WeaverseStorefrontData = {
     id?: string;
-    __cachedId?: string;
     rootId: string;
     name: string;
     items: HydrogenComponentData[];
@@ -227,9 +226,9 @@ interface WeaverseLoaderData {
 }
 interface HydrogenPageData extends WeaverseProjectDataType {
     id: string;
-    pageId: string;
     name: string;
     items: HydrogenComponentData[];
+    __cacheId?: string;
     [key: string]: any;
 }
 interface WeaverseHydrogenRootProps {
@@ -273,6 +272,7 @@ type FetchProjectPayload = {
     page: HydrogenPageData;
     project: HydrogenProjectType;
     pageAssignment: HydrogenPageAssignment;
+    error?: string;
 };
 type HydrogenThemeEnv = {
     WEAVERSE_PROJECT_ID: string;
@@ -310,7 +310,7 @@ type WeaverseArticle = WeaverseResourcePickerData;
 declare global {
     interface Window {
         __weaverse: WeaverseHydrogen;
-        __weaverses: WeaverseHydrogen[];
+        __weaverses: Record<string, WeaverseHydrogen>;
     }
 }
 

package/dist/index.d.ts

@@ -140,7 +140,6 @@ type WeaverseLoaderRequestInfo = {
 };
 type WeaverseStorefrontData = {
     id?: string;
-    __cachedId?: string;
     rootId: string;
     name: string;
     items: HydrogenComponentData[];
@@ -227,9 +226,9 @@ interface WeaverseLoaderData {
 }
 interface HydrogenPageData extends WeaverseProjectDataType {
     id: string;
-    pageId: string;
     name: string;
     items: HydrogenComponentData[];
+    __cacheId?: string;
     [key: string]: any;
 }
 interface WeaverseHydrogenRootProps {
@@ -273,6 +272,7 @@ type FetchProjectPayload = {
     page: HydrogenPageData;
     project: HydrogenProjectType;
     pageAssignment: HydrogenPageAssignment;
+    error?: string;
 };
 type HydrogenThemeEnv = {
     WEAVERSE_PROJECT_ID: string;
@@ -310,7 +310,7 @@ type WeaverseArticle = WeaverseResourcePickerData;
 declare global {
     interface Window {
         __weaverse: WeaverseHydrogen;
-        __weaverses: WeaverseHydrogen[];
+        __weaverses: Record<string, WeaverseHydrogen>;
     }
 }
 

package/dist/index.js

@@ -79,17 +79,13 @@ var import_react2 = require("@weaverse/react");
 var import_react3 = require("react");
 function createCachedWeaverseInstance(params, components) {
   if (import_react2.isBrowser) {
-    window.__weaverses = window.__weaverses || [];
-    let weaverse = window.__weaverses.find((w) => {
-      let { pathname } = w.requestInfo;
-      return pathname === params.requestInfo.pathname;
-    });
+    window.__weaverses = window.__weaverses || {};
+    let weaverse = window.__weaverses[params.pageId];
     if (!weaverse) {
       weaverse = new WeaverseHydrogen(params, components);
-      window.__weaverses.push(weaverse);
+      window.__weaverses[params.pageId] = weaverse;
     } else if (weaverse.isDesignMode) {
-      weaverse.requestInfo = params.requestInfo;
-      weaverse.setProjectData(params.data);
+      window.weaverseStudio?.refresh(params);
     }
     return weaverse;
   }
@@ -185,41 +181,38 @@ function useThemeContext() {
 // src/hooks/use-studio.ts
 function useStudio(weaverse) {
   let { revalidate } = (0, import_react7.useRevalidator)();
+  let { pathname, search } = (0, import_react7.useLocation)();
   let navigate = (0, import_react7.useNavigate)();
   let themeSettingsStore = useThemeContext();
   let { isDesignMode, weaverseHost, weaverseVersion } = weaverse;
-  let isStudio = import_react8.isIframe && isDesignMode && weaverseHost && weaverseVersion;
   (0, import_react9.useEffect)(() => {
-    if (isStudio) {
+    if (isDesignMode) {
       weaverse.internal = {
         ...weaverse.internal,
         navigate,
         revalidate,
         themeSettingsStore
       };
-      window.__weaverse = weaverse;
-      if (window.weaverseStudio) {
-        window.weaverseStudio.init(weaverse);
-      } else {
-        let studioSrc = `${weaverseHost}/static/studio/hydrogen/index.js?v=${weaverseVersion}`;
-        (0, import_react8.loadScript)(studioSrc);
-      }
+      let studioSrc = `${weaverseHost}/static/studio/hydrogen/index.js?v=${weaverseVersion}`;
+      (0, import_react8.loadScript)(studioSrc).then(() => {
+        window.weaverseStudio?.init(weaverse);
+      }).catch(console.error);
     }
-  }, [weaverse.requestInfo]);
+  }, [pathname, search]);
 }
 
 // src/pixel.tsx
 var import_react10 = __toESM(require("react"));
-var Pixel = ({ baseUrl, projectId, pageId }) => {
+function 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 }) => {
+}
+function 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_react13.memo)(
@@ -270,7 +263,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.4",
+  version: "2.8.0",
   license: "MIT",
   main: "dist/index.js",
   typings: "dist/index.d.ts",
@@ -308,7 +301,7 @@ var package_default = {
     singleQuote: true
   },
   dependencies: {
-    "@weaverse/react": "2.7.4",
+    "@weaverse/react": "2.8.0",
     "react-error-boundary": "^4.0.11"
   },
   devDependencies: {
@@ -513,12 +506,15 @@ var WeaverseClient = class {
             strategy
           });
         }
+        if (payload?.error) {
+          throw new Error(payload?.error);
+        }
         let { page, project, pageAssignment } = payload;
-        if (!page || !project || !pageAssignment) {
-          throw new Error(
-            // @ts-ignore
-            payload?.error || "Invalid Weaverse project payload!"
-          );
+        if (!project) {
+          throw new Error(`Weaverse project not found. Id: ${projectId}`);
+        }
+        if (!page) {
+          throw new Error(`No Weaverse page assigned to this url.`);
         }
         if (page?.items) {
           let items = page.items;
@@ -585,6 +581,7 @@ var WeaverseHydrogen = class extends import_react14.Weaverse {
   internal;
   requestInfo;
   constructor(params, components) {
+    console.log("\u{1F4BF} New WeaverseHydrogen", params);
     let { internal, pageId, requestInfo, ...coreParams } = params;
     super({ ...coreParams, ItemConstructor: WeaverseHydrogenItem });
     this.internal = internal;

package/dist/index.mjs

@@ -45,17 +45,13 @@ import { isBrowser } from "@weaverse/react";
 import { createContext } from "react";
 function createCachedWeaverseInstance(params, components) {
   if (isBrowser) {
-    window.__weaverses = window.__weaverses || [];
-    let weaverse = window.__weaverses.find((w) => {
-      let { pathname } = w.requestInfo;
-      return pathname === params.requestInfo.pathname;
-    });
+    window.__weaverses = window.__weaverses || {};
+    let weaverse = window.__weaverses[params.pageId];
     if (!weaverse) {
       weaverse = new WeaverseHydrogen(params, components);
-      window.__weaverses.push(weaverse);
+      window.__weaverses[params.pageId] = weaverse;
     } else if (weaverse.isDesignMode) {
-      weaverse.requestInfo = params.requestInfo;
-      weaverse.setProjectData(params.data);
+      window.weaverseStudio?.refresh(params);
     }
     return weaverse;
   }
@@ -77,8 +73,8 @@ var ThemeProvider = createContext(null);
 ThemeProvider.displayName = "WeaverseThemeProvider";
 
 // src/hooks/use-studio.ts
-import { useNavigate, useRevalidator } from "@remix-run/react";
-import { isIframe, loadScript } from "@weaverse/react";
+import { useLocation, useNavigate, useRevalidator } from "@remix-run/react";
+import { loadScript } from "@weaverse/react";
 import { useEffect } from "react";
 
 // src/hooks/use-theme-context.ts
@@ -151,41 +147,38 @@ function useThemeContext() {
 // src/hooks/use-studio.ts
 function useStudio(weaverse) {
   let { revalidate } = useRevalidator();
+  let { pathname, search } = useLocation();
   let navigate = useNavigate();
   let themeSettingsStore = useThemeContext();
   let { isDesignMode, weaverseHost, weaverseVersion } = weaverse;
-  let isStudio = isIframe && isDesignMode && weaverseHost && weaverseVersion;
   useEffect(() => {
-    if (isStudio) {
+    if (isDesignMode) {
       weaverse.internal = {
         ...weaverse.internal,
         navigate,
         revalidate,
         themeSettingsStore
       };
-      window.__weaverse = weaverse;
-      if (window.weaverseStudio) {
-        window.weaverseStudio.init(weaverse);
-      } else {
-        let studioSrc = `${weaverseHost}/static/studio/hydrogen/index.js?v=${weaverseVersion}`;
-        loadScript(studioSrc);
-      }
+      let studioSrc = `${weaverseHost}/static/studio/hydrogen/index.js?v=${weaverseVersion}`;
+      loadScript(studioSrc).then(() => {
+        window.weaverseStudio?.init(weaverse);
+      }).catch(console.error);
     }
-  }, [weaverse.requestInfo]);
+  }, [pathname, search]);
 }
 
 // src/pixel.tsx
 import React2 from "react";
-var Pixel = ({ baseUrl, projectId, pageId }) => {
+function 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 }) => {
+}
+function 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(
@@ -236,7 +229,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.4",
+  version: "2.8.0",
   license: "MIT",
   main: "dist/index.js",
   typings: "dist/index.d.ts",
@@ -274,7 +267,7 @@ var package_default = {
     singleQuote: true
   },
   dependencies: {
-    "@weaverse/react": "2.7.4",
+    "@weaverse/react": "2.8.0",
     "react-error-boundary": "^4.0.11"
   },
   devDependencies: {
@@ -479,12 +472,15 @@ var WeaverseClient = class {
             strategy
           });
         }
+        if (payload?.error) {
+          throw new Error(payload?.error);
+        }
         let { page, project, pageAssignment } = payload;
-        if (!page || !project || !pageAssignment) {
-          throw new Error(
-            // @ts-ignore
-            payload?.error || "Invalid Weaverse project payload!"
-          );
+        if (!project) {
+          throw new Error(`Weaverse project not found. Id: ${projectId}`);
+        }
+        if (!page) {
+          throw new Error(`No Weaverse page assigned to this url.`);
         }
         if (page?.items) {
           let items = page.items;
@@ -551,6 +547,7 @@ var WeaverseHydrogen = class extends Weaverse {
   internal;
   requestInfo;
   constructor(params, components) {
+    console.log("\u{1F4BF} New WeaverseHydrogen", params);
     let { internal, pageId, requestInfo, ...coreParams } = params;
     super({ ...coreParams, ItemConstructor: WeaverseHydrogenItem });
     this.internal = internal;

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