Merge branch 'main' into deduplicate-build-spannable

.circleci/configurations/jobs.yml

@@ -503,16 +503,16 @@ jobs:
         description: Which JavaScript engine to use. Must be one of "Hermes", "JSC".
         type: enum
         enum: ["Hermes", "JSC"]
-      architecture:
-        default: "OldArch"
-        description: Which React Native architecture to use. Must be one of "OldArch", "NewArch".
-        type: enum
-        enum: ["NewArch", "OldArch"]
       use_frameworks:
         default: "StaticLibraries"
         description: The dependency building and linking strategy to use. Must be one of "StaticLibraries", "DynamicFrameworks"
         type: enum
         enum: ["StaticLibraries", "DynamicFrameworks"]
+      architecture:
+        default: "NewArch"
+        description: "The React Native architecture to Test. RNTester has always Fabric enabled, but we want to run integration test with the old arch setup"
+        type: enum
+        enum: ["OldArch", "NewArch"]
       ruby_version:
         default: "2.6.10"
         description: The version of ruby that must be used
@@ -550,11 +550,8 @@ jobs:
             - with_xcodebuild_cache:
                 steps:
                   - run:
-                      name: Install CocoaPods dependencies - Architecture << parameters.architecture >>
+                      name: Install CocoaPods dependencies
                       command: |
-                        if [[ << parameters.architecture >> == "NewArch" ]]; then
-                          export RCT_NEW_ARCH_ENABLED=1
-                        fi
 
                         if [[ << parameters.jsengine >> == "JSC" ]]; then
                           export USE_HERMES=0
@@ -564,6 +561,10 @@ jobs:
                           export USE_FRAMEWORKS=dynamic
                         fi
 
+                        if [[ << parameters.architecture >> == "NewArch" ]]; then
+                          export RCT_NEW_ARCH_ENABLED=1
+                        fi
+                        
                         cd packages/rn-tester
 
                         bundle install

.circleci/configurations/test_workflows/testAll.yml

@@ -80,10 +80,8 @@
             - build_hermes_macos
           name: "Test RNTester with Ruby 3.2.0"
           ruby_version: "3.2.0"
-          architecture: "NewArch"
           executor: reactnativeios-lts
       - test_ios_rntester:
-          architecture: "NewArch"
           requires:
             - build_hermes_macos
           matrix:
@@ -108,5 +106,5 @@
             - build_hermes_macos
           matrix:
             parameters:
-              architecture: ["OldArch", "NewArch"]
               jsengine: ["Hermes", "JSC"]
+              architecture: ["NewArch", "OldArch"]

.circleci/configurations/test_workflows/testIOS.yml

@@ -69,35 +69,25 @@
       - test_ios_rntester:
           requires:
             - build_hermes_macos
-          name: "Test RNTester with Ruby 3.2.0"
+          name: "RNTester on Ruby 3.2.0"
           ruby_version: "3.2.0"
-          architecture: "NewArch"
           executor: reactnativeios-lts
       - test_ios_rntester:
-          architecture: "NewArch"
+          name: "RNTester with Dynamic Frameworks"
+          use_frameworks: "DynamicFrameworks"
           requires:
             - build_hermes_macos
           matrix:
             parameters:
               jsengine: ["Hermes", "JSC"]
-              use_frameworks: ["StaticLibraries", "DynamicFrameworks"]
-            exclude:
-              # Tested by test_ios-Hermes
-              - jsengine: "Hermes"
-                use_frameworks: "StaticLibraries"
-              # Tested by test_ios-JSC
-              - jsengine: "JSC"
-                use_frameworks: "StaticLibraries"
-              # Tested with Ruby 3.2.0, let's not double test this
-              - jsengine: "Hermes"
-                use_frameworks: "StaticLibraries"
       - test_ios_rntester:
+          name: "RNTester Integration Tests"
           run_unit_tests: true
           use_frameworks: "StaticLibraries"
           ruby_version: "2.6.10"
           requires:
             - build_hermes_macos
           matrix:
             parameters:
-              architecture: ["NewArch", "OldArch"]
               jsengine: ["Hermes", "JSC"]
+              architecture: ["NewArch", "OldArch"]

.eslintignore

