Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ task default: %i[compile rubocop spec]

desc 'Compile all the extensions'
task :compile do
sh 'rake', '-C', 'ext/sass', 'clobber', 'install'
sh 'rake', '-C', 'ext/sass', 'clobber', 'install', 'embedded_sass_pb.rb'

if ENV.key?('ext_platform') && ENV['ext_platform'] != 'ruby'
host_cpu, host_os = ENV['ext_platform'].split('-', 2)
Expand Down
2 changes: 1 addition & 1 deletion exe/sass
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# frozen_string_literal: true

require_relative '../ext/sass/cli'
require 'sass/cli'

module Sass
# The `sass` command line interface
Expand Down
17 changes: 12 additions & 5 deletions ext/sass/Rakefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# frozen_string_literal: true

dest = File.absolute_path('sass', ENV.fetch('RUBYARCHDIR', File.absolute_path('../../lib', __dir__)))
FileUtils.mkdir_p(dest)
Dir.chdir(dest)

require 'rake/clean'

require_relative '../../lib/sass/elf'
Expand All @@ -8,9 +12,7 @@ ELF = Sass.const_get(:ELF)

task default: %i[install clean]

task install: %w[cli.rb] do
Rake::Task['embedded_sass_pb.rb'].invoke unless File.exist?('embedded_sass_pb.rb')
end
task install: %w[cli.rb]

CLEAN.include %w[
protoc.exe
Expand Down Expand Up @@ -57,6 +59,11 @@ rescue StandardError
end

file 'node_modules/sass' do
cp File.absolute_path('package.json', __dir__), './'

# TODO: remove after https://github.com/sass/dart-sass/pull/2413
cp File.absolute_path("sass-#{SassConfig.dart_sass_version}.tgz", __dir__), './'

sh 'npm', 'install'
rescue StandardError
begin
Expand Down Expand Up @@ -135,7 +142,7 @@ file 'cli.rb' => %w[dart-sass] do |t|
File.write(t.name, <<~CLI_RB)
# frozen_string_literal: true

require_relative '../../lib/sass/elf'
require 'sass/elf'

module Sass
module CLI
Expand Down Expand Up @@ -487,7 +494,7 @@ module SassConfig
end

def dart_sass_version
package_json['dependencies']['sass']
package_json(__dir__)['dependencies']['sass']
# TODO: remove after https://github.com/sass/dart-sass/pull/2413
.delete_prefix('file:sass-').delete_suffix('.tgz')
end
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/sass/compiler/connection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require 'open3'

require_relative '../../../ext/sass/cli'
require 'sass/cli'

module Sass
class Compiler
Expand Down
2 changes: 1 addition & 1 deletion lib/sass/embedded_protocol.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Sass
# @see https://github.com/sass/sass/blob/HEAD/spec/embedded-protocol.md
module EmbeddedProtocol
require_relative '../../ext/sass/embedded_sass_pb'
require_relative 'embedded_sass_pb'
end

private_constant :EmbeddedProtocol
Expand Down
11 changes: 4 additions & 7 deletions sass-embedded.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,16 @@ Gem::Specification.new do |spec|

spec.bindir = 'exe'
spec.executables = ['sass']
spec.files = Dir['exe/**/*', 'ext/**/*_pb.rb', 'lib/**/*.rb'] + ['LICENSE', 'README.md']
spec.files = Dir['exe/**/*', 'lib/**/*.rb'] + ['LICENSE', 'README.md']
spec.platform = ENV.fetch('gem_platform', 'ruby')

if spec.platform == Gem::Platform::RUBY
spec.extensions = ['ext/sass/Rakefile']
spec.files += Dir['ext/sass/sass-*.tgz'] # TODO: remove after https://github.com/sass/dart-sass/pull/2413
spec.files += [
'ext/sass/Rakefile',
'ext/sass/package.json'
]
spec.files += Dir['ext/**/*']
spec.files -= ['lib/sass/cli.rb']
spec.add_dependency 'rake', '>= 13'
else
spec.files += Dir['ext/sass/dart-sass/**/*'] + ['ext/sass/cli.rb']
spec.files += Dir['lib/sass/dart-sass/**/*']
end

spec.required_ruby_version = if spec.platform == Gem::Platform::RUBY || spec.platform.os != 'linux'
Expand Down