react-native 0.85.0-rc.7 → 0.85.1

package/Libraries/Core/ReactNativeVersion.js

@@ -28,8 +28,8 @@
 export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 85;
-  static patch: number = 0;
-  static prerelease: string | null = 'rc.7';
+  static patch: number = 1;
+  static prerelease: string | null = null;
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/React/Base/RCTVersion.m

@@ -23,8 +23,8 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(85),
-                  RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.7",
+                  RCTVersionPatch: @(1),
+                  RCTVersionPrerelease: [NSNull null],
                   };
   });
   return __rnVersion;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.85.0-rc.7
+VERSION_NAME=0.85.1
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<8531ce29d0e5362517d35559ebda623b>>
+ * @generated SignedSource<<2452c003ffcba8e20b7cd40c68e05e3d>>
  */
 
 /**
@@ -23,6 +23,8 @@ public open class ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android :
   // We could use JNI to get the defaults from C++,
   // but that is more expensive than just duplicating the defaults here.
 
+  override fun cxxNativeAnimatedEnabled(): Boolean = true
+
   override fun enableAccessibilityOrder(): Boolean = true
 
   override fun enableSwiftUIBasedFilters(): Boolean = true
@@ -30,4 +32,6 @@ public open class ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android :
   override fun fixTextClippingAndroid15useBoundsForWidth(): Boolean = true
 
   override fun preventShadowTreeCommitExhaustion(): Boolean = true
+
+  override fun useSharedAnimatedBackend(): Boolean = true
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt

@@ -19,6 +19,7 @@ import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import java.io.IOException
 import java.net.SocketTimeoutException
 import okhttp3.Headers
+import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import okio.Buffer
 
@@ -263,6 +264,13 @@ internal object NetworkEventUtil {
       return "[Preview unavailable]"
     }
 
+    // MultipartBody does not propagate isOneShot() from its parts, so check each
+    // part explicitly. Reading a one-shot part here would drain the underlying
+    // stream and cause the real request to fail.
+    if (body is MultipartBody && body.parts().any { it.body().isOneShot() }) {
+      return "[Preview unavailable]"
+    }
+
     return try {
       val buffer = Buffer()
       body.writeTo(buffer)

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.kt

@@ -146,6 +146,8 @@ internal object RequestBodyUtil {
         }
       }
 
+      override fun isOneShot(): Boolean = true
+
       @Throws(IOException::class)
       override fun writeTo(sink: BufferedSink) {
         var source: Source? = null

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 85,
-    "patch" to 0,
-    "prerelease" to "rc.7"
+    "patch" to 1,
+    "prerelease" to null
   )
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -14,15 +14,15 @@
 
 #define REACT_NATIVE_VERSION_MAJOR 0
 #define REACT_NATIVE_VERSION_MINOR 85
-#define REACT_NATIVE_VERSION_PATCH 0
+#define REACT_NATIVE_VERSION_PATCH 1
 
 namespace facebook::react {
 
 struct ReactNativeVersionType {
   int32_t Major = 0;
   int32_t Minor = 85;
-  int32_t Patch = 0;
-  std::string_view Prerelease = "rc.7";
+  int32_t Patch = 1;
+  std::string_view Prerelease = "";
 };
 
 constexpr ReactNativeVersionType ReactNativeVersion;

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<6a047fa1d33ea17ebd7ba8d0680ee1cc>>
+ * @generated SignedSource<<6ded821dda8049a32168bf82333dd4c3>>
  */
 
 /**
@@ -27,6 +27,10 @@ class ReactNativeFeatureFlagsOverridesOSSExperimental : public ReactNativeFeatur
  public:
     ReactNativeFeatureFlagsOverridesOSSExperimental() = default;
 
+  bool cxxNativeAnimatedEnabled() override {
+    return true;
+  }
+
   bool enableAccessibilityOrder() override {
     return true;
   }
@@ -42,6 +46,10 @@ class ReactNativeFeatureFlagsOverridesOSSExperimental : public ReactNativeFeatur
   bool preventShadowTreeCommitExhaustion() override {
     return true;
   }
+
+  bool useSharedAnimatedBackend() override {
+    return true;
+  }
 };
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.85.0-rc.7",
+  "version": "0.85.1",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -149,7 +149,7 @@
     "featureflags": "node ./scripts/featureflags/index.js"
   },
   "peerDependencies": {
-    "@react-native/jest-preset": "0.85.0-rc.7",
+    "@react-native/jest-preset": "0.85.1",
     "@types/react": "^19.1.1",
     "react": "^19.2.3"
   },
@@ -162,13 +162,13 @@
     }
   },
   "dependencies": {
-    "@react-native/assets-registry": "0.85.0-rc.7",
-    "@react-native/codegen": "0.85.0-rc.7",
-    "@react-native/community-cli-plugin": "0.85.0-rc.7",
-    "@react-native/gradle-plugin": "0.85.0-rc.7",
-    "@react-native/js-polyfills": "0.85.0-rc.7",
-    "@react-native/normalize-colors": "0.85.0-rc.7",
-    "@react-native/virtualized-lists": "0.85.0-rc.7",
+    "@react-native/assets-registry": "0.85.1",
+    "@react-native/codegen": "0.85.1",
+    "@react-native/community-cli-plugin": "0.85.1",
+    "@react-native/gradle-plugin": "0.85.1",
+    "@react-native/js-polyfills": "0.85.1",
+    "@react-native/normalize-colors": "0.85.1",
+    "@react-native/virtualized-lists": "0.85.1",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",

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

@@ -10,7 +10,7 @@
 
 'use strict';
 const {TEMPLATES_FOLDER_PATH, packageJson} = require('./constants');
-const {codegenLog} = require('./utils');
+const {codegenLog, writeFileSyncIfChanged} = require('./utils');
 const fs = require('fs');
 const path = require('path');
 
@@ -38,7 +38,7 @@ function generateAppDependencyProvider(outputDir /*: string */) {
     'utf8',
   );
   const finalPathH = path.join(outputDir, 'RCTAppDependencyProvider.h');
-  fs.writeFileSync(finalPathH, templateH);
+  writeFileSyncIfChanged(finalPathH, templateH);
   codegenLog(`Generated artifact: ${finalPathH}`);
 
   const templateMM = fs.readFileSync(
@@ -46,7 +46,7 @@ function generateAppDependencyProvider(outputDir /*: string */) {
     'utf8',
   );
   const finalPathMM = path.join(outputDir, 'RCTAppDependencyProvider.mm');
-  fs.writeFileSync(finalPathMM, templateMM);
+  writeFileSyncIfChanged(finalPathMM, templateMM);
   codegenLog(`Generated artifact: ${finalPathMM}`);
 
   // Generate the podspec file
@@ -58,7 +58,7 @@ function generateAppDependencyProvider(outputDir /*: string */) {
     outputDir,
     'ReactAppDependencyProvider.podspec',
   );
-  fs.writeFileSync(finalPathPodspec, templatePodspec);
+  writeFileSyncIfChanged(finalPathPodspec, templatePodspec);
   codegenLog(`Generated podspec: ${finalPathPodspec}`);
 }
 

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

@@ -11,7 +11,7 @@
 'use strict';
 
 const {TEMPLATES_FOLDER_PATH} = require('./constants');
-const {parseiOSAnnotations} = require('./utils');
+const {parseiOSAnnotations, writeFileSyncIfChanged} = require('./utils');
 const fs = require('fs');
 const path = require('path');
 
