spree_core 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77f4a7f3643f4b9263ab029e06d7870f5f45397e295f4116a485bc82a280d15f
-  data.tar.gz: 482208c5fd5725818a539a4daa4d566bd4c57c1c82595166e6232c91c56b876f
+  metadata.gz: 40e658898150457b9405d6d68e58d78c1b31b23518e2ffdb6829d3bfb0d68a90
+  data.tar.gz: e36b7e5d2e39426e2ea9cb4078625f72c36ed58e626959b277174f7f033bdd1f
 SHA512:
-  metadata.gz: 6424ad89c3f5a35cade4d6fc2dc67a74bbf1e0fab459727630c49582f5f94581924b16fba3ce54844d9fddac8cf2f2c2e442c4937f00db98d4276f1e5fb45649
-  data.tar.gz: 5dbaa89fd0648e3b35d5f4d7d48ee1066d3bf2da71cae97ee2c9769600380c95054f0aee146f845d4c92910f9b1944bc52155b98508345482ba3bb47224c689f
+  metadata.gz: f01a4d3e5245986e4a851dc51fb18103405cf2fab2669a43d504c922a5e7284739a23f6cd17da01276a6ab9a71b4c9589667a4bd7e3373d2c83a9508ea9b87e4
+  data.tar.gz: 1be2f451d4c370d7c72eee740dfce1536308d61ad7f16c114a7db2eb2462401150ca874b56cda455645abccdc65e9bc97e5810ef82dac16a263ed64ea584c7f7

data/app/finders/spree/line_items/find_by_variant.rb

@@ -5,7 +5,7 @@ module Spree
         line_item = order.line_items.loaded? ? order.line_items.detect { |li| li.variant_id == variant.id } : order.line_items.find_by(variant_id: variant.id)
 
         if line_item
-          Spree::Dependencies.cart_compare_line_items_service.constantize.call(order: order, line_item: line_item, options: options).value
+          Spree.cart_compare_line_items_service.call(order: order, line_item: line_item, options: options).value
         end
 
         line_item

data/app/helpers/spree/images_helper.rb

@@ -7,10 +7,17 @@ module Spree
     # @param options [Hash] options for the image tag
     # @option options [Integer] :width the width of the image
     # @option options [Integer] :height the height of the image
+    # @option options [Symbol] :variant use a preprocessed named variant (e.g., :mini, :small, :medium, :large, :xlarge)
     def spree_image_tag(image, options = {})
+      url_options = if options[:variant].present?
+                      { variant: options[:variant] }
+                    else
+                      { width: options[:width], height: options[:height], format: options[:format] }
+                    end
+
       image_tag(
-        spree_image_url(image, { width: options[:width], height: options[:height], format: options[:format] }),
-        options
+        spree_image_url(image, url_options),
+        options.except(:variant, :format)
       )
     end
 
@@ -19,9 +26,17 @@ module Spree
       return unless image.variable?
       return if image.respond_to?(:attached?) && !image.attached?
       url_helpers = respond_to?(:main_app) ? main_app : Rails.application.routes.url_helpers
+
+      # Use preprocessed named variant if specified (e.g., :mini, :small, :medium, :large, :xlarge)
+      if options[:variant].present?
+        return url_helpers.cdn_image_url(image.variant(options[:variant]))
+      end
+
+      # Dynamic variant generation for width/height options
       width = options[:width]
       height = options[:height]
 
+      # Double dimensions for retina displays
       width *= 2 if width.present?
       height *= 2 if height.present?
 
@@ -74,27 +89,28 @@ module Spree
     # @param options [Hash] options for the image variant
     # @option options [Integer] :width the width of the image
     # @option options [Integer] :height the height of the image
+    #
+    # @note The key order matters for variation digest matching with preprocessed variants.
+    #       Active Storage reorders keys alphabetically, so use: format, resize_to_fill/limit, saver
+    # @note Use string values (not symbols) for format because variation keys are JSON-encoded
+    #       in URLs and JSON converts symbols to strings, causing digest mismatches.
     def spree_image_variant_options(options = {})
-      {
-        saver: options[:format] == :png ? png_variant_options : webp_variant_options,
-        format: options[:format] || :webp
-      }.merge(options.except(:format))
+      format_opt = options[:format]&.to_s
+      saver_options = format_opt == "png" ? png_saver_options : Spree::Asset::WEBP_SAVER_OPTIONS
+      format = format_opt || "webp"
+
+      # Build hash in alphabetical order to match Active Storage's key ordering
+      result = {}
+      result[:format] = format
+      result[:resize_to_fill] = options[:resize_to_fill] if options[:resize_to_fill]
+      result[:resize_to_limit] = options[:resize_to_limit] if options[:resize_to_limit]
+      result[:saver] = saver_options
+      result
     end
 
     private
 
