dartsass-rails 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63c02e6013b5cc320cc16b785bfde748ed62b4c7131381a0b20094671a3e60e2
-  data.tar.gz: 97f292bf59c8d746cd8d3234496d04e235ccebf2ffeb5561070cfd40b95c8c48
+  metadata.gz: 8bee8507190c1b8fef63816699f2174316cb9b96de4fc1d6ce4a733b73f9334e
+  data.tar.gz: 29b2d2b7eed2bb31222f1d589bba04e9e6f7726c2ed1d0b7db82b5db91a41382
 SHA512:
-  metadata.gz: 6df4dbdbe880d4bda7d6f70d2dbe2393efcde5ab03677c1ab914d0307515b48324d7b249fdd394abc23ba8141f587b2f3bd2e29961854b055b78c1408c91a414
-  data.tar.gz: 107198c8ec71b941ab26d2f6071b192e459a1f0bf0fbca47b8ec59b2a12c7f7aff4e638f789e7b8eb93c10746be0aa3eaa94de653bd099d6741ed15ea78ea0d7
+  metadata.gz: a0f2b2541a72fb15f85e3d11801cd16aea6b972f6253f1399aece4dcc6e77567e734267aa011de2e645dd28de1540f2f68252ae593815eb2a7a0f0a88d0f6217
+  data.tar.gz: 24165e161833a474acf36ed4ad2c866397f64a524bbd70640b3ec167083575dd65e2ce094afa53e5bf9562a84526b8b80cc010bc220c5d4e86f4640d5e06ded6

data/README.md

