Skip to content

Commit bec9d12

Browse files
Merge pull request #240 from cedarcode/nt--migrate-to-propshaft
Migrate from `sprockets-rails` to `propshaft`
2 parents 8a84cac + 001fa6f commit bec9d12

File tree

5 files changed

+7
-16
lines changed

5 files changed

+7
-16
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ gem "webauthn", "~> 3.4"
77

88
gem 'bootsnap', '~> 1.18', require: false
99
gem 'importmap-rails', '~> 2.2'
10+
gem 'propshaft', '~> 1.2'
1011
gem 'puma', '~> 6.6'
1112
gem "rollbar", "~> 3.6"
12-
gem 'sprockets-rails', '~> 3.5'
1313
gem 'sqlite3', '>= 1.4'
1414
gem 'stimulus-rails', '~> 1.3'
1515

Gemfile.lock

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ GEM
188188
prettyprint
189189
prettyprint (0.2.0)
190190
prism (1.4.0)
191+
propshaft (1.2.1)
192+
actionpack (>= 7.0.0)
193+
activesupport (>= 7.0.0)
194+
rack
191195
psych (5.2.6)
192196
date
193197
stringio
@@ -275,14 +279,6 @@ GEM
275279
rexml (~> 3.2, >= 3.2.5)
276280
rubyzip (>= 1.2.2, < 3.0)
277281
websocket (~> 1.0)
278-
sprockets (4.2.2)
279-
concurrent-ruby (~> 1.0)
280-
logger
281-
rack (>= 2.2.4, < 4)
282-
sprockets-rails (3.5.2)
283-
actionpack (>= 6.1)
284-
activesupport (>= 6.1)
285-
sprockets (>= 3.0.0)
286282
sqlite3 (2.7.3)
287283
mini_portile2 (~> 2.8.0)
288284
sshkit (1.24.0)
@@ -342,14 +338,14 @@ DEPENDENCIES
342338
importmap-rails (~> 2.2)
343339
kamal (~> 2.7)
344340
minitest-stub_any_instance (~> 1.0)
341+
propshaft (~> 1.2)
345342
puma (~> 6.6)
346343
rack-mini-profiler (~> 4.0)
347344
rails (~> 8.0.1)
348345
rollbar (~> 3.6)
349346
rubocop (~> 1.79)
350347
rubocop-rails (~> 2.33)
351348
selenium-webdriver (~> 4.34)
352-
sprockets-rails (~> 3.5)
353349
sqlite3 (>= 1.4)
354350
stimulus-rails (~> 1.3)
355351
web-console (~> 4.2, >= 4.2.1)

app/assets/config/manifest.js

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

app/views/layouts/application.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<meta property="og:image:width" content="600">
2525

2626
<%= stylesheet_link_tag 'https://unpkg.com/material-components-web@4.0.0/dist/material-components-web.min.css' %>
27-
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbo-track': 'reload' %>
27+
<%= stylesheet_link_tag :app, "data-turbo-track": "reload" %>
2828
<%= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Roboto:300,400,500" %>
2929
<%= stylesheet_link_tag "https://fonts.googleapis.com/icon?family=Material+Icons" %>
3030

config/application.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# require "action_text/engine"
1313
require "action_view/railtie"
1414
# require "action_cable/engine"
15-
require "sprockets/railtie"
1615
require "rails/test_unit/railtie"
1716

1817
# Require the gems listed in Gemfile, including any gems

0 commit comments

Comments
 (0)