@jsenv/core 41.0.7 → 41.1.1

package/dist/build/jsenv_core_packages.js

@@ -6595,6 +6595,7 @@ const browserDefaultRuntimeCompat = {
   edge: "79",
   firefox: "67",
   ios: "12",
+  ios_safari: "12",
   opera: "51",
   safari: "11.3",
   samsung: "9.2",
@@ -6696,6 +6697,7 @@ const featuresCompatMap = {
     safari: "10.1",
     opera: "48",
     ios: "10.3",
+    ios_safari: "10.3",
     android: "61",
     samsung: "8.2",
   },
@@ -6715,6 +6717,7 @@ const featuresCompatMap = {
     edge: "79",
     firefox: "62",
     ios: "12",
+    ios_safari: "12",
     opera: "51",
     safari: "11.1",
     samsung: "9.2",
@@ -6732,6 +6735,7 @@ const featuresCompatMap = {
     edge: "79",
     firefox: "67",
     ios: "11.3",
+    ios_safari: "11.3",
     opera: "50",
     safari: "11.3",
     samsung: "8.0",
@@ -6745,6 +6749,7 @@ const featuresCompatMap = {
     safari: "15",
     samsung: "15",
     ios: "15",
+    ios_safari: "15",
     node: "14.8",
   },
   // https://caniuse.com/import-maps
@@ -6780,6 +6785,7 @@ const featuresCompatMap = {
     opera: "11.5",
     safari: "4",
     ios: "5",
+    ios_safari: "5",
     android: "4.4",
   },
   // https://developer.mozilla.org/en-US/docs/Web/API/Worker/Worker#browser_compatibility
@@ -6797,6 +6803,7 @@ const featuresCompatMap = {
     safari: "11.1",
     opera: "27",
     ios: "11.3",
+    ios_safari: "11.3",
     android: "12.12",
   },
   service_worker_type_module: {
@@ -6826,6 +6833,7 @@ const featuresCompatMap = {
     safari: "12.1",
     opera: "58",
     ios: "12.2",
+    ios_safari: "12.2",
     android: "94",
     node: "12",
   },
@@ -6837,6 +6845,7 @@ const featuresCompatMap = {
     safari: "12",
     node: "10",
     ios: "12",
+    ios_safari: "12",
     samsung: "8",
     electron: "3",
   },
@@ -6848,6 +6857,7 @@ const featuresCompatMap = {
     opera: "28",
     safari: "9",
     ios: "9",
+    ios_safari: "9",
     android: "4",
     node: "4",
   },
@@ -6859,6 +6869,7 @@ const featuresCompatMap = {
     safari: "10",
     node: "6",
     ios: "10",
+    ios_safari: "10",
     samsung: "5",
     electron: "0.36",
   },
@@ -6871,6 +6882,7 @@ const featuresCompatMap = {
     node: "4",
     ie: "11",
     ios: "10",
+    ios_safari: "10",
     samsung: "3.4",
     electron: "0.22",
   },
@@ -6882,6 +6894,7 @@ const featuresCompatMap = {
     safari: "9",
     node: "4",
     ios: "9",
+    ios_safari: "9",
     samsung: "4",
     electron: "0.28",
   },
@@ -6895,6 +6908,7 @@ const featuresCompatMap = {
     ie: "9",
     android: "4.4",
     ios: "6",
+    ios_safari: "6",
     phantom: "2",
     samsung: "1",
     electron: "0.20",
@@ -6906,6 +6920,7 @@ const featuresCompatMap = {
     firefox: "36",
     safari: "9",
     ios: "9",
+    ios_safari: "9",
     samsung: "4",
     node: "0.12",
   },
@@ -6992,7 +7007,7 @@ const inferRuntimeCompatFromClosestPackage = async (
     for (const browserNameAndVersion of browserslistConfig) {
       let [name, version] = browserNameAndVersion.split(" ");
       if (name === "ios_saf") {
-        name = "ios";
+        name = "ios_safari";
       }
       if (Object.keys(browserDefaultRuntimeCompat).includes(name)) {
         runtimeCompat[name] = version;

package/dist/start_dev_server/jsenv_core_packages.js

@@ -5897,6 +5897,7 @@ const featuresCompatMap = {
     safari: "10.1",
     opera: "48",
     ios: "10.3",
+    ios_safari: "10.3",
     android: "61",
     samsung: "8.2",
   },
@@ -5916,6 +5917,7 @@ const featuresCompatMap = {
     edge: "79",
     firefox: "62",
     ios: "12",
+    ios_safari: "12",
     opera: "51",
     safari: "11.1",
     samsung: "9.2",
@@ -5933,6 +5935,7 @@ const featuresCompatMap = {
     edge: "79",
     firefox: "67",
     ios: "11.3",
+    ios_safari: "11.3",
     opera: "50",
     safari: "11.3",
     samsung: "8.0",
@@ -5946,6 +5949,7 @@ const featuresCompatMap = {
     safari: "15",
     samsung: "15",
     ios: "15",
+    ios_safari: "15",
     node: "14.8",
   },
   // https://caniuse.com/import-maps
@@ -5981,6 +5985,7 @@ const featuresCompatMap = {
     opera: "11.5",
     safari: "4",
     ios: "5",
+    ios_safari: "5",
     android: "4.4",
   },
   // https://developer.mozilla.org/en-US/docs/Web/API/Worker/Worker#browser_compatibility
@@ -5998,6 +6003,7 @@ const featuresCompatMap = {
     safari: "11.1",
     opera: "27",
     ios: "11.3",
+    ios_safari: "11.3",
     android: "12.12",
   },
   service_worker_type_module: {
@@ -6027,6 +6033,7 @@ const featuresCompatMap = {
     safari: "12.1",
     opera: "58",
     ios: "12.2",
+    ios_safari: "12.2",
     android: "94",
     node: "12",
   },
@@ -6038,6 +6045,7 @@ const featuresCompatMap = {
     safari: "12",
     node: "10",
     ios: "12",
+    ios_safari: "12",
     samsung: "8",
     electron: "3",
   },
@@ -6049,6 +6057,7 @@ const featuresCompatMap = {
     opera: "28",
     safari: "9",
     ios: "9",
+    ios_safari: "9",
     android: "4",
     node: "4",
   },
@@ -6060,6 +6069,7 @@ const featuresCompatMap = {
     safari: "10",
     node: "6",
     ios: "10",
+    ios_safari: "10",
     samsung: "5",
     electron: "0.36",
   },
@@ -6072,6 +6082,7 @@ const featuresCompatMap = {
     node: "4",
     ie: "11",
     ios: "10",
+    ios_safari: "10",
     samsung: "3.4",
     electron: "0.22",
   },
@@ -6083,6 +6094,7 @@ const featuresCompatMap = {
     safari: "9",
     node: "4",
     ios: "9",
+    ios_safari: "9",
     samsung: "4",
     electron: "0.28",
   },
@@ -6096,6 +6108,7 @@ const featuresCompatMap = {
     ie: "9",
     android: "4.4",
     ios: "6",
+    ios_safari: "6",
     phantom: "2",
     samsung: "1",
     electron: "0.20",
@@ -6107,6 +6120,7 @@ const featuresCompatMap = {
     firefox: "36",
     safari: "9",
     ios: "9",
+    ios_safari: "9",
     samsung: "4",
     node: "0.12",
   },
@@ -6286,24 +6300,4 @@ const isResponseEligibleForIntegrityValidation = (response) => {
   return ["basic", "cors", "default"].includes(response.type);
 };
 
-const memoizeByFirstArgument = (compute) => {
-  const urlCache = new Map();
-
-  const fnWithMemoization = (url, ...args) => {
-    const valueFromCache = urlCache.get(url);
-    if (valueFromCache) {
-      return valueFromCache;
-    }
-    const value = compute(url, ...args);
-    urlCache.set(url, value);
-    return value;
-  };
-
-  fnWithMemoization.forget = () => {
-    urlCache.clear();
-  };
-
-  return fnWithMemoization;
-};
-
-export { ANSI, CONTENT_TYPE, DATA_URL, JS_QUOTES, RUNTIME_COMPAT, URL_META, applyFileSystemMagicResolution, applyNodeEsmResolution, asSpecifierWithoutSearch, asUrlWithoutSearch, assertAndNormalizeDirectoryUrl, bufferToEtag, compareFileUrls, composeTwoImportMaps, createDetailedMessage$1 as createDetailedMessage, createLogger, createTaskLog, ensurePathnameTrailingSlash, ensureWindowsDriveLetter, errorToHTML, formatError, generateContentFrame, getCallerPosition, getExtensionsToTry, injectQueryParams, injectQueryParamsIntoSpecifier, isFileSystemPath, isSpecifierForNodeBuiltin, lookupPackageDirectory, memoizeByFirstArgument, moveUrl, normalizeImportMap, normalizeUrl, readCustomConditionsFromProcessArgs, readEntryStatSync, readPackageAtOrNull, registerDirectoryLifecycle, resolveImport, setUrlBasename, setUrlExtension, setUrlFilename, stringifyUrlSite, urlIsOrIsInsideOf, urlToBasename, urlToExtension$1 as urlToExtension, urlToFileSystemPath, urlToFilename$1 as urlToFilename, urlToPathname$1 as urlToPathname, urlToRelativeUrl, validateResponseIntegrity, writeFileSync };
+export { ANSI, CONTENT_TYPE, DATA_URL, JS_QUOTES, RUNTIME_COMPAT, URL_META, applyFileSystemMagicResolution, applyNodeEsmResolution, asSpecifierWithoutSearch, asUrlWithoutSearch, assertAndNormalizeDirectoryUrl, bufferToEtag, compareFileUrls, composeTwoImportMaps, createDetailedMessage$1 as createDetailedMessage, createLogger, createTaskLog, ensurePathnameTrailingSlash, ensureWindowsDriveLetter, errorToHTML, formatError, generateContentFrame, getCallerPosition, getExtensionsToTry, injectQueryParams, injectQueryParamsIntoSpecifier, isFileSystemPath, isSpecifierForNodeBuiltin, lookupPackageDirectory, moveUrl, normalizeImportMap, normalizeUrl, readCustomConditionsFromProcessArgs, readEntryStatSync, readPackageAtOrNull, registerDirectoryLifecycle, resolveImport, setUrlBasename, setUrlExtension, setUrlFilename, stringifyUrlSite, urlIsOrIsInsideOf, urlToBasename, urlToExtension$1 as urlToExtension, urlToFileSystemPath, urlToFilename$1 as urlToFilename, urlToPathname$1 as urlToPathname, urlToRelativeUrl, validateResponseIntegrity, writeFileSync };

package/dist/start_dev_server/start_dev_server.js

@@ -1,6 +1,6 @@
 import { WebSocketResponse, pickContentType, ServerEvents, serverPluginErrorHandler, composeTwoResponses, fetchDirectory, serverPluginCORS, jsenvAccessControlAllowedHeaders, startServer } from "@jsenv/server";
 import { readFileSync, existsSync, readdirSync, lstatSync, realpathSync } from "node:fs";
-import { lookupPackageDirectory, readPackageAtOrNull, generateContentFrame, urlToRelativeUrl, errorToHTML, DATA_URL, CONTENT_TYPE, normalizeImportMap, composeTwoImportMaps, resolveImport, JS_QUOTES, urlToExtension, urlToBasename, applyNodeEsmResolution, URL_META, readCustomConditionsFromProcessArgs, urlIsOrIsInsideOf, registerDirectoryLifecycle, asUrlWithoutSearch, readEntryStatSync, ensurePathnameTrailingSlash, compareFileUrls, urlToFilename, applyFileSystemMagicResolution, getExtensionsToTry, setUrlExtension, createDetailedMessage, stringifyUrlSite, injectQueryParamsIntoSpecifier, isSpecifierForNodeBuiltin, injectQueryParams, urlToFileSystemPath, writeFileSync, moveUrl, ensureWindowsDriveLetter, validateResponseIntegrity, setUrlFilename, getCallerPosition, asSpecifierWithoutSearch, bufferToEtag, isFileSystemPath, urlToPathname, setUrlBasename, createLogger, normalizeUrl, ANSI, RUNTIME_COMPAT, memoizeByFirstArgument, formatError, assertAndNormalizeDirectoryUrl, createTaskLog } from "./jsenv_core_packages.js";
+import { lookupPackageDirectory, readPackageAtOrNull, generateContentFrame, urlToRelativeUrl, errorToHTML, DATA_URL, CONTENT_TYPE, normalizeImportMap, composeTwoImportMaps, resolveImport, JS_QUOTES, urlToExtension, urlToBasename, applyNodeEsmResolution, URL_META, readCustomConditionsFromProcessArgs, urlIsOrIsInsideOf, registerDirectoryLifecycle, asUrlWithoutSearch, readEntryStatSync, ensurePathnameTrailingSlash, compareFileUrls, urlToFilename, applyFileSystemMagicResolution, getExtensionsToTry, setUrlExtension, createDetailedMessage, stringifyUrlSite, injectQueryParamsIntoSpecifier, isSpecifierForNodeBuiltin, injectQueryParams, urlToFileSystemPath, writeFileSync, moveUrl, ensureWindowsDriveLetter, validateResponseIntegrity, setUrlFilename, getCallerPosition, asSpecifierWithoutSearch, bufferToEtag, isFileSystemPath, urlToPathname, setUrlBasename, createLogger, normalizeUrl, ANSI, RUNTIME_COMPAT, formatError, assertAndNormalizeDirectoryUrl, createTaskLog } from "./jsenv_core_packages.js";
 import { createPluginsController } from "@jsenv/server/src/plugins_controller.js";
 import { parseHtml, parseCssUrls, getHtmlNodeAttribute, getHtmlNodePosition, getHtmlNodeAttributePosition, setHtmlNodeAttributes, parseSrcSet, getUrlForContentInsideHtml, removeHtmlNodeText, setHtmlNodeText, getHtmlNodeText, analyzeScriptNode, stringifyHtmlAst, visitHtmlNodes, parseJsUrls, getUrlForContentInsideJs, injectJsenvScript, applyBabelPlugins, analyzeLinkNode, injectHtmlNodeAsEarlyAsPossible, createHtmlNode, generateUrlForInlineContent, parseJsWithAcorn } from "@jsenv/ast";
 import { jsenvPluginSupervisor } from "@jsenv/plugin-supervisor";
@@ -10,7 +10,6 @@ import { pathToFileURL } from "node:url";
 import { bundleJsModules } from "@jsenv/plugin-bundling";
 import { randomUUID } from "node:crypto";
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/plugins/filesystem/filesystem_error_to_response.js";
-import { createRequire } from "node:module";
 import "./jsenv_core_node_modules.js";
 import "node:process";
 import "node:os";
@@ -9560,9 +9559,83 @@ const inferUrlInfoType = (urlInfo) => {
   return expectedType || "other";
 };
 
-const requireFromJsenv = createRequire(import.meta.url);
+const runtimeBySecChUa = new Map();
+const runtimeByUserAgent = new Map();
 
-const parseUserAgentHeader = memoizeByFirstArgument((userAgent) => {
+const getRuntimeFromRequest = (request) => {
+  const secChUa = request.headers["sec-ch-ua"];
+  if (secChUa) {
+    const cached = runtimeBySecChUa.get(secChUa);
+    if (cached) {
+      return cached;
+    }
+    const result = parseSecChUaHeader(secChUa);
+    if (result) {
+      runtimeBySecChUa.set(secChUa, result);
+      return result;
+    }
+  }
+  const userAgent = request.headers["user-agent"] || "";
+  const cached = runtimeByUserAgent.get(userAgent);
+  if (cached) {
+    return cached;
+  }
+  const result = parseUserAgentHeader(userAgent);
+  runtimeByUserAgent.set(userAgent, result);
+  return result;
+};
+
+const parseSecChUaHeader = (secChUa) => {
+  // sec-ch-ua format: "Google Chrome";v="149", "Chromium";v="149", "Not)A;Brand";v="24"
+  const brands = [];
+  const regex = /"([^"]+)";v="([^"]+)"/g;
+  let match;
+  while ((match = regex.exec(secChUa)) !== null) {
+    const name = match[1];
+    const version = match[2];
+    // skip "Not X;Brand" noise entries
+    if (!name.includes("Not") && !name.includes("Brand")) {
+      brands.push({ name, version });
+    }
+  }
+  if (brands.length === 0) {
+    return null;
+  }
+  // Prefer the non-Chromium brand (e.g. "Google Chrome", "Microsoft Edge")
+  // Fall back to "Chromium" if no specific brand found
+  let brand = brands.find((b) => b.name !== "Chromium");
+  if (!brand) {
+    brand = brands[0];
+  }
+  const runtimeName = brandNameToRuntimeName(brand.name);
+  const runtimeVersion = `${brand.version}.0.0`;
+  return { runtimeName, runtimeVersion };
+};
+const brandNameToRuntimeName = (brandName) => {
+  const lower = brandName.toLowerCase();
+  if (lower === "google chrome") {
+    return "chrome";
+  }
+  if (lower === "headlesschrome") {
+    return "chrome";
+  }
+  if (lower === "microsoft edge") {
+    return "edge";
+  }
+  if (lower === "opera") {
+    return "opera";
+  }
+  if (lower === "samsung internet") {
+    return "samsung";
+  }
+  if (lower === "chromium") {
+    return "chrome";
+  }
+  // other Chromium-based browsers share Chrome's compatibility
+  return "chrome";
+};
+
+const parseUserAgentHeader = (userAgent) => {
   if (userAgent.includes("node-fetch/")) {
     // it's not really node and conceptually we can't assume the node version
     // but good enough for now
@@ -9571,15 +9644,48 @@ const parseUserAgentHeader = memoizeByFirstArgument((userAgent) => {
       runtimeVersion: process.version.slice(1),
     };
   }
-  const UA = requireFromJsenv("@financial-times/polyfill-useragent-normaliser");
-  const { ua } = new UA(userAgent);
-  const { family, major, minor, patch } = ua;
-  return {
-    runtimeName: family.toLowerCase(),
-    runtimeVersion:
-      family === "Other" ? "unknown" : `${major}.${minor}${patch}`,
-  };
-});
+  // iOS Safari must be checked before Safari (UA contains both)
+  if (userAgent.includes("Mobile") && userAgent.includes("Safari")) {
+    const iosSafariMatch = userAgent.match(/\bOS (\d+)[._](\d+)(?:[._](\d+))?/);
+    if (iosSafariMatch) {
+      const major = iosSafariMatch[1];
+      const minor = iosSafariMatch[2] || "0";
+      const patch = iosSafariMatch[3] || "0";
+      return {
+        runtimeName: "ios_safari",
+        runtimeVersion: `${major}.${minor}.${patch}`,
+      };
+    }
+  }
+  if (!userAgent.includes("Chrome") && userAgent.includes("Safari")) {
+    const safariMatch = userAgent.match(/\bVersion\/(\d+)\.(\d+)(?:\.(\d+))?/);
+    if (safariMatch) {
+      const major = safariMatch[1];
+      const minor = safariMatch[2] || "0";
+      const patch = safariMatch[3] || "0";
+      return {
+        runtimeName: "safari",
+        runtimeVersion: `${major}.${minor}.${patch}`,
+      };
+    }
+  }
+  const firefoxMatch = userAgent.match(/\bFirefox\/(\d+)\.(\d+)\b/);
+  if (firefoxMatch) {
+    const major = firefoxMatch[1];
+    const minor = firefoxMatch[2] || "0";
+    return { runtimeName: "firefox", runtimeVersion: `${major}.${minor}.0` };
+  }
+  // generic Chromium-based fallback (should normally be handled by sec-ch-ua)
+  const chromeMatch = userAgent.match(
+    /(?:HeadlessChrome|Chrome)\/(\d+)\.(\d+)\b/,
+  );
+  if (chromeMatch) {
+    const major = chromeMatch[1];
+    const minor = chromeMatch[2] || "0";
+    return { runtimeName: "chrome", runtimeVersion: `${major}.${minor}.0` };
+  }
+  return { runtimeName: "unknown", runtimeVersion: "unknown" };
+};
 
 const devServerPluginServeSourceFiles = ({
   packageDirectory,
@@ -9620,9 +9726,7 @@ const devServerPluginServeSourceFiles = ({
   serverStopCallbackSet.add(stopWatchingSourceFiles);
 
   const getOrCreateKitchen = async (request) => {
-    const { runtimeName, runtimeVersion } = parseUserAgentHeader(
-      request.headers["user-agent"] || "",
-    );
+    const { runtimeName, runtimeVersion } = getRuntimeFromRequest(request);
     const runtimeId = `${runtimeName}@${runtimeVersion}`;
     const existing = kitchenCache.get(runtimeId);
     if (existing) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "41.0.7",
+  "version": "41.1.1",
   "description": "Tool to develop, test and build js projects",
   "repository": {
     "type": "git",
@@ -74,13 +74,12 @@
     "test:snapshot_clear": "npx @jsenv/filesystem clear **/tests/**/side_effects/"
   },
   "dependencies": {
-    "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/ast": "6.7.21",
     "@jsenv/js-module-fallback": "1.4.29",
     "@jsenv/plugin-bundling": "2.10.9",
     "@jsenv/plugin-minification": "1.7.3",
     "@jsenv/plugin-supervisor": "1.8.0",
-    "@jsenv/plugin-transpilation": "1.5.70",
+    "@jsenv/plugin-transpilation": "1.5.71",
     "@jsenv/server": "17.1.1",
     "@jsenv/sourcemap": "1.3.17",
     "react-table": "7.8.0"

package/src/dev/dev_server_plugins/dev_server_plugin_serve_source_files.js

@@ -8,8 +8,7 @@ import { watchSourceFiles } from "../../helpers/watch_source_files.js";
 import { WEB_URL_CONVERTER } from "../../helpers/web_url_converter.js";
 import { createKitchen } from "../../kitchen/kitchen.js";
 import { createJsenvPluginsController } from "../../plugins/jsenv_plugins_controller.js";
-
-import { parseUserAgentHeader } from "./user_agent.js";
+import { getRuntimeFromRequest } from "./runtime_from_request.js";
 
 export const devServerPluginServeSourceFiles = ({
   packageDirectory,
@@ -50,9 +49,7 @@ export const devServerPluginServeSourceFiles = ({
   serverStopCallbackSet.add(stopWatchingSourceFiles);
 
   const getOrCreateKitchen = async (request) => {
-    const { runtimeName, runtimeVersion } = parseUserAgentHeader(
-      request.headers["user-agent"] || "",
-    );
+    const { runtimeName, runtimeVersion } = getRuntimeFromRequest(request);
     const runtimeId = `${runtimeName}@${runtimeVersion}`;
     const existing = kitchenCache.get(runtimeId);
     if (existing) {

package/src/dev/dev_server_plugins/runtime_from_request.js

@@ -0,0 +1,127 @@
+const runtimeBySecChUa = new Map();
+const runtimeByUserAgent = new Map();
+
+export const getRuntimeFromRequest = (request) => {
+  const secChUa = request.headers["sec-ch-ua"];
+  if (secChUa) {
+    const cached = runtimeBySecChUa.get(secChUa);
+    if (cached) {
+      return cached;
+    }
+    const result = parseSecChUaHeader(secChUa);
+    if (result) {
+      runtimeBySecChUa.set(secChUa, result);
+      return result;
+    }
+  }
+  const userAgent = request.headers["user-agent"] || "";
+  const cached = runtimeByUserAgent.get(userAgent);
+  if (cached) {
+    return cached;
+  }
+  const result = parseUserAgentHeader(userAgent);
+  runtimeByUserAgent.set(userAgent, result);
+  return result;
+};
+
+const parseSecChUaHeader = (secChUa) => {
+  // sec-ch-ua format: "Google Chrome";v="149", "Chromium";v="149", "Not)A;Brand";v="24"
+  const brands = [];
+  const regex = /"([^"]+)";v="([^"]+)"/g;
+  let match;
+  while ((match = regex.exec(secChUa)) !== null) {
+    const name = match[1];
+    const version = match[2];
+    // skip "Not X;Brand" noise entries
+    if (!name.includes("Not") && !name.includes("Brand")) {
+      brands.push({ name, version });
+    }
+  }
+  if (brands.length === 0) {
+    return null;
+  }
+  // Prefer the non-Chromium brand (e.g. "Google Chrome", "Microsoft Edge")
+  // Fall back to "Chromium" if no specific brand found
+  let brand = brands.find((b) => b.name !== "Chromium");
+  if (!brand) {
+    brand = brands[0];
+  }
+  const runtimeName = brandNameToRuntimeName(brand.name);
+  const runtimeVersion = `${brand.version}.0.0`;
+  return { runtimeName, runtimeVersion };
+};
+const brandNameToRuntimeName = (brandName) => {
+  const lower = brandName.toLowerCase();
+  if (lower === "google chrome") {
+    return "chrome";
+  }
+  if (lower === "headlesschrome") {
+    return "chrome";
+  }
+  if (lower === "microsoft edge") {
+    return "edge";
+  }
+  if (lower === "opera") {
+    return "opera";
+  }
+  if (lower === "samsung internet") {
+    return "samsung";
+  }
+  if (lower === "chromium") {
+    return "chrome";
+  }
+  // other Chromium-based browsers share Chrome's compatibility
+  return "chrome";
+};
+
+const parseUserAgentHeader = (userAgent) => {
+  if (userAgent.includes("node-fetch/")) {
+    // it's not really node and conceptually we can't assume the node version
+    // but good enough for now
+    return {
+      runtimeName: "node",
+      runtimeVersion: process.version.slice(1),
+    };
+  }
+  // iOS Safari must be checked before Safari (UA contains both)
+  if (userAgent.includes("Mobile") && userAgent.includes("Safari")) {
+    const iosSafariMatch = userAgent.match(/\bOS (\d+)[._](\d+)(?:[._](\d+))?/);
+    if (iosSafariMatch) {
+      const major = iosSafariMatch[1];
+      const minor = iosSafariMatch[2] || "0";
+      const patch = iosSafariMatch[3] || "0";
+      return {
+        runtimeName: "ios_safari",
+        runtimeVersion: `${major}.${minor}.${patch}`,
+      };
+    }
+  }
+  if (!userAgent.includes("Chrome") && userAgent.includes("Safari")) {
+    const safariMatch = userAgent.match(/\bVersion\/(\d+)\.(\d+)(?:\.(\d+))?/);
+    if (safariMatch) {
+      const major = safariMatch[1];
+      const minor = safariMatch[2] || "0";
+      const patch = safariMatch[3] || "0";
+      return {
+        runtimeName: "safari",
+        runtimeVersion: `${major}.${minor}.${patch}`,
+      };
+    }
+  }
+  const firefoxMatch = userAgent.match(/\bFirefox\/(\d+)\.(\d+)\b/);
+  if (firefoxMatch) {
+    const major = firefoxMatch[1];
+    const minor = firefoxMatch[2] || "0";
+    return { runtimeName: "firefox", runtimeVersion: `${major}.${minor}.0` };
+  }
+  // generic Chromium-based fallback (should normally be handled by sec-ch-ua)
+  const chromeMatch = userAgent.match(
+    /(?:HeadlessChrome|Chrome)\/(\d+)\.(\d+)\b/,
+  );
+  if (chromeMatch) {
+    const major = chromeMatch[1];
+    const minor = chromeMatch[2] || "0";
+    return { runtimeName: "chrome", runtimeVersion: `${major}.${minor}.0` };
+  }
+  return { runtimeName: "unknown", runtimeVersion: "unknown" };
+};

package/src/dev/dev_server_plugins/user_agent.js

@@ -1,22 +0,0 @@
-import { memoizeByFirstArgument } from "@jsenv/utils/src/memoize/memoize_by_first_argument.js";
-
-import { requireFromJsenv } from "@jsenv/core/src/helpers/require_from_jsenv.js";
-
-export const parseUserAgentHeader = memoizeByFirstArgument((userAgent) => {
-  if (userAgent.includes("node-fetch/")) {
-    // it's not really node and conceptually we can't assume the node version
-    // but good enough for now
-    return {
-      runtimeName: "node",
-      runtimeVersion: process.version.slice(1),
-    };
-  }
-  const UA = requireFromJsenv("@financial-times/polyfill-useragent-normaliser");
-  const { ua } = new UA(userAgent);
-  const { family, major, minor, patch } = ua;
-  return {
-    runtimeName: family.toLowerCase(),
-    runtimeVersion:
-      family === "Other" ? "unknown" : `${major}.${minor}${patch}`,
-  };
-});