From 5605b828e5149bd3a5161eb8d536ad51094afe64 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 17:56:11 +0100 Subject: [PATCH] Bump webpacker from 4.0.7 to 4.2.0 (#12416) * Bump webpacker from 4.0.7 to 4.2.0 Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.7 to 4.2.0. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v4.0.7...v4.2.0) Signed-off-by: dependabot-preview[bot] * Use NODE_ENV=tests instead of test, to work around async modules not having a chunk --- .env.test | 2 +- Gemfile | 2 +- Gemfile.lock | 4 ++-- config/webpack/{test.js => tests.js} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename config/webpack/{test.js => tests.js} (100%) diff --git a/.env.test b/.env.test index fa4e1d91fa..761d0d9210 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,5 @@ # Node.js -NODE_ENV=test +NODE_ENV=tests # Federation LOCAL_DOMAIN=cb6e6126.ngrok.io LOCAL_HTTPS=true diff --git a/Gemfile b/Gemfile index 158e8d2365..0bdc86323c 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ gem 'tty-command', '~> 0.9', require: false gem 'tty-prompt', '~> 0.19', require: false gem 'twitter-text', '~> 1.14' gem 'tzinfo-data', '~> 1.2019' -gem 'webpacker', '~> 4.0' +gem 'webpacker', '~> 4.2' gem 'webpush' gem 'json-ld', git: 'https://github.com/ruby-rdf/json-ld.git', ref: 'e742697a0906e74e8bb777ef98137bc3955d981d' diff --git a/Gemfile.lock b/Gemfile.lock index ac9c0e906b..401de21f74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -660,7 +660,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpacker (4.0.7) + webpacker (4.2.0) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) @@ -800,7 +800,7 @@ DEPENDENCIES twitter-text (~> 1.14) tzinfo-data (~> 1.2019) webmock (~> 3.7) - webpacker (~> 4.0) + webpacker (~> 4.2) webpush RUBY VERSION diff --git a/config/webpack/test.js b/config/webpack/tests.js similarity index 100% rename from config/webpack/test.js rename to config/webpack/tests.js