WebUI: Replace uglify-es with terser.

The former is deprecated and no longer receives any updates.

Bug: 1087970
Change-Id: I15cb6beb49eb55fb7fa7489459d7072ba8e2f66c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2444486Reviewed-by: John Lee <johntlee@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813856}

chrome/browser/resources/optimize_webui.py

@@ -359,7 +359,7 @@ def _optimize(in_folder, args):
     # Pass the JS files through Uglify and write the output to its final
     # destination.
     for index, js_out_file in enumerate(args.js_out_files):
-      node.RunNode([node_modules.PathToUglify(),
+      node.RunNode([node_modules.PathToTerser(),
                     os.path.join(tmp_out_dir, js_out_file),
                     '--comments', '/Copyright|license|LICENSE|\<\/?if/',
                     '--output', os.path.join(out_path, js_out_file)])

third_party/node/node_modules.py

@@ -38,8 +38,8 @@ def PathToSvgo():
   return _path_in_node_modules('svgo', 'bin', 'svgo')
 
 
-def PathToUglify():
-  return _path_in_node_modules('uglify-es', 'bin', 'uglifyjs')
+def PathToTerser():
+  return _path_in_node_modules('terser', 'bin', 'terser')
 
 # Typescript is not approved for general use in Chromium. Email chromium-dev
 # if you want to use it.

third_party/node/node_modules.tar.gz.sha1

-a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c
+57ebd65121c4ed969896f4bd8441077850951083

third_party/node/package-lock.json

@@ -485,6 +485,11 @@
         "concat-map": "0.0.1"
       }
     },
+    "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=="
+    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -607,11 +612,6 @@
         "typical": "^2.6.0"
       }
     },
-    "commander": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
-      "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="
-    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -2212,6 +2212,22 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
+    "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"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -2367,6 +2383,28 @@
         "wordwrapjs": "^2.0.0-0"
       }
     },
+    "terser": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.3.tgz",
+      "integrity": "sha512-vRQDIlD+2Pg8YMwVK9kMM3yGylG95EIwzBai1Bw7Ot4OBfn3VP1TZn3EWx4ep2jERN/AmnVaTiGuelZSN7ds/A==",
+      "requires": {
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
+      },
+      "dependencies": {
+        "commander": {
+          "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=="
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+        }
+      }
+    },
     "test-value": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz",
@@ -2435,22 +2473,6 @@
       "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz",
       "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0="
     },
-    "uglify-es": {
-      "version": "3.3.9",
-      "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
-      "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
-      "requires": {
-        "commander": "~2.13.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
     "unquote": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",

third_party/node/package.json

@@ -8,7 +8,7 @@
     "eslint": "5.16.0",
     "polymer-bundler": "4.0.10",
     "polymer-css-build": "0.7.0",
-    "uglify-es": "3.3.9",
+    "terser": "5.3.3",
     "svgo": "1.2.0",
     "typescript": "3.5.3"
   }

tools/grit/minify_with_uglify.py

@@ -23,8 +23,8 @@ def Minify(source):
        tempfile.NamedTemporaryFile(suffix='.js') as outfile:
     infile.write(source)
     infile.flush();
-    node.RunNode([
-        node_modules.PathToUglify(), infile.name, '--output', outfile.name])
+    node.RunNode(
+        [node_modules.PathToTerser(), infile.name, '--output', outfile.name])
     result = outfile.read()
     return result