@@ -2,7 +2,7 @@
 
 [Sass](https://sass-lang.com) is a stylesheet language that’s compiled to CSS. It allows you to use variables, nested rules, mixins, functions, and more, all with a fully CSS-compatible syntax.
 
-This gem wraps [the standalone executable version](https://github.com/sass/dart-sass/releases) of the Dart version of Sass. These executables are platform specific, but included in this gem are the ones for macOS (Intel, Apple Silicon), Linux (x86-64, AArch64), and Windows (x86-64).
+This gem wraps [the standalone executable version](https://github.com/sass/dart-sass/releases) of the Dart version of Sass. The platform specific Dart Sass executables are distributed by [sass-embedded](https://rubygems.org/gems/sass-embedded) gem.
 
 The installer will create your default Sass input file in `app/assets/stylesheets/application.scss`. This is where you should import all the style files to be compiled [using the @use rule](https://sass-lang.com/documentation/at-rules/use). When you run `rails dartsass:build`, this input file will be used to generate the output in `app/assets/builds/application.css`. That's the output CSS that you'll include in your app. The load path for Sass is automatically configured to be `app/assets/stylesheets`.
 
@@ -35,13 +35,22 @@ Rails.application.config.dartsass.builds = {
 
 The hash key is the relative path to a Sass file in `app/assets/stylesheets/` and the hash value will be the name of the file output to `app/assets/builds/`.
 
+If both the hash key and the hash value are directories instead of files, it configures a directory to directory compliation, which compiles all public Sass files whose filenames do not start with underscore (`_`).
+
+```ruby
+# config/initializers/dartsass.rb
+Rails.application.config.dartsass.builds = {
+  "." => "."
+}
+```
+
 ## Configuring build options
 
-By default, sass is invoked with `--style=compressed --no-source-map`. You can adjust these options by overwriting `Rails.application.config.dartsass.build_options`.
+By default, sass is invoked with `["--style=compressed", "--no-source-map"]`. You can adjust these options by overwriting `Rails.application.config.dartsass.build_options`.
 
 ```ruby
 # config/initializers/dartsass.rb
-Rails.application.config.dartsass.build_options << " --quiet-deps"
+Rails.application.config.dartsass.build_options << "--no-charset" << "--quiet-deps"
 ```
 
 ## Importing assets from gems
@@ -106,7 +115,7 @@ the Dart Sass process is most likely not running.
 
 ##### Solution
 
-Make sure the Dart Sass process is running by starting the Rails sever by
+Make sure the Dart Sass process is running by starting the Rails server by
 running: `./bin/dev`.
 
 #### Running continuous integration pipelines
@@ -123,8 +132,9 @@ the following command: `bundle exec rails dartsass:build`.
 
 ## Version
 
-Dart Sass 1.49.0
-
+``` sh
+bundle exec dartsass --version
+```
 
 ## License
 

data/exe/dartsass

@@ -1,26 +1,4 @@
 #! /usr/bin/env ruby
-# because rubygems shims assume a gem's executables are Ruby
+# frozen_string_literal: true
 
-require "shellwords"
-require "rbconfig"
-
-system_config = RbConfig::CONFIG
-platform_string = "#{system_config["host_cpu"]}-#{system_config["host_os"]}"
-
-exe_path =
-  case platform_string
-  when /aarch64-linux/ then File.join(__dir__, "aarch64-linux/sass")
-  when /arm(64)?-darwin/ then File.join(__dir__, "arm64-darwin/sass")
-  when /darwin/ then File.join(__dir__, "darwin/sass")
-  when /linux/ then File.join(__dir__, "linux/sass")
-  when /mswin|mingw|cygwin/ then File.join(__dir__, "mingw32/sass.bat")
-  else
-    STDERR.puts(<<~ERRMSG)
-      ERROR: dartsass-rails does not support the #{platform_string} platform
-    ERRMSG
-    exit 1
-  end
-
-command = Shellwords.join([ exe_path, ARGV ].flatten)
-puts "+ #{command}"
-exec(command)
+load Gem.bin_path("sass-embedded", "sass")

data/lib/dartsass/engine.rb

@@ -4,6 +4,6 @@ module Dartsass
   class Engine < ::Rails::Engine
     config.dartsass = ActiveSupport::OrderedOptions.new
     config.dartsass.builds = { "application.scss" => "application.css" }
-    config.dartsass.build_options = "--style=compressed --no-source-map"
+    config.dartsass.build_options = ["--style=compressed", "--no-source-map"]
   end
 end

data/lib/dartsass/runner.rb

@@ -0,0 +1,27 @@
+module Dartsass
+  module Runner
+    EXEC_PATH      = "#{Pathname.new(__dir__).to_s}/../../exe/dartsass"
+    CSS_LOAD_PATH  = Rails.root.join("app/assets/stylesheets")
+    CSS_BUILD_PATH = Rails.root.join("app/assets/builds")
+
+    module_function
+
+    def dartsass_build_mapping
+      Rails.application.config.dartsass.builds.map { |input, output|
+        "#{CSS_LOAD_PATH.join(input)}:#{CSS_BUILD_PATH.join(output)}"
+      }
+    end
+
+    def dartsass_build_options
+      Rails.application.config.dartsass.build_options.flat_map(&:split)
+    end
+
+    def dartsass_load_paths
+      [ CSS_LOAD_PATH ].concat(Rails.application.config.assets.paths).flat_map { |path| ["--load-path", path.to_s] }
+    end
+
+    def dartsass_compile_command
+      [ RbConfig.ruby, EXEC_PATH ].concat(dartsass_build_options).concat(dartsass_load_paths).concat(dartsass_build_mapping)
+    end
+  end
+end

data/lib/dartsass/version.rb

@@ -1,3 +1,3 @@
 module Dartsass
-  VERSION = "0.4.1"
+  VERSION = "0.5.1"
 end

data/lib/install/dartsass.rb

@@ -32,7 +32,7 @@ else
 end
 
 say "Add bin/dev to start foreman"
-copy_file "#{__dir__}/dev", "bin/dev"
+copy_file "#{__dir__}/dev", "bin/dev", force: true
 chmod "bin/dev", 0755, verbose: false
 
 say "Compile initial Dart Sass build"

data/lib/tasks/build.rake

@@ -1,41 +1,23 @@
-EXEC_PATH      = "#{Pathname.new(__dir__).to_s}/../../exe/dartsass"
-CSS_LOAD_PATH  = Rails.root.join("app/assets/stylesheets")
-CSS_BUILD_PATH = Rails.root.join("app/assets/builds")
-
-def dartsass_build_mapping
-  Rails.application.config.dartsass.builds.map { |input, output|
-    "#{Shellwords.escape(CSS_LOAD_PATH.join(input))}:#{Shellwords.escape(CSS_BUILD_PATH.join(output))}"
-  }.join(" ")
-end
-
-def dartsass_build_options
-  Rails.application.config.dartsass.build_options
-end
-
-def dartsass_load_paths
-  [ CSS_LOAD_PATH ].concat(Rails.application.config.assets.paths).map { |path| "--load-path #{Shellwords.escape(path)}" }.join(" ")
-end
-
-def dartsass_compile_command
-   "#{EXEC_PATH} #{dartsass_build_options} #{dartsass_load_paths} #{dartsass_build_mapping}"
-end
+require "dartsass/runner"
 
 namespace :dartsass do
   desc "Build your Dart Sass CSS"
   task build: :environment do
-    system dartsass_compile_command, exception: true
+    system(*Dartsass::Runner.dartsass_compile_command, exception: true)
   end
 
   desc "Watch and build your Dart Sass CSS on file changes"
   task watch: :environment do
-    system "#{dartsass_compile_command} -w", exception: true
+    system(*Dartsass::Runner.dartsass_compile_command, "--watch", exception: true)
   end
 end
 
-Rake::Task["assets:precompile"].enhance(["dartsass:build"])
+unless ENV["SKIP_CSS_BUILD"]
+  Rake::Task["assets:precompile"].enhance(["dartsass:build"])
 
-if Rake::Task.task_defined?("test:prepare")
-  Rake::Task["test:prepare"].enhance(["dartsass:build"])
-elsif Rake::Task.task_defined?("db:test:prepare")
-  Rake::Task["db:test:prepare"].enhance(["dartsass:build"])
+  if Rake::Task.task_defined?("test:prepare")
+    Rake::Task["test:prepare"].enhance(["dartsass:build"])
+  elsif Rake::Task.task_defined?("db:test:prepare")
+    Rake::Task["db:test:prepare"].enhance(["dartsass:build"])
+  end
 end

data/lib/tasks/clobber.rake

@@ -1,8 +1,8 @@
 namespace :dartsass do
   desc "Remove CSS builds"
   task :clobber do
-    rm_rf Dir["app/assets/builds/[^.]*.css"], verbose: false
-    rm_rf Dir["app/assets/builds/[^.]*.css\.map"], verbose: false
+    rm_rf Dir["app/assets/builds/**/[^.]*.css"], verbose: false
+    rm_rf Dir["app/assets/builds/**/[^.]*.css\.map"], verbose: false
   end
 end
 

data/lib/tasks/install.rake

@@ -1,6 +1,6 @@
 namespace :dartsass do
   desc "Install Dart Sass into the app"
   task :install do
-    system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../install/dartsass.rb", __dir__)}", exception: true
+    system RbConfig.ruby, "./bin/rails", "app:template", "LOCATION=#{File.expand_path("../install/dartsass.rb", __dir__)}", exception: true
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dartsass-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-16 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: sass-embedded
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.63'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.63'
 description:
 email: david@hey.com
 executables:
@@ -31,25 +45,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE-DEPENDENCIES
 - MIT-LICENSE
 - README.md
 - Rakefile
-- exe/aarch64-linux/sass
-- exe/arm64-darwin/sass
 - exe/dartsass
-- exe/darwin/LICENSE
-- exe/darwin/sass
-- exe/darwin/src/dart
-- exe/darwin/src/sass.snapshot
-- exe/linux/LICENSE
-- exe/linux/sass
-- exe/mingw32/LICENSE
-- exe/mingw32/sass.bat
-- exe/mingw32/src/dart.exe
-- exe/mingw32/src/sass.snapshot
 - lib/dartsass-rails.rb
 - lib/dartsass/engine.rb
+- lib/dartsass/runner.rb
 - lib/dartsass/version.rb
 - lib/install/Procfile.dev
 - lib/install/application.scss
@@ -79,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Integrate Dart Sass with the asset pipeline in Rails.

data/LICENSE-DEPENDENCIES

@@ -1,26 +0,0 @@
-dartsass-rails redistributes executables from the https://github.com/sass/dart-sass/ project
-
-The license for that software can be found at https://github.com/sass/dart-sass/blob/main/LICENSE which is reproduced here for your convenience:
-
-    Copyright (c) 2016, Google Inc.
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Licenses for individual platform binaries are available under exe/[platform]/LICENSE