diff --git a/Gemfile b/Gemfile index 164c55e1c..948feb87b 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby file: '.tool-versions' -gem 'administrate', '~> 0.20.1' +gem 'administrate', '~> 1.0.0' gem 'administrate-field-active_storage' gem 'aws-sdk-s3', require: false gem 'base64', '~> 0.3' @@ -36,6 +36,7 @@ gem 'open-uri' gem 'paper_trail' gem 'pg', '~> 1.6' gem 'postmark-rails' +gem 'propshaft' gem 'puma', '~> 7.2' gem 'rack-cors' gem 'rails', '~> 7.1' diff --git a/Gemfile.lock b/Gemfile.lock index 8f58d7be3..b282904a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,14 +86,11 @@ GEM tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - administrate (0.20.1) - actionpack (>= 6.0, < 8.0) - actionview (>= 6.0, < 8.0) - activerecord (>= 6.0, < 8.0) - jquery-rails (~> 4.6.0) + administrate (1.0.0) + actionpack (>= 6.0, < 9.0) + actionview (>= 6.0, < 9.0) + activerecord (>= 6.0, < 9.0) kaminari (~> 1.2.2) - sassc-rails (~> 2.1) - selectize-rails (~> 0.6) administrate-field-active_storage (1.0.6) administrate (>= 0.2.2) rails (>= 7.0) @@ -186,9 +183,9 @@ GEM logger faraday-net_http (3.4.2) net-http (~> 0.5) - ffi (1.17.2-aarch64-linux-gnu) - ffi (1.17.2-arm64-darwin) - ffi (1.17.2-x86_64-linux-gnu) + ffi (1.17.3-aarch64-linux-gnu) + ffi (1.17.3-arm64-darwin) + ffi (1.17.3-x86_64-linux-gnu) fiber-storage (1.0.1) flipper (1.3.6) concurrent-ruby (< 2) @@ -248,10 +245,6 @@ GEM actionview (>= 7.0.0) activesupport (>= 7.0.0) 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.18.1) jwt (2.2.3) kaminari (1.2.2) @@ -348,6 +341,10 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) + propshaft (1.3.1) + actionpack (>= 7.0.0) + activesupport (>= 7.0.0) + rack pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) @@ -507,16 +504,7 @@ GEM sanitize (7.0.0) crass (~> 1.0.2) nokogiri (>= 1.16.8) - 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 securerandom (0.4.1) - selectize-rails (0.12.6) selenium-webdriver (4.1.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) @@ -539,21 +527,12 @@ GEM snaky_hash (2.0.3) hashie (>= 0.1.0, < 6) version_gem (>= 1.1.8, < 3) - sprockets (4.2.2) - concurrent-ruby (~> 1.0) - logger - rack (>= 2.2.4, < 4) - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) - sprockets (>= 3.0.0) statesman (13.1.0) stringio (3.2.0) thor (1.5.0) - tilt (2.6.1) time (0.4.1) date - timeout (0.4.3) + timeout (0.6.0) tsort (0.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -588,7 +567,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - administrate (~> 0.20.1) + administrate (~> 1.0.0) administrate-field-active_storage awesome_print aws-sdk-s3 @@ -627,6 +606,7 @@ DEPENDENCIES paper_trail pg (~> 1.6) postmark-rails + propshaft pry-byebug puma (~> 7.2) rack-cors diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js deleted file mode 100644 index 6151b36ad..000000000 --- a/app/assets/config/manifest.js +++ /dev/null @@ -1,4 +0,0 @@ -//= link_tree ../images -//= link_directory ../stylesheets .css -//= link_tree ../../../vendor/javascript .js -//= link administrate-field-active_storage/application.css diff --git a/config/application.rb b/config/application.rb index ec122fbcf..821a349dc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -48,8 +48,6 @@ class Application < Rails::Application g.test_framework :rspec end - config.assets.css_compressor = nil - config.active_job.queue_adapter = :good_job config.to_prepare do diff --git a/config/environments/production.rb b/config/environments/production.rb index 57f3a22cd..cd0b8ca17 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -25,12 +25,6 @@ # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead. # config.public_file_server.enabled = false - # Compress CSS using a preprocessor. - # config.assets.css_compressor = :sass - - # Do not fall back to assets pipeline if a precompiled asset is missed. - config.assets.compile = false - # Enable serving of images, stylesheets, and JavaScripts from an asset server. # config.asset_host = "http://assets.example.com" diff --git a/config/initializers/administrate.rb b/config/initializers/administrate.rb deleted file mode 100644 index 5a49a7479..000000000 --- a/config/initializers/administrate.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -require 'administrate/field/associative' - -module Administrate - module Field - class Associative < Base - module Overrides - def deprecated_option(name) - name == :class_name ? options.fetch(name) : super - end - end - end - end -end - -# Ref: https://github.com/thoughtbot/administrate/commit/f9c5f1af0bd27dbe8e98d43b2074b96004689ad5 -patch_no_longer_required = Gem::Version.new(Administrate::VERSION) >= Gem::Version.new('1.0.0.beta3') -raise 'Administrate::Field::Associative::Overrides patch is no longer required' if patch_no_longer_required - -Administrate::Field::Associative.prepend(Administrate::Field::Associative::Overrides) diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb deleted file mode 100644 index bcafccdd3..000000000 --- a/config/initializers/assets.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -# Be sure to restart your server when you modify this file. - -# Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = '1.0' - -# Add additional assets to the asset load path. -# Rails.application.config.assets.paths << Emoji.images_path - -# Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in the app/assets -# folder are already added. -# Rails.application.config.assets.precompile += %w( admin.js admin.css )