@use-voltra/ios-client 2.1.1 → 2.3.0

package/expo-plugin/src/ios-widget/index.ts

@@ -1,6 +1,6 @@
 import { ConfigPlugin, withPlugins } from '@expo/config-plugins'
 
-import type { IOSWidgetConfig } from '../types'
+import type { IOSDynamicLiveActivityConfig, IOSWidgetConfig } from '../types'
 import { configureEasBuild } from './eas'
 import { generateWidgetExtensionFiles } from './files'
 import { withFonts } from './fonts'
@@ -13,11 +13,13 @@ export interface WithIOSProps {
   bundleIdentifier: string
   deploymentTarget: string
   widgets?: IOSWidgetConfig[]
+  liveActivities?: IOSDynamicLiveActivityConfig[]
   groupIdentifier?: string
   keychainGroup?: string
   fonts?: string[]
   version: string
   buildNumber: string
+  voltraVersion: string
 }
 
 /**
@@ -42,11 +44,13 @@ export const withIOS: ConfigPlugin<WithIOSProps> = (config, props) => {
     bundleIdentifier,
     deploymentTarget,
     widgets,
+    liveActivities,
     groupIdentifier,
     keychainGroup,
     fonts,
     version,
     buildNumber,
+    voltraVersion,
   } = props
 
   const plugins: [ConfigPlugin<any>, any][] = [
@@ -54,7 +58,10 @@ export const withIOS: ConfigPlugin<WithIOSProps> = (config, props) => {
     ...(fonts && fonts.length > 0 ? [[withFonts, { fonts, targetName }] as [ConfigPlugin<any>, any]] : []),
 
     // 2. Configure Xcode project (creates the target - must run before fonts mod executes)
-    [configureXcodeProject, { targetName, bundleIdentifier, deploymentTarget, widgets }],
+    [
+      configureXcodeProject,
+      { targetName, bundleIdentifier, deploymentTarget, widgets, liveActivities, version, buildNumber },
+    ],
 
     // 3. Configure Podfile for widget extension target
     [configurePodfile, { targetName }],
@@ -66,7 +73,10 @@ export const withIOS: ConfigPlugin<WithIOSProps> = (config, props) => {
     [configureEasBuild, { targetName, bundleIdentifier, groupIdentifier }],
 
     // 6. Generate widget extension files (dangerous mod should run before plist patchers)
-    [generateWidgetExtensionFiles, { targetName, widgets, groupIdentifier, keychainGroup, version, buildNumber }],
+    [
+      generateWidgetExtensionFiles,
+      { targetName, widgets, liveActivities, groupIdentifier, keychainGroup, version, buildNumber, voltraVersion },
+    ],
   ]
 
   return withPlugins(config, plugins)

package/expo-plugin/src/ios-widget/podfile.ts

@@ -1,11 +1,23 @@
 import { ConfigPlugin, withPodfile as withExpoPodfile } from '@expo/config-plugins'
 
+const BEGIN_MARKER = '# @voltra-widget-target BEGIN'
+const END_MARKER = '# @voltra-widget-target END'
+
+// Matches a legacy (pre-marker) block emitted by older plugin versions: a bare header comment
+// followed directly by the `target '<name>' do ... end` block, with no surrounding markers.
+// Non-greedy up to the first line-start `end` — our generated block never nests another
+// `do...end`, so this always lands on the block's own closing `end`.
+const LEGACY_BLOCK_RE =
+  /\n?# Voltra Widget Extension Target\n# DO NOT MODIFY THIS FILE - IT IS AUTO-GENERATED BY THE VOLTRA PLUGIN\ntarget '[^']*' do\n[\s\S]*?\nend/
+
+// Matches a marked block (any target name) end-to-end, inclusive of both markers.
+const MARKED_BLOCK_RE = new RegExp(`${BEGIN_MARKER}[\\s\\S]*?${END_MARKER}`)
+
 /**
- * Generates the Podfile target content for the widget extension.
+ * Generates the Podfile target content for the widget extension (unwrapped, no markers).
  */
 function getTargetContent(targetName: string): string {
-  return `
-# Voltra Widget Extension Target
+  return `# Voltra Widget Extension Target
 # DO NOT MODIFY THIS FILE - IT IS AUTO-GENERATED BY THE VOLTRA PLUGIN
 target '${targetName}' do
   use_frameworks! :linkage => podfile_properties['ios.useFrameworks'].to_sym if podfile_properties['ios.useFrameworks']
@@ -14,31 +26,52 @@ target '${targetName}' do
   require 'pathname'
   project_root = "#{Pod::Config.instance.installation_root}/.."
   voltra_client_root = \`node --print "require.resolve('@use-voltra/ios-client/package.json', {paths: ['#{project_root}']})" 2>/dev/null\`.strip.gsub('/package.json', '')
+  raise "Voltra: could not resolve @use-voltra/ios-client from #{project_root}. Is @use-voltra/ios-client installed, and is node on PATH for pod install?" if voltra_client_root.empty?
   voltra_widget_podspec_root = File.join(voltra_client_root, 'ios')
+  voltra_widget_podspec_root = File.realpath(voltra_widget_podspec_root) if File.exist?(voltra_widget_podspec_root)
   podspec_dir_path = Pathname.new(voltra_widget_podspec_root).relative_path_from(Pathname.new(__dir__)).to_path
 
   pod 'VoltraWidget', :path => podspec_dir_path
 end`
 }
 
