vxrn 2.0.0-beta.96.1 → 2.0.0-beta.97.1

package/dist/exports/prebuildWithoutExpo.mjs

@@ -333,7 +333,7 @@ ${anchor}`);
 		${ids.dependency} /* PBXTargetDependency */ = {isa = PBXTargetDependency; target = ${ids.target} /* OneWidgets */; targetProxy = ${ids.proxy} /* PBXContainerItemProxy */; };
 /* End PBXTargetDependency section */
 `);
-	const config = (id, mode) => `		${id} /* ${mode} */ = {isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = OneWidgets/OneWidgets.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = ${app.ios?.buildNumber || "1"}; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = OneWidgets/WidgetInfo.plist; IPHONEOS_DEPLOYMENT_TARGET = ${deploymentTarget}; MARKETING_VERSION = "${app.version || "1.0"}"; PRODUCT_BUNDLE_IDENTIFIER = ${bundleId}.widgets; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1"; }; name = ${mode}; };`;
+	const config = (id, mode) => `		${id} /* ${mode} */ = {isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = OneWidgets/OneWidgets.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = ${app.ios?.buildNumber || "1"}; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = OneWidgets/WidgetInfo.plist; IPHONEOS_DEPLOYMENT_TARGET = ${deploymentTarget}; MARKETING_VERSION = "${app.version || "1.0"}"; PRODUCT_BUNDLE_IDENTIFIER = ${bundleId}.widgets; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "${app.ios?.tablet ? "1,2" : "1"}"; }; name = ${mode}; };`;
 	insert("/* End XCBuildConfiguration section */", `${config(ids.debug, "Debug")}
 ${config(ids.release, "Release")}`);
 	insert("/* End XCConfigurationList section */", `		${ids.config} /* Build configuration list for PBXNativeTarget "OneWidgets" */ = {isa = XCConfigurationList; buildConfigurations = (${ids.debug} /* Debug */, ${ids.release} /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; };`);
@@ -367,20 +367,13 @@ 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) {
+	if (app.notifications?.push === true && !app.ios?.widgets) {
 		FSExtra.writeFileSync(path.join(dest, app.name, `${app.name}.entitlements`), renderPushEntitlements());
 	}
 }
 function generateIosWidgets(dest, app) {
 	const widgets = app.ios?.widgets;
 	if (!widgets) return;
-	if (widgets.jsx) {
-		try {
-			module.createRequire(dest + "/").resolve("@use-voltra/ios-client/package.json");
-		} catch {
-			throw new Error("[vxrn] native.app.ios.widgets.jsx requires @use-voltra/ios-client");
-		}
-	}
 	const appDir = path.join(dest, app.name);
 	const extensionDir = path.join(dest, "OneWidgets");
 	FSExtra.mkdirSync(extensionDir, { recursive: true });
@@ -388,7 +381,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 ? entitlements.replace("</dict></plist>", "<key>aps-environment</key><string>development</string></dict></plist>") : entitlements);
+	FSExtra.writeFileSync(path.join(appDir, "OneAppWidgets.entitlements"), widgets.pushNotifications || app.notifications?.push ? entitlements.replace("</dict></plist>", "<key>aps-environment</key><string>development</string></dict></plist>") : entitlements);
 	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">
