@rightkit/release 0.6.4 → 0.6.6

package/apple-profile-create.mjs

@@ -2,8 +2,9 @@ import { createHash, generateKeyPairSync, randomUUID, sign, X509Certificate } fr
 import { chmodSync, copyFileSync, constants, existsSync, mkdirSync, mkdtempSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { fileURLToPath } from "node:url";
 import { spawnSync } from "./background-process.mjs";
+import { defaultReleaseConfigFile, importReleaseConfig } from "./release-config.mjs";
 import { appleProfileAuth, decodeAppleProfile, findAppleSigningCertificate, signAppleApiJwt } from "./apple-profile-renew.mjs";
 
 // right-release apple-profile-create: issue a Mac Development provisioning profile
@@ -452,10 +453,10 @@ export async function main(args = process.argv.slice(2), options = {}) {
     return;
   }
   const parsed = parseCreateArgs(args);
-  const configPath = parsed.configPath ?? "right-release.config.mjs";
+  const configPath = parsed.configPath ?? defaultReleaseConfigFile();
   const absolute = path.resolve(configPath);
   let config = {};
-  if (existsSync(absolute)) { const loaded = await import(pathToFileURL(absolute)); config = loaded.default ?? loaded.config ?? loaded; }
+  if (existsSync(absolute)) config = await importReleaseConfig(absolute, { lenient: true });
   else if (parsed.configPath) fail("APPLE_PROFILE_USAGE", `Config file not found: ${parsed.configPath}`);
   return createAppleProfile({ ...options, root: path.dirname(absolute), config, ...parsed });
 }

package/apple-profile-renew.mjs

@@ -1,8 +1,9 @@
 import { createHash, createPrivateKey, randomUUID, sign, X509Certificate } from "node:crypto";
 import { constants, copyFileSync, existsSync, readFileSync, renameSync, rmSync, statSync, writeFileSync, realpathSync } from "node:fs";
 import path from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { fileURLToPath } from "node:url";
 import { spawnSync } from "./background-process.mjs";
+import { defaultReleaseConfigFile, importReleaseConfig } from "./release-config.mjs";
 import { isManagedHost, refuseManagedEnvSecret } from "./managed-host-secrets.mjs";
 import os from "node:os";
 
@@ -226,7 +227,7 @@ export async function main(args = process.argv.slice(2), options = {}) {
     return;
   }
   if (args[0] !== "profile" || args[1] !== "renew") fail("APPLE_PROFILE_USAGE", "Expected: right-release apple profile renew");
-  let configPath = "right-release.config.mjs", profilePath, dryRun = false;
+  let configPath = defaultReleaseConfigFile(), profilePath, dryRun = false;
   for (let i = 2; i < args.length; i++) {
     if (args[i] === "--dry-run") dryRun = true;
     else if (["--config", "--profile"].includes(args[i])) {
@@ -236,8 +237,8 @@ export async function main(args = process.argv.slice(2), options = {}) {
     } else fail("APPLE_PROFILE_USAGE", `Unknown option: ${args[i]}`);
   }
   const absolute = path.resolve(configPath);
-  const loaded = await import(pathToFileURL(absolute));
-  return renewAppleProfile({ ...options, root: path.dirname(absolute), config: loaded.default ?? loaded.config ?? loaded, profilePath, dryRun });
+  const config = await importReleaseConfig(absolute, { lenient: true });
+  return renewAppleProfile({ ...options, root: path.dirname(absolute), config, profilePath, dryRun });
 }
 
 const realOrSelf = (file) => { try { return realpathSync(file); } catch { return path.resolve(file); } };