File tree Expand file tree Collapse file tree 2 files changed +13
-6
lines changed Expand file tree Collapse file tree 2 files changed +13
-6
lines changed Original file line number Diff line number Diff line change @@ -24,12 +24,6 @@ class Railtie < ::Rails::Railtie
24
24
# Remove the sass middleware if it gets inadvertently enabled by applications.
25
25
config . after_initialize do |app |
26
26
app . config . middleware . delete ( Sass ::Plugin ::Rack ) if defined? ( Sass ::Plugin ::Rack )
27
-
28
- if app . assets
29
- # do this after initialize so sass-rails doesn't interfere with us
30
- app . assets . register_engine '.sass' , SassC ::Rails ::SassTemplate
31
- app . assets . register_engine '.scss' , SassC ::Rails ::ScssTemplate
32
- end
33
27
end
34
28
35
29
initializer :setup_sass , group : :all do |app |
@@ -52,6 +46,9 @@ class Railtie < ::Rails::Railtie
52
46
class_attribute :sass_config
53
47
self . sass_config = app . config . sass
54
48
end
49
+
50
+ app . assets . register_engine '.sass' , SassC ::Rails ::SassTemplate
51
+ app . assets . register_engine '.scss' , SassC ::Rails ::ScssTemplate
55
52
end
56
53
end
57
54
Original file line number Diff line number Diff line change @@ -32,16 +32,26 @@ def render_asset(asset)
32
32
def initialize!
33
33
Rails . env = "test"
34
34
@app . initialize!
35
+ handle_sass_rails
35
36
end
36
37
37
38
def initialize_dev!
38
39
Rails . env = "development"
39
40
@app . initialize!
41
+ handle_sass_rails
40
42
end
41
43
42
44
def initialize_prod!
43
45
Rails . env = "production"
44
46
@app . initialize!
47
+ handle_sass_rails
48
+ end
49
+
50
+ def handle_sass_rails
51
+ if defined? ( Sass ::Rails )
52
+ Rails . application . assets . register_engine '.sass' , SassC ::Rails ::SassTemplate
53
+ Rails . application . assets . register_engine '.scss' , SassC ::Rails ::ScssTemplate
54
+ end
45
55
end
46
56
47
57
def test_setup_works
You can’t perform that action at this time.
0 commit comments