@hominis/fireforge 0.24.0 → 0.25.0

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.25.0
+
+- Kept `MOZ_APP_VENDOR` in `browser/moz.configure` for Firefox ESR 140 project-flag trees instead of generated branding `configure.sh`.
+- Added a regression for stale xpcshell install symlink repair under shared `_tests/testing/mochitest/` harness paths.
+
 ## 0.24.0
 
 - Moved branding vendor identity into generated branding configure scripts and made `browser/moz.configure` vendor patching optional.

package/README.md

@@ -20,7 +20,7 @@ Inspired by [fern.js](https://github.com/ghostery/user-agent-desktop) and [Melon
 
 ## Requirements
 
-- Node.js 20+
+- Node.js 22.22.1+
 - Python 3
 - Git
 - The normal Firefox platform build tools: Xcode command line tools on macOS, `build-essential`-style packages on Linux, Visual Studio Build Tools on Windows (never tested on Windows tbh)

package/dist/src/core/branding.js

@@ -53,6 +53,7 @@ export class BrandingMozconfigMismatchError extends FireForgeError {
             'The mismatch is caught before mach builds because resolving the build against the wrong branding tree fails deep in moz.build with a confusing "path does not exist" message.');
     }
 }
+const MOZ_APP_VENDOR_IMPLY_REGEX = /imply_option\("MOZ_APP_VENDOR",\s*"[^"]*"\)/;
 /**
  * Sets up the custom branding directory for the browser.
  *
@@ -76,29 +77,30 @@ export async function setupBranding(engineDir, config) {
     if (!(await pathExists(brandingDir))) {
         await copyDir(unofficialDir, brandingDir);
     }
+    const vendorPlacement = await resolveVendorPlacement(engineDir);
     // Create/update configure.sh with custom values
-    await createConfigureScript(brandingDir, config);
+    await createConfigureScript(brandingDir, config, vendorPlacement);
     // Update localization files
     await updateBrandProperties(brandingDir, config);
     await updateBrandFtl(brandingDir, config);
     // Patch moz.configure for MOZ_APP_VENDOR
-    await patchMozConfigure(engineDir, config);
+    await patchMozConfigure(engineDir, config, vendorPlacement);
 }
 /**
  * Creates the branding configure.sh script.
  */
