*Rename androidHost to nativeHost

*add js package to xcodeproj folder

lib/commands/add-platform.ts

@@ -12,7 +12,8 @@ import { injector } from "../common/yok";
 
 export class AddPlatformCommand
 extends ValidatePlatformCommandBase
-implements ICommand {
+implements ICommand
+{
 public allowedParameters: ICommandParameter[] = [];
 
 constructor(
@@ -36,7 +37,8 @@ export class AddPlatformCommand
 await this.$platformCommandHelper.addPlatforms(
 args,
 this.$projectData,
-this.$options.frameworkPath
+this.$options.frameworkPath,
+this.$options.nativeHost
 );
 }
 

lib/data/build-data.ts

@@ -29,6 +29,7 @@ export class IOSBuildData extends BuildData implements IiOSBuildData {
 public mobileProvisionData: any;
 public buildForAppStore: boolean;
 public iCloudContainerEnvironment: string;
+public nativeHost: string;
 
 constructor(projectDir: string, platform: string, data: any) {
 super(projectDir, platform, data);
@@ -38,6 +39,7 @@ export class IOSBuildData extends BuildData implements IiOSBuildData {
 this.mobileProvisionData = data.mobileProvisionData;
 this.buildForAppStore = data.buildForAppStore;
 this.iCloudContainerEnvironment = data.iCloudContainerEnvironment;
+this.nativeHost = data.nativeHost;
 }
 }
 
@@ -49,7 +51,7 @@ export class AndroidBuildData extends BuildData {
 public androidBundle: boolean;
 public gradlePath: string;
 public gradleArgs: string;
-public androidHost: string;
+public nativeHost: string;
 
 constructor(projectDir: string, platform: string, data: any) {
 super(projectDir, platform, data);
@@ -61,6 +63,6 @@ export class AndroidBuildData extends BuildData {
 this.androidBundle = data.androidBundle || data.aab;
 this.gradlePath = data.gradlePath;
 this.gradleArgs = data.gradleArgs;
-this.androidHost = data.androidHost;
+this.nativeHost = data.nativeHost;
 }
 }

lib/data/prepare-data.ts

@@ -7,6 +7,7 @@ export class PrepareData extends ControllerDataBase {
 public env: any;
 public watch?: boolean;
 public watchNative: boolean = true;
+public nativeHost?: string;
 
 constructor(public projectDir: string, public platform: string, data: any) {
 super(projectDir, platform, data);
@@ -36,6 +37,7 @@ export class PrepareData extends ControllerDataBase {
 if (_.isBoolean(data.watchNative)) {
 this.watchNative = data.watchNative;
 }
+this.nativeHost = data.nativeHost;
 }
 }
 

lib/declarations.d.ts

@@ -581,7 +581,11 @@ interface IAndroidBundleOptions {
 interface IAndroidOptions {
 gradlePath: string;
 gradleArgs: string;
-androidHost: string;
+nativeHost: string;
+}
+
+interface IIOSOptions {
+nativeHost: string;
 }
 
 interface ITypingsOptions {
@@ -604,6 +608,7 @@ interface IOptions
 IProvision,
 ITeamIdentifier,
 IAndroidOptions,
+IIOSOptions,
 IAndroidReleaseOptions,
 IAndroidBundleOptions,
 INpmInstallConfigurationOptions,
@@ -1001,6 +1006,7 @@ interface IXcprojService {
  * @return {string} The full path to the xcodeproj
  */
 getXcodeprojPath(projectData: IProjectData, projectRoot: string): string;
+findXcodeProject(dir: string): string;
 }
 
 /**
@@ -1208,7 +1214,8 @@ interface IPlatformCommandHelper {
 addPlatforms(
 platforms: string[],
 projectData: IProjectData,
-frameworkPath?: string
+frameworkPath?: string,
+nativeHost?: string
 ): Promise<void>;
 cleanPlatforms(
 platforms: string[],

lib/definitions/platform.d.ts

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

lib/helpers/platform-command-helper.ts

@@ -36,7 +36,8 @@ export class PlatformCommandHelper implements IPlatformCommandHelper {
 public async addPlatforms(
 platforms: string[],
 projectData: IProjectData,
-frameworkPath: string
+frameworkPath: string,
+nativeHost?: string
 ): Promise<void> {
 const platformsDir = projectData.platformsDir;
 this.$fs.ensureDirectoryExists(platformsDir);
@@ -58,6 +59,7 @@ export class PlatformCommandHelper implements IPlatformCommandHelper {
 projectDir: projectData.projectDir,
 platform,
 frameworkPath,
+nativeHost,
 });
 }
 }
@@ -104,8 +106,8 @@ export class PlatformCommandHelper implements IPlatformCommandHelper {
 }
 
 try {
-const platformDir = this.$options.androidHost
-? this.$options.androidHost
+const platformDir = this.$options.nativeHost
+? this.$options.nativeHost
 : path.join(projectData.platformsDir, platform.toLowerCase());
 this.$fs.deleteDirectory(platformDir);
 await this.$packageInstallationManager.uninstall(

lib/options.ts

@@ -221,7 +221,7 @@ export class Options {
 },
 gradlePath: { type: OptionType.String, hasSensitiveValue: false },
 gradleArgs: { type: OptionType.String, hasSensitiveValue: false },
-androidHost: { type: OptionType.String, hasSensitiveValue: false },
+nativeHost: { type: OptionType.String, hasSensitiveValue: false },
 aab: { type: OptionType.Boolean, hasSensitiveValue: false },
 performance: { type: OptionType.Object, hasSensitiveValue: true },
 appleApplicationSpecificPassword: {

lib/services/android-project-service.ts

@@ -164,8 +164,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 );
 }
 if (projectData && projectData.platformsDir) {
-const projectRoot = this.$options.androidHost
-? this.$options.androidHost
+const projectRoot = this.$options.nativeHost
+? this.$options.nativeHost
 : path.join(
 projectData.platformsDir,
 AndroidProjectService.ANDROID_PLATFORM_NAME
@@ -748,8 +748,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 projectData: IProjectData,
 dependencies: IDependencyData[]
 ): IDependencyData[] {
-const platformDir = this.$options.androidHost
-? this.$options.androidHost
+const platformDir = this.$options.nativeHost
+? this.$options.nativeHost
 : path.join(
 projectData.platformsDir,
 AndroidProjectService.ANDROID_PLATFORM_NAME

lib/services/assets-generation/assets-generation-service.ts

@@ -43,7 +43,7 @@ export class AssetsGenerationService implements IAssetsGenerationService {
 public async generateIcons(
 resourceGenerationData: IResourceGenerationData
 ): Promise<void> {
-if (this.$options.androidHost) {
+if (this.$options.nativeHost) {
 return;
 }
 
@@ -59,7 +59,7 @@ export class AssetsGenerationService implements IAssetsGenerationService {
 public async generateSplashScreens(
 splashesGenerationData: IResourceGenerationData
 ): Promise<void> {
-if (this.$options.androidHost) {
+if (this.$options.nativeHost) {
 return;
 }
 

lib/services/ios-project-service.ts

@@ -84,6 +84,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 private $logger: ILogger,
 private $injector: IInjector,
 $projectDataService: IProjectDataService,
+private $options: IOptions,
 private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 private $hostInfo: IHostInfo,
 private $xcprojService: IXcprojService,
@@ -120,10 +121,13 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 projectData.platformsDir &&
 this._platformsDirCache !== projectData.platformsDir
 ) {
-const projectRoot = path.join(
-projectData.platformsDir,
-this.$devicePlatformsConstants.iOS.toLowerCase()
-);
+const projectRoot = this.$options.nativeHost
+? this.$options.nativeHost
+: path.join(
+projectData.platformsDir,
+this.$devicePlatformsConstants.iOS.toLowerCase()
+ );
+
 const runtimePackage = this.$projectDataService.getRuntimePackage(
 projectData.projectDir,
 constants.PlatformTypes.ios
@@ -564,11 +568,17 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 projectData: IProjectData,
 prepareData: IOSPrepareData
 ): Promise<void> {
-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);
+
 this.$iOSExtensionsService.removeExtensions({ pbxProjPath });
 await this.addExtensions(projectData, pluginsData);
 
@@ -860,6 +870,15 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 }
 
 private getPbxProjPath(projectData: IProjectData): string {
+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,

lib/services/platform/add-platform-service.ts

@@ -28,6 +28,8 @@ export class AddPlatformService implements IAddPlatformService {
 private $analyticsService: IAnalyticsService // private $tempService: ITempService
 ) {}
 
+public async addProjectHost() {}
+
 public async addPlatformSafe(
 projectData: IProjectData,
 platformData: IPlatformData,
@@ -183,14 +185,15 @@ export class AddPlatformService implements IAddPlatformService {
 frameworkDirPath: string,
 frameworkVersion: string
 ): Promise<void> {
-const platformDir = this.$options.androidHost
-? this.$options.androidHost
+//here we should use ios OR android
+const platformDir = this.$options.nativeHost
+? this.$options.nativeHost
 : path.join(
 projectData.platformsDir,
 platformData.normalizedPlatformName.toLowerCase()
  );
 this.$fs.deleteDirectory(platformDir);
-
+//if iosHost - dont create project
 await platformData.platformProjectService.createProject(
 path.resolve(frameworkDirPath),
 frameworkVersion,

lib/services/platform/prepare-native-platform-service.ts

@@ -48,7 +48,7 @@ export class PrepareNativePlatformService
 await this.cleanProject(platformData, { release });
 }
 
-if (!this.$options.androidHost) {
+if (!this.$options.nativeHost) {
 platformData.platformProjectService.prepareAppResources(projectData);
 }
 

lib/services/webpack/webpack-compiler-service.ts

@@ -340,9 +340,11 @@ export class WebpackCompilerService
 cwd: projectData.projectDir,
 stdio,
 };
-if (this.$options.androidHost) {
+
+if (this.$options.nativeHost) {
 options.env = {
-USER_PROJECT_PLATFORMS_ANDROID: this.$options.androidHost,
+USER_PROJECT_PLATFORMS_ANDROID: this.$options.nativeHost,
+USER_PROJECT_PLATFORMS_IOS: this.$options.nativeHost,
 };
 }
 const childProcess = this.$childProcess.spawn(

lib/services/xcproj-service.ts

@@ -1,4 +1,5 @@
 import * as path from "path";
+import * as fs from "fs";
 import { IosProjectConstants } from "../constants";
 import { IXcprojService } from "../declarations";
 import { IProjectData } from "../definitions/project";
@@ -15,6 +16,23 @@ class XcprojService implements IXcprojService {
 projectData.projectName + IosProjectConstants.XcodeProjExtName
 );
 }
+
+public findXcodeProject(dir: string): string {
+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;
+}
 }
 
 injector.register("xcprojService", XcprojService);