@react-native/codegen 0.80.0-nightly-20250319-adbcaef1e → 0.80.0-nightly-20250320-146d809b6

package/lib/cli/combine/combine-js-to-schema.js

@@ -52,7 +52,7 @@ function expandDirectoriesIntoFiles(fileList, platform, exclude) {
         return [file];
       }
       const filePattern = path.sep === '\\' ? file.replace(/\\/g, '/') : file;
-      return glob.sync(`${filePattern}/**/*.{js,ts,tsx}`, {
+      return glob.sync(`${filePattern}/**/*{,.fb}.{js,ts,tsx}`, {
         nodir: true,
         // TODO: This will remove the need of slash substitution above for Windows,
         // but it requires glob@v9+; with the package currenlty relying on

package/lib/cli/combine/combine-js-to-schema.js.flow

@@ -59,7 +59,7 @@ function expandDirectoriesIntoFiles(
         return [file];
       }
       const filePattern = path.sep === '\\' ? file.replace(/\\/g, '/') : file;
-      return glob.sync(`${filePattern}/**/*.{js,ts,tsx}`, {
+      return glob.sync(`${filePattern}/**/*{,.fb}.{js,ts,tsx}`, {
         nodir: true,
         // TODO: This will remove the need of slash substitution above for Windows,
         // but it requires glob@v9+; with the package currenlty relying on

package/lib/cli/combine/combine-utils.js

@@ -14,26 +14,30 @@
 const path = require('path');
 
 /**
- * This function is used by the CLI to decide whether a JS/TS file has to be processed or not by the Codegen.
- * Parameters:
- *   - file: the path to the file
- *   - currentPlatform: the current platform for which we are creating the specs
- * Returns: `true` if the file can be used to generate some code; `false` otherwise
+ * This function is used by the CLI to decide whether a JS/TS file has to be
+ * processed or not by the Codegen.
  *
+ * Parameters:
+ *   - originalFilePath: the path to the file
+ *   - currentPlatform: the platform for which we are creating the specs
+ * Returns: `true` if the file can be used to generate code; `false` otherwise
  */
-function filterJSFile(file, currentPlatform, excludeRegExp) {
-  const isSpecFile = /^(Native.+|.+NativeComponent)/.test(path.basename(file));
-  const isNotNativeUIManager = !file.endsWith('NativeUIManager.js');
-  const isNotTest = !file.includes('__tests');
-  const isNotExcluded = excludeRegExp == null || !excludeRegExp.test(file);
-  const isNotTSTypeDefinition = !file.endsWith('.d.ts');
+function filterJSFile(originalFilePath, currentPlatform, excludeRegExp) {
+  // Remove `.fb` if it exists (see `react-native.cconf`).
+  const filePath = originalFilePath.replace(/\.fb(\.|$)/, '$1');
+  const basename = path.basename(filePath);
+  const isSpecFile = /^(Native.+|.+NativeComponent)/.test(basename);
+  const isNotNativeUIManager = !filePath.endsWith('NativeUIManager.js');
+  const isNotTest = !filePath.includes('__tests');
+  const isNotExcluded = excludeRegExp == null || !excludeRegExp.test(filePath);
+  const isNotTSTypeDefinition = !filePath.endsWith('.d.ts');
   const isValidCandidate =
     isSpecFile &&
     isNotNativeUIManager &&
     isNotExcluded &&
     isNotTest &&
     isNotTSTypeDefinition;
-  const filenameComponents = path.basename(file).split('.');
+  const filenameComponents = basename.split('.');
   const isPlatformAgnostic = filenameComponents.length === 2;
   if (currentPlatform == null) {
     // need to accept only files that are platform agnostic

package/lib/cli/combine/combine-utils.js.flow

@@ -14,23 +14,28 @@
 const path = require('path');
 
 /**
- * This function is used by the CLI to decide whether a JS/TS file has to be processed or not by the Codegen.
- * Parameters:
- *   - file: the path to the file
- *   - currentPlatform: the current platform for which we are creating the specs
- * Returns: `true` if the file can be used to generate some code; `false` otherwise
+ * This function is used by the CLI to decide whether a JS/TS file has to be
+ * processed or not by the Codegen.
  *
+ * Parameters:
+ *   - originalFilePath: the path to the file
+ *   - currentPlatform: the platform for which we are creating the specs
+ * Returns: `true` if the file can be used to generate code; `false` otherwise
  */
 function filterJSFile(
-  file: string,
+  originalFilePath: string,
   currentPlatform: ?string,
   excludeRegExp: ?RegExp,
 ): boolean {
-  const isSpecFile = /^(Native.+|.+NativeComponent)/.test(path.basename(file));
-  const isNotNativeUIManager = !file.endsWith('NativeUIManager.js');
-  const isNotTest = !file.includes('__tests');
-  const isNotExcluded = excludeRegExp == null || !excludeRegExp.test(file);
-  const isNotTSTypeDefinition = !file.endsWith('.d.ts');
+  // Remove `.fb` if it exists (see `react-native.cconf`).
+  const filePath = originalFilePath.replace(/\.fb(\.|$)/, '$1');
+  const basename = path.basename(filePath);
+
+  const isSpecFile = /^(Native.+|.+NativeComponent)/.test(basename);
+  const isNotNativeUIManager = !filePath.endsWith('NativeUIManager.js');
+  const isNotTest = !filePath.includes('__tests');
+  const isNotExcluded = excludeRegExp == null || !excludeRegExp.test(filePath);
+  const isNotTSTypeDefinition = !filePath.endsWith('.d.ts');
 
   const isValidCandidate =
     isSpecFile &&
@@ -39,7 +44,7 @@ function filterJSFile(
     isNotTest &&
     isNotTSTypeDefinition;
 
-  const filenameComponents = path.basename(file).split('.');
+  const filenameComponents = basename.split('.');
   const isPlatformAgnostic = filenameComponents.length === 2;
 
   if (currentPlatform == null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.80.0-nightly-20250319-adbcaef1e",
+  "version": "0.80.0-nightly-20250320-146d809b6",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {