@weaverse/hydrogen 1.3.2 → 1.3.3

package/dist/index.js

@@ -50,7 +50,7 @@ var import_hydrogen = require("@shopify/hydrogen");
 
 // package.json
 var package_default = {
-  version: "1.3.2",
+  version: "1.3.3",
   license: "MIT",
   main: "dist/index.js",
   typings: "dist/index.d.ts",
@@ -62,7 +62,7 @@ var package_default = {
     "dist/*"
   ],
   engines: {
-    node: ">=10"
+    node: ">=16"
   },
   scripts: {
     start: "npm run dev",
@@ -85,7 +85,7 @@ var package_default = {
   dependencies: {
     "@remix-run/react": "1.19.1",
     "@shopify/hydrogen": "2023.7.8",
-    "@weaverse/react": "1.3.2",
+    "@weaverse/react": "1.3.3",
     "react-error-boundary": "^4.0.11"
   },
   devDependencies: {
@@ -151,24 +151,56 @@ function getWeaverseCsp(request) {
 
 // src/client.ts
 var WeaverseClient = class {
+  API = "api/public/project";
+  clientVersion = package_default.version;
+  storefront;
+  components;
+  countries;
+  themeSchema;
+  configs;
+  basePageConfigs;
+  basePageRequestBody;
+  withCache;
   constructor(args) {
-    this.API = "api/public/project";
-    this.clientVersion = package_default.version;
-    this.fetchWithCache = (url, options) => {
-      let cacheKey = [url, options.body];
-      let { strategy = this.storefront.CacheShort(), ...reqInit } = options;
-      let res = this.withCache(cacheKey, strategy, async () => {
-        let response = await fetch(url, reqInit);
-        if (!response.ok) {
-          throw new Error("Something went wrong. Skipping cache.");
-        }
-        return await response.json();
-      });
-      return res;
+    let { configs, storefront, components, countries, withCache, themeSchema } = args;
+    this.storefront = storefront;
+    this.components = components;
+    this.countries = countries;
+    this.themeSchema = themeSchema;
+    this.configs = configs;
+    this.withCache = withCache;
+    this.basePageConfigs = {
+      projectId: configs.projectId,
+      weaverseHost: configs.weaverseHost,
+      weaverseVersion: configs.weaverseVersion,
+      isDesignMode: configs.isDesignMode
+    };
+    this.basePageRequestBody = {
+      countries,
+      isDesignMode: this.configs.isDesignMode,
+      i18n: storefront.i18n,
+      projectId: this.configs.projectId
     };
-    this.loadThemeSettings = async (strategy) => {
+  }
+  fetchWithCache = (url, options) => {
+    let cacheKey = [url, options.body];
+    let { strategy = this.storefront.CacheShort(), ...reqInit } = options;
+    let res = this.withCache(cacheKey, strategy, async () => {
+      let response = await fetch(url, reqInit);
+      if (!response.ok) {
+        throw new Error("Something went wrong. Skipping cache.");
+      }
+      return await response.json();
+    });
+    return res;
+  };
+  loadThemeSettings = async (strategy) => {
+    try {
       let { API, configs } = this;
       let { weaverseHost, projectId } = configs;
+      if (!projectId) {
+        throw new Error("Missing Weaverse projectId!");
+      }
       let res = await this.fetchWithCache(
         `${weaverseHost}/${API}/${projectId}/configs`,
         { strategy }
@@ -186,109 +218,96 @@ var WeaverseClient = class {
         }
       }
       return data;
-    };
-    this.loadPage = async (args, configs = {}) => {
-      return new Promise(async (resolve, reject) => {
-        try {
-          let { request, params } = args;
-          let { strategy, ...pageLoadParams } = configs;
-          let body = {
-            ...this.basePageRequestBody,
-            params: pageLoadParams,
-            url: request.url
-          };
-          let reqInit = {
-            method: "POST",
-            body: JSON.stringify(body)
-          };
-          let url = `${this.configs.weaverseHost}/${this.API}`;
-          let payload;
-          if (this.configs.isDesignMode) {
-            payload = await fetch(url, reqInit).then((res) => res.json());
-          } else {
-            payload = await this.fetchWithCache(url, {
-              ...reqInit,
-              strategy
-            });
-          }
-          let { page, project, pageAssignment } = payload;
-          if (!page || !project || !pageAssignment) {
-            return reject(
-              new Error(
-                // @ts-ignore
-                payload?.error || "Invalid Weaverse project payload!"
-              )
-            );
-          }
-          if (page?.items) {
-            let items = page.items;
-            page.items = await Promise.all(
-              items.map((item) => this.execComponentLoader(item, args))
-            );
-          }
-          let data = {
-            page,
-            project,
-            pageAssignment,
-            configs: {
-              ...this.basePageConfigs,
-              requestInfo: {
-                params,
-                i18n: this.storefront.i18n,
-                queries: getRequestQueries(request),
-                pathname: new URL(request.url).pathname,
-                search: new URL(request.url).search
-              }
-            }
-          };
-          return resolve(data);
-        } catch (err) {
-          console.log(`\u274C [Weaverse page]`, err);
-          reject(err);
+    } catch (err) {
+      console.log(`\u274C [Weaverse theme settings]`, err);
+      return null;
+    }
+  };
+  loadPage = async (args, configs = {}) => {
+    return new Promise(async (resolve, reject) => {
+      try {
+        if (!this.configs.projectId) {
+          reject(new Error("Missing Weaverse projectId!"));
         }
-      });
-    };
-    this.execComponentLoader = async (item, args) => {
-      let schema = this.components.find(
-        ({ schema: schema2 }) => schema2?.type === item.type
-      );
-      let { loader } = schema || {};
-      if (loader && typeof loader === "function") {
-        try {
-          return {
-            ...item,
-            loaderData: await loader({
-              itemData: item,
-              ...args
-            })
-          };
-        } catch (err) {
-          console.log(`\u274C [Weaverse item loader]`, item.id, err);
-          return item;
+        let { request, params } = args;
+        let { strategy, ...pageLoadParams } = configs;
+        let body = {
+          ...this.basePageRequestBody,
+          params: pageLoadParams,
+          url: request.url
+        };
+        let reqInit = {
+          method: "POST",
+          body: JSON.stringify(body)
+        };
+        let url = `${this.configs.weaverseHost}/${this.API}`;
+        let payload;
+        if (this.configs.isDesignMode) {
+          payload = await fetch(url, reqInit).then((res) => res.json());
+        } else {
+          payload = await this.fetchWithCache(url, {
+            ...reqInit,
+            strategy
+          });
+        }
+        let { page, project, pageAssignment } = payload;
+        if (!page || !project || !pageAssignment) {
+          return reject(
+            new Error(
+              // @ts-ignore
+              payload?.error || "Invalid Weaverse project payload!"
+            )
+          );
+        }
+        if (page?.items) {
+          let items = page.items;
+          page.items = await Promise.all(
+            items.map((item) => this.execComponentLoader(item, args))
+          );
         }
+        let data = {
+          page,
+          project,
+          pageAssignment,
+          configs: {
+            ...this.basePageConfigs,
+            requestInfo: {
+              params,
+              i18n: this.storefront.i18n,
+              queries: getRequestQueries(request),
+              pathname: new URL(request.url).pathname,
+              search: new URL(request.url).search
+            }
+          }
+        };
+        return resolve(data);
+      } catch (err) {
+        console.log(`\u274C [Weaverse page]`, err);
+        reject(err);
       }
-      return item;
-    };
-    let { configs, storefront, components, countries, withCache, themeSchema } = args;
-    this.storefront = storefront;
-    this.components = components;
-    this.countries = countries;
-    this.themeSchema = themeSchema;
-    this.configs = configs;
-    this.withCache = withCache;
-    this.basePageConfigs = {
-      projectId: configs.projectId,
-      weaverseHost: configs.weaverseHost,
-      weaverseVersion: configs.weaverseVersion,
-      isDesignMode: configs.isDesignMode
-    };
-    this.basePageRequestBody = {
-      countries,
-      isDesignMode: this.configs.isDesignMode,
-      i18n: storefront.i18n,
-      projectId: this.configs.projectId
-    };
-  }
+    });
+  };
+  execComponentLoader = async (item, args) => {
+    let schema = this.components.find(
+      ({ schema: schema2 }) => schema2?.type === item.type
+    );
+    let { loader } = schema || {};
+    if (loader && typeof loader === "function") {
+      try {
+        return {
+          ...item,
+          loaderData: await loader({
+            itemData: item,
+            ...args
+          })
+        };
+      } catch (err) {
+        console.log(`\u274C [Weaverse item loader]`, item.id, err);
+        return item;
+      }
+    }
+    return item;
+  };
 };
 
 // src/hooks/use-theme-settings.ts
@@ -352,36 +371,39 @@ function useThemeContext() {
 
 // src/hooks/use-theme-settings.ts
 var ThemeSettingsStore = class {
+  settings = null;
+  listeners = [];
+  countries;
+  schema;
+  publicEnv;
   constructor(data) {
-    this.settings = null;
-    this.listeners = [];
-    this.updateThemeSettings = (newSettings) => {
-      this.settings = { ...this.settings, ...newSettings };
-      this.emitChange();
-    };
-    this.subscribe = (listener) => {
-      this.listeners = [...this.listeners, listener];
-      return () => {
-        this.listeners = this.listeners.filter((l) => l !== listener);
-      };
-    };
-    this.getSnapshot = () => {
-      return this.settings;
-    };
-    this.getServerSnapshot = () => {
-      return this.settings;
-    };
-    this.emitChange = () => {
-      for (let listener of this.listeners) {
-        listener();
-      }
-    };
     let { theme, countries, schema, publicEnv } = data || {};
     this.settings = theme || null;
     this.countries = countries;
     this.schema = schema;
     this.publicEnv = publicEnv;
   }
+  updateThemeSettings = (newSettings) => {
+    this.settings = { ...this.settings, ...newSettings };
+    this.emitChange();
+  };
+  subscribe = (listener) => {
+    this.listeners = [...this.listeners, listener];
+    return () => {
+      this.listeners = this.listeners.filter((l) => l !== listener);
+    };
+  };
+  getSnapshot = () => {
+    return this.settings;
+  };
+  getServerSnapshot = () => {
+    return this.settings;
+  };
+  emitChange = () => {
+    for (let listener of this.listeners) {
+      listener();
+    }
+  };
 };
 function useThemeSettings() {
   let themeSettingsStore = useThemeContext();

package/dist/index.mjs

@@ -6,7 +6,7 @@ import "@shopify/hydrogen";
 
 // package.json
 var package_default = {
-  version: "1.3.2",
+  version: "1.3.3",
   license: "MIT",
   main: "dist/index.js",
   typings: "dist/index.d.ts",
@@ -18,7 +18,7 @@ var package_default = {
     "dist/*"
   ],
   engines: {
-    node: ">=10"
+    node: ">=16"
   },
   scripts: {
     start: "npm run dev",
@@ -41,7 +41,7 @@ var package_default = {
   dependencies: {
     "@remix-run/react": "1.19.1",
     "@shopify/hydrogen": "2023.7.8",
-    "@weaverse/react": "1.3.2",
+    "@weaverse/react": "1.3.3",
     "react-error-boundary": "^4.0.11"
   },
   devDependencies: {
@@ -107,24 +107,56 @@ function getWeaverseCsp(request) {
 
 // src/client.ts
 var WeaverseClient = class {
+  API = "api/public/project";
+  clientVersion = package_default.version;
+  storefront;
+  components;
+  countries;
+  themeSchema;
+  configs;
+  basePageConfigs;
+  basePageRequestBody;
+  withCache;
   constructor(args) {
-    this.API = "api/public/project";
-    this.clientVersion = package_default.version;
-    this.fetchWithCache = (url, options) => {
-      let cacheKey = [url, options.body];
-      let { strategy = this.storefront.CacheShort(), ...reqInit } = options;
-      let res = this.withCache(cacheKey, strategy, async () => {
-        let response = await fetch(url, reqInit);
-        if (!response.ok) {
-          throw new Error("Something went wrong. Skipping cache.");
-        }
-        return await response.json();
-      });
-      return res;
+    let { configs, storefront, components, countries, withCache, themeSchema } = args;
+    this.storefront = storefront;
+    this.components = components;
+    this.countries = countries;
+    this.themeSchema = themeSchema;
+    this.configs = configs;
+    this.withCache = withCache;
+    this.basePageConfigs = {
+      projectId: configs.projectId,
+      weaverseHost: configs.weaverseHost,
+      weaverseVersion: configs.weaverseVersion,
+      isDesignMode: configs.isDesignMode
+    };
+    this.basePageRequestBody = {
+      countries,
+      isDesignMode: this.configs.isDesignMode,
+      i18n: storefront.i18n,
+      projectId: this.configs.projectId
     };
-    this.loadThemeSettings = async (strategy) => {
+  }
+  fetchWithCache = (url, options) => {
+    let cacheKey = [url, options.body];
+    let { strategy = this.storefront.CacheShort(), ...reqInit } = options;
+    let res = this.withCache(cacheKey, strategy, async () => {
+      let response = await fetch(url, reqInit);
+      if (!response.ok) {
+        throw new Error("Something went wrong. Skipping cache.");
+      }
+      return await response.json();
+    });
+    return res;
+  };
+  loadThemeSettings = async (strategy) => {
+    try {
       let { API, configs } = this;
       let { weaverseHost, projectId } = configs;
+      if (!projectId) {
+        throw new Error("Missing Weaverse projectId!");
+      }
       let res = await this.fetchWithCache(
         `${weaverseHost}/${API}/${projectId}/configs`,
         { strategy }
@@ -142,109 +174,96 @@ var WeaverseClient = class {
         }
       }
       return data;
-    };
-    this.loadPage = async (args, configs = {}) => {
-      return new Promise(async (resolve, reject) => {
-        try {
-          let { request, params } = args;
-          let { strategy, ...pageLoadParams } = configs;
-          let body = {
-            ...this.basePageRequestBody,
-            params: pageLoadParams,
-            url: request.url
-          };
-          let reqInit = {
-            method: "POST",
-            body: JSON.stringify(body)
-          };
-          let url = `${this.configs.weaverseHost}/${this.API}`;
-          let payload;
-          if (this.configs.isDesignMode) {
-            payload = await fetch(url, reqInit).then((res) => res.json());
-          } else {
-            payload = await this.fetchWithCache(url, {
-              ...reqInit,
-              strategy
-            });
-          }
-          let { page, project, pageAssignment } = payload;
-          if (!page || !project || !pageAssignment) {
-            return reject(
-              new Error(
-                // @ts-ignore
-                payload?.error || "Invalid Weaverse project payload!"
-              )
-            );
-          }
-          if (page?.items) {
-            let items = page.items;
-            page.items = await Promise.all(
-              items.map((item) => this.execComponentLoader(item, args))
-            );
-          }
-          let data = {
-            page,
-            project,
-            pageAssignment,
-            configs: {
-              ...this.basePageConfigs,
-              requestInfo: {
-                params,
-                i18n: this.storefront.i18n,
-                queries: getRequestQueries(request),
-                pathname: new URL(request.url).pathname,
-                search: new URL(request.url).search
-              }
-            }
-          };
-          return resolve(data);
-        } catch (err) {
-          console.log(`\u274C [Weaverse page]`, err);
-          reject(err);
+    } catch (err) {
+      console.log(`\u274C [Weaverse theme settings]`, err);
+      return null;
+    }
+  };
+  loadPage = async (args, configs = {}) => {
+    return new Promise(async (resolve, reject) => {
+      try {
+        if (!this.configs.projectId) {
+          reject(new Error("Missing Weaverse projectId!"));
         }
-      });
-    };
-    this.execComponentLoader = async (item, args) => {
-      let schema = this.components.find(
-        ({ schema: schema2 }) => schema2?.type === item.type
-      );
-      let { loader } = schema || {};
-      if (loader && typeof loader === "function") {
-        try {
-          return {
-            ...item,
-            loaderData: await loader({
-              itemData: item,
-              ...args
-            })
-          };
-        } catch (err) {
-          console.log(`\u274C [Weaverse item loader]`, item.id, err);
-          return item;
+        let { request, params } = args;
+        let { strategy, ...pageLoadParams } = configs;
+        let body = {
+          ...this.basePageRequestBody,
+          params: pageLoadParams,
+          url: request.url
+        };
+        let reqInit = {
+          method: "POST",
+          body: JSON.stringify(body)
+        };
+        let url = `${this.configs.weaverseHost}/${this.API}`;
+        let payload;
+        if (this.configs.isDesignMode) {
+          payload = await fetch(url, reqInit).then((res) => res.json());
+        } else {
+          payload = await this.fetchWithCache(url, {
+            ...reqInit,
+            strategy
+          });
+        }
+        let { page, project, pageAssignment } = payload;
+        if (!page || !project || !pageAssignment) {
+          return reject(
+            new Error(
+              // @ts-ignore
+              payload?.error || "Invalid Weaverse project payload!"
+            )
+          );
+        }
+        if (page?.items) {
+          let items = page.items;
+          page.items = await Promise.all(
+            items.map((item) => this.execComponentLoader(item, args))
+          );
         }
+        let data = {
+          page,
+          project,
+          pageAssignment,
+          configs: {
+            ...this.basePageConfigs,
+            requestInfo: {
+              params,
+              i18n: this.storefront.i18n,
+              queries: getRequestQueries(request),
+              pathname: new URL(request.url).pathname,
+              search: new URL(request.url).search
+            }
+          }
+        };
+        return resolve(data);
+      } catch (err) {
+        console.log(`\u274C [Weaverse page]`, err);
+        reject(err);
       }
-      return item;
-    };
-    let { configs, storefront, components, countries, withCache, themeSchema } = args;
-    this.storefront = storefront;
-    this.components = components;
-    this.countries = countries;
-    this.themeSchema = themeSchema;
-    this.configs = configs;
-    this.withCache = withCache;
-    this.basePageConfigs = {
-      projectId: configs.projectId,
-      weaverseHost: configs.weaverseHost,
-      weaverseVersion: configs.weaverseVersion,
-      isDesignMode: configs.isDesignMode
-    };
-    this.basePageRequestBody = {
-      countries,
-      isDesignMode: this.configs.isDesignMode,
-      i18n: storefront.i18n,
-      projectId: this.configs.projectId
-    };
-  }
+    });
+  };
+  execComponentLoader = async (item, args) => {
+    let schema = this.components.find(
+      ({ schema: schema2 }) => schema2?.type === item.type
+    );
+    let { loader } = schema || {};
+    if (loader && typeof loader === "function") {
+      try {
+        return {
+          ...item,
+          loaderData: await loader({
+            itemData: item,
+            ...args
+          })
+        };
+      } catch (err) {
+        console.log(`\u274C [Weaverse item loader]`, item.id, err);
+        return item;
+      }
+    }
+    return item;
+  };
 };
 
 // src/hooks/use-theme-settings.ts
@@ -308,36 +327,39 @@ function useThemeContext() {
 
 // src/hooks/use-theme-settings.ts
 var ThemeSettingsStore = class {
+  settings = null;
+  listeners = [];
+  countries;
+  schema;
+  publicEnv;
   constructor(data) {
-    this.settings = null;
-    this.listeners = [];
-    this.updateThemeSettings = (newSettings) => {
-      this.settings = { ...this.settings, ...newSettings };
-      this.emitChange();
-    };
-    this.subscribe = (listener) => {
-      this.listeners = [...this.listeners, listener];
-      return () => {
-        this.listeners = this.listeners.filter((l) => l !== listener);
-      };
-    };
-    this.getSnapshot = () => {
-      return this.settings;
-    };
-    this.getServerSnapshot = () => {
-      return this.settings;
-    };
-    this.emitChange = () => {
-      for (let listener of this.listeners) {
-        listener();
-      }
-    };
     let { theme, countries, schema, publicEnv } = data || {};
     this.settings = theme || null;
     this.countries = countries;
     this.schema = schema;
     this.publicEnv = publicEnv;
   }
+  updateThemeSettings = (newSettings) => {
+    this.settings = { ...this.settings, ...newSettings };
+    this.emitChange();
+  };
+  subscribe = (listener) => {
+    this.listeners = [...this.listeners, listener];
+    return () => {
+      this.listeners = this.listeners.filter((l) => l !== listener);
+    };
+  };
+  getSnapshot = () => {
+    return this.settings;
+  };
+  getServerSnapshot = () => {
+    return this.settings;
+  };
+  emitChange = () => {
+    for (let listener of this.listeners) {
+      listener();
+    }
+  };
 };
 function useThemeSettings() {
   let themeSettingsStore = useThemeContext();

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.2",
+  "version": "1.3.3",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -11,7 +11,7 @@
     "dist/*"
   ],
   "engines": {
-    "node": ">=10"
+    "node": ">=16"
   },
   "scripts": {
     "start": "npm run dev",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@remix-run/react": "1.19.1",
     "@shopify/hydrogen": "2023.7.8",
-    "@weaverse/react": "1.3.2",
+    "@weaverse/react": "1.3.3",
     "react-error-boundary": "^4.0.11"
   },
   "devDependencies": {