Iterate on the fix

Author: antonis

dev-packages/e2e-tests/cli.mjs

@@ -189,6 +189,14 @@ if (actions.includes('create')) {
       env: env,
     });
 
+    // Clean Pods to ensure CocoaPods reads the patched podspec
+    if (fs.existsSync(`${appDir}/ios/Pods`)) {
+      fs.rmSync(`${appDir}/ios/Pods`, { recursive: true });
+    }
+    if (fs.existsSync(`${appDir}/ios/Podfile.lock`)) {
+      fs.rmSync(`${appDir}/ios/Podfile.lock`);
+    }
+
     if (fs.existsSync(`${appDir}/Gemfile`)) {
       execSync(`bundle install`, { stdio: 'inherit', cwd: appDir, env: env });
       execSync('bundle exec pod install --repo-update', { stdio: 'inherit', cwd: `${appDir}/ios`, env: env });

dev-packages/e2e-tests/patch-scripts/rn.patch.launch-arguments.js

@@ -56,16 +56,33 @@ debug.log('Patching react-native-launch-arguments podspec', podspecPath);
 
 if (fs.existsSync(podspecPath)) {
   const podspec = fs.readFileSync(podspecPath, 'utf8');
+  debug.log('Found podspec, checking for React dependency...');
+
   const isPatched = podspec.includes("s.dependency 'React-Core'") || podspec.includes('s.dependency "React-Core"');
-  if (!isPatched) {
-    const patched = podspec
-      .replace(/s\.dependency\s+['"]React['"]/g, "s.dependency 'React-Core'")
-      .replace(/s\.dependency\s+['"]React\/Core['"]/g, "s.dependency 'React-Core'");
+  const hasReactDep = /s\.dependency\s+['"]React['"]/.test(podspec);
+  const hasReactCoreDep = /s\.dependency\s+['"]React\/Core['"]/.test(podspec);
+
+  debug.log(`Podspec status: isPatched=${isPatched}, hasReactDep=${hasReactDep}, hasReactCoreDep=${hasReactCoreDep}`);
+
+  if (!isPatched && (hasReactDep || hasReactCoreDep)) {
+    let patched = podspec;
+
+    if (hasReactDep) {
+      debug.log("Replacing s.dependency 'React' with s.dependency 'React-Core'");
+      patched = patched.replace(/s\.dependency\s+['"]React['"]/g, "s.dependency 'React-Core'");
+    }
+
+    if (hasReactCoreDep) {
+      debug.log("Replacing s.dependency 'React/Core' with s.dependency 'React-Core'");
+      patched = patched.replace(/s\.dependency\s+['"]React\/Core['"]/g, "s.dependency 'React-Core'");
+    }
 
     fs.writeFileSync(podspecPath, patched);
     debug.log('Patched react-native-launch-arguments podspec successfully!');
-  } else {
+  } else if (isPatched) {
     debug.log('react-native-launch-arguments podspec is already patched!');
+  } else {
+    debug.log('Podspec does not contain React dependency - may use install_modules_dependencies');
   }
 } else {
   debug.log('podspec not found, skipping iOS patch');