@weaverse/hydrogen 1.1.9 → 1.1.11

package/dist/index.d.mts

@@ -1,9 +1,9 @@
 import React, { ForwardRefExoticComponent } from 'react';
+import { Params, NavigateFunction } from '@remix-run/react';
+import { LanguageCode, CountryCode, CurrencyCode } from '@shopify/hydrogen/storefront-api-types';
 import { LoaderArgs, AppLoadContext } from '@shopify/remix-oxygen';
 import { ElementData, ElementSchema, BasicInput, WeaverseElement, WeaverseItemStore, Weaverse } from '@weaverse/react';
 export * from '@weaverse/react';
-import { LanguageCode, CountryCode, CurrencyCode } from '@shopify/hydrogen/storefront-api-types';
-import { NavigateFunction } from '@remix-run/react';
 import * as _shopify_hydrogen_react_storefront_api_types from '@shopify/hydrogen-react/storefront-api-types';
 
 declare let STORE_PAGES: {
@@ -84,9 +84,9 @@ type I18nLocale = Locale & {
     pathPrefix: string;
 };
 type WeaverseLoaderRequestInfo = {
-    params: any;
-    pathname: string;
+    params: Params;
     search: string;
+    pathname: string;
     queries: Record<string, string | boolean>;
     i18n: I18nLocale;
 };
@@ -101,6 +101,7 @@ interface WeaverseHydrogen extends WeaverseCore {
 }
 type WeaverseStorefrontData = {
     id?: string;
+    __cachedId?: string;
     rootId: string;
     name: string;
     items: HydrogenComponentData[];
@@ -125,6 +126,7 @@ type WeaverseInternal = {
     project: HydrogenProjectType;
     navigate: NavigateFunction;
     revalidate: () => void;
+    [key: string]: any;
 };
 type HydrogenComponentPresets = {
     type: string;
@@ -224,6 +226,11 @@ type FetchProjectRequestBody = {
     loaderConfigs?: WeaverseLoaderConfigs;
     isDesignMode?: boolean;
 };
+type FetchProjectPayload = {
+    page: HydrogenPageData;
+    project: HydrogenProjectType;
+    pageAssignment: HydrogenPageAssignment;
+};
 declare global {
     interface Window {
         __weaverse: WeaverseHydrogen;
@@ -251,4 +258,4 @@ declare function useThemeSettings(): (Record<string, any> | ((newSettings: any)
 
 declare function WeaverseHydrogenRoot({ errorComponent: ErrorComponent, ...themeConfigs }: WeaverseHydrogenRootProps): React.JSX.Element;
 
-export { FetchProjectRequestBody, HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenToolbarAction, I18nLocale, InspectorGroup, Locale, Localizations, PageType, TODO, WeaverseHydrogen, WeaverseHydrogenInit, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderArgs, WeaverseLoaderConfigs, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, fetchWithServerCache, getRequestQueries, getSelectedProductOptions, useThemeSettings, weaverseLoader };
+export { FetchProjectPayload, FetchProjectRequestBody, HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenToolbarAction, I18nLocale, InspectorGroup, Locale, Localizations, PageType, TODO, WeaverseHydrogen, WeaverseHydrogenInit, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderArgs, WeaverseLoaderConfigs, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, fetchWithServerCache, getRequestQueries, getSelectedProductOptions, useThemeSettings, weaverseLoader };

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import React, { ForwardRefExoticComponent } from 'react';
+import { Params, NavigateFunction } from '@remix-run/react';
+import { LanguageCode, CountryCode, CurrencyCode } from '@shopify/hydrogen/storefront-api-types';
 import { LoaderArgs, AppLoadContext } from '@shopify/remix-oxygen';
 import { ElementData, ElementSchema, BasicInput, WeaverseElement, WeaverseItemStore, Weaverse } from '@weaverse/react';
 export * from '@weaverse/react';
-import { LanguageCode, CountryCode, CurrencyCode } from '@shopify/hydrogen/storefront-api-types';
-import { NavigateFunction } from '@remix-run/react';
 import * as _shopify_hydrogen_react_storefront_api_types from '@shopify/hydrogen-react/storefront-api-types';
 
 declare let STORE_PAGES: {
@@ -84,9 +84,9 @@ type I18nLocale = Locale & {
     pathPrefix: string;
 };
 type WeaverseLoaderRequestInfo = {
-    params: any;
-    pathname: string;
+    params: Params;
     search: string;
+    pathname: string;
     queries: Record<string, string | boolean>;
     i18n: I18nLocale;
 };
@@ -101,6 +101,7 @@ interface WeaverseHydrogen extends WeaverseCore {
 }
 type WeaverseStorefrontData = {
     id?: string;
+    __cachedId?: string;
     rootId: string;
     name: string;
     items: HydrogenComponentData[];
@@ -125,6 +126,7 @@ type WeaverseInternal = {
     project: HydrogenProjectType;
     navigate: NavigateFunction;
     revalidate: () => void;
+    [key: string]: any;
 };
 type HydrogenComponentPresets = {
     type: string;
@@ -224,6 +226,11 @@ type FetchProjectRequestBody = {
     loaderConfigs?: WeaverseLoaderConfigs;
     isDesignMode?: boolean;
 };
+type FetchProjectPayload = {
+    page: HydrogenPageData;
+    project: HydrogenProjectType;
+    pageAssignment: HydrogenPageAssignment;
+};
 declare global {
     interface Window {
         __weaverse: WeaverseHydrogen;
@@ -251,4 +258,4 @@ declare function useThemeSettings(): (Record<string, any> | ((newSettings: any)
 
 declare function WeaverseHydrogenRoot({ errorComponent: ErrorComponent, ...themeConfigs }: WeaverseHydrogenRootProps): React.JSX.Element;
 
-export { FetchProjectRequestBody, HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenToolbarAction, I18nLocale, InspectorGroup, Locale, Localizations, PageType, TODO, WeaverseHydrogen, WeaverseHydrogenInit, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderArgs, WeaverseLoaderConfigs, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, fetchWithServerCache, getRequestQueries, getSelectedProductOptions, useThemeSettings, weaverseLoader };
+export { FetchProjectPayload, FetchProjectRequestBody, HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenToolbarAction, I18nLocale, InspectorGroup, Locale, Localizations, PageType, TODO, WeaverseHydrogen, WeaverseHydrogenInit, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderArgs, WeaverseLoaderConfigs, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, fetchWithServerCache, getRequestQueries, getSelectedProductOptions, useThemeSettings, weaverseLoader };

package/dist/index.js

@@ -51,22 +51,19 @@ function createCachedWeaverseInstance(init) {
     window.__weaverses = window.__weaverses || [];
     let weaverse = window.__weaverses.find((w) => {
       let { pathname, search } = w.requestInfo;
-      return pathname === init.requestInfo.pathname && search === init.requestInfo.search;
+      let { __cachedId } = w.data;
+      return pathname === init.requestInfo.pathname && search === init.requestInfo.search && __cachedId === init.data.__cachedId;
     });
     if (!weaverse) {
       weaverse = new import_react.Weaverse(init);
       window.__weaverses.push(weaverse);
-    } else {
-      weaverse.setProjectData(init.data);
+      console.log("\u{1F4BF} Weaverse", weaverse);
     }
     return weaverse;
   }
   return new import_react.Weaverse(init);
 }
 function createWeaverseInstance(weaverseData, components) {
-  if (import_react.isBrowser) {
-    console.log("\u{1F4BF} Weaverse data", weaverseData);
-  }
   let { page, configs, project, pageAssignment } = weaverseData || {};
   let weaverse = createCachedWeaverseInstance({
     ...configs,
@@ -90,7 +87,7 @@ function createWeaverseInstance(weaverseData, components) {
 var import_react2 = require("@remix-run/react");
 var import_react3 = require("@weaverse/react");
 var import_react4 = require("react");
-function useStudio(weaverse, countries, schema) {
+function useStudio(weaverse, countries, schema, weaverseData) {
   let navigate = (0, import_react2.useNavigate)();
   let { revalidate } = (0, import_react2.useRevalidator)();
   let { isDesignMode, weaverseHost, weaverseVersion } = weaverse;
@@ -101,7 +98,9 @@ function useStudio(weaverse, countries, schema) {
         ...weaverse.internal,
         navigate,
         revalidate,
-        themeConfigs: { schema, countries }
+        themeConfigs: { schema, countries },
+        publicStoreDomain: weaverseData?.configs?.publicStoreDomain,
+        publicStorefrontApiToken: weaverseData?.configs?.publicStorefrontApiToken
       };
       window.__weaverse = weaverse;
       if (window.weaverseStudio) {
@@ -152,7 +151,12 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
     try {
       let { request, context, params } = args;
       let queries = getRequestQueries(request);
-      let { WEAVERSE_PROJECT_ID, WEAVERSE_HOST } = context?.env || {};
+      let {
+        WEAVERSE_PROJECT_ID,
+        WEAVERSE_HOST,
+        PUBLIC_STORE_DOMAIN,
+        PUBLIC_STOREFRONT_API_TOKEN
+      } = context?.env || {};
       let { weaverseProjectId, weaverseHost, isDesignMode, weaverseVersion } = queries;
       let projectId = weaverseProjectId || WEAVERSE_PROJECT_ID;
       weaverseHost = weaverseHost || WEAVERSE_HOST || "https://weaverse.io";
@@ -208,6 +212,12 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
         let items = page.items;
         page.items = await withLoaderData(items, components, configs, args);
       }
+      if (isDesignMode) {
+        Object.assign(configs, {
+          publicStoreDomain: PUBLIC_STORE_DOMAIN,
+          publicStorefrontApiToken: PUBLIC_STOREFRONT_API_TOKEN
+        });
+      }
       resolve({ page, configs, project, pageAssignment });
     } catch (err) {
       console.log(`\u274C Error fetching project data: ${err?.toString()}`);
@@ -296,7 +306,7 @@ function WeaverseHydrogenRoot({
 function RenderWeaverseRoot(props) {
   let { weaverseData, components, countries, themeSchema } = props;
   let weaverse = createWeaverseInstance(weaverseData, components);
-  useStudio(weaverse, countries, themeSchema);
+  useStudio(weaverse, countries, themeSchema, weaverseData);
   return /* @__PURE__ */ import_react8.default.createElement(import_react7.WeaverseRoot, { context: weaverse });
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.mjs

@@ -11,22 +11,19 @@ function createCachedWeaverseInstance(init) {
     window.__weaverses = window.__weaverses || [];
     let weaverse = window.__weaverses.find((w) => {
       let { pathname, search } = w.requestInfo;
-      return pathname === init.requestInfo.pathname && search === init.requestInfo.search;
+      let { __cachedId } = w.data;
+      return pathname === init.requestInfo.pathname && search === init.requestInfo.search && __cachedId === init.data.__cachedId;
     });
     if (!weaverse) {
       weaverse = new Weaverse(init);
       window.__weaverses.push(weaverse);
-    } else {
-      weaverse.setProjectData(init.data);
+      console.log("\u{1F4BF} Weaverse", weaverse);
     }
     return weaverse;
   }
   return new Weaverse(init);
 }
 function createWeaverseInstance(weaverseData, components) {
-  if (isBrowser) {
-    console.log("\u{1F4BF} Weaverse data", weaverseData);
-  }
   let { page, configs, project, pageAssignment } = weaverseData || {};
   let weaverse = createCachedWeaverseInstance({
     ...configs,
@@ -50,7 +47,7 @@ function createWeaverseInstance(weaverseData, components) {
 import { useNavigate, useRevalidator } from "@remix-run/react";
 import { isIframe, loadScript } from "@weaverse/react";
 import { useEffect } from "react";
-function useStudio(weaverse, countries, schema) {
+function useStudio(weaverse, countries, schema, weaverseData) {
   let navigate = useNavigate();
   let { revalidate } = useRevalidator();
   let { isDesignMode, weaverseHost, weaverseVersion } = weaverse;
@@ -61,7 +58,9 @@ function useStudio(weaverse, countries, schema) {
         ...weaverse.internal,
         navigate,
         revalidate,
-        themeConfigs: { schema, countries }
+        themeConfigs: { schema, countries },
+        publicStoreDomain: weaverseData?.configs?.publicStoreDomain,
+        publicStorefrontApiToken: weaverseData?.configs?.publicStorefrontApiToken
       };
       window.__weaverse = weaverse;
       if (window.weaverseStudio) {
@@ -112,7 +111,12 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
     try {
       let { request, context, params } = args;
       let queries = getRequestQueries(request);
-      let { WEAVERSE_PROJECT_ID, WEAVERSE_HOST } = context?.env || {};
+      let {
+        WEAVERSE_PROJECT_ID,
+        WEAVERSE_HOST,
+        PUBLIC_STORE_DOMAIN,
+        PUBLIC_STOREFRONT_API_TOKEN
+      } = context?.env || {};
       let { weaverseProjectId, weaverseHost, isDesignMode, weaverseVersion } = queries;
       let projectId = weaverseProjectId || WEAVERSE_PROJECT_ID;
       weaverseHost = weaverseHost || WEAVERSE_HOST || "https://weaverse.io";
@@ -168,6 +172,12 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
         let items = page.items;
         page.items = await withLoaderData(items, components, configs, args);
       }
+      if (isDesignMode) {
+        Object.assign(configs, {
+          publicStoreDomain: PUBLIC_STORE_DOMAIN,
+          publicStorefrontApiToken: PUBLIC_STOREFRONT_API_TOKEN
+        });
+      }
       resolve({ page, configs, project, pageAssignment });
     } catch (err) {
       console.log(`\u274C Error fetching project data: ${err?.toString()}`);
@@ -256,7 +266,7 @@ function WeaverseHydrogenRoot({
 function RenderWeaverseRoot(props) {
   let { weaverseData, components, countries, themeSchema } = props;
   let weaverse = createWeaverseInstance(weaverseData, components);
-  useStudio(weaverse, countries, themeSchema);
+  useStudio(weaverse, countries, themeSchema, weaverseData);
   return /* @__PURE__ */ React.createElement(WeaverseRoot, { context: weaverse });
 }
 export {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.9",
+  "version": "1.1.11",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@remix-run/react": "1.19.1",
     "@shopify/hydrogen": "2023.7.3",
-    "@weaverse/react": "1.1.9",
+    "@weaverse/react": "1.1.11",
     "react-error-boundary": "^4.0.11"
   },
   "devDependencies": {