cssbundling-rails 1.3.3 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77c2a2dbfa75c9cdb60655f5624811509c3406c0628e3de359ebc8681c90a648
-  data.tar.gz: 3cd9fa316f58f1ba5268561b8fe9bc5306393e3a10421283a984b98bdce56de5
+  metadata.gz: a644c7ba1cafbe1174c0c1fec2cbc9b545e1fc9e620d9c9e348c9cd58f2477a9
+  data.tar.gz: 756402251b7446a021598edcbd26b24fd6e89be36aeeb0f42592febabe5d336a
 SHA512:
-  metadata.gz: 1a5871258df72a6352adab32fa3440a8f935d16a19f58875a1c0394c9c3dfedb1e8dee93fc79183b8fbbab3bb388f8c7783a15c0c13786f5e33d810175e81036
-  data.tar.gz: 372189f7681950572648f9f56aa578e47a6a42c1a7e12ac92d4f122fbd81433d493a09a05b22f2b0c47d7f9c122bafcce4ab41c57f34994be27534aee8e9f09c
+  metadata.gz: 63e4c7932449cf676e20d0f3d6510c653ecf1e90aa1fdabae9a5f43b4edb41ee6e8697ce12cff1b1debd2a0d410356ffeec141fe1032b2015edb689e1c6a8920
+  data.tar.gz: b0abcc8f73a13d588066195646989b2218c5a7bd3d9d85344ae1802136ddfa3f660eca75af03835f5af4f75f0c9ea87d026dbbd99efbc4a1b12104d374d6689a

data/README.md

@@ -43,6 +43,15 @@ Some CSS packages use new CSS features that are not supported by the default Sas
 
 A common issue is that your repository does not contain the output directory used by the build commands. You must have `app/assets/builds` available. Add the directory with a `.gitkeep` file, and you'll ensure it's available in production.
 
+### How do I avoid `ActionView::Template::Error: Error: Function rgb is missing argument $green`?
+
+This might happen if your Gemfile.lock contains the legacy `sassc-rails`, which might be need while progressively migrating your project, or which might be a transitive dependency of a gem your project depends on and over which you have no control. In this case, prevent Sprockets from bundling the CSS on top of the bundling already performed by this gem. Make sure do this for all environments, not only production, otherwise your test suite may fail.
+
+```
+# config/initializers/assets.rb
+Rails.application.config.assets.css_compressor = nil
+```
+
 ### Why isn't Rails using my updated css files?
 
 Watch out - if you precompile your files locally, those will be served over the dynamically created ones you expect. The solution:
@@ -51,6 +60,15 @@ Watch out - if you precompile your files locally, those will be served over the
 rails assets:clobber 
 ```
 
+### How do I include 3rd party stylesheets from `node_modules` in my bundle?
+
+Use an `@import` statement and path to a specific stylesheet, omitting the `node_modules/` segment and the file's extension. For example:
+
+```scss
+/* Desired file is at at node_modules/select2/dist/css/select2.css */
+@import "select2/dist/css/select2";
+```
+
 ## License
 
 CSS Bundling for Rails is released under the [MIT License](https://opensource.org/licenses/MIT).

data/lib/cssbundling/version.rb

@@ -1,3 +1,3 @@
 module Cssbundling
-  VERSION = "1.3.3"
+  VERSION = "1.4.1"
 end

data/lib/install/bootstrap/install.rb

@@ -1,6 +1,8 @@
 require_relative "../helpers"
 self.extend Helpers
 
+apply "#{__dir__}/../install.rb"
+
 say "Install Bootstrap with Bootstrap Icons, Popperjs/core and Autoprefixer"
 copy_file "#{__dir__}/application.bootstrap.scss",
    "app/assets/stylesheets/application.bootstrap.scss"
@@ -19,6 +21,19 @@ else
   say %(Add import * as bootstrap from "bootstrap" to your entry point JavaScript file), :red
 end
 
+if Rails.root.join("config/importmap.rb").exist?
+  say "Pin Bootstrap"
+  append_to_file "config/importmap.rb", %(pin "bootstrap", to: "bootstrap.min.js"\n)
+
+  inject_into_file "config/initializers/assets.rb", after: /.*Rails.application.config.assets.paths.*\n/ do
+    <<~RUBY
+      Rails.application.config.assets.paths << Rails.root.join("node_modules/bootstrap/dist/js")
+    RUBY
+  end
+
+  append_to_file "config/initializers/assets.rb", %(Rails.application.config.assets.precompile << "bootstrap.min.js")
+end
+
 add_package_json_script("build:css:compile", "sass ./app/assets/stylesheets/application.bootstrap.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules")
 add_package_json_script("build:css:prefix", "postcss ./app/assets/builds/application.css --use=autoprefixer --output=./app/assets/builds/application.css")
 add_package_json_script("build:css", "#{bundler_run_cmd} build:css:compile && #{bundler_run_cmd} build:css:prefix")

data/lib/install/bulma/install.rb

@@ -1,6 +1,8 @@
 require_relative "../helpers"
 self.extend Helpers
 
+apply "#{__dir__}/../install.rb"
+
 say "Install Bulma"
 copy_file "#{__dir__}/application.bulma.scss",
    "app/assets/stylesheets/application.bulma.scss"

data/lib/install/dev

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-if ! gem list foreman -i --silent; then
+if gem list --no-installed --exact --silent foreman; then
   echo "Installing foreman..."
   gem install foreman
 fi
@@ -8,4 +8,4 @@ fi
 # Default to port 3000 if not specified
 export PORT="${PORT:-3000}"
 
-exec foreman start -f Procfile.dev "$@"
+exec foreman start -f Procfile.dev --env /dev/null "$@"

data/lib/install/helpers.rb

@@ -21,7 +21,7 @@ module Helpers
     if using_bun?
       package_json = JSON.parse(File.read("package.json"))
       package_json["scripts"] ||= {}
-      package_json["scripts"][name] = script
+      package_json["scripts"][name] = script.gsub('\\"', '"')
       File.write("package.json", JSON.pretty_generate(package_json))
       run %(bun run #{name}) if run_script
     else

data/lib/install/install.rb

@@ -54,5 +54,5 @@ 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

data/lib/install/postcss/install.rb

@@ -1,6 +1,8 @@
 require_relative "../helpers"
 self.extend Helpers
 
+apply "#{__dir__}/../install.rb"
+
 say "Install PostCSS w/ nesting and autoprefixer"
 copy_file "#{__dir__}/postcss.config.js", "postcss.config.js"
 copy_file "#{__dir__}/application.postcss.css", "app/assets/stylesheets/application.postcss.css"

data/lib/install/sass/install.rb

@@ -1,6 +1,8 @@
 require_relative "../helpers"
 self.extend Helpers
 
+apply "#{__dir__}/../install.rb"
+
 say "Install Sass"
 copy_file "#{__dir__}/application.sass.scss", "app/assets/stylesheets/application.sass.scss"
 run "#{bundler_cmd} add sass"

data/lib/install/tailwind/install.rb

@@ -1,6 +1,8 @@
 require_relative "../helpers"
 self.extend Helpers
 
+apply "#{__dir__}/../install.rb"
+
 say "Install Tailwind (+PostCSS w/ autoprefixer)"
 copy_file "#{__dir__}/tailwind.config.js", "tailwind.config.js"
 copy_file "#{__dir__}/application.tailwind.css", "app/assets/stylesheets/application.tailwind.css"

data/lib/tasks/cssbundling/build.rake

@@ -22,15 +22,36 @@ module Cssbundling
     extend self
 
     def install_command
-      return "bun install" if File.exist?('bun.lockb') || (tool_exists?('bun') && !File.exist?('yarn.lock'))
-      return "yarn install" if File.exist?('yarn.lock') || tool_exists?('yarn')
-      raise "cssbundling-rails: No suitable tool found for installing JavaScript dependencies"
+      case tool
+      when :bun then "bun install"
+      when :yarn then "yarn install"
+      when :pnpm then "pnpm install"
+      when :npm then "npm install"
+      else raise "cssbundling-rails: No suitable tool found for installing JavaScript dependencies"
+      end
     end
 
     def build_command
-      return "bun run build:css" if File.exist?('bun.lockb') || (tool_exists?('bun') && !File.exist?('yarn.lock'))
-      return "yarn build:css" if File.exist?('yarn.lock') || tool_exists?('yarn')
-      raise "cssbundling-rails: No suitable tool found for building CSS"
+      case tool
+      when :bun then "bun run build:css"
+      when :yarn then "yarn build:css"
+      when :pnpm then "pnpm build:css"
+      when :npm then "npm run build:css"
+      else raise "cssbundling-rails: No suitable tool found for building CSS"
+      end
+    end
+
+    def tool
+      case
+      when File.exist?('bun.lockb') then :bun
+      when File.exist?('yarn.lock') then :yarn
+      when File.exist?('pnpm-lock.yaml') then :pnpm
+      when File.exist?('package-lock.json') then :npm
+      when tool_exists?('bun') then :bun
+      when tool_exists?('yarn') then :yarn
+      when tool_exists?('pnpm') then :pnpm
+      when tool_exists?('npm') then :npm
+      end
     end
 
     def tool_exists?(tool)

data/lib/tasks/cssbundling/install.rake

@@ -1,32 +1,27 @@
 namespace :css do
   namespace :install do
-    desc "Install shared elements for all bundlers"
-    task :shared do
-      system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../../install/install.rb",  __dir__)}"
-    end
-
     desc "Install Tailwind"
-    task tailwind: "css:install:shared" do
+    task :tailwind do
       system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../../install/tailwind/install.rb",  __dir__)}"
     end
 
     desc "Install PostCSS"
-    task postcss: "css:install:shared" do
+    task :postcss do
       system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../../install/postcss/install.rb",  __dir__)}"
     end
 
     desc "Install Sass"
-    task sass: "css:install:shared" do
+    task :sass do
       system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../../install/sass/install.rb",  __dir__)}"
     end
 
     desc "Install Bootstrap"
-    task bootstrap: "css:install:shared" do
+    task :bootstrap do
       system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../../install/bootstrap/install.rb",  __dir__)}"
     end
 
     desc "Install Bulma"
-    task bulma: "css:install:shared" do
+    task :bulma do
       system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../../install/bulma/install.rb",  __dir__)}"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cssbundling-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -61,7 +61,8 @@ files:
 homepage: https://github.com/rails/cssbundling-rails
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/rails/cssbundling-rails/releases
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Bundle and process CSS with Tailwind, Bootstrap, PostCSS, Sass in Rails via