@onexapis/cli 1.1.65 → 1.1.66

package/dist/preview/preview-app.tsx

@@ -130,6 +130,77 @@ try {
   // CommerceClient not available — safe to ignore
 }
 
+// Fetch website settings once at startup for PageDataProvider.
+// Cache in sessionStorage so full-page navigations don't re-fetch.
+const WS_CACHE_KEY = "onex_website_settings";
+let _websiteSettings: Record<string, unknown> = {};
+let _settingsReady: Promise<void>;
+{
+  // Restore from sessionStorage first (instant, no network)
+  try {
+    const raw = sessionStorage.getItem(WS_CACHE_KEY);
+    if (raw) _websiteSettings = JSON.parse(raw);
+  } catch {
+    /* ignore */
+  }
+
+  let resolve: () => void;
+  _settingsReady = new Promise<void>((r) => {
+    resolve = r;
+  });
+
+  if (Object.keys(_websiteSettings).length > 0) {
+    // Already have cached settings — skip fetch
+    resolve!();
+  } else {
+    // No cache — fetch from API
+    (async () => {
+      try {
+        const { getCommerceClient } = coreCommerce as any;
+        const client = getCommerceClient?.();
+        if (client?.getSettings) {
+          _websiteSettings = (await client.getSettings()) || {};
+          try {
+            sessionStorage.setItem(
+              WS_CACHE_KEY,
+              JSON.stringify(_websiteSettings)
+            );
+          } catch {
+            /* ignore */
+          }
+        }
+      } catch {
+        /* no-op */
+      }
+      resolve!();
+    })();
+  }
+}
+
+/**
+ * Normalize ./assets/ → /assets/ so relative paths work on nested routes.
+ * Same logic as storefront's section-renderer.tsx.
+ */
+function normalizeAssetPaths<T>(value: T): T {
+  if (typeof value === "string") {
+    if (value.startsWith("./assets/")) {
+      return value.replace(/^\.\/assets\//, "/assets/") as unknown as T;
+    }
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map(normalizeAssetPaths) as unknown as T;
+  }
+  if (value !== null && typeof value === "object") {
+    const result: Record<string, unknown> = {};
+    for (const [k, v] of Object.entries(value as Record<string, unknown>)) {
+      result[k] = normalizeAssetPaths(v);
+    }
+    return result as T;
+  }
+  return value;
+}
+
 // ===== 2. THEME LOADING =====
 
 interface ThemeExports {
@@ -454,6 +525,8 @@ function getInitialPageFromURL(
 function PreviewApp() {
   const [themeExports, setThemeExports] = useState<ThemeExports | null>(null);
   const [selectedPage, setSelectedPage] = useState(-1); // -1 = not yet resolved from URL
+  const [wsSettings, setWsSettings] =
+    useState<Record<string, unknown>>(_websiteSettings);
   const [wsStatus, setWsStatus] = useState<
     "connected" | "disconnected" | "rebuilding"
   >("disconnected");
@@ -485,6 +558,15 @@ function PreviewApp() {
     loadTheme();
   }, [loadTheme]);
 
+  // Resolve website settings from async startup fetch
+  useEffect(() => {
+    _settingsReady.then(() => {
+      if (Object.keys(_websiteSettings).length > 0) {
+        setWsSettings(_websiteSettings);
+      }
+    });
+  }, []);
+
   // Handle browser back/forward navigation
   useEffect(() => {
     const handlePopState = () => {
@@ -663,7 +745,7 @@ function PreviewApp() {
     page: currentPage.config,
     products: [],
     blogs: [],
-    settings: {},
+    settings: wsSettings,
     routeParams,
     locale: urlLocale,
   };
@@ -707,10 +789,12 @@ function PreviewApp() {
       );
     }
     const { Component, schema, template } = registration;
+    // Normalize ./assets/ → /assets/ so relative paths work on nested routes
+    const normalizedSection = normalizeAssetPaths(section);
     return (
       <Component
         key={section.id}
-        section={section}
+        section={normalizedSection}
         schema={schema}
         template={template}
         isEditing={isEditing}
@@ -720,7 +804,7 @@ function PreviewApp() {
   };
 
   return (
-    <>
+    <PageDataProvider data={{ websiteSettings: wsSettings }}>
       {/* Inject theme CSS variables (Gap 2) */}
       {themeCSS && <style dangerouslySetInnerHTML={{ __html: themeCSS }} />}
 
@@ -740,7 +824,7 @@ function PreviewApp() {
         !currentPage.config?.metadata?.hideFooter && (
           <footer>{footerSections.map(renderSection)}</footer>
         )}
-    </>
+    </PageDataProvider>
   );
 }
 
@@ -764,9 +848,7 @@ root.render(
     <LocaleProvider locale={_rootLocale as any}>
       <CartProvider>
         <FlyToCartProvider>
-          <PageDataProvider data={{}}>
-            <PreviewApp />
-          </PageDataProvider>
+          <PreviewApp />
         </FlyToCartProvider>
       </CartProvider>
     </LocaleProvider>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onexapis/cli",
-  "version": "1.1.65",
+  "version": "1.1.66",
   "description": "CLI tool for OneX theme development - scaffolds themes using @onexapis/core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -49,7 +49,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@onexapis/core": "^1.0.21",
+    "@onexapis/core": "^1.0.22",
     "@tanstack/react-query": "^5.90.16",
     "adm-zip": "^0.5.16",
     "archiver": "^7.0.1",