react-native-tvos 0.82.1-0 → 0.83.0-0

package/scripts/codegen/codegen-utils.js

@@ -30,7 +30,7 @@ function getCodegen() /*: $FlowFixMe */ {
     RNCodegen = require('@react-native/codegen/lib/generators/RNCodegen.js');
   }
   if (!RNCodegen) {
-    throw 'RNCodegen not found.';
+    throw new Error('RNCodegen not found.');
   }
   return RNCodegen;
 }
@@ -45,7 +45,7 @@ function getCombineJSToSchema() /*: $FlowFixMe */ {
     combineJSToSchema = require('@react-native/codegen/lib/cli/combine/combine-js-to-schema.js');
   }
   if (!combineJSToSchema) {
-    throw 'combine-js-to-schema not found.';
+    throw new Error('combine-js-to-schema not found.');
   }
   return combineJSToSchema;
 }

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

@@ -0,0 +1,44 @@
+/**
+ * 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.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+const {TEMPLATES_FOLDER_PATH} = require('./constants');
+const {codegenLog} = require('./utils');
+const fs = require('fs');
+const path = require('path');
+
+const PACKAGE_SWIFT_TEMPLATE_PATH = path.join(
+  TEMPLATES_FOLDER_PATH,
+  'Package.swift.template',
+);
+
+function generatePackageSwift(
+  projectRoot /*: string */,
+  outputDir /*: string */,
+  reactNativePath /*: string */,
+) {
+  const fullOutputPath = path.join(projectRoot, outputDir);
+  fs.mkdirSync(outputDir, {recursive: true});
+  // Generate PAckage.swift File
+  codegenLog('Generating Package.swift');
+  const templateH = fs
+    .readFileSync(PACKAGE_SWIFT_TEMPLATE_PATH, 'utf8')
+    .replace(
+      /{reactNativePath}/,
+      path.relative(fullOutputPath, reactNativePath),
+    );
+  const finalPathH = path.join(outputDir, 'Package.swift');
+  fs.writeFileSync(finalPathH, templateH);
+  codegenLog(`Generated artifact: ${finalPathH}`);
+}
+
+module.exports = {
+  generatePackageSwift,
+};

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

@@ -59,6 +59,11 @@ function getInputFiles(appPath /*: string */, appPkgJson /*: $FlowFixMe */) {
         !projectPath.includes('/Pods/') && // exclude Pods/Pods.xcodeproj
         !projectPath.includes('/node_modules/'), // exclude all the xcodeproj in node_modules of libraries
     )[0];
