@akylas/nativescript-cli 8.7.2 → 8.8.3

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

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IOSProjectService = exports.VisionSimulatorPlatformSdkName = exports.VisionDevicePlatformSdkName = exports.SimulatorPlatformSdkName = exports.DevicePlatformSdkName = void 0;
 const path = require("path");
@@ -90,7 +81,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             projectData.platformsDir &&
             this._platformsDirCache !== projectData.platformsDir) {
             const platform = this.$mobileHelper.normalizePlatformName((_a = this.$options.platformOverride) !== null && _a !== void 0 ? _a : this.$devicePlatformsConstants.iOS);
-            const projectRoot = path.join(projectData.platformsDir, platform.toLowerCase());
+            const projectRoot = this.$options.hostProjectPath
+                ? this.$options.hostProjectPath
+                : path.join(projectData.platformsDir, platform.toLowerCase());
             const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, platform.toLowerCase());
             this._platformData = {
                 frameworkPackageName: runtimePackage.name,
@@ -148,119 +141,107 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         }
         return this._platformData;
     }
-    validateOptions(projectId, provision, teamId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (provision && teamId) {
-                this.$errors.fail("The options --provision and --teamId are mutually exclusive.");
-            }
-            if (provision === true) {
-                yield this.$iOSProvisionService.listProvisions(projectId);
-                this.$errors.fail("Please provide provisioning profile uuid or name with the --provision option.");
-            }
-            if (teamId === true) {
-                yield this.$iOSProvisionService.listTeams();
-                this.$errors.fail("Please provide team id or team name with the --teamId options.");
-            }
-            return true;
-        });
+    async validateOptions(projectId, provision, teamId) {
+        if (provision && teamId) {
+            this.$errors.fail("The options --provision and --teamId are mutually exclusive.");
+        }
+        if (provision === true) {
+            await this.$iOSProvisionService.listProvisions(projectId);
+            this.$errors.fail("Please provide provisioning profile uuid or name with the --provision option.");
+        }
+        if (teamId === true) {
+            await this.$iOSProvisionService.listTeams();
+            this.$errors.fail("Please provide team id or team name with the --teamId options.");
+        }
+        return true;
     }
     getAppResourcesDestinationDirectoryPath(projectData) {
         return path.join(this.getPlatformData(projectData).projectRoot, projectData.projectName, "Resources");
     }
-    validate(projectData, options, notConfiguredEnvOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.$hostInfo.isDarwin) {
-                return;
-            }
-            const checkEnvironmentRequirementsOutput = yield this.$platformEnvironmentRequirements.checkEnvironmentRequirements({
-                platform: this.getPlatformData(projectData).normalizedPlatformName,
-                projectDir: projectData.projectDir,
-                options,
-                notConfiguredEnvOptions,
-            });
-            if (checkEnvironmentRequirementsOutput &&
-                checkEnvironmentRequirementsOutput.canExecute) {
-                const xcodeWarning = yield this.$sysInfo.getXcodeWarning();
-                if (xcodeWarning) {
-                    this.$logger.warn(xcodeWarning);
-                }
-            }
-            return {
-                checkEnvironmentRequirementsOutput,
-            };
+    async validate(projectData, options, notConfiguredEnvOptions) {
+        if (!this.$hostInfo.isDarwin) {
+            return;
+        }
+        const checkEnvironmentRequirementsOutput = await this.$platformEnvironmentRequirements.checkEnvironmentRequirements({
+            platform: this.getPlatformData(projectData).normalizedPlatformName,
+            projectDir: projectData.projectDir,
+            options,
+            notConfiguredEnvOptions,
         });
+        if (checkEnvironmentRequirementsOutput &&
+            checkEnvironmentRequirementsOutput.canExecute) {
+            const xcodeWarning = await this.$sysInfo.getXcodeWarning();
+            if (xcodeWarning) {
+                this.$logger.warn(xcodeWarning);
+            }
+        }
+        return {
+            checkEnvironmentRequirementsOutput,
+        };
     }
-    createProject(frameworkDir, frameworkVersion, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$fs.ensureDirectoryExists(path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER));
-            shell.cp("-R", path.join(frameworkDir, "*"), this.getPlatformData(projectData).projectRoot);
-        });
+    async createProject(frameworkDir, frameworkVersion, projectData) {
+        this.$fs.ensureDirectoryExists(path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER));
+        shell.cp("-R", path.join(frameworkDir, "*"), this.getPlatformData(projectData).projectRoot);
     }
-    interpolateData(projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const projectRootFilePath = path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER);
-            if (this.$fs.exists(path.join(projectRootFilePath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + "-Info.plist"))) {
-                this.replaceFileName("-Info.plist", projectRootFilePath, projectData);
-            }
-            this.replaceFileName("-Prefix.pch", projectRootFilePath, projectData);
-            if (this.$fs.exists(path.join(projectRootFilePath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + ".entitlements"))) {
-                this.replaceFileName(".entitlements", projectRootFilePath, projectData);
-            }
-            const xcschemeDirPath = path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER +
-                constants_2.IosProjectConstants.XcodeProjExtName, "xcshareddata/xcschemes");
-            const xcschemeFilePath = path.join(xcschemeDirPath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER +
-                constants_2.IosProjectConstants.XcodeSchemeExtName);
-            if (this.$fs.exists(xcschemeFilePath)) {
-                this.$logger.trace("Found shared scheme at xcschemeFilePath, renaming to match project name.");
-                this.$logger.trace("Checkpoint 0");
-                this.replaceFileContent(xcschemeFilePath, projectData);
-                this.$logger.trace("Checkpoint 1");
-                this.replaceFileName(constants_2.IosProjectConstants.XcodeSchemeExtName, xcschemeDirPath, projectData);
-                this.$logger.trace("Checkpoint 2");
-            }
-            else {
-                this.$logger.trace("Copying xcscheme from template not found at " + xcschemeFilePath);
-            }
-            this.replaceFileName(constants_2.IosProjectConstants.XcodeProjExtName, this.getPlatformData(projectData).projectRoot, projectData);
-            const pbxprojFilePath = this.getPbxProjPath(projectData);
-            this.replaceFileContent(pbxprojFilePath, projectData);
-            const internalDirPath = path.join(projectRootFilePath, "..", "internal");
-            const xcframeworksFilePath = path.join(internalDirPath, "XCFrameworks.zip");
-            if (this.$fs.exists(xcframeworksFilePath)) {
-                yield this.$fs.unzip(xcframeworksFilePath, internalDirPath);
-                this.$fs.deleteFile(xcframeworksFilePath);
-            }
-        });
+    async interpolateData(projectData) {
+        const projectRootFilePath = path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER);
+        if (this.$fs.exists(path.join(projectRootFilePath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + "-Info.plist"))) {
+            this.replaceFileName("-Info.plist", projectRootFilePath, projectData);
+        }
+        this.replaceFileName("-Prefix.pch", projectRootFilePath, projectData);
+        if (this.$fs.exists(path.join(projectRootFilePath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + ".entitlements"))) {
+            this.replaceFileName(".entitlements", projectRootFilePath, projectData);
+        }
+        const xcschemeDirPath = path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER +
+            constants_2.IosProjectConstants.XcodeProjExtName, "xcshareddata/xcschemes");
+        const xcschemeFilePath = path.join(xcschemeDirPath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER +
+            constants_2.IosProjectConstants.XcodeSchemeExtName);
+        if (this.$fs.exists(xcschemeFilePath)) {
+            this.$logger.trace("Found shared scheme at xcschemeFilePath, renaming to match project name.");
+            this.$logger.trace("Checkpoint 0");
+            this.replaceFileContent(xcschemeFilePath, projectData);
+            this.$logger.trace("Checkpoint 1");
+            this.replaceFileName(constants_2.IosProjectConstants.XcodeSchemeExtName, xcschemeDirPath, projectData);
+            this.$logger.trace("Checkpoint 2");
+        }
+        else {
+            this.$logger.trace("Copying xcscheme from template not found at " + xcschemeFilePath);
+        }
+        this.replaceFileName(constants_2.IosProjectConstants.XcodeProjExtName, this.getPlatformData(projectData).projectRoot, projectData);
+        const pbxprojFilePath = this.getPbxProjPath(projectData);
+        this.replaceFileContent(pbxprojFilePath, projectData);
+        const internalDirPath = path.join(projectRootFilePath, "..", "internal");
+        const xcframeworksFilePath = path.join(internalDirPath, "XCFrameworks.zip");
+        if (this.$fs.exists(xcframeworksFilePath)) {
+            await this.$fs.unzip(xcframeworksFilePath, internalDirPath);
+            this.$fs.deleteFile(xcframeworksFilePath);
+        }
     }
     interpolateConfigurationFile(projectData) {
         return undefined;
     }
