vxrn 2.0.0-beta.114.1 → 2.0.0-beta.117.1

package/dist/exports/prebuildWithoutExpo.mjs

@@ -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}`);
@@ -1296,15 +1298,30 @@ ${schemes.map((scheme) => `            <data android:scheme="${scheme}" />`).joi
 			if (app.imagePicker?.camera !== void 0) {
 				usage.push(["NSCameraUsageDescription", app.imagePicker.camera]);
 			}
+			if (app.location !== void 0) {
+				usage.push(["NSLocationWhenInUseUsageDescription", app.location.whenInUse]);
+			}
+			if (app.ios?.faceIdUsageDescription !== void 0) {
+				usage.push(["NSFaceIDUsageDescription", app.ios.faceIdUsageDescription]);
+			}
 			if (app.speech !== void 0) {
 				usage.push(["NSSpeechRecognitionUsageDescription", app.speech.recognition], ["NSMicrophoneUsageDescription", app.speech.microphone]);
 			}
-			if (usage.length) {
+			const additions = [];
+			for (const [key, text] of usage) {
+				const existing = new RegExp(`(<key>${key}</key>\\s*<string>)[^<]*(</string>)`);
+				if (existing.test(rendered)) {
+					rendered = rendered.replace(existing, (_match, before, after) => `${before}${escapeXml(text)}${after}`);
+				} else {
+					additions.push([key, text]);
+				}
+			}
+			if (additions.length) {
 				const anchor = "	<key>LSRequiresIPhoneOS</key>";
 				if (!rendered.includes(anchor)) {
-					throw new Error(`[vxrn] cannot stamp ${usage[0][0]}: expected LSRequiresIPhoneOS in Info.plist`);
+					throw new Error(`[vxrn] cannot stamp ${additions[0][0]}: expected LSRequiresIPhoneOS in Info.plist`);
 				}
-				rendered = rendered.replace(anchor, `${usage.map(([key, text]) => `	<key>${key}</key>
+				rendered = rendered.replace(anchor, `${additions.map(([key, text]) => `	<key>${key}</key>
 	<string>${escapeXml(text)}</string>
 `).join("")}${anchor}`);
 			}
@@ -1312,6 +1329,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 +1351,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 +1467,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,
@@ -1522,7 +1538,7 @@ function applyAndroidDependencyPatches(args) {
 		return;
 	}
 	const activityPath = path.join(root, "android", "app", "src", "main", "java", ...app.android.applicationId.split("."), "MainActivity.kt");
-	const rendered = nativeProjectPatches.addReactNativeScreensFix(FSExtra.readFileSync(activityPath, "utf8"));
+	const rendered = nativeProjectPatches.holdLaunchScreenInMainActivity(nativeProjectPatches.addReactNativeScreensFix(FSExtra.readFileSync(activityPath, "utf8")));
 	if (!rendered.includes("RNScreensFragmentFactory")) {
 		throw new Error("[vxrn] failed to apply the react-native-screens activity patch");
 	}