vxrn 2.0.0-beta.113.1 → 2.0.0-beta.115.1

package/dist/exports/prebuildWithoutExpo.mjs

@@ -5,7 +5,7 @@ import { pathToFileURL } from "node:url";
 import { validateNativeApp } from "@vxrn/utils/nativeAppManifest";
 import FSExtra from "fs-extra";
 import sharp from "sharp";
-import { swiftPackageId } from "../utils/swiftPackageId.mjs";
+import { swiftPackageDirectories } from "../utils/swiftPackageId.mjs";
 
 const nativeProjectPatches = module.createRequire(import.meta.url)("../../native-project-patches.cjs");
 const notificationsHost = nativeProjectPatches.ONE_NOTIFICATIONS;
@@ -205,23 +205,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   }
 }`);
 }
-const UPDATES_BRIDGING_HEADER_NAME = "OneUpdates-Bridging-Header.h";
-function renderUpdatesBridgingHeader() {
-	return `// generated by one prebuild: exposes the updates launcher entry
-// point to AppDelegate without importing the One module.
-${updatesHost.bridgingHeaderImport}
+const ONE_BRIDGING_HEADER_NAME = "One-Bridging-Header.h";
+function renderOneBridgingHeader(app) {
+	const imports = [nativeProjectPatches.ONE_LAUNCH_SCREEN.bridgingHeaderImport];
+	if (app.updates !== void 0) imports.push(updatesHost.bridgingHeaderImport);
+	return `// generated by one prebuild: exposes One's c entry points (the launch
+// screen hold, the updates launcher) to AppDelegate without importing the
+// One module.
+${imports.join("\n")}
 `;
 }
-function generateUpdatesBridgingHeader(dest, app) {
-	if (app.updates === void 0) return;
-	FSExtra.writeFileSync(path.join(dest, app.name, UPDATES_BRIDGING_HEADER_NAME), renderUpdatesBridgingHeader());
+function generateOneBridgingHeader(dest, app) {
+	FSExtra.writeFileSync(path.join(dest, app.name, ONE_BRIDGING_HEADER_NAME), renderOneBridgingHeader(app));
 }
-function patchIosPbxprojUpdatesBridgingHeader(project, appName) {
+function patchIosPbxprojOneBridgingHeader(project, appName) {
 	const anchor = `INFOPLIST_FILE = ${appName}/Info.plist;`;
-	const setting = `SWIFT_OBJC_BRIDGING_HEADER = "${appName}/${UPDATES_BRIDGING_HEADER_NAME}";`;
+	const setting = `SWIFT_OBJC_BRIDGING_HEADER = "${appName}/${ONE_BRIDGING_HEADER_NAME}";`;
 	const occurrences = project.split(anchor).length - 1;
 	if (occurrences !== 2) {
-		throw new Error("[vxrn] prebuild template project.pbxproj changed shape: cannot point the app target at the One.Updates bridging header");
+		throw new Error("[vxrn] prebuild template project.pbxproj changed shape: cannot point the app target at the One bridging header");
 	}
 	return project.split(anchor).join(`${anchor}
 				${setting}`);
@@ -1312,6 +1314,7 @@ ${schemes.map((scheme) => `            <data android:scheme="${scheme}" />`).joi
 		}
 		if (platform === "ios" && relativePath.endsWith("/AppDelegate.swift")) {
 			rendered = patchIosAppDelegateSceneLifecycle(rendered, appName);
+			rendered = nativeProjectPatches.holdLaunchScreenOverRootView(rendered);
 			if (app.updates !== void 0) {
 				rendered = nativeProjectPatches.pointReleaseBundleURLAtOneUpdates(rendered);
 			}
@@ -1333,9 +1336,7 @@ end`);
 		if (platform === "ios" && relativePath.endsWith(".xcodeproj/project.pbxproj")) {
 			rendered = patchIosBundlePhase(rendered, app.updates?.runtimeVersion);
 			rendered = patchIosPbxprojSceneDelegate(rendered, appName);
-			if (app.updates !== void 0) {
-				rendered = patchIosPbxprojUpdatesBridgingHeader(rendered, appName);
-			}
+			rendered = patchIosPbxprojOneBridgingHeader(rendered, appName);
 			if (app.notifications?.push === true && !app.ios?.widgets) {
 				rendered = patchIosPbxprojPushEntitlements(rendered, appName);
 			}
@@ -1451,7 +1452,7 @@ const generateForPlatform = async (root, platform, app, outDir = path.resolve(ro
 		platform,
 		app
 	});
-	if (platform === "ios") generateUpdatesBridgingHeader(dest, app);
+	if (platform === "ios") generateOneBridgingHeader(dest, app);
 	if (platform === "ios") generateIosWidgets(dest, app);
 	if (platform === "ios") generateSwiftPackages({
 		root,
@@ -1467,21 +1468,7 @@ function generateSwiftPackages({ root, dest }) {
 		"types",
 		"build"
 	]);
-	const packageDirs = [];
-	const walk = (dir) => {
-		const entries = FSExtra.readdirSync(dir, { withFileTypes: true });
-		if (entries.some((entry) => entry.isFile() && entry.name === "Package.swift")) {
-			packageDirs.push(dir);
-			return;
-		}
-		for (const entry of entries) {
-			if (!entry.isDirectory() || entry.name.startsWith(".") || skip.has(entry.name)) continue;
-			walk(path.join(dir, entry.name));
-		}
-	};
-	walk(root);
-	for (const packageDir of packageDirs) {
-		const id = swiftPackageId(packageDir);
+	for (const [id, packageDir] of swiftPackageDirectories(root)) {
 		const podDir = path.join(dest, "OneSwiftPackages", id);
 		const sources = [];
 		const collect = (dir) => {