135 lines
4.5 KiB
Diff
135 lines
4.5 KiB
Diff
|
From 2f8e87ce9ccaab51b32a395c6cf6c764434ed0e2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Woerner <twoerner@redhat.com>
|
||
|
|
Date: Thu, 11 Jun 2020 10:40:57 +0200
|
||
|
|
Subject: [PATCH] Revert "WebUI: use python3-rjsmin to minify JavaScript files"
|
||
|
|
|
||
|
|
This reverts commit d986e844bbd37ccc7a532175631a55acd315cda3.
|
||
|
|
---
|
||
|
|
.lgtm.yml | 4 ++--
|
||
|
|
freeipa.spec.in | 2 +-
|
||
|
|
install/ui/build/freeipa/Makefile.am | 2 +-
|
||
|
|
install/ui/src/webui.profile.js | 4 ++--
|
||
|
|
install/ui/util/build/README | 4 ++--
|
||
|
|
install/ui/util/compile.sh | 8 ++++----
|
||
|
|
6 files changed, 12 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
#diff --git a/.lgtm.yml b/.lgtm.yml
|
||
|
|
#index b3898116e..e63615918 100644
|
||
|
|
#--- a/.lgtm.yml
|
||
|
|
#+++ b/.lgtm.yml
|
||
|
|
#@@ -39,7 +39,7 @@ extraction:
|
||
|
|
# - python3-setuptools
|
||
|
|
# - python3-wheel
|
||
|
|
# - nodejs
|
||
|
|
#- - python3-rjsmin
|
||
|
|
#+ - uglifyjs
|
||
|
|
# - systemd
|
||
|
|
# - 389-ds-base-dev
|
||
|
|
# - libssl-dev
|
||
|
|
#@@ -79,7 +79,7 @@ extraction:
|
||
|
|
# - python3-setuptools
|
||
|
|
# - python3-wheel
|
||
|
|
# - nodejs
|
||
|
|
#- - python3-rjsmin
|
||
|
|
#+ - uglifyjs
|
||
|
|
# - systemd
|
||
|
|
# - 389-ds-base-dev
|
||
|
|
# - libssl-dev
|
||
|
|
diff --git a/freeipa.spec.in b/freeipa.spec.in
|
||
|
|
index b6eb79593..a4682497a 100755
|
||
|
|
--- a/freeipa.spec.in
|
||
|
|
+++ b/freeipa.spec.in
|
||
|
|
@@ -191,7 +191,7 @@ BuildRequires: libsss_idmap-devel
|
||
|
|
BuildRequires: libsss_certmap-devel
|
||
|
|
BuildRequires: libsss_nss_idmap-devel >= %{sssd_version}
|
||
|
|
BuildRequires: nodejs(abi)
|
||
|
|
-BuildRequires: python3-rjsmin
|
||
|
|
+BuildRequires: uglify-js
|
||
|
|
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 f4d97819e..05e82f4da 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)
|
||
|
|
- PYTHON=$(PYTHON) $(srcdir)/../../util/make-ui.sh
|
||
|
|
+ $(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 2d4d691dc..1d7a6cc84 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 python3-rjsmin
|
||
|
|
+ // optimization done separately by uglify.js
|
||
|
|
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 2c4e0ecac..0772532d4 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 python3-rjsmin
|
||
|
|
+itself and compiled using uglify.js
|
||
|
|
|
||
|
|
_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.
|
||
|
|
+Full Dojo license is in LICENSE file.
|
||
|
|
\ No newline at end of file
|
||
|
|
diff --git a/install/ui/util/compile.sh b/install/ui/util/compile.sh
|
||
|
|
index 1516b815f..d14f90ab0 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 Python rjsmin.
|
||
|
|
+ compile.sh - Compiles layer file of Dojo build using uglify.js.
|
||
|
|
Deletes all other files.
|
||
|
|
|
||
|
|
SYNOPSIS
|
||
|
|
path/to/compile.sh [--help] --release RELEASE --layer NAME/NAME
|
||
|
|
|
||
|
|
DESCRIPTION
|
||
|
|
- Compiles layer file of Dojo build output using Python rjsmin.
|
||
|
|
+ Compiles layer file of Dojo build output using uglify.js.
|
||
|
|
Deletes all other files.
|
||
|
|
|
||
|
|
OPTIONS
|
||
|
|
@@ -105,7 +105,7 @@ if [[ ! $OUTPUT_FILE ]] ; then
|
||
|
|
OUTPUT_FILE=$RDIR/$RELEASE/$LAYER.js
|
||
|
|
fi
|
||
|
|
|
||
|
|
-# compile using python rjsmin
|
||
|
|
+# compile using uglifyjs
|
||
|
|
echo "Minimizing: $RDIR/$RELEASE/$LAYER.js"
|
||
|
|
echo "Target file: $OUTPUT_FILE"
|
||
|
|
-${PYTHON:-python3} -m rjsmin < $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
|
||
|
|
+uglifyjs $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|