react-native-tvos 0.87.1-0 → 0.88.0-0rc2

package/scripts/setup-apple-spm.js

@@ -99,10 +99,18 @@ const {
   findInjectedXcodeproj,
   injectSpmIntoExistingXcodeproj,
   readArtifactsVersionOverride,
+  readMarker,
   readPinnedConfigCommand,
   removeSpmInjection,
 } = require('./spm/generate-spm-xcodeproj');
-const {scaffoldAll} = require('./spm/scaffold-package-swift');
+const {
+  MIN_IOS_VERSION_SUPPORTED,
+  resolveIosDeploymentTarget,
+} = require('./spm/ios-deployment-target');
+const {
+  refreshScaffoldedPlatformFloors,
+  scaffoldAll,
+} = require('./spm/scaffold-package-swift');
 const {
   RemoteVersionError,
   buildPerAppHeaderTree,
@@ -116,10 +124,10 @@ const {
   remotePackageConfig,
   runCodegenAndInstallTemplate,
 } = require('./spm/spm-utils');
-const {execFileSync} = require('child_process');
-const fs = require('fs');
-const path = require('path');
-const readline = require('readline');
+const {execFileSync} = require('node:child_process');
+const fs = require('node:fs');
+const path = require('node:path');
+const readline = require('node:readline');
 const yargs = require('yargs');
 
 const {log, warn: logError} = makeLogger('setup-apple-spm');
@@ -452,6 +460,7 @@ async function runScaffold(
   appRoot /*: string */,
   projectRoot /*: string */,
   reactNativeRoot /*: string */,
+  iosDeploymentTarget /*: string */,
 ) /*: Promise<void> */ {
   // Resolve the cache slot identifier so the scaffolded files carry it as
   // a comment — that's how SPM's manifest hash bumps on slot transitions.
@@ -472,6 +481,7 @@ async function runScaffold(
       projectRoot,
       reactNativeRoot,
       cacheSlotLabel,
+      iosDeploymentTarget,
       // Always force a re-render so re-running after editing a podspec picks
       // up the new content.
       force: true,
@@ -490,15 +500,27 @@ async function runScaffold(
 
   if (written.length > 0) {
     log(`Scaffolded Package.swift for ${written.length} dep(s):`);
+    // Silent for the outcomes that changed nothing ('already-set', 'skipped').
+    const nameOutcome = (outcome /*: ?string */) /*: string */ => {
+      if (outcome === 'created' || outcome === 'inserted') {
+        return " — also recorded 'swiftpmConfig.name' in its package.json";
+      }
+      if (outcome === 'failed') {
+        return " — could NOT record 'swiftpmConfig.name'; the manifest is written, the name is not";
+      }
+      return '';
+    };
     for (const r of written) {
-      log(`  • ${r.depName}`);
+      log(`  • ${r.depName}${nameOutcome(r.swiftpmName)}`);
     }
     log('');
     log(
       'node_modules is NOT committed and is wiped by `npm install`. To keep\n' +
         'these manifests, create and commit a patch with a tool like patch-package:\n' +
         '  • `npx patch-package <dep>` for each scaffolded dep, then commit the patch.\n' +
-        'Also consider asking the maintainer to ship a Package.swift upstream.\n' +
+        'The patch also captures any recorded `swiftpmConfig.name`, which is what\n' +
+        'lets the library be named without reading its podspec. Better still, ask the\n' +
+        'maintainer to ship both upstream.\n' +
         'Without a committed patch the build will hard-error again after a fresh install.',
     );
     log('');
@@ -776,6 +798,29 @@ function resolveInjectionTarget(
   return {path: path.join(appRoot, names[0])};
 }
 
+/** The app's own floor for every manifest this run generates, logged once. */
+function resolveAppIosDeploymentTarget(
+  args /*: SetupArgs */,
+  appRoot /*: string */,
+) /*: string */ {
+  const target = resolveInjectionTarget(args, appRoot);
+  const xcodeprojPath = target.path ?? null;
+  const read = resolveIosDeploymentTarget({
+    xcodeprojPath,
+    targetUuid:
+      xcodeprojPath != null ? readMarker(xcodeprojPath)?.targetUuid : null,
+    targetName: args.productName,
+  });
+  const value = read ?? MIN_IOS_VERSION_SUPPORTED;
+  const origin =
+    read != null && xcodeprojPath != null
+      ? `from ${path.basename(xcodeprojPath)}`
+      : // `sync` and `scaffold` don't otherwise surface why no project was picked.
+        `react-native default${target.error != null ? `; ${target.error}` : ''}`;
+  log(`iOS deployment target: ${value} (${origin})`);
+  return value;
+}
+
 /**
  * Inject SPM packages into the user's existing .xcodeproj, in place — the only
  * xcodeproj strategy (`add` and `update` both run this; there is no
@@ -1105,6 +1150,9 @@ async function main(argv /*:: ?: Array<string> */) /*: Promise<void> */ {
     }
     log(`Wrote ${path.relative(appRoot, autolinkingConfigResult.outputPath)}`);
   }
+  const iosDeploymentTarget /*: string */ = needsCliConfig
+    ? resolveAppIosDeploymentTarget(args, appRoot)
+    : MIN_IOS_VERSION_SUPPORTED;
   const reactNativeRoot = resolveReactNativeRoot(
     autolinkingConfigResult,
     projectRoot,
@@ -1148,6 +1196,8 @@ async function main(argv /*:: ?: Array<string> */) /*: Promise<void> */ {
         appRoot,
         '--react-native-root',
         reactNativeRoot,
+        '--ios-deployment-target',
+        iosDeploymentTarget,
       ]);
     } catch (e) {
       if (e instanceof MissingManifestError) {
@@ -1181,10 +1231,35 @@ async function main(argv /*:: ?: Array<string> */) /*: Promise<void> */ {
   // visible and fixed deliberately (scaffold + patch-package, or upstream).
   // Auto-scaffolding would silently hide that real error.
   if (action === 'scaffold') {
-    await runScaffold(args, appRoot, projectRoot, reactNativeRoot);
+    await runScaffold(
+      args,
+      appRoot,
+      projectRoot,
+      reactNativeRoot,
+      iosDeploymentTarget,
+    );
   }
 
   runCodegenStep(projectRoot, appRoot, reactNativeRoot, args.skipCodegen);
+
+  // A manifest scaffolded before the app's deployment target changed (or by a
+  // pre-v20 scaffolder) would pin a floor SwiftPM then refuses to link against.
+  if (
+    (action === 'add' || action === 'update') &&
+    autolinkingConfigResult != null
+  ) {
+    for (const refreshed of refreshScaffoldedPlatformFloors({
+      appRoot,
+      autolinkingJsonPath: autolinkingConfigResult.outputPath,
+      iosDeploymentTarget,
+    })) {
+      log(
+        `Refreshed platform floor in ${path.relative(appRoot, refreshed.path)}: ` +
+          `${refreshed.from} → ${refreshed.to}`,
+      );
+    }
+  }
+
   log('Generating build/generated/autolinking/Package.swift...');
   try {
     generateAutolinking([
@@ -1192,6 +1267,8 @@ async function main(argv /*:: ?: Array<string> */) /*: Promise<void> */ {
       appRoot,
       '--react-native-root',
       reactNativeRoot,
+      '--ios-deployment-target',
+      iosDeploymentTarget,
     ]);
   } catch (e) {
     if (e instanceof MissingManifestError) {
@@ -1276,6 +1353,7 @@ module.exports = {
   generateAutolinkingConfigOrFailClosed,
   parseArgs,
   resolveAction,
+  resolveAppIosDeploymentTarget,
   resolveConfigCommandToPin,
   resolveExplicitConfigCommand,
   shouldAutoDeintegrate,

package/scripts/spm/autolinking-plugins.js

@@ -85,7 +85,8 @@
  */
 
 const {isValidScriptPhaseId, isValidScriptPhaseName} = require('./spm-utils');
-const path = require('path');
+const {readSwiftpmConfig} = require('./swiftpm-config');
+const path = require('node:path');
 
 /*:: import type {
   AutolinkedDep,
@@ -98,8 +99,8 @@ const path = require('path');
 
 /**
  * Discover plugins declared by autolinked deps. `readConfig(root)` returns the
- * dep's parsed react-native.config.js (or null). `denyList` is the app's
- * `spm.denyPlugins` (npm names to skip). Fail-closed: a declared-but-missing
+ * dep's parsed react-native.config.js (or null), which is one of the two homes
+ * the plugin may be declared in. `denyList` is the app's `denyPlugins`. Fail-closed: a declared-but-missing
  * or unloadable plugin throws, naming the dep — a framework silently dropping
  * its modules is worse than a loud stop.
  */
@@ -114,15 +115,17 @@ function discoverPlugins(
     if (denied.has(dep.name)) {
       continue;
     }
-    const config = readConfig(dep.root);
     // $FlowFixMe[incompatible-use] config has a dynamic shape
-    const rel = config?.spm?.autolinkingPlugin;
+    const rel = readSwiftpmConfig(
+      dep.root,
+      readConfig(dep.root),
+    )?.autolinkingPlugin;
     if (rel == null) {
       continue;
     }
     if (typeof rel !== 'string' || rel.length === 0) {
       throw new Error(
-        `react-native spm: '${dep.name}' declares an invalid spm.autolinkingPlugin ` +
+        `react-native spm: '${dep.name}' declares an invalid 'swiftpmConfig.autolinkingPlugin' ` +
           `(expected a module path string).`,
       );
     }

package/scripts/spm/download-spm-artifacts.js

@@ -42,7 +42,17 @@
  * Per-artifact version overrides (mirrors existing env vars):
  *   HERMES_VERSION=<ver|nightly|latest-v1>
  *   RN_DEP_VERSION=<ver|nightly>
- *   ENTERPRISE_REPOSITORY=<url>   Custom Maven mirror (must match Maven structure)
+ *
+ * Repository selection:
+ *   Release tarballs are looked up on the React Native Maven mirror first,
+ *   with Maven Central as the fallback when the mirror doesn't have the
+ *   artifact (or errors). Nightlies/snapshots always come from Sonatype.
+ *   ENTERPRISE_REPOSITORY=<url>   Custom Maven repository (must match the
+ *                                 Maven structure). When set it is the ONLY
+ *                                 repository consulted (no mirror/Central).
+ *   RCT_REACT_NATIVE_MAVEN_MIRROR_ENABLED=false|0
+ *                                 Skip the mirror and go straight to Maven
+ *                                 Central.
  *
  * Output:
  *   <output>/React.xcframework/
@@ -57,10 +67,10 @@ const {
   makeLogger,
   sharedCacheDir,
 } = require('./spm-utils');
-const {execFileSync} = require('child_process');
-const fs = require('fs');
-const path = require('path');
-const stream = require('stream');
+const {execFileSync} = require('node:child_process');
+const fs = require('node:fs');
+const path = require('node:path');
+const stream = require('node:stream');
 const yargs = require('yargs');
 
 const {log, warn, die} = makeLogger('download-spm-artifacts');
@@ -128,36 +138,69 @@ function parseArgs(argv /*: Array<string> */) /*: DownloadArgs */ {
   };
 }
 
-const MAVEN_RELEASE =
-  process.env.ENTERPRISE_REPOSITORY ?? 'https://repo1.maven.org/maven2';
+const MAVEN_CENTRAL_REPOSITORY = 'https://repo1.maven.org/maven2';
+const REACT_NATIVE_MAVEN_MIRROR_REPOSITORY =
+  'https://repo.reactnative.dev/maven2';
 const MAVEN_SNAPSHOT =
   'https://central.sonatype.com/repository/maven-snapshots';
 
-function rnCoreReleaseUrl(
+/**
+ * The mirror is ON unless RCT_REACT_NATIVE_MAVEN_MIRROR_ENABLED is
+ * explicitly "false"/"0".
+ */
+function reactNativeMavenMirrorEnabled() /*: boolean */ {
+  const value = process.env.RCT_REACT_NATIVE_MAVEN_MIRROR_ENABLED;
+  if (value == null || value === '') {
+    return true;
+  }
+  return value.toLowerCase() !== 'false' && value !== '0';
+}
+
+/**
+ * Release repositories to try, in order.
+ * When ENTERPRISE_REPOSITORY is set it is the ONLY repository consulted.  
+ *
+ * Otherwise the React Native Maven mirror is kept before Maven Central so
+ * cached artifacts are tried first and Maven Central remains the fallback.
+ */
+function mavenRepositoryUrls() /*: Array<string> */ {
+  const enterpriseRepository = process.env.ENTERPRISE_REPOSITORY?.trim();
+  if (enterpriseRepository != null && enterpriseRepository !== '') {
+    return [enterpriseRepository.replace(/\/+$/, '')];
+  }
+  return reactNativeMavenMirrorEnabled()
+    ? [REACT_NATIVE_MAVEN_MIRROR_REPOSITORY, MAVEN_CENTRAL_REPOSITORY]
+    : [MAVEN_CENTRAL_REPOSITORY];
+}
+
+function rnCoreReleaseUrls(
   version /*: string */,
   flavor /*: string */,
-) /*: string */ {
-  return (
-    `${MAVEN_RELEASE}/com/facebook/react/react-native-artifacts/${version}/` +
-    `react-native-artifacts-${version}-reactnative-core-${flavor}.tar.gz`
+) /*: Array<string> */ {
+  return mavenRepositoryUrls().map(
+    repository =>
+      `${repository}/com/facebook/react/react-native-artifacts/${version}/` +
+      `react-native-artifacts-${version}-reactnative-core-${flavor}.tar.gz`,
   );
 }
-function rnDepsReleaseUrl(
+function rnDepsReleaseUrls(
   version /*: string */,
   flavor /*: string */,
-) /*: string */ {
-  return (
-    `${MAVEN_RELEASE}/com/facebook/react/react-native-artifacts/${version}/` +
-    `react-native-artifacts-${version}-reactnative-dependencies-${flavor}.tar.gz`
+) /*: Array<string> */ {
+  return mavenRepositoryUrls().map(
+    repository =>
+      `${repository}/com/facebook/react/react-native-artifacts/${version}/` +
+      `react-native-artifacts-${version}-reactnative-dependencies-${flavor}.tar.gz`,
   );
 }
-function hermesReleaseUrl(
+function hermesReleaseUrls(
   version /*: string */,
   flavor /*: string */,
-) /*: string */ {
-  return (
-    `${MAVEN_RELEASE}/com/facebook/hermes/hermes-ios/${version}/` +
-    `hermes-ios-${version}-hermes-ios-${flavor}.tar.gz`
+) /*: Array<string> */ {
+  return mavenRepositoryUrls().map(
+    repository =>
+      `${repository}/com/facebook/hermes/hermes-ios/${version}/` +
+      `hermes-ios-${version}-hermes-ios-${flavor}.tar.gz`,
   );
 }
 
@@ -319,11 +362,27 @@ async function exists(url /*: string */) /*: Promise<boolean> */ {
   }
 }
 
+/**
+ * Probes candidate URLs in order and returns the first one that exists
+ * (HTTP 200 on HEAD), or null when none do.
+ */
+async function firstExistingUrl(
+  candidates /*: Array<string> */,
+) /*: Promise<string | null> */ {
+  for (const url of candidates) {
+    if (await exists(url)) {
+      return url;
+    }
+  }
+  return null;
+}
+
 /**
  * Returns {url, version} for the React Native core xcframework tarball.
  * Resolution order:
- *   1. Stable release on Maven Central
- *   2. Snapshot build on Sonatype
+ *   1. Stable release on the RN Maven mirror
+ *   2. Stable release on Maven Central
+ *   3. Snapshot build on Sonatype
  */
 async function resolveRNCoreArtifact(
   version /*: string */,
@@ -344,12 +403,12 @@ async function resolveRNCoreArtifact(
     log(`  Using LOCAL core tarball: ${localTarball}`);
     return {url: localTarball, version: `${version}-local`};
   }
-  const releaseUrl = rnCoreReleaseUrl(version, flavor);
-  if (await exists(releaseUrl)) {
+  const releaseUrl = await firstExistingUrl(rnCoreReleaseUrls(version, flavor));
+  if (releaseUrl != null) {
     log(`  Using stable release: ${releaseUrl}`);
     return {url: releaseUrl, version};
   }
-  log(`  Release not found, trying snapshot...`);
+  log(`  Release not found in any Maven repository, trying snapshot...`);
   const snapshotUrl = await rnCoreSnapshotUrl(version, flavor);
   return {url: snapshotUrl, version};
 }
@@ -383,22 +442,21 @@ async function resolveRNDepsArtifact(
     version = await resolveNightlyVersion('react-native');
   }
 
-  const releaseUrl = rnDepsReleaseUrl(version, flavor);
-  if (await exists(releaseUrl)) {
+  const releaseUrl = await firstExistingUrl(rnDepsReleaseUrls(version, flavor));
+  if (releaseUrl != null) {
     log(`  Using stable release: ${releaseUrl}`);
     return {url: releaseUrl, version};
   }
-  log(`  Release not found, trying snapshot...`);
+  log(`  Release not found in any Maven repository, trying snapshot...`);
   const snapshotUrl = await rnDepsSnapshotUrl(version, flavor);
   return {url: snapshotUrl, version};
 }
 
 /**
  * Resolves the `hermes-compiler` npm package's version from THIS project's own
- * node_modules — the exact same lookup generate-spm-xcodeproj.js's
- * resolveHermesCliPathSetting() uses to find the hermesc binary that will
- * compile the JS bundle, and the same one react-native-xcode.sh falls back to
- * for SwiftPM builds. Returns null when the package isn't resolvable (e.g.
+ * node_modules — the same lookup react-native-xcode.sh falls back to for
+ * SwiftPM builds to find the hermesc binary that compiles the JS bundle.
+ * Returns null when the package isn't resolvable (e.g.
  * USE_HERMES=false apps that never installed it) so the caller can fall back
  * to the npm dist-tag lookup.
  */
@@ -440,8 +498,8 @@ function resolveLocalHermesCompilerVersion(
  *   HERMES_VERSION unset       → version pinned by the locally installed
  *                                hermes-compiler package (node_modules).
  *                                This is the SAME source
- *                                resolveHermesCliPathSetting() reads for
- *                                HERMES_CLI_PATH, so the downloaded VM and
+ *                                react-native-xcode.sh resolves hermesc
+ *                                from, so the downloaded VM and
  *                                the hermesc that compiles the JS bundle
  *                                always agree — a mismatched pair crashes at
  *                                launch with "Wrong bytecode version" (#57917).
@@ -479,12 +537,12 @@ async function resolveHermesArtifact(
     version = await resolveLatestV1Version();
   }
 
-  const releaseUrl = hermesReleaseUrl(version, flavor);
-  if (await exists(releaseUrl)) {
+  const releaseUrl = await firstExistingUrl(hermesReleaseUrls(version, flavor));
+  if (releaseUrl != null) {
     log(`  Using stable release: ${releaseUrl}`);
     return {url: releaseUrl, version};
   }
-  log(`  Release not found, trying snapshot...`);
+  log(`  Release not found in any Maven repository, trying snapshot...`);
   const snapshotUrl = await hermesSnapshotUrl(version, flavor);
   return {url: snapshotUrl, version};
 }
@@ -1451,9 +1509,12 @@ module.exports = {
   REQUIRED_ARTIFACTS,
   validateArtifactsCache,
   // Exposed for unit tests (pure / fetch-stubbable helpers).
-  rnCoreReleaseUrl,
-  rnDepsReleaseUrl,
-  hermesReleaseUrl,
+  mavenRepositoryUrls,
+  reactNativeMavenMirrorEnabled,
+  rnCoreReleaseUrls,
+  rnDepsReleaseUrls,
+  hermesReleaseUrls,
+  firstExistingUrl,
   resolveSnapshotUrl,
   resolveNightlyVersion,
   resolveLatestV1Version,