vxrn 2.0.0-beta.130.1 → 2.0.0-beta.131.1

package/dist/exports/prebuildWithoutExpo.mjs

@@ -247,7 +247,7 @@ function patchIosPbxprojSceneDelegate(rendered, appName) {
 	}
 	return patched;
 }
-function patchIosPbxprojPushEntitlements(rendered, appName) {
+function patchIosPbxprojAppEntitlements(rendered, appName) {
 	const edits = [["/* AppDelegate.swift */ = {isa = PBXFileReference;", `		${PUSH_ENTITLEMENTS_FILE_REF_ID} /* ${appName}.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = ${appName}.entitlements; path = ${appName}/${appName}.entitlements; sourceTree = "<group>"; };`], ["/* AppDelegate.swift */,", `				${PUSH_ENTITLEMENTS_FILE_REF_ID} /* ${appName}.entitlements */,`]];
 	let patched = rendered;
 	for (const [anchor, insertion] of edits) {
@@ -264,13 +264,55 @@ function patchIosPbxprojPushEntitlements(rendered, appName) {
 	return patched.split(setting).join(`${setting}
 				CODE_SIGN_ENTITLEMENTS = ${appName}/${appName}.entitlements;`);
 }
-function renderPushEntitlements() {
+function renderPlistValue(value, indent) {
+	if (typeof value === "string") return `${indent}<string>${escapeXml(value)}</string>`;
+	if (typeof value === "boolean") return `${indent}<${value}/>`;
+	if (typeof value === "number") {
+		return Number.isInteger(value) ? `${indent}<integer>${value}</integer>` : `${indent}<real>${value}</real>`;
+	}
+	if (Array.isArray(value)) {
+		return `${indent}<array>
+${value.map((item) => renderPlistValue(item, `${indent}	`)).join("\n")}
+${indent}</array>`;
+	}
+	return `${indent}<dict>
+${renderPlistEntries(value, `${indent}	`)}
+${indent}</dict>`;
+}
+function renderPlistEntries(entries, indent) {
+	return Object.entries(entries).map(([key, value]) => `${indent}<key>${escapeXml(key)}</key>
+${renderPlistValue(value, indent)}`).join("\n");
+}
+function appEntitlements(app) {
+	const modeled = {};
+	if (app.notifications?.push === true || app.ios?.widgets?.pushNotifications) {
+		modeled["aps-environment"] = notificationsHost.apsEnvironment;
+	}
+	if (app.ios?.widgets) {
+		modeled["com.apple.security.application-groups"] = [app.ios.widgets.appGroup];
+	}
+	if (app.ios?.associatedDomains?.length) {
+		modeled["com.apple.developer.associated-domains"] = app.ios.associatedDomains;
+	}
+	if (app.ios?.usesAppleSignIn) {
+		modeled["com.apple.developer.applesignin"] = ["Default"];
+	}
+	for (const key of Object.keys(app.ios?.entitlements ?? {})) {
+		if (key in modeled) {
+			throw new Error(`[vxrn] native.app.ios.entitlements sets ${key}, which native.app already writes: use its field`);
+		}
+	}
+	return {
+		...modeled,
+		...app.ios?.entitlements
+	};
+}
+function renderEntitlements(entries) {
 	return `<?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">
 <plist version="1.0">
 <dict>
-	<key>aps-environment</key>
-	<string>${notificationsHost.apsEnvironment}</string>
+${renderPlistEntries(entries, "	")}
 </dict>
 </plist>
 `;
@@ -409,8 +451,9 @@ function generateSceneDelegate(args) {
 	const { dest, platform, app } = args;
 	if (platform !== "ios") return;
 	FSExtra.writeFileSync(path.join(dest, app.name, "SceneDelegate.swift"), renderSceneDelegateSwift(app.name));
-	if (app.notifications?.push === true && !app.ios?.widgets) {
-		FSExtra.writeFileSync(path.join(dest, app.name, `${app.name}.entitlements`), renderPushEntitlements());
+	const entitlements = appEntitlements(app);
+	if (Object.keys(entitlements).length && !app.ios?.widgets) {
+		FSExtra.writeFileSync(path.join(dest, app.name, `${app.name}.entitlements`), renderEntitlements(entitlements));
 	}
 }
 function generateIosWidgets(dest, app) {
@@ -423,7 +466,7 @@ function generateIosWidgets(dest, app) {
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0"><dict><key>com.apple.security.application-groups</key><array><string>${escapeXml(widgets.appGroup)}</string></array></dict></plist>
 `;
-	FSExtra.writeFileSync(path.join(appDir, "OneAppWidgets.entitlements"), widgets.pushNotifications || app.notifications?.push ? entitlements.replace("</dict></plist>", `<key>aps-environment</key><string>${notificationsHost.apsEnvironment}</string></dict></plist>`) : entitlements);
+	FSExtra.writeFileSync(path.join(appDir, "OneAppWidgets.entitlements"), renderEntitlements(appEntitlements(app)));
 	FSExtra.writeFileSync(path.join(extensionDir, "OneWidgets.entitlements"), entitlements);
 	FSExtra.writeFileSync(path.join(extensionDir, "WidgetInfo.plist"), `<?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">
@@ -1223,6 +1266,12 @@ ${schemes.map((scheme) => `				<string>${scheme}</string>`).join("\n")}
 ${phoneOrientations.map((orientation) => `		<string>${orientation}</string>`).join("\n")}
 	</array>`);
 			}
+			for (const [key, value] of Object.entries(app.ios?.infoPlist ?? {})) {
+				if (rendered.includes(`<key>${key}</key>`) || stamps.some((stamp) => stamp.includes(`<key>${key}</key>`))) {
+					throw new Error(`[vxrn] native.app.ios.infoPlist sets ${key}, which the template or native.app already writes: use its field`);
+				}
+				stamps.push(renderPlistEntries({ [key]: value }, "	"));
+			}
 			if (stamps.length) {
 				const anchor = "	<key>LSRequiresIPhoneOS</key>";
 				if (!rendered.includes(anchor)) throw new Error(`[vxrn] prebuild template ${relativePath} lost its LSRequiresIPhoneOS anchor`);
@@ -1334,6 +1383,29 @@ ${line}
 			}
 			rendered = rendered.replace(dayNight, app.userInterfaceStyle === "light" ? "parent=\"Theme.AppCompat.Light.NoActionBar\"" : "parent=\"Theme.AppCompat.NoActionBar\"");
 		}
+		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && (app.android?.permissions?.length || app.android?.blockedPermissions?.length)) {
+			const anchor = "<uses-permission android:name=\"android.permission.INTERNET\" />";
+			if (!rendered.includes(anchor)) {
+				throw new Error("[vxrn] cannot stamp permissions: expected the INTERNET permission in app/src/main/AndroidManifest.xml");
+			}
+			const permissionName = (name) => name.includes(".") ? name : `android.permission.${name}`;
+			const lines = [...(app.android?.permissions ?? []).map((name) => `    <uses-permission android:name="${permissionName(name)}" />`), ...(app.android?.blockedPermissions ?? []).map((name) => `    <uses-permission android:name="${permissionName(name)}" tools:node="remove" />`)];
+			rendered = rendered.replace(anchor, `${anchor}
+${lines.join("\n")}`);
+			if (app.android?.blockedPermissions?.length && !rendered.includes("xmlns:tools=")) {
+				rendered = rendered.replace("xmlns:android=\"http://schemas.android.com/apk/res/android\"", "xmlns:android=\"http://schemas.android.com/apk/res/android\"\n    xmlns:tools=\"http://schemas.android.com/tools\"");
+			}
+		}
+		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && app.android?.appLinks?.length) {
+			rendered = rendered.replace("      </activity>", `        <intent-filter android:autoVerify="true">
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https" />
+${app.android.appLinks.map((link) => `            <data android:host="${link.host}"${link.pathPrefix ? ` android:pathPrefix="${link.pathPrefix}"` : ""} />`).join("\n")}
+        </intent-filter>
+      </activity>`);
+		}
 		if (platform === "android" && relativePath === "app/src/main/AndroidManifest.xml" && app.orientation !== void 0) {
 			const anchor = "android:name=\".MainActivity\"";
 			if (!rendered.includes(anchor)) {
@@ -1447,8 +1519,8 @@ end`);
 			rendered = patchIosBundlePhase(rendered, app.updates?.runtimeVersion);
 			rendered = patchIosPbxprojSceneDelegate(rendered, appName);
 			rendered = patchIosPbxprojOneBridgingHeader(rendered, appName);
-			if (app.notifications?.push === true && !app.ios?.widgets) {
-				rendered = patchIosPbxprojPushEntitlements(rendered, appName);
+			if (Object.keys(appEntitlements(app)).length && !app.ios?.widgets) {
+				rendered = patchIosPbxprojAppEntitlements(rendered, appName);
 			}
 			if (app.ios?.widgets) rendered = patchIosPbxprojWidgets(rendered, app);
 		}
@@ -1493,8 +1565,14 @@ use_frameworks! :linkage => :${app.ios.useFrameworks}`);
 			}
 			rendered = rendered.replace(hardcodedGradlePlugin, `includeBuild(new File(["node", "--print", "require('module').createRequire(require.resolve('react-native/package.json')).resolve('@react-native/gradle-plugin/package.json')"].execute(null, settingsDir).text.trim()).parentFile.canonicalPath)`);
 		}
-		if (platform === "android" && app.android?.minSdk !== void 0) {
-			rendered = rendered.replace(/minSdkVersion = \d+/g, `minSdkVersion = ${app.android.minSdk}`);
+		for (const [field, setting] of [
+			["minSdk", "minSdkVersion"],
+			["targetSdk", "targetSdkVersion"],
+			["compileSdk", "compileSdkVersion"]
+		]) {
+			const value = platform === "android" ? app.android?.[field] : void 0;
+			if (value === void 0) continue;
+			rendered = rendered.replace(new RegExp(`${setting} = \\d+`, "g"), `${setting} = ${value}`);
 		}
 	}
 	return {