Fix Theme Check offences (#3283)

* Fix schema JSON formatting Co-authored-by: Abhishek Jani <abhishekdarshanjani@gmail.com> * Add loading=eager attribute to gift card page img * Use liquid tag to combine successive liquid statements Co-authored-by: Abhishek Jani <abhishekdarshanjani@gmail.com> * Remove snippet to avoid > 3 levels of nested snippets * Ignore AssetPreload theme check for font links --------- Co-authored-by: Abhishek Jani <abhishekdarshanjani@gmail.com>
pridyok · Feb 16, 2024 · a42f234 · a42f234
1 parent 9309102
commit a42f234
Show file tree

Hide file tree

Showing 26 changed files with 129 additions and 88 deletions.
diff --git a/layout/password.liquid b/layout/password.liquid
@@ -175,10 +175,14 @@
     {% endstyle %}
 
     {%- unless settings.type_body_font.system? -%}
+      {% comment %}theme-check-disable AssetPreload{% endcomment %}
       <link rel="preload" as="font" href="{{ settings.type_body_font | font_url }}" type="font/woff2" crossorigin>
+      {% comment %}theme-check-enable AssetPreload{% endcomment %}
     {%- endunless -%}
     {%- unless settings.type_header_font.system? -%}
+      {% comment %}theme-check-disable AssetPreload{% endcomment %}
       <link rel="preload" as="font" href="{{ settings.type_header_font | font_url }}" type="font/woff2" crossorigin>
+      {% comment %}theme-check-enable AssetPreload{% endcomment %}
     {%- endunless -%}
 
     {{ 'section-password.css' | asset_url | stylesheet_tag }}

diff --git a/layout/theme.liquid b/layout/theme.liquid
@@ -254,10 +254,14 @@
     {{ 'base.css' | asset_url | stylesheet_tag }}
 
     {%- unless settings.type_body_font.system? -%}
+      {% comment %}theme-check-disable AssetPreload{% endcomment %}
       <link rel="preload" as="font" href="{{ settings.type_body_font | font_url }}" type="font/woff2" crossorigin>
+      {% comment %}theme-check-enable AssetPreload{% endcomment %}
     {%- endunless -%}
     {%- unless settings.type_header_font.system? -%}
+      {% comment %}theme-check-disable AssetPreload{% endcomment %}
       <link rel="preload" as="font" href="{{ settings.type_header_font | font_url }}" type="font/woff2" crossorigin>
+      {% comment %}theme-check-enable AssetPreload{% endcomment %}
     {%- endunless -%}
 
     {%- if localization.available_countries.size > 1 or localization.available_languages.size > 1 -%}

diff --git a/sections/announcement-bar.liquid b/sections/announcement-bar.liquid
@@ -224,7 +224,9 @@
   "max_blocks": 12,
   "class": "announcement-bar-section",
   "enabled_on": {
-    "groups": ["header"]
+    "groups": [
+      "header"
+    ]
   },
   "settings": [
     {

diff --git a/sections/collage.liquid b/sections/collage.liquid
@@ -250,7 +250,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
@@ -412,7 +415,10 @@
         {
           "type": "video_url",
           "id": "video_url",
-          "accept": ["youtube", "vimeo"],
+          "accept": [
+            "youtube",
+            "vimeo"
+          ],
           "default": "https://www.youtube.com/watch?v=_9VUPq3SxOc",
           "label": "t:sections.collage.blocks.video.settings.video_url.label",
           "placeholder": "t:sections.collage.blocks.video.settings.video_url.placeholder",

diff --git a/sections/collapsible-content.liquid b/sections/collapsible-content.liquid
@@ -112,7 +112,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/collection-list.liquid b/sections/collection-list.liquid
@@ -136,7 +136,10 @@
   "class": "section section-collection-list",
   "max_blocks": 15,
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/contact-form.liquid b/sections/contact-form.liquid
@@ -139,7 +139,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/email-signup-banner.liquid b/sections/email-signup-banner.liquid
@@ -385,6 +385,8 @@
       ]
     }
   ],
-  "templates": ["password"]
+  "templates": [
+    "password"
+  ]
 }
 {% endschema %}
diff --git a/sections/featured-blog.liquid b/sections/featured-blog.liquid
@@ -187,7 +187,10 @@
   "name": "t:sections.featured-blog.name",
   "tag": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/featured-collection.liquid b/sections/featured-collection.liquid
@@ -176,7 +176,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/featured-product.liquid b/sections/featured-product.liquid
@@ -446,8 +446,10 @@
                   {%- endif -%}
                 </div>
               {%- when 'share' -%}
