sass-embedded 1.93.2 → 1.94.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc4054a436ec0eff00459cc8aba58d769e50547962f3a69fbb343be2394fa31
-  data.tar.gz: 2cdb280162c84af663685bf5de55119912f1508360f34fe9aee7e00db5206696
+  metadata.gz: 592760481cef8fc78c82dbf2aa3fae1ee17959b131ffb4aeb837d00560602a14
+  data.tar.gz: 6bce6a2b48dcdbb3a507cd7a64249870a6d204382eaa4464c95ee716b66b1d0f
 SHA512:
-  metadata.gz: e1065fef7644a6b34f81da204d9c0c234f34c3c148f3c55b19749b6256cfd8a29c78790defc32d7249654f5775aea8230feb5720db2b3426423bf30eaff6c458
-  data.tar.gz: abaf76d8d3d6d6c79c92562e359f836e2ceb541973fcd694d8a52e8193dfddba8688afadbe634c28b2dfc40c05289cd746189df16356ba662b66c14c86f22c5e
+  metadata.gz: ba978f37924c71183725144681c9ef2868238248883dd2ec91257138efae09f3ca2de1cadac04459b8b326290700d2ca295ac3758e8d0acc9a85ca97dd8b7f24
+  data.tar.gz: 5e9ffecf35daa73416c0043c8c996be65da95e01501dea74a4de93204797251e3f6ab6765a1a2cfac3681a277d5a57b20051ee193a290b8151b90e4db3b5980c

data/README.md

@@ -5,7 +5,7 @@
 
 This is a Ruby library that implements the host side of the [Embedded Sass protocol](https://github.com/sass/sass/blob/HEAD/spec/embedded-protocol.md).
 
-It exposes a Ruby API for Sass that's backed by a native [Dart Sass](https://sass-lang.com/dart-sass) executable.
+It exposes a Ruby API for Sass that's backed by a native [Dart Sass](https://sass-lang.com/dart-sass) executable on [supported hardware architectures and platforms](https://dart.dev/get-dart#system-requirements) or a Node.js Dart Sass executable everywhere else.
 
 ## Install
 

data/exe/sass

@@ -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

data/ext/sass/Rakefile

@@ -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'
@@ -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
@@ -47,7 +49,7 @@ end
 file 'dart-sass/sass' do
   gem_install 'sass-embedded', SassConfig.gem_version, SassConfig.gem_platform do |installer|
     gh_attestation_verify(installer.gem, repo: 'sass-contrib/sass-embedded-host-ruby')
-    mv File.absolute_path('ext/sass/dart-sass', installer.gem_dir), 'dart-sass'
+    mv File.absolute_path('lib/sass/dart-sass', installer.gem_dir), 'dart-sass'
   end
 rescue StandardError
   archive = fetch(SassConfig.dart_sass)
@@ -57,15 +59,22 @@ rescue StandardError
 end
 
 file 'node_modules/sass' do
-  sh 'npm', 'install'
-rescue StandardError
+  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__), './'
+
   begin
-    sh 'yarn', 'install'
+    sh 'npm', 'install'
   rescue StandardError
     begin
-      sh 'pnpm', 'install'
+      sh 'yarn', 'install'
     rescue StandardError
-      sh 'bun', 'install'
+      begin
+        sh 'pnpm', 'install'
+      rescue StandardError
+        sh 'bun', 'install'
+      end
     end
   end
 end
@@ -135,7 +144,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
@@ -487,7 +496,9 @@ 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
 
   def dart_sass
@@ -606,8 +617,6 @@ module SassConfig
     tag_name = JSON.parse(version)['protocolVersion']
 
     "https://github.com/sass/sass/raw/embedded-protocol-#{tag_name}/spec/embedded_sass.proto"
-  rescue StandardError # TODO: remove after https://github.com/sass/dart-sass/pull/2413
-    'https://github.com/sass/sass/raw/HEAD/spec/embedded_sass.proto'
   end
 
   def development?

data/ext/sass/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sass": "1.93.2"
+    "sass": "file:sass-1.94.2.tgz"
   }
 }

data/lib/sass/compiler/connection.rb

@@ -2,7 +2,7 @@
 
 require 'open3'
 
-require_relative '../../../ext/sass/cli'
+require 'sass/cli'
 
 module Sass
   class Compiler

data/lib/sass/compiler.rb

@@ -11,6 +11,7 @@ require_relative 'embedded/version'
 require_relative 'embedded_protocol'
 require_relative 'exception'
 require_relative 'fork_tracker'
+require_relative 'gem_package_importer'
 require_relative 'logger/silent'
 require_relative 'logger/source_location'
 require_relative 'logger/source_span'

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.93.2'
+    VERSION = '1.94.2'
   end
 end

data/lib/sass/embedded_protocol.rb

@@ -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

data/lib/sass/gem_package_importer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Sass
+  # The built-in RubyGems package importer. This loads pkg: URLs from gems.
+  class GemPackageImporter
+    # @!visibility private
+    def find_file_url(url, _canonicalize_context)
+      return unless url.start_with?('pkg:')
+
+      library, _, path = url[4..].partition(/[#?]/).first.partition('/')
+      gem_dir = Gem::Dependency.new(library).to_spec.gem_dir
+      gem_dir = "/#{gem_dir}" unless gem_dir.start_with?('/')
+
+      "file://#{gem_dir.gsub(/[#%?\\]/, { '#' => '%23', '%' => '%25', '?' => '%3F', '\\' => '%5C' })}/#{path}"
+    rescue Gem::MissingSpecError
+      nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.93.2
+  version: 1.94.2
 platform: ruby
 authors:
 - なつき
@@ -51,8 +51,8 @@ files:
 - README.md
 - exe/sass
 - ext/sass/Rakefile
-- ext/sass/embedded_sass_pb.rb
 - ext/sass/package.json
+- ext/sass/sass-1.94.2.tgz
 - lib/sass-embedded.rb
 - lib/sass/calculation_value.rb
 - lib/sass/calculation_value/calculation_operation.rb
@@ -73,8 +73,10 @@ files:
 - lib/sass/embedded.rb
 - lib/sass/embedded/version.rb
 - lib/sass/embedded_protocol.rb
+- lib/sass/embedded_sass_pb.rb
 - lib/sass/exception.rb
 - lib/sass/fork_tracker.rb
+- lib/sass/gem_package_importer.rb
 - lib/sass/logger/silent.rb
 - lib/sass/logger/source_location.rb
 - lib/sass/logger/source_span.rb
@@ -123,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.93.2
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.93.2
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.94.2
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.94.2
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 rdoc_options: []