@weaverse/hydrogen 2.0.1 → 2.1.1

package/dist/index.d.mts

@@ -1,31 +1,12 @@
 import { ElementData, ElementSchema, BasicInput, WeaverseElement, WeaverseCoreParams, WeaverseProjectDataType, Weaverse, PlatformTypeEnum, WeaverseItemStore } from '@weaverse/react';
-import { Params, NavigateFunction } from '@remix-run/react';
+export { WeaverseImage } from '@weaverse/react';
+import { NavigateFunction } from '@remix-run/react';
 import { createWithCache, Storefront } from '@shopify/hydrogen';
 import { LanguageCode, CountryCode, CurrencyCode } from '@shopify/hydrogen/storefront-api-types';
 import { LoaderArgs, AppLoadContext } from '@shopify/remix-oxygen';
 import React, { ForwardRefExoticComponent } from 'react';
 import * as _shopify_hydrogen_react_storefront_api_types from '@shopify/hydrogen-react/storefront-api-types';
 
-declare class WeaverseClient {
-    API: string;
-    clientVersion: string;
-    basePageConfigs: Omit<WeaverseProjectConfigs, 'requestInfo'>;
-    basePageRequestBody: Omit<FetchProjectRequestBody, 'url'>;
-    storefront: WeaverseClientArgs['storefront'];
-    components: HydrogenComponent[];
-    countries?: Localizations;
-    themeSchema: HydrogenThemeSchema;
-    configs: WeaverseProjectConfigs;
-    withCache: WeaverseClientArgs['withCache'];
-    constructor(args: WeaverseClientArgs);
-    fetchWithCache: <T>(url: string, options: FetchWithCacheOptions) => Promise<T>;
-    loadThemeSettings: (strategy?: AllCacheOptions) => Promise<any>;
-    loadPage: (args: LoaderArgs, configs?: PageLoadParams & {
-        strategy?: AllCacheOptions;
-    }) => Promise<WeaverseLoaderData | null>;
-    execComponentLoader: (item: HydrogenComponentData, args: LoaderArgs) => Promise<HydrogenComponentData>;
-}
-
 declare class ThemeSettingsStore {
     settings: HydrogenThemeSettings | null;
     listeners: (() => void)[];
@@ -58,13 +39,35 @@ declare let STORE_PAGES: {
     CUSTOM: string;
 };
 
+declare class WeaverseClient {
+    API: string;
+    clientVersion: string;
+    basePageConfigs: Omit<WeaverseProjectConfigs, 'requestInfo'>;
+    basePageRequestBody: Omit<FetchProjectRequestBody, 'url'>;
+    configs: WeaverseProjectConfigs;
+    request: WeaverseClientArgs['request'];
+    storefront: WeaverseClientArgs['storefront'];
+    components: WeaverseClientArgs['components'];
+    themeSchema: WeaverseClientArgs['themeSchema'];
+    env: WeaverseClientArgs['env'];
+    withCache: WeaverseClientArgs['withCache'];
+    countries?: WeaverseClientArgs['countries'];
+    constructor(args: WeaverseClientArgs);
+    fetchWithCache: <T>(url: string, options: FetchWithCacheOptions) => Promise<T>;
+    loadThemeSettings: (strategy?: AllCacheOptions) => Promise<{} | null>;
+    loadPage: (params?: LoadPageParams) => Promise<WeaverseLoaderData | null>;
+    execComponentLoader: (item: HydrogenComponentData) => Promise<HydrogenComponentData>;
+}
+
 type Locale = {
     language: LanguageCode;
     country: CountryCode;
     label: string;
     currency: CurrencyCode;
 };
-type Localizations = Record<string, Locale>;
+type Localizations = {
+    [key: string]: Locale;
+};
 interface AllCacheOptions {
     mode?: string;
     maxAge?: number;
@@ -72,8 +75,11 @@ interface AllCacheOptions {
     sMaxAge?: number;
     staleIfError?: number;
 }
-type ComponentLoaderArgs = LoaderArgs & {
-    itemData: HydrogenComponentData;
+type ComponentLoaderArgs<T = {
+    [key: string]: any;
+}> = {
+    data: T;
+    weaverse: WeaverseClient;
 };
 interface RouteLoaderArgs extends LoaderArgs {
     context: AppLoadContext & {
@@ -81,7 +87,9 @@ interface RouteLoaderArgs extends LoaderArgs {
     };
 }
 interface HydrogenComponentData extends ElementData {
-    data?: Record<string, any>;
+    data?: {
+        [key: string]: any;
+    };
     children?: {
         id: string;
     }[];
@@ -114,10 +122,11 @@ type I18nLocale = Locale & {
     pathPrefix: string;
 };
 type WeaverseLoaderRequestInfo = {
-    params: Params;
     search: string;
     pathname: string;
-    queries: Record<string, string | boolean>;
+    queries: {
+        [key: string]: string | boolean;
+    };
     i18n: I18nLocale;
 };
 type WeaverseStorefrontData = {
@@ -137,7 +146,6 @@ type HydrogenProjectType = {
     id: string;
     weaverseShopId: string;
     name: string;
-    config: HydrogenProjectConfig;
     [key: string]: any;
 };
 type WeaverseThemeConfigs = {
@@ -235,17 +243,20 @@ interface HydrogenThemeSchema {
     inspector: InspectorGroup[];
 }
 type PageType = keyof typeof STORE_PAGES;
-type PageLoadParams = {
+type PageAssignmentParams = {
     type?: PageType;
     locale?: string;
     handle?: string;
 };
+type LoadPageParams = PageAssignmentParams & {
+    strategy?: AllCacheOptions;
+};
 type FetchProjectRequestBody = {
     projectId: string;
     url: string;
     countries?: Localizations;
     i18n?: I18nLocale;
-    params?: PageLoadParams;
+    params?: PageAssignmentParams;
     isDesignMode?: boolean;
 };
 type FetchProjectPayload = {
@@ -260,8 +271,9 @@ type HydrogenThemeEnv = {
     PUBLIC_STOREFRONT_API_TOKEN: string;
 };
 type WeaverseClientArgs = {
+    request: Request;
     withCache: ReturnType<typeof createWithCache>;
-    configs: WeaverseProjectConfigs;
+    env: HydrogenThemeEnv;
     storefront: Storefront<I18nLocale>;
     components: HydrogenComponent[];
     countries?: Localizations;
@@ -315,4 +327,4 @@ declare class WeaverseHydrogenItem extends WeaverseItemStore {
     set data(update: HydrogenComponentData);
 }
 
-export { AllCacheOptions, ComponentLoaderArgs, FetchProjectPayload, FetchProjectRequestBody, FetchWithCacheOptions, HydrogenComponent, HydrogenComponentData, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeEnv, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenThemeSettings, HydrogenToolbarAction, I18nLocale, InspectorGroup, Locale, Localizations, PageLoadParams, PageType, PublicEnv, RootRouteData, RouteLoaderArgs, ThemeSettingsStore, WeaverseClient, WeaverseClientArgs, WeaverseHydrogen, WeaverseHydrogenItem, WeaverseHydrogenParams, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseProjectConfigs, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, useThemeSettings, withWeaverse };
+export { AllCacheOptions, ComponentLoaderArgs, FetchProjectPayload, FetchProjectRequestBody, FetchWithCacheOptions, HydrogenComponent, HydrogenComponentData, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeEnv, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenThemeSettings, HydrogenToolbarAction, I18nLocale, InspectorGroup, LoadPageParams, Locale, Localizations, PageAssignmentParams, PageType, PublicEnv, RootRouteData, RouteLoaderArgs, ThemeSettingsStore, WeaverseClient, WeaverseClientArgs, WeaverseHydrogen, WeaverseHydrogenItem, WeaverseHydrogenParams, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseProjectConfigs, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, useThemeSettings, withWeaverse };

package/dist/index.d.ts

@@ -1,31 +1,12 @@
 import { ElementData, ElementSchema, BasicInput, WeaverseElement, WeaverseCoreParams, WeaverseProjectDataType, Weaverse, PlatformTypeEnum, WeaverseItemStore } from '@weaverse/react';
-import { Params, NavigateFunction } from '@remix-run/react';
+export { WeaverseImage } from '@weaverse/react';
+import { NavigateFunction } from '@remix-run/react';
 import { createWithCache, Storefront } from '@shopify/hydrogen';
 import { LanguageCode, CountryCode, CurrencyCode } from '@shopify/hydrogen/storefront-api-types';
 import { LoaderArgs, AppLoadContext } from '@shopify/remix-oxygen';
 import React, { ForwardRefExoticComponent } from 'react';
 import * as _shopify_hydrogen_react_storefront_api_types from '@shopify/hydrogen-react/storefront-api-types';
 
-declare class WeaverseClient {
-    API: string;
-    clientVersion: string;
-    basePageConfigs: Omit<WeaverseProjectConfigs, 'requestInfo'>;
-    basePageRequestBody: Omit<FetchProjectRequestBody, 'url'>;
-    storefront: WeaverseClientArgs['storefront'];
-    components: HydrogenComponent[];
-    countries?: Localizations;
-    themeSchema: HydrogenThemeSchema;
-    configs: WeaverseProjectConfigs;
-    withCache: WeaverseClientArgs['withCache'];
-    constructor(args: WeaverseClientArgs);
-    fetchWithCache: <T>(url: string, options: FetchWithCacheOptions) => Promise<T>;
-    loadThemeSettings: (strategy?: AllCacheOptions) => Promise<any>;
-    loadPage: (args: LoaderArgs, configs?: PageLoadParams & {
-        strategy?: AllCacheOptions;
-    }) => Promise<WeaverseLoaderData | null>;
-    execComponentLoader: (item: HydrogenComponentData, args: LoaderArgs) => Promise<HydrogenComponentData>;
-}
-
 declare class ThemeSettingsStore {
     settings: HydrogenThemeSettings | null;
     listeners: (() => void)[];
@@ -58,13 +39,35 @@ declare let STORE_PAGES: {
     CUSTOM: string;
 };
 
+declare class WeaverseClient {
+    API: string;
+    clientVersion: string;
+    basePageConfigs: Omit<WeaverseProjectConfigs, 'requestInfo'>;
+    basePageRequestBody: Omit<FetchProjectRequestBody, 'url'>;
+    configs: WeaverseProjectConfigs;
+    request: WeaverseClientArgs['request'];
+    storefront: WeaverseClientArgs['storefront'];
+    components: WeaverseClientArgs['components'];
+    themeSchema: WeaverseClientArgs['themeSchema'];
+    env: WeaverseClientArgs['env'];
+    withCache: WeaverseClientArgs['withCache'];
+    countries?: WeaverseClientArgs['countries'];
+    constructor(args: WeaverseClientArgs);
+    fetchWithCache: <T>(url: string, options: FetchWithCacheOptions) => Promise<T>;
+    loadThemeSettings: (strategy?: AllCacheOptions) => Promise<{} | null>;
+    loadPage: (params?: LoadPageParams) => Promise<WeaverseLoaderData | null>;
+    execComponentLoader: (item: HydrogenComponentData) => Promise<HydrogenComponentData>;
+}
+
 type Locale = {
     language: LanguageCode;
     country: CountryCode;
     label: string;
     currency: CurrencyCode;
 };
-type Localizations = Record<string, Locale>;
+type Localizations = {
+    [key: string]: Locale;
+};
 interface AllCacheOptions {
     mode?: string;
     maxAge?: number;
@@ -72,8 +75,11 @@ interface AllCacheOptions {
     sMaxAge?: number;
     staleIfError?: number;
 }
-type ComponentLoaderArgs = LoaderArgs & {
-    itemData: HydrogenComponentData;
+type ComponentLoaderArgs<T = {
+    [key: string]: any;
+}> = {
+    data: T;
+    weaverse: WeaverseClient;
 };
 interface RouteLoaderArgs extends LoaderArgs {
     context: AppLoadContext & {
@@ -81,7 +87,9 @@ interface RouteLoaderArgs extends LoaderArgs {
     };
 }
 interface HydrogenComponentData extends ElementData {
-    data?: Record<string, any>;
+    data?: {
+        [key: string]: any;
+    };
     children?: {
         id: string;
     }[];
@@ -114,10 +122,11 @@ type I18nLocale = Locale & {
     pathPrefix: string;
 };
 type WeaverseLoaderRequestInfo = {
-    params: Params;
     search: string;
     pathname: string;
-    queries: Record<string, string | boolean>;
+    queries: {
+        [key: string]: string | boolean;
+    };
     i18n: I18nLocale;
 };
 type WeaverseStorefrontData = {
@@ -137,7 +146,6 @@ type HydrogenProjectType = {
     id: string;
     weaverseShopId: string;
     name: string;
-    config: HydrogenProjectConfig;
     [key: string]: any;
 };
 type WeaverseThemeConfigs = {
@@ -235,17 +243,20 @@ interface HydrogenThemeSchema {
     inspector: InspectorGroup[];
 }
 type PageType = keyof typeof STORE_PAGES;
-type PageLoadParams = {
+type PageAssignmentParams = {
     type?: PageType;
     locale?: string;
     handle?: string;
 };
+type LoadPageParams = PageAssignmentParams & {
+    strategy?: AllCacheOptions;
+};
 type FetchProjectRequestBody = {
     projectId: string;
     url: string;
     countries?: Localizations;
     i18n?: I18nLocale;
-    params?: PageLoadParams;
+    params?: PageAssignmentParams;
     isDesignMode?: boolean;
 };
 type FetchProjectPayload = {
@@ -260,8 +271,9 @@ type HydrogenThemeEnv = {
     PUBLIC_STOREFRONT_API_TOKEN: string;
 };
 type WeaverseClientArgs = {
+    request: Request;
     withCache: ReturnType<typeof createWithCache>;
-    configs: WeaverseProjectConfigs;
+    env: HydrogenThemeEnv;
     storefront: Storefront<I18nLocale>;
     components: HydrogenComponent[];
     countries?: Localizations;
@@ -315,4 +327,4 @@ declare class WeaverseHydrogenItem extends WeaverseItemStore {
     set data(update: HydrogenComponentData);
 }
 
-export { AllCacheOptions, ComponentLoaderArgs, FetchProjectPayload, FetchProjectRequestBody, FetchWithCacheOptions, HydrogenComponent, HydrogenComponentData, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeEnv, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenThemeSettings, HydrogenToolbarAction, I18nLocale, InspectorGroup, Locale, Localizations, PageLoadParams, PageType, PublicEnv, RootRouteData, RouteLoaderArgs, ThemeSettingsStore, WeaverseClient, WeaverseClientArgs, WeaverseHydrogen, WeaverseHydrogenItem, WeaverseHydrogenParams, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseProjectConfigs, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, useThemeSettings, withWeaverse };
+export { AllCacheOptions, ComponentLoaderArgs, FetchProjectPayload, FetchProjectRequestBody, FetchWithCacheOptions, HydrogenComponent, HydrogenComponentData, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeEnv, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenThemeSettings, HydrogenToolbarAction, I18nLocale, InspectorGroup, LoadPageParams, Locale, Localizations, PageAssignmentParams, PageType, PublicEnv, RootRouteData, RouteLoaderArgs, ThemeSettingsStore, WeaverseClient, WeaverseClientArgs, WeaverseHydrogen, WeaverseHydrogenItem, WeaverseHydrogenParams, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseProjectConfigs, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, useThemeSettings, withWeaverse };

package/dist/index.js

@@ -217,7 +217,7 @@ function FallbackError({ error }) {
 
 // package.json
 var package_default = {
-  version: "2.0.1",
+  version: "2.1.1",
   license: "MIT",
   main: "dist/index.js",
   typings: "dist/index.d.ts",
@@ -251,8 +251,8 @@ var package_default = {
   author: "Weaverse Team",
   dependencies: {
     "@remix-run/react": "1.19.1",
-    "@shopify/hydrogen": "2023.7.8",
-    "@weaverse/react": "2.0.1",
+    "@shopify/hydrogen": "2023.7.9",
+    "@weaverse/react": "2.1.1",
     "react-error-boundary": "^4.0.11"
   },
   devDependencies: {
@@ -298,27 +298,37 @@ var WeaverseClient = class {
   clientVersion = package_default.version;
   basePageConfigs;
   basePageRequestBody;
+  configs;
+  request;
   storefront;
-  // storefront: Storefront<I18nLocale>
   components;
-  countries;
   themeSchema;
-  configs;
+  env;
   withCache;
-  // withCache: ReturnType<typeof createWithCache>
+  countries;
   constructor(args) {
-    let { configs, storefront, components, countries, withCache, themeSchema } = args;
+    let {
+      env,
+      storefront,
+      components,
+      countries,
+      withCache,
+      themeSchema,
+      request
+    } = args;
+    this.request = request;
     this.storefront = storefront;
     this.components = components;
-    this.countries = countries;
     this.themeSchema = themeSchema;
-    this.configs = configs;
+    this.env = env;
     this.withCache = withCache;
+    this.countries = countries;
+    this.configs = getWeaverseConfigs(request, env);
     this.basePageConfigs = {
-      projectId: configs.projectId,
-      weaverseHost: configs.weaverseHost,
-      weaverseVersion: configs.weaverseVersion,
-      isDesignMode: configs.isDesignMode
+      projectId: this.configs.projectId,
+      weaverseHost: this.configs.weaverseHost,
+      weaverseVersion: this.configs.weaverseVersion,
+      isDesignMode: this.configs.isDesignMode
     };
     this.basePageRequestBody = {
       countries,
@@ -333,7 +343,9 @@ var WeaverseClient = class {
     let res = this.withCache(cacheKey, strategy, async () => {
       let response = await fetch(url, reqInit);
       if (!response.ok) {
-        throw new Error("Something went wrong. Skipping cache.");
+        let error = await response.text();
+        let { status, statusText } = response;
+        throw new Error(`${status} ${statusText} ${error}`);
       }
       return await response.json();
     });
@@ -348,36 +360,34 @@ var WeaverseClient = class {
       }
       let res = await this.fetchWithCache(
         `${weaverseHost}/${API}/${projectId}/configs`,
-        { strategy }
+        { method: "POST", strategy }
       );
-      let data = null;
-      if (res.ok) {
-        data = res.payload;
-        if (this.configs.isDesignMode) {
-          data = {
-            ...data,
-            schema: this.themeSchema,
-            countries: this.countries,
-            publicEnv: this.configs.publicEnv
-          };
-        }
+      let data = res || {};
+      if (this.configs.isDesignMode) {
+        data = {
+          ...data,
+          schema: this.themeSchema,
+          countries: this.countries || [],
+          publicEnv: this.configs.publicEnv
+        };
       }
       return data;
-    } catch (err) {
-      console.log(`\u274C [Weaverse theme settings]`, err);
+    } catch (e) {
+      console.error(`\u274C Theme settings load failed.`, e);
       return null;
     }
   };
-  loadPage = async (args, configs = {}) => {
+  loadPage = async (params = {}) => {
     return new Promise(async (resolve, reject) => {
       try {
-        if (!this.configs.projectId) {
+        let { request, storefront, basePageRequestBody, basePageConfigs } = this;
+        let { projectId, isDesignMode, weaverseHost } = this.configs;
+        if (!projectId) {
           throw new Error("Missing Weaverse projectId!");
         }
-        let { request, params } = args;
-        let { strategy, ...pageLoadParams } = configs;
+        let { strategy, ...pageLoadParams } = params;
         let body = {
-          ...this.basePageRequestBody,
+          ...basePageRequestBody,
           params: pageLoadParams,
           url: request.url
         };
@@ -385,9 +395,9 @@ var WeaverseClient = class {
           method: "POST",
           body: JSON.stringify(body)
         };
-        let url = `${this.configs.weaverseHost}/${this.API}`;
+        let url = `${weaverseHost}/${this.API}`;
         let payload;
-        if (this.configs.isDesignMode) {
+        if (isDesignMode) {
           payload = await fetch(url, reqInit).then((res) => res.json());
         } else {
           payload = await this.fetchWithCache(url, {
@@ -405,7 +415,7 @@ var WeaverseClient = class {
         if (page?.items) {
           let items = page.items;
           page.items = await Promise.all(
-            items.map((item) => this.execComponentLoader(item, args))
+            items.map((item) => this.execComponentLoader(item))
           );
         }
         let data = {
@@ -413,10 +423,9 @@ var WeaverseClient = class {
           project,
           pageAssignment,
           configs: {
-            ...this.basePageConfigs,
+            ...basePageConfigs,
             requestInfo: {
-              params,
-              i18n: this.storefront.i18n,
+              i18n: storefront.i18n,
               queries: getRequestQueries(request),
               pathname: new URL(request.url).pathname,
               search: new URL(request.url).search
@@ -424,28 +433,27 @@ var WeaverseClient = class {
           }
         };
         return resolve(data);
-      } catch (err) {
-        console.log(`\u274C [Weaverse page]`, err);
-        reject(err);
+      } catch (e) {
+        console.error(`\u274C Page load failed.`, e);
+        reject(e);
       }
     });
   };
-  execComponentLoader = async (item, args) => {
-    let schema = this.components.find(
-      ({ schema: schema2 }) => schema2?.type === item.type
-    );
+  execComponentLoader = async (item) => {
+    let { data = {}, type, id } = item;
+    let schema = this.components.find(({ schema: schema2 }) => schema2?.type === type);
     let { loader } = schema || {};
     if (loader && typeof loader === "function") {
       try {
         return {
           ...item,
           loaderData: await loader({
-            itemData: item,
-            ...args
+            data,
+            weaverse: this
           })
         };
-      } catch (err) {
-        console.log(`\u274C [Weaverse item loader]`, item.id, err);
+      } catch (e) {
+        console.warn(`\u274C Item loader run failed.`, type, id, e);
         return item;
       }
     }

package/dist/index.mjs

@@ -177,7 +177,7 @@ function FallbackError({ error }) {
 
 // package.json
 var package_default = {
-  version: "2.0.1",
+  version: "2.1.1",
   license: "MIT",
   main: "dist/index.js",
   typings: "dist/index.d.ts",
@@ -211,8 +211,8 @@ var package_default = {
   author: "Weaverse Team",
   dependencies: {
     "@remix-run/react": "1.19.1",
-    "@shopify/hydrogen": "2023.7.8",
-    "@weaverse/react": "2.0.1",
+    "@shopify/hydrogen": "2023.7.9",
+    "@weaverse/react": "2.1.1",
     "react-error-boundary": "^4.0.11"
   },
   devDependencies: {
@@ -258,27 +258,37 @@ var WeaverseClient = class {
   clientVersion = package_default.version;
   basePageConfigs;
   basePageRequestBody;
+  configs;
+  request;
   storefront;
-  // storefront: Storefront<I18nLocale>
   components;
-  countries;
   themeSchema;
-  configs;
+  env;
   withCache;
-  // withCache: ReturnType<typeof createWithCache>
+  countries;
   constructor(args) {
-    let { configs, storefront, components, countries, withCache, themeSchema } = args;
+    let {
+      env,
+      storefront,
+      components,
+      countries,
+      withCache,
+      themeSchema,
+      request
+    } = args;
+    this.request = request;
     this.storefront = storefront;
     this.components = components;
-    this.countries = countries;
     this.themeSchema = themeSchema;
-    this.configs = configs;
+    this.env = env;
     this.withCache = withCache;
+    this.countries = countries;
+    this.configs = getWeaverseConfigs(request, env);
     this.basePageConfigs = {
-      projectId: configs.projectId,
-      weaverseHost: configs.weaverseHost,
-      weaverseVersion: configs.weaverseVersion,
-      isDesignMode: configs.isDesignMode
+      projectId: this.configs.projectId,
+      weaverseHost: this.configs.weaverseHost,
+      weaverseVersion: this.configs.weaverseVersion,
+      isDesignMode: this.configs.isDesignMode
     };
     this.basePageRequestBody = {
       countries,
@@ -293,7 +303,9 @@ var WeaverseClient = class {
     let res = this.withCache(cacheKey, strategy, async () => {
       let response = await fetch(url, reqInit);
       if (!response.ok) {
-        throw new Error("Something went wrong. Skipping cache.");
+        let error = await response.text();
+        let { status, statusText } = response;
+        throw new Error(`${status} ${statusText} ${error}`);
       }
       return await response.json();
     });
@@ -308,36 +320,34 @@ var WeaverseClient = class {
       }
       let res = await this.fetchWithCache(
         `${weaverseHost}/${API}/${projectId}/configs`,
-        { strategy }
+        { method: "POST", strategy }
       );
-      let data = null;
-      if (res.ok) {
-        data = res.payload;
-        if (this.configs.isDesignMode) {
-          data = {
-            ...data,
-            schema: this.themeSchema,
-            countries: this.countries,
-            publicEnv: this.configs.publicEnv
-          };
-        }
+      let data = res || {};
+      if (this.configs.isDesignMode) {
+        data = {
+          ...data,
+          schema: this.themeSchema,
+          countries: this.countries || [],
+          publicEnv: this.configs.publicEnv
+        };
       }
       return data;
-    } catch (err) {
-      console.log(`\u274C [Weaverse theme settings]`, err);
+    } catch (e) {
+      console.error(`\u274C Theme settings load failed.`, e);
       return null;
     }
   };
-  loadPage = async (args, configs = {}) => {
+  loadPage = async (params = {}) => {
     return new Promise(async (resolve, reject) => {
       try {
-        if (!this.configs.projectId) {
+        let { request, storefront, basePageRequestBody, basePageConfigs } = this;
+        let { projectId, isDesignMode, weaverseHost } = this.configs;
+        if (!projectId) {
           throw new Error("Missing Weaverse projectId!");
         }
-        let { request, params } = args;
-        let { strategy, ...pageLoadParams } = configs;
+        let { strategy, ...pageLoadParams } = params;
         let body = {
-          ...this.basePageRequestBody,
+          ...basePageRequestBody,
           params: pageLoadParams,
           url: request.url
         };
@@ -345,9 +355,9 @@ var WeaverseClient = class {
           method: "POST",
           body: JSON.stringify(body)
         };
-        let url = `${this.configs.weaverseHost}/${this.API}`;
+        let url = `${weaverseHost}/${this.API}`;
         let payload;
-        if (this.configs.isDesignMode) {
+        if (isDesignMode) {
           payload = await fetch(url, reqInit).then((res) => res.json());
         } else {
           payload = await this.fetchWithCache(url, {
@@ -365,7 +375,7 @@ var WeaverseClient = class {
         if (page?.items) {
           let items = page.items;
           page.items = await Promise.all(
-            items.map((item) => this.execComponentLoader(item, args))
+            items.map((item) => this.execComponentLoader(item))
           );
         }
         let data = {
@@ -373,10 +383,9 @@ var WeaverseClient = class {
           project,
           pageAssignment,
           configs: {
-            ...this.basePageConfigs,
+            ...basePageConfigs,
             requestInfo: {
-              params,
-              i18n: this.storefront.i18n,
+              i18n: storefront.i18n,
               queries: getRequestQueries(request),
               pathname: new URL(request.url).pathname,
               search: new URL(request.url).search
@@ -384,28 +393,27 @@ var WeaverseClient = class {
           }
         };
         return resolve(data);
-      } catch (err) {
-        console.log(`\u274C [Weaverse page]`, err);
-        reject(err);
+      } catch (e) {
+        console.error(`\u274C Page load failed.`, e);
+        reject(e);
       }
     });
   };
-  execComponentLoader = async (item, args) => {
-    let schema = this.components.find(
-      ({ schema: schema2 }) => schema2?.type === item.type
-    );
+  execComponentLoader = async (item) => {
+    let { data = {}, type, id } = item;
+    let schema = this.components.find(({ schema: schema2 }) => schema2?.type === type);
     let { loader } = schema || {};
     if (loader && typeof loader === "function") {
       try {
         return {
           ...item,
           loaderData: await loader({
-            itemData: item,
-            ...args
+            data,
+            weaverse: this
           })
         };
-      } catch (err) {
-        console.log(`\u274C [Weaverse item loader]`, item.id, err);
+      } catch (e) {
+        console.warn(`\u274C Item loader run failed.`, type, id, e);
         return item;
       }
     }

package/package.json

@@ -1,43 +1,43 @@
 {
-  "version": "2.0.1",
-  "license": "MIT",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
-  "module": "dist/index.mjs",
-  "publishConfig": {
-    "access": "public"
+  "version" : "2.1.1",
+  "license" : "MIT",
+  "main" : "dist/index.js",
+  "typings" : "dist/index.d.ts",
+  "module" : "dist/index.mjs",
+  "publishConfig" : {
+    "access" : "public"
   },
-  "files": [
+  "files" : [
     "dist/*"
   ],
-  "engines": {
-    "node": ">=16"
+  "engines" : {
+    "node" : ">=16"
   },
-  "scripts": {
-    "start": "npm run dev",
-    "dev": "tsup src/index.ts --format esm,cjs --dts --outDir dist --watch --external @remix-run/react,@shopify/hydrogen",
-    "build": "tsup src/index.ts --format esm,cjs --dts --outDir dist --external @remix-run/react,@shopify/hydrogen",
-    "clean": "rimraf dist",
-    "prepublish": "npm run build"
+  "scripts" : {
+    "start" : "npm run dev",
+    "dev" : "tsup src/index.ts --format esm,cjs --dts --outDir dist --watch --external @remix-run/react,@shopify/hydrogen",
+    "build" : "tsup src/index.ts --format esm,cjs --dts --outDir dist --external @remix-run/react,@shopify/hydrogen",
+    "clean" : "rimraf dist",
+    "prepublish" : "npm run build"
   },
-  "peerDependencies": {
-    "react": ">=18",
-    "react-dom": ">=18"
+  "peerDependencies" : {
+    "react" : ">=18",
+    "react-dom" : ">=18"
   },
-  "prettier": {
-    "printWidth": 80,
-    "semi": false,
-    "singleQuote": true
+  "prettier" : {
+    "printWidth" : 80,
+    "semi" : false,
+    "singleQuote" : true
   },
-  "name": "@weaverse/hydrogen",
-  "author": "Weaverse Team",
-  "dependencies": {
-    "@remix-run/react": "1.19.1",
-    "@shopify/hydrogen": "2023.7.8",
-    "@weaverse/react": "2.0.1",
-    "react-error-boundary": "^4.0.11"
+  "name" : "@weaverse/hydrogen",
+  "author" : "Weaverse Team",
+  "dependencies" : {
+    "@remix-run/react" : "1.19.1",
+    "@shopify/hydrogen" : "2023.7.9",
+    "@weaverse/react" : "2.1.1",
+    "react-error-boundary" : "^4.0.11"
   },
-  "devDependencies": {
-    "@shopify/remix-oxygen": "^1.1.4"
+  "devDependencies" : {
+    "@shopify/remix-oxygen" : "^1.1.4"
   }
 }