react-native 0.69.0-rc.6 → 0.70.0-rc.0

package/scripts/generate-artifacts.js

@@ -9,17 +9,7 @@
 
 'use strict';
 
-/**
- * This script crawls through a React Native application's dependencies and invokes the codegen
- * for any libraries that require it.
- * To enable codegen support, the library should include a config in the CODEGEN_CONFIG_KEY key
- * in a CODEGEN_CONFIG_FILENAME file.
- */
-
-const {execSync} = require('child_process');
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
+const executor = require('./codegen/generate-artifacts-executor.js');
 const yargs = require('yargs');
 
 const argv = yargs
@@ -62,257 +52,21 @@ const argv = yargs
   .usage('Usage: $0 -p [path to app]')
   .demandOption(['p']).argv;
 
-const RN_ROOT = path.join(__dirname, '..');
 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 CODEGEN_REPO_PATH = `${RN_ROOT}/packages/react-native-codegen`;
-const CODEGEN_NPM_PATH = `${RN_ROOT}/../react-native-codegen`;
-const CORE_LIBRARIES = new Set(['rncore', 'FBReactNativeSpec']);
-const REACT_NATIVE_DEPENDENCY_NAME = 'react-native';
-
-function isReactNativeCoreLibrary(libraryName) {
-  return CORE_LIBRARIES.has(libraryName);
-}
-
-function executeNodeScript(script) {
-  execSync(`${NODE} ${script}`);
-}
-
-function main(appRootDir, outputPath) {
-  if (appRootDir == null) {
-    console.error('Missing path to React Native application');
-    process.exitCode = 1;
-    return;
-  }
-
-  try {
-    // Get app package.json
-    const pkgJson = JSON.parse(
-      fs.readFileSync(path.join(appRootDir, 'package.json')),
-    );
-
-    // Get dependencies for the app
-    const dependencies = {...pkgJson.dependencies, ...pkgJson.devDependencies};
-
-    const libraries = [];
-
-    // Handle react-native core libraries.
-    // This is required when react-native is outside of node_modules.
-    console.log('[Codegen] Processing react-native core libraries');
-    const reactNativePkgJson = path.join(RN_ROOT, CODEGEN_CONFIG_FILENAME);
-    if (!fs.existsSync(reactNativePkgJson)) {
-      throw '[Codegen] Error: Could not find config file for react-native.';
-    }
-    const reactNativeConfigFile = JSON.parse(
-      fs.readFileSync(reactNativePkgJson),
-    );
-    if (
-      reactNativeConfigFile[CODEGEN_CONFIG_KEY] == null ||
-      reactNativeConfigFile[CODEGEN_CONFIG_KEY].libraries == null
-    ) {
-      throw '[Codegen] Error: Could not find codegen config for react-native.';
-    }
-    console.log('[Codegen] Found react-native');
-    reactNativeConfigFile[CODEGEN_CONFIG_KEY].libraries.forEach(config => {
-      const libraryConfig = {
-        library: REACT_NATIVE_DEPENDENCY_NAME,
-        config,
-        libraryPath: RN_ROOT,
-      };
-      libraries.push(libraryConfig);
-    });
-
-    // Determine which of these are codegen-enabled libraries
-    const confifDir = CODEGEN_CONFIG_FILE_DIR || path.join(RN_ROOT, '..');
-    console.log(
-      `\n\n[Codegen] >>>>> Searching for codegen-enabled libraries in ${confifDir}`,
-    );
-
-    // Handle third-party libraries
-    Object.keys(dependencies).forEach(dependency => {
-      if (dependency === REACT_NATIVE_DEPENDENCY_NAME) {
-        // react-native should already be added.
-        return;
-      }
-      const codegenConfigFileDir = path.join(confifDir, dependency);
-      const configFilePath = path.join(
-        codegenConfigFileDir,
-        CODEGEN_CONFIG_FILENAME,
-      );
-      if (fs.existsSync(configFilePath)) {
-        const configFile = JSON.parse(fs.readFileSync(configFilePath));
-        if (
-          configFile[CODEGEN_CONFIG_KEY] != null &&
-          configFile[CODEGEN_CONFIG_KEY].libraries != null
-        ) {
-          console.log(`[Codegen] Found ${dependency}`);
-          configFile[CODEGEN_CONFIG_KEY].libraries.forEach(config => {
-            const libraryConfig = {
-              library: dependency,
-              config,
-              libraryPath: codegenConfigFileDir,
-            };
-            libraries.push(libraryConfig);
-          });
-        }
-      }
-    });
-
-    console.log(
-      '\n\n[Codegen] >>>>> Searching for codegen-enabled libraries in the app',
-    );
-
-    // Handle in-app libraries
-    if (
-      pkgJson[CODEGEN_CONFIG_KEY] != null &&
-      pkgJson[CODEGEN_CONFIG_KEY].libraries != null
-    ) {
-      console.log(`[Codegen] Found ${pkgJson.name}`);
-      pkgJson[CODEGEN_CONFIG_KEY].libraries.forEach(config => {
-        const libraryConfig = {
-          library: pkgJson.name,
-          config,
-          libraryPath: appRootDir,
-        };
-        libraries.push(libraryConfig);
-      });
-    }
-
-    if (libraries.length === 0) {
-      console.log('[Codegen] No codegen-enabled libraries found.');
-      return;
-    }
-
-    // 4. Locate codegen package
-    let codegenCliPath;
-    if (fs.existsSync(CODEGEN_REPO_PATH)) {
-      codegenCliPath = CODEGEN_REPO_PATH;
-
-      if (!fs.existsSync(path.join(CODEGEN_REPO_PATH, 'lib'))) {
-        console.log(
-          '\n\n[Codegen] >>>>> Building react-native-codegen package',
-        );
-        execSync('yarn install', {
-          cwd: codegenCliPath,
-          stdio: 'inherit',
-        });
-        execSync('yarn build', {
-          cwd: codegenCliPath,
-          stdio: 'inherit',
-        });
-      }
-    } else if (fs.existsSync(CODEGEN_NPM_PATH)) {
-      codegenCliPath = CODEGEN_NPM_PATH;
-    } else {
-      throw "error: Could not determine react-native-codegen location. Try running 'yarn install' or 'npm install' in your project root.";
-    }
-
-    const schemaPaths = {};
-
-    const iosOutputDir = path.join(
-      outputPath ? outputPath : appRootDir,
-      'build/generated/ios',
-    );
-
-    // 5. For each codegen-enabled library, generate the native code spec files
-    libraries.forEach(library => {
-      if (!CODEGEN_FABRIC_ENABLED && library.config.type === 'components') {
-        console.log(
-          `[Codegen] ${library.config.name} skipped because fabric is not enabled.`,
-        );
-        return;
-      }
-      const tmpDir = fs.mkdtempSync(
-        path.join(os.tmpdir(), library.config.name),
-      );
-      const pathToSchema = path.join(tmpDir, 'schema.json');
-      const pathToJavaScriptSources = path.join(
-        library.libraryPath,
-        library.config.jsSrcsDir,
-      );
-      const pathToOutputDirIOS = path.join(
-        iosOutputDir,
-        library.config.type === 'components'
-          ? 'react/renderer/components'
-          : './',
-        library.config.name,
-      );
-      const pathToTempOutputDir = path.join(tmpDir, 'out');
-
-      console.log(`\n\n[Codegen] >>>>> Processing ${library.config.name}`);
-      // Generate one schema for the entire library...
-      executeNodeScript(
-        `${path.join(
-          codegenCliPath,
-          'lib',
-          'cli',
-          'combine',
-          'combine-js-to-schema-cli.js',
-        )} ${pathToSchema} ${pathToJavaScriptSources}`,
-      );
-      console.log(`[Codegen] Generated schema: ${pathToSchema}`);
-
-      // ...then generate native code artifacts.
-      const libraryTypeArg = library.config.type
-        ? `--libraryType ${library.config.type}`
-        : '';
-      fs.mkdirSync(pathToTempOutputDir, {recursive: true});
-      executeNodeScript(
-        `${path.join(
-          RN_ROOT,
-          'scripts',
-          'generate-specs-cli.js',
-        )} --platform ios --schemaPath ${pathToSchema} --outputDir ${pathToTempOutputDir} --libraryName ${
-          library.config.name
-        } ${libraryTypeArg}`,
-      );
-
-      // Finally, copy artifacts to the final output directory.
-      fs.mkdirSync(pathToOutputDirIOS, {recursive: true});
-      execSync(`cp -R ${pathToTempOutputDir}/* ${pathToOutputDirIOS}`);
-      console.log(`[Codegen] Generated artifacts: ${pathToOutputDirIOS}`);
-
-      // Filter the react native core library out.
-      // In the future, core library and third party library should
-      // use the same way to generate/register the fabric components.
-      if (!isReactNativeCoreLibrary(library.config.name)) {
-        schemaPaths[library.config.name] = pathToSchema;
-      }
-    });
-
-    if (CODEGEN_FABRIC_ENABLED) {
-      console.log('\n\n>>>>> Creating component provider');
-      // Save the list of spec paths to a temp file.
-      const schemaListTmpPath = `${os.tmpdir()}/rn-tmp-schema-list.json`;
-      const fd = fs.openSync(schemaListTmpPath, 'w');
-      fs.writeSync(fd, JSON.stringify(schemaPaths));
-      fs.closeSync(fd);
-      console.log(`Generated schema list: ${schemaListTmpPath}`);
-
-      // Generate FabricComponentProvider.
-      // Only for iOS at this moment.
-      executeNodeScript(
-        `${path.join(
-          RN_ROOT,
-          'scripts',
-          'generate-provider-cli.js',
-        )} --platform ios --schemaListPath "${schemaListTmpPath}" --outputDir ${iosOutputDir}`,
-      );
-      console.log(`Generated provider in: ${iosOutputDir}`);
-    }
-  } catch (err) {
-    console.error(err);
-    process.exitCode = 1;
-  }
-
-  // 5. Done!
-  console.log('\n\n[Codegen] Done.');
-  return;
-}
 
 const appRoot = argv.path;
 const outputPath = argv.outputPath;
