nativescript 9.1.0-alpha.15 → 9.1.0-alpha.16

package/lib/services/ios-project-service.js

@@ -74,10 +74,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this._platformsDirCache = null;
         this._platformOverrideCache = null;
         this._platformData = null;
-        // Track added frameworks by name to prevent duplicates in monorepo/workspace setups
-        // where the same plugin may exist in multiple node_modules paths
         this._addedFrameworks = new Set();
-        // Track added static libraries by name to prevent duplicates in monorepo/workspace setups
         this._addedStaticLibs = new Set();
     }
     getPlatformData(projectData) {
@@ -146,7 +143,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                     ".ico",
                     ".cur",
                     ".xbm",
-                ], // https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIImage_Class/
+                ],
             };
             this._platformsDirCache = projectData.platformsDir;
             this._platformOverrideCache = currentOverride;
@@ -195,11 +192,8 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$fs.ensureDirectoryExists(path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER));
         shell.cp("-R", path.join(frameworkDir, "*"), this.getPlatformData(projectData).projectRoot);
     }
-    //TODO: plamen5kov: revisit this method, might have unnecessary/obsolete logic
     async interpolateData(projectData) {
         const projectRootFilePath = path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER);
-        // Starting with NativeScript for iOS 1.6.0, the project Info.plist file resides not in the platform project,
-        // but in the hello-world app template as a platform specific resource.
         if (this.$fs.exists(path.join(projectRootFilePath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + "-Info.plist"))) {
             this.replaceFileName("-Info.plist", projectRootFilePath, projectData);
         }
@@ -243,9 +237,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     }
     async buildProject(projectRoot, projectData, buildData) {
         const platformData = this.getPlatformData(projectData);
-        // On a first build, the runtime (and any other Swift packages) download
-        // here. Pre-resolve under a clear spinner so the subsequent
-        // "Xcode build..." step doesn't appear to hang while that happens.
         await this.$spmService.ensureSPMDependenciesResolved(platformData, projectData);
         const handler = (data) => {
             this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data);
@@ -296,9 +287,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             return await isDynamicFrameworkBundle(path.join(frameworkPath, frameworkName));
         }
     }
-    /**
-     * Clears the framework and static library tracking sets. Should be called at the start of a new prepare cycle.
-     */
     clearFrameworksCache() {
         this._addedFrameworks.clear();
         this._addedStaticLibs.clear();
@@ -307,7 +295,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         if (this.$hostInfo.isWindows) {
             return;
         }
-        // Check if framework with same name already added (prevents duplicate output errors in monorepos)
         const frameworkName = path.basename(frameworkPath);
         if (this._addedFrameworks.has(frameworkName)) {
             this.$logger.trace(`Framework ${frameworkName} already added, skipping duplicate from ${frameworkPath}`);
@@ -323,51 +310,29 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             frameworkAddOptions["sign"] = true;
         }
         if (this.$options.hostProjectPath) {
-            // always mark xcframeworks for embedding
             frameworkAddOptions["embed"] = true;
             frameworkAddOptions["sign"] = false;
         }
-        // Note: we used to prepend "$(SRCROOT)/" to the framework path, but seems like it's not needed anymore
-        // "$(SRCROOT)/" +
         const frameworkRelativePath = this.getLibSubpathRelativeToProjectPath(frameworkPath, projectData);
         project.addFramework(frameworkRelativePath, frameworkAddOptions);
-        // filePathsArray, buildPhaseType, comment, target, optionsOrFolderType, subfolderPath
-        // project.addBuildPhase(
-        // 	[],
-        // 	"PBXShellScriptBuildPhase",
-        // 	"Debug SRCROOT",
-        // 	undefined,
-        // 	{
-        // 		shellPath: "/bin/sh",
-        // 		shellScript: `echo "SRCROOT: $SRCROOT"`,
-        // 	}
-        // );
         this.savePbxProj(project, projectData);
     }
     async addStaticLibrary(staticLibPath, projectData) {
-        // Check if static library with same name already added (prevents duplicate errors in monorepos)
         const libraryName = path.basename(staticLibPath, ".a");
         if (this._addedStaticLibs.has(libraryName)) {
             this.$logger.trace(`Static library ${libraryName} already added, skipping duplicate from ${staticLibPath}`);
             return;
         }
         this._addedStaticLibs.add(libraryName);
-        // Copy files to lib folder.
         const headersSubpath = path.join(path.dirname(staticLibPath), "include", libraryName);
-        // Add static library to project file and setup header search paths
         const project = this.createPbxProj(projectData);
         const relativeStaticLibPath = this.getLibSubpathRelativeToProjectPath(staticLibPath, projectData);
         project.addFramework(relativeStaticLibPath);
         const relativeHeaderSearchPath = path.join(this.getLibSubpathRelativeToProjectPath(headersSubpath, projectData));
         project.addToHeaderSearchPaths({ relativePath: relativeHeaderSearchPath });
-        // Write the generated modulemap into a CLI-managed folder under the
-        // platform root (never into node_modules). The modulemap references the
-        // plugin's headers in-place via relative paths, so nothing is copied.
         const modulemapDir = path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.GENERATED_PLUGINS_DIR_NAME, libraryName);
         const hasModulemap = this.generateModulemap(headersSubpath, libraryName, modulemapDir);
         if (hasModulemap) {
-            // Put the modulemap dir on the header search path so clang discovers
-            // the module there instead of inside node_modules.
             project.addToHeaderSearchPaths({
                 relativePath: this.getLibSubpathRelativeToProjectPath(modulemapDir, projectData),
             });
@@ -400,58 +365,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                     filesRelativeToProject: true,
                     uuid: "NATIVESCRIPTNATIVESCRIPT",
                 });
