From 07afe04f730bb762dded53e60b2125e3c235539c Mon Sep 17 00:00:00 2001
From: Gabriel Saillard <gabriel@saillard.dev>
Date: Mon, 21 Dec 2020 11:15:25 +0100
Subject: [PATCH] ci: fix code minifier script

---
 package-lock.json  | 32 ++++++++++++++++++++------------
 package.json       |  2 +-
 prebuild-minify.js |  4 ++--
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 628c420..fa8c747 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -723,9 +723,9 @@
       }
     },
     "commander": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-      "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
     "concat-map": {
       "version": "0.0.1",
@@ -2931,6 +2931,23 @@
       "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
       "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="
     },
+    "terser": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz",
+      "integrity": "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==",
+      "requires": {
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+        }
+      }
+    },
     "to-readable-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
@@ -2991,15 +3008,6 @@
         "is-typedarray": "^1.0.0"
       }
     },
-    "uglify-es": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz",
-      "integrity": "sha512-rPzPisCzW68Okj1zNrfa2dR9uEm43SevDmpR6FChoZABFk9dANGnzzBMgHYUXI3609//63fnVkyQ1SQmAMyjww==",
-      "requires": {
-        "commander": "~2.14.1",
-        "source-map": "~0.6.1"
-      }
-    },
     "unique-string": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
diff --git a/package.json b/package.json
index 3c5436c..3b6399c 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "electron-rebuild": "^2.3.4",
     "node-abi": "2.19.3",
     "node-json-minify": "1.0.0",
-    "uglify-es": "3.3.10"
+    "terser": "^5.5.1"
   },
   "optionalDependencies": {
     "cson-parser": "4.0.7"
diff --git a/prebuild-minify.js b/prebuild-minify.js
index cc5dbe5..64cb0f1 100644
--- a/prebuild-minify.js
+++ b/prebuild-minify.js
@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
 const stdout = process.stdout;
-const UglifyJS = require("uglify-es");
+const UglifyJS = require("terser");
 const CleanCSS = require("clean-css");
 JSON.minify = require("node-json-minify");
 
@@ -36,7 +36,7 @@ async function recursiveMinify(dirPath) {
 
                 switch (filePath.split(".").pop()) {
                     case "js":
-                        let minified = UglifyJS.minify(fs.readFileSync(filePath, {encoding: "utf-8"}), {
+                        let minified = await UglifyJS.minify(fs.readFileSync(filePath, {encoding: "utf-8"}), {
                             compress: {
                                 dead_code: false,
                                 unused: false,
-- 
GitLab