sass-embedded 1.80.4 → 1.80.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9be33eed9b40a0e768590d095103c8a0b4b554701d7693d4e63422a5a55a99d
-  data.tar.gz: ad5ee19943aa2c198190ff3d60f69a81df4d99daba687c8a36ba74c4e1a47b4c
+  metadata.gz: 48f9a046796c1128fee72e53aae8da123f2d37d35cf0d27e33e9258f2f58ece6
+  data.tar.gz: 839809b0866cf6aed49542e7a4fca8fd64bf01d1a4d15b79be8ca1de630132aa
 SHA512:
-  metadata.gz: a14166107a1fa40fea9ab183dc2de6a7662c9c39a98b59bcb3740c61aea7022f8820711f30406c2444d9c369ae7467a597d55fc44f5f2cbb4d947c4568edb21b
-  data.tar.gz: d7d03250cf170d674494829764c42f22f496fc5b8540e15a6fc02c80abc638dc38ead93b476b1af37e83b85cbed11d154fa5097b1536c80d508047def568e264
+  metadata.gz: da49936d0d5279f7effac246d314d0138aafee881e167ad619c2f92fb47a3372170fde648c2fe12ed1cd4f33ff26063c5b461a14957e056aff94a7ac7a54dfc2
+  data.tar.gz: 371313ed88a584d86c0b841d35347c309a314b935b5acb8fef509660f3ed44ec748f9eeeb905d2dcba26575239b457cd42805d7c4d50e3cd659621a9bdafa753

data/ext/sass/Rakefile

@@ -8,17 +8,32 @@ task install: %w[cli.rb] do
   Rake::Task['embedded_sass_pb.rb'].invoke unless File.exist?('embedded_sass_pb.rb')
 end
 
-CLEAN.include %w[protoc.exe ruby *.proto *.tar.gz *.zip]
-
-CLOBBER.include %w[dart-sass cli.rb embedded_sass_pb.rb]
+CLEAN.include %w[
+  protoc.exe
+  ruby
+  *.proto
+  *.tar.gz
+  *.zip
+]
+
+CLOBBER.include %w[
+  dart-sass
+  cli.rb
+  embedded_sass_pb.rb
+  node_modules
+  bun.lockb
+  package-lock.json
+  pnpm-lock.yaml
+  yarn.lock
+]
 
 file 'protoc.exe' do |t|
   fetch(ENV.fetch('PROTOC_BIN') { SassConfig.default_protoc }, t.name)
   chmod 'a+x', t.name
 end
 
-file 'dart-sass' do |t|
-  raise if ENV.key?('DART_SASS')
+file 'dart-sass/sass' do |t|
+  raise RuntimeError if ENV.key?('DART_SASS')
 
   gem_install 'sass-embedded', SassConfig.gem_version, SassConfig.gem_platform do |dir|
     mv File.absolute_path("ext/sass/#{t.name}", dir), t.name
@@ -29,34 +44,68 @@ rescue StandardError
   rm archive
 end
 
+file 'node_modules/sass' do
+  sh 'npm', 'install'
+rescue StandardError
+  begin
+    sh 'yarn', 'install'
+  rescue StandardError
+    begin
+      sh 'pnpm', 'install'
+    rescue StandardError
+      sh 'bun', 'install'
+    end
+  end
+end
+
+task 'dart-sass' do
+  Rake::Task['dart-sass/sass'].invoke
+rescue NotImplementedError
+  Rake::Task['node_modules/sass'].invoke
+end
+
 file 'cli.rb' => %w[dart-sass] do |t|
   require_relative '../../lib/sass/elf'
 
-  exe = 'dart-sass/sass'
-  exe = "#{exe}#{['', '.bat', '.exe'].find { |ext| File.exist?("#{exe}#{ext}") }}"
+  begin
+    exe = 'dart-sass/sass'
+    exe = "#{exe}#{['', '.bat', '.exe'].find { |ext| File.exist?("#{exe}#{ext}") }}"
 
