spree_storefront 5.4.1 → 5.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c18fe5cbf2c1619cfda1f9ae3209b1bc6e83eef396cadd669d685cb5e11aff
-  data.tar.gz: fa94ea40e743864d935d550e178a710fa6aad34b264efdfe9faaa3bb85e7cbb1
+  metadata.gz: f19a77df22de90e0318f79b859fb980e290ce71eb2498d425a7523e3667cdf71
+  data.tar.gz: d2aaac44425273c8b8c900002d883629851473da2ad4be8e65dee01271bcb1ef
 SHA512:
-  metadata.gz: 4916d85ad37a17a36c442c0bb953d5bf4cc80055add3a74fa9c294c8f9b2f057cfc5b41357de110863c074bdbb83723485170486299c06283370fb91228b2247
-  data.tar.gz: e9d6530f6e12c1646558028f2bdec15cca750bec1dcc4385840aa78af00cffdd97cf6c43476c574fef4192a8625a1322bae757be4ec3b547cdea07ed2fccd585
+  metadata.gz: b2959a382e2d1ccd4f1fa0c78ca02acaf075b7905ce5663de76f571aa4a9a90adb7417b9addf83e957d20b0a6dc181b63a2374e7ca152471dabd64c91d6e8e70
+  data.tar.gz: 6b78637997d7a6e3948d88e9d547233db94617133e99a1fa6226fa0c9c4dff0864ec20ed90b4a96cdfb79af50b84cacada89ef4381cc9f9926dbbf9e4c29e2eb

data/app/helpers/spree/json_ld_helper.rb

@@ -0,0 +1,12 @@
+module Spree
+  module JsonLdHelper
+    # spree_api globally sets ActiveSupport::JSON::Encoding.escape_html_entities_in_json = false,
+    # so a literal `</script>` in any field would break out of the surrounding script tag.
+    # ERB::Util.json_escape post-processes the encoded JSON to escape `<`, `>`, `&` regardless
+    # of that global flag.
+    def json_ld_script(data, **html_attrs)
+      json = ERB::Util.json_escape(data.to_json)
+      content_tag(:script, json.html_safe, type: 'application/ld+json', **html_attrs)
+    end
+  end
+end

data/app/helpers/spree/products_helper.rb

@@ -225,6 +225,46 @@ module Spree
       json_ld
     end
 
+    def product_json_ld_data(product, selected_variant: nil)
+      first_or_default_variant = product.first_or_default_variant(current_currency)
+      data = {
+        '@context' => 'https://schema.org/',
+        '@type' => 'Product',
+        'name' => product.name,
+        'url' => spree.product_url(product, host: current_store.url_or_custom_domain)
+      }
+      data['image'] = [spree_image_url(product.primary_media, variant: :large)] if product.has_images?
+      data['description'] = strip_tags(product.description) if product.description.present?
+
+      sku_variant = product.has_variants? ? selected_variant : first_or_default_variant
+      data['sku'] = sku_variant.sku if sku_variant&.sku.present?
+
+      if product.brand_taxon
+        data['brand'] = { '@type' => 'Brand', 'name' => product.brand_taxon.name }
+      end
+
+      data['offers'] = if product.has_variants?
+                         product.variants.map { |variant| product_json_ld_variant_offer(product, variant) }
+                       else
+                         [product_json_ld_variant_offer(product, first_or_default_variant)]
+                       end
+      data
+    end
+
+    def product_json_ld_variant_offer(product, variant)
+      Rails.cache.fetch(['json-ld-variant-hash', *spree_base_cache_key, variant.cache_key_with_version]) do
+        offer = {
+          '@type' => 'Offer',
+          'availability' => "http://schema.org/#{variant.available? ? 'InStock' : 'OutOfStock'}",
+          'price' => variant.amount_in(current_currency),
+          'priceCurrency' => current_currency,
+          'url' => spree.product_url(product, variant_id: variant.id, host: current_store.url_or_custom_domain)
+        }
+        offer['sku'] = variant.sku if variant.sku.present?
+        offer
+      end
+    end
+
     def option_type_colors_preview_styles(option_type)
       return unless option_type.color_swatch?
 

