Skip to content

Commit 68c6ad6

Browse files
committed
switch from sprockets to propshaft
1 parent 2844bfe commit 68c6ad6

File tree

7 files changed

+11
-26
lines changed

7 files changed

+11
-26
lines changed

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ gem "httparty"
1818
gem "jsbundling-rails"
1919
gem "nokogiri", "~> 1.19.0"
2020
gem "pg"
21+
gem "propshaft"
2122
gem "puma", "~> 7.0"
2223
gem "rack-ssl"
2324
gem "sass"
24-
gem "sprockets"
25-
gem "sprockets-rails"
2625
gem "stripe"
2726
gem "thread"
2827
gem "will_paginate"

Gemfile.lock

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,10 @@ GEM
226226
prettyprint
227227
prettyprint (0.2.0)
228228
prism (1.9.0)
229+
propshaft (1.3.1)
230+
actionpack (>= 7.0.0)
231+
activesupport (>= 7.0.0)
232+
rack
229233
pry (0.16.0)
230234
coderay (~> 1.1)
231235
method_source (~> 1.0)
@@ -372,14 +376,6 @@ GEM
372376
simplecov_json_formatter (~> 0.1)
373377
simplecov-html (0.13.2)
374378
simplecov_json_formatter (0.1.4)
375-
sprockets (4.2.2)
376-
concurrent-ruby (~> 1.0)
377-
logger
378-
rack (>= 2.2.4, < 4)
379-
sprockets-rails (3.5.2)
380-
actionpack (>= 6.1)
381-
activesupport (>= 6.1)
382-
sprockets (>= 3.0.0)
383379
stringio (3.2.0)
384380
stripe (18.3.1)
385381
sync (0.5.0)
@@ -450,6 +446,7 @@ DEPENDENCIES
450446
jsbundling-rails
451447
nokogiri (~> 1.19.0)
452448
pg
449+
propshaft
453450
pry-byebug
454451
puma (~> 7.0)
455452
rack-ssl
@@ -466,8 +463,6 @@ DEPENDENCIES
466463
sass
467464
selenium-webdriver
468465
simplecov
469-
sprockets
470-
sprockets-rails
471466
stripe
472467
thread
473468
web-console

app/assets/config/manifest.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/stylesheets/application.css

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
/*
2-
*= require bootstrap.min
3-
*= require font-awesome.min
4-
*= require_tree .
5-
*/
6-
71
html, body {
82
height: 100%;
93
color: #484948;

app/views/layouts/application.html.erb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818

1919
<%= content_for(:head) %>
2020

21+
<%= stylesheet_link_tag 'bootstrap.min' %>
22+
<%= stylesheet_link_tag 'font-awesome.min' %>
23+
<%= stylesheet_link_tag 'font-awesome-fonts' %>
24+
<%= stylesheet_link_tag 'lato-fonts' %>
25+
<%= stylesheet_link_tag 'reenie-beanie-font' %>
2126
<%= stylesheet_link_tag 'application' %>
2227
<%= javascript_include_tag 'application' %>
2328
</head>

config/environments/production.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,4 @@
8282
# { exclude: ->(request) { request.path == "/up" } }
8383

8484
config.good_job.execution_mode = :async
85-
86-
config.assets.compile = false
8785
end

config/initializers/assets.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
# Be sure to restart your server when you modify this file.
44

5-
# Version of your assets, change this if you want to expire all your assets.
6-
Rails.application.config.assets.version = "1.0"
7-
85
# Add additional assets to the asset load path.
96
Rails.application.config.assets.paths += [
107
Rails.root.join("node_modules/bootstrap/dist/css"),

0 commit comments

Comments
 (0)