Skip to content

Commit

Permalink
Revert "Upgrade administrate and get rid of a tailwind related hack"
Browse files Browse the repository at this point in the history
This reverts commit dc287da.
  • Loading branch information
mlandauer committed Aug 5, 2024
1 parent 10da5ee commit 88b500a
Show file tree
Hide file tree
Showing 8 changed files with 2,834 additions and 27 deletions.
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ gem "dalli"
gem "rack-attack"

# Admin interface
gem "administrate", "~> 1.0.0.beta"

gem "sprockets-rails"
gem "administrate", "~> 0.20.0"

# Logging in and such things
gem "devise", "~> 4.2" # Pin to a particular major version to get deprecation warnings
Expand Down
22 changes: 19 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,14 @@ GEM
tzinfo (~> 2.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
administrate (1.0.0.beta1)
administrate (0.20.1)
actionpack (>= 6.0, < 8.0)
actionview (>= 6.0, < 8.0)
activerecord (>= 6.0, < 8.0)
jquery-rails (~> 4.6.0)
kaminari (~> 1.2.2)
sassc-rails (~> 2.1)
selectize-rails (~> 0.6)
airbrussh (1.5.2)
sshkit (>= 1.6.1, != 1.7.0)
ast (2.4.2)
Expand Down Expand Up @@ -324,6 +327,10 @@ GEM
reline (>= 0.4.2)
jb (0.8.2)
jmespath (1.6.2)
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.7.2)
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand Down Expand Up @@ -593,12 +600,21 @@ GEM
sanitize (6.1.2)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
searchkick (5.3.1)
activemodel (>= 6.1)
hashie
selectize-rails (0.12.6)
selenium-webdriver (4.10.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
Expand Down Expand Up @@ -679,6 +695,7 @@ GEM
execjs (>= 0.3.0, < 3)
thor (1.3.1)
thread_safe (0.3.6)
tilt (2.4.0)
timecop (0.9.10)
timeout (0.4.1)
tzinfo (2.0.6)
Expand Down Expand Up @@ -741,7 +758,7 @@ PLATFORMS
DEPENDENCIES
active_record_doctor
activerecord-postgis-adapter
administrate (~> 1.0.0.beta)
administrate (~> 0.20.0)
autoprefixer-rails
aws-sdk-s3
axe-core-capybara
Expand Down Expand Up @@ -832,7 +849,6 @@ DEPENDENCIES
sparql-client
spoom
sprockets
sprockets-rails
tailwindcss-rails (~> 2.0)
tapioca
terser
Expand Down
16 changes: 16 additions & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@
# you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups)

# TODO: Remove this as soon as we can remove sassc-rails
# Currently administrate depends on it
class SkippingSassCompressor
def compress(string)
options = { syntax: :scss, cache: false, read_cache: false, style: :compressed}
begin
SassC::Engine.new(string, options).render
rescue => e
puts "Could not compress '#{string[0..65]}'...: #{e.message}, skipping compression"
string
end
end
end

module PlanningalertsApp
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
Expand Down Expand Up @@ -37,6 +51,8 @@ class Application < Rails::Application

config.exceptions_app = routes

config.assets.css_compressor = SkippingSassCompressor.new

# Application configuration
# These are things that are nice to have as configurations but unlikely really
# in practise to change much
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions sorbet/rbi/gems/[email protected]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 88b500a

Please sign in to comment.