core: fix js edge case in minification estimator (#12067)

GoogleChrome · Feb 9, 2021 · aaf1365 · aaf1365
1 parent b439bf2
commit aaf1365
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lighthouse-core/lib/minification-estimator.js b/lighthouse-core/lib/minification-estimator.js
@@ -7,7 +7,7 @@
 
 // https://www.ecma-international.org/ecma-262/9.0/index.html#sec-punctuators
 // eslint-disable-next-line max-len
-const PUNCTUATOR_REGEX = /(return|{|\(|\[|\.\.\.|;|,|<|>|<=|>=|==|!=|===|!==|\+|-|\*|%|\*\*|\+\+|--|<<|>>|>>>|&|\||\^|!|~|&&|\|\||\?|:|=|\+=|-=|\*=|%=|\*\*=|<<=|>>=|>>>=|&=|\|=|\^=|=>|\/|\/=|\})$/;
+const PUNCTUATOR_REGEX = /(return|case|{|\(|\[|\.\.\.|;|,|<|>|<=|>=|==|!=|===|!==|\+|-|\*|%|\*\*|\+\+|--|<<|>>|>>>|&|\||\^|!|~|&&|\|\||\?|:|=|\+=|-=|\*=|%=|\*\*=|<<=|>>=|>>>=|&=|\|=|\^=|=>|\/|\/=|\})$/;
 const WHITESPACE_REGEX = /( |\n|\t)+$/;
 
 /**

diff --git a/lighthouse-core/test/lib/minification-estimator-test.js b/lighthouse-core/test/lib/minification-estimator-test.js
@@ -214,6 +214,15 @@ describe('minification estimator', () => {
       assert.equal(computeJSTokenLength(js), 9);
     });
 
+    it('should handle regex as switch case clause edge cases', () => {
+      const js = `
+        switch(true){case/^hello!/.test("hello!"):"///123456789"}
+      `;
+
+      assert.equal(computeJSTokenLength(js), 57);
+      assert.equal(computeJSTokenLength(js), js.trim().length);
+    });
+
     it('should handle large, real, unminified javscript files', () => {
       assert.equal(angularJs.length, 1374505);
       const minificationPct = 1 - computeJSTokenLength(angularJs) / angularJs.length;