cssbundling-rails 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99329a3089f29c127a662c2b9ee910f0d432a450dc8f8581a97e0876cbbafdff
-  data.tar.gz: d5bc8749354e3094058d2cb0c8151200f15b7a455e2913ed43f1202e1fb40771
+  metadata.gz: 3eb8589b682d3c0c276c75baa0923c706e3f09de2a554e47ea7f008e01b555c5
+  data.tar.gz: c8c43687d5cbf5cf3fc7f2e7fcbeb35f99b80e2986227135e306cb4a42167423
 SHA512:
-  metadata.gz: d66dcdf7c882660552852c38b6bb5066d9b53844ae68c7d937a0886cdfe7e29a70360d68d57ead20f21b4bbf6c0f92a09386c98259e901ceb300f5ac47706c0a
-  data.tar.gz: 7f025dd959ffc7a8453198c4537e795d82f933f74c9ed0cdb82bd44b1a3efba22e7ebd8701ce163c1d6501cef231899e484a0cdd64a40de059da47ee82480278
+  metadata.gz: 88e4959bbf33a9b580f33a8316a327f437b3ce422d69a95e2e7c55df99e2fc840e98eb636c6baa9e281421415c62e5de28e42d39db2d1b0440db46895f498959
+  data.tar.gz: ee626b8d3329f131034b218ccac7c5590d36afa7d4191b75afa0a06ed5f27268fe5c1720cdd64d347102ec71d5bdff34c993d12b460030064802c0ccc6d71899

data/README.md

@@ -8,9 +8,7 @@ Whenever the bundler detects changes to any of the stylesheet files in your proj
 
 When you deploy your application to production, the `css:build` task attaches to the `assets:precompile` task to ensure that all your package dependencies from `package.json` have been installed via yarn, and then runs `yarn build:css` to process your stylesheet entrypoint, as it would in development. This output is then picked up by the asset pipeline, digested, and copied into public/assets, as any other asset pipeline file.
 