-                /**
-                 * 1. Add platforms/ios/{projectname}/app build to the host app
-                 */
-                // Note: allow customization of this targetFolderName
-                // const targetFolderName = "app";
                 const buildFolderPath = path.join(this.$options.hostProjectPath, projectData.projectName);
                 project.addResourceFile(buildFolderPath, {}, "NATIVESCRIPTNATIVESCRIPT");
-                // filePathsArray, buildPhaseType, comment, target, optionsOrFolderType, subfolderPath
-                // project.addBuildPhase(
-                // 	[],
-                // 	"PBXShellScriptBuildPhase",
-                // 	"Copy Metadata (DEBUG)",
-                // 	undefined,
-                // 	{
-                // 		shellPath: "/bin/sh",
-                // 		shellScript: `cp ./platforms/ios/build/Debug-iphonesimulator/metadata-arm64.bin $CONFIGURATION_BUILD_DIR`,
-                // 		outputPaths: [
-                // 			JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-arm64.bin"),
-                // 			// JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-arm64e.bin"),
-                // 			// JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-i386.bin"),
-                // 			// JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-x86_64.bin"),
-                // 		],
-                // 	}
-                // );
                 const metadataPath = path.relative(this.$options.hostProjectPath, buildFolderPath);
                 project.addToOtherLinkerFlags(JSON.stringify(`-sectcreate __DATA __TNSMetadata "${metadataPath}/metadata-arm64.bin"`));
