@absolutejs/absolute 0.20.0-beta.150 → 0.20.0-beta.152

package/dist/mobile/index.js

@@ -8224,6 +8224,15 @@ var pathExists4 = async (path) => {
     return false;
   }
 };
+var resolveAbsoluteIosXcodeTarget = async (nativeDirectory) => {
+  const workspacePath = join8(nativeDirectory, "App", "App.xcworkspace");
+  if (await pathExists4(workspacePath))
+    return ["-workspace", workspacePath];
+  const projectPath = join8(nativeDirectory, "App", "App.xcodeproj");
+  if (await pathExists4(projectPath))
+    return ["-project", projectPath];
+  throw new TypeError(`Neither App.xcworkspace nor App.xcodeproj exists under ${join8(nativeDirectory, "App")}. Generate the native project with "absolute mobile sync ios".`);
+};
 var defaultRun2 = async (command, options = {}) => {
   const process2 = Bun.spawn(command, {
     cwd: options.cwd,
@@ -8260,7 +8269,9 @@ var ignoredFingerprintDirectories = new Set([
   "Pods",
   "DerivedData",
   "build",
-  "xcuserdata"
+  "xcuserdata",
+  ".swiftpm",
+  "swiftpm"
 ]);
 var fingerprintFiles = async (root, current = root, options = {}) => {
   const entries = await readdir3(current, { withFileTypes: true });
@@ -8355,13 +8366,27 @@ var resolveAbsoluteIosXcodeProject = async (nativeDirectory, options = {}) => {
   const workspaces = requestedWorkspace ? [requestedWorkspace] : await findAllByExtension(nativeDirectory, ".xcworkspace", {
     excludedDirectories: new Set(["Pods", "DerivedData", "build"])
   });
-  if (workspaces.length !== 1)
-    throw new TypeError(workspaces.length > 1 ? `iOS release found multiple Xcode workspaces: ${workspaces.map((path) => relative6(nativeDirectory, path)).join(", ")}. Pass an explicit workspacePath.` : "iOS release could not find an Xcode workspace.");
+  if (workspaces.length > 1)
+    throw new TypeError(`iOS release found multiple Xcode workspaces: ${workspaces.map((path) => relative6(nativeDirectory, path)).join(", ")}. Pass an explicit workspacePath.`);
   const [workspacePath] = workspaces;
-  if (!workspacePath || !await pathExists4(workspacePath))
-    throw new TypeError("iOS release could not find an Xcode workspace.");
+  let target;
+  if (workspacePath && await pathExists4(workspacePath)) {
+    target = ["-workspace", workspacePath];
+  } else if (requestedWorkspace) {
+    throw new TypeError("iOS release could not find the requested Xcode workspace.");
+  } else {
+    const projects = await findAllByExtension(nativeDirectory, ".xcodeproj", {
+      excludedDirectories: new Set(["Pods", "DerivedData", "build"])
+    });
+    if (projects.length > 1)
+      throw new TypeError(`iOS release found multiple Xcode projects: ${projects.map((path) => relative6(nativeDirectory, path)).join(", ")}.`);
+    const [projectPath] = projects;
+    if (!projectPath || !await pathExists4(projectPath))
+      throw new TypeError("iOS release could not find an Xcode workspace or project.");
+    target = ["-project", projectPath];
+  }
   if (options.scheme)
-    return { scheme: options.scheme, workspacePath };
+    return { scheme: options.scheme, target };
   const schemeFiles = await findAllByExtension(nativeDirectory, ".xcscheme", {
     excludedDirectories: new Set(["Pods", "DerivedData", "build"])
   });
@@ -8370,7 +8395,7 @@ var resolveAbsoluteIosXcodeProject = async (nativeDirectory, options = {}) => {
   ];
   if (schemes.length !== 1 || !schemes[0])
     throw new TypeError(schemes.length > 1 ? `iOS release found multiple shared Xcode schemes: ${schemes.join(", ")}. Pass an explicit scheme.` : "iOS release could not find a shared Xcode scheme.");
-  return { scheme: schemes[0], workspacePath };
+  return { scheme: schemes[0], target };
 };
 var exportOptions = (method) => `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -8544,8 +8569,7 @@ var buildAbsoluteIosRelease = async (options) => {
     ];
     const archiveExit = await run([
       "xcodebuild",
-      "-workspace",
-      xcode.workspacePath,
+      ...xcode.target,
       "-scheme",
       xcode.scheme,
       "-configuration",
@@ -8554,6 +8578,7 @@ var buildAbsoluteIosRelease = async (options) => {
       "generic/platform=iOS",
       "-archivePath",
       archivePath,
+      "-allowProvisioningUpdates",
       ...versionArguments,
       "archive"
     ], { cwd: nativeDirectory, env: options.env });
@@ -8578,7 +8603,8 @@ var buildAbsoluteIosRelease = async (options) => {
       "-exportPath",
       exportPath,
       "-exportOptionsPlist",
-      exportPlist
+      exportPlist,
+      "-allowProvisioningUpdates"
     ], { cwd: nativeDirectory, env: options.env });
     if (exportExit !== 0)
       throw new TypeError("Xcode failed to export the App Store IPA.");
@@ -8887,8 +8913,7 @@ var runAbsoluteIosSimulatorReleaseAcceptance = async (options) => {
   await mkdir8(options.artifactDirectory, { recursive: true });
   await requireSuccess3(run, [
     xcodebuild,
-    "-workspace",
-    xcode.workspacePath,
+    ...xcode.target,
     "-scheme",
     xcode.scheme,
     "-configuration",
@@ -9690,8 +9715,7 @@ var buildIosDebugApp = async (project, udid, fingerprint, run, signal) => {
   await mkdir9(derivedDataPath, { recursive: true });
   await requireSuccess4([
     project.xcodebuild,
-    "-workspace",
-    join10(project.nativeDirectory, "App", "App.xcworkspace"),
+    ...await resolveAbsoluteIosXcodeTarget(project.nativeDirectory),
     "-scheme",
     "App",
     "-configuration",
@@ -9712,8 +9736,7 @@ var buildPhysicalIosDebugApp = async (project, identifier, run, signal) => {
   await mkdir9(derivedDataPath, { recursive: true });
   await requireSuccess4([
     project.xcodebuild,
-    "-workspace",
-    join10(project.nativeDirectory, "App", "App.xcworkspace"),
+    ...await resolveAbsoluteIosXcodeTarget(project.nativeDirectory),
     "-scheme",
     "App",
     "-configuration",
@@ -11772,8 +11795,9 @@ var buildAbsoluteMobileCompatibilityRelease = async (options) => {
   if (priorAppIds.size > 1 || priorAppIds.size === 1 && !priorAppIds.has(options.appId)) {
     throw new TypeError("Previous mobile compatibility artifacts belong to another app.");
   }
+  const newestGeneration = Math.max(0, ...(options.previousArtifacts ?? []).map((artifact) => artifact.generation));
   const unchanged = options.previousArtifacts?.find((artifact) => artifact.appBuild === appBuild && artifact.runtime === options.runtime);
-  const generation = unchanged?.generation ?? Math.max(0, ...(options.previousArtifacts ?? []).map((artifact) => artifact.generation)) + 1;
+  const generation = unchanged && unchanged.generation === newestGeneration ? unchanged.generation : newestGeneration + 1;
   const artifact = createAbsoluteMobileCompatibilityArtifact({
     appBuild,
     appId: options.appId,
@@ -12044,54 +12068,23 @@ var CAPACITOR_CLIENT_FRAMEWORKS = new Set([
 ]);
 var CLIENT_ASSET_DIRECTORIES = ["assets", "html", "htmx", "indexes"];
 var errorHasCode2 = (error, code) => typeof error === "object" && error !== null && Reflect.get(error, "code") === code;
-var shellBootstrapModule = () => {
-  const candidate = ["js", "ts"].map((extension) => join13(import.meta.dir, `shellBootstrap.${extension}`)).find(existsSync2);
-  if (candidate)
-    return candidate;
-  throw new TypeError("AbsoluteJS mobile shell bootstrap module is missing.");
-};
-var shellAuthModule = () => {
-  const candidate = ["js", "ts"].map((extension) => join13(import.meta.dir, `shellAuth.${extension}`)).find(existsSync2);
+var resolveShellModule = (name, missingMessage) => {
+  const candidate = ["js", "ts"].flatMap((extension) => [
+    join13(import.meta.dir, `${name}.${extension}`),
+    join13(import.meta.dir, "..", "mobile", `${name}.${extension}`)
+  ]).find(existsSync2);
   if (candidate)
     return candidate;
-  throw new TypeError("AbsoluteJS mobile auth shell module is missing.");
-};
-var shellExpoAuthModule = () => {
-  const candidate = ["js", "ts"].map((extension) => join13(import.meta.dir, `shellExpoAuth.${extension}`)).find(existsSync2);
-  if (candidate)
-    return candidate;
-  throw new TypeError("AbsoluteJS Expo auth bridge module is missing.");
-};
-var shellSyncModule = () => {
-  const candidate = ["js", "ts"].map((extension) => join13(import.meta.dir, `shellSync.${extension}`)).find(existsSync2);
-  if (candidate)
-    return candidate;
-  throw new TypeError("AbsoluteJS mobile Sync shell module is missing.");
-};
-var shellExpoSyncModule = () => {
-  const candidate = ["js", "ts"].map((extension) => join13(import.meta.dir, `shellExpoSync.${extension}`)).find(existsSync2);
-  if (candidate)
-    return candidate;
-  throw new TypeError("AbsoluteJS Expo Sync bridge module is missing.");
-};
-var shellPushModule = () => {
-  const candidate = ["js", "ts"].map((extension) => join13(import.meta.dir, `shellPush.${extension}`)).find(existsSync2);
-  if (candidate)
-    return candidate;
-  throw new TypeError("AbsoluteJS mobile push shell module is missing.");
-};
-var shellExpoDevicesModule = () => {
-  const candidate = ["js", "ts"].map((extension) => join13(import.meta.dir, `shellExpoDevices.${extension}`)).find(existsSync2);
-  if (candidate)
-    return candidate;
-  throw new TypeError("AbsoluteJS Expo device bridge module is missing.");
-};
-var shellUpdateModule = () => {
-  const candidate = ["js", "ts"].map((extension) => join13(import.meta.dir, `shellUpdate.${extension}`)).find(existsSync2);
-  if (candidate)
-    return candidate;
-  throw new TypeError("AbsoluteJS mobile update shell module is missing.");
-};
+  throw new TypeError(missingMessage);
+};
+var shellBootstrapModule = () => resolveShellModule("shellBootstrap", "AbsoluteJS mobile shell bootstrap module is missing.");
+var shellAuthModule = () => resolveShellModule("shellAuth", "AbsoluteJS mobile auth shell module is missing.");
+var shellExpoAuthModule = () => resolveShellModule("shellExpoAuth", "AbsoluteJS Expo auth bridge module is missing.");
+var shellSyncModule = () => resolveShellModule("shellSync", "AbsoluteJS mobile Sync shell module is missing.");
+var shellExpoSyncModule = () => resolveShellModule("shellExpoSync", "AbsoluteJS Expo Sync bridge module is missing.");
+var shellPushModule = () => resolveShellModule("shellPush", "AbsoluteJS mobile push shell module is missing.");
+var shellExpoDevicesModule = () => resolveShellModule("shellExpoDevices", "AbsoluteJS Expo device bridge module is missing.");
+var shellUpdateModule = () => resolveShellModule("shellUpdate", "AbsoluteJS mobile update shell module is missing.");
 var shellReleaseReadinessModule = () => {
   const candidate = ["js", "ts"].map((extension) => join13(import.meta.dir, `shellReleaseReadiness.${extension}`)).find(existsSync2);
   if (candidate)
@@ -15572,7 +15565,12 @@ var finalizeAbsoluteMobileCompatibilityBuild = async (options) => {
   const candidates = compatibilityStore ? await carryForwardAbsoluteMobileCompatibilityReleases({
     current,
     store: compatibilityStore
-  }) : [current, ...previous];
+  }) : [
+    ...new Map([...previous, current].map((release) => [
+      release.artifact.appBuild,
+      release
+    ])).values()
+  ];
   const releasesById = new Map(candidates.map((release) => [release.artifact.releaseId, release]));
   const retained = retainAbsoluteMobileCompatibilityArtifacts([...releasesById.values()].map(({ artifact }) => artifact));
   await materializeAbsoluteMobileCompatibilityBundle({
@@ -18477,7 +18475,7 @@ ${domains}
 `;
 };
 var configureIosEntitlements = async (config) => {
-  const path = join30(config.nativeProjectDirectory, "ios/App/AbsoluteJS.entitlements");
+  const path = join30(config.nativeProjectDirectory, "ios/App/App/AbsoluteJS.entitlements");
   let current = "";
   try {
     current = await readFile26(path, "utf8");
@@ -18771,7 +18769,7 @@ ${content}
   return infoChanged || privacyChanged || projectChanged || pushChanged;
 };
 var configureIosPushNotifications = async (config, enabled) => {
-  const entitlementsPath = join31(config.nativeProjectDirectory, "ios/App/AbsoluteJS.entitlements");
+  const entitlementsPath = join31(config.nativeProjectDirectory, "ios/App/App/AbsoluteJS.entitlements");
   const entitlements = await optionalSource(entitlementsPath);
   if (entitlements === null && !enabled)
     return false;
@@ -27571,6 +27569,7 @@ export {
   requireAbsoluteIosReleaseMetadata,
   resolveAbsoluteDeviceCapabilityPlan,
   resolveAbsoluteIosXcodeProject,
+  resolveAbsoluteIosXcodeTarget,
   resolveAbsoluteMobileAuthManifest,
   resolveAbsoluteMobileCertificationRequirement,
   resolveAbsoluteMobileCompatibilityRelease,
@@ -27618,5 +27617,5 @@ export {
   writeAbsoluteMobileUpdateRegistry
 };
 
-//# debugId=0FAFED9BB618099064756E2164756E21
+//# debugId=1D3C1CDCB4517A5C64756E2164756E21
 //# sourceMappingURL=index.js.map