Skip to content

feat: add detection of Servo #2958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NiklasMerz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add detection of Servo #2958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ import path from "node:path";
import fs from "node:fs";

export const BASE_DIR = new URL("..", import.meta.url);
export const RUNTIME_IDS_WITH_PATCH_VERSIONING = new Set(["bun"]); // List of browsers/runtimes that might add features in patches
export const RUNTIME_IDS_WITH_PATCH_VERSIONING = new Set([
"bun",
"servo",
"servo_android",
]); // List of browsers/runtimes that might add features in patches

/**
* Tests a specified path to see if it's a local checkout of mdn/browser-compat-data
Expand Down
40 changes: 40 additions & 0 deletions lib/ua-parser.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@ const browsers = {
name: "WebView Android",
releases: {1.1: {}, 4.4: {}, "4.4.3": {}, 37: {}, 86: {}},
},
servo: {
name: "Servo",
releases: {"0.0.1": {}},
},
servo_android: {
name: "Servo Android",
releases: {"0.0.1": {}},
},
};

describe("getMajorMinorVersion", () => {
Expand Down Expand Up @@ -407,6 +415,38 @@ describe("parseUA", () => {
);
});

it("Servo 140 Linux", () => {
assert.deepEqual(
parseUA(
"Mozilla/5.0 (X11; Linux x86_64; rv:140.0) Servo/0.0.1 Firefox/140.0",
browsers,
),
{
browser: {id: "servo", name: "Servo"},
version: "0.0.1",
fullVersion: "0.0.1",
os: {name: "Linux", version: ""},
inBcd: true,
},
);
});

it("Servo 140 Android", () => {
assert.deepEqual(
parseUA(
"Mozilla/5.0 (Android 10; Mobile; rv:140.0) Servo/0.0.1 Firefox/140.0",
browsers,
),
{
browser: {id: "servo_android", name: "Servo Android"},
version: "0.0.1",
fullVersion: "0.0.1",
os: {name: "Android", version: "10"},
inBcd: true,
},
);
});

it("WebView Android (Android Browser, 1.1)", () => {
assert.deepEqual(
parseUA(
Expand Down
10 changes: 10 additions & 0 deletions lib/ua-parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ const parseUA = (userAgent: string, browsers: Browsers): ParsedUserAgent => {
const [runtime, runtimeVersion] = userAgent.replace("!! ", "").split("/");
data.browser.id = runtime;
data.fullVersion = runtimeVersion;
} else if (userAgent.includes("Servo/")) {
// Servo browser detection
const servoMatch = userAgent.match(/Servo\/([\d.]+)/);
if (servoMatch) {
data.browser.id = "servo";
data.browser.name = "Servo";
data.fullVersion = servoMatch[1];
}
data.os.name = ua.os.name || "";
data.os.version = ua.os.version || "";
} else {
if (!ua.browser.name) {
return data;
Expand Down