cssbundling-rails 1.2.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb8589b682d3c0c276c75baa0923c706e3f09de2a554e47ea7f008e01b555c5
-  data.tar.gz: c8c43687d5cbf5cf3fc7f2e7fcbeb35f99b80e2986227135e306cb4a42167423
+  metadata.gz: 643412ab70b4a60ccf019381db175e18fb2e779c34439cf89c19d0caa3a8dfd5
+  data.tar.gz: 80888732e4252b4e59ef90843010ef5dd6cf3e395c72ea8d2539c27557752dec
 SHA512:
-  metadata.gz: 88e4959bbf33a9b580f33a8316a327f437b3ce422d69a95e2e7c55df99e2fc840e98eb636c6baa9e281421415c62e5de28e42d39db2d1b0440db46895f498959
-  data.tar.gz: ee626b8d3329f131034b218ccac7c5590d36afa7d4191b75afa0a06ed5f27268fe5c1720cdd64d347102ec71d5bdff34c993d12b460030064802c0ccc6d71899
+  metadata.gz: a14d2636c1b596f6cd4106c9214b1963f1f5e65329b3beaa27557de5dbfa6e57dcb9c688130e11ce75fc68a823fad74fddc3e3a14557e1fa6d3e663dc22a05a1
+  data.tar.gz: 687cd595a551a1feef7279fe59ff8a6a4c623e00c35b33aeb4a3dc13259f89f548e8a6ece4d1c7d727cedb71dd3feb88f4a8577278eba825f1074d6606286185

data/lib/cssbundling/version.rb

@@ -1,3 +1,3 @@
 module Cssbundling
-  VERSION = "1.2.0"
+  VERSION = "1.3.2"
 end

data/lib/install/Procfile_for_bun.dev

@@ -0,0 +1,2 @@
+web: env RUBY_DEBUG_OPEN=true bin/rails server
+css: bun run build:css --watch

data/lib/install/Procfile_for_node.dev

@@ -0,0 +1,2 @@
+web: env RUBY_DEBUG_OPEN=true bin/rails server
+css: yarn build:css --watch

data/lib/install/bootstrap/install.rb

@@ -1,7 +1,10 @@
+require_relative "../helpers"
+self.extend Helpers
+
 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 postcss postcss-cli autoprefixer nodemon"
+run "#{bundler_cmd} 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,32 +19,14 @@ else
   say %(Add import * as bootstrap from "bootstrap" to your entry point JavaScript file), :red
 end
 
-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)
+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")
+add_package_json_script("watch:css", "nodemon --watch ./app/assets/stylesheets/ --ext scss --exec \"#{bundler_run_cmd} build:css\"", false)
 
 gsub_file "Procfile.dev", "build:css --watch", "watch:css"
 
-case `npx -v`.to_f
-when (7.1..)
-  say "Add browserslist config"
-  run %(npm pkg set browserslist[]=defaults)
-else
-  say %(Add "browserslist": ["defaults"] to your package.json), :green
-end
+package_json = JSON.parse(File.read("package.json"))
+package_json["browserslist"] ||= {}
+package_json["browserslist"] = ["defaults"]
+File.write("package.json", JSON.pretty_generate(package_json))

data/lib/install/bulma/install.rb

@@ -1,18 +1,11 @@
+require_relative "../helpers"
+self.extend Helpers
+
 say "Install Bulma"
 copy_file "#{__dir__}/application.bulma.scss",
    "app/assets/stylesheets/application.bulma.scss"
-run "yarn add sass bulma"
+run "#{bundler_cmd} 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"
-
-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
+add_package_json_script "build:css",
+  "sass ./app/assets/stylesheets/application.bulma.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules"

data/lib/install/dev

@@ -5,4 +5,7 @@ if ! gem list foreman -i --silent; then
   gem install foreman
 fi
 
+# Default to port 3000 if not specified
+export PORT="${PORT:-3000}"
+
 exec foreman start -f Procfile.dev "$@"

data/lib/install/helpers.rb

