@depup/react-native 0.85.0-depup.1 → 0.86.2-depup.0

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

@@ -12,19 +12,26 @@
 
 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');
 
 function generateNativeCode(
   outputPath /*: string */,
-  schemaInfos /*: $ReadOnlyArray<$FlowFixMe> */,
+  schemaInfos /*: ReadonlyArray<$FlowFixMe> */,
   includesGeneratedCode /*: boolean */,
   platform /*: string */,
+  forceOutputPath /*: boolean */ = false,
 ) /*: Array<void> */ {
   return schemaInfos.map(schemaInfo => {
-    generateCode(outputPath, schemaInfo, includesGeneratedCode, platform);
+    generateCode(
+      outputPath,
+      schemaInfo,
+      includesGeneratedCode,
+      platform,
+      forceOutputPath,
+    );
   });
 }
 
@@ -33,6 +40,7 @@ function generateCode(
   schemaInfo /*: $FlowFixMe */,
   includesGeneratedCode /*: boolean */,
   platform /*: string */,
+  forceOutputPath /*: boolean */ = false,
 ) {
   if (shouldSkipGenerationForFBReactNativeSpec(schemaInfo, platform)) {
     codegenLog(
@@ -60,11 +68,11 @@ function generateCode(
   );
 
   // Finally, copy artifacts to the final output directory.
-  const outputDir =
-    reactNativeCoreLibraryOutputPath(libraryName, platform) ?? outputPath;
+  const outputDir = forceOutputPath
+    ? outputPath
+    : (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');
@@ -31,7 +32,7 @@ const MODULE_PROVIDERS_MM_TEMPLATE_PATH = path.join(
 function generateRCTModuleProviders(
   projectRoot /*: string */,
   pkgJson /*: $FlowFixMe */,
-  libraries /*: $ReadOnlyArray<$FlowFixMe> */,
+  libraries /*: ReadonlyArray<$FlowFixMe> */,
   outputDir /*: string */,
 ) {
   fs.mkdirSync(outputDir, {recursive: true});
@@ -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');
@@ -30,7 +31,7 @@ const THIRD_PARTY_COMPONENTS_MM_TEMPLATE_PATH = path.join(
 );
 
 function generateRCTThirdPartyComponents(
-  libraries /*: $ReadOnlyArray<$FlowFixMe> */,
+  libraries /*: ReadonlyArray<$FlowFixMe> */,
   outputDir /*: string */,
 ) {
   fs.mkdirSync(outputDir, {recursive: true});
@@ -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}`);
 }
 
@@ -49,8 +49,13 @@ function getInputFiles(appPath /*: string */, appPkgJson /*: $FlowFixMe */) {
     return '[]';
   }
 
+  // Normalize appPath so any "Pods/.." segment is collapsed before find runs.
+  // Otherwise every find result inherits the search-root prefix containing
+  // "/Pods/" and gets dropped by the exclusion filter below.
+  const resolvedAppPath = path.resolve(appPath);
+
   const xcodeproj = String(
-    execSync(`find ${appPath} -type d -name "*.xcodeproj"`),
+    execSync(`find ${resolvedAppPath} -type d -name "*.xcodeproj"`),
   )
     .trim()
     .split('\n')
@@ -61,12 +66,12 @@ function getInputFiles(appPath /*: string */, appPkgJson /*: $FlowFixMe */) {
     )[0];
   if (!xcodeproj) {
     throw new Error(
-      `Cannot find .xcodeproj file inside ${appPath}. This is required to determine codegen spec paths relative to native project.`,
+      `Cannot find .xcodeproj file inside ${resolvedAppPath}. This is required to determine codegen spec paths relative to native project.`,
     );
   }
   const jsFiles = '-name "Native*.js" -or -name "*NativeComponent.js"';
   const tsFiles = '-name "Native*.ts" -or -name "*NativeComponent.ts"';
-  const findCommand = `find ${path.join(appPath, jsSrcsDir)} -type f -not -path "*/__mocks__/*" -and \\( ${jsFiles} -or ${tsFiles} \\)`;
+  const findCommand = `find ${path.join(resolvedAppPath, jsSrcsDir)} -type f -not -path "*/__mocks__/*" -and \\( ${jsFiles} -or ${tsFiles} \\)`;
   const list = String(execSync(findCommand))
     .trim()
     .split('\n')
@@ -82,10 +87,16 @@ function codegenScripts(appPath /*: string */, baseOutputPath /*: string */) {
     baseOutputPath,
     REACT_NATIVE_PACKAGE_ROOT_FOLDER,
   );
+  // Use PODFILE_DIR (set by react_native_post_install) to locate the Podfile
+  // directory. PODS_ROOT/.. does not work when Pods/ is a symlink.
   return `<<-SCRIPT
-pushd "$PODS_ROOT/../" > /dev/null
-RCT_SCRIPT_POD_INSTALLATION_ROOT=$(pwd)
-popd >/dev/null
+if [ -n "$PODFILE_DIR" ]; then
+  RCT_SCRIPT_POD_INSTALLATION_ROOT="$PODFILE_DIR"
+else
+  pushd "$PODS_ROOT/../" > /dev/null
+  RCT_SCRIPT_POD_INSTALLATION_ROOT=$(pwd)
+  popd >/dev/null
+fi
 
 export RCT_SCRIPT_RN_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT/${relativeReactNativeRootFolder}"
 export RCT_SCRIPT_APP_PATH="$RCT_SCRIPT_POD_INSTALLATION_ROOT/${relativeAppPath.length === 0 ? '.' : relativeAppPath}"

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

@@ -17,7 +17,7 @@ const path = require('path');
 const {globSync} = require('tinyglobby');
 
 function generateSchemaInfos(
-  libraries /*: $ReadOnlyArray<$FlowFixMe> */,
+  libraries /*: ReadonlyArray<$FlowFixMe> */,
 ) /*: Array<$FlowFixMe> */ {
   // $FlowFixMe[incompatible-type]
   return libraries.map(generateSchemaInfo);

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');
 
@@ -28,7 +28,7 @@ const UNSTABLE_MODULES_REQUIRING_MAIN_QUEUE_SETUP_PROVIDER_MM_TEMPLATE_PATH =
   );
 
 function generateUnstableModulesRequiringMainQueueSetupProvider(
-  libraries /*: $ReadOnlyArray<$FlowFixMe> */,
+  libraries /*: ReadonlyArray<$FlowFixMe> */,
   outputDir /*: string */,
 ) {
   const iosAnnotations = parseiOSAnnotations(libraries);
@@ -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/index.js

@@ -66,6 +66,7 @@ function execute(
   optionalBaseOutputPath /*: ?string */,
   source /*: string */,
   runReactNativeCodegen /*: boolean */ = true,
+  forceOutputPath /*: boolean */ = false,
 ) {
   try {
     codegenLog(`Analyzing ${path.join(projectRoot, 'package.json')}`);
@@ -146,6 +147,7 @@ function execute(
           ),
           pkgJsonIncludesGeneratedCode(pkgJson),
           platform,
+          forceOutputPath,
         );
       }
 

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

@@ -389,7 +389,7 @@ function isReactNativeCoreLibrary(libraryName /*: string */) /*: boolean */ {
  * Validates that components are defined in at most one library.
  */
 function parseiOSAnnotations(
-  libraries /*: $ReadOnlyArray<$FlowFixMe> */,
+  libraries /*: ReadonlyArray<$FlowFixMe> */,
 ) /*: {[string]: $FlowFixMe} */ {
   const mLibraryMap /*: {[string]: $FlowFixMe} */ = {};
   const cLibraryMap /*: {[string]: $FlowFixMe} */ = {};
@@ -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,
 };

package/scripts/codegen/generate-specs-cli-executor.js

@@ -14,7 +14,7 @@ const utils = require('./codegen-utils');
 const fs = require('fs');
 const path = require('path');
 
-const GENERATORS /*: {[string]: {[string]: $ReadOnlyArray<string>}} */ = {
+const GENERATORS /*: {[string]: {[string]: ReadonlyArray<string>}} */ = {
   all: {
     android: ['componentsAndroid', 'modulesAndroid', 'modulesCxx'],
     ios: ['componentsIOS', 'modulesIOS', 'modulesCxx'],

package/scripts/codegen/templates/ReactAppDependencyProvider.podspec.template

@@ -4,7 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 version = "{react-native-version}"
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/scripts/codegen/templates/ReactCodegen.podspec.template

@@ -4,7 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 version = "{react-native-version}"
-source = { :git => 'https://github.com/facebook/react-native.git' }
+source = { :git => 'https://github.com/react/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/scripts/generate-codegen-artifacts.js

@@ -31,8 +31,26 @@ const argv = yargs
     description: 'Whether the script is invoked from an `app` or a `library`',
     default: 'app',
   })
+  .option('f', {
+    alias: 'forceOutputPath',
+    description:
+      'Whether to force React Native Core artifacts to output to the specified path',
+    type: 'boolean',
+    default: false,
+  })
   .usage('Usage: $0 -p [path to app] -t [target platform] -o [output path]')
   .demandOption(['p', 't']).argv;
 
-// $FlowFixMe[prop-missing]
-executor.execute(argv.path, argv.targetPlatform, argv.outputPath, argv.source);
+executor.execute(
+  // $FlowFixMe[prop-missing]
+  argv.path,
+  // $FlowFixMe[prop-missing]
+  argv.targetPlatform,
+  // $FlowFixMe[prop-missing]
+  argv.outputPath,
+  // $FlowFixMe[prop-missing]
+  argv.source,
+  true, // runReactNativeCodegen
+  // $FlowFixMe[prop-missing]
+  argv.forceOutputPath,
+);

package/scripts/generate-provider-cli.js

@@ -34,7 +34,7 @@ const argv = yargs
     'Please provide platform, schema path, and output directory.',
   ).argv;
 
-const GENERATORS /*: {[string]: $ReadOnlyArray<string>} */ = {
+const GENERATORS /*: {[string]: ReadonlyArray<string>} */ = {
   android: [],
   ios: ['providerIOS'],
 };

package/scripts/ios-configure-glog.sh

@@ -62,7 +62,7 @@ if [ -h "test-driver" ]; then
     rm test-driver
 fi
 
-# Manually disable gflags include to fix issue https://github.com/facebook/react-native/issues/28446
+# Manually disable gflags include to fix issue https://github.com/react/react-native/issues/28446
 sed -i.bak -e 's/\@ac_cv_have_libgflags\@/0/' src/glog/logging.h.in && rm src/glog/logging.h.in.bak
 sed -i.bak -e 's/HAVE_LIB_GFLAGS/HAVE_LIB_GFLAGS_DISABLED/' src/config.h.in && rm src/config.h.in.bak
 

package/scripts/react_native_pods.rb

@@ -78,7 +78,7 @@ def use_react_native! (
   react_native_path = Pod::Config.instance.installation_root.join(path)
   prefix = react_native_path.relative_path_from(Pod::Config.instance.installation_root)
 
-  hermes_enabled= true
+  hermes_enabled= !use_third_party_jsc()
   # Set the app_path as env variable so the podspecs can access it.
   ENV['APP_PATH'] = app_path
   ENV['REACT_NATIVE_PATH'] = react_native_path.to_s
@@ -157,6 +157,8 @@ def use_react_native! (
   pod 'React-microtasksnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/microtasks"
   pod 'React-idlecallbacksnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/idlecallbacks"
   pod 'React-intersectionobservernativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/intersectionobserver"
+  pod 'React-mutationobservernativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/mutationobserver"
+  pod 'React-viewtransitionnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/viewtransition"
   pod 'React-webperformancenativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/webperformance"
   pod 'React-domnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/dom"
   pod 'React-defaultsnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/defaults"
@@ -529,7 +531,29 @@ def react_native_post_install(
   ReactNativePodsUtils.fix_library_search_paths(installer)
   ReactNativePodsUtils.update_search_paths(installer)
   ReactNativePodsUtils.set_build_setting(installer, build_setting: "USE_HERMES", value: use_hermes())
-  ReactNativePodsUtils.set_build_setting(installer, build_setting: "REACT_NATIVE_PATH", value: File.join("${PODS_ROOT}", "..", react_native_path))
+  # Compute REACT_NATIVE_PATH relative to PODS_ROOT using real (physical)
+  # paths, so the relative traversal is correct even when Pods/ is a symlink.
+  pods_dir_real = Pathname.new(Pod::Config.instance.sandbox_root.to_s).realpath
+  rn_absolute = File.expand_path(react_native_path, Pod::Config.instance.installation_root.to_s)
+  rn_real = Pathname.new(rn_absolute).realpath
+  rn_relative_to_pods = rn_real.relative_path_from(pods_dir_real)
+  ReactNativePodsUtils.set_build_setting(installer, build_setting: "REACT_NATIVE_PATH", value: File.join("${PODS_ROOT}", rn_relative_to_pods.to_s))
+  # Store the Podfile directory as a build setting so that shell scripts can
+  # locate it without hardcoding an absolute path. Use Xcode variable
+  # substitution per-project so the value persisted in project.pbxproj is
+  # portable across machines: $(SRCROOT) is the Podfile dir for user projects
+  # (also avoids the PODS_ROOT/.. traversal that breaks when Pods/ is a
+  # symlink), and $(SRCROOT)/.. for the Pods project.
+  installer.aggregate_targets.map(&:user_project).uniq(&:path).each do |user_project|
+    user_project.build_configurations.each do |config|
+      config.build_settings['PODFILE_DIR'] = '$(SRCROOT)'
+    end
+    user_project.save
+  end
+  installer.pods_project.build_configurations.each do |config|
+    config.build_settings['PODFILE_DIR'] = '$(SRCROOT)/..'
+  end
+  installer.pods_project.save
   ReactNativePodsUtils.set_build_setting(installer, build_setting: "SWIFT_ACTIVE_COMPILATION_CONDITIONS", value: ['$(inherited)', 'DEBUG'], config_name: "Debug")
 
   if (ENV['RCT_REMOVE_LEGACY_ARCH'] == '1')

package/scripts/react_native_pods_utils/script_phases.rb

@@ -35,9 +35,15 @@ end
 
 def get_script_template(react_native_path, export_vars={})
     template =<<~EOS
-        pushd "$PODS_ROOT/../" > /dev/null
-        RCT_SCRIPT_POD_INSTALLATION_ROOT=$(pwd)
-        popd >/dev/null
+        # Use PODFILE_DIR (set by react_native_post_install) to locate the
+        # Podfile directory. PODS_ROOT/.. does not work when Pods/ is a symlink.
+        if [ -n "$PODFILE_DIR" ]; then
+          RCT_SCRIPT_POD_INSTALLATION_ROOT="$PODFILE_DIR"
+        else
+          pushd "$PODS_ROOT/../" > /dev/null
+          RCT_SCRIPT_POD_INSTALLATION_ROOT=$(pwd)
+          popd >/dev/null
+        fi
         <% export_vars.each do |(varname, value)| %>
         export <%= varname -%>=<%= value -%>
         <% end %>

package/scripts/replace-rncore-version.js

@@ -12,6 +12,8 @@
 
 const {spawnSync} = require('child_process');
 const fs = require('fs');
+const os = require('os');
+const path = require('path');
 const yargs = require('yargs');
 
 const LAST_BUILD_FILENAME = 'React-Core-prebuilt/.last_build_configuration';
@@ -63,22 +65,97 @@ function replaceRNCoreConfiguration(
 
   const finalLocation = 'React-Core-prebuilt';
 
-  // Delete all directories - not files, since we want to keep the React-VFS.yaml file
-  const dirs = fs
-    .readdirSync(finalLocation, {withFileTypes: true})
-    .filter(dirent => dirent.isDirectory());
-  for (const dirent of dirs) {
-    const direntName =
-      typeof dirent.name === 'string' ? dirent.name : dirent.name.toString();
-    const dirPath = `${finalLocation}/${direntName}`;
-    console.log('Removing directory', dirPath);
-    fs.rmSync(dirPath, {force: true, recursive: true});
+  // Extract to a temporary directory on a regular filesystem first, then move
+  // into the final location. This avoids issues with partial tar extraction on
+  // certain filesystems (e.g. EdenFS) where extracting directly can silently
+  // produce incomplete results.
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'rncore-'));
+  const tmpExtractDir = path.join(tmpDir, 'React-Core-prebuilt');
+  fs.mkdirSync(tmpExtractDir, {recursive: true});
+
+  // Preserve Expo-generated modulemap before replacing directories
+  const useFrameworksModulemapName = 'React-use-frameworks.modulemap';
+  const useFrameworksModulemapPath = path.join(
+    finalLocation,
+    useFrameworksModulemapName,
+  );
+  let savedModulemap = null;
+  if (fs.existsSync(useFrameworksModulemapPath)) {
+    console.log('Preserving', useFrameworksModulemapName);
+    savedModulemap = fs.readFileSync(useFrameworksModulemapPath);
   }
 
-  console.log('Extracting the tarball', tarballURLPath);
-  spawnSync('tar', ['-xf', tarballURLPath, '-C', finalLocation], {
-    stdio: 'inherit',
-  });
+  try {
+    console.log('Extracting the tarball to temp dir', tarballURLPath);
+    const result = spawnSync(
+      'tar',
+      ['-xf', tarballURLPath, '-C', tmpExtractDir],
+      {
+        stdio: 'inherit',
+      },
+    );
+
+    if (result.status !== 0) {
+      throw new Error(`tar extraction failed with exit code ${result.status}`);
+    }
+
+    // Verify extraction produced the expected xcframework structure
+    const xcfwPath = path.join(tmpExtractDir, 'React.xcframework');
+    const modulemapPath = path.join(xcfwPath, 'Modules', 'module.modulemap');
+    if (!fs.existsSync(modulemapPath)) {
+      throw new Error(
+        `Extraction verification failed: ${modulemapPath} not found`,
+      );
+    }
+
+    // Delete all directories in finalLocation - not files, since we want to
+    // keep the React-VFS.yaml file
+    const dirs = fs
+      .readdirSync(finalLocation, {withFileTypes: true})
+      .filter(dirent => dirent.isDirectory());
+    for (const dirent of dirs) {
+      const direntName =
+        typeof dirent.name === 'string' ? dirent.name : dirent.name.toString();
+      const dirPath = `${finalLocation}/${direntName}`;
+      console.log('Removing directory', dirPath);
+      fs.rmSync(dirPath, {force: true, recursive: true});
+    }
+
+    // Move extracted directories from temp to final location
+    const extractedEntries = fs
+      .readdirSync(tmpExtractDir, {withFileTypes: true})
+      .filter(dirent => dirent.isDirectory());
+    for (const dirent of extractedEntries) {
+      const direntName =
+        typeof dirent.name === 'string' ? dirent.name : dirent.name.toString();
+      const src = path.join(tmpExtractDir, direntName);
+      const dst = path.join(finalLocation, direntName);
+      const mvResult = spawnSync('mv', [src, dst], {stdio: 'inherit'});
+      if (mvResult.status !== 0) {
+        // Fallback: copy recursively then remove source
+        console.log(`mv failed for ${direntName}, falling back to cp -R`);
+        const cpResult = spawnSync('cp', ['-R', src, dst], {
+          stdio: 'inherit',
+        });
+        if (cpResult.status !== 0) {
+          throw new Error(
+            `cp fallback failed with exit code ${cpResult.status}`,
+          );
+        }
+      }
+    }
+  } finally {
+    // Clean up temp directory
+    fs.rmSync(tmpDir, {force: true, recursive: true});
+
+    // Restore Expo-generated modulemap after directory replacement.
+    // Runs in finally so it is not skipped if mv/cp partially fails.
+    if (savedModulemap != null) {
+      const restoredPath = path.join(finalLocation, useFrameworksModulemapName);
+      fs.writeFileSync(restoredPath, savedModulemap);
+      console.log('Restored', useFrameworksModulemapName);
+    }
+  }
 }
 
 function updateLastBuildConfiguration(configuration /*: string */) {

package/scripts/xcode/with-environment.sh

@@ -17,7 +17,13 @@ NODE_BINARY=$(command -v node || echo "")
 export NODE_BINARY
 
 # Override the default with the global environment
-ENV_PATH="$PODS_ROOT/../.xcode.env"
+# Use PODFILE_DIR (set by react_native_post_install) to locate .xcode.env.
+# PODS_ROOT/.. does not work when Pods/ is a symlink.
+if [ -n "$PODFILE_DIR" ]; then
+    ENV_PATH="$PODFILE_DIR/.xcode.env"
+else
+    ENV_PATH="$PODS_ROOT/../.xcode.env"
+fi
 if [ -f "$ENV_PATH" ]; then
     source "$ENV_PATH"
 fi

package/sdks/.hermesv1version

@@ -1 +1 @@
-hermes-v250829098.0.10
+hermes-v250829098.0.16

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-v0.16.0
+hermes-v0.17.0

package/sdks/hermes-engine/hermes-engine.podspec

@@ -74,7 +74,7 @@ Pod::Spec.new do |spec|
       else
         # Hermes v1 is shipping a jsi/hermes.h header which is imported by the hermes.h header
         # and that file is not present in React Native's JSI
-        # (see https://github.com/facebook/react-native/tree/main/packages/react-native/ReactCommon/jsi/jsi/ where there is
+        # (see https://github.com/react/react-native/tree/main/packages/react-native/ReactCommon/jsi/jsi/ where there is
         # hermes-interface.h but not hermes.h)
         ss.source_files = ["destroot/include/hermes/**/*.h", "destroot/include/jsi/hermes.h"]
       end