Skip to content

Commit 7e35f63

Browse files
kennyadslrainerdema
andcommitted
Improve engine's requires to remove double inclusions
Into the engine.rb template, with 3db5d7b, we started including the main gem's .rb file in order to have solidus_support available when the engine was loaded stand-alone (for example when running `bin/r migration add ...` in an extension). See the PR that the above commit belongs to for more details. But that main .rb file was requiring the engine itself so we can refactor requires in order to have a clean state. We also changed the `spree/core` require into `solidus_core` since they are equivalent (`solidus_core` only requires `spree/core`), see https://github.com/solidusio/solidus/blob/ed88ebc464d1373dc28f4d69cc9fd12c943ddfbe/core/lib/solidus_core.rb . Co-authored-by: Rainer Dema <rainerdema@users.noreply.github.com>
1 parent c97f42c commit 7e35f63

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# frozen_string_literal: true
22

3-
require 'solidus_core'
4-
require 'solidus_support'
5-
63
require '<%=file_name%>/configuration'
74
require '<%=file_name%>/version'
85
require '<%=file_name%>/engine'

lib/solidus_dev_support/templates/extension/lib/%file_name%/engine.rb.tt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

3-
require 'spree/core'
4-
require '<%= file_name %>'
3+
require 'solidus_core'
4+
require 'solidus_support'
55

66
module <%= class_name %>
77
class Engine < Rails::Engine

0 commit comments

Comments
 (0)