cssbundling-rails 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a644c7ba1cafbe1174c0c1fec2cbc9b545e1fc9e620d9c9e348c9cd58f2477a9
-  data.tar.gz: 756402251b7446a021598edcbd26b24fd6e89be36aeeb0f42592febabe5d336a
+  metadata.gz: 319fde756ef3f014dc55f2e3c826e8420d7a294c1284b7858d7195f4df3263f2
+  data.tar.gz: 22855d55faabba57015601f580c548eef162d8ff34f364ea0290bd46c2c04b86
 SHA512:
-  metadata.gz: 63e4c7932449cf676e20d0f3d6510c653ecf1e90aa1fdabae9a5f43b4edb41ee6e8697ce12cff1b1debd2a0d410356ffeec141fe1032b2015edb689e1c6a8920
-  data.tar.gz: b0abcc8f73a13d588066195646989b2218c5a7bd3d9d85344ae1802136ddfa3f660eca75af03835f5af4f75f0c9ea87d026dbbd99efbc4a1b12104d374d6689a
+  metadata.gz: 88081e41b62f0e7b58f729d82f865d7b1557c1628de598aa2f96327d4be0277720e5c79a4657ac52f7b9a833d4ef78c9896d392cebe12b37024be2dccb4be4f3
+  data.tar.gz: 22ce728830cd4be3ad30cba5d9066b9dfba630dfa21aa677959a28e2d86999efd7996898d88e62af9e904de3c312da1bc4368ca0b97137c637fa8ac5cb9a19e8

data/README.md

@@ -12,8 +12,7 @@ This also happens in testing where the bundler attaches to the `test:prepare` ta
 
 That's it!
 
-You can configure your bundler options in the `build:css` script in `package.json` or via the installer-generated `tailwind.config.js` for Tailwind or `postcss.config.js` for PostCSS.
-
+You can configure your bundler options in the `build:css` script in `package.json` or `postcss.config.js` for PostCSS.
 
 ## Installation
 
@@ -22,8 +21,7 @@ You must already have node and yarn installed on your system. You will also need
 1. Run `./bin/bundle add cssbundling-rails`
 2. Run `./bin/rails css:install:[tailwind|bootstrap|bulma|postcss|sass]`
 
-Or, in Rails 7+, you can preconfigure your new application to use a specific bundler with `rails new myapp --css [tailwind|bootstrap|bulma|postcss|sass]`.
-
+Or, in Rails 7+, you can preconfigure your new application to use `cssbundling-rails` for `bootstrap`, `bulma` or `postcss` with `rails new myapp --css [bootstrap|bulma|postcss]`.
 
 ## FAQ
 
@@ -31,9 +29,17 @@ Or, in Rails 7+, you can preconfigure your new application to use a specific bun
 
 If you're already relying on Node to process your JavaScript, this gem is the way to go. But if you're using [the default import map setup in Rails 7+](https://github.com/rails/importmap-rails/), you can avoid having to deal with Node at all by using the standalone versions of Tailwind CSS and Dart Sass that are available through [tailwindcss-rails](https://github.com/rails/tailwindcss-rails/) and [dartsass-rails](https://github.com/rails/dartsass-rails/). It's simpler, fewer moving parts, and still has all the functionality.
 
+In Rails 7+, you can preconfigure your new application to use `tailwindcss-rails` and `dartsass-rails` with `rails new myapp --css [tailwind|sass]`.
+
 ### How do I import relative CSS files with Tailwind?
 
-If you want to use `@import` statements as part of your Tailwind application.js file, you need to [configure Tailwind to use `postcss` and then `postcss-import`](https://tailwindcss.com/docs/using-with-preprocessors#build-time-imports). But you should also consider simply referring to your other CSS files directly, instead of bundling them all into one big file. It's better for caching, and it's simpler to setup. You can refer to other CSS files by expanding the `stylesheet_link_tag` in `application.html.erb` like so: `<%= stylesheet_link_tag "application", "other", "styles", "data-turbo-track": "reload" %>`.
+Tailwind CSS 4 is configured using native CSS. Instead of bundling all your CSS into a single file, consider referencing individual CSS files directly. This approach simplifies setup and improves caching performance. To reference multiple CSS files in Rails, update the stylesheet_link_tag in application.html.erb like this:
+
+```erb
+<%= stylesheet_link_tag "application", "other", "styles", "data-turbo-track": "reload" %>
+```
+
+This ensures your files are properly linked and ready to use.
 
 ### How do I avoid SassC::SyntaxError exceptions on existing projects?
 
@@ -41,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`?
 
@@ -57,7 +63,7 @@ Rails.application.config.assets.css_compressor = nil
 Watch out - if you precompile your files locally, those will be served over the dynamically created ones you expect. The solution:
 
 ```shell
-rails assets:clobber 
+rails assets:clobber
 ```
 
 ### How do I include 3rd party stylesheets from `node_modules` in my bundle?

data/lib/cssbundling/version.rb

@@ -1,3 +1,3 @@
 module Cssbundling
-  VERSION = "1.4.1"
+  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

@@ -9,8 +9,14 @@ module Helpers
     using_bun? ? "bun run" : "yarn"
   end
 
+  def bundler_x_cmd
+    using_bun? ? "bunx" : "npx"
+  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/install/tailwind/application.tailwind.css

@@ -1,3 +1 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss";

data/lib/install/tailwind/install.rb

@@ -3,11 +3,10 @@ self.extend Helpers
 
 apply "#{__dir__}/../install.rb"
 
-say "Install Tailwind (+PostCSS w/ autoprefixer)"
-copy_file "#{__dir__}/tailwind.config.js", "tailwind.config.js"
+say "Install Tailwind"
 copy_file "#{__dir__}/application.tailwind.css", "app/assets/stylesheets/application.tailwind.css"
-run "#{bundler_cmd} add tailwindcss@latest postcss@latest autoprefixer@latest"
+run "#{bundler_cmd} add tailwindcss@latest @tailwindcss/cli@latest"
 
 say "Add build:css script"
 add_package_json_script "build:css",
-  "tailwindcss -i ./app/assets/stylesheets/application.tailwind.css -o ./app/assets/builds/application.css --minify"
+  "#{bundler_x_cmd} @tailwindcss/cli -i ./app/assets/stylesheets/application.tailwind.css -o ./app/assets/builds/application.css --minify"

data/lib/install/tailwind/package.json

@@ -2,6 +2,6 @@
   "name": "app",
   "private": "true",
   "scripts": {
-    "build:css": "tailwindcss -i ./app/assets/stylesheets/application.tailwind.css -o ./app/assets/builds/application.css"
+    "build:css": "npx @tailwindcss/cli -i ./app/assets/stylesheets/application.tailwind.css -o ./app/assets/builds/application.css"
   }
 }

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.1
+  version: 1.4.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 - Dom Christie
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-29 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: []
@@ -54,7 +52,6 @@ files:
 - lib/install/tailwind/application.tailwind.css
 - lib/install/tailwind/install.rb
 - lib/install/tailwind/package.json
-- lib/install/tailwind/tailwind.config.js
 - lib/tasks/cssbundling/build.rake
 - lib/tasks/cssbundling/clobber.rake
 - lib/tasks/cssbundling/install.rake
@@ -63,7 +60,6 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/rails/cssbundling-rails/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,8 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-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.

data/lib/install/tailwind/tailwind.config.js

@@ -1,8 +0,0 @@
-module.exports = {
-  content: [
-    './app/views/**/*.html.erb',
-    './app/helpers/**/*.rb',
-    './app/assets/stylesheets/**/*.css',
-    './app/javascript/**/*.js'
-  ]
-}