nativescript 8.9.0-dev.1 → 8.9.0-dev.2

package/lib/services/cocoapods-service.js

@@ -1,4 +1,13 @@
 "use strict";
+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.CocoaPodsService = void 0;
 const os_1 = require("os");
@@ -29,64 +38,81 @@ class CocoaPodsService {
     getProjectPodfilePath(projectRoot) {
         return path.join(projectRoot, constants_1.PODFILE_NAME);
     }
-    async executePodInstall(projectRoot, xcodeProjPath) {
-        this.$logger.info("Installing pods...");
-        let podTool = this.$config.USE_POD_SANDBOX ? "sandbox-pod" : "pod";
-        const args = ["install"];
-        if (process.platform === "darwin" && process.arch === "arm64") {
-            const res = await this.$childProcess
-                .exec("arch -x86_64 pod --version", null, {
-                showStderr: true,
-            })
-                .then((res) => res.stdout + " " + res.stderr)
-                .catch((err) => err.message);
-            if (!res.includes("Bad CPU type in executable")) {
-                this.$logger.trace("Running on arm64 but pod is installed under rosetta2 - running pod through rosetta2");
-                args.unshift(podTool);
-                args.unshift("-x86_64");
-                podTool = "arch";
+    executePodInstall(projectRoot, xcodeProjPath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.$logger.info("Installing pods...");
+            let podTool = this.$config.USE_POD_SANDBOX ? "sandbox-pod" : "pod";
+            const args = ["install"];
+            if (process.platform === "darwin" && process.arch === "arm64") {
+                // check if pod is installed as an x86_64 binary or a native arm64 one
+                // we run the following:
+                // arch -x86_64 pod --version
+                // if it's an arm64 binary, we'll get something like this as a result:
+                // arch: posix_spawnp: pod: Bad CPU type in executable
+                // in which case, we should run it natively.
+                const res = yield this.$childProcess
+                    .exec("arch -x86_64 pod --version", null, {
+                    showStderr: true,
+                })
+                    .then((res) => res.stdout + " " + res.stderr)
+                    .catch((err) => err.message);
+                if (!res.includes("Bad CPU type in executable")) {
+                    this.$logger.trace("Running on arm64 but pod is installed under rosetta2 - running pod through rosetta2");
+                    args.unshift(podTool);
+                    args.unshift("-x86_64");
+                    podTool = "arch";
+                }
             }
-        }
-        const podInstallResult = await this.$childProcess.spawnFromEvent(podTool, args, "close", { cwd: projectRoot, stdio: ["pipe", process.stdout, process.stdout] }, { throwError: false });
-        if (podInstallResult.exitCode !== 0) {
-            const versionResolutionHint = podInstallResult.exitCode === 31
-                ? `For more information on resolving CocoaPod issues in NativeScript read.`
-                : "";
-            this.$errors.fail(`'${podTool} install' command failed.${podInstallResult.stderr ? " Error is: " + podInstallResult.stderr : ""}
+            // cocoapods print a lot of non-error information on stderr. Pipe the `stderr` to `stdout`, so we won't polute CLI's stderr output.
+            const podInstallResult = yield this.$childProcess.spawnFromEvent(podTool, args, "close", { cwd: projectRoot, stdio: ["pipe", process.stdout, process.stdout] }, { throwError: false });
+            if (podInstallResult.exitCode !== 0) {
+                // https://github.com/CocoaPods/CocoaPods/blob/92aaf0f1120d32f3487960b485fb69fcaf61486c/lib/cocoapods/resolver.rb#L498
+                // TODO add article
+                const versionResolutionHint = podInstallResult.exitCode === 31
+                    ? `For more information on resolving CocoaPod issues in NativeScript read.`
+                    : "";
+                this.$errors.fail(`'${podTool} install' command failed.${podInstallResult.stderr ? " Error is: " + podInstallResult.stderr : ""}
 ${versionResolutionHint}`);
-        }
-        return podInstallResult;
+            }
+            return podInstallResult;
+        });
     }
-    async mergePodXcconfigFile(projectData, platformData) {
-        const podFilesRootDirName = path.join("Pods", "Target Support Files", `Pods-${projectData.projectName}`);
-        const podFolder = path.join(platformData.projectRoot, podFilesRootDirName);
-        if (this.$fs.exists(podFolder)) {
-            const pluginsXcconfigFilePaths = this.$xcconfigService.getPluginsXcconfigFilePaths(platformData.projectRoot);
-            for (const configuration in pluginsXcconfigFilePaths) {
-                const pluginsXcconfigFilePath = pluginsXcconfigFilePaths[configuration];
-                const podXcconfigFilePath = path.join(podFolder, `Pods-${projectData.projectName}.${configuration}.xcconfig`);
-                await this.$xcconfigService.mergeFiles(podXcconfigFilePath, pluginsXcconfigFilePath);
+    mergePodXcconfigFile(projectData, platformData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const podFilesRootDirName = path.join("Pods", "Target Support Files", `Pods-${projectData.projectName}`);
+            const podFolder = path.join(platformData.projectRoot, podFilesRootDirName);
+            if (this.$fs.exists(podFolder)) {
+                const pluginsXcconfigFilePaths = this.$xcconfigService.getPluginsXcconfigFilePaths(platformData.projectRoot);
+                for (const configuration in pluginsXcconfigFilePaths) {
+                    const pluginsXcconfigFilePath = pluginsXcconfigFilePaths[configuration];
+                    const podXcconfigFilePath = path.join(podFolder, `Pods-${projectData.projectName}.${configuration}.xcconfig`);
+                    yield this.$xcconfigService.mergeFiles(podXcconfigFilePath, pluginsXcconfigFilePath);
+                }
             }
-        }
+        });
     }
-    async applyPodfileFromAppResources(projectData, platformData) {
-        const { projectRoot, normalizedPlatformName } = platformData;
-        const mainPodfilePath = path.join(projectData.appResourcesDirectoryPath, normalizedPlatformName, constants_1.PODFILE_NAME);
-        const projectPodfilePath = this.getProjectPodfilePath(projectRoot);
-        if (this.$fs.exists(projectPodfilePath) ||
-            this.$fs.exists(mainPodfilePath)) {
-            await this.applyPodfileToProject(constants_1.NS_BASE_PODFILE, mainPodfilePath, projectData, platformData);
-        }
+    applyPodfileFromAppResources(projectData, platformData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { projectRoot, normalizedPlatformName } = platformData;
+            const mainPodfilePath = path.join(projectData.appResourcesDirectoryPath, normalizedPlatformName, constants_1.PODFILE_NAME);
+            const projectPodfilePath = this.getProjectPodfilePath(projectRoot);
+            if (this.$fs.exists(projectPodfilePath) ||
+                this.$fs.exists(mainPodfilePath)) {
+                yield this.applyPodfileToProject(constants_1.NS_BASE_PODFILE, mainPodfilePath, projectData, platformData);
+            }
+        });
     }
-    async applyPodfileArchExclusions(projectData, platformData) {
-        const xcodeVersionData = await this.$xcodeSelectService.getXcodeVersion();
-        if (+xcodeVersionData.major !== 12) {
-            return;
-        }
-        const { projectRoot } = platformData;
-        const exclusionsPodfile = path.join(projectRoot, "Podfile-exclusions");
-        if (!this.$fs.exists(exclusionsPodfile)) {
-            const exclusions = `
+    applyPodfileArchExclusions(projectData, platformData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const xcodeVersionData = yield this.$xcodeSelectService.getXcodeVersion();
+            // only apply EXCLUDED_ARCHS workaround on XCode 12
+            if (+xcodeVersionData.major !== 12) {
+                return;
+            }
+            const { projectRoot } = platformData;
+            const exclusionsPodfile = path.join(projectRoot, "Podfile-exclusions");
+            if (!this.$fs.exists(exclusionsPodfile)) {
+                const exclusions = `
 post_install do |installer|
   installer.pods_project.build_configurations.each do |config|
     config.build_settings.delete "VALID_ARCHS"
@@ -95,74 +121,83 @@ post_install do |installer|
     config.build_settings["EXCLUDED_ARCHS[sdk=iphoneos*]"] = "i386 armv6 armv7 armv7s armv8 x86_64"
   end
 end`.trim();
-            this.$fs.writeFile(exclusionsPodfile, exclusions);
-        }
-        await this.applyPodfileToProject("NativeScript-CLI-Architecture-Exclusions", exclusionsPodfile, projectData, platformData);
-        this.$fs.deleteFile(exclusionsPodfile);
+                this.$fs.writeFile(exclusionsPodfile, exclusions);
+            }
+            yield this.applyPodfileToProject("NativeScript-CLI-Architecture-Exclusions", exclusionsPodfile, projectData, platformData);
+            // clean up
+            this.$fs.deleteFile(exclusionsPodfile);
+        });
     }
-    async applyPodfileFromExtensions(projectData, platformData) {
-        const extensionFolderPath = path.join(projectData.getAppResourcesDirectoryPath(), constants.iOSAppResourcesFolderName, constants.NATIVE_EXTENSION_FOLDER);
-        const projectPodfilePath = this.getProjectPodfilePath(platformData.projectRoot);
-        if (!this.$fs.exists(extensionFolderPath) ||
-            !this.$fs.exists(projectPodfilePath)) {
-            return;
-        }
-        let projectPodFileContent = this.$fs.readText(projectPodfilePath);
-        const extensionsPodfile = this.$fs
-            .readDirectory(extensionFolderPath)
-            .filter((name) => {
-            const extensionPath = path.join(extensionFolderPath, name);
-            const stats = this.$fs.getFsStats(extensionPath);
-            return stats.isDirectory() && !name.startsWith(".");
-        })
-            .map((name) => ({
-            targetName: name,
-            podfilePath: path.join(extensionFolderPath, name, constants.PODFILE_NAME),
-        }));
-        extensionsPodfile.forEach(({ targetName, podfilePath }) => {
-            const regExpToRemove = new RegExp(`${this.getExtensionPodfileHeader(podfilePath, targetName)}[\\s\\S]*?${this.getExtensionPodfileEnd()}`, "mg");
-            projectPodFileContent = projectPodFileContent.replace(regExpToRemove, "");
-            if (this.$fs.exists(podfilePath)) {
-                const podfileContentWithoutTarget = this.$fs.readText(podfilePath);
-                const podFileContent = this.getExtensionPodfileHeader(podfilePath, targetName) +
-                    os_1.EOL +
-                    podfileContentWithoutTarget +
-                    os_1.EOL +
-                    this.getExtensionPodfileEnd();
-                projectPodFileContent += os_1.EOL + podFileContent;
+    applyPodfileFromExtensions(projectData, platformData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const extensionFolderPath = path.join(projectData.getAppResourcesDirectoryPath(), constants.iOSAppResourcesFolderName, constants.NATIVE_EXTENSION_FOLDER);
+            const projectPodfilePath = this.getProjectPodfilePath(platformData.projectRoot);
+            if (!this.$fs.exists(extensionFolderPath) ||
+                !this.$fs.exists(projectPodfilePath)) {
+                return;
             }
+            let projectPodFileContent = this.$fs.readText(projectPodfilePath);
+            const extensionsPodfile = this.$fs
+                .readDirectory(extensionFolderPath)
+                .filter((name) => {
+                const extensionPath = path.join(extensionFolderPath, name);
+                const stats = this.$fs.getFsStats(extensionPath);
+                return stats.isDirectory() && !name.startsWith(".");
+            })
+                .map((name) => ({
+                targetName: name,
+                podfilePath: path.join(extensionFolderPath, name, constants.PODFILE_NAME),
+            }));
+            extensionsPodfile.forEach(({ targetName, podfilePath }) => {
+                // Remove the data between #Begin Podfile and #EndPodfile
+                const regExpToRemove = new RegExp(`${this.getExtensionPodfileHeader(podfilePath, targetName)}[\\s\\S]*?${this.getExtensionPodfileEnd()}`, "mg");
+                projectPodFileContent = projectPodFileContent.replace(regExpToRemove, "");
+                if (this.$fs.exists(podfilePath)) {
+                    const podfileContentWithoutTarget = this.$fs.readText(podfilePath);
+                    const podFileContent = this.getExtensionPodfileHeader(podfilePath, targetName) +
+                        os_1.EOL +
+                        podfileContentWithoutTarget +
+                        os_1.EOL +
+                        this.getExtensionPodfileEnd();
+                    projectPodFileContent += os_1.EOL + podFileContent;
+                }
+            });
+            this.$fs.writeFile(projectPodfilePath, projectPodFileContent);
         });
-        this.$fs.writeFile(projectPodfilePath, projectPodFileContent);
     }
-    async applyPodfileToProject(moduleName, podfilePath, projectData, platformData) {
-        const nativeProjectPath = platformData.projectRoot;
-        if (!this.$fs.exists(podfilePath)) {
-            this.removePodfileFromProject(moduleName, podfilePath, projectData, nativeProjectPath);
-            return;
-        }
-        const { podfileContent, replacedFunctions, podfilePlatformData } = this.buildPodfileContent(podfilePath, moduleName, projectData, platformData);
-        const pathToProjectPodfile = this.getProjectPodfilePath(nativeProjectPath);
-        const projectPodfileContent = this.$fs.exists(pathToProjectPodfile)
-            ? this.$fs.readText(pathToProjectPodfile).trim()
-            : "";
-        if (projectPodfileContent.indexOf(podfileContent) === -1) {
-            this.removePodfileFromProject(moduleName, podfilePath, projectData, nativeProjectPath);
-            let finalPodfileContent = this.$fs.exists(pathToProjectPodfile)
-                ? this.getPodfileContentWithoutTarget(projectData, this.$fs.readText(pathToProjectPodfile))
-                : "";
-            if (podfileContent.indexOf(CocoaPodsService.PODFILE_POST_INSTALL_SECTION_NAME) !== -1) {
-                finalPodfileContent = this.addPostInstallHook(replacedFunctions, finalPodfileContent, podfileContent);
+    applyPodfileToProject(moduleName, podfilePath, projectData, platformData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const nativeProjectPath = platformData.projectRoot;
+            if (!this.$fs.exists(podfilePath)) {
+                this.removePodfileFromProject(moduleName, podfilePath, projectData, nativeProjectPath);
+                return;
             }
-            if (podfilePlatformData) {
-                finalPodfileContent = this.$cocoaPodsPlatformManager.addPlatformSection(projectData, podfilePlatformData, finalPodfileContent);
+            const { podfileContent, replacedFunctions, podfilePlatformData } = this.buildPodfileContent(podfilePath, moduleName, projectData, platformData);
+            const pathToProjectPodfile = this.getProjectPodfilePath(nativeProjectPath);
+            const projectPodfileContent = this.$fs.exists(pathToProjectPodfile)
+                ? this.$fs.readText(pathToProjectPodfile).trim()
+                : "";
+            if (projectPodfileContent.indexOf(podfileContent) === -1) {
+                // Remove old occurences of the plugin from the project's Podfile.
+                this.removePodfileFromProject(moduleName, podfilePath, projectData, nativeProjectPath);
+                let finalPodfileContent = this.$fs.exists(pathToProjectPodfile)
+                    ? this.getPodfileContentWithoutTarget(projectData, this.$fs.readText(pathToProjectPodfile))
+                    : "";
+                if (podfileContent.indexOf(CocoaPodsService.PODFILE_POST_INSTALL_SECTION_NAME) !== -1) {
+                    finalPodfileContent = this.addPostInstallHook(replacedFunctions, finalPodfileContent, podfileContent);
+                }
+                if (podfilePlatformData) {
+                    finalPodfileContent = this.$cocoaPodsPlatformManager.addPlatformSection(projectData, podfilePlatformData, finalPodfileContent);
+                }
+                finalPodfileContent = `${finalPodfileContent.trim()}${os_1.EOL}${os_1.EOL}${podfileContent.trim()}${os_1.EOL}`;
+                this.saveProjectPodfile(projectData, finalPodfileContent, nativeProjectPath);
             }
-            finalPodfileContent = `${finalPodfileContent.trim()}${os_1.EOL}${os_1.EOL}${podfileContent.trim()}${os_1.EOL}`;
-            this.saveProjectPodfile(projectData, finalPodfileContent, nativeProjectPath);
-        }
+        });
     }
     removePodfileFromProject(moduleName, podfilePath, projectData, projectRoot) {
         if (this.$fs.exists(this.getProjectPodfilePath(projectRoot))) {
             let projectPodFileContent = this.$fs.readText(this.getProjectPodfilePath(projectRoot));
+            // Remove the data between #Begin Podfile and #EndPodfile
             const regExpToRemove = new RegExp(`${this.getPluginPodfileHeader(podfilePath)}[\\s\\S]*?${this.getPluginPodfileEnd()}`, "mg");
             projectPodFileContent = projectPodFileContent.replace(regExpToRemove, "");
             projectPodFileContent = this.removePostInstallHook(moduleName, projectPodFileContent);
@@ -183,7 +218,7 @@ end`.trim();
         }
     }
     getPluginPodfilePath(pluginData) {
-        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath("ios");
+        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath("ios" /* PlatformTypes.ios */);
         const pluginPodFilePath = path.join(pluginPlatformsFolderPath, constants_1.PODFILE_NAME);
         return pluginPodFilePath;
     }
@@ -219,6 +254,7 @@ end`.trim();
         if (_.startsWith(projectPodfileContent, podFileHeader)) {
             projectPodfileContent = projectPodfileContent.substr(podFileHeader.length);
             const podFileFooter = this.getPodfileFooter();
+            // Only remove the final end in case the file starts with the podFileHeader
             if (_.endsWith(projectPodfileContent, podFileFooter)) {
                 projectPodfileContent = projectPodfileContent.substr(0, projectPodfileContent.length - podFileFooter.length);
             }
@@ -239,6 +275,8 @@ end`.trim();
         return projectPodFileContent;
     }
     getHookBasicFuncNameForPlugin(hookName, pluginName) {
+        // nativescript-hook and nativescript_hook should have different names, so replace all _ with ___ first and then replace all special symbols with _
+        // This will lead to a clash in case plugins are called nativescript-hook and nativescript___hook
         const replacedPluginName = pluginName
             .replace(/_/g, "___")
             .replace(/[^A-Za-z0-9_]/g, "_");
@@ -252,6 +290,7 @@ end`.trim();
             const newFunctionName = `${this.getHookBasicFuncNameForPlugin(hookName, pluginName)}_${newFunctions.length}`;
             let newDefinition = `def ${newFunctionName}`;
             const rubyFunction = { functionName: newFunctionName };
+            // firstGroup is the block parameter, secondGroup is the block parameter name.
             if (firstGroup && secondGroup) {
                 newDefinition = `${newDefinition} (${secondGroup})`;
                 rubyFunction.functionParameters = secondGroup;
@@ -262,6 +301,7 @@ end`.trim();
         return { replacedContent, newFunctions };
     }
     getPluginPodfileHeader(pluginPodFilePath) {
+        // escape special + from the podfile path (pnpm)
         pluginPodFilePath = pluginPodFilePath.replace(/\+/g, "\\+");
         return `# Begin Podfile - ${pluginPodFilePath}`;
     }
@@ -327,7 +367,8 @@ end`.trim();
         return pods;
     }
 }
-exports.CocoaPodsService = CocoaPodsService;
 CocoaPodsService.PODFILE_POST_INSTALL_SECTION_NAME = "post_install";
 CocoaPodsService.INSTALLER_BLOCK_PARAMETER_NAME = "installer";
+exports.CocoaPodsService = CocoaPodsService;
 yok_1.injector.register("cocoapodsService", CocoaPodsService);
+//# sourceMappingURL=cocoapods-service.js.map

package/lib/services/debug-data-service.js

@@ -19,3 +19,4 @@ class DebugDataService {
 }
 exports.DebugDataService = DebugDataService;
 yok_1.injector.register("debugDataService", DebugDataService);
+//# sourceMappingURL=debug-data-service.js.map

package/lib/services/debug-service-base.js

@@ -27,6 +27,12 @@ class DebugServiceBase extends events_1.EventEmitter {
         };
     }
     getChromeDebugUrl(debugOptions, port) {
+        // corresponds to 55.0.2883 Chrome version
+        // SHA is taken from https://chromium.googlesource.com/chromium/src/+/55.0.2883.100
+        // This SHA is old and does not support debugging with HMR.
+        // In case we want to stick with concrete SHA, get it from one of the tags https://chromium.googlesource.com/chromium/src/
+        // IMPORTANT: When you get the SHA, ensure you are using the `parent` commit, not the actual one.
+        // Using the actual commit will result in 404 error in the remote serve.
         const commitSHA = debugOptions.devToolsCommit || "02e6bde1bbe34e43b309d4ef774b1168d25fd024";
         const devToolsProtocol = `devtools`;
         let chromeDevToolsPrefix = `${devToolsProtocol}://devtools/remote/serve_file/@${commitSHA}`;
@@ -42,3 +48,4 @@ class DebugServiceBase extends events_1.EventEmitter {
     }
 }
 exports.DebugServiceBase = DebugServiceBase;
+//# sourceMappingURL=debug-service-base.js.map

package/lib/services/device/device-install-app-service.js

@@ -1,4 +1,13 @@
 "use strict";
+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.DeviceInstallAppService = void 0;
 const constants_1 = require("../../constants");
@@ -15,65 +24,74 @@ class DeviceInstallAppService {
         this.$projectDataService = $projectDataService;
         this.$platformsDataService = $platformsDataService;
     }
-    async installOnDevice(device, buildData, packageFile) {
-        this.$logger.info(`Installing on device ${device.deviceInfo.identifier}...`);
-        const platform = device.deviceInfo.platform.toLowerCase();
-        const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
-        const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
-        await this.$analyticsService.trackEventActionInGoogleAnalytics({
-            action: "Deploy",
-            device,
-            projectDir: projectData.projectDir,
+    installOnDevice(device, buildData, packageFile) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.$logger.info(`Installing on device ${device.deviceInfo.identifier}...`);
+            const platform = device.deviceInfo.platform.toLowerCase();
+            const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
+            const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
+            yield this.$analyticsService.trackEventActionInGoogleAnalytics({
+                action: "Deploy" /* TrackActionNames.Deploy */,
+                device,
+                projectDir: projectData.projectDir,
+            });
+            if (!packageFile) {
+                packageFile = yield this.$buildArtifactsService.getLatestAppPackagePath(platformData, buildData);
+            }
+            yield platformData.platformProjectService.cleanDeviceTempFolder(device.deviceInfo.identifier, projectData);
+            const appIdentifier = projectData.projectIdentifiers[platform];
+            const outputFilePath = buildData.outputPath || platformData.getBuildOutputPath(buildData);
+            yield device.applicationManager.reinstallApplication(appIdentifier, packageFile, buildData);
+            yield this.updateHashesOnDevice({
+                device,
+                appIdentifier,
+                outputFilePath,
+                platformData,
+            });
+            if (!buildData.release) {
+                yield this.$buildInfoFileService.saveDeviceBuildInfo(device, projectData, outputFilePath);
+            }
+            this.$logger.info(`Successfully installed on device with identifier '${device.deviceInfo.identifier}'.`);
         });
-        if (!packageFile) {
-            packageFile = await this.$buildArtifactsService.getLatestAppPackagePath(platformData, buildData);
-        }
-        await platformData.platformProjectService.cleanDeviceTempFolder(device.deviceInfo.identifier, projectData);
-        const appIdentifier = projectData.projectIdentifiers[platform];
-        const outputFilePath = buildData.outputPath || platformData.getBuildOutputPath(buildData);
-        await device.applicationManager.reinstallApplication(appIdentifier, packageFile, buildData);
-        await this.updateHashesOnDevice({
-            device,
-            appIdentifier,
-            outputFilePath,
-            platformData,
-        });
-        if (!buildData.release) {
-            await this.$buildInfoFileService.saveDeviceBuildInfo(device, projectData, outputFilePath);
-        }
-        this.$logger.info(`Successfully installed on device with identifier '${device.deviceInfo.identifier}'.`);
     }
-    async installOnDeviceIfNeeded(device, buildData, packageFile) {
-        const shouldInstall = await this.shouldInstall(device, buildData);
-        if (shouldInstall) {
-            await this.installOnDevice(device, buildData, packageFile);
-        }
+    installOnDeviceIfNeeded(device, buildData, packageFile) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const shouldInstall = yield this.shouldInstall(device, buildData);
+            if (shouldInstall) {
+                yield this.installOnDevice(device, buildData, packageFile);
+            }
+        });
     }
-    async shouldInstall(device, buildData) {
-        const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
-        const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
-        const platform = device.deviceInfo.platform;
-        if (!(await device.applicationManager.isApplicationInstalled(projectData.projectIdentifiers[platform.toLowerCase()]))) {
-            return true;
-        }
-        const deviceBuildInfo = await this.$buildInfoFileService.getDeviceBuildInfo(device, projectData);
-        const localBuildInfo = this.$buildInfoFileService.getLocalBuildInfo(platformData, { ...buildData, buildForDevice: !device.isEmulator });
-        return (!localBuildInfo ||
-            !deviceBuildInfo ||
-            deviceBuildInfo.buildTime !== localBuildInfo.buildTime);
+    shouldInstall(device, buildData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
+            const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
+            const platform = device.deviceInfo.platform;
+            if (!(yield device.applicationManager.isApplicationInstalled(projectData.projectIdentifiers[platform.toLowerCase()]))) {
+                return true;
+            }
+            const deviceBuildInfo = yield this.$buildInfoFileService.getDeviceBuildInfo(device, projectData);
+            const localBuildInfo = this.$buildInfoFileService.getLocalBuildInfo(platformData, Object.assign(Object.assign({}, buildData), { buildForDevice: !device.isEmulator }));
+            return (!localBuildInfo ||
+                !deviceBuildInfo ||
+                deviceBuildInfo.buildTime !== localBuildInfo.buildTime);
+        });
     }
-    async updateHashesOnDevice(data) {
-        const { device, appIdentifier, platformData, outputFilePath } = data;
-        if (!this.$mobileHelper.isAndroidPlatform(platformData.normalizedPlatformName)) {
-            return;
-        }
-        let hashes = {};
-        const hashesFilePath = path.join(outputFilePath, constants_1.HASHES_FILE_NAME);
-        if (this.$fs.exists(hashesFilePath)) {
-            hashes = this.$fs.readJson(hashesFilePath);
-        }
-        await device.fileSystem.updateHashesOnDevice(hashes, appIdentifier);
+    updateHashesOnDevice(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { device, appIdentifier, platformData, outputFilePath } = data;
+            if (!this.$mobileHelper.isAndroidPlatform(platformData.normalizedPlatformName)) {
+                return;
+            }
+            let hashes = {};
+            const hashesFilePath = path.join(outputFilePath, constants_1.HASHES_FILE_NAME);
+            if (this.$fs.exists(hashesFilePath)) {
+                hashes = this.$fs.readJson(hashesFilePath);
+            }
+            yield device.fileSystem.updateHashesOnDevice(hashes, appIdentifier);
+        });
     }
 }
 exports.DeviceInstallAppService = DeviceInstallAppService;
 yok_1.injector.register("deviceInstallAppService", DeviceInstallAppService);
+//# sourceMappingURL=device-install-app-service.js.map