fix(mac): merge fileAssociations with existing `CFBundleDocumentTyp…

…es` if defined in `mac.extendInfo` (#8035)
electron-userland · Feb 8, 2024 · 94677f3 · 94677f3
1 parent 6fec9e8
commit 94677f3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/.changeset/fifty-lions-burn.md b/.changeset/fifty-lions-burn.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+fix(mac): merge `fileAssociations` with existing `CFBundleDocumentTypes` if defined in `mac.extendInfo`
diff --git a/packages/app-builder-lib/src/electron/electronMac.ts b/packages/app-builder-lib/src/electron/electronMac.ts
@@ -201,7 +201,7 @@ export async function createMacApp(packager: MacPackager, appOutDir: string, asa
 
   const fileAssociations = packager.fileAssociations
   if (fileAssociations.length > 0) {
-    appPlist.CFBundleDocumentTypes = await BluebirdPromise.map(fileAssociations, async fileAssociation => {
+    const documentTypes = await BluebirdPromise.map(fileAssociations, async fileAssociation => {
       const extensions = asArray(fileAssociation.ext).map(normalizeExt)
       const customIcon = await packager.getResource(getPlatformIconFileName(fileAssociation.icon, true), `${extensions[0]}.icns`)
       let iconFile = appPlist.CFBundleIconFile
@@ -223,6 +223,9 @@ export async function createMacApp(packager: MacPackager, appOutDir: string, asa
       }
       return result
     })
+
+    // `CFBundleDocumentTypes` may be defined in `mac.extendInfo`, so we need to merge it in that case
+    appPlist.CFBundleDocumentTypes = [...(appPlist.CFBundleDocumentTypes || []), ...documentTypes]
   }
 
   if (asarIntegrity != null) {

diff --git a/test/snapshots/mac/macPackagerTest.js.snap b/test/snapshots/mac/macPackagerTest.js.snap
@@ -68,6 +68,13 @@ exports[`one-package 2`] = `
 Object {
   "CFBundleDisplayName": "Test App ßW",
   "CFBundleDocumentTypes": Array [
+    Object {
+      "CFBundleTypeName": "Folders",
+      "CFBundleTypeRole": "Editor",
+      "LSItemContentTypes": Array [
+        "public.folder",
+      ],
+    },
     Object {
       "CFBundleTypeExtensions": Array [
         "foo",

diff --git a/test/src/mac/macPackagerTest.ts b/test/src/mac/macPackagerTest.ts
@@ -54,6 +54,13 @@ test.ifMac(
           appId: "foo",
           extendInfo: {
             LSUIElement: true,
+            CFBundleDocumentTypes: [
+              {
+                CFBundleTypeName: "Folders",
+                CFBundleTypeRole: "Editor",
+                LSItemContentTypes: ["public.folder"],
+              },
+            ],
           },
           minimumSystemVersion: "10.12.0",
           fileAssociations: [