-                {% assign share_url = product.selected_variant.url | default: product.url | prepend: request.origin %}
-                {% render 'share-button', block: block, share_link: share_url %}
+                {% liquid 
+                  assign share_url = product.selected_variant.url | default: product.url | prepend: request.origin 
+                  render 'share-button', block: block, share_link: share_url
+                %}
               {%- when 'variant_picker' -%}
                 {% render 'product-variant-picker',
                   product: product,
@@ -700,7 +702,10 @@
   "tag": "section",
   "class": "section section-featured-product",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "blocks": [
     {

diff --git a/sections/header.liquid b/sections/header.liquid
@@ -593,7 +593,7 @@
       "label": "t:sections.all.colors.label",
       "default": "scheme-1"
     },
-      {
+    {
       "type": "color_scheme",
       "id": "menu_color_scheme",
       "label": "t:sections.header.settings.menu_color_scheme.label",

diff --git a/sections/image-banner.liquid b/sections/image-banner.liquid
@@ -172,7 +172,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/image-with-text.liquid b/sections/image-with-text.liquid
@@ -112,7 +112,10 @@
   "name": "t:sections.image-with-text.name",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/main-product.liquid b/sections/main-product.liquid
@@ -406,12 +406,10 @@
                 {{- block.settings.text -}}
               </a>
             {%- when 'share' -%}
-              {% assign share_url = product.selected_variant.url | default: product.url | prepend: request.origin %}
-              {% render 'share-button',
-                block: block,
-                share_link: share_url
+              {% liquid 
+                assign share_url = product.selected_variant.url | default: product.url | prepend: request.origin
+                render 'share-button', block: block, share_link: share_url
               %}
-
             {%- when 'variant_picker' -%}
               {% render 'product-variant-picker', product: product, block: block, product_form_id: product_form_id %}
             {%- when 'buy_buttons' -%}

diff --git a/sections/multicolumn.liquid b/sections/multicolumn.liquid
@@ -194,7 +194,10 @@
   "class": "section",
   "tag": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/multirow.liquid b/sections/multirow.liquid
@@ -112,7 +112,10 @@
   "name": "t:sections.multirow.name",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/newsletter.liquid b/sections/newsletter.liquid
@@ -120,7 +120,9 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header"]
+    "groups": [
+      "header"
+    ]
   },
   "settings": [
     {

diff --git a/sections/page.liquid b/sections/page.liquid
@@ -41,7 +41,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/quick-order-list.liquid b/sections/quick-order-list.liquid
@@ -279,7 +279,9 @@
   "name": "t:sections.quick-order-list.name",
   "limit": 1,
   "enabled_on": {
-    "templates": ["product"]
+    "templates": [
+      "product"
+    ]
   },
   "settings": [
     {

diff --git a/sections/rich-text.liquid b/sections/rich-text.liquid
@@ -100,7 +100,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/slideshow.liquid b/sections/slideshow.liquid
@@ -281,7 +281,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {

diff --git a/sections/video.liquid b/sections/video.liquid
@@ -154,7 +154,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
@@ -209,7 +212,10 @@
     {
       "type": "video_url",
       "id": "video_url",
-      "accept": ["youtube", "vimeo"],
+      "accept": [
+        "youtube",
+        "vimeo"
+      ],
       "default": "https://www.youtube.com/watch?v=_9VUPq3SxOc",
       "label": "t:sections.video.settings.video_url.label",
       "info": "t:sections.video.settings.video_url.info"

diff --git a/snippets/product-variant-options.liquid b/snippets/product-variant-options.liquid
@@ -67,21 +67,35 @@
   {%- endcapture %}
 
   {%- if picker_type == 'swatch' -%}
-    {% assign checked = false %}
-    {% if option.selected_value == value %}
-      {% assign checked = true %}
-    {% endif %}
-    {%
-      render 'swatch-input',
-      id: input_id,
-      name: option.name,
-      value: value | escape,
-      product_form_id: product_form_id,
-      checked: checked,
-      disabled: option_disabled,
-      shape: block.settings.swatch_shape,
-      help_text: label_unavailable
+    {% liquid
+      assign checked = false
+
+      if option.selected_value == value
+        assign checked = true
+      endif
+
+      assign value_text = value | escape
     %}
+    <input
+      type="radio"
+      id="{{ input_id }}"
+      name="{{ option.name }}"
+      value="{{ value_text }}"
+      form="{{ product_form_id }}"
+      class="swatch-input__input{% if option_disabled %} disabled{% endif %}"
+      {% if checked %}
+        checked
+      {% endif %}
+    >
+    <label
+      for="{{ input_id }}"
+      title="{{ value_text }}"
+      class="swatch-input__label{% if block.settings.swatch_shape == 'square' %} swatch-input__label--square{% endif %}"
+    >
+      {% render 'swatch', swatch: value.swatch, shape: block.settings.swatch_shape %}
+      <span class="visually-hidden">{{ value_text }}</span>
+      {{ label_unavailable }}
+    </label>
   {%- elsif picker_type == 'button' -%}
     <input
       type="radio"