Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change asset pipeline default to Propshaft in Rails 8 #51799

Merged
merged 11 commits into from
May 26, 2024
Merged

Change asset pipeline default to Propshaft in Rails 8 #51799

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7734f89
Change asset pipeline default to Propshaft
dhh May 12, 2024
45347e3
Merge branch 'main' into propshaft-by-default
dhh May 14, 2024
cee5cb2
Use :all for stylesheets when propshaft is active
dhh May 14, 2024
ea0723c
Merge branch 'main' into propshaft-by-default
dhh May 15, 2024
39d28b0
Switch to using propshaft as the default (still need to find a way to…
dhh May 15, 2024
e845079
Merge branch 'main' into propshaft-by-default
dhh May 22, 2024
06243e6
Fix tests that rely on sprockets being used
dhh May 22, 2024
d9d72d4
Merge branch 'main' into propshaft-by-default
dhh May 23, 2024
35d34b2
Fix Propshaft tests (#51913)
lazaronixon May 26, 2024
821727b
Merge branch 'main' into propshaft-by-default
dhh May 26, 2024
462b367
Update railties/test/generators/shared_generator_tests.rb
dhh May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion railties/lib/rails/generators/app_base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def self.add_shared_options_for(name)

class_option :skip_asset_pipeline, type: :boolean, aliases: "-A", default: nil

class_option :asset_pipeline, type: :string, aliases: "-a", default: "sprockets",
class_option :asset_pipeline, type: :string, aliases: "-a", default: "propshaft",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be done in a follow-up PR, but are there documentation changes that we'd like to do as well?

enum: ASSET_PIPELINE_OPTIONS,
desc: "Choose your asset pipeline"

Expand Down
5 changes: 3 additions & 2 deletions railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@
<link rel="icon" href="/icon.png" type="image/png">
<link rel="icon" href="/icon.svg" type="image/svg+xml">
<link rel="apple-touch-icon" href="/icon.png">
<% style_link_target = options[:asset_pipeline] == "propshaft" ? ":all" : "application" %>
dhh marked this conversation as resolved.
Show resolved Hide resolved
<%- if options[:skip_hotwire] || options[:skip_javascript] -%>
<%%= stylesheet_link_tag "application" %>
<%%= stylesheet_link_tag <%= style_link_target %> %>
<%- else -%>
<%%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
<%%= stylesheet_link_tag <%= style_link_target %>, "data-turbo-track": "reload" %>
<%- end -%>
</head>

Expand Down
20 changes: 10 additions & 10 deletions railties/test/generators/plugin_generator_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,8 +663,12 @@ def test_dummy_application_configures_asset_pipeline_when_mountable
def test_dummy_application_configures_asset_pipeline_when_full
run_generator [destination_root, "--full"]

assert_gem "sprockets-rails"
assert_file "test/dummy/app/assets/config/manifest.js"
assert_gem "propshaft"
assert_no_gem "sprockets-rails"
assert_file "test/dummy/config/initializers/assets.rb"
assert_file "test/dummy/config/environments/development.rb" do |content|
assert_no_match "config.assets", content
end
end

def test_dummy_application_skips_asset_pipeline_when_flag_skip_asset_pipeline
Expand All @@ -678,20 +682,16 @@ def test_dummy_application_skips_asset_pipeline_when_flag_skip_asset_pipeline
end

def test_dummy_application_respects_asset_pipeline_gem_choice
run_generator [destination_root, "--mountable", "--asset-pipeline=propshaft"]
run_generator [destination_root, "--mountable", "--asset-pipeline=sprockets"]

assert_gem "propshaft"
assert_no_gem "sprockets-rails"
assert_file "test/dummy/config/initializers/assets.rb"
assert_file "test/dummy/config/environments/development.rb" do |content|
assert_no_match "config.assets", content
end
assert_gem "sprockets-rails"
assert_file "test/dummy/app/assets/config/manifest.js"
end

def test_no_asset_pipeline_gem_when_no_dummy_application
run_generator [destination_root, "--mountable", "--skip-test"]

assert_no_gem "sprockets-rails"
assert_no_gem "propshaft"
assert_no_directory "test/dummy"
end

Expand Down