Skip to content

Commit 7c6056e

Browse files
committed
sass -> sassc
Fixes #159
1 parent 5a2f627 commit 7c6056e

3 files changed

Lines changed: 8 additions & 13 deletions

File tree

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ end
4545

4646
desc 'Dumps output to a CSS file for testing'
4747
task :debug do
48-
require 'sass'
48+
require 'sassc'
4949
require './lib/bootstrap'
5050
require 'term/ansicolor'
5151
require 'autoprefixer-rails'
5252
path = Bootstrap.stylesheets_path
5353
%w(_bootstrap _bootstrap-reboot _bootstrap-grid).each do |file|
54-
engine = Sass::Engine.for_file("#{path}/#{file}.scss", syntax: :scss, load_paths: [path])
54+
engine = SassC::Engine.new(File.read("#{path}/#{file}.scss"), syntax: :scss, load_paths: [path])
5555
out = File.join('tmp', "#{file[1..-1]}.css")
5656
css = engine.render
5757
css = AutoprefixerRails.process(css)

bootstrap.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Gem::Specification.new do |s|
1111
s.homepage = 'https://github.com/twbs/bootstrap-rubygem'
1212
s.license = 'MIT'
1313

14-
s.add_runtime_dependency 'popper_js', '>= 1.12.9', '< 2'
14+
s.add_runtime_dependency 'popper_js', '>= 1.14.3', '< 2'
1515

16-
s.add_runtime_dependency 'sass', '>= 3.5.2'
17-
s.add_runtime_dependency 'autoprefixer-rails', '>= 6.0.3'
16+
s.add_runtime_dependency 'sassc', '>= 1.12.1'
17+
s.add_runtime_dependency 'autoprefixer-rails', '>= 9.1.0'
1818

1919
# Testing dependencies
2020
s.add_development_dependency 'minitest', '~> 5.8.0'

lib/bootstrap.rb

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ def load!
1111
register_hanami
1212
elsif sprockets?
1313
register_sprockets
14+
elsif defined?(::Sass) && ::Sass.respond_to?(:load_paths)
15+
# The deprecated `sass` gem:
16+
::Sass.load_paths << stylesheets_path
1417
end
15-
16-
configure_sass
1718
end
1819

1920
# Paths
@@ -48,12 +49,6 @@ def hanami?
4849

4950
private
5051

51-
def configure_sass
52-
require 'sass'
53-
54-
::Sass.load_paths << stylesheets_path
55-
end
56-
5752
def register_rails_engine
5853
require 'bootstrap/engine'
5954
end

0 commit comments

Comments
 (0)