-This also happens in testing where the bundler attaches to the `test:prepare` task to ensure the stylesheets have been bundled before testing commences. (Note that this currently only applies to rails `test:*` tasks (like `test:all` or `test:controllers`), not "rails test", as that doesn't load `test:prepare`).
-
-If your test framework does not define a `test:prepare` Rake task, ensure that your test framework runs `css:build` to bundle stylesheets before testing commences. If your setup uses [jsbundling-rails](https://github.com/rails/jsbundling-rails) (ie, esbuild + tailwind), you will also need to run `javascript:build`.
+This also happens in testing where the bundler attaches to the `test:prepare` task to ensure the stylesheets have been bundled before testing commences. If your test framework does not call the `test:prepare` Rake task, ensure that your test framework runs `css:build` to bundle stylesheets before testing commences. If your setup uses [jsbundling-rails](https://github.com/rails/jsbundling-rails) (ie, esbuild + tailwind), you will also need to run `javascript:build`.
 
 That's it!
 
@@ -45,6 +43,14 @@ 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.
 
+### 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:
+
+```shell
+rails assets:clobber 
+```
+
 ## 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.1.1"
+  VERSION = "1.2.0"
 end

data/lib/install/Procfile.dev

@@ -1,2 +1,2 @@
-web: bin/rails server -p 3000
+web: unset PORT && env RUBY_DEBUG_OPEN=true bin/rails server
 css: yarn build:css --watch

data/lib/install/bootstrap/install.rb

@@ -1,7 +1,7 @@
-say "Install Bootstrap with Bootstrap Icons and Popperjs/core"
+say "Install Bootstrap with Bootstrap Icons, Popperjs/core and Autoprefixer"
 copy_file "#{__dir__}/application.bootstrap.scss",
    "app/assets/stylesheets/application.bootstrap.scss"
-run "yarn add sass bootstrap bootstrap-icons @popperjs/core"
+run "yarn add sass bootstrap bootstrap-icons @popperjs/core postcss postcss-cli autoprefixer nodemon"
 
 inject_into_file "config/initializers/assets.rb", after: /.*Rails.application.config.assets.paths.*\n/ do
   <<~RUBY
@@ -16,12 +16,32 @@ else
   say %(Add import * as bootstrap from "bootstrap" to your entry point JavaScript file), :red
 end
 
-say "Add build:css script"
-build_script = "sass ./app/assets/stylesheets/application.bootstrap.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules"
+def add_npm_script(name, script, run_script=true)
+  case `npx -v`.to_f
+  when 7.1...8.0
+    say "Add #{name} script"
+    run %(npm set-script #{name} "#{script}")
+    run %(yarn #{name}) if run_script
+  when (8.0..)
+    say "Add #{name} script"
+    run %(npm pkg set scripts.#{name}="#{script}")
+    run %(yarn #{name}) if run_script
+  else
+    say %(Add "scripts": { "#{name}": "#{script}" } to your package.json), :green
+  end
+end
+
+add_npm_script("build:css:compile", "sass ./app/assets/stylesheets/application.bootstrap.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules")
+add_npm_script("build:css:prefix", "postcss ./app/assets/builds/application.css --use=autoprefixer --output=./app/assets/builds/application.css")
+add_npm_script("build:css", "yarn build:css:compile && yarn build:css:prefix")
+add_npm_script("watch:css", "nodemon --watch ./app/assets/stylesheets/ --ext scss --exec \\\"yarn build:css\\\"", false)
+
+gsub_file "Procfile.dev", "build:css --watch", "watch:css"
 
-if (`npx -v`.to_f < 7.1 rescue "Missing")
-  say %(Add "scripts": { "build:css": "#{build_script}" } to your package.json), :red
+case `npx -v`.to_f
+when (7.1..)
+  say "Add browserslist config"
+  run %(npm pkg set browserslist[]=defaults)
 else
-  run %(npm set-script build:css "#{build_script}")
-  run %(yarn build:css)
+  say %(Add "browserslist": ["defaults"] to your package.json), :green
 end

data/lib/install/bulma/install.rb

@@ -6,9 +6,13 @@ run "yarn add sass bulma"
 say "Add build:css script"
 build_script = "sass ./app/assets/stylesheets/application.bulma.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules"
 
-if (`npx -v`.to_f < 7.1 rescue "Missing")
-  say %(Add "scripts": { "build:css": "#{build_script}" } to your package.json), :red
-else
+case `npx -v`.to_f
+when 7.1...8.0
   run %(npm set-script build:css "#{build_script}")
   run %(yarn build:css)
+when (8.0..)
+  run %(npm pkg set scripts.build:css="#{build_script}")
+  run %(yarn build:css)
+else
+  say %(Add "scripts": { "build:css": "#{build_script}" } to your package.json), :green
 end

data/lib/install/dev

@@ -1,9 +1,8 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
-if ! foreman version &> /dev/null
-then
+if ! gem list foreman -i --silent; then
   echo "Installing foreman..."
   gem install foreman
 fi
 
-foreman start -f Procfile.dev "$@"
+exec foreman start -f Procfile.dev "$@"

data/lib/install/postcss/install.rb

@@ -6,9 +6,13 @@ run "yarn add postcss postcss-cli postcss-nesting autoprefixer"
 say "Add build:css script"
 build_script = "postcss ./app/assets/stylesheets/application.postcss.css -o ./app/assets/builds/application.css"
 
-if (`npx -v`.to_f < 7.1 rescue "Missing")
-  say %(Add "scripts": { "build:css": "#{build_script}" } to your package.json), :red
-else
+case `npx -v`.to_f
+when 7.1...8.0
   run %(npm set-script build:css "#{build_script}")
   run %(yarn build:css)
+when (8.0..)
+  run %(npm pkg set scripts.build:css="#{build_script}")
+  run %(yarn build:css)
+else
+  say %(Add "scripts": { "build:css": "#{build_script}" } to your package.json), :green
 end

data/lib/install/sass/install.rb

@@ -5,9 +5,13 @@ run "yarn add sass"
 say "Add build:css script"
 build_script = "sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules"
 
-if (`npx -v`.to_f < 7.1 rescue "Missing")
-  say %(Add "scripts": { "build:css": "#{build_script}" } to your package.json), :red
-else
+case `npx -v`.to_f
+when 7.1...8.0
   run %(npm set-script build:css "#{build_script}")
   run %(yarn build:css)
+when (8.0..)
+  run %(npm pkg set scripts.build:css="#{build_script}")
+  run %(yarn build:css)
+else
+  say %(Add "scripts": { "build:css": "#{build_script}" } to your package.json), :green
 end

data/lib/install/tailwind/install.rb

@@ -6,9 +6,13 @@ run "yarn add tailwindcss@latest postcss@latest autoprefixer@latest"
 say "Add build:css script"
 build_script = "tailwindcss -i ./app/assets/stylesheets/application.tailwind.css -o ./app/assets/builds/application.css --minify"
 
-if (`npx -v`.to_f < 7.1 rescue "Missing")
-  say %(Add "scripts": { "build:css": "#{build_script}" } to your package.json), :red
-else
+case `npx -v`.to_f
+when 7.1...8.0
   run %(npm set-script build:css "#{build_script}")
   run %(yarn build:css)
+when (8.0..)
+  run %(npm pkg set scripts.build:css="#{build_script}")
+  run %(yarn build:css)
+else
+  say %(Add "scripts": { "build:css": "#{build_script}" } to your package.json), :green
 end

data/lib/tasks/cssbundling/build.rake

@@ -2,17 +2,21 @@ namespace :css do
   desc "Build your CSS bundle"
   task :build do
     unless system "yarn install && yarn build:css"
-      raise "cssbundling-rails: Command css:build failed, ensure yarn is installed and `yarn build:css` runs without errors"
+      raise "cssbundling-rails: Command css:build failed, ensure yarn is installed and `yarn build:css` runs without errors or use SKIP_CSS_BUILD env variable"
     end
   end
 end
 
-if Rake::Task.task_defined?("assets:precompile")
-  Rake::Task["assets:precompile"].enhance(["css:build"])
-end
+unless ENV["SKIP_CSS_BUILD"]
+  if Rake::Task.task_defined?("assets:precompile")
+    Rake::Task["assets:precompile"].enhance(["css:build"])
+  end
 
-if Rake::Task.task_defined?("test:prepare")
-  Rake::Task["test:prepare"].enhance(["css:build"])
-elsif Rake::Task.task_defined?("db:test:prepare")
-  Rake::Task["db:test:prepare"].enhance(["css:build"])
+  if Rake::Task.task_defined?("test:prepare")
+    Rake::Task["test:prepare"].enhance(["css:build"])
+  elsif Rake::Task.task_defined?("spec:prepare")
+    Rake::Task["spec:prepare"].enhance(["css:build"])
+  elsif Rake::Task.task_defined?("db:test:prepare")
+    Rake::Task["db:test:prepare"].enhance(["css:build"])
+  end
 end

data/lib/tasks/cssbundling/clobber.rake

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cssbundling-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-19 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Bundle and process CSS with Tailwind, Bootstrap, PostCSS, Sass in Rails via