@akylas/nativescript-cli 8.7.2 → 8.8.3

package/lib/controllers/update-controller-base.js

@@ -1,13 +1,4 @@
 "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.UpdateControllerBase = void 0;
 const path = require("path");
@@ -58,27 +49,23 @@ class UpdateControllerBase {
         const currentPlatformVersion = this.$platformCommandHelper.getCurrentPlatformVersion(lowercasePlatform, projectData);
         return !!currentPlatformVersion;
     }
-    getMaxRuntimeVersion({ platform, projectData, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lowercasePlatform = platform.toLowerCase();
-            const currentPlatformVersion = this.$platformCommandHelper.getCurrentPlatformVersion(lowercasePlatform, projectData);
-            const platformData = this.$platformsDataService.getPlatformData(lowercasePlatform, projectData);
-            if (currentPlatformVersion) {
-                return ((yield this.$packageInstallationManager.getMaxSatisfyingVersionSafe(platformData.frameworkPackageName, currentPlatformVersion)) || currentPlatformVersion);
-            }
-        });
+    async getMaxRuntimeVersion({ platform, projectData, }) {
+        const lowercasePlatform = platform.toLowerCase();
+        const currentPlatformVersion = this.$platformCommandHelper.getCurrentPlatformVersion(lowercasePlatform, projectData);
+        const platformData = this.$platformsDataService.getPlatformData(lowercasePlatform, projectData);
+        if (currentPlatformVersion) {
+            return ((await this.$packageInstallationManager.getMaxSatisfyingVersionSafe(platformData.frameworkPackageName, currentPlatformVersion)) || currentPlatformVersion);
+        }
     }
-    _getPackageManifest(templateName, version) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const packageVersion = semver.valid(version) ||
-                (yield this.$packageManager.getTagVersion(templateName, version));
-            if (packageVersion && semver.valid(packageVersion)) {
-                return yield this.$pacoteService.manifest(`${templateName}@${packageVersion}`, { fullMetadata: true });
-            }
-            else {
-                throw new Error(`Failed to get information for package: ${templateName}@${version}`);
-            }
-        });
+    async _getPackageManifest(templateName, version) {
+        const packageVersion = semver.valid(version) ||
+            (await this.$packageManager.getTagVersion(templateName, version));
+        if (packageVersion && semver.valid(packageVersion)) {
+            return await this.$pacoteService.manifest(`${templateName}@${packageVersion}`, { fullMetadata: true });
+        }
+        else {
+            throw new Error(`Failed to get information for package: ${templateName}@${version}`);
+        }
     }
 }
 exports.UpdateControllerBase = UpdateControllerBase;

package/lib/controllers/update-controller.js

@@ -1,13 +1,4 @@
 "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.UpdateController = void 0;
 const semver = require("semver");
@@ -33,127 +24,112 @@ class UpdateController extends update_controller_base_1.UpdateControllerBase {
         this.$projectCleanupService = $projectCleanupService;
         this.$terminalSpinnerService = $terminalSpinnerService;
     }
-    update(updateOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.spinner = this.$terminalSpinnerService.createSpinner();
-            const projectData = this.$projectDataService.getProjectData(updateOptions.projectDir);
-            updateOptions.version = updateOptions.version || constants_1.PackageVersion.LATEST;
-            this.spinner.info("Backing up project files before update");
-            yield this.backupProject();
-            this.spinner.succeed("Project files have been backed up");
-            this.spinner.info("Cleaning up project files before update");
-            yield this.cleanUpProject();
-            this.spinner.succeed("Project files have been cleaned up");
-            this.spinner.info("Updating project dependencies");
-            yield this.updateDependencies(projectData, updateOptions.version);
-            this.spinner.succeed("Project dependencies have been updated");
-            this.spinner.succeed("Update complete.");
-            this.$logger.info("");
-            this.$logger.printMarkdown("Project has been successfully updated. The next step is to run `ns run <platform>` to ensure everything is working properly." +
-                "\n\nPlease note that you may need additional changes to complete the update.");
-        });
+    async update(updateOptions) {
+        this.spinner = this.$terminalSpinnerService.createSpinner();
+        const projectData = this.$projectDataService.getProjectData(updateOptions.projectDir);
+        updateOptions.version = updateOptions.version || constants_1.PackageVersion.LATEST;
+        this.spinner.info("Backing up project files before update");
+        await this.backupProject();
+        this.spinner.succeed("Project files have been backed up");
+        this.spinner.info("Cleaning up project files before update");
+        await this.cleanUpProject();
+        this.spinner.succeed("Project files have been cleaned up");
+        this.spinner.info("Updating project dependencies");
+        await this.updateDependencies(projectData, updateOptions.version);
+        this.spinner.succeed("Project dependencies have been updated");
+        this.spinner.succeed("Update complete.");
+        this.$logger.info("");
+        this.$logger.printMarkdown("Project has been successfully updated. The next step is to run `ns run <platform>` to ensure everything is working properly." +
+            "\n\nPlease note that you may need additional changes to complete the update.");
     }
