react-native-tvos 0.69.8-2 → 0.71.7-0rc0

package/scripts/generate-codegen-artifacts.js

@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+'use strict';
+
+const executor = require('./codegen/generate-artifacts-executor.js');
+const yargs = require('yargs');
+
+const argv = yargs
+  .option('p', {
+    alias: 'path',
+    description: 'Path to React Native application',
+  })
+  .option('o', {
+    alias: 'outputPath',
+    description: 'Path where generated artifacts will be output to',
+  })
+  .option('f', {
+    alias: 'configFilename',
+    default: 'package.json',
+    description: 'The file that contains the codegen configuration.',
+  })
+  .option('k', {
+    alias: 'configKey',
+    default: 'codegenConfig',
+    description:
+      'The key that contains the codegen configuration in the config file.',
+  })
+  .option('e', {
+    alias: 'fabricEnabled',
+    default: true,
+    description: 'A flag to control whether to generate fabric components.',
+    boolean: 'e',
+  })
+  .option('c', {
+    alias: 'configFileDir',
+    default: '',
+    description:
+      'Path where codegen config files are located (e.g. node_modules dir).',
+  })
+  .option('n', {
+    alias: 'nodeBinary',
+    default: 'node',
+    description: 'Path to the node executable.',
+  })
+  .usage('Usage: $0 -p [path to app]')
+  .demandOption(['p']).argv;
+
+const CODEGEN_CONFIG_FILENAME = argv.f;
+const CODEGEN_CONFIG_FILE_DIR = argv.c;
+const CODEGEN_CONFIG_KEY = argv.k;
+const CODEGEN_FABRIC_ENABLED = argv.e;
+const NODE = argv.n;
+
+const appRoot = argv.path;
+const outputPath = argv.outputPath;
+
+executor.execute(
+  appRoot,
+  outputPath,
+  NODE,
+  CODEGEN_CONFIG_FILENAME,
+  CODEGEN_CONFIG_KEY,
+  CODEGEN_CONFIG_FILE_DIR,
+  CODEGEN_FABRIC_ENABLED,
+);

package/scripts/generate-specs-cli.js

@@ -9,20 +9,8 @@
 
 'use strict';
 
-let RNCodegen;
-try {
-  RNCodegen = require('../packages/react-native-codegen/lib/generators/RNCodegen.js');
-} catch (e) {
-  RNCodegen = require('react-native-codegen/lib/generators/RNCodegen.js');
-  if (!RNCodegen) {
-    throw 'RNCodegen not found.';
-  }
-}
-
-const fs = require('fs');
-const mkdirp = require('mkdirp');
-const path = require('path');
 const yargs = require('yargs');
