@jsenv/core 24.5.6 → 24.5.7

package/src/internal/browser_detection/browser_detection.js

@@ -1,6 +1,7 @@
 // https://github.com/Ahmdrza/detect-browser/blob/26254f85cf92795655a983bfd759d85f3de850c6/detect-browser.js#L1
 // https://github.com/lancedikson/bowser/blob/master/src/parser-browsers.js#L1
 
+import { detectFromUserAgentData } from "./user_agent_data.js"
 import { detectAndroid } from "./detectAndroid.js"
 import { detectInternetExplorer } from "./detectInternetExplorer.js"
 import { detectOpera } from "./detectOpera.js"
@@ -25,6 +26,7 @@ const detectorCompose = (detectors) => () => {
 }
 
 const detector = detectorCompose([
+  detectFromUserAgentData, // keep this first
   detectOpera,
   detectInternetExplorer,
   detectEdge,

package/src/internal/browser_detection/detectChrome.js

@@ -1,18 +1,6 @@
 import { userAgentToVersion, firstMatch } from "./util.js"
 
 export const detectChrome = () => {
-  const { userAgentData } = window.navigator
-  if (userAgentData) {
-    const brand = userAgentData.brands.some((brand) => {
-      return brand.brand === "chromium" || brand.brand === "Google Chrome"
-    })
-    if (brand) {
-      return {
-        name: "chrome",
-        version: brand.version,
-      }
-    }
-  }
   return userAgentToBrowser(window.navigator.userAgent)
 }
 

package/src/internal/browser_detection/user_agent_data.js

@@ -0,0 +1,26 @@
+/*
+ * Prefer window.navigator.userAgentData before resorting to
+ * window.navigator.userAgent because of
+ * https://blog.chromium.org/2021/09/user-agent-reduction-origin-trial-and-dates.html
+ */
+
+export const detectFromUserAgentData = () => {
+  const { userAgentData } = window.navigator
+  if (!userAgentData) {
+    return null
+  }
+
+  const { brands } = userAgentData
+  let i = 0
+  while (i < brands.legth) {
+    const { brand, version } = brands[i]
+    i++
+    if (brand === "chromium" || brand === "Google Chrome") {
+      return {
+        name: "chrome",
+        version,
+      }
+    }
+  }
+  return null
+}