Merge branch 'main' into dependabot/npm_and_yarn/ts-jest-29.4.4

Author: sundaramramaswamy

change/react-native-windows-430100b8-4f19-4354-90b8-48658475a668.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "fix for watson",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

packages/@office-iss/react-native-win32-tester/js/utils/JSEventLoopWatchdog.js

@@ -0,0 +1,86 @@
+/**
+ * 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.
+ *
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+type Handler = {
+  onIterate?: () => void,
+  onStall: (params: {lastInterval: number, busyTime: number, ...}) => ?string,
+  ...
+};
+
+/**
+ * A utility for tracking stalls in the JS event loop that prevent timers and
+ * other events from being processed in a timely manner.
+ *
+ * The "stall" time is defined as the amount of time in access of the acceptable
+ * threshold, which is typically around 100-200ms. So if the threshold is set to
+ * 100 and a timer fires 150 ms later than it was scheduled because the event
+ * loop was tied up, that would be considered a 50ms stall.
+ *
+ * By default, logs stall events to the console when installed. Can also be
+ * queried with `getStats`.
+ */
+const JSEventLoopWatchdog = {
+  getStats: function (): Object {
+    return {stallCount, totalStallTime, longestStall, acceptableBusyTime};
+  },
+  reset: function () {
+    console.log('JSEventLoopWatchdog: reset');
+    totalStallTime = 0;
+    stallCount = 0;
+    longestStall = 0;
+    lastInterval = global.performance.now();
+  },
+  addHandler: function (handler: Handler) {
+    handlers.push(handler);
+  },
+  install: function ({thresholdMS}: {thresholdMS: number, ...}) {
+    acceptableBusyTime = thresholdMS;
+    if (installed) {
+      return;
+    }
+    installed = true;
+    lastInterval = global.performance.now();
+    function iteration() {
+      const now = global.performance.now();
+      const busyTime = now - lastInterval;
+      if (busyTime >= thresholdMS) {
+        const stallTime = busyTime - thresholdMS;
+        stallCount++;
+        totalStallTime += stallTime;
+        longestStall = Math.max(longestStall, stallTime);
+        let msg =
+          `JSEventLoopWatchdog: JS thread busy for ${busyTime}ms. ` +
+          `${totalStallTime}ms in ${stallCount} stalls so far. `;
+        handlers.forEach(handler => {
+          msg += handler.onStall({lastInterval, busyTime}) || '';
+        });
+        console.log(msg);
+      }
+      handlers.forEach(handler => {
+        handler.onIterate && handler.onIterate();
+      });
+      lastInterval = now;
+      setTimeout(iteration, thresholdMS / 5);
+    }
+    iteration();
+  },
+};
+
+let acceptableBusyTime = 0;
+let installed = false;
+let totalStallTime = 0;
+let stallCount = 0;
+let longestStall = 0;
+let lastInterval = 0;
+const handlers: Array<Handler> = [];
+
+export default JSEventLoopWatchdog;

packages/@office-iss/react-native-win32-tester/overrides.json

@@ -5,19 +5,19 @@
   "excludePatterns": [
     "src/js/examples-win32/**"
   ],
-  "baseVersion": "0.81.0-nightly-20250521-3cb70bb6a",
+  "baseVersion": "0.81.0-nightly-20250604-1a6d466f1",
   "overrides": [
     {
       "type": "patch",
       "file": "src/js/components/ListExampleShared.win32.js",
       "baseFile": "packages/rn-tester/js/components/ListExampleShared.js",
-      "baseHash": "eb604f3c06468e8aaa2671985a772b26f666e5de"
+      "baseHash": "885ca16a7587f79d6404679ee1b1309d3844afe9"
     },
     {
       "type": "patch",
       "file": "src/js/components/RNTesterExampleFilter.win32.js",
       "baseFile": "packages/rn-tester/js/components/RNTesterExampleFilter.js",
-      "baseHash": "2b12495e7371031510b53ebcccdad627363c36ad"
+      "baseHash": "142194524dd3dfc8d28f2b77fb26cd819ce0236c"
     },
     {
       "type": "platform",
@@ -35,14 +35,14 @@
       "type": "copy",
       "file": "src/js/RNTesterApp.win32.js",
       "baseFile": "packages/rn-tester/js/RNTesterApp.android.js",
-      "baseHash": "5e73edb50a1156756f2d1bec70d95a92f701ec22",
+      "baseHash": "987893a4df686425670b7897881b61e485960191",
       "issue": 4586
     },
     {
       "type": "derived",
       "file": "src/js/utils/RNTesterList.win32.js",
       "baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
-      "baseHash": "aded9dd37f3ac325aa1cc095f6d217114c45a8b9"
+      "baseHash": "faa6a65524adb312817e96d511649edd81e38262"
     }
   ]
 }

