Update dependency terser to v5 (#3582)

* Update dependency terser to v5

* fix typescript issue

* Update dependency terser to v5

* update script because terser.minify becomes async

Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Feiyang1 <[email protected]>

Author: 3 people

package.json

@@ -143,7 +143,7 @@
     "sinon": "9.0.3",
     "sinon-chai": "3.5.0",
     "source-map-loader": "1.0.2",
-    "terser": "4.8.0",
+    "terser": "5.2.1",
     "ts-loader": "8.0.3",
     "ts-node": "8.10.2",
     "tslint": "6.1.3",

repo-scripts/size-analysis/analysis-helper.ts

@@ -116,20 +116,20 @@ export async function extractDependenciesAndSize(
     externalDepsNotResolvedOutput,
     'utf-8'
   );
-  const externalDepsResolvedOutputContentMinimized: terser.MinifyOutput = terser.minify(
+  const externalDepsResolvedOutputContentMinimized = await terser.minify(
     externalDepsResolvedOutputContent,
     {
-      output: {
+      format: {
         comments: false
       },
       mangle: { toplevel: true },
       compress: false
     }
   );
-  const externalDepsNotResolvedOutputContentMinimized: terser.MinifyOutput = terser.minify(
+  const externalDepsNotResolvedOutputContentMinimized = await terser.minify(
     externalDepsNotResolvedOutputContent,
     {
-      output: {
+      format: {
         comments: false
       },
       mangle: { toplevel: true },

repo-scripts/size-analysis/package.json

@@ -26,7 +26,7 @@
     "rollup-plugin-typescript2": "0.27.2",
     "tmp": "0.2.1",
     "typescript": "4.0.2",
-    "terser": "4.8.0",
+    "terser": "5.2.1",
     "yargs": "15.4.1",
     "@firebase/util": "0.3.1"
   },

scripts/size_report/report_binary_size.ts

@@ -65,7 +65,7 @@ function generateReportForCDNScripts(): Report[] {
 }
 
 // NPM packages
-function generateReportForNPMPackages(): Report[] {
+async function generateReportForNPMPackages(): Promise<Report[]> {
   const reports: Report[] = [];
   const fields = [
     'main',
@@ -81,41 +81,50 @@ function generateReportForNPMPackages(): Report[] {
     execSync('npx lerna ls --json --scope @firebase/*').toString()
   );
 
+  const taskPromises: Promise<void>[] = [];
   for (const pkg of packageInfo) {
     // we traverse the dir in order to include binaries for submodules, e.g. @firebase/firestore/memory
     // Currently we only traverse 1 level deep because we don't have any submodule deeper than that.
     traverseDirs(pkg.location, collectBinarySize, 0, 1);
   }
 
-  function collectBinarySize(path: string) {
-    const packageJsonPath = `${path}/package.json`;
-    if (!fs.existsSync(packageJsonPath)) {
-      return;
-    }
-
-    const packageJson = require(packageJsonPath);
+  await Promise.all(taskPromises);
 
-    for (const field of fields) {
-      if (packageJson[field]) {
-        const filePath = `${path}/${packageJson[field]}`;
-        const rawCode = fs.readFileSync(filePath, 'utf-8');
+  return reports;
 
-        // remove comments and whitespaces, then get size
-        const { code } = terser.minify(rawCode, {
-          output: {
-            comments: false
-          },
-          mangle: false,
-          compress: false
-        });
+  function collectBinarySize(path: string) {
+    const promise = new Promise<void>(async resolve => {
+      const packageJsonPath = `${path}/package.json`;
+      if (!fs.existsSync(packageJsonPath)) {
+        return;
+      }
 
-        const size = Buffer.byteLength(code!, 'utf-8');
-        reports.push(makeReportObject(packageJson.name, field, size));
+      const packageJson = require(packageJsonPath);
+
+      for (const field of fields) {
+        if (packageJson[field]) {
+          const filePath = `${path}/${packageJson[field]}`;
+          const rawCode = fs.readFileSync(filePath, 'utf-8');
+
+          // remove comments and whitespaces, then get size
+          const { code } = await terser.minify(rawCode, {
+            format: {
+              comments: false
+            },
+            mangle: false,
+            compress: false
+          });
+
+          const size = Buffer.byteLength(code!, 'utf-8');
+          reports.push(makeReportObject(packageJson.name, field, size));
+        }
       }
-    }
-  }
 
-  return reports;
+      resolve();
+    });
+
+    taskPromises.push(promise);
+  }
 }
 
 function traverseDirs(
@@ -147,10 +156,10 @@ function makeReportObject(sdk: string, type: string, value: number): Report {
   };
 }
 
-function generateSizeReport(): BinarySizeRequestBody {
+async function generateSizeReport(): Promise<BinarySizeRequestBody> {
   const reports: Report[] = [
     ...generateReportForCDNScripts(),
-    ...generateReportForNPMPackages()
+    ...(await generateReportForNPMPackages())
   ];
 
   for (const r of reports) {
@@ -168,5 +177,6 @@ function generateSizeReport(): BinarySizeRequestBody {
   };
 }
 
-const report = generateSizeReport();
-upload(report, RequestEndpoint.BINARY_SIZE);
+generateSizeReport().then(report => {
+  upload(report, RequestEndpoint.BINARY_SIZE);
+});

yarn.lock

@@ -14637,7 +14637,16 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-[email protected], terser@^4.1.2, terser@^4.7.0:
+[email protected]:
+  version "5.2.1"
+  resolved "https://registry.npmjs.org/terser/-/terser-5.2.1.tgz#40b971b8d28b4fe98c9e8c0d073ab48e7bb96cd8"
+  integrity sha512-/AOtjRtAMNGO0fIF6m8HfcvXTw/2AKpsOzDn36tA5RfhRdeXyb4RvHxJ5Pah7iL6dFkLk+gOnCaNHGwJPl6TrQ==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
+terser@^4.1.2, terser@^4.7.0:
   version "4.8.0"
   resolved "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
   integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==