Merge branch 'main' into tts-span

Author: fabOnReact

.gitignore

@@ -122,6 +122,7 @@ package-lock.json
 /sdks/download
 /sdks/hermes
 /sdks/hermesc
+/sdks/hermes-engine/build_host_hermesc
 
 # Visual studio
 .vscode

Libraries/LogBox/Data/__tests__/LogBoxLog-test.js

@@ -50,7 +50,7 @@ function getLogBoxSymbolication(): {|
 }
 
 const createStack = (methodNames: Array<string>) =>
-  methodNames.map(methodName => ({
+  methodNames.map((methodName): StackFrame => ({
     column: null,
     file: 'file://path/to/file.js',
     lineNumber: 1,

Libraries/LogBox/Data/__tests__/LogBoxSymbolication-test.js

@@ -24,7 +24,7 @@ const symbolicateStackTrace: JestMockFn<
 > = (require('../../../Core/Devtools/symbolicateStackTrace'): any);
 
 const createStack = (methodNames: Array<string>) =>
-  methodNames.map(methodName => ({
+  methodNames.map((methodName): StackFrame => ({
     column: null,
     file: 'file://path/to/file.js',
     lineNumber: 1,

Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrames-test.js

@@ -9,6 +9,8 @@
  * @oncall react_native
  */
 
+import type {StackFrame} from '../../../Core/NativeExceptionsManager';
+
 import LogBoxInspectorStackFrames, {
   getCollapseMessage,
 } from '../LogBoxInspectorStackFrames';
@@ -33,7 +35,7 @@ const createLogWithFrames = (collapsedOptions: Array<?boolean>) => {
 };
 
 const createCollapsedFrames = (collapsedOptions: Array<?boolean>) => {
-  return collapsedOptions.map(option => ({
+  return collapsedOptions.map((option): StackFrame => ({
     column: 1,
     file: 'dependency.js',
     lineNumber: 1,

Libraries/Performance/QuickPerformanceLogger.js

@@ -13,7 +13,7 @@
 const AUTO_SET_TIMESTAMP = -1;
 const DUMMY_INSTANCE_KEY = 0;
 
-// Defines map of annotations for markEvent
+// Defines map of annotations
 // Use as following:
 // {string: {key1: value1, key2: value2}}
 export type AnnotationsMap = $Shape<{
@@ -54,17 +54,25 @@ const QuickPerformanceLogger = {
 
   markerAnnotate(
     markerId: number,
-    annotationKey: string,
-    annotationValue: string,
+    annotations: AnnotationsMap,
     instanceKey: number = DUMMY_INSTANCE_KEY,
   ): void {
-    if (global.nativeQPLMarkerAnnotate) {
-      global.nativeQPLMarkerAnnotate(
-        markerId,
-        instanceKey,
-        annotationKey,
-        annotationValue,
-      );
+    if (global.nativeQPLMarkerAnnotateWithMap) {
+      global.nativeQPLMarkerAnnotateWithMap(markerId, annotations, instanceKey);
+    } else if (global.nativeQPLMarkerAnnotate) {
+      for (const type of ['string']) {
+        const keyValsOfType = annotations[type];
+        if (keyValsOfType != null) {
+          for (const annotationKey of Object.keys(keyValsOfType)) {
+            global.nativeQPLMarkerAnnotate(
+              markerId,
+              instanceKey,
+              annotationKey,
+              keyValsOfType[annotationKey].toString(),
+            );
+          }
+        }
+      }
     }
   },
 

Libraries/Renderer/REVISION

@@ -1 +1 @@
-54f297a60ce13d6f9ea385614498650c1935c572
+ab075a232409ea1f566526c6a5dca30f658280de

Libraries/Renderer/implementations/ReactNativeRenderer.d.ts

@@ -1,12 +1,12 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
  * @noformat
  * @flow
- * @generated SignedSource<<ca65d187831e77f0f589dfd9fa8775bc>>
+ * @generated SignedSource<<ef2742380b2b2c69cea8618289eea086>>
  *
  * This file was sync'd from the facebook/react repository.
  */

Libraries/Renderer/shims/ReactFabric.js

@@ -1,12 +1,12 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
  * @noformat
  * @flow strict-local
- * @generated SignedSource<<b17df4f82c9d4fe20645f360eadf82bc>>
+ * @generated SignedSource<<47062f1b1abd7428381f0362986d9c0e>>
  *
  * This file was sync'd from the facebook/react repository.
  */

Libraries/Renderer/shims/ReactFeatureFlags.js

@@ -1,12 +1,12 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
  * @noformat
  * @flow
- * @generated SignedSource<<45ec3626ad048b08dac9b031b02bc0a8>>
+ * @generated SignedSource<<744176db456e2656dac661d36e55f42a>>
  *
  * This file was sync'd from the facebook/react repository.
  */