-    cleanProject(projectRoot, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return null;
-        });
+    async cleanProject(projectRoot, projectData) {
+        return null;
     }
     afterCreateProject(projectRoot, projectData) {
         this.$fs.rename(path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER), path.join(projectRoot, projectData.projectName));
     }
-    buildProject(projectRoot, projectData, buildData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const platformData = this.getPlatformData(projectData);
-            const handler = (data) => {
-                this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data);
-            };
-            if (buildData.buildForDevice) {
-                yield this.$iOSSigningService.setupSigningForDevice(projectRoot, projectData, buildData);
-                yield (0, helpers_1.attachAwaitDetach)(constants.BUILD_OUTPUT_EVENT_NAME, this.$childProcess, handler, this.$xcodebuildService.buildForDevice(platformData, projectData, buildData));
-            }
-            else if (buildData.buildForAppStore) {
-                yield (0, helpers_1.attachAwaitDetach)(constants.BUILD_OUTPUT_EVENT_NAME, this.$childProcess, handler, this.$xcodebuildService.buildForAppStore(platformData, projectData, buildData));
-            }
-            else {
-                yield (0, helpers_1.attachAwaitDetach)(constants.BUILD_OUTPUT_EVENT_NAME, this.$childProcess, handler, this.$xcodebuildService.buildForSimulator(platformData, projectData, buildData));
-            }
-            this.validateApplicationIdentifier(projectData);
-        });
+    async buildProject(projectRoot, projectData, buildData) {
+        const platformData = this.getPlatformData(projectData);
+        const handler = (data) => {
+            this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data);
+        };
+        if (buildData.buildForDevice) {
+            await this.$iOSSigningService.setupSigningForDevice(projectRoot, projectData, buildData);
+            await (0, helpers_1.attachAwaitDetach)(constants.BUILD_OUTPUT_EVENT_NAME, this.$childProcess, handler, this.$xcodebuildService.buildForDevice(platformData, projectData, buildData));
+        }
+        else if (buildData.buildForAppStore) {
+            await (0, helpers_1.attachAwaitDetach)(constants.BUILD_OUTPUT_EVENT_NAME, this.$childProcess, handler, this.$xcodebuildService.buildForAppStore(platformData, projectData, buildData));
+        }
+        else {
+            await (0, helpers_1.attachAwaitDetach)(constants.BUILD_OUTPUT_EVENT_NAME, this.$childProcess, handler, this.$xcodebuildService.buildForSimulator(platformData, projectData, buildData));
+        }
+        this.validateApplicationIdentifier(projectData);
     }
     isPlatformPrepared(projectRoot, projectData) {
         return this.$fs.exists(path.join(projectRoot, projectData.projectName, constants.APP_FOLDER_NAME));
@@ -268,115 +249,130 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     cleanDeviceTempFolder(deviceIdentifier) {
         return Promise.resolve();
     }
-    isDynamicFramework(frameworkPath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const isDynamicFrameworkBundle = (bundlePath, frameworkName) => __awaiter(this, void 0, void 0, function* () {
-                const frameworkBinaryPath = path.join(bundlePath, frameworkName);
-                const fileResult = (yield this.$childProcess.spawnFromEvent("file", [frameworkBinaryPath], "close")).stdout;
-                const isDynamicallyLinked = _.includes(fileResult, "dynamically linked");
-                return isDynamicallyLinked;
-            });
-            if (path.extname(frameworkPath) === ".xcframework") {
-                let isDynamic = true;
-                const plistJson = this.$plistParser.parseFileSync(path.join(frameworkPath, "Info.plist"));
-                for (const library of plistJson.AvailableLibraries) {
-                    const singlePlatformFramework = path.join(frameworkPath, library.LibraryIdentifier, library.LibraryPath);
-                    if (this.$fs.exists(singlePlatformFramework)) {
-                        const frameworkName = path.basename(singlePlatformFramework, path.extname(singlePlatformFramework));
-                        isDynamic = yield isDynamicFrameworkBundle(singlePlatformFramework, frameworkName);
-                        break;
-                    }
+    async isDynamicFramework(frameworkPath) {
+        const isDynamicFrameworkBundle = async (bundlePath, frameworkName) => {
+            const frameworkBinaryPath = path.join(bundlePath, frameworkName);
+            const fileResult = (await this.$childProcess.spawnFromEvent("file", [frameworkBinaryPath], "close")).stdout;
+            const isDynamicallyLinked = _.includes(fileResult, "dynamically linked");
+            return isDynamicallyLinked;
+        };
+        if (path.extname(frameworkPath) === ".xcframework") {
+            let isDynamic = true;
+            const plistJson = this.$plistParser.parseFileSync(path.join(frameworkPath, "Info.plist"));
+            for (const library of plistJson.AvailableLibraries) {
+                const singlePlatformFramework = path.join(frameworkPath, library.LibraryIdentifier, library.LibraryPath);
+                if (this.$fs.exists(singlePlatformFramework)) {
+                    const frameworkName = path.basename(singlePlatformFramework, path.extname(singlePlatformFramework));
+                    isDynamic = await isDynamicFrameworkBundle(singlePlatformFramework, frameworkName);
+                    break;
                 }
-                return isDynamic;
             }
-            else {
-                const frameworkName = path.basename(frameworkPath, path.extname(frameworkPath));
-                return yield isDynamicFrameworkBundle(frameworkPath, frameworkName);
-            }
-        });
+            return isDynamic;
+        }
+        else {
+            const frameworkName = path.basename(frameworkPath, path.extname(frameworkPath));
+            return await isDynamicFrameworkBundle(frameworkPath, frameworkName);
+        }
     }
-    addFramework(frameworkPath, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.$hostInfo.isWindows) {
-                this.validateFramework(frameworkPath);
-                const project = this.createPbxProj(projectData);
-                const frameworkAddOptions = { customFramework: true };
-                const dynamic = yield this.isDynamicFramework(frameworkPath);
-                if (dynamic) {
-                    frameworkAddOptions["embed"] = true;
-                    frameworkAddOptions["sign"] = true;
-                }
-                const frameworkRelativePath = "$(SRCROOT)/" +
-                    this.getLibSubpathRelativeToProjectPath(frameworkPath, projectData);
-                project.addFramework(frameworkRelativePath, frameworkAddOptions);
-                this.savePbxProj(project, projectData);
-            }
-        });
+    async addFramework(frameworkPath, projectData) {
+        if (this.$hostInfo.isWindows) {
+            return;
+        }
+        this.validateFramework(frameworkPath);
+        const project = this.createPbxProj(projectData);
+        const frameworkAddOptions = { customFramework: true };
+        const dynamic = await this.isDynamicFramework(frameworkPath);
+        if (dynamic) {
+            frameworkAddOptions["embed"] = true;
+            frameworkAddOptions["sign"] = true;
+        }
+        if (this.$options.hostProjectPath) {
+            frameworkAddOptions["embed"] = true;
+            frameworkAddOptions["sign"] = false;
+        }
+        const frameworkRelativePath = this.getLibSubpathRelativeToProjectPath(frameworkPath, projectData);
+        project.addFramework(frameworkRelativePath, frameworkAddOptions);
+        this.savePbxProj(project, projectData);
     }
