@use-voltra/ios-client 2.1.0 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (131) hide show
  1. package/README.md +61 -8
  2. package/build/commonjs/dynamic-widget/api.js +15 -0
  3. package/build/commonjs/dynamic-widget/api.js.map +1 -0
  4. package/build/commonjs/index.js +15 -7
  5. package/build/commonjs/index.js.map +1 -1
  6. package/build/commonjs/native/NativeVoltra.js.map +1 -1
  7. package/build/module/dynamic-widget/api.js +10 -0
  8. package/build/module/dynamic-widget/api.js.map +1 -0
  9. package/build/module/index.js +1 -0
  10. package/build/module/index.js.map +1 -1
  11. package/build/module/native/NativeVoltra.js.map +1 -1
  12. package/build/typescript/commonjs/dynamic-widget/api.d.ts +8 -0
  13. package/build/typescript/commonjs/dynamic-widget/api.d.ts.map +1 -0
  14. package/build/typescript/commonjs/index.d.ts +1 -0
  15. package/build/typescript/commonjs/index.d.ts.map +1 -1
  16. package/build/typescript/commonjs/native/NativeVoltra.d.ts +1 -0
  17. package/build/typescript/commonjs/native/NativeVoltra.d.ts.map +1 -1
  18. package/build/typescript/module/dynamic-widget/api.d.ts +8 -0
  19. package/build/typescript/module/dynamic-widget/api.d.ts.map +1 -0
  20. package/build/typescript/module/index.d.ts +1 -0
  21. package/build/typescript/module/index.d.ts.map +1 -1
  22. package/build/typescript/module/native/NativeVoltra.d.ts +1 -0
  23. package/build/typescript/module/native/NativeVoltra.d.ts.map +1 -1
  24. package/expo-plugin/build/cjs/index.js +3 -1
  25. package/expo-plugin/build/cjs/index.js.map +1 -1
  26. package/expo-plugin/build/cjs/ios-widget/index.js +1 -1
  27. package/expo-plugin/build/cjs/ios-widget/index.js.map +1 -1
  28. package/expo-plugin/build/cjs/ios-widget/podfile.js +38 -12
  29. package/expo-plugin/build/cjs/ios-widget/podfile.js.map +1 -1
  30. package/expo-plugin/build/cjs/ios-widget/xcode/buildPhases.js +143 -107
  31. package/expo-plugin/build/cjs/ios-widget/xcode/buildPhases.js.map +1 -1
  32. package/expo-plugin/build/cjs/ios-widget/xcode/configurationList.js +30 -22
  33. package/expo-plugin/build/cjs/ios-widget/xcode/configurationList.js.map +1 -1
  34. package/expo-plugin/build/cjs/ios-widget/xcode/fileReferences.js +50 -0
  35. package/expo-plugin/build/cjs/ios-widget/xcode/fileReferences.js.map +1 -0
  36. package/expo-plugin/build/cjs/ios-widget/xcode/groups.js +45 -43
  37. package/expo-plugin/build/cjs/ios-widget/xcode/groups.js.map +1 -1
  38. package/expo-plugin/build/cjs/ios-widget/xcode/index.js +77 -91
  39. package/expo-plugin/build/cjs/ios-widget/xcode/index.js.map +1 -1
  40. package/expo-plugin/build/cjs/ios-widget/xcode/mainAppSettings.js +41 -39
  41. package/expo-plugin/build/cjs/ios-widget/xcode/mainAppSettings.js.map +1 -1
  42. package/expo-plugin/build/cjs/ios-widget/xcode/productFile.js +2 -2
  43. package/expo-plugin/build/cjs/ios-widget/xcode/productFile.js.map +1 -1
  44. package/expo-plugin/build/cjs/ios-widget/xcode/target.js +29 -63
  45. package/expo-plugin/build/cjs/ios-widget/xcode/target.js.map +1 -1
  46. package/expo-plugin/build/esm/index.js +3 -1
  47. package/expo-plugin/build/esm/index.js.map +1 -1
  48. package/expo-plugin/build/esm/ios-widget/index.js +1 -1
  49. package/expo-plugin/build/esm/ios-widget/index.js.map +1 -1
  50. package/expo-plugin/build/esm/ios-widget/podfile.js +36 -11
  51. package/expo-plugin/build/esm/ios-widget/podfile.js.map +1 -1
  52. package/expo-plugin/build/esm/ios-widget/xcode/buildPhases.js +143 -106
  53. package/expo-plugin/build/esm/ios-widget/xcode/buildPhases.js.map +1 -1
  54. package/expo-plugin/build/esm/ios-widget/xcode/configurationList.js +31 -22
  55. package/expo-plugin/build/esm/ios-widget/xcode/configurationList.js.map +1 -1
  56. package/expo-plugin/build/esm/ios-widget/xcode/fileReferences.js +45 -0
  57. package/expo-plugin/build/esm/ios-widget/xcode/fileReferences.js.map +1 -0
  58. package/expo-plugin/build/esm/ios-widget/xcode/groups.js +45 -42
  59. package/expo-plugin/build/esm/ios-widget/xcode/groups.js.map +1 -1
  60. package/expo-plugin/build/esm/ios-widget/xcode/index.js +81 -96
  61. package/expo-plugin/build/esm/ios-widget/xcode/index.js.map +1 -1
  62. package/expo-plugin/build/esm/ios-widget/xcode/mainAppSettings.js +41 -39
  63. package/expo-plugin/build/esm/ios-widget/xcode/mainAppSettings.js.map +1 -1
  64. package/expo-plugin/build/esm/ios-widget/xcode/productFile.js +3 -2
  65. package/expo-plugin/build/esm/ios-widget/xcode/productFile.js.map +1 -1
  66. package/expo-plugin/build/esm/ios-widget/xcode/target.js +28 -62
  67. package/expo-plugin/build/esm/ios-widget/xcode/target.js.map +1 -1
  68. package/expo-plugin/build/types/index.d.ts.map +1 -1
  69. package/expo-plugin/build/types/ios-widget/podfile.d.ts +19 -1
  70. package/expo-plugin/build/types/ios-widget/podfile.d.ts.map +1 -1
  71. package/expo-plugin/build/types/ios-widget/xcode/buildPhases.d.ts +3 -7
  72. package/expo-plugin/build/types/ios-widget/xcode/buildPhases.d.ts.map +1 -1
  73. package/expo-plugin/build/types/ios-widget/xcode/configurationList.d.ts +15 -10
  74. package/expo-plugin/build/types/ios-widget/xcode/configurationList.d.ts.map +1 -1
  75. package/expo-plugin/build/types/ios-widget/xcode/fileReferences.d.ts +16 -0
  76. package/expo-plugin/build/types/ios-widget/xcode/fileReferences.d.ts.map +1 -0
  77. package/expo-plugin/build/types/ios-widget/xcode/groups.d.ts +0 -4
  78. package/expo-plugin/build/types/ios-widget/xcode/groups.d.ts.map +1 -1
  79. package/expo-plugin/build/types/ios-widget/xcode/index.d.ts +22 -3
  80. package/expo-plugin/build/types/ios-widget/xcode/index.d.ts.map +1 -1
  81. package/expo-plugin/build/types/ios-widget/xcode/mainAppSettings.d.ts +16 -4
  82. package/expo-plugin/build/types/ios-widget/xcode/mainAppSettings.d.ts.map +1 -1
  83. package/expo-plugin/build/types/ios-widget/xcode/productFile.d.ts +0 -4
  84. package/expo-plugin/build/types/ios-widget/xcode/productFile.d.ts.map +1 -1
  85. package/expo-plugin/build/types/ios-widget/xcode/target.d.ts +11 -26
  86. package/expo-plugin/build/types/ios-widget/xcode/target.d.ts.map +1 -1
  87. package/expo-plugin/src/index.ts +5 -1
  88. package/expo-plugin/src/ios-widget/index.ts +1 -1
  89. package/expo-plugin/src/ios-widget/podfile.ts +46 -13
  90. package/expo-plugin/src/ios-widget/xcode/__fixtures__/fresh.pbxproj +197 -0
  91. package/expo-plugin/src/ios-widget/xcode/__fixtures__/with-existing-extension.pbxproj +321 -0
  92. package/expo-plugin/src/ios-widget/xcode/__fixtures__/with-per-config-signing.pbxproj +203 -0
  93. package/expo-plugin/src/ios-widget/xcode/__snapshots__/applyXcodeChanges.node.test.ts.snap +357 -0
  94. package/expo-plugin/src/ios-widget/xcode/__tests__/pbxConsistency.ts +130 -0
  95. package/expo-plugin/src/ios-widget/xcode/buildPhases.ts +151 -152
  96. package/expo-plugin/src/ios-widget/xcode/configurationList.ts +52 -35
  97. package/expo-plugin/src/ios-widget/xcode/fileReferences.ts +51 -0
  98. package/expo-plugin/src/ios-widget/xcode/groups.ts +52 -54
  99. package/expo-plugin/src/ios-widget/xcode/index.ts +107 -119
  100. package/expo-plugin/src/ios-widget/xcode/mainAppSettings.ts +59 -54
  101. package/expo-plugin/src/ios-widget/xcode/productFile.ts +3 -2
  102. package/expo-plugin/src/ios-widget/xcode/target.ts +31 -83
  103. package/ios/Package.swift +7 -1
  104. package/ios/app/NativeVoltra.mm +19 -0
  105. package/ios/app/VoltraModule.swift +18 -0
  106. package/ios/app/VoltraModuleImpl.swift +16 -0
  107. package/ios/shared/DynamicWidgetPropsCodec.swift +51 -0
  108. package/ios/shared/DynamicWidgetPropsStorage.swift +53 -0
  109. package/ios/shared/DynamicWidgetPropsStore.swift +50 -0
  110. package/ios/shared/DynamicWidgetRenderCoordinator.swift +31 -0
  111. package/ios/shared/DynamicWidgetUpdater.swift +30 -0
  112. package/ios/shared/VoltraConstants.swift +4 -0
  113. package/ios/shared/VoltraJSRenderer.swift +3 -1
  114. package/ios/shared/VoltraNode.swift +6 -2
  115. package/ios/shared/VoltraWidgetDefaults.swift +9 -1
  116. package/ios/target/VoltraClientWidgetRuntime.swift +17 -5
  117. package/ios/target/VoltraHomeWidget.swift +6 -2
  118. package/ios/target/VoltraWidget.swift +3 -1
  119. package/ios/ui/Helpers/VoltraDeepLinkResolver.swift +3 -1
  120. package/ios/ui/Helpers/VoltraProgressDriver.swift +6 -2
  121. package/ios/ui/Layout/VoltraFlexStackLayout.swift +9 -3
  122. package/ios/ui/Style/JSColorParser.swift +24 -8
  123. package/ios/ui/Style/JSGradientParser.swift +36 -12
  124. package/ios/ui/Style/JSStyleParser.swift +36 -12
  125. package/ios/ui/Style/LayoutStyle.swift +12 -4
  126. package/ios/ui/Views/VoltraChart.swift +52 -16
  127. package/ios/ui/Views/VoltraLinearGradient.swift +6 -2
  128. package/package.json +5 -5
  129. package/src/dynamic-widget/api.ts +25 -0
  130. package/src/index.ts +1 -0
  131. package/src/native/NativeVoltra.ts +1 -0