-async function createConfigureScript(brandingDir, config) {
+async function createConfigureScript(brandingDir, config, vendorPlacement) {
     const configureShPath = join(brandingDir, 'configure.sh');
-    await writeTextIfChanged(configureShPath, buildConfigureScriptContent(config));
+    await writeTextIfChanged(configureShPath, buildConfigureScriptContent(config, vendorPlacement));
 }
-function buildConfigureScriptContent(config) {
+function buildConfigureScriptContent(config, vendorPlacement) {
     const header = getLicenseHeader(config.license ?? DEFAULT_LICENSE, 'hash');
-    return `${header}
-
-MOZ_APP_DISPLAYNAME="${escapeShellValue(config.name)}"
-MOZ_APP_VENDOR="${escapeShellValue(config.vendor)}"
-MOZ_MACBUNDLE_ID="${escapeShellValue(config.appId)}"
-`;
+    const lines = [`MOZ_APP_DISPLAYNAME="${escapeShellValue(config.name)}"`];
+    if (vendorPlacement === 'branding-configure') {
+        lines.push(`MOZ_APP_VENDOR="${escapeShellValue(config.vendor)}"`);
+    }
+    lines.push(`MOZ_MACBUNDLE_ID="${escapeShellValue(config.appId)}"`);
+    return `${header}\n\n${lines.join('\n')}\n`;
 }
 /**
  * Updates the brand.properties localization file.
@@ -150,30 +152,66 @@ trademarkInfo = { " " }
 }
 /**
  * Patches browser/moz.configure to set custom vendor when the upstream
- * configure surface still owns an existing MOZ_APP_VENDOR imply_option.
- *
- * Newer FireForge branding writes MOZ_APP_VENDOR from the branding-owned
- * configure.sh instead, so an absent browser/moz.configure line is valid.
- * Keeping this best-effort replacement preserves compatibility for queues
- * that still carry the older process-wide registration line.
+ * configure surface owns MOZ_APP_VENDOR as a project flag. ESR 140 rejects
+ * branding configure.sh / confvars origins for that flag, so the value must
+ * come from imply_option.
  */
-async function patchMozConfigure(engineDir, config) {
+async function patchMozConfigure(engineDir, config, vendorPlacement) {
+    if (vendorPlacement !== 'moz-configure') {
+        return;
+    }
     const mozConfigurePath = join(engineDir, 'browser', 'moz.configure');
     if (!(await pathExists(mozConfigurePath))) {
         return;
     }
     let content = await readText(mozConfigurePath);
-    // Replace MOZ_APP_VENDOR imply_option
-    const vendorRegex = /imply_option\("MOZ_APP_VENDOR",\s*"[^"]*"\)/;
-    if (!vendorRegex.test(content)) {
-        return;
+    if (MOZ_APP_VENDOR_IMPLY_REGEX.test(content)) {
+        content = content.replace(MOZ_APP_VENDOR_IMPLY_REGEX, buildMozConfigureVendorLine(config));
+    }
+    else {
+        content = insertMozConfigureVendorLine(content, buildMozConfigureVendorLine(config));
     }
-    content = content.replace(vendorRegex, buildMozConfigureVendorLine(config));
     await writeTextIfChanged(mozConfigurePath, content);
 }
 function buildMozConfigureVendorLine(config) {
     return `imply_option("MOZ_APP_VENDOR", "${escapeString(config.vendor)}")`;
 }
+async function resolveVendorPlacement(engineDir) {
+    const mozConfigurePath = join(engineDir, 'browser', 'moz.configure');
+    const toolkitMozConfigurePath = join(engineDir, 'toolkit', 'moz.configure');
+    const browserMozConfigureExists = await pathExists(mozConfigurePath);
+    const browserMozConfigureContent = browserMozConfigureExists
+        ? await readText(mozConfigurePath)
+        : undefined;
+    if (browserMozConfigureContent !== undefined &&
+        MOZ_APP_VENDOR_IMPLY_REGEX.test(browserMozConfigureContent)) {
+        return 'moz-configure';
+    }
+    if (await toolkitMozConfigureUsesVendorProjectFlag(toolkitMozConfigurePath)) {
+        if (!browserMozConfigureExists) {
+            throw new BrandingError('Firefox toolkit configure declares MOZ_APP_VENDOR as a project_flag, but browser/moz.configure is missing, so FireForge cannot safely set the vendor identity.');
+        }
+        return 'moz-configure';
+    }
+    return 'branding-configure';
+}
+async function toolkitMozConfigureUsesVendorProjectFlag(filePath) {
+    if (!(await pathExists(filePath))) {
+        return false;
+    }
+    const content = await readText(filePath);
+    return /project_flag\(\s*(?:(?!\)\s*\n)[\s\S])*env\s*=\s*"MOZ_APP_VENDOR"/m.test(content);
+}
+function insertMozConfigureVendorLine(content, line) {
+    const includeRegex = /^include\((["'])\.\.\/toolkit\/moz\.configure\1\)\s*$/m;
+    const match = includeRegex.exec(content);
+    if (!match) {
+        return `${content.replace(/\s*$/, '')}\n\n${line}\n`;
+    }
+    const prefix = content.slice(0, match.index).replace(/\s*$/, '');
+    const suffix = content.slice(match.index);
+    return `${prefix}\n\n${line}\n${suffix}`;
+}
 /**
  * Escapes a string for use in Python/configure file.
  */
@@ -230,8 +268,9 @@ export async function isBrandingSetup(engineDir, config) {
     if (!(await pathExists(configureShPath))) {
         return false;
     }
+    const vendorPlacement = await resolveVendorPlacement(engineDir);
     const configureContent = await readText(configureShPath);
-    if (configureContent !== buildConfigureScriptContent(config)) {
+    if (configureContent !== buildConfigureScriptContent(config, vendorPlacement)) {
         return false;
     }
     if (await pathExists(propsPath)) {
@@ -246,7 +285,15 @@ export async function isBrandingSetup(engineDir, config) {
             return false;
         }
     }
-    return configureContent.includes(`MOZ_APP_VENDOR="${escapeShellValue(config.vendor)}"`);
+    if (vendorPlacement === 'branding-configure') {
+        return configureContent.includes(`MOZ_APP_VENDOR="${escapeShellValue(config.vendor)}"`);
+    }
+    const mozConfigurePath = join(engineDir, 'browser', 'moz.configure');
+    if (!(await pathExists(mozConfigurePath))) {
+        return false;
+    }
+    const mozConfigureContent = await readText(mozConfigurePath);
+    return mozConfigureContent.includes(buildMozConfigureVendorLine(config));
 }
 /**
  * Checks whether a file path belongs to the tool-managed branding directory.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hominis/fireforge",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "description": "FireForge — a build tool for customizing Firefox",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -79,7 +79,7 @@
     "vitest": "^4.0.18"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.22.1"
   },
   "packageManager": "npm@11.12.1",
   "license": "EUPL-1.2",