-    addStaticLibrary(staticLibPath, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const libraryName = path.basename(staticLibPath, ".a");
-            const headersSubpath = path.join(path.dirname(staticLibPath), "include", libraryName);
-            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 });
-            this.generateModulemap(headersSubpath, libraryName);
-            this.savePbxProj(project, projectData);
-        });
+    async addStaticLibrary(staticLibPath, projectData) {
+        const libraryName = path.basename(staticLibPath, ".a");
+        const headersSubpath = path.join(path.dirname(staticLibPath), "include", libraryName);
+        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 });
+        this.generateModulemap(headersSubpath, libraryName);
+        this.savePbxProj(project, projectData);
     }
-    prepareProject(projectData, prepareData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const projectRoot = path.join(projectData.platformsDir, "ios");
-            const platformData = this.getPlatformData(projectData);
-            const pluginsData = this.getAllProductionPlugins(projectData);
-            const pbxProjPath = this.getPbxProjPath(projectData);
-            this.$iOSExtensionsService.removeExtensions({ pbxProjPath });
-            yield this.addExtensions(projectData, pluginsData);
-            const resourcesDirectoryPath = projectData.getAppResourcesDirectoryPath();
-            const provision = prepareData && prepareData.provision;
-            const teamId = prepareData && prepareData.teamId;
-            if (provision) {
-                yield this.$iOSSigningService.setupSigningFromProvision(projectRoot, projectData, provision, prepareData.mobileProvisionData);
-            }
-            if (teamId) {
-                yield this.$iOSSigningService.setupSigningFromTeam(projectRoot, projectData, teamId);
-            }
-            const project = this.createPbxProj(projectData);
-            const resources = project.pbxGroupByName("Resources");
-            if (resources) {
-                const references = project.pbxFileReferenceSection();
-                const xcodeProjectImages = _.map(resources.children, (resource) => this.replace(references[resource.value].name));
-                this.$logger.trace("Images from Xcode project");
-                this.$logger.trace(xcodeProjectImages);
-                const appResourcesImages = this.$fs.readDirectory(this.getAppResourcesDestinationDirectoryPath(projectData));
-                this.$logger.trace("Current images from App_Resources");
-                this.$logger.trace(appResourcesImages);
-                const imagesToAdd = _.difference(appResourcesImages, xcodeProjectImages);
-                this.$logger.trace(`New images to add into xcode project: ${imagesToAdd.join(", ")}`);
-                _.each(imagesToAdd, (image) => project.addResourceFile(path.relative(this.getPlatformData(projectData).projectRoot, path.join(this.getAppResourcesDestinationDirectoryPath(projectData), image))));
-                const imagesToRemove = _.difference(xcodeProjectImages, appResourcesImages);
-                this.$logger.trace(`Images to remove from xcode project: ${imagesToRemove.join(", ")}`);
-                _.each(imagesToRemove, (image) => project.removeResourceFile(path.join(this.getAppResourcesDestinationDirectoryPath(projectData), image)));
+    async prepareProject(projectData, prepareData) {
+        const projectRoot = this.$options.hostProjectPath
+            ? this.$options.hostProjectPath
+            : path.join(projectData.platformsDir, this.$devicePlatformsConstants.iOS.toLowerCase());
+        const platformData = this.getPlatformData(projectData);
+        const pluginsData = this.getAllProductionPlugins(projectData);
+        const pbxProjPath = this.getPbxProjPath(projectData);
+        this.$iOSExtensionsService.removeExtensions({ pbxProjPath });
+        await this.addExtensions(projectData, pluginsData);
+        const resourcesDirectoryPath = projectData.getAppResourcesDirectoryPath();
+        const provision = prepareData && prepareData.provision;
+        const teamId = prepareData && prepareData.teamId;
+        if (provision) {
+            await this.$iOSSigningService.setupSigningFromProvision(projectRoot, projectData, provision, prepareData.mobileProvisionData);
+        }
+        if (teamId) {
+            await this.$iOSSigningService.setupSigningFromTeam(projectRoot, projectData, teamId);
+        }
+        const project = this.createPbxProj(projectData);
+        if (this.$options.hostProjectPath) {
+            try {
+                project.addPbxGroup([], "NativeScript", "NativeScript", null, {
+                    isMain: true,
+                    filesRelativeToProject: true,
+                    uuid: "NATIVESCRIPTNATIVESCRIPT",
+                });
+                const buildFolderPath = path.join(this.$options.hostProjectPath, projectData.projectName);
+                project.addResourceFile(buildFolderPath, {}, "NATIVESCRIPTNATIVESCRIPT");
+                const metadataPath = path.relative(this.$options.hostProjectPath, buildFolderPath);
+                project.addToOtherLinkerFlags(JSON.stringify(`-sectcreate __DATA __TNSMetadata "${metadataPath}/metadata-arm64.bin"`));
                 this.savePbxProj(project, projectData);
-                let resourcesNativeCodePath = path.join(resourcesDirectoryPath, platformData.normalizedPlatformName, constants.NATIVE_SOURCE_FOLDER);
-                if (!this.$fs.exists(resourcesNativeCodePath)) {
-                    resourcesNativeCodePath = path.join(resourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants.NATIVE_SOURCE_FOLDER);
-                }
-                yield this.prepareNativeSourceCode(constants.TNS_NATIVE_SOURCE_GROUP_NAME, resourcesNativeCodePath, projectData);
             }
-            this.$iOSWatchAppService.removeWatchApp({ pbxProjPath });
-            const addedWatchApp = yield this.$iOSWatchAppService.addWatchAppFromPath({
-                watchAppFolderPath: path.join(resourcesDirectoryPath, platformData.normalizedPlatformName),
-                projectData,
-                platformData,
-                pbxProjPath,
-            });
-            if (addedWatchApp) {
-                this.$logger.warn("The support for Apple Watch App is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/nativescript-cli/issues/4589");
+            catch (err) {
+                this.$logger.trace("Error adding NativeScript group to host project", err);
             }
+        }
+        const resources = project.pbxGroupByName("Resources");
+        if (resources && !this.$options.hostProjectPath) {
+            const references = project.pbxFileReferenceSection();
+            const xcodeProjectImages = _.map(resources.children, (resource) => this.replace(references[resource.value].name));
+            this.$logger.trace("Images from Xcode project");
+            this.$logger.trace(xcodeProjectImages);
+            const appResourcesImages = this.$fs.readDirectory(this.getAppResourcesDestinationDirectoryPath(projectData));
+            this.$logger.trace("Current images from App_Resources");
+            this.$logger.trace(appResourcesImages);
+            const imagesToAdd = _.difference(appResourcesImages, xcodeProjectImages);
+            this.$logger.trace(`New images to add into xcode project: ${imagesToAdd.join(", ")}`);
+            _.each(imagesToAdd, (image) => project.addResourceFile(path.relative(this.getPlatformData(projectData).projectRoot, path.join(this.getAppResourcesDestinationDirectoryPath(projectData), image))));
+            const imagesToRemove = _.difference(xcodeProjectImages, appResourcesImages);
+            this.$logger.trace(`Images to remove from xcode project: ${imagesToRemove.join(", ")}`);
+            _.each(imagesToRemove, (image) => project.removeResourceFile(path.join(this.getAppResourcesDestinationDirectoryPath(projectData), image)));
+            this.savePbxProj(project, projectData);
+            let resourcesNativeCodePath = path.join(resourcesDirectoryPath, platformData.normalizedPlatformName, constants.NATIVE_SOURCE_FOLDER);
+            if (!this.$fs.exists(resourcesNativeCodePath)) {
+                resourcesNativeCodePath = path.join(resourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants.NATIVE_SOURCE_FOLDER);
+            }
+            await this.prepareNativeSourceCode(constants.TNS_NATIVE_SOURCE_GROUP_NAME, resourcesNativeCodePath, projectData);
+        }
+        this.$iOSWatchAppService.removeWatchApp({ pbxProjPath });
+        const addedWatchApp = await this.$iOSWatchAppService.addWatchAppFromPath({
+            watchAppFolderPath: path.join(resourcesDirectoryPath, platformData.normalizedPlatformName),
+            projectData,
+            platformData,
+            pbxProjPath,
         });
+        if (addedWatchApp) {
+            this.$logger.warn("The support for Apple Watch App is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/nativescript-cli/issues/4589");
+        }
     }
     prepareAppResources(projectData) {
         const platformData = this.getPlatformData(projectData);
@@ -398,48 +394,45 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$fs.deleteDirectory(path.join(platformsAppResourcesPath, "watchapp"));
         this.$fs.deleteDirectory(path.join(platformsAppResourcesPath, "watchextension"));
     }
-    processConfigurationFilesFromAppResources(projectData, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.mergeInfoPlists(projectData, opts);
-            yield this.$iOSEntitlementsService.merge(projectData);
-            yield this.mergeProjectXcconfigFiles(projectData);
-        });
+    async processConfigurationFilesFromAppResources(projectData, opts) {
+        await this.mergeInfoPlists(projectData, opts);
+        await this.$iOSEntitlementsService.merge(projectData);
+        await this.mergeProjectXcconfigFiles(projectData);
     }
     ensureConfigurationFileInAppResources() {
         return null;
     }
-    mergeInfoPlists(projectData, buildOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const projectDir = projectData.projectDir;
-            const infoPlistPath = path.join(projectData.appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, this.getPlatformData(projectData).configurationFileName);
-            this.ensureConfigurationFileInAppResources();
-            const reporterTraceMessage = "Info.plist:";
-            const reporter = {
-                log: (txt) => this.$logger.trace(`${reporterTraceMessage} ${txt}`),
-                warn: (txt) => this.$logger.warn(`${reporterTraceMessage} ${txt}`),
-            };
-            const session = new plist_merge_patch_1.PlistSession(reporter);
-            const makePatch = (plistPath) => {
-                if (!this.$fs.exists(plistPath)) {
-                    this.$logger.trace("No plist found at: " + plistPath);
-                    return;
-                }
-                this.$logger.trace("Schedule merge plist at: " + plistPath);
-                session.patch({
-                    name: path.relative(projectDir, plistPath),
-                    read: () => this.$fs.readText(plistPath),
-                });
-            };
-            const allPlugins = this.getAllProductionPlugins(projectData);
-            for (const plugin of allPlugins) {
-                const pluginInfoPlistPath = path.join(plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME), this.getPlatformData(projectData).configurationFileName);
-                makePatch(pluginInfoPlistPath);
+    async mergeInfoPlists(projectData, buildOptions) {
+        const projectDir = projectData.projectDir;
+        const infoPlistPath = path.join(projectData.appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, this.getPlatformData(projectData).configurationFileName);
+        this.ensureConfigurationFileInAppResources();
+        const reporterTraceMessage = "Info.plist:";
+        const reporter = {
+            log: (txt) => this.$logger.trace(`${reporterTraceMessage} ${txt}`),
+            warn: (txt) => this.$logger.warn(`${reporterTraceMessage} ${txt}`),
+        };
+        const session = new plist_merge_patch_1.PlistSession(reporter);
+        const makePatch = (plistPath) => {
+            if (!this.$fs.exists(plistPath)) {
+                this.$logger.trace("No plist found at: " + plistPath);
+                return;
             }
-            makePatch(infoPlistPath);
-            if (projectData.projectIdentifiers && projectData.projectIdentifiers.ios) {
-                session.patch({
-                    name: "CFBundleIdentifier from package.json nativescript.id",
-                    read: () => `<?xml version="1.0" encoding="UTF-8"?>
+            this.$logger.trace("Schedule merge plist at: " + plistPath);
+            session.patch({
+                name: path.relative(projectDir, plistPath),
+                read: () => this.$fs.readText(plistPath),
+            });
+        };
+        const allPlugins = this.getAllProductionPlugins(projectData);
+        for (const plugin of allPlugins) {
+            const pluginInfoPlistPath = path.join(plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME), this.getPlatformData(projectData).configurationFileName);
+            makePatch(pluginInfoPlistPath);
+        }
+        makePatch(infoPlistPath);
+        if (projectData.projectIdentifiers && projectData.projectIdentifiers.ios) {
+            session.patch({
+                name: "CFBundleIdentifier from package.json nativescript.id",
+                read: () => `<?xml version="1.0" encoding="UTF-8"?>
 						<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 						<plist version="1.0">
 						<dict>
@@ -447,14 +440,14 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 							<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 						</dict>
 						</plist>`,
-                });
-            }
-            if (!buildOptions.release &&
-                projectData.projectIdentifiers &&
-                projectData.projectIdentifiers.ios) {
-                session.patch({
-                    name: "CFBundleURLTypes from package.json nativescript.id",
-                    read: () => `<?xml version="1.0" encoding="UTF-8"?>
+            });
+        }
+        if (!buildOptions.release &&
+            projectData.projectIdentifiers &&
+            projectData.projectIdentifiers.ios) {
+            session.patch({
+                name: "CFBundleURLTypes from package.json nativescript.id",
+                read: () => `<?xml version="1.0" encoding="UTF-8"?>
 						<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 						<plist version="1.0">
 						<dict>
@@ -471,13 +464,12 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 							</array>
 						</dict>
 						</plist>`,
-                });
-            }
-            const plistContent = session.build();
-            this.$logger.trace("Info.plist: Write to: " +
-                this.getPlatformData(projectData).configurationFilePath);
-            this.$fs.writeFile(this.getPlatformData(projectData).configurationFilePath, plistContent);
-        });
+            });
+        }
+        const plistContent = session.build();
+        this.$logger.trace("Info.plist: Write to: " +
+            this.getPlatformData(projectData).configurationFilePath);
+        this.$fs.writeFile(this.getPlatformData(projectData).configurationFilePath, plistContent);
     }
     getAllProductionPlugins(projectData) {
         return (this.$injector.resolve("pluginsService")).getAllProductionPlugins(projectData, this.getPlatformData(projectData).platformNameLowerCase);
@@ -489,10 +481,18 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         return name.replace(/\\\"/g, '"');
     }
     getLibSubpathRelativeToProjectPath(targetPath, projectData) {
-        const frameworkPath = path.relative(this.getPlatformData(projectData).projectRoot, targetPath);
+        const projectRoot = this.getPlatformData(projectData).projectRoot;
+        const frameworkPath = path.relative(projectRoot, targetPath);
         return frameworkPath;
     }
     getPbxProjPath(projectData) {
+        if (this.$options.hostProjectPath) {
+            let xcodeProjectPath = this.$xcprojService.findXcodeProject(this.$options.hostProjectPath);
+            if (!xcodeProjectPath) {
+                this.$errors.fail("Xcode project not found at the specified directory");
+            }
+            return path.join(xcodeProjectPath, "project.pbxproj");
+        }
         return path.join(this.$xcprojService.getXcodeprojPath(projectData, this.getPlatformData(projectData).projectRoot), "project.pbxproj");
     }
     createPbxProj(projectData) {
@@ -503,89 +503,81 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     savePbxProj(project, projectData, omitEmptyValues) {
         return this.$fs.writeFile(this.getPbxProjPath(projectData), project.writeSync({ omitEmptyValues }));
     }
-    preparePluginNativeCode(pluginData, projectData, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
-            const sourcePath = path.join(pluginPlatformsFolderPath, "src");
-            yield this.prepareNativeSourceCode(pluginData.name, sourcePath, projectData);
-            yield this.prepareResources(pluginPlatformsFolderPath, pluginData, projectData);
-            yield this.prepareFrameworks(pluginPlatformsFolderPath, pluginData, projectData);
-            yield this.prepareStaticLibs(pluginPlatformsFolderPath, pluginData, projectData);
-        });
-    }
-    removePluginNativeCode(pluginData, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
-            this.removeNativeSourceCode(pluginPlatformsFolderPath, pluginData, projectData);
-            this.removeFrameworks(pluginPlatformsFolderPath, pluginData, projectData);
-            this.removeStaticLibs(pluginPlatformsFolderPath, pluginData, projectData);
-            const projectRoot = this.getPlatformData(projectData).projectRoot;
-            this.$cocoapodsService.removePodfileFromProject(pluginData.name, this.$cocoapodsService.getPluginPodfilePath(pluginData), projectData, projectRoot);
-        });
-    }
-    handleNativeDependenciesChange(projectData, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const platformData = this.getPlatformData(projectData);
-            const pluginsData = this.getAllProductionPlugins(projectData);
-            this.setProductBundleIdentifier(projectData);
-            yield this.applyPluginsCocoaPods(pluginsData, projectData, platformData);
-            yield this.$cocoapodsService.applyPodfileFromAppResources(projectData, platformData);
-            yield this.$cocoapodsService.applyPodfileArchExclusions(projectData, platformData);
-            yield this.$cocoapodsService.applyPodfileFromExtensions(projectData, platformData);
-            const projectPodfilePath = this.$cocoapodsService.getProjectPodfilePath(platformData.projectRoot);
-            if (this.$fs.exists(projectPodfilePath)) {
-                yield this.$cocoapodsService.executePodInstall(platformData.projectRoot, this.$xcprojService.getXcodeprojPath(projectData, platformData.projectRoot));
-                yield this.$cocoapodsService.mergePodXcconfigFile(projectData, platformData, opts);
-            }
-            yield this.$spmService.applySPMPackages(platformData, projectData);
-        });
+    async preparePluginNativeCode(pluginData, projectData, opts) {
+        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
+        const sourcePath = path.join(pluginPlatformsFolderPath, "src");
+        await this.prepareNativeSourceCode(pluginData.name, sourcePath, projectData);
+        await this.prepareResources(pluginPlatformsFolderPath, pluginData, projectData);
+        await this.prepareFrameworks(pluginPlatformsFolderPath, pluginData, projectData);
+        await this.prepareStaticLibs(pluginPlatformsFolderPath, pluginData, projectData);
+    }
+    async removePluginNativeCode(pluginData, projectData) {
+        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
+        this.removeNativeSourceCode(pluginPlatformsFolderPath, pluginData, projectData);
+        this.removeFrameworks(pluginPlatformsFolderPath, pluginData, projectData);
+        this.removeStaticLibs(pluginPlatformsFolderPath, pluginData, projectData);
+        const projectRoot = this.getPlatformData(projectData).projectRoot;
+        this.$cocoapodsService.removePodfileFromProject(pluginData.name, this.$cocoapodsService.getPluginPodfilePath(pluginData), projectData, projectRoot);
+    }
+    async handleNativeDependenciesChange(projectData, opts) {
+        const platformData = this.getPlatformData(projectData);
+        const pluginsData = this.getAllProductionPlugins(projectData);
+        this.setProductBundleIdentifier(projectData);
+        await this.applyPluginsCocoaPods(pluginsData, projectData, platformData);
+        await this.$cocoapodsService.applyPodfileFromAppResources(projectData, platformData);
+        await this.$cocoapodsService.applyPodfileArchExclusions(projectData, platformData);
+        await this.$cocoapodsService.applyPodfileFromExtensions(projectData, platformData);
+        const projectPodfilePath = this.$cocoapodsService.getProjectPodfilePath(platformData.projectRoot);
+        if (this.$fs.exists(projectPodfilePath)) {
+            await this.$cocoapodsService.executePodInstall(platformData.projectRoot, this.$xcprojService.getXcodeprojPath(projectData, platformData.projectRoot));
+            await this.$cocoapodsService.mergePodXcconfigFile(projectData, platformData, opts);
+        }
+        await this.$spmService.applySPMPackages(platformData, projectData);
     }
     beforePrepareAllPlugins(projectData, dependencies) {
         return Promise.resolve(dependencies);
     }
