Use released webpacker

上级 470e6bda
......@@ -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.
......
......@@ -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
......
......@@ -316,7 +316,7 @@ def webpacker_gemfile_entry
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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册