diff --git a/Gemfile.lock b/Gemfile.lock index 170cafb..28ff220 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - cssbundling-rails (1.1.1) + cssbundling-rails (1.1.2) railties (>= 6.0.0) GEM @@ -169,6 +169,7 @@ GEM PLATFORMS arm64-darwin-20 arm64-darwin-21 + arm64-darwin-22 x86_64-darwin-20 x86_64-darwin-21 x86_64-linux diff --git a/lib/cssbundling/version.rb b/lib/cssbundling/version.rb index 15fda7f..6b4798e 100644 --- a/lib/cssbundling/version.rb +++ b/lib/cssbundling/version.rb @@ -1,3 +1,3 @@ module Cssbundling - VERSION = "1.1.1" + VERSION = "1.1.2" end diff --git a/lib/install/Procfile.dev b/lib/install/Procfile.dev index 0c4b735..cb7c9aa 100644 --- a/lib/install/Procfile.dev +++ b/lib/install/Procfile.dev @@ -1,2 +1,2 @@ -web: bin/rails server -p 3000 +web: unset PORT && bin/rails server css: yarn build:css --watch diff --git a/lib/install/bootstrap/install.rb b/lib/install/bootstrap/install.rb index cfab96a..ec1a67f 100644 --- a/lib/install/bootstrap/install.rb +++ b/lib/install/bootstrap/install.rb @@ -19,9 +19,13 @@ 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" -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 diff --git a/lib/install/bulma/install.rb b/lib/install/bulma/install.rb index d70fa1b..96dc9be 100644 --- a/lib/install/bulma/install.rb +++ b/lib/install/bulma/install.rb @@ -6,9 +6,13 @@ 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 diff --git a/lib/install/dev b/lib/install/dev index c1cb98b..74ade16 100755 --- a/lib/install/dev +++ b/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 "$@" diff --git a/lib/install/postcss/install.rb b/lib/install/postcss/install.rb index 4ce2ca4..fbad140 100644 --- a/lib/install/postcss/install.rb +++ b/lib/install/postcss/install.rb @@ -6,9 +6,13 @@ 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 diff --git a/lib/install/sass/install.rb b/lib/install/sass/install.rb index dbef54d..dbdb4c5 100644 --- a/lib/install/sass/install.rb +++ b/lib/install/sass/install.rb @@ -5,9 +5,13 @@ 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 diff --git a/lib/install/tailwind/install.rb b/lib/install/tailwind/install.rb index a5d76df..bc7dfcc 100644 --- a/lib/install/tailwind/install.rb +++ b/lib/install/tailwind/install.rb @@ -6,9 +6,13 @@ 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 diff --git a/lib/tasks/cssbundling/clobber.rake b/lib/tasks/cssbundling/clobber.rake index 729de8a..9bfcae9 100644 --- a/lib/tasks/cssbundling/clobber.rake +++ b/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"], verbose: false end end