[FEATURE] Upgrade form builder to 3.8.2

refs OSC-17
Children-in-Families · Aug 22, 2022 · b0eb1c4 · b0eb1c4
1 parent c0ef371
commit b0eb1c4
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 417 deletions.
diff --git a/Gemfile b/Gemfile
@@ -131,3 +131,4 @@ group :test do
 end
 
 gem "sentry-raven", "~> 2.13"
+gem 'terser', '~> 1.1', '>= 1.1.12'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -796,6 +796,8 @@ GEM
     sysrandom (1.0.5)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
+    terser (1.1.12)
+      execjs (>= 0.3.0, < 3)
     text (1.3.1)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
@@ -976,6 +978,7 @@ DEPENDENCIES
   sorbet-rails
   spreadsheet (~> 1.1.3)
   sysrandom (~> 1.0, >= 1.0.5)
+  terser (~> 1.1, >= 1.1.12)
   text (~> 1.3, >= 1.3.1)
   thin (~> 1.7)
   thredded (~> 0.6.1)

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -1,4 +1,5 @@
 Rails.application.configure do
+  config.assets.js_compressor = :terser
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -98,4 +98,6 @@
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  config.assets.js_compressor = :terser
 end
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
@@ -77,4 +77,6 @@
   config.log_formatter = ::Logger::Formatter.new
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  config.assets.js_compressor = :terser
 end
diff --git a/vendor/assets/javascripts/form_builder/form-builder.min.js b/vendor/assets/javascripts/form_builder/form-builder.min.js
diff --git a/vendor/assets/javascripts/form_builder/form-render.min.js b/vendor/assets/javascripts/form_builder/form-render.min.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -131,3 +131,4 @@ group :test do
		end

		gem "sentry-raven", "~> 2.13"
		gem 'terser', '~> 1.1', '>= 1.1.12'