Merge branch 'main' into fix/rntester-tests

Author: artus9033

.flowconfig

@@ -98,4 +98,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.289.0
+^0.290.0

package.json

@@ -86,7 +86,7 @@
     "eslint-plugin-relay": "^1.8.3",
     "fb-dotslash": "0.5.8",
     "flow-api-translator": "0.32.0",
-    "flow-bin": "^0.289.0",
+    "flow-bin": "^0.290.0",
     "glob": "^7.1.1",
     "hermes-eslint": "0.32.0",
     "hermes-transform": "0.32.0",

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

@@ -94,22 +94,26 @@ export default class OpenDebuggerKeyboardHandler {
         const target = targets[0];
         void this.#tryOpenDebuggerForTarget(target);
       } else {
-        this.#targetsShownForSelection = targets;
-
         if (targets.length > 9) {
           this.#log(
             'warn',
             '10 or more debug targets available, showing the first 9.',
           );
         }
+        const targetsShown = targets.slice(0, 9);
+        const hasDuplicateTitles =
+          new Set(targetsShown.map(target => target.title)).size <
+          targetsShown.length;
+        this.#targetsShownForSelection = targetsShown;
 
         this.#setTerminalMenu(
-          `Multiple debug targets available, please select:\n  ${targets
-            .slice(0, 9)
-            .map(
-              ({title}, i) =>
-                `${styleText(['white', 'inverse'], ` ${i + 1} `)} - "${title}"`,
-            )
+          `Multiple debug targets available, please select:\n  ${targetsShown
+            .map(({title, description}, i) => {
+              const descriptionSuffix = hasDuplicateTitles
+                ? ` (${description})`
+                : '';
+              return `${styleText(['white', 'inverse'], ` ${i + 1} `)} - "${title}${descriptionSuffix}"`;
+            })
             .join('\n  ')}`,
         );
       }

packages/debugger-frontend/BUILD_INFO

@@ -1,5 +1,5 @@
-@generated SignedSource<<4bb67766e15e25a481c4c38873260a7a>>
-Git revision: 7aa57d13e50ce9d74a91c9315c9b0ded00fbc19f
+@generated SignedSource<<b62ff235444c99d1d66a64ceb11e3bad>>
+Git revision: d8824de5790a32c018ec9926a970daa7feb9a84c
 Built with --nohooks: false
 Is local checkout: false
 Remote URL: https://github.com/facebook/react-native-devtools-frontend

packages/debugger-frontend/dist/third-party/front_end/core/host/host.js

@@ -571,6 +571,11 @@ function consoleAssertPolyfill(expression, label) {
 
 function stub() {}
 
+// https://developer.chrome.com/docs/devtools/console/api#createtask
+function consoleCreateTaskStub() {
+  return {run: cb => cb()};
+}
+
 if (global.nativeLoggingHook) {
   const originalConsole = global.console;
   // Preserve the original `console` as `originalConsole`
@@ -587,6 +592,7 @@ if (global.nativeLoggingHook) {
     timeStamp: stub,
     count: stub,
     countReset: stub,
+    createTask: consoleCreateTaskStub,
     ...(originalConsole ?? {}),
     error: getNativeLogFunction(LOG_LEVELS.error),
     info: getNativeLogFunction(LOG_LEVELS.info),
@@ -705,6 +711,7 @@ if (global.nativeLoggingHook) {
     time: stub,
     timeEnd: stub,
     timeStamp: stub,
+    createTask: consoleCreateTaskStub,
   };
 
   Object.defineProperty(console, '_isPolyfilled', {

packages/debugger-frontend/dist/third-party/front_end/core/sdk/sdk.js

@@ -125,6 +125,7 @@ export function unstable_createAnimatedComponentWithAllowlist<
     const [reducedProps, callbackRef] = useAnimatedProps<
       TProps,
       React.ElementRef<TInstance>,
+      // $FlowFixMe[incompatible-type]
     >(props);
     const ref = useMergeRefs<React.ElementRef<TInstance>>(
       callbackRef,

packages/polyfills/console.js

@@ -42,10 +42,7 @@ @implementation RCTBlobManager {
   dispatch_queue_t _processingQueue;
 }
 
-+ (NSString *)moduleName
-{
-  return @"BlobModule";
-}
+RCT_EXPORT_MODULE(BlobModule)
 
 @synthesize bridge = _bridge;
 @synthesize moduleRegistry = _moduleRegistry;

packages/react-native/Libraries/Animated/createAnimatedComponent.js

@@ -13,21 +13,21 @@
 
 #import "RCTBlobPlugins.h"
 
-#import <string>
-#import <unordered_map>
-
-Class RCTBlobClassProvider(const char *name) {
-  // Intentionally leak to avoid crashing after static destructors are run.
-  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
-    {"BlobModule", RCTBlobManagerCls},
-    {"FileReaderModule", RCTFileReaderModuleCls},
-  };
-
-  auto p = sCoreModuleClassMap->find(name);
-  if (p != sCoreModuleClassMap->end()) {
-    auto classFunc = p->second;
-    return classFunc();
+#import <string_view>
+
+using namespace std::literals;
+
+Class RCTBlobClassProvider(const char *name)
+{
+
+  if (name == "BlobModule"sv) {
+    return RCTBlobManagerCls();
   }
+
+  if (name == "FileReaderModule"sv) {
+    return RCTFileReaderModuleCls();
+  }
+
   return nil;
 }