@@ -403,7 +396,6 @@ function generateIosWidgets(dest, app) {
   <key>CFBundleShortVersionString</key><string>${escapeXml(app.version || "1.0")}</string>
   <key>CFBundleVersion</key><string>${escapeXml(app.ios?.buildNumber || "1")}</string>
   <key>NSExtension</key><dict><key>NSExtensionPointIdentifier</key><string>com.apple.widgetkit-extension</string></dict>
-  ${widgets.jsx ? `<key>Voltra_AppGroupIdentifier</key><string>${escapeXml(widgets.appGroup)}</string>` : ""}
 </dict></plist>
 `);
 	FSExtra.writeFileSync(path.join(appDir, "OneWidgetContract.swift"), `import Foundation
@@ -418,12 +410,14 @@ enum OneWidgetContract {
     let title: String
     let value: String
     let subtitle: String
+    let layout: String?
   }
 
   struct Attributes: ActivityAttributes {
     struct ContentState: Codable, Hashable {
       let status: String
       let value: String
+      let layout: String?
     }
     let title: String
   }
@@ -432,7 +426,163 @@ enum OneWidgetContract {
 	FSExtra.writeFileSync(path.join(extensionDir, "OneWidget.swift"), `import SwiftUI
 import WidgetKit
 import ActivityKit
-${widgets.jsx ? "import VoltraRuntime" : ""}
+
+struct OneWidgetNode: Decodable {
+  let type: String
+  let text: String?
+  let style: Style?
+  let children: [OneWidgetNode]?
+  let systemName: String?
+  let value: Double?
+  let total: Double?
+  let fill: String?
+  let cornerRadius: Double?
+  let url: String?
+
+  struct Style: Decodable {
+    let color: String?
+    let backgroundColor: String?
+    let fontSize: Double?
+    let fontWeight: String?
+    let fontDesign: String?
+    let padding: Double?
+    let borderRadius: Double?
+    let spacing: Double?
+    let width: Double?
+    let height: Double?
+    let opacity: Double?
+    let lineLimit: Int?
+    let alignment: String?
+  }
+}
+
+struct OneActivityView: Decodable {
+  let lockScreen: OneWidgetNode
+  let compactLeading: OneWidgetNode?
+  let compactTrailing: OneWidgetNode?
+  let minimal: OneWidgetNode?
+  let expandedLeading: OneWidgetNode?
+  let expandedTrailing: OneWidgetNode?
+  let expandedBottom: OneWidgetNode?
+}
+
+private func oneDecode<T: Decodable>(_ value: String?, as type: T.Type) -> T? {
+  guard let value, let data = value.data(using: .utf8) else { return nil }
+  return try? JSONDecoder().decode(type, from: data)
+}
+
+private func oneColor(_ hex: String?) -> Color? {
+  guard let hex, hex.count == 7, hex.first == "#",
+        let rgb = Int(hex.dropFirst(), radix: 16) else { return nil }
+  return Color(red: Double((rgb >> 16) & 255) / 255,
+               green: Double((rgb >> 8) & 255) / 255,
+               blue: Double(rgb & 255) / 255)
+}
+
+struct OneWidgetRendered: View {
+  let node: OneWidgetNode
+
+  private var alignment: Alignment {
+    switch node.style?.alignment {
+    case "leading": .leading
+    case "trailing": .trailing
+    default: .center
+    }
+  }
+
+  private var horizontalAlignment: HorizontalAlignment {
+    switch node.style?.alignment {
+    case "center": .center
+    case "trailing": .trailing
+    default: .leading
+    }
+  }
+
+  private var weight: Font.Weight {
+    switch node.style?.fontWeight {
+    case "medium": .medium
+    case "semibold": .semibold
+    case "bold": .bold
+    default: .regular
+    }
+  }
+
+  private var design: Font.Design {
+    switch node.style?.fontDesign {
+    case "rounded": .rounded
+    case "serif": .serif
+    case "monospaced": .monospaced
+    default: .default
+    }
+  }
+
+  var body: some View {
+    Group {
+      switch node.type {
+      case "text":
+        Text(node.text ?? "")
+          .font(.system(size: CGFloat(node.style?.fontSize ?? 16), weight: weight, design: design))
+      case "vstack":
+        VStack(alignment: horizontalAlignment, spacing: CGFloat(node.style?.spacing ?? 8)) {
+          ForEach(Array((node.children ?? []).enumerated()), id: \\.offset) { _, child in
+            OneWidgetRendered(node: child)
+          }
+        }
+      case "hstack":
+        HStack(spacing: CGFloat(node.style?.spacing ?? 8)) {
+          ForEach(Array((node.children ?? []).enumerated()), id: \\.offset) { _, child in
+            OneWidgetRendered(node: child)
+          }
+        }
+      case "zstack":
+        ZStack(alignment: alignment) {
+          ForEach(Array((node.children ?? []).enumerated()), id: \\.offset) { _, child in
+            OneWidgetRendered(node: child)
+          }
+        }
+      case "spacer": Spacer(minLength: 0)
+      case "divider": Divider()
+      case "image":
+        if let systemName = node.systemName {
+          Image(systemName: systemName)
+            .font(.system(size: CGFloat(node.style?.fontSize ?? 20), weight: weight))
+        }
+      case "progress":
+        ProgressView(value: node.value ?? 0, total: node.total ?? 1)
+          .tint(oneColor(node.style?.color))
+      case "gauge":
+        Gauge(value: node.value ?? 0, in: 0...(node.total ?? 1)) { EmptyView() }
+          .gaugeStyle(.accessoryCircular)
+          .tint(oneColor(node.style?.color))
+      case "circle":
+        Circle().fill(oneColor(node.fill) ?? .primary)
+      case "rectangle":
+        Rectangle().fill(oneColor(node.fill) ?? .primary)
+      case "rounded-rectangle":
+        RoundedRectangle(cornerRadius: CGFloat(node.cornerRadius ?? 8))
+          .fill(oneColor(node.fill) ?? .primary)
+      case "link":
+        if let url = node.url.flatMap(URL.init(string:)) {
+          Link(destination: url) {
+            ForEach(Array((node.children ?? []).enumerated()), id: \\.offset) { _, child in
+              OneWidgetRendered(node: child)
+            }
+          }
+        }
+      default: EmptyView()
+      }
+    }
+    .foregroundColor(oneColor(node.style?.color))
+    .lineLimit(node.style?.lineLimit)
+    .frame(width: node.style?.width.map { CGFloat($0) },
+           height: node.style?.height.map { CGFloat($0) },
+           alignment: alignment)
+    .opacity(node.style?.opacity ?? 1)
+    .padding(CGFloat(node.style?.padding ?? 0))
+    .background { if let fill = oneColor(node.style?.backgroundColor) { fill } }
+    .clipShape(RoundedRectangle(cornerRadius: CGFloat(node.style?.borderRadius ?? 0)))
+  }
+}
 
 struct OneWidgetEntry: TimelineEntry {
   let date: Date
@@ -441,7 +591,7 @@ struct OneWidgetEntry: TimelineEntry {
 
 struct OneWidgetProvider: TimelineProvider {
   func placeholder(in context: Context) -> OneWidgetEntry {
-    OneWidgetEntry(date: .now, data: .init(title: ${JSON.stringify(widgets.displayName)}, value: "", subtitle: ""))
+    OneWidgetEntry(date: .now, data: .init(title: ${JSON.stringify(widgets.displayName)}, value: "", subtitle: "", layout: nil))
   }
 
   func getSnapshot(in context: Context, completion: @escaping (OneWidgetEntry) -> Void) {
@@ -455,7 +605,7 @@ struct OneWidgetProvider: TimelineProvider {
   private func entry() -> OneWidgetEntry {
     let stored = UserDefaults(suiteName: OneWidgetContract.appGroup)?.data(forKey: OneWidgetContract.dataKey)
     let data = stored.flatMap { try? JSONDecoder().decode(OneWidgetContract.Data.self, from: $0) }
-      ?? .init(title: ${JSON.stringify(widgets.displayName)}, value: "", subtitle: "")
+      ?? .init(title: ${JSON.stringify(widgets.displayName)}, value: "", subtitle: "", layout: nil)
     return OneWidgetEntry(date: .now, data: data)
   }
 }
@@ -463,10 +613,16 @@ struct OneWidgetProvider: TimelineProvider {
 struct OneWidget: Widget {
   var body: some WidgetConfiguration {
     StaticConfiguration(kind: OneWidgetContract.kind, provider: OneWidgetProvider()) { entry in
-      VStack(alignment: .leading, spacing: 8) {
-        Text(entry.data.title).font(.headline)
-        Text(entry.data.value).font(.title2).bold()
-        Text(entry.data.subtitle).font(.caption)
+      Group {
+        if let layout = oneDecode(entry.data.layout, as: OneWidgetNode.self) {
+          OneWidgetRendered(node: layout)
+        } else {
+          VStack(alignment: .leading, spacing: 8) {
+            Text(entry.data.title).font(.headline)
+            Text(entry.data.value).font(.title2).bold()
+            Text(entry.data.subtitle).font(.caption)
+          }
+        }
       }
       .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .leading)
       .containerBackground(.fill.tertiary, for: .widget)
@@ -480,53 +636,78 @@ struct OneWidget: Widget {
 struct OneLiveActivity: Widget {
   var body: some WidgetConfiguration {
     ActivityConfiguration(for: OneWidgetContract.Attributes.self) { context in
-      HStack {
-        VStack(alignment: .leading) {
-          Text(context.attributes.title).font(.headline)
-          Text(context.state.status)
+      Group {
+        if let layout = oneDecode(context.state.layout, as: OneActivityView.self) {
+          OneWidgetRendered(node: layout.lockScreen)
+        } else {
+          HStack {
+            VStack(alignment: .leading) {
+              Text(context.attributes.title).font(.headline)
+              Text(context.state.status)
+            }
+            Spacer()
+            Text(context.state.value).bold()
+          }
         }
-        Spacer()
-        Text(context.state.value).bold()
       }
       .padding()
       .activityBackgroundTint(.blue.opacity(0.2))
     } dynamicIsland: { context in
       DynamicIsland {
-        DynamicIslandExpandedRegion(.leading) { Text(context.attributes.title) }
-        DynamicIslandExpandedRegion(.trailing) { Text(context.state.value) }
-        DynamicIslandExpandedRegion(.bottom) { Text(context.state.status) }
+        DynamicIslandExpandedRegion(.leading) {
+          if let layout = oneDecode(context.state.layout, as: OneActivityView.self),
+             let leading = layout.expandedLeading {
+            OneWidgetRendered(node: leading)
+          } else {
+            Text(context.attributes.title)
+          }
+        }
+        DynamicIslandExpandedRegion(.trailing) {
+          if let layout = oneDecode(context.state.layout, as: OneActivityView.self),
+             let trailing = layout.expandedTrailing {
+            OneWidgetRendered(node: trailing)
+          } else {
+            Text(context.state.value)
+          }
+        }
+        DynamicIslandExpandedRegion(.bottom) {
+          if let layout = oneDecode(context.state.layout, as: OneActivityView.self) {
+            OneWidgetRendered(node: layout.expandedBottom ?? layout.lockScreen)
+          } else {
+            Text(context.state.status)
+          }
+        }
       } compactLeading: {
-        Text(context.attributes.title)
+        if let layout = oneDecode(context.state.layout, as: OneActivityView.self),
+           let leading = layout.compactLeading {
+          OneWidgetRendered(node: leading)
+        } else {
+          Text(context.attributes.title)
+        }
       } compactTrailing: {
-        Text(context.state.value)
+        if let layout = oneDecode(context.state.layout, as: OneActivityView.self),
+           let trailing = layout.compactTrailing {
+          OneWidgetRendered(node: trailing)
+        } else {
+          Text(context.state.value)
+        }
       } minimal: {
-        Text(context.state.value)
+        if let layout = oneDecode(context.state.layout, as: OneActivityView.self),
+           let minimal = layout.minimal {
+          OneWidgetRendered(node: minimal)
+        } else {
+          Text(context.state.value)
+        }
       }
     }
   }
 }
 
-${widgets.jsx ? `struct OneJSXWidget: Widget {
-  private let widgetId = ${JSON.stringify(widgets.jsx.id)}
-
-  var body: some WidgetConfiguration {
-    StaticConfiguration(kind: "Voltra_Widget_${widgets.jsx.id}", provider: VoltraHomeWidgetProvider(widgetId: widgetId)) { entry in
-      VoltraHomeWidgetView(entry: entry)
-    }
-    .configurationDisplayName(${JSON.stringify(widgets.jsx.displayName)})
-    .description(${JSON.stringify(widgets.jsx.description)})
-    .supportedFamilies([.systemSmall, .systemMedium])
-    .contentMarginsDisabled()
-  }
-}
-` : ""}
-
 @main
 struct OneWidgetsBundle: WidgetBundle {
   var body: some Widget {
     OneWidget()
     OneLiveActivity()
-    ${widgets.jsx ? "OneJSXWidget()\n    VoltraWidget()" : ""}
   }
 }
 `);
@@ -535,8 +716,11 @@ struct OneWidgetsBundle: WidgetBundle {
 
 @interface RCT_EXTERN_MODULE(OneWidgetsBridge, RCTEventEmitter)
 RCT_EXTERN_METHOD(writeWidget:(NSString *)title value:(NSString *)value subtitle:(NSString *)subtitle resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(writeView:(NSString *)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(start:(NSString *)title status:(NSString *)status value:(NSString *)value push:(BOOL)push resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(startView:(NSString *)title layout:(NSString *)layout push:(BOOL)push resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(update:(NSString *)identifier status:(NSString *)status value:(NSString *)value resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(updateView:(NSString *)identifier layout:(NSString *)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(end:(NSString *)identifier resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(pushToken:(NSString *)identifier resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 @end
@@ -583,7 +767,24 @@ class OneWidgetsBridge: RCTEventEmitter {
       return
     }
     do {
-      defaults.set(try JSONEncoder().encode(OneWidgetContract.Data(title: title, value: value, subtitle: subtitle)),
+      defaults.set(try JSONEncoder().encode(OneWidgetContract.Data(title: title, value: value, subtitle: subtitle, layout: nil)),
+                   forKey: OneWidgetContract.dataKey)
+      WidgetCenter.shared.reloadTimelines(ofKind: OneWidgetContract.kind)
+      resolve(nil)
+    } catch {
+      reject("widget_write", error.localizedDescription, error)
+    }
+  }
+
+  @objc(writeView:resolver:rejecter:)
+  func writeView(_ layout: String, resolver resolve: RCTPromiseResolveBlock,
+                 rejecter reject: RCTPromiseRejectBlock) {
+    guard let defaults = UserDefaults(suiteName: OneWidgetContract.appGroup) else {
+      reject("app_group", "Cannot open the configured App Group", nil)
+      return
+    }
+    do {
+      defaults.set(try JSONEncoder().encode(OneWidgetContract.Data(title: "", value: "", subtitle: "", layout: layout)),
                    forKey: OneWidgetContract.dataKey)
       WidgetCenter.shared.reloadTimelines(ofKind: OneWidgetContract.kind)
       resolve(nil)
@@ -602,7 +803,27 @@ class OneWidgetsBridge: RCTEventEmitter {
     do {
       let activity = try Activity<OneWidgetContract.Attributes>.request(
         attributes: .init(title: title),
-        content: .init(state: .init(status: status, value: value), staleDate: nil),
+        content: .init(state: .init(status: status, value: value, layout: nil), staleDate: nil),
+        pushType: push ? .token : nil
+      )
+      observeToken(activity)
+      resolve(activity.id)
+    } catch {
+      reject("activity_start", error.localizedDescription, error)
+    }
+  }
+
+  @objc(startView:layout:push:resolver:rejecter:)
+  func startView(_ title: String, layout: String, push: Bool,
+                 resolver resolve: RCTPromiseResolveBlock, rejecter reject: RCTPromiseRejectBlock) {
+    guard ActivityAuthorizationInfo().areActivitiesEnabled else {
+      reject("activities_disabled", "Live Activities are disabled", nil)
+      return
+    }
+    do {
+      let activity = try Activity<OneWidgetContract.Attributes>.request(
+        attributes: .init(title: title),
+        content: .init(state: .init(status: "", value: "", layout: layout), staleDate: nil),
         pushType: push ? .token : nil
       )
       observeToken(activity)
@@ -620,7 +841,20 @@ class OneWidgetsBridge: RCTEventEmitter {
       return
     }
     Task {
-      await activity.update(.init(state: .init(status: status, value: value), staleDate: nil))
+      await activity.update(.init(state: .init(status: status, value: value, layout: nil), staleDate: nil))
+      resolve(nil)
+    }
+  }
+
+  @objc(updateView:layout:resolver:rejecter:)
+  func updateView(_ identifier: String, layout: String,
+                  resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+    guard let activity = Activity<OneWidgetContract.Attributes>.activities.first(where: { $0.id == identifier }) else {
+      reject("activity_missing", "Live Activity not found", nil)
+      return
+    }
+    Task {
+      await activity.update(.init(state: .init(status: "", value: "", layout: layout), staleDate: nil))
       resolve(nil)
     }
   }
@@ -646,7 +880,11 @@ class OneWidgetsBridge: RCTEventEmitter {
       reject("activity_missing", "Live Activity not found", nil)
       return
     }
-    resolve(activity.pushToken?.map { String(format: "%02x", $0) }.joined())
+    if let data = activity.pushToken {
+      resolve(data.map { String(format: "%02x", $0) }.joined())
+    } else {
+      resolve(NSNull())
+    }
   }
 }
 `);
@@ -869,13 +1107,6 @@ ${schemes.map((scheme) => `				<string>${scheme}</string>`).join("\n")}
 			}
 			if (app.ios?.widgets) {
 				stamps.push("	<key>NSSupportsLiveActivities</key>\n	<true/>");
-				if (app.ios.widgets.jsx) {
-					stamps.push(`	<key>Voltra_AppGroupIdentifier</key>
-	<string>${escapeXml(app.ios.widgets.appGroup)}</string>`);
-					if (app.ios.widgets.pushNotifications) {
-						stamps.push("	<key>Voltra_EnablePushNotifications</key>\n	<true/>");
-					}
-				}
 			}
 			if (stamps.length) {
 				const anchor = "	<key>LSRequiresIPhoneOS</key>";
@@ -1000,7 +1231,7 @@ end`);
 		if (platform === "ios" && relativePath.endsWith(".xcodeproj/project.pbxproj")) {
 			rendered = patchIosBundlePhase(rendered);
 			rendered = patchIosPbxprojSceneDelegate(rendered, appName);
-			if (app.notifications?.push === true) {
+			if (app.notifications?.push === true && !app.ios?.widgets) {
 				rendered = patchIosPbxprojPushEntitlements(rendered, appName);
 			}
 			if (app.ios?.widgets) rendered = patchIosPbxprojWidgets(rendered, app);
@@ -1019,16 +1250,6 @@ use_frameworks! :linkage => :${app.ios.useFrameworks}`);
 			rendered = nativeProjectPatches.injectOneSwiftPackagesIntoPodfile(rendered);
 			if (nitroWebImage) rendered = nativeProjectPatches.injectNitroWebImageModularHeaderIntoPodfile(rendered);
 			rendered = nativeProjectPatches.injectHermesMinificationPatchIntoPodfile(rendered);
-			if (app.ios?.widgets?.jsx) {
-				rendered += `
-# jsx widgets use Voltra's SwiftUI renderer in One's generated extension
-target 'OneWidgets' do
-  client = \`node --print "require.resolve('@use-voltra/ios-client/package.json', {paths: ['#{Pod::Config.instance.installation_root}/..']})"\`.strip
-  raise 'Install @use-voltra/ios-client to build the JSX widget' if client.empty?
-  pod 'VoltraWidget', :path => File.join(File.dirname(client), 'ios')
-end
-`;
-			}
 			if (!rendered.includes("[vxrn/one] fmt c++17 fix") || !rendered.includes("[vxrn/one] minify iOS Hermes Release bundle input")) {
 				throw new Error("[vxrn] failed to apply required iOS Podfile patches");
 			}