Skip to content

Fix new codegen API disabling behaviour of the old one #51867

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
wants to merge 4 commits into from
Closed

Fix new codegen API disabling behaviour of the old one #51867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4524ca8
Fix new codegen API disabling behaviour of the old one
kkafar Jun 6, 2025
24eec02
Fix semicolons
kkafar Jun 6, 2025
e94ad79
Try second approach - split libraries basing on whether they opt in for
kkafar Jun 6, 2025
26ca243
Partition componentLibraries into new api & old api users
kkafar Jun 6, 2025
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
4 changes: 1 addition & 3 deletions ...t-native/scripts/codegen/__tests__/__snapshots__/generate-artifacts-executor-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,7 @@ exports[`execute test-app "RCTThirdPartyComponentsProvider.mm" should match snap

dispatch_once(&nativeComponentsToken, ^{
thirdPartyComponents = @{
@\\"TestAppDeprecatedComponent\\": NSClassFromString(@\\"RCTTestAppDeprecatedComponentClass\\"), // test-app
@\\"TestAppComponent\\": NSClassFromString(@\\"RCTTestAppComponent\\"), // test-app
@\\"TestLibraryDeprecatedComponent\\": NSClassFromString(@\\"RCTTestLibraryDeprecatedComponentClass\\"), // test-library
@\\"TestLibraryComponent\\": NSClassFromString(@\\"RCTTestLibraryComponent\\"), // test-library
};
});
Expand Down Expand Up @@ -778,7 +776,7 @@ exports[`execute test-app-legacy "RCTThirdPartyComponentsProvider.mm" should mat

dispatch_once(&nativeComponentsToken, ^{
thirdPartyComponents = @{

@\\"TestAppDeprecatedComponent\\": NSClassFromString(@\\"RCTTestAppDeprecatedComponentClass\\"), // test-app-legacy
};
});

Expand Down
22 changes: 17 additions & 5 deletions ...act-native/scripts/codegen/generate-artifacts-executor/generateRCTThirdPartyComponents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,23 @@ function generateRCTThirdPartyComponents(

const librariesToCrawl = {} /*:: as {[string]: $FlowFixMe} */;

// Using new API explicitly or not using any config field to define components.
const componentLibrariesUsingNewApi = [];
const componentLibrariesUsingOldApi = [];

for (const library of componentLibraries) {
if (
library.config.ios?.components ||
!library.config.ios?.componentProvider
) {
componentLibrariesUsingNewApi.push(library);
} else {
componentLibrariesUsingOldApi.push(library);
}
}

// Old API
componentLibraries.forEach(library => {
componentLibrariesUsingOldApi.forEach(library => {
const {config, libraryPath} = library;
const libraryName = JSON.parse(
fs.readFileSync(path.join(libraryPath, 'package.json'), 'utf8'),
Expand All @@ -66,9 +81,6 @@ function generateRCTThirdPartyComponents(
librariesToCrawl[libraryName] = library;

const componentsProvider = config.ios?.componentProvider;
if (!componentsProvider) {
return;
}

delete librariesToCrawl[libraryName];
componentsInLibraries[libraryName] =
Expand All @@ -83,7 +95,7 @@ function generateRCTThirdPartyComponents(
});

// New API
const iosAnnotations = parseiOSAnnotations(componentLibraries);
const iosAnnotations = parseiOSAnnotations(componentLibrariesUsingNewApi);
for (const [libraryName, annotationMap] of Object.entries(iosAnnotations)) {
const {library, components} = annotationMap;
librariesToCrawl[libraryName] = library;
Expand Down
Loading