-                // // no shorthand way to get UUID of build phase that i can tell
-                // // methods return the phase as an object but ommitted the actual key (uuid we need)
-                // // this does it same way nativescript-dev-xcode does but gets the uuid we need
-                // const resourcesBuildPhaseKeys = Object.keys(
-                // 	project.hash.project.objects["PBXResourcesBuildPhase"]
-                // );
-                // // console.log('resourcesBuildPhaseKeys:', resourcesBuildPhaseKeys);
-                // const buildPhaseUUID = resourcesBuildPhaseKeys[0];
-                // const comment = `${targetFolderName} in Resources`;
-                // project.hash.project.objects["PBXResourcesBuildPhase"][
-                // 	buildPhaseUUID
-                // ].files.forEach((f: any) => {
-                // 	console.log(f);
-                // });
-                // if (
-                // 	!project.hash.project.objects["PBXResourcesBuildPhase"][
-                // 		buildPhaseUUID
-                // 	].files.find((f: any) => f.comment === comment)
-                // ) {
-                // 	project.addResourceFile(buildFolderPath, {}, buildPhaseUUID);
-                // }
-                /**
-                 * 2. Ensure metadata is copied as a file
-                 * 		The apps metadata-{arch}.bin should be added as a file reference.
-                 */
-                // TODO
                 this.savePbxProj(project, projectData);
             }
             catch (err) {
@@ -503,12 +420,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$fs.deleteDirectory(platformsAppResourcesPath);
         this.$fs.ensureDirectoryExists(platformsAppResourcesPath);
         const platformAppResourcesPath = path.join(projectAppResourcesPath, platformData.normalizedPlatformName);
-        // this allows App_Resources/visionOS
         if (this.$fs.exists(platformAppResourcesPath)) {
             this.$fs.copyFile(path.join(platformAppResourcesPath, "*"), platformsAppResourcesPath);
         }
         else {
-            // otherwise falls back to App_Resources/iOS
             this.$fs.copyFile(path.join(projectAppResourcesPath, this.$devicePlatformsConstants.iOS, "*"), platformsAppResourcesPath);
         }
         this.$fs.deleteFile(path.join(platformsAppResourcesPath, platformData.configurationFileName));
@@ -607,12 +522,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     getLibSubpathRelativeToProjectPath(targetPath, projectData) {
         const projectRoot = this.getPlatformData(projectData).projectRoot;
         const frameworkPath = path.relative(projectRoot, targetPath);
-        // console.log({
-        // 	targetPath,
-        // 	projectRoot,
-        // 	frameworkPath,
-        // 	resolved: path.resolve(projectRoot, frameworkPath),
-        // });
         return frameworkPath;
     }
     getPbxProjPath(projectData) {
@@ -671,7 +580,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$cocoapodsService.removePodfileFromProject(pluginData.name, this.$cocoapodsService.getPluginPodfilePath(pluginData), projectData, projectRoot);
     }
     async handleNativeDependenciesChange(projectData, opts) {
-        // Clear framework tracking for fresh duplicate detection
         this.clearFrameworksCache();
         const platformData = this.getPlatformData(projectData);
         const pluginsData = this.getAllProductionPlugins(projectData);
@@ -683,10 +591,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         const projectPodfilePath = this.$cocoapodsService.getProjectPodfilePath(platformData.projectRoot);
         if (this.$fs.exists(projectPodfilePath)) {
             await this.$cocoapodsService.executePodInstall(platformData.projectRoot, this.$xcprojService.getXcodeprojPath(projectData, platformData.projectRoot));
-            // The `pod install` command adds a new target to the .pbxproject. This target adds additional build phases to Xcode project.
-            // Some of these phases relies on env variables (like PODS_PODFILE_DIR_PATH or PODS_ROOT).
-            // These variables are produced from merge of pod's xcconfig file and project's xcconfig file.
-            // So the correct order is `pod install` to be executed before merging pod's xcconfig file.
             await this.$cocoapodsService.mergePodXcconfigFile(projectData, platformData, opts);
         }
         const pluginSpmPackages = [];
@@ -698,11 +602,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                     const packages = _.get(config, `${platformData.platformNameLowerCase}.SPMPackages`, []);
                     if (packages.length) {
                         for (const pkg of packages) {
-                            // a plugin's local package path is naturally authored relative
-                            // to the plugin itself, but the SPM service resolves relative
-                            // paths against the app project dir. When the app-relative
-                            // path doesn't exist (e.g. non-hoisted node_modules layouts),
-                            // fall back to resolving against the plugin's own directory.
                             if ("path" in pkg &&
                                 pkg.path &&
                                 !path.isAbsolute(pkg.path) &&
@@ -729,7 +628,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         const hasProvision = provision !== undefined;
         const hasTeamId = teamId !== undefined;
         if (hasProvision || hasTeamId) {
-            // Check if the native project's signing is set to the provided provision...
             const pbxprojPath = this.getPbxProjPath(projectData);
             if (this.$fs.exists(pbxprojPath)) {
                 const xcode = this.$pbxprojDomXcode.Xcode.open(pbxprojPath);
@@ -745,9 +643,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                         }
                     }
                     else {
-                        // Specifying provisioning profile requires "Manual" signing style.
-                        // If the current signing style was not "Manual" it was probably "Automatic" or,
-                        // it was not uniform for the debug and release build configurations.
                         changesInfo.signingChanged = true;
                     }
                 }
@@ -761,8 +656,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                         }
                     }
                     else {
-                        // Specifying team id or name requires "Automatic" signing style.
-                        // If the current signing style was not "Automatic" it was probably "Manual".
                         changesInfo.signingChanged = true;
                     }
                 }
@@ -818,11 +711,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         var _a;
         const project = this.createPbxProj(projectData);
         const group = await this.getRootGroup(groupName, sourceFolderPath);
-        // pin the sources to the main app target: without an explicit target the
-        // underlying xcode lib picks whichever "Sources" build phase it finds
-        // first, which can be an extension target (e.g. a widget) once one
-        // exists — compiling plugin native code into extensions breaks their
-        // builds (and bloats them) since they lack the app's search paths.
         project.addPbxGroup(group.files, group.name, group.path, null, {
             isMain: true,
             filesRelativeToProject: true,
@@ -944,7 +832,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             project.removeFromHeaderSearchPaths({
                 relativePath: relativeHeaderSearchPath,
             });
-            // Remove the generated modulemap dir search path (see addStaticLibrary)
             const modulemapDir = path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.GENERATED_PLUGINS_DIR_NAME, path.basename(staticLibPath, ".a"));
             project.removeFromHeaderSearchPaths({
                 relativePath: this.getLibSubpathRelativeToProjectPath(modulemapDir, projectData),
@@ -954,9 +841,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     }
     generateModulemap(headersFolderPath, libraryName, modulemapDir) {
         const modulemapPath = path.join(modulemapDir, "module.modulemap");
-        // A plugin may ship a `.a` without an `include/{lib}` headers folder. In
-        // that case there's nothing to expose as a module - clean up any stale
-        // modulemap and bail out instead of letting readDirectory throw.
         if (!this.$fs.exists(headersFolderPath)) {
             if (this.$fs.exists(modulemapPath)) {
                 this.$fs.deleteFile(modulemapPath);
@@ -973,9 +857,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             }
             return false;
         }
-        // Reference the plugin's headers (still in node_modules) relative to the
-        // generated modulemap's location, so we don't copy headers or write into
-        // node_modules.
         const headers = _.map(headerFiles, (value) => {
             const relativeHeaderPath = path.relative(modulemapDir, path.join(headersFolderPath, value));
             return `header "${relativeHeaderPath}"`;
@@ -991,6 +872,12 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
             this.$fs.deleteFile(pluginsXcconfigFilePath);
         }
+        const appResourcesXcconfigPath = path.join(projectData.appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, constants_2.BUILD_XCCONFIG_FILE_NAME);
+        if (this.$fs.exists(appResourcesXcconfigPath)) {
+            for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
+                await this.$xcconfigService.mergeFiles(appResourcesXcconfigPath, pluginsXcconfigFilePath);
+            }
+        }
         const allPlugins = this.getAllProductionPlugins(projectData);
         for (const plugin of allPlugins) {
             const pluginPlatformsFolderPath = plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
@@ -1001,22 +888,12 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                 }
             }
         }
-        const appResourcesXcconfigPath = path.join(projectData.appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, constants_2.BUILD_XCCONFIG_FILE_NAME);
-        if (this.$fs.exists(appResourcesXcconfigPath)) {
-            for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
-                await this.$xcconfigService.mergeFiles(appResourcesXcconfigPath, pluginsXcconfigFilePath);
-            }
-        }
         for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
             if (!this.$fs.exists(pluginsXcconfigFilePath)) {
-                // We need the pluginsXcconfig file to exist in platforms dir as it is required in the native template:
-                // https://github.com/NativeScript/ios-runtime/blob/9c2b7b5f70b9bee8452b7a24aa6b646214c7d2be/build/project-template/__PROJECT_NAME__/build-debug.xcconfig#L3
-                // From Xcode 10 in case the file is missing, this include fails and the build itself fails (was a warning in previous Xcode versions).
                 this.$fs.writeFile(pluginsXcconfigFilePath, "");
             }
         }
         for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
