@weaverse/hydrogen 1.1.5 → 1.1.7

package/dist/index.d.mts

@@ -221,6 +221,7 @@ type FetchProjectRequestBody = {
     countries: Localizations;
     i18n?: I18nLocale;
     loaderConfigs?: WeaverseLoaderConfigs;
+    isDesignMode?: boolean;
 };
 declare global {
     interface Window {

package/dist/index.d.ts

@@ -221,6 +221,7 @@ type FetchProjectRequestBody = {
     countries: Localizations;
     i18n?: I18nLocale;
     loaderConfigs?: WeaverseLoaderConfigs;
+    isDesignMode?: boolean;
 };
 declare global {
     interface Window {

package/dist/index.js

@@ -56,6 +56,8 @@ function createCachedWeaverseInstance(init) {
     if (!weaverse) {
       weaverse = new import_react.Weaverse(init);
       window.__weaverses.push(weaverse);
+    } else {
+      weaverse.setProjectData(init.data);
     }
     return weaverse;
   }
@@ -109,7 +111,7 @@ function useStudio(weaverse, countries, schema) {
         );
       }
     }
-  }, [weaverse]);
+  }, [weaverse, revalidator]);
 }
 
 // src/index.tsx
@@ -150,7 +152,7 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
       let { request, context, params } = args;
       let queries = getRequestQueries(request);
       let { WEAVERSE_PROJECT_ID, WEAVERSE_HOST } = context?.env || {};
-      let { weaverseProjectId, weaverseHost } = queries;
+      let { weaverseProjectId, weaverseHost, isDesignMode, weaverseVersion } = queries;
       let projectId = weaverseProjectId || WEAVERSE_PROJECT_ID;
       weaverseHost = weaverseHost || WEAVERSE_HOST || "https://weaverse.io";
       if (!projectId) {
@@ -160,17 +162,27 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
       }
       let i18n = context?.storefront?.i18n;
       let reqBody = {
+        isDesignMode,
         i18n,
         countries,
         projectId,
         loaderConfigs,
         url: request.url
       };
-      let payload = await fetchWithServerCache({
-        url: `${weaverseHost}/api/public/project`,
-        options: { method: "POST", body: JSON.stringify(reqBody) },
-        context
-      });
+      let url = `${weaverseHost}/api/public/project`;
+      let payload;
+      if (isDesignMode) {
+        payload = await fetch(url, {
+          method: "POST",
+          body: JSON.stringify(reqBody)
+        }).then((res) => res.json());
+      } else {
+        payload = await fetchWithServerCache({
+          url,
+          options: { method: "POST", body: JSON.stringify(reqBody) },
+          context
+        });
+      }
       let { page, project, pageAssignment } = payload;
       if (!page || !project || !pageAssignment) {
         throw new Error(
@@ -181,8 +193,8 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
       let configs = {
         projectId,
         weaverseHost,
-        weaverseVersion: queries.weaverseVersion,
-        isDesignMode: queries.isDesignMode,
+        weaverseVersion,
+        isDesignMode,
         requestInfo: {
           i18n,
           params,

package/dist/index.mjs

@@ -16,6 +16,8 @@ function createCachedWeaverseInstance(init) {
     if (!weaverse) {
       weaverse = new Weaverse(init);
       window.__weaverses.push(weaverse);
+    } else {
+      weaverse.setProjectData(init.data);
     }
     return weaverse;
   }
@@ -69,7 +71,7 @@ function useStudio(weaverse, countries, schema) {
         );
       }
     }
-  }, [weaverse]);
+  }, [weaverse, revalidator]);
 }
 
 // src/index.tsx
@@ -110,7 +112,7 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
       let { request, context, params } = args;
       let queries = getRequestQueries(request);
       let { WEAVERSE_PROJECT_ID, WEAVERSE_HOST } = context?.env || {};
-      let { weaverseProjectId, weaverseHost } = queries;
+      let { weaverseProjectId, weaverseHost, isDesignMode, weaverseVersion } = queries;
       let projectId = weaverseProjectId || WEAVERSE_PROJECT_ID;
       weaverseHost = weaverseHost || WEAVERSE_HOST || "https://weaverse.io";
       if (!projectId) {
@@ -120,17 +122,27 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
       }
       let i18n = context?.storefront?.i18n;
       let reqBody = {
+        isDesignMode,
         i18n,
         countries,
         projectId,
         loaderConfigs,
         url: request.url
       };
-      let payload = await fetchWithServerCache({
-        url: `${weaverseHost}/api/public/project`,
-        options: { method: "POST", body: JSON.stringify(reqBody) },
-        context
-      });
+      let url = `${weaverseHost}/api/public/project`;
+      let payload;
+      if (isDesignMode) {
+        payload = await fetch(url, {
+          method: "POST",
+          body: JSON.stringify(reqBody)
+        }).then((res) => res.json());
+      } else {
+        payload = await fetchWithServerCache({
+          url,
+          options: { method: "POST", body: JSON.stringify(reqBody) },
+          context
+        });
+      }
       let { page, project, pageAssignment } = payload;
       if (!page || !project || !pageAssignment) {
         throw new Error(
@@ -141,8 +153,8 @@ async function weaverseLoader(args, components, countries, loaderConfigs) {
       let configs = {
         projectId,
         weaverseHost,
-        weaverseVersion: queries.weaverseVersion,
-        isDesignMode: queries.isDesignMode,
+        weaverseVersion,
+        isDesignMode,
         requestInfo: {
           i18n,
           params,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.5",
+  "version": "1.1.7",
   "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.1",
-    "@weaverse/react": "1.1.5",
-    "react-error-boundary": "^4.0.10"
+    "@shopify/hydrogen": "2023.7.2",
+    "@weaverse/react": "1.1.7",
+    "react-error-boundary": "^4.0.11"
   },
   "devDependencies": {
-    "@shopify/remix-oxygen": "^1.1.2"
+    "@shopify/remix-oxygen": "^1.1.3"
   }
 }