+function buildMarkedBlock(targetName: string): string {
+  return `${BEGIN_MARKER}\n${getTargetContent(targetName)}\n${END_MARKER}`
+}
+
+/**
+ * Idempotently inserts/upgrades the Voltra widget target block in Podfile contents:
+ * - marked block already present → replaced in place (covers renamed targets too, since the
+ *   markers are name-agnostic)
+ * - legacy (pre-marker) block present → replaced with the new marked block
+ * - neither present → appended
+ */
+export function upsertWidgetTarget(contents: string, targetName: string): string {
+  const markedBlock = buildMarkedBlock(targetName)
+
+  if (MARKED_BLOCK_RE.test(contents)) {
+    return contents.replace(MARKED_BLOCK_RE, markedBlock)
+  }
+
+  if (LEGACY_BLOCK_RE.test(contents)) {
+    return contents.replace(LEGACY_BLOCK_RE, `\n${markedBlock}`)
+  }
+
+  return `${contents.trimEnd()}\n\n${markedBlock}\n`
+}
+
 export interface ConfigurePodfileProps {
   targetName: string
 }
 
 /**
- * Plugin step that adds the Podfile target for the widget extension.
+ * Plugin step that adds (or upgrades) the Podfile target for the widget extension.
  */
 export const configurePodfile: ConfigPlugin<ConfigurePodfileProps> = (config, { targetName }) => {
   return withExpoPodfile(config, (podfile) => {
-    const targetContent = getTargetContent(targetName)
-
-    // Check if target already exists (avoid duplicates)
-    const targetMarker = "target '" + targetName + "'"
-    if (podfile.modResults.contents.includes(targetMarker)) {
-      return podfile
-    }
-
-    podfile.modResults.contents = podfile.modResults.contents + '\n' + targetContent
+    podfile.modResults.contents = upsertWidgetTarget(podfile.modResults.contents, targetName)
     return podfile
   })
 }
+
+export const __test__ = { BEGIN_MARKER, END_MARKER, getTargetContent }

package/expo-plugin/src/ios-widget/widgetPlist.ts

@@ -3,9 +3,12 @@ import plist from '@expo/plist'
 import { existsSync, readFileSync, writeFileSync } from 'fs'
 import { join as joinPath } from 'path'
 
+import { widgetKindOverrides } from '../constants'
 import type { IOSWidgetConfig } from '../types'
 import { detectClientRenderedWidgets } from './clientRendered'
 import { logger } from '@use-voltra/expo-plugin'
