Skip to content

feat: warn about multiple podfiles only if provided platform is unsupported #2223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thymikee merged 5 commits into from
Dec 21, 2023
Merged

feat: warn about multiple podfiles only if provided platform is unsupported #2223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07d0d44
feat: warn about multiple podfiles only if provided platform is unsup…
okwasniewski Dec 20, 2023
4eaea89
refactor: rename platform to platformConfig
okwasniewski Dec 21, 2023
064de9d
fix: avoid negation use containsUnsupportedPodfiles
okwasniewski Dec 21, 2023
13b3c61
Update createBuild.ts
okwasniewski Dec 21, 2023
22b4124
Update createLog.ts
okwasniewski Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/cli-platform-apple/src/commands/buildCommand/createBuild.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const createBuild =

let {xcodeProject, sourceDir} = getXcodeProjectAndDir(
platform,
platformName,
installedPods,
);

Expand Down
7 changes: 6 additions & 1 deletion packages/cli-platform-apple/src/commands/buildCommand/getXcodeProjectAndDir.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@ import fs from 'fs';
import {IOSProjectConfig} from '@react-native-community/cli-types';
import {CLIError} from '@react-native-community/cli-tools';
import findXcodeProject from '../../config/findXcodeProject';
import {getPlatformInfo} from '../runCommand/getPlatformInfo';
import {ApplePlatform} from '../../types';

export function getXcodeProjectAndDir(
iosProjectConfig: IOSProjectConfig | undefined,
platformName: ApplePlatform,
installedPods?: boolean,
) {
const {readableName: platformReadableName} = getPlatformInfo(platformName);

if (!iosProjectConfig) {
throw new CLIError(
'iOS project folder not found. Are you sure this is a React Native project?',
`${platformReadableName} project folder not found. Make sure that project.${platformName}.sourceDir points to a directory with your Xcode project and that you are running this command inside of React Native project.`,
);
}

Expand Down
1 change: 1 addition & 0 deletions packages/cli-platform-apple/src/commands/runCommand/createRun.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ const createRun =

let {xcodeProject, sourceDir} = getXcodeProjectAndDir(
platform,
platformName,
installedPods,
);

Expand Down
8 changes: 7 additions & 1 deletion packages/cli-platform-apple/src/config/findPodfilePath.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {inlineString, logger} from '@react-native-community/cli-tools';
import path from 'path';
import findAllPodfilePaths from './findAllPodfilePaths';
import {ApplePlatform} from '../types';
import {supportedPlatforms} from './supportedPlatforms';

// Regexp matching all test projects
const TEST_PROJECTS = /test|example|sample/i;
Expand Down Expand Up @@ -50,8 +51,13 @@ export default function findPodfilePath(
*/
.sort((project) => (path.dirname(project) === platformName ? -1 : 1));

const supportedPlatformsArray: string[] = Object.values(supportedPlatforms);
const containsOnlySupportedPodfiles = podfiles.every((podfile) =>
supportedPlatformsArray.includes(podfile.split('/')[0]),
);

if (podfiles.length > 0) {
if (podfiles.length > 1) {
if (podfiles.length > 1 && !containsOnlySupportedPodfiles) {
logger.warn(
inlineString(`
Multiple Podfiles were found: ${podfiles}. Choosing ${podfiles[0]} automatically.
Expand Down