diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2019-01-17 17:21:09 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2019-01-17 17:21:09 -0500 |
| commit | 3219e4aef10e7e3cbac24c98f52f7de4954969e4 (patch) | |
| tree | c2d258a58bf3734d7d04a21a1221ac60dfdd216f | |
| parent | 470e6bdac97249ca3406c635f611aa8f7df8b222 (diff) | |
| download | rails-3219e4aef10e7e3cbac24c98f52f7de4954969e4.tar.gz rails-3219e4aef10e7e3cbac24c98f52f7de4954969e4.tar.bz2 rails-3219e4aef10e7e3cbac24c98f52f7de4954969e4.zip | |
Use released webpacker
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 15 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
3 files changed, 7 insertions, 12 deletions
@@ -14,7 +14,7 @@ gem "capybara", ">= 2.15" gem "rack-cache", "~> 1.2" gem "sass-rails" gem "turbolinks", "~> 5" -gem "webpacker", github: "rails/webpacker", require: ENV["SKIP_REQUIRE_WEBPACKER"] != "true" +gem "webpacker", ">= 4.0.0.rc.3", 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 23942b11fb..95ea05881e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,15 +15,6 @@ GIT queue_classic (3.2.0.RC1) pg (>= 0.17, < 2.0) -GIT - remote: https://github.com/rails/webpacker.git - revision: bb132d591da35095e3246082cba3d693f847e0b5 - specs: - webpacker (4.0.0.pre.3) - activesupport (>= 4.2) - rack-proxy (>= 0.6.1) - railties (>= 4.2) - PATH remote: . specs: @@ -513,6 +504,10 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff + webpacker (4.0.0.rc.3) + activesupport (>= 4.2) + rack-proxy (>= 0.6.1) + railties (>= 4.2) websocket (1.2.8) websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) @@ -590,7 +585,7 @@ DEPENDENCIES w3c_validators wdm (>= 0.1.0) webmock - webpacker! + webpacker (>= 4.0.0.rc.3) websocket-client-simple! BUNDLED WITH diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 8278abcaeb..0023a9a6a6 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.new "webpacker", nil, "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker" + GemfileEntry.version "webpacker", ">= 4.0.0.rc.3", "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker" end end |