-    def webp_variant_options
-      {
-        strip: true,
-        quality: 75,
-        lossless: false,
-        alpha_q: 85,
-        reduction_effort: 6,
-        smart_subsample: true
-      }
-    end
-
-    def png_variant_options
+    def png_saver_options
       {
         strip: true,
         compression_level: 8,

data/app/helpers/spree/mail_helper.rb

@@ -5,7 +5,7 @@ module Spree
 
     def variant_image_url(variant)
       image = variant.default_image
-      image.present? && image.attached? ? spree_image_url(image, width: 100, height: 100, format: :png) : image_url('noimage/small.png')
+      image.present? && image.attached? ? spree_image_url(image, variant: :mini) : image_url('noimage/small.png')
     end
 
     def name_for(order)

data/app/jobs/spree/imports/create_rows_job.rb

@@ -31,7 +31,7 @@ module Spree
 
         upsert_options = {}
         if %w[PostgreSQL SQLite].include?(ActiveRecord::Base.connection.adapter_name)
-          upsert_options[:unique_by] = %i[import_id row_number]
+          upsert_options[:unique_by] = :index_spree_import_rows_on_import_id_and_row_number
         end
         # NOTE: Ensure a DB-level unique index on [:import_id, :row_number] for all adapters.
 

data/app/jobs/spree/variants/remove_line_item_job.rb

@@ -4,7 +4,7 @@ module Spree
       queue_as Spree.queues.variants
 
       def perform(line_item:)
-        Spree::Dependencies.cart_remove_line_item_service.constantize.call(order: line_item.order, line_item: line_item)
+        Spree.cart_remove_line_item_service.call(order: line_item.order, line_item: line_item)
       end
     end
   end

data/app/models/spree/asset.rb

@@ -12,9 +12,33 @@ module Spree
     belongs_to :viewable, polymorphic: true, touch: true
     acts_as_list scope: [:viewable_id, :viewable_type]
 
-    delegate :key, :attached?, :variant, :variable?, :blob, :filename, to: :attachment
+    delegate :key, :attached?, :variant, :variable?, :blob, :filename, :variation, to: :attachment
 
-    has_one_attached :attachment, service: Spree.public_storage_service_name
+    WEBP_SAVER_OPTIONS = {
+      strip: true,
+      quality: 75,
+      lossless: false,
+      alpha_q: 85,
+      reduction_effort: 6,
+      smart_subsample: true
+    }.freeze
+
+    has_one_attached :attachment, service: Spree.public_storage_service_name do |attachable|
+      # Note: Key order matters for variation digest matching.
+      # Active Storage reorders keys alphabetically when calling variant(:name),
+      # so we must define them in alphabetical order: format, resize_to_fill, saver
+      #
+      # IMPORTANT: Use string values (not symbols) for format because the variation key
+      # is JSON-encoded in URLs. JSON converts symbols to strings, so "webp" != :webp
+      # after round-tripping, which causes digest mismatches.
+      Spree::Config.product_image_variant_sizes.each do |name, (width, height)|
+        attachable.variant name,
+                           format: "webp",
+                           resize_to_fill: [width, height],
+                           saver: WEBP_SAVER_OPTIONS,
+                           preprocessed: true
+      end
+    end
 
     default_scope { includes(attachment_attachment: :blob) }
 

data/app/models/spree/export.rb

@@ -157,7 +157,7 @@ module Spree
     end
 
     def current_ability
-      @current_ability ||= Spree::Dependencies.ability_class.constantize.new(user, { store: store })
+      @current_ability ||= Spree.ability_class.new(user, { store: store })
     end
 
     # eg. Spree::Exports::Products => products-store-my-store-code-20241030133348.csv

data/app/models/spree/image/configuration/active_storage.rb

@@ -7,25 +7,16 @@ module Spree
         included do
           validates :attachment, attached: true, content_type: Rails.application.config.active_storage.web_image_content_types
 
+          # Returns image styles derived from Spree::Config.product_image_variant_sizes
+          # Format: { variant_name: 'WxH>' } for API compatibility
           def self.styles
-            @styles ||= {
-              mini: '48x48>',
-              small: '100x100>',
-              product: '240x240>',
-              pdp_thumbnail: '160x200>',
-              plp_and_carousel: '448x600>',
-              plp_and_carousel_xs: '254x340>',
-              plp_and_carousel_sm: '350x468>',
-              plp_and_carousel_md: '222x297>',
-              plp_and_carousel_lg: '278x371>',
-              large: '600x600>',
-              plp: '278x371>',
-              zoomed: '650x870>'
-            }
+            @styles ||= Spree::Config.product_image_variant_sizes.transform_values do |dimensions|
+              "#{dimensions[0]}x#{dimensions[1]}>"
+            end
           end
 
           def default_style
-            :product
+            :small
           end
         end
       end

data/app/models/spree/image.rb

@@ -51,7 +51,8 @@ module Spree
     end
 
     def plp_url
-      generate_url(size: self.class.styles[:plp_and_carousel])
+      Spree::Deprecation.warn "Image#plp_url is deprecated. Use variant(:large) instead."
+      generate_url(size: self.class.styles[:large])
     end
 
     private

data/app/models/spree/import.rb

@@ -217,7 +217,7 @@ module Spree
     # Returns the current ability for the import
     # @return [Spree::Ability]
     def current_ability
-      @current_ability ||= Spree::Dependencies.ability_class.constantize.new(user, { store: store })
+      @current_ability ||= Spree.ability_class.new(user, { store: store })
     end
 
     class << self

data/app/models/spree/order/gift_card.rb

@@ -25,13 +25,13 @@ module Spree
       # @param gift_card [Spree::GiftCard] the gift card to apply
       # @return [Spree::Order] the order with the gift card applied
       def apply_gift_card(gift_card)
-        Spree::Dependencies.gift_card_apply_service.constantize.call(gift_card: gift_card, order: self)
+        Spree.gift_card_apply_service.call(gift_card: gift_card, order: self)
       end
 
       # Removes a gift card from the order
       # @return [Spree::Order] the order with the gift card removed
       def remove_gift_card
-        Spree::Dependencies.gift_card_remove_service.constantize.call(order: self)
+        Spree.gift_card_remove_service.call(order: self)
       end
 
       def recalculate_gift_card
@@ -44,7 +44,7 @@ module Spree
       def redeem_gift_card
         return unless gift_card.present?
 
-        Spree::Dependencies.gift_card_redeem_service.constantize.call(gift_card: gift_card)
+        Spree.gift_card_redeem_service.call(gift_card: gift_card)
       end
     end
   end

data/app/models/spree/order/store_credit.rb

@@ -2,11 +2,11 @@ module Spree
   class Order < Spree.base_class
     module StoreCredit
       def add_store_credit_payments(amount = nil)
-        Spree::Dependencies.checkout_add_store_credit_service.constantize.call(order: self, amount: amount)
+        Spree.checkout_add_store_credit_service.call(order: self, amount: amount)
       end
 
       def remove_store_credit_payments
-        Spree::Dependencies.checkout_remove_store_credit_service.constantize.call(order: self)
+        Spree.checkout_remove_store_credit_service.call(order: self)
       end
 
       def covered_by_store_credit?

data/app/models/spree/order.rb

@@ -349,7 +349,7 @@ module Spree
     end
 
     def updater
-      @updater ||= Spree::Dependencies.order_updater.constantize.new(self)
+      @updater ||= Spree.order_updater.new(self)
     end
 
     def update_with_updater!
@@ -407,7 +407,7 @@ module Spree
     def find_line_item_by_variant(variant, options = {})
       line_items.detect do |line_item|
         line_item.variant_id == variant.id &&
-          Spree::Dependencies.cart_compare_line_items_service.constantize.new.call(order: self, line_item: line_item, options: options).value
+          Spree.cart_compare_line_items_service.new.call(order: self, line_item: line_item, options: options).value
       end
     end
 
@@ -578,7 +578,7 @@ module Spree
     def empty!
       raise Spree.t(:cannot_empty_completed_order) if completed?
 
-      result = Spree::Dependencies.cart_empty_service.constantize.call(order: self)
+      result = Spree.cart_empty_service.call(order: self)
       result.value
     end
 
@@ -957,7 +957,7 @@ module Spree
       if gift_card.present?
         recalculate_gift_card
       elsif using_store_credit?
-        Spree::Dependencies.checkout_add_store_credit_service.constantize.call(order: self)
+        Spree.checkout_add_store_credit_service.call(order: self)
       end
     end
   end

data/app/models/spree/order_contents.rb

@@ -7,17 +7,17 @@ module Spree
     end
 
     def add(variant, quantity = 1, options = {})
-      Spree::Dependencies.cart_add_item_service.constantize.call(order: order,
-                                                                 variant: variant,
-                                                                 quantity: quantity,
-                                                                 options: options).value
+      Spree.cart_add_item_service.call(order: order,
+                                       variant: variant,
+                                       quantity: quantity,
+                                       options: options).value
     end
 
     def remove(variant, quantity = 1, options = {})
-      Spree::Dependencies.cart_remove_item_service.constantize.call(order: order,
-                                                                    variant: variant,
-                                                                    quantity: quantity,
-                                                                    options: options).value
+      Spree.cart_remove_item_service.call(order: order,
+                                          variant: variant,
+                                          quantity: quantity,
+                                          options: options).value
     end
 
     def remove_line_item(line_item, options = {})
@@ -25,7 +25,7 @@ module Spree
     end
 
     def update_cart(params)
-      Spree::Dependencies.cart_update_service.constantize.call(order: order, params: params).value
+      Spree.cart_update_service.call(order: order, params: params).value
     end
   end
 end

data/app/models/spree/order_merger.rb

@@ -35,9 +35,9 @@ module Spree
     def find_matching_line_item(other_order_line_item)
       order.line_items.detect do |my_li|
         my_li.variant == other_order_line_item.variant &&
-          Spree::Dependencies.cart_compare_line_items_service.constantize.new.call(order: order,
-                                                                                   line_item: my_li,
-                                                                                   options: other_order_line_item.serializable_hash).value
+          Spree.cart_compare_line_items_service.new.call(order: order,
+                                                         line_item: my_li,
+                                                         options: other_order_line_item.serializable_hash).value
       end
     end
 

data/app/models/spree/page_sections/featured_taxon.rb

@@ -61,8 +61,7 @@ module Spree
             sort_by: 'default'
           }
 
