Skip to content

Commit 1d04113

Browse files
authored
Remove sprockets dependency (#17)
Remove dependency on Sprockets. Now compatible with both Propshaft and Sprockets
1 parent 7b7bf3a commit 1d04113

File tree

11 files changed

+16
-40
lines changed

11 files changed

+16
-40
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323
- ruby: "3.2"
2424
- ruby: "3.3"
2525
### TEST RAILS VERSIONS
26-
- ruby: "2.7"
27-
rails_version: "~> 6.0.0"
2826
- ruby: "2.7"
2927
rails_version: "~> 6.1.0"
3028
- ruby: "3.3"

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### Unreleased
44
- [View Diff](https://github.com/westonganger/pairer/compare/v1.1.0...master)
5-
- Nothing yet
5+
- [#17](https://github.com/westonganger/pairer/pull/17) - Remove dependency on Sprockets. Now compatible with both Propshaft and Sprockets.
66

77
### v1.1.0 - July 23, 2024
88
- [View Diff](https://github.com/westonganger/pairer/compare/v1.0.0...v1.1.0)

Gemfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,15 @@ def get_env(name)
1818
(ENV[name] && !ENV[name].empty?) ? ENV[name] : nil
1919
end
2020

21-
gem "rails", get_env("RAILS_VERSION")
21+
rails_version = get_env("RAILS_VERSION")
22+
23+
gem "rails", rails_version
24+
25+
if rails_version.nil? || rails_version.to_f >= 8.0
26+
gem "propshaft"
27+
else
28+
gem 'sprockets-rails', require: 'sprockets/railtie'
29+
end
2230

2331
db_gem = get_env("DB_GEM") || "sqlite3"
2432
gem db_gem, get_env("DB_GEM_VERSION")

app/assets/javascripts/pairer/application.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//= require rails-ujs
2-
31
window.init = function(){
42
$('form').attr('autocomplete', 'off');
53

app/assets/stylesheets/pairer/application.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
/*
2-
*= require ./utility
3-
*= require_self
4-
*/
5-
61
:root{
72
--navbar-height: 3.5em;
83
}

app/views/layouts/pairer/application.html.slim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ html
1313

1414
link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.4.0/united/bootstrap.min.css" integrity="sha512-JsK+6bBl5wmtKe9PnCXclLS1fwG7GvLZ9IkBg/ACzuSJJUKTedxyXRFujJf+KpcNFFhSX+I05YPAm99r1ivmog==" crossorigin="anonymous" referrerpolicy="no-referrer"
1515

16+
= stylesheet_link_tag 'pairer/utility'
1617
= stylesheet_link_tag 'pairer/application', media: 'all'
1718

1819
script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" referrerpolicy="no-referrer"
@@ -28,6 +29,7 @@ html
2829

2930
script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha512-oBTprMeNEKCnqfuqKd6sbvFzmFQtlXS3e0C/RGFV0hD6QzhHV+ODfaQbAlmY6/q0ubbwlAM/nCJjkrgA3waLzg==" crossorigin="anonymous" referrerpolicy="no-referrer"
3031

32+
= javascript_include_tag 'rails-ujs'
3133
= javascript_include_tag 'pairer/application'
3234

3335
body

lib/pairer/engine.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
require 'slim'
2-
require "sprockets/railtie"
32
require 'hashids'
43

54
module Pairer
65
class Engine < ::Rails::Engine
76
isolate_namespace Pairer
87

98
initializer "pairer.assets.precompile" do |app|
9+
# this initializer is only called when sprockets is in use
10+
1011
app.config.assets.precompile << "pairer_manifest.js" ### manifest file required
1112
app.config.assets.precompile << "pairer/favicon.ico"
13+
app.config.assets.precompile << "rails-ujs" # provided by activesupport
1214

1315
### Automatically precompile assets in specified folders
1416
["app/assets/images/"].each do |folder|

pairer.gemspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ Gem::Specification.new do |spec|
1818

1919
spec.required_ruby_version = ">= 2.7"
2020

21-
spec.add_dependency "rails", ">= 6.0"
21+
spec.add_dependency "rails", ">= 6.1"
2222
spec.add_dependency "actioncable"
2323
spec.add_dependency "slim"
2424
spec.add_dependency "hashids"
25-
spec.add_dependency "sprockets-rails"
2625

2726
spec.add_development_dependency "sqlite3"
2827
spec.add_development_dependency "rspec-rails"

spec/dummy/config/environments/development.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@
4545
# Highlight code that triggered database queries in logs.
4646
config.active_record.verbose_query_logs = true
4747

48-
# Debug mode disables concatenation and preprocessing of assets.
49-
# This option may cause significant delays in view rendering with a large
50-
# number of complex assets.
51-
config.assets.debug = true
52-
53-
# Suppress logger output for asset requests.
54-
config.assets.quiet = true
55-
5648
# Raises error for missing translations.
5749
# config.action_view.raise_on_missing_translations = true
5850

spec/dummy/config/environments/production.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@
2222
# Apache or NGINX already handles this.
2323
config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
2424

25-
# Compress CSS using a preprocessor.
26-
# config.assets.css_compressor = :sass
27-
28-
# Do not fallback to assets pipeline if a precompiled asset is missed.
29-
config.assets.compile = false
30-
3125
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
3226
# config.action_controller.asset_host = 'http://assets.example.com'
3327

0 commit comments

Comments
 (0)