-    checkForChanges(changesInfo, prepareData, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { provision, teamId } = prepareData;
-            const hasProvision = provision !== undefined;
-            const hasTeamId = teamId !== undefined;
-            if (hasProvision || hasTeamId) {
-                const pbxprojPath = this.getPbxProjPath(projectData);
-                if (this.$fs.exists(pbxprojPath)) {
-                    const xcode = this.$pbxprojDomXcode.Xcode.open(pbxprojPath);
-                    const signing = xcode.getSigning(projectData.projectName);
-                    if (hasProvision) {
-                        if (signing && signing.style === "Manual") {
-                            for (const name in signing.configurations) {
-                                const config = signing.configurations[name];
-                                if (config.uuid !== provision && config.name !== provision) {
-                                    changesInfo.signingChanged = true;
-                                    break;
-                                }
+    async checkForChanges(changesInfo, prepareData, projectData) {
+        const { provision, teamId } = prepareData;
+        const hasProvision = provision !== undefined;
+        const hasTeamId = teamId !== undefined;
+        if (hasProvision || hasTeamId) {
+            const pbxprojPath = this.getPbxProjPath(projectData);
+            if (this.$fs.exists(pbxprojPath)) {
+                const xcode = this.$pbxprojDomXcode.Xcode.open(pbxprojPath);
+                const signing = xcode.getSigning(projectData.projectName);
+                if (hasProvision) {
+                    if (signing && signing.style === "Manual") {
+                        for (const name in signing.configurations) {
+                            const config = signing.configurations[name];
+                            if (config.uuid !== provision && config.name !== provision) {
+                                changesInfo.signingChanged = true;
+                                break;
                             }
                         }
-                        else {
-                            changesInfo.signingChanged = true;
-                        }
                     }
-                    if (hasTeamId) {
-                        if (signing && signing.style === "Automatic") {
-                            if (signing.team !== teamId) {
-                                const teamIdsForName = yield this.$iOSProvisionService.getTeamIdsWithName(teamId);
-                                if (!teamIdsForName.some((id) => id === signing.team)) {
-                                    changesInfo.signingChanged = true;
-                                }
+                    else {
+                        changesInfo.signingChanged = true;
+                    }
+                }
+                if (hasTeamId) {
+                    if (signing && signing.style === "Automatic") {
+                        if (signing.team !== teamId) {
+                            const teamIdsForName = await this.$iOSProvisionService.getTeamIdsWithName(teamId);
+                            if (!teamIdsForName.some((id) => id === signing.team)) {
+                                changesInfo.signingChanged = true;
                             }
                         }
-                        else {
-                            changesInfo.signingChanged = true;
-                        }
                     }
-                }
-                else {
-                    changesInfo.signingChanged = true;
+                    else {
+                        changesInfo.signingChanged = true;
+                    }
                 }
             }
-        });
+            else {
+                changesInfo.signingChanged = true;
+            }
+        }
     }
     getDeploymentTarget(projectData) {
         const target = this.$xcconfigService.readPropertyValue(this.getBuildXCConfigFilePath(projectData), "IPHONEOS_DEPLOYMENT_TARGET");
@@ -632,54 +624,50 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         const newFileName = projectData.projectName + fileNamePart;
         this.$fs.rename(path.join(fileRootLocation, oldFileName), path.join(fileRootLocation, newFileName));
     }
-    prepareNativeSourceCode(groupName, sourceFolderPath, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const project = this.createPbxProj(projectData);
-            const group = this.getRootGroup(groupName, sourceFolderPath);
-            project.addPbxGroup(group.files, group.name, group.path, null, {
-                isMain: true,
-                filesRelativeToProject: true,
-            });
-            project.addToHeaderSearchPaths(group.path);
-            const headerFiles = this.$fs.exists(sourceFolderPath)
-                ? this.$fs.enumerateFilesInDirectorySync(sourceFolderPath, (file, stat) => stat.isDirectory() || path.extname(file) === ".h")
-                : [];
-            if (headerFiles.length > 0 &&
-                !this.$fs.exists(path.join(sourceFolderPath, "module.modulemap"))) {
-                this.$logger.warn(`warning: Directory ${sourceFolderPath} with native iOS source code doesn't contain a modulemap file. Metadata for it will not be generated and it will not be accessible from JavaScript. To learn more see https://docs.nativescript.org/guides/ios-source-code`);
-            }
-            this.savePbxProj(project, projectData);
+    async prepareNativeSourceCode(groupName, sourceFolderPath, projectData) {
+        const project = this.createPbxProj(projectData);
+        const group = this.getRootGroup(groupName, sourceFolderPath);
+        project.addPbxGroup(group.files, group.name, group.path, null, {
+            isMain: true,
+            filesRelativeToProject: true,
         });
+        project.addToHeaderSearchPaths(group.path);
+        const headerFiles = this.$fs.exists(sourceFolderPath)
+            ? this.$fs.enumerateFilesInDirectorySync(sourceFolderPath, (file, stat) => stat.isDirectory() || path.extname(file) === ".h")
+            : [];
+        if (headerFiles.length > 0 &&
+            !this.$fs.exists(path.join(sourceFolderPath, "module.modulemap"))) {
+            this.$logger.warn(`warning: Directory ${sourceFolderPath} with native iOS source code doesn't contain a modulemap file. Metadata for it will not be generated and it will not be accessible from JavaScript. To learn more see https://docs.nativescript.org/guides/ios-source-code`);
+        }
+        this.savePbxProj(project, projectData);
     }
-    addExtensions(projectData, pluginsData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const resorcesExtensionsPath = path.join(projectData.getAppResourcesDirectoryPath(), this.getPlatformData(projectData).normalizedPlatformName, constants.NATIVE_EXTENSION_FOLDER);
-            const platformData = this.getPlatformData(projectData);
-            const pbxProjPath = this.getPbxProjPath(projectData);
-            const addedExtensionsFromResources = yield this.$iOSExtensionsService.addExtensionsFromPath({
-                extensionsFolderPath: resorcesExtensionsPath,
+    async addExtensions(projectData, pluginsData) {
+        const resorcesExtensionsPath = path.join(projectData.getAppResourcesDirectoryPath(), this.getPlatformData(projectData).normalizedPlatformName, constants.NATIVE_EXTENSION_FOLDER);
+        const platformData = this.getPlatformData(projectData);
+        const pbxProjPath = this.getPbxProjPath(projectData);
+        const addedExtensionsFromResources = await this.$iOSExtensionsService.addExtensionsFromPath({
+            extensionsFolderPath: resorcesExtensionsPath,
+            projectData,
+            platformData,
+            pbxProjPath,
+        });
+        let addedExtensionsFromPlugins = false;
+        for (const pluginIndex in pluginsData) {
+            const pluginData = pluginsData[pluginIndex];
+            const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
+            const extensionPath = path.join(pluginPlatformsFolderPath, constants.NATIVE_EXTENSION_FOLDER);
+            const addedExtensionFromPlugin = await this.$iOSExtensionsService.addExtensionsFromPath({
+                extensionsFolderPath: extensionPath,
                 projectData,
                 platformData,
                 pbxProjPath,
             });
-            let addedExtensionsFromPlugins = false;
-            for (const pluginIndex in pluginsData) {
-                const pluginData = pluginsData[pluginIndex];
-                const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
-                const extensionPath = path.join(pluginPlatformsFolderPath, constants.NATIVE_EXTENSION_FOLDER);
-                const addedExtensionFromPlugin = yield this.$iOSExtensionsService.addExtensionsFromPath({
-                    extensionsFolderPath: extensionPath,
-                    projectData,
-                    platformData,
-                    pbxProjPath,
-                });
-                addedExtensionsFromPlugins =
-                    addedExtensionsFromPlugins || addedExtensionFromPlugin;
-            }
-            if (addedExtensionsFromResources || addedExtensionsFromPlugins) {
-                this.$logger.warn("The support for iOS App Extensions is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/nativescript-cli/issues/4472");
-            }
-        });
+            addedExtensionsFromPlugins =
+                addedExtensionsFromPlugins || addedExtensionFromPlugin;
+        }
+        if (addedExtensionsFromResources || addedExtensionsFromPlugins) {
+            this.$logger.warn("The support for iOS App Extensions is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/nativescript-cli/issues/4472");
+        }
     }
     getRootGroup(name, rootPath) {
         const filePathsArr = [];
@@ -699,32 +687,26 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         }
         return rootGroup;
     }
-    prepareResources(pluginPlatformsFolderPath, pluginData, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const project = this.createPbxProj(projectData);
-            const resourcesPath = path.join(pluginPlatformsFolderPath, "Resources");
-            if (this.$fs.exists(resourcesPath) && !this.$fs.isEmptyDir(resourcesPath)) {
-                for (const fileName of this.$fs.readDirectory(resourcesPath)) {
-                    const filePath = path.join(resourcesPath, fileName);
-                    project.addResourceFile(filePath);
-                }
+    async prepareResources(pluginPlatformsFolderPath, pluginData, projectData) {
+        const project = this.createPbxProj(projectData);
+        const resourcesPath = path.join(pluginPlatformsFolderPath, "Resources");
+        if (this.$fs.exists(resourcesPath) && !this.$fs.isEmptyDir(resourcesPath)) {
+            for (const fileName of this.$fs.readDirectory(resourcesPath)) {
+                const filePath = path.join(resourcesPath, fileName);
+                project.addResourceFile(filePath);
             }
-            this.savePbxProj(project, projectData);
-        });
+        }
+        this.savePbxProj(project, projectData);
     }
-    prepareFrameworks(pluginPlatformsFolderPath, pluginData, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, FRAMEWORK_EXTENSIONS)) {
-                yield this.addFramework(path.join(pluginPlatformsFolderPath, fileName), projectData);
-            }
-        });
+    async prepareFrameworks(pluginPlatformsFolderPath, pluginData, projectData) {
+        for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, FRAMEWORK_EXTENSIONS)) {
+            await this.addFramework(path.join(pluginPlatformsFolderPath, fileName), projectData);
+        }
     }
-    prepareStaticLibs(pluginPlatformsFolderPath, pluginData, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, ".a")) {
-                yield this.addStaticLibrary(path.join(pluginPlatformsFolderPath, fileName), projectData);
-            }
-        });
+    async prepareStaticLibs(pluginPlatformsFolderPath, pluginData, projectData) {
+        for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, ".a")) {
+            await this.addStaticLibrary(path.join(pluginPlatformsFolderPath, fileName), projectData);
+        }
     }
     removeNativeSourceCode(pluginPlatformsFolderPath, pluginData, projectData) {
         const project = this.createPbxProj(projectData);
@@ -773,46 +755,44 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         const modulemap = `module ${libraryName} { explicit module ${libraryName} { ${headers.join(" ")} } }`;
         this.$fs.writeFile(path.join(headersFolderPath, "module.modulemap"), modulemap);
     }
