nativescript 8.7.2 → 8.8.0-embed.0

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

@@ -90,7 +90,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             projectData.platformsDir &&
             this._platformsDirCache !== projectData.platformsDir) {
             const platform = this.$mobileHelper.normalizePlatformName((_a = this.$options.platformOverride) !== null && _a !== void 0 ? _a : this.$devicePlatformsConstants.iOS);
-            const projectRoot = path.join(projectData.platformsDir, platform.toLowerCase());
+            const projectRoot = this.$options.nativeHost
+                ? this.$options.nativeHost
+                : path.join(projectData.platformsDir, platform.toLowerCase());
             const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, platform.toLowerCase());
             this._platformData = {
                 frameworkPackageName: runtimePackage.name,
@@ -143,7 +145,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                     ".ico",
                     ".cur",
                     ".xbm",
-                ], // https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIImage_Class/
+                ],
             };
         }
         return this._platformData;
@@ -196,12 +198,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             shell.cp("-R", path.join(frameworkDir, "*"), this.getPlatformData(projectData).projectRoot);
         });
     }
-    //TODO: plamen5kov: revisit this method, might have unnecessary/obsolete logic
     interpolateData(projectData) {
         return __awaiter(this, void 0, void 0, function* () {
             const projectRootFilePath = path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER);
-            // Starting with NativeScript for iOS 1.6.0, the project Info.plist file resides not in the platform project,
-            // but in the hello-world app template as a platform specific resource.
             if (this.$fs.exists(path.join(projectRootFilePath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + "-Info.plist"))) {
                 this.replaceFileName("-Info.plist", projectRootFilePath, projectData);
             }
@@ -318,10 +317,8 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     }
     addStaticLibrary(staticLibPath, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Copy files to lib folder.
             const libraryName = path.basename(staticLibPath, ".a");
             const headersSubpath = path.join(path.dirname(staticLibPath), "include", libraryName);
-            // Add static library to project file and setup header search paths
             const project = this.createPbxProj(projectData);
             const relativeStaticLibPath = this.getLibSubpathRelativeToProjectPath(staticLibPath, projectData);
             project.addFramework(relativeStaticLibPath);
@@ -333,7 +330,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     }
     prepareProject(projectData, prepareData) {
         return __awaiter(this, void 0, void 0, function* () {
-            const projectRoot = path.join(projectData.platformsDir, "ios");
+            const projectRoot = this.$options.nativeHost
+                ? this.$options.nativeHost
+                : path.join(projectData.platformsDir, this.$devicePlatformsConstants.iOS.toLowerCase());
             const platformData = this.getPlatformData(projectData);
             const pluginsData = this.getAllProductionPlugins(projectData);
             const pbxProjPath = this.getPbxProjPath(projectData);
@@ -350,7 +349,16 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             }
             const project = this.createPbxProj(projectData);
             const resources = project.pbxGroupByName("Resources");
-            if (resources) {
+            if (this.$options.nativeHost) {
+                try {
+                    project.addResourceFile(path.join(this.$options.nativeHost, projectData.projectName));
+                    this.savePbxProj(project, projectData);
+                }
+                catch (err) {
+                    console.log(err);
+                }
+            }
+            if (resources && !this.$options.nativeHost) {
                 const references = project.pbxFileReferenceSection();
                 const xcodeProjectImages = _.map(resources.children, (resource) => this.replace(references[resource.value].name));
                 this.$logger.trace("Images from Xcode project");
@@ -390,12 +398,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$fs.deleteDirectory(platformsAppResourcesPath);
         this.$fs.ensureDirectoryExists(platformsAppResourcesPath);
         const platformAppResourcesPath = path.join(projectAppResourcesPath, platformData.normalizedPlatformName);
-        // this allows App_Resources/visionOS
         if (this.$fs.exists(platformAppResourcesPath)) {
             this.$fs.copyFile(path.join(platformAppResourcesPath, "*"), platformsAppResourcesPath);
         }
         else {
-            // otherwise falls back to App_Resources/iOS
             this.$fs.copyFile(path.join(projectAppResourcesPath, this.$devicePlatformsConstants.iOS, "*"), platformsAppResourcesPath);
         }
         this.$fs.deleteFile(path.join(platformsAppResourcesPath, platformData.configurationFileName));
@@ -500,6 +506,13 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         return frameworkPath;
     }
     getPbxProjPath(projectData) {
+        if (this.$options.nativeHost) {
+            let xcodeProjectPath = this.$xcprojService.findXcodeProject(this.$options.nativeHost);
+            if (!xcodeProjectPath) {
+                this.$errors.fail("Xcode project not found at the specified directory");
+            }
+            return path.join(xcodeProjectPath, "project.pbxproj");
+        }
         return path.join(this.$xcprojService.getXcodeprojPath(projectData, this.getPlatformData(projectData).projectRoot), "project.pbxproj");
     }
     createPbxProj(projectData) {
@@ -542,10 +555,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             const projectPodfilePath = this.$cocoapodsService.getProjectPodfilePath(platformData.projectRoot);
             if (this.$fs.exists(projectPodfilePath)) {
                 yield this.$cocoapodsService.executePodInstall(platformData.projectRoot, this.$xcprojService.getXcodeprojPath(projectData, platformData.projectRoot));
-                // The `pod install` command adds a new target to the .pbxproject. This target adds additional build phases to Xcode project.
-                // Some of these phases relies on env variables (like PODS_PODFILE_DIR_PATH or PODS_ROOT).
-                // These variables are produced from merge of pod's xcconfig file and project's xcconfig file.
-                // So the correct order is `pod install` to be executed before merging pod's xcconfig file.
                 yield this.$cocoapodsService.mergePodXcconfigFile(projectData, platformData, opts);
             }
             yield this.$spmService.applySPMPackages(platformData, projectData);
@@ -560,7 +569,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             const hasProvision = provision !== undefined;
             const hasTeamId = teamId !== undefined;
             if (hasProvision || hasTeamId) {
-                // Check if the native project's signing is set to the provided provision...
                 const pbxprojPath = this.getPbxProjPath(projectData);
                 if (this.$fs.exists(pbxprojPath)) {
                     const xcode = this.$pbxprojDomXcode.Xcode.open(pbxprojPath);
@@ -576,9 +584,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                             }
                         }
                         else {
-                            // Specifying provisioning profile requires "Manual" signing style.
-                            // If the current signing style was not "Manual" it was probably "Automatic" or,
-                            // it was not uniform for the debug and release build configurations.
                             changesInfo.signingChanged = true;
                         }
                     }
@@ -592,8 +597,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                             }
                         }
                         else {
-                            // Specifying team id or name requires "Automatic" signing style.
-                            // If the current signing style was not "Automatic" it was probably "Manual".
                             changesInfo.signingChanged = true;
                         }
                     }
@@ -812,14 +815,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             }
             for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
                 if (!this.$fs.exists(pluginsXcconfigFilePath)) {
-                    // We need the pluginsXcconfig file to exist in platforms dir as it is required in the native template:
-                    // https://github.com/NativeScript/ios-runtime/blob/9c2b7b5f70b9bee8452b7a24aa6b646214c7d2be/build/project-template/__PROJECT_NAME__/build-debug.xcconfig#L3
-                    // From Xcode 10 in case the file is missing, this include fails and the build itself fails (was a warning in previous Xcode versions).
                     this.$fs.writeFile(pluginsXcconfigFilePath, "");
                 }
             }
             for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
-                // Set Entitlements Property to point to default file if not set explicitly by the user.
                 const entitlementsPropertyValue = this.$xcconfigService.readPropertyValue(pluginsXcconfigFilePath, constants.CODE_SIGN_ENTITLEMENTS);
                 if (entitlementsPropertyValue === null &&
                     this.$fs.exists(this.$iOSEntitlementsService.getPlatformsEntitlementsPath(projectData))) {
@@ -867,4 +866,3 @@ __decorate([
 ], IOSProjectService.prototype, "buildProject", null);
 exports.IOSProjectService = IOSProjectService;
 yok_1.injector.register("iOSProjectService", IOSProjectService);
-//# sourceMappingURL=ios-project-service.js.map

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

@@ -145,8 +145,6 @@ class IOSProvisionService {
     getDevelopmentTeams() {
         return __awaiter(this, void 0, void 0, function* () {
             const teams = {};
-            // NOTE: We are reading all provisioning profiles and collect team information from them.
-            // It would be better if we can check the Apple ID registered in Xcode and read the teams associated with it.
             mobileprovision.provision.read().forEach((provision) => provision.TeamIdentifier &&
                 provision.TeamIdentifier.forEach((id) => {
                     if (!teams[provision.TeamName]) {
@@ -173,4 +171,3 @@ class IOSProvisionService {
 }
 exports.IOSProvisionService = IOSProvisionService;
 yok_1.injector.register("iOSProvisionService", IOSProvisionService);
-//# sourceMappingURL=ios-provision-service.js.map

package/lib/services/ios-watch-app-service.js

@@ -74,4 +74,3 @@ IOSWatchAppService.WATCH_APP_IDENTIFIER = "watchkitapp";
 IOSWatchAppService.WACTCH_EXTENSION_IDENTIFIER = "watchkitextension";
 exports.IOSWatchAppService = IOSWatchAppService;
 yok_1.injector.register("iOSWatchAppService", IOSWatchAppService);
-//# sourceMappingURL=ios-watch-app-service.js.map

package/lib/services/ip-service.js

@@ -52,7 +52,6 @@ class IPService {
     }
     getIPAddressFromIpifyOrgAPI() {
         return __awaiter(this, void 0, void 0, function* () {
-            // https://www.ipify.org/
             const ipifyOrgAPIEndpoint = "https://api.ipify.org";
             let ipAddress = null;
             try {
@@ -77,4 +76,3 @@ __decorate([
 ], IPService.prototype, "getCurrentIPv4Address", null);
 exports.IPService = IPService;
 yok_1.injector.register("ipService", IPService);
-//# sourceMappingURL=ip-service.js.map

package/lib/services/itmstransporter-service.js

@@ -214,4 +214,3 @@ __decorate([
 ], ITMSTransporterService.prototype, "getITMSTransporterPath", null);
 exports.ITMSTransporterService = ITMSTransporterService;
 yok_1.injector.register("itmsTransporterService", ITMSTransporterService);
-//# sourceMappingURL=itmstransporter-service.js.map

package/lib/services/karma-execution.js

@@ -9,10 +9,8 @@ process.on("message", (data) => {
         });
         const KarmaServer = require(path.join(pathToKarma, "lib/server"));
         const karma = new KarmaServer(data.karmaConfig, (exitCode) => {
-            // Exit with the correct exit code and signal the manager process.
             process.exit(exitCode);
         });
         karma.start();
     }
 });
-//# sourceMappingURL=karma-execution.js.map

package/lib/services/livesync/android-device-livesync-service-base.js

@@ -66,4 +66,3 @@ class AndroidDeviceLiveSyncServiceBase extends device_livesync_service_base_1.De
     }
 }
 exports.AndroidDeviceLiveSyncServiceBase = AndroidDeviceLiveSyncServiceBase;
-//# sourceMappingURL=android-device-livesync-service-base.js.map

package/lib/services/livesync/android-device-livesync-service.js

@@ -119,7 +119,6 @@ class AndroidDeviceLiveSyncService extends android_device_livesync_service_base_
             ]);
             const regex = new RegExp(`^-.*${deviceRootBasename}$`, "m");
             const matchingFile = (listResult || "").match(regex);
-            // Check if there is already a file with deviceRootBasename. If so, delete it as it breaks LiveSyncing.
             if (matchingFile && matchingFile[0] && _.startsWith(matchingFile[0], "-")) {
                 yield this.device.adb.executeShellCommand(["rm", "-f", deviceRootPath]);
             }
@@ -202,4 +201,3 @@ __decorate([
     (0, decorators_1.performanceLog)()
 ], AndroidDeviceLiveSyncService.prototype, "removeFiles", null);
 exports.AndroidDeviceLiveSyncService = AndroidDeviceLiveSyncService;
-//# sourceMappingURL=android-device-livesync-service.js.map

package/lib/services/livesync/android-device-livesync-sockets-service.js

@@ -11,8 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AndroidDeviceSocketsLiveSyncService = void 0;
 const android_device_livesync_service_base_1 = require("./android-device-livesync-service-base");
-const constants_1 = require("../../constants");
-const constants_2 = require("../../common/constants");
+const constants_1 = require("../../common/constants");
 const android_livesync_tool_1 = require("./android-livesync-tool");
 const path = require("path");
 const semver = require("semver");
@@ -57,7 +56,7 @@ class AndroidDeviceSocketsLiveSyncService extends android_device_livesync_servic
         });
     }
     getPathToLiveSyncFileOnDevice(appIdentifier) {
-        return `${constants_2.LiveSyncPaths.ANDROID_TMP_DIR_NAME}/${appIdentifier}-livesync-in-progress`;
+        return `${constants_1.LiveSyncPaths.ANDROID_TMP_DIR_NAME}/${appIdentifier}-livesync-in-progress`;
     }
     finalizeSync(liveSyncInfo, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -112,8 +111,6 @@ class AndroidDeviceSocketsLiveSyncService extends android_device_livesync_servic
                     yield this.$cleanupService.removeCleanupCommand(cleanupCommand);
                 });
                 yield this.$cleanupService.addCleanupCommand(cleanupCommand);
-                // We need to clear resources when the action fails
-                // But we also need the real result of the action.
                 yield doSyncPromise.then(actionOnEnd.bind(this), actionOnEnd.bind(this));
                 result = yield doSyncPromise;
             }
@@ -183,7 +180,7 @@ class AndroidDeviceSocketsLiveSyncService extends android_device_livesync_servic
     connectLivesyncTool(appIdentifier, connectTimeout) {
         return __awaiter(this, void 0, void 0, function* () {
             const platformData = this.platformsDataService.getPlatformData(this.$devicePlatformsConstants.Android, this.data);
-            const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, constants_1.APP_FOLDER_NAME);
+            const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule);
             if (!this.livesyncTool.hasConnection()) {
                 yield this.livesyncTool.connect({
                     appIdentifier,
@@ -198,4 +195,3 @@ class AndroidDeviceSocketsLiveSyncService extends android_device_livesync_servic
 AndroidDeviceSocketsLiveSyncService.STATUS_UPDATE_INTERVAL = 10000;
 AndroidDeviceSocketsLiveSyncService.MINIMAL_VERSION_LONG_LIVING_CONNECTION = "0.2.0";
 exports.AndroidDeviceSocketsLiveSyncService = AndroidDeviceSocketsLiveSyncService;
-//# sourceMappingURL=android-device-livesync-sockets-service.js.map

package/lib/services/livesync/android-livesync-service.js

@@ -24,8 +24,8 @@ const semver = require("semver");
 const _ = require("lodash");
 const yok_1 = require("../../common/yok");
 class AndroidLiveSyncService extends platform_livesync_service_base_1.PlatformLiveSyncServiceBase {
-    constructor($platformsDataService, $projectFilesManager, $injector, $devicePathProvider, $fs, $logger) {
-        super($fs, $logger, $platformsDataService, $projectFilesManager, $devicePathProvider);
+    constructor($platformsDataService, $projectFilesManager, $injector, $devicePathProvider, $fs, $logger, $options) {
+        super($fs, $logger, $platformsDataService, $projectFilesManager, $devicePathProvider, $options);
         this.$platformsDataService = $platformsDataService;
         this.$projectFilesManager = $projectFilesManager;
         this.$injector = $injector;
@@ -74,4 +74,3 @@ __decorate([
 ], AndroidLiveSyncService.prototype, "fullSync", null);
 exports.AndroidLiveSyncService = AndroidLiveSyncService;
 yok_1.injector.register("androidLiveSyncService", AndroidLiveSyncService);
-//# sourceMappingURL=android-livesync-service.js.map

package/lib/services/livesync/android-livesync-tool.js

@@ -159,12 +159,9 @@ class AndroidLivesyncTool {
             error =
                 error ||
                     this.getErrorWithMessage("Socket connection ended before sync operation is complete.");
-            //remove listeners and delete this.socketConnection
             this.cleanState(socketUid);
-            //call end of the connection (close and error callbacks won't be called - listeners removed)
             socket.end();
             socket.destroy();
-            //reject all pending sync requests and clear timeouts
             this.rejectPendingSyncOperations(socketUid, error);
         }
     }
@@ -428,4 +425,3 @@ AndroidLivesyncTool.SOCKET_CONNECTION_TIMED_OUT_ERROR = "Socket connection timed
 AndroidLivesyncTool.NO_SOCKET_CONNECTION_AVAILABLE_ERROR = "No socket connection available.";
 exports.AndroidLivesyncTool = AndroidLivesyncTool;
 yok_1.injector.register("androidLivesyncTool", AndroidLivesyncTool);
-//# sourceMappingURL=android-livesync-tool.js.map

package/lib/services/livesync/device-livesync-service-base.js

@@ -52,7 +52,6 @@ class DeviceLiveSyncServiceBase {
     }
     finalizeSync(liveSyncInfo, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
-            //implement in case a sync point for all remove/create operation is needed
             return {
                 didRefresh: true,
                 operationId: "",
@@ -68,4 +67,3 @@ __decorate([
     (0, decorators_2.performanceLog)()
 ], DeviceLiveSyncServiceBase.prototype, "transferFiles", null);
 exports.DeviceLiveSyncServiceBase = DeviceLiveSyncServiceBase;
-//# sourceMappingURL=device-livesync-service-base.js.map

package/lib/services/livesync/ios-device-livesync-service.js

@@ -47,13 +47,11 @@ class IOSDeviceLiveSyncService extends device_livesync_service_base_1.DeviceLive
     }
     setupSocketIfNeeded(projectData) {
         return __awaiter(this, void 0, void 0, function* () {
-            // TODO: persist the sockets per app in order to support LiveSync on multiple apps on the same device
             if (this.socket) {
                 return true;
             }
             const appId = projectData.projectIdentifiers.ios;
             try {
-                // TODO: temp workaround till we setup the sockets along with the app start
                 const ensureAppStarted = true;
                 this.socket = yield this.device.getDebugSocket(appId, projectData.projectName, projectData.projectDir, ensureAppStarted);
             }
@@ -145,7 +143,6 @@ class IOSDeviceLiveSyncService extends device_livesync_service_base_1.DeviceLive
                 projectDir: projectData.projectDir,
             });
             if (liveSyncInfo.useHotModuleReload) {
-                // enable HOT updates
                 yield this.setupSocketIfNeeded(projectData);
             }
         });
@@ -208,9 +205,6 @@ class IOSDeviceLiveSyncService extends device_livesync_service_base_1.DeviceLive
     destroySocket() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.socket) {
-                // we do not support LiveSync on multiple apps on the same device
-                // in order to do that, we should cache the socket per app
-                // and destroy just the current app socket when possible
                 yield this.device.destroyAllSockets();
                 this.socket = null;
             }
@@ -222,4 +216,3 @@ __decorate([
     (0, decorators_1.performanceLog)()
 ], IOSDeviceLiveSyncService.prototype, "removeFiles", null);
 exports.IOSDeviceLiveSyncService = IOSDeviceLiveSyncService;
-//# sourceMappingURL=ios-device-livesync-service.js.map

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

@@ -23,8 +23,8 @@ const constants_1 = require("../../constants");
 const decorators_1 = require("../../common/decorators");
 const yok_1 = require("../../common/yok");
 class IOSLiveSyncService extends platform_livesync_service_base_1.PlatformLiveSyncServiceBase {
-    constructor($fs, $platformsDataService, $projectFilesManager, $injector, $tempService, $devicePathProvider, $logger) {
-        super($fs, $logger, $platformsDataService, $projectFilesManager, $devicePathProvider);
+    constructor($fs, $platformsDataService, $projectFilesManager, $injector, $tempService, $devicePathProvider, $logger, $options) {
+        super($fs, $logger, $platformsDataService, $projectFilesManager, $devicePathProvider, $options);
         this.$fs = $fs;
         this.$platformsDataService = $platformsDataService;
         this.$projectFilesManager = $projectFilesManager;
@@ -73,7 +73,6 @@ class IOSLiveSyncService extends platform_livesync_service_base_1.PlatformLiveSy
     syncAfterInstall(device, liveSyncInfo) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!device.isEmulator) {
-                // In this case we should execute fullsync because iOS Runtime requires the full content of app dir to be extracted in the root of sync dir.
                 yield this.fullSync({
                     projectData: liveSyncInfo.projectData,
                     device,
@@ -94,4 +93,3 @@ __decorate([
 ], IOSLiveSyncService.prototype, "fullSync", null);
 exports.IOSLiveSyncService = IOSLiveSyncService;
 yok_1.injector.register("iOSLiveSyncService", IOSLiveSyncService);
-//# sourceMappingURL=ios-livesync-service.js.map

package/lib/services/livesync/livesync-socket.js

@@ -12,4 +12,3 @@ class LiveSyncSocket extends net.Socket {
 }
 exports.LiveSyncSocket = LiveSyncSocket;
 yok_1.injector.register("LiveSyncSocket", LiveSyncSocket, false);
-//# sourceMappingURL=livesync-socket.js.map

package/lib/services/livesync/platform-livesync-service-base.js

@@ -24,12 +24,13 @@ const helpers_1 = require("../../common/helpers");
 const decorators_1 = require("../../common/decorators");
 const color_1 = require("../../color");
 class PlatformLiveSyncServiceBase {
-    constructor($fs, $logger, $platformsDataService, $projectFilesManager, $devicePathProvider) {
+    constructor($fs, $logger, $platformsDataService, $projectFilesManager, $devicePathProvider, $options) {
         this.$fs = $fs;
         this.$logger = $logger;
         this.$platformsDataService = $platformsDataService;
         this.$projectFilesManager = $projectFilesManager;
         this.$devicePathProvider = $devicePathProvider;
+        this.$options = $options;
         this._deviceLiveSyncServicesCache = {};
     }
     getDeviceLiveSyncService(device, projectData) {
@@ -51,7 +52,6 @@ class PlatformLiveSyncServiceBase {
     }
     syncAfterInstall(device, liveSyncInfo) {
         return __awaiter(this, void 0, void 0, function* () {
-            /* intentionally left blank */
         });
     }
     restartApplication(projectData, liveSyncInfo) {
@@ -82,7 +82,7 @@ class PlatformLiveSyncServiceBase {
             if (deviceLiveSyncService.beforeLiveSyncAction) {
                 yield deviceLiveSyncService.beforeLiveSyncAction(deviceAppData);
             }
-            const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, constants_1.APP_FOLDER_NAME);
+            const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule);
             const localToDevicePaths = yield this.$projectFilesManager.createLocalToDevicePaths(deviceAppData, projectFilesPath, null, []);
             const modifiedFilesData = yield this.transferFiles(deviceAppData, localToDevicePaths, projectFilesPath, projectData, syncInfo.liveSyncDeviceData, { isFullSync: true, force: syncInfo.force });
             return {
@@ -105,8 +105,6 @@ class PlatformLiveSyncServiceBase {
             let modifiedLocalToDevicePaths = [];
             if (liveSyncInfo.filesToSync.length) {
                 const filesToSync = liveSyncInfo.filesToSync;
-                // const mappedFiles = _.map(filesToSync, filePath => this.$projectFilesProvider.mapFilePath(filePath, device.deviceInfo.platform, projectData));
-                // Some plugins modify platforms dir on afterPrepare (check nativescript-dev-sass) - we want to sync only existing file.
                 const existingFiles = filesToSync.filter((m) => m && this.$fs.exists(m));
                 this.$logger.trace("Will execute livesync for files: ", existingFiles);
                 const skippedFiles = _.difference(filesToSync, existingFiles);
@@ -115,7 +113,7 @@ class PlatformLiveSyncServiceBase {
                 }
                 if (existingFiles.length) {
                     const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
-                    const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, constants_1.APP_FOLDER_NAME);
+                    const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule);
                     const localToDevicePaths = yield this.$projectFilesManager.createLocalToDevicePaths(deviceAppData, projectFilesPath, existingFiles, []);
                     modifiedLocalToDevicePaths.push(...localToDevicePaths);
                     modifiedLocalToDevicePaths = yield this.transferFiles(deviceAppData, localToDevicePaths, projectFilesPath, projectData, liveSyncInfo.liveSyncDeviceData, { isFullSync: false, force: liveSyncInfo.force });
@@ -125,7 +123,6 @@ class PlatformLiveSyncServiceBase {
                 const filePaths = liveSyncInfo.filesToRemove;
                 const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
                 const mappedFiles = _(filePaths)
-                    // .map(filePath => this.$projectFilesProvider.mapFilePath(filePath, device.deviceInfo.platform, projectData))
                     .filter((filePath) => !!filePath)
                     .value();
                 const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, constants_1.APP_FOLDER_NAME);
@@ -182,4 +179,3 @@ __decorate([
     (0, decorators_1.performanceLog)()
 ], PlatformLiveSyncServiceBase.prototype, "liveSyncWatchAction", null);
 exports.PlatformLiveSyncServiceBase = PlatformLiveSyncServiceBase;
-//# sourceMappingURL=platform-livesync-service-base.js.map

package/lib/services/livesync-process-data-service.js

@@ -41,4 +41,3 @@ class LiveSyncProcessDataService {
 }
 exports.LiveSyncProcessDataService = LiveSyncProcessDataService;
 yok_1.injector.register("liveSyncProcessDataService", LiveSyncProcessDataService);
-//# sourceMappingURL=livesync-process-data-service.js.map

package/lib/services/log-parser-service.js

@@ -50,4 +50,3 @@ __decorate([
 ], LogParserService.prototype, "startParsingLogCore", null);
 exports.LogParserService = LogParserService;
 yok_1.injector.register("logParserService", LogParserService);
-//# sourceMappingURL=log-parser-service.js.map

package/lib/services/log-source-map-service.js

@@ -23,10 +23,11 @@ class LogSourceMapService {
     get $platformsDataService() {
         return this.$injector.resolve("platformsDataService");
     }
-    constructor($fs, $projectDataService, $injector, $devicePlatformsConstants, $logger) {
+    constructor($fs, $projectDataService, $injector, $options, $devicePlatformsConstants, $logger) {
         this.$fs = $fs;
         this.$projectDataService = $projectDataService;
         this.$injector = $injector;
+        this.$options = $options;
         this.$devicePlatformsConstants = $devicePlatformsConstants;
         this.$logger = $logger;
         this.cache = {};
@@ -40,7 +41,6 @@ class LogSourceMapService {
                 if (!this.$fs.getFsStats(filePath).isDirectory()) {
                     const mapFile = filePath + ".map";
                     let sourceMapRaw;
-                    // Skip files bigger than 50MB
                     if (this.$fs.getFileSize(filePath) > 50 * 1000 * 1000) {
                         this.$logger.trace(`Skipping source map for file ${filePath} because it is too big (> 50MB).`);
                         return;
@@ -122,7 +122,7 @@ class LogSourceMapService {
         return runtimeVersion;
     }
     getOriginalFileLocation(platform, parsedLine, projectData) {
-        const fileLocation = path.join(this.getFilesLocation(platform, projectData), constants_1.APP_FOLDER_NAME);
+        const fileLocation = path.join(this.getFilesLocation(platform, projectData), this.$options.nativeHostModule);
         if (parsedLine && parsedLine.filePath) {
             const sourceMapFile = path.join(fileLocation, parsedLine.filePath);
             const smc = this.cache[sourceMapFile];
@@ -166,8 +166,6 @@ class LogSourceMapService {
         }
     }
     parseAndroidLog(projectData, rawMessage) {
-        // "JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap (file:///data/data/org.nativescript.sourceMap/files/app/bundle.js:303:17)"
-        // "System.err: File: "file:///data/data/org.nativescript.sourceMap/files/app/bundle.js, line: 304, column: 8"
         const fileIndex = rawMessage.lastIndexOf(LogSourceMapService.FILE_PREFIX);
         const deviceProjectPath = util.format(constants_1.ANDROID_DEVICE_APP_ROOT_TEMPLATE, projectData.projectIdentifiers.android);
         let separator = ",";
@@ -175,25 +173,18 @@ class LogSourceMapService {
         let parts, filePath, line, column, messagePrefix;
         if (fileIndex >= 0) {
             const fileSubstring = rawMessage.substring(fileIndex + LogSourceMapService.FILE_PREFIX.length);
-            //"data/data/org.nativescript.sourceMap/files/app/bundle.js, line: 304, column: 8"
             parts = fileSubstring.split(separator);
             if (parts.length >= 3) {
-                // "data/data/org.nativescript.sourceMap/files/app/bundle.js"
                 parts[0] = parts[0].replace("'", "");
-                // " line: 304"
                 parts[1] = parts[1].replace(" line: ", "");
-                // " column: 8"
                 parts[2] = parts[2].replace(" column: ", "");
             }
             else {
-                // "data/data/org.nativescript.sourceMap/files/app/bundle.js:303:17)"
                 separator = ":";
                 parts = fileSubstring.split(separator);
             }
             if (parts.length >= 3) {
-                // "/data/data/org.nativescript.sourceMap/files/app/"
                 const devicePath = `${deviceProjectPath}/${constants_1.APP_FOLDER_NAME}/`;
-                // "bundle.js"
                 filePath = path.relative(devicePath, `${"/"}${parts[0]}`);
                 line = parseInt(parts[1]);
                 column = parseInt(parts[2]);
@@ -201,24 +192,20 @@ class LogSourceMapService {
                 for (let i = 3; i < parts.length; i++) {
                     messageSuffix += `${parts[i]}${i === parts.length - 1 ? "" : separator}`;
                 }
-                // "JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap ("
                 messagePrefix = _.trimEnd(messagePrefix, "(");
             }
         }
         return { filePath, line, column, messagePrefix, messageSuffix };
     }
     parseIosLog(rawMessage) {
-        // "CONSOLE INFO file:///app/vendor.js:131:36: HMR: Hot Module Replacement Enabled. Waiting for signal."
         const fileIndex = rawMessage.lastIndexOf(LogSourceMapService.FILE_PREFIX);
         let messageSuffix = "";
         let parts, filePath, line, column, messagePrefix;
         if (fileIndex >= 0) {
-            // "app/vendor.js:131:36: HMR: Hot Module Replacement Enabled. Waiting for signal."
             const fileSubstring = rawMessage.substring(fileIndex + LogSourceMapService.FILE_PREFIX.length);
             parts = fileSubstring.split(":");
             if (parts && parts.length >= 3) {
                 filePath = parts[0];
-                // "app/vendor.js"
                 if (_.startsWith(filePath, constants_1.APP_FOLDER_NAME)) {
                     filePath = path.relative(constants_1.APP_FOLDER_NAME, parts[0]);
                 }
@@ -247,4 +234,3 @@ LogSourceMapService.FILE_PREFIX_REPLACEMENT = "file: ";
 LogSourceMapService.MEMOIZE_FUNCTION_RANDOM_KEY_FOR_JOIN = "__some_random_value__";
 exports.LogSourceMapService = LogSourceMapService;
 yok_1.injector.register("logSourceMapService", LogSourceMapService);
-//# sourceMappingURL=log-source-map-service.js.map

package/lib/services/marking-mode-service.js

@@ -15,7 +15,7 @@ const constants_1 = require("../constants");
 const yok_1 = require("../common/yok");
 const semver = require("semver/preload");
 const MARKING_MODE_PROP = "markingMode";
-const MARKING_MODE_FULL_DEPRECATION_MSG = `In the current version of NativeScript "${MARKING_MODE_PROP}:${"full" /* MarkingMode.Full */}" is no longer supported.`;
+const MARKING_MODE_FULL_DEPRECATION_MSG = `In the current version of NativeScript "${MARKING_MODE_PROP}:${"full"}" is no longer supported.`;
 class MarkingModeService {
     constructor($logger, $projectConfigService, $projectHelper, $projectDataService) {
         this.$logger = $logger;
@@ -28,13 +28,11 @@ class MarkingModeService {
             const markingModeValue = this.$projectConfigService.getValue("android.markingMode");
             const { skipWarnings, forceSwitch } = options;
             if (forceSwitch) {
-                yield this.setMarkingMode("none" /* MarkingMode.None */);
+                yield this.setMarkingMode("none");
                 return;
             }
-            if (!skipWarnings && (markingModeValue === null || markingModeValue === void 0 ? void 0 : markingModeValue.toLowerCase()) !== "none" /* MarkingMode.None */) {
-                // only warn if runtime is less than 7.0.0-rc.5 - where the default has been changed to None
-                // if version is null - we are about to add the latest runtime, so no need to warn
-                const { version } = this.$projectDataService.getRuntimePackage(this.$projectHelper.projectDir, "android" /* PlatformTypes.android */);
+            if (!skipWarnings && (markingModeValue === null || markingModeValue === void 0 ? void 0 : markingModeValue.toLowerCase()) !== "none") {
+                const { version } = this.$projectDataService.getRuntimePackage(this.$projectHelper.projectDir, "android");
                 const isMarkingModeFullDefault = version && semver.lt(semver.coerce(version), "7.0.0-rc.5");
                 if (isMarkingModeFullDefault) {
                     this.showMarkingModeFullWarning();
@@ -48,7 +46,7 @@ class MarkingModeService {
         });
     }
     showMarkingModeFullWarning() {
-        const markingModeFullWarning = `You are using the deprecated "${MARKING_MODE_PROP}:${"full" /* MarkingMode.Full */}".${os_1.EOL}${os_1.EOL}${MARKING_MODE_FULL_DEPRECATION_MSG}${os_1.EOL}${os_1.EOL}You should update your marking mode by executing 'ns update --markingMode'.`;
+        const markingModeFullWarning = `You are using the deprecated "${MARKING_MODE_PROP}:${"full"}".${os_1.EOL}${os_1.EOL}${MARKING_MODE_FULL_DEPRECATION_MSG}${os_1.EOL}${os_1.EOL}You should update your marking mode by executing 'ns update --markingMode'.`;
         this.$logger.warn(markingModeFullWarning, {
             [constants_1.LoggerConfigData.wrapMessageWithBorders]: true,
         });
@@ -56,4 +54,3 @@ class MarkingModeService {
 }
 exports.MarkingModeService = MarkingModeService;
 yok_1.injector.register("markingModeService", MarkingModeService);
-//# sourceMappingURL=marking-mode-service.js.map

package/lib/services/metadata-filtering-service.js

@@ -103,4 +103,3 @@ class MetadataFilteringService {
 }
 exports.MetadataFilteringService = MetadataFilteringService;
 yok_1.injector.register("metadataFilteringService", MetadataFilteringService);
-//# sourceMappingURL=metadata-filtering-service.js.map

package/lib/services/npm-config-service.js

@@ -21,11 +21,8 @@ class NpmConfigService {
     readConfig() {
         try {
             const res = (0, child_process_1.execSync)("npm config list --json --global");
-            // const data: any = npmconfig.read();
             const data = JSON.parse(res.toString());
-            // todo: remove if not needed with npm config list --json?
             Object.entries(data).forEach(([key, value]) => {
-                // replace env ${VARS} in strings with the process.env value
                 this.config[key] =
                     typeof value !== "string"
                         ? value
@@ -40,4 +37,3 @@ __decorate([
 ], NpmConfigService.prototype, "readConfig", null);
 exports.NpmConfigService = NpmConfigService;
 yok_1.injector.register("npmConfigService", NpmConfigService);
-//# sourceMappingURL=npm-config-service.js.map