From a613dc350106eb7b935935002f6072aa1d6a409c Mon Sep 17 00:00:00 2001
From: Ari Archer <ari.web.xyz@gmail.com>
Date: Sun, 25 Sep 2022 03:48:59 +0300
Subject: [PATCH] Fix JS minification

Signed-off-by: Ari Archer <ari.web.xyz@gmail.com>
---
 Makefile               |  1 -
 package-lock.json      | 27 ++++++++++++++++-----------
 package.json           |  2 +-
 scripts/netlifyapis.sh | 14 ++++++++++----
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 92632d6..f515f61 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 build:
-	npm install
 	npm run build
 
 netlifyapis:
diff --git a/package-lock.json b/package-lock.json
index ab145d4..d021542 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
                 "eslint": "^8.14.0",
                 "live-server": "^1.2.2",
                 "node-sass": "^7.0.1",
-                "uglifyjs": "^2.4.11"
+                "uglify-js": "^3.17.1"
             }
         },
         "node_modules/@babel/code-frame": {
@@ -5763,12 +5763,17 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/uglifyjs": {
-            "version": "2.4.11",
-            "resolved": "https://registry.npmjs.org/uglifyjs/-/uglifyjs-2.4.11.tgz",
-            "integrity": "sha512-iR5+eXZCsoqmlzqYYENJm+rtX/KpC+jhhCtgORtBeVxRET+mfFHlyArl3DgYEqRTVDOxenv0OojFg02tf6LluA==",
-            "deprecated": "uglifyjs is deprecated - use uglify-js instead.",
-            "dev": true
+        "node_modules/uglify-js": {
+            "version": "3.17.1",
+            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.1.tgz",
+            "integrity": "sha512-+juFBsLLw7AqMaqJ0GFvlsGZwdQfI2ooKQB39PSBgMnMakcFosi9O8jCwE+2/2nMNcc0z63r9mwjoDG8zr+q0Q==",
+            "dev": true,
+            "bin": {
+                "uglifyjs": "bin/uglifyjs"
+            },
+            "engines": {
+                "node": ">=0.8.0"
+            }
         },
         "node_modules/union-value": {
             "version": "1.0.1",
@@ -10627,10 +10632,10 @@
             "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
             "dev": true
         },
-        "uglifyjs": {
-            "version": "2.4.11",
-            "resolved": "https://registry.npmjs.org/uglifyjs/-/uglifyjs-2.4.11.tgz",
-            "integrity": "sha512-iR5+eXZCsoqmlzqYYENJm+rtX/KpC+jhhCtgORtBeVxRET+mfFHlyArl3DgYEqRTVDOxenv0OojFg02tf6LluA==",
+        "uglify-js": {
+            "version": "3.17.1",
+            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.1.tgz",
+            "integrity": "sha512-+juFBsLLw7AqMaqJ0GFvlsGZwdQfI2ooKQB39PSBgMnMakcFosi9O8jCwE+2/2nMNcc0z63r9mwjoDG8zr+q0Q==",
             "dev": true
         },
         "union-value": {
diff --git a/package.json b/package.json
index 55843eb..ce7ddd4 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,6 @@
         "eslint": "^8.14.0",
         "live-server": "^1.2.2",
         "node-sass": "^7.0.1",
-        "uglifyjs": "^2.4.11"
+        "uglify-js": "^3.17.1"
     }
 }
diff --git a/scripts/netlifyapis.sh b/scripts/netlifyapis.sh
index 46e7538..ee12d5a 100755
--- a/scripts/netlifyapis.sh
+++ b/scripts/netlifyapis.sh
@@ -3,10 +3,16 @@
 set -e
 
 main() {
-    for api in api/*; do
-        api_cont="$(sed 's/^\s*//g; s/: /:/g' "$api" | tr -d '\n')"
-        printf '%s' "$api_cont" >"$api"
-    done
+    if [ "$CI" ]; then
+        echo 'Minifying APIs'
+
+        for api in api/*; do
+            api_cont="$(sed 's/^\s*//g; s/: /:/g' "$api" | tr -d '\n')"
+            printf '%s' "$api_cont" >"$api"
+        done
+    else
+        echo 'Not minifying APIs as not in CI mode'
+    fi
 }
 
 main "$@"