Upgrade administrate to latest version which allows us to remove scss…

… and a tailwind related hack

Gemfile

@@ -18,7 +18,9 @@ gem "dalli"
 gem "rack-attack"
 
 # Admin interface
-gem "administrate", "~> 0.20.0"
+gem "administrate", "~> 1.0.0.beta"
+
+gem "sprockets-rails"
 
 # Logging in and such things
 gem "devise", "~> 4.2" # Pin to a particular major version to get deprecation warnings

Gemfile.lock

@@ -82,14 +82,11 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    administrate (0.20.1)
+    administrate (1.0.0.beta1)
       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)
@@ -257,7 +254,8 @@ GEM
     faraday-net_http_persistent (2.1.0)
       faraday (~> 2.5)
       net-http-persistent (~> 4.0)
-    faraday-retry (1.0.3)
+    faraday-retry (2.2.1)
+      faraday (~> 2.0)
     ffi (1.17.0-aarch64-linux-gnu)
     ffi (1.17.0-arm64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
@@ -326,10 +324,6 @@ 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)
@@ -599,21 +593,12 @@ 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)
@@ -694,7 +679,6 @@ 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)
@@ -757,7 +741,7 @@ PLATFORMS
 DEPENDENCIES
   active_record_doctor
   activerecord-postgis-adapter
-  administrate (~> 0.20.0)
+  administrate (~> 1.0.0.beta)
   autoprefixer-rails
   aws-sdk-s3
   axe-core-capybara
@@ -848,6 +832,7 @@ DEPENDENCIES
   sparql-client
   spoom
   sprockets
+  sprockets-rails
   tailwindcss-rails (~> 2.0)
   tapioca
   terser

config/application.rb

@@ -8,20 +8,6 @@
 # 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.
@@ -51,8 +37,6 @@ 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