nativescript 8.9.0-dev.0 → 8.9.0-dev.2

package/lib/controllers/update-controller-base.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.UpdateControllerBase = void 0;
 const path = require("path");
@@ -49,23 +58,28 @@ class UpdateControllerBase {
         const currentPlatformVersion = this.$platformCommandHelper.getCurrentPlatformVersion(lowercasePlatform, projectData);
         return !!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);
-        }
+    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 _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}`);
-        }
+    _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}`);
+            }
+        });
     }
 }
 exports.UpdateControllerBase = UpdateControllerBase;
+//# sourceMappingURL=update-controller-base.js.map

package/lib/controllers/update-controller.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.UpdateController = void 0;
 const semver = require("semver");
@@ -24,116 +33,140 @@ class UpdateController extends update_controller_base_1.UpdateControllerBase {
         this.$projectCleanupService = $projectCleanupService;
         this.$terminalSpinnerService = $terminalSpinnerService;
     }
-    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.");
+    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 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.trace(`Package ${dependency.packageName} does not have version/tag ${updateOptions.version}. Skipping.`);
-                continue;
-            }
-            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;
+    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;
+            return false;
+        });
     }
-    async updateDependencies(projectData, version) {
-        for (const dependency of UpdateController.updatableDependencies) {
-            await this.updateDependency(projectData, dependency, version);
-        }
+    updateDependencies(projectData, version) {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const dependency of UpdateController.updatableDependencies) {
+                yield this.updateDependency(projectData, dependency, version);
+            }
+        });
     }
-    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;
+    updateDependency(projectData, dependency, version) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.hasDependency(dependency, projectData)) {
+                return;
             }
-            if (semver.coerce(desiredVersion).version === desiredVersion) {
-                return `~${desiredVersion}`;
+            const desiredVersion = yield 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 = yield this.shouldUpdateDependency(projectData, dependency, desiredVersion);
+            if (!shouldUpdate) {
+                return;
             }
-            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)}`);
+            // 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)}`);
+        });
     }
