fix: apply pod install after merging all pod files (from node_modules and from App_Resources)

Author: Fatme

lib/definitions/project.d.ts

@@ -400,8 +400,7 @@ interface IPlatformProjectService extends NodeJS.EventEmitter, IPlatformProjectS
 	 */
 	removePluginNativeCode(pluginData: IPluginData, projectData: IProjectData): Promise<void>;
 
-	afterPrepareAllPlugins(projectData: IProjectData): Promise<void>;
-	beforePrepareAllPlugins(projectData: IProjectData, dependencies?: IDependencyData[]): Promise<void>;
+	handleNativeDependenciesChange(projectData: IProjectData): Promise<void>;
 
 	/**
 	 * Gets the path wheren App_Resources should be copied.

lib/services/android-project-service.ts

@@ -577,11 +577,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}
 	}
 
-	public async afterPrepareAllPlugins(projectData: IProjectData): Promise<void> {
-		return;
-	}
-
-	public async beforePrepareAllPlugins(projectData: IProjectData, dependencies?: IDependencyData[]): Promise<void> {
+	public async handleNativeDependenciesChange(projectData: IProjectData, dependencies?: IDependencyData[]): Promise<void> {
 		const shouldUseNewRoutine = this.runtimeVersionIsGreaterThanOrEquals(projectData, "3.3.0");
 
 		if (dependencies) {

lib/services/ios-project-service.ts

@@ -800,6 +800,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 		}
 
 		this.$pluginVariablesService.interpolateAppIdentifier(this.getPlatformData(projectData).configurationFilePath, projectData.projectIdentifiers.ios);
+		await this.mergeProjectPodFile(projectData);
 	}
 
 	private getInfoPlistPath(projectData: IProjectData): string {
@@ -976,34 +977,10 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 		this.$cocoapodsService.removePodfileFromProject(pluginData.name, this.$cocoapodsService.getPluginPodfilePath(pluginData), projectData, projectRoot);
 	}
 
-	public async afterPrepareAllPlugins(projectData: IProjectData): Promise<void> {
-		await this.installPodsIfAny(projectData);
-	}
-
-	public async installPodsIfAny(projectData: IProjectData): Promise<void> {
+	public async handleNativeDependenciesChange(projectData: IProjectData): Promise<void> {
 		const projectRoot = this.getPlatformData(projectData).projectRoot;
-		const mainPodfilePath = path.join(projectData.appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, constants.PODFILE_NAME);
-		if (this.$fs.exists(this.$cocoapodsService.getProjectPodfilePath(projectRoot)) || this.$fs.exists(mainPodfilePath)) {
-			const xcodeProjPath = this.getXcodeprojPath(projectData);
-			const xcuserDataPath = path.join(xcodeProjPath, "xcuserdata");
-			const sharedDataPath = path.join(xcodeProjPath, "xcshareddata");
-
-			if (!this.$fs.exists(xcuserDataPath) && !this.$fs.exists(sharedDataPath)) {
-				this.$logger.info("Creating project scheme...");
-				await this.checkIfXcodeprojIsRequired();
-
-				const createSchemeRubyScript = `ruby -e "require 'xcodeproj'; xcproj = Xcodeproj::Project.open('${projectData.projectName}.xcodeproj'); xcproj.recreate_user_schemes; xcproj.save"`;
-				await this.$childProcess.exec(createSchemeRubyScript, { cwd: this.getPlatformData(projectData).projectRoot });
-			}
-
-			await this.$cocoapodsService.applyPodfileToProject(constants.NS_BASE_PODFILE, mainPodfilePath, projectData, this.getPlatformData(projectData).projectRoot);
-
-			await this.$cocoapodsService.executePodInstall(projectRoot, xcodeProjPath);
-		}
-	}
-
-	public beforePrepareAllPlugins(): Promise<void> {
-		return Promise.resolve();
+		const xcodeProjPath = this.getXcodeprojPath(projectData);
+		await this.$cocoapodsService.executePodInstall(projectRoot, xcodeProjPath);
 	}
 
 	public async checkForChanges(changesInfo: IProjectChangesInfo, { provision, teamId }: IProjectChangesOptions, projectData: IProjectData): Promise<void> {
@@ -1068,6 +1045,28 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 		return semver.coerce(target);
 	}
 
+	private async mergeProjectPodFile(projectData: IProjectData): Promise<void> {
+		const platformData = this.getPlatformData(projectData);
+		const { projectRoot, normalizedPlatformName } = platformData;
+		const mainPodfilePath = path.join(projectData.appResourcesDirectoryPath, normalizedPlatformName, constants.PODFILE_NAME);
+		const projectPodfilePath = this.$cocoapodsService.getProjectPodfilePath(projectRoot);
+		if (this.$fs.exists(projectPodfilePath) || this.$fs.exists(mainPodfilePath)) {
+			const xcodeProjPath = this.getXcodeprojPath(projectData);
+			const xcuserDataPath = path.join(xcodeProjPath, "xcuserdata");
+			const sharedDataPath = path.join(xcodeProjPath, "xcshareddata");
+
+			if (!this.$fs.exists(xcuserDataPath) && !this.$fs.exists(sharedDataPath)) {
+				this.$logger.info("Creating project scheme...");
+				await this.checkIfXcodeprojIsRequired();
+
+				const createSchemeRubyScript = `ruby -e "require 'xcodeproj'; xcproj = Xcodeproj::Project.open('${projectData.projectName}.xcodeproj'); xcproj.recreate_user_schemes; xcproj.save"`;
+				await this.$childProcess.exec(createSchemeRubyScript, { cwd: projectRoot });
+			}
+
+			await this.$cocoapodsService.applyPodfileToProject(constants.NS_BASE_PODFILE, mainPodfilePath, projectData, projectRoot);
+		}
+	}
+
 	private getAllLibsForPluginWithFileExtension(pluginData: IPluginData, fileExtension: string): string[] {
 		const filterCallback = (fileName: string, pluginPlatformsFolderPath: string) => path.extname(fileName) === fileExtension;
 		return this.getAllNativeLibrariesForPlugin(pluginData, IOSProjectService.IOS_PLATFORM_NAME, filterCallback);

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

@@ -67,7 +67,7 @@ export class PreparePlatformNativeService extends PreparePlatformService impleme
 
 		if (hasModulesChange || hasConfigChange) {
 			await config.platformData.platformProjectService.processConfigurationFilesFromAppResources(config.projectData, { release: config.appFilesUpdaterOptions.release });
-			await config.platformData.platformProjectService.afterPrepareAllPlugins(config.projectData);
+			await config.platformData.platformProjectService.handleNativeDependenciesChange(config.projectData);
 		}
 
 		config.platformData.platformProjectService.interpolateConfigurationFile(config.projectData, config.platformSpecificData);

lib/tools/node-modules/node-modules-dest-copy.ts

@@ -107,10 +107,6 @@ export class NpmPluginPrepare {
 	) {
 	}
 
-	protected async beforePrepare(dependencies: IDependencyData[], platform: string, projectData: IProjectData): Promise<void> {
-		await this.$platformsData.getPlatformData(platform, projectData).platformProjectService.beforePrepareAllPlugins(projectData, dependencies);
-	}
-
 	protected async afterPrepare(dependencies: IDependencyData[], platform: string, projectData: IProjectData): Promise<void> {
 		const prepareData: IDictionary<boolean> = {};
 		_.each(dependencies, d => {
@@ -158,7 +154,6 @@ export class NpmPluginPrepare {
 			return;
 		}
 
-		await this.beforePrepare(dependencies, platform, projectData);
 		for (const dependencyKey in dependencies) {
 			const dependency = dependencies[dependencyKey];
 			const isPlugin = !!dependency.nativescript;

test/debug.ts

@@ -350,7 +350,7 @@ describe("debug command tests", () => {
 			testInjector = createTestInjector();
 		});
 
-		it("Ensures that beforePrepareAllPlugins will call gradle with clean option when *NOT* livesyncing", async () => {
+		it("Ensures that handleNativeDependenciesChange will call gradle with clean option when *NOT* livesyncing", async () => {
 			const platformData = testInjector.resolve<IPlatformData>("platformsData");
 			platformData.frameworkPackageName = "tns-android";
 
@@ -367,7 +367,7 @@ describe("debug command tests", () => {
 			};
 			const projectData: IProjectData = testInjector.resolve("projectData");
 			const spawnFromEventCount = childProcess.spawnFromEventCount;
-			await androidProjectService.beforePrepareAllPlugins(projectData);
+			await androidProjectService.handleNativeDependenciesChange(projectData);
 			assert.isTrue(childProcess.lastCommand.indexOf("gradle") !== -1);
 			assert.isTrue(childProcess.lastCommandArgs[0] === "clean");
 			assert.isTrue(spawnFromEventCount === 0);

test/npm-support.ts

@@ -182,8 +182,7 @@ async function setupProject(dependencies?: any): Promise<any> {
 			platformProjectService: {
 				prepareProject: (): any => null,
 				prepareAppResources: (): any => null,
-				afterPrepareAllPlugins: () => Promise.resolve(),
-				beforePrepareAllPlugins: () => Promise.resolve(),
+				handleNativeDependenciesChange: () => Promise.resolve(),
 				getAppResourcesDestinationDirectoryPath: () => path.join(androidFolderPath, "src", "main", "res"),
 				processConfigurationFilesFromAppResources: () => Promise.resolve(),
 				ensureConfigurationFileInAppResources: (): any => null,

test/platform-service.ts

@@ -496,7 +496,7 @@ describe('Platform Service Tests', () => {
 							}
 						},
 						processConfigurationFilesFromAppResources: () => Promise.resolve(),
-						afterPrepareAllPlugins: () => Promise.resolve(),
+						handleNativeDependenciesChange: () => Promise.resolve(),
 						ensureConfigurationFileInAppResources: (): any => null,
 						interpolateConfigurationFile: (): void => undefined,
 						isPlatformPrepared: (projectRoot: string) => false,
@@ -932,7 +932,7 @@ describe('Platform Service Tests', () => {
 						afterCreateProject: (projectRoot: string): any => null,
 						getAppResourcesDestinationDirectoryPath: () => testDirData.appResourcesFolderPath,
 						processConfigurationFilesFromAppResources: () => Promise.resolve(),
-						afterPrepareAllPlugins: () => Promise.resolve(),
+						handleNativeDependenciesChange: () => Promise.resolve(),
 						ensureConfigurationFileInAppResources: (): any => null,
 						interpolateConfigurationFile: (): void => undefined,
 						isPlatformPrepared: (projectRoot: string) => false,

test/plugin-prepare.ts

@@ -14,15 +14,11 @@ class TestNpmPluginPrepare extends NpmPluginPrepare {
 		return this.previouslyPrepared;
 	}
 
-	protected async beforePrepare(dependencies: IDependencyData[], platform: string): Promise<void> {
+	protected async afterPrepare(dependencies: IDependencyData[], platform: string): Promise<void> {
 		_.each(dependencies, d => {
 			this.preparedDependencies[d.name] = true;
 		});
 	}
-
-	protected async afterPrepare(dependencies: IDependencyData[], platform: string): Promise<void> {
-		// DO NOTHING
-	}
 }
 
 describe("Plugin preparation", () => {

test/stubs.ts

@@ -445,10 +445,7 @@ export class PlatformProjectServiceStub extends EventEmitter implements IPlatfor
 
 	async removePluginNativeCode(pluginData: IPluginData): Promise<void> { }
 
-	async afterPrepareAllPlugins(): Promise<void> {
-		return Promise.resolve();
-	}
-	async beforePrepareAllPlugins(): Promise<void> {
+	async handleNativeDependenciesChange(): Promise<void> {
 		return Promise.resolve();
 	}
 	async cleanDeviceTempFolder(deviceIdentifier: string): Promise<void> {