-  raise "#{exe} not found" unless File.exist?(exe)
+    raise Errno::ENOENT, exe unless File.exist?(exe)
 
-  runtime = 'dart-sass/src/dart'
-  runtime = "#{runtime}#{['', '.exe'].find { |ext| File.exist?("#{runtime}#{ext}") }}"
-  snapshot = 'dart-sass/src/sass.snapshot'
+    runtime = 'dart-sass/src/dart'
+    runtime = "#{runtime}#{['', '.exe'].find { |ext| File.exist?("#{runtime}#{ext}") }}"
+    snapshot = 'dart-sass/src/sass.snapshot'
 
-  command = if File.exist?(runtime) && File.exist?(snapshot)
-              [runtime, snapshot]
-            else
-              [exe]
-            end
+    command = if File.exist?(runtime) && File.exist?(snapshot)
+                [runtime, snapshot]
+              else
+                [exe]
+              end
 
-  interpreter = File.open(command[0], 'rb') do |file|
-    Sass.const_get(:ELF).new(file).interpreter
-  rescue ArgumentError
-    nil
-  end
+    interpreter = File.open(command[0], 'rb') do |file|
+      Sass.const_get(:ELF).new(file).interpreter
+    rescue ArgumentError
+      nil
+    end
 
-  command_source = command.map do |argument|
-    "File.absolute_path('#{argument}', __dir__).freeze"
-  end.join(',
+    command_source = command.map do |argument|
+      "File.absolute_path('#{argument}', __dir__).freeze"
+    end.join(',
       ')
+  rescue Errno::ENOENT
+    package = 'node_modules/sass'
+
+    script = File.join(package, SassConfig.package_json(package)['bin']['sass'])
+
+    interpreter = nil
+
+    command_source = [
+      "'node'",
+      "File.absolute_path('#{script}', __dir__).freeze"
+    ].join(',
+      ')
+  end
 
   if interpreter.nil?
     File.write(t.name, <<~CLI_RB)
@@ -135,7 +184,7 @@ module FileUtils
       entry = entries.nextElement
       name = entry.getName
       path = dest_path.resolve(name).normalize
-      raise unless path.startsWith(dest_path)
+      raise SecurityError unless path.startsWith(dest_path)
 
       Rake.rake_output_message "  inflating: #{name}" if Rake::FileUtilsExt.verbose_flag
 
@@ -231,7 +280,7 @@ module FileUtils
       s.platform == platform
     end
 
-    raise if resolver_spec.nil?
+    raise Gem::UnsatisfiableDependencyError, dependency_request if resolver_spec.nil?
 
     options = { force: true, install_dir: }
     if Rake::FileUtilsExt.nowrite_flag
@@ -290,12 +339,14 @@ module SassConfig
 
   module_function
 
-  def dart_sass_version
+  def package_json(path = '.')
     require 'json'
 
-    spec = JSON.parse(File.read(File.absolute_path('package.json', __dir__)))
+    JSON.parse(File.read(File.absolute_path('package.json', path)))
+  end
 
-    spec['dependencies']['sass']
+  def dart_sass_version
+    package_json['dependencies']['sass']
   end
 
   def default_dart_sass
@@ -359,7 +410,7 @@ module SassConfig
     os = case Platform::OS
          when 'darwin'
            'osx'
-         when 'linux'
+         when 'linux', 'linux-android', 'linux-musl', 'linux-uclibc'
            'linux'
          when 'windows'
            'windows'

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass": "1.80.4"
+    "sass": "1.80.5"
   }
 }

data/lib/sass/compiler/host.rb

@@ -116,7 +116,7 @@ module Sass
 
         case version_response.implementation_name
         when 'dart-sass'
-          info << '[Dart]'
+          info << (CLI::COMMAND.first == 'node' ? '[JavaScript]' : '[Dart]')
         end
 
         info

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.80.4'
+    VERSION = '1.80.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.80.4
+  version: 1.80.5
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,8 +125,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/issues
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.80.4
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.80.4
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.80.5
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.80.5
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 post_install_message: