CR updates

Author: TMisiukiewicz

packages/cli-platform-ios/src/commands/runIOS/index.ts

@@ -53,13 +53,17 @@ async function runIOS(_: Array<string>, ctx: Config, args: FlagsT) {
     await resolvePods(ctx.root, ctx.dependencies, {
       forceInstall: args.forcePods,
     });
-  } else if (args.forcePods && !ctx.project.ios?.automaticPodsInstallation) {
+  } else if (args.forcePods) {
     logger.warn(
       `${chalk.bold(
         '--force-pods',
       )} has no effect because automatic CocoaPods installation is disabled. In order to use this flag, set ${chalk.bold(
         'project.ios.automaticPodsInstallation',
-      )} to true in ${chalk.bold('react-native.config.js')}.`,
+      )} to true in ${chalk.bold(
+        'react-native.config.js',
+      )}. For more information, see ${chalk.underline(
+        'https://github.com/react-native-community/cli/blob/main/docs/projects.md#projectiosautomaticpodsinstallation',
+      )}`,
     );
   }
 

packages/cli/package.json

@@ -35,6 +35,7 @@
     "@react-native-community/cli-types": "12.0.0-alpha.18",
     "chalk": "^4.1.2",
     "commander": "^9.4.1",
+    "deepmerge": "^4.3.0",
     "execa": "^5.0.0",
     "find-up": "^4.1.0",
     "fs-extra": "^8.1.0",
@@ -48,7 +49,6 @@
     "@types/hapi__joi": "^17.1.6",
     "@types/prompts": "^2.4.4",
     "@types/semver": "^6.0.2",
-    "deepmerge": "^4.3.0",
     "slash": "^3.0.0",
     "snapshot-diff": "^0.7.0"
   },

packages/cli/src/commands/init/init.ts

@@ -28,6 +28,7 @@ import {getBunVersionIfAvailable} from '../../tools/bun';
 import {getNpmVersionIfAvailable} from '../../tools/npm';
 import {getYarnVersionIfAvailable} from '../../tools/yarn';
 import {createHash} from 'crypto';
+import deepmerge from 'deepmerge';
 
 const DEFAULT_VERSION = 'latest';
 
@@ -270,6 +271,14 @@ function createTemplateUri(options: Options, version: string): string {
   return options.template || `react-native@${version}`;
 }
 
+/*
+Starting from 0.73, react-native.config.js is created by CLI during the init process.
+It contains automaticPodsInstallation flag set to true by default.
+This flag is used by CLI to determine whether to install CocoaPods dependencies when running ios commands or not.
+It's created by CLI rather than being a part of a template to avoid displaying this file in the Upgrade Helper,
+as it might bring confusion for existing projects where this change might not be applicable.
+For more details, see https://github.com/react-native-community/cli/blob/main/docs/projects.md#projectiosautomaticpodsinstallation
+*/
 function createDefaultConfigFile(directory: string) {
   const content = `module.exports = {
   project: {
@@ -281,11 +290,22 @@ function createDefaultConfigFile(directory: string) {
 `;
 
   const filepath = 'react-native.config.js';
-  if (!fs.existsSync(path.join(directory, filepath))) {
+  if (!doesDirectoryExist(path.join(directory, filepath))) {
     fs.createFileSync(filepath);
-  }
+    fs.writeFileSync(filepath, content, {encoding: 'utf-8'});
+  } else {
+    const tempFilePath = path.join(directory, 'tempConfig.js');
+    fs.writeFileSync(tempFilePath, content);
+    const cliConfigFile = require(tempFilePath);
+    const existingConfigFile = require(path.join(directory, filepath));
+
+    const mergedConfig = deepmerge(existingConfigFile, cliConfigFile);
 
-  fs.writeFileSync(filepath, content, {encoding: 'utf-8'});
+    fs.unlinkSync(tempFilePath);
+
+    const output = `module.exports = ${JSON.stringify(mergedConfig, null, 2)};`;
+    fs.writeFileSync(filepath, output, {encoding: 'utf-8'});
+  }
 }
 
 async function createProject(