-            // Set Entitlements Property to point to default file if not set explicitly by the user.
             const entitlementsPropertyValue = this.$xcconfigService.readPropertyValue(pluginsXcconfigFilePath, constants.CODE_SIGN_ENTITLEMENTS);
             if (entitlementsPropertyValue === null &&
                 this.$fs.exists(this.$iOSEntitlementsService.getPlatformsEntitlementsPath(projectData))) {
@@ -1057,11 +934,8 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 exports.IOSProjectService = IOSProjectService;
 IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER = "__PROJECT_NAME__";
 IOSProjectService.IOS_PLATFORM_NAME = "ios";
-// CLI-managed folder under the platform root where we write generated
-// artifacts (e.g. plugin modulemaps) so we never write into node_modules
 IOSProjectService.GENERATED_PLUGINS_DIR_NAME = ".plugins";
 __decorate([
     (0, helpers_2.hook)("buildIOS")
 ], IOSProjectService.prototype, "buildProject", null);
 yok_1.injector.register("iOSProjectService", IOSProjectService);
-//# sourceMappingURL=ios-project-service.js.map

package/lib/services/ios-provision-service.js

@@ -127,8 +127,6 @@ class IOSProvisionService {
     }
     async getDevelopmentTeams() {
         const teams = {};
-        // NOTE: We are reading all provisioning profiles and collect team information from them.
-        // It would be better if we can check the Apple ID registered in Xcode and read the teams associated with it.
         mobileprovision.provision.read().forEach((provision) => provision.TeamIdentifier &&
             provision.TeamIdentifier.forEach((id) => {
                 if (!teams[provision.TeamName]) {
@@ -152,4 +150,3 @@ class IOSProvisionService {
 }
 exports.IOSProvisionService = IOSProvisionService;
 yok_1.injector.register("iOSProvisionService", IOSProvisionService);
-//# sourceMappingURL=ios-provision-service.js.map

package/lib/services/ios-watch-app-service.js

@@ -23,26 +23,26 @@ const resourceExtensions = [
     ".jpeg",
     ".gif",
     ".svg",
-    ".pdf", // Images
+    ".pdf",
     ".ttf",
     ".otf",
     ".woff",
-    ".woff2", // Fonts
-    ".xcassets", // Asset catalogs
+    ".woff2",
+    ".xcassets",
     ".storyboard",
-    ".xib", // Interface files
+    ".xib",
     ".strings",
-    ".stringsdict", // Localization
+    ".stringsdict",
     ".json",
     ".xml",
-    ".plist", // Data files
+    ".plist",
     ".m4a",
     ".mp3",
     ".wav",
-    ".caf", // Audio
+    ".caf",
     ".mp4",
-    ".mov", // Video
-    ".bundle", // Resource bundles
+    ".mov",
+    ".bundle",
 ];
 const WATCH_APP_IDENTIFIER = "watchkitapp";
 const WACTCH_EXTENSION_IDENTIFIER = "watchkitextension";
@@ -76,7 +76,6 @@ class IOSWatchAppService {
         const appPath = path.join(watchAppFolderPath, constants_1.IOS_WATCHAPP_FOLDER);
         const extensionPath = path.join(watchAppFolderPath, constants_1.IOS_WATCHAPP_EXTENSION_FOLDER);
         const hasWatchExtension = this.$fs.exists(extensionPath);
-        // Check if watchapp exists - it's required
         if (!this.$fs.exists(appPath)) {
             return false;
         }
@@ -95,7 +94,6 @@ class IOSWatchAppService {
         await this.configureTarget(appFolder, path.join(appPath, appFolder), `${projectData.projectIdentifiers.ios}.${WATCH_APP_IDENTIFIER}`, configPath, config, watchApptarget, project, projectData, platformData, pbxProjPath, !hasWatchExtension);
         targetUuids.push(watchApptarget.uuid);
         targetNames.push(appFolder);
-        // Extension is optional (Xcode 14+ supports single target)
         if (hasWatchExtension) {
             const extensionFolder = this.$iOSNativeTargetService.getTargetDirectories(extensionPath)[0];
             const configPath = path.join(path.join(extensionPath, extensionFolder), "extension.json");
@@ -114,10 +112,8 @@ class IOSWatchAppService {
             this.$logger.debug("No watch extension found - using single target mode (Xcode 14+)");
         }
         this.$fs.writeFile(pbxProjPath, project.writeSync({ omitEmptyValues: true }));
-        // Add SPM packages (file needs to be saved first)
         const watchSPMPackages = this.getWatchSPMPackages(platformData);
         await this.applySPMPackagesToTargets(targetNames, platformData, projectData.projectDir, watchSPMPackages);
-        // nothing done after we dont need to reload project
         this.$iOSNativeTargetService.prepareSigning(targetUuids, projectData, pbxProjPath);
         if (disableStubBinary) {
             this.applyWatchAppStubBinaryOverrides(appFolder, pbxProjPath);
@@ -128,7 +124,6 @@ class IOSWatchAppService {
         const targetPath = path.join(targetRootPath, targetFolder);
         const targetRelativePath = path.relative(platformData.projectRoot, targetPath);
         const target = project.addTarget(targetFolder, targetType, targetRelativePath, parentTarget, productTargetType);
-        // Add build phases
         project.addBuildPhase([], "PBXSourcesBuildPhase", "Sources", target.uuid);
         project.addBuildPhase([], "PBXResourcesBuildPhase", "Resources", target.uuid);
         project.addBuildPhase([], "PBXFrameworksBuildPhase", "Frameworks", target.uuid);
@@ -136,14 +131,10 @@ class IOSWatchAppService {
         project.addToHeaderSearchPaths(targetPath, target.pbxNativeTarget.productName);
         return target;
     }
-    /**
-     * Recursively add source files from a directory to a target
-     */
     addSourceFilesFromDirectory(dirPath, targetUuid, project, platformData, groupName, excludePatterns) {
         const items = this.getFolderFiles(dirPath, platformData.projectRoot, excludePatterns);
         for (const item of items) {
             const relativePath = path.relative(platformData.projectRoot, item);
-            // Check if file is a source file by extension
             const ext = path.extname(item).toLowerCase();
             if (sourceExtensions.includes(ext)) {
                 this.$logger.debug(`Adding source file: ${relativePath}`);
@@ -166,38 +157,30 @@ class IOSWatchAppService {
             this.$logger.warn(`Error adding watch app resources: ${err.message}`);
         }
     }
-    /**
-     * Recursively add resources from a directory to a target
-     */
     addResourcesFromDirectory(dirPath, targetUuid, project, platformData, groupName, excludePatterns) {
         const items = this.$fs.readDirectory(dirPath);
         for (const item of items) {
-            // Skip hidden files and excluded files/directories
             if (item.startsWith(".") || RESOURCES_TO_IGNORE.indexOf(item) !== -1) {
                 continue;
             }
             const itemPath = path.join(dirPath, item);
             const stats = this.$fs.getFsStats(itemPath);
             const relativePath = path.relative(platformData.projectRoot, itemPath);
-            // Check if file/directory should be excluded based on patterns
             if (excludePatterns &&
                 this.shouldExclude(relativePath, excludePatterns)) {
                 this.$logger.debug(`Excluding from resources: ${relativePath}`);
                 continue;
             }
             if (stats.isDirectory()) {
-                // Special handling for .xcassets, .bundle, and other resource bundles
                 if (item.endsWith(".xcassets") || item.endsWith(".bundle")) {
                     this.$logger.debug(`Adding resource bundle: ${relativePath}`);
                     this.addResourceFile(project, relativePath, { target: targetUuid }, groupName);
                 }
                 else {
-                    // Recursively scan subdirectories
                     this.addResourcesFromDirectory(itemPath, targetUuid, project, platformData, groupName, excludePatterns);
                 }
             }
             else {
-                // Check if file is a resource by extension
                 const ext = path.extname(item).toLowerCase();
                 if (resourceExtensions.includes(ext)) {
                     this.$logger.debug(`Adding resource file: ${relativePath}`);
@@ -221,7 +204,6 @@ class IOSWatchAppService {
         const identifierParts = identifier.split(".");
         identifierParts.pop();
         const wkAppBundleIdentifier = identifierParts.join(".");
-        // Build configuration properties
         const buildConfigProperties = [
             { name: "PRODUCT_BUNDLE_IDENTIFIER", value: identifier },
             { name: "SDKROOT", value: "watchos" },
@@ -257,7 +239,6 @@ class IOSWatchAppService {
         }
         const resourcesExclude = (config === null || config === void 0 ? void 0 : config.resourcesExclude) || [];
         const srcExclude = (config === null || config === void 0 ? void 0 : config.srcExclude) || [];
-        // Handle custom Info.plist path
         if (config === null || config === void 0 ? void 0 : config.infoPlistPath) {
             const infoPlistPath = path.resolve(basedir, config.infoPlistPath);
             if (this.$fs.exists(infoPlistPath)) {
@@ -272,7 +253,6 @@ class IOSWatchAppService {
                 this.$logger.warn(`Custom Info.plist not found at: ${infoPlistPath}`);
             }
         }
-        // Handle custom xcprivacy file path
         if (config === null || config === void 0 ? void 0 : config.xcprivacyPath) {
             const xcprivacyPath = path.resolve(basedir, config.xcprivacyPath);
             if (this.$fs.exists(xcprivacyPath)) {
@@ -294,7 +274,6 @@ class IOSWatchAppService {
             await this.addTargetResources(path.dirname(configPath), [target.uuid], project, platformData, resourcesGroup, resourcesExclude);
         }
         if (config) {
-            // Process additional configurations
             await this.processWatchAppConfiguration(config, basedir, targetName, target, project, projectData, platformData, pbxProjPath, srcExclude, resourcesExclude);
         }
     }
@@ -309,7 +288,6 @@ class IOSWatchAppService {
     }
     async processWatchAppConfiguration(config, basedir, targetName, target, project, projectData, platformData, pbxProjPath, srcExclude, resourcesExclude) {
         this.$logger.debug(`processWatchAppConfiguration ${JSON.stringify(config)}`);
-        // Handle custom resources
         if (config.resources && Array.isArray(config.resources)) {
             this.$logger.debug(`Processing ${config.resources.length} custom resource(s) for watch target: ${targetName}`);
             for (const resourcePath of config.resources) {
@@ -323,8 +301,6 @@ class IOSWatchAppService {
             }
         }
         if (config.SPMPackages && Array.isArray(config.SPMPackages)) {
-            // to be able to add SPM the file needs to be saved
-            // but it means we need to reload it again after spm packages addition
             this.$fs.writeFile(pbxProjPath, project.writeSync({ omitEmptyValues: true }));
             await this.applySPMPackagesToTargets([targetName], platformData, basedir, config.SPMPackages);
             project.parseSync();
@@ -394,7 +370,6 @@ class IOSWatchAppService {
         const items = this.getFolderFiles(dirPath, platformData.projectRoot, excludePatterns);
         for (const item of items) {
             const relativePath = path.relative(platformData.projectRoot, item);
-            // Check if file is a source file by extension
             const ext = path.extname(item).toLowerCase();
             if (sourceExtensions.includes(ext)) {
                 this.$logger.debug(`Adding source file: ${relativePath}`);
@@ -417,7 +392,6 @@ class IOSWatchAppService {
                 return;
             }
             if (stats.isDirectory()) {
-                // Special handling for .xcassets, .bundle - add as bundles, not recursively
                 if (item.endsWith(".xcassets") || item.endsWith(".bundle")) {
                     this.$logger.debug(`Adding resource bundle: ${relativePath} for target:${targetUuid}`);
                     this.addResourceFile(project, relativePath, { target: targetUuid }, groupName);
@@ -446,11 +420,9 @@ class IOSWatchAppService {
         const isFolder = stats.isDirectory() && !isFramework;
         this.$logger.debug(`Adding module dependency: ${JSON.stringify(moduleDef)} to ${targetName}, basedir:${basedir}, isFramework:${isFramework} isFolder:${isFolder}`);
         if (isFramework) {
-            // Handle compiled frameworks (xcframework, framework)
             this.addCompiledFramework(moduleDef, relativePath, targetName, target, project);
         }
         else if (isFolder) {
-            // Handle folder-based modules
             await this.addFolderModule(moduleDef, modulePath, relativePath, targetName, target, config, project, basedir, srcExclude, resourcesExclude, projectData, platformData);
         }
         else {
@@ -474,7 +446,7 @@ class IOSWatchAppService {
         project.addFramework(relativePath, {
             target: target.uuid,
             customFramework: true,
-            embed: moduleDef.embed !== false, // Default to true
+            embed: moduleDef.embed !== false,
         });
         const frameworkDir = path.dirname(relativePath);
         project.addBuildProperty("FRAMEWORK_SEARCH_PATHS", `"$(inherited)" "${frameworkDir}"`, null, targetName);
@@ -524,7 +496,6 @@ class IOSWatchAppService {
             explicitFileType: "wrapper.framework",
             ...otherProps,
         });
-        // Add build phases
         project.addBuildPhase([], "PBXSourcesBuildPhase", "Sources", moduleTarget.uuid);
         project.addBuildPhase([], "PBXResourcesBuildPhase", "Resources", moduleTarget.uuid);
         project.addBuildPhase([], "PBXFrameworksBuildPhase", "Frameworks", moduleTarget.uuid);
@@ -582,8 +553,6 @@ class IOSWatchAppService {
             }
         }
         if (moduleDef.SPMPackages && Array.isArray(moduleDef.SPMPackages)) {
-            // to be able to add SPM the file needs to be saved
-            // but it means we need to reload it again after spm packages addition
             this.$fs.writeFile(project.filepath, project.writeSync({ omitEmptyValues: true }));
             await this.applySPMPackagesToTargets([moduleName], platformData, basedir, moduleDef.SPMPackages.map((t) => {
                 if (typeof t === "string") {
@@ -606,9 +575,6 @@ class IOSWatchAppService {
         }
         this.$logger.debug(`Added folder-based module ${moduleName} at ${relativePath}`);
     }
-    /**
-     * Add linker flags to a target's build settings
-     */
     addLinkerFlags(flags, targetName, project) {
         for (const flag of flags) {
             const currentFlags = this.getBuildProperty("OTHER_LDFLAGS", targetName, project);
@@ -624,11 +590,7 @@ class IOSWatchAppService {
             this.$logger.debug(`Added linker flag: ${flag}`);
         }
     }
-    /**
-     * Get build property value for a specific target
-     */
     getBuildProperty(propertyName, targetName, project) {
-        // Access the project hash to read build settings
         const projectHash = project.hash;
         if (!projectHash) {
             return null;
@@ -648,9 +610,6 @@ class IOSWatchAppService {
         }
         return null;
     }
-    /**
-     * Check if a path should be excluded based on glob patterns
-     */
     shouldExclude(filePath, excludePatterns) {
         for (const pattern of excludePatterns) {
             const matcher = new minimatch_1.Minimatch(pattern, { dot: true });
@@ -660,9 +619,6 @@ class IOSWatchAppService {
         }
         return false;
     }
-    /**
-     * Apply SPM packages to watch app targets
-     */
     async applySPMPackagesToTargets(targetNames, platformData, basedir, watchSPMPackages) {
         try {
             this.$logger.debug(`applySPMPackagesToTargets ${JSON.stringify(watchSPMPackages)}`);
@@ -681,7 +637,6 @@ class IOSWatchAppService {
                 this.$logger.debug("No iOS project found via trapeze");
                 return;
             }
-            // Add SPM packages to each watch target
             for (const pkg of watchSPMPackages) {
                 if ("path" in pkg) {
                     pkg.path = path.resolve(basedir, pkg.path);
@@ -698,16 +653,11 @@ class IOSWatchAppService {
             this.$logger.debug(`Error applying SPM packages to targets ${targetNames} "`, err);
         }
     }
-    /**
-     * Get SPM packages configured for watch app targets
-     */
     getWatchSPMPackages(platformData) {
         const $projectConfigService = yok_1.injector.resolve("projectConfigService");
-        // Check for watch-specific SPM packages in config
         const watchPackages = $projectConfigService.getValue(`${platformData.platformNameLowerCase}.watchApp.SPMPackages`, []);
         return watchPackages;
     }
 }
 exports.IOSWatchAppService = IOSWatchAppService;
 yok_1.injector.register("iOSWatchAppService", IOSWatchAppService);
-//# sourceMappingURL=ios-watch-app-service.js.map

package/lib/services/ip-service.js

@@ -38,7 +38,6 @@ class IPService {
         return ipAddress;
     }
     async getIPAddressFromIpifyOrgAPI() {
-        // https://www.ipify.org/
         const ipifyOrgAPIEndpoint = "https://api.ipify.org";
         let ipAddress = null;
         try {
@@ -62,4 +61,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], IPService.prototype, "getCurrentIPv4Address", null);
 yok_1.injector.register("ipService", IPService);
-//# sourceMappingURL=ip-service.js.map

package/lib/services/itmstransporter-service.js

@@ -191,4 +191,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], ITMSTransporterService.prototype, "getITMSTransporterPath", null);
 yok_1.injector.register("itmsTransporterService", ITMSTransporterService);
-//# sourceMappingURL=itmstransporter-service.js.map