-          products_finder = Spree::Dependencies.products_finder.constantize
-          products_finder.new(scope: store.products, params: finder_params).execute.limit(preferred_max_products_to_show)
+          Spree.products_finder.new(scope: store.products, params: finder_params).execute.limit(preferred_max_products_to_show)
         end
       end
 

data/app/models/spree/promotion/actions/create_line_items.rb

@@ -47,9 +47,9 @@ module Spree
             current_quantity = order.quantity_of(item.variant)
             next unless current_quantity < item.quantity && item_available?(item)
 
-            line_item = Spree::Dependencies.cart_add_item_service.constantize.call(order: order,
-                                                                                   variant: item.variant,
-                                                                                   quantity: item.quantity - current_quantity).value
+            line_item = Spree.cart_add_item_service.call(order: order,
+                                                         variant: item.variant,
+                                                         quantity: item.quantity - current_quantity).value
             action_taken = true if line_item.try(:valid?)
           end
           action_taken
@@ -68,9 +68,9 @@ module Spree
             line_item = order.find_line_item_by_variant(item.variant)
             next unless line_item.present?
 
-            Spree::Dependencies.cart_remove_item_service.constantize.call(order: order,
-                                                                          variant: item.variant,
-                                                                          quantity: (item.quantity || 1))
+            Spree.cart_remove_item_service.call(order: order,
+                                                variant: item.variant,
+                                                quantity: (item.quantity || 1))
             action_taken = true
           end
 

