Consolidate Hermes version files and simplify JS release scripts (#56737)

Summary:
Pull Request resolved: #56737

  - Remove `sdks/.hermesv1version` from `package.json` files array — only `.hermesversion` remains
  - Simplify `hermes-utils.js`: remove `readHermesV1Tag()`, `HERMES_V1_TAG_FILE_PATH`; `setHermesTag()` takes single argument
  - Simplify `scripts/releases/utils/hermes-utils.js`: single version in `getLatestHermesNightlyVersion()` and `updateHermesRuntimeDependenciesVersions()`
  - Simplify `bump-hermes-version.js`: remove `--v1-tag` and `--hermes-v1-version` CLI options
  - Simplify `release-hermes-for-branch-cut.js`: remove legacy branch/workflow/PR logic, keep only single Hermes branch

## Changelog:
[General][Changed] - Simplified build JS Hermes infrastructure for the Release

  ## Test plan
  - [x] JS tests: `yarn jest --no-watchman hermes-utils-test.js` — 5/5 tests pass

Differential Revision: D104380961

Author: cipolleschi

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt

@@ -147,8 +147,7 @@ internal object DependencyUtils {
       coordinates: Coordinates,
   ): List<Triple<String, String, String>> {
     val dependencySubstitution = mutableListOf<Triple<String, String, String>>()
-    val hermesVersionString =
-        "${coordinates.hermesGroupString}:hermes-android:${coordinates.hermesVersionString}"
+    val hermesVersionString = "${coordinates.hermesGroupString}:hermes-android:${coordinates.hermesVersionString}"
     dependencySubstitution.add(
         Triple(
             "com.facebook.react:react-native",

packages/react-native/ReactCommon/hermes/executor/HermesExecutorFactory.cpp

@@ -110,7 +110,8 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
     (void)debuggerName;
   }
 
-  ~DecoratedRuntime() {}
+  ~DecoratedRuntime() {
+  }
 
  private:
   std::shared_ptr<Runtime> runtime_;

packages/react-native/package.json

@@ -128,7 +128,6 @@
     "scripts/xcode/ccache.conf",
     "scripts/xcode/with-environment.sh",
     "sdks/.hermesversion",
-    "sdks/.hermesv1version",
     "sdks/hermes-engine",
     "sdks/hermesc",
     "settings.gradle.kts",
@@ -176,7 +175,7 @@
     "base64-js": "^1.5.1",
     "commander": "^12.0.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-compiler": "0.0.0",
+    "hermes-compiler": "250829098.0.13",
     "invariant": "^2.2.4",
     "memoize-one": "^5.0.0",
     "metro-runtime": "^0.84.3",

packages/react-native/scripts/cocoapods/jsengine.rb

@@ -13,7 +13,7 @@ def setup_hermes!(react_native_path: "../node_modules/react-native")
     react_native_dir = Pod::Config.instance.installation_root.join(react_native_path)
     # This `:tag => hermestag` below is only to tell CocoaPods to update hermes-engine when React Native version changes.
     # We have custom logic to compute the source for hermes-engine. See sdks/hermes-engine/*
-    hermestag_file_name = ".hermesv1version"
+    hermestag_file_name = ".hermesversion"
     hermestag_file = File.join(react_native_dir, "sdks", hermestag_file_name)
     hermestag = File.exist?(hermestag_file) ? File.read(hermestag_file).strip : ''
     pod 'hermes-engine', :podspec => "#{react_native_path}/sdks/hermes-engine/hermes-engine.podspec", :tag => hermestag

packages/react-native/scripts/hermes/__tests__/hermes-utils-test.js

@@ -10,17 +10,12 @@
 
 import * as path from 'path';
 
-const {
-  readHermesTag,
-  readHermesV1Tag,
-  setHermesTag,
-} = require('../hermes-utils');
+const {readHermesTag, setHermesTag} = require('../hermes-utils');
 // $FlowFixMe[untyped-import] (OSS) memfs
 const {memfs} = require('memfs');
 
 const hermesTag =
   'hermes-2022-04-28-RNv0.69.0-15d07c2edd29a4ea0b8f15ab0588a0c1adb1200f';
-const hermesV1Tag = '250829098.0.0';
 const ROOT_DIR = path.normalize(path.join(__dirname, '../../..'));
 const SDKS_DIR = path.join(ROOT_DIR, 'sdks');
 
@@ -61,45 +56,19 @@ describe('hermes-utils', () => {
       });
     });
 
-    describe('readHermesV1Tag', () => {
-      it('should throw if .hermesv1version does not exist', () => {
-        expect(() => {
-          readHermesV1Tag();
-        }).toThrow('[Hermes] .hermesv1version does not exist.');
-      });
-      it('should fail if hermes v1 tag is empty', () => {
-        fs.writeFileSync(path.join(SDKS_DIR, '.hermesv1version'), '');
-        expect(() => {
-          readHermesV1Tag();
-        }).toThrow('[Hermes] .hermesv1version file is empty.');
-      });
-      it('should return tag from .hermesv1version if file exists', () => {
-        fs.writeFileSync(path.join(SDKS_DIR, '.hermesv1version'), hermesV1Tag);
-        expect(readHermesV1Tag()).toEqual(hermesV1Tag);
-      });
-    });
-
     describe('setHermesTag', () => {
       it('should write tag to .hermesversion file', async () => {
-        await setHermesTag(hermesTag, hermesV1Tag);
+        await setHermesTag(hermesTag);
         expect(
           fs.readFileSync(path.join(SDKS_DIR, '.hermesversion'), {
             encoding: 'utf8',
             flag: 'r',
           }),
         ).toEqual(hermesTag);
-
-        expect(
-          fs.readFileSync(path.join(SDKS_DIR, '.hermesv1version'), {
-            encoding: 'utf8',
-            flag: 'r',
-          }),
-        ).toEqual(hermesV1Tag);
       });
       it('should set Hermes tag and read it back', async () => {
-        await setHermesTag(hermesTag, hermesV1Tag);
+        await setHermesTag(hermesTag);
         expect(readHermesTag()).toEqual(hermesTag);
-        expect(readHermesV1Tag()).toEqual(hermesV1Tag);
       });
     });
   });

