Skip to content

Commit 01f2056

Browse files
authored
Revert "Support Rails 6 asset recompilation through webpacker" (#723)
* Revert "Support Rails 6 asset recompilation through webpacker (#656)" This reverts commit 5f413c2. * Update expected output
1 parent 2e87ff5 commit 01f2056

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
if\ diff\ \-qrN\ ".*/deploy/current/vendor/assets/"\ "\./vendor/assets/"\ 2>/dev/null\ &&\ diff\ \-qrN\ ".*/deploy/current/app/assets/"\ "\./app/assets/"\ 2>/dev/null\ &&\ diff\ \-qrN\ ".*/deploy/current/app/javascript/"\ "\./app/javascript/"\ 2>/dev/null &&\ diff\ \-qrN\ ".*/deploy/current/package.json"\ "\./package.json"\ 2>/dev/null\s*then\s*echo\ "\-\-\-\-\->\ Skipping\ asset\ precompilation"\s*else\s*echo\ "\-\-\-\-\->\ Precompiling\ asset\ files"\s*RAILS_ENV="production"\ bundle\ exec\ rake\ assets:precompile\s*fi
1+
if\ diff\ \-qrN\ ".*/deploy/current/vendor/assets/"\ "\./vendor/assets/"\ 2>/dev/null\ &&\ diff\ \-qrN\ ".*/deploy/current/app/assets/"\ "\./app/assets/"\ 2>/dev/null\s*then\s*echo\ "\-\-\-\-\->\ Skipping\ asset\ precompilation"\s*else\s*echo\ "\-\-\-\-\->\ Precompiling\ asset\ files"\s*RAILS_ENV="production"\ bundle\ exec\ rake\ assets:precompile\s*fi

spec/support/outputs/rails_assets_precompile_with_diff.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if diff -qrN ".*/deploy/current/vendor/assets/" "\./vendor/assets/" 2>/dev/null && diff -qrN ".*/deploy/current/app/assets/" "\./app/assets/" 2>/dev/null && diff -qrN ".*/deploy/current/app/javascript/" "\./app/javascript/" 2>/dev/null && diff -qrN ".*/deploy/current/package\.json" "\./package\.json" 2>/dev/null
1+
if diff -qrN ".*/deploy/current/vendor/assets/" "\./vendor/assets/" 2>/dev/null && diff -qrN ".*/deploy/current/app/assets/" "\./app/assets/" 2>/dev/null
22
then
33
echo "-----> Skipping asset precompilation"
44
else

tasks/mina/rails.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
set :bundle_prefix, -> { %(RAILS_ENV="#{fetch(:rails_env)}" #{fetch(:bundle_bin)} exec) }
88
set :rake, -> { "#{fetch(:bundle_prefix)} rake" }
99
set :rails, -> { "#{fetch(:bundle_prefix)} rails" }
10-
set :compiled_asset_path, ['public/assets', 'public/packs']
11-
set :asset_dirs, ['vendor/assets/', 'app/assets/', 'app/javascript/', 'package.json']
10+
set :compiled_asset_path, 'public/assets'
11+
set :asset_dirs, ['vendor/assets/', 'app/assets/']
1212
set :migration_dirs, ['db/migrate']
1313

14-
set :shared_dirs, fetch(:shared_dirs, []).push('log', 'tmp/cache', 'node_modules', *fetch(:compiled_asset_path))
14+
set :shared_dirs, fetch(:shared_dirs, []).push('log', 'tmp/cache', fetch(:compiled_asset_path))
1515

1616
desc 'Starts an interactive console.'
1717
task :console do

0 commit comments

Comments
 (0)