nativescript 8.9.0-dev.2 → 8.9.0-dev.4

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,134 +24,119 @@ 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;
-            // back up project files and folders
-            this.spinner.info("Backing up project files before update");
-            yield this.backupProject();
-            this.spinner.succeed("Project files have been backed up");
-            // clean up project files
-            this.spinner.info("Cleaning up project files before update");
-            yield this.cleanUpProject();
-            this.spinner.succeed("Project files have been cleaned up");
-            // update dependencies
-            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;
+        // back up project files and folders
+        this.spinner.info("Backing up project files before update");
+        await this.backupProject();
+        this.spinner.succeed("Project files have been backed up");
+        // clean up project files
+        this.spinner.info("Cleaning up project files before update");
+        await this.cleanUpProject();
+        this.spinner.succeed("Project files have been cleaned up");
+        // update dependencies
+        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;
             }
-            // check if the coerced version is the same as desired and prefix it with a ~
-            // for example:
-            // 8.0.0 -> ~8.0.0
-            // 8.0.8-next-XXX -> 8.0.8-next-XXX
-            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;
+        }
+        // check if the coerced version is the same as desired and prefix it with a ~
+        // for example:
+        // 8.0.0 -> ~8.0.0
+        // 8.0.8-next-XXX -> 8.0.8-next-XXX
+        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,
-                constants.PLATFORMS_DIR_NAME,
-                constants.NODE_MODULES_FOLDER_NAME,
-                constants.PACKAGE_LOCK_JSON_FILE_NAME,
-            ]);
-        });
+    async cleanUpProject() {
+        await this.$projectCleanupService.clean([
+            constants.HOOKS_DIR_NAME,
+            constants.PLATFORMS_DIR_NAME,
+            constants.NODE_MODULES_FOLDER_NAME,
+            constants.PACKAGE_LOCK_JSON_FILE_NAME,
+        ]);
     }
 }