+import { resolveIOSWidgetServerUpdate } from '../ios/serverUpdate'
+import { appendMissingURLSchemes, getAppURLSchemes } from '../utils/urlScheme'
 
 export interface ConfigureMainAppPlistProps {
   targetName: string
@@ -35,9 +38,9 @@ export const configureWidgetExtensionPlist: ConfigPlugin<ConfigureMainAppPlistPr
         return config
       }
 
-      const scheme = typeof expoConfig.scheme === 'string' ? expoConfig.scheme : expoConfig.ios?.bundleIdentifier
+      const schemes = getAppURLSchemes(expoConfig)
 
-      if (scheme) {
+      if (schemes.length > 0) {
         const targetPath = joinPath(config.modRequest.platformProjectRoot, targetName)
         const filePath = joinPath(targetPath, 'Info.plist')
         if (!existsSync(filePath)) {
@@ -78,20 +81,8 @@ export const configureWidgetExtensionPlist: ConfigPlugin<ConfigureMainAppPlistPr
 
         // Keep URL schemes in the widget extension so Live Activity links can be resolved
         // from relative to absolute URLs (see VoltraDeepLinkResolver.swift).
-        const existingTypes = (content.CFBundleURLTypes as any[]) || []
-        const hasScheme = existingTypes.some(
-          (t) => Array.isArray(t?.CFBundleURLSchemes) && t.CFBundleURLSchemes.includes(scheme)
-        )
-        if (!hasScheme) {
-          content.CFBundleURLTypes = [
-            ...existingTypes,
-            {
-              CFBundleURLSchemes: [scheme],
-            },
-          ]
-        } else {
-          content.CFBundleURLTypes = existingTypes
-        }
+        // Uses the same scheme list as the app, so a relative link resolves to the app's first scheme.
+        content.CFBundleURLTypes = appendMissingURLSchemes((content.CFBundleURLTypes as any[]) || [], schemes)
 
         // Only set group identifier if provided
         if (groupIdentifier) {
@@ -105,18 +96,31 @@ export const configureWidgetExtensionPlist: ConfigPlugin<ConfigureMainAppPlistPr
           const serverRefresh: Record<string, boolean> = {}
 
           for (const widget of widgets) {
-            if (widget.serverUpdate) {
-              serverUrls[widget.id] = widget.serverUpdate.url
-              serverIntervals[widget.id] = widget.serverUpdate.intervalMinutes ?? 15
-              if (widget.serverUpdate.refresh) {
-                serverRefresh[widget.id] = true
-              }
+            const serverUpdate = resolveIOSWidgetServerUpdate(widget)
+
+            if (!serverUpdate) {
+              continue
+            }
+
+            // Every server-driven widget gets an interval, so this dictionary's keys are the set
+            // of server-driven widget ids. A URL is written only when app.json set one.
+            serverIntervals[widget.id] = serverUpdate.intervalMinutes
+
+            if (serverUpdate.url !== undefined) {
+              serverUrls[widget.id] = serverUpdate.url
+            }
+
+            if (serverUpdate.refresh) {
+              serverRefresh[widget.id] = true
             }
           }
 
+          if (Object.keys(serverIntervals).length > 0) {
+            ;(content as any)['Voltra_WidgetServerIntervals'] = serverIntervals
+          }
+
           if (Object.keys(serverUrls).length > 0) {
             ;(content as any)['Voltra_WidgetServerUrls'] = serverUrls
-            ;(content as any)['Voltra_WidgetServerIntervals'] = serverIntervals
           }
 
           if (Object.keys(serverRefresh).length > 0) {
@@ -124,6 +128,16 @@ export const configureWidgetExtensionPlist: ConfigPlugin<ConfigureMainAppPlistPr
           }
         }
 
+        // Custom widget kinds, so the extension maps ids to kinds too (see VoltraWidgetKind.swift).
+        // Deleted when no widget pins one, so a `kind` dropped from the config does not linger in
+        // an Info.plist that a previous prebuild wrote.
+        const widgetKinds = widgetKindOverrides(widgets)
+        if (widgetKinds) {
+          ;(content as any)['Voltra_WidgetKinds'] = widgetKinds
+        } else {
+          delete (content as any)['Voltra_WidgetKinds']
+        }
+
         // Add Keychain group for shared credential access
         if (keychainGroup) {
           ;(content as any)['Voltra_KeychainGroup'] = keychainGroup

package/expo-plugin/src/ios-widget/xcode/__fixtures__/fresh.pbxproj

@@ -0,0 +1,197 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 54;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		13B07FBF1A68108700A75B9A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.swift */; };
+		13B07FC11A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
+		13B07FC21A68108700A75B9A /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB61A68108700A75B9A /* Info.plist */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		13B07F961A680F5B00A75B9A /* voltraexample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = voltraexample.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		13B07FB01A68108700A75B9A /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = voltraexample/AppDelegate.swift; sourceTree = "<group>"; };
+		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = voltraexample/Images.xcassets; sourceTree = "<group>"; };
+		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = voltraexample/Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		13B07F8C1A680F5B00A75B9A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		83CBB9F61A601CBA00E9B192 = {
+			isa = PBXGroup;
+			children = (
+				13B07FAE1A68108700A75B9A /* voltraexample */,
+				83CBBA001A601CBA00E9B192 /* Products */,
+			);
+			indentWidth = 2;
+			sourceTree = "<group>";
+			tabWidth = 2;
+			usesTabs = 0;
+		};
+		13B07FAE1A68108700A75B9A /* voltraexample */ = {
+			isa = PBXGroup;
+			children = (
+				13B07FB01A68108700A75B9A /* AppDelegate.swift */,
+				13B07FB51A68108700A75B9A /* Images.xcassets */,
+				13B07FB61A68108700A75B9A /* Info.plist */,
+			);
+			name = voltraexample;
+			sourceTree = "<group>";
+		};
+		83CBBA001A601CBA00E9B192 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				13B07F961A680F5B00A75B9A /* voltraexample.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		13B07F861A680F5B00A75B9A /* voltraexample */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "voltraexample" */;
+			buildPhases = (
+				13B07F871A680F5B00A75B9A /* Sources */,
+				13B07F8C1A680F5B00A75B9A /* Frameworks */,
+				13B07F8E1A680F5B00A75B9A /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = voltraexample;
+			productName = voltraexample;
+			productReference = 13B07F961A680F5B00A75B9A /* voltraexample.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		83CBB9F71A601CBA00E9B192 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1210;
+				TargetAttributes = {
+					13B07F861A680F5B00A75B9A = {
+						LastSwiftMigration = 1250;
+					};
+				};
+			};
+			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "voltraexample" */;
+			compatibilityVersion = "Xcode 12.0";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 83CBB9F61A601CBA00E9B192;
+			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				13B07F861A680F5B00A75B9A /* voltraexample */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		13B07F8E1A680F5B00A75B9A /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				13B07FC11A68108700A75B9A /* Images.xcassets in Resources */,
+				13B07FC21A68108700A75B9A /* Info.plist in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		13B07F871A680F5B00A75B9A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				13B07FBF1A68108700A75B9A /* AppDelegate.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		13B07F941A680F5B00A75B9A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = voltraexample/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = com.voltra.example;
+				PRODUCT_NAME = voltraexample;
+				SWIFT_VERSION = 5.0;
+			};
+			name = Debug;
+		};
+		13B07F951A680F5B00A75B9A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = voltraexample/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = com.voltra.example;
+				PRODUCT_NAME = voltraexample;
+				SWIFT_VERSION = 5.0;
+			};
+			name = Release;
+		};
+		83CBBA201A601CBA00E9B192 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		83CBBA211A601CBA00E9B192 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
+				SDKROOT = iphoneos;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "voltraexample" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				13B07F941A680F5B00A75B9A /* Debug */,
+				13B07F951A680F5B00A75B9A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "voltraexample" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				83CBBA201A601CBA00E9B192 /* Debug */,
+				83CBBA211A601CBA00E9B192 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;
+}