-    shouldUpdate(updateOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const projectData = this.$projectDataService.getProjectData(updateOptions.projectDir);
-            updateOptions.version = updateOptions.version || constants_1.PackageVersion.LATEST;
-            for (const dependency of UpdateController.updatableDependencies) {
-                this.$logger.trace(`Checking if ${dependency.packageName} needs to be updated...`);
-                const desiredVersion = yield this.getVersionFromTagOrVersion(dependency.packageName, updateOptions.version);
-                if (typeof desiredVersion === "boolean") {
-                    this.$logger.trace(`Package ${dependency.packageName} does not have version/tag ${updateOptions.version}. Skipping.`);
-                    continue;
-                }
-                const shouldUpdate = yield this.shouldUpdateDependency(projectData, dependency, desiredVersion);
-                if (shouldUpdate) {
-                    this.$logger.trace(`shouldUpdate is true because '${dependency.packageName} needs to be updated.'`);
-                    return true;
-                }
-            }
-            return false;
-        });
-    }
-    updateDependencies(projectData, version) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const dependency of UpdateController.updatableDependencies) {
-                yield this.updateDependency(projectData, dependency, version);
-            }
-        });
-    }
-    updateDependency(projectData, dependency, version) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.hasDependency(dependency, projectData)) {
-                return;
-            }
-            const desiredVersion = yield this.getVersionFromTagOrVersion(dependency.packageName, version);
+    async shouldUpdate(updateOptions) {
+        const projectData = this.$projectDataService.getProjectData(updateOptions.projectDir);
+        updateOptions.version = updateOptions.version || constants_1.PackageVersion.LATEST;
+        for (const dependency of UpdateController.updatableDependencies) {
+            this.$logger.trace(`Checking if ${dependency.packageName} needs to be updated...`);
+            const desiredVersion = await this.getVersionFromTagOrVersion(dependency.packageName, updateOptions.version);
             if (typeof desiredVersion === "boolean") {
-                this.$logger.info(`  - ${color_1.color.yellow(dependency.packageName)} does not have version/tag ${color_1.color.green(version)}. ` +
-                    color_1.color.yellow("Skipping."));
-                return;
+                this.$logger.trace(`Package ${dependency.packageName} does not have version/tag ${updateOptions.version}. Skipping.`);
+                continue;
             }
-            const shouldUpdate = yield this.shouldUpdateDependency(projectData, dependency, desiredVersion);
-            if (!shouldUpdate) {
-                return;
+            const shouldUpdate = await this.shouldUpdateDependency(projectData, dependency, desiredVersion);
+            if (shouldUpdate) {
+                this.$logger.trace(`shouldUpdate is true because '${dependency.packageName} needs to be updated.'`);
+                return true;
             }
-            const updatedVersion = (() => {
-                if (desiredVersion === version) {
-                    return desiredVersion;
-                }
-                if (semver.coerce(desiredVersion).version === desiredVersion) {
-                    return `~${desiredVersion}`;
-                }
-                return desiredVersion;
-            })();
-            this.$pluginsService.addToPackageJson(dependency.packageName, updatedVersion, dependency.isDev, projectData.projectDir);
-            this.$logger.info(`  - ${color_1.color.yellow(dependency.packageName)} has been updated to ${color_1.color.green(updatedVersion)}`);
-        });
+        }
+        return false;
     }
-    shouldUpdateDependency(projectData, dependency, desiredVersion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const installedVersion = yield this.$packageInstallationManager.getInstalledDependencyVersion(dependency.packageName, projectData.projectDir);
-            if (!installedVersion) {
-                return false;
-            }
-            return installedVersion != desiredVersion;
-        });
+    async updateDependencies(projectData, version) {
+        for (const dependency of UpdateController.updatableDependencies) {
+            await this.updateDependency(projectData, dependency, version);
+        }
     }
-    getVersionFromTagOrVersion(packageName, versionOrTag) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (semver.valid(versionOrTag) || semver.validRange(versionOrTag)) {
-                return versionOrTag;
+    async updateDependency(projectData, dependency, version) {
+        if (!this.hasDependency(dependency, projectData)) {
+            return;
+        }
+        const desiredVersion = await this.getVersionFromTagOrVersion(dependency.packageName, version);
+        if (typeof desiredVersion === "boolean") {
+            this.$logger.info(`  - ${color_1.color.yellow(dependency.packageName)} does not have version/tag ${color_1.color.green(version)}. ` +
+                color_1.color.yellow("Skipping."));
+            return;
+        }
+        const shouldUpdate = await this.shouldUpdateDependency(projectData, dependency, desiredVersion);
+        if (!shouldUpdate) {
+            return;
+        }
+        const updatedVersion = (() => {
+            if (desiredVersion === version) {
+                return desiredVersion;
             }
-            const version = yield this.$packageManager.getTagVersion(packageName, versionOrTag);
-            if (!version) {
-                return false;
+            if (semver.coerce(desiredVersion).version === desiredVersion) {
+                return `~${desiredVersion}`;
             }
-            return version;
-        });
+            return desiredVersion;
+        })();
+        this.$pluginsService.addToPackageJson(dependency.packageName, updatedVersion, dependency.isDev, projectData.projectDir);
+        this.$logger.info(`  - ${color_1.color.yellow(dependency.packageName)} has been updated to ${color_1.color.green(updatedVersion)}`);
     }
-    backupProject() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const backup = this.$projectBackupService.getBackup("migration");
-            backup.addPaths([...UpdateController.pathsToBackup]);
-            try {
-                return backup.create();
-            }
-            catch (error) {
-                this.spinner.fail(`Project backup failed.`);
-                backup.remove();
-                this.$errors.fail(`Project backup failed. Error is: ${error.message}`);
-            }
-        });
+    async shouldUpdateDependency(projectData, dependency, desiredVersion) {
+        const installedVersion = await this.$packageInstallationManager.getInstalledDependencyVersion(dependency.packageName, projectData.projectDir);
+        if (!installedVersion) {
+            return false;
+        }
+        return installedVersion != desiredVersion;
+    }
+    async getVersionFromTagOrVersion(packageName, versionOrTag) {
+        if (semver.valid(versionOrTag) || semver.validRange(versionOrTag)) {
+            return versionOrTag;
+        }
+        const version = await this.$packageManager.getTagVersion(packageName, versionOrTag);
+        if (!version) {
+            return false;
+        }
+        return version;
+    }
+    async backupProject() {
+        const backup = this.$projectBackupService.getBackup("migration");
+        backup.addPaths([...UpdateController.pathsToBackup]);
+        try {
+            return backup.create();
+        }
+        catch (error) {
+            this.spinner.fail(`Project backup failed.`);
+            backup.remove();
+            this.$errors.fail(`Project backup failed. Error is: ${error.message}`);
+        }
     }
-    cleanUpProject() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.$projectCleanupService.clean([
-                constants.HOOKS_DIR_NAME,
-                this.$projectDataService.getProjectData().getBuildRelativeDirectoryPath(),
-                constants.NODE_MODULES_FOLDER_NAME,
-                constants.PACKAGE_LOCK_JSON_FILE_NAME,
-            ]);
-        });
+    async cleanUpProject() {
+        await this.$projectCleanupService.clean([
+            constants.HOOKS_DIR_NAME,
+            this.$projectDataService.getProjectData().getBuildRelativeDirectoryPath(),
+            constants.NODE_MODULES_FOLDER_NAME,
+            constants.PACKAGE_LOCK_JSON_FILE_NAME,
+        ]);
     }
 }
