spree_storefront 5.0.0.rc1 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a85a5314ccfde9abdbc6aa20b457c36dea85e8e84aab3098f5d9c5b9a86e60c6
-  data.tar.gz: 0a762fa040c55ffe89e0393072e5f3ce899230bbfbf106ef0aacc8a690dde0be
+  metadata.gz: f2b9329afb684cf2e9b1373c7b73b848db85f132bbaa6e5c4906a20c0a14de4c
+  data.tar.gz: 2afb59994771463137ee0bebefc6727d160a2701ab54d02f42de9d594bb753fa
 SHA512:
-  metadata.gz: eb5bdae6df97ff2a7bb407a6e274b9d4e73f69606ec310639a099f6273da4dca58820e78a0047f066e75b1a431bf333b38a342ac053a58c904fee1377ff8027d
-  data.tar.gz: 5da6d30f25e1e3d9e736f3254fab117c099395f47fe1c9f90ad79be016bea0c85d3bcf52c6c6b61c29038bb377c7ae2bdd29b3abce5608782390276b8513c5b2
+  metadata.gz: 9d423712701926969b368ceb927c5472f7cfafd65cf337f135031696d33e8b36c0f611373d58784df197f580009a97a2990ab321332293d71ce4a2ff1ce2d7d8
+  data.tar.gz: 922e2d4b3743a632c8fd049c5266258ee57e84c3953a30da93e26c913aa909263ca7b2cba4b9f0ba6962e719e9f11a97076947ba1554e6f0cc256f33d13d0bd5

data/app/controllers/concerns/spree/locale_urls.rb

@@ -9,7 +9,11 @@ module Spree
     private
 
     def default_url_options
-      locale = current_locale == current_store.default_locale ? nil : current_locale
+      locale = if current_store.default_locale.nil? || current_locale == current_store.default_locale
+                 nil
+               else
+                 current_locale
+               end
 
       super.merge(locale: locale, currency: currency_param)
     end

data/app/controllers/spree/policies_controller.rb

@@ -2,7 +2,16 @@ module Spree
   class PoliciesController < StoreController
     def show
       if params[:id].in?(supported_policies)
-        @policy = current_store.send("customer_#{params[:id]}")
+        @policy = case params[:id]
+                  when 'privacy_policy'
+                    current_store.customer_privacy_policy
+                  when 'terms_of_service'
+                    current_store.customer_terms_of_service
+                  when 'returns_policy'
+                    current_store.customer_returns_policy
+                  when 'shipping_policy'
+                    current_store.customer_shipping_policy
+                  end
       else
         raise ActiveRecord::RecordNotFound
       end

data/app/helpers/spree/checkout_helper.rb

@@ -29,7 +29,7 @@ module Spree
     end
 
     def checkout_available_payment_methods
-      @checkout_available_payment_methods ||= @order.available_payment_methods.reject(&:store_credit?)
+      @checkout_available_payment_methods ||= @order.collect_frontend_payment_methods.reject(&:store_credit?)
     end
 
     def checkout_started?

data/app/helpers/spree/storefront_helper.rb

@@ -3,9 +3,9 @@ module Spree
     include BaseHelper
     include Heroicon::Engine.helpers
 
-    def render_storefront_partials(section)
+    def render_storefront_partials(section, options = {})
       Rails.application.config.spree_storefront.send(section).map do |partial|
-        render partial: partial
+        render partial, options
       end.join.html_safe
     end
 
@@ -47,21 +47,8 @@ module Spree
     end
 
     def as_aspect_ratio(attachment)
-      return unless attachment.present?
-      return unless attachment.analyzed?
-
-      metadata = attachment.metadata
-      aspect_ratio = metadata['aspect_ratio'].presence
-
-      return aspect_ratio if aspect_ratio
-
-      width = metadata['width']&.to_f
-      return unless width
-
-      height = metadata['height']&.to_f
-      return unless height
-
-      width / height
+      Spree::Deprecation.warn('as_aspect_ratio is deprecated. Please use spree_asset_aspect_ratio instead.')
+      spree_asset_aspect_ratio(attachment)
     end
 
     def svg_country_icon(country_code)

data/app/views/spree/checkout/_line_item.html.erb