data/app/models/spree/promotion_handler/coupon.rb

@@ -133,7 +133,7 @@ module Spree
           line_item = order.find_line_item_by_variant(item.variant)
           next if line_item.blank?
 
-          Spree::Dependencies.cart_remove_item_service.constantize.call(order: order, variant: item.variant, quantity: item.quantity)
+          Spree.cart_remove_item_service.call(order: order, variant: item.variant, quantity: item.quantity)
         end
       end
 

data/app/models/spree/shipping_method.rb

@@ -77,7 +77,7 @@ module Spree
 
     # your shipping method subclasses can override this method to provide a custom tracking number service
     def tracking_number_service(tracking)
-      @tracking_number_service ||= Spree::Dependencies.tracking_number_service.constantize.new(tracking)
+      @tracking_number_service ||= Spree.tracking_number_service.new(tracking)
     end
 
     def self.calculators

data/app/models/spree/store.rb

@@ -210,7 +210,7 @@ module Spree
 
     def self.current(url = nil)
       if url.present?
-        Spree::Dependencies.current_store_finder.constantize.new(url: url).execute
+        Spree.current_store_finder.new(url: url).execute
       else
         Spree::Current.store
       end

data/app/models/spree/themes/default.rb

@@ -85,10 +85,13 @@ module Spree
       preference :border_shadow_blur, :integer, default: 5
 
       # PRODUCT IMAGES
-      preference :product_listing_image_height, :integer, default: 300
-      preference :product_listing_image_width, :integer, default: 300
-      preference :product_listing_image_height_mobile, :integer, default: 190
-      preference :product_listing_image_width_mobile, :integer, default: 190
+      # These defaults match preprocessed variant sizes for optimal performance:
+      # Desktop (360x360) → large variant (720x720 at 2x)
+      # Mobile (200x200) → medium variant (400x400 at 2x)
+      preference :product_listing_image_height, :integer, default: 360
+      preference :product_listing_image_width, :integer, default: 360
+      preference :product_listing_image_height_mobile, :integer, default: 200
+      preference :product_listing_image_width_mobile, :integer, default: 200
     end
   end
 end

