Merge pull request 'Upgrade Rails to 7.0.2, use native JS bundling' (#60) from dev/upgrade_rails into dev/cssbundling

Reviewed-on: #60

.ruby-version

@@ -1 +1 @@
-2.6.1
+2.7.2

Gemfile

@@ -2,13 +2,19 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
+gem 'rails', '~> 7.0.2'
 # Use Puma as the app server
 gem 'puma', '~> 4.1'
+# Separate dependency since Rails 7.0
+gem 'sprockets-rails'
 # Allows custom JS build tasks to integrate with the asset pipeline
 gem 'cssbundling-rails'
-# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
-gem 'turbolinks', '~> 5'
+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. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.7'
 # Use Redis adapter to run Action Cable in production

Gemfile.lock

@@ -1,67 +1,77 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.4.1)
+    actioncable (7.0.2.2)
-      actionpack (= 6.0.4.1)
+      actionpack (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4.1)
+    actionmailbox (7.0.2.2)
-      actionpack (= 6.0.4.1)
+      actionpack (= 7.0.2.2)
-      activejob (= 6.0.4.1)
+      activejob (= 7.0.2.2)
-      activerecord (= 6.0.4.1)
+      activerecord (= 7.0.2.2)
-      activestorage (= 6.0.4.1)
+      activestorage (= 7.0.2.2)
-      activesupport (= 6.0.4.1)
+      activesupport (= 7.0.2.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.4.1)
+      net-imap
-      actionpack (= 6.0.4.1)
+      net-pop
-      actionview (= 6.0.4.1)
+      net-smtp
-      activejob (= 6.0.4.1)
+    actionmailer (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      actionview (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.4.1)
+    actionpack (7.0.2.2)
-      actionview (= 6.0.4.1)
+      actionview (= 7.0.2.2)
-      activesupport (= 6.0.4.1)
+      activesupport (= 7.0.2.2)
-      rack (~> 2.0, >= 2.0.8)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.4.1)
+    actiontext (7.0.2.2)
-      actionpack (= 6.0.4.1)
+      actionpack (= 7.0.2.2)
-      activerecord (= 6.0.4.1)
+      activerecord (= 7.0.2.2)
-      activestorage (= 6.0.4.1)
+      activestorage (= 7.0.2.2)
-      activesupport (= 6.0.4.1)
+      activesupport (= 7.0.2.2)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.0.4.1)
+    actionview (7.0.2.2)
-      activesupport (= 6.0.4.1)
+      activesupport (= 7.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.4.1)
+    activejob (7.0.2.2)
-      activesupport (= 6.0.4.1)
+      activesupport (= 7.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.4.1)
+    activemodel (7.0.2.2)
-      activesupport (= 6.0.4.1)
+      activesupport (= 7.0.2.2)
-    activerecord (6.0.4.1)
+    activerecord (7.0.2.2)
-      activemodel (= 6.0.4.1)
+      activemodel (= 7.0.2.2)
-      activesupport (= 6.0.4.1)
+      activesupport (= 7.0.2.2)
-    activestorage (6.0.4.1)
+    activestorage (7.0.2.2)
-      actionpack (= 6.0.4.1)
+      actionpack (= 7.0.2.2)
-      activejob (= 6.0.4.1)
+      activejob (= 7.0.2.2)
-      activerecord (= 6.0.4.1)
+      activerecord (= 7.0.2.2)
-      marcel (~> 1.0.0)
+      activesupport (= 7.0.2.2)
-    activesupport (6.0.4.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+      i18n (>= 1.6, < 2)
-      minitest (~> 5.1)
+      minitest (>= 5.1)
-      tzinfo (~> 1.1)
+      tzinfo (~> 2.0)
-      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     bcrypt (3.1.16)
     bindex (0.8.1)
-    bootsnap (1.9.1)
+    bootsnap (1.10.3)
-      msgpack (~> 1.0)
+      msgpack (~> 1.2)
     builder (3.2.4)
     byebug (11.1.3)
     capybara (3.36.0)
@@ -87,7 +97,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    devise (4.8.0)
+    devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -96,7 +106,8 @@ GEM
     devise_ldap_authenticatable (0.8.7)
       devise (>= 3.4.1)
       net-ldap (>= 0.16.0)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
+    digest (3.1.0)
     dotenv (2.7.6)
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
@@ -110,49 +121,40 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (1.8.0)
+    faraday (2.2.0)
-      faraday-em_http (~> 1.0)
+      faraday-net_http (~> 2.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
+    faraday-net_http (2.0.1)
-    faraday-em_synchrony (1.0.0)
+    ffi (1.15.5)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    ffi (1.15.4)
     fugit (1.5.2)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    globalid (0.5.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
-    i18n (1.8.11)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.11.3)
+    importmap-rails (1.0.2)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
+    io-wait (0.2.1)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     launchy (2.5.0)
       addressable (~> 2.7)
     letter_opener (1.7.0)
       launchy (~> 2.2)
-    letter_opener_web (1.4.1)
+    letter_opener_web (2.0.0)
-      actionmailer (>= 3.2)
+      actionmailer (>= 5.2)
-      letter_opener (~> 1.0)
+      letter_opener (~> 1.7)
-      railties (>= 3.2)
+      railties (>= 5.2)
-    listen (3.7.0)
+      rexml
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lockbox (0.6.6)
+    lockbox (0.6.8)
-    loofah (2.12.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -161,76 +163,86 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
+    minitest (5.15.0)
-    minitest (5.14.4)
+    msgpack (1.4.4)
-    msgpack (1.4.2)
+    net-imap (0.2.3)
-    multipart-post (2.1.1)
+      digest
+      net-protocol
+      strscan
     net-ldap (0.17.0)
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
     nio4r (2.5.8)
-    nokogiri (1.12.5)
+    nokogiri (1.13.1-x86_64-linux)
-      mini_portile2 (~> 2.6.1)
-      racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pg (1.2.3)
     public_suffix (4.0.6)
-    puma (4.3.10)
+    puma (4.3.11)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.4.1)
+    rails (7.0.2.2)
-      actioncable (= 6.0.4.1)
+      actioncable (= 7.0.2.2)
-      actionmailbox (= 6.0.4.1)
+      actionmailbox (= 7.0.2.2)
-      actionmailer (= 6.0.4.1)
+      actionmailer (= 7.0.2.2)
-      actionpack (= 6.0.4.1)
+      actionpack (= 7.0.2.2)
-      actiontext (= 6.0.4.1)
+      actiontext (= 7.0.2.2)
-      actionview (= 6.0.4.1)
+      actionview (= 7.0.2.2)
-      activejob (= 6.0.4.1)
+      activejob (= 7.0.2.2)
-      activemodel (= 6.0.4.1)
+      activemodel (= 7.0.2.2)
-      activerecord (= 6.0.4.1)
+      activerecord (= 7.0.2.2)
-      activestorage (= 6.0.4.1)
+      activestorage (= 7.0.2.2)
-      activesupport (= 6.0.4.1)
+      activesupport (= 7.0.2.2)
-      bundler (>= 1.3.0)
+      bundler (>= 1.15.0)
-      railties (= 6.0.4.1)
+      railties (= 7.0.2.2)
-      sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.0.4.1)
+    railties (7.0.2.2)
-      actionpack (= 6.0.4.1)
+      actionpack (= 7.0.2.2)
-      activesupport (= 6.0.4.1)
+      activesupport (= 7.0.2.2)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
-      thor (>= 0.20.3, < 2.0)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.5.1)
+    redis (4.6.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.1)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    rqrcode (2.1.0)
+    rqrcode (2.1.1)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec-core (3.10.1)
+    rspec-core (3.11.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
-    rspec-rails (5.0.2)
+    rspec-rails (5.1.0)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -238,25 +250,15 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.3)
+    rspec-support (3.11.0)
     ruby2_keywords (0.0.5)
