aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuji Yaginuma <yuuji.yaginuma@gmail.com>2019-03-09 11:22:17 +0900
committerGitHub <noreply@github.com>2019-03-09 11:22:17 +0900
commit413173c285ffb8a4144fdf8a91050730b7a9a17c (patch)
tree5d670f5eeb3a78554e0ade06d12f17fd31645639
parent788272231cb75d9de454c45881421db9afea74cd (diff)
parentc2de1f79aba8f7282bda1e519147f08ef32cba47 (diff)
downloadrails-413173c285ffb8a4144fdf8a91050730b7a9a17c.tar.gz
rails-413173c285ffb8a4144fdf8a91050730b7a9a17c.tar.bz2
rails-413173c285ffb8a4144fdf8a91050730b7a9a17c.zip
Merge pull request #35545 from sharang-d/relax-webpacker-version
Don't lock the webpacker gem by its patch version
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock2
-rw-r--r--railties/lib/rails/generators/app_base.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index f14108e9c2..d5c2ee9d28 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem "selenium-webdriver", ">= 3.5.0", "< 3.13.0"
gem "rack-cache", "~> 1.2"
gem "sass-rails"
gem "turbolinks", "~> 5"
-gem "webpacker", "~> 4.0.0", require: ENV["SKIP_REQUIRE_WEBPACKER"] != "true"
+gem "webpacker", "~> 4.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 0209a41763..c778569e72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -588,7 +588,7 @@ DEPENDENCIES
w3c_validators
wdm (>= 0.1.0)
webmock
- webpacker (~> 4.0.0)
+ webpacker (~> 4.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 1a857985ef..66f6b57379 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -316,7 +316,7 @@ module Rails
if options.dev? || options.edge?
GemfileEntry.github "webpacker", "rails/webpacker", nil, "Use development version of Webpacker"
else
- GemfileEntry.version "webpacker", "~> 4.0.0", "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker"
+ GemfileEntry.version "webpacker", "~> 4.0", "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker"
end
end