@@ -11,3 +11,5 @@ packages/debugger-frontend/dist/**/*
 packages/react-native-codegen/lib
 tools/eslint/rules/sort-imports.js
 **/Pods/*
+**/*.macos.js
+**/*.windows.js

.flowconfig

@@ -85,4 +85,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.225.1
+^0.227.0

CHANGELOG.md

@@ -1,5 +1,52 @@
 # Changelog
 
+## v0.72.10
+
+### Added
+
+- Unhandled promise rejection - attach non-standard Error object stack info if possible ([655b12dbfa](https://github.com/facebook/react-native/commit/655b12dbfaa2c48f9fd38bbe8311e6f935045b30) by [@ospfranco](https://github.com/ospfranco))
+
+### Fixed
+
+- Revert the regression of iOS min version and updates Podfile.lock for Releases ([1f70f58aa4](https://github.com/facebook/react-native/commit/1f70f58aa4225d017ebad4f66641cbd0d1db114f) by [@cipolleschi](https://github.com/cipolleschi))
+- Fix flags ([565281105e](https://github.com/facebook/react-native/commit/565281105e4a0c4d51d2134114bdadb33f03d61a) by [@cipolleschi](https://github.com/cipolleschi))
+
+## v0.72.9
+
+### Fixed
+
+- Fix boost link ([d62d714ada](https://github.com/facebook/react-native/commit/d62d714adab891028004063136a7e906478618c4) by [@cipolleschi](https://github.com/cipolleschi))
+- Fix New Arch build failing with -std=c++20 ([b7c1a40db4](https://github.com/facebook/react-native/commit/b7c1a40db4d5a6d992b926307842fe671ae80436) by [@tido64](https://github.com/tido64))
+- Fix ruby tests ([7c7baad7bd](https://github.com/facebook/react-native/commit/7c7baad7bd62cf59b46a426eeb31aefc1e85bca7) by [@cipolleschi](https://github.com/cipolleschi))
+- Bump Podfile.lock and try to fix Hermes update ([34da08755d](https://github.com/facebook/react-native/commit/34da08755d88a726e0a68d7a2ef544fe4af0dc6e) by [@cipolleschi](https://github.com/cipolleschi))
+
+## v0.73.2
+
+### Added
+
+- Unhandled promise rejection - attach non-standard Error object stack info if possible ([655b12dbfa](https://github.com/facebook/react-native/commit/655b12dbfaa2c48f9fd38bbe8311e6f935045b30) by [@ospfranco](https://github.com/ospfranco))
+
+### Changed
+
+- Bump Metro to ^v0.80.3 ([16dff523b0](https://github.com/facebook/react-native/commit/16dff523b0a16d7fa9b651062c386885c2f48a6b) by [@huntie](https://github.com/huntie))
+- Automatically reconnect to an existing debugger session on relaunching the app ([0806ad7854](https://github.com/facebook/react-native/commit/0806ad785458009887ff4c67b995ec992a010702) by [@motiz88](https://github.com/motiz88))
+
+#### iOS specific
+
+- Update ios pod post_install logic for detecting if hermes is enabled ([d6163d7f43](https://github.com/facebook/react-native/commit/d6163d7f43a753f24148450033491dfc9c5d0c36) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+
+### Fixed
+
+- Fix comment about adding packages in android template ([ac9b87cd57](https://github.com/facebook/react-native/commit/ac9b87cd57029a0f0876aaec8d259d9befba9838) by [@janicduplessis](https://github.com/janicduplessis))
+- Fix boost download url ([7e721f09ad](https://github.com/facebook/react-native/commit/7e721f09ad3dafed9f490f433b2ac613786c27b2) by [@cipolleschi](https://github.com/cipolleschi))
+
+#### iOS specific
+
+- Fix horizontal scrollview scrollTo coordinate space in RTL on oldarch ([e809e0aca7](https://github.com/facebook/react-native/commit/e809e0aca713ad12f91778b09f5297f1da866b26) by [@NickGerleman](https://github.com/NickGerleman))
+- [enhance IP address retrieval for iOS devices in Metro bundler setup](https://github.com/facebook/react-native/pull/41839/commits/6a351db158dadf944933173aa0150435c742001f) ([9f28616650](https://github.com/facebook/react-native/commit/9f28616650a61ca298c2fc710b588445b8ceb94c) by [@Morritz](https://github.com/Morritz))
+
+
 This file contains all changelogs for latest releases, from 0.70.0 onward. Please check out the other `CHANGELOG-*.md` files for previous versions.
 
 ## v0.73.1
@@ -899,6 +946,25 @@ This file contains all changelogs for latest releases, from 0.70.0 onward. Pleas
 
 - Enable Address and Undefined Behavior Sanitizers on RNTester ([65e61f3c88](https://github.com/facebook/react-native/commit/65e61f3c88388d4a2ed88bcc9a2cb5ba63fd8afa) by [@Saadnajmi](https://github.com/Saadnajmi))
 
+## v0.71.15
+
+### Fixed
+
+#### Android specific
+- Fix Android crash when apply PlatformColor to borders ([265af222aa](https://github.com/facebook/react-native/commit/265af222aa8acb3b514e22a7db191d66755f553b) by [@axinvd](https://github.com/axinvd))
+- Fixed crash occurring in certain native views when keyboard events are fired. ([9497203957](https://github.com/facebook/react-native/commit/94972039571e1f3b387e0f63227a6ad13740eaf3) by [@kot331107](https://github.com/kot331107))
+
+#### iOS specific
+
+- Migrate away from JFrog to download boost ([ab19fd6aef](https://github.com/facebook/react-native/commit/ab19fd6aef43a739f78cf62155fec59d95f577d3) by [@cipolleschi](https://github.com/cipolleschi))
+- Fix overriding `EXCLUDED_ARCHS` when installing Hermes on RN v0.71 ([16a605b6a3](https://github.com/facebook/react-native/commit/16a605b6a3c320f93b6cda9198d738672086e851) by [@ken0nek](https://github.com/ken0nek))
+
+### Changed
+
+- Update node installation on debian (0.71) ([bdc0ef3466](https://github.com/facebook/react-native/commit/bdc0ef34664b7f1a2b8598ad6092a2ec6cf089ce) by [@cipolleschi](https://github.com/cipolleschi))
+- Bump cli to 10.2.6 ([0bc2dd03c1](https://github.com/facebook/react-native/commit/0bc2dd03c1ccb4ab6ecf55add249f222c5757f06) by [@hurali97](https://github.com/hurali97))
+- Fix version of react-native-codegen ([c74602fe47](https://github.com/facebook/react-native/commit/c74602fe47ca12a151eb173203fb6fce7f3cc964) by [@lunaleaps](https://github.com/lunaleaps))
+
 ## v0.71.14
 
 ### Fixed
@@ -1588,6 +1654,20 @@ Read the [announcement blogpost here](https://reactnative.dev/blog/2023/01/12/ve
 
 - Bump terser minor version to mitigate CVE-2022-25858 ([743f9ff63b](https://github.com/facebook/react-native/commit/743f9ff63bf1e3825a1788978a9f6bad8ebddc0d) by [@GijsWeterings](https://github.com/GijsWeterings))
 
+## v0.70.15
+
+### Changed
+
+- BUMP CLI to v9.3.5 ([cb170efdd3](https://github.com/facebook/react-native/commit/cb170efdd346776aa6941512e1c23eb11c3f0a3a) by [@hurali97](https://github.com/hurali97))
+- Bump react-devtools-core to 4.27.7 ([abb4a2bddd](https://github.com/facebook/react-native/commit/abb4a2bdddbc904b4b3ff185e41c2dddb5ba684b) by [@lunaleaps](https://github.com/lunaleaps))
+- Bump hermes-engine ([5b95254359](https://github.com/facebook/react-native/commit/5b95254359da9813ce8eba5571b9abf6a5fcb21c) by [@cipolleschi](https://github.com/cipolleschi))
+
+### Fixed
+
+#### iOS specific
+
+- Migrate boost download url away from JFrog ([e8e059a977](https://github.com/facebook/react-native/commit/e8e059a977ef2feec1b4b9dfd2866daede2b8ff8) by [@cipolleschi](https://github.com/cipolleschi))
+
 ## v0.70.14
 
 ### Changed

package.json

@@ -85,9 +85,10 @@
     "eslint-plugin-redundant-undefined": "^0.4.0",
     "eslint-plugin-relay": "^1.8.3",
     "flow-api-translator": "0.18.2",
-    "flow-bin": "^0.225.1",
+    "flow-bin": "^0.227.0",
     "glob": "^7.1.1",
     "hermes-eslint": "0.18.2",
+    "hermes-transform": "0.18.2",
     "inquirer": "^7.1.0",
     "jest": "^29.6.3",
     "jest-junit": "^10.0.0",

packages/community-cli-plugin/package.json

@@ -28,14 +28,14 @@
     "@react-native/metro-babel-transformer": "0.74.0",
     "chalk": "^4.0.0",
     "execa": "^5.1.1",
-    "metro": "^0.80.0",
-    "metro-config": "^0.80.0",
-    "metro-core": "^0.80.0",
+    "metro": "^0.80.3",
+    "metro-config": "^0.80.3",
+    "metro-core": "^0.80.3",
     "node-fetch": "^2.2.0",
     "readline": "^1.3.0"
   },
   "devDependencies": {
-    "metro-resolver": "^0.80.0"
+    "metro-resolver": "^0.80.3"
   },
   "engines": {
     "node": ">=18"

packages/community-cli-plugin/src/commands/bundle/buildBundle.js

@@ -42,6 +42,7 @@ export type BundleCommandArgs = {
   verbose: boolean,
   unstableTransformProfile: string,
   indexedRamBundle?: boolean,
+  customResolverOptions?: Record<string, string>,
 };
 
 async function buildBundle(
@@ -99,6 +100,7 @@ async function buildBundleWithConfig(
     minify: args.minify !== undefined ? args.minify : !args.dev,
     platform: args.platform,
     unstable_transformProfile: args.unstableTransformProfile,
+    customResolverOptions: args.customResolverOptions,
   };
   const server = new Server(config);
 

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

@@ -114,6 +114,18 @@ const bundleCommand: Command = {
       description: 'Path to the CLI configuration file',
       parse: (val: string): string => path.resolve(val),
     },
+    {
+      name: '--custom-resolver-options <string>',
+      description: 'Custom resolver options, format: key=value,key2=value2.',
+      parse: (val: string): Record<string, string> => {
+        return Object.fromEntries(
+          val.split(',').map(option => {
+            const [key, value] = option.split('=');
+            return [key, value];
+          }),
+        );
+      },
+    },
   ],
 };
 

packages/dev-middleware/package.json

@@ -29,6 +29,7 @@
     "connect": "^3.6.5",
     "debug": "^2.2.0",
     "node-fetch": "^2.2.0",
+    "nullthrows": "^1.1.1",
     "open": "^7.0.3",
     "selfsigned": "^2.4.1",
     "serve-static": "^1.13.1",

packages/dev-middleware/src/__tests__/InspectorDebuggerUtils.js

@@ -20,15 +20,15 @@ import until from 'wait-for-expect';
 import WebSocket from 'ws';
 
 export class DebuggerAgent {
-  _ws: ?WebSocket;
-  _readyPromise: Promise<void>;
+  #ws: ?WebSocket;
+  #readyPromise: Promise<void>;
 
   constructor(url: string, signal?: AbortSignal) {
     const ws = new WebSocket(url, {
       // The mock server uses a self-signed certificate.
       rejectUnauthorized: false,
     });
-    this._ws = ws;
+    this.#ws = ws;
     ws.on('message', data => {
       this.__handle(JSON.parse(data.toString()));
     });
@@ -37,7 +37,7 @@ export class DebuggerAgent {
         this.close();
       });
     }
-    this._readyPromise = new Promise<void>((resolve, reject) => {
+    this.#readyPromise = new Promise<void>((resolve, reject) => {
       ws.once('open', () => {
         resolve();
       });
@@ -50,29 +50,29 @@ export class DebuggerAgent {
   __handle(message: JSONSerializable): void {}
 
   send(message: JSONSerializable) {
-    if (!this._ws) {
+    if (!this.#ws) {
       return;
     }
-    this._ws.send(JSON.stringify(message));
+    this.#ws.send(JSON.stringify(message));
   }
 
   ready(): Promise<void> {
-    return this._readyPromise;
+    return this.#readyPromise;
   }
 
   close() {
-    if (!this._ws) {
+    if (!this.#ws) {
       return;
     }
     try {
-      this._ws.terminate();
+      this.#ws.terminate();
     } catch {}
-    this._ws = null;
+    this.#ws = null;
   }
 
   // $FlowIgnore[unsafe-getters-setters]
   get socket(): WebSocket {
-    return nullthrows(this._ws);
+    return nullthrows(this.#ws);
   }
 }