-    rufus-scheduler (3.8.0)
+    rufus-scheduler (3.8.1)
       fugit (~> 1.1, >= 1.1.6)
-    sass-rails (6.0.0)
+    sidekiq (6.4.1)
-      sassc-rails (~> 2.1, >= 2.1.1)
-    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
-    sidekiq (6.3.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
-    sidekiq-scheduler (3.1.0)
+    sidekiq-scheduler (3.1.1)
       e2mmap
       redis (>= 3, < 5)
       rufus-scheduler (~> 3.2)
@@ -270,21 +272,24 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.4.0)
+    sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    thor (1.1.0)
+    stimulus-rails (1.0.2)
-    thread_safe (0.3.6)
+      railties (>= 6.0.0)
+    strscan (3.0.1)
+    thor (1.2.1)
     thwait (0.2.0)
       e2mmap
     tilt (2.0.10)
-    turbolinks (5.2.1)
+    timeout (0.2.0)
-      turbolinks-source (~> 5.2)
+    turbo-rails (1.0.1)
-    turbolinks-source (5.2.0)
+      actionpack (>= 6.0.0)
-    tzinfo (1.2.9)
+      railties (>= 6.0.0)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.0)
@@ -301,10 +306,9 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.4)
 
 PLATFORMS
-  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -318,6 +322,7 @@ DEPENDENCIES
   dotenv-rails
   factory_bot_rails
   faraday
