feat: merge 0.84-merge into main

.ado/jobs/npm-publish.yml

@@ -1,6 +1,8 @@
 jobs:
 - job: NPMPublish
   displayName: NPM Publish
+  # Also disable direct template consumers until ADO publication is re-enabled.
+  condition: false
   pool:
     name: cxeiss-ubuntu-20-04-large
     image: cxe-ubuntu-20-04-1es-pt

.ado/publish.yml

@@ -51,5 +51,8 @@ extends:
     stages:
       - stage: NPM
         dependsOn: []
+        # GitHub Trusted Publishing owns releases. Retain the ADO publication
+        # path for explicit re-enablement after its contract/auth are reviewed.
+        condition: false
         jobs:
          - template: /.ado/jobs/npm-publish.yml@self

.ado/scripts/configure-publish.mts

@@ -1,237 +1,45 @@
 #!/usr/bin/env node
-import { $, argv, echo, fs } from 'zx';
-import { resolve } from 'node:path';
-
-const isGitHubActions = process.env['GITHUB_ACTIONS'] === 'true';
-
-const NPM_TAG_NEXT = 'next';
-
-export type ReleaseState = 'STABLE_IS_LATEST' | 'STABLE_IS_NEW' | 'STABLE_IS_OLD';
-
-export interface ReleaseStateInfo {
-  state: ReleaseState;
-  currentVersion: number;
-  latestVersion: number;
-  nextVersion: number;
-}
-
-export interface TagInfo {
-  npmTags: string[];
-  prerelease?: string;
-}
-
-interface Options {
-  'mock-branch'?: string;
-  tag?: string;
-  verbose?: boolean;
-}
-
-function enablePublishingOnAzurePipelines() {
-  echo(`##vso[task.setvariable variable=publish_react_native_macos]1`);
-}
-
-function enablePublishingOnGitHubActions() {
-  if (process.env['GITHUB_OUTPUT']) {
-    fs.appendFileSync(process.env['GITHUB_OUTPUT'], `publish_react_native_macos=1\n`);
-  }
-}
-
-export function isMainBranch(branch: string): boolean {
-  return branch === 'main';
-}
-
-export function isStableBranch(branch: string): boolean {
-  return /^\d+\.\d+-stable$/.test(branch);
-}
-
-export function versionToNumber(version: string): number {
-  const [major, minor] = version.split('-')[0].split('.');
-  return Number(major) * 1000 + Number(minor);
-}
-
-function getTargetBranch(): string | undefined {
-  // Azure Pipelines
-  if (process.env['TF_BUILD'] === 'True') {
-    const targetBranch = process.env['SYSTEM_PULLREQUEST_TARGETBRANCH'];
-    return targetBranch?.replace(/^refs\/heads\//, '');
-  }
-
-  // GitHub Actions
-  if (process.env['GITHUB_ACTIONS'] === 'true') {
-    return process.env['GITHUB_BASE_REF'];
-  }
-
-  return undefined;
-}
-
-async function getCurrentBranch(options: Options): Promise<string> {
-  const targetBranch = getTargetBranch();
-  if (targetBranch) {
-    return targetBranch;
-  }
-
-  // Azure DevOps Pipelines
-  if (process.env['TF_BUILD'] === 'True') {
-    const sourceBranch = process.env['BUILD_SOURCEBRANCHNAME'];
-    if (sourceBranch) {
-      return sourceBranch.replace(/^refs\/heads\//, '');
-    }
-  }
-
-  // GitHub Actions
-  if (process.env['GITHUB_ACTIONS'] === 'true') {
-    const headRef = process.env['GITHUB_HEAD_REF'];
-    if (headRef) return headRef;
-
-    const ref = process.env['GITHUB_REF'];
-    if (ref) return ref.replace(/^refs\/heads\//, '');
-  }
-
-  if (options['mock-branch']) {
-    return options['mock-branch'];
-  }
-
-  const result = await $`git rev-parse --abbrev-ref HEAD`;
-  return result.stdout.trim();
-}
-
-function getPublishedVersionSync(tag: 'latest' | 'next'): number {
-  const result = $.sync`npm view react-native-macos@${tag} version`;
-  return versionToNumber(result.stdout.trim());
-}
-
-export function getReleaseState(
-  branch: string,
-  getVersion: (tag: 'latest' | 'next') => number = getPublishedVersionSync,
-): ReleaseStateInfo {
-  if (!isStableBranch(branch)) {
-    throw new Error('Expected a stable branch');
-  }
-
-  const latestVersion = getVersion('latest');
-  const nextVersion = getVersion('next');
-  const currentVersion = versionToNumber(branch);
-
-  let state: ReleaseState;
-  if (currentVersion === latestVersion) {
-    state = 'STABLE_IS_LATEST';
-  } else if (currentVersion < latestVersion) {
-    state = 'STABLE_IS_OLD';
+import {execFileSync} from 'node:child_process';
+import {appendFileSync} from 'node:fs';
+import {parseArgs} from 'node:util';
+import {
+  createPublishPlan,
+  isStableBranch,
+  publishPrepared,
+  readChangesetStatus,
+  readWorkspaces,
+} from '../../.github/scripts/publishing-contract.mjs';
+
+const {values: options} = parseArgs({options: {
+  'mock-branch': {type: 'string'},
+  verbose: {type: 'boolean'},
+  publish: {type: 'boolean'},
+}});
+const branch = process.env.GITHUB_REF_NAME ?? process.env.BUILD_SOURCEBRANCHNAME ??
+  options['mock-branch'] ?? execFileSync('git', ['branch', '--show-current'], {encoding: 'utf8'}).trim();
+const isPullRequest = Boolean(process.env.GITHUB_BASE_REF ||
+  process.env.SYSTEM_PULLREQUEST_TARGETBRANCH || process.env.BUILD_REASON === 'PullRequest');
+
+function output(name: string, value: string) {
+  if (process.env.TF_BUILD === 'True') console.log(`##vso[task.setvariable variable=${name}]${value}`);
+  if (process.env.GITHUB_OUTPUT) appendFileSync(process.env.GITHUB_OUTPUT, `${name}=${value}\n`);
+}
+
+output('publish_react_native_macos', '0');
+if (!isStableBranch(branch) || isPullRequest) {
+  console.log(`Publication disabled for ${isPullRequest ? 'pull requests' : branch}`);
+} else {
+  const plan = await createPublishPlan({
+    branch,
+    status: await readChangesetStatus(),
+    workspaces: readWorkspaces(),
+  });
+  if (options.verbose) console.log(JSON.stringify(plan, null, 2));
+  output('publishTag', plan.tag ?? '');
+  if (plan.packages.length) {
+    output('publish_react_native_macos', '1');
+    if (options.publish) publishPrepared(plan);
   } else {
-    state = 'STABLE_IS_NEW';
-  }
-
-  return { state, currentVersion, latestVersion, nextVersion };
-}
-
-export function getPublishTags(
-  stateInfo: ReleaseStateInfo,
-  branch: string,
-  tag: string = NPM_TAG_NEXT,
-): TagInfo {
-  const { state, currentVersion, nextVersion } = stateInfo;
-
-  switch (state) {
-    case 'STABLE_IS_LATEST':
-      // Patching the current latest version
-      return { npmTags: ['latest', branch] };
-
-    case 'STABLE_IS_OLD':
-      // Patching an older stable version
-      return { npmTags: [branch] };
-
-    case 'STABLE_IS_NEW': {
-      if (tag === 'latest') {
-        // Promoting this branch to latest
-        const npmTags = ['latest', branch];
-        if (currentVersion > nextVersion) {
-          npmTags.push(NPM_TAG_NEXT);
-        }
-        return { npmTags };
-      }
-
-      // Publishing a release candidate
-      if (currentVersion < nextVersion) {
-        throw new Error(
-          `Current version cannot be a release candidate because it is too old: ${currentVersion} < ${nextVersion}`,
-        );
-      }
-
-      return { npmTags: [NPM_TAG_NEXT], prerelease: 'rc' };
-    }
-  }
-}
-
-async function enablePublishing(tagInfo: TagInfo, options: Options) {
-  const [primaryTag, ...additionalTags] = tagInfo.npmTags;
-
-  // Output publishTag for subsequent pipeline steps
-  echo(`##vso[task.setvariable variable=publishTag]${primaryTag}`);
-  if (process.env['GITHUB_OUTPUT']) {
-    fs.appendFileSync(process.env['GITHUB_OUTPUT'], `publishTag=${primaryTag}\n`);
-  }
-
-  // Output additional tags
-  if (additionalTags.length > 0) {
-    const tagsValue = additionalTags.join(',');
-    echo(`##vso[task.setvariable variable=additionalTags]${tagsValue}`);
-    if (process.env['GITHUB_OUTPUT']) {
-      fs.appendFileSync(process.env['GITHUB_OUTPUT'], `additionalTags=${tagsValue}\n`);
-    }
-  }
-
-  // Don't enable publishing in PRs
-  if (!getTargetBranch()) {
-    if (isGitHubActions) {
-      enablePublishingOnGitHubActions();
-    } else if (process.env['TF_BUILD'] === 'True') {
-      enablePublishingOnAzurePipelines();
-    } else {
-      echo('ℹ️ Local run — publishing not enabled');
-    }
-  }
-}
-
-const isDirectRun =
-  process.argv[1] != null &&
-  resolve(process.argv[1]) === new URL(import.meta.url).pathname;
-
-if (isDirectRun) {
-  // Parse CLI args using zx's argv (minimist)
-  const options: Options = {
-    'mock-branch': argv['mock-branch'] as string | undefined,
-    tag: typeof argv['tag'] === 'string' ? argv['tag'] : NPM_TAG_NEXT,
-    verbose: Boolean(argv['verbose']),
-  };
-
-  const branch = await getCurrentBranch(options);
-  if (!branch) {
-    echo('❌ Could not get current branch');
-    process.exit(1);
-  }
-
-  const log = options.verbose ? (msg: string) => echo(`ℹ️ ${msg}`) : () => {};
-
-  try {
-    if (isMainBranch(branch)) {
-      // Nightlies are currently disabled — skip publishing from main
-      echo('ℹ️ On main branch — nightly publishing is currently disabled');
-    } else if (isStableBranch(branch)) {
-      const stateInfo = getReleaseState(branch);
-      log(`react-native-macos@latest: ${stateInfo.latestVersion}`);
-      log(`react-native-macos@next: ${stateInfo.nextVersion}`);
-      log(`Current version: ${stateInfo.currentVersion}`);
-      log(`Release state: ${stateInfo.state}`);
-
-      const tagInfo = getPublishTags(stateInfo, branch, options.tag);
-      log(`Expected npm tags: ${tagInfo.npmTags.join(', ')}`);
-
-      await enablePublishing(tagInfo, options);
-    } else {
-      echo(`ℹ️ Branch '${branch}' is not main or a stable branch — skipping`);
-    }
-  } catch (e) {
-    echo(`❌ ${(e as Error).message}`);
-    process.exit(1);
+    console.log(plan.reason ?? 'All prepared versions are already published');
   }
 }

.changeset/config.json

@@ -2,8 +2,14 @@
   "$schema": "https://unpkg.com/@changesets/config@3.1.1/schema.json",
   "access": "public",
   "baseBranch": "origin/main",
+  "bumpVersionsWithWorkspaceProtocolOnly": true,
   "changelog": "@changesets/cli/changelog",
   "commit": false,
-  "ignore": [],
+  "fixed": [["react-native-macos", "@react-native-macos/virtualized-lists"]],
+  "ignore": ["react-native-macos", "@react-native/tester"],
+  "privatePackages": {
+    "version": false,
+    "tag": false
+  },
   "linked": []
 }

.eslintignore

@@ -13,6 +13,7 @@ packages/*/dist
 packages/*/types_generated
 packages/debugger-frontend/dist/**/*
 packages/react-native-codegen/lib
+private/react-native-codegen-typescript-test/lib/**/*
 **/Pods/*
 **/*.macos.js
 **/*.windows.js

.flowconfig

@@ -74,7 +74,7 @@ module.name_mapper='^@react-native/fantom$' -> '<PROJECT_ROOT>/private/react-nat
 module.name_mapper='^@react-native/fantom/\(.*\)$' -> '<PROJECT_ROOT>/private/react-native-fantom/\1'
 module.name_mapper='^@react-native/core-cli-utils$' -> '<PROJECT_ROOT>/packages/core-cli-utils/src/index.flow.js'
 ; macOS]
-module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\|xml\|ktx\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'
+module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\|xml\|ktx\|heic\|heif\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'
 
 module.system.haste.module_ref_prefix=m#
 
@@ -103,4 +103,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.289.0
+^0.295.0