Merge pull request #154 from CruGlobal/revert-147-rails7

Revert "Upgrade to Rails 7"

.gitattributes

@@ -3,5 +3,8 @@
 # Mark the database schema as having been generated.
 db/schema.rb linguist-generated
 
+# Mark the yarn lockfile as having been generated.
+yarn.lock linguist-generated
+
 # Mark any vendored files as having been vendored.
 vendor/* linguist-vendored

.github/workflows/ruby.yml

@@ -47,6 +47,14 @@ jobs:
           bundle exec rails db:create
           bundle exec rails db:schema:load
 
+      - name: Set up node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.20.0
+
+      - name: Install yarn dependencies and precompile assets
+        run: bundle exec rails assets:precompile
+
       - name: RSpec tests
         run: bundle exec rspec --color
 
@@ -78,5 +86,8 @@ jobs:
       - name: StandardRB
         run: bundle exec standardrb --format simple
 
-      - name: JavaScript Audit
-        run: bin/importmap audit
+      - name: Install yarn dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Yarn audit
+        run: yarn run improved-yarn-audit --ignore-dev-deps

.gitignore

@@ -19,15 +19,20 @@
 # Ignore uploaded files in development.
 /storage/*
 !/storage/.keep
-/tmp/storage/*
-!/tmp/storage/
-!/tmp/storage/.keep
 
 /public/assets
+.byebug_history
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
 
 /.idea
 /.env.*
 /coverage
+
+/public/packs
+/public/packs-test
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity

.iyarc

@@ -0,0 +1,10 @@
+# No dependency path exists to fix this vulnerability currently
+
+# glob-parent
+GHSA-ww39-953v-wcq6
+
+# nth-check
+GHSA-rp65-9cf3-cjxr
+
+# semver
+GHSA-c2qf-rxjj-qqgw

Dockerfile

@@ -15,7 +15,7 @@ WORKDIR /home/webapp/app
 RUN apk upgrade --no-cache
 
 # Install rails/app dependencies
-RUN apk --no-cache add libc6-compat git postgresql-libs tzdata
+RUN apk --no-cache add libc6-compat git postgresql-libs tzdata nodejs=~16.20 yarn
 
 # Copy dependency definitions and lock files
 COPY Gemfile Gemfile.lock ./

Gemfile

@@ -7,76 +7,63 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby "3.0.6"
 
-# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.0.7"
-
-# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
-gem "sprockets-rails"
-
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem "rails", "~> 6.1.3"
 # Use sqlite3 as the database for Active Record
-# gem "sqlite3", "~> 1.4"
-
-# Use the Puma web server [https://github.com/puma/puma]
-gem "puma", "~> 5.0"
-
-# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
-gem "importmap-rails"
-
-# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
-gem "turbo-rails"
-
-# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
-gem "stimulus-rails"
-
-# Build JSON APIs with ease [https://github.com/rails/jbuilder]
-gem "jbuilder"
-
+# gem 'sqlite3', '~> 1.4'
+# Use Puma as the app server
+gem "puma", "~> 5.6"
+# Use SCSS for stylesheets
+gem "sass-rails", ">= 6"
+# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
+gem "webpacker", "~> 5.0"
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+# gem 'turbolinks', '~> 5'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem "jbuilder", "~> 2.7"
 # Use Redis adapter to run Action Cable in production
-# gem "redis", "~> 4.0"
-
-# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
-# gem "kredis"
+# gem 'redis', '~> 4.0'
+# Use Active Model has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
 
-# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
-# gem "bcrypt", "~> 3.1.7"
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
+# Use Active Storage variant
+# gem 'image_processing', '~> 1.2'
 
 # Reduces boot times through caching; required in config/boot.rb
-gem "bootsnap", require: false
-
-# Use Sass to process CSS
-gem "sassc-rails"
-
-# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
-# gem "image_processing", "~> 1.2"
+gem "bootsnap", ">= 1.4.4", require: false
 
 group :development, :test do
-  # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
-  gem "debug", platforms: %i[mri mingw x64_mingw]
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
 end
 
 group :development do
-  # Use console on exceptions pages [https://github.com/rails/web-console]
-  gem "web-console"
-
-  # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
-  # gem "rack-mini-profiler"
-
-  # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
-  # gem "spring"
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+  gem "web-console", ">= 4.1.0"
+  # Display performance information such as SQL time and flame graphs for each request in your browser.
+  # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
+  gem "rack-mini-profiler", "~> 2.0"
+  gem "listen", "~> 3.3"
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem "spring"
+  gem "spring-watcher-listen", "~> 2.0.0"
 end
 
 group :test do
-  # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
-  gem "capybara"
+  # Adds support for Capybara system testing and selenium driver
+  gem "capybara", ">= 3.26"
   gem "selenium-webdriver"
-  # gem "webdrivers"
+  # Easy installation and use of web drivers to run system tests with browsers
+  gem "webdrivers"
+  gem "simplecov-cobertura" # Codecov, CI only
 end
 
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
 gem "pg"
 
+gem "active_admin_flat_skin"
 gem "activeadmin"
 gem "activeadmin_addons"
 gem "adobe-campaign", "~> 0.2"
@@ -96,22 +83,19 @@ gem "omniauth-oktaoauth", github: "CruGlobal/omniauth-oktaoauth"
 gem "omniauth-rails_csrf_protection"
 gem "ougai", "~> 1.7"
 gem "rack-cors"
-gem "redis", "< 5.0"
 gem "redis-actionpack"
 gem "rollbar"
-gem "sidekiq", "~> 6.5.10"
 gem "sidekiq-failures"
 gem "sidekiq-unique-jobs"
 gem "standardrb"
-gem "strip_attributes", "~> 1.11"
+gem "strip_attributes", "~> 1.11.0"
 
 group :development, :test do
   gem "database_cleaner-active_record"
   gem "dotenv-rails"
   gem "factory_bot_rails"
   gem "faker"
   gem "rspec-rails"
-  gem "simplecov-cobertura", require: false
   gem "webmock"
   gem "pry-byebug"
 end