From ba44f5e409e4e7e7bd52cbc074a0331a37e4cc4e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 17 Apr 2022 10:43:44 +0200 Subject: [PATCH] Fix patch --- sources/patches/app-1-use-latest_uglify-js.patch | 4 ++-- .../app-3-Re-add-support-for-older-versions-of-brotli.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sources/patches/app-1-use-latest_uglify-js.patch b/sources/patches/app-1-use-latest_uglify-js.patch index 5af4246..c2c32ad 100644 --- a/sources/patches/app-1-use-latest_uglify-js.patch +++ b/sources/patches/app-1-use-latest_uglify-js.patch @@ -2,9 +2,9 @@ diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake index 4a02d5f1b1..7b47f21658 100644 --- a/lib/tasks/assets.rake +++ b/lib/tasks/assets.rake -@@ -94,6 +94,7 @@ def compress_ruby(from, to) +@@ -153,6 +153,7 @@ data = File.read("#{assets_path}/#{from}") - + uglified, map = Uglifier.new(comments: :none, + harmony: true, source_map: { diff --git a/sources/patches/app-3-Re-add-support-for-older-versions-of-brotli.patch b/sources/patches/app-3-Re-add-support-for-older-versions-of-brotli.patch index 728758a..2c1bcfe 100644 --- a/sources/patches/app-3-Re-add-support-for-older-versions-of-brotli.patch +++ b/sources/patches/app-3-Re-add-support-for-older-versions-of-brotli.patch @@ -2,9 +2,9 @@ diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake index 7b47f21658..ea6d0da2c4 100644 --- a/lib/tasks/assets.rake +++ b/lib/tasks/assets.rake -@@ -116,9 +116,21 @@ def gzip(path) +@@ -174,9 +174,21 @@ end - + # different brotli versions use different parameters -def brotli_command(path, max_compress) - compression_quality = max_compress ? "11" : "6" @@ -25,5 +25,5 @@ index 7b47f21658..ea6d0da2c4 100644 + # not sure what to do here, not expecting this + raise "cannot determine brotli version" end - + def brotli(path, max_compress)