-    mergeProjectXcconfigFiles(projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const platformData = this.getPlatformData(projectData);
-            const pluginsXcconfigFilePaths = _.values(this.$xcconfigService.getPluginsXcconfigFilePaths(platformData.projectRoot));
-            for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
-                this.$fs.deleteFile(pluginsXcconfigFilePath);
-            }
-            const allPlugins = this.getAllProductionPlugins(projectData);
-            for (const plugin of allPlugins) {
-                const pluginPlatformsFolderPath = plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
-                const pluginXcconfigFilePath = path.join(pluginPlatformsFolderPath, constants_2.BUILD_XCCONFIG_FILE_NAME);
-                if (this.$fs.exists(pluginXcconfigFilePath)) {
-                    for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
-                        yield this.$xcconfigService.mergeFiles(pluginXcconfigFilePath, pluginsXcconfigFilePath);
-                    }
-                }
-            }
-            const appResourcesXcconfigPath = path.join(projectData.appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, constants_2.BUILD_XCCONFIG_FILE_NAME);
-            if (this.$fs.exists(appResourcesXcconfigPath)) {
+    async mergeProjectXcconfigFiles(projectData) {
+        const platformData = this.getPlatformData(projectData);
+        const pluginsXcconfigFilePaths = _.values(this.$xcconfigService.getPluginsXcconfigFilePaths(platformData.projectRoot));
+        for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
+            this.$fs.deleteFile(pluginsXcconfigFilePath);
+        }
+        const allPlugins = this.getAllProductionPlugins(projectData);
+        for (const plugin of allPlugins) {
+            const pluginPlatformsFolderPath = plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
+            const pluginXcconfigFilePath = path.join(pluginPlatformsFolderPath, constants_2.BUILD_XCCONFIG_FILE_NAME);
+            if (this.$fs.exists(pluginXcconfigFilePath)) {
                 for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
-                    yield this.$xcconfigService.mergeFiles(appResourcesXcconfigPath, pluginsXcconfigFilePath);
+                    await this.$xcconfigService.mergeFiles(pluginXcconfigFilePath, 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) {
-                if (!this.$fs.exists(pluginsXcconfigFilePath)) {
-                    this.$fs.writeFile(pluginsXcconfigFilePath, "");
-                }
+                await this.$xcconfigService.mergeFiles(appResourcesXcconfigPath, pluginsXcconfigFilePath);
             }
-            for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
-                const entitlementsPropertyValue = this.$xcconfigService.readPropertyValue(pluginsXcconfigFilePath, constants.CODE_SIGN_ENTITLEMENTS);
-                if (entitlementsPropertyValue === null &&
-                    this.$fs.exists(this.$iOSEntitlementsService.getPlatformsEntitlementsPath(projectData))) {
-                    const tempEntitlementsDir = yield this.$tempService.mkdirSync("entitlements");
-                    const tempEntitlementsFilePath = path.join(tempEntitlementsDir, "set-entitlements.xcconfig");
-                    const entitlementsRelativePath = this.$iOSEntitlementsService.getPlatformsEntitlementsRelativePath(projectData);
-                    this.$fs.writeFile(tempEntitlementsFilePath, `CODE_SIGN_ENTITLEMENTS = ${entitlementsRelativePath}${os_1.EOL}`);
-                    yield this.$xcconfigService.mergeFiles(tempEntitlementsFilePath, pluginsXcconfigFilePath);
-                }
+        }
+        for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
+            if (!this.$fs.exists(pluginsXcconfigFilePath)) {
+                this.$fs.writeFile(pluginsXcconfigFilePath, "");
             }
-        });
+        }
+        for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
+            const entitlementsPropertyValue = this.$xcconfigService.readPropertyValue(pluginsXcconfigFilePath, constants.CODE_SIGN_ENTITLEMENTS);
+            if (entitlementsPropertyValue === null &&
+                this.$fs.exists(this.$iOSEntitlementsService.getPlatformsEntitlementsPath(projectData))) {
+                const tempEntitlementsDir = await this.$tempService.mkdirSync("entitlements");
+                const tempEntitlementsFilePath = path.join(tempEntitlementsDir, "set-entitlements.xcconfig");
+                const entitlementsRelativePath = this.$iOSEntitlementsService.getPlatformsEntitlementsRelativePath(projectData);
+                this.$fs.writeFile(tempEntitlementsFilePath, `CODE_SIGN_ENTITLEMENTS = ${entitlementsRelativePath}${os_1.EOL}`);
+                await this.$xcconfigService.mergeFiles(tempEntitlementsFilePath, pluginsXcconfigFilePath);
+            }
+        }
     }
     getBuildXCConfigFilePath(projectData) {
         const buildXCConfig = path.join(projectData.appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, constants_2.BUILD_XCCONFIG_FILE_NAME);
@@ -831,21 +811,19 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             this.$logger.warn(`[WARNING]: The CFBundleIdentifier key inside the 'Info.plist' will be overriden by the 'id' set inside the "${constants_2.CONFIG_FILE_NAME_DISPLAY}".`);
         }
     }
