Merge pull request #897 from sharvy/upgraded-to-ruby-272

Issue #782 : Ruby version upgraded to 2.7.2.
rubyforgood · Mar 16, 2021 · 6f47d02 · 6f47d02
2 parents d96f9fd + 0e0adcb
commit 6f47d02
Show file tree

Hide file tree

Showing 15 changed files with 1,409 additions and 1,149 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,5 +1,5 @@
 docker_image: &docker_image
-  image: circleci/ruby:2.7.0-node
+  image: circleci/ruby:2.7.2-node
 
 version: 2.1
 commands:

diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-12.16.3
+14.15.5
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.7.0
+ruby-2.7.2
diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,3 @@
-ruby 2.7.0
+ruby 2.7.2
 yarn 1.22.5
-nodejs 12.18.4
+nodejs 14.15.5
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.0'
+ruby '2.7.2'
 
 gem 'rails', '~> 6.0.2', '>= 6.0.2.2'
 
@@ -36,7 +36,7 @@ gem 'reform-rails'
 gem 'rubocop-rails'
 gem 'sendgrid-ruby'
 gem 'simple_form'
-gem 'webpacker', '~> 4.0'
+gem 'webpacker', '~> 5.0'
 
 group :development, :test do
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -249,6 +249,7 @@ GEM
     ruby-progressbar (1.11.0)
     ruby_dep (1.5.0)
     ruby_http_client (3.5.0)
+    semantic_range (3.0.0)
     sendgrid-ruby (6.2.0)
       ruby_http_client (~> 3.4)
     simple_form (5.0.2)
@@ -280,10 +281,11 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webpacker (4.2.2)
-      activesupport (>= 4.2)
+    webpacker (5.2.1)
+      activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
-      railties (>= 4.2)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -327,10 +329,10 @@ DEPENDENCIES
   spring-commands-rspec
   spring-watcher-listen (~> 2.0.0)
   web-console (>= 3.3.0)
-  webpacker (~> 4.0)
+  webpacker (~> 5.0)
 
 RUBY VERSION
-   ruby 2.7.0p0
+   ruby 2.7.2p137
 
 BUNDLED WITH
-   2.1.2
+   2.1.4
diff --git a/ansible/vars/main.yml b/ansible/vars/main.yml
@@ -17,8 +17,8 @@ postgresql_service_state: started
 postgresql_service_enabled: true
 postgres_users_no_log: false
 ruby_install_from_source: true
-ruby_download_url: https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.0.tar.bz2
-ruby_version: 2.7.0
+ruby_download_url: https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.2.tar.bz2
+ruby_version: 2.7.2
 nodejs_npm_global_packages:
   - name: yarn
 npm_config_prefix: "/home/{{ ansible_ssh_user}}/npm"
diff --git a/bin/bundle b/bin/bundle
@@ -73,7 +73,7 @@ m = Module.new do
 
     requirement = bundler_gem_version.approximate_recommendation
 
-    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.2")
 
     requirement += ".a" if bundler_gem_version.prerelease?
 

diff --git a/config/webpacker.yml b/config/webpacker.yml
@@ -11,7 +11,7 @@ default: &default
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  resolved_paths: ['app/assets']
+  additional_paths: ['app/assets']
 
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false

diff --git a/doc/setup.md b/doc/setup.md
@@ -7,7 +7,7 @@ This is a Ruby on Rails 6.0 application with Vue + Webpack included.
 To get started developing on your machine, you'll need the following tools installed:
 
 * ruby 2.7+, bundler 2+
-* node 10+, yarn 1.16+
+* node 14+, yarn 1.16+
 
 This project uses webpacker to bundle front end assets, including:
 

diff --git a/docker/development/app/Dockerfile b/docker/development/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7.0-alpine as base
+FROM ruby:2.7.2-alpine as base
 
 WORKDIR /usr/src/app
 

diff --git a/docker/development/email/Dockerfile b/docker/development/email/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7.0-alpine
+FROM ruby:2.7.2-alpine
 
 RUN apk add --update-cache openssl-dev build-base sqlite-dev
 

diff --git a/docker/production/app/Dockerfile b/docker/production/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7.0-alpine
+FROM ruby:2.7.2-alpine
 
 RUN bundle config --global frozen 1
 WORKDIR /usr/src/app

diff --git a/package.json b/package.json
@@ -3,21 +3,22 @@
   "private": true,
   "version": "0.4.0",
   "engines": {
-    "node": "12.x"
+    "node": "14.x"
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.13.0",
     "@mapbox/mapbox-sdk": "^0.11.0",
     "@rails/actiontext": "^6.0.3-2",
     "@rails/ujs": "^6.0.0",
-    "@rails/webpacker": "4.2.2",
+    "@rails/webpacker": "^5.0.0",
     "@vue/composition-api": "^0.5.0",
     "babel-loader": "^8.1.0",
     "buefy": "^0.8.17",
     "bulma": "^0.8.2",
     "css-loader": "^3.5.2",
     "file-loader": "^6.0.0",
     "mapbox-gl-vue": "^2.0.4",
+    "node-fetch": "^2.6.1",
     "null-loader": "^4.0.0",
     "sass-loader": "8.0.2",
     "style-loader": "^1.1.4",
@@ -41,7 +42,7 @@
     "prettier": "2.0.5",
     "release-it": "^13.6.2",
     "sinon": "9.0.2",
-    "webpack-cli": "^3.3.11",
+    "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.10.3",
     "webpack-node-externals": "^1.7.2"
   },