@swell/apps-sdk 1.0.125 → 1.0.127

package/dist/index.js

@@ -13647,7 +13647,10 @@ ${formattedMessage}`;
       blogCategory = cloneStorefrontResource(blogCategory);
     }
     const allTags = deferWith(blogCategory.blogs, (blogs) => {
-      const set = blogs?.results?.reduce(
+      if (!Array.isArray(blogs?.results)) {
+        return [];
+      }
+      const set = blogs.results.reduce(
         (set2, blog) => {
           for (const tag of blog.tags || []) {
             set2.add(tag);
@@ -17104,11 +17107,12 @@ ${injects.join("\n")}<\/script>`;
       hash;
       constructor(token, remainTokens, liquid, parser) {
         super(token, remainTokens, liquid);
-        this.hash = md5(token.input);
         this.templates = [];
+        const tagBegin = token.begin;
         while (remainTokens.length > 0) {
           const token2 = remainTokens.shift();
           if (import_liquidjs18.TypeGuards.isTagToken(token2) && token2.name === "endstyle") {
+            this.hash = md5(token2.input.slice(tagBegin, token2.end));
             return;
           }
           this.templates.push(parser.parseToken(token2, remainTokens));
@@ -19557,14 +19561,36 @@ ${injects.join("\n")}<\/script>`;
         "layouts",
         name
       );
-      if (templateConfig) {
-        const content = await this.renderThemeTemplate(
-          templateConfig.file_path,
-          data
-        );
-        return typeof content === "string" ? content : `<!-- invalid layout: ${name}--> {{ content_for_layout }}`;
+      if (!templateConfig) {
+        throw new Error(`Layout template not found: ${name}`);
       }
-      throw new Error(`Layout template not found: ${name}`);
+      let content = await this.renderThemeTemplate(
+        templateConfig.file_path,
+        data
+      );
+      if (typeof content !== "string") {
+        return `<!-- invalid layout: ${name}--> {{ content_for_layout }}`;
+      }
+      if (!this.globals.request.is_editor) {
+        let customCss = this.globals.settings.custom_css || "";
+        if (Array.isArray(customCss)) {
+          customCss = customCss.join("\n").trim();
+        }
+        if (customCss) {
+          let pos = -1;
+          let match = null;
+          const regex = /<\/body\s*?>/gi;
+          while ((match = regex.exec(content)) !== null) {
+            pos = match.index;
+          }
+          if (pos !== -1) {
+            content = `${content.slice(0, pos)}
+<style>${customCss}</style>
+${content.slice(pos)}`;
+          }
+        }
+      }
+      return content;
     }
     async renderPageTemplate(name, data, altTemplateId) {
       let templateConfig = null;