@@ -1,47 +1,66 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.addPbxGroup = addPbxGroup;
4
3
  exports.ensurePbxGroup = ensurePbxGroup;
4
+ const fileReferences_1 = require("./fileReferences");
5
5
  const pbxFile = require('xcode/lib/pbxFile');
6
- /**
7
- * Adds a PBXGroup for the widget extension files.
8
- */
9
- function addPbxGroup(xcodeProject, options) {
10
- const { targetName, widgetFiles } = options;
6
+ function collectGroupFiles(widgetFiles) {
11
7
  const { swiftFiles, intentFiles, assetDirectories, entitlementFiles, plistFiles, localizedStringResources } = widgetFiles;
12
- // Add PBX group with all widget files
13
- const { uuid: pbxGroupUuid } = xcodeProject.addPbxGroup([
8
+ return [
14
9
  ...swiftFiles,
15
10
  ...intentFiles,
16
11
  ...entitlementFiles,
17
12
  ...plistFiles,
18
13
  ...assetDirectories,
19
14
  ...localizedStringResources,
20
- ], targetName, targetName);
21
- // Add PBXGroup to top level group
15
+ ];
16
+ }
17
+ /**
18
+ * Adds a PBXGroup for the widget extension files.
19
+ *
20
+ * Constructs the PBXGroup and its PBXFileReference children by hand rather than delegating to
21
+ * `xcodeProject.addPbxGroup`, because that helper also creates a PBXBuildFile per file as a side
22
+ * effect. Those extra build files collide with the ones managed by the build-phase functions and
23
+ * produce the "no parent for object" consistency errors from issues #87/#32. File references are
24
+ * resolved through the widget-scoped {@link ensureWidgetFileReference} so they are shared with the
25
+ * build phases instead of duplicated.
26
+ *
27
+ * Internal create-only fallback for {@link ensurePbxGroup}; not part of the public pipeline.
28
+ */
29
+ function addPbxGroup(xcodeProject, options) {
30
+ const { targetName, widgetFiles } = options;
31
+ const allFiles = collectGroupFiles(widgetFiles);
32
+ const pbxGroupUuid = xcodeProject.generateUuid();
33
+ const pbxGroup = {
34
+ isa: 'PBXGroup',
35
+ children: [],
36
+ name: targetName,
37
+ path: targetName,
38
+ sourceTree: '"<group>"',
39
+ };
22
40
  const groups = xcodeProject.hash.project.objects['PBXGroup'];
23
- if (pbxGroupUuid) {
24
- Object.keys(groups).forEach(function (key) {
25
- if (groups[key].name === undefined && groups[key].path === undefined) {
26
- xcodeProject.addToPbxGroup(pbxGroupUuid, key);
27
- }
28
- });
41
+ groups[pbxGroupUuid] = pbxGroup;
42
+ groups[`${pbxGroupUuid}_comment`] = targetName;
43
+ for (const filePath of allFiles) {
44
+ const file = new pbxFile(filePath);
45
+ const fileRef = (0, fileReferences_1.ensureWidgetFileReference)(xcodeProject, filePath, targetName);
46
+ pbxGroup.children.push({ value: fileRef, comment: file.basename });
29
47
  }
48
+ // Attach the new group to the top-level (unnamed, path-less) group.
49
+ Object.keys(groups).forEach(function (key) {
50
+ if (/_comment$/.test(key)) {
51
+ return;
52
+ }
53
+ if (groups[key].name === undefined && groups[key].path === undefined) {
54
+ xcodeProject.addToPbxGroup(pbxGroupUuid, key);
55
+ }
56
+ });
30
57
  }
31
58
  /**
32
59
  * Ensures a PBXGroup exists for the widget extension files.
33
60
  */
34
61
  function ensurePbxGroup(xcodeProject, options) {
35
62
  const { targetName, widgetFiles } = options;
36
- const { swiftFiles, intentFiles, assetDirectories, entitlementFiles, plistFiles, localizedStringResources } = widgetFiles;
37
- const allFiles = [
38
- ...swiftFiles,
39
- ...intentFiles,
40
- ...entitlementFiles,
41
- ...plistFiles,
42
- ...assetDirectories,
43
- ...localizedStringResources,
44
- ];
63
+ const allFiles = collectGroupFiles(widgetFiles);
45
64
  const existingGroup = xcodeProject.pbxGroupByName(targetName);
46
65
  if (!existingGroup) {
47
66
  addPbxGroup(xcodeProject, options);
@@ -52,28 +71,11 @@ function ensurePbxGroup(xcodeProject, options) {
52
71
  }
53
72
  for (const filePath of allFiles) {
54
73
  const file = new pbxFile(filePath);
55
- const fileRef = ensureFileReference(xcodeProject, filePath);
74
+ const fileRef = (0, fileReferences_1.ensureWidgetFileReference)(xcodeProject, filePath, targetName);
56
75
  const alreadyInGroup = existingGroup.children.some((child) => child.value === fileRef || child.comment === file.basename);
57
76
  if (!alreadyInGroup) {
58
77
  existingGroup.children.push({ value: fileRef, comment: file.basename });
59
78
  }
60
79
  }
61
80
  }
62
- function ensureFileReference(xcodeProject, filePath) {
63
- const fileReferenceSection = xcodeProject.pbxFileReferenceSection();
64
- const file = new pbxFile(filePath);
65
- for (const key of Object.keys(fileReferenceSection)) {
66
- if (/_comment$/.test(key)) {
67
- continue;
68
- }
69
- const entry = fileReferenceSection[key];
70
- const entryPath = typeof entry?.path === 'string' ? entry.path.replace(/^"|"$/g, '') : '';
71
- if (entryPath === file.path || entryPath === filePath) {
72
- return key;
73
- }
74
- }
75
- file.fileRef = xcodeProject.generateUuid();
76
- xcodeProject.addToPbxFileReferenceSection(file);
77
- return file.fileRef;
78
- }
79
81
  //# sourceMappingURL=groups.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"groups.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/groups.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"groups.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/groups.ts"],"names":[],"mappings":"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"}
@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
34
34
  })();
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.configureXcodeProject = void 0;
37
+ exports.applyXcodeChanges = applyXcodeChanges;
37
38
  const config_plugins_1 = require("@expo/config-plugins");
38
39
  const path = __importStar(require("path"));
39
40
  const fileDiscovery_1 = require("../../utils/fileDiscovery");
@@ -44,6 +45,77 @@ const groups_1 = require("./groups");
44
45
  const mainAppSettings_1 = require("./mainAppSettings");
45
46
  const productFile_1 = require("./productFile");
46
47
  const target_1 = require("./target");
48
+ /**
49
+ * Applies all widget-extension changes to an already-parsed Xcode project.
50
+ *
51
+ * This is the pure core of {@link configureXcodeProject}: it takes the parsed project, the plugin
52
+ * props, the discovered widget files, and whether any widget is client-rendered, then mutates the
53
+ * project in place. It performs no filesystem or `modRequest` access, which makes it directly
54
+ * testable against pbxproj fixtures.
55
+ *
56
+ * When the widget target does not exist yet, the minimal native-target skeleton is created first
57
+ * (targets cannot be "ensured" into existence); every other object is then reconciled by the same
58
+ * idempotent ensure pipeline that runs for an already-existing target.
59
+ */
60
+ function applyXcodeChanges(xcodeProject, props, widgetFiles, hasClientRenderedWidgets = false) {
61
+ const { targetName, bundleIdentifier, deploymentTarget, version, buildNumber } = props;
62
+ const groupName = 'Embed Foundation Extensions';
63
+ // Read main app target settings to synchronize code signing (per configuration).
64
+ const mainAppSettings = (0, mainAppSettings_1.getMainAppTargetSettings)(xcodeProject);
65
+ // Use the deploymentTarget from plugin config (or default), ignore main app's deployment target.
66
+ // This allows the widget extension to have its own deployment target independent of the main app.
67
+ // Resolve (or create) the widget target. A target cannot be reconciled into existence, so the
68
+ // absent case creates the minimal skeleton; from here on both paths share one pipeline.
69
+ let targetUuid = xcodeProject.findTargetKey(targetName);
70
+ if (!targetUuid) {
71
+ targetUuid = xcodeProject.generateUuid();
72
+ (0, target_1.createTargetSkeleton)(xcodeProject, { targetName, targetUuid });
73
+ }
74
+ const target = xcodeProject.pbxNativeTargetSection()[targetUuid];
75
+ // Ensure the configuration list is present and its settings are in sync.
76
+ const xCConfigurationList = (0, configurationList_1.ensureXCConfigurationList)(xcodeProject, {
77
+ targetName,
78
+ bundleIdentifier,
79
+ deploymentTarget,
80
+ version,
81
+ buildNumber,
82
+ mainAppSettings,
83
+ }, target.buildConfigurationList);
84
+ // Ensure the product file (.appex) exists.
85
+ const productFile = (0, productFile_1.ensureProductFile)(xcodeProject, {
86
+ targetName,
87
+ groupName,
88
+ });
89
+ // Point the target at the reconciled configuration list and product file.
90
+ target.productReference = productFile.fileRef;
91
+ target.buildConfigurationList = xCConfigurationList.uuid;
92
+ target.productType = `"com.apple.product-type.app-extension"`;
93
+ target.name = targetName;
94
+ target.productName = targetName;
95
+ if (!target.buildPhases) {
96
+ target.buildPhases = [];
97
+ }
98
+ // Ensure the group first so the widget's file references exist before the build phases
99
+ // reference them (the phases resolve files through the widget-scoped group).
100
+ (0, groups_1.ensurePbxGroup)(xcodeProject, {
101
+ targetName,
102
+ widgetFiles,
103
+ });
104
+ // Ensure build phases and their files.
105
+ (0, buildPhases_1.ensureBuildPhases)(xcodeProject, {
106
+ targetUuid,
107
+ targetName,
108
+ groupName,
109
+ productFile,
110
+ widgetFiles,
111
+ mainTargetUuid: xcodeProject.getFirstTarget().uuid,
112
+ });
113
+ if (hasClientRenderedWidgets) {
114
+ (0, buildPhases_1.ensureWidgetBundleScriptPhase)(xcodeProject, targetUuid);
115
+ }
116
+ (0, target_1.ensureTargetAttributes)(xcodeProject, targetUuid);
117
+ (0, target_1.ensureTargetDependency)(xcodeProject, targetUuid);
118
+ }
47
119
  /**
48
120
  * Plugin step that configures the Xcode project for the widget extension.
49
121
  *
@@ -54,111 +126,25 @@ const target_1 = require("./target");
54
126
  * - Adds build phases (Sources, CopyFiles, Frameworks, Resources)
55
127
  * - Adds PBXGroup for widget files
56
128
  *
57
- * This should run after generateWidgetExtensionFiles so the files exist.
129
+ * This should run after generateWidgetExtensionFiles so the files exist. The wrapper is kept thin:
130
+ * it discovers widget files and detects client-rendered widgets, then delegates the actual pbxproj
131
+ * mutation to {@link applyXcodeChanges}.
58
132
  */
59
133
  const configureXcodeProject = (config, props) => {
60
- const { targetName, bundleIdentifier, deploymentTarget, widgets } = props;
134
+ const { targetName, widgets } = props;
61
135
  return (0, config_plugins_1.withXcodeProject)(config, (config) => {
62
136
  if (config.modRequest.introspect) {
63
137
  return config;
64
138
  }
65
139
  const xcodeProject = config.modResults;
66
- const groupName = 'Embed Foundation Extensions';
67
140
  // The release widget-bundling phase is only needed when a widget is a Dynamic Widget (server
68
141
  // widgets carry no JS bundle). Detect once so both the create and update paths agree.
69
142
  const hasClientRenderedWidgets = !!widgets &&
70
143
  (0, clientRendered_1.detectClientRenderedWidgets)(widgets, config.modRequest.projectRoot).some((widget) => widget.clientRendered);
71
- // Check if target already exists
72
- const nativeTargets = xcodeProject.pbxNativeTargetSection();
73
- const existingTargetKey = xcodeProject.findTargetKey(targetName);
74
- const existingTarget = existingTargetKey ? nativeTargets[existingTargetKey] : null;
75
144
  const { platformProjectRoot } = config.modRequest;
76
145
  const targetPath = path.join(platformProjectRoot, targetName);
77
146
  const widgetFiles = (0, fileDiscovery_1.getIOSWidgetExtensionFiles)(targetPath, targetName);
78
- // Read main app target settings to synchronize code signing
79
- const mainAppSettings = (0, mainAppSettings_1.getMainAppTargetSettings)(xcodeProject);
80
- // Use the deploymentTarget from plugin config (or default), ignore main app's deployment target
81
- // This allows the widget extension to have its own deployment target independent of the main app
82
- if (existingTarget && existingTargetKey) {
83
- // Ensure configuration list is up to date
84
- const xCConfigurationList = (0, configurationList_1.ensureXCConfigurationList)(xcodeProject, {
85
- targetName,
86
- bundleIdentifier,
87
- deploymentTarget,
88
- codeSignStyle: mainAppSettings?.codeSignStyle,
89
- developmentTeam: mainAppSettings?.developmentTeam,
90
- provisioningProfileSpecifier: mainAppSettings?.provisioningProfileSpecifier,
91
- }, existingTarget.buildConfigurationList);
92
- // Ensure product file exists
93
- const productFile = (0, productFile_1.ensureProductFile)(xcodeProject, {
94
- targetName,
95
- groupName,
96
- });
97
- // Update target references
98
- existingTarget.productReference = productFile.fileRef;
99
- existingTarget.buildConfigurationList = xCConfigurationList.uuid;
100
- existingTarget.productType = `"com.apple.product-type.app-extension"`;
101
- existingTarget.name = targetName;
102
- existingTarget.productName = targetName;
103
- if (!existingTarget.buildPhases) {
104
- existingTarget.buildPhases = [];
105
- }
106
- // Ensure build phases and groups
107
- (0, buildPhases_1.ensureBuildPhases)(xcodeProject, {
108
- targetUuid: existingTargetKey,
109
- groupName,
110
- productFile,
111
- widgetFiles,
112
- mainTargetUuid: xcodeProject.getFirstTarget().uuid,
113
- });
114
- if (hasClientRenderedWidgets) {
115
- (0, buildPhases_1.ensureWidgetBundleScriptPhase)(xcodeProject, existingTargetKey);
116
- }
117
- (0, groups_1.ensurePbxGroup)(xcodeProject, {
118
- targetName,
119
- widgetFiles,
120
- });
121
- (0, target_1.ensureTargetAttributes)(xcodeProject, existingTargetKey);
122
- (0, target_1.ensureTargetDependency)(xcodeProject, existingTargetKey);
123
- return config;
124
- }
125
- // Add configuration list
126
- const targetUuid = xcodeProject.generateUuid();
127
- const xCConfigurationList = (0, configurationList_1.addXCConfigurationList)(xcodeProject, {
128
- targetName,
129
- bundleIdentifier,
130
- deploymentTarget,
131
- codeSignStyle: mainAppSettings?.codeSignStyle,
132
- developmentTeam: mainAppSettings?.developmentTeam,
133
- provisioningProfileSpecifier: mainAppSettings?.provisioningProfileSpecifier,
134
- });
135
- // Add product file
136
- const productFile = (0, productFile_1.addProductFile)(xcodeProject, {
137
- targetName,
138
- groupName,
139
- });
140
- // Configure target (native target, project section, dependency)
141
- (0, target_1.configureTarget)(xcodeProject, {
142
- targetName,
143
- targetUuid,
144
- productFile,
145
- xCConfigurationList,
146
- });
147
- // Add build phases
148
- (0, buildPhases_1.addBuildPhases)(xcodeProject, {
149
- targetUuid,
150
- groupName,
151
- productFile,
152
- widgetFiles,
153
- });
154
- if (hasClientRenderedWidgets) {
155
- (0, buildPhases_1.ensureWidgetBundleScriptPhase)(xcodeProject, targetUuid);
156
- }
157
- // Add PBX group
158
- (0, groups_1.addPbxGroup)(xcodeProject, {
159
- targetName,
160
- widgetFiles,
161
- });
147
+ applyXcodeChanges(xcodeProject, props, widgetFiles, hasClientRenderedWidgets);
162
148
  return config;
163
149
  });
164
150
  };
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/index.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,28 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getMainAppTargetSettings = getMainAppTargetSettings;
4
+ /** Strips surrounding quotes from a raw build-setting value. */
5
+ function unquote(value) {
6
+ if (typeof value !== 'string') {
7
+ return undefined;
8
+ }
9
+ return value.replace(/^"|"$/g, '');
10
+ }
11
+ /** Reads the signing-related build settings from a single XCBuildConfiguration. */
12
+ function readSigningSettings(buildSettings) {
13
+ return {
14
+ codeSignStyle: unquote(buildSettings.CODE_SIGN_STYLE),
15
+ developmentTeam: unquote(buildSettings.DEVELOPMENT_TEAM),
16
+ provisioningProfileSpecifier: unquote(buildSettings.PROVISIONING_PROFILE_SPECIFIER),
17
+ };
18
+ }
4
19
  /**
5
- * Reads build settings from the main app target to synchronize code signing with the widget extension.
20
+ * Reads code-signing build settings from every build configuration of the main app target, so the
21
+ * widget extension can synchronize signing per configuration (Debug→Debug, Release→Release).
6
22
  *
7
23
  * @param xcodeProject The Xcode project instance
8
- * @returns The main app target's build settings, or null if not found
24
+ * @returns Signing settings keyed by configuration name plus a first-configuration fallback, or
25
+ * null when the main app target or its configurations cannot be resolved
9
26
  */
10
27
  function getMainAppTargetSettings(xcodeProject) {
11
28
  try {
@@ -13,7 +30,6 @@ function getMainAppTargetSettings(xcodeProject) {
13
30
  if (!mainAppTarget) {
14
31
  return null;
15
32
  }
16
- // Get the build configuration list for the main app target
17
33
  const buildConfigurationListId = mainAppTarget.buildConfigurationList;
18
34
  if (!buildConfigurationListId) {
19
35
  return null;
@@ -21,47 +37,33 @@ function getMainAppTargetSettings(xcodeProject) {
21
37
  // Extract UUID from buildConfigurationListId (it might include a comment like "UUID /* comment */")
22
38
  const buildConfigurationListUuid = buildConfigurationListId.split(' ')[0];
23
39
  const buildConfigurationList = xcodeProject.hash.project.objects['XCConfigurationList']?.[buildConfigurationListUuid];
24
- if (!buildConfigurationList || !buildConfigurationList.buildConfigurations) {
25
- return null;
26
- }
27
- // Get the first build configuration (usually Debug) to read settings
28
- const firstConfigRef = buildConfigurationList.buildConfigurations[0];
29
- if (!firstConfigRef) {
30
- return null;
31
- }
32
- // Extract UUID from config reference (it might include a comment)
33
- const firstConfigUuid = typeof firstConfigRef === 'string' ? firstConfigRef.split(' ')[0] : firstConfigRef.value?.split(' ')[0];
34
- if (!firstConfigUuid) {
40
+ if (!buildConfigurationList?.buildConfigurations) {
35
41
  return null;
36
42
  }
37
- const buildConfiguration = xcodeProject.hash.project.objects['XCBuildConfiguration']?.[firstConfigUuid];
38
- if (!buildConfiguration || !buildConfiguration.buildSettings) {
39
- return null;
43
+ const buildConfigurationSection = xcodeProject.hash.project.objects['XCBuildConfiguration'] ?? {};
44
+ const byConfigurationName = {};
45
+ let fallback = null;
46
+ for (const configRef of buildConfigurationList.buildConfigurations) {
47
+ // Extract UUID from the config reference (it might include a comment)
48
+ const configUuid = typeof configRef === 'string' ? configRef.split(' ')[0] : configRef.value?.split(' ')[0];
49
+ if (!configUuid) {
50
+ continue;
51
+ }
52
+ const buildConfiguration = buildConfigurationSection[configUuid];
53
+ if (!buildConfiguration?.buildSettings) {
54
+ continue;
55
+ }
56
+ const settings = readSigningSettings(buildConfiguration.buildSettings);
57
+ const configName = unquote(buildConfiguration.name);
58
+ if (configName && !(configName in byConfigurationName)) {
59
+ byConfigurationName[configName] = settings;
60
+ }
61
+ fallback = fallback ?? settings;
40
62
  }
41
- const buildSettings = buildConfiguration.buildSettings;
42
- // Extract deployment target (remove quotes if present)
43
- const deploymentTarget = buildSettings.IPHONEOS_DEPLOYMENT_TARGET?.replace(/^"|"$/g, '') ||
44
- buildSettings['IPHONEOS_DEPLOYMENT_TARGET']?.replace(/^"|"$/g, '') ||
45
- null;
46
- // Extract code signing settings
47
- const codeSignStyle = buildSettings.CODE_SIGN_STYLE?.replace(/^"|"$/g, '') ||
48
- buildSettings['CODE_SIGN_STYLE']?.replace(/^"|"$/g, '') ||
49
- null;
50
- const developmentTeam = buildSettings.DEVELOPMENT_TEAM?.replace(/^"|"$/g, '') ||
51
- buildSettings['DEVELOPMENT_TEAM']?.replace(/^"|"$/g, '') ||
52
- null;
53
- const provisioningProfileSpecifier = buildSettings.PROVISIONING_PROFILE_SPECIFIER?.replace(/^"|"$/g, '') ||
54
- buildSettings['PROVISIONING_PROFILE_SPECIFIER']?.replace(/^"|"$/g, '') ||
55
- null;
56
- if (!deploymentTarget) {
63
+ if (!fallback) {
57
64
  return null;
58
65
  }
59
- return {
60
- deploymentTarget,
61
- codeSignStyle: codeSignStyle || undefined,
62
- developmentTeam: developmentTeam || undefined,
63
- provisioningProfileSpecifier: provisioningProfileSpecifier || undefined,
64
- };
66
+ return { byConfigurationName, fallback };
65
67
  }
66
68
  catch {
67
69
  // If we can't read the settings, return null and use fallback values
@@ -1 +1 @@
1
- {"version":3,"file":"mainAppSettings.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/mainAppSettings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mainAppSettings.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/mainAppSettings.ts"],"names":[],"mappings":";;AA6CA,4DAsDC;AA/ED,gEAAgE;AAChE,SAAS,OAAO,CAAC,KAAc;IAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;AACpC,CAAC;AAED,mFAAmF;AACnF,SAAS,mBAAmB,CAAC,aAAsC;IACjE,OAAO;QACL,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC;QACrD,eAAe,EAAE,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC;QACxD,4BAA4B,EAAE,OAAO,CAAC,aAAa,CAAC,8BAA8B,CAAC;KACpF,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,wBAAwB,CAAC,YAA0B;IACjE,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,YAAY,CAAC,cAAc,EAAE,EAAE,WAAW,CAAA;QAChE,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,MAAM,wBAAwB,GAAG,aAAa,CAAC,sBAAsB,CAAA;QACrE,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAA;QACb,CAAC;QAED,oGAAoG;QACpG,MAAM,0BAA0B,GAAG,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAEzE,MAAM,sBAAsB,GAC1B,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAA;QACxF,IAAI,CAAC,sBAAsB,EAAE,mBAAmB,EAAE,CAAC;YACjD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,MAAM,yBAAyB,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAA;QACjG,MAAM,mBAAmB,GAA2C,EAAE,CAAA;QACtE,IAAI,QAAQ,GAAkC,IAAI,CAAA;QAElD,KAAK,MAAM,SAAS,IAAI,sBAAsB,CAAC,mBAAmB,EAAE,CAAC;YACnE,sEAAsE;YACtE,MAAM,UAAU,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;YAC3G,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,SAAQ;YACV,CAAC;YAED,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAA;YAChE,IAAI,CAAC,kBAAkB,EAAE,aAAa,EAAE,CAAC;gBACvC,SAAQ;YACV,CAAC;YAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;YACtE,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;YACnD,IAAI,UAAU,IAAI,CAAC,CAAC,UAAU,IAAI,mBAAmB,CAAC,EAAE,CAAC;gBACvD,mBAAmB,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAA;YAC5C,CAAC;YACD,QAAQ,GAAG,QAAQ,IAAI,QAAQ,CAAA;QACjC,CAAC;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,IAAI,CAAA;QACb,CAAC;QAED,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,CAAA;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,qEAAqE;QACrE,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}
@@ -1,6 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.addProductFile = addProductFile;
4
3
  exports.ensureProductFile = ensureProductFile;
5
4
  function findProductFileReference(xcodeProject, targetName) {
6
5
  const fileReferenceSection = xcodeProject.pbxFileReferenceSection();
@@ -32,7 +31,8 @@ function findBuildFileForFileRef(xcodeProject, fileRef) {
32
31
  return null;
33
32
  }
34
33
  /**
35
- * Adds the product file (.appex) for the widget extension.
34
+ * Adds the product file (.appex) for the widget extension. Internal create-only fallback for
35
+ * {@link ensureProductFile}; not part of the public pipeline.
36
36
  */
37
37
  function addProductFile(xcodeProject, options) {
38
38
  const { targetName, groupName } = options;
@@ -1 +1 @@
1
- {"version":3,"file":"productFile.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/productFile.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"productFile.js","sourceRoot":"","sources":["../../../../src/ios-widget/xcode/productFile.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.configureTarget = configureTarget;
3
+ exports.createTargetSkeleton = createTargetSkeleton;
4
4
  exports.ensureTargetAttributes = ensureTargetAttributes;
5
5
  exports.ensureTargetDependency = ensureTargetDependency;
6
6
  const constants_1 = require("../../constants");
@@ -8,18 +8,36 @@ const constants_1 = require("../../constants");
8
8
  // Main Function
9
9
  // ============================================================================
10
10
  /**
11
- * Configures the widget extension target in the Xcode project.
11
+ * Creates the minimal widget-extension native target and registers it with the project.
12
12
  *
13
- * This:
14
- * - Adds the target to PBXNativeTarget section
15
- * - Adds the target to PBXProject section
16
- * - Adds a dependency from the main app to the widget extension
13
+ * A target cannot be "ensured" into existence, so this is the one create-only step in
14
+ * {@link applyXcodeChanges}: it adds an empty `PBXNativeTarget` (no product reference, configuration
15
+ * list or build phases yet) to the `PBXNativeTarget` and `PBXProject` sections. The shared ensure
16
+ * pipeline then fills in the configuration list, product file, group, build phases, attributes and
17
+ * dependency — the same code that reconciles an already-existing target.
18
+ *
19
+ * @returns The freshly created native-target object (the value stored in the `PBXNativeTarget`
20
+ * section under `targetUuid`).
17
21
  */
18
- function configureTarget(xcodeProject, options) {
19
- const target = addToPbxNativeTargetSection(xcodeProject, options);
20
- addToPbxProjectSection(xcodeProject, target);
21
- addTargetDependency(xcodeProject, target);
22
- return target;
22
+ function createTargetSkeleton(xcodeProject, options) {
23
+ const { targetName, targetUuid } = options;
24
+ const target = {
25
+ uuid: targetUuid,
26
+ pbxNativeTarget: {
27
+ isa: 'PBXNativeTarget',
28
+ name: targetName,
29
+ productName: targetName,
30
+ productType: `"com.apple.product-type.app-extension"`,
31
+ buildConfigurationList: '',
32
+ productReference: '',
33
+ buildPhases: [],
34
+ buildRules: [],
35
+ dependencies: [],
36
+ },
37
+ };
38
+ xcodeProject.addToPbxNativeTargetSection(target);
39
+ xcodeProject.addToPbxProjectSection(target);
40
+ return xcodeProject.pbxNativeTargetSection()[targetUuid];
23
41
  }
24
42
  /**
25
43
  * Ensures target attributes (LastSwiftMigration) exist for the target.
@@ -58,56 +76,4 @@ function ensureTargetDependency(xcodeProject, targetUuid) {
58
76
  xcodeProject.addTargetDependency(mainTargetUuid, [targetUuid]);
59
77
  }
60
78
  }
61
- // ============================================================================
62
- // Helper Functions
63
- // ============================================================================
64
- /**
65
- * Adds the widget extension target to the PBXNativeTarget section.
66
- */
67
- function addToPbxNativeTargetSection(xcodeProject, options) {
68
- const { targetName, targetUuid, productFile, xCConfigurationList } = options;
69
- const target = {
70
- uuid: targetUuid,
71
- pbxNativeTarget: {
72
- isa: 'PBXNativeTarget',
73
- name: targetName,
74
- productName: targetName,
75
- productReference: productFile.fileRef,
76
- productType: `"com.apple.product-type.app-extension"`,
77
- buildConfigurationList: xCConfigurationList.uuid,
78
- buildPhases: [],
79
- buildRules: [],
80
- dependencies: [],
81
- },
82
- };
83
- xcodeProject.addToPbxNativeTargetSection(target);
84
- return target;
85
- }
86
- /**
87
- * Adds the target to the PBXProject section.
88
- */
89
- function addToPbxProjectSection(xcodeProject, target) {
90
- xcodeProject.addToPbxProjectSection(target);
91
- // Add target attributes to project section
92
- const projectSection = xcodeProject.pbxProjectSection();
93
- const firstProject = xcodeProject.getFirstProject();
94
- if (!projectSection[firstProject.uuid].attributes.TargetAttributes) {
95
- projectSection[firstProject.uuid].attributes.TargetAttributes = {};
96
- }
97
- projectSection[firstProject.uuid].attributes.TargetAttributes[target.uuid] = {
98
- LastSwiftMigration: constants_1.IOS.LAST_SWIFT_MIGRATION,
99
- };
100
- }
101
- /**
102
- * Adds a target dependency so the main app depends on the widget extension.
103
- */
104
- function addTargetDependency(xcodeProject, target) {
105
- if (!xcodeProject.hash.project.objects['PBXTargetDependency']) {
106
- xcodeProject.hash.project.objects['PBXTargetDependency'] = {};
107
- }
108
- if (!xcodeProject.hash.project.objects['PBXContainerItemProxy']) {
109
- xcodeProject.hash.project.objects['PBXContainerItemProxy'] = {};
110
- }
111
- xcodeProject.addTargetDependency(xcodeProject.getFirstTarget().uuid, [target.uuid]);
112
- }
113
79
  //# sourceMappingURL=target.js.map