vxrn 2.0.0-beta.148.1 → 2.0.0-beta.158.1

package/dist/constants/defaults.mjs

@@ -7,6 +7,7 @@ const DEFAULT_ASSET_EXTS = [
 	"psd",
 	"svg",
 	"webp",
+	"lottie",
 	"m4v",
 	"mov",
 	"mp4",
@@ -26,6 +27,8 @@ const DEFAULT_ASSET_EXTS = [
 	"yml",
 	"otf",
 	"ttf",
+	"woff",
+	"woff2",
 	"zip"
 ];
 

package/dist/constants/defaults.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.js","names":[],"sources":["constants/defaults.js"],"sourcesContent":["const DEFAULT_ASSET_EXTS = [\n  // Image formats\n  \"bmp\",\n  \"gif\",\n  \"jpg\",\n  \"jpeg\",\n  \"png\",\n  \"psd\",\n  \"svg\",\n  \"webp\",\n  // Video formats\n  \"m4v\",\n  \"mov\",\n  \"mp4\",\n  \"mpeg\",\n  \"mpg\",\n  \"webm\",\n  // Audio formats\n  \"aac\",\n  \"aiff\",\n  \"caf\",\n  \"m4a\",\n  \"mp3\",\n  \"wav\",\n  // Document formats\n  \"html\",\n  \"pdf\",\n  \"txt\",\n  \"yaml\",\n  \"yml\",\n  // Font formats\n  \"otf\",\n  \"ttf\",\n  // Archives (virtual files)\n  \"zip\"\n];\nexport {\n  DEFAULT_ASSET_EXTS\n};\n//# sourceMappingURL=defaults.js.map\n"],"mappings":";AAAA,MAAM,qBAAqB;CAEzB;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CACA;CAEA;CACA;CAEA;AACF"}
+{"version":3,"file":"defaults.js","names":[],"sources":["constants/defaults.js"],"sourcesContent":["const DEFAULT_ASSET_EXTS = [\n  // Image formats\n  \"bmp\",\n  \"gif\",\n  \"jpg\",\n  \"jpeg\",\n  \"png\",\n  \"psd\",\n  \"svg\",\n  \"webp\",\n  // dotLottie animation archives\n  \"lottie\",\n  // Video formats\n  \"m4v\",\n  \"mov\",\n  \"mp4\",\n  \"mpeg\",\n  \"mpg\",\n  \"webm\",\n  // Audio formats\n  \"aac\",\n  \"aiff\",\n  \"caf\",\n  \"m4a\",\n  \"mp3\",\n  \"wav\",\n  // Document formats\n  \"html\",\n  \"pdf\",\n  \"txt\",\n  \"yaml\",\n  \"yml\",\n  // Font formats\n  \"otf\",\n  \"ttf\",\n  \"woff\",\n  \"woff2\",\n  // Archives (virtual files)\n  \"zip\"\n];\nexport {\n  DEFAULT_ASSET_EXTS\n};\n//# sourceMappingURL=defaults.js.map\n"],"mappings":";AAAA,MAAM,qBAAqB;CAEzB;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CAEA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CAEA;AACF"}

package/dist/constants/defaults.native.js

@@ -7,6 +7,7 @@ var DEFAULT_ASSET_EXTS = [
 	"psd",
 	"svg",
 	"webp",
+	"lottie",
 	"m4v",
 	"mov",
 	"mp4",
@@ -26,6 +27,8 @@ var DEFAULT_ASSET_EXTS = [
 	"yml",
 	"otf",
 	"ttf",
+	"woff",
+	"woff2",
 	"zip"
 ];
 

package/dist/constants/defaults.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.native.js","names":[],"sources":["constants/defaults.native.js"],"sourcesContent":["var DEFAULT_ASSET_EXTS = [\n  // Image formats\n  \"bmp\",\n  \"gif\",\n  \"jpg\",\n  \"jpeg\",\n  \"png\",\n  \"psd\",\n  \"svg\",\n  \"webp\",\n  // Video formats\n  \"m4v\",\n  \"mov\",\n  \"mp4\",\n  \"mpeg\",\n  \"mpg\",\n  \"webm\",\n  // Audio formats\n  \"aac\",\n  \"aiff\",\n  \"caf\",\n  \"m4a\",\n  \"mp3\",\n  \"wav\",\n  // Document formats\n  \"html\",\n  \"pdf\",\n  \"txt\",\n  \"yaml\",\n  \"yml\",\n  // Font formats\n  \"otf\",\n  \"ttf\",\n  // Archives (virtual files)\n  \"zip\"\n];\nexport {\n  DEFAULT_ASSET_EXTS\n};\n//# sourceMappingURL=defaults.js.map\n"],"mappings":";AAAA,IAAI,qBAAqB;CAEvB;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CACA;CAEA;CACA;CAEA;AACF"}
+{"version":3,"file":"defaults.native.js","names":[],"sources":["constants/defaults.native.js"],"sourcesContent":["var DEFAULT_ASSET_EXTS = [\n  // Image formats\n  \"bmp\",\n  \"gif\",\n  \"jpg\",\n  \"jpeg\",\n  \"png\",\n  \"psd\",\n  \"svg\",\n  \"webp\",\n  // dotLottie animation archives\n  \"lottie\",\n  // Video formats\n  \"m4v\",\n  \"mov\",\n  \"mp4\",\n  \"mpeg\",\n  \"mpg\",\n  \"webm\",\n  // Audio formats\n  \"aac\",\n  \"aiff\",\n  \"caf\",\n  \"m4a\",\n  \"mp3\",\n  \"wav\",\n  // Document formats\n  \"html\",\n  \"pdf\",\n  \"txt\",\n  \"yaml\",\n  \"yml\",\n  // Font formats\n  \"otf\",\n  \"ttf\",\n  \"woff\",\n  \"woff2\",\n  // Archives (virtual files)\n  \"zip\"\n];\nexport {\n  DEFAULT_ASSET_EXTS\n};\n//# sourceMappingURL=defaults.js.map\n"],"mappings":";AAAA,IAAI,qBAAqB;CAEvB;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CAEA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CACA;CAEA;CACA;CACA;CACA;CAEA;AACF"}

package/dist/exports/prebuildWithoutExpo.mjs

@@ -158,7 +158,7 @@ function patchIosInfoPlistSceneManifest(rendered) {
 	</dict>
 ${anchor}`);
 }
-function patchIosAppDelegateSceneLifecycle(rendered, appName, backgroundTasks) {
+function patchIosAppDelegateSceneLifecycle(rendered, appName, backgroundTasks, appIntents) {
 	const anchor = `@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
   var window: UIWindow?
@@ -206,6 +206,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     reactNativeDelegate = delegate
     reactNativeFactory = factory
 ${backgroundTasks ? `    OneBackgroundTasksRegisterHost(factory, launchOptions)
+` : ""}${appIntents ? `    OneAppIntentsRegisterHost(factory, launchOptions)
 ` : ""}    return true
   }
 }`);
@@ -215,6 +216,7 @@ function renderOneBridgingHeader(app) {
 	const imports = [nativeProjectPatches.ONE_LAUNCH_SCREEN.bridgingHeaderImport];
 	if (app.updates !== void 0) imports.push(updatesHost.bridgingHeaderImport);
 	if (app.ios?.backgroundTasks !== void 0) imports.push("#import \"OneBackgroundTasksBridge.h\"");
+	if (app.ios?.appIntents !== void 0) imports.push("#import \"OneAppIntentsBridge.h\"");
 	return `// generated by one prebuild: exposes One's c entry points to AppDelegate
 // without importing the One module.
 ${imports.join("\n")}
@@ -250,6 +252,79 @@ function patchIosPbxprojSceneDelegate(rendered, appName) {
 	}
 	return patched;
 }
+function patchIosPbxprojAppIntents(rendered, appName) {
+	const name = "OneAppIntents.swift";
+	const fileRef = pbxprojId("one-app-intents-file");
+	const buildFile = pbxprojId("one-app-intents-build");
+	const edits = [
+		["/* AppDelegate.swift in Sources */ = {isa = PBXBuildFile;", `		${buildFile} /* ${name} in Sources */ = {isa = PBXBuildFile; fileRef = ${fileRef} /* ${name} */; };`],
+		["/* AppDelegate.swift */ = {isa = PBXFileReference;", `		${fileRef} /* ${name} */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ${name}; path = ${appName}/${name}; sourceTree = "<group>"; };`],
+		["/* AppDelegate.swift */,", `				${fileRef} /* ${name} */,`],
+		["/* AppDelegate.swift in Sources */,", `				${buildFile} /* ${name} in Sources */,`]
+	];
+	let patched = rendered;
+	for (const [anchor, insertion] of edits) {
+		const next = insertAfterLine(patched, anchor, insertion);
+		if (next === patched) {
+			throw new Error(`[vxrn] prebuild template project.pbxproj lost its AppDelegate.swift anchor (${anchor})`);
+		}
+		patched = next;
+	}
+	return patched;
+}
+function swiftLiteral(value) {
+	return JSON.stringify(value).replace(/\\u([0-9a-fA-F]{4})/g, (_match, hex) => `\\u{${hex}}`);
+}
+function swiftShortcutPhrase(value) {
+	return `"${value.split("{app}").map((part) => swiftLiteral(part).slice(1, -1)).join("\\(.applicationName)")}"`;
+}
+function renderIosAppIntentsSwift(actions) {
+	const types = actions.map((action, index) => {
+		const summaryTitle = swiftLiteral(action.title).slice(1, -1);
+		const text = action.textParameterTitle === void 0 ? "" : `
+  @Parameter(title: ${swiftLiteral(action.textParameterTitle)}) var text: String
+
+  static var parameterSummary: some ParameterSummary {
+    Summary("${summaryTitle} \\(\\.$text)")
+  }
+`;
+		return `struct OneAppIntent${index}: AppIntent {
+  static let title: LocalizedStringResource = ${swiftLiteral(action.title)}
+${text}
+  func perform() async throws -> some IntentResult & ReturnsValue<String> {
+    let result = try await oneAppIntentsRun(${swiftLiteral(action.id)}, ${text ? "text" : "nil"})
+    return .result(value: result)
+  }
+}`;
+	});
+	const shortcuts = actions.map((action, index) => `    AppShortcut(
+      intent: OneAppIntent${index}(),
+      phrases: [${swiftShortcutPhrase(action.shortcutPhrase)}],
+      shortTitle: ${swiftLiteral(action.title)},
+      systemImageName: "bolt.fill"
+    )`).join("\n");
+	return `import AppIntents
+import Foundation
+
+private func oneAppIntentsRun(_ identifier: String, _ text: String?) async throws -> String {
+  try await withCheckedThrowingContinuation { continuation in
+    OneAppIntentsPerform(identifier, text) { result, error in
+      if let error { continuation.resume(throwing: error) }
+      else if let result { continuation.resume(returning: result) }
+      else { continuation.resume(throwing: NSError(domain: "OneAppIntents", code: 3)) }
+    }
+  }
+}
+
+${types.join("\n\n")}
+
+struct OneAppShortcuts: AppShortcutsProvider {
+  static var appShortcuts: [AppShortcut] {
+${shortcuts}
+  }
+}
+`;
+}
 function fontFileName(font) {
 	return path.basename(font);
 }
@@ -507,6 +582,10 @@ function generateSceneDelegate(args) {
 		FSExtra.writeFileSync(path.join(dest, app.name, `${app.name}.entitlements`), renderEntitlements(entitlements));
 	}
 }
+function generateIosAppIntents(dest, platform, app) {
+	if (platform !== "ios" || !app.ios?.appIntents) return;
+	FSExtra.writeFileSync(path.join(dest, app.name, "OneAppIntents.swift"), renderIosAppIntentsSwift(app.ios.appIntents.actions));
+}
 function generateIosWidgets(dest, app) {
 	const widgets = app.ios?.widgets;
 	if (!widgets) return;
@@ -1452,6 +1531,12 @@ ${identifiers.map((identifier) => `		<string>${escapeXml(identifier)}</string>`)
 				stamps.push(plistArray("OneBackgroundRefreshTaskIdentifiers", refreshTasks));
 				stamps.push(plistArray("OneBackgroundProcessingTaskIdentifiers", processingTasks));
 			}
+			if (app.ios?.appIntents) {
+				stamps.push(`	<key>OneAppIntentIdentifiers</key>
+	<array>
+${app.ios.appIntents.actions.map((action) => `		<string>${escapeXml(action.id)}</string>`).join("\n")}
+	</array>`);
+			}
 			const backgroundModes = [
 				...app.pictureInPicture || app.audio?.background ? ["audio"] : [],
 				...app.location?.background ? ["location"] : [],
@@ -1737,7 +1822,7 @@ ${schemes.map((scheme) => `            <data android:scheme="${scheme}" />`).joi
 			rendered = patchIosInfoPlistSceneManifest(rendered);
 		}
 		if (platform === "ios" && relativePath.endsWith("/AppDelegate.swift")) {
-			rendered = patchIosAppDelegateSceneLifecycle(rendered, appName, !!app.ios?.backgroundTasks);
+			rendered = patchIosAppDelegateSceneLifecycle(rendered, appName, !!app.ios?.backgroundTasks, !!app.ios?.appIntents);
 			rendered = nativeProjectPatches.holdLaunchScreenOverRootView(rendered);
 			if (app.updates !== void 0) {
 				rendered = nativeProjectPatches.pointReleaseBundleURLAtOneUpdates(rendered);
@@ -1760,6 +1845,7 @@ end`);
 		if (platform === "ios" && relativePath.endsWith(".xcodeproj/project.pbxproj")) {
 			rendered = patchIosBundlePhase(rendered, app.updates?.runtimeVersion);
 			rendered = patchIosPbxprojSceneDelegate(rendered, appName);
+			if (app.ios?.appIntents) rendered = patchIosPbxprojAppIntents(rendered, appName);
 			rendered = patchIosPbxprojOneBridgingHeader(rendered, appName);
 			if (Object.keys(appEntitlements(app)).length && !app.ios?.widgets) {
 				rendered = patchIosPbxprojAppEntitlements(rendered, appName);
@@ -1942,6 +2028,7 @@ const generateForPlatform = async (root, platform, app, outDir = path.resolve(ro
 		platform,
 		app
 	});
+	generateIosAppIntents(dest, platform, app);
 	if (platform === "ios") generateOneBridgingHeader(dest, app);
 	if (platform === "ios") generateIosWidgets(dest, app);
 	if (platform === "ios") await generateSwiftPackages({
@@ -1953,6 +2040,41 @@ const generateForPlatform = async (root, platform, app, outDir = path.resolve(ro
 		dest
 	});
 };
+function enableAppComposeIntegration(dest) {
+	const rootBuildGradlePath = path.join(dest, "build.gradle");
+	if (FSExtra.existsSync(rootBuildGradlePath)) {
+		let content = FSExtra.readFileSync(rootBuildGradlePath, "utf8");
+		const composePluginClasspath = "        classpath(\"org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:$kotlinVersion\")";
+		if (!content.includes("org.jetbrains.kotlin.plugin.compose")) {
+			const anchor = content.includes("classpath(\"org.jetbrains.kotlin:kotlin-gradle-plugin\")") ? "classpath(\"org.jetbrains.kotlin:kotlin-gradle-plugin\")" : "classpath \"org.jetbrains.kotlin:kotlin-gradle-plugin\"";
+			content = insertAfterLine(content, anchor, composePluginClasspath);
+			FSExtra.writeFileSync(rootBuildGradlePath, content, "utf8");
+		}
+	}
+	const appBuildGradlePath = path.join(dest, "app/build.gradle");
+	if (FSExtra.existsSync(appBuildGradlePath)) {
+		let content = FSExtra.readFileSync(appBuildGradlePath, "utf8");
+		if (!content.includes("org.jetbrains.kotlin.plugin.compose")) {
+			const pluginAnchor = content.includes("apply plugin: \"org.jetbrains.kotlin.android\"") ? "apply plugin: \"org.jetbrains.kotlin.android\"" : "apply plugin: 'org.jetbrains.kotlin.android'";
+			content = insertAfterLine(content, pluginAnchor, "apply plugin: \"org.jetbrains.kotlin.plugin.compose\"");
+		}
+		if (!content.includes("compose true")) {
+			content = insertAfterLine(content, "android {", "    buildFeatures {\n        compose true\n    }");
+		}
+		if (!content.includes("androidx.compose.ui:ui")) {
+			const composeDeps = [
+				"    def composeUiVersion = rootProject.ext.has(\"composeUiVersion\") ? rootProject.ext.get(\"composeUiVersion\") : \"1.11.4\"",
+				"    def material3Version = rootProject.ext.has(\"material3Version\") ? rootProject.ext.get(\"material3Version\") : \"1.5.0-alpha17\"",
+				"    implementation \"androidx.compose.ui:ui:$composeUiVersion\"",
+				"    implementation \"androidx.compose.foundation:foundation:$composeUiVersion\"",
+				"    implementation \"androidx.compose.material3:material3:$material3Version\""
+			].join("\n");
+			const depsAnchor = content.includes("implementation(\"com.facebook.react:react-android\")") ? "implementation(\"com.facebook.react:react-android\")" : "implementation \"com.facebook.react:react-android\"";
+			content = insertAfterLine(content, depsAnchor, composeDeps);
+		}
+		FSExtra.writeFileSync(appBuildGradlePath, content, "utf8");
+	}
+}
 async function generateKotlinSources({ root, dest }) {
 	const skip = /* @__PURE__ */ new Set([
 		"node_modules",
@@ -1967,6 +2089,7 @@ async function generateKotlinSources({ root, dest }) {
 	]);
 	const sources = [];
 	const collect = (dir) => {
+		if (dir !== root && FSExtra.existsSync(path.join(dir, "package.json"))) return;
 		for (const entry of FSExtra.readdirSync(dir, { withFileTypes: true })) {
 			if (entry.name.startsWith(".") || skip.has(entry.name)) continue;
 			const source = path.join(dir, entry.name);
@@ -1977,16 +2100,21 @@ async function generateKotlinSources({ root, dest }) {
 	collect(root);
 	if (sources.length === 0) return;
 	const { kotlinSourceId, renderKotlinSourceGlue, writeNativeSourceDeclaration } = await import("../utils/nativeSourceContract.mjs");
+	let hasViews = false;
 	for (const source of sources) {
 		const id = kotlinSourceId(root, source);
 		const target = path.join(dest, "app/src/main/java/one/source", id);
 		FSExtra.mkdirSync(target, { recursive: true });
 		FSExtra.copyFileSync(source, path.join(target, path.basename(source)));
 		const contract = writeNativeSourceDeclaration(source);
-		if (contract.modules.length > 0) {
+		if (contract.views.length > 0) hasViews = true;
+		if (contract.modules.length > 0 || contract.views.length > 0) {
 			FSExtra.writeFileSync(path.join(target, `OneNativeSource_${id}.kt`), renderKotlinSourceGlue(id, contract).source);
 		}
 	}
+	if (hasViews) {
+		enableAppComposeIntegration(dest);
+	}
 }
 async function generateSwiftPackages({ root, dest }) {
 	const skip = /* @__PURE__ */ new Set([
@@ -2103,5 +2231,5 @@ const transformPath = (filePath) => {
 	return filePath.replace("_BUCK", "BUCK").replace("_gitignore", ".gitignore").replace("_gitattributes", ".gitattributes").replace("_babelrc", ".babelrc").replace("_editorconfig", ".editorconfig").replace("_eslintrc.js", ".eslintrc.js").replace("_flowconfig", ".flowconfig").replace("_buckconfig", ".buckconfig").replace("_prettierrc.js", ".prettierrc.js").replace("_bundle", ".bundle").replace("_ruby-version", ".ruby-version").replace("_node-version", ".node-version").replace("_watchmanconfig", ".watchmanconfig").replace("_xcode.env", ".xcode.env");
 };
 
-export { applyAndroidDependencyPatches, generateForPlatform, getNativeDependencyInventory, installNativeDependencies, renderPrebuildFile, renderSceneDelegateSwift, validatePrebuildApp };
+export { applyAndroidDependencyPatches, enableAppComposeIntegration, generateForPlatform, generateKotlinSources, getNativeDependencyInventory, installNativeDependencies, renderIosAppIntentsSwift, renderPrebuildFile, renderSceneDelegateSwift, validatePrebuildApp };
 //# sourceMappingURL=prebuildWithoutExpo.mjs.map