nativescript 8.8.0-alpha.0 → 8.8.0-embed.0

package/lib/base-package-manager.js

@@ -73,6 +73,7 @@ class BasePackageManager {
             yield this.$childProcess.spawnFromEvent(npmExecutable, params, "close", {
                 cwd: opts.cwd,
                 stdio: stdioValue,
+                shell: this.$hostInfo.isWindows,
             });
             const { isInstallingAllDependencies } = opts;
             if (isInstallingAllDependencies) {

package/lib/commands/add-platform.js

@@ -22,7 +22,7 @@ class AddPlatformCommand extends command_base_1.ValidatePlatformCommandBase {
     }
     execute(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.$platformCommandHelper.addPlatforms(args, this.$projectData, this.$options.frameworkPath);
+            yield this.$platformCommandHelper.addPlatforms(args, this.$projectData, this.$options.frameworkPath, this.$options.nativeHost);
         });
     }
     canExecute(args) {

package/lib/commands/typings.js

@@ -137,7 +137,7 @@ class TypingsCommand {
             const dtsGeneratorPath = path.resolve(this.$projectData.projectDir, "platforms", "android", "build-tools", "dts-generator.jar");
             if (!this.$fs.exists(dtsGeneratorPath)) {
                 this.$logger.warn("No platforms folder found, preparing project now...");
-                yield this.$childProcess.spawnFromEvent(this.$hostInfo.isWindows ? "ns.cmd" : "ns", ["prepare", "android"], "exit", { stdio: "inherit" });
+                yield this.$childProcess.spawnFromEvent(this.$hostInfo.isWindows ? "ns.cmd" : "ns", ["prepare", "android"], "exit", { stdio: "inherit", shell: this.$hostInfo.isWindows });
             }
             const asArray = (input) => {
                 if (!input) {

package/lib/common/mobile/android/android-virtual-device-service.js

@@ -152,7 +152,7 @@ class AndroidVirtualDeviceService {
                 ];
             }
             if (canExecuteAvdManagerCommand) {
-                result = yield this.$childProcess.trySpawnFromCloseEvent(this.pathToAvdManagerExecutable, ["list", "avds"]);
+                result = yield this.$childProcess.trySpawnFromCloseEvent(this.pathToAvdManagerExecutable, ["list", "avds"], { shell: this.$hostInfo.isWindows });
             }
             else if (this.pathToAndroidExecutable &&
                 this.$fs.exists(this.pathToAndroidExecutable)) {

package/lib/common/mobile/application-manager-base.js

@@ -31,7 +31,7 @@ class ApplicationManagerBase extends events_1.EventEmitter {
     reinstallApplication(appIdentifier, packageFilePath, buildData) {
         return __awaiter(this, void 0, void 0, function* () {
             const isApplicationInstalled = yield this.isApplicationInstalled(appIdentifier);
-            if (isApplicationInstalled) {
+            if (isApplicationInstalled && (buildData === null || buildData === void 0 ? void 0 : buildData.clean)) {
                 yield this.uninstallApplication(appIdentifier);
             }
             yield this.installApplication(packageFilePath, appIdentifier, buildData);
@@ -127,7 +127,8 @@ class ApplicationManagerBase extends events_1.EventEmitter {
                         this.emit("debuggableViewChanged", appIdentifier, view);
                     }
                 });
-                this.lastAvailableDebuggableAppViews[appIdentifier] = currentlyAvailableViews;
+                this.lastAvailableDebuggableAppViews[appIdentifier] =
+                    currentlyAvailableViews;
             });
         });
     }

package/lib/controllers/prepare-controller.js

@@ -25,12 +25,13 @@ const helpers_1 = require("../common/helpers");
 const yok_1 = require("../common/yok");
 const constants_1 = require("../constants");
 class PrepareController extends events_1.EventEmitter {
-    constructor($platformController, $hooksService, $fs, $logger, $mobileHelper, $nodeModulesDependenciesBuilder, $platformsDataService, $pluginsService, $prepareNativePlatformService, $projectChangesService, $projectDataService, $webpackCompilerService, $watchIgnoreListService, $analyticsService, $markingModeService, $projectConfigService, $projectService) {
+    constructor($platformController, $hooksService, $fs, $logger, $options, $mobileHelper, $nodeModulesDependenciesBuilder, $platformsDataService, $pluginsService, $prepareNativePlatformService, $projectChangesService, $projectDataService, $webpackCompilerService, $watchIgnoreListService, $analyticsService, $markingModeService, $projectConfigService, $projectService) {
         super();
         this.$platformController = $platformController;
         this.$hooksService = $hooksService;
         this.$fs = $fs;
         this.$logger = $logger;
+        this.$options = $options;
         this.$mobileHelper = $mobileHelper;
         this.$nodeModulesDependenciesBuilder = $nodeModulesDependenciesBuilder;
         this.$platformsDataService = $platformsDataService;
@@ -86,7 +87,9 @@ class PrepareController extends events_1.EventEmitter {
     prepareCore(prepareData, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.$projectService.ensureAppResourcesExist(projectData.projectDir);
-            yield this.$platformController.addPlatformIfNeeded(prepareData, projectData);
+            if (!this.$options.nativeHost) {
+                yield this.$platformController.addPlatformIfNeeded(prepareData, projectData);
+            }
             yield this.trackRuntimeVersion(prepareData.platform, projectData);
             this.$logger.info("Preparing project...");
             prepareData.env = prepareData.env || {};
@@ -272,7 +275,7 @@ class PrepareController extends events_1.EventEmitter {
                 packagePath = path.join(platformData.projectRoot, projectData.projectName, "app", "package.json");
             }
             else {
-                packagePath = path.join(platformData.projectRoot, "app", "src", "main", "assets", "app", "package.json");
+                packagePath = path.join(platformData.projectRoot, this.$options.nativeHostModule, "src", this.$options.nativeHost ? "nativescript" : "main", "assets", "app", "package.json");
             }
             try {
                 const emittedPackageData = this.$fs.readJson(packagePath);

package/lib/data/build-data.js

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

package/lib/data/prepare-data.js

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

package/lib/declarations.d.ts

@@ -578,11 +578,18 @@ interface IAndroidBundleOptions {
 	aab: boolean;
 }
 
-interface IAndroidOptions {
+interface IEmbedOptions {
+	nativeHost: string;
+	nativeHostModule: string;
+}
+
+interface IAndroidOptions extends IEmbedOptions {
 	gradlePath: string;
 	gradleArgs: string;
 }
 
+interface IIOSOptions extends IEmbedOptions {}
+
 interface ITypingsOptions {
 	jar: string;
 	aar: string;
@@ -603,6 +610,7 @@ interface IOptions
 		IProvision,
 		ITeamIdentifier,
 		IAndroidOptions,
+		IIOSOptions,
 		IAndroidReleaseOptions,
 		IAndroidBundleOptions,
 		INpmInstallConfigurationOptions,
@@ -1009,6 +1017,7 @@ interface IXcprojService {
 	 * @return {string} The full path to the xcodeproj
 	 */
 	getXcodeprojPath(projectData: IProjectData, projectRoot: string): string;
+	findXcodeProject(dir: string): string;
 }
 
 /**
@@ -1216,7 +1225,8 @@ interface IPlatformCommandHelper {
 	addPlatforms(
 		platforms: string[],
 		projectData: IProjectData,
-		frameworkPath?: string
+		frameworkPath?: string,
+		nativeHost?: string
 	): Promise<void>;
 	cleanPlatforms(
 		platforms: string[],

package/lib/definitions/platform.d.ts

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

package/lib/helpers/platform-command-helper.js

@@ -16,11 +16,12 @@ const _ = require("lodash");
 const constants = require("../constants");
 const yok_1 = require("../common/yok");
 class PlatformCommandHelper {
-    constructor($platformController, $fs, $errors, $logger, $mobileHelper, $packageInstallationManager, $pacoteService, $platformsDataService, $platformValidationService, $projectChangesService, $projectDataService, $tempService) {
+    constructor($platformController, $fs, $errors, $logger, $options, $mobileHelper, $packageInstallationManager, $pacoteService, $platformsDataService, $platformValidationService, $projectChangesService, $projectDataService, $tempService) {
         this.$platformController = $platformController;
         this.$fs = $fs;
         this.$errors = $errors;
         this.$logger = $logger;
+        this.$options = $options;
         this.$mobileHelper = $mobileHelper;
         this.$packageInstallationManager = $packageInstallationManager;
         this.$pacoteService = $pacoteService;
@@ -30,8 +31,12 @@ class PlatformCommandHelper {
         this.$projectDataService = $projectDataService;
         this.$tempService = $tempService;
     }
-    addPlatforms(platforms, projectData, frameworkPath) {
+    addPlatforms(platforms, projectData, frameworkPath, nativeHost) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.$options.nativeHost) {
+                this.$logger.info("Ignoring platform add becuase of --native-host flag");
+                return;
+            }
             const platformsDir = projectData.platformsDir;
             this.$fs.ensureDirectoryExists(platformsDir);
             for (const platform of platforms) {
@@ -45,6 +50,7 @@ class PlatformCommandHelper {
                     projectDir: projectData.projectDir,
                     platform,
                     frameworkPath,
+                    nativeHost,
                 });
             }
         });
@@ -61,6 +67,10 @@ class PlatformCommandHelper {
     }
     removePlatforms(platforms, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.$options.nativeHost) {
+                this.$logger.info("Ignoring platform remove becuase of --native-host flag");
+                return;
+            }
             for (const platform of platforms) {
                 this.$platformValidationService.validatePlatformInstalled(platform, projectData);
                 const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
@@ -72,7 +82,9 @@ class PlatformCommandHelper {
                     errorMessage = err.message;
                 }
                 try {
-                    const platformDir = path.join(projectData.platformsDir, platform.toLowerCase());
+                    const platformDir = this.$options.nativeHost
+                        ? this.$options.nativeHost
+                        : 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

@@ -15,6 +15,7 @@ const yargs = require("yargs");
 const helpers_1 = require("yargs/helpers");
 const _ = require("lodash");
 const yok_1 = require("./common/yok");
+const constants_1 = require("./constants");
 class Options {
     setupOptions(commandSpecificDashedOptions) {
         if (commandSpecificDashedOptions) {
@@ -206,6 +207,12 @@ class Options {
             },
             gradlePath: { type: "string", hasSensitiveValue: false },
             gradleArgs: { type: "string", hasSensitiveValue: false },
+            nativeHost: { type: "string", hasSensitiveValue: false },
+            nativeHostModule: {
+                type: "string",
+                hasSensitiveValue: false,
+                default: constants_1.APP_FOLDER_NAME,
+            },
             aab: { type: "boolean", hasSensitiveValue: false },
             performance: { type: "object", hasSensitiveValue: true },
             appleApplicationSpecificPassword: {

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, constants.APP_FOLDER_NAME, relativePath);
+            mappedFilePath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, relativePath);
         }
         const appResourcesDirectoryPath = projectData.appResourcesDirectoryPath;
         const platformSpecificAppResourcesDirectoryPath = path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName);

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

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

package/lib/services/android/gradle-command-service.js

@@ -23,7 +23,11 @@ class GradleCommandService {
         return __awaiter(this, void 0, void 0, function* () {
             const { message, cwd, stdio, spawnOptions } = options;
             this.$logger.info(message);
-            const childProcessOptions = { cwd, stdio: stdio || "inherit" };
+            const childProcessOptions = {
+                cwd,
+                stdio: stdio || "inherit",
+                shell: this.$hostInfo.isWindows,
+            };
             const gradleExecutable = (_a = options.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
             const result = yield this.executeCommandSafe(gradleExecutable, gradleArgs, childProcessOptions, spawnOptions);
             return result;

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

@@ -23,14 +23,17 @@ const xml2js_1 = require("xml2js");
 const yok_1 = require("../common/yok");
 const _ = require("lodash");
 const resolve_package_path_1 = require("@rigor789/resolve-package-path");
+const process_1 = require("process");
 class AndroidPluginBuildService {
     get $platformsDataService() {
         return this.$injector.resolve("platformsDataService");
     }
-    constructor($fs, $childProcess, $hostInfo, $logger, $packageManager, $projectData, $projectDataService, $devicePlatformsConstants, $errors, $filesHashService, $hooksService, $injector, $watchIgnoreListService) {
+    constructor($fs, $childProcess, $hostInfo, $options, $androidToolsInfo, $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;
@@ -258,17 +261,6 @@ 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) {
@@ -453,12 +445,25 @@ 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()}`,
             ];
@@ -468,11 +473,16 @@ class AndroidPluginBuildService {
             if (this.$logger.getLevel() === "INFO") {
                 localArgs.push("--quiet");
             }
+            const opts = {
+                cwd: pluginBuildSettings.pluginDir,
+                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);
+            }
             try {
-                yield this.$childProcess.spawnFromEvent(gradlew, localArgs, "close", {
-                    cwd: pluginBuildSettings.pluginDir,
-                    stdio: "inherit",
-                });
+                yield this.$childProcess.spawnFromEvent(gradlew, localArgs, "close", opts);
             }
             catch (err) {
                 this.$errors.fail(`Failed to build plugin ${pluginBuildSettings.pluginName} : \n${err}`);

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

@@ -69,24 +69,26 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
             throw new Error("First call of getPlatformData without providing projectData.");
         }
         if (projectData && projectData.platformsDir) {
-            const projectRoot = path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
+            const projectRoot = this.$options.nativeHost
+                ? this.$options.nativeHost
+                : path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
             const appDestinationDirectoryArr = [
                 projectRoot,
-                constants.APP_FOLDER_NAME,
+                this.$options.nativeHostModule,
                 constants.SRC_DIR,
                 constants.MAIN_DIR,
                 constants.ASSETS_DIR,
             ];
             const configurationsDirectoryArr = [
                 projectRoot,
-                constants.APP_FOLDER_NAME,
+                this.$options.nativeHostModule,
                 constants.SRC_DIR,
                 constants.MAIN_DIR,
                 constants.MANIFEST_FILE_NAME,
             ];
             const deviceBuildOutputArr = [
                 projectRoot,
-                constants.APP_FOLDER_NAME,
+                this.$options.nativeHostModule,
                 constants.BUILD_DIR,
                 constants.OUTPUTS_DIR,
                 constants.APK_DIR,
@@ -102,7 +104,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                 projectRoot: projectRoot,
                 getBuildOutputPath: (buildOptions) => {
                     if (buildOptions.androidBundle) {
-                        return path.join(projectRoot, constants.APP_FOLDER_NAME, constants.BUILD_DIR, constants.OUTPUTS_DIR, constants.BUNDLE_DIR);
+                        return path.join(projectRoot, this.$options.nativeHostModule, constants.BUILD_DIR, constants.OUTPUTS_DIR, constants.BUNDLE_DIR);
                     }
                     return path.join(...deviceBuildOutputArr);
                 },
@@ -113,8 +115,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                     if (buildOptions.androidBundle) {
                         return {
                             packageNames: [
-                                `${constants.APP_FOLDER_NAME}${constants.AAB_EXTENSION_NAME}`,
-                                `${constants.APP_FOLDER_NAME}-${buildMode}${constants.AAB_EXTENSION_NAME}`,
+                                `${this.$options.nativeHostModule}${constants.AAB_EXTENSION_NAME}`,
+                                `${this.$options.nativeHostModule}-${buildMode}${constants.AAB_EXTENSION_NAME}`,
                             ],
                         };
                     }
@@ -123,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}`,
-                            `${constants.APP_FOLDER_NAME}-${buildMode}${constants.APK_EXTENSION_NAME}`,
+                            `${this.$options.nativeHostModule}-${buildMode}${constants.APK_EXTENSION_NAME}`,
                         ],
                         regexes: [
-                            new RegExp(`(${packageName}|${constants.APP_FOLDER_NAME})-.*-(${constants_1.Configurations.Debug}|${constants_1.Configurations.Release})(-unsigned)?${constants.APK_EXTENSION_NAME}`, "i"),
+                            new RegExp(`(${packageName}|${this.$options.nativeHostModule})-.*-(${constants_1.Configurations.Debug}|${constants_1.Configurations.Release})(-unsigned)?${constants.APK_EXTENSION_NAME}`, "i"),
                         ],
                     };
                 },
@@ -247,8 +249,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         });
     }
     interpolateConfigurationFile(projectData) {
-        const manifestPath = this.getPlatformData(projectData)
-            .configurationFilePath;
+        const manifestPath = this.getPlatformData(projectData).configurationFilePath;
         shell.sed("-i", /__PACKAGE__/, projectData.projectIdentifiers.android, manifestPath);
     }
     getProjectNameFromId(projectData) {
@@ -290,7 +291,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         });
     }
     isPlatformPrepared(projectRoot, projectData) {
-        return this.$fs.exists(path.join(this.getPlatformData(projectData).appDestinationDirectoryPath, constants.APP_FOLDER_NAME));
+        return this.$fs.exists(path.join(this.getPlatformData(projectData).appDestinationDirectoryPath, this.$options.nativeHostModule));
     }
     getFrameworkFilesExtensions() {
         return [".jar", ".dat"];
@@ -391,7 +392,9 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         return _.values(depsDictionary);
     }
     provideDependenciesJson(projectData, dependencies) {
-        const platformDir = path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
+        const platformDir = this.$options.nativeHost
+            ? this.$options.nativeHost
+            : path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
         const dependenciesJsonPath = path.join(platformDir, constants.DEPENDENCIES_JSON_NAME);
         let nativeDependencyData = dependencies.filter(AndroidProjectService.isNativeAndroidDependency);
         let nativeDependencies = nativeDependencyData.map(({ name, directory, dependencies }) => {
@@ -471,7 +474,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     }
     getLegacyAppResourcesDestinationDirPath(projectData) {
         const resourcePath = [
-            constants.APP_FOLDER_NAME,
+            this.$options.nativeHostModule,
             constants.SRC_DIR,
             constants.MAIN_DIR,
             constants.RESOURCES_DIR,
@@ -480,7 +483,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     }
     getUpdatedAppResourcesDestinationDirPath(projectData) {
         const resourcePath = [
-            constants.APP_FOLDER_NAME,
+            this.$options.nativeHostModule,
             constants.SRC_DIR,
         ];
         return path.join(this.getPlatformData(projectData).projectRoot, ...resourcePath);

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

@@ -30,13 +30,17 @@ class AssetsGenerationService {
             splash: ["splashBackgrounds", "splashCenterImages", "splashImages"],
         };
     }
-    constructor($logger, $projectDataService, $fs) {
+    constructor($logger, $projectDataService, $fs, $options) {
         this.$logger = $logger;
         this.$projectDataService = $projectDataService;
         this.$fs = $fs;
+        this.$options = $options;
     }
     generateIcons(resourceGenerationData) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.$options.nativeHost) {
+                return;
+            }
             this.$logger.info("Generating icons ...");
             yield this.generateImagesForDefinitions(resourceGenerationData, this.propertiesToEnumerate.icon);
             this.$logger.info("Icons generation completed.");
@@ -44,6 +48,9 @@ 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

@@ -17,9 +17,10 @@ const path = require("path");
 const _ = require("lodash");
 const yok_1 = require("../common/yok");
 class FilesHashService {
-    constructor($fs, $logger) {
+    constructor($fs, $logger, $options) {
         this.$fs = $fs;
         this.$logger = $logger;
+        this.$options = $options;
     }
     generateHashes(files) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -41,7 +42,7 @@ class FilesHashService {
     }
     generateHashesForProject(platformData) {
         return __awaiter(this, void 0, void 0, function* () {
-            const appFilesPath = path.join(platformData.appDestinationDirectoryPath, constants_2.APP_FOLDER_NAME);
+            const appFilesPath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule);
             const files = this.$fs.enumerateFilesInDirectorySync(appFilesPath);
             const hashes = yield this.generateHashes(files);
             return hashes;

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,
@@ -328,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);
@@ -345,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");
@@ -493,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) {

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* () {
@@ -181,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,

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;

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;

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) {
@@ -81,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 {
@@ -112,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 });

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 = {};
@@ -121,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];

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

@@ -21,13 +21,17 @@ const constants_1 = require("../../constants");
 const decorators_1 = require("../../common/decorators");
 const yok_1 = require("../../common/yok");
 class AddPlatformService {
-    constructor($fs, $logger, $packageManager, $terminalSpinnerService, $analyticsService) {
+    constructor($fs, $logger, $options, $packageManager, $terminalSpinnerService, $analyticsService) {
         this.$fs = $fs;
         this.$logger = $logger;
+        this.$options = $options;
         this.$packageManager = $packageManager;
         this.$terminalSpinnerService = $terminalSpinnerService;
         this.$analyticsService = $analyticsService;
     }
+    addProjectHost() {
+        return __awaiter(this, void 0, void 0, function* () { });
+    }
     addPlatformSafe(projectData, platformData, packageToInstall, addPlatformData) {
         return __awaiter(this, void 0, void 0, function* () {
             const spinner = this.$terminalSpinnerService.createSpinner();
@@ -95,7 +99,9 @@ class AddPlatformService {
     }
     addNativePlatform(platformData, projectData, frameworkDirPath, frameworkVersion) {
         return __awaiter(this, void 0, void 0, function* () {
-            const platformDir = path.join(projectData.platformsDir, platformData.normalizedPlatformName.toLowerCase());
+            const platformDir = this.$options.nativeHost
+                ? this.$options.nativeHost
+                : 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

@@ -20,11 +20,12 @@ const helpers_1 = require("../../common/helpers");
 const decorators_1 = require("../../common/decorators");
 const yok_1 = require("../../common/yok");
 class PrepareNativePlatformService {
-    constructor($hooksService, $nodeModulesBuilder, $projectChangesService, $metadataFilteringService) {
+    constructor($hooksService, $nodeModulesBuilder, $projectChangesService, $metadataFilteringService, $options) {
         this.$hooksService = $hooksService;
         this.$nodeModulesBuilder = $nodeModulesBuilder;
         this.$projectChangesService = $projectChangesService;
         this.$metadataFilteringService = $metadataFilteringService;
+        this.$options = $options;
     }
     prepareNativePlatform(platformData, projectData, prepareData) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -40,8 +41,10 @@ class PrepareNativePlatformService {
             if (changesInfo.hasChanges) {
                 yield this.cleanProject(platformData, { release });
             }
-            platformData.platformProjectService.prepareAppResources(projectData);
-            if (hasChangesRequirePrepare) {
+            if (!this.$options.nativeHost) {
+                platformData.platformProjectService.prepareAppResources(projectData);
+            }
+            if (hasChangesRequirePrepare || this.$options.nativeHost) {
                 yield platformData.platformProjectService.prepareProject(projectData, prepareData);
             }
             if (hasNativeModulesChange) {

package/lib/services/platform-environment-requirements.js

@@ -74,7 +74,9 @@ class PlatformEnvironmentRequirements {
             win32: "windows",
             darwin: "macos",
         }[process.platform];
-        const anchor = platform ? `#setting-up-${os}-for-${platform.toLowerCase()}` : "";
+        const anchor = platform
+            ? `#setting-up-${os}-for-${platform.toLowerCase()}`
+            : "";
         return (`Verify that your environment is configured according to the system requirements described at\n` +
             `https://docs.nativescript.org/setup/${os}${anchor}.`);
     }

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, constants.APP_FOLDER_NAME, "tns_modules");
+                    const pluginDestinationPath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, "tns_modules");
                     yield action(pluginDestinationPath, platform.toLowerCase(), platformData);
                 }
             }
@@ -450,6 +450,9 @@ This framework comes from ${dependencyName} plugin, which is installed multiple
         });
     }
     getAllPluginsNativeHashes(pathToPluginsBuildFile) {
+        if (this.$options.nativeHost) {
+            return {};
+        }
         let data = {};
         if (this.$fs.exists(pathToPluginsBuildFile)) {
             data = this.$fs.readJson(pathToPluginsBuildFile);
@@ -457,6 +460,9 @@ This framework comes from ${dependencyName} plugin, which is installed multiple
         return data;
     }
     setPluginNativeHashes(opts) {
+        if (this.$options.nativeHost) {
+            return;
+        }
         opts.allPluginsNativeHashes[opts.pluginData.name] =
             opts.currentPluginNativeHashes;
         this.$fs.writeJson(opts.pathToPluginsBuildFile, opts.allPluginsNativeHashes);

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

@@ -37,10 +37,11 @@ class ProjectChangesInfo {
     }
 }
 class ProjectChangesService {
-    constructor($devicePlatformsConstants, $fs, $logger, $hooksService, $nodeModulesDependenciesBuilder) {
+    constructor($devicePlatformsConstants, $fs, $logger, $options, $hooksService, $nodeModulesDependenciesBuilder) {
         this.$devicePlatformsConstants = $devicePlatformsConstants;
         this.$fs = $fs;
         this.$logger = $logger;
+        this.$options = $options;
         this.$hooksService = $hooksService;
         this.$nodeModulesDependenciesBuilder = $nodeModulesDependenciesBuilder;
     }
@@ -130,6 +131,9 @@ class ProjectChangesService {
         return prepareInfoFilePath;
     }
     getPrepareInfo(platformData) {
+        if (this.$options.nativeHost) {
+            return null;
+        }
         const prepareInfoFilePath = this.getPrepareInfoFilePath(platformData);
         let prepareInfo = null;
         if (this.$fs.exists(prepareInfoFilePath)) {
@@ -147,6 +151,9 @@ class ProjectChangesService {
             if (!this._prepareInfo) {
                 yield this.ensurePrepareInfo(platformData, projectData, prepareData);
             }
+            if (this.$options.nativeHost) {
+                return null;
+            }
             const prepareInfoFilePath = this.getPrepareInfoFilePath(platformData);
             this.$fs.writeJson(prepareInfoFilePath, this._prepareInfo);
         });

package/lib/services/webpack/webpack-compiler-service.js

@@ -94,8 +94,8 @@ class WebpackCompilerService extends events_1.EventEmitter {
                                     hash: "",
                                 };
                             }
-                            const files = result.emittedFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, "app", file));
-                            const fallbackFiles = result.fallbackFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, "app", file));
+                            const files = result.emittedFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, file));
+                            const fallbackFiles = result.fallbackFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, file));
                             const data = {
                                 files,
                                 hasOnlyHotUpdateFiles: files.every((f) => f.indexOf("hot-update") > -1),
@@ -214,10 +214,18 @@ class WebpackCompilerService extends events_1.EventEmitter {
                 args.push("--watch");
             }
             const stdio = prepareData.watch ? ["ipc"] : "inherit";
-            const childProcess = this.$childProcess.spawn(process.execPath, args, {
+            const options = {
                 cwd: projectData.projectDir,
                 stdio,
-            });
+            };
+            if (this.$options.nativeHost) {
+                options.env = {
+                    USER_PROJECT_PLATFORMS_ANDROID: this.$options.nativeHost,
+                    USER_PROJECT_PLATFORMS_ANDROID_MODULE: this.$options.nativeHostModule,
+                    USER_PROJECT_PLATFORMS_IOS: this.$options.nativeHost,
+                };
+            }
+            const childProcess = this.$childProcess.spawn(process.execPath, args, options);
             this.webpackProcesses[platformData.platformNameLowerCase] = childProcess;
             yield this.$cleanupService.addKillProcess(childProcess.pid.toString());
             return childProcess;
@@ -337,8 +345,8 @@ class WebpackCompilerService extends events_1.EventEmitter {
             return;
         }
         this.$logger.trace("Webpack build done!");
-        const files = message.data.emittedAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, "app", asset));
-        const staleFiles = message.data.staleAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, "app", asset));
+        const files = message.data.emittedAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, asset));
+        const staleFiles = message.data.staleAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, asset));
         const lastHash = (() => {
             const absoluteFileNameWithLastHash = files.find((fileName) => fileName.endsWith("hot-update.js"));
             if (!absoluteFileNameWithLastHash) {

package/lib/services/xcproj-service.js

@@ -1,11 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
+const fs = require("fs");
 const constants_1 = require("../constants");
 const yok_1 = require("../common/yok");
 class XcprojService {
     getXcodeprojPath(projectData, projectRoot) {
         return path.join(projectRoot, projectData.projectName + constants_1.IosProjectConstants.XcodeProjExtName);
     }
+    findXcodeProject(dir) {
+        const filesAndDirs = fs.readdirSync(dir);
+        for (let i = 0; i < filesAndDirs.length; i++) {
+            const fullPath = path.join(dir, filesAndDirs[i]);
+            if (fs.statSync(fullPath).isDirectory() &&
+                filesAndDirs[i].endsWith(".xcodeproj")) {
+                return fullPath;
+            }
+        }
+        return null;
+    }
 }
 yok_1.injector.register("xcprojService", XcprojService);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
-  "preferGlobal": true,
-  "version": "8.8.0-alpha.0",
+  "main": "./lib/nativescript-cli-lib.js",
+  "version": "8.8.0-embed.0",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -10,7 +10,6 @@
     "nsc": "./bin/tns",
     "ns": "./bin/tns"
   },
-  "main": "./lib/nativescript-cli-lib.js",
   "files": [
     "bin/*",
     "config",
@@ -117,7 +116,6 @@
     "xml2js": "0.6.2",
     "yargs": "17.7.1"
   },
-  "analyze": true,
   "devDependencies": {
     "@types/archiver": "^5.3.2",
     "@types/byline": "^4.2.33",
@@ -171,13 +169,6 @@
     "sinon": "15.0.3",
     "source-map-support": "0.5.21"
   },
-  "license": "Apache-2.0",
-  "engines": {
-    "node": ">=10.0.0"
-  },
-  "lint-staged": {
-    "*.ts": "prettier --write"
-  },
   "bundleDependencies_comment1": "These dependencies are bundled in the CLI and are not installed from npm to avoid deprecation warnings.",
   "bundleDependencies_comment2": "Eventually we'll remove them as we replaced their functionality.",
   "bundleDependencies_comment3": "note: @npmcli/move-file is a transient dep of pacote - we dont use it directly.",
@@ -185,6 +176,9 @@
     "@npmcli/move-file",
     "stringify-package"
   ],
+  "optionalDependencies": {
+    "fsevents": "*"
+  },
   "overrides": {
     "jimp": {
       "xml2js": "0.6.2"
@@ -192,5 +186,13 @@
     "npm-watch": {
       "nodemon": "3.0.3"
     }
+  },
+  "analyze": true,
+  "license": "Apache-2.0",
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "lint-staged": {
+    "*.ts": "prettier --write"
   }
-}
+}

package/vendor/aab-tool/README.txt

@@ -1 +1 @@
-Downloaded from https://github.com/google/bundletool/releases/tag/1.15.6
+Downloaded from https://github.com/google/bundletool/releases/tag/1.8.2

package/vendor/gradle-plugin/build.gradle

@@ -8,14 +8,33 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 
 buildscript {
+    // project.ext.USER_PROJECT_ROOT = "$rootDir/../../.."
+    project.ext.PLATFORMS_ANDROID = "platforms/android"
+    project.ext.PLUGIN_NAME = "{{pluginName}}"
+
+    def USER_PROJECT_ROOT_FROM_ENV = System.getenv('USER_PROJECT_ROOT');
+    if (USER_PROJECT_ROOT_FROM_ENV != null && !USER_PROJECT_ROOT_FROM_ENV.equals("")) {
+        project.ext.USER_PROJECT_ROOT = USER_PROJECT_ROOT_FROM_ENV;
+    } else {
+        project.ext.USER_PROJECT_ROOT = "$rootDir/../../../"
+    }
+
+    def USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV = System.getenv('USER_PROJECT_PLATFORMS_ANDROID');
+    if (USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV != null && !USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV.equals("")) {
+        project.ext.USER_PROJECT_PLATFORMS_ANDROID = USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV;
+    } else {
+        project.ext.USER_PROJECT_PLATFORMS_ANDROID = project.ext.USER_PROJECT_ROOT + PLATFORMS_ANDROID
+    }
+
+
     def getDepPlatformDir = { dep ->
-        file("${project.ext.USER_PROJECT_ROOT}/${project.ext.PLATFORMS_ANDROID}/${dep.directory}/$PLATFORMS_ANDROID")
+        file("${project.ext.USER_PROJECT_PLATFORMS_ANDROID}/${dep.directory}/$PLATFORMS_ANDROID")
     }
-    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "2.0.0-RC1" }
+    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "1.8.20" }
     def kotlinVersion = computeKotlinVersion()
     repositories {
         google()
-        mavenCentral()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:{{runtimeAndroidPluginVersion}}'
@@ -29,12 +48,8 @@ buildscript {
     project.ext.getDepPlatformDir = getDepPlatformDir
     project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
 
-    project.ext.USER_PROJECT_ROOT = "$rootDir/../../.."
-    project.ext.PLATFORMS_ANDROID = "platforms/android"
-    project.ext.PLUGIN_NAME = "{{pluginName}}"
-
     // the build script will not work with previous versions of the CLI (3.1 or earlier)
-    def dependenciesJson = file("${project.ext.USER_PROJECT_ROOT}/${project.ext.PLATFORMS_ANDROID}/dependencies.json")
+    def dependenciesJson = file("${project.ext.USER_PROJECT_PLATFORMS_ANDROID}/dependencies.json")
     def appDependencies = new JsonSlurper().parseText(dependenciesJson.text)
     def pluginData = appDependencies.find { it.name == project.ext.PLUGIN_NAME }
     project.ext.nativescriptDependencies = appDependencies.findAll{pluginData.dependencies.contains(it.name)}
@@ -135,6 +150,7 @@ allprojects {
             url 'https://maven.google.com/'
             name 'Google'
         }
+        jcenter()
         if (pluginDependencies.size() > 0) {
             flatDir {
                 dirs pluginDependencies
@@ -144,29 +160,13 @@ allprojects {
 }
 
 
-def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 34 }
-def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 34 as int }
+def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 31 }
+def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 31 as int }
 def computeBuildToolsVersion = { ->
-    project.hasProperty("buildToolsVersion") ? buildToolsVersion : "34.0.0"
+    project.hasProperty("buildToolsVersion") ? buildToolsVersion : "31.0.0"
 }
 
 android {
-    namespace "{{pluginNamespace}}"
-
-    kotlinOptions {
-        jvmTarget = '17'
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
-
-    if (project.hasProperty("ndkVersion")) {
-        ndkVersion project.ndkVersion
-    }
-
     def applyPluginGradleConfigurations = { ->
         nativescriptDependencies.each { dep ->
             def includeGradlePath = "${getDepPlatformDir(dep)}/include.gradle"
@@ -220,6 +220,15 @@ task addDependenciesFromNativeScriptPlugins {
     }
 }
 
+afterEvaluate {
+    def generateBuildConfig =  project.hasProperty("generateBuildConfig") ? project.generateBuildConfig : false
+    def generateR =  project.hasProperty("generateR") ? project.generateR : false
+    generateReleaseBuildConfig.enabled = generateBuildConfig
+    generateDebugBuildConfig.enabled = generateBuildConfig
+    generateReleaseResValues.enabled = generateR
+    generateDebugResValues.enabled = generateR
+}
+
 tasks.whenTaskAdded({ DefaultTask currentTask ->
     if (currentTask.name == 'bundleRelease' || currentTask.name == 'bundleDebug') {
         def generateBuildConfig =  project.hasProperty("generateBuildConfig") ? project.generateBuildConfig : false

package/vendor/gradle-plugin/settings.gradle

@@ -1,16 +1,26 @@
 import groovy.json.JsonSlurper
 
-def USER_PROJECT_ROOT = "$rootDir/../../../"
+// def USER_PROJECT_ROOT = "$rootDir/../../../"
 def PLATFORMS_ANDROID = "platforms/android"
 def PLUGIN_NAME = "{{pluginName}}"
 
-def dependenciesJson = file("${USER_PROJECT_ROOT}/${PLATFORMS_ANDROID}/dependencies.json")
+def USER_PROJECT_PLATFORMS_ANDROID
+def USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV = System.getenv('USER_PROJECT_PLATFORMS_ANDROID');
+if (USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV != null && !USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV.equals("")) {
+    USER_PROJECT_PLATFORMS_ANDROID = USER_PROJECT_PLATFORMS_ANDROID_FROM_ENV;
+} else {
+    USER_PROJECT_PLATFORMS_ANDROID = "$rootDir/../../../platforms/android"
+}
+
+System.out.println("!!!!! VM: USER_PROJECT_PLATFORMS_ANDROID: " + USER_PROJECT_PLATFORMS_ANDROID);
+
+def dependenciesJson = file("${USER_PROJECT_PLATFORMS_ANDROID}/dependencies.json")
 def appDependencies = new JsonSlurper().parseText(dependenciesJson.text)
 def pluginData = appDependencies.find { it.name == PLUGIN_NAME }
 def nativescriptDependencies = appDependencies.findAll{pluginData.name == it.name}
 
 def getDepPlatformDir = { dep ->
-        file("$USER_PROJECT_ROOT/$PLATFORMS_ANDROID/${dep.directory}/$PLATFORMS_ANDROID")
+        file("$USER_PROJECT_PLATFORMS_ANDROID/${dep.directory}/$PLATFORMS_ANDROID")
 }
 
 def applyIncludeSettingsGradlePlugin = {

package/node_modules/@npmcli/move-file/node_modules/mkdirp/CHANGELOG.md

@@ -1,15 +0,0 @@
-# Changers Lorgs!
-
-## 1.0
-
-Full rewrite.  Essentially a brand new module.
-
-- Return a promise instead of taking a callback.
-- Use native `fs.mkdir(path, { recursive: true })` when available.
-- Drop support for outdated Node.js versions.  (Technically still works on
-  Node.js v8, but only 10 and above are officially supported.)
-
-## 0.x
-
-Original and most widely used recursive directory creation implementation
-in JavaScript, dating back to 2010.

package/node_modules/rimraf/CHANGELOG.md

@@ -1,65 +0,0 @@
-# v3.0
-
-- Add `--preserve-root` option to executable (default true)
-- Drop support for Node.js below version 6
-
-# v2.7
-
-- Make `glob` an optional dependency
-
-# 2.6
-
-- Retry on EBUSY on non-windows platforms as well
-- Make `rimraf.sync` 10000% more reliable on Windows
-
-# 2.5
-
-- Handle Windows EPERM when lstat-ing read-only dirs
-- Add glob option to pass options to glob
-
-# 2.4
-
-- Add EPERM to delay/retry loop
-- Add `disableGlob` option
-
-# 2.3
-
-- Make maxBusyTries and emfileWait configurable
-- Handle weird SunOS unlink-dir issue
-- Glob the CLI arg for better Windows support
-
-# 2.2
-
-- Handle ENOENT properly on Windows
-- Allow overriding fs methods
-- Treat EPERM as indicative of non-empty dir
-- Remove optional graceful-fs dep
-- Consistently return null error instead of undefined on success
-- win32: Treat ENOTEMPTY the same as EBUSY
-- Add `rimraf` binary
-
-# 2.1
-
-- Fix SunOS error code for a non-empty directory
-- Try rmdir before readdir
-- Treat EISDIR like EPERM
-- Remove chmod
-- Remove lstat polyfill, node 0.7 is not supported
-
-# 2.0
-
-- Fix myGid call to check process.getgid
-- Simplify the EBUSY backoff logic.
-- Use fs.lstat in node >= 0.7.9
-- Remove gently option
-- remove fiber implementation
-- Delete files that are marked read-only
-
-# 1.0
-
-- Allow ENOENT in sync method
-- Throw when no callback is provided
-- Make opts.gently an absolute path
-- use 'stat' if 'lstat' is not available
-- Consistent error naming, and rethrow non-ENOENT stat errors
-- add fiber implementation

package/node_modules/stringify-package/CHANGELOG.md

@@ -1,16 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-<a name="1.0.1"></a>
-## [1.0.1](https://github.com/npm/stringify-package/compare/v1.0.0...v1.0.1) (2019-09-30)
-
-
-### Bug Fixes
-
-* strict comparison ([0c5675f](https://github.com/npm/stringify-package/commit/0c5675f)), closes [#2](https://github.com/npm/stringify-package/issues/2)
-
-
-
-<a name="1.0.0"></a>
-# 1.0.0 (2018-07-18)