+exports.UpdateController = UpdateController;
 UpdateController.updatableDependencies = [
     // dependencies
     {
@@ -194,6 +170,5 @@ UpdateController.pathsToBackup = [
     constants.PACKAGE_LOCK_JSON_FILE_NAME,
     constants.CONFIG_NS_FILE_NAME,
 ];
-exports.UpdateController = UpdateController;
 yok_1.injector.register("updateController", UpdateController);
 //# sourceMappingURL=update-controller.js.map

package/lib/data/prepare-data.js

@@ -24,7 +24,10 @@ 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;

package/lib/definitions/project.d.ts

@@ -232,7 +232,7 @@ interface IProjectData extends ICreateProjectData {
 	initializeProjectData(projectDir?: string): void;
 	initializeProjectDataFromContent(
 		packageJsonContent: string,
-		projectDir?: string
+		projectDir?: string,
 	): void;
 	getAppDirectoryPath(projectDir?: string): string;
 	getAppDirectoryRelativePath(): string;
@@ -322,7 +322,7 @@ interface IProjectDataService {
 	 */
 	getRuntimePackage(
 		projectDir: string,
-		platform: SupportedPlatform
+		platform: SupportedPlatform,
 	): IBasePluginData;
 
 	/**
@@ -342,7 +342,7 @@ interface IProjectCleanupService {
 	 */
 	clean(
 		pathsToClean: string[],
-		options?: IProjectCleanupOptions
+		options?: IProjectCleanupOptions,
 	): Promise<IProjectCleanupResult>;
 
 	/**
@@ -351,7 +351,7 @@ interface IProjectCleanupService {
 	 */
 	cleanPath(
 		pathToClean: string,
-		options?: IProjectCleanupOptions
+		options?: IProjectCleanupOptions,
 	): Promise<IProjectCleanupResult>;
 }
 
@@ -453,7 +453,7 @@ interface IProjectConfigService {
 
 	writeLegacyNSConfigIfNeeded(
 		projectDir: string,
-		runtimePackage: IBasePluginData
+		runtimePackage: IBasePluginData,
 	): Promise<void>;
 }
 
@@ -556,14 +556,14 @@ interface IProjectTemplatesService {
 	 */
 	prepareTemplate(
 		templateName: string,
-		projectDir: string
+		projectDir: string,
 	): Promise<ITemplateData>;
 }
 
 interface IPlatformProjectServiceBase {
 	getPluginPlatformsFolderPath(
 		pluginData: IPluginData,
-		platform: string
+		platform: string,
 	): string;
 	getFrameworkVersion(projectData: IProjectData): string;
 }
@@ -625,7 +625,7 @@ interface ILocalBuildService {
 	 */
 	build(
 		platform: string,
-		platformBuildOptions: IPlatformBuildData
+		platformBuildOptions: IPlatformBuildData,
 	): Promise<string>;
 	/**
 	 * Removes build artifacts specific to the platform
@@ -645,7 +645,7 @@ interface ITestExecutionService {
 	startKarmaServer(
 		platform: string,
 		liveSyncInfo: ILiveSyncInfo,
-		deviceDescriptors: ILiveSyncDeviceDescriptor[]
+		deviceDescriptors: ILiveSyncDeviceDescriptor[],
 	): Promise<void>;
 	canStartKarmaServer(projectData: IProjectData): Promise<boolean>;
 }
@@ -679,17 +679,17 @@ interface ICocoaPodsService {
 	 */
 	applyPodfileFromAppResources(
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	applyPodfileArchExclusions(
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	applyPodfileFromExtensions(
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	/**
@@ -704,7 +704,7 @@ interface ICocoaPodsService {
 		moduleName: string,
 		podfilePath: string,
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	/**
@@ -726,7 +726,7 @@ interface ICocoaPodsService {
 		moduleName: string,
 		podfilePath: string,
 		projectData: IProjectData,
-		nativeProjectPath: string
+		nativeProjectPath: string,
 	): void;
 
 	/**
@@ -744,7 +744,7 @@ interface ICocoaPodsService {
 	 */
 	executePodInstall(
 		projectRoot: string,
-		xcodeProjPath: string
+		xcodeProjPath: string,
 	): Promise<ISpawnResult>;
 
 	/**
@@ -756,7 +756,7 @@ interface ICocoaPodsService {
 	mergePodXcconfigFile(
 		projectData: IProjectData,
 		platformData: IPlatformData,
-		opts: IRelease
+		opts: IRelease,
 	): Promise<void>;
 }
 
@@ -764,16 +764,16 @@ interface ICocoaPodsPlatformManager {
 	addPlatformSection(
 		projectData: IProjectData,
 		podfilePlatformData: IPodfilePlatformData,
-		projectPodfileContent: string
+		projectPodfileContent: string,
 	): string;
 	removePlatformSection(
 		moduleName: string,
 		projectPodFileContent: string,
-		podfilePath: string
+		podfilePath: string,
 	): string;
 	replacePlatformRow(
 		podfileContent: string,
-		podfilePath: string
+		podfilePath: string,
 	): { replacedContent: string; podfilePlatformData: IPodfilePlatformData };
 }
 
@@ -798,24 +798,24 @@ interface IIOSNativeTargetService {
 		targetType: string,
 		project: IXcode.project,
 		platformData: IPlatformData,
-		parentTarget?: string
+		parentTarget?: string,
 	): IXcode.target;
 	prepareSigning(
 		targetUuids: string[],
 		projectData: IProjectData,
-		projectPath: string
+		projectPath: string,
 	): void;
 	getTargetDirectories(folderPath: string): string[];
 	setXcodeTargetBuildConfigurationProperties(
 		properties: IXcodeTargetBuildConfigurationProperty[],
 		targetName: string,
-		project: IXcode.project
+		project: IXcode.project,
 	): void;
 	setConfigurationsFromJsonFile(
 		jsonPath: string,
 		targetUuid: string,
 		targetName: string,
-		project: IXcode.project
+		project: IXcode.project,
 	): void;
 }
 
@@ -824,7 +824,7 @@ interface IIOSNativeTargetService {
  */
 interface IIOSExtensionsService {
 	addExtensionsFromPath(
-		options: IAddExtensionsFromPathOptions
+		options: IAddExtensionsFromPathOptions,
 	): Promise<boolean>;
 	removeExtensions(options: IRemoveExtensionsOptions): void;
 }

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 });
 // NOTE: This file is used to call JS functions when cleaning resources used by CLI, after the CLI is killed.
 // The instances here are not shared with the ones in main CLI process.
@@ -45,14 +36,14 @@ const logMessage = (msg, type) => {
     fileLogService.logData({ message: `[${uniqueId}] ${msg}`, type });
 };
 /* tslint:disable:no-floating-promises */
-(() => __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) {
@@ -63,6 +54,6 @@ const logMessage = (msg, type) => {
     catch (err) {
         logMessage(`Unable to require file: ${jsFilePath}. Error is: ${err}.`, "Error" /* FileLogMessageType.Error */);
     }
-}))();
+})();
 /* tslint:enable:no-floating-promises */
 //# sourceMappingURL=cleanup-js-subprocess.js.map