From bf52353a5c3d0ba7bebde209c916d492fe521159 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sun, 7 Nov 2021 16:45:00 +0100
Subject: [PATCH] [enh] minify searxng-wordmark.svg (HTMLMinifier)

Command::

  ./node_modules/.bin/html-minifier \
      --remove-comments \
      --collapse-whitespace \
      src/svg/searxng-wordmark.svg \
      -o ../../../templates/__common__/searxng-wordmark.min.svg

- html-minifier: https://github.com/kangax/html-minifier
  - onilne: https://kangax.github.io/html-minifier
  - grunt: https://www.npmjs.com/package/grunt-contrib-htmlmin
  - grunt-contrib-htmlmin: https://github.com/gruntjs/grunt-contrib-htmlmin
  - npm: https://www.npmjs.com/package/html-minifier

To test, rebuild your node environment::

  make node.env

Alternatives:

- pretty-data: https://github.com/vkiryukhin/pretty-data
  - grunt: https://www.npmjs.com/package/grunt-xmlmin
  - grunt-xmlming: https://github.com/dtrunk90/grunt-xmlmin
  - npm: https://www.npmjs.com/package/grunt-xmlmin

- minify-xml: https://github.com/kristian/minify-xml
  - no grunt package available
  - npm: https://www.npmjs.com/package/minify-xml

src/svg/searxng-wordmark.svg':
'../../../templates/__common__/searxng-wordmark.min.svg'

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/static/themes/simple/gruntfile.js          |  15 ++++++++++++++-
 searx/static/themes/simple/package.json          |   2 ++
 .../__common__/searxng-wordmark.min.svg          | Bin 0 -> 2357 bytes
 utils/lib_static.sh                              |   1 +
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 searx/templates/__common__/searxng-wordmark.min.svg

diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js
index 325a973b4..f10d00cf3 100644
--- a/searx/static/themes/simple/gruntfile.js
+++ b/searx/static/themes/simple/gruntfile.js
@@ -9,7 +9,7 @@ module.exports = function(grunt) {
     watch: {
       scripts: {
         files: ['src/**'],
-        tasks: ['eslint', 'copy', 'concat', 'uglify', 'less:development', 'less:production']
+        tasks: ['eslint', 'copy', 'concat', 'uglify', 'htmlmin', 'less:development', 'less:production']
       }
     },
     eslint: {
@@ -95,6 +95,17 @@ module.exports = function(grunt) {
         }
       }
     },
+    htmlmin: {
+      dist: {
+        options: {
+          removeComments: true,
+          collapseWhitespace: true
+        },
+        files: {
+          '../../../templates/__common__/searxng-wordmark.min.svg': 'src/svg/searxng-wordmark.svg'
+        }
+      }
+    },
     webfont: {
       icons: {
         // src: 'node_modules/ionicons-npm/src/*.svg',
@@ -191,6 +202,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-htmlmin');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-less');
@@ -207,6 +219,7 @@ module.exports = function(grunt) {
     'copy',
     'concat',
     'uglify',
+    'htmlmin',
     'less:development',
     'less:production'
   ]);
diff --git a/searx/static/themes/simple/package.json b/searx/static/themes/simple/package.json
index 4b0ffc4fd..4ef608db7 100644
--- a/searx/static/themes/simple/package.json
+++ b/searx/static/themes/simple/package.json
@@ -8,6 +8,8 @@
     "grunt-contrib-jshint": "~3.1.1",
     "grunt-contrib-less": "~3.0.0",
     "grunt-contrib-uglify": "~5.0.1",
+    "grunt-xmlmin": "~0.1.8",
+    "grunt-contrib-htmlmin": "~3.1.0",
     "grunt-contrib-watch": "~1.1.0",
     "grunt-stylelint": "^0.16.0",
     "grunt-eslint": "^23.0.0",