@@ -1,20 +1,18 @@
-<div class="flex justify-between items-center">
-  <div class="flex items-center">
-    <div class="mr-5 w-[64px] h-[64px] relative rounded bg-accent-100">
-      <span class="rounded-full text-xs text-center font-bold pl-[0.5px] py-1 w-6 text-sidebar-text bg-background absolute -right-2 -top-3">
-        <%= line_item.quantity %>
-      </span>
-      <% image = line_item.variant.default_image %>
-      <% if image.present? && image.attached? && image.variable? %>
-        <%= image_tag main_app.cdn_image_url(image.variant(spree_image_variant_options(resize_to_fill: [128, 128]))), class: 'rounded border border-default bg-transparent object-cover object-center', loading: :lazy, width: 64, height: 64 %>
-      <% end %>
-    </div>
-    <div class="col-6 col-md-8 pr-3 text-sm">
-      <p class="font-bold word-break"><%= line_item.name %></p>
-      <p class="text-xs"><%= line_item.options_text %></p>
-    </div>
+<div class="flex justify-between items-center pt-3">
+  <div class="mr-5 w-[60px] h-[60px] relative rounded bg-accent-100 shrink-0">
+    <span class="rounded-full text-xs text-center font-bold pl-[0.5px] py-1 w-6 text-sidebar-text bg-background absolute -right-2 -top-3">
+      <%= line_item.quantity %>
+    </span>
+    <% image = line_item.variant.default_image %>
+    <% if image.present? && image.attached? && image.variable? %>
+      <%= spree_image_tag(image, class: 'rounded border border-default bg-transparent object-cover object-center', loading: :lazy, width: 60, height: 60) %>
+    <% end %>
+  </div>
+  <div class="flex-1 pr-3 text-sm">
+    <p class="font-bold word-break"><%= line_item.name %></p>
+    <p class="text-xs"><%= line_item.options_text %></p>
   </div>
-  <div class="font-semibold text-sm text-right">
+  <div class="font-semibold text-sm text-right shrink-0">
     <% if should_display_compare_at_price?(line_item.variant) %>
       <span class="line-through text-red-500">
         <%= Spree::Money.new(line_item.variant.compare_at_amount_in(line_item.currency) * line_item.quantity, currency: line_item.currency) %>

data/app/views/spree/shared/_head.html.erb

@@ -6,7 +6,7 @@
 
 <% cache current_store do %>
   <% if current_store.favicon_image.attached? && current_store.favicon_image.variable? %>
-    <link rel="icon" href="<%= main_app.cdn_image_url(current_store.favicon_image.variant(spree_image_variant_options(resize_to_fill: [256, 256]))) %>">
+    <link rel="icon" href="<%= spree_image_url(current_store.favicon_image, width: 256, height: 256) %>">
   <% end %>
 <% end %>
 

data/app/views/themes/default/spree/orders/_line_item.html.erb

@@ -5,7 +5,7 @@
         <% image = line_item.variant.default_image %>
         <% if image.present? && image.attached? && image.variable? %>
           <%= link_to spree_storefront_resource_url(line_item.product), data: { 'turbo-frame': '_top' } do %>
-            <%= image_tag main_app.cdn_image_url(image.variant(spree_image_variant_options(resize_to_fit: [256, 256]))), width: 128, height: 128, class: 'object-cover', loading: :lazy %>
+            <%= spree_image_tag(image, width: 128, height: 128, class: 'object-cover', loading: :lazy) %>
           <% end %>
         <% end %>
       </div>

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

@@ -47,7 +47,7 @@
           <% if section_with_image %>
             <div class='lg:col-span-5'>
               <%= link_to spree.nested_taxons_path(section.taxon), data: { turbo_frame: "_top" } do %>
-                <%= image_tag main_app.cdn_image_url(section.taxon.image.variant(spree_image_variant_options(resize_to_fill: [1000, 1000]))), height: 500, width: 500, class: 'h-full w-full object-cover object-center', loading: :lazy %>
+                <%= spree_image_tag(section.taxon.image, height: 500, width: 500, class: 'h-full w-full object-cover object-center', loading: :lazy) %>
               <% end %>
             </div>
           <% end %>

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

@@ -14,7 +14,7 @@
         <%= page_builder_link_to link, title: link.label, class: 'group block overflow-hidden', target: link.open_in_new_tab.presence && '_blank' do %>
           <% if link.linkable.image&.attached? && link.linkable.image&.variable? %>
             <div class="flex space-y-2 flex-col">
-              <%= image_tag main_app.cdn_image_url(link.linkable.image.variant(spree_image_variant_options(resize_to_fill: [600, 600]))), height: 300, width: 300, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-gray-200', loading: :lazy, alt: link.label %>
+              <%= spree_image_tag(link.linkable.image, height: 300, width: 300, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-gray-200', loading: :lazy, alt: link.label) %>
               <span><%= link.label %></span>
             </div>
           <% else %>
@@ -49,7 +49,7 @@
               <%= page_builder_link_to link, title: link.label, class: 'group block overflow-hidden', target: link.open_in_new_tab.presence && '_blank' do %>
                 <% if link.linkable.image&.attached? && link.linkable.image&.variable? %>
                   <div class="flex space-y-2 flex-col">
-                    <%= image_tag main_app.cdn_image_url(link.linkable.image.variant(spree_image_variant_options(resize_to_fill: [400, 400]))), height: 200, width: 200, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-gray-200', loading: :lazy, alt: link.label %>
+                    <%= spree_image_tag(link.linkable.image, height: 200, width: 200, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-gray-200', loading: :lazy, alt: link.label) %>
                     <span><%= link.label %></span>
                   </div>
                 <% else %>

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

@@ -3,13 +3,13 @@
     <div class="w-full absolute left-0 image-banner--image-wrapper" style="height: <%= section.preferred_height %>px; opacity: <%= section.preferred_overlay_transparency %>%;">
       <% if section.image.attached? && section.image.variable? %>
         <picture>
-          <source media="(max-width: 640px)" srcset="<%= main_app.cdn_image_url(section.image.variant(spree_image_variant_options(resize_to_limit: [640, nil]))) %>">
-          <source media="(max-width: 750px)" srcset="<%= main_app.cdn_image_url(section.image.variant(spree_image_variant_options(resize_to_limit: [750, nil]))) %>">
-          <source media="(max-width: 828px)" srcset="<%= main_app.cdn_image_url(section.image.variant(spree_image_variant_options(resize_to_limit: [828, nil]))) %>">
-          <source media="(max-width: 1080px)" srcset="<%= main_app.cdn_image_url(section.image.variant(spree_image_variant_options(resize_to_limit: [1080, nil]))) %>">
-          <source media="(max-width: 1200px)" srcset="<%= main_app.cdn_image_url(section.image.variant(spree_image_variant_options(resize_to_limit: [1200, nil]))) %>">
-          <source media="(min-width: 1201px)" srcset="<%= main_app.cdn_image_url(section.image.variant(spree_image_variant_options(resize_to_limit: [2000, nil]))) %>">
-          <%= image_tag main_app.cdn_image_url(section.image.variant(spree_image_variant_options(resize_to_limit: [2000, nil]))), class: "w-full h-full object-cover", loading: "lazy" %>
+          <source media="(max-width: 640px)" srcset="<%= spree_image_url(section.image, width: 320, height: nil) %>">
+          <source media="(max-width: 750px)" srcset="<%= spree_image_url(section.image, width: 375, height: nil) %>">
+          <source media="(max-width: 828px)" srcset="<%= spree_image_url(section.image, width: 414, height: nil) %>">
+          <source media="(max-width: 1080px)" srcset="<%= spree_image_url(section.image, width: 540, height: nil) %>">
+          <source media="(max-width: 1200px)" srcset="<%= spree_image_url(section.image, width: 620, height: nil) %>">
+          <source media="(min-width: 1201px)" srcset="<%= spree_image_url(section.image, width: 1000, height: nil) %>">
+          <%= spree_image_tag(section.image, width: 1000, class: "w-full h-full object-cover", loading: "lazy") %>
         </picture>
       <% end %>
     </div>

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

@@ -5,12 +5,12 @@
         <div class="lg:col-span-6 aspect-[6/7] <%= 'lg:col-start-7 lg:order-1' if section.preferred_desktop_image_alignment == 'right' %> image-with-text--image-wrapper">
           <%= page_builder_link_to(section.link, title: section.link&.label,  target: (section.link&.open_in_new_tab ? '_blank' : nil)) do %>
             <% if section.image.present? %>
-              <%= image_tag main_app.cdn_image_url(section.image.variant(spree_image_variant_options(resize_to_fill: [2000, nil]))),
+              <%= image_tag spree_image_url(section.image, width: 1000, height: nil),
                 class: "w-full h-full object-cover",
                 loading: :lazy,
                 sizes: "(max-width: 1024px) 100vw, 50vw",
                 srcset: [640, 750, 828, 1080, 1200, 2000].map { |width|
-                  "#{main_app.cdn_image_url(section.image.variant(spree_image_variant_options(resize_to_fill: [width, nil])))} #{width}w"
+                  "#{spree_image_url(section.image, width: width / 2, height: nil)} #{width}w"
                 }.join(', ')
               %>
             <% else %>

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

@@ -5,7 +5,7 @@
     <img
       class="w-full h-full absolute top-0 object-cover z-0"
       style="opacity: <%= section.preferred_overlay_transparency %>%"
-      src="<%= main_app.cdn_image_url(img.variant(spree_image_variant_options(resize_to_limit: [2000, nil]))) %>" />
+      src="<%= spree_image_url(img, width: 2000, height: nil) %>" />
   <% end %>
   <div class="w-full page-container flex flex-col text-center py-5 px-5 z-10">
     <% section.blocks.includes(:rich_text_text).each do |block| %>
@@ -37,8 +37,8 @@
         <% when 'Spree::PageBlocks::Image' %>
           <div <%= block_attributes(block) %> class="flex justify-center w-full">
             <% if block.image.attached? && block.image.variable? %>
-              <% image_style = "aspect-ratio: #{as_aspect_ratio(block.image)}; --desktop-height: #{block.preferred_height}px; --mobile-height: #{block.preferred_mobile_height}px;" %>
-              <%= image_tag main_app.cdn_image_url(block.image.variant(spree_image_variant_options(resize_to_fill: [1000, 1000]))), height: block.preferred_height, width: block.preferred_width, class: "custom-desktop-height custom-mobile-height", style: image_style %>
+              <% image_style = "aspect-ratio: #{spree_asset_aspect_ratio(block.image)}; --desktop-height: #{block.preferred_height}px; --mobile-height: #{block.preferred_mobile_height}px;" %>
+              <%= image_tag spree_image_url(block.image, width: 1000, height: 1000), height: block.preferred_height, width: block.preferred_width, class: "custom-desktop-height custom-mobile-height", style: image_style %>
             <% end %>
           </div>
       <% end %>

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

@@ -2,7 +2,7 @@
   <div class="page-container">
     <div class="flex flex-col max-w-3xl m-auto mt-16 first:mt-0">
       <% if post.image.attached? && post.image.variable? %>
-        <%= image_tag main_app.cdn_image_url(post.image.variant(spree_image_variant_options(resize_to_fit: [nil, 800]))), height: 400, class: 'h-full w-full object-cover object-center', loading: :lazy, alt: post.title %>
+        <%= spree_image_tag(post.image, height: 400, class: 'h-full w-full object-cover object-center', loading: :lazy, alt: post.title) %>
       <% end %>
 
       <h1 class="uppercase text-2xl font-medium mt-4"><%= post.title %></h1>

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

@@ -7,12 +7,18 @@
       <div class="lg:gap-6 lg:grid lg:grid-cols-12">
         <% if taxon.image.present? %>
           <div class="flex lg:col-span-7 lg:col-start-6 lg:order-1 lg:items-center lg:justify-end">
-            <% aspect_ratio_style = "aspect-ratio: #{as_aspect_ratio(taxon.image)};" %>
-            <%= image_tag main_app.cdn_image_url(taxon.image.variant(spree_image_variant_options(resize_to_limit: [720, 720]))), alt: taxon.name, class: 'w-full lg:max-h-[280px] h-full lg:w-auto mb-6', style: aspect_ratio_style, loading: :lazy %>
+            <% aspect_ratio_style = "aspect-ratio: #{spree_asset_aspect_ratio(taxon.image)};" %>
+            <%= spree_image_tag(taxon.image, width: 500, height: 280, alt: taxon.name, class: 'w-full lg:h-[280px] h-full lg:w-auto mb-6', style: aspect_ratio_style, loading: :lazy) %>
           </div>
         <% end %>
         <div class="lg:col-span-5 flex flex-col justify-center items-start gap-1">
-          <div class="text-xs lg:text-sm tracking-widest" style="<%= section_heading_styles(section) %>"><%= taxon.taxonomy.name.singularize %></div>
+          <div class="text-xs lg:text-sm tracking-widest" style="<%= section_heading_styles(section) %>">
+            <% if taxon.root? || taxon.parent.root? %>
+              <%= taxon.taxonomy.name.singularize %>
+            <% else%>
+              <%= link_to taxon.parent.name, spree.nested_taxons_path(taxon.parent) %>
+            <% end %>
+          </div>
           <h1 class="self-stretch text-2xl lg:text-3xl font-medium" style="<%= section_heading_styles(section) %>"><%= taxon.name %></h1>
           <% description_text = taxon.description.to_plain_text %>
           <div

data/app/views/themes/default/spree/page_sections/nav/_desktop.html.erb

@@ -28,7 +28,7 @@
                 <% cache spree_base_cache_scope.call(block.featured_taxon) do %>
                   <% if block.featured_taxon.image.attached? && block.featured_taxon.image.variable? %>
                     <%= link_to spree_storefront_resource_url(block.featured_taxon), class: "flex flex-col col-start-4" do %>
-                      <%= image_tag main_app.cdn_image_url(block.featured_taxon.image.variant(spree_image_variant_options(resize_to_fill: [700, 700]))), class: 'w-full h-auto aspect-1', loading: :lazy, alt: block.featured_taxon.name %>
+                      <%= spree_image_tag(block.featured_taxon.image, width: 360, height: 360, class: 'w-full h-auto aspect-1', loading: :lazy, alt: block.featured_taxon.name) %>
                       <span class="py-3 px-2 bg-accent block uppercase text-sm tracking-widest font-semibold header--mega-nav-featured-taxon-title"><%= Spree.t(:explore_taxon, taxon_name: block.featured_taxon.name) %></span>
                     <% end %>
                   <% end %>

data/app/views/themes/default/spree/page_sections/nav/_mobile.html.erb

@@ -24,7 +24,7 @@
                       <% cache spree_base_cache_scope.call(block.featured_taxon) do %>
                         <% if block.featured_taxon.image.attached? && block.featured_taxon.image.variable? %>
                           <%= link_to spree_storefront_resource_url(block.featured_taxon), class: "flex w-full pt-4" do %>
-                            <%= image_tag main_app.cdn_image_url(block.featured_taxon.image.variant(spree_image_variant_options(resize_to_fill: [280, 280]))), class: 'h-auto aspect-1 w-2/5 max-w-[140px]', loading: :lazy, alt: block.featured_taxon.name %>
+                            <%= spree_image_tag(block.featured_taxon.image, width: 140, height: 140, class: 'h-auto aspect-1 w-2/5 max-w-[140px]', loading: :lazy, alt: block.featured_taxon.name) %>
                             <span class="bg-accent w-full flex items-center justify-center header--mega-nav-featured-taxon-title text-sm tracking-widest font-semibold uppercase">
                               <%= Spree.t(:explore_taxon, taxon_name: block.featured_taxon.name) %>
                             </span>

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

@@ -3,7 +3,7 @@
     "@context": "https://schema.org",
     "@type": "BlogPosting",
     "headline": "<%= post.title %>",
-    "image": <%= post.image.attached? ? [main_app.cdn_image_url(post.image.variant(spree_image_variant_options(resize_to_limit: [1200, 675])))].to_json.html_safe : [].to_json.html_safe %>,
+    "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": [

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

@@ -2,7 +2,7 @@
   <%= link_to spree.post_path(post), class: 'block hover:opacity-70 transition-opacity' do %>
     <div class="h-[200px] w-full bg-gray-100">
       <% if post.image.attached? && post.image.variable? %>
-        <%= image_tag main_app.cdn_image_url(post.image.variant(spree_image_variant_options(resize_to_fit: [nil, 800]))), height: 400, class: 'h-full w-full object-cover object-center', loading: :lazy, alt: post.title %>
+        <%= spree_image_tag(post.image, width: 400, height: 200, class: 'h-full w-full object-cover object-center', loading: :lazy, alt: post.title) %>
       <% end %>
     </div>
 

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

@@ -12,24 +12,16 @@
       <% object_class = 'object-contain object-top' %>
     <% end %>
 
-    <% image_variant_options = spree_image_variant_options(resize_and_pad: [width * 2, height * 2, { alpha: true }]) %>
-
     <% image_hover_class = object.secondary_image.present? && object.secondary_image.attached? ? 
          "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}" %>
 
-    <%= image_tag main_app.cdn_image_url(object.default_image.variant(image_variant_options)),
-          loading: :lazy,
-          alt: object.default_image.alt,
-          class: image_hover_class %>
+    <%= spree_image_tag(object.default_image, width: width, height: height, loading: :lazy, alt: object.default_image.alt, class: image_hover_class) %>
 
     <% if 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}" %>
 
-      <%= image_tag main_app.cdn_image_url(object.secondary_image.variant(image_variant_options)),
-            loading: :lazy,
-            alt: object.secondary_image.alt,
-            class: secondary_image_class %>
+      <%= spree_image_tag(object.secondary_image, width: width, height: height, loading: :lazy, alt: object.secondary_image.alt, class: secondary_image_class) %>
     <% end %>
   </figure>
 <% else %>

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

@@ -7,7 +7,7 @@
     "url": <%= spree.product_url(product).to_json.html_safe %>,
   <% if product.featured_image %>
     "image": [
-      <%= main_app.cdn_image_url(product.featured_image.variant(spree_image_variant_options(resize_to_limit: [1260, 1260]))).to_json.html_safe %>
+      <%= spree_image_url(product.featured_image, width: 630, height: 630).to_json.html_safe %>
     ],
   <% end %>
   <% if product.description.present? %>

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

@@ -21,7 +21,7 @@
                     class="relative aspect-1 w-full block "
                     id="thumb-desktop-product-image-<%= image.id %>"
                     data-turbo-permanent>
-                    <%= image_tag main_app.cdn_image_url(image.variant(spree_image_variant_options(resize_to_fill: [200, 200]))), alt: image_alt(image), class: 'w-full h-full' %>
+                    <%= spree_image_tag(image, width: 100, height: 100, alt: image_alt(image), class: 'w-full h-full') %>
                   </div>
                 </div>
               <% end %>
@@ -39,11 +39,11 @@
                   class="product-image relative w-full aspect-1"
                   id="main-desktop-product-image-<%= image.id %>"
                   data-turbo-permanent>
-                  <%= link_to main_app.cdn_image_url(image.variant(spree_image_variant_options(resize_to_fill: [2000, 2000]))), data: { pswp_width: "2000", pswp_height: "2000" } do %>
+                  <%= link_to spree_image_url(image, width: 1000, height: 1000), data: { pswp_width: "2000", pswp_height: "2000" } do %>
                     <div class="zoom-icon hidden absolute bottom-2 right-2 p-4 bg-background rounded-full opacity-75 hover:opacity-100">
                       <%= render 'spree/shared/icons/zoom' %>
                     </div>
-                    <%= image_tag main_app.cdn_image_url(image.variant(spree_image_variant_options(resize_to_fill: [2000, 2000]))), alt: image_alt(image), class: 'w-full h-full' %>
+                    <%= spree_image_tag(image, width: 1000, height: 1000, alt: image_alt(image), class: 'w-full h-full') %>
                   <% end %>
                 </div>
               </div>
@@ -70,11 +70,11 @@
         <div class="swiper-wrapper">
           <% images.each do |image| %>
             <div class="swiper-slide aspect-1" id="swiper-slide-<%= image.id %>">
-              <%= link_to main_app.cdn_image_url(image.variant(spree_image_variant_options(resize_to_fill: [2000, 2000]))), class: "absolute top-2 right-2 p-2 bg-background rounded-full opacity-75 hover:opacity-100", data: { pswp_width: "2000", pswp_height: "2000" } do %>
+              <%= link_to spree_image_url(image, width: 2000, height: 2000), class: "absolute top-2 right-2 p-2 bg-background rounded-full opacity-75 hover:opacity-100", data: { pswp_width: "2000", pswp_height: "2000" } do %>
                 <%= render 'spree/shared/icons/zoom' %>
               <% end %>
               <%= render 'spree/products/label', product: product, mobile_pdp: true %>
-              <%= image_tag main_app.cdn_image_url(image.variant(spree_image_variant_options(resize_to_fill: [720, 720]))), alt: image_alt(image), class: 'h-full w-full object-cover object-center', style: 'min-height: 358px' %>
+              <%= spree_image_tag(image, width: 360, height: 360, alt: image_alt(image), class: 'h-full w-full object-cover object-center', style: 'min-height: 358px') %>
             </div>
           <% end %>
         </div>

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

@@ -6,7 +6,7 @@
       "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": <%= main_app.cdn_image_url(current_store.logo.variant(spree_image_variant_options(resize_to_fill: [500, 500]))).to_json.html_safe %>,
+      "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 %>

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

@@ -5,7 +5,7 @@
 <%= link_to spree.root_path, id: 'site-logo' do %>
   <span class='sr-only'><%= current_store.name %></span>
   <% if logo.present? && logo.attached? && logo.variable? %>
-    <% aspect_ratio = as_aspect_ratio(logo) %>
+    <% aspect_ratio = spree_asset_aspect_ratio(logo) %>
     <% logo_style = "aspect-ratio: #{aspect_ratio};" %>
 
     <% if aspect_ratio.to_f > 10 %>

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

@@ -22,7 +22,7 @@
 <meta property="og:description" content="<%= h(og_description) %>">
 
 <% if page_image.present? && page_image.attached? && page_image.variable? %>
-  <% image_url = main_app.cdn_image_url(page_image.variant(spree_image_variant_options(resize_to_fill: [1200, 630]))) %>
+  <% image_url = spree_image_url(page_image, width: 1200, height: 630) %>
 
   <meta property="og:image" content="<%= image_url %>">
   <meta property="og:image:secure_url" content="<%= image_url %>">

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

@@ -6,11 +6,7 @@
       <% image = line_item.variant.default_image %>
       <% if image.present? && image.attached? && image.variable? %>
         <%= link_to spree_storefront_resource_url(line_item.product, relative: true) do %>
-          <%= image_tag main_app.cdn_image_url(
-            image.variant(spree_image_variant_options(resize_to_fit: [256, 256])),
-          ),
-          width: 128,
-          loaging: :lazy %>
+          <%= spree_image_tag(image, width: 128, height: 128, loading: :lazy) %>
         <% end %>
       <% end %>
     </div>

data/config/i18n-tasks.yml

@@ -147,6 +147,7 @@ ignore_missing:
 ignore_unused:
 - 'spree.storefront.refund_action_not_required_message.*'
 - 'spree.storefront.refund_action_required_message.*'
+- 'spree.storefront.checkout.or_continue_below'
 
 ## Exclude these keys from the `i18n-tasks eq-base' report:
 # ignore_eq_base:

data/config/locales/en.yml

@@ -30,6 +30,7 @@ en:
             one: This item will be removed from your cart because there are no delivery methods available for your address.
             other: These %{count} items will be removed from your cart because there are no delivery methods available for your address.
         gift_card_amount_applied: Gift card %{code} applied %{amount} to your order.
+        or_continue_below: or continue below
         order_already_paid: You don't need to pay anything, just click Place now button to confirm the order.
         order_success: Your order is confirmed!
         order_success_message: When your order is ready, you will receive an email confirmation.

data/lib/spree/storefront/engine.rb

@@ -14,12 +14,16 @@ module Spree
         :quick_checkout_partials
       )
 
+      # accessible via Rails.application.config.spree_storefront
+      initializer 'spree.storefront.environment', before: :load_config_initializers do |app|
+        app.config.spree_storefront = Environment.new
+      end
+
       initializer 'spree.storefront.configuration', before: :load_config_initializers do |_app|
         Spree::Storefront::Config = Spree::Storefront::Configuration.new
       end
 
       initializer 'spree.storefront.assets' do |app|
-        app.config.spree_storefront = Environment.new
         app.config.assets.paths << root.join('app/javascript')
         app.config.assets.paths << root.join('vendor/javascript')
         app.config.assets.precompile += %w[spree_storefront_manifest]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_storefront
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
+  version: 5.0.1
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -542,9 +542,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.0.rc1
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.1
 post_install_message:
 rdoc_options: []
 require_paths: