refactor: cocoapods override logic

KristianDD · KristianDD · commit 5bc58a77d23a · 2019-10-08T17:30:43.000+03:00
diff --git a/lib/definitions/platform.d.ts b/lib/definitions/platform.d.ts
@@ -52,7 +52,6 @@ interface INodeModulesBuilder {
 interface IPrepareNodeModulesData {
 	platformData: IPlatformData;
 	projectData: IProjectData;
-	forcePluginNativePrepare: boolean;
 }
 
 interface INodeModulesDependenciesBuilder {
diff --git a/lib/definitions/plugins.d.ts b/lib/definitions/plugins.d.ts
@@ -21,7 +21,6 @@ interface IPreparePluginNativeCodeData {
 	pluginData: IPluginData;
 	platform: string;
 	projectData: IProjectData;
-	forcePluginNativePrepare: boolean;
 }
 
 interface IPackageJsonDepedenciesResult {
diff --git a/lib/services/cocoapods-service.ts b/lib/services/cocoapods-service.ts
@@ -93,10 +93,6 @@ ${versionResolutionHint}`);
 				finalPodfileContent = this.$cocoaPodsPlatformManager.addPlatformSection(projectData, podfilePlatformData, finalPodfileContent);
 			}
 
-			if (this.isMainPodFile(podfilePath, projectData, platformData) && projectData.nsConfig && projectData.nsConfig.overridePods) {
-				finalPodfileContent = this.overridePodsFromFile(finalPodfileContent, projectData, platformData);
-			}
-
 			finalPodfileContent = `${finalPodfileContent.trim()}${EOL}${EOL}${podfileContent.trim()}${EOL}`;
 			this.saveProjectPodfile(projectData, finalPodfileContent, nativeProjectPath);
 		}
@@ -234,14 +230,13 @@ ${versionResolutionHint}`);
 	}
 
 	private buildPodfileContent(pluginPodFilePath: string, pluginName: string, projectData: IProjectData, platformData: IPlatformData): { podfileContent: string, replacedFunctions: IRubyFunction[], podfilePlatformData: IPodfilePlatformData } {
-		const mainPodfilePath = this.getMainPodFilePath(projectData, platformData);
 		const pluginPodfileContent = this.$fs.readText(pluginPodFilePath);
 		const data = this.replaceHookContent(CocoaPodsService.PODFILE_POST_INSTALL_SECTION_NAME, pluginPodfileContent, pluginName);
 		const cocoapodsData = this.$cocoaPodsPlatformManager.replacePlatformRow(data.replacedContent, pluginPodFilePath);
 		const podfilePlatformData  = cocoapodsData.podfilePlatformData;
 		let replacedContent = cocoapodsData.replacedContent;
 
-		if (projectData.nsConfig && projectData.nsConfig.overridePods && mainPodfilePath !== pluginPodFilePath) {
+		if (projectData.nsConfig && projectData.nsConfig.overridePods && !this.isMainPodFile(pluginPodFilePath, projectData, platformData)) {
 			replacedContent = this.overridePodsFromFile(replacedContent, projectData, platformData);
 		}
 
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
@@ -495,8 +495,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		await this.prepareResources(pluginPlatformsFolderPath, pluginData, projectData);
 		await this.prepareFrameworks(pluginPlatformsFolderPath, pluginData, projectData);
 		await this.prepareStaticLibs(pluginPlatformsFolderPath, pluginData, projectData);
-		const platformData = this.getPlatformData(projectData);
-		await this.$cocoapodsService.applyPodfileToProject(pluginData.name, this.$cocoapodsService.getPluginPodfilePath(pluginData), projectData, platformData);
 	}
 
 	public async removePluginNativeCode(pluginData: IPluginData, projectData: IProjectData): Promise<void> {
@@ -512,8 +510,10 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 	public async handleNativeDependenciesChange(projectData: IProjectData, opts: IRelease): Promise<void> {
 		const platformData = this.getPlatformData(projectData);
-
+		const pluginsData = await this.getAllInstalledPlugins(projectData);
 		this.setProductBundleIdentifier(projectData);
+
+		await this.applyPluginsCocoaPods(pluginsData, projectData, platformData);
 		await this.$cocoapodsService.applyPodfileFromAppResources(projectData, platformData);
 
 		const projectPodfilePath = this.$cocoapodsService.getProjectPodfilePath(platformData.projectRoot);
@@ -528,7 +528,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 		const pbxProjPath = this.getPbxProjPath(projectData);
 		this.$iOSExtensionsService.removeExtensions({ pbxProjPath });
-		await this.addExtensions(projectData);
+		await this.addExtensions(projectData, pluginsData);
 	}
 
 	public beforePrepareAllPlugins(): Promise<void> {
@@ -641,18 +641,17 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		this.savePbxProj(project, projectData);
 	}
 
-	private async addExtensions(projectData: IProjectData): Promise<void> {
+	private async addExtensions(projectData: IProjectData, pluginsData: IPluginData[]): Promise<void> {
 		const resorcesExtensionsPath = path.join(
 			projectData.getAppResourcesDirectoryPath(),
 			this.getPlatformData(projectData).normalizedPlatformName, constants.NATIVE_EXTENSION_FOLDER
 		);
 		const platformData = this.getPlatformData(projectData);
 		const pbxProjPath = this.getPbxProjPath(projectData);
 		const addedExtensionsFromResources = await this.$iOSExtensionsService.addExtensionsFromPath({ extensionsFolderPath: resorcesExtensionsPath, projectData, platformData, pbxProjPath });
-		const plugins = await this.getAllInstalledPlugins(projectData);
 		let addedExtensionsFromPlugins = false;
-		for (const pluginIndex in plugins) {
-			const pluginData = plugins[pluginIndex];
+		for (const pluginIndex in pluginsData) {
+			const pluginData = pluginsData[pluginIndex];
 			const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
 
 			const extensionPath = path.join(pluginPlatformsFolderPath, constants.NATIVE_EXTENSION_FOLDER);
@@ -828,6 +827,15 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			this.$logger.warn("[WARNING]: The CFBundleIdentifier key inside the 'Info.plist' will be overriden by the 'id' inside 'package.json'.");
 		}
 	}
+
+	private async applyPluginsCocoaPods(pluginsData: IPluginData[], projectData: IProjectData, platformData: IPlatformData) {
+		for (const pluginIndex in pluginsData) {
+			const pluginData = pluginsData[pluginIndex];
+			if (this.$fs.exists(pluginData.pluginPlatformsFolderPath(platformData.normalizedPlatformName))) {
+				await this.$cocoapodsService.applyPodfileToProject(pluginData.name, this.$cocoapodsService.getPluginPodfilePath(pluginData), projectData, platformData);
+			}
+		}
+	}
 }
 
 $injector.register("iOSProjectService", IOSProjectService);
diff --git a/lib/services/platform/prepare-native-platform-service.ts b/lib/services/platform/prepare-native-platform-service.ts
@@ -24,7 +24,7 @@ export class PrepareNativePlatformService implements IPrepareNativePlatformServi
 		const hasConfigChange = !changesInfo || changesInfo.configChanged;
 		const hasChangesRequirePrepare = !changesInfo || changesInfo.changesRequirePrepare;
 
-		const hasChanges = hasNativeModulesChange || hasConfigChange || hasChangesRequirePrepare || changesInfo.nsConfigChanged;
+		const hasChanges = hasNativeModulesChange || hasConfigChange || hasChangesRequirePrepare;
 
 		if (changesInfo.hasChanges) {
 			await this.cleanProject(platformData, { release });
@@ -36,8 +36,8 @@ export class PrepareNativePlatformService implements IPrepareNativePlatformServi
 			await platformData.platformProjectService.prepareProject(projectData, prepareData);
 		}
 
-		if (hasNativeModulesChange || changesInfo.nsConfigChanged) {
-			await this.$nodeModulesBuilder.prepareNodeModules({platformData, projectData, forcePluginNativePrepare: changesInfo.nsConfigChanged});
+		if (hasNativeModulesChange) {
+			await this.$nodeModulesBuilder.prepareNodeModules({platformData, projectData});
 		}
 
 		if (hasNativeModulesChange || hasConfigChange) {
diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts
@@ -114,7 +114,7 @@ export class PluginsService implements IPluginsService {
 		}
 	}
 
-	public async preparePluginNativeCode({pluginData, platform, projectData, forcePluginNativePrepare}: IPreparePluginNativeCodeData): Promise<void> {
+	public async preparePluginNativeCode({pluginData, platform, projectData}: IPreparePluginNativeCodeData): Promise<void> {
 		const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
 		pluginData.pluginPlatformsFolderPath = (_platform: string) => path.join(pluginData.fullPath, "platforms", _platform.toLowerCase());
 
@@ -126,7 +126,7 @@ export class PluginsService implements IPluginsService {
 			const oldPluginNativeHashes = allPluginsNativeHashes[pluginData.name];
 			const currentPluginNativeHashes = await this.getPluginNativeHashes(pluginPlatformsFolderPath);
 
-			if (forcePluginNativePrepare || !oldPluginNativeHashes || this.$filesHashService.hasChangesInShasums(oldPluginNativeHashes, currentPluginNativeHashes)) {
+			if (!oldPluginNativeHashes || this.$filesHashService.hasChangesInShasums(oldPluginNativeHashes, currentPluginNativeHashes)) {
 				await platformData.platformProjectService.preparePluginNativeCode(pluginData, projectData);
 				this.setPluginNativeHashes({
 					pathToPluginsBuildFile,
diff --git a/lib/tools/node-modules/node-modules-builder.ts b/lib/tools/node-modules/node-modules-builder.ts
@@ -5,7 +5,7 @@ export class NodeModulesBuilder implements INodeModulesBuilder {
 		private $pluginsService: IPluginsService
 	) { }
 
-	public async prepareNodeModules({platformData , projectData, forcePluginNativePrepare}: IPrepareNodeModulesData): Promise<void> {
+	public async prepareNodeModules({platformData , projectData}: IPrepareNodeModulesData): Promise<void> {
 		const dependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(projectData.projectDir);
 		if (_.isEmpty(dependencies)) {
 			return;
@@ -19,7 +19,7 @@ export class NodeModulesBuilder implements INodeModulesBuilder {
 			if (isPlugin) {
 				this.$logger.debug(`Successfully prepared plugin ${dependency.name} for ${platformData.normalizedPlatformName.toLowerCase()}.`);
 				const pluginData = this.$pluginsService.convertToPluginData(dependency, projectData.projectDir);
-				await this.$pluginsService.preparePluginNativeCode({pluginData, platform: platformData.normalizedPlatformName.toLowerCase(), projectData, forcePluginNativePrepare});
+				await this.$pluginsService.preparePluginNativeCode({pluginData, platform: platformData.normalizedPlatformName.toLowerCase(), projectData});
 			}
 		}
 	}
diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts
@@ -318,11 +318,18 @@ describe("Cocoapods support", () => {
 			const samplePluginData = {
 				pluginPlatformsFolderPath(platform: string): string {
 					return samplePluginPlatformsFolderPath;
-				}
+				},
+				name: "somePlugin"
 			};
 			const projectData: IProjectData = testInjector.resolve("projectData");
+			const pluginsService = testInjector.resolve("pluginsService");
+			pluginsService.getAllInstalledPlugins = () => {
+				return [samplePluginData];
+			};
+			const cocoapodsService = testInjector.resolve("cocoapodsService");
+			cocoapodsService.executePodInstall = async () => { /* */ };
 
-			await iOSProjectService.preparePluginNativeCode(samplePluginData, projectData);
+			await iOSProjectService.handleNativeDependenciesChange(projectData);
 
 			const projectPodfilePath = join(platformsFolderPath, "Podfile");
 			assert.isTrue(fs.exists(projectPodfilePath));
@@ -403,8 +410,14 @@ describe("Cocoapods support", () => {
 				fullPath: "fullPath"
 			};
 			const projectData: IProjectData = testInjector.resolve("projectData");
+			const pluginsService = testInjector.resolve("pluginsService");
+			pluginsService.getAllInstalledPlugins = () => {
+				return [samplePluginData];
+			};
+			const cocoapodsService = testInjector.resolve("cocoapodsService");
+			cocoapodsService.executePodInstall = async () => { /* */ };
 
-			await iOSProjectService.preparePluginNativeCode(samplePluginData, projectData);
+			await iOSProjectService.handleNativeDependenciesChange(projectData);
 
 			const projectPodfilePath = join(platformsFolderPath, "Podfile");
 			assert.isTrue(fs.exists(projectPodfilePath));
diff --git a/test/plugins-service.ts b/test/plugins-service.ts
@@ -570,7 +570,7 @@ describe("Plugins service", () => {
 				`\n@#[line:1,col:39].` +
 				`\n@#[line:1,col:39].`;
 			mockBeginCommand(testInjector, expectedErrorMessage);
-			await pluginsService.preparePluginNativeCode({pluginData: pluginsService.convertToPluginData(pluginJsonData, projectData.projectDir), platform: "android", projectData, forcePluginNativePrepare: false});
+			await pluginsService.preparePluginNativeCode({pluginData: pluginsService.convertToPluginData(pluginJsonData, projectData.projectDir), platform: "android", projectData});
 		});
 	});
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ interface INodeModulesBuilder {`
`52`	`52`	`interface IPrepareNodeModulesData {`
`53`	`53`	`platformData: IPlatformData;`
`54`	`54`	`projectData: IProjectData;`
`55`		`- forcePluginNativePrepare: boolean;`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`interface INodeModulesDependenciesBuilder {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ interface IPreparePluginNativeCodeData {`
`21`	`21`	`pluginData: IPluginData;`
`22`	`22`	`platform: string;`
`23`	`23`	`projectData: IProjectData;`
`24`		`- forcePluginNativePrepare: boolean;`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`interface IPackageJsonDepedenciesResult {`
Original file line number	Diff line number	Diff line change
@@ -93,10 +93,6 @@ ${versionResolutionHint}`);
`93`	`93`	`finalPodfileContent = this.$cocoaPodsPlatformManager.addPlatformSection(projectData, podfilePlatformData, finalPodfileContent);`
`94`	`94`	`}`
`95`	`95`
`96`		`- if (this.isMainPodFile(podfilePath, projectData, platformData) && projectData.nsConfig && projectData.nsConfig.overridePods) {`
`97`		`- finalPodfileContent = this.overridePodsFromFile(finalPodfileContent, projectData, platformData);`
`98`		`- }`
`99`		`-`
`100`	`96`	finalPodfileContent = `${finalPodfileContent.trim()}${EOL}${EOL}${podfileContent.trim()}${EOL}`;
`101`	`97`	`this.saveProjectPodfile(projectData, finalPodfileContent, nativeProjectPath);`
`102`	`98`	`}`
@@ -234,14 +230,13 @@ ${versionResolutionHint}`);
`234`	`230`	`}`
`235`	`231`
`236`	`232`	`private buildPodfileContent(pluginPodFilePath: string, pluginName: string, projectData: IProjectData, platformData: IPlatformData): { podfileContent: string, replacedFunctions: IRubyFunction[], podfilePlatformData: IPodfilePlatformData } {`
`237`		`- const mainPodfilePath = this.getMainPodFilePath(projectData, platformData);`
`238`	`233`	`const pluginPodfileContent = this.$fs.readText(pluginPodFilePath);`
`239`	`234`	`const data = this.replaceHookContent(CocoaPodsService.PODFILE_POST_INSTALL_SECTION_NAME, pluginPodfileContent, pluginName);`
`240`	`235`	`const cocoapodsData = this.$cocoaPodsPlatformManager.replacePlatformRow(data.replacedContent, pluginPodFilePath);`
`241`	`236`	`const podfilePlatformData = cocoapodsData.podfilePlatformData;`
`242`	`237`	`let replacedContent = cocoapodsData.replacedContent;`
`243`	`238`
`244`		`- if (projectData.nsConfig && projectData.nsConfig.overridePods && mainPodfilePath !== pluginPodFilePath) {`
	`239`	`+ if (projectData.nsConfig && projectData.nsConfig.overridePods && !this.isMainPodFile(pluginPodFilePath, projectData, platformData)) {`
`245`	`240`	`replacedContent = this.overridePodsFromFile(replacedContent, projectData, platformData);`
`246`	`241`	`}`
`247`	`242`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ export class PluginsService implements IPluginsService {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`117`		`- public async preparePluginNativeCode({pluginData, platform, projectData, forcePluginNativePrepare}: IPreparePluginNativeCodeData): Promise<void> {`
	`117`	`+ public async preparePluginNativeCode({pluginData, platform, projectData}: IPreparePluginNativeCodeData): Promise<void> {`
`118`	`118`	`const platformData = this.$platformsDataService.getPlatformData(platform, projectData);`
`119`	`119`	`pluginData.pluginPlatformsFolderPath = (_platform: string) => path.join(pluginData.fullPath, "platforms", _platform.toLowerCase());`
`120`	`120`
`@@ -126,7 +126,7 @@ export class PluginsService implements IPluginsService {`
`126`	`126`	`const oldPluginNativeHashes = allPluginsNativeHashes[pluginData.name];`
`127`	`127`	`const currentPluginNativeHashes = await this.getPluginNativeHashes(pluginPlatformsFolderPath);`
`128`	`128`
`129`		`- if (forcePluginNativePrepare \|\| !oldPluginNativeHashes \|\| this.$filesHashService.hasChangesInShasums(oldPluginNativeHashes, currentPluginNativeHashes)) {`
	`129`	`+ if (!oldPluginNativeHashes \|\| this.$filesHashService.hasChangesInShasums(oldPluginNativeHashes, currentPluginNativeHashes)) {`
`130`	`130`	`await platformData.platformProjectService.preparePluginNativeCode(pluginData, projectData);`
`131`	`131`	`this.setPluginNativeHashes({`
`132`	`132`	`pathToPluginsBuildFile,`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export class NodeModulesBuilder implements INodeModulesBuilder {`
`5`	`5`	`private $pluginsService: IPluginsService`
`6`	`6`	`) { }`
`7`	`7`
`8`		`- public async prepareNodeModules({platformData , projectData, forcePluginNativePrepare}: IPrepareNodeModulesData): Promise<void> {`
	`8`	`+ public async prepareNodeModules({platformData , projectData}: IPrepareNodeModulesData): Promise<void> {`
`9`	`9`	`const dependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(projectData.projectDir);`
`10`	`10`	`if (_.isEmpty(dependencies)) {`
`11`	`11`	`return;`
`@@ -19,7 +19,7 @@ export class NodeModulesBuilder implements INodeModulesBuilder {`
`19`	`19`	`if (isPlugin) {`
`20`	`20`	this.$logger.debug(`Successfully prepared plugin ${dependency.name} for ${platformData.normalizedPlatformName.toLowerCase()}.`);
`21`	`21`	`const pluginData = this.$pluginsService.convertToPluginData(dependency, projectData.projectDir);`
`22`		`- await this.$pluginsService.preparePluginNativeCode({pluginData, platform: platformData.normalizedPlatformName.toLowerCase(), projectData, forcePluginNativePrepare});`
	`22`	`+ await this.$pluginsService.preparePluginNativeCode({pluginData, platform: platformData.normalizedPlatformName.toLowerCase(), projectData});`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`}`