Skip to content

fix(codegen): fix react-native modules/components duplication #2817

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
gabrieldonadel wants to merge 1 commit into from
Closed

fix(codegen): fix react-native modules/components duplication #2817

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
36 changes: 35 additions & 1 deletion packages/react-native/scripts/codegen/generate-artifacts-executor/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ function parseiOSAnnotations(
) /*: {[string]: $FlowFixMe} */ {
const mLibraryMap = {} /*:: as {[string]: $FlowFixMe} */;
const cLibraryMap = {} /*:: as {[string]: $FlowFixMe} */;
const map = {};
const map = {} /*:: as {[string]: $FlowFixMe} */; // [macOS]

for (const library of libraries) {
const iosConfig = library?.config?.ios;
Expand Down Expand Up @@ -363,6 +363,40 @@ function parseiOSAnnotations(
}
}
}
// [macOS
// Allow react-native-macos to override react-native modules/components
const isAllowedOverride = (libraryNames /*: Set<string> */) => {
const names = Array.from(libraryNames);
return (
names.length === 2 &&
names.includes('react-native') &&
names.includes('react-native-macos')
);
};

// Merge entries with react-native-macos taking precedence over react-native
for (const [moduleName, libraryNames] of Object.entries(mLibraryMap)) {
if (isAllowedOverride(libraryNames)) {
// Remove the module from react-native, keep only react-native-macos
if (map['react-native']?.modules?.[moduleName]) {
delete map['react-native'].modules[moduleName];
}
// Update the library map to only contain react-native-macos
mLibraryMap[moduleName] = new Set(['react-native-macos']);
}
}

for (const [componentName, libraryNames] of Object.entries(cLibraryMap)) {
if (isAllowedOverride(libraryNames)) {
// Remove the component from react-native, keep only react-native-macos
if (map['react-native']?.components?.[componentName]) {
delete map['react-native'].components[componentName];
}
// Update the library map to only contain react-native-macos
cLibraryMap[componentName] = new Set(['react-native-macos']);
}
}
// macOS]

const moduleConflicts = Object.entries(mLibraryMap)
.filter(([_, libraryNames]) => libraryNames.size > 1)
Expand Down
Loading