@@ -0,0 +1,42 @@
+require 'json'
+
+module Helpers
+  def bundler_cmd
+    using_bun? ? "bun" : "yarn"
+  end
+
+  def bundler_run_cmd
+    using_bun? ? "bun run" : "yarn"
+  end
+
+  def using_bun?
+    File.exist?('bun.lockb') || (tool_exists?('bun') && !File.exist?('yarn.lock'))
+  end
+
+  def tool_exists?(tool)
+    system "command -v #{tool} > /dev/null"
+  end
+
+  def add_package_json_script(name, script, run_script=true)
+    if using_bun?
+      package_json = JSON.parse(File.read("package.json"))
+      package_json["scripts"] ||= {}
+      package_json["scripts"][name] = script
+      File.write("package.json", JSON.pretty_generate(package_json))
+      run %(bun run #{name}) if run_script
+    else
+      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
+  end
+end

data/lib/install/install.rb

@@ -1,3 +1,6 @@
+require_relative "helpers"
+self.extend Helpers
+
 say "Build into app/assets/builds"
 empty_directory "app/assets/builds"
 keep_file "app/assets/builds"
@@ -41,10 +44,10 @@ unless Rails.root.join("package.json").exist?
 end
 
 if Rails.root.join("Procfile.dev").exist?
-  append_to_file "Procfile.dev", "css: yarn build:css --watch\n"
+  append_to_file "Procfile.dev", "css: #{bundler_run_cmd} build:css --watch\n"
 else
   say "Add default Procfile.dev"
-  copy_file "#{__dir__}/Procfile.dev", "Procfile.dev"
+  copy_file "#{__dir__}/#{using_bun? ? "Procfile_for_bun.dev" : "Procfile_for_node.dev"}", "Procfile.dev"
 
   say "Ensure foreman is installed"
   run "gem install foreman"

data/lib/install/postcss/install.rb

@@ -1,18 +1,11 @@
+require_relative "../helpers"
+self.extend Helpers
+
 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"
-run "yarn add postcss postcss-cli postcss-nesting autoprefixer"
+run "#{bundler_cmd} add postcss postcss-cli postcss-import postcss-nesting autoprefixer"
 
 say "Add build:css script"
-build_script = "postcss ./app/assets/stylesheets/application.postcss.css -o ./app/assets/builds/application.css"
-
-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
+add_package_json_script "build:css",
+  "postcss ./app/assets/stylesheets/application.postcss.css -o ./app/assets/builds/application.css"

data/lib/install/postcss/postcss.config.js

@@ -1,5 +1,6 @@
 module.exports = {
   plugins: [
+    require('postcss-import'),
     require('postcss-nesting'),
     require('autoprefixer'),
   ],

data/lib/install/sass/install.rb

@@ -1,17 +1,10 @@
+require_relative "../helpers"
+self.extend Helpers
+
 say "Install Sass"
 copy_file "#{__dir__}/application.sass.scss", "app/assets/stylesheets/application.sass.scss"
-run "yarn add sass"
+run "#{bundler_cmd} 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"
-
-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
+add_package_json_script "build:css",
+  "sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules"

data/lib/install/tailwind/install.rb

@@ -1,18 +1,11 @@
+require_relative "../helpers"
+self.extend Helpers
+
 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"
-run "yarn add tailwindcss@latest postcss@latest autoprefixer@latest"
+run "#{bundler_cmd} 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"
-
-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
+add_package_json_script "build:css",
+  "tailwindcss -i ./app/assets/stylesheets/application.tailwind.css -o ./app/assets/builds/application.css --minify"

data/lib/tasks/cssbundling/build.rake

@@ -1,8 +1,40 @@
 namespace :css do
+  desc "Install JavaScript dependencies"
+  task :install do
+    command = Cssbundling::Tasks.install_command
+    unless system(command)
+      raise "cssbundling-rails: Command install failed, ensure #{command.split.first} is installed"
+    end
+  end
+
   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 or use SKIP_CSS_BUILD env variable"
+  build_task = task :build do
+    command = Cssbundling::Tasks.build_command
+    unless system(command)
+      raise "cssbundling-rails: Command build failed, ensure `#{command}` runs without errors"
+    end
+  end
+  build_task.prereqs << :install unless ENV["SKIP_YARN_INSTALL"] || ENV["SKIP_BUN_INSTALL"]
+end
+
+module Cssbundling
+  module Tasks
+    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"
+    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"
+    end
+
+    def tool_exists?(tool)
+      system "command -v #{tool} > /dev/null"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cssbundling-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -36,12 +36,14 @@ files:
 - lib/cssbundling-rails.rb
 - lib/cssbundling/engine.rb
 - lib/cssbundling/version.rb
-- lib/install/Procfile.dev
+- lib/install/Procfile_for_bun.dev
+- lib/install/Procfile_for_node.dev
 - lib/install/bootstrap/application.bootstrap.scss
 - lib/install/bootstrap/install.rb
 - lib/install/bulma/application.bulma.scss
 - lib/install/bulma/install.rb
 - lib/install/dev
+- lib/install/helpers.rb
 - lib/install/install.rb
 - lib/install/package.json
 - lib/install/postcss/application.postcss.css

data/lib/install/Procfile.dev

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