@hominis/fireforge 0.41.0 → 0.42.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.42.0
+
+### macOS bundle identity
+
+- `MOZ_MACBUNDLE_ID` in the generated branding `configure.sh` now carries only the LEAF segment of `appId`, and the generated mozconfig emits `ac_add_options --with-distribution-id=<appId prefix>` — upstream `toolkit/moz.configure` composes `CFBundleIdentifier` as `<distribution-id>.<MOZ_MACBUNDLE_ID>`, so writing the full reverse-domain `appId` double-prefixed the shipped bundle id (observed: `org.mozilla.org.hominis.browser`). A `configure.sh` carrying the full `appId` now reads as stale and is rewritten.
+
 ## 0.41.0
 
 ### Release and build integrity

package/dist/build-info.json

@@ -1,9 +1,9 @@
 {
   "schemaVersion": 1,
-  "version": "0.41.0",
-  "commit": "8d94512ea3928aa68b5525ddb73091fec73ce56c",
-  "shortCommit": "8d94512ea392",
+  "version": "0.42.0",
+  "commit": "8200882a267f82974cd34356112990be0650c2ee",
+  "shortCommit": "8200882a267f",
   "dirty": false,
   "dirtyHash": null,
-  "buildTime": "2026-08-15T22:42:44.650Z"
+  "buildTime": "2026-08-16T18:03:30.697Z"
 }

package/dist/src/core/branding.d.ts

@@ -52,6 +52,22 @@ export interface BrandingConfig {
      */
     license?: ProjectLicense;
 }
+/**
+ * Splits the reverse-domain `appId` for macOS bundle identity. Upstream
+ * `toolkit/moz.configure` composes `CFBundleIdentifier` as
+ * `<--with-distribution-id>.<MOZ_MACBUNDLE_ID>` (the distribution id
+ * defaults to `org.mozilla`), so branding `configure.sh` must carry only
+ * the LEAF segment while the generated mozconfig carries the remainder as
+ * `--with-distribution-id`. Writing the full appId into `MOZ_MACBUNDLE_ID`
+ * double-prefixes the shipped bundle id (observed:
+ * `org.mozilla.org.hominis.browser`, and with a distribution-id flag,
+ * `org.hominis.org.hominis.browser`). Config validation guarantees a
+ * reverse-domain id, so the split always has both halves.
+ */
+export declare function splitAppId(appId: string): {
+    distributionId: string;
+    leaf: string;
+};
 /**
  * Sets up the custom branding directory for the browser.
  *

package/dist/src/core/branding.js

@@ -53,6 +53,22 @@ 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.');
     }
 }
+/**
+ * Splits the reverse-domain `appId` for macOS bundle identity. Upstream
+ * `toolkit/moz.configure` composes `CFBundleIdentifier` as
+ * `<--with-distribution-id>.<MOZ_MACBUNDLE_ID>` (the distribution id
+ * defaults to `org.mozilla`), so branding `configure.sh` must carry only
+ * the LEAF segment while the generated mozconfig carries the remainder as
+ * `--with-distribution-id`. Writing the full appId into `MOZ_MACBUNDLE_ID`
+ * double-prefixes the shipped bundle id (observed:
+ * `org.mozilla.org.hominis.browser`, and with a distribution-id flag,
+ * `org.hominis.org.hominis.browser`). Config validation guarantees a
+ * reverse-domain id, so the split always has both halves.
+ */
+export function splitAppId(appId) {
+    const lastDot = appId.lastIndexOf('.');
+    return { distributionId: appId.slice(0, lastDot), leaf: appId.slice(lastDot + 1) };
+}
 const MOZ_APP_VENDOR_IMPLY_REGEX = /imply_option\("MOZ_APP_VENDOR",\s*"[^"]*"\)/;
 const BRANDING_CONFIGURE_MANAGED_KEYS = new Set([
     'MOZ_APP_DISPLAYNAME',
@@ -107,7 +123,7 @@ function buildConfigureScriptContent(config, vendorPlacement, existingContent) {
     if (vendorPlacement === 'branding-configure') {
         managedLines.push(`MOZ_APP_VENDOR="${escapeShellValue(config.vendor)}"`);
     }
-    managedLines.push(`MOZ_MACBUNDLE_ID="${escapeShellValue(config.appId)}"`);
+    managedLines.push(`MOZ_MACBUNDLE_ID="${escapeShellValue(splitAppId(config.appId).leaf)}"`);
     const preservedLines = existingContent ? extractPreservedConfigureLines(existingContent) : [];
     const body = [...managedLines, ...preservedLines].join('\n');
     return `${header}\n\n${body}\n`;
@@ -140,7 +156,7 @@ function isConfigureScriptCurrent(content, config, vendorPlacement) {
     if (assignments.get('MOZ_APP_DISPLAYNAME') !== `"${escapeShellValue(config.name)}"`) {
         return false;
     }
-    if (assignments.get('MOZ_MACBUNDLE_ID') !== `"${escapeShellValue(config.appId)}"`) {
+    if (assignments.get('MOZ_MACBUNDLE_ID') !== `"${escapeShellValue(splitAppId(config.appId).leaf)}"`) {
         return false;
     }
     const vendorValue = assignments.get('MOZ_APP_VENDOR');

package/dist/src/core/mach-mozconfig.js

@@ -3,7 +3,7 @@ import { join } from 'node:path';
 import { MozconfigError } from '../errors/build.js';
 import { pathExists, readText, writeText } from '../utils/fs.js';
 import { getPlatform } from '../utils/platform.js';
-import { BrandingMozconfigMismatchError } from './branding.js';
+import { BrandingMozconfigMismatchError, splitAppId } from './branding.js';
 /**
  * Replaces template variables in a string.
  * @param content - Content with ${variable} placeholders
@@ -95,6 +95,14 @@ export async function generateMozconfig(configsDir, engineDir, config) {
         binaryName: config.binaryName,
     };
     let content = '';
+    // Bundle identity: branding configure.sh carries only the LEAF of appId
+    // (see splitAppId in branding.ts — upstream composes the mac bundle id as
+    // <distribution-id>.<MOZ_MACBUNDLE_ID>); the prefix travels here so the
+    // two halves can never drift apart.
+    const { distributionId } = splitAppId(config.appId);
+    content +=
+        `# FireForge identity (generated from fireforge.json appId)\n` +
+            `ac_add_options --with-distribution-id=${distributionId}\n\n`;
     // Read common config if it exists
     if (await pathExists(commonPath)) {
         const commonContent = await readText(commonPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hominis/fireforge",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "description": "FireForge — a build tool for customizing Firefox",
   "type": "module",
   "main": "./dist/src/index.js",