diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index 599861313..3480ae762 100644 --- a/src/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -376,7 +376,7 @@ function getFileCompressed(filename, contentType, callback) { const compressResult = await compressJS(content); if (compressResult.error) { - console.error(`Error compressing JS (${filename}) using UglifyJS`, compressResult.error); + console.error(`Error compressing JS (${filename}) using terser`, compressResult.error); } else { content = compressResult.code.toString(); // Convert content obj code to string } diff --git a/src/node/utils/MinifyWorker.js b/src/node/utils/MinifyWorker.js index 624efa4a3..8ac6d3a7f 100644 --- a/src/node/utils/MinifyWorker.js +++ b/src/node/utils/MinifyWorker.js @@ -3,13 +3,13 @@ */ var CleanCSS = require('clean-css'); -var uglifyJS = require("uglify-js"); +var Terser = require("terser"); var path = require('path'); var Threads = require('threads') function compressJS(content) { - return uglifyJS.minify(content); + return Terser.minify(content); } function compressCSS(filename, ROOT_DIR) diff --git a/src/package-lock.json b/src/package-lock.json index a6b983eda..9b210d079 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -892,6 +892,11 @@ "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", "dev": true }, + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" + }, "buffer-writer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", @@ -7740,6 +7745,15 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, + "source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, "space-separated-tokens": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz", @@ -8035,6 +8049,16 @@ "readable-stream": "^3.1.1" } }, + "terser": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz", + "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==", + "requires": { + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" + } + }, "test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -8207,15 +8231,6 @@ } } }, - "uglify-js": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.1.tgz", - "integrity": "sha512-W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw==", - "requires": { - "commander": "~2.20.3", - "source-map": "~0.6.1" - } - }, "uid-safe": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", diff --git a/src/package.json b/src/package.json index 94b223c24..c0fb5d884 100644 --- a/src/package.json +++ b/src/package.json @@ -62,11 +62,11 @@ "semver": "5.6.0", "slide": "1.1.6", "socket.io": "^2.3.0", + "terser": "^4.7.0", "threads": "^1.4.0", "tiny-worker": "^2.3.0", "tinycon": "0.0.1", "ueberdb2": "0.4.9", - "uglify-js": "3.8.1", "underscore": "1.8.3", "unorm": "1.4.1" },