data/app/presenters/spree/csv/product_variant_presenter.rb

@@ -135,10 +135,7 @@ module Spree
       private
 
       def image_url_options
-        {
-          width: 1000,
-          height: 1000
-        }
+        { variant: :xlarge }
       end
     end
   end

data/app/services/spree/cart/add_item.rb

@@ -6,7 +6,7 @@ module Spree
       def call(order:, variant:, quantity: nil, public_metadata: {}, private_metadata: {}, options: {})
         ApplicationRecord.transaction do
           run :add_to_line_item
-          run Spree::Dependencies.cart_recalculate_service.constantize
+          run Spree.cart_recalculate_service
         end
       end
 
@@ -18,7 +18,7 @@ module Spree
 
         return failure(variant, "#{variant.name} is not available in #{order.currency}") if variant.amount_in(order.currency).nil?
 
-        line_item = Spree::Dependencies.line_item_by_variant_finder.constantize.new.execute(order: order, variant: variant, options: options)
+        line_item = Spree.line_item_by_variant_finder.new.execute(order: order, variant: variant, options: options)
 
         line_item_created = line_item.nil?
         if line_item.nil?

data/app/services/spree/cart/remove_item.rb

@@ -9,9 +9,9 @@ module Spree
 
         ActiveRecord::Base.transaction do
           line_item = remove_from_line_item(order: order, variant: variant, quantity: quantity, options: options)
-          Spree::Dependencies.cart_recalculate_service.constantize.call(line_item: line_item,
-                                                                        order: order,
-                                                                        options: options)
+          Spree.cart_recalculate_service.call(line_item: line_item,
+                                              order: order,
+                                              options: options)
           success(line_item)
         end
       end
@@ -19,7 +19,7 @@ module Spree
       private
 
       def remove_from_line_item(order:, variant:, quantity:, options:)
-        line_item = Spree::Dependencies.line_item_by_variant_finder.constantize.new.execute(order: order, variant: variant, options: options)
+        line_item = Spree.line_item_by_variant_finder.new.execute(order: order, variant: variant, options: options)
 
         raise ActiveRecord::RecordNotFound if line_item.nil?
 

data/app/services/spree/cart/remove_line_item.rb

@@ -7,9 +7,9 @@ module Spree
         options ||= {}
         ActiveRecord::Base.transaction do
           order.line_items.destroy(line_item)
-          Spree::Dependencies.cart_recalculate_service.constantize.new.call(order: order,
-                                                                            line_item: line_item,
-                                                                            options: options)
+          Spree.cart_recalculate_service.new.call(order: order,
+                                                  line_item: line_item,
+                                                  options: options)
         end
         success(line_item)
       end

data/app/services/spree/cart/remove_out_of_stock_items.rb

@@ -49,7 +49,7 @@ module Spree
       end
 
       def cart_remove_line_item_service
-        Spree::Dependencies.cart_remove_line_item_service.constantize
+        Spree.cart_remove_line_item_service
       end
     end
   end

data/app/services/spree/cart/set_quantity.rb

@@ -6,7 +6,7 @@ module Spree
       def call(order:, line_item:, quantity: nil)
         ActiveRecord::Base.transaction do
           run :change_item_quantity
-          run Spree::Dependencies.cart_recalculate_service.constantize
+          run Spree.cart_recalculate_service
         end
       end
 

data/app/services/spree/checkout/advance.rb

@@ -15,7 +15,7 @@ module Spree
         transitions_count = 0
 
         until cannot_make_transition?(order, state)
-          next_result = Spree::Dependencies.checkout_next_service.constantize.call(order: order)
+          next_result = Spree.checkout_next_service.call(order: order)
           return failure(order, order.errors) if next_result.failure? && (transitions_count.zero? || state.present?)
 
           transitions_count +=1

data/app/services/spree/checkout/complete.rb

@@ -4,7 +4,7 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call(order:)
-        Spree::Dependencies.checkout_next_service.constantize.call(order: order) until cannot_make_transition?(order)
+        Spree.checkout_next_service.call(order: order) until cannot_make_transition?(order)
 
         if order.reload.complete?
           success(order)

data/app/services/spree/data_feeds/google/rss.rb

@@ -87,19 +87,19 @@ module Spree
         end
 
         def optional_attributes
-          Spree::Dependencies.data_feeds_google_optional_attributes_service.constantize.new
+          Spree.data_feeds_google_optional_attributes_service.new
         end
 
         def required_attributes
-          Spree::Dependencies.data_feeds_google_required_attributes_service.constantize.new
+          Spree.data_feeds_google_required_attributes_service.new
         end
 
         def optional_sub_attributes
-          Spree::Dependencies.data_feeds_google_optional_sub_attributes_service.constantize.new
+          Spree.data_feeds_google_optional_sub_attributes_service.new
         end
 
         def products_list
