react-native 0.88.0-rc.0 → 0.88.0-rc.2

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,
@@ -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,6 +85,7 @@
  */
 
 const {isValidScriptPhaseId, isValidScriptPhaseName} = require('./spm-utils');
+const {readSwiftpmConfig} = require('./swiftpm-config');
 const path = require('node:path');
 
 /*:: import type {
@@ -98,8 +99,8 @@ const path = require('node: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).`,
       );
     }