packages/react-native/scripts/hermes/bump-hermes-version.js

@@ -28,88 +28,41 @@ const inquirer = require('inquirer');
 const {exit} = require('shelljs');
 const yargs = require('yargs');
 
-let argv = yargs
-  .option('t', {
-    alias: 'tag',
-    describe:
-      'Hermes release tag to use for this React Native release, ex. hermes-2022-02-21-RNv0.68.0. This tag will be used when building Hermes from source.',
-    required: true,
-  })
-  .option('s', {
-    alias: 'v1-tag',
-    describe:
-      'Hermes V1 release tag to use for this React Native release, ex. 250829098.0.0. This tag will be used when building Hermes V1 from source.',
-    required: true,
-  })
-  .option('h', {
-    alias: 'hermes-version',
-    describe:
-      'Hermes version to use for this React Native release, ex. 250829098.0.0. This version will be used when consuming Hermes from a prebuilt package.',
-    required: false,
-  })
-  .option('v', {
-    alias: 'hermes-v1-version',
-    describe:
-      'Hermes V1 version to use for this React Native release, ex. 250829098.0.0. This version will be used when consuming Hermes V1 from a prebuilt package.',
-    required: false,
-  }).argv;
+let argv = yargs.option('v', {
+  alias: 'version',
+  describe:
+    'Hermes version to use for this React Native release, ex. 250829098.0.0. Used both as the .hermesversion tag (for building from source) and as the prebuilt package version. If omitted, the latest published version is fetched from NPM.',
+  required: false,
+}).argv;
 
 async function main() {
   // $FlowFixMe[prop-missing]
-  const hermesTag = argv.tag;
-  // $FlowFixMe[prop-missing]
-  const hermesV1Tag = argv['v1-tag'];
-  // $FlowFixMe[prop-missing]
-  let hermesVersion = argv['hermes-version'];
-  // $FlowFixMe[prop-missing]
-  let hermesV1Version = argv['hermes-v1-version'];
+  let hermesVersion = argv.version;
 
   if (!hermesVersion) {
     console.log(
       'No Hermes version provided. Fetching the latest version from NPM...',
     );
     hermesVersion = await getPackageVersionStrByTag(
-      'hermes-compiler',
-      'latest-v0',
-    );
-  }
-
-  if (!hermesV1Version) {
-    console.log(
-      'No Hermes V1 version provided. Fetching the latest version from NPM...',
-    );
-    hermesV1Version = await getPackageVersionStrByTag(
       'hermes-compiler',
       'latest-v1',
     );
   }
 
-  const {confirmHermesVersions} = await inquirer.prompt({
+  const {confirmHermesVersion} = await inquirer.prompt({
     type: 'confirm',
-    name: 'confirmHermesVersions',
-    message: `Do you want to use the Hermes version "${hermesVersion}" and Hermes V1 version "${hermesV1Version}" (for prebuilt)?`,
+    name: 'confirmHermesVersion',
+    message: `Do you want to use the Hermes version "${hermesVersion}"?`,
   });
 
-  if (!confirmHermesVersions) {
+  if (!confirmHermesVersion) {
     console.log('Aborting.');
     return;
   }
 
-  const {confirmHermesTags} = await inquirer.prompt({
-    type: 'confirm',
-    name: 'confirmHermesTags',
-    message: `Do you want to use the Hermes release tagged "${hermesTag}" and Hermes V1 release tagged "${hermesV1Tag}" (for building from source)?`,
-  });
-
-  if (!confirmHermesTags) {
-    console.log('Aborting.');
-    return;
-  }
-
-  await setHermesTag(hermesTag, hermesV1Tag);
-
-  await updateHermesCompilerVersionInDependencies(hermesV1Version);
-  await updateHermesRuntimeDependenciesVersions(hermesVersion, hermesV1Version);
+  await setHermesTag(hermesVersion);
+  await updateHermesCompilerVersionInDependencies(hermesVersion);
+  await updateHermesRuntimeDependenciesVersions(hermesVersion);
 }
 
 void main().then(() => {

packages/react-native/scripts/hermes/hermes-utils.js

@@ -21,7 +21,6 @@ type BuildType = 'dry-run' | 'release' | 'nightly';
 
 const SDKS_DIR = path.normalize(path.join(__dirname, '..', '..', 'sdks'));
 const HERMES_TAG_FILE_PATH = path.join(SDKS_DIR, '.hermesversion');
-const HERMES_V1_TAG_FILE_PATH = path.join(SDKS_DIR, '.hermesv1version');
 
 function readHermesTag() /*: string */ {
   if (fs.existsSync(HERMES_TAG_FILE_PATH)) {
@@ -42,70 +41,40 @@ function readHermesTag() /*: string */ {
   throw new Error('[Hermes] .hermesversion does not exist.');
 }
 
-function readHermesV1Tag() /*: string */ {
-  if (fs.existsSync(HERMES_V1_TAG_FILE_PATH)) {
-    const data = fs
-      .readFileSync(HERMES_V1_TAG_FILE_PATH, {
-        encoding: 'utf8',
-        flag: 'r',
-      })
-      .trim();
-
-    if (data.length > 0) {
-      return data;
-    } else {
-      throw new Error('[Hermes] .hermesv1version file is empty.');
-    }
+async function setHermesTag(hermesTag /*: string */) {
+  if (!fs.existsSync(SDKS_DIR)) {
+    fs.mkdirSync(SDKS_DIR, {recursive: true});
   }
 
-  throw new Error('[Hermes] .hermesv1version does not exist.');
-}
-
-async function updateHermesTag(
-  tagFile /*: string */,
-  hermesTag /*: string */,
-  prompt /*: string */,
-) {
-  if (!fs.existsSync(tagFile)) {
-    fs.writeFileSync(tagFile, hermesTag.trim());
-  } else {
-    const previousHermesTag = fs.readFileSync(tagFile, {
-      encoding: 'utf8',
-      flag: 'r',
-    });
+  if (!fs.existsSync(HERMES_TAG_FILE_PATH)) {
+    fs.writeFileSync(HERMES_TAG_FILE_PATH, hermesTag.trim());
+    return;
+  }
 
-    if (previousHermesTag.trim() !== hermesTag.trim()) {
-      const {confirmHermesTag} = await inquirer.prompt({
-        type: 'confirm',
-        name: 'confirmHermesTag',
-        message: `Do you want to use updtate release tag for ${prompt} from "${previousHermesTag}" to "${hermesTag}"?`,
-      });
+  const previousHermesTag = fs.readFileSync(HERMES_TAG_FILE_PATH, {
+    encoding: 'utf8',
+    flag: 'r',
+  });
 
-      if (confirmHermesTag) {
-        fs.writeFileSync(tagFile, hermesTag.trim());
-      } else {
-        console.log(`[${prompt}] .hermesversion file is unchanged.`);
-      }
-    } else {
-      console.log(`[${prompt}] .hermesversion file is unchanged.`);
-    }
+  if (previousHermesTag.trim() === hermesTag.trim()) {
+    console.log('[Hermes] .hermesversion file is unchanged.');
+    return;
   }
-}
 
-async function setHermesTag(
-  hermesTag /*: string */,
-  hermesV1Tag /*: string */,
-) {
-  if (!fs.existsSync(SDKS_DIR)) {
-    fs.mkdirSync(SDKS_DIR, {recursive: true});
-  }
+  const {confirmHermesTag} = await inquirer.prompt({
+    type: 'confirm',
+    name: 'confirmHermesTag',
+    message: `Do you want to update release tag for Hermes from "${previousHermesTag}" to "${hermesTag}"?`,
+  });
 
-  await updateHermesTag(HERMES_TAG_FILE_PATH, hermesTag, 'Hermes');
-  await updateHermesTag(HERMES_V1_TAG_FILE_PATH, hermesV1Tag, 'Hermes V1');
+  if (confirmHermesTag) {
+    fs.writeFileSync(HERMES_TAG_FILE_PATH, hermesTag.trim());
+  } else {
+    console.log('[Hermes] .hermesversion file is unchanged.');
+  }
 }
 
 module.exports = {
   readHermesTag,
-  readHermesV1Tag,
   setHermesTag,
 };