+  if (!xcodeproj) {
+    throw new Error(
+      `Cannot find .xcodeproj file inside ${appPath}. 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} \\)`;
@@ -71,14 +76,18 @@ function getInputFiles(appPath /*: string */, appPkgJson /*: $FlowFixMe */) {
   return `[${list}]`;
 }
 
-function codegenScripts(appPath /*: string */, outputPath /*: string */) {
-  const relativeAppPath = path.relative(outputPath, appPath);
+function codegenScripts(appPath /*: string */, baseOutputPath /*: string */) {
+  const relativeAppPath = path.relative(baseOutputPath, appPath);
+  const relativeReactNativeRootFolder = path.relative(
+    baseOutputPath,
+    REACT_NATIVE_PACKAGE_ROOT_FOLDER,
+  );
   return `<<-SCRIPT
 pushd "$PODS_ROOT/../" > /dev/null
 RCT_SCRIPT_POD_INSTALLATION_ROOT=$(pwd)
 popd >/dev/null
 
-export RCT_SCRIPT_RN_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT/${path.relative(outputPath, REACT_NATIVE_PACKAGE_ROOT_FOLDER)}"
+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}"
 export RCT_SCRIPT_OUTPUT_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT"
 export RCT_SCRIPT_TYPE="withCodegenDiscovery"

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

@@ -22,6 +22,7 @@ const {
 } = require('./generateAppDependencyProvider');
 const {generateCustomURLHandlers} = require('./generateCustomURLHandlers');
 const {generateNativeCode} = require('./generateNativeCode');
+const {generatePackageSwift} = require('./generatePackageSwift');
 const {generateRCTModuleProviders} = require('./generateRCTModuleProviders');
 const {
   generateRCTThirdPartyComponents,
@@ -37,6 +38,7 @@ const {
   codegenLog,
   findCodegenEnabledLibraries,
   findDisabledLibrariesByPlatform,
+  findReactNativeRootPath,
   pkgJsonIncludesGeneratedCode,
   readPkgJsonInDirectory,
   readReactNativeConfig,
@@ -61,7 +63,7 @@ const path = require('path');
 function execute(
   projectRoot /*: string */,
   targetPlatform /*: string */,
-  baseOutputPath /*: string */,
+  optionalBaseOutputPath /*: ?string */,
   source /*: string */,
   runReactNativeCodegen /*: boolean */ = true,
 ) {
@@ -86,25 +88,35 @@ function execute(
       buildCodegenIfNeeded();
     }
 
-    const reactNativeConfig = readReactNativeConfig(
-      projectRoot,
-      baseOutputPath,
-    );
-    const codegenEnabledLibraries = findCodegenEnabledLibraries(
-      pkgJson,
-      projectRoot,
-      baseOutputPath,
-      reactNativeConfig,
-    );
-
-    if (codegenEnabledLibraries.length === 0) {
-      codegenLog('No codegen-enabled libraries found.', true);
-    }
-
-    let platforms =
+    const platforms =
       targetPlatform === 'all' ? supportedPlatforms : [targetPlatform];
 
+    // NOTE: We cache the external libraries search (which may not run) across platforms to not change previous behaviour
+    const externalLibrariesCache /*: { current?: ?Array<$FlowFixMe> } */ = {};
+
     for (const platform of platforms) {
+      // NOTE: This needs to be computed per-platform since `platform` can alter the path via a `package.json:codegenConfig.outputDir[platform]` override
+      const baseOutputPath = computeBaseOutputPath(
+        projectRoot,
+        optionalBaseOutputPath,
+        pkgJson,
+        platform,
+      );
+      const reactNativeConfig = readReactNativeConfig(
+        projectRoot,
+        baseOutputPath,
+      );
+      const codegenEnabledLibraries = findCodegenEnabledLibraries(
+        pkgJson,
+        projectRoot,
+        baseOutputPath,
+        reactNativeConfig,
+        externalLibrariesCache,
+      );
+      if (codegenEnabledLibraries.length === 0) {
+        codegenLog('No codegen-enabled libraries found.', true);
+      }
+
       const disabledLibraries = findDisabledLibrariesByPlatform(
         reactNativeConfig,
         platform,
@@ -120,10 +132,15 @@ function execute(
         platform,
       );
 
+      const reactCodegenOutputPath =
+        platform === 'android'
+          ? outputPath
+          : path.join(outputPath, 'ReactCodegen');
+
       if (runReactNativeCodegen) {
         const schemaInfos = generateSchemaInfos(libraries);
         generateNativeCode(
-          outputPath,
+          reactCodegenOutputPath,
           schemaInfos.filter(schemaInfo =>
             mustGenerateNativeCode(projectRoot, schemaInfo),
           ),
@@ -134,26 +151,39 @@ function execute(
 
       if (source === 'app' && platform !== 'android') {
         // These components are only required by apps, not by libraries and are Apple specific.
-        generateRCTThirdPartyComponents(libraries, outputPath);
-        generateRCTModuleProviders(projectRoot, pkgJson, libraries, outputPath);
-        generateCustomURLHandlers(libraries, outputPath);
+        generateRCTThirdPartyComponents(libraries, reactCodegenOutputPath);
+        generateRCTModuleProviders(
+          projectRoot,
+          pkgJson,
+          libraries,
+          reactCodegenOutputPath,
+        );
+        generateCustomURLHandlers(libraries, reactCodegenOutputPath);
         generateUnstableModulesRequiringMainQueueSetupProvider(
           libraries,
-          outputPath,
+          reactCodegenOutputPath,
+        );
+        generateAppDependencyProvider(
+          path.join(outputPath, 'ReactAppDependencyProvider'),
         );
-        generateAppDependencyProvider(outputPath);
         generateReactCodegenPodspec(
           projectRoot,
           pkgJson,
-          outputPath,
+          reactCodegenOutputPath,
           baseOutputPath,
         );
+        generatePackageSwift(
+          projectRoot,
+          outputPath,
+          findReactNativeRootPath(projectRoot),
+        );
       }
 
       cleanupEmptyFilesAndFolders(outputPath);
     }
   } catch (err) {
     codegenLog(err);
+    codegenLog(err.stack);
     process.exitCode = 1;
   }
 
@@ -182,22 +212,38 @@ function readOutputDirFromPkgJson(
   return null;
 }
 
-function computeOutputPath(
+function computeBaseOutputPath(
   projectRoot /*: string */,
-  baseOutputPath /*: string */,
+  optionalBaseOutputPath /*: ?string */,
   pkgJson /*: $FlowFixMe */,
   platform /*: string */,
 ) {
-  if (baseOutputPath == null) {
+  if (
+    process.env.RCT_SCRIPT_OUTPUT_DIR != null &&
+    process.env.RCT_SCRIPT_OUTPUT_DIR.length > 0
+  ) {
+    return process.env.RCT_SCRIPT_OUTPUT_DIR;
+  }
+  let baseOutputPath /*: string */;
+  if (optionalBaseOutputPath == null) {
     const outputDirFromPkgJson = readOutputDirFromPkgJson(pkgJson, platform);
     if (outputDirFromPkgJson != null) {
-      // $FlowFixMe[reassign-const]
       baseOutputPath = path.join(projectRoot, outputDirFromPkgJson);
     } else {
-      // $FlowFixMe[reassign-const]
       baseOutputPath = projectRoot;
     }
+  } else {
+    baseOutputPath = optionalBaseOutputPath;
   }
+  return baseOutputPath;
+}
+
+function computeOutputPath(
+  projectRoot /*: string */,
+  baseOutputPath /*: string */,
+  pkgJson /*: $FlowFixMe */,
+  platform /*: string */,
+) /*: string */ {
   if (pkgJsonIncludesGeneratedCode(pkgJson)) {
     // Don't create nested directories for libraries to make importing generated headers easier.
     return baseOutputPath;

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

@@ -38,7 +38,7 @@ const codegenLog = (text /*: string */, info /*: boolean */ = false) => {
 function readPkgJsonInDirectory(dir /*: string */) /*: $FlowFixMe */ {
   const pkgJsonPath = path.join(dir, 'package.json');
   if (!fs.existsSync(pkgJsonPath)) {
-    throw `[Codegen] Error: ${pkgJsonPath} does not exist.`;
+    throw new Error(`[Codegen] Error: ${pkgJsonPath} does not exist.`);
   }
   return JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
 }
@@ -98,9 +98,11 @@ function cleanupEmptyFilesAndFolders(filepath /*: string */) {
 }
 
 function readGeneratedAutolinkingOutput(
+  projectRoot /*: string */,
   baseOutputPath /*: string */,
 ) /*: $FlowFixMe */ {
   // NOTE: Generated by scripts/cocoapods/autolinking.rb in list_native_modules (called by use_native_modules)
+  // The `baseOutputPath` is based on a CLI argument and optional
   const autolinkingGeneratedPath = path.resolve(
     baseOutputPath,
     'build/generated/autolinking/autolinking.json',
@@ -120,7 +122,10 @@ function readReactNativeConfig(
   projectRoot /*: string */,
   baseOutputPath /*: string */,
 ) /*: $FlowFixMe */ {
-  const autolinkingOutput = readGeneratedAutolinkingOutput(baseOutputPath);
+  const autolinkingOutput = readGeneratedAutolinkingOutput(
+    projectRoot,
+    baseOutputPath,
+  );
   const rnConfigFilePath = path.resolve(projectRoot, 'react-native.config.js');
   if (autolinkingOutput) {
     return autolinkingOutput;
@@ -141,6 +146,7 @@ function findCodegenEnabledLibraries(
   projectRoot /*: string */,
   baseOutputPath /*: string */,
   reactNativeConfig /*: $FlowFixMe */,
+  externalLibrariesCache /*: { current?: ?Array<$FlowFixMe> } */ = {},
 ) /*: Array<$FlowFixMe> */ {
   const projectLibraries = findProjectRootLibraries(pkgJson, projectRoot);
   if (pkgJsonIncludesGeneratedCode(pkgJson)) {
@@ -149,8 +155,14 @@ function findCodegenEnabledLibraries(
     const libraries = [...projectLibraries];
     // If we ran autolinking, we shouldn't try to run our own "autolinking-like"
     // library discovery
-    if (!readGeneratedAutolinkingOutput(baseOutputPath)) {
-      libraries.push(...findExternalLibraries(pkgJson, projectRoot));
+    if (!readGeneratedAutolinkingOutput(projectRoot, baseOutputPath)) {
+      const externalLibraries =
+        externalLibrariesCache.current ??
+        (externalLibrariesCache.current = findExternalLibraries(
+          pkgJson,
+          projectRoot,
+        ));
+      libraries.push(...externalLibraries);
     }
     libraries.push(
       ...findLibrariesFromReactNativeConfig(projectRoot, reactNativeConfig),
@@ -174,7 +186,7 @@ function findProjectRootLibraries(
   }
 
   if (typeof pkgJson.codegenConfig !== 'object') {
-    throw 'The "codegenConfig" field must be an Object.';
+    throw new Error('The "codegenConfig" field must be an Object.');
   }
 
   return extractLibrariesFromJSON(pkgJson, projectRoot);
@@ -266,7 +278,8 @@ function findExternalLibraries(
           pkgJson.dependencies[dependency],
           'package.json',
         );
-      } else {
+      }
+      if (!configFilePath) {
         return [];
       }
     }
@@ -462,6 +475,30 @@ function findDisabledLibrariesByPlatform(
   );
 }
 
+function findReactNativeRootPath(projectRoot /* : string */) /* : string */ {
+  let reactNativePackageJsonPath;
+  try {
+    reactNativePackageJsonPath = require.resolve(
+      path.join('react-native', 'package.json'),
+      {
+        paths: [projectRoot],
+      },
+    );
+    return path.dirname(reactNativePackageJsonPath);
+  } catch (e) {}
+  try {
+    reactNativePackageJsonPath = require.resolve(
+      path.join('react-native-tvos', 'package.json'),
+      {
+        paths: [projectRoot],
+      },
+    );
+    return path.dirname(reactNativePackageJsonPath);
+  } catch (e) {
+    throw new Error(e);
+  }
+}
+
 module.exports = {
   buildCodegenIfNeeded,
   pkgJsonIncludesGeneratedCode,
@@ -475,4 +512,5 @@ module.exports = {
   parseiOSAnnotations,
   readReactNativeConfig,
   findDisabledLibrariesByPlatform,
+  findReactNativeRootPath,
 };

package/scripts/codegen/templates/Package.swift.template

@@ -0,0 +1,59 @@
+// swift-tools-version: 6.1
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "React-GeneratedCode",
+    platforms: [.iOS(.v15), .macCatalyst(SupportedPlatform.MacCatalystVersion.v13)],
+    products: [
+        // Products define the executables and libraries a package produces, making them visible to other packages.
+        .library(
+            name: "ReactCodegen",
+            targets: ["ReactCodegen"]),
+        .library(
+            name: "ReactAppDependencyProvider",
+            targets: ["ReactAppDependencyProvider"]),
+    ],
+    dependencies: [
+      .package(name: "React", path: "{reactNativePath}")
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
+        // Targets can depend on other targets in this package and products from dependencies.
+        .target(
+            name: "ReactCodegen",
+            dependencies: ["React"],
+            path: "ReactCodegen",
+            exclude: ["ReactCodegen.podspec"],
+            publicHeadersPath: ".",
+            cSettings: [
+              .headerSearchPath("headers")
+            ],
+            cxxSettings: [
+              .headerSearchPath("headers"),
+              .unsafeFlags(["-std=c++20"]),
+            ],
+            linkerSettings: [
+              .linkedFramework("Foundation")
+            ]
+        ),
+        .target(
+          name: "ReactAppDependencyProvider",
+          dependencies: ["ReactCodegen"],
+          path: "ReactAppDependencyProvider",
+          exclude: ["ReactAppDependencyProvider.podspec"],
+          publicHeadersPath: ".",
+          cSettings: [
+            .headerSearchPath("headers"),
+          ],
+          cxxSettings: [
+            .headerSearchPath("headers"),
+            .unsafeFlags(["-std=c++20"]),
+          ],
+          linkerSettings: [
+            .linkedFramework("Foundation")
+          ]
+        )
+    ]
+)