From 831de842a7eca0df44367d8cb182cedc53680d77 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: May 13 2020 09:06:26 +0000
Subject: WebUI: use python3-rjsmin to minify JavaScript files


Fedora 33+ deprecated uglify-js. There are other alternatives which seem
to be fine for the minify task. Use python-rjsmin instead.

Fixes: https://pagure.io/freeipa/issue/8300
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>

---

diff --git a/.lgtm.yml b/.lgtm.yml
index e636159..b389811 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -39,7 +39,7 @@ extraction:
         - python3-setuptools
         - python3-wheel
         - nodejs
-        - uglifyjs
+        - python3-rjsmin
         - systemd
         - 389-ds-base-dev
         - libssl-dev
@@ -79,7 +79,7 @@ extraction:
         - python3-setuptools
         - python3-wheel
         - nodejs
-        - uglifyjs
+        - python3-rjsmin
         - systemd
         - 389-ds-base-dev
         - libssl-dev
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 8eccc00..5cb462a 100755
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -192,7 +192,7 @@ BuildRequires:  libsss_idmap-devel
 BuildRequires:  libsss_certmap-devel
 BuildRequires:  libsss_nss_idmap-devel >= %{sssd_version}
 BuildRequires:  nodejs(abi)
-BuildRequires:  uglify-js
+BuildRequires:  python3-rjsmin
 BuildRequires:  libverto-devel
 BuildRequires:  libunistring-devel
 # 0.13.0: https://bugzilla.redhat.com/show_bug.cgi?id=1584773
diff --git a/install/ui/build/freeipa/Makefile.am b/install/ui/build/freeipa/Makefile.am
index 05e82f4..f4d9781 100644
--- a/install/ui/build/freeipa/Makefile.am
+++ b/install/ui/build/freeipa/Makefile.am
@@ -18,6 +18,6 @@ widgets := $(wildcard ../../src/freeipa/widgets/*.js)
 nav := $(wildcard ../../src/freeipa/navigation/*.js)
 
 app.js: $(core) $(base) $(widgets) $(nav)
-	$(srcdir)/../../util/make-ui.sh
+	PYTHON=$(PYTHON) $(srcdir)/../../util/make-ui.sh
 
 core.js: app.js
diff --git a/install/ui/src/webui.profile.js b/install/ui/src/webui.profile.js
index 1d7a6cc..2d4d691 100644
--- a/install/ui/src/webui.profile.js
+++ b/install/ui/src/webui.profile.js
@@ -9,7 +9,7 @@ var profile = (function(){
         releaseName: "lib",
         action: "release",
 
-        // optimization done separately by uglify.js
+        // optimization done separately by python3-rjsmin
         layerOptimize: false,
         optimize: false,
         cssOptimize: false,
@@ -123,4 +123,4 @@ var profile = (function(){
             }
         }
     };
-})();
\ No newline at end of file
+})();
diff --git a/install/ui/util/build/README b/install/ui/util/build/README
index 0772532..2c4e0ec 100644
--- a/install/ui/util/build/README
+++ b/install/ui/util/build/README
@@ -1,5 +1,5 @@
 build.js is builded dojo builder, with applied patches from 'patches' folder, by
-itself and compiled using uglify.js
+itself and compiled using python3-rjsmin
 
 _base/configRhino.js is unmodifed file from dojo/dojo. Required for a build to work.
 
@@ -9,4 +9,4 @@ Available via Academic Free License >= 2.1 OR the modified BSD license.
 see: http://dojotoolkit.org/license for details
 
 = License =
-Full Dojo license is in LICENSE file.
\ No newline at end of file
+Full Dojo license is in LICENSE file.
diff --git a/install/ui/util/compile.sh b/install/ui/util/compile.sh
index d14f90a..1516b81 100755
--- a/install/ui/util/compile.sh
+++ b/install/ui/util/compile.sh
@@ -26,14 +26,14 @@ RDIR=$DIR/../release
 usage() {
 cat <<-__EOF__;
 NAME
-     compile.sh - Compiles layer file of Dojo build using uglify.js.
+     compile.sh - Compiles layer file of Dojo build using Python rjsmin.
                   Deletes all other files.
 
 SYNOPSIS
      path/to/compile.sh [--help] --release RELEASE --layer NAME/NAME
 
 DESCRIPTION
-     Compiles layer file of Dojo build output using uglify.js.
+     Compiles layer file of Dojo build output using Python rjsmin.
      Deletes all other files.
 
 OPTIONS
@@ -105,7 +105,7 @@ if [[ ! $OUTPUT_FILE ]] ; then
     OUTPUT_FILE=$RDIR/$RELEASE/$LAYER.js
 fi
 
-# compile using uglifyjs
+# compile using python rjsmin
 echo "Minimizing: $RDIR/$RELEASE/$LAYER.js"
 echo "Target file: $OUTPUT_FILE"
-uglifyjs $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
+${PYTHON:-python3} -m rjsmin < $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE