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

Migrate from sprockets to propshaft #659

Merged
merged 6 commits into from
Feb 14, 2025
Merged

Migrate from sprockets to propshaft #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
09113f1
build(deps): remove `sprockets-rails` gem
nicolastemciuc Feb 14, 2025
22420ee
build(deps): add `propshaft` gem
nicolastemciuc Feb 14, 2025
a9f4f53
chore: remove `app/assets/config/manifest.js`
nicolastemciuc Feb 14, 2025
7766741
chore: remove `sprockets` comment in `application.css`
nicolastemciuc Feb 14, 2025
b69a788
chore: import stylesheets
nicolastemciuc Feb 14, 2025
42dd063
chore: remove unnecessary required path
nicolastemciuc Feb 14, 2025
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 Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ gem "omniauth", "~> 2.1"
gem "omniauth-google-oauth2", '~> 1.2'
gem "omniauth-rails_csrf_protection", '~> 1.0'
gem 'pg', '~> 1.5'
gem 'propshaft', '~> 1.1'
gem 'puma', '~> 6.6'
gem 'rollbar', '~> 3.6'
gem 'sprockets-rails', '~> 3.5', require: 'sprockets/railtie'
gem 'stimulus-rails', '~> 1.3'
gem 'turbo-rails', '~> 2.0'

Expand Down
14 changes: 6 additions & 8 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,11 @@ GEM
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
propshaft (1.1.0)
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
rack
railties (>= 7.0.0)
psych (5.2.3)
date
stringio
Expand Down Expand Up @@ -344,13 +349,6 @@ GEM
snaky_hash (2.0.1)
hashie
version_gem (~> 1.1, >= 1.1.1)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.5.2)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sshkit (1.24.0)
base64
logger
Expand Down Expand Up @@ -406,6 +404,7 @@ DEPENDENCIES
omniauth-google-oauth2 (~> 1.2)
omniauth-rails_csrf_protection (~> 1.0)
pg (~> 1.5)
propshaft (~> 1.1)
puma (~> 6.6)
rails (~> 8.0.0)
rollbar (~> 3.6)
Expand All @@ -416,7 +415,6 @@ DEPENDENCIES
selenium-webdriver (~> 4.28)
shoulda-matchers (~> 6.0)
simplecov
sprockets-rails (~> 3.5)
stimulus-rails (~> 1.3)
turbo-rails (~> 2.0)
web-console (~> 4.2)
Expand Down
5 changes: 0 additions & 5 deletions app/assets/config/manifest.js
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions app/assets/stylesheets/application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
* vendor/assets/stylesheets directory can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
* compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
* files in this directory. Styles in this file should be added after the last require_* statement.
* It is generally better to create a new file per style scope.
*
*= require reset
*= require_tree .
*= require_self
*/


body {
display: flex;
justify-content: start;
Expand Down
3 changes: 2 additions & 1 deletion app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<link rel="icon" type="image/png" href="/icon-128.png" sizes="128x128">

<meta name="viewport" content="width=device-width, initial-scale=1">
<%= stylesheet_link_tag 'application', media: 'all' %>
<%= stylesheet_link_tag :app, "data-turbo-track": "reload" %>
Copy link
Collaborator

Choose a reason for hiding this comment

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

esto incluye todos los css que estan en app/assets/stylesheets/ ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Si, cree una app Rails 8 nueva y tenia este comentario

    <%# Includes all stylesheet files in app/assets/stylesheets %>
    <%= stylesheet_link_tag :app, "data-turbo-track": "reload" %>

Aca en el generator de Rails

<%= stylesheet_link_tag :reset, "data-turbo-track": "reload" %>
<%= stylesheet_link_tag 'https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,500,0,0' %>
<%= stylesheet_link_tag 'https://fonts.googleapis.com/css?family=Roboto:300,400,500,600,700' %>
<%= stylesheet_link_tag 'https://fonts.googleapis.com/icon?family=Material+Icons' %>
Expand Down
1 change: 0 additions & 1 deletion config/initializers/assets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@

# Add additional assets to the asset load path.
# Rails.application.config.assets.paths << Emoji.images_path
Rails.application.config.assets.paths << Rails.root.join('app/assets/fonts')