Skip to content

Commit

Permalink
Fix webpacker:compile task
Browse files Browse the repository at this point in the history
Following rails/webpacker#2389
Requires webpacker v4.2+
  • Loading branch information
glebm committed Dec 30, 2019
1 parent 66600de commit d138eb2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'

gem 'rails', '~> 6.0.0'
gem 'rails-i18n', '~> 6.0.0'
gem 'webpacker', '~> 4.0'
gem 'webpacker', '~> 4.2'

# https://github.com/rails/rails/blob/v6.0.0.rc1/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L12
gem 'sqlite3', '~> 1.3', '>= 1.3.6'
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace :webpacker do
task compile: %i[yarn_install load_app] do
Dir.chdir(File.join(__dir__, 'spec/dummy')) do
Webpacker.with_node_env('production') do
ensure_log_goes_to_stdout do
Webpacker.ensure_log_goes_to_stdout do
exit! unless ::Webpacker.instance.commands.compile
end
end
Expand Down
2 changes: 1 addition & 1 deletion heroku.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'thredded', path: File.dirname(__FILE__)
gem 'mustache'

gem 'rails', '~> 6.0.0'
gem 'webpacker', '~> 4.0'
gem 'webpacker', '~> 4.2'

# Make these gems available in production
gem 'puma'
Expand Down
4 changes: 2 additions & 2 deletions heroku.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PATH
kramdown (>= 2.0.0)
kramdown-parser-gfm
nokogiri
onebox (~> 1.9, >= 1.9.24)
onebox (~> 1.8, >= 1.8.99)
pundit (>= 1.1.0)
rails (>= 4.2.10, != 6.0.0.rc2)
rb-gravatar
Expand Down Expand Up @@ -309,7 +309,7 @@ DEPENDENCIES
tunemygc
turbolinks
twemoji
webpacker (~> 4.0)
webpacker (~> 4.2)

RUBY VERSION
ruby 2.6.5p114
Expand Down
2 changes: 1 addition & 1 deletion spec/gemfiles/rails_6_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ eval_gemfile '../../shared.gemfile'
gem 'rails', '~> 6.0.0'
gem 'rails-i18n', '~> 6.0.0'

gem 'webpacker', '~> 4.0'
gem 'webpacker', '~> 4.2'

# https://github.com/rails/rails/blob/v6.0.0/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
gem 'sqlite3', '~> 1.4'
Expand Down

0 comments on commit d138eb2

Please sign in to comment.