Merge pull request #4 from edgartheunready/main

Update Rails/Webpacker to latest 5.x
planningcenter · Apr 6, 2022 · ec7a8f9 · ec7a8f9
2 parents dd7dcef + 3dd41d4
commit ec7a8f9
Show file tree

Hide file tree

Showing 4 changed files with 1,275 additions and 916 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby "2.7.4"
 
-gem "rails", "~> 5.2.5"
+gem "rails", "~> 5.2.7"
 gem "sqlite3"
 
 gem "bootsnap", ">= 1.1.0", require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,43 +1,43 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.6)
-      actionpack (= 5.2.6)
+    actioncable (5.2.7)
+      actionpack (= 5.2.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
+    actionmailer (5.2.7)
+      actionpack (= 5.2.7)
+      actionview (= 5.2.7)
+      activejob (= 5.2.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.6)
-      actionview (= 5.2.6)
-      activesupport (= 5.2.6)
+    actionpack (5.2.7)
+      actionview (= 5.2.7)
+      activesupport (= 5.2.7)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.6)
-      activesupport (= 5.2.6)
+    actionview (5.2.7)
+      activesupport (= 5.2.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.6)
-      activesupport (= 5.2.6)
+    activejob (5.2.7)
+      activesupport (= 5.2.7)
       globalid (>= 0.3.6)
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
+    activemodel (5.2.7)
+      activesupport (= 5.2.7)
+    activerecord (5.2.7)
+      activemodel (= 5.2.7)
+      activesupport (= 5.2.7)
       arel (>= 9.0)
-    activestorage (5.2.6)
-      actionpack (= 5.2.6)
-      activerecord (= 5.2.6)
+    activestorage (5.2.7)
+      actionpack (= 5.2.7)
+      activerecord (= 5.2.7)
       marcel (~> 1.0.0)
-    activesupport (5.2.6)
+    activesupport (5.2.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -60,7 +60,7 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     crass (1.0.6)
     devise (4.8.0)
@@ -75,18 +75,18 @@ GEM
     erubi (1.10.0)
     execjs (2.8.1)
     ffi (1.15.4)
-    globalid (0.5.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     http-accept (1.7.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.12.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -99,11 +99,13 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
     mini_mime (1.1.2)
-    minitest (5.14.4)
+    minitest (5.15.0)
     msgpack (1.4.2)
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.13.3-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     popper_js (2.9.3)
@@ -112,33 +114,33 @@ GEM
       method_source (~> 1.0)
     puma (5.5.0)
       nio4r (~> 2.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-proxy (0.7.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.6)
-      actioncable (= 5.2.6)
-      actionmailer (= 5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
-      activemodel (= 5.2.6)
-      activerecord (= 5.2.6)
-      activestorage (= 5.2.6)
-      activesupport (= 5.2.6)
+    rails (5.2.7)
+      actioncable (= 5.2.7)
+      actionmailer (= 5.2.7)
+      actionpack (= 5.2.7)
+      actionview (= 5.2.7)
+      activejob (= 5.2.7)
+      activemodel (= 5.2.7)
+      activerecord (= 5.2.7)
+      activestorage (= 5.2.7)
+      activesupport (= 5.2.7)
       bundler (>= 1.3.0)
-      railties (= 5.2.6)
+      railties (= 5.2.7)
       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 (5.2.6)
-      actionpack (= 5.2.6)
-      activesupport (= 5.2.6)
+    railties (5.2.7)
+      actionpack (= 5.2.7)
+      activesupport (= 5.2.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -194,12 +196,12 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 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)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     turbolinks (5.2.1)
@@ -229,6 +231,7 @@ GEM
     websocket-extensions (0.1.5)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-20
 
 DEPENDENCIES
@@ -240,7 +243,7 @@ DEPENDENCIES
   mailgun-ruby
   pry
   puma
-  rails (~> 5.2.5)
+  rails (~> 5.2.7)
   react-rails
   redis
   rspec-rails
@@ -257,4 +260,4 @@ RUBY VERSION
    ruby 2.7.4p191
 
 BUNDLED WITH
-   2.2.28
+   2.3.5
diff --git a/package.json b/package.json
@@ -2,8 +2,8 @@
   "name": "on-site-interview",
   "private": true,
   "dependencies": {
-    "@rails/webpacker": "5.2.1",
-    "activestorage": "^5.2.1",
+    "@rails/webpacker": "5.4.3",
+    "activestorage": "^5.2.7",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "lodash": "^4.17.11",
     "prop-types": "^15.7.2",