-          Spree::Dependencies.data_feeds_google_products_list.constantize.new
+          Spree.data_feeds_google_products_list.new
         end
       end
     end

data/app/services/spree/line_items/helper.rb

@@ -4,7 +4,7 @@ module Spree
       protected
 
       def recalculate_service
-        Spree::Dependencies.cart_recalculate_service.constantize
+        Spree.cart_recalculate_service
       end
     end
   end

data/app/services/spree/shipments/helper.rb

@@ -12,11 +12,11 @@ module Spree
       end
 
       def add_item_service
-        Spree::Dependencies.cart_add_item_service.constantize
+        Spree.cart_add_item_service
       end
 
       def remove_item_service
-        Spree::Dependencies.cart_remove_item_service.constantize
+        Spree.cart_remove_item_service
       end
     end
   end

data/lib/spree/core/configuration.rb

@@ -46,6 +46,36 @@ module Spree
       preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
       preference :geocode_addresses, :boolean, default: true
       preference :images_save_from_url_job_attempts, :integer, default: 5
+
+      # Preprocessed product image variant sizes at 2x retina resolution.
+      # These variants are generated on upload to reduce runtime processing.
+      # When using spree_image_tag, pass variant option instead of width and height.
+      #
+      # Default sizes:
+      #   mini (128x128)     - admin thumbnails, checkout line items
+      #   small (256x256)    - cart/order items, gallery thumbnails
+      #   medium (400x400)   - mobile listing, admin media
+      #   large (720x720)    - product listing, mobile gallery
+      #   xlarge (2000x2000) - gallery main, lightbox
+      #
+      # To customize, override in your initializer:
+      #   Spree::Config.product_image_variant_sizes = {
+      #     mini: [128, 128],
+      #     small: [256, 256],
+      #     # ... your custom sizes
+      #   }
+      attr_writer :product_image_variant_sizes
+
+      def product_image_variant_sizes
+        @product_image_variant_sizes ||= {
+          mini: [128, 128],
+          small: [256, 256],
+          medium: [400, 400],
+          large: [720, 720],
+          xlarge: [2000, 2000],
+          og_image: [1200, 630]
+        }
+      end
       preference :layout, :string, deprecated: 'Please use Spree::Frontend::Config[:layout] instead'
       preference :logo, :string, deprecated: true
       preference :mailer_logo, :string, deprecated: true

data/lib/spree/core/controller_helpers/auth.rb

@@ -17,7 +17,7 @@ module Spree
 
         # Needs to be overridden so that we use Spree's Ability rather than anyone else's.
         def current_ability
-          @current_ability ||= Spree::Dependencies.ability_class.constantize.new(try_spree_current_user, { store: current_store })
+          @current_ability ||= Spree.ability_class.new(try_spree_current_user, { store: current_store })
         end
 
         def redirect_back_or_default(default)

data/lib/spree/core/controller_helpers/store.rb

@@ -64,7 +64,7 @@ module Spree
         end
 
         def current_store_finder
-          Spree::Dependencies.current_store_finder.constantize
+          Spree.current_store_finder
         end
 
         def raise_record_not_found_if_store_is_not_found

data/lib/spree/core/dependencies.rb

@@ -97,8 +97,8 @@ module Spree
         # finders
         address_finder: 'Spree::Addresses::Find',
         country_finder: 'Spree::Countries::Find',
-        cms_page_finder: 'Spree::CmsPages::Find', # LEGACY
-        menu_finder: 'Spree::Menus::Find', # LEGACY
+        cms_page_finder: nil, # LEGACY
+        menu_finder: nil, # LEGACY
         current_order_finder: 'Spree::Orders::FindCurrent',
         current_store_finder: 'Spree::Stores::FindCurrent',
         completed_order_finder: 'Spree::Orders::FindComplete',

data/lib/spree/core/dependencies_helper.rb

@@ -1,21 +1,103 @@
 module Spree
+  class DependencyError < StandardError; end
+
   module DependenciesHelper
+    # Patterns to skip when finding the actual caller (internal routing code)
+    INTERNAL_CALLER_PATTERNS = [
+      %r{lib/spree/core\.rb.*method_missing},
+      %r{lib/spree/api\.rb.*method_missing}
+    ].freeze
+
     def self.included(base)
       injection_points = base::INJECTION_POINTS_WITH_DEFAULTS.keys.freeze
       base.const_set(:INJECTION_POINTS, injection_points)