packages/@office-iss/react-native-win32-tester/package.json

@@ -17,21 +17,21 @@
     "flow-enums-runtime": "^0.0.6"
   },
   "peerDependencies": {
-    "@office-iss/react-native-win32": "^0.0.0-canary.297",
+    "@office-iss/react-native-win32": "^0.0.0-canary.298",
     "react": "19.1.0",
-    "react-native": "0.81.0-nightly-20250521-3cb70bb6a"
+    "react-native": "0.81.0-nightly-20250604-1a6d466f1"
   },
   "devDependencies": {
-    "@office-iss/react-native-win32": "^0.0.0-canary.297",
+    "@office-iss/react-native-win32": "^0.0.0-canary.298",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.2.37",
-    "@rnw-scripts/just-task": "2.3.55",
+    "@rnw-scripts/just-task": "2.3.56",
     "@rnw-scripts/ts-config": "2.0.6",
     "@types/node": "^22.14.0",
     "eslint": "^8.19.0",
     "just-scripts": "^1.3.3",
-    "react-native": "0.81.0-nightly-20250521-3cb70bb6a",
-    "react-native-platform-override": "^1.9.58",
+    "react-native": "0.81.0-nightly-20250604-1a6d466f1",
+    "react-native-platform-override": "^1.9.59",
     "typescript": "5.0.4"
   },
   "engines": {

packages/@office-iss/react-native-win32-tester/src/js/RNTesterApp.win32.js

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow strict-local
+ * @format
  */
 
 import RNTesterApp from './RNTesterAppShared';

packages/@office-iss/react-native-win32-tester/src/js/components/ListExampleShared.win32.js

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow
+ * @format
  */
 
 'use strict';

packages/@office-iss/react-native-win32-tester/src/js/components/RNTesterExampleFilter.win32.js

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow
+ * @format
  */
 
 import type {SectionData} from '../types/RNTesterTypes';

packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js

@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow
+ * @format
  */
 
 'use strict';

packages/@office-iss/react-native-win32/.flowconfig

@@ -110,7 +110,7 @@
 
 [libs]
 interface.js
-flow/
+../../../node_modules/.flow/flow/
 ../../../node_modules/.flow/flow-typed/
 ../../../node_modules/react-native/src/types
 src/types/
@@ -143,6 +143,8 @@ module.name_mapper='^@office-iss/react-native-win32/\(.*\)$' -> '<PROJECT_ROOT>\
 module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/\1'
 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\)$' -> '<PROJECT_ROOT>/Libraries/Image/RelativeImageStub'
 
+module.system.haste.module_ref_prefix=m#
+
 react.runtime=automatic
 
 suppress_type=$FlowIssue
@@ -176,4 +178,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.271.0
+^0.272.2

packages/@office-iss/react-native-win32/CHANGELOG.json

@@ -1,6 +1,33 @@
 {
   "name": "@office-iss/react-native-win32",
   "entries": [
+    {
+      "date": "Tue, 07 Oct 2025 05:27:27 GMT",
+      "version": "0.0.0-canary.298",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.298",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "[email protected]",
+            "package": "@office-iss/react-native-win32",
+            "commit": "bcce2736db9d50987e9c3b5a614e527f871d22a9",
+            "comment": "Update tester files"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @rnw-scripts/just-task to v2.3.56",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump react-native-platform-override to v1.9.59",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 19 Sep 2025 05:29:13 GMT",
       "version": "0.0.0-canary.297",