diff --git a/.env.test b/.env.test index fa4e1d91fa8..761d0d92106 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 015a4d5773a..76eb05fc151 100644 --- a/Gemfile +++ b/Gemfile @@ -94,7 +94,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 bc84b7deeaf..b152003b37e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -663,7 +663,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) @@ -805,7 +805,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