-    async shouldUpdateDependency(projectData, dependency, desiredVersion) {
-        const installedVersion = await this.$packageInstallationManager.getInstalledDependencyVersion(dependency.packageName, projectData.projectDir);
-        if (!installedVersion) {
-            return false;
-        }
-        return installedVersion != desiredVersion;
+    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 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;
+    getVersionFromTagOrVersion(packageName, versionOrTag) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (semver.valid(versionOrTag) || semver.validRange(versionOrTag)) {
+                return versionOrTag;
+            }
+            const version = yield 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}`);
-        }
+    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 cleanUpProject() {
-        await this.$projectCleanupService.clean([
-            constants.HOOKS_DIR_NAME,
-            constants.PLATFORMS_DIR_NAME,
-            constants.NODE_MODULES_FOLDER_NAME,
-            constants.PACKAGE_LOCK_JSON_FILE_NAME,
-        ]);
+    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,
+            ]);
+        });
     }
 }
-exports.UpdateController = UpdateController;
 UpdateController.updatableDependencies = [
+    // dependencies
     {
         packageName: "@nativescript/core",
     },
+    // devDependencies
     {
         packageName: "@nativescript/webpack",
         isDev: true,
@@ -142,6 +175,7 @@ UpdateController.updatableDependencies = [
         packageName: "@nativescript/types",
         isDev: true,
     },
+    // runtimes
     {
         packageName: "@nativescript/ios",
         isDev: true,
@@ -160,4 +194,6 @@ 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/build-data.js

@@ -42,3 +42,4 @@ class AndroidBuildData extends BuildData {
     }
 }
 exports.AndroidBuildData = AndroidBuildData;
+//# sourceMappingURL=build-data.js.map

package/lib/data/controller-data-base.js

@@ -9,3 +9,4 @@ class ControllerDataBase {
     }
 }
 exports.ControllerDataBase = ControllerDataBase;
+//# sourceMappingURL=controller-data-base.js.map

package/lib/data/debug-data.js

@@ -4,3 +4,4 @@ exports.DebugData = void 0;
 class DebugData {
 }
 exports.DebugData = DebugData;
+//# sourceMappingURL=debug-data.js.map

package/lib/data/platform-data.js

@@ -11,3 +11,4 @@ class AddPlatformData extends controller_data_base_1.ControllerDataBase {
     }
 }
 exports.AddPlatformData = AddPlatformData;
+//# sourceMappingURL=platform-data.js.map

package/lib/data/prepare-data.js

@@ -24,10 +24,7 @@ class PrepareData extends controller_data_base_1.ControllerDataBase {
         }
         this.release = data.release;
         this.hmr = data.hmr || data.useHotModuleReload;
-        this.env = {
-            ...env,
-            hmr: data.hmr || data.useHotModuleReload,
-        };
+        this.env = Object.assign(Object.assign({}, env), { hmr: data.hmr || data.useHotModuleReload });
         this.watch = data.watch;
         if (_.isBoolean(data.watchNative)) {
             this.watchNative = data.watchNative;
@@ -49,3 +46,4 @@ exports.IOSPrepareData = IOSPrepareData;
 class AndroidPrepareData extends PrepareData {
 }
 exports.AndroidPrepareData = AndroidPrepareData;
+//# sourceMappingURL=prepare-data.js.map

package/lib/data/run-data.js

@@ -9,3 +9,4 @@ class RunData {
     }
 }
 exports.RunData = RunData;
+//# sourceMappingURL=run-data.js.map

package/lib/definitions/ios.d.ts

@@ -41,16 +41,18 @@ declare global {
 		): Promise<string>;
 	}
 
+	type IosSPMPackage = IosSPMPackageDefinition & { targets?: string[] };
+
 	interface ISPMService {
 		applySPMPackages(
 			platformData: IPlatformData,
 			projectData: IProjectData,
-			pluginSpmPackages?: IosSPMPackageDefinition[]
+			pluginSpmPackages?: IosSPMPackage[]
 		);
 		getSPMPackages(
 			projectData: IProjectData,
 			platform: string
-		): IosSPMPackageDefinition[];
+		): IosSPMPackage[];
 	}
 
 	interface IXcodebuildArgsService {

package/lib/definitions/project.d.ts

@@ -101,8 +101,34 @@ interface INsConfigPlaform {
 	id?: string;
 }
 
+interface IOSSPMPackageBase {
+	name: string;
+	libs: string[];
+	/**
+	 * Optional: If you have more targets (like widgets for example)
+	 * you can list their names here to include the Swift Package with them
+	 */
+	targets?: string[];
+}
+
+export interface IOSRemoteSPMPackage extends IOSSPMPackageBase {
+	repositoryURL: string;
+	version: string;
+}
+
+export interface IOSLocalSPMPackage extends IOSSPMPackageBase {
+	path: string;
+}
+
+export type IOSSPMPackage = IOSRemoteSPMPackage | IOSLocalSPMPackage;
+
 interface INsConfigIOS extends INsConfigPlaform {
 	discardUncaughtJsExceptions?: boolean;
+	/**
+	 * Swift Package Manager
+	 * List packages to be included in the iOS build.
+	 */
+	SPMPackages?: Array<IOSSPMPackage>;
 }
 
 interface INSConfigVisionOS extends INsConfigIOS {}

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

@@ -1,6 +1,17 @@
 #!/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.
 const fs = require("fs");
 const uuid_1 = require("uuid");
 const file_log_service_1 = require("./file-log-service");
@@ -9,6 +20,7 @@ const pathToBootstrap = process.argv[2];
 if (!pathToBootstrap || !fs.existsSync(pathToBootstrap)) {
     throw new Error("Invalid path to bootstrap.");
 }
+// After requiring the bootstrap we can use $injector
 require(pathToBootstrap);
 const logFile = process.argv[3];
 const jsFilePath = process.argv[4];
@@ -32,22 +44,25 @@ catch (err) {
 const logMessage = (msg, type) => {
     fileLogService.logData({ message: `[${uniqueId}] ${msg}`, type });
 };
-(async () => {
+/* tslint:disable:no-floating-promises */
+(() => __awaiter(void 0, void 0, void 0, function* () {
     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}`);
-                await func(data);
+                yield func(data);
                 logMessage(`Finished execution with data: ${JSON.stringify(data)} to the default function exported by currently required file ${jsFilePath}`);
             }
             catch (err) {
-                logMessage(`Unable to execute action of file ${jsFilePath} when passed data is ${JSON.stringify(data)}. Error is: ${err}.`, "Error");
+                logMessage(`Unable to execute action of file ${jsFilePath} when passed data is ${JSON.stringify(data)}. Error is: ${err}.`, "Error" /* FileLogMessageType.Error */);
             }
         }
     }
     catch (err) {
-        logMessage(`Unable to require file: ${jsFilePath}. Error is: ${err}.`, "Error");
+        logMessage(`Unable to require file: ${jsFilePath}. Error is: ${err}.`, "Error" /* FileLogMessageType.Error */);
     }
-})();
+}))();
+/* tslint:enable:no-floating-promises */
+//# sourceMappingURL=cleanup-js-subprocess.js.map