fix shellToInvoke refresh missing reordered or unspaced attributes

Author: lazerg

packages/react-native/scripts/spm/__tests__/generate-spm-xcodeproj-test.js

@@ -176,6 +176,31 @@ describe('scheme pre-action', () => {
       updated,
     );
   });
+
+  it('refreshes shellToInvoke when it appears before scriptText', () => {
+    const reordered = generateXcscheme(
+      'MyApp',
+      'TARGET_UUID',
+      'MyApp',
+      'SCRIPT',
+    ).replace(
+      'scriptText = "SCRIPT"\n               shellToInvoke = "/bin/bash">',
+      'shellToInvoke = "/bin/bash"\n               scriptText = "SCRIPT">',
+    );
+    const updated = addPreActionToScheme(reordered, 'TARGET_UUID', 'SCRIPT');
+    expect(updated.match(/shellToInvoke/g)).toHaveLength(1);
+  });
+
+  it('refreshes shellToInvoke with no spaces around the equals sign', () => {
+    const unspaced = generateXcscheme(
+      'MyApp',
+      'TARGET_UUID',
+      'MyApp',
+      'SCRIPT',
+    ).replace('shellToInvoke = "/bin/bash"', 'shellToInvoke="/bin/bash"');
+    const updated = addPreActionToScheme(unspaced, 'TARGET_UUID', 'SCRIPT');
+    expect(updated.match(/shellToInvoke/g)).toHaveLength(1);
+  });
 });
 
 describe('sync scripts', () => {

packages/react-native/scripts/spm/generate-spm-xcodeproj.js

@@ -1898,12 +1898,19 @@ function addPreActionToScheme(
     // attribute names (default /bin/sh), independent of a
     // PBXShellScriptBuildPhase's own shellPath (see shellScriptPhase) — pin
     // it to bash too. `>` can't appear unescaped inside either attribute
-    // value, so it reliably closes the ActionContent open tag.
+    // value, so it reliably closes the ActionContent open tag. Search the
+    // whole open tag (not just after scriptText) and allow any spacing
+    // around `=`, since attribute order and formatting aren't guaranteed.
+    const contentOpenIdx = xmlWithScript.lastIndexOf(
+      '<ActionContent',
+      titleIdx,
+    );
     const contentCloseIdx = xmlWithScript.indexOf('>', stIdx);
-    const shellToInvokeMarker = 'shellToInvoke = "';
-    const stiIdx = xmlWithScript.indexOf(shellToInvokeMarker, valueStart);
-    if (stiIdx >= 0 && stiIdx < contentCloseIdx) {
-      const stiValueStart = stiIdx + shellToInvokeMarker.length;
+    const openTag = xmlWithScript.slice(contentOpenIdx, contentCloseIdx);
+    const stiMatch = openTag.match(/shellToInvoke\s*=\s*"/);
+    if (stiMatch != null) {
+      const stiValueStart =
+        contentOpenIdx + stiMatch.index + stiMatch[0].length;
       const stiValueEnd = xmlWithScript.indexOf('"', stiValueStart);
       xmlWithScript =
         xmlWithScript.slice(0, stiValueStart) +