From 533766aa54809681a0b1550d7a8bde575f9b43f5 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Sun, 9 Oct 2022 19:44:00 +0100 Subject: [PATCH] remove extra gems from the stack (#5566) --- Gemfile | 12 +++---- lib/sidekiq/rails.rb | 1 + myapp/Gemfile | 22 ++++++++---- myapp/app/assets/config/manifest.js | 0 myapp/config/application.rb | 12 ++++++- myapp/config/cable.yml | 10 ------ myapp/config/credentials.yml.enc | 1 - myapp/config/environments/production.rb | 6 ---- myapp/config/initializers/assets.rb | 12 ------- .../initializers/content_security_policy.rb | 25 -------------- myapp/config/initializers/inflections.rb | 16 --------- myapp/config/initializers/mime_types.rb | 4 --- .../config/initializers/permissions_policy.rb | 11 ------ myapp/config/storage.yml | 34 ------------------- myapp/script/rails | 6 ---- 15 files changed, 33 insertions(+), 139 deletions(-) delete mode 100644 myapp/app/assets/config/manifest.js delete mode 100644 myapp/config/cable.yml delete mode 100644 myapp/config/credentials.yml.enc delete mode 100644 myapp/config/initializers/assets.rb delete mode 100644 myapp/config/initializers/content_security_policy.rb delete mode 100644 myapp/config/initializers/inflections.rb delete mode 100644 myapp/config/initializers/mime_types.rb delete mode 100644 myapp/config/initializers/permissions_policy.rb delete mode 100644 myapp/config/storage.yml delete mode 100755 myapp/script/rails diff --git a/Gemfile b/Gemfile index 9a197d95..2997d614 100644 --- a/Gemfile +++ b/Gemfile @@ -3,15 +3,15 @@ source "https://rubygems.org" gemspec gem "rake" -gem "rails" +RAILS_VERSION = '~> 7.0.4' +gem 'actionmailer', RAILS_VERSION +gem 'actionpack', RAILS_VERSION +gem 'activejob', RAILS_VERSION +gem 'activerecord', RAILS_VERSION +gem 'railties', RAILS_VERSION gem "redis-client" # gem "debug" -# Required for Ruby 3.1 -# https://github.com/mikel/mail/pull/1439 -gem "net-smtp" -gem "net-imap" -gem "net-pop" gem "sqlite3", platforms: :ruby gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby diff --git a/lib/sidekiq/rails.rb b/lib/sidekiq/rails.rb index 7c808d73..3341ae69 100644 --- a/lib/sidekiq/rails.rb +++ b/lib/sidekiq/rails.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require "sidekiq/job" +require 'rails' module Sidekiq class Rails < ::Rails::Engine diff --git a/myapp/Gemfile b/myapp/Gemfile index d15db36d..7c120ade 100644 --- a/myapp/Gemfile +++ b/myapp/Gemfile @@ -1,11 +1,19 @@ -source "https://rubygems.org" +# frozen_string_literal: true + +source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.1.2" +ruby '3.1.2' -gem "rails", "~> 7.0.3", ">= 7.0.3.1" -gem "sqlite3", "~> 1.4" -gem "puma", "~> 5.0" -gem "sidekiq", path: ".." +RAILS_VERSION = '~> 7.0.4' +gem 'actionmailer', RAILS_VERSION +gem 'actionpack', RAILS_VERSION +gem 'activejob', RAILS_VERSION +gem 'activerecord', RAILS_VERSION +gem 'railties', RAILS_VERSION -gem "after_commit_everywhere" +gem 'puma', '~> 5.0' +gem 'sidekiq', path: '..' +gem 'sqlite3', '~> 1.4' + +gem 'after_commit_everywhere' diff --git a/myapp/app/assets/config/manifest.js b/myapp/app/assets/config/manifest.js deleted file mode 100644 index e69de29b..00000000 diff --git a/myapp/config/application.rb b/myapp/config/application.rb index e4d36bdb..f8d80dff 100644 --- a/myapp/config/application.rb +++ b/myapp/config/application.rb @@ -1,6 +1,16 @@ require_relative "boot" -require "rails/all" +require "rails" +%w( + active_record/railtie + action_controller/railtie + action_view/railtie + action_mailer/railtie + active_job/railtie +).each do |railtie| + require railtie +end + # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. diff --git a/myapp/config/cable.yml b/myapp/config/cable.yml deleted file mode 100644 index d7187d2e..00000000 --- a/myapp/config/cable.yml +++ /dev/null @@ -1,10 +0,0 @@ -development: - adapter: async - -test: - adapter: test - -production: - adapter: redis - url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> - channel_prefix: myapp_production diff --git a/myapp/config/credentials.yml.enc b/myapp/config/credentials.yml.enc deleted file mode 100644 index 49689a7a..00000000 --- a/myapp/config/credentials.yml.enc +++ /dev/null @@ -1 +0,0 @@ -EfD5wxxADj8J5S7rGHbmbuKKgWPGjQGQIEnC8L2I2cpQAXysmeUgjB/gK9VMCUC6Gc4p9hO5AvI/SC6R6/hxIjx51poL/B1NEuYT0W7qD0UZcFCZzvC4CWy4EVsg0AimrR6ihT+iLtptq0fpxXva6KWLx6IFceI6YJR8yaiDcRbnvFa8R6qEHr8aww5ty99geswumHJ65IKhvq+dU+8iEmDDIE7lwov8Qxz5AIG0IGpyIz4a5WEup+JQJQHxjO2BO7PUNZPWb+KbJzXaox9RHvGXwN7h+tf0wOudUn4GNWJaFUvk2jtIwU90/043QoZaBuhS5me7vsSXC6/vZNOv06+GeAdYEZibYnfBEi1rOTRuBkVHK1vmU5pt5jSdCaUDC2fmx+GsAaOLXg49Idx+3VKpFV5VgzPM7oPI--+e3LjH2OqyOtgw6E--G9Ga2O1sdoSkfEhXgCPXuw== \ No newline at end of file diff --git a/myapp/config/environments/production.rb b/myapp/config/environments/production.rb index 307dfd77..24042024 100644 --- a/myapp/config/environments/production.rb +++ b/myapp/config/environments/production.rb @@ -24,12 +24,6 @@ Rails.application.configure do # Apache or NGINX already handles this. config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present? - # Compress CSS using a preprocessor. - # config.assets.css_compressor = :sass - - # Do not fallback 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/myapp/config/initializers/assets.rb b/myapp/config/initializers/assets.rb deleted file mode 100644 index d6156df0..00000000 --- a/myapp/config/initializers/assets.rb +++ /dev/null @@ -1,12 +0,0 @@ -# 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 ) diff --git a/myapp/config/initializers/content_security_policy.rb b/myapp/config/initializers/content_security_policy.rb deleted file mode 100644 index 54f47cf1..00000000 --- a/myapp/config/initializers/content_security_policy.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Define an application-wide content security policy. -# See the Securing Rails Applications Guide for more information: -# https://guides.rubyonrails.org/security.html#content-security-policy-header - -# Rails.application.configure do -# config.content_security_policy do |policy| -# policy.default_src :self, :https -# policy.font_src :self, :https, :data -# policy.img_src :self, :https, :data -# policy.object_src :none -# policy.script_src :self, :https -# policy.style_src :self, :https -# # Specify URI for violation reports -# # policy.report_uri "/csp-violation-report-endpoint" -# end -# -# # Generate session nonces for permitted importmap and inline scripts -# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s } -# config.content_security_policy_nonce_directives = %w(script-src) -# -# # Report violations without enforcing the policy. -# # config.content_security_policy_report_only = true -# end diff --git a/myapp/config/initializers/inflections.rb b/myapp/config/initializers/inflections.rb deleted file mode 100644 index 3860f659..00000000 --- a/myapp/config/initializers/inflections.rb +++ /dev/null @@ -1,16 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format. Inflections -# are locale specific, and you may define rules for as many different -# locales as you wish. All of these examples are active by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.plural /^(ox)$/i, "\\1en" -# inflect.singular /^(ox)en/i, "\\1" -# inflect.irregular "person", "people" -# inflect.uncountable %w( fish sheep ) -# end - -# These inflection rules are supported but not enabled by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.acronym "RESTful" -# end diff --git a/myapp/config/initializers/mime_types.rb b/myapp/config/initializers/mime_types.rb deleted file mode 100644 index dc189968..00000000 --- a/myapp/config/initializers/mime_types.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf diff --git a/myapp/config/initializers/permissions_policy.rb b/myapp/config/initializers/permissions_policy.rb deleted file mode 100644 index 00f64d71..00000000 --- a/myapp/config/initializers/permissions_policy.rb +++ /dev/null @@ -1,11 +0,0 @@ -# Define an application-wide HTTP permissions policy. For further -# information see https://developers.google.com/web/updates/2018/06/feature-policy -# -# Rails.application.config.permissions_policy do |f| -# f.camera :none -# f.gyroscope :none -# f.microphone :none -# f.usb :none -# f.fullscreen :self -# f.payment :self, "https://secure.example.com" -# end diff --git a/myapp/config/storage.yml b/myapp/config/storage.yml deleted file mode 100644 index 4942ab66..00000000 --- a/myapp/config/storage.yml +++ /dev/null @@ -1,34 +0,0 @@ -test: - service: Disk - root: <%= Rails.root.join("tmp/storage") %> - -local: - service: Disk - root: <%= Rails.root.join("storage") %> - -# Use bin/rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) -# amazon: -# service: S3 -# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> -# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> -# region: us-east-1 -# bucket: your_own_bucket-<%= Rails.env %> - -# Remember not to checkin your GCS keyfile to a repository -# google: -# service: GCS -# project: your_project -# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> -# bucket: your_own_bucket-<%= Rails.env %> - -# Use bin/rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) -# microsoft: -# service: AzureStorage -# storage_account_name: your_account_name -# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> -# container: your_container_name-<%= Rails.env %> - -# mirror: -# service: Mirror -# primary: local -# mirrors: [ amazon, google, microsoft ] diff --git a/myapp/script/rails b/myapp/script/rails deleted file mode 100755 index 9a5a81dc..00000000 --- a/myapp/script/rails +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env ruby -# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. - -APP_PATH = File.expand_path("../../config/application", __FILE__) -require File.expand_path("../../config/boot", __FILE__) -require "rails/commands"