From 5701f0d5146cdfb0ac46b98ed02a36fb79dd0a89 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Tue, 17 Dec 2024 19:05:17 +0100 Subject: [PATCH 1/2] Revert "Fix: Add patch paths in `lib` BEFORE `flickwerk.add_paths`" This reverts commit aa7cad1aef6d53131ba1adede7442faebb0b227c. --- lib/solidus_support/engine_extensions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/solidus_support/engine_extensions.rb b/lib/solidus_support/engine_extensions.rb index 7b1c34b..71e9fbc 100644 --- a/lib/solidus_support/engine_extensions.rb +++ b/lib/solidus_support/engine_extensions.rb @@ -108,7 +108,7 @@ def enable_solidus_engine_support(engine) end end - initializer "#{name}_#{engine}_patch_paths", before: "flickwerk.add_paths" do + initializer "#{name}_#{engine}_patch_paths", after: "flickwerk.add_paths" do patch_paths = root.join("lib/patches/#{engine}").glob("*") Flickwerk.patch_paths += patch_paths end From 9949d503c0e2a26b9c8df11ac6c3ae199bd018a7 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Tue, 17 Dec 2024 19:05:36 +0100 Subject: [PATCH 2/2] Revert "Support Flickwerk-style patches" This reverts commit 783ac66a108500001cc0421ae6fe4546ab56fa73. --- lib/solidus_support/engine_extensions.rb | 13 ------------- solidus_support.gemspec | 3 --- 2 files changed, 16 deletions(-) diff --git a/lib/solidus_support/engine_extensions.rb b/lib/solidus_support/engine_extensions.rb index 71e9fbc..08634c1 100644 --- a/lib/solidus_support/engine_extensions.rb +++ b/lib/solidus_support/engine_extensions.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "active_support/deprecation" -require "flickwerk" module SolidusSupport module EngineExtensions @@ -10,7 +9,6 @@ module EngineExtensions def self.included(engine) engine.extend ClassMethods - engine.include Flickwerk engine.class_eval do solidus_decorators_root.glob('*') do |decorators_folder| @@ -107,17 +105,6 @@ def enable_solidus_engine_support(engine) end end end - - initializer "#{name}_#{engine}_patch_paths", after: "flickwerk.add_paths" do - patch_paths = root.join("lib/patches/#{engine}").glob("*") - Flickwerk.patch_paths += patch_paths - end - - initializer "#{name}_#{engine}_user_patches", before: "flickwerk.add_patches" do - Flickwerk.patches.transform_keys! do |key| - key.gsub("Spree.user_class", Spree.user_class_name) - end - end end end end diff --git a/solidus_support.gemspec b/solidus_support.gemspec index 0c97da3..563248d 100644 --- a/solidus_support.gemspec +++ b/solidus_support.gemspec @@ -28,9 +28,6 @@ Gem::Specification.new do |spec| spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency 'flickwerk', '~> 0.2.0' - spec.add_dependency 'solidus_core', '~> 4.1' - spec.add_development_dependency 'rails' spec.add_development_dependency 'bundler' spec.add_development_dependency 'rake'