Skip to content

Commit bf17075

Browse files
committed
Temp: Use unreleased solidus_support
1 parent 0c1beb5 commit bf17075

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed

Gemfile

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
3232
gem 'async', '< 3', require: false
3333
end
3434

35+
# Temporarily use the `solidus_support` gem with Flickwerk support
36+
gem "solidus_support", github: "mamhoff/solidus_support", branch: "re-enable-flickwerk"
37+
3538
# 'net/smtp' is required by 'mail', see:
3639
# - https://github.com/ruby/net-protocol/issues/10
3740
# - https://stackoverflow.com/a/72474475

lib/spree/auth/engine.rb

+1-17
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,17 @@
44
require 'devise'
55
require 'devise-encryptable'
66
require 'spree/auth/version'
7-
require 'flickwerk'
7+
88
module Spree
99
module Auth
1010
class Engine < Rails::Engine
1111
include SolidusSupport::EngineExtensions
1212

13-
include Flickwerk
14-
1513
isolate_namespace Spree
1614
engine_name 'solidus_auth'
1715

1816
Spree.user_class = "Spree::User"
1917

20-
initializer "spree.auth.frontend_patch_paths", before: "flickwerk.add_paths" do
21-
if SolidusSupport.frontend_available?
22-
patch_paths = root.join("lib/patches/frontend").glob("*")
23-
Flickwerk.patch_paths += patch_paths
24-
end
25-
end
26-
27-
initializer "spree.auth.backend_patch_paths", before: "flickwerk.add_paths" do
28-
if SolidusSupport.backend_available?
29-
patch_paths = root.join("lib/patches/backend").glob("*")
30-
Flickwerk.patch_paths += patch_paths
31-
end
32-
end
33-
3418
initializer "spree.auth.environment", before: :load_config_initializers do |_app|
3519
require 'spree/auth_configuration'
3620

solidus_auth_devise.gemspec

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
3131
spec.add_dependency 'deface', '~> 1.0'
3232
spec.add_dependency 'devise', '~> 4.1'
3333
spec.add_dependency 'devise-encryptable', '0.2.0'
34-
spec.add_dependency 'flickwerk', '~> 0.3.1'
3534
spec.add_dependency 'solidus_core', ['>= 3', '< 5']
3635
spec.add_dependency 'solidus_support', '~> 0.11'
3736

0 commit comments

Comments
 (0)