Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
9d3b052
changes before resolving merge conflicts
Sep 22, 2025
ff4f7ea
Update tester files
Sep 23, 2025
3590d2a
Change files
Sep 23, 2025
7ecc7d1
Update Viewproptypes.d.ts files
Sep 23, 2025
b3a35e2
Fixed build errors
Sep 25, 2025
e7e08bd
Add primitives.h to define HighResTimeStamp in ReactPerfettoLogger.cpp
Sep 26, 2025
a11e65c
Merge branch 'main' into user/harinimalothu/integrate_0.81.0-0618
HariniMalothu17 Sep 26, 2025
569ea44
lint fix
Sep 26, 2025
1be183d
fix for community cli
Sep 26, 2025
d0db36e
fix build errors
Sep 26, 2025
763f1be
fix build errors
Sep 26, 2025
c98d182
Move timing.h include to ReactCommon
jonthysell Sep 26, 2025
bf92445
Update communitycli template version
Sep 29, 2025
137bda4
Update communitycli template version
Sep 29, 2025
31c6ac1
Change files
Sep 29, 2025
913d67a
Updated versions that were pointing to precious integration
Sep 29, 2025
bcd48a3
Updated tester folder with new file that was added
Sep 29, 2025
eee7d94
Merge branch 'main' into user/harinimalothu/integrate_0.81.0-0618
HariniMalothu17 Sep 29, 2025
3f76152
Add mockComponent to global scope in tests for RN 0.81.0 where it's n…
Sep 29, 2025
5bdeed4
Merge branch 'user/harinimalothu/integrate_0.81.0-0618' of https://gi…
Sep 29, 2025
1d33384
Add mockComponent to global scope in tests for RN 0.81.0 where it's n…
Sep 29, 2025
ffe9268
change type to copy
Sep 29, 2025
7b05163
Lint fix
Sep 29, 2025
48a0bc1
change import for newscreenapp
Sep 29, 2025
25a6bf9
update missing ternary operator
Sep 29, 2025
119c0d6
Fix setup.js file changes
Sep 30, 2025
fe7ccbc
Fix yarn validate overrides error
Sep 30, 2025
c27c41c
Merge branch 'main' into user/harinimalothu/integrate_0.81.0-0618
HariniMalothu17 Sep 30, 2025
d96595f
fix linting errors, update snapshots,update flow version
Sep 30, 2025
5db9d8c
Merge branch 'user/harinimalothu/integrate_0.81.0-0618' of https://gi…
Sep 30, 2025
237bcc5
update yarn.lock
Sep 30, 2025
b31efc5
Update downloadFlowTypes with newly missing flow types
jonthysell Oct 1, 2025
ff399d1
Merge branch 'main' into user/harinimalothu/integrate_0.81.0-0618
HariniMalothu17 Oct 1, 2025
483aab6
Change files
Oct 1, 2025
559d1b1
Fix flowconfig for react-native-win32
jonthysell Oct 1, 2025
f3fd551
fix uncleartype and untyped import errors
Oct 3, 2025
a3790af
Merge branch 'main' into user/harinimalothu/integrate_0.81.0-0618
HariniMalothu17 Oct 3, 2025
8e1ba39
fix uncleartype and untyped import errors
Oct 3, 2025
acb528d
Merge branch 'main' into user/harinimalothu/integrate_0.81.0-0618
HariniMalothu17 Oct 6, 2025
684da17
update code
Oct 6, 2025
4759e94
update code
Oct 6, 2025
dfb617d
lint fix
Oct 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Update tester files",
"packageName": "@office-iss/react-native-win32",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update tester files",
"packageName": "@react-native-windows/automation-channel",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update communitycli template version",
"packageName": "@rnw-scripts/integrate-rn",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update downloadFlowTypes with newly missing flow types",
"packageName": "@rnw-scripts/just-task",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Update tester files",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -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;
10 changes: 5 additions & 5 deletions packages/@office-iss/react-native-win32-tester/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
]
}
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32-tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.297",
"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",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^22.14.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.81.0-nightly-20250521-3cb70bb6a",
"react-native": "0.81.0-nightly-20250604-1a6d466f1",
"react-native-platform-override": "^1.9.58",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 4 additions & 2 deletions packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -176,4 +178,4 @@ untyped-import
untyped-type-import

[version]
^0.271.0
^0.272.2
Loading
Loading