voltra 2.2.0 → 2.3.1

package/build/cjs/platforms/ios/apply.js

@@ -5,6 +5,7 @@ exports.applyIOSPlatform = applyIOSPlatform;
 const ios_1 = require("../../discovery/ios");
 const platformPackages_1 = require("../../dependencies/platformPackages");
 const summary_1 = require("../../reporting/summary");
+const buildConfigurationValues_1 = require("./buildConfigurationValues");
 const entitlements_1 = require("./entitlements");
 const generated_1 = require("./generated");
 const plist_1 = require("./plist");
@@ -41,32 +42,36 @@ async function applyIOSPlatform(context) {
         throw new summary_1.VoltraCliError('iOS config is missing.');
     }
     const discovery = getIOSDiscovery(context.preflight);
+    // Values given per build configuration are collapsed once, so every mutator below sees a plain
+    // string and the project carries the per-configuration values.
+    const { ios, buildSettings } = (0, buildConfigurationValues_1.resolveIOSBuildConfigurationValues)(iosConfig, discovery);
     const generatedResult = await (0, generated_1.generateIOSFiles)({
         projectRoot: context.config.projectRoot,
-        ios: iosConfig,
+        ios,
         discovery,
     });
     const entitlementsResult = await (0, entitlements_1.ensureEntitlements)({
         projectRoot: context.config.projectRoot,
-        ios: iosConfig,
+        ios,
         discovery,
     });
     const infoPlistResult = await (0, plist_1.ensureInfoPlist)({
         projectRoot: context.config.projectRoot,
-        ios: iosConfig,
+        ios,
         discovery,
     });
     const podfileResult = await (0, podfile_1.ensurePodfileBlock)({
         projectRoot: context.config.projectRoot,
-        ios: iosConfig,
+        ios,
         discovery,
     });
     const xcodeTargetResult = await (0, xcodeTarget_1.ensureIOSWidgetTarget)({
         projectRoot: context.config.projectRoot,
-        ios: iosConfig,
+        ios,
         discovery,
         generatedFiles: generatedResult.files,
         previousGeneratedFiles: context.previousState?.files,
+        buildSettings,
     });
     if (generatedResult.targetName !== xcodeTargetResult.targetName) {
         throw new summary_1.VoltraCliError(`iOS generated files and Xcode target mutation resolved different widget target names: ${generatedResult.targetName} vs ${xcodeTargetResult.targetName}.`);
@@ -75,11 +80,10 @@ async function applyIOSPlatform(context) {
         throw new summary_1.VoltraCliError(`iOS generated files and Podfile block resolved different widget target names: ${generatedResult.targetName} vs ${podfileResult.targetName}.`);
     }
     const changes = [
-        infoPlistResult.change,
-        entitlementsResult.change,
-        podfileResult.change,
-        xcodeTargetResult.change,
-    ].filter(isDefined);
+        ...infoPlistResult.changes,
+        ...entitlementsResult.changes,
+        ...[podfileResult.change, xcodeTargetResult.change].filter(isDefined),
+    ];
     return {
         platform: 'ios',
         changes: [...changes, ...generatedResult.changes],
@@ -105,7 +109,13 @@ function isIOSProjectDiscovery(value) {
         candidate.podfilePath,
         candidate.mainTargetName,
         candidate.infoPlistPath,
-    ].every((entry) => typeof entry === 'string' && entry.length > 0) && Array.isArray(candidate.mainTargetCandidates));
+    ].every((entry) => typeof entry === 'string' && entry.length > 0) &&
+        [
+            candidate.mainTargetCandidates,
+            candidate.buildConfigurationNames,
+            candidate.infoPlistPaths,
+            candidate.entitlementsPaths,
+        ].every((entry) => Array.isArray(entry)));
 }
 function isDefined(value) {
     return value !== undefined;

package/build/cjs/platforms/ios/apply.js.map

@@ -1 +1 @@
-{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../../src/platforms/ios/apply.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../../src/platforms/ios/apply.ts"],"names":[],"mappings":"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"}

package/build/cjs/platforms/ios/buildConfigurationValues.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IOSBuildConfigurationValueError = exports.VOLTRA_OWNED_BUILD_SETTINGS = exports.VOLTRA_BUILD_SETTING_PREFIX = void 0;
+exports.resolveIOSBuildConfigurationValues = resolveIOSBuildConfigurationValues;
+const perConfiguration_1 = require("../../config/perConfiguration");
+const summary_1 = require("../../reporting/summary");
+/**
+ * Prefix of the user-defined build settings Voltra writes. Settings under it are Voltra's to add
+ * and remove, so a value that stops being per build configuration leaves nothing behind.
+ */
+exports.VOLTRA_BUILD_SETTING_PREFIX = 'VOLTRA_';
+const APP_GROUP_IDENTIFIER_SETTING = `${exports.VOLTRA_BUILD_SETTING_PREFIX}APP_GROUP_IDENTIFIER`;
+const KEYCHAIN_GROUP_SETTING = `${exports.VOLTRA_BUILD_SETTING_PREFIX}KEYCHAIN_GROUP`;
+/**
+ * The settings Voltra writes and is therefore allowed to remove. Anything else a project happens to
+ * name `VOLTRA_*` belongs to the user and is left alone.
+ */
+exports.VOLTRA_OWNED_BUILD_SETTINGS = [APP_GROUP_IDENTIFIER_SETTING, KEYCHAIN_GROUP_SETTING];
+class IOSBuildConfigurationValueError extends summary_1.VoltraCliError {
+    constructor(message) {
+        super(message, 'VOLTRA_IOS_BUILD_CONFIGURATION_VALUE_FAILED');
+        this.name = 'IOSBuildConfigurationValueError';
+    }
+}
+exports.IOSBuildConfigurationValueError = IOSBuildConfigurationValueError;
+/**
+ * Collapses per-build-configuration values into the single strings the platform mutators consume.
+ *
+ * A plain string resolves to itself and writes no build settings. A value given per build
+ * configuration becomes a user-defined build setting holding one value per configuration, and
+ * resolves to a reference to that setting, which Xcode expands per build into the entitlements and
+ * Info.plist files. The app and the generated widget extension both read the value that way, so
+ * nothing downstream has to know which environment is being built.
+ */
+function resolveIOSBuildConfigurationValues(ios, discovery) {
+    const buildSettings = new Map();
+    const resolve = (settingName, value, context) => {
+        if (!(0, perConfiguration_1.isPerConfigurationMap)(value)) {
+            return value;
+        }
+        const valuesByBuildConfiguration = (0, perConfiguration_1.getValuesByBuildConfiguration)(value, discovery.buildConfigurationNames, context, (message) => new IOSBuildConfigurationValueError(message));
+        for (const [buildConfigurationName, configurationValue] of valuesByBuildConfiguration) {
+            const configurationSettings = buildSettings.get(buildConfigurationName) ?? {};
+            configurationSettings[settingName] = configurationValue;
+            buildSettings.set(buildConfigurationName, configurationSettings);
+        }
+        return `$(${settingName})`;
+    };
+    return {
+        ios: {
+            ...ios,
+            groupIdentifier: resolve(APP_GROUP_IDENTIFIER_SETTING, ios.groupIdentifier, 'ios.groupIdentifier'),
+            keychainGroup: resolve(KEYCHAIN_GROUP_SETTING, ios.keychainGroup, 'ios.keychainGroup'),
+            project: {
+                ...ios.project,
+                entitlementsPath: resolveEntitlementsPath(ios.project.entitlementsPath, discovery),
+            },
+        },
+        buildSettings,
+    };
+}
+/**
+ * The entitlements file of the default build configuration. Unlike a value written into a file, a
+ * per-configuration entitlements path is a build setting of its own, so it is applied to the Xcode
+ * project directly rather than through a reference.
+ */
+function resolveEntitlementsPath(entitlementsPath, discovery) {
+    if (!(0, perConfiguration_1.isPerConfigurationMap)(entitlementsPath)) {
+        return entitlementsPath;
+    }
+    return discovery.entitlementsPathByConfiguration?.get(discovery.buildConfigurationNames[0]);
+}
+//# sourceMappingURL=buildConfigurationValues.js.map

package/build/cjs/platforms/ios/buildConfigurationValues.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildConfigurationValues.js","sourceRoot":"","sources":["../../../../src/platforms/ios/buildConfigurationValues.ts"],"names":[],"mappings":";;;AA6CA,gFA2CC;AAxFD,oEAAoG;AACpG,qDAAwD;AAMxD;;;GAGG;AACU,QAAA,2BAA2B,GAAG,SAAS,CAAA;AAEpD,MAAM,4BAA4B,GAAG,GAAG,mCAA2B,sBAAsB,CAAA;AACzF,MAAM,sBAAsB,GAAG,GAAG,mCAA2B,gBAAgB,CAAA;AAE7E;;;GAGG;AACU,QAAA,2BAA2B,GAAsB,CAAC,4BAA4B,EAAE,sBAAsB,CAAC,CAAA;AASpH,MAAa,+BAAgC,SAAQ,wBAAc;IACjE,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,EAAE,6CAA6C,CAAC,CAAA;QAC7D,IAAI,CAAC,IAAI,GAAG,iCAAiC,CAAA;IAC/C,CAAC;CACF;AALD,0EAKC;AAED;;;;;;;;GAQG;AACH,SAAgB,kCAAkC,CAChD,GAA8B,EAC9B,SAA8B;IAE9B,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkC,CAAA;IAE/D,MAAM,OAAO,GAAG,CACd,WAAmB,EACnB,KAA2C,EAC3C,OAAe,EACK,EAAE;QACtB,IAAI,CAAC,IAAA,wCAAqB,EAAC,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,KAAK,CAAA;QACd,CAAC;QAED,MAAM,0BAA0B,GAAG,IAAA,gDAA6B,EAC9D,KAAK,EACL,SAAS,CAAC,uBAAuB,EACjC,OAAO,EACP,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,+BAA+B,CAAC,OAAO,CAAC,CAC1D,CAAA;QAED,KAAK,MAAM,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,IAAI,0BAA0B,EAAE,CAAC;YACtF,MAAM,qBAAqB,GAAG,aAAa,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAA;YAC7E,qBAAqB,CAAC,WAAW,CAAC,GAAG,kBAAkB,CAAA;YACvD,aAAa,CAAC,GAAG,CAAC,sBAAsB,EAAE,qBAAqB,CAAC,CAAA;QAClE,CAAC;QAED,OAAO,KAAK,WAAW,GAAG,CAAA;IAC5B,CAAC,CAAA;IAED,OAAO;QACL,GAAG,EAAE;YACH,GAAG,GAAG;YACN,eAAe,EAAE,OAAO,CAAC,4BAA4B,EAAE,GAAG,CAAC,eAAe,EAAE,qBAAqB,CAAC;YAClG,aAAa,EAAE,OAAO,CAAC,sBAAsB,EAAE,GAAG,CAAC,aAAa,EAAE,mBAAmB,CAAC;YACtF,OAAO,EAAE;gBACP,GAAG,GAAG,CAAC,OAAO;gBACd,gBAAgB,EAAE,uBAAuB,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC;aACnF;SACF;QACD,aAAa;KACd,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAC9B,gBAAsD,EACtD,SAA8B;IAE9B,IAAI,CAAC,IAAA,wCAAqB,EAAC,gBAAgB,CAAC,EAAE,CAAC;QAC7C,OAAO,gBAAgB,CAAA;IACzB,CAAC;IAED,OAAO,SAAS,CAAC,+BAA+B,EAAE,GAAG,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAA;AAC7F,CAAC"}

package/build/cjs/platforms/ios/entitlements.js

@@ -17,29 +17,44 @@ class IOSEntitlementsMutationError extends summary_1.VoltraCliError {
 exports.IOSEntitlementsMutationError = IOSEntitlementsMutationError;
 async function ensureEntitlements(options) {
     const { projectRoot, ios, discovery } = options;
-    const entitlementsPath = (0, mainAppEntitlements_1.resolveMainAppEntitlementsPath)(discovery);
-    if (!discovery.entitlementsPath) {
-        if (!needsEntitlementsMutation(ios)) {
-            return {};
-        }
+    const entitlementsPaths = resolveEntitlementsPathsToMutate(ios, discovery);
+    if (entitlementsPaths.length === 0) {
+        return { changes: [] };
     }
-    const entitlements = (await (0, readWrite_1.pathExists)(entitlementsPath))
-        ? await (0, plist_1.parsePlistFile)(entitlementsPath, 'main app entitlements', createEntitlementsError)
-        : {};
     const previousVoltraValues = await readPreviousVoltraEntitlementValues(discovery.infoPlistPath);
-    ensureStringArrayValue(entitlements, 'com.apple.security.application-groups', ios.groupIdentifier, previousVoltraValues.appGroupIdentifier);
-    ensureStringArrayValue(entitlements, 'keychain-access-groups', ios.keychainGroup, previousVoltraValues.keychainGroup);
-    if (ios.enablePushNotifications && entitlements['aps-environment'] === undefined) {
-        entitlements['aps-environment'] = 'development';
+    const changes = [];
+    for (const entitlementsPath of entitlementsPaths) {
+        const entitlements = (await (0, readWrite_1.pathExists)(entitlementsPath))
+            ? await (0, plist_1.parsePlistFile)(entitlementsPath, 'main app entitlements', createEntitlementsError)
+            : {};
+        ensureStringArrayValue(entitlements, 'com.apple.security.application-groups', ios.groupIdentifier, previousVoltraValues.appGroupIdentifier);
+        ensureStringArrayValue(entitlements, 'keychain-access-groups', ios.keychainGroup, previousVoltraValues.keychainGroup);
+        if (ios.enablePushNotifications && entitlements['aps-environment'] === undefined) {
+            entitlements['aps-environment'] = 'development';
+        }
+        else if (!ios.enablePushNotifications &&
+            previousVoltraValues.pushNotificationsEnabled &&
+            entitlements['aps-environment'] === 'development') {
+            delete entitlements['aps-environment'];
+        }
+        const nextContent = (0, plist_1.buildPlistXml)(entitlements, createEntitlementsError);
+        const change = await writeEntitlementsIfChanged(projectRoot, entitlementsPath, nextContent);
+        if (change) {
+            changes.push(change);
+        }
     }
-    else if (!ios.enablePushNotifications &&
-        previousVoltraValues.pushNotificationsEnabled &&
-        entitlements['aps-environment'] === 'development') {
-        delete entitlements['aps-environment'];
+    return { changes };
+}
+/**
+ * Every entitlements file the app target references, so each build configuration of a
+ * multi-environment app keeps its own file. Falls back to the standard path when the project
+ * references none and Voltra has values to write.
+ */
+function resolveEntitlementsPathsToMutate(ios, discovery) {
+    if (discovery.entitlementsPaths.length > 0) {
+        return discovery.entitlementsPaths;
     }
-    const nextContent = (0, plist_1.buildPlistXml)(entitlements, createEntitlementsError);
-    const change = await writeEntitlementsIfChanged(projectRoot, entitlementsPath, nextContent);
-    return { change };
+    return needsEntitlementsMutation(ios) ? [(0, mainAppEntitlements_1.resolveMainAppEntitlementsPath)(discovery)] : [];
 }
 function needsEntitlementsMutation(ios) {
     return ios.enablePushNotifications || ios.groupIdentifier !== undefined || ios.keychainGroup !== undefined;

package/build/cjs/platforms/ios/entitlements.js.map

@@ -1 +1 @@
-{"version":3,"file":"entitlements.js","sourceRoot":"","sources":["../../../../src/platforms/ios/entitlements.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entitlements.js","sourceRoot":"","sources":["../../../../src/platforms/ios/entitlements.ts"],"names":[],"mappings":"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"}

package/build/cjs/platforms/ios/generated.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IOSGeneratedFilesError = void 0;
+exports.__test__ = exports.IOSGeneratedFilesError = void 0;
 exports.generateIOSFiles = generateIOSFiles;
 const node_fs_1 = __importDefault(require("node:fs"));
 const promises_1 = __importDefault(require("node:fs/promises"));
@@ -14,6 +14,7 @@ const readWrite_1 = require("../../fs/readWrite");
 const path_1 = require("../../fs/path");
 const summary_1 = require("../../reporting/summary");
 const widgetModule_1 = require("../shared/widgetModule");
+const widgetKind_1 = require("../../config/widgetKind");
 const plist_1 = require("./plist");
 const targetName_1 = require("./targetName");
 const VALID_IMAGE_EXTENSIONS = new Set(['.png', '.jpg', '.jpeg']);
@@ -101,15 +102,17 @@ function createGeneratedFilesError(message) {
 }
 async function generateIOSFiles(options) {
     const { projectRoot, ios, discovery } = options;
+    const voltraVersion = (0, platformPackages_1.getPlatformClientPackageVersion)(projectRoot, 'ios');
     const targetName = (0, targetName_1.resolveIOSWidgetTargetName)(ios, discovery);
     const targetPath = node_path_1.default.join(discovery.iosRoot, targetName);
-    const detectedWidgets = detectClientRenderedWidgets(projectRoot, ios.widgets);
     const mainAppMetadata = await readMainAppMetadata(discovery.infoPlistPath);
     const changes = [];
-    const warnings = [];
+    const warnings = [...(await getDivergentMainAppMetadataWarnings(discovery, mainAppMetadata))];
     const generatedFiles = new Set();
+    const widgetModuleLoader = (0, widgetModule_1.createGeneratedWidgetModuleLoader)(projectRoot, 'ios', createGeneratedFilesError, (message) => warnings.push(message));
+    const detectedWidgets = detectClientRenderedWidgets(projectRoot, widgetModuleLoader, ios.widgets);
     mergeSingleResult(await writeGeneratedTextFile(projectRoot, node_path_1.default.join(projectRoot, IOS_DYNAMIC_WIDGET_MANIFEST_PATH), `${JSON.stringify(createDynamicWidgetsManifest(detectedWidgets), null, 2)}\n`), changes, generatedFiles);
-    const infoPlistResult = await generateInfoPlistFile(projectRoot, targetPath, targetName, ios, mainAppMetadata, detectedWidgets);
+    const infoPlistResult = await generateInfoPlistFile(projectRoot, targetPath, targetName, ios, mainAppMetadata, detectedWidgets, voltraVersion);
     mergeSingleResult(infoPlistResult, changes, generatedFiles);
     const entitlementsResult = await generateEntitlementsFile(projectRoot, targetPath, targetName, ios);
     mergeSingleResult(entitlementsResult, changes, generatedFiles);
@@ -117,7 +120,7 @@ async function generateIOSFiles(options) {
     mergeResult(assetResult, changes, warnings, generatedFiles);
     const fontsResult = await copyIOSFonts(projectRoot, targetPath, ios.fonts);
     mergeResult(fontsResult, changes, warnings, generatedFiles);
-    const initialStatesResult = await generateInitialStatesSwift(projectRoot, detectedWidgets);
+    const initialStatesResult = await generateInitialStatesSwift(projectRoot, widgetModuleLoader, detectedWidgets, voltraVersion);
     mergeSingleResult(await writeGeneratedTextFile(projectRoot, node_path_1.default.join(targetPath, 'VoltraWidgetInitialStates.swift'), initialStatesResult), changes, generatedFiles);
     const widgetBundleResult = await writeGeneratedTextFile(projectRoot, node_path_1.default.join(targetPath, 'VoltraWidgetBundle.swift'), generateWidgetBundleSwift(detectedWidgets));
     mergeSingleResult(widgetBundleResult, changes, generatedFiles);
@@ -131,12 +134,16 @@ async function generateIOSFiles(options) {
         targetPath,
     };
 }
-async function generateInfoPlistFile(projectRoot, targetPath, targetName, ios, mainAppMetadata, widgets) {
+async function generateInfoPlistFile(projectRoot, targetPath, targetName, ios, mainAppMetadata, widgets, voltraVersion) {
     const plistPath = node_path_1.default.join(targetPath, 'Info.plist');
     const fontNames = ios.fonts.map((fontPath) => node_path_1.default.basename(fontPath)).sort();
     const serverWidgets = widgets.filter((widget) => widget.serverUpdate);
     const hasClientRenderedWidget = widgets.some((widget) => widget.clientRendered);
-    const serverUrls = Object.fromEntries(serverWidgets.map((widget) => [widget.id, widget.serverUpdate?.url]));
+    // Keys of the intervals dictionary are the set of server-driven widget ids; a URL appears only
+    // when app.json set one, because it may instead arrive at runtime via setWidgetServerUpdate.
+    const serverUrls = Object.fromEntries(serverWidgets
+        .filter((widget) => widget.serverUpdate?.url !== undefined)
+        .map((widget) => [widget.id, widget.serverUpdate?.url]));
     const serverIntervals = Object.fromEntries(serverWidgets.map((widget) => [widget.id, widget.serverUpdate?.intervalMinutes]));
     const serverRefresh = Object.fromEntries(serverWidgets.map((widget) => [widget.id, widget.serverUpdate?.refresh ?? false]));
     const infoPlist = (0, plist_1.buildPlistXml)({
@@ -157,6 +164,10 @@ async function generateInfoPlistFile(projectRoot, targetPath, targetName, ios, m
         UIAppFonts: fontNames.length > 0 ? fontNames : undefined,
         Voltra_AppGroupIdentifier: ios.groupIdentifier,
         Voltra_KeychainGroup: ios.keychainGroup,
+        Voltra_Version: voltraVersion,
+        // The extension resolves its own kinds too, and Bundle.main there is the extension bundle,
+        // so the map has to be written here as well as into the app's Info.plist.
+        Voltra_WidgetKinds: (0, widgetKind_1.iosWidgetKindOverrides)(widgets),
         Voltra_WidgetServerIntervals: Object.keys(serverIntervals).length > 0 ? serverIntervals : undefined,
         Voltra_WidgetServerRefresh: Object.keys(serverRefresh).length > 0 ? serverRefresh : undefined,
         NSAppTransportSecurity: createWidgetAppTransportSecurity(hasClientRenderedWidget, serverWidgets.length > 0),
@@ -265,6 +276,23 @@ async function generateLocalizedWidgetStrings(projectRoot, targetPath, widgets)
         targetPath,
     };
 }
+/**
+ * The widget extension has a single Info.plist, so its version has to come from one of the app's.
+ * An app whose build configurations disagree on the version would ship an extension that matches
+ * only some of them, which App Store validation rejects, so say so rather than picking silently.
+ */
+async function getDivergentMainAppMetadataWarnings(discovery, mainAppMetadata) {
+    const warnings = [];
+    for (const infoPlistPath of discovery.infoPlistPaths.slice(1)) {
+        const metadata = await readMainAppMetadata(infoPlistPath);
+        if (metadata.shortVersionString === mainAppMetadata.shortVersionString &&
+            metadata.buildNumber === mainAppMetadata.buildNumber) {
+            continue;
+        }
+        warnings.push(`${(0, path_1.toRelativePath)(discovery.iosRoot, infoPlistPath)} sets version ${metadata.shortVersionString} (${metadata.buildNumber}) while ${(0, path_1.toRelativePath)(discovery.iosRoot, discovery.infoPlistPath)} sets ${mainAppMetadata.shortVersionString} (${mainAppMetadata.buildNumber}). The widget extension is generated with the version of the default build configuration. Set ios.project.infoPlistPath to choose a different one.`);
+    }
+    return warnings;
+}
 async function readMainAppMetadata(infoPlistPath) {
     const dict = await (0, plist_1.parsePlistFile)(infoPlistPath, 'main app Info.plist', (message) => new IOSGeneratedFilesError(message));
     const shortVersionString = readPlistString(dict, 'CFBundleShortVersionString') ?? '1.0.0';
@@ -276,11 +304,11 @@ async function readMainAppMetadata(infoPlistPath) {
         urlTypes: urlTypes.length > 0 ? urlTypes : undefined,
     };
 }
-async function generateInitialStatesSwift(projectRoot, widgets) {
+async function generateInitialStatesSwift(projectRoot, loader, widgets, voltraVersion) {
     const serverWidgets = widgets.filter((widget) => !widget.clientRendered);
     const prerenderableServerWidgets = serverWidgets.filter((widget) => widget.initialStatePath);
-    const serverStates = await prerenderWidgetStates(projectRoot, prerenderableServerWidgets, loadIOSWidgetRenderer(projectRoot));
-    const clientStates = await prerenderClientRenderedWidgets(projectRoot, widgets);
+    const serverStates = await prerenderWidgetStates(loader, prerenderableServerWidgets, loadIOSWidgetRenderer(projectRoot));
+    const clientStates = await prerenderClientRenderedWidgets(projectRoot, loader, widgets, voltraVersion);
     const prerenderedStates = new Map([...serverStates, ...clientStates]);
     if (prerenderedStates.size === 0) {
         return [
@@ -349,7 +377,7 @@ function generateWidgetBundleSwift(widgets) {
         appIntentWidgets.length > 0 ? 'import AppIntents' : undefined,
         'import SwiftUI',
         'import WidgetKit',
-        'import VoltraWidget',
+        'import VoltraRuntime',
     ]
         .filter((value) => value !== undefined)
         .join('\n');
@@ -409,9 +437,12 @@ function generateWidgetStruct(widget) {
     const familiesSwift = widget.supportedFamilies.map((family) => IOS_WIDGET_FAMILY_MAP[family]).join(', ');
     const displayNameExpr = createSwiftLabelExpression(widget.id, 'displayName', widget.displayName);
     const descriptionExpr = createSwiftLabelExpression(widget.id, 'description', widget.description);
+    // `entry` picks the render engine and `serverUpdate` picks where the data comes from, so the two
+    // keys together select one of four providers. Runtime code never asks "is this server-driven?" —
+    // the answer is baked in here, once, at generate time.
     const providerAndContent = widget.clientRendered
         ? [
-            '      provider: VoltraClientWidgetProvider(',
+            `      provider: ${widget.serverUpdate ? 'VoltraDynamicWidgetServerUpdateProvider' : 'VoltraClientWidgetProvider'}(`,
             '        widgetId: widgetId,',
             '        initialState: VoltraWidgetInitialStates.getInitialState(for: widgetId)',
             '      )',
@@ -437,7 +468,7 @@ function generateWidgetStruct(widget) {
         '',
         '  public var body: some WidgetConfiguration {',
         '    StaticConfiguration(',
-        `      kind: ${JSON.stringify(`Voltra_Widget_${widget.id}`)},`,
+        `      kind: ${JSON.stringify((0, widgetKind_1.iosWidgetKind)(widget))},`,
         providerAndContent,
         '    }',
         `    .configurationDisplayName(${displayNameExpr})`,
@@ -467,6 +498,22 @@ function generateClientAppIntentWidgetCode(widget) {
         .join('\n');
     const configuredDictionary = createSwiftDictionaryLiteral(widget.appIntent.parameters.map((parameter) => `${JSON.stringify(parameter.name)}: configuration.${parameter.name}`));
     const defaultDictionary = createSwiftDictionaryLiteral(widget.appIntent.parameters.map((parameter) => `${JSON.stringify(parameter.name)}: ${swiftDefaultValue(parameter)}`));
+    // A server-driven Dynamic Widget fetches on every timeline request and schedules the next one
+    // from its resolved interval; a plain one has nothing to ask again for, so its policy is .never.
+    const timelineBody = widget.serverUpdate
+        ? [
+            '    return await VoltraDynamicWidgetServerUpdateProvider.timeline(',
+            '      widgetId: widgetId,',
+            '      family: context.family,',
+            `      configuration: ${configuredDictionary}`,
+            '    )',
+            '  }',
+        ]
+        : [
+            `    let entry = await VoltraClientWidgetProvider.loadEntry(widgetId: widgetId, configuration: ${configuredDictionary})`,
+            '    return Timeline(entries: [entry], policy: .never)',
+            '  }',
+        ];
     return [
         `@available(iOS 17.0, *)`,
         `struct ${intentName}: WidgetConfigurationIntent {`,
@@ -495,10 +542,8 @@ function generateClientAppIntentWidgetCode(widget) {
         `    await VoltraClientWidgetProvider.loadEntry(widgetId: widgetId, configuration: ${configuredDictionary})`,
         '  }',
         '',
-        `  func timeline(for configuration: ${intentName}, in _: Context) async -> Timeline<VoltraClientWidgetEntry> {`,
-        `    let entry = await VoltraClientWidgetProvider.loadEntry(widgetId: widgetId, configuration: ${configuredDictionary})`,
-        '    return Timeline(entries: [entry], policy: .never)',
-        '  }',
+        `  func timeline(for configuration: ${intentName}, in context: Context) async -> Timeline<VoltraClientWidgetEntry> {`,
+        ...timelineBody,
         '}',
         '',
         `@available(iOS 17.0, *)`,
@@ -509,7 +554,7 @@ function generateClientAppIntentWidgetCode(widget) {
         '',
         '  public var body: some WidgetConfiguration {',
         '    AppIntentConfiguration(',
-        `      kind: ${JSON.stringify(`Voltra_Widget_${widget.id}`)},`,
+        `      kind: ${JSON.stringify((0, widgetKind_1.iosWidgetKind)(widget))},`,
         `      intent: ${intentName}.self,`,
         `      provider: ${providerName}()`,
         '    ) { entry in',
@@ -540,7 +585,7 @@ function swiftDefaultValue(parameter) {
 function createSwiftDictionaryLiteral(entries) {
     return entries.length > 0 ? `[${entries.join(', ')}]` : '[:]';
 }
-async function prerenderWidgetStates(projectRoot, widgets, renderer) {
+async function prerenderWidgetStates(loader, widgets, renderer) {
     const prerenderedStates = new Map();
     for (const widget of widgets) {
         const initialStatePath = widget.initialStatePath;
@@ -553,16 +598,15 @@ async function prerenderWidgetStates(projectRoot, widgets, renderer) {
             if (!(await (0, readWrite_1.pathExists)(modulePath))) {
                 throw new IOSGeneratedFilesError(`Initial state file not found for widget '${widget.id}' at ${modulePath}`);
             }
-            const widgetVariants = evaluateLegacyWidgetModule(projectRoot, modulePath);
+            const widgetVariants = evaluateLegacyWidgetModule(loader, modulePath);
             localeStates.set(localeKey, renderer(widgetVariants));
         }
         prerenderedStates.set(widget.id, localeStates);
     }
     return prerenderedStates;
 }
-function evaluateLegacyWidgetModule(projectRoot, filePath) {
-    const exports = (0, widgetModule_1.evaluateWidgetModuleExports)(projectRoot, filePath, createGeneratedFilesError);
-    const widgetVariants = exports.default ?? exports;
+function evaluateLegacyWidgetModule(loader, filePath) {
+    const widgetVariants = loader.loadDefaultExport(filePath);
     if (!widgetVariants || typeof widgetVariants !== 'object') {
         throw new IOSGeneratedFilesError(`Widget file must export widget variants: ${filePath}`);
     }
@@ -594,10 +638,10 @@ function createDynamicWidgetsManifest(widgets) {
         })),
     };
 }
-function detectClientRenderedWidgets(projectRoot, widgets) {
-    return widgets.map((widget) => detectSingleWidget(projectRoot, widget));
+function detectClientRenderedWidgets(projectRoot, loader, widgets) {
+    return widgets.map((widget) => detectSingleWidget(projectRoot, loader, widget));
 }
-function detectSingleWidget(projectRoot, widget) {
+function detectSingleWidget(projectRoot, loader, widget) {
     if (!widget.entry) {
         return {
             ...widget,
@@ -608,7 +652,7 @@ function detectSingleWidget(projectRoot, widget) {
     if (!node_fs_1.default.existsSync(clientSourcePath) || !node_fs_1.default.statSync(clientSourcePath).isFile()) {
         throw createGeneratedFilesError(`[voltra] Dynamic Widget "${widget.id}" entry not found at ${widget.entry}`);
     }
-    const widgetModule = safelyEvaluateDynamicWidget(projectRoot, widget.id, widget.entry, clientSourcePath);
+    const widgetModule = safelyEvaluateDynamicWidget(loader, widget.id, widget.entry, clientSourcePath);
     const widgetFn = readDynamicWidgetExport(widget.id, widget.entry, widgetModule);
     if (typeof widgetFn !== 'function') {
         throw createGeneratedFilesError(`[voltra] Dynamic Widget "${widget.id}" at ${widget.entry} must default-export a function or component.`);
@@ -620,7 +664,7 @@ function detectSingleWidget(projectRoot, widget) {
         clientSourcePath,
     };
 }
-async function prerenderClientRenderedWidgets(projectRoot, widgets) {
+async function prerenderClientRenderedWidgets(projectRoot, loader, widgets, voltraVersion) {
     const clientWidgets = widgets.filter((widget) => widget.clientRendered);
     if (clientWidgets.length === 0) {
         return new Map();
@@ -634,12 +678,12 @@ async function prerenderClientRenderedWidgets(projectRoot, widgets) {
         widgetRenderingMode: 'fullColor',
         showsWidgetContainerBackground: true,
         configuration: undefined,
-        build: widgetModule_1.DYNAMIC_WIDGET_BUILD_INFO,
+        build: (0, widgetModule_1.createDynamicWidgetBuildInfo)(voltraVersion),
     };
     const prerenderedStates = new Map();
     for (const widget of clientWidgets) {
         try {
-            const widgetModule = safelyEvaluateDynamicWidget(projectRoot, widget.id, widget.entry, widget.clientSourcePath);
+            const widgetModule = safelyEvaluateDynamicWidget(loader, widget.id, widget.entry, widget.clientSourcePath);
             const widgetFn = readDynamicWidgetExport(widget.id, widget.entry, widgetModule);
             const element = widgetFn({}, placeholderEnv);
             prerenderedStates.set(widget.id, new Map([[DEFAULT_INITIAL_STATE_LOCALE, JSON.stringify(renderer(element))]]));
@@ -653,9 +697,9 @@ async function prerenderClientRenderedWidgets(projectRoot, widgets) {
     }
     return prerenderedStates;
 }
-function safelyEvaluateDynamicWidget(projectRoot, widgetId, widgetEntry, clientSourcePath) {
+function safelyEvaluateDynamicWidget(loader, widgetId, widgetEntry, clientSourcePath) {
     try {
-        return (0, widgetModule_1.evaluateWidgetModuleExports)(projectRoot, clientSourcePath, createGeneratedFilesError);
+        return loader.load(clientSourcePath);
     }
     catch (error) {
         if (error instanceof IOSGeneratedFilesError) {
@@ -882,4 +926,7 @@ function mergeSingleResult(result, changes, generatedFiles) {
     }
     generatedFiles.add((0, path_1.normalizeRelativePath)(result.relativePath));
 }
+exports.__test__ = {
+    generateWidgetBundleSwift,
+};
 //# sourceMappingURL=generated.js.map