Skip to content

Resolve appPath in getInputFiles so "/Pods/" filter doesn't drop xcodeproj results #56730

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

Closed
zoontek wants to merge 1 commit into from
Closed

Resolve appPath in getInputFiles so "/Pods/" filter doesn't drop xcodeproj results #56730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions ...s/react-native/scripts/codegen/generate-artifacts-executor/generateReactCodegenPodspec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,13 @@ function getInputFiles(appPath /*: string */, appPkgJson /*: $FlowFixMe */) {
return '[]';
}

// Normalize appPath so any "Pods/.." segment is collapsed before find runs.
// Otherwise every find result inherits the search-root prefix containing
// "/Pods/" and gets dropped by the exclusion filter below.
const resolvedAppPath = path.resolve(appPath);

const xcodeproj = String(
execSync(`find ${appPath} -type d -name "*.xcodeproj"`),
execSync(`find ${resolvedAppPath} -type d -name "*.xcodeproj"`),
)
.trim()
.split('\n')
Expand All @@ -61,12 +66,12 @@ function getInputFiles(appPath /*: string */, appPkgJson /*: $FlowFixMe */) {
)[0];
if (!xcodeproj) {
throw new Error(
`Cannot find .xcodeproj file inside ${appPath}. This is required to determine codegen spec paths relative to native project.`,
`Cannot find .xcodeproj file inside ${resolvedAppPath}. This is required to determine codegen spec paths relative to native project.`,
);
}
const jsFiles = '-name "Native*.js" -or -name "*NativeComponent.js"';
const tsFiles = '-name "Native*.ts" -or -name "*NativeComponent.ts"';
const findCommand = `find ${path.join(appPath, jsSrcsDir)} -type f -not -path "*/__mocks__/*" -and \\( ${jsFiles} -or ${tsFiles} \\)`;
const findCommand = `find ${path.join(resolvedAppPath, jsSrcsDir)} -type f -not -path "*/__mocks__/*" -and \\( ${jsFiles} -or ${tsFiles} \\)`;
const list = String(execSync(findCommand))
.trim()
.split('\n')
Expand Down
Loading