未验证 提交 cd89082f 编写于 作者: G Guillermo Iguaran 提交者: GitHub

Merge pull request #35538 from sharang-d/use-latest-webpacker

Use the latest stable release of webpacker
......@@ -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.rc.3", require: ENV["SKIP_REQUIRE_WEBPACKER"] != "true"
gem "webpacker", "~> 4.0.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.
......
......@@ -505,7 +505,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
webpacker (4.0.0.rc.3)
webpacker (4.0.2)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
......@@ -588,7 +588,7 @@ DEPENDENCIES
w3c_validators
wdm (>= 0.1.0)
webmock
webpacker (>= 4.0.0.rc.3)
webpacker (~> 4.0.0)
websocket-client-simple!
BUNDLED WITH
......
......@@ -2,10 +2,10 @@
"name": "dummy",
"private": true,
"dependencies": {
"@rails/webpacker": "^3.2.2",
"@rails/webpacker": "^4.0.2",
"activetext": "file:../.."
},
"devDependencies": {
"webpack-dev-server": "^2.11.1"
"webpack-dev-server": "^3.2.1"
}
}
此差异已折叠。
......@@ -2,10 +2,10 @@
"name": "dummy",
"private": true,
"dependencies": {
"@rails/webpacker": "^3.2.2",
"@rails/webpacker": "^4.0.2",
"actiontext": "file:../.."
},
"devDependencies": {
"webpack-dev-server": "^2.11.1"
"webpack-dev-server": "^3.2.1"
}
}
此差异已折叠。
......@@ -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.version "webpacker", ">= 4.0.0.rc.3", "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker"
GemfileEntry.version "webpacker", "~> 4.0.0", "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.
先完成此消息的编辑!
想要评论请 注册