pr

GoogleChrome · Nov 12, 2020 · c2f1058 · c2f1058
1 parent 25c751c
commit c2f1058
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/build/build-lightrider-bundles.js b/build/build-lightrider-bundles.js
@@ -40,7 +40,7 @@ function buildReportGenerator() {
     .transform('@wardpeet/brfs', {
       readFileSyncTransform: minifyFileTransform,
       global: true,
-      parserOpts: {ecmaVersion: 10},
+      parserOpts: {ecmaVersion: 12},
     })
     .bundle((err, src) => {
       if (err) throw err;

diff --git a/build/build-smokehouse-bundle.js b/build/build-smokehouse-bundle.js
@@ -14,7 +14,7 @@ const smokehouseLibFilename = './lighthouse-cli/test/smokehouse/frontends/lib.js
 
 browserify(smokehouseLibFilename, {standalone: 'Lighthouse.Smokehouse'})
   .ignore('./lighthouse-cli/test/smokehouse/lighthouse-runners/cli.js')
-  .transform('@wardpeet/brfs', {global: true, parserOpts: {ecmaVersion: 10}})
+  .transform('@wardpeet/brfs', {global: true, parserOpts: {ecmaVersion: 12}})
   .bundle((err, src) => {
     if (err) throw err;
     fs.writeFileSync(bundleOutFile, src.toString());

diff --git a/build/build-utils.js b/build/build-utils.js
@@ -32,16 +32,20 @@ function minifyFileTransform(file) {
       next();
     },
     async final(next) {
-      const result = await terser.minify(code, {ecma: 2019});
+      try {
+        const result = await terser.minify(code, {ecma: 2019});
 
-      if (result.code) {
-        const saved = code.length - result.code.length;
-        // eslint-disable-next-line no-console
-        console.log(`minifying ${file} saved ${saved / 1000} KB`);
-        this.push(result.code);
-      }
+        if (result.code) {
+          const saved = code.length - result.code.length;
+          // eslint-disable-next-line no-console
+          console.log(`minifying ${file} saved ${saved / 1000} KB`);
+          this.push(result.code);
+        }
 
-      next();
+        next();
+      } catch (err) {
+        next(err);
+      }
     },
   });
 }

diff --git a/lighthouse-core/scripts/dogfood-lhci.sh b/lighthouse-core/scripts/dogfood-lhci.sh
@@ -9,7 +9,7 @@ if [[ -z "$LHCI_CANARY_SERVER_TOKEN" ]]; then
   exit 0;
 fi
 
-if [[ "$TRAVIS_NODE_VERSION" != "10" ]]; then
+if [[ "$TRAVIS_NODE_VERSION" != "12" ]]; then
   echo "Not running dogfood script on node versions other than 10";
   exit 0;
 fi