+exports.UpdateController = UpdateController;
 UpdateController.updatableDependencies = [
     {
         packageName: "@nativescript/core",
@@ -184,5 +160,4 @@ UpdateController.pathsToBackup = [
     constants.PACKAGE_LOCK_JSON_FILE_NAME,
     constants.CONFIG_NS_FILE_NAME,
 ];
-exports.UpdateController = UpdateController;
 yok_1.injector.register("updateController", UpdateController);

package/lib/data/build-data.js

@@ -24,6 +24,7 @@ class IOSBuildData extends BuildData {
         this.mobileProvisionData = data.mobileProvisionData;
         this.buildForAppStore = data.buildForAppStore;
         this.iCloudContainerEnvironment = data.iCloudContainerEnvironment;
+        this.hostProjectPath = data.hostProjectPath;
     }
 }
 exports.IOSBuildData = IOSBuildData;
@@ -39,6 +40,7 @@ class AndroidBuildData extends BuildData {
         this.gradleFlavor = data.gradleFlavor;
         this.gradlePath = data.gradlePath;
         this.gradleArgs = data.gradleArgs;
+        this.hostProjectPath = data.hostProjectPath;
     }
 }
 exports.AndroidBuildData = AndroidBuildData;

package/lib/data/prepare-data.js

@@ -24,11 +24,15 @@ class PrepareData extends controller_data_base_1.ControllerDataBase {
         }
         this.release = data.release;
         this.hmr = data.hmr || data.useHotModuleReload;
-        this.env = Object.assign(Object.assign({}, env), { hmr: data.hmr || data.useHotModuleReload });
+        this.env = {
+            ...env,
+            hmr: data.hmr || data.useHotModuleReload,
+        };
         this.watch = data.watch;
         if (_.isBoolean(data.watchNative)) {
             this.watchNative = data.watchNative;
         }
+        this.hostProjectPath = data.hostProjectPath;
     }
 }
 exports.PrepareData = PrepareData;

package/lib/declarations.d.ts

@@ -578,14 +578,20 @@ interface IAndroidBundleOptions {
 	aab: boolean;
 }
 