data/app/presenters/spree/colors_preview_styles_presenter.rb

@@ -1,5 +1,7 @@
 module Spree
   class ColorsPreviewStylesPresenter
+    UNSAFE_CSS_CHARS = /[<>"'\\;{}\r\n]/
+
     def initialize(colors)
       @colors = colors.compact_blank.map do |color|
         case color
@@ -17,11 +19,11 @@ module Spree
     end
 
     def to_s
-      @to_s ||= if colors.any?
+      @to_s ||= if renderable_colors.any?
                   css = ['<style>']
 
-                  colors.each do |color|
-                    css_color = css_colors_hash[color[:filter_name]] || color[:filter_name].gsub(' ', '')
+                  renderable_colors.each do |color|
+                    css_color = css_colors_hash[color[:filter_name]]
                     color_name = color[:name]
                     css << <<~CSS
                        @supports(background: #{css_color}) {
@@ -48,6 +50,17 @@ module Spree
 
     attr_reader :colors
 
+    # We only emit CSS rules for colors we recognise via Spree::ColorNames AND whose
+    # name contains no characters that could break out of the CSS string/selector
+    # context (admins control these names; #to_s output is rendered with raw()).
+    def renderable_colors
+      @renderable_colors ||= colors.reject do |color|
+        css_colors_hash[color[:filter_name]].nil? ||
+          color[:name].match?(UNSAFE_CSS_CHARS) ||
+          color[:filter_name].match?(UNSAFE_CSS_CHARS)
+      end
+    end
+
     def css_colors_hash
       @css_colors_hash ||= begin
         colors_hash = {}
@@ -61,7 +74,7 @@ module Spree
             colors_hash[color_name] = generate_css_color(hex_colors)
           elsif (subcolors = color_name.split.compact) && subcolors.length > 1
             subcolors = subcolors.map(&method(:find_color)).compact
-            colors_hash[color_name] = generate_css_color(subcolors)
+            colors_hash[color_name] = generate_css_color(subcolors) if subcolors.any?
           end
         end
 

data/app/views/themes/default/spree/page_sections/_featured_taxon.html.erb

@@ -35,7 +35,7 @@
               </div>
             <% end %>
           </div>
-          <% if section.taxon.present? %>
+          <% if section.taxon.present? && section.preferred_show_more_button %>
             <%= link_to spree_storefront_resource_url(section.taxon), class: class_names(section.preferred_button_style == "primary" ? "btn-primary" : "btn-secondary", " text-center hidden md:inline-block"), data: { turbo_frame: '_top' } do %>
               <%= section.preferred_button_text %>
             <% end %>

data/app/views/themes/default/spree/page_sections/_newsletter.html.erb

@@ -28,7 +28,7 @@
                   <%= hidden_field_tag :section_id, section.id %>
                   <%= f.email_field :email, placeholder: block.preferred_placeholder, required: true, class: 'focus:border-primary focus:ring-primary pr-36 text-sm bg-accent rounded-input border-accent py-2 px-4 w-full relative z-30 !leading-[46px]' %>
                   <div class="absolute right-2 top-1/2 transform -translate-y-1/2 z-40">
-                    <%= f.submit block.preferred_button_text.html_safe, class: "#{block.preferred_button_style == 'secondary' ? 'btn-secondary' : 'btn-primary'} content-center" %>
+                    <%= f.submit block.preferred_button_text, class: "#{block.preferred_button_style == 'secondary' ? 'btn-secondary' : 'btn-primary'} content-center" %>
                   </div>
                 </div>
               </div>

data/app/views/themes/default/spree/posts/_json_ld.html.erb

@@ -1,20 +1,16 @@
-<script type="application/ld+json" data-test-id="post-json-ld">
-  {
-    "@context": "https://schema.org",
-    "@type": "BlogPosting",
-    "headline": "<%= post.title %>",
-    "image": <%= post.image.attached? ? [spree_image_url(post.image, width: 1200, height: 675)].to_json.html_safe : [].to_json.html_safe %>,
-    "datePublished": "<%= post.published_at&.iso8601 %>",
-    "dateModified": "<%= post.updated_at&.iso8601 %>",
-    "author": [
-      {
-        "@type": "Person",
-        "name": "<%= post.author_name %>"
-      }
-    ]
-  }
-</script>
+<%= json_ld_script({
+  '@context' => 'https://schema.org',
+  '@type' => 'BlogPosting',
+  'headline' => post.title,
+  'image' => post.image.attached? ? [spree_image_url(post.image, width: 1200, height: 675)] : [],
+  'datePublished' => post.published_at&.iso8601,
+  'dateModified' => post.updated_at&.iso8601,
+  'author' => [
+    {
+      '@type' => 'Person',
+      'name' => post.author_name
+    }
+  ]
+}, data: { test_id: 'post-json-ld' }) %>
 
-<script type="application/ld+json" data-test-id="post-breadcrumbs-json-ld">
-  <%= posts_json_ld_breadcrumbs(post).to_json.html_safe %>
-</script>
+<%= json_ld_script(posts_json_ld_breadcrumbs(post), data: { test_id: 'post-breadcrumbs-json-ld' }) %>

data/app/views/themes/default/spree/products/_description.html.erb

@@ -2,7 +2,7 @@
   <% description_text = strip_tags(product.storefront_description) %>
   <div data-controller="read-more" class="flex flex-col gap-4" data-read-more-more-text-value="<%= Spree.t(:read_more) %>" data-read-more-less-text-value="Read less">
     <div class="prose product-description text-sm <%= 'product-description-truncated' if description_text.size > 250 %>" data-read-more-target="content">
-      <%= raw(product.storefront_description) %>
+      <%= sanitize(product.storefront_description) %>
     </div>
     <% if description_text.size > 250 %>
       <%= button_tag Spree.t(:read_more), type: 'button', data: { action: "read-more#toggle" }, class: "font-bold underline text-sm" %>

data/app/views/themes/default/spree/products/_details.html.erb

@@ -3,7 +3,7 @@
     <% description_text = strip_tags(product.storefront_description) %>
     <div data-controller="read-more" class="py-4 flex flex-col gap-4" data-read-more-more-text-value="<%= Spree.t(:read_more) %>" data-read-more-less-text-value="Read less">
       <div class="prose product-description text-sm <%= 'product-description-truncated' if description_text.size > 250 %>" data-read-more-target="content">
-        <%= raw(product.storefront_description) %>
+        <%= sanitize(product.storefront_description) %>
       </div>
       <% if description_text.size > 250 %>
         <%= button_tag Spree.t(:read_more), type: 'button', data: { action: "read-more#toggle" }, class: "font-bold underline text-sm" %>

data/app/views/themes/default/spree/products/_featured_image.html.erb

@@ -14,7 +14,7 @@
          "w-full group-hover:opacity-0 transition-opacity duration-500 z-10 relative h-full bg-background product-card !max-h-full #{object_class}" :
          "w-full h-full !max-h-full #{object_class}" %>
     <%= spree_image_tag(object.primary_media, width: width, height: height, variant: :medium, loading: :lazy, alt: "#{object.name} #{Spree.t('storefront.products.primary_image', default: 'primary image')}", class: image_hover_class) %>
-    <% if object.has_images? && object.image_count > 1 && object.secondary_image.present? && object.secondary_image.attached? %>
+    <% if object.has_images? && object.secondary_image.present? && object.secondary_image.attached? %>
       <% secondary_image_class = "w-full absolute top-0 left-0 opacity-100 h-full !max-h-full #{object_class}" %>
       <%= spree_image_tag(object.secondary_image, width: width, height: height, variant: :medium, loading: :lazy, alt: "#{object.name} #{Spree.t('storefront.products.secondary_image', default: 'secondary image')}", class: secondary_image_class) %>
     <% end %>

data/app/views/themes/default/spree/products/_json_ld.html.erb

@@ -1,40 +1,2 @@
-<script type="application/ld+json" data-test-id="product-json-ld">
-  <% first_or_default_variant = product.first_or_default_variant(current_currency) %>
-  {
-    "@context": "https://schema.org/",
-    "@type": "Product",
-    "name": <%= product.name.to_json.html_safe %>,
-    "url": <%= spree.product_url(product, host: current_store.url_or_custom_domain).to_json.html_safe %>,
-  <% if product.has_images? %>
-    "image": [
-      <%= spree_image_url(product.primary_media, variant: :large).to_json.html_safe %>
-    ],
-  <% end %>
-  <% if product.description.present? %>
-    "description": <%= strip_tags(product.description).to_json.html_safe %>,
-  <% end %>
-  <% if !product.has_variants? %>
-    <% if first_or_default_variant.sku.present? %>"sku": <%= first_or_default_variant.sku.to_json.html_safe %>,<% end %>
-  <% elsif selected_variant %>
-    <% if selected_variant.sku.present? %>"sku": <%= selected_variant.sku.to_json.html_safe %>,<% end %>
-  <% end %>
-  <% if product.brand_taxon %>
-    "brand": {
-      "@type": "Brand",
-      "name": <%= product.brand_taxon.name.to_json.html_safe %>
-    },
-  <% end %>
-"offers": [
-  <% if product.has_variants? %>
-  <%= raw(product.variants.map do |variant|
-  render partial: "spree/products/json_ld_variant", locals: { product: product, variant: variant }
-  end.join(",\n")) %>
-  <% else %>
-  <%= render "spree/products/json_ld_variant", product: product, variant: first_or_default_variant %>
-  <% end %>
-  ]
-  }
-</script>
-<script type="application/ld+json">
-  <%= product_json_ld_breadcrumbs(product).to_json.html_safe %>
-</script>
+<%= json_ld_script(product_json_ld_data(product, selected_variant: selected_variant), data: { test_id: 'product-json-ld' }) %>
+<%= json_ld_script(product_json_ld_breadcrumbs(product)) %>

data/app/views/themes/default/spree/products/_json_ld_list.html.erb

@@ -1,9 +1,7 @@
 <% cache [spree_base_cache_key, products,'json-ld-list'], expires_in: 1.day do %>
-  <script type="application/ld+json" data-test-id="product-list-json-ld">
-    {
-      "@context": "https://schema.org",
-      "@type": "ItemList",
-      "itemListElement": <%= product_list_json_ld_elements(products.to_a.pluck(:slug)).to_json.html_safe %>
-    }
-  </script>
-<% end %>
+  <%= json_ld_script({
+    '@context' => 'https://schema.org',
+    '@type' => 'ItemList',
+    'itemListElement' => product_list_json_ld_elements(products.to_a.pluck(:slug))
+  }, data: { test_id: 'product-list-json-ld' }) %>
+<% end %>

data/app/views/themes/default/spree/shared/_json_ld.html.erb

@@ -1,32 +1,29 @@
 <% cache spree_storefront_base_cache_scope.call(current_store) do %>
-  <script type="application/ld+json">
-    {
-      "@context": "https://schema.org",
-      "@type": "Organization",
-      "url": <%= current_store.formatted_url_or_custom_domain.to_json.html_safe %>,
-      "sameAs": <%= current_store.social_links.to_json.html_safe %>,
-    <% if current_store.logo && current_store.logo&.attached? && current_store.logo&.variable? %>
-      "logo": <%= spree_image_url(current_store.logo, width: 250, height: 250).to_json.html_safe %>,
-    <% end %>
-      "name": <%= current_store.name.to_json.html_safe %>,
-      "email": <%= current_store.customer_support_email.to_json.html_safe %>
-    }
-  </script>
+  <% organization = {
+    '@context' => 'https://schema.org',
+    '@type' => 'Organization',
+    'url' => current_store.formatted_url_or_custom_domain,
+    'sameAs' => current_store.social_links,
+    'name' => current_store.name,
+    'email' => current_store.customer_support_email
+  } %>
+  <% if current_store.logo && current_store.logo&.attached? && current_store.logo&.variable? %>
+    <% organization['logo'] = spree_image_url(current_store.logo, width: 250, height: 250) %>
+  <% end %>
+  <%= json_ld_script(organization) %>
 <% end %>
 
 <% if canonical_path.include?('search') %>
   <% potential_action_target = "#{canonical_href(current_store.url_or_custom_domain)}?q={search_term_string}" %>
-  <script type="application/ld+json">
-    {
-      "@context": "https://schema.org",
-      "@type": "WebSite",
-      "name": <%= current_store.name.to_json.html_safe %>,
-      "potentialAction": {
-        "@type": "SearchAction",
-        "target": <%= potential_action_target.to_json.html_safe %>,
-        "query-input": "required name=search_term_string"
-      },
-      "url": <%= current_store.formatted_url_or_custom_domain.to_json.html_safe %>
-    }
-  </script>
+  <%= json_ld_script({
+    '@context' => 'https://schema.org',
+    '@type' => 'WebSite',
+    'name' => current_store.name,
+    'potentialAction' => {
+      '@type' => 'SearchAction',
+      'target' => potential_action_target,
+      'query-input' => 'required name=search_term_string'
+    },
+    'url' => current_store.formatted_url_or_custom_domain
+  }) %>
 <% end %>

data/config/i18n-tasks.yml

@@ -34,6 +34,7 @@ data:
     ## Example (replace %#= with %=):
     # - "<%#= %x[bundle info vagrant --path].chomp %>/templates/locales/%{locale}.yml"
     - "<%= %x[bundle info spree_core --path].chomp %>/config/locales/%{locale}.yml"
+    - "<%= %x[bundle info spree_admin --path].chomp %>/config/locales/%{locale}.yml"
 
   ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
   # router: conservative_router
@@ -54,8 +55,11 @@ data:
 # Find translate calls
 search:
   ## Paths or `Find.find` patterns to search in:
-  # paths:
-  #  - app/
+  paths:
+    - app/
+    - spec/
+    - ../page_builder/app/
+    - ../page_builder/lib/
 
   ## Root directories for relative keys resolution.
   # relative_roots:
@@ -80,6 +84,7 @@ search:
     - app/assets/fonts
     - app/assets/videos
     - app/assets/builds
+    - spec/dummy
 
   ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:
   ## If specified, this settings takes priority over `exclude`, but `exclude` still applies.
@@ -148,6 +153,29 @@ ignore_unused:
 - 'spree.storefront.refund_action_not_required_message.*'
 - 'spree.storefront.refund_action_required_message.*'
 - 'spree.storefront.checkout.or_continue_below'
+- 'spree.order_state.*'
+- 'spree.payment_states.*'
+- 'spree.shipment_states.*'
+- 'spree.breadcrumbs'
+- 'spree.confirm_delete'
+- 'spree.copied'
+- 'spree.custom_domains'
+- 'spree.domains'
+- 'spree.favicon'
+- 'spree.new_page'
+- 'spree.order_details'
+- 'spree.order_success'
+- 'spree.pagination.truncate'
+- 'spree.product_details'
+- 'spree.search_results'
+- 'spree.searching'
+- 'spree.seo_robots'
+- 'spree.server_error'
+- 'spree.shipping_total'
+- 'spree.successfully_created'
+- 'spree.successfully_removed'
+- 'spree.unlock'
+- 'spree.vendors'
 
 ## Exclude these keys from the `i18n-tasks eq-base' report:
 # ignore_eq_base:

data/config/locales/en.yml

@@ -1,6 +1,28 @@
 ---
 en:
   spree:
+    actions:
+      cancel: Cancel
+      destroy: Delete
+      discard: Discard
+      publish: Publish
+      save: Save
+      update: Update
+    add_address: Add address
+    add_link: Add link
+    add_new_credit_card: Add a new card
+    add_new_page: Add new page
+    add_page_block: Add Block
+    add_section: Add section
+    add_to_cart: Add To Cart
+    add_to_waitlist: Add to waitlist
+    add_to_waitlist_description: Add to waitlist description
+    address_book:
+      set_as_default_billing_address: Set as default billing address
+      set_as_default_delivery_address: Set as default delivery address
+      successfully_created: Address has been successfully created.
+      successfully_removed: Address has been successfully removed.
+      successfully_updated: Updated successfully
     admin:
       checkout_settings:
         checkout_links:
@@ -16,14 +38,233 @@ en:
           label: Display the special instructions field
       markets:
         list: Markets
+      page_builder:
+        maximum_posts_to_show: Maximum posts to show
+        visible: Visible
       store_form:
         company_field:
           description: It shows the company field on the address form in the My Account section and on the checkout address step.
           label: Display the company address field
     all_posts: All Posts
     all_posts_with_tag: All Posts tagged with %{tag}
+    all_rights_reserved: All rights reserved
+    alt_text: Alternative Text
+    are_you_sure: Are you sure?
+    authorization_failure: Authorization Failure
+    automatic_taxon_names:
+      new_arrivals: New arrivals
+      on_sale: On sale
     blog: Blog
+    breadcrumbs: Breadcrumbs
+    card_expiration_placeholder: MM/YYYY
+    cart_page:
+      add_promo_code: ADD PROMO CODE
+      empty_info: Your cart is empty.
+    change_password: Change password
+    changes_published: Changes published!
+    checkout_message: Checkout message
+    close_sidebar: Close sidebar
+    confirm_delete: Confirm Deletion
+    confirm_password: Password Confirmation
+    contact_information: Contact information
+    contact_us: Contact us
+    container_alignment: Container alignment
+    continue_as_guest: Continue as a guest
+    continue_without_logging_in: Continue without logging in
+    copied: Copied!
+    create_a_new_account: Create a new account
+    custom_code: Custom code
+    custom_domains: Custom domains
+    custom_font_code: Custom font code
+    default_theme_name: Default
+    delete_address: Delete address
+    delivery_address: Delivery Address
+    didn_t_receive_confirmation_instructions: Didn't receive confirmation instructions?
+    didn_t_receive_unlock_instructions: Didn't receive unlock instructions?
+    digital_link_unauthorized: You are not authorized to access this asset
+    domains: Domains
+    edit_address: Edit address
+    enter_using_password: Enter using password
+    errors:
+      messages:
+        no_shipping_methods_available: No shipping methods available for selected location, please change your address and try again.
+    expiration_date: Expiration Date
+    explore_taxon: Explore taxon
+    favicon: Favicon
+    featured_taxon: Featured taxon
+    find_your_order: Find your order
+    follow_us: Follow us
+    font_family: Font family
+    font_size_scale: Font size scale
+    forbidden_message: You are not authorized to access this page.
+    forgot_password: Forgot password?
+    header_font_family: Header font family
+    header_font_size_scale: Header font size scale
+    homepage: Homepage
+    i18n:
+      language: Language
+      localization_settings: Localization Settings
+    index_in_search_engines: Index in search engines
+    internal_server_error: Internal Server Error
+    internal_server_error_message: The server encountered an internal error and was unable to complete your request.
+    mega_nav: Mega nav
+    mega_nav_with_subcategories: Mega nav with subcategories
+    minimum_password_length:
+      one: "(%{count} character minimum)"
+      other: "(%{count} characters minimum)"
+    move_down: Move down
+    move_up: Move up
+    my_addresses: My addresses
+    name_on_card: Name on card
+    new_balance: New balance
+    new_page: New Page
+    new_password: New password
+    newsletters: Newsletters
+    no_products_found: No products found
+    no_resource_found: No %{resource} found
+    no_tracking_present: No tracking details provided.
+    not_subscribed: Not subscribed
+    notify_me_when_available: Notify me when available
+    only_left: Only %{count} left
+    order_again: Order again
     order_already_updated: The order has already been updated.
+    order_details: Order Details
+    order_state:
+      address: address
+      awaiting_return: awaiting return
+      canceled: canceled
+      cart: cart
+      complete: complete
+      confirm: confirm
+      considered_risky: considered risky
+      delivery: delivery
+      payment: payment
+      resumed: resumed
+      returned: returned
+    order_status: Order status
+    order_success: Order placed successfully
+    page_blocks:
+      buttons:
+        display_name: Button
+      link:
+        display_name: Link
+      nav:
+        label_default: Menu
+      newsletter_form:
+        button_text_default: Submit
+        placeholder_default: Enter your email
+      products:
+        buy_buttons:
+          display_name: Add To Cart
+    page_not_found: Sorry! Page you are looking can’t be found.
+    page_not_found_message: This page just doesn't exist.
+    page_sections:
+      announcement_bar:
+        default_text: Welcome to my Store!
+      featured_taxon:
+        button_text_default: Explore category
+        heading_default: Beloved products
+      featured_taxons:
+        heading_default: Shop by category
+      image_banner:
+        heading_default: Welcome to your website
+        text_default: This is the place to tell people about your business and what you do.
+      image_with_text:
+        heading_default: Welcome to our shop!
+        text_default: At %{store_name} we offer a wide range of products for your home and business.
+      newsletter:
+        heading_default: Subscribe to our newsletter
+        text_default: Thank you for choosing us as your trusted online shopping destination.
+      page_title:
+        display_name: Page Title
+      related_products:
+        heading_default: You might also like
+      rich_text:
+        heading_default: This is a heading
+        text_default: This is a paragraph of text
+      taxon_grid:
+        heading_default: Brands we work with
+      video:
+        heading_1_default: Why I recommend it?
+        heading_2_default: There's nothing like a soft hint of blush to add dimension and color to your look.
+    pages_defaults:
+      homepage:
+        featured_taxon_heading_new_arrivals: New arrivals
+        featured_taxon_heading_on_sale: On sale
+        image_with_text_heading: About us
+        image_with_text_text: Welcome to our shop! We carefully curate high-quality products that we believe in. Our process involves rigorous testing and selection to ensure we only offer items that meet our standards. We're passionate about delivering exceptional value and service to our customers.
+      password:
+        newsletter_heading: Opening soon
+        newsletter_text: Be the first one to know when we launch.
+    pagination:
+      truncate: "…"
+    password_protected: Password protected
+    payment_information: Payment Information
+    payment_states:
+      balance_due: Balance Due
+      checkout: Checkout
+      complete: Complete
+      completed: Completed
+      credit_owed: Credit Owed
+      failed: Failed
+      paid: Paid
+      partially_refunded: Partially Refunded
+      pending: Pending
+      processing: Processing
+      refunded: Refunded
+      void: Void
+    personal_details: Personal details
+    place_order: Place Order
+    policy: Policy
+    post: Post
+    posts: Posts
+    product_details: Product Details
+    product_sold_out: This item is sold out
+    products_sort_options:
+      best_selling: Best Selling
+      name_a_z: Alphabetically, A-Z
+      name_z_a: Alphabetically, Z-A
+      newest_first: Newest
+      oldest_first: Oldest
+      price_high_to_low: Price (high-low)
+      price_low_to_high: Price (low-high)
+      relevance: Relevance
+    read_less: Read less
+    read_more: Read more
+    regular_price: Regular price
+    restore_defaults: Restore defaults
+    sale_price: Sale price
+    save_and_continue: Save and Continue
+    search_all: Search all
+    search_results: Search results for '%{keywords}'
+    search_results_for: Search results for %{query}
+    searching: Searching
+    send_message: Send message
+    send_us_a_message: Send us a message
+    seo_robots: SEO Robots
+    server_error: The server returned an error
+    service_unavailable: Service Unavailable
+    service_unavailable_message: The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.
+    shipment_refunded_message: You will receive a refund in the next few days.
+    shipment_states:
+      backorder: Backorder
+      canceled: Canceled
+      partial: Partial
+      pending: Pending
+      ready: Ready
+      shipped: Shipped
+    shipped_from: Shipped from
+    shipping_not_available: Shipping not available
+    shipping_total: Shipping total
+    shop_all: Shop All
+    show_all: Show all
+    show_less: Show less
+    sign_in_with_provider: Sign in with %{provider}
+    sign_out: Sign out
+    social_media: Social media
+    sold_out: Sold out
+    something_went_wrong: Something went wrong
+    spree_gateway_error_flash_for_checkout: There was a problem with your payment information. Please check your information and try again.
     storefront:
       account:
         change_password: Change password
@@ -113,3 +354,36 @@ en:
         remove_error: You already removed this item from your wishlist
         select_variant: Select variant to add to wishlist
         unavailable: Unavailable
+    successfully_created: "%{resource} has been successfully created!"
+    successfully_removed: "%{resource} has been successfully removed!"
+    successfully_updated: "%{resource} has been successfully updated!"
+    text_alignment: Text alignment
+    theme_copied: Theme has been successfully copied.
+    theme_is_now_live: Theme is now live
+    theme_not_copied: 'Theme could not be copied with errors: %{error}'
+    theme_settings:
+      accent_color: Accent color
+      background_color: Background color
+      border_color: Border color
+      brand_color: Brand color
+      button_border_color: Button border color
+      button_text_color: Button text color
+      danger_color: Danger color
+      input_text_color: Input text color
+      neutral_color: Neutral color
+      success_color: Success color
+      text_color: Text color
+    title_link: Title link
+    toggle_menu: Toggle menu
+    top_suggestions: Top suggestions
+    track_items: Track items
+    try_removing_filters: Try removing some filters to see more products
+    unlock: Unlock
+    unprocessable_entity: Unprocessable Entity
+    unprocessable_entity_message: Your request could not be processed. Please check the form for errors and try again.
+    use_shipping_address: Use Shipping Address
+    vendors: Vendors
+    view_all: View all
+    view_full_details: View full details
+    view_store: View store
+    view_your_store: View your store

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_storefront
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.4.5
 platform: ruby
 authors:
 - Vendo Connect Inc.
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.1
+        version: 5.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.1
+        version: 5.4.5
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +247,7 @@ files:
 - app/helpers/spree/checkout_helper.rb
 - app/helpers/spree/filters_helper.rb
 - app/helpers/spree/fonts_helper.rb
+- app/helpers/spree/json_ld_helper.rb
 - app/helpers/spree/orders_helper.rb
 - app/helpers/spree/page_helper.rb
 - app/helpers/spree/payment_methods_helper.rb
@@ -471,7 +472,6 @@ files:
 - app/views/themes/default/spree/products/_filters.html.erb
 - app/views/themes/default/spree/products/_json_ld.html.erb
 - app/views/themes/default/spree/products/_json_ld_list.html.erb
-- app/views/themes/default/spree/products/_json_ld_variant.html.erb
 - app/views/themes/default/spree/products/_label.html.erb
 - app/views/themes/default/spree/products/_media_gallery.html.erb
 - app/views/themes/default/spree/products/_metafields.html.erb
@@ -592,9 +592,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/spree/spree-rails-storefront/issues
-  changelog_uri: https://github.com/spree/spree-rails-storefront/releases/tag/v5.4.1
+  changelog_uri: https://github.com/spree/spree-rails-storefront/releases/tag/v5.4.5
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree-rails-storefront/tree/v5.4.1
+  source_code_uri: https://github.com/spree/spree-rails-storefront/tree/v5.4.5
 rdoc_options: []
 require_paths:
 - lib

data/app/views/themes/default/spree/products/_json_ld_variant.html.erb

@@ -1,12 +0,0 @@
-<% cache ["json-ld-variant", spree_base_cache_scope, variant.cache_key_with_version] do %>
-{
-  "@type": "Offer",
-  <% if variant.sku.present? %>
-    "sku": <%= variant.sku.to_json.html_safe %>,
-  <% end %>
-  "availability": "http://schema.org/<%= variant.available? ? 'InStock' : 'OutOfStock' %>",
-  "price": <%= variant.amount_in(current_currency).to_json.html_safe %>,
-  "priceCurrency": <%= current_currency.to_json.html_safe %>,
-  "url": <%= spree.product_url(product, variant_id: variant.id, host: current_store.url_or_custom_domain).to_json.html_safe %>
-}
-<% end %>