cssbundling-rails 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a66c0e0cc7f1112643a6c720f3f44ad0cd5f755bcf041a20c457b85dcc1d4399
-  data.tar.gz: 583f803ecef9faf25ae086b134124bee3f20bf518fb3134c376ec07e214c60f2
+  metadata.gz: 319fde756ef3f014dc55f2e3c826e8420d7a294c1284b7858d7195f4df3263f2
+  data.tar.gz: 22855d55faabba57015601f580c548eef162d8ff34f364ea0290bd46c2c04b86
 SHA512:
-  metadata.gz: bf563e95e2d5bb3649fd863ad960b8442cad65283671bb2546f43cd35e0f26000ae99b4495c5b665aad99c8051be1a69cf4a4c6706afc9506aba93691ff8ac7f
-  data.tar.gz: fb26b6ec28b4d8e87f8e2df215da00c923f7601c7d5112a4486af99241347f6ab2cbe0f02292f991270faa2813fd81ed82a932658c6522a3881e86169f006ec7
+  metadata.gz: 88081e41b62f0e7b58f729d82f865d7b1557c1628de598aa2f96327d4be0277720e5c79a4657ac52f7b9a833d4ef78c9896d392cebe12b37024be2dccb4be4f3
+  data.tar.gz: 22ce728830cd4be3ad30cba5d9066b9dfba630dfa21aa677959a28e2d86999efd7996898d88e62af9e904de3c312da1bc4368ca0b97137c637fa8ac5cb9a19e8

data/README.md

@@ -47,7 +47,7 @@ Some CSS packages use new CSS features that are not supported by the default Sas
 
 ### Why do I get `application.css not in asset pipeline` in production?
 
-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.
+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 `.keep` file, and you'll ensure it's available in production.
 
 ### How do I avoid `ActionView::Template::Error: Error: Function rgb is missing argument $green`?
 

data/lib/cssbundling/version.rb

@@ -1,3 +1,3 @@
 module Cssbundling
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/lib/install/bootstrap/install.rb

@@ -23,15 +23,15 @@ 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)
+  append_to_file "config/importmap.rb", %(pin "bootstrap", to: "bootstrap.bundle.min.js"\n)
 
-  inject_into_file "config/initializers/assets.rb", after: /.*Rails.application.config.assets.paths.*\n/ do
+  inject_into_file "config/initializers/assets.rb", after: /.*\/bootstrap-icons\/font.*\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")
+  append_to_file "config/initializers/assets.rb", %(Rails.application.config.assets.precompile << "bootstrap.bundle.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")

data/lib/install/helpers.rb

@@ -14,7 +14,9 @@ module Helpers
   end
 
   def using_bun?
-    File.exist?('bun.lockb') || (tool_exists?('bun') && !File.exist?('yarn.lock'))
+    tool_exists?('bun') && (File.exist?('bun.lockb') || 
+                            File.exist?('bun.lock') ||       
+                            File.exist?('yarn.lock'))
   end
 
   def tool_exists?(tool)

data/lib/install/install.rb

@@ -20,21 +20,23 @@ end
 say "Remove app/assets/stylesheets/application.css so build output can take over"
 remove_file "app/assets/stylesheets/application.css"
 
-if (app_layout_path = Rails.root.join("app/views/layouts/application.html.erb")).exist?
-  say "Add stylesheet link tag in application layout"
-  insert_into_file(
-    app_layout_path.to_s,
-    defined?(Turbo) ?
-      %(\n    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>) :
-      %(\n    <%= stylesheet_link_tag "application" %>),
-    before: /\s*<\/head>/
-  )
-else
-  say "Default application.html.erb is missing!", :red
-  if defined?(Turbo)
-    say %(        Add <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> within the <head> tag in your custom layout.)
+if Rails::VERSION::MAJOR < 8
+  if (app_layout_path = Rails.root.join("app/views/layouts/application.html.erb")).exist?
+    say "Add stylesheet link tag in application layout"
+    insert_into_file(
+      app_layout_path.to_s,
+      defined?(Turbo) ?
+        %(\n    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>) :
+        %(\n    <%= stylesheet_link_tag "application" %>),
+      before: /\s*<\/head>/
+    )
   else
-    say %(        Add <%= stylesheet_link_tag "application" %> within the <head> tag in your custom layout.)
+    say "Default application.html.erb is missing!", :red
+    if defined?(Turbo)
+      say %(        Add <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> within the <head> tag in your custom layout.)
+    else
+      say %(        Add <%= stylesheet_link_tag "application" %> within the <head> tag in your custom layout.)
+    end
   end
 end
 

data/lib/tasks/cssbundling/build.rake

@@ -1,5 +1,5 @@
 namespace :css do
-  desc "Install JavaScript dependencies"
+  desc "Install CSS dependencies"
   task :install do
     command = Cssbundling::Tasks.install_command
     unless system(command)
@@ -21,42 +21,42 @@ module Cssbundling
   module Tasks
     extend self
 
+    LOCK_FILES = {
+      bun: %w[bun.lockb bun.lock yarn.lock],
+      yarn: %w[yarn.lock],
+      pnpm: %w[pnpm-lock.yaml],
+      npm: %w[package-lock.json]
+    }
+
     def install_command
-      case tool
-      when :bun then "bun install"
-      when :yarn then "yarn install"
-      when :pnpm then "pnpm install"
-      when :npm then "npm install"
+      case
+      when using_tool?(:bun) then "bun install"
+      when using_tool?(:yarn) then "yarn install"
+      when using_tool?(:pnpm) then "pnpm install"
+      when using_tool?(:npm) then "npm install"
       else raise "cssbundling-rails: No suitable tool found for installing JavaScript dependencies"
       end
     end
 
     def build_command
-      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"
+      case
+      when using_tool?(:bun) then "bun run build:css"
+      when using_tool?(:yarn) then "yarn build:css"
+      when using_tool?(:pnpm) then "pnpm build:css"
+      when using_tool?(: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
+    private
 
     def tool_exists?(tool)
       system "command -v #{tool} > /dev/null"
     end
+
+    def using_tool?(tool)
+      tool_exists?(tool) && LOCK_FILES[tool].any? { |file| File.exist?(file) }
+    end
   end
 end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cssbundling-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 - Dom Christie
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -25,7 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-description:
 email: david@loudthinking.com
 executables: []
 extensions: []
@@ -62,7 +60,6 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/rails/cssbundling-rails/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,8 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Bundle and process CSS with Tailwind, Bootstrap, PostCSS, Sass in Rails via
   Node.js.