feat(ua): add better Pale Moon handling

wessberg · May 19, 2021 · 74b1d74 · 74b1d74
1 parent f6406de
commit 74b1d74
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/src/browserslist-generator/browserslist-generator.ts b/src/browserslist-generator/browserslist-generator.ts
@@ -1033,16 +1033,24 @@ function getCaniuseBrowserForUseragentBrowser(parser: UaParserWrapper): Partial<
 			}
 		}
 
-		else {
 			// Then, from v27, it was based on a re-fork of Firefox 38.
-			// Unfortunately, there has been no re-forks since, so we'll
-			// have to assume it is still equivalent to Firefox 38 for
-			// the time being
+			// Unfortunately, we don't have fresh data as for the versions
+			// in between 27 and 29, so we'll have to stay at version 38 in
+			// this range
+		else if (lt(semver, "29.0.0")) {
 			return {
 				browser: "firefox",
 				version: "38"
 			}
 		}
+
+		// We know that v29 points to Firefox 68 in some of its user agents
+		else {
+			return {
+				browser: "firefox",
+				version: "68"
+			}
+		}
 	}
 
 	// For the MIUIBrowser, there are some rare instances for major versions 8 and 9 where they'll have no declared Chromium engine.
@@ -1268,7 +1276,7 @@ function getCaniuseBrowserForUseragentBrowser(parser: UaParserWrapper): Partial<
 				case "Gecko":
 					return {
 						browser: "firefox",
-						version: browser.version
+						version: engine.version
 					};
 				case "Presto":
 					return {

diff --git a/src/browserslist-generator/ua-parser-wrapper.ts b/src/browserslist-generator/ua-parser-wrapper.ts
@@ -3,6 +3,8 @@ import {UAParser} from "ua-parser-js";
 import isbot from "isbot";
 import {UseragentBrowser, UseragentDevice, UseragentEngine, UseragentOs} from "./useragent/useragent-typed";
 
+const FIREFOX_MATCH = /Firefox\/([\d.]+)/i;
+
 // These extension provide ua-parser-js with support for additional browsers
 // such as Sogou Explorer
 const PARSER_EXTENSIONS = {
@@ -121,6 +123,15 @@ export class UaParserWrapper {
 			delete result.blink;
 		}
 
+		// The User Agent may hold additional information, such as the equivalent Firefox version
+		if (result.name === "Goanna") {
+			const ffMatch = this.userAgent.match(FIREFOX_MATCH);
+			if (ffMatch != null) {
+				result.name = "Gecko";
+				result.version = ffMatch[1];
+			}
+		}
+
 		return result;
 	}
 }
diff --git a/test/browserslist-generator.test.ts b/test/browserslist-generator.test.ts
@@ -140,6 +140,10 @@ test("matchBrowserslistOnUserAgent() => Will match Pale Moon, but treat it as Fi
 	t.true(matchBrowserslistOnUserAgent(`Mozilla/5.0 (Windows NT 5.1; rv:4.8) Goanna/20210507 PaleMoon/28.10.3a1`, ["firefox >= 38"]));
 });
 
+test("matchBrowserslistOnUserAgent() => Will match Pale Moon, but treat it as Firefox. #2", t => {
+	t.true(matchBrowserslistOnUserAgent(`Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Goanna/4.8 Firefox/68.0 PaleMoon/29.1.1`, ["firefox >= 68"]));
+});
+
 test("matchBrowserslistOnUserAgent() => Will match Sogou Explorer, but treat it as Chrome. #1", t => {
 	t.true(
 		matchBrowserslistOnUserAgent(`Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/534.3 (KHTML, like Gecko) Chrome/6.0.472.33 Safari/534.3 SE 2.X MetaSr 1.0`, [