-main(appRoot, 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

@@ -68,7 +68,7 @@ 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() {
@@ -129,16 +129,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'),
   );
 }
 
@@ -158,7 +158,11 @@ function copyPodSpec() {
   );
 }
 
-function isOnAReleaseBranch() {
+function isTestingAgainstLocalHermesTarball() {
+  return 'HERMES_ENGINE_TARBALL_PATH' in process.env;
+}
+
+function isOnAReactNativeReleaseBranch() {
   try {
     let currentBranch = execSync('git rev-parse --abbrev-ref HEAD')
       .toString()
@@ -176,7 +180,7 @@ function isOnAReleaseBranch() {
   }
 }
 
-function isOnAReleaseTag() {
+function isOnAReactNativeReleaseTag() {
   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.
@@ -190,12 +194,17 @@ function isOnAReleaseTag() {
   return currentRemote.endsWith('facebook/react-native.git');
 }
 
-function shouldBuildHermesFromSource() {
+function isRequestingLatestCommitFromHermesMainBranch() {
   const hermesTag = readHermesTag();
+  return hermesTag === DEFAULT_HERMES_TAG;
+}
+
+function shouldBuildHermesFromSource() {
   return (
-    isOnAReleaseBranch() ||
-    isOnAReleaseTag() ||
-    hermesTag === DEFAULT_HERMES_TAG
+    !isTestingAgainstLocalHermesTarball() &&
+    (isOnAReactNativeReleaseBranch() ||
+      isOnAReactNativeReleaseTag() ||
+      isRequestingLatestCommitFromHermesMainBranch())
   );
 }
 

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/react-native-xcode.sh

@@ -74,25 +74,19 @@ 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 [[ -z "$USE_HERMES" && -f "$HERMES_CLI_PATH" ]]; then
-  echo "Enabling Hermes byte-code compilation. Disable with USE_HERMES=false if needed."
-  USE_HERMES=true
-fi
+HERMES_ENGINE_PATH="$PODS_ROOT/hermes-engine"
+[ -z "$HERMES_CLI_PATH" ] && HERMES_CLI_PATH="$HERMES_ENGINE_PATH/destroot/bin/hermesc"
 
-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 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 [[  -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
@@ -181,7 +175,6 @@ else
 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