+  importmap-rails
   jbuilder (~> 2.7)
   letter_opener
   letter_opener_web
@@ -326,20 +331,21 @@ DEPENDENCIES
   net-ldap
   pg (~> 1.2.3)
   puma (~> 4.1)
-  rails (~> 6.0.3, >= 6.0.3.4)
+  rails (~> 7.0.2)
   rqrcode (~> 2.0)
   rspec-rails
-  sass-rails (>= 6)
   sidekiq
   sidekiq-scheduler
   spring
   spring-watcher-listen (~> 2.0.0)
+  sprockets-rails
   sqlite3 (~> 1.4)
-  turbolinks (~> 5)
+  stimulus-rails
+  turbo-rails
   tzinfo-data
   warden
   web-console (>= 3.3.0)
   webmock
 
 BUNDLED WITH
-   2.3.6
+   2.3.5

app/javascript/application.js

@@ -0,0 +1,3 @@
+// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
+import "@hotwired/turbo-rails"
+// import "controllers"

app/javascript/channels/consumer.js

@@ -1,6 +0,0 @@
-// Action Cable provides the framework to deal with WebSockets in Rails.
-// You can generate new channels where WebSocket features live using the `rails generate channel` command.
-
-import { createConsumer } from "@rails/actioncable"
-
-export default createConsumer()

app/javascript/channels/index.js

@@ -1,5 +0,0 @@
-// Load all the channels within this directory and all subdirectories.
-// Channel files must be named *_channel.js.
-
-const channels = require.context('.', true, /_channel\.js$/)
-channels.keys().forEach(channels)

app/javascript/controllers/application.js

@@ -0,0 +1,9 @@
+import { Application } from "@hotwired/stimulus"
+
+const application = Application.start()
+
+// Configure Stimulus development experience
+application.debug = false
+window.Stimulus   = application
+
+export { application }

app/javascript/controllers/hello_controller.js

@@ -0,0 +1,7 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  connect() {
+    this.element.textContent = "Hello World!"
+  }
+}

app/javascript/controllers/index.js

@@ -0,0 +1,11 @@
+// Import and register all your controllers from the importmap under controllers/*
+
+import { application } from "controllers/application"
+
+// Eager load all controllers defined in the import map under controllers/**/*_controller
+import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading"
+eagerLoadControllersFrom("controllers", application)
+
+// Lazy load controllers as they appear in the DOM (remember not to preload controllers in import map!)
+// import { lazyLoadControllersFrom } from "@hotwired/stimulus-loading"
+// lazyLoadControllersFrom("controllers", application)

app/javascript/packs/application.js

