From 2ca1000122b045954544780010f79cb678e8728a Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Thu, 29 Mar 2018 23:18:54 -0400 Subject: [PATCH 01/13] Update railties and actionmailer to 5.0.7 - Remove deprecated quiet_assets gem - Add rails-controller-testing to allow use of `assigns` --- Gemfile | 8 ++--- Gemfile.lock | 92 +++++++++++++++++++++++++--------------------------- 2 files changed, 49 insertions(+), 51 deletions(-) diff --git a/Gemfile b/Gemfile index 5c3e5033e..b8902755c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' ruby '2.3.3' -gem 'actionmailer', '~> 4.2.9' +gem 'actionmailer', '~> 5.0.7' gem 'compass-rails' gem 'dalli', '~> 2.7.1' gem 'faraday-http-cache', '~> 2.0' @@ -17,9 +17,9 @@ gem 'ohanakapa', '~> 1.1.1' gem 'puma' gem 'rack-cache', '~> 1.2' gem 'rack-rewrite', '~> 1.5.0' -gem 'railties', '~> 4.2' +gem 'railties', '~> 5.0.7' gem 'sass-rails', '~> 5.0.1' -gem 'sprockets', '~> 2.12' +gem 'sprockets', '~> 3.7.1' gem 'uglifier' gem 'webpacker', '~> 3.2' @@ -36,7 +36,6 @@ group :development do gem 'derailed' gem 'flamegraph' gem 'letter_opener' - gem 'quiet_assets' gem 'rack-mini-profiler' gem 'reek' gem 'spring' @@ -52,6 +51,7 @@ group :test do gem 'email_spec' gem 'haml_lint' gem 'poltergeist' + gem 'rails-controller-testing' gem 'rubocop' gem 'vcr' gem 'webmock', '~> 2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 12132e9ae..de72dedde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,32 +1,32 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) + actionmailer (5.0.7) + actionpack (= 5.0.7) + actionview (= 5.0.7) + activejob (= 5.0.7) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.9) - actionview (= 4.2.9) - activesupport (= 4.2.9) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.0.7) + actionview (= 5.0.7) + activesupport (= 5.0.7) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.9) - activesupport (= 4.2.9) + actionview (5.0.7) + activesupport (= 5.0.7) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.9) - activesupport (= 4.2.9) - globalid (>= 0.3.0) - activesupport (4.2.9) - i18n (~> 0.7) + activejob (5.0.7) + activesupport (= 5.0.7) + globalid (>= 0.3.6) + activesupport (5.0.7) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) @@ -157,7 +157,6 @@ GEM sysexits (~> 1.1) hashdiff (0.3.2) heapy (0.1.2) - hike (1.2.3) html2haml (2.2.0) erubis (~> 2.7.0) haml (>= 4.0, < 6) @@ -165,7 +164,7 @@ GEM ruby_parser (~> 3.5) htmlentities (4.3.4) httpclient (2.8.3) - i18n (0.9.4) + i18n (1.0.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) json (2.1.0) @@ -187,7 +186,7 @@ GEM logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - loofah (2.1.1) + loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -195,6 +194,7 @@ GEM memcachier (0.0.2) memoist (0.16.0) memory_profiler (0.9.6) + method_source (0.9.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) @@ -218,9 +218,7 @@ GEM powerpack (0.1.1) public_suffix (3.0.1) puma (3.11.2) - quiet_assets (1.1.0) - railties (>= 3.1, < 5.0) - rack (1.6.8) + rack (2.0.4) rack-cache (1.7.1) rack (>= 0.4) rack-mini-profiler (0.10.7) @@ -230,22 +228,24 @@ GEM rack-rewrite (1.5.1) rack-test (0.6.3) rack (>= 1.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-controller-testing (1.0.2) + actionpack (~> 5.x, >= 5.0.1) + actionview (~> 5.x, >= 5.0.1) + activesupport (~> 5.x) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.4) - railties (4.2.9) - actionpack (= 4.2.9) - activesupport (= 4.2.9) + railties (5.0.7) + actionpack (= 5.0.7) + activesupport (= 5.0.7) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) @@ -320,11 +320,9 @@ GEM spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (2.12.4) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) @@ -336,7 +334,7 @@ GEM tins (~> 1.0) thor (0.19.4) thread_safe (0.3.6) - tilt (1.4.1) + tilt (2.0.8) tins (1.14.0) tzinfo (1.2.5) thread_safe (~> 0.1) @@ -369,7 +367,7 @@ PLATFORMS ruby DEPENDENCIES - actionmailer (~> 4.2.9) + actionmailer (~> 5.0.7) better_errors binding_of_caller (~> 0.7.2) bummr @@ -394,12 +392,12 @@ DEPENDENCIES ohanakapa (~> 1.1.1) poltergeist puma - quiet_assets rack-cache (~> 1.2) rack-mini-profiler rack-rewrite (~> 1.5.0) + rails-controller-testing rails_12factor - railties (~> 4.2) + railties (~> 5.0.7) reek rspec-rails (~> 3.1) rubocop @@ -407,7 +405,7 @@ DEPENDENCIES spring spring-commands-rspec spring-watcher-listen - sprockets (~> 2.12) + sprockets (~> 3.7.1) stackprof uglifier vcr From 23ba8e0ce93c5a953b75f5457e58c83936ebe543 Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Mon, 2 Apr 2018 21:20:21 -0400 Subject: [PATCH 02/13] Address Rails 5.1 deprecation warnings --- config/environments/production.rb | 2 +- config/environments/staging.rb | 2 +- config/environments/test.rb | 4 ++-- spec/controllers/feedback_controller_spec.rb | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 93b2a9c9a..c4311d565 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -60,7 +60,7 @@ # https://devcenter.heroku.com/articles/rack-cache-memcached-rails31 # ------------------------------------------------------------------ - config.serve_static_files = true + config.public_file_server.enabled = true # Asset digests allow you to set far-future HTTP expiration dates on all assets, # yet still be able to expire them through the digest params. diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 8a7287c44..b7f83590b 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -17,7 +17,7 @@ # https://devcenter.heroku.com/articles/rack-cache-memcached-rails31 # ------------------------------------------------------------------ - config.serve_static_files = true + config.public_file_server.enabled = true # Asset digests allow you to set far-future HTTP expiration dates on all assets, # yet still be able to expire them through the digest params. diff --git a/config/environments/test.rb b/config/environments/test.rb index 35a5159c9..5970060d5 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -13,8 +13,8 @@ config.eager_load = false # Configure static file server for tests with Cache-Control for performance. - config.serve_static_files = true - config.static_cache_control = 'public, max-age=3600' + config.public_file_server.enabled = true + config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' } # Show full error reports and disable caching. config.consider_all_requests_local = false diff --git a/spec/controllers/feedback_controller_spec.rb b/spec/controllers/feedback_controller_spec.rb index d9d158fef..a4c6771fb 100644 --- a/spec/controllers/feedback_controller_spec.rb +++ b/spec/controllers/feedback_controller_spec.rb @@ -11,12 +11,13 @@ } allow(FeedbackMailer).to receive(:feedback_email).and_return(mailer) - post :create, feedback_params + post :create, params: feedback_params expect(response).to redirect_to root_url expect(flash[:notice]).to eq 'Feedback Sent! Thank you!' + params = ActionController::Parameters.new(feedback_params) expect(FeedbackMailer). - to have_received(:feedback_email).with(feedback_params) + to have_received(:feedback_email).with(params.permit(:agent, :from, :message)) expect(mailer).to have_received(:deliver_now) end end From 14d9cc87d54338198781b606c668984501f87f43 Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Mon, 2 Apr 2018 22:59:34 -0400 Subject: [PATCH 03/13] Fix haml-lint offenses --- app/views/about/index.html.haml | 2 +- app/views/component/about/_feedback.html.haml | 10 +++++++--- app/views/layouts/application.html.haml | 2 +- app/views/shared/_header.html.haml | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml index 3c71e349c..339f84e0d 100644 --- a/app/views/about/index.html.haml +++ b/app/views/about/index.html.haml @@ -1,3 +1,3 @@ - title 'About' = render 'component/about/about' -= render 'component/about/feedback' += render 'component/about/feedback', user_agent: @user_agent diff --git a/app/views/component/about/_feedback.html.haml b/app/views/component/about/_feedback.html.haml index 85c10c7f1..568f0df66 100644 --- a/app/views/component/about/_feedback.html.haml +++ b/app/views/component/about/_feedback.html.haml @@ -10,11 +10,15 @@ = form_tag('/feedback', method: :post) do %p = label_tag 'message', t('views.feedback.submit_comment_label') - = text_area_tag 'message', nil, placeholder: 'enter your comment, question, etc.', | - rows: '4', required: 'true', class: 'comment' + = text_area_tag('message', + nil, + placeholder: 'enter your comment, question, etc.', + rows: '4', + required: 'true', + class: 'comment') %p = label_tag 'from', 'Email:' = email_field_tag 'from', nil, placeholder: 'your email address (optional)', class: 'email' - = hidden_field_tag 'agent', @user_agent + = hidden_field_tag 'agent', user_agent %p = button_tag 'Send!', class: 'button-feedback-send' diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index b61ddb228..4e210d280 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -11,7 +11,7 @@ %body{ class: "#{controller_name == 'home' ? '' : 'inside '}#{controller_name} #{action_name}" } %section#content = render 'shared/alert' - = render 'shared/header' + = render 'shared/header', user_agent: @user_agent %main.main= yield = render 'shared/footer' diff --git a/app/views/shared/_header.html.haml b/app/views/shared/_header.html.haml index 6403b06a2..694ce7a97 100644 --- a/app/views/shared/_header.html.haml +++ b/app/views/shared/_header.html.haml @@ -23,4 +23,4 @@ .popup-container.hide .arrow %span - = render 'component/about/feedback' + = render 'component/about/feedback', user_agent: user_agent From dba803155be106b4c95ca64195b1f48d553fb5f3 Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Tue, 3 Apr 2018 15:46:12 -0400 Subject: [PATCH 04/13] Update railties and actionmailer to 5.1.6 --- Gemfile | 4 ++-- Gemfile.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index b8902755c..e6f93061c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' ruby '2.3.3' -gem 'actionmailer', '~> 5.0.7' +gem 'actionmailer', '~> 5.1.6' gem 'compass-rails' gem 'dalli', '~> 2.7.1' gem 'faraday-http-cache', '~> 2.0' @@ -17,7 +17,7 @@ gem 'ohanakapa', '~> 1.1.1' gem 'puma' gem 'rack-cache', '~> 1.2' gem 'rack-rewrite', '~> 1.5.0' -gem 'railties', '~> 5.0.7' +gem 'railties', '~> 5.1.6' gem 'sass-rails', '~> 5.0.1' gem 'sprockets', '~> 3.7.1' gem 'uglifier' diff --git a/Gemfile.lock b/Gemfile.lock index de72dedde..030352629 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,29 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7) - actionview (= 5.0.7) - activesupport (= 5.0.7) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7) - activesupport (= 5.0.7) + actionview (5.1.6) + activesupport (= 5.1.6) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7) - activesupport (= 5.0.7) + activejob (5.1.6) + activesupport (= 5.1.6) globalid (>= 0.3.6) - activesupport (5.0.7) + activesupport (5.1.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -226,8 +226,8 @@ GEM rack-proxy (0.6.3) rack rack-rewrite (1.5.1) - rack-test (0.6.3) - rack (>= 1.0) + rack-test (1.0.0) + rack (>= 1.0, < 3) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) actionview (~> 5.x, >= 5.0.1) @@ -242,9 +242,9 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.4) - railties (5.0.7) - actionpack (= 5.0.7) - activesupport (= 5.0.7) + railties (5.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -367,7 +367,7 @@ PLATFORMS ruby DEPENDENCIES - actionmailer (~> 5.0.7) + actionmailer (~> 5.1.6) better_errors binding_of_caller (~> 0.7.2) bummr @@ -397,7 +397,7 @@ DEPENDENCIES rack-rewrite (~> 1.5.0) rails-controller-testing rails_12factor - railties (~> 5.0.7) + railties (~> 5.1.6) reek rspec-rails (~> 3.1) rubocop From 311c8edea072fa4eedd409e80219ff02a65bd2bb Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Tue, 3 Apr 2018 15:50:19 -0400 Subject: [PATCH 05/13] Update binding_of_caller from 0.7.2 to 0.8.0 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index e6f93061c..56cf8ae99 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ end # dev and debugging tools group :development do gem 'better_errors' - gem 'binding_of_caller', '~> 0.7.2', platforms: %i[mri_19 rbx] + gem 'binding_of_caller', platforms: %i[mri_19 rbx] gem 'bummr' gem 'derailed' gem 'flamegraph' diff --git a/Gemfile.lock b/Gemfile.lock index 030352629..84ba271a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - binding_of_caller (0.7.2) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) bummr (0.2.1) @@ -87,7 +87,7 @@ GEM safe_yaml (~> 1.0.0) crass (1.0.3) dalli (2.7.6) - debug_inspector (0.0.2) + debug_inspector (0.0.3) declarative (0.0.10) declarative-option (0.1.0) derailed (0.1.0) @@ -369,7 +369,7 @@ PLATFORMS DEPENDENCIES actionmailer (~> 5.1.6) better_errors - binding_of_caller (~> 0.7.2) + binding_of_caller bummr capybara (~> 2.4) compass-rails From a34ac5f14849f9547d62641873b650d0ac647c05 Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Tue, 3 Apr 2018 18:07:23 -0400 Subject: [PATCH 06/13] Update webpacker from 3.2.2 to 3.4.3 --- Gemfile.lock | 6 +++--- bin/webpack | 14 ++++++-------- bin/webpack-dev-server | 14 ++++++-------- package.json | 2 +- yarn.lock | 28 ++++++++++++++++------------ 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 84ba271a9..97575c7c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,7 +109,7 @@ GEM launchy (~> 2.1) mail (~> 2.6) equalizer (0.0.11) - erubi (1.7.0) + erubi (1.7.1) erubis (2.7.0) execjs (2.7.0) faraday (0.14.0) @@ -223,7 +223,7 @@ GEM rack (>= 0.4) rack-mini-profiler (0.10.7) rack (>= 1.2.0) - rack-proxy (0.6.3) + rack-proxy (0.6.4) rack rack-rewrite (1.5.1) rack-test (1.0.0) @@ -352,7 +352,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpacker (3.2.2) + webpacker (3.4.3) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) diff --git a/bin/webpack b/bin/webpack index 9d3800c74..0869ad277 100755 --- a/bin/webpack +++ b/bin/webpack @@ -1,11 +1,7 @@ #!/usr/bin/env ruby -# frozen_string_literal: true -# -# This file was generated by Bundler. -# -# The application 'webpack' is installed as part of a gem, and -# this file is here to facilitate running it. -# + +ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development" +ENV["NODE_ENV"] ||= ENV["NODE_ENV"] || "development" require "pathname" ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", @@ -14,4 +10,6 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", require "rubygems" require "bundler/setup" -load Gem.bin_path("webpacker", "webpack") +require "webpacker" +require "webpacker/webpack_runner" +Webpacker::WebpackRunner.run(ARGV) diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server index cf701102a..251f65e8e 100755 --- a/bin/webpack-dev-server +++ b/bin/webpack-dev-server @@ -1,11 +1,7 @@ #!/usr/bin/env ruby -# frozen_string_literal: true -# -# This file was generated by Bundler. -# -# The application 'webpack-dev-server' is installed as part of a gem, and -# this file is here to facilitate running it. -# + +ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development" +ENV["NODE_ENV"] ||= ENV["NODE_ENV"] || "development" require "pathname" ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", @@ -14,4 +10,6 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", require "rubygems" require "bundler/setup" -load Gem.bin_path("webpacker", "webpack-dev-server") +require "webpacker" +require "webpacker/dev_server_runner" +Webpacker::DevServerRunner.run(ARGV) diff --git a/package.json b/package.json index 73a83f224..afdcad287 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@rails/webpacker": "^3.2.2", + "@rails/webpacker": "^3.4.3", "google-maps-infobox": "^2.0.0", "rails-erb-loader": "^5.2.1" }, diff --git a/yarn.lock b/yarn.lock index f9a430807..0056c6bcc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,9 +2,9 @@ # yarn lockfile v1 -"@rails/webpacker@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-3.2.2.tgz#6d60e1cf729dc2ccc52053c9b6b8d30c9a48a297" +"@rails/webpacker@^3.4.3": + version "3.4.3" + resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-3.4.3.tgz#496a5d49bea8856db20b212d2727a4b43b281dd9" dependencies: babel-core "^6.26.0" babel-loader "^7.1.2" @@ -14,14 +14,14 @@ babel-polyfill "^6.26.0" babel-preset-env "^1.6.1" case-sensitive-paths-webpack-plugin "^2.1.1" - compression-webpack-plugin "^1.1.6" + compression-webpack-plugin "^1.1.10" css-loader "^0.28.9" extract-text-webpack-plugin "^3.0.2" file-loader "^1.1.6" glob "^7.1.2" js-yaml "^3.10.0" node-sass "^4.7.2" - path-complete-extname "^0.1.0" + path-complete-extname "^1.0.0" postcss-cssnext "^3.1.0" postcss-import "^11.0.0" postcss-loader "^2.1.0" @@ -1401,13 +1401,13 @@ compressible@~2.0.13: dependencies: mime-db ">= 1.33.0 < 2" -compression-webpack-plugin@^1.1.6: - version "1.1.8" - resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-1.1.8.tgz#ba5f184f51ed55da07da19caada80e181403e1a7" +compression-webpack-plugin@^1.1.10: + version "1.1.11" + resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-1.1.11.tgz#8384c7a6ead1d2e2efb190bdfcdcf35878ed8266" dependencies: - async "^2.4.1" cacache "^10.0.1" find-cache-dir "^1.0.0" + neo-async "^2.5.0" serialize-javascript "^1.4.0" webpack-sources "^1.0.1" @@ -3842,6 +3842,10 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" +neo-async@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f" + node-forge@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.1.tgz#9da611ea08982f4b94206b3beb4cc9665f20c300" @@ -4192,9 +4196,9 @@ path-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" -path-complete-extname@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/path-complete-extname/-/path-complete-extname-0.1.0.tgz#c454702669f31452f8193aa6168915fa31692f4a" +path-complete-extname@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/path-complete-extname/-/path-complete-extname-1.0.0.tgz#f889985dc91000c815515c0bfed06c5acda0752b" path-dirname@^1.0.0: version "1.0.2" From eb3b51ab4e4306df7f08f37cd0c226307b106541 Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Tue, 3 Apr 2018 18:07:49 -0400 Subject: [PATCH 07/13] Update capybara from 2.17.0 to 2.18.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 97575c7c0..52af5e3ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,7 +46,7 @@ GEM bummr (0.2.1) rainbow thor - capybara (2.17.0) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) @@ -216,7 +216,7 @@ GEM cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) - public_suffix (3.0.1) + public_suffix (3.0.2) puma (3.11.2) rack (2.0.4) rack-cache (1.7.1) From 2113a81a2104e3203f86f2f25833b433a2d8da3a Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Tue, 3 Apr 2018 18:07:56 -0400 Subject: [PATCH 08/13] Update dalli from 2.7.6 to 2.7.7 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 52af5e3ac..f7353eb1c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,7 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.3) - dalli (2.7.6) + dalli (2.7.7) debug_inspector (0.0.3) declarative (0.0.10) declarative-option (0.1.0) From ec904f85527ca5cd11b93216eff23c150f7160f2 Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Tue, 3 Apr 2018 18:08:06 -0400 Subject: [PATCH 09/13] Update google-api-client from 0.19.6 to 0.20.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f7353eb1c..bd70cfc1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,7 +125,7 @@ GEM get_process_mem (0.2.0) globalid (0.4.1) activesupport (>= 4.2.0) - google-api-client (0.19.6) + google-api-client (0.20.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) From 9bcbecb4019c240da147430d377a5d16a25b29d8 Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Tue, 3 Apr 2018 18:08:13 -0400 Subject: [PATCH 10/13] Update puma from 3.11.2 to 3.11.3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index bd70cfc1a..d89feb4c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -217,7 +217,7 @@ GEM websocket-driver (>= 0.2.0) powerpack (0.1.1) public_suffix (3.0.2) - puma (3.11.2) + puma (3.11.3) rack (2.0.4) rack-cache (1.7.1) rack (>= 0.4) From 1773ce3b54c007431208ffc75bf98181d9ce9080 Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Tue, 3 Apr 2018 18:08:20 -0400 Subject: [PATCH 11/13] Update rack-mini-profiler from 0.10.7 to 1.0.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d89feb4c3..45d0ca96b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -221,7 +221,7 @@ GEM rack (2.0.4) rack-cache (1.7.1) rack (>= 0.4) - rack-mini-profiler (0.10.7) + rack-mini-profiler (1.0.0) rack (>= 1.2.0) rack-proxy (0.6.4) rack From 62900ef14b3793dd4f83360b5176812c97b0f531 Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Tue, 3 Apr 2018 18:08:27 -0400 Subject: [PATCH 12/13] Update reek from 4.7.3 to 4.8.0 --- Gemfile.lock | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 45d0ca96b..e926d4c17 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -209,8 +209,8 @@ GEM sawyer (~> 0.8) os (0.9.6) parallel (1.12.1) - parser (2.4.0.2) - ast (~> 2.3) + parser (2.5.0.5) + ast (~> 2.4.0) poltergeist (1.17.0) capybara (~> 2.1) cliver (~> 0.3.1) @@ -248,16 +248,15 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake + rainbow (3.0.0) rake (10.5.0) rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) - reek (4.7.3) + reek (4.8.0) codeclimate-engine-rb (~> 0.4.0) - parser (>= 2.4.0.0, < 2.5) - rainbow (~> 2.0) + parser (>= 2.5.0.0, < 2.6) + rainbow (~> 3.0) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) From 4a21a986c75f276b9fcf77630c128fc5d20e3199 Mon Sep 17 00:00:00 2001 From: Moncef Belyamani Date: Tue, 3 Apr 2018 18:08:43 -0400 Subject: [PATCH 13/13] Update uglifier from 4.1.6 to 4.1.8 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e926d4c17..008d397a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -338,7 +338,7 @@ GEM tzinfo (1.2.5) thread_safe (~> 0.1) uber (0.1.0) - uglifier (4.1.6) + uglifier (4.1.8) execjs (>= 0.3.0, < 3) unicode-display_width (1.3.0) vcr (4.0.0)