spree_frontend 4.4.0 → 4.5.0

data/app/controllers/spree/locale_controller.rb

@@ -27,10 +27,11 @@ module Spree
     private
 
     def should_build_new_url?
+      return false if request.env['HTTP_REFERER'].blank?
       if request.env['HTTP_REFERER'].match(REDIRECT_TO_ROOT)
         false
       else
-        request.env['HTTP_REFERER'].present? && request.env['HTTP_REFERER'] != request.env['REQUEST_URI']
+        request.env['HTTP_REFERER'] != request.env['REQUEST_URI']
       end
     end
   end

data/app/controllers/spree/orders_controller.rb

@@ -25,7 +25,7 @@ module Spree
           end
         end
       else
-        respond_with(@order)
+        respond_with(@order, status: :unprocessable_entity)
       end
     end
 

data/app/helpers/spree/frontend_helper.rb

@@ -9,12 +9,18 @@ module Spree
     end
 
     def logo(image_path = nil, options = {})
-      image_path ||= if current_store.logo.attached? && current_store.logo.variable?
-                       main_app.url_for(current_store.logo.variant(resize: '244x104>'))
-                     elsif current_store.logo.attached? && current_store.logo.image?
-                       main_app.url_for(current_store.logo)
+      logo_attachment = if defined?(Spree::StoreLogo) && current_store.logo.is_a?(Spree::StoreLogo)
+                          current_store.logo.attachment # Spree v5
+                        else
+                          current_store.logo # Spree 4.x
+                        end
+
+      image_path ||= if logo_attachment&.attached? && logo_attachment&.variable?
+                       main_app.cdn_image_url(logo_attachment.variant(resize: '244x104>'))
+                     elsif logo_attachment&.attached? && logo_attachment&.image?
+                       main_app.cdn_image_url(current_store.logo)
                      else
-                      'logo/spree_50.png'
+                       asset_path('logo/spree_50.png')
                      end
 
       path = spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
@@ -165,7 +171,7 @@ module Spree
       image = default_image_for_product_or_variant(product)
 
       image_url = if image.present?
-                    main_app.url_for(image.url('plp'))
+                    main_app.cdn_image_url(image.url('plp'))
                   else
                     asset_path('noimage/plp.svg')
                   end
@@ -200,7 +206,7 @@ module Spree
       widths = { lg: 1200, md: 992, sm: 768, xs: 576 }
       set = []
       widths.each do |key, value|
-        file = main_app.url_for(image.url("plp_and_carousel_#{key}"))
+        file = main_app.cdn_image_url(image.url("plp_and_carousel_#{key}"))
 
         set << "#{file} #{value}w"
       end
@@ -352,7 +358,7 @@ module Spree
     def spree_social_link(service)
       return '' if current_store.send(service).blank?
 
-      link_to "https://#{service}.com/#{current_store.send(service)}", target: :blank, rel: 'nofollow noopener', 'aria-label': service do
+      link_to "https://#{service}.com/#{current_store.send(service)}", target: '_blank', rel: 'nofollow noopener', 'aria-label': service do
         content_tag :figure, id: service, class: 'px-2' do
           icon(name: service, width: 22, height: 22)
         end

data/app/helpers/spree/navigation_helper.rb

@@ -67,7 +67,7 @@ module Spree
                         "/#{I18n.locale}"
                       end
 
-      if Spree::MenuItem::DYNAMIC_RESOURCE_TYPE.include? item.linked_resource_type
+      if ['Spree::Product', 'Spree::Taxon', 'Spree::CmsPage'].include?(item.linked_resource_type)
         output_locale.to_s + item.link
       elsif item.linked_resource_type == 'Home Page'
         "/#{locale_param}"

data/app/helpers/spree/products_filters_helper.rb

@@ -67,7 +67,7 @@ module Spree
             }
           end
         else
-          filter_content_tag(option_value.name, opts.merge(is_selected: is_selected))
+          filter_content_tag(option_value.presentation, opts.merge(is_selected: is_selected))
         end
       end
     end

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

@@ -33,7 +33,7 @@ end
   </div>
 
   <div class="row checkout-content" data-hook="checkout_content">
