feat(macos): merge React Native through the RedBox 2.0 cutoff

.changeset/config.json

@@ -6,7 +6,7 @@
   "changelog": "@changesets/cli/changelog",
   "commit": false,
   "fixed": [["react-native-macos", "@react-native-macos/virtualized-lists"]],
-  "ignore": [],
+  "ignore": ["react-native-macos", "@react-native/tester"],
   "privatePackages": {
     "version": false,
     "tag": false

.flowconfig

@@ -100,4 +100,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.303.0
+^0.311.0

.github/actions/build-fantom-runner/action.yml

@@ -0,0 +1,84 @@
+name: Build Fantom Runner
+inputs:
+  release-type:
+    required: true
+    description: The type of release we are building. It could be nightly, release or dry-run
+  gradle-cache-encryption-key:
+    description: "The encryption key needed to store the Gradle Configuration cache"
+
+runs:
+  using: composite
+  steps:
+    - name: Install dependencies
+      shell: bash
+      run: |
+        sudo apt update
+        sudo apt install -y git cmake openssl libssl-dev clang
+    - name: Setup git safe folders
+      shell: bash
+      run: git config --global --add safe.directory '*'
+    - name: Setup node.js
+      uses: ./.github/actions/setup-node
+    - name: Install node dependencies
+      uses: ./.github/actions/yarn-install
+    - name: Setup gradle
+      uses: ./.github/actions/setup-gradle
+      with:
+        cache-read-only: "false"
+        cache-encryption-key: ${{ inputs.gradle-cache-encryption-key }}
+    - name: Restore Fantom ccache
+      uses: actions/cache/restore@v5
+      with:
+        path: /github/home/.cache/ccache
+        key: v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-${{ hashFiles(
+            'packages/react-native/ReactAndroid/**/*.cpp',
+            'packages/react-native/ReactAndroid/**/*.h',
+            'packages/react-native/ReactAndroid/**/CMakeLists.txt',
+            'packages/react-native/ReactCommon/**/*.cpp',
+            'packages/react-native/ReactCommon/**/*.h',
+            'packages/react-native/ReactCommon/**/CMakeLists.txt',
+            'private/react-native-fantom/tester/**/*.cpp',
+            'private/react-native-fantom/tester/**/*.h',
+            'private/react-native-fantom/tester/**/CMakeLists.txt'
+          ) }}
+        restore-keys: |
+          v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-
+          v2-ccache-fantom-${{ github.job }}-
+          v2-ccache-fantom-
+    - name: Show ccache stats (before)
+      shell: bash
+      run: ccache -s -v
+    - name: Build Fantom Runner
+      shell: bash
+      run: yarn workspace @react-native/fantom build
+      env:
+        CC: clang
+        CXX: clang++
+    - name: Save Fantom ccache
+      if: ${{ github.ref == 'refs/heads/main' || contains(github.ref, '-stable') }}
+      uses: actions/cache/save@v5
+      with:
+        path: /github/home/.cache/ccache
+        key: v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-${{ hashFiles(
+            'packages/react-native/ReactAndroid/**/*.cpp',
+            'packages/react-native/ReactAndroid/**/*.h',
+            'packages/react-native/ReactAndroid/**/CMakeLists.txt',
+            'packages/react-native/ReactCommon/**/*.cpp',
+            'packages/react-native/ReactCommon/**/*.h',
+            'packages/react-native/ReactCommon/**/CMakeLists.txt',
+            'private/react-native-fantom/tester/**/*.cpp',
+            'private/react-native-fantom/tester/**/*.h',
+            'private/react-native-fantom/tester/**/CMakeLists.txt'
+          ) }}
+    - name: Show ccache stats (after)
+      shell: bash
+      run: ccache -s -v
+    - name: Copy shared libraries
+      shell: bash
+      run: cp packages/react-native/ReactAndroid/hermes-engine/build/hermes/lib/libhermesvm.so private/react-native-fantom/build/tester/
+    - name: Upload Fantom Runner binary
+      uses: actions/upload-artifact@v6
+      with:
+        name: fantom-runner-binary
+        compression-level: 1
+        path: private/react-native-fantom/build/tester/

.github/actions/maestro-android/action.yml

@@ -77,6 +77,7 @@ runs:
       if: always()
       with:
         name: e2e_android_${{ steps.normalize-app-id.outputs.app-id }}_report_${{ inputs.flavor }}_${{ inputs.emulator-arch }}_NewArch
+        overwrite: true
         path: |
           report.xml
           screen.mp4
@@ -85,4 +86,5 @@ runs:
       uses: actions/upload-artifact@v6
       with:
         name: maestro-logs-android-${{ steps.normalize-app-id.outputs.app-id }}-${{ inputs.flavor }}-${{ inputs.emulator-arch }}-NewArch
+        overwrite: true
         path: /tmp/MaestroLogs

.github/actions/maestro-ios/action.yml

@@ -69,6 +69,7 @@ runs:
       uses: actions/upload-artifact@v6
       with:
         name: e2e_ios_${{ inputs.app-id }}_report_${{ inputs.flavor }}_NewArch
+        overwrite: true
         path: |
           video_record_1.mov
           video_record_2.mov
@@ -81,4 +82,5 @@ runs:
       uses: actions/upload-artifact@v6
       with:
         name: maestro-logs-${{ inputs.app-id }}-${{ inputs.flavor }}-NewArch
+        overwrite: true
         path: /tmp/MaestroLogs

.github/actions/run-fantom-tests/action.yml

@@ -1,78 +1,49 @@
 name: Run Fantom Tests
-inputs:
-  release-type:
-    required: true
-    description: The type of release we are building. It could be nightly, release or dry-run
-  gradle-cache-encryption-key:
-    description: "The encryption key needed to store the Gradle Configuration cache"
-
 runs:
   using: composite
   steps:
-    - name: Install dependencies
+    - name: Install runtime dependencies
       shell: bash
       run: |
         sudo apt update
-        sudo apt install -y git cmake openssl libssl-dev clang
+        sudo apt install -y openssl libssl-dev
     - name: Setup git safe folders
       shell: bash
       run: git config --global --add safe.directory '*'
     - name: Setup node.js
       uses: ./.github/actions/setup-node
     - name: Install node dependencies
       uses: ./.github/actions/yarn-install
-    - name: Setup gradle
-      uses: ./.github/actions/setup-gradle
+    - name: Download Fantom Runner binary
+      uses: actions/download-artifact@v7
       with:
-        cache-read-only: "false"
-        cache-encryption-key: ${{ inputs.gradle-cache-encryption-key }}
-    - name: Restore Fantom ccache
-      uses: actions/cache/restore@v5
-      with:
-        path: /github/home/.cache/ccache
-        key: v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-${{ hashFiles(
-            'packages/react-native/ReactAndroid/**/*.cpp',
-            'packages/react-native/ReactAndroid/**/*.h',
-            'packages/react-native/ReactAndroid/**/CMakeLists.txt',
-            'packages/react-native/ReactCommon/**/*.cpp',
-            'packages/react-native/ReactCommon/**/*.h',
-            'packages/react-native/ReactCommon/**/CMakeLists.txt',
-            'private/react-native-fantom/tester/**/*.cpp',
-            'private/react-native-fantom/tester/**/*.h',
-            'private/react-native-fantom/tester/**/CMakeLists.txt'
-          ) }}
-        restore-keys: |
-          v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-
-          v2-ccache-fantom-${{ github.job }}-
-          v2-ccache-fantom-
-    - name: Show ccache stats
+        name: fantom-runner-binary
+        path: private/react-native-fantom/build/tester
+    - name: Make binary executable
       shell: bash
-      run: ccache -s -v
+      run: chmod +x private/react-native-fantom/build/tester/fantom_tester
     - name: Run Fantom Tests
       shell: bash
-      run: yarn fantom
+      run: |
+        for attempt in 1 2 3; do
+          echo "Attempt $attempt of 3"
+          if [ "$attempt" -eq 1 ]; then
+            if yarn fantom; then
+              exit 0
+            fi
+          else
+            if yarn fantom --onlyFailures; then
+              exit 0
+            fi
+          fi
+          if [ "$attempt" -lt 3 ]; then
+            echo "Attempt $attempt failed. Retrying only failed tests..."
+          fi
+        done
+        echo "All 3 attempts failed."
+        exit 1
       env:
-        CC: clang
-        CXX: clang++
-    - name: Save Fantom ccache
-      if: ${{ github.ref == 'refs/heads/main' || contains(github.ref, '-stable') }}
-      uses: actions/cache/save@v5
-      with:
-        path: /github/home/.cache/ccache
-        key: v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-${{ hashFiles(
-            'packages/react-native/ReactAndroid/**/*.cpp',
-            'packages/react-native/ReactAndroid/**/*.h',
-            'packages/react-native/ReactAndroid/**/CMakeLists.txt',
-            'packages/react-native/ReactCommon/**/*.cpp',
-            'packages/react-native/ReactCommon/**/*.h',
-            'packages/react-native/ReactCommon/**/CMakeLists.txt',
-            'private/react-native-fantom/tester/**/*.cpp',
-            'private/react-native-fantom/tester/**/*.h',
-            'private/react-native-fantom/tester/**/CMakeLists.txt'
-          ) }}
-    - name: Show ccache stats
-      shell: bash
-      run: ccache -s -v
+        LD_LIBRARY_PATH: ${{ github.workspace }}/private/react-native-fantom/build/tester
     - name: Upload test results
       if: ${{ always() }}
       uses: actions/upload-artifact@v6

.github/scripts/__tests__/publishing-contract.test.mjs

@@ -182,6 +182,10 @@ const repositoryRoot = new URL('../../../', import.meta.url).pathname;
 const releasePolicy = JSON.parse(readFileSync(join(repositoryRoot, '.changeset/config.json'), 'utf8'));
 const getReleasePlan = require('@changesets/get-release-plan').default;
 const semver = require('semver');
+// Stable preparation clears main's deferral of the unreleasable development graph.
+const stablePolicy = {...releasePolicy, baseBranch: `origin/${branch}`, ignore: []};
+// Older Changesets also requires private dependents of ignored packages here.
+const mainPolicy = {...releasePolicy, baseBranch: 'origin/main', ignore: [core, '@react-native/tester']};
 
 test('repository Changesets policy disables private versions and tags and fixes core with lists', () => {
   assert.deepEqual(releasePolicy.privatePackages, {version: false, tag: false});
@@ -194,27 +198,81 @@ test('repository Changesets policy follows the actual public and private workspa
   const listsPackage = workspaces.find(pkg => pkg.name === lists);
   assert.ok(corePackage && !corePackage.private, 'Missing public core workspace');
   assert.ok(listsPackage, 'Missing lists workspace');
-  const publicPackages = listsPackage.private ? [corePackage] : [corePackage, listsPackage];
+  const main = corePackage.version === '1000.0.0';
+  assert.deepEqual(releasePolicy.ignore, main ? mainPolicy.ignore : []);
+  assert.equal(releasePolicy.baseBranch, main ? 'origin/main'
+    : `origin/${semver.major(corePackage.version)}.${semver.minor(corePackage.version)}-stable`);
+  assert.equal(Boolean(listsPackage.private), main, 'Lists must be public on stable and private on main');
+  assert.equal(listsPackage.version, corePackage.version);
+  const publicPackages = [corePackage, listsPackage];
   // Derive expectations from manifests, never from the policy or release-plan output.
   const nextVersion = semver.inc(publicPackages.map(pkg => pkg.version).sort(semver.rcompare)[0], 'patch');
-  const expected = publicPackages.map(pkg => [pkg.name, nextVersion]).sort();
+  const expected = main ? [] : publicPackages.map(pkg => [pkg.name, nextVersion]).sort();
   const {root} = releaseFixture(t, {workspaces, config: releasePolicy});
   assert.deepEqual((await getReleasePlan(root)).releases, []);
   for (const changed of [core, lists]) {
     writeFileSync(join(root, '.changeset/fix.md'), `---\n"${changed}": patch\n---\n\nFix package.\n`);
     const bumped = (await getReleasePlan(root)).releases.filter(pkg => pkg.type !== 'none');
-    assert.deepEqual(bumped.map(pkg => [pkg.name, pkg.newVersion]).sort(),
-      changed === lists && listsPackage.private ? [] : expected);
+    assert.deepEqual(bumped.map(pkg => [pkg.name, pkg.newVersion]).sort(), expected);
   }
 });
 
+test('main defers the private runtime graph, preserves pending core changes, and releases them after stable preparation', async t => {
+  const workspaces = graph('1000.0.0');
+  workspaces[1].private = true;
+  workspaces[0].dependencies['@react-native/codegen'] = 'workspace:*';
+  workspaces.push({name: '@react-native/tester', version: '1000.0.0', private: true,
+    devDependencies: {[core]: 'workspace:*'}});
+  const {root} = releaseFixture(t, {workspaces, config: mainPolicy});
+  const coreChange = '---\n"react-native-macos": patch\n---\n\nFix core.\n';
+  writeFileSync(join(root, '.changeset/core.md'), coreChange);
+  writeFileSync(join(root, '.changeset/init.md'), '---\n"react-native-macos-init": patch\n---\n\nFix init.\n');
+  assert.deepEqual((await getReleasePlan(root)).releases.map(pkg => [pkg.name, pkg.newVersion]),
+    [['react-native-macos-init', '2.1.4']]);
+  const version = () => execFileSync(process.execPath, [require.resolve('@changesets/cli/bin.js'), 'version'], {
+    cwd: root, encoding: 'utf8', env: {...process.env, CI: 'true'},
+  });
+  version();
+  for (const [index, pkg] of workspaces.entries()) {
+    const expected = pkg.name === 'react-native-macos-init' ? {...pkg, version: '2.1.4'} : pkg;
+    assert.deepEqual(JSON.parse(readFileSync(join(root, `packages/p${index}/package.json`), 'utf8')), expected);
+  }
+  assert.equal(readFileSync(join(root, '.changeset/core.md'), 'utf8'), coreChange);
+  assert.deepEqual((await getReleasePlan(root)).releases, []);
+
+  // Model the committed stable preparation: public coupled versions and registry
+  // inputs for upstream packages, with no ignored public release packages.
+  workspaces[0].version = workspaces[1].version = '0.83.0';
+  workspaces[0].dependencies['@react-native/codegen'] = '0.83.1';
+  delete workspaces[1].private;
+  for (const index of [0, 1]) {
+    writeFileSync(join(root, `packages/p${index}/package.json`), JSON.stringify(workspaces[index]));
+  }
+  writeFileSync(join(root, '.changeset/config.json'), JSON.stringify(stablePolicy));
+  assert.deepEqual((await getReleasePlan(root)).releases.filter(pkg => pkg.type !== 'none').map(pkg => [pkg.name, pkg.newVersion]).sort(),
+    [[core, '0.83.1'], [lists, '0.83.1']].sort());
+  version();
+  for (const index of [0, 1]) {
+    const pkg = JSON.parse(readFileSync(join(root, `packages/p${index}/package.json`), 'utf8'));
+    assert.equal(pkg.version, '0.83.1');
+    assert.ok(!pkg.private);
+    assert.match(readFileSync(join(root, `packages/p${index}/CHANGELOG.md`), 'utf8'), /^## 0\.83\.1$/m);
+  }
+  for (const [index, pkg] of workspaces.entries()) {
+    if (pkg.private) {
+      assert.deepEqual(JSON.parse(readFileSync(join(root, `packages/p${index}/package.json`), 'utf8')), pkg);
+    }
+  }
+  assert.deepEqual((await getReleasePlan(root)).changesets, []);
+});
+
 test('repository Changesets policy accepts a private lists fixture and skips its release', async t => {
   const workspaces = graph('1000.0.0');
   workspaces[1].private = true;
   // A public package can use skipped private packages as development dependencies.
   workspaces[0].devDependencies = {[lists]: workspaces[0].dependencies[lists]};
   delete workspaces[0].dependencies[lists];
-  const {root} = releaseFixture(t, {workspaces, config: releasePolicy});
+  const {root} = releaseFixture(t, {workspaces, config: stablePolicy});
   assert.deepEqual((await getReleasePlan(root)).releases, []);
   writeFileSync(join(root, '.changeset/fix.md'), `---\n"${core}": patch\n---\n\nFix core.\n`);
   const bumped = (await getReleasePlan(root)).releases.filter(pkg => pkg.type !== 'none');
@@ -224,7 +282,7 @@ test('repository Changesets policy accepts a private lists fixture and skips its
 });
 
 test('repository Changesets policy couples public stable packages without registry or private release edges', async t => {
-  const {root, workspaces} = releaseFixture(t, {config: releasePolicy});
+  const {root, workspaces} = releaseFixture(t, {config: stablePolicy});
   for (const changed of [core, lists, '@react-native/codegen', 'react-native-macos-init']) {
     writeFileSync(join(root, '.changeset/fix.md'), `---\n"${changed}": patch\n---\n\nFix package.\n`);
     const releases = (await getReleasePlan(root)).releases.map(pkg => [pkg.name, pkg.newVersion]).sort();
@@ -641,6 +699,23 @@ test('every changed public package needs its own new nonempty version section',
   }
 });
 
+test('reconstructed HTML comments are not release evidence, but visible notes remain valid', async t => {
+  for (const comment of [
+    '<!-- first --><!-- second -->',
+    '<<!-- removed -->!-- hidden -->',
+    '<<!-- removed -->!-- hidden --<!-- removed -->>',
+    '<<<!---->!---->!-- hidden -->',
+  ]) {
+    for (const notes of ['', '- Visible release note.']) {
+      const fixture = preparedFixture(t, {editHead: ({writeChangelog}) => {
+        writeChangelog(0, `# Changelog\n\n## 0.83.2\n\n${comment}\n${notes}\n`);
+      }});
+      if (notes) assert.equal(await fixture.validate(), true);
+      else await assert.rejects(fixture.validate(), /Missing nonempty new changelog section/);
+    }
+  }
+});
+
 test('a new changelog file is valid, but an absent base manifest is not a version transition', async t => {
   const fixture = preparedFixture(t, {editBase: ({root}) => {
     for (const index of [0, 1]) rmSync(join(root, `packages/p${index}/CHANGELOG.md`));