diff --git a/searx/templates/__common__/searxng-wordmark.min.svg b/searx/templates/__common__/searxng-wordmark.min.svg
new file mode 100644
index 0000000000000000000000000000000000000000..35b4cac25e6cee9a57e8ebbea505a4c8f34296eb
GIT binary patch
literal 2357
zcmbtV+iv4F5d9T_dD);A#f$E1d4VEbps(94`dBa$Z3~e^gQDYjzrHiFs3=Gt+OA+j
z(%d+6&dg~0<)!a}XKlyU3>D#&kw6c%Y1-jXkw3qG4RaEVP7RIf%%CeW81iKoY{%zA
z0G`8GHg!dg&Yj9AI-PAtjXgw79qCT@dT?XJDUZl(Tff@YRx8&&>)Q0a8OF(N81KBL
zZT3sp%jH5Za<bq>QAA8cLWE!uj@QAdmvH3=d41$37-JFW=J5Z*q#OZ*6Z{ujFQB72
z+gk6TP)!HzqKEGfkynO{Hm>niw8PU_s}sOBBZQ@R;jLuV>+z&&Jw{$mf=k=DV?_$l
z_ar##_HcCm?YY&LU(HKJSipipz>loi<0NRCia@16n-5qn^fFoqngpK&OPQ|uzSwU9
z!2}Cg9J2f#n4XI+8&eOE8idlyz6^)IFUB^#vQHFI+-)1ZAE%@6L6B&-U0l(x!8|AZ
zqZ%~{PU-+mcg9xaZa-Zlc!Y@BdTBacUTOf6)?Md@TnfQ3i;7{dzEO=w)tE~~0Fy=j
z!<Zh!@H7!J$yS;gP|RtT<V>y|YB)9IaYi$qv9&!wa>kYp&qM3RiXb`5G4<J6)OG5r
zp~&e5WQ<31Ias7*uQ~)`ak#Vt<QmRY^FpkPnU$V;p2+mQE2RIi8x$bciO<n`_0sn3
z4-LsMB&^p?HOi@pCjXKEw=h}dw}-F0ZC#gt8T%BVKs}l>bRkk-m(csYa=W$%K5(pl
zfmN`DsrL%Bao3ZcJgvSB%rXS)HPO^P@O;wIAFl1X-!UNOhW@SV^lpmkALo2PxTF~Q
z#CO}nE4ZC{)Llh>d(?vta3<zCEDzS4PrYfNu_uZ^1#oz_oK?e!wN+$#?3B}=!WgH9
zOC~oV&uEN|l->glb!+QRPXSKK9c9KP39zZM1nxir&gST@9UQiY;>rOQ=;zT{^Q6l=
zSV(ZqueUZRx$y4*inbll<;vL08U_7rt-7uQh4VO+P$l%;MC_c{yQ49QSNkOs$r85T
z`%|WdEcuez|H=eGMND!Tdq`#sZ^$H)7EB~Kj*zsRvPS#&aQ%mz6JNs5rJNvZehp%4
zRz%r)CA(2fvph*Tl(*O-<#S;vj=qm!aZvFqx(LAVjR3x{7G^7^LdHeLp?wxxJ>a;~
zI8QQBq=46=F((ZlY-i7~RlueX(u^iN&f{VuGg|OO#DNNUzTr81Dp<e+0bh5p$dZku
zl8cySZ`6`<nSp$Rc3Cd+X{}pbJ5S5fYoDinzMDJeV~$qcKDT%N(*$8M1qXus+RSMl
zr&0pkepkwZ79e3Ti-5bN8B1j%3KAgbLQs|$1psXEmF8($aF*y0M|U;-*0|f~r$|Z0
PihEp2(E<Lj?RNhFtYZQU

literal 0
HcmV?d00001

diff --git a/utils/lib_static.sh b/utils/lib_static.sh
index 0d4ba9bad..b88b9b6cf 100755
--- a/utils/lib_static.sh
+++ b/utils/lib_static.sh
@@ -11,6 +11,7 @@ STATIC_BUILT_PATHS=(
     searx/static/themes/simple/css
     searx/static/themes/simple/js
     searx/static/themes/simple/src/generated/pygments.less
+    searx/templates/__common__/searxng-wordmark.min.svg
 )
 
 static_help(){