-    <%= form_for @order, url: spree.update_checkout_path(@order.state), html: { id: "checkout_form_#{@order.state}", class: "w-100 d-lg-flex align-items-lg-baseline  flex-wrap position-relative" } do |form| %>
+    <%= form_for @order, url: spree.update_checkout_path(@order.state), html: { id: "checkout_form_#{@order.state}", class: "w-100 d-lg-flex align-items-lg-baseline  flex-wrap position-relative", data: { turbo: false } } do |form| %>
       <div class="<%= if @order.state != 'confirm' then 'col-lg-6' else 'col-md-12' end %>" data-hook="checkout_form_wrapper">
         <%= form.hidden_field :state_lock_version %>
         <%= render @order.state, form: form %>

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

@@ -15,7 +15,7 @@
           </div>
           <% path = spree.respond_to?(:update_checkout_registration_path) ? spree.update_checkout_registration_path : spree_signup_path %>
 
-          <%= form_for @order, url: path, method: :put, html: { id: 'checkout_form_registration' } do |f| %>
+          <%= form_for @order, url: path, method: :put, html: { id: 'checkout_form_registration', data: { turbo: false } } do |f| %>
             <div class="form-group">
               <p class="form-group checkout-content-inner-field">
                 <%= f.email_field :email, class: 'spree-flat-input', placeholder: Spree.t(:email) %>

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

@@ -16,7 +16,7 @@
         <% variant.option_values.sort { |ov| ov.option_type.position }.each do |ov| %>
           <li class="item-details">
             <% # TODO: rework option values so options_text method can be used here %>
-            <%= "#{ov.option_type.presentation}: #{ov.name.titleize}" %>
+            <%= "#{ov.option_type.presentation}: #{ov.presentation}" %>
           </li>
         <% end %>
       </ul>

data/app/views/spree/orders/_line_item_data.html.erb

@@ -22,7 +22,7 @@
 <% end %>
 
 <div class="shopping-cart-item-delete <%= additional_classes %>" data-hook="cart_item_delete">
-  <%= link_to '#', class: 'delete', id: "delete_#{dom_id(line_item)}", data: { turbolinks: false, id: dom_id(line_item), variant_sku: line_item.sku, variant_name: line_item.name, variant_price: line_item.price, variant_options: line_item.options_text }, aria: { label: Spree.t('cart_page.remove_from_cart') } do %>
+  <%= link_to '#', class: 'delete', id: "delete_#{dom_id(line_item)}", data: { turbo: false, id: dom_id(line_item), variant_sku: line_item.sku, variant_name: line_item.name, variant_price: line_item.price, variant_options: line_item.options_text }, aria: { label: Spree.t('cart_page.remove_from_cart') } do %>
     <%= icon(name: 'garbage',
              classes: 'shopping-cart-item-delete-icon',
              width: 18.9,

data/app/views/spree/products/_color_option_type.html.erb

@@ -9,14 +9,14 @@
         <li>
           <%= label_tag "variant_option_value_id_#{option_type[:id]}_#{option_value[:id]}",
             class: "m-1 m-sm-2 m-md-1 color-select-label",
-            title: option_value[:name]&.humanize,
+            title: option_value[:presentation],
             data: { toggle: "tooltip", placement: "bottom" } do %>
 
             <%= radio_button_tag "variant_option_value_id_#{option_type[:id]}",
               option_value[:id],
               option_value[:is_default] && index == 0,
               class: "product-variants-variant-values-radio",
-              aria: { label: option_value[:name] },
+              aria: { label: option_value[:presentation] },
               data: {
                 "option-type-index" => index,
                 "presentation" => option_value[:presentation],

data/app/views/spree/products/_filters_desktop.html.erb

@@ -9,7 +9,7 @@
           <% option_type_name = ot_filter_param.titleize %>
           <% collapsed = params[ot_filter_param].blank? %>
 
-          <button class="card-header <%= 'collapsed' if collapsed %> px-1 plp-filters-card-header" id="filters<%= option_type_name %>" data-toggle="collapse" data-target="#collapseFilter<%= option_type_name %>" aria-expanded="<%= !collapsed %>" aria-controls="collapseFilter<%= option_type_name %>" role="heading" aria-level="2">
+          <button class="card-header <%= 'collapsed' if collapsed %> px-1 plp-filters-card-header" id="filters<%= ot_filter_param %>" data-toggle="collapse" data-target="#collapseFilter<%= ot_filter_param %>" aria-expanded="<%= !collapsed %>" aria-controls="collapseFilter<%= ot_filter_param %>" role="heading" aria-level="2">
             <%= option_type.presentation %>
             <%= icon(name: 'plus',
                     classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--plus',
@@ -20,7 +20,7 @@
                     width: 16,
                     height: 16) %>
           </button>
-          <div id="collapseFilter<%= option_type_name %>" class="collapse <%= 'show' unless collapsed %>" aria-labelledby="filters<%= option_type_name %>">
+          <div id="collapseFilter<%= ot_filter_param %>" class="collapse <%= 'show' unless collapsed %>" aria-labelledby="filters<%= ot_filter_param %>">
             <div class="card-body px-0 pt-1">
               <%= render 'spree/shared/option_values',
                 option_type: option_type,
@@ -36,7 +36,7 @@
             <% property_name = property.name %>
             <% collapsed = params.dig(:properties, property.filter_param).blank? %>
             <button class="card-header <%= 'collapsed' if collapsed %> px-1 plp-filters-card-header" id="filters<%= property_name %>" data-toggle="collapse" data-target="#collapseFilter<%= property_name %>" aria-expanded="<%= !collapsed %>" aria-controls="collapseFilter<%= property_name %>" role="heading" aria-level="2">
-              <%= property.presentation.titleize %>
+              <%= property.presentation %>
               <%= icon(name: 'plus',
                       classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--plus',
                       width: 16,

data/app/views/spree/products/_filters_mobile.html.erb

@@ -16,7 +16,7 @@
 
           <div class="card plp-overlay-card">
             <div class="card-header text-uppercase <%= 'collapsed' if params[ot_downcase_name].blank? %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= option_type_name %>" data-target="#collapseFilterMobile<%= option_type_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= option_type_name %>" role="heading" aria-level="3">
-              <%= option_type_name %>
+              <%= option_type.presentation %>
               <%= icon(name: 'arrow-right',
                       classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow',
                       width: 16,
@@ -36,7 +36,7 @@
             <% collapsed = params.dig(:properties, property.filter_param).blank? %>
             <div class="card plp-overlay-card">
               <div class="card-header text-uppercase <%= 'collapsed' if collapsed %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= property_name %>" data-target="#collapseFilterMobile<%= property_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= property_name %>" role="heading" aria-level="3">
-                <%= property_name %>
+                <%= property.presentation %>
                 <%= icon(name: 'arrow-right',
                          classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow',
                          width: 16,

data/app/views/spree/products/_thumbnails.html.erb

@@ -3,7 +3,7 @@
   <ul id="product-thumbnails" class="thumbnails d-flex w-100 pl-0 my-4" data-hook>
     <% @product.images.each do |i| %>
       <li class='tmb-all mr-2 tmb-<%= i.viewable.id %>'>
-        <%= link_to(image_tag(main_app.url_for(i.url(:mini)), class: "img-thumbnail d-inline-block"), main_app.url_for(i.url(:product))) %>
+        <%= link_to(image_tag(main_app.cdn_image_url(i.url(:mini)), class: "img-thumbnail d-inline-block"), main_app.cdn_image_url(i.url(:product))) %>
       </li>
     <% end %>
 
@@ -11,7 +11,7 @@
       <% @product.variant_images.each do |i| %>
         <% next if @product.images.include?(i) %>
         <li class='vtmb mr-2 tmb-<%= i.viewable.id %>'>
-          <%= link_to(image_tag(main_app.url_for(i.url(:mini)), class: "img-thumbnail"), main_app.url_for(i.url(:product))) %>
+          <%= link_to(image_tag(main_app.cdn_image_url(i.url(:mini)), class: "img-thumbnail"), main_app.cdn_image_url(i.url(:product))) %>
         </li>
       <% end %>
     <% end %>

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

@@ -5,9 +5,10 @@
 <%== meta_robots %>
 <%= canonical_tag(current_store.url) %>
 <%= favicon_link_tag(spree_favicon_path) %>
-<%= stylesheet_link_tag 'spree/frontend/all', media: 'screen', 'data-turbolinks-track': 'reload' %>
+<%= stylesheet_link_tag 'spree/frontend/all', media: 'screen', data: { turbo_track: 'reload' } %>
 <%= csrf_meta_tags %>
 <%= render 'spree/shared/paths' %>
 <%= render 'spree/shared/locale_and_currency' %>
-<%= javascript_include_tag 'spree/frontend/all', defer: true, 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag "application", defer: true, data: { turbo_track: 'reload' } %>
+<%= javascript_include_tag 'spree/frontend/all', defer: true, data: { turbo_track: 'reload' } %>
 <%= yield :head %>

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

@@ -8,7 +8,7 @@
           <% line_item.variant.option_values.sort { |ov| ov.option_type.position }.each do |ov| %>
           <li>
             <% # TODO: rework option values so options_text method can be used here %>
-            <%= "#{ov.option_type.presentation}: #{ov.name.titleize}" %>
+            <%= "#{ov.option_type.presentation}: #{ov.presentation}" %>
           </li>
         <% end %>
         </ul>

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

@@ -1,6 +1,6 @@
 <% if try_spree_current_user %>
   <%= link_to Spree.t(:my_account).upcase, spree.account_path, class: 'dropdown-item' if spree.respond_to?(:account_path) %>
-  <% if spree.respond_to(:admin_orders_path) %>
+  <% if spree.respond_to?(:admin_orders_path) %>
     <%= link_to Spree.t('nav_bar.admin_panel'), spree.admin_orders_path(locale: nil), class: 'dropdown-item text-uppercase' if try_spree_current_user.has_spree_role?(:admin) %>
   <% end %>
   <%= link_to Spree.t(:logout).upcase, spree_logout_path, class: 'dropdown-item', method: :get if defined?(spree_logout_path) %>

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

@@ -1,6 +1,6 @@
 <div class="col-lg-11 mx-auto">
   <h3 class="spree-mb-large spree-mt-large spree-header"><%= Spree.t(:log_in_to_continue) %></h3>
-  <%= form_for Spree.user_class.new, as: :spree_user, url: spree_login_path do |f| %>
+  <%= form_for Spree.user_class.new, as: :spree_user, url: spree_login_path, data: { turbo: false } do |f| %>
     <div id="password-credentials" class="mb-4">
       <div class="form-group mb-4">
         <p class="form-group checkout-content-inner-field">

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

@@ -44,7 +44,7 @@
                             <%= spree_nav_link_tag(promo_banner, { class: "dropdown-item" }) do %>
                               <div class="category-image text-center my-4 mx-3">
                                 <% if promo_banner.icon.present? %>
-                                  <%= image_tag main_app.url_for(promo_banner.icon.attachment), alt: promo_banner.icon.alt ,title: promo_banner.subtitle %>
+                                  <%= image_tag main_app.cdn_image_url(promo_banner.icon.attachment), alt: promo_banner.icon.alt ,title: promo_banner.subtitle %>
                                 <% end %>
                                 <div class="category-box">
                                   <div class="category-box-small-text">

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

@@ -1,4 +1,4 @@
-<ul id="nav-bar" class="nav align-items-center d-flex flex-nowrap justify-content-end navbar-right" data-turbo-permanent data-turbolinks-permanent>
+<ul id="nav-bar" class="nav align-items-center d-flex flex-nowrap justify-content-end navbar-right" data-turbo-permanent data-turbo-permanent>
   <li>
     <div class="navbar-right-search-menu">
       <button type="button" class="navbar-right-dropdown-toggle search-icons" aria-label="<%= Spree.t('nav_bar.show_search') %>">

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

@@ -86,7 +86,7 @@
                     <% item.variant.option_values.sort { |ov| ov.option_type.position }.each do |ov| %>
                     <li>
                       <% # TODO: rework option values so options_text method can be used here %>
-                      <%= "#{ov.option_type.presentation}: #{ov.name.titleize}" %>
+                      <%= "#{ov.option_type.presentation}: #{ov.presentation}" %>
                     </li>
                   <% end %>
                   </ul>

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

@@ -1,5 +1,5 @@
 <script>
-  window.addEventListener('turbolinks:load', function() {
+  window.addEventListener('turbo:load', function() {
       Spree.translations = <%==
         {
           coupon_code_applied: Spree.t(:coupon_code_applied),

data/app/views/spree/shared/carousel/_single.html.erb

@@ -47,7 +47,7 @@
         data-variant-id="<%= image.viewable_id %>">
         <div class="product-carousel-item-squared <%= 'product-carousel-item-squared-only' if images.length == 1 %>">
           <% image_attrs = {
-            src: main_app.url_for(image.url(zoomed ? :zoomed : :large)),
+            src: main_app.cdn_image_url(image.url(zoomed ? :zoomed : :large)),
             alt: image.alt || @product.name,
             class: "d-block w-100",
             width: zoomed ? 650 : 475,
@@ -66,7 +66,7 @@
         data-slide-to="<%= imageIndex %>"
         class="product-carousel-indicators-indicator product-carousel-indicators-indicator--visible<%= ' active' if imageIndex == 0 %>">
         <%= lazy_image(
-          src: main_app.url_for(image.url(:pdp_thumbnail)),
+          src: main_app.cdn_image_url(image.url(:pdp_thumbnail)),
           class: 'd-block w-100',
           alt: image.alt || @product.name,
           width: image.style(:pdp_thumbnail)[:width],

data/app/views/spree/shared/carousel/_thumbnails.html.erb

@@ -20,7 +20,7 @@
                 data-variant-is-master="<%= image.viewable_id == @product.master.id %>"
                 data-variant-id="<%= image.viewable_id %>">
                 <%= lazy_image(
-                  src: main_app.url_for(image.url(:pdp_thumbnail)),
+                  src: main_app.cdn_image_url(image.url(:pdp_thumbnail)),
                   class: 'd-block w-100',
                   alt: image.alt || @product.name,
                   width: 57,

data/app/views/spree/shared/cms/sections/_hero_image.html.erb

@@ -10,30 +10,30 @@
 <div class="col-12 homepage-hero-image position-relative p-0 <%= section_padding %>">
 
   <div class="bg-light" style="--aspect-ratio:12/5;">
-    <% if section.image_one.attached? %>
+    <% if section.image_one&.attachment&.attached? %>
 
         <!-- SM to MD -->
         <img class="d-block d-md-none lazyload"
-          data-src="<%= main_app.url_for(section.img_one_sm) %>"
-          data-srcset="<%= main_app.url_for(section.img_one_sm) %>"
+          data-src="<%= main_app.cdn_image_url(section.img_one_sm) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_sm) %>"
           alt="<%= section&.title %>">
 
         <!-- MD to LG -->
         <img class="d-none d-md-block d-lg-none lazyload"
-          data-src="<%= main_app.url_for(section.img_one_md) %>"
-          data-srcset="<%= main_app.url_for(section.img_one_md) %>"
+          data-src="<%= main_app.cdn_image_url(section.img_one_md) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_md) %>"
           alt="<%= section&.title %>">
 
         <!-- LG to XL -->
         <img class="d-none d-lg-block d-xl-none lazyload"
-          data-src="<%= main_app.url_for(section.img_one_lg) %>"
-          data-srcset="<%= main_app.url_for(section.img_one_lg) %>"
+          data-src="<%= main_app.cdn_image_url(section.img_one_lg) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_lg) %>"
           alt="<%= section&.title %>">
 
         <!-- XL UP -->
         <img class="d-none d-xl-block lazyload"
-          data-src="<%= main_app.url_for(section.img_one_xl) %>"
-          data-srcset="<%= main_app.url_for(section.img_one_xl) %>"
+          data-src="<%= main_app.cdn_image_url(section.img_one_xl) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_xl) %>"
           alt="<%= section&.title %>">
 
      <% else %>

data/app/views/spree/shared/cms/sections/_image_gallery.html.erb

@@ -64,24 +64,24 @@
     <div class="col-12">
 
       <%= link_to link_one, class: link_one_classes, style: '--aspect-ratio:18/13;' do %>
-        <% if section.image_one.attached? && section.image_one.variable? %>
+        <% if section.image_one&.attachment&.attached? && section.image_one&.attachment&.variable? %>
 
             <!-- XS to MD -->
             <img class="d-md-none lazyload"
-              data-src="<%= main_app.url_for(section.img_one_md) %>"
-              data-srcset="<%= main_app.url_for(section.img_one_md) %>"
+              data-src="<%= main_app.cdn_image_url(section.img_one_md) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_one_md) %>"
               alt="<%= section&.title_one %>">
 
             <!-- MD to XL -->
             <img class="d-none d-md-block d-xl-none lazyload"
-              data-src="<%= main_app.url_for(section.img_one_lg) %>"
-              data-srcset="<%= main_app.url_for(section.img_one_lg) %>"
+              data-src="<%= main_app.cdn_image_url(section.img_one_lg) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_one_lg) %>"
               alt="<%= section&.title_one %>">
 
             <!-- XL UP -->
             <img class="d-none d-xl-block lazyload"
-              data-src="<%= main_app.url_for(section.img_one_xl) %>"
-              data-srcset="<%= main_app.url_for(section.img_one_xl) %>"
+              data-src="<%= main_app.cdn_image_url(section.img_one_xl) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_one_xl) %>"
               alt="<%= section&.title_one %>">
         <% else %>
           <%= icon( name: 'card-image',
@@ -102,24 +102,24 @@
     <div class="col-12">
 
       <%= link_to link_three, class: link_three_classes, style: '--aspect-ratio:18/13;' do %>
-        <% if section.image_three.attached? && section.image_three.variable? %>
+        <% if section.image_three&.attachment&.attached? && section.image_three&.attachment&.variable? %>
 
             <!-- XS to MD -->
             <img class="d-md-none lazyload"
-              data-src="<%= main_app.url_for(section.img_three_md) %>"
-              data-srcset="<%= main_app.url_for(section.img_three_md) %>"
+              data-src="<%= main_app.cdn_image_url(section.img_three_md) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_three_md) %>"
               alt="<%= section&.title_three %>">
 
             <!-- MD to XL -->
             <img class="d-none d-md-block d-xl-none lazyload"
-              data-src="<%= main_app.url_for(section.img_three_lg) %>"
-              data-srcset="<%= main_app.url_for(section.img_three_lg) %>"
+              data-src="<%= main_app.cdn_image_url(section.img_three_lg) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_three_lg) %>"
               alt="<%= section&.title_three %>">
 
             <!-- XL UP -->
             <img class="d-none d-xl-block lazyload"
-              data-src="<%= main_app.url_for(section.img_three_xl) %>"
-              data-srcset="<%= main_app.url_for(section.img_three_xl) %>"
+              data-src="<%= main_app.cdn_image_url(section.img_three_xl) %>"
+              data-srcset="<%= main_app.cdn_image_url(section.img_three_xl) %>"
               alt="<%= section&.title_three %>">
         <% else %>
           <%= icon( name: 'card-image',
@@ -139,24 +139,24 @@
 <!-- Right Block TALL -->
 <div class="col-6 <%= section_two_padding %>">
   <%= link_to link_two, class: link_two_classes, style: '--aspect-ratio:27/40;' do %>
-    <% if section.image_two.attached? && section.image_two.variable? %>
+    <% if section.image_two&.attachment&.attached? && section.image_two&.attachment&.variable? %>
 
         <!-- XS to MD -->
         <img class="d-md-none lazyload"
-          data-src="<%= main_app.url_for(section.img_two_md) %>"
-          data-srcset="<%= main_app.url_for(section.img_two_md) %>"
+          data-src="<%= main_app.cdn_image_url(section.img_two_md) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_two_md) %>"
           alt="<%= section&.title_two %>">
 
         <!-- MD to XL -->
         <img class="d-none d-md-block d-xl-none lazyload"
-          data-src="<%= main_app.url_for(section.img_two_lg) %>"
-          data-srcset="<%= main_app.url_for(section.img_two_lg) %>"
+          data-src="<%= main_app.cdn_image_url(section.img_two_lg) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_two_lg) %>"
           alt="<%= section&.title_two %>">
 
         <!-- XL UP -->
         <img class="d-none d-xl-block lazyload"
-          data-src="<%= main_app.url_for(section.img_two_xl) %>"
-          data-srcset="<%= main_app.url_for(section.img_two_xl) %>"
+          data-src="<%= main_app.cdn_image_url(section.img_two_xl) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_two_xl) %>"
           alt="<%= section&.title_two %>">
     <% else %>
       <%= icon( name: 'file-image',

data/app/views/spree/shared/cms/sections/_side_by_side_images.html.erb

@@ -36,23 +36,23 @@
               class: "d-flex align-items-end justify-content-center bg-light text-center overflow-hidden homepage-bottom-box #{'pointer-events-none cursor-default' unless link_one}",
               style: '--aspect-ratio:54/35;' do %>
 
-      <% if section.image_one.attached? %>
+      <% if section.image_one&.attachment&.attached? %>
         <!-- XS to MD -->
         <img class="d-md-none lazyload"
-          data-src="<%= main_app.url_for(section.img_one_md) %>"
-          data-srcset="<%= main_app.url_for(section.img_one_md) %>"
+          data-src="<%= main_app.cdn_image_url(section.img_one_md) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_md) %>"
           alt="<%= section&.title_one %>">
 
         <!-- MD to XL -->
         <img class="d-none d-md-block d-xl-none lazyload"
-          data-src="<%= main_app.url_for(section.img_one_lg) %>"
-          data-srcset="<%= main_app.url_for(section.img_one_lg) %>"
+          data-src="<%= main_app.cdn_image_url(section.img_one_lg) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_lg) %>"
           alt="<%= section&.title_one %>">
 
         <!-- XL UP -->
         <img class="d-none d-xl-block lazyload"
-          data-src="<%= main_app.url_for(section.img_one_xl) %>"
-          data-srcset="<%= main_app.url_for(section.img_one_xl) %>"
+          data-src="<%= main_app.cdn_image_url(section.img_one_xl) %>"
+          data-srcset="<%= main_app.cdn_image_url(section.img_one_xl) %>"
           alt="<%= section&.title_one %>">
        <% else %>
         <%= icon( name: 'card-image',
@@ -79,23 +79,23 @@
               class: "d-flex align-items-end justify-content-center bg-light text-center overflow-hidden homepage-bottom-box #{'pointer-events-none cursor-default' unless link_two}",
               style: '--aspect-ratio:54/35;' do %>
 
-      <% if section.image_two.attached? %>
+      <% if section.image_two&.attachment&.attached? %>
         <!-- XS to MD -->
           <img class="d-md-none lazyload"
-            data-src="<%= main_app.url_for(section.img_two_md) %>"
-            data-srcset="<%= main_app.url_for(section.img_two_md) %>"
+            data-src="<%= main_app.cdn_image_url(section.img_two_md) %>"
+            data-srcset="<%= main_app.cdn_image_url(section.img_two_md) %>"
             alt="<%= section&.title_two %>">
 
         <!-- MD to XL -->
           <img class="d-none d-md-block d-xl-none lazyload"
-            data-src="<%= main_app.url_for(section.img_two_lg) %>"
-            data-srcset="<%= main_app.url_for(section.img_two_lg) %>"
+            data-src="<%= main_app.cdn_image_url(section.img_two_lg) %>"
+            data-srcset="<%= main_app.cdn_image_url(section.img_two_lg) %>"
             alt="<%= section&.title_two %>">
 
         <!-- XL UP -->
           <img class="d-none d-xl-block lazyload"
-            data-src="<%= main_app.url_for(section.img_two_xl) %>"
-            data-srcset="<%= main_app.url_for(section.img_two_xl) %>"
+            data-src="<%= main_app.cdn_image_url(section.img_two_xl) %>"
+            data-srcset="<%= main_app.cdn_image_url(section.img_two_xl) %>"
             alt="<%= section&.title_two %>">
        <% else %>
         <%= icon( name: 'card-image',

data/app/views/spree/taxons/_header.html.erb

@@ -13,7 +13,7 @@
   <% if @taxon.icon&.attachment %>
     <div class="d-none d-md-block pt-4 taxon-icon">
       <%= lazy_image(
-        src: main_app.url_for(@taxon.icon.attachment),
+        src: main_app.cdn_image_url(@taxon.icon.attachment),
         alt: @taxon.description || Spree.t('taxon_missing_alt'),
         width: 1110,
         height: 300,

data/app/views/spree/users/_address_controls.html.erb

@@ -2,7 +2,7 @@
   <%= inline_svg_tag('edit.svg', width: 24, height: 24) %>
 <% end %>
 
-<%= link_to '#', class: 'js-delete-address-link ml-3', data: { turbolinks: false, hook: 'remove_address', address: spree.address_path(address) }, aria: { label: Spree.t('address_book.remove_address') } do %>
+<%= link_to '#', class: 'js-delete-address-link ml-3', data: { turbo: false, hook: 'remove_address', address: spree.address_path(address) }, aria: { label: Spree.t('address_book.remove_address') } do %>
     <%= icon(name: 'garbage_2',
              classes: '',
              width: 24,

data/lib/generators/spree/frontend/install/install_generator.rb

@@ -24,7 +24,7 @@ module Spree
           # SCSS theming
           template 'variables.scss', './app/assets/stylesheets/spree/frontend/variables/variables.scss'
           # Sprockets 4 manifest
-          template 'app/assets/config/manifest.js'
+          template 'app/assets/config/manifest.js', force: Rails.env.test?
           # home page template
           directory 'home', './app/views/spree/home'
         end

data/lib/spree/frontend/configuration.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Frontend
+    class Configuration < Preferences::Configuration
+      preference :additional_filters_partials, :array, default: %w()
+      preference :always_put_site_name_in_title, :boolean, default: true
+      preference :coupon_codes_enabled, :boolean, default: true # Determines if we show coupon code form at cart and checkout
+      preference :http_cache_enabled, :boolean, default: true
+      preference :layout, :string, default: 'spree/layouts/spree_application'
+      preference :locale, :string, default: nil
+      preference :products_filters, :array, default: %w(keywords price sort_by)
+      preference :remember_me_enabled, :boolean, default: true
+      preference :shipping_instructions, :boolean, default: false # Request instructions/info for shipping
+      preference :show_raw_product_description, :boolean, default: false
+      preference :show_store_selector, :boolean, default: false
+      preference :title_site_name_separator, :string, default: '-' # When always_put_site_name_in_title is true, insert a separator character before the site name in the title
+    end
+  end
+end

data/lib/spree/frontend/engine.rb

@@ -1,3 +1,5 @@
+require_relative 'configuration'
+
 module Spree
   module Frontend
     class Engine < ::Rails::Engine
@@ -15,14 +17,7 @@ module Spree
       end
 
       initializer 'spree.frontend.environment', before: :load_config_initializers do |_app|
-        Spree::Frontend::Config = Spree::FrontendConfiguration.new
-      end
-
-      initializer 'spree.frontend.checking_deprecated_preferences' do
-        Spree::Frontend::Config.deprecated_preferences.each do |pref|
-          # FIXME: we should only notify about deprecated preferences that are in use, not all of them
-          # warn "[DEPRECATION] Spree::Frontend::Config[:#{pref[:name]}] is deprecated. #{pref[:message]}"
-        end
+        Spree::Frontend::Config = Spree::Frontend::Configuration.new
       end
     end
   end

data/lib/spree/frontend/version.rb

@@ -1,6 +1,6 @@
 module Spree
   module Frontend
-    VERSION = '4.4.0'.freeze
+    VERSION = '4.5.0'.freeze
 
     def self.version
       VERSION