@weaverse/hydrogen 1.1.12 → 1.1.13

package/dist/index.d.mts

@@ -106,8 +106,11 @@ type WeaverseStorefrontData = {
     name: string;
     items: HydrogenComponentData[];
 };
+type HydrogenThemeSettings = {
+    [key: string]: string | number | boolean;
+};
 type HydrogenProjectConfig = {
-    theme: Record<string, any>;
+    theme: HydrogenThemeSettings;
 };
 type HydrogenProjectType = {
     id: string;
@@ -126,7 +129,7 @@ type WeaverseInternal = {
     project: HydrogenProjectType;
     navigate: NavigateFunction;
     revalidate: () => void;
-    [key: string]: any;
+    publicEnv?: PublicEnv;
 };
 type HydrogenComponentPresets = {
     type: string;
@@ -163,12 +166,17 @@ type WeaverseStudioQueries = {
     weaverseVersion: string;
     isDesignMode: boolean;
 };
+type PublicEnv = {
+    PUBLIC_STORE_DOMAIN: string;
+    PUBLIC_STOREFRONT_API_TOKEN: string;
+};
 type HydrogenPageConfigs = {
     projectId: string;
     weaverseHost: string;
     weaverseVersion?: string;
     isDesignMode?: boolean;
     requestInfo: WeaverseLoaderRequestInfo;
+    publicEnv?: PublicEnv;
 };
 type HydrogenPageAssignment = {
     projectId: string;
@@ -254,8 +262,8 @@ declare function getRequestQueries<T = Record<string, string | boolean>>(request
 
 declare function getSelectedProductOptions(request: Request): _shopify_hydrogen_react_storefront_api_types.SelectedOptionInput[];
 
-declare function useThemeSettings(): (Record<string, any> | ((newSettings: any) => void))[];
+declare function useThemeSettings<T = HydrogenThemeSettings>(): T;
 
 declare function WeaverseHydrogenRoot({ errorComponent: ErrorComponent, ...themeConfigs }: WeaverseHydrogenRootProps): React.JSX.Element;
 
-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 };
+export { FetchProjectPayload, FetchProjectRequestBody, HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenThemeSettings, HydrogenToolbarAction, I18nLocale, InspectorGroup, Locale, Localizations, PageType, PublicEnv, TODO, WeaverseHydrogen, WeaverseHydrogenInit, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderArgs, WeaverseLoaderConfigs, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, fetchWithServerCache, getRequestQueries, getSelectedProductOptions, useThemeSettings, weaverseLoader };

package/dist/index.d.ts

@@ -106,8 +106,11 @@ type WeaverseStorefrontData = {
     name: string;
     items: HydrogenComponentData[];
 };
+type HydrogenThemeSettings = {
+    [key: string]: string | number | boolean;
+};
 type HydrogenProjectConfig = {
-    theme: Record<string, any>;
+    theme: HydrogenThemeSettings;
 };
 type HydrogenProjectType = {
     id: string;
@@ -126,7 +129,7 @@ type WeaverseInternal = {
     project: HydrogenProjectType;
     navigate: NavigateFunction;
     revalidate: () => void;
-    [key: string]: any;
+    publicEnv?: PublicEnv;
 };
 type HydrogenComponentPresets = {
     type: string;
@@ -163,12 +166,17 @@ type WeaverseStudioQueries = {
     weaverseVersion: string;
     isDesignMode: boolean;
 };
+type PublicEnv = {
+    PUBLIC_STORE_DOMAIN: string;
+    PUBLIC_STOREFRONT_API_TOKEN: string;
+};
 type HydrogenPageConfigs = {
     projectId: string;
     weaverseHost: string;
     weaverseVersion?: string;
     isDesignMode?: boolean;
     requestInfo: WeaverseLoaderRequestInfo;
+    publicEnv?: PublicEnv;
 };
 type HydrogenPageAssignment = {
     projectId: string;
@@ -254,8 +262,8 @@ declare function getRequestQueries<T = Record<string, string | boolean>>(request
 
 declare function getSelectedProductOptions(request: Request): _shopify_hydrogen_react_storefront_api_types.SelectedOptionInput[];
 
-declare function useThemeSettings(): (Record<string, any> | ((newSettings: any) => void))[];
+declare function useThemeSettings<T = HydrogenThemeSettings>(): T;
 
 declare function WeaverseHydrogenRoot({ errorComponent: ErrorComponent, ...themeConfigs }: WeaverseHydrogenRootProps): React.JSX.Element;
 
-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 };
+export { FetchProjectPayload, FetchProjectRequestBody, HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenThemeSettings, HydrogenToolbarAction, I18nLocale, InspectorGroup, Locale, Localizations, PageType, PublicEnv, TODO, WeaverseHydrogen, WeaverseHydrogenInit, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderArgs, WeaverseLoaderConfigs, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, fetchWithServerCache, getRequestQueries, getSelectedProductOptions, useThemeSettings, weaverseLoader };

package/dist/index.js

@@ -87,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, weaverseData) {
+function useStudio(weaverse, countries, schema, publicEnv) {
   let navigate = (0, import_react2.useNavigate)();
   let { revalidate } = (0, import_react2.useRevalidator)();
   let { isDesignMode, weaverseHost, weaverseVersion } = weaverse;
@@ -96,11 +96,10 @@ function useStudio(weaverse, countries, schema, weaverseData) {
     if (isStudio) {
       weaverse.internal = {
         ...weaverse.internal,
+        publicEnv,
         navigate,
         revalidate,
-        themeConfigs: { schema, countries },
-        publicStoreDomain: weaverseData?.configs?.publicStoreDomain,
-        publicStorefrontApiToken: weaverseData?.configs?.publicStorefrontApiToken
+        themeConfigs: { schema, countries }
       };
       window.__weaverse = weaverse;
       if (window.weaverseStudio) {
@@ -213,10 +212,10 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
         page.items = await withLoaderData(items, components, configs, args);
       }
       if (isDesignMode) {
-        Object.assign(configs, {
-          publicStoreDomain: PUBLIC_STORE_DOMAIN,
-          publicStorefrontApiToken: PUBLIC_STOREFRONT_API_TOKEN
-        });
+        configs.publicEnv = {
+          PUBLIC_STORE_DOMAIN,
+          PUBLIC_STOREFRONT_API_TOKEN
+        };
       }
       resolve({ page, configs, project, pageAssignment });
     } catch (err) {
@@ -264,15 +263,7 @@ var import_react5 = require("@weaverse/react");
 function useThemeSettings() {
   let weaverse = (0, import_react5.useWeaverse)();
   let settings = weaverse?.internal?.project?.config?.theme;
-  let updateSettings = (newSettings) => {
-    weaverse.internal.project.config.theme = Object.assign(
-      {},
-      settings,
-      newSettings
-    );
-    weaverse.triggerUpdate();
-  };
-  return [settings, updateSettings];
+  return settings;
 }
 
 // src/index.tsx
@@ -306,7 +297,8 @@ function WeaverseHydrogenRoot({
 function RenderWeaverseRoot(props) {
   let { weaverseData, components, countries, themeSchema } = props;
   let weaverse = createWeaverseInstance(weaverseData, components);
-  useStudio(weaverse, countries, themeSchema, weaverseData);
+  let { publicEnv } = weaverseData.configs;
+  useStudio(weaverse, countries, themeSchema, publicEnv);
   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

@@ -47,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, weaverseData) {
+function useStudio(weaverse, countries, schema, publicEnv) {
   let navigate = useNavigate();
   let { revalidate } = useRevalidator();
   let { isDesignMode, weaverseHost, weaverseVersion } = weaverse;
@@ -56,11 +56,10 @@ function useStudio(weaverse, countries, schema, weaverseData) {
     if (isStudio) {
       weaverse.internal = {
         ...weaverse.internal,
+        publicEnv,
         navigate,
         revalidate,
-        themeConfigs: { schema, countries },
-        publicStoreDomain: weaverseData?.configs?.publicStoreDomain,
-        publicStorefrontApiToken: weaverseData?.configs?.publicStorefrontApiToken
+        themeConfigs: { schema, countries }
       };
       window.__weaverse = weaverse;
       if (window.weaverseStudio) {
@@ -173,10 +172,10 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
         page.items = await withLoaderData(items, components, configs, args);
       }
       if (isDesignMode) {
-        Object.assign(configs, {
-          publicStoreDomain: PUBLIC_STORE_DOMAIN,
-          publicStorefrontApiToken: PUBLIC_STOREFRONT_API_TOKEN
-        });
+        configs.publicEnv = {
+          PUBLIC_STORE_DOMAIN,
+          PUBLIC_STOREFRONT_API_TOKEN
+        };
       }
       resolve({ page, configs, project, pageAssignment });
     } catch (err) {
@@ -224,15 +223,7 @@ import { useWeaverse } from "@weaverse/react";
 function useThemeSettings() {
   let weaverse = useWeaverse();
   let settings = weaverse?.internal?.project?.config?.theme;
-  let updateSettings = (newSettings) => {
-    weaverse.internal.project.config.theme = Object.assign(
-      {},
-      settings,
-      newSettings
-    );
-    weaverse.triggerUpdate();
-  };
-  return [settings, updateSettings];
+  return settings;
 }
 
 // src/index.tsx
@@ -266,7 +257,8 @@ function WeaverseHydrogenRoot({
 function RenderWeaverseRoot(props) {
   let { weaverseData, components, countries, themeSchema } = props;
   let weaverse = createWeaverseInstance(weaverseData, components);
-  useStudio(weaverse, countries, themeSchema, weaverseData);
+  let { publicEnv } = weaverseData.configs;
+  useStudio(weaverse, countries, themeSchema, publicEnv);
   return /* @__PURE__ */ React.createElement(WeaverseRoot, { context: weaverse });
 }
 export {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.12",
+  "version": "1.1.13",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -33,11 +33,11 @@
   "author": "Weaverse Team",
   "dependencies": {
     "@remix-run/react": "1.19.1",
-    "@shopify/hydrogen": "2023.7.3",
-    "@weaverse/react": "1.1.12",
+    "@shopify/hydrogen": "2023.7.5",
+    "@weaverse/react": "1.1.13",
     "react-error-boundary": "^4.0.11"
   },
   "devDependencies": {
     "@shopify/remix-oxygen": "^1.1.3"
   }
-}
+}