From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 7 Apr 2025 11:36:04 +0000 (+0200)
Subject: Compile: JsShrink -> Terser
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=refs%2Fheads%2Fterser;p=adminer.git

Compile: JsShrink -> Terser
---

diff --git a/.gitmodules b/.gitmodules
index 04841dce..0851cc55 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "jush"]
 	path = externals/jush
 	url = https://github.com/vrana/jush
-[submodule "JsShrink"]
-	path = externals/JsShrink
-	url = https://github.com/vrana/JsShrink
 [submodule "PhpShrink"]
 	path = externals/PhpShrink
 	url = https://github.com/vrana/PhpShrink
diff --git a/compile.php b/compile.php
index 7b57f0a2..ba46fd61 100755
--- a/compile.php
+++ b/compile.php
@@ -2,7 +2,6 @@
 <?php
 include __DIR__ . "/adminer/include/version.inc.php";
 include __DIR__ . "/adminer/include/errors.inc.php";
-include __DIR__ . "/externals/JsShrink/jsShrink.php";
 include __DIR__ . "/externals/PhpShrink/phpShrink.php";
 
 function add_apo_slashes($s) {
@@ -199,14 +198,12 @@ function minify_css($file) {
 }
 
 function minify_js($file) {
-	$file = preg_replace_callback("~'use strict';~", function ($match) { // keep only the first one
-		static $count = 0;
-		$count++;
-		return ($count == 1 ? $match[0] : '');
-	}, $file);
-	if (function_exists('jsShrink')) {
-		$file = jsShrink($file);
+	file_put_contents("compile.js", $file);
+	$terser = shell_exec("terser -c --comments false compile.js"); // prints warning to stderr if terser is not available
+	if ($terser) {
+		$file = $terser;
 	}
+	unlink("compile.js");
 	return lzw_compress($file);
 }