Skip to content

Revert flickwerk #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tvdeyen merged 2 commits into from
Dec 17, 2024
Merged

Revert flickwerk #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5701f0d
Revert "Fix: Add patch paths in `lib` BEFORE `flickwerk.add_paths`"
tvdeyen Dec 17, 2024
9949d50
Revert "Support Flickwerk-style patches"
tvdeyen Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions lib/solidus_support/engine_extensions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# frozen_string_literal: true

require "active_support/deprecation"
require "flickwerk"

module SolidusSupport
module EngineExtensions
Expand All @@ -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|
Expand Down Expand Up @@ -107,17 +105,6 @@ def enable_solidus_engine_support(engine)
end
end
end

initializer "#{name}_#{engine}_patch_paths", before: "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
Expand Down
3 changes: 0 additions & 3 deletions solidus_support.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down