-      base.attr_accessor(*injection_points)
+
+      injection_points.each do |point|
+        # Original getter - returns raw value (string, class, or proc result)
+        # BACKWARDS COMPATIBLE: Spree::Dependencies.foo.constantize still works
+        base.attr_reader(point)
+
+        # Setter with override tracking
+        # BACKWARDS COMPATIBLE: Spree::Dependencies.foo = "MyClass" still works
+        base.define_method("#{point}=") do |value|
+          @overrides ||= {}
+          @overrides[point] = {
+            value: value,
+            source: find_caller_source,
+            set_at: Time.current
+          }
+          # Clear memoized class when value changes
+          remove_instance_variable("@#{point}_resolved") if instance_variable_defined?("@#{point}_resolved")
+          instance_variable_set("@#{point}", value)
+        end
+
+        # Returns resolved class with memoization
+        # Usage: Spree::Dependencies.foo_class or Spree.foo
+        base.define_method("#{point}_class") do
+          return instance_variable_get("@#{point}_resolved") if instance_variable_defined?("@#{point}_resolved")
+
+          value = send(point)
+          resolved = case value
+                     when String then value.constantize
+                     when Proc then value.call.then { |v| v.is_a?(String) ? v.constantize : v }
+                     else value
+                     end
+          instance_variable_set("@#{point}_resolved", resolved)
+          resolved
+        end
+      end
     end
 
     def initialize
       set_default_values
     end
 
+    # Returns hash of all overridden dependencies with metadata
+    def overrides
+      @overrides || {}
+    end
+
+    # Check if a specific dependency has been overridden
+    def overridden?(name)
+      overrides.key?(name.to_sym)
+    end
+
+    # Get override info for a specific dependency
+    def override_info(name)
+      overrides[name.to_sym]
+    end
+
+    # Returns array of all dependencies with current values and metadata
     def current_values
-      values = []
-      self.class::INJECTION_POINTS.each do |injection_point|
-        values << { injection_point.to_s => instance_variable_get("@#{injection_point}") }
+      self.class::INJECTION_POINTS.map do |point|
+        default = self.class::INJECTION_POINTS_WITH_DEFAULTS[point]
+        default_val = default.respond_to?(:call) ? default.call : default
+        current = send(point)
+
+        {
+          name: point,
+          current: current,
+          default: default_val,
+          # Use overridden? to check if setter was called, not value comparison
+          # Value comparison fails for proc-based defaults that reference other dependencies
+          overridden: overridden?(point),
+          override_info: overrides[point]
+        }
       end
-      values
+    end
+
+    # Validate all dependencies can be resolved to classes
+    # Raises Spree::DependencyError if any dependency is invalid
+    def validate!
+      errors = []
+      self.class::INJECTION_POINTS.each do |point|
+        send("#{point}_class")
+      rescue NameError => e
+        errors << { name: point, value: send(point), error: e.message }
+      end
+      raise Spree::DependencyError, "Invalid dependencies: #{errors.map { |e| e[:name] }.join(', ')}" if errors.any?
+
+      true
     end
 
     private
@@ -26,5 +108,18 @@ module Spree
         instance_variable_set("@#{injection_point}", value)
       end
     end
+
+    # Find the actual caller source, skipping internal DSL routing code
+    # This ensures Spree.foo = X reports the user's code location, not method_missing
+    def find_caller_source
+      caller_locations(2, 10).each do |location|
+        location_str = location.to_s
+        next if INTERNAL_CALLER_PATTERNS.any? { |pattern| location_str.match?(pattern) }
+
+        return location_str
+      end
+      # Fallback to immediate caller if no external caller found
+      caller_locations(2, 1).first.to_s
+    end
   end
 end

data/lib/spree/core/search/base.rb

@@ -32,7 +32,7 @@ module Spree
         def extended_base_scope
           base_scope = current_store.products.spree_base_scopes
           base_scope = get_products_conditions_for(base_scope, keywords)
-          base_scope = Spree::Dependencies.products_finder.constantize.new(**product_finder_params(base_scope)).execute
+          base_scope = Spree.products_finder.new(**product_finder_params(base_scope)).execute
           base_scope = add_search_scopes(base_scope)
           add_eagerload_scopes(base_scope)
         end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.2.1'.freeze
+  VERSION = '5.2.2'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -374,6 +374,40 @@ module Spree
     @permissions ||= PermissionConfiguration.new
   end
 
