kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

CSS processors other than Tailwind require a node-based JavaScript environment (#43600)

Browse source 
So overwrite the normal JS default if one such processor has been specified.
This commit is contained in:
David Heinemeier Hansson 2021-11-08 15:49:36 +01:00 committed by GitHub
parent 016f6c850c
commit fbdb22bd1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
railties/lib/rails/generators/app_base.rb
View file

@ -313,7 +313,7 @@ module Rails
def javascript_gemfile_entry
return [] if options[:skip_javascript]
if options[:javascript] == "importmap"
if adjusted_javascript_option == "importmap"
GemfileEntry.version("importmap-rails", ">= 0.3.4", "Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]")
else
GemfileEntry.version "jsbundling-rails", "~> 0.1.0", "Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]"
@ -336,6 +336,16 @@ module Rails
options[:javascript] && options[:javascript] != "importmap"
end
# CSS processors other than Tailwind require a node-based JavaScript environment. So overwrite the normal JS default
# if one such processor has been specified.
def adjusted_javascript_option
if options[:css] && options[:css] != "tailwind" && options[:javascript] == "importmap"
"esbuild"
else
options[:javascript]
end
end
def css_gemfile_entry
return [] unless options[:css]
@ -407,9 +417,9 @@ module Rails
def run_javascript
return if options[:skip_javascript] || !bundle_install?
case options[:javascript]
case adjusted_javascript_option
when "importmap" then rails_command "importmap:install"
when "webpack", "esbuild", "rollup" then rails_command "javascript:install:#{options[:javascript]}"
when "webpack", "esbuild", "rollup" then rails_command "javascript:install:#{adjusted_javascript_option}"
end
end