react-native 0.81.3 → 0.81.4

package/Libraries/Core/ReactNativeVersion.js

@@ -17,6 +17,6 @@ export const version: $ReadOnly<{
 }> = {
   major: 0,
   minor: 81,
-  patch: 3,
+  patch: 4,
   prerelease: null,
 };

package/React/Base/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(81),
-                  RCTVersionPatch: @(3),
+                  RCTVersionPatch: @(4),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.81.3
+VERSION_NAME=0.81.4
 react.internal.publishingGroup=com.facebook.react
 
 android.useAndroidX=true

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -14,7 +14,7 @@ public object ReactNativeVersion {
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
     "minor" to 81,
-    "patch" to 3,
+    "patch" to 4,
     "prerelease" to null
   )
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -14,14 +14,14 @@
 
 #define REACT_NATIVE_VERSION_MAJOR 0
 #define REACT_NATIVE_VERSION_MINOR 81
-#define REACT_NATIVE_VERSION_PATCH 3
+#define REACT_NATIVE_VERSION_PATCH 4
 
 namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 81;
-  int32_t Patch = 3;
+  int32_t Patch = 4;
   std::string_view Prerelease = "";
 } ReactNativeVersion;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.81.3",
+  "version": "0.81.4",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -162,13 +162,13 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.81.3",
-    "@react-native/codegen": "0.81.3",
-    "@react-native/community-cli-plugin": "0.81.3",
-    "@react-native/gradle-plugin": "0.81.3",
-    "@react-native/js-polyfills": "0.81.3",
-    "@react-native/normalize-colors": "0.81.3",
-    "@react-native/virtualized-lists": "0.81.3",
+    "@react-native/assets-registry": "0.81.4",
+    "@react-native/codegen": "0.81.4",
+    "@react-native/community-cli-plugin": "0.81.4",
+    "@react-native/gradle-plugin": "0.81.4",
+    "@react-native/js-polyfills": "0.81.4",
+    "@react-native/normalize-colors": "0.81.4",
+    "@react-native/virtualized-lists": "0.81.4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",

package/scripts/cocoapods/autolinking.rb

@@ -40,6 +40,12 @@ def list_native_modules!(config_command)
   packages = config["dependencies"]
   ios_project_root = Pathname.new(config["project"]["ios"]["sourceDir"])
   react_native_path = Pathname.new(config["reactNativePath"])
+  codegen_output_path = ios_project_root.join("build/generated/autolinking/autolinking.json")
+
+  # Write autolinking react-native-config output to codegen folder
+  FileUtils.mkdir_p(File.dirname(codegen_output_path))
+  File.write(codegen_output_path, json)
+
   found_pods = []
 
   packages.each do |package_name, package|

package/scripts/cocoapods/codegen_utils.rb

@@ -87,7 +87,7 @@ class CodegenUtils
       codegen_path = file_manager.join(ios_folder, codegen_dir)
       return if !dir_manager.exist?(codegen_path)
 
-      FileUtils.rm_rf(dir_manager.glob("#{codegen_path}/*"))
+      FileUtils.rm_rf("#{codegen_path}")
       base_provider_path = file_manager.join(rn_path, 'React', 'Fabric', 'RCTThirdPartyFabricComponentsProvider')
       FileUtils.rm_rf("#{base_provider_path}.h")
       FileUtils.rm_rf("#{base_provider_path}.mm")

package/scripts/codegen/generate-artifacts-executor/index.js

@@ -86,16 +86,19 @@ function execute(
       buildCodegenIfNeeded();
     }
 
-    const reactNativeConfig = readReactNativeConfig(projectRoot);
+    const reactNativeConfig = readReactNativeConfig(
+      projectRoot,
+      baseOutputPath,
+    );
     const codegenEnabledLibraries = findCodegenEnabledLibraries(
       pkgJson,
       projectRoot,
+      baseOutputPath,
       reactNativeConfig,
     );
 
     if (codegenEnabledLibraries.length === 0) {
       codegenLog('No codegen-enabled libraries found.', true);
-      return;
     }
 
     let platforms =
@@ -110,10 +113,6 @@ function execute(
         ({name}) => !disabledLibraries.includes(name),
       );
 
-      if (!libraries.length) {
-        continue;
-      }
-
       const outputPath = computeOutputPath(
         projectRoot,
         baseOutputPath,

package/scripts/codegen/generate-artifacts-executor/utils.js

@@ -97,15 +97,40 @@ function cleanupEmptyFilesAndFolders(filepath /*: string */) {
   }
 }
 
-function readReactNativeConfig(projectRoot /*: string */) /*: $FlowFixMe */ {
-  const rnConfigFilePath = path.resolve(projectRoot, 'react-native.config.js');
+function readGeneratedAutolinkingOutput(
+  baseOutputPath /*: string */,
+) /*: $FlowFixMe */ {
+  // NOTE: Generated by scripts/cocoapods/autolinking.rb in list_native_modules (called by use_native_modules)
+  const autolinkingGeneratedPath = path.resolve(
+    baseOutputPath,
+    'build/generated/autolinking/autolinking.json',
+  );
+  if (fs.existsSync(autolinkingGeneratedPath)) {
+    // $FlowFixMe[unsupported-syntax]
+    return require(autolinkingGeneratedPath);
+  } else {
+    codegenLog(
+      `Could not find generated autolinking output at: ${autolinkingGeneratedPath}`,
+    );
+    return null;
+  }
+}
 
-  if (!fs.existsSync(rnConfigFilePath)) {
+function readReactNativeConfig(
+  projectRoot /*: string */,
+  baseOutputPath /*: string */,
+) /*: $FlowFixMe */ {
+  const autolinkingOutput = readGeneratedAutolinkingOutput(baseOutputPath);
+  const rnConfigFilePath = path.resolve(projectRoot, 'react-native.config.js');
+  if (autolinkingOutput) {
+    return autolinkingOutput;
+  } else if (fs.existsSync(rnConfigFilePath)) {
+    // $FlowIgnore[unsupported-syntax]
+    return require(rnConfigFilePath);
+  } else {
+    codegenLog(`Could not find React Native config at: ${rnConfigFilePath}`);
     return {};
   }
-
-  // $FlowIgnore[unsupported-syntax]
-  return require(rnConfigFilePath);
 }
 
 /**
@@ -114,17 +139,23 @@ function readReactNativeConfig(projectRoot /*: string */) /*: $FlowFixMe */ {
 function findCodegenEnabledLibraries(
   pkgJson /*: $FlowFixMe */,
   projectRoot /*: string */,
+  baseOutputPath /*: string */,
   reactNativeConfig /*: $FlowFixMe */,
 ) /*: Array<$FlowFixMe> */ {
   const projectLibraries = findProjectRootLibraries(pkgJson, projectRoot);
   if (pkgJsonIncludesGeneratedCode(pkgJson)) {
     return projectLibraries;
   } else {
-    return [
-      ...projectLibraries,
-      ...findExternalLibraries(pkgJson, projectRoot),
+    const libraries = [...projectLibraries];
+    // If we ran autolinking, we shouldn't try to run our own "autolinking-like"
+    // library discovery
+    if (!readGeneratedAutolinkingOutput(baseOutputPath)) {
+      libraries.push(...findExternalLibraries(pkgJson, projectRoot));
+    }
+    libraries.push(
       ...findLibrariesFromReactNativeConfig(projectRoot, reactNativeConfig),
-    ];
+    );
+    return libraries;
   }
 }