-interface IAndroidOptions {
-	gradleArgs: string[];
-	gradleFlavor: string;
+interface IEmbedOptions {
+	hostProjectPath: string;
+	hostProjectModuleName: string;
+}
+
+interface IAndroidOptions extends IEmbedOptions {
 	gradlePath: string;
+	gradleFlavor: string;
 	gradleArgs: string[];
 	overrideRuntimeGradleFiles: boolean;
 }
 
+interface IIOSOptions extends IEmbedOptions {}
+
 interface ITypingsOptions {
 	jar: string;
 	aar: string;
@@ -606,6 +612,7 @@ interface IOptions
 		IProvision,
 		ITeamIdentifier,
 		IAndroidOptions,
+		IIOSOptions,
 		IAndroidReleaseOptions,
 		IAndroidBundleOptions,
 		INpmInstallConfigurationOptions,
@@ -704,6 +711,9 @@ interface IOptions
 	dryRun: boolean;
 
 	platformOverride: string;
+
+	// allow arbitrary options
+	[optionName: string]: any;
 }
 
 interface IEnvOptions {
@@ -1012,6 +1022,7 @@ interface IXcprojService {
 	 * @return {string} The full path to the xcodeproj
 	 */
 	getXcodeprojPath(projectData: IProjectData, projectRoot: string): string;
+	findXcodeProject(dir: string): string;
 }
 
 /**

package/lib/definitions/android-plugin-migrator.d.ts

@@ -12,6 +12,7 @@ interface IAndroidBuildOptions {
 	tempPluginDirPath: string;
 	gradleArgs?: string[];
 	gradlePath?: string;
+	aarSuffix?: string;
 }
 
 interface IAndroidPluginBuildService {

package/lib/definitions/ios-debugger-port-service.d.ts

@@ -11,7 +11,7 @@ interface IIOSDebuggerPortData {
 
 interface IIOSDebuggerPortStoredData {
 	port: number;
-	timer?: NodeJS.Timer;
+	timer?: NodeJS.Timeout;
 	error?: Error;
 }
 

package/lib/definitions/livesync.d.ts

@@ -18,7 +18,7 @@ import {
 
 declare global {
 	interface ILiveSyncProcessData {
-		timer: NodeJS.Timer;
+		timer: NodeJS.Timeout;
 		actionsChain: Promise<any>;
 		isStopped: boolean;
 		deviceDescriptors: ILiveSyncDeviceDescriptor[];

package/lib/definitions/platform.d.ts

@@ -118,6 +118,7 @@ interface ICheckEnvironmentRequirementsOutput {
 
 interface IAddPlatformData extends IControllerDataBase {
 	frameworkPath?: string;
+	hostProjectPath?: string;
 }
 
 interface IPlatformController {

package/lib/definitions/prepare.d.ts

@@ -11,6 +11,9 @@ declare global {
 		watch?: boolean;
 		watchNative: boolean;
 		watchNodeModules?: boolean;
+
+		// embedding
+		hostProjectPath?: string;
 	}
 
 	interface IiOSCodeSigningData {

package/lib/definitions/project.d.ts

@@ -104,6 +104,7 @@ interface INsConfigPlaform {
 interface INsConfigIOS extends INsConfigPlaform {
 	discardUncaughtJsExceptions?: boolean;
 	runtimePackageName?: string
+	cocoapodUseBundleExec?: boolean
 }
 
 interface INSConfigVisionOS extends INsConfigIOS {}
@@ -147,6 +148,8 @@ interface INsConfigAndroid extends INsConfigPlaform {
 
 	gradleArgs?: string[];
 
+	plugins?:{ [k:string]: { aarSuffix?: string } }
+
 	runtimePackageName?: string
 }
 
@@ -170,6 +173,7 @@ interface INsConfig {
 	visionos?: INSConfigVisionOS;
 	ignoredNativeDependencies?: string[];
 	hooks?: INsConfigHooks[];
+	projectName?: string;
 }
 
 interface IProjectData extends ICreateProjectData {
@@ -204,6 +208,7 @@ interface IProjectData extends ICreateProjectData {
 	 * The value can be changed by setting `webpackConfigPath` in nativescript.config.
 	 */
 	webpackConfigPath: string;
+	projectName: string;
 
 	/**
 	 * Initializes project data with the given project directory. If none supplied defaults to --path option or cwd.

package/lib/detached-processes/cleanup-js-subprocess.js

@@ -1,14 +1,5 @@
 #!/usr/bin/env node
 "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 });
 const fs = require("fs");
 const uuid_1 = require("uuid");
@@ -41,14 +32,14 @@ catch (err) {
 const logMessage = (msg, type) => {
     fileLogService.logData({ message: `[${uniqueId}] ${msg}`, type });
 };
-(() => __awaiter(void 0, void 0, void 0, function* () {
+(async () => {
     try {
         logMessage(`Requiring file ${jsFilePath}`);
         const func = require(jsFilePath);
         if (func && typeof func === "function") {
             try {
                 logMessage(`Passing data: ${JSON.stringify(data)} to the default function exported by currently required file ${jsFilePath}`);
-                yield func(data);
+                await func(data);
                 logMessage(`Finished execution with data: ${JSON.stringify(data)} to the default function exported by currently required file ${jsFilePath}`);
             }
             catch (err) {
@@ -59,4 +50,4 @@ const logMessage = (msg, type) => {
     catch (err) {
         logMessage(`Unable to require file: ${jsFilePath}. Error is: ${err}.`, "Error");
     }
-}))();
+})();

package/lib/detached-processes/cleanup-process.js

@@ -1,13 +1,4 @@
 "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 });
 const fs = require("fs");
 const path = require("path");
@@ -29,13 +20,13 @@ const commandsInfos = [];
 const filesToDelete = [];
 const jsCommands = [];
 const requests = [];
-const executeRequest = (request) => __awaiter(void 0, void 0, void 0, function* () {
+const executeRequest = async (request) => {
     const $httpClient = yok_1.injector.resolve("httpClient");
     try {
         fileLogService.logData({
             message: `Start executing request: ${request.method} ${request.url}`,
         });
-        const response = yield $httpClient.httpRequest({
+        const response = await $httpClient.httpRequest({
             url: request.url,
             method: request.method,
             headers: request.headers,
@@ -51,14 +42,14 @@ const executeRequest = (request) => __awaiter(void 0, void 0, void 0, function*
             message: `Unable to execute request: ${request.method} ${request.url}`,
         });
     }
-});
-const executeJSCleanup = (jsCommand) => __awaiter(void 0, void 0, void 0, function* () {
+};
+const executeJSCleanup = async (jsCommand) => {
     const $childProcess = yok_1.injector.resolve("childProcess");
     try {
         fileLogService.logData({
             message: `Start executing action for file: ${jsCommand.filePath} and data ${JSON.stringify(jsCommand.data)}`,
         });
-        yield $childProcess.trySpawnFromCloseEvent(process.execPath, [
+        await $childProcess.trySpawnFromCloseEvent(process.execPath, [
             path.join(__dirname, "cleanup-js-subprocess.js"),
             pathToBootstrap,
             logFile,
@@ -75,21 +66,21 @@ const executeJSCleanup = (jsCommand) => __awaiter(void 0, void 0, void 0, functi
             type: "Error",
         });
     }
-});
-const executeCleanup = () => __awaiter(void 0, void 0, void 0, function* () {
+};
+const executeCleanup = async () => {
     const $childProcess = yok_1.injector.resolve("childProcess");
     for (const request of requests) {
-        yield executeRequest(request);
+        await executeRequest(request);
     }
     for (const jsCommand of jsCommands) {
-        yield executeJSCleanup(jsCommand);
+        await executeJSCleanup(jsCommand);
     }
     for (const commandInfo of commandsInfos) {
         try {
             fileLogService.logData({
                 message: `Start executing command: ${JSON.stringify(commandInfo)}`,
             });
-            yield $childProcess.trySpawnFromCloseEvent(commandInfo.command, commandInfo.args, commandInfo.options || {}, { throwError: true, timeout: commandInfo.timeout || 3000 });
+            await $childProcess.trySpawnFromCloseEvent(commandInfo.command, commandInfo.args, commandInfo.options || {}, { throwError: true, timeout: commandInfo.timeout || 3000 });
             fileLogService.logData({
                 message: `Successfully executed command: ${JSON.stringify(commandInfo)}`,
             });
@@ -117,7 +108,7 @@ const executeCleanup = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     fileLogService.logData({ message: `cleanup-process finished` });
     process.exit();
-});
+};
 const addCleanupAction = (commandInfo) => {
     if (_.some(commandsInfos, (currentCommandInfo) => _.isEqual(currentCommandInfo, commandInfo))) {
         fileLogService.logData({
@@ -228,7 +219,7 @@ const removeJSFile = (jsCommand) => {
         });
     }
 };
-process.on("message", (cleanupProcessMessage) => __awaiter(void 0, void 0, void 0, function* () {
+process.on("message", async (cleanupProcessMessage) => {
     fileLogService.logData({
         message: `cleanup-process received message of type: ${JSON.stringify(cleanupProcessMessage)}`,
     });
@@ -266,15 +257,15 @@ process.on("message", (cleanupProcessMessage) => __awaiter(void 0, void 0, void
             });
             break;
     }
-}));
-process.on("disconnect", () => __awaiter(void 0, void 0, void 0, function* () {
+});
+process.on("disconnect", async () => {
     fileLogService.logData({
         message: "cleanup-process received process.disconnect event",
     });
-    yield executeCleanup();
+    await executeCleanup();
     yok_1.injector.dispose();
     process.exit();
-}));
+});
 fileLogService.logData({
     message: `cleanup-process will send ${"ProcessReadyToReceive"} message`,
 });