mirror of https://github.com/rails/rails
Test with and generate new apps with webpacker 5.0
This commit is contained in:
parent
b49521efef
commit
104aaf5b3f
2
Gemfile
2
Gemfile
|
@ -15,7 +15,7 @@ gem "selenium-webdriver", ">= 3.141.592"
|
||||||
gem "rack-cache", "~> 1.2"
|
gem "rack-cache", "~> 1.2"
|
||||||
gem "sass-rails"
|
gem "sass-rails"
|
||||||
gem "turbolinks", "~> 5"
|
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.
|
# 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)
|
# This is to avoid Active Model (and by extension the entire framework)
|
||||||
# being dependent on a binary library.
|
# being dependent on a binary library.
|
||||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -446,6 +446,7 @@ GEM
|
||||||
selenium-webdriver (3.142.7)
|
selenium-webdriver (3.142.7)
|
||||||
childprocess (>= 0.5, < 4.0)
|
childprocess (>= 0.5, < 4.0)
|
||||||
rubyzip (>= 1.2.2)
|
rubyzip (>= 1.2.2)
|
||||||
|
semantic_range (2.3.0)
|
||||||
sequel (5.27.0)
|
sequel (5.27.0)
|
||||||
serverengine (2.0.7)
|
serverengine (2.0.7)
|
||||||
sigdump (~> 0.2.2)
|
sigdump (~> 0.2.2)
|
||||||
|
@ -517,10 +518,11 @@ GEM
|
||||||
addressable (>= 2.3.6)
|
addressable (>= 2.3.6)
|
||||||
crack (>= 0.3.2)
|
crack (>= 0.3.2)
|
||||||
hashdiff (>= 0.4.0, < 2.0.0)
|
hashdiff (>= 0.4.0, < 2.0.0)
|
||||||
webpacker (4.2.2)
|
webpacker (5.0.0)
|
||||||
activesupport (>= 4.2)
|
activesupport (>= 5.2)
|
||||||
rack-proxy (>= 0.6.1)
|
rack-proxy (>= 0.6.1)
|
||||||
railties (>= 4.2)
|
railties (>= 5.2)
|
||||||
|
semantic_range (>= 2.3.0)
|
||||||
websocket (1.2.8)
|
websocket (1.2.8)
|
||||||
websocket-driver (0.7.1)
|
websocket-driver (0.7.1)
|
||||||
websocket-extensions (>= 0.1.0)
|
websocket-extensions (>= 0.1.0)
|
||||||
|
@ -604,7 +606,7 @@ DEPENDENCIES
|
||||||
wdm (>= 0.1.0)
|
wdm (>= 0.1.0)
|
||||||
webdrivers
|
webdrivers
|
||||||
webmock
|
webmock
|
||||||
webpacker (~> 4.0)
|
webpacker (~> 5.0)
|
||||||
websocket-client-simple!
|
websocket-client-simple!
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
|
|
|
@ -322,7 +322,7 @@ module Rails
|
||||||
if options.dev? || options.edge? || options.master?
|
if options.dev? || options.edge? || options.master?
|
||||||
GemfileEntry.github "webpacker", "rails/webpacker", nil, "Use development version of Webpacker"
|
GemfileEntry.github "webpacker", "rails/webpacker", nil, "Use development version of Webpacker"
|
||||||
else
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue