Toggle the new Android prop diffing mechanism for components

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

@@ -20,8 +20,6 @@ runs:
     - name: Set React Native Version
       shell: bash
       run: node ./scripts/releases/set-rn-artifacts-version.js --build-type ${{ inputs.release-type }}
-      # We don't want to re-set the artifacts version if we're on the release branch.
-      if: ${{ !contains(github.ref, '-stable') }}
     - name: Setup gradle
       uses: ./.github/actions/setup-gradle
       with:

.github/workflow-scripts/publishTemplate.js

@@ -68,6 +68,10 @@ module.exports.verifyPublishedTemplate = async (
   latest = false,
   retries = MAX_RETRIES,
 ) => {
+  if (version.startsWith('v')) {
+    version = version.slice(1);
+  }
+
   log(`🔍 Is ${TEMPLATE_NPM_PKG}@${version} on npm?`);
 
   let count = retries;
@@ -86,7 +90,7 @@ module.exports.verifyPublishedTemplate = async (
         return;
       }
       log(
-        `🐌 ${TEMPLATE_NPM_PKG}@latest → ${pkg.version} on npm and not ${version} as expected, retrying...`,
+        `🐌 ${TEMPLATE_NPM_PKG}@latest → ${json.version} on npm and not ${version} as expected, retrying...`,
       );
     } catch (e) {
       log(`Nope, fetch failed: ${e.message}`);

.github/workflows/test-all.yml

@@ -157,7 +157,7 @@ jobs:
           react-native-version: ${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
 
   test_ios_rntester:
-    runs-on: macos-13
+    runs-on: macos-13-large
     needs:
       [build_apple_slices_hermes, prepare_hermes_workspace, build_hermes_macos]
     env:
@@ -369,6 +369,11 @@ jobs:
             sed -i 's/newArchEnabled=true/newArchEnabled=false/' android/gradle.properties
           fi
 
+          if [[ ${{matrix.jsengine}} == "JSC" ]]; then
+            echo "Using JSC instead of Hermes"
+            sed -i 's/hermesEnabled=true/hermesEnabled=false/' android/gradle.properties
+          fi
+
           # Build
           cd android
           CAPITALIZED_FLAVOR=$(echo "${{ matrix.flavor }}" | awk '{print toupper(substr($0, 1, 1)) substr($0, 2)}')

Gemfile

@@ -6,3 +6,4 @@ ruby ">= 2.6.10"
 gem 'cocoapods', '~> 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
 gem 'xcodeproj', '< 1.26.0'
+gem 'concurrent-ruby', '< 1.3.4'

build.gradle.kts

@@ -7,7 +7,7 @@
 
 plugins {
   alias(libs.plugins.nexus.publish)
-  alias(libs.plugins.android.library) apply false
+  id(libs.plugins.android.library.get().pluginId) version libs.plugins.android.library.get().version.requiredVersion apply false
   alias(libs.plugins.android.application) apply false
   alias(libs.plugins.download) apply false
   alias(libs.plugins.kotlin.android) apply false

discord/bump_version.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+
+from pathlib import Path
+from typing import List
+import re
+import subprocess
+import sys
+
+
+def check_output(args: List[str]) -> str:
+    return subprocess.check_output(args).decode('utf-8').strip()
+
+
+VERSION_MATCHER = re.compile(r'^(.*)-discord-(\d*)$')
+
+status = check_output(['git', 'status', '--porcelain'])
+if status != '':
+    print('Detected changed files, please remove or commit them first.\n')
+    print(status)
+    sys.exit(1)
+
+
+root = check_output(['git', 'rev-parse', '--show-toplevel'])
+android_path = Path(root) / "ReactAndroid"
+props_path = android_path / "gradle.properties"
+
+version = None
+property_lines = [line.strip() for line in props_path.read_text().splitlines()]
+for line in property_lines:
+    if line.startswith("VERSION_NAME="):
+        version = line.split('=')[1]
+
+assert version, "unable to find current version"
+
+matches = VERSION_MATCHER.match(version)
+assert matches, f'{version} did not match expected format, X.Y.Z-discord-N'
+
+upstream = matches[1]
+local = int(matches[2])
+
+new_version = f'{upstream}-discord-{local + 1}'
+
+with open(props_path, 'w') as f:
+    for line in property_lines:
+        if line.startswith("VERSION_NAME="):
+            f.write(f'VERSION_NAME={new_version}\n')
+        else:
+            f.write(f'{line}\n')
+
+
+branch_name = check_output(['git', 'symbolic-ref', '--short', 'HEAD'])
+
+subprocess.check_call(
+    ['../gradlew', 'publishReleasePublicationToDiscordRepository'],
+    cwd=android_path.absolute()
+  )
+
+subprocess.check_call(['git', 'add', props_path.absolute()])
+subprocess.check_call(['git', 'commit', '-m', f'version bump: {new_version}'])
+subprocess.check_call(['git', 'push', 'origin', branch_name])
+
+new_commit = check_output(['git', 'rev-parse', 'HEAD'])
+
+
+print(f'NEW TAGGED VERSION: {new_version}')
+print(f'NEW COMMIT: {new_commit}')

package.json

@@ -49,8 +49,8 @@
     "@babel/preset-flow": "^7.24.7",
     "@definitelytyped/dtslint": "^0.0.127",
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native/metro-babel-transformer": "0.77.0-main",
-    "@react-native/metro-config": "0.77.0-main",
+    "@react-native/metro-babel-transformer": "0.78.2",
+    "@react-native/metro-config": "0.78.2",
     "@tsconfig/node18": "1.0.1",
     "@types/react": "^19.0.0",
     "@typescript-eslint/parser": "^7.1.1",
@@ -87,9 +87,9 @@
     "jest-junit": "^10.0.0",
     "jest-snapshot": "^29.7.0",
     "jscodeshift": "^0.14.0",
-    "metro-babel-register": "^0.81.0",
-    "metro-memory-fs": "^0.81.0",
-    "metro-transform-plugins": "^0.81.0",
+    "metro-babel-register": "^0.81.3",
+    "metro-memory-fs": "^0.81.3",
+    "metro-transform-plugins": "^0.81.3",
     "micromatch": "^4.0.4",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",

packages/assets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/assets-registry",
-  "version": "0.77.0-main",
+  "version": "0.78.2",
   "description": "Asset support code for React Native.",
   "license": "MIT",
   "repository": {

packages/babel-plugin-codegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/babel-plugin-codegen",
-  "version": "0.77.0-main",
+  "version": "0.78.2",
   "description": "Babel plugin to generate native module and view manager code for React Native.",
   "license": "MIT",
   "repository": {
@@ -26,7 +26,7 @@
   ],
   "dependencies": {
     "@babel/traverse": "^7.25.3",
-    "@react-native/codegen": "0.77.0-main"
+    "@react-native/codegen": "0.78.2"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2"

packages/community-cli-plugin/README.md

@@ -15,7 +15,7 @@ Start the React Native development server.
 #### Usage
 
 ```sh
-npx react-native start [options]
+npx @react-native-community/cli start [options]
 ```
 
 #### Options
@@ -37,6 +37,7 @@ npx react-native start [options]
 | `--cert <path>` | Specify path to a custom SSL cert. |
 | `--config <string>` | Path to the CLI configuration file. |
 | `--no-interactive` | Disable interactive mode. |
+| `--client-logs` | **[Deprecated]** Enable plain text JavaScript log streaming for all connected apps. |
 
 ### `bundle`
 
@@ -45,7 +46,7 @@ Build the bundle for the provided JavaScript entry file.
 #### Usage
 
 ```sh
-npx react-native bundle --entry-file <path> [options]
+npx @react-native-community/cli bundle --entry-file <path> [options]
 ```
 
 #### Options

packages/community-cli-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/community-cli-plugin",
-  "version": "0.77.0-main",
+  "version": "0.78.2",
   "description": "Core CLI commands for React Native",
   "keywords": [
     "react-native",
@@ -22,25 +22,25 @@
     "dist"
   ],
   "dependencies": {
-    "@react-native/dev-middleware": "0.77.0-main",
-    "@react-native/metro-babel-transformer": "0.77.0-main",
+    "@react-native/dev-middleware": "0.78.2",
+    "@react-native/metro-babel-transformer": "0.78.2",
     "chalk": "^4.0.0",
     "debug": "^2.2.0",
     "invariant": "^2.2.4",
-    "metro": "^0.81.0",
-    "metro-config": "^0.81.0",
-    "metro-core": "^0.81.0",
+    "metro": "^0.81.3",
+    "metro-config": "^0.81.3",
+    "metro-core": "^0.81.3",
     "readline": "^1.3.0",
     "semver": "^7.1.3"
   },
   "devDependencies": {
-    "metro-resolver": "^0.81.0"
+    "metro-resolver": "^0.81.3"
   },
   "peerDependencies": {
-    "@react-native-community/cli-server-api": "*"
+    "@react-native-community/cli": "*"
   },
   "peerDependenciesMeta": {
-    "@react-native-community/cli-server-api": {
+    "@react-native-community/cli": {
       "optional": true
     }
   },

packages/community-cli-plugin/src/commands/start/index.js

@@ -95,6 +95,14 @@ const startCommand: Command = {
       name: '--no-interactive',
       description: 'Disables interactive mode',
     },
+    {
+      name: '--client-logs',
+      description:
+        '[Deprecated] Enable plain text JavaScript log streaming for all ' +
+        'connected apps. This feature is deprecated and will be removed in ' +
+        'future.',
+      default: false,
+    },
   ],
 };
 

packages/community-cli-plugin/src/commands/start/middleware.js

@@ -9,7 +9,8 @@
  * @oncall react_native
  */
 
-import type {NextHandleFunction, Server} from 'connect';
+import typeof * as CLIServerAPI from '@react-native-community/cli-server-api';
+import type {Server} from 'connect';
 import type {TerminalReportableEvent} from 'metro/src/lib/TerminalReporter';
 
 const debug = require('debug')('ReactNative:CommunityCliPlugin');
@@ -30,10 +31,6 @@ type MiddlewareReturn = {
   ...
 };
 
-const noopNextHandle: NextHandleFunction = (req, res, next) => {
-  next();
-};
-
 // $FlowFixMe
 const unusedStubWSServer: ws$WebSocketServer = {};
 // $FlowFixMe
@@ -45,6 +42,12 @@ const communityMiddlewareFallback = {
     port: number,
     watchFolders: $ReadOnlyArray<string>,
   }): MiddlewareReturn => ({
+    // FIXME: Several features will break without community middleware and
+    // should be migrated into core.
+    // e.g. used by Libraries/Core/Devtools:
+    // - /open-stack-frame
+    // - /open-url
+    // - /symbolicate
     middleware: unusedMiddlewareStub,
     websocketEndpoints: {},
     messageSocketEndpoint: {
@@ -59,23 +62,34 @@ const communityMiddlewareFallback = {
       reportEvent: (event: TerminalReportableEvent) => {},
     },
   }),
-  indexPageMiddleware: noopNextHandle,
 };
 
 // Attempt to use the community middleware if it exists, but fallback to
 // the stubs if it doesn't.
 try {
-  const community = require('@react-native-community/cli-server-api');
-  communityMiddlewareFallback.indexPageMiddleware =
-    community.indexPageMiddleware;
+  // `@react-native-community/cli` is an optional peer dependency of this
+  // package, and should be a dev dependency of the host project (via the
+  // community template's package.json).
+  const communityCliPath = require.resolve('@react-native-community/cli');
+
+  // `@react-native-community/cli-server-api` is a dependency of
+  // `@react-native-community/cli`, but is not re-exported by it, so we need
+  // to resolve the former through the latter.
+  const communityCliServerApiPath = require.resolve(
+    '@react-native-community/cli-server-api',
+    {paths: [communityCliPath]},
+  );
+  // $FlowIgnore[unsupported-syntax] dynamic import
+  const communityCliServerApi: CLIServerAPI = require(
+    communityCliServerApiPath,
+  );
+  // $FlowIgnore[unsupported-syntax] dynamic import
   communityMiddlewareFallback.createDevServerMiddleware =
-    community.createDevServerMiddleware;
+    communityCliServerApi.createDevServerMiddleware;
 } catch {
   debug(`⚠️ Unable to find @react-native-community/cli-server-api
 Starting the server without the community middleware.`);
 }
 
 export const createDevServerMiddleware =
   communityMiddlewareFallback.createDevServerMiddleware;
-export const indexPageMiddleware =
-  communityMiddlewareFallback.indexPageMiddleware;

packages/community-cli-plugin/src/commands/start/runServer.js

@@ -19,7 +19,7 @@ import isDevServerRunning from '../../utils/isDevServerRunning';
 import loadMetroConfig from '../../utils/loadMetroConfig';
 import * as version from '../../utils/version';
 import attachKeyHandlers from './attachKeyHandlers';
-import {createDevServerMiddleware, indexPageMiddleware} from './middleware';
+import {createDevServerMiddleware} from './middleware';
 import {createDevMiddleware} from '@react-native/dev-middleware';
 import chalk from 'chalk';
 import Metro from 'metro';
@@ -44,6 +44,7 @@ export type StartCommandArgs = {
   config?: string,
   projectRoot?: string,
   interactive: boolean,
+  clientLogs: boolean,
 };
 
 async function runServer(
@@ -96,6 +97,11 @@ async function runServer(
       require.resolve(plugin),
     );
   }
+  // TODO(T214991636): Remove legacy Metro log forwarding
+  if (!args.clientLogs) {
+    // $FlowIgnore[cannot-write] Assigning to readonly property
+    metroConfig.server.forwardClientLogs = false;
+  }
 
   let reportEvent: (event: TerminalReportableEvent) => void;
   const terminal = new Terminal(process.stdout);
@@ -146,11 +152,7 @@ async function runServer(
     secure: args.https,
     secureCert: args.cert,
     secureKey: args.key,
-    unstable_extraMiddleware: [
-      communityMiddleware,
-      indexPageMiddleware,
-      middleware,
-    ],
+    unstable_extraMiddleware: [communityMiddleware, middleware],
     websocketEndpoints: {
       ...communityWebsocketEndpoints,
       ...websocketEndpoints,

packages/core-cli-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/core-cli-utils",
-  "version": "0.77.0-main",
+  "version": "0.78.2",
   "description": "React Native CLI library for Frameworks to build on",
   "license": "MIT",
   "main": "./src/index.flow.js",

packages/debugger-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/debugger-frontend",
-  "version": "0.77.0-main",
+  "version": "0.78.2",
   "description": "Debugger frontend for React Native based on Chrome DevTools",
   "keywords": [
     "react-native",