@osimart/create-storefront 1.0.3 → 1.0.7

package/app/composables/useContentTree.js

@@ -238,9 +238,18 @@ export function useContentTree(section, options = {}) {
   const HEADINGS = ["H1", "H2", "H3", "H4", "H5", "H6"];
 
   const plain = (html) => String(html || "").replace(/<(img|video|iframe)\b/gi, "x").replace(/<[^>]*>/g, "").replace(/&nbsp;/g, " ").trim();
-  // A heading preset renders as <hN>: its richtext paragraphs become lines.
+  // A heading preset renders as <hN>, which can't hold blocks: the editor's
+  // paragraphs, headings and list items become lines (<br>) inside it.
+  // Inline formatting (<b>, <i>, <a>, …) is kept.
   const inline = (html) =>
-    String(html).replace(/<\/p>\s*<p[^>]*>/gi, "<br>").replace(/^\s*<p[^>]*>/i, "").replace(/<\/p>\s*$/i, "");
+    String(html)
+      .replace(/<(p|h[1-6]|li)\b[^>]*>\s*<br\s*\/?>\s*<\/\1>/gi, "<$1></$1>") // a blank line = one <br>
+      .replace(/<\/?(ul|ol)\b[^>]*>/gi, "")
+      .replace(/<(p|h[1-6]|li|blockquote|div)\b[^>]*>/gi, "")
+      .replace(/<\/(p|h[1-6]|li|blockquote|div)>/gi, "<br>")
+      .replace(/^(\s*<br\s*\/?>)+/i, "")
+      .replace(/(<br\s*\/?>\s*)+$/i, "")
+      .trim();
 
   /* ------------------------------------------------------------ the tree */
 

package/app/composables/useStoreInit.js

@@ -47,6 +47,7 @@ const API_ROOT = storeApiBase
       console.log("storedataaaaa", bootstrapData.value);
     } catch (error) {
       console.error('[useStoreInit] Failed to fetch bootstrap data:', error);
+      throw error;
     }
 
     return bootstrapData.value;

package/app/composables/useStorefront.js

@@ -22,6 +22,13 @@ const FOOTER_APPEARANCE = [
   "FOOTER_LINK_COLOR", "FOOTER_LINK_HOVER_COLOR",
 ];
 
+function unavailable(status, message) {
+  const err = new Error(message);
+  err.status = status;
+  err.code = "STORE_UNAVAILABLE";
+  return err;
+}
+
 /** Menus arrive as a map keyed by handle from bootstrap, and as a plain list
  *  from the dashboard's MENUS message. Normalize to the map either way. */
 function menusAsMap(value) {
@@ -120,8 +127,7 @@ export function useStorefront() {
 
     // The bar's own on / off is now "is the section there (and shown)".
     const bar = chrome.find((s) => s.type === "ANNOUNCEMENT_BAR");
-    out.ANNOUNCEMENT_ENABLED =
-      !!bar && (!bar.disabled || !!previewState.value);
+    out.ANNOUNCEMENT_ENABLED = !!bar && !bar.disabled;
     return out;
   });
 
@@ -185,7 +191,14 @@ export function useStorefront() {
       // and derives baseUrl from the store's username in the response. Reuse
       // that payload instead of firing a second, redundant bootstrap request.
       if (!bootstrapData.value) await init();
-      data.value = bootstrapData.value;
+      const payload = bootstrapData.value;
+
+      if (!payload?.store) throw unavailable(404, "No store for this address");
+      if (payload.store.is_active === false || payload.store.available === false) {
+        throw unavailable(402, "This store is currently unavailable");
+      }
+
+      data.value = payload;
 
       const available = data.value?.store?.locales ?? ["en"];
       if (!available.includes(locale.value)) {

package/app/logic/layouts/default.js

@@ -39,13 +39,13 @@ export default function useLogic() {
   const { sectionGroups } = useStorefront();
   const { isPreview } = useBuilderPreview();
   const headerSections = computed(() => {
-    const list = (sectionGroups.value?.header ?? []).filter((s) => isPreview.value || !s.disabled);
+const list = (sectionGroups.value?.header ?? []).filter((s) => !s.disabled);
     if (chrome.value === "bare") return [];
     return chrome.value === "minimal" ? list.filter((s) => s.type === "HEADER") : list;
   });
   const footerSections = computed(() =>
     chrome.value === "full"
-      ? (sectionGroups.value?.footer ?? []).filter((s) => isPreview.value || !s.disabled)
+      ? (sectionGroups.value?.footer ?? []).filter((s) => !s.disabled)
       : []
   );