@@ -1,16 +0,0 @@
-// This file is automatically compiled by Webpack, along with any other files
-// present in this directory. You're encouraged to place your actual application logic in
-// a relevant structure within app/javascript and only use these pack files to reference
-// that code so it'll be compiled.
-
-require("@rails/ujs").start()
-require("turbolinks").start()
-require("channels")
-
-// import "stylesheets/application"
-// Uncomment to copy all static images under ../images to the output folder and reference
-// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)
-// or the `imagePath` JavaScript helper below.
-//
-// const images = require.context('../images', true)
-// const imagePath = (name) => images(name, true)

app/models/user.rb

@@ -10,8 +10,8 @@ class User < ApplicationRecord
   validates_uniqueness_of :email
   validates :email, email: true
 
-  encrypts :ln_login
+  lockbox_encrypts :ln_login
-  encrypts :ln_password
+  lockbox_encrypts :ln_password
 
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable

app/views/layouts/admin.html.erb

@@ -8,6 +8,7 @@
     <link href="https://assets.kosmos.org/fonts/open-sans/open-sans.css" rel="stylesheet">
     <%= stylesheet_link_tag 'legacy', "data-turbo-track": "reload" %>
     <%= stylesheet_link_tag 'application', "data-turbo-track": "reload" %>
+    <%= javascript_importmap_tags %>
   </head>
   <body id="admin-panel">
     <div id="wrapper">

app/views/layouts/application.html.erb

@@ -8,6 +8,7 @@
     <link href="https://assets.kosmos.org/fonts/open-sans/open-sans.css" rel="stylesheet">
     <%= stylesheet_link_tag 'legacy', "data-turbo-track": "reload" %>
     <%= stylesheet_link_tag 'application', "data-turbo-track": "reload" %>
+    <%= javascript_importmap_tags %>
   </head>
   <body>
     <div id="wrapper">

app/views/layouts/signup.html.erb

@@ -8,6 +8,7 @@
     <link href="https://assets.kosmos.org/fonts/open-sans/open-sans.css" rel="stylesheet">
     <%= stylesheet_link_tag 'legacy', "data-turbo-track": "reload" %>
     <%= stylesheet_link_tag 'application', "data-turbo-track": "reload" %>
+    <%= javascript_importmap_tags %>
   </head>
   <body class="layout-signup">
     <div id="wrapper">

config/importmap.rb

@@ -0,0 +1,7 @@
+# Pin npm packages by running ./bin/importmap
+
+pin "application", preload: true
+pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
+pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
+pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
+pin_all_from "app/javascript/controllers", under: "controllers"

config/ldap.yml

@@ -26,7 +26,7 @@ authorizations: &AUTHORIZATIONS
 ## Environment
 
 development:
-  host: 192.168.33.10
+  host: 192.168.56.5
   port: 389
   attribute: cn
   base: ou=kosmos.org,cn=users,dc=kosmos,dc=org

package.json

@@ -2,9 +2,6 @@
   "name": "akkounts",
   "private": true,
   "dependencies": {
-    "@rails/actioncable": "^6.0.0",
-    "@rails/ujs": "^6.0.0",
-    "@rails/webpacker": "4.3.0",
     "@tailwindcss/forms": "^0.4.0",
     "autoprefixer": "^10.4.2",
     "postcss": "^8.4.6",
@@ -12,9 +9,8 @@
     "postcss-import": "^14.0.2",
     "postcss-nested": "^5.0.6",
     "postcss-preset-env": "^7.3.1",
-    "tailwindcss": "^3.0.22",
-    "turbolinks": "^5.2.0"
     "sass": "^1.49.7",
+    "tailwindcss": "^3.0.22"
   },
   "version": "0.2.0",
   "devDependencies": {

spec/features/signup_spec.rb

@@ -79,7 +79,7 @@ RSpec.describe "Signup", type: :feature do
 
       fill_in "user_email", with: "tony@"
       click_button "Continue"
-      expect(page).to have_content("Email is not a valid address")
+      expect(page).to have_content("Email is invalid")
       fill_in "user_email", with: ""
       click_button "Continue"
       expect(page).to have_content("Email can't be blank")