-    applyPluginsCocoaPods(pluginsData, projectData, platformData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const pluginIndex in pluginsData) {
-                const pluginData = pluginsData[pluginIndex];
-                if (this.$fs.exists(pluginData.pluginPlatformsFolderPath(platformData.normalizedPlatformName))) {
-                    yield this.$cocoapodsService.applyPodfileToProject(pluginData.name, this.$cocoapodsService.getPluginPodfilePath(pluginData), projectData, platformData);
-                }
+    async applyPluginsCocoaPods(pluginsData, projectData, platformData) {
+        for (const pluginIndex in pluginsData) {
+            const pluginData = pluginsData[pluginIndex];
+            if (this.$fs.exists(pluginData.pluginPlatformsFolderPath(platformData.normalizedPlatformName))) {
+                await this.$cocoapodsService.applyPodfileToProject(pluginData.name, this.$cocoapodsService.getPluginPodfilePath(pluginData), projectData, platformData);
             }
-        });
+        }
     }
 }
+exports.IOSProjectService = IOSProjectService;
 IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER = "__PROJECT_NAME__";
 IOSProjectService.IOS_PLATFORM_NAME = "ios";
 __decorate([
     (0, helpers_2.hook)("buildIOS")
 ], IOSProjectService.prototype, "buildProject", null);
-exports.IOSProjectService = IOSProjectService;
 yok_1.injector.register("iOSProjectService", IOSProjectService);