From 8e9f3f00e80094ef8a560ead26f831dab478afdc Mon Sep 17 00:00:00 2001
From: Erick Zhao <erick@hotmail.ca>
Date: Wed, 11 Dec 2024 12:09:05 -0800
Subject: [PATCH 1/2] fix(flat): don't use pkgbuild for MAS distributions

---
 src/flat.ts | 61 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/flat.ts b/src/flat.ts
index aed3ccf..a0a9a0f 100644
--- a/src/flat.ts
+++ b/src/flat.ts
@@ -49,27 +49,44 @@ async function validateFlatOpts (opts: FlatOptions): Promise<ValidatedFlatOption
 
 /**
  * This function returns a promise flattening the application.
- * @function
- * @param {Object} opts - Options.
- * @returns {Promise} Promise.
+ * @param opts - Options for building the .pkg archive
  */
 async function buildApplicationPkg (opts: ValidatedFlatOptions, identity: Identity) {
-  const componentPkgPath = path.join(path.dirname(opts.app), path.basename(opts.app, '.app') + '-component.pkg');
-  const pkgbuildArgs = ['--install-location', opts.install, '--component', opts.app, componentPkgPath];
-  if (opts.scripts) {
-    pkgbuildArgs.unshift('--scripts', opts.scripts);
-  }
-  debugLog('Building component package... ' + opts.app);
-  await execFileAsync('pkgbuild', pkgbuildArgs);
+  if (opts.platform === 'mas') {
+    const args = ['--component', opts.app, opts.install, '--sign', identity.name, opts.pkg];
+    if (opts.keychain) {
+      args.unshift('--keychain', opts.keychain);
+    }
 
-  const args = ['--package', componentPkgPath, opts.install, '--sign', identity.name, opts.pkg];
-  if (opts.keychain) {
-    args.unshift('--keychain', opts.keychain);
-  }
+    debugLog('Flattening Mac App Store package... ' + opts.app);
+    await execFileAsync('productbuild', args);
+  } else {
+    const componentPkgPath = path.join(
+      path.dirname(opts.app),
+      path.basename(opts.app, '.app') + '-component.pkg'
+    );
+    const pkgbuildArgs = [
+      '--install-location',
+      opts.install,
+      '--component',
+      opts.app,
+      componentPkgPath
+    ];
+    if (opts.scripts) {
+      pkgbuildArgs.unshift('--scripts', opts.scripts);
+    }
+    debugLog('Building component package... ' + opts.app);
+    await execFileAsync('pkgbuild', pkgbuildArgs);
 
-  debugLog('Flattening... ' + opts.app);
-  await execFileAsync('productbuild', args);
-  await execFileAsync('rm', [componentPkgPath]);
+    const args = ['--package', componentPkgPath, opts.install, '--sign', identity.name, opts.pkg];
+    if (opts.keychain) {
+      args.unshift('--keychain', opts.keychain);
+    }
+
+    debugLog('Flattening OS X Installer package... ' + opts.app);
+    await execFileAsync('productbuild', args);
+    await execFileAsync('rm', [componentPkgPath]);
+  }
 }
 
 /**
@@ -97,15 +114,15 @@ export async function buildPkg (_opts: FlatOptions) {
       debugLog(
         'Finding `3rd Party Mac Developer Installer` certificate for flattening app distribution in the Mac App Store...'
       );
-      identities = await findIdentities(
-        validatedOptions.keychain || null,
-        '3rd Party Mac Developer Installer:'
-      );
+      identities = await findIdentities(validatedOptions.keychain || null, '3rd Party Mac Developer Installer:');
     } else {
       debugLog(
         'Finding `Developer ID Application` certificate for distribution outside the Mac App Store...'
       );
-      identities = await findIdentities(validatedOptions.keychain || null, 'Developer ID Installer:');
+      identities = await findIdentities(
+        validatedOptions.keychain || null,
+        'Developer ID Installer:'
+      );
     }
   }
 

From 17b0473d1f5b0ea0412ef67cb5ab89b9336e3c91 Mon Sep 17 00:00:00 2001
From: Erick Zhao <erick@hotmail.ca>
Date: Wed, 11 Dec 2024 15:51:26 -0800
Subject: [PATCH 2/2] chore: additional validation and logging

---
 src/flat.ts  | 9 ++++++++-
 src/types.ts | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/flat.ts b/src/flat.ts
index a0a9a0f..5d7ea2e 100644
--- a/src/flat.ts
+++ b/src/flat.ts
@@ -39,6 +39,10 @@ async function validateFlatOpts (opts: FlatOptions): Promise<ValidatedFlatOption
     install = '/Applications';
   }
 
+  if (typeof opts.scripts === 'string' && opts.platform === 'mas') {
+    debugWarn('Mac App Store packages cannot have `scripts`, ignoring option.');
+  }
+
   return {
     ...opts,
     pkg,
@@ -114,7 +118,10 @@ export async function buildPkg (_opts: FlatOptions) {
       debugLog(
         'Finding `3rd Party Mac Developer Installer` certificate for flattening app distribution in the Mac App Store...'
       );
-      identities = await findIdentities(validatedOptions.keychain || null, '3rd Party Mac Developer Installer:');
+      identities = await findIdentities(
+        validatedOptions.keychain || null,
+        '3rd Party Mac Developer Installer:'
+      );
     } else {
       debugLog(
         'Finding `Developer ID Application` certificate for distribution outside the Mac App Store...'
diff --git a/src/types.ts b/src/types.ts
index 7db6041..3c32d2b 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -220,6 +220,8 @@ type OnlyFlatOptions = {
    * Path to a directory containing `preinstall.sh` or `postinstall.sh` scripts.
    * These must be executable and will run on pre/postinstall depending on the file
    * name.
+   *
+   * This option is only valid if {@link FlatOptions.platform} is set to `darwin`.
    */
   scripts?: string;
 };