Skip to content

Commit a03bdea

Browse files
scherztcThomas Scherz
and
Thomas Scherz
authored
Updates Ugglifier. (#380)
Co-authored-by: Thomas Scherz <[email protected]>
1 parent 680e596 commit a03bdea

File tree

6 files changed

+15
-7
lines changed

6 files changed

+15
-7
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ gem 'sass-rails', '~> 5.0'
2222
# Use Devise for authentication
2323
gem 'devise'
2424
# Use Uglifier as compressor for JavaScript assets
25-
gem 'uglifier', '>= 1.3.0'
25+
gem 'uglifier', '~> 4.2', '>= 4.2.1'
2626
# See https://github.com/rails/execjs#readme for more supported runtimes
2727
# gem 'mini_racer', platforms: :ruby
2828
# Use CoffeeScript for .coffee assets and views

Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ DEPENDENCIES
449449
sqlite3 (~> 1.4)
450450
turbolinks (~> 5)
451451
tzinfo-data
452-
uglifier (>= 1.3.0)
452+
uglifier (~> 4.2, >= 4.2.1)
453453
web-console (>= 3.3.0)
454454

455455
RUBY VERSION

app/assets/javascripts/application.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//= require rails-ujs
1414
//= require jquery3
15-
//= require bootstrap-sprockets
15+
//= require bootstrap
1616
//= require gritter
1717
//= require activestorage
1818
//= require turbolinks

app/views/front/dashboard.html.erb

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</div>
77
<div class="card-body" style="overflow: scroll; height: 10%; background-color: black ; color: white">
88
<% if @indesign_count != 0 %>
9-
<table class="table text-center w-25" style="padding-left: 20p; background-color: black">
9+
<table class="table text-center w-25" style="padding-left: 20px; background-color: black">
1010
<thead>
1111
<tr>
1212
<th class="align-left" style="padding-left: 20px; background-color: black ; color: white"><%= sortable "title", "Software Record" %>
@@ -28,7 +28,7 @@
2828
<i class="fa fa-caret-down float-none"></i>
2929
<% end %></th>
3030
<th class="align-left" style="padding-left: 20px; background-color: black ; color: white">Status</th>
31-
<th class="align-left" style="padding-left: 20px; background-color: black ; color: white""><%= sortable "production_url", "URL" %>
31+
<th class="align-left" style="padding-left: 20px; background-color: black ; color: white"><%= sortable "production_url", "URL" %>
3232
<% if params[:direction] == "asc" || params[:direction] == nil %>
3333
<i class="fa fa-caret-up"></i>
3434
<% else %>

config/deploy.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
WARN
6363
ask :value, "Sure you want to continue deploying `#{branch}` on #{stage}? (Y)"
6464

65-
if fetch(:value) != 'Y'
65+
if fetch(:value).to_s.downcase != 'y'
6666
puts "\nDeploy cancelled!"
6767
exit
6868
end

config/environments/production.rb

+9-1
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,13 @@
112112
config.active_record.dump_schema_after_migration = false
113113

114114
# Change the Uglifier parsing engine
115-
config.assets.js_compressor = Uglifier.new(harmony: true)
115+
config.assets.js_compressor = Uglifier.new(
116+
harmony: true,
117+
mangle: false,
118+
compress: false,
119+
output: {
120+
beautify: true,
121+
comments: :all
122+
}
123+
)
116124
end

0 commit comments

Comments
 (0)