+  class << self
+    # Dynamic methods for core dependencies
+    #
+    # @example Getting a dependency (returns resolved class)
+    #   Spree.cart_add_item_service.call(order: order, variant: variant)
+    #
+    # @example Setting a dependency
+    #   Spree.cart_add_item_service = MyApp::CartAddItem
+    def method_missing(method_name, *args, &block)
+      base_name = method_name.to_s.chomp('=').to_sym
+
+      return super unless core_dependency?(base_name)
+
+      if method_name.to_s.end_with?('=')
+        Spree::Dependencies.send(method_name, args.first)
+      else
+        # Returns resolved class (not string)
+        Spree::Dependencies.send("#{method_name}_class")
+      end
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      base_name = method_name.to_s.chomp('=').to_sym
+      core_dependency?(base_name) || super
+    end
+
+    private
+
+    def core_dependency?(name)
+      defined?(Spree::Dependencies) &&
+        Spree::Dependencies.class::INJECTION_POINTS.include?(name)
+    end
+  end
+
   module Core
     autoload :ProductFilters, 'spree/core/product_filters'
     autoload :TokenGenerator, 'spree/core/token_generator'

data/lib/spree/testing_support/authorization_helpers.rb

@@ -30,7 +30,7 @@ module Spree
 
         def stub_authorization!
           ability = build_ability
-          ability_class = Spree::Dependencies.ability_class.constantize
+          ability_class = Spree.ability_class
 
           after(:all) do
             ability_class.remove_ability(ability)
@@ -51,7 +51,7 @@ module Spree
 
         def custom_authorization!(&block)
           ability = build_ability(&block)
-          ability_class = Spree::Dependencies.ability_class.constantize
+          ability_class = Spree.ability_class
 
           after(:all) do
             ability_class.remove_ability(ability)

data/lib/tasks/dependencies.rake

@@ -0,0 +1,76 @@
+namespace :spree do
+  namespace :dependencies do
+    desc 'List all Spree dependencies with their current values'
+    task list: :environment do
+      print_dependencies('CORE', Spree::Dependencies)
+      print_dependencies('API', Spree::Api::Dependencies) if defined?(Spree::Api::Dependencies)
+    end
+
+    desc 'Show only overridden dependencies'
+    task overrides: :environment do
+      core_overrides = Spree::Dependencies.current_values.select { |d| d[:overridden] }
+      api_overrides = if defined?(Spree::Api::Dependencies)
+                        Spree::Api::Dependencies.current_values.select { |d| d[:overridden] }
+                      else
+                        []
+                      end
+
+      if core_overrides.empty? && api_overrides.empty?
+        puts 'No dependencies have been overridden.'
+      else
+        print_overrides('Core', core_overrides) if core_overrides.any?
+        print_overrides('API', api_overrides) if api_overrides.any?
+      end
+    end
+
+    desc 'Validate all dependencies resolve to valid classes'
+    task validate: :environment do
+      errors = validate_dependencies('Core', Spree::Dependencies)
+      errors += validate_dependencies('API', Spree::Api::Dependencies) if defined?(Spree::Api::Dependencies)
+
+      puts "\n"
+      if errors.any?
+        puts "\n\e[31m#{errors.size} invalid dependencies:\e[0m"
+        errors.each { |err| puts "  [#{err[:source]}] #{err[:name]}: #{err[:error]}" }
+        exit 1
+      else
+        puts "\e[32mAll dependencies valid\e[0m"
+      end
+    end
+
+    def print_dependencies(name, deps)
+      puts "\n[#{name}]"
+
+      # Calculate max width for alignment
+      max_name_width = deps.class::INJECTION_POINTS.map(&:length).max
+
+      deps.current_values.each do |dep|
+        status = dep[:overridden] ? ' [OVERRIDDEN]' : ''
+        puts "#{dep[:name].to_s.ljust(max_name_width)}  #{dep[:current]}#{status}"
+      end
+    end
+
+    def print_overrides(name, overrides)
+      puts "\n[#{name} OVERRIDES]"
+
+      max_name_width = overrides.map { |d| d[:name].length }.max
+
+      overrides.each do |dep|
+        source = dep[:override_info] ? " (#{dep[:override_info][:source]})" : ''
+        puts "#{dep[:name].to_s.ljust(max_name_width)}  #{dep[:default]} -> #{dep[:current]}#{source}"
+      end
+    end
+
+    def validate_dependencies(name, deps)
+      errors = []
+      deps.class::INJECTION_POINTS.each do |point|
+        deps.send("#{point}_class")
+        print "\e[32m.\e[0m"
+      rescue NameError => e
+        errors << { source: name, name: point, error: e.message }
+        print "\e[31mF\e[0m"
+      end
+      errors
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - Sean Schofield
@@ -1665,6 +1665,7 @@ files:
 - lib/spree/translation_migrations.rb
 - lib/spree_core.rb
 - lib/tasks/core.rake
+- lib/tasks/dependencies.rake
 - lib/tasks/exchanges.rake
 - vendor/javascript/@rails--request.js.js
 - vendor/javascript/@stimulus-components--auto-submit.js
@@ -1677,9 +1678,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.2.1
+  source_code_uri: https://github.com/spree/spree/tree/v5.2.2
 rdoc_options: []
 require_paths:
 - lib