diff --git a/Gemfile b/Gemfile index 5fdaceab2f7..b2d8f1ec05f 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem "selenium-webdriver", ">= 3.141.592" gem "rack-cache", "~> 1.2" gem "sass-rails" gem "turbolinks", "~> 5" -gem "webpacker", "~> 4.0", require: ENV["SKIP_REQUIRE_WEBPACKER"] != "true" +gem "webpacker", "~> 5.0", require: ENV["SKIP_REQUIRE_WEBPACKER"] != "true" # require: false so bcrypt is loaded only when has_secure_password is used. # This is to avoid Active Model (and by extension the entire framework) # being dependent on a binary library. diff --git a/Gemfile.lock b/Gemfile.lock index 4ec10dce19d..aa1a71537d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -446,6 +446,7 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) + semantic_range (2.3.0) sequel (5.27.0) serverengine (2.0.7) sigdump (~> 0.2.2) @@ -517,10 +518,11 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpacker (4.2.2) - activesupport (>= 4.2) + webpacker (5.0.0) + activesupport (>= 5.2) rack-proxy (>= 0.6.1) - railties (>= 4.2) + railties (>= 5.2) + semantic_range (>= 2.3.0) websocket (1.2.8) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) @@ -604,7 +606,7 @@ DEPENDENCIES wdm (>= 0.1.0) webdrivers webmock - webpacker (~> 4.0) + webpacker (~> 5.0) websocket-client-simple! BUNDLED WITH diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 29082bcce73..e16e040c787 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -322,7 +322,7 @@ module Rails if options.dev? || options.edge? || options.master? GemfileEntry.github "webpacker", "rails/webpacker", nil, "Use development version of Webpacker" else - GemfileEntry.version "webpacker", "~> 4.0", "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker" + GemfileEntry.version "webpacker", "~> 5.0", "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker" end end