@@ -105,13 +105,13 @@ function generateCustomURLHandlers(
 
   fs.mkdirSync(outputDir, {recursive: true});
 
-  fs.writeFileSync(
+  writeFileSyncIfChanged(
     path.join(outputDir, 'RCTModulesConformingToProtocolsProvider.mm'),
     finalMMFile,
   );
 
   const templateH = fs.readFileSync(MODULES_PROTOCOLS_H_TEMPLATE_PATH, 'utf8');
-  fs.writeFileSync(
+  writeFileSyncIfChanged(
     path.join(outputDir, 'RCTModulesConformingToProtocolsProvider.h'),
     templateH,
   );

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

@@ -12,7 +12,7 @@
 
 const generateSpecsCLIExecutor = require('../generate-specs-cli-executor');
 const {CORE_LIBRARIES_WITH_OUTPUT_FOLDER} = require('./constants');
-const {codegenLog} = require('./utils');
+const {codegenLog, cpSyncRecursiveIfChanged} = require('./utils');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
@@ -63,8 +63,7 @@ function generateCode(
   const outputDir =
     reactNativeCoreLibraryOutputPath(libraryName, platform) ?? outputPath;
   fs.mkdirSync(outputDir, {recursive: true});
-  // $FlowFixMe[prop-missing] - `fs.cpSync` is missing in Flow libdefs.
-  fs.cpSync(tmpOutputDir, outputDir, {recursive: true});
+  cpSyncRecursiveIfChanged(tmpOutputDir, outputDir);
   codegenLog(`Generated artifacts: ${outputDir}`);
 }
 

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

@@ -10,7 +10,7 @@
 
 'use strict';
 const {TEMPLATES_FOLDER_PATH} = require('./constants');
-const {codegenLog} = require('./utils');
+const {codegenLog, writeFileSyncIfChanged} = require('./utils');
 const fs = require('fs');
 const path = require('path');
 
@@ -35,7 +35,7 @@ function generatePackageSwift(
       path.relative(fullOutputPath, reactNativePath),
     );
   const finalPathH = path.join(outputDir, 'Package.swift');
-  fs.writeFileSync(finalPathH, templateH);
+  writeFileSyncIfChanged(finalPathH, templateH);
   codegenLog(`Generated artifact: ${finalPathH}`);
 }
 

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

@@ -14,6 +14,7 @@ const {
   codegenLog,
   isReactNativeCoreLibrary,
   parseiOSAnnotations,
+  writeFileSyncIfChanged,
 } = require('./utils');
 const fs = require('fs');
 const path = require('path');
@@ -39,7 +40,7 @@ function generateRCTModuleProviders(
   codegenLog('Generating RCTModulesProvider.h');
   const templateH = fs.readFileSync(MODULE_PROVIDERS_H_TEMPLATE_PATH, 'utf8');
   const finalPathH = path.join(outputDir, 'RCTModuleProviders.h');
-  fs.writeFileSync(finalPathH, templateH);
+  writeFileSyncIfChanged(finalPathH, templateH);
   codegenLog(`Generated artifact: ${finalPathH}`);
 
   codegenLog('Generating RCTModuleProviders.mm');
@@ -112,7 +113,7 @@ function generateRCTModuleProviders(
     .readFileSync(MODULE_PROVIDERS_MM_TEMPLATE_PATH, 'utf8')
     .replace(/{moduleMapping}/, modulesMapping);
   const finalPathMM = path.join(outputDir, 'RCTModuleProviders.mm');
-  fs.writeFileSync(finalPathMM, templateMM);
+  writeFileSyncIfChanged(finalPathMM, templateMM);
   codegenLog(`Generated artifact: ${finalPathMM}`);
 }
 

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

@@ -15,6 +15,7 @@ const {
   codegenLog,
   isReactNativeCoreLibrary,
   parseiOSAnnotations,
+  writeFileSyncIfChanged,
 } = require('./utils');
 const fs = require('fs');
 const path = require('path');
@@ -41,7 +42,7 @@ function generateRCTThirdPartyComponents(
     'utf8',
   );
   const finalPathH = path.join(outputDir, 'RCTThirdPartyComponentsProvider.h');
-  fs.writeFileSync(finalPathH, templateH);
+  writeFileSyncIfChanged(finalPathH, templateH);
   codegenLog(`Generated artifact: ${finalPathH}`);
 
   codegenLog('Generating RCTThirdPartyComponentsProvider.mm');
@@ -150,7 +151,7 @@ function generateRCTThirdPartyComponents(
     outputDir,
     'RCTThirdPartyComponentsProvider.mm',
   );
-  fs.writeFileSync(finalPathMM, templateMM);
+  writeFileSyncIfChanged(finalPathMM, templateMM);
   codegenLog(`Generated artifact: ${finalPathMM}`);
 }
 

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

@@ -15,7 +15,7 @@ const {
   TEMPLATES_FOLDER_PATH,
   packageJson,
 } = require('./constants');
-const {codegenLog} = require('./utils');
+const {codegenLog, writeFileSyncIfChanged} = require('./utils');
 const {execSync} = require('child_process');
 const fs = require('fs');
 const path = require('path');
@@ -39,7 +39,7 @@ function generateReactCodegenPodspec(
     .replace(/{input-files}/, inputFiles)
     .replace(/{codegen-script}/, codegenScript);
   const finalPathPodspec = path.join(outputPath, 'ReactCodegen.podspec');
-  fs.writeFileSync(finalPathPodspec, finalPodspec);
+  writeFileSyncIfChanged(finalPathPodspec, finalPodspec);
   codegenLog(`Generated podspec: ${finalPathPodspec}`);
 }
 

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

@@ -11,7 +11,7 @@
 'use strict';
 
 const {TEMPLATES_FOLDER_PATH} = require('./constants');
-const {parseiOSAnnotations} = require('./utils');
+const {parseiOSAnnotations, writeFileSyncIfChanged} = require('./utils');
 const fs = require('fs');
 const path = require('path');
 
@@ -70,7 +70,7 @@ function generateUnstableModulesRequiringMainQueueSetupProvider(
 
   fs.mkdirSync(outputDir, {recursive: true});
 
-  fs.writeFileSync(
+  writeFileSyncIfChanged(
     path.join(
       outputDir,
       'RCTUnstableModulesRequiringMainQueueSetupProvider.mm',
@@ -82,7 +82,7 @@ function generateUnstableModulesRequiringMainQueueSetupProvider(
     UNSTABLE_MODULES_REQUIRING_MAIN_QUEUE_SETUP_PROVIDER_H_TEMPLATE_PATH,
     'utf8',
   );
-  fs.writeFileSync(
+  writeFileSyncIfChanged(
     path.join(outputDir, 'RCTUnstableModulesRequiringMainQueueSetupProvider.h'),
     templateH,
   );

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

@@ -485,6 +485,52 @@ function findReactNativeRootPath(projectRoot /* : string */) /* : string */ {
   return path.dirname(reactNativePackageJsonPath);
 }
 
+function writeFileSyncIfChanged(
+  targetPath /*: string */,
+  contents /*: string */,
+) {
+  try {
+    const oldContents = fs.readFileSync(targetPath, 'utf8');
+    if (oldContents === contents) {
+      return;
+    }
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error;
+    }
+  }
+  fs.writeFileSync(targetPath, contents);
+}
+
+function cpSyncRecursiveIfChanged(
+  sourcePath /*: string */,
+  targetPath /*: string */,
+) {
+  fs.cpSync(sourcePath, targetPath, {
+    recursive: true,
+    force: true,
+    preserveTimestamps: true,
+    filter(src /*: string */, dest /*: string */) {
+      try {
+        const stat = fs.statSync(src);
+        if (!stat.isFile()) {
+          return true;
+        } else {
+          const oldContents = fs.readFileSync(dest, 'utf8');
+          const newContents = fs.readFileSync(src, 'utf8');
+          return oldContents !== newContents;
+        }
+      } catch (error) {
+        if (error.code !== 'ENOENT' && error.code !== 'EISDIR') {
+          throw error;
+        } else {
+          return true;
+        }
+      }
+    },
+  });
+}
+
 module.exports = {
   buildCodegenIfNeeded,
   pkgJsonIncludesGeneratedCode,
@@ -499,4 +545,6 @@ module.exports = {
   readReactNativeConfig,
   findDisabledLibrariesByPlatform,
   findReactNativeRootPath,
+  writeFileSyncIfChanged,
+  cpSyncRecursiveIfChanged,
 };