nativescript 8.8.0-embed.0 → 8.8.0-embed.2

package/lib/common/mobile/android/logcat-helper.js

@@ -65,16 +65,17 @@ class LogcatHelper {
                 this.mapDevicesLoggingData[deviceIdentifier].rawLineStream =
                     rawLineStream;
                 rawLineStream.on("data", (lineBuffer) => {
-                    var _a, _b;
+                    var _a, _b, _c, _d;
                     if (!((_a = this.mapDevicesLoggingData[deviceIdentifier]) === null || _a === void 0 ? void 0 : _a.loggingProcess))
                         return;
                     const lines = (lineBuffer.toString() || "").split("\n");
                     for (let line of lines) {
-                        if (line.includes("START") &&
-                            line.includes(options.appId) &&
-                            !line.includes(options.pid)) {
+                        const startProc = /Start proc (?<pid>[0-9]+):(?<appId>.+?)\//.exec(line);
+                        if (startProc &&
+                            ((_b = startProc.groups) === null || _b === void 0 ? void 0 : _b.appId) === options.appId &&
+                            ((_c = startProc.groups) === null || _c === void 0 ? void 0 : _c.pid) !== options.pid) {
                             this.forceStop(deviceIdentifier);
-                            (_b = options.onAppRestarted) === null || _b === void 0 ? void 0 : _b.call(options);
+                            (_d = options.onAppRestarted) === null || _d === void 0 ? void 0 : _d.call(options);
                         }
                     }
                 });
@@ -150,7 +151,15 @@ class LogcatHelper {
     getAppStartTrackingLogcatStream(deviceIdentifier, appId) {
         return __awaiter(this, void 0, void 0, function* () {
             const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
-            const logcatCommand = [`logcat`, `-b`, `system`, `-T`, `1`];
+            const logcatCommand = [
+                `logcat`,
+                `-b`,
+                `system`,
+                `-T`,
+                `1`,
+                "-s",
+                "ActivityManager",
+            ];
             if (appId) {
                 logcatCommand.push(`--regex=START.*${appId}`);
             }

package/lib/controllers/platform-controller.js

@@ -70,6 +70,10 @@ class PlatformController {
     }
     addPlatformIfNeeded(addPlatformData, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (addPlatformData.hostProjectPath) {
+                this.$logger.trace("Not adding platform because --hostProjectPath is provided.");
+                return;
+            }
             const [platform] = addPlatformData.platform.toLowerCase().split("@");
             projectData !== null && projectData !== void 0 ? projectData : (projectData = this.$projectDataService.getProjectData(addPlatformData.projectDir));
             const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
@@ -94,7 +98,8 @@ class PlatformController {
                     desiredRuntimePackage.version = version;
                 }
                 if (!desiredRuntimePackage.version) {
-                    desiredRuntimePackage.version = yield this.$packageInstallationManager.getLatestCompatibleVersion(desiredRuntimePackage.name);
+                    desiredRuntimePackage.version =
+                        yield this.$packageInstallationManager.getLatestCompatibleVersion(desiredRuntimePackage.name);
                 }
                 result = `${desiredRuntimePackage.name}@${desiredRuntimePackage.version}`;
             }

package/lib/controllers/prepare-controller.js

@@ -87,9 +87,7 @@ class PrepareController extends events_1.EventEmitter {
     prepareCore(prepareData, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.$projectService.ensureAppResourcesExist(projectData.projectDir);
-            if (!this.$options.nativeHost) {
-                yield this.$platformController.addPlatformIfNeeded(prepareData, projectData);
-            }
+            yield this.$platformController.addPlatformIfNeeded(prepareData, projectData);
             yield this.trackRuntimeVersion(prepareData.platform, projectData);
             this.$logger.info("Preparing project...");
             prepareData.env = prepareData.env || {};
@@ -275,7 +273,7 @@ class PrepareController extends events_1.EventEmitter {
                 packagePath = path.join(platformData.projectRoot, projectData.projectName, "app", "package.json");
             }
             else {
-                packagePath = path.join(platformData.projectRoot, this.$options.nativeHostModule, "src", this.$options.nativeHost ? "nativescript" : "main", "assets", "app", "package.json");
+                packagePath = path.join(platformData.projectRoot, this.$options.hostProjectModuleName, "src", this.$options.hostProjectPath ? "nativescript" : "main", "assets", "app", "package.json");
             }
             try {
                 const emittedPackageData = this.$fs.readJson(packagePath);

package/lib/data/build-data.js

@@ -24,7 +24,7 @@ class IOSBuildData extends BuildData {
         this.mobileProvisionData = data.mobileProvisionData;
         this.buildForAppStore = data.buildForAppStore;
         this.iCloudContainerEnvironment = data.iCloudContainerEnvironment;
-        this.nativeHost = data.nativeHost;
+        this.hostProjectPath = data.hostProjectPath;
     }
 }
 exports.IOSBuildData = IOSBuildData;
@@ -38,7 +38,7 @@ class AndroidBuildData extends BuildData {
         this.androidBundle = data.androidBundle || data.aab;
         this.gradlePath = data.gradlePath;
         this.gradleArgs = data.gradleArgs;
-        this.nativeHost = data.nativeHost;
+        this.hostProjectPath = data.hostProjectPath;
     }
 }
 exports.AndroidBuildData = AndroidBuildData;

package/lib/data/prepare-data.js

@@ -29,7 +29,7 @@ class PrepareData extends controller_data_base_1.ControllerDataBase {
         if (_.isBoolean(data.watchNative)) {
             this.watchNative = data.watchNative;
         }
-        this.nativeHost = data.nativeHost;
+        this.hostProjectPath = data.hostProjectPath;
     }
 }
 exports.PrepareData = PrepareData;

package/lib/declarations.d.ts

@@ -579,8 +579,8 @@ interface IAndroidBundleOptions {
 }
 
 interface IEmbedOptions {
-	nativeHost: string;
-	nativeHostModule: string;
+	hostProjectPath: string;
+	hostProjectModuleName: string;
 }
 
 interface IAndroidOptions extends IEmbedOptions {
@@ -709,6 +709,9 @@ interface IOptions
 	dryRun: boolean;
 
 	platformOverride: string;
+
+	// allow arbitrary options
+	[optionName: string]: any;
 }
 
 interface IEnvOptions {
@@ -1225,8 +1228,7 @@ interface IPlatformCommandHelper {
 	addPlatforms(
 		platforms: string[],
 		projectData: IProjectData,
-		frameworkPath?: string,
-		nativeHost?: string
+		frameworkPath?: string
 	): Promise<void>;
 	cleanPlatforms(
 		platforms: string[],

package/lib/definitions/platform.d.ts

@@ -118,7 +118,7 @@ interface ICheckEnvironmentRequirementsOutput {
 
 interface IAddPlatformData extends IControllerDataBase {
 	frameworkPath?: string;
-	nativeHost?: 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

@@ -161,6 +161,7 @@ interface INsConfig {
 	visionos?: INSConfigVisionOS;
 	ignoredNativeDependencies?: string[];
 	hooks?: INsConfigHooks[];
+	projectName?: string;
 }
 
 interface IProjectData extends ICreateProjectData {
@@ -195,6 +196,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/helpers/platform-command-helper.js

@@ -31,10 +31,10 @@ class PlatformCommandHelper {
         this.$projectDataService = $projectDataService;
         this.$tempService = $tempService;
     }
-    addPlatforms(platforms, projectData, frameworkPath, nativeHost) {
+    addPlatforms(platforms, projectData, frameworkPath) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.$options.nativeHost) {
-                this.$logger.info("Ignoring platform add becuase of --native-host flag");
+            if (this.$options.hostProjectPath) {
+                this.$logger.info("Ignoring platform add becuase of --hostProjectPath flag");
                 return;
             }
             const platformsDir = projectData.platformsDir;
@@ -50,7 +50,6 @@ class PlatformCommandHelper {
                     projectDir: projectData.projectDir,
                     platform,
                     frameworkPath,
-                    nativeHost,
                 });
             }
         });
@@ -67,7 +66,7 @@ class PlatformCommandHelper {
     }
     removePlatforms(platforms, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.$options.nativeHost) {
+            if (this.$options.hostProjectPath) {
                 this.$logger.info("Ignoring platform remove becuase of --native-host flag");
                 return;
             }
@@ -82,9 +81,7 @@ class PlatformCommandHelper {
                     errorMessage = err.message;
                 }
                 try {
-                    const platformDir = this.$options.nativeHost
-                        ? this.$options.nativeHost
-                        : path.join(projectData.platformsDir, platform.toLowerCase());
+                    const platformDir = path.join(projectData.platformsDir, platform.toLowerCase());
                     this.$fs.deleteDirectory(platformDir);
                     yield this.$packageInstallationManager.uninstall(platformData.frameworkPackageName, projectData.projectDir);
                     this.$logger.info(`Platform ${platform} successfully removed.`);

package/lib/options.js

@@ -207,8 +207,8 @@ class Options {
             },
             gradlePath: { type: "string", hasSensitiveValue: false },
             gradleArgs: { type: "string", hasSensitiveValue: false },
-            nativeHost: { type: "string", hasSensitiveValue: false },
-            nativeHostModule: {
+            hostProjectPath: { type: "string", hasSensitiveValue: false },
+            hostProjectModuleName: {
                 type: "string",
                 hasSensitiveValue: false,
                 default: constants_1.APP_FOLDER_NAME,

package/lib/project-data.js

@@ -70,7 +70,10 @@ class ProjectData {
                 `Additional technical info: ${err.toString()}`);
         }
         if (packageJsonData) {
-            this.projectName = this.$projectHelper.sanitizeName(path.basename(projectDir));
+            this.projectName =
+                nsConfig && nsConfig.projectName
+                    ? nsConfig.projectName
+                    : this.$projectHelper.sanitizeName(path.basename(projectDir));
             this.platformsDir = path.join(projectDir, constants.PLATFORMS_DIR_NAME);
             this.projectFilePath = projectFilePath;
             this.projectIdentifiers = this.initializeProjectIdentifiers(nsConfig);

package/lib/providers/project-files-provider.js

@@ -23,7 +23,7 @@ class ProjectFilesProvider extends project_files_provider_base_1.ProjectFilesPro
         }
         else {
             relativePath = path.relative(projectData.appDirectoryPath, parsedFilePath);
-            mappedFilePath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, relativePath);
+            mappedFilePath = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, relativePath);
         }
         const appResourcesDirectoryPath = projectData.appResourcesDirectoryPath;
         const platformSpecificAppResourcesDirectoryPath = path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName);

package/lib/services/android/gradle-build-args-service.js

@@ -14,8 +14,7 @@ const path = require("path");
 const constants_1 = require("../../common/constants");
 const yok_1 = require("../../common/yok");
 class GradleBuildArgsService {
-    constructor($androidToolsInfo, $hooksService, $analyticsService, $staticConfig, $projectData, $logger) {
-        this.$androidToolsInfo = $androidToolsInfo;
+    constructor($hooksService, $analyticsService, $staticConfig, $projectData, $logger) {
         this.$hooksService = $hooksService;
         this.$analyticsService = $analyticsService;
         this.$staticConfig = $staticConfig;
@@ -42,11 +41,8 @@ class GradleBuildArgsService {
     }
     getBaseTaskArgs(buildData) {
         const args = this.getBuildLoggingArgs();
-        const toolsInfo = this.$androidToolsInfo.getToolsInfo({
-            projectDir: buildData.projectDir,
-        });
         this.$projectData.initializeProjectData(buildData.projectDir);
-        args.push(`-PcompileSdk=android-${toolsInfo.compileSdkVersion}`, `-PtargetSdk=${toolsInfo.targetSdkVersion}`, `-PbuildToolsVersion=${toolsInfo.buildToolsVersion}`, `-PgenerateTypings=${toolsInfo.generateTypings}`, `-PappPath=${this.$projectData.getAppDirectoryPath()}`, `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`);
+        args.push(`-PappPath=${this.$projectData.getAppDirectoryPath()}`, `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`);
         if (buildData.gradleArgs) {
             args.push(buildData.gradleArgs);
         }

package/lib/services/android-plugin-build-service.js

@@ -28,12 +28,11 @@ class AndroidPluginBuildService {
     get $platformsDataService() {
         return this.$injector.resolve("platformsDataService");
     }
-    constructor($fs, $childProcess, $hostInfo, $options, $androidToolsInfo, $logger, $packageManager, $projectData, $projectDataService, $devicePlatformsConstants, $errors, $filesHashService, $hooksService, $injector, $watchIgnoreListService) {
+    constructor($fs, $childProcess, $hostInfo, $options, $logger, $packageManager, $projectData, $projectDataService, $devicePlatformsConstants, $errors, $filesHashService, $hooksService, $injector, $watchIgnoreListService) {
         this.$fs = $fs;
         this.$childProcess = $childProcess;
         this.$hostInfo = $hostInfo;
         this.$options = $options;
-        this.$androidToolsInfo = $androidToolsInfo;
         this.$logger = $logger;
         this.$packageManager = $packageManager;
         this.$projectData = $projectData;
@@ -261,6 +260,17 @@ class AndroidPluginBuildService {
             this.replaceGradleAndroidPluginVersion(buildGradlePath, runtimeGradleVersions.gradleAndroidPluginVersion);
             this.replaceFileContent(buildGradlePath, "{{pluginName}}", pluginName);
             this.replaceFileContent(settingsGradlePath, "{{pluginName}}", pluginName);
+            const shortPluginName = (0, helpers_1.getShortPluginName)(pluginName);
+            const manifestPath = path.join(pluginTempDir, "src", "main", "AndroidManifest.xml");
+            const manifestContent = this.$fs.readText(manifestPath);
+            let packageName = `org.nativescript.${shortPluginName}`;
+            const xml = yield this.getXml(manifestContent);
+            if (xml["manifest"]) {
+                if (xml["manifest"]["$"]["package"]) {
+                    packageName = xml["manifest"]["$"]["package"];
+                }
+            }
+            this.replaceFileContent(buildGradlePath, "{{pluginNamespace}}", packageName);
         });
     }
     getRuntimeGradleVersions(projectDir) {
@@ -445,25 +455,12 @@ class AndroidPluginBuildService {
     buildPlugin(pluginBuildSettings) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!pluginBuildSettings.androidToolsInfo) {
-                this.$androidToolsInfo.validateInfo({
-                    showWarningsAsErrors: true,
-                    validateTargetSdk: true,
-                    projectDir: pluginBuildSettings.projectDir,
-                });
-                pluginBuildSettings.androidToolsInfo =
-                    this.$androidToolsInfo.getToolsInfo({
-                        projectDir: pluginBuildSettings.projectDir,
-                    });
-            }
             const gradlew = (_a = pluginBuildSettings.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
             const localArgs = [
                 "-p",
                 pluginBuildSettings.pluginDir,
                 "assembleRelease",
                 `-PtempBuild=true`,
-                `-PcompileSdk=android-${pluginBuildSettings.androidToolsInfo.compileSdkVersion}`,
-                `-PbuildToolsVersion=${pluginBuildSettings.androidToolsInfo.buildToolsVersion}`,
                 `-PappPath=${this.$projectData.getAppDirectoryPath()}`,
                 `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`,
             ];
@@ -478,8 +475,8 @@ class AndroidPluginBuildService {
                 stdio: "inherit",
                 shell: this.$hostInfo.isWindows,
             };
-            if (this.$options.nativeHost) {
-                opts.env = Object.assign({ USER_PROJECT_PLATFORMS_ANDROID: path.resolve((0, process_1.cwd)(), this.$options.nativeHost) }, process.env);
+            if (this.$options.hostProjectPath) {
+                opts.env = Object.assign({ USER_PROJECT_PLATFORMS_ANDROID: path.resolve((0, process_1.cwd)(), this.$options.hostProjectPath) }, process.env);
             }
             try {
                 yield this.$childProcess.spawnFromEvent(gradlew, localArgs, "close", opts);

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

@@ -69,26 +69,26 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
             throw new Error("First call of getPlatformData without providing projectData.");
         }
         if (projectData && projectData.platformsDir) {
-            const projectRoot = this.$options.nativeHost
-                ? this.$options.nativeHost
+            const projectRoot = this.$options.hostProjectPath
+                ? this.$options.hostProjectPath
                 : path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
             const appDestinationDirectoryArr = [
                 projectRoot,
-                this.$options.nativeHostModule,
+                this.$options.hostProjectModuleName,
                 constants.SRC_DIR,
                 constants.MAIN_DIR,
                 constants.ASSETS_DIR,
             ];
             const configurationsDirectoryArr = [
                 projectRoot,
-                this.$options.nativeHostModule,
+                this.$options.hostProjectModuleName,
                 constants.SRC_DIR,
                 constants.MAIN_DIR,
                 constants.MANIFEST_FILE_NAME,
             ];
             const deviceBuildOutputArr = [
                 projectRoot,
-                this.$options.nativeHostModule,
+                this.$options.hostProjectModuleName,
                 constants.BUILD_DIR,
                 constants.OUTPUTS_DIR,
                 constants.APK_DIR,
@@ -104,7 +104,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                 projectRoot: projectRoot,
                 getBuildOutputPath: (buildOptions) => {
                     if (buildOptions.androidBundle) {
-                        return path.join(projectRoot, this.$options.nativeHostModule, constants.BUILD_DIR, constants.OUTPUTS_DIR, constants.BUNDLE_DIR);
+                        return path.join(projectRoot, this.$options.hostProjectModuleName, constants.BUILD_DIR, constants.OUTPUTS_DIR, constants.BUNDLE_DIR);
                     }
                     return path.join(...deviceBuildOutputArr);
                 },
@@ -115,8 +115,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                     if (buildOptions.androidBundle) {
                         return {
                             packageNames: [
-                                `${this.$options.nativeHostModule}${constants.AAB_EXTENSION_NAME}`,
-                                `${this.$options.nativeHostModule}-${buildMode}${constants.AAB_EXTENSION_NAME}`,
+                                `${this.$options.hostProjectModuleName}${constants.AAB_EXTENSION_NAME}`,
+                                `${this.$options.hostProjectModuleName}-${buildMode}${constants.AAB_EXTENSION_NAME}`,
                             ],
                         };
                     }
@@ -125,10 +125,10 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                             `${packageName}-${buildMode}${constants.APK_EXTENSION_NAME}`,
                             `${projectData.projectName}-${buildMode}${constants.APK_EXTENSION_NAME}`,
                             `${projectData.projectName}${constants.APK_EXTENSION_NAME}`,
-                            `${this.$options.nativeHostModule}-${buildMode}${constants.APK_EXTENSION_NAME}`,
+                            `${this.$options.hostProjectModuleName}-${buildMode}${constants.APK_EXTENSION_NAME}`,
                         ],
                         regexes: [
-                            new RegExp(`(${packageName}|${this.$options.nativeHostModule})-.*-(${constants_1.Configurations.Debug}|${constants_1.Configurations.Release})(-unsigned)?${constants.APK_EXTENSION_NAME}`, "i"),
+                            new RegExp(`(${packageName}|${this.$options.hostProjectModuleName})-.*-(${constants_1.Configurations.Debug}|${constants_1.Configurations.Release})(-unsigned)?${constants.APK_EXTENSION_NAME}`, "i"),
                         ],
                     };
                 },
@@ -291,7 +291,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         });
     }
     isPlatformPrepared(projectRoot, projectData) {
-        return this.$fs.exists(path.join(this.getPlatformData(projectData).appDestinationDirectoryPath, this.$options.nativeHostModule));
+        return this.$fs.exists(path.join(this.getPlatformData(projectData).appDestinationDirectoryPath, this.$options.hostProjectModuleName));
     }
     getFrameworkFilesExtensions() {
         return [".jar", ".dat"];
@@ -392,8 +392,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         return _.values(depsDictionary);
     }
     provideDependenciesJson(projectData, dependencies) {
-        const platformDir = this.$options.nativeHost
-            ? this.$options.nativeHost
+        const platformDir = this.$options.hostProjectPath
+            ? this.$options.hostProjectPath
             : path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
         const dependenciesJsonPath = path.join(platformDir, constants.DEPENDENCIES_JSON_NAME);
         let nativeDependencyData = dependencies.filter(AndroidProjectService.isNativeAndroidDependency);
@@ -474,7 +474,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     }
     getLegacyAppResourcesDestinationDirPath(projectData) {
         const resourcePath = [
-            this.$options.nativeHostModule,
+            this.$options.hostProjectModuleName,
             constants.SRC_DIR,
             constants.MAIN_DIR,
             constants.RESOURCES_DIR,
@@ -483,7 +483,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     }
     getUpdatedAppResourcesDestinationDirPath(projectData) {
         const resourcePath = [
-            this.$options.nativeHostModule,
+            this.$options.hostProjectModuleName,
             constants.SRC_DIR,
         ];
         return path.join(this.getPlatformData(projectData).projectRoot, ...resourcePath);

package/lib/services/assets-generation/assets-generation-service.js

@@ -38,7 +38,7 @@ class AssetsGenerationService {
     }
     generateIcons(resourceGenerationData) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.$options.nativeHost) {
+            if (this.$options.hostProjectPath) {
                 return;
             }
             this.$logger.info("Generating icons ...");
@@ -48,9 +48,6 @@ class AssetsGenerationService {
     }
     generateSplashScreens(splashesGenerationData) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.$options.nativeHost) {
-                return;
-            }
             this.$logger.info("Generating splash screens ...");
             yield this.generateImagesForDefinitions(splashesGenerationData, this.propertiesToEnumerate.splash);
             this.$logger.info("Splash screens generation completed.");

package/lib/services/files-hash-service.js

@@ -42,7 +42,7 @@ class FilesHashService {
     }
     generateHashesForProject(platformData) {
         return __awaiter(this, void 0, void 0, function* () {
-            const appFilesPath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule);
+            const appFilesPath = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName);
             const files = this.$fs.enumerateFilesInDirectorySync(appFilesPath);
             const hashes = yield this.generateHashes(files);
             return hashes;

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

@@ -90,8 +90,8 @@ 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 = this.$options.nativeHost
-                ? this.$options.nativeHost
+            const projectRoot = this.$options.hostProjectPath
+                ? this.$options.hostProjectPath
                 : path.join(projectData.platformsDir, platform.toLowerCase());
             const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, platform.toLowerCase());
             this._platformData = {
@@ -330,8 +330,8 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     }
     prepareProject(projectData, prepareData) {
         return __awaiter(this, void 0, void 0, function* () {
-            const projectRoot = this.$options.nativeHost
-                ? this.$options.nativeHost
+            const projectRoot = this.$options.hostProjectPath
+                ? this.$options.hostProjectPath
                 : path.join(projectData.platformsDir, this.$devicePlatformsConstants.iOS.toLowerCase());
             const platformData = this.getPlatformData(projectData);
             const pluginsData = this.getAllProductionPlugins(projectData);
@@ -349,16 +349,16 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             }
             const project = this.createPbxProj(projectData);
             const resources = project.pbxGroupByName("Resources");
-            if (this.$options.nativeHost) {
+            if (this.$options.hostProjectPath) {
                 try {
-                    project.addResourceFile(path.join(this.$options.nativeHost, projectData.projectName));
+                    project.addResourceFile(path.join(this.$options.hostProjectPath, projectData.projectName));
                     this.savePbxProj(project, projectData);
                 }
                 catch (err) {
                     console.log(err);
                 }
             }
-            if (resources && !this.$options.nativeHost) {
+            if (resources && !this.$options.hostProjectPath) {
                 const references = project.pbxFileReferenceSection();
                 const xcodeProjectImages = _.map(resources.children, (resource) => this.replace(references[resource.value].name));
                 this.$logger.trace("Images from Xcode project");
@@ -506,8 +506,8 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         return frameworkPath;
     }
     getPbxProjPath(projectData) {
-        if (this.$options.nativeHost) {
-            let xcodeProjectPath = this.$xcprojService.findXcodeProject(this.$options.nativeHost);
+        if (this.$options.hostProjectPath) {
+            let xcodeProjectPath = this.$xcprojService.findXcodeProject(this.$options.hostProjectPath);
             if (!xcodeProjectPath) {
                 this.$errors.fail("Xcode project not found at the specified directory");
             }

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

@@ -180,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, this.$options.nativeHostModule);
+            const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName);
             if (!this.livesyncTool.hasConnection()) {
                 yield this.livesyncTool.connect({
                     appIdentifier,

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

@@ -82,7 +82,7 @@ class PlatformLiveSyncServiceBase {
             if (deviceLiveSyncService.beforeLiveSyncAction) {
                 yield deviceLiveSyncService.beforeLiveSyncAction(deviceAppData);
             }
-            const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule);
+            const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName);
             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 {
@@ -113,7 +113,7 @@ class PlatformLiveSyncServiceBase {
                 }
                 if (existingFiles.length) {
                     const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
-                    const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule);
+                    const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName);
                     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 });

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

@@ -122,7 +122,7 @@ class LogSourceMapService {
         return runtimeVersion;
     }
     getOriginalFileLocation(platform, parsedLine, projectData) {
-        const fileLocation = path.join(this.getFilesLocation(platform, projectData), this.$options.nativeHostModule);
+        const fileLocation = path.join(this.getFilesLocation(platform, projectData), this.$options.hostProjectModuleName);
         if (parsedLine && parsedLine.filePath) {
             const sourceMapFile = path.join(fileLocation, parsedLine.filePath);
             const smc = this.cache[sourceMapFile];

package/lib/services/platform/add-platform-service.js

@@ -98,10 +98,9 @@ class AddPlatformService {
         return null;
     }
     addNativePlatform(platformData, projectData, frameworkDirPath, frameworkVersion) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const platformDir = this.$options.nativeHost
-                ? this.$options.nativeHost
-                : path.join(projectData.platformsDir, platformData.normalizedPlatformName.toLowerCase());
+            const platformDir = (_a = this.$options.hostProjectPath) !== null && _a !== void 0 ? _a : path.join(projectData.platformsDir, platformData.normalizedPlatformName.toLowerCase());
             this.$fs.deleteDirectory(platformDir);
             yield platformData.platformProjectService.createProject(path.resolve(frameworkDirPath), frameworkVersion, projectData);
             platformData.platformProjectService.ensureConfigurationFileInAppResources(projectData);

package/lib/services/platform/prepare-native-platform-service.js

@@ -41,10 +41,10 @@ class PrepareNativePlatformService {
             if (changesInfo.hasChanges) {
                 yield this.cleanProject(platformData, { release });
             }
-            if (!this.$options.nativeHost) {
+            if (!this.$options.hostProjectPath) {
                 platformData.platformProjectService.prepareAppResources(projectData);
             }
-            if (hasChangesRequirePrepare || this.$options.nativeHost) {
+            if (hasChangesRequirePrepare || this.$options.hostProjectPath) {
                 yield platformData.platformProjectService.prepareProject(projectData, prepareData);
             }
             if (hasNativeModulesChange) {

package/lib/services/plugins-service.js

@@ -412,7 +412,7 @@ This framework comes from ${dependencyName} plugin, which is installed multiple
                 const isPlatformInstalled = this.$fs.exists(path.join(projectData.platformsDir, platform.toLowerCase()));
                 if (isPlatformInstalled) {
                     const platformData = this.$platformsDataService.getPlatformData(platform.toLowerCase(), projectData);
-                    const pluginDestinationPath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, "tns_modules");
+                    const pluginDestinationPath = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, "tns_modules");
                     yield action(pluginDestinationPath, platform.toLowerCase(), platformData);
                 }
             }
@@ -450,7 +450,7 @@ This framework comes from ${dependencyName} plugin, which is installed multiple
         });
     }
     getAllPluginsNativeHashes(pathToPluginsBuildFile) {
-        if (this.$options.nativeHost) {
+        if (this.$options.hostProjectPath) {
             return {};
         }
         let data = {};
@@ -460,7 +460,7 @@ This framework comes from ${dependencyName} plugin, which is installed multiple
         return data;
     }
     setPluginNativeHashes(opts) {
-        if (this.$options.nativeHost) {
+        if (this.$options.hostProjectPath) {
             return;
         }
         opts.allPluginsNativeHashes[opts.pluginData.name] =