+const executor = require('./codegen/generate-specs-cli-executor');
 
 const argv = yargs
   .option('p', {
@@ -36,7 +24,7 @@ const argv = yargs
   .option('o', {
     alias: 'outputDir',
     describe:
-      'Path to directory where native code source files should be saved.',
+      'Path to the root directory where native code source files should be saved.',
   })
   .option('n', {
     alias: 'libraryName',
@@ -59,81 +47,8 @@ const argv = yargs
     'Please provide platform, schema path, and output directory.',
   ).argv;
 
-const GENERATORS = {
-  all: {
-    android: ['componentsAndroid', 'modulesAndroid'],
-    ios: ['componentsIOS', 'modulesIOS'],
-  },
-  components: {
-    android: ['componentsAndroid'],
-    ios: ['componentsIOS'],
-  },
-  modules: {
-    android: ['modulesAndroid'],
-    ios: ['modulesIOS'],
-  },
-};
-
-function generateSpec(
-  platform,
-  schemaPath,
-  outputDirectory,
-  libraryName,
-  packageName,
-  libraryType,
-) {
-  const schemaText = fs.readFileSync(schemaPath, 'utf-8');
-
-  if (schemaText == null) {
-    throw new Error(`Can't find schema at ${schemaPath}`);
-  }
-
-  if (!outputDirectory) {
-    outputDirectory = path.resolve(__dirname, '..', 'Libraries', libraryName);
-  }
-  mkdirp.sync(outputDirectory);
-
-  let schema;
-  try {
-    schema = JSON.parse(schemaText);
-  } catch (err) {
-    throw new Error(`Can't parse schema to JSON. ${schemaPath}`);
-  }
-
-  if (GENERATORS[libraryType] == null) {
-    throw new Error(`Invalid library type. ${libraryType}`);
-  }
-
-  RNCodegen.generate(
-    {
-      libraryName,
-      schema,
-      outputDirectory,
-      packageName,
-    },
-    {
-      generators: GENERATORS[libraryType][platform],
-    },
-  );
-
-  if (platform === 'android') {
-    // Move all components C++ files to a structured jni folder for now.
-    // Note: this should've been done by RNCodegen's generators, but:
-    // * the generators don't support platform option yet
-    // * this subdir structure is Android-only, not applicable to iOS
-    const files = fs.readdirSync(outputDirectory);
-    const jniOutputDirectory = `${outputDirectory}/jni/react/renderer/components/${libraryName}`;
-    mkdirp.sync(jniOutputDirectory);
-    files
-      .filter(f => f.endsWith('.h') || f.endsWith('.cpp'))
-      .forEach(f => {
-        fs.renameSync(`${outputDirectory}/${f}`, `${jniOutputDirectory}/${f}`);
-      });
-  }
-}
-
 function main() {
-  generateSpec(
+  executor.execute(
     argv.platform,
     argv.schemaPath,
     argv.outputDir,

package/scripts/hermes/hermes-utils.js

@@ -10,14 +10,15 @@
 'use strict';
 
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
-const {execSync} = require('child_process');
+const {execSync, spawnSync} = require('child_process');
 
 const SDKS_DIR = path.normalize(path.join(__dirname, '..', '..', 'sdks'));
 const HERMES_DIR = path.join(SDKS_DIR, 'hermes');
-const DEFAULT_HERMES_TAG = 'main';
 const HERMES_TAG_FILE_PATH = path.join(SDKS_DIR, '.hermesversion');
-const HERMES_TARBALL_BASE_URL = 'https://github.com/facebook/hermes/tarball/';
+const HERMES_SOURCE_TARBALL_BASE_URL =
+  'https://github.com/facebook/hermes/tarball/';
 const HERMES_TARBALL_DOWNLOAD_DIR = path.join(SDKS_DIR, 'download');
 const MACOS_BIN_DIR = path.join(SDKS_DIR, 'hermesc', 'osx-bin');
 const MACOS_HERMESC_PATH = path.join(MACOS_BIN_DIR, 'hermesc');
@@ -26,6 +27,17 @@ const MACOS_IMPORT_HERMESC_PATH = path.join(
   'ImportHermesc.cmake',
 );
 
+/**
+ * Delegate execution to the supplied command.
+ *
+ * @param command Path to the command.
+ * @param args Array of arguments pass to the command.
+ * @param options child process options.
+ */
+function delegateSync(command, args, options) {
+  return spawnSync(command, args, {stdio: 'inherit', ...options});
+}
+
 function readHermesTag() {
   if (fs.existsSync(HERMES_TAG_FILE_PATH)) {
     const data = fs
@@ -68,14 +80,14 @@ function getHermesTagSHA(hermesTag) {
 
 function getHermesTarballDownloadPath(hermesTag) {
   const hermesTagSHA = getHermesTagSHA(hermesTag);
-  return `${HERMES_TARBALL_DOWNLOAD_DIR}/hermes-${hermesTagSHA}.tgz`;
+  return path.join(HERMES_TARBALL_DOWNLOAD_DIR, `hermes-${hermesTagSHA}.tgz`);
 }
 
-function downloadHermesTarball() {
+function downloadHermesSourceTarball() {
   const hermesTag = readHermesTag();
   const hermesTagSHA = getHermesTagSHA(hermesTag);
   const hermesTarballDownloadPath = getHermesTarballDownloadPath(hermesTag);
-  let hermesTarballUrl = HERMES_TARBALL_BASE_URL + hermesTag;
+  let hermesTarballUrl = HERMES_SOURCE_TARBALL_BASE_URL + hermesTag;
 
   if (fs.existsSync(hermesTarballDownloadPath)) {
     return;
@@ -89,13 +101,13 @@ function downloadHermesTarball() {
     `[Hermes] Downloading Hermes source code for commit ${hermesTagSHA}`,
   );
   try {
-    execSync(`curl ${hermesTarballUrl} -Lo ${hermesTarballDownloadPath}`);
+    delegateSync('curl', [hermesTarballUrl, '-Lo', hermesTarballDownloadPath]);
   } catch (error) {
     throw new Error(`[Hermes] Failed to download Hermes tarball. ${error}`);
   }
 }
 
-function expandHermesTarball() {
+function expandHermesSourceTarball() {
   const hermesTag = readHermesTag();
   const hermesTagSHA = getHermesTagSHA(hermesTag);
   const hermesTarballDownloadPath = getHermesTarballDownloadPath(hermesTag);
@@ -109,9 +121,13 @@ function expandHermesTarball() {
   }
   console.info(`[Hermes] Expanding Hermes tarball for commit ${hermesTagSHA}`);
   try {
-    execSync(
-      `tar -zxf ${hermesTarballDownloadPath} --strip-components=1 --directory ${HERMES_DIR}`,
-    );
+    delegateSync('tar', [
+      '-zxf',
+      hermesTarballDownloadPath,
+      '--strip-components=1',
+      '--directory',
+      HERMES_DIR,
+    ]);
   } catch (error) {
     throw new Error('[Hermes] Failed to expand Hermes tarball.');
   }
@@ -129,16 +145,16 @@ function copyBuildScripts() {
   }
 
   fs.copyFileSync(
-    `${SDKS_DIR}/hermes-engine/utils/build-apple-framework.sh`,
-    `${HERMES_DIR}/utils/build-apple-framework.sh`,
+    path.join(SDKS_DIR, 'hermes-engine', 'utils', 'build-apple-framework.sh'),
+    path.join(HERMES_DIR, 'utils', 'build-apple-framework.sh'),
   );
   fs.copyFileSync(
-    `${SDKS_DIR}/hermes-engine/utils/build-ios-framework.sh`,
-    `${HERMES_DIR}/utils/build-ios-framework.sh`,
+    path.join(SDKS_DIR, 'hermes-engine', 'utils', 'build-ios-framework.sh'),
+    path.join(HERMES_DIR, 'utils', 'build-ios-framework.sh'),
   );
   fs.copyFileSync(
-    `${SDKS_DIR}/hermes-engine/utils/build-mac-framework.sh`,
-    `${HERMES_DIR}/utils/build-mac-framework.sh`,
+    path.join(SDKS_DIR, 'hermes-engine', 'utils', 'build-mac-framework.sh'),
+    path.join(HERMES_DIR, 'utils', 'build-mac-framework.sh'),
   );
 }
 
@@ -152,71 +168,28 @@ function copyPodSpec() {
   if (!fs.existsSync(HERMES_DIR)) {
     fs.mkdirSync(HERMES_DIR, {recursive: true});
   }
+  const podspec = 'hermes-engine.podspec';
   fs.copyFileSync(
-    path.join(SDKS_DIR, 'hermes-engine', 'hermes-engine.podspec'),
-    path.join(HERMES_DIR, 'hermes-engine.podspec'),
+    path.join(SDKS_DIR, 'hermes-engine', podspec),
+    path.join(HERMES_DIR, podspec),
+  );
+  const utils = 'hermes-utils.rb';
+  fs.copyFileSync(
+    path.join(SDKS_DIR, 'hermes-engine', utils),
+    path.join(HERMES_DIR, utils),
   );
 }
 
-function isOnAReleaseBranch() {
-  try {
-    let currentBranch = execSync('git rev-parse --abbrev-ref HEAD')
-      .toString()
-      .trim();
-    let currentRemote = execSync('git config --get remote.origin.url')
-      .toString()
-      .trim();
-    return (
-      currentBranch.endsWith('-stable') &&
-      currentRemote.endsWith('facebook/react-native.git')
-    );
-  } catch (error) {
-    // If not inside a git repo, we're going to fail here and return.
-    return false;
-  }
-}
-
-function isOnAReleaseTag() {
-  try {
-    // If on a named tag, this method will return the tag name.
-    // If not, it will throw as the return code is not 0.
-    execSync('git describe --exact-match HEAD', {stdio: 'ignore'});
-  } catch (error) {
-    return false;
-  }
-  let currentRemote = execSync('git config --get remote.origin.url')
-    .toString()
-    .trim();
-  return currentRemote.endsWith('facebook/react-native.git');
-}
-
-function isPRAgainstStable(pullRequest) {
-  if (pullRequest == null) {
-    return false;
-  }
-
-  const prComponents = pullRequest.split('/');
-  const prNumber = prComponents[prComponents.length - 1];
-  const apiURL = `https://api.github.com/repos/facebook/react-native/pulls/${prNumber}`;
-  const prJson = JSON.parse(execSync(`curl ${apiURL}`).toString());
-  const baseBranch = prJson.base.label;
-
-  return baseBranch.endsWith('-stable');
+function isTestingAgainstLocalHermesTarball() {
+  return 'HERMES_ENGINE_TARBALL_PATH' in process.env;
 }
 
-function shouldBuildHermesFromSource(pullRequest) {
-  const hermesTag = readHermesTag();
-
-  return (
-    isOnAReleaseBranch() ||
-    isOnAReleaseTag() ||
-    isPRAgainstStable(pullRequest) ||
-    hermesTag === DEFAULT_HERMES_TAG
-  );
+function shouldBuildHermesFromSource(isInCI) {
+  return !isTestingAgainstLocalHermesTarball() && isInCI;
 }
 
-function shouldUsePrebuiltHermesC(os) {
-  if (os === 'macos') {
+function shouldUsePrebuiltHermesC(platform) {
+  if (platform === 'macos') {
     return fs.existsSync(MACOS_HERMESC_PATH);
   }
 
@@ -239,13 +212,108 @@ set_target_properties(native-hermesc PROPERTIES
   }
 }
 
+function getHermesPrebuiltArtifactsTarballName(buildType) {
+  if (!buildType) {
+    throw Error('Did not specify build type.');
+  }
+  return `hermes-ios-${buildType.toLowerCase()}.tar.gz`;
+}
+
+/**
+ * Creates a tarball with the contents of the supplied directory.
+ */
+function createTarballFromDirectory(directory, filename) {
+  const args = ['-C', directory, '-czvf', filename, '.'];
+  delegateSync('tar', args);
+}
+
+function createHermesPrebuiltArtifactsTarball(
+  hermesDir,
+  buildType,
+  tarballOutputDir,
+  excludeDebugSymbols,
+) {
+  validateHermesFrameworksExist(path.join(hermesDir, 'destroot'));
+
+  if (!fs.existsSync(tarballOutputDir)) {
+    fs.mkdirSync(tarballOutputDir, {recursive: true});
+  }
+
+  let tarballTempDir;
+  try {
+    tarballTempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), 'hermes-engine-destroot-'),
+    );
+
+    let args = ['-a'];
+    if (excludeDebugSymbols) {
+      args.push('--exclude=dSYMs/');
+      args.push('--exclude=*.dSYM/');
+    }
+    args.push('./destroot');
+    args.push(tarballTempDir);
+    delegateSync('rsync', args, {
+      cwd: hermesDir,
+    });
+    if (fs.existsSync(path.join(hermesDir, 'LICENSE'))) {
+      delegateSync('cp', ['LICENSE', tarballTempDir], {cwd: hermesDir});
+    }
+  } catch (error) {
+    throw new Error(`Failed to copy destroot to tempdir: ${error}`);
+  }
+
+  const tarballFilename = path.join(
+    tarballOutputDir,
+    getHermesPrebuiltArtifactsTarballName(buildType),
+  );
+
+  try {
+    createTarballFromDirectory(tarballTempDir, tarballFilename);
+  } catch (error) {
+    throw new Error(`[Hermes] Failed to create tarball: ${error}`);
+  }
+
+  if (!fs.existsSync(tarballFilename)) {
+    throw new Error(
+      `Tarball creation failed, could not locate tarball at ${tarballFilename}`,
+    );
+  }
+
+  return tarballFilename;
+}
+
+function validateHermesFrameworksExist(destrootDir) {
+  if (
+    !fs.existsSync(
+      path.join(destrootDir, 'Library/Frameworks/macosx/hermes.framework'),
+    )
+  ) {
+    throw new Error(
+      'Error: Hermes macOS Framework not found. Are you sure Hermes has been built?',
+    );
+  }
+  if (
+    !fs.existsSync(
+      path.join(destrootDir, 'Library/Frameworks/universal/hermes.xcframework'),
+    )
+  ) {
+    throw new Error(
+      'Error: Hermes iOS XCFramework not found. Are you sure Hermes has been built?',
+    );
+  }
+}
+
 module.exports = {
   configureMakeForPrebuiltHermesC,
   copyBuildScripts,
   copyPodSpec,
-  downloadHermesTarball,
-  expandHermesTarball,
+  createHermesPrebuiltArtifactsTarball,
+  createTarballFromDirectory,
+  downloadHermesSourceTarball,
+  expandHermesSourceTarball,
   getHermesTagSHA,
+  getHermesTarballDownloadPath,
+  getHermesPrebuiltArtifactsTarballName,
   readHermesTag,
   setHermesTag,
   shouldBuildHermesFromSource,

package/scripts/hermes/prepare-hermes-for-build.js

@@ -17,20 +17,19 @@ const {
   configureMakeForPrebuiltHermesC,
   copyBuildScripts,
   copyPodSpec,
-  downloadHermesTarball,
-  expandHermesTarball,
+  downloadHermesSourceTarball,
+  expandHermesSourceTarball,
   shouldUsePrebuiltHermesC,
   shouldBuildHermesFromSource,
 } = require('./hermes-utils');
 
-async function main(pullRequest) {
-  if (!shouldBuildHermesFromSource(pullRequest)) {
+async function main(isInCI) {
+  if (!shouldBuildHermesFromSource(isInCI)) {
     copyPodSpec();
     return;
   }
-
-  downloadHermesTarball();
-  expandHermesTarball();
+  downloadHermesSourceTarball();
+  expandHermesSourceTarball();
   copyPodSpec();
   copyBuildScripts();
 
@@ -40,8 +39,8 @@ async function main(pullRequest) {
   }
 }
 
-const pullRequest = process.argv.length > 2 ? process.argv[2] : null;
-console.log(`Pull request detected: ${pullRequest}`);
-main(pullRequest).then(() => {
+const isInCI = process.env.REACT_NATIVE_CI === 'true';
+
+main(isInCI).then(() => {
   process.exit(0);
 });

package/scripts/ios-configure-glog.sh

@@ -20,6 +20,7 @@ if [ -z "$CURRENT_ARCH" ] || [ "$CURRENT_ARCH" == "undefined_arch" ]; then
     fi
 fi
 
+# @lint-ignore-every TXT2 Tab Literal
 if [ "$CURRENT_ARCH" == "arm64" ]; then
     cat <<\EOF >>fix_glog_0.3.5_apple_silicon.patch
 diff --git a/config.sub b/config.sub
@@ -50,8 +51,8 @@ if [ -h "test-driver" ]; then
 fi
 
 # Manually disable gflags include to fix issue https://github.com/facebook/react-native/issues/28446
-sed -i '' 's/\@ac_cv_have_libgflags\@/0/' src/glog/logging.h.in
-sed -i '' 's/HAVE_LIB_GFLAGS/HAVE_LIB_GFLAGS_DISABLED/' src/config.h.in
+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
 
 ./configure --host arm-apple-darwin
 

package/scripts/launchPackager.command

@@ -10,6 +10,10 @@ clear
 
 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 
+export PODS_ROOT="$THIS_DIR/../../../ios/Pods"
+WITH_ENVIRONMENT="$THIS_DIR/xcode/with-environment.sh"
+source $WITH_ENVIRONMENT
+
 # export packager environment variables
 source "$THIS_DIR/.packager.env"
 

package/scripts/native_modules.rb

@@ -0,0 +1,6 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+require_relative '../../@react-native-community/cli-platform-ios/native_modules'

package/scripts/packager.sh

@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 # scripts directory
-THIS_DIR=$(cd -P "$(dirname "$(realpath "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 REACT_NATIVE_ROOT="$THIS_DIR/.."
 # Application root directory - General use case: react-native is a dependency
 PROJECT_ROOT="$THIS_DIR/../../.."

package/scripts/react-native-xcode.sh

@@ -13,7 +13,7 @@ set -x
 DEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH
 
 # Enables iOS devices to get the IP address of the machine running Metro
-if [[ "$CONFIGURATION" = *Debug* && ! "$PLATFORM_NAME" == *simulator ]]; then
+if [[ ! "$SKIP_BUNDLING_METRO_IP" && "$CONFIGURATION" = *Debug* && ! "$PLATFORM_NAME" == *simulator ]]; then
   for num in 0 1 2 3 4 5 6 7 8; do
     IP=$(ipconfig getifaddr en${num})
     if [ ! -z "$IP" ]; then
@@ -74,25 +74,30 @@ else
   ENTRY_FILE=${1:-index.js}
 fi
 
-if [[ $DEV != true && ! -f "$ENTRY_FILE" ]]; then
-  echo "error: Entry file $ENTRY_FILE does not exist. If you use another file as your entry point, pass ENTRY_FILE=myindex.js" >&2
-  exit 2
-fi
-
 # check and assign NODE_BINARY env
 # shellcheck source=/dev/null
 source "$REACT_NATIVE_DIR/scripts/node-binary.sh"
 
-[ -z "$HERMES_CLI_PATH" ] && HERMES_CLI_PATH="$PODS_ROOT/hermes-engine/destroot/bin/hermesc"
+# If hermes-engine is in the Podfile.lock, it means that Hermes is a dependency of the project
+# and it is enabled. If not, it means that hermes is disabled.
+HERMES_ENABLED=$(grep hermes-engine $PODS_PODFILE_DIR_PATH/Podfile.lock)
 
-if [[ -z "$USE_HERMES" && -f "$HERMES_CLI_PATH" ]]; then
-  echo "Enabling Hermes byte-code compilation. Disable with USE_HERMES=false if needed."
-  USE_HERMES=true
+# If hermes-engine is not in the Podfile.lock, it means that the app is not using Hermes.
+# Setting USE_HERMES is no the only way to set whether the app can use hermes or not: users
+# can also modify manually the Podfile.
+if [[ -z "$HERMES_ENABLED" ]]; then
+  USE_HERMES=false
 fi
 
-if [[ $USE_HERMES == true && ! -f "$HERMES_CLI_PATH" ]]; then
-  echo "error: USE_HERMES is set to true but the hermesc binary could not be " \
-       "found at ${HERMES_CLI_PATH}. Perhaps you need to run 'bundle exec pod install' or otherwise " \
+HERMES_ENGINE_PATH="$PODS_ROOT/hermes-engine"
+[ -z "$HERMES_CLI_PATH" ] && HERMES_CLI_PATH="$HERMES_ENGINE_PATH/destroot/bin/hermesc"
+
+# Hermes is enabled in new projects by default, so we cannot assume that USE_HERMES=1 is set as an envvar.
+# If hermes-engine is found in Pods, we can assume Hermes has not been disabled.
+# If hermesc is not available and USE_HERMES is either unset or true, show error.
+if [[  ! -z "$HERMES_ENABLED" && -f "$HERMES_ENGINE_PATH" && ! -f "$HERMES_CLI_PATH" ]]; then
+  echo "error: Hermes is enabled but the hermesc binary could not be found at ${HERMES_CLI_PATH}." \
+       "Perhaps you need to run 'bundle exec pod install' or otherwise " \
        "point the HERMES_CLI_PATH variable to your custom location." >&2
   exit 2
 fi
@@ -135,7 +140,7 @@ fi
 
 PACKAGER_SOURCEMAP_FILE=
 if [[ $EMIT_SOURCEMAP == true ]]; then
-  if [[ $USE_HERMES == true ]]; then
+  if [[ $USE_HERMES != false ]]; then
     PACKAGER_SOURCEMAP_FILE="$CONFIGURATION_BUILD_DIR/$(basename $SOURCEMAP_FILE)"
   else
     PACKAGER_SOURCEMAP_FILE="$SOURCEMAP_FILE"
@@ -144,7 +149,7 @@ if [[ $EMIT_SOURCEMAP == true ]]; then
 fi
 
 # Hermes doesn't require JS minification.
-if [[ $USE_HERMES == true && $DEV == false ]]; then
+if [[ $USE_HERMES != false && $DEV == false ]]; then
   EXTRA_ARGS="$EXTRA_ARGS --minify false"
 fi
 
@@ -159,7 +164,7 @@ fi
   $EXTRA_ARGS \
   $EXTRA_PACKAGER_ARGS
 
-if [[ $USE_HERMES != true ]]; then
+if [[ $USE_HERMES == false ]]; then
   cp "$BUNDLE_FILE" "$DEST/"
   BUNDLE_FILE="$DEST/main.jsbundle"
 else
@@ -174,14 +179,15 @@ else
   fi
   "$HERMES_CLI_PATH" -emit-binary $EXTRA_COMPILER_ARGS -out "$DEST/main.jsbundle" "$BUNDLE_FILE"
   if [[ $EMIT_SOURCEMAP == true ]]; then
-    HBC_SOURCEMAP_FILE="$BUNDLE_FILE.map"
+    HBC_SOURCEMAP_FILE="$DEST/main.jsbundle.map"
     "$NODE_BINARY" "$COMPOSE_SOURCEMAP_PATH" "$PACKAGER_SOURCEMAP_FILE" "$HBC_SOURCEMAP_FILE" -o "$SOURCEMAP_FILE"
+    rm "$HBC_SOURCEMAP_FILE"
+    rm "$PACKAGER_SOURCEMAP_FILE"
   fi
   BUNDLE_FILE="$DEST/main.jsbundle"
 fi
 
 if [[ $DEV != true && ! -f "$BUNDLE_FILE" ]]; then
-  echo "error: File $BUNDLE_FILE does not exist. This must be a bug with" >&2
-  echo "React Native, please report it here: https://github.com/facebook/react-native/issues"
+  echo "error: File $BUNDLE_FILE does not exist. This must be a bug with React Native, please report it here: https://github.com/facebook/react-native/issues" >&2
   exit 2
 fi