Skip to content

Commit ebdfffb

Browse files
anuagragithAnukrati AgrawalCopilot
authored
Integrate RN 0.85.0-nightly-20260128-36f07a1b2 (#16245)
* Integrate RN 0.85.0-nightly-20260128-36f07a1b2 Includes: - Full nightly integration with conflict resolution - Fix C++ compile errors from nightly integration - Fix AnimationBackend linker errors from nightly integration - Fix X86 build (suppress C4018 signed/unsigned mismatch in MapBuffer.cpp) - Sync stale copy overrides in @react-native/tester - Update yarn.lock and add change files Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix linting: update flow-bin to ^0.298.0 to match .flowconfig Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Update E2E snapshots for nightly integration - snapshotPages Text 33: Add new FiraCode font variant examples - TextComponentTest borders: Adjust visual tree sizes (138→139, 20→19) - TouchableComponentTest: Add PositionInSet/SizeofSet accessibility props Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix CLI Verify FabricLib: exclude @react-native/jest-preset from nightly pinning The nightly fixup regex in creaternwlib.cmd and creaternwapp.cmd was replacing all @react-native/*-config and *-preset package versions with the exact nightly version. However, @react-native/jest-preset was not published until Feb 2026 (earliest: 0.85.0-nightly-20260219), while our target nightly is from Jan 2026 (0.85.0-nightly-20260128-36f07a1b2). This caused yarn install to fail with 'No candidates found'. Fix: Add a negative lookahead (?!jest-preset) to skip this package. It will remain at the 'nightly' dist-tag which resolves to a valid version. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix C4018/C4267 in MapBuffer.cpp via local patched copy Instead of suppressing SDL-mandatory warnings (which could break BinSkim), create a local patched copy in TEMP_UntilReactCommonUpdate with proper static_casts to fix signed/unsigned comparison warnings in upstream code. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add issue references to TEMP_UntilReactCommonUpdate overrides - MapBuffer.cpp: #16261 (C4018/C4267 signed/unsigned fixes) - AnimatedPropSerializer.cpp: #16262 (Windows Color struct conversion) - NetworkIOAgent.cpp: #16263 (destructor and enableAgent/disableAgent API) Added // [Windows #issue] comments and registered overrides in overrides.json per integration process guidelines. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Anukrati Agrawal <anuagra@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent b50c94d commit ebdfffb

102 files changed

Lines changed: 2197 additions & 1845 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
4+
"packageName": "@office-iss/react-native-win32",
5+
"email": "email not defined",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
4+
"packageName": "@react-native-windows/automation-channel",
5+
"email": "email not defined",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
4+
"packageName": "@react-native-windows/cli",
5+
"email": "email not defined",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
4+
"packageName": "@react-native-windows/perf-testing",
5+
"email": "email not defined",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
4+
"packageName": "react-native-windows",
5+
"email": "email not defined",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate RN 0.85.0-nightly-20260128-36f07a1b2",
4+
"packageName": "react-native-windows-init",
5+
"email": "email not defined",
6+
"dependentChangeType": "patch"
7+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"prettier": "^3.6.2",
5454
"prettier-plugin-hermes-parser": "0.21.1",
5555
"react": "19.2.3",
56-
"react-native": "0.85.0-nightly-20260114-f15985f4f",
56+
"react-native": "0.85.0-nightly-20260128-36f07a1b2",
5757
"react-native-platform-override": "0.0.0-canary.1017",
5858
"typescript": "5.0.4"
5959
},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"excludePatterns": [
66
"src/js/examples-win32/**"
77
],
8-
"baseVersion": "0.85.0-nightly-20260114-f15985f4f",
8+
"baseVersion": "0.85.0-nightly-20260128-36f07a1b2",
99
"overrides": [
1010
{
1111
"type": "patch",
@@ -17,7 +17,7 @@
1717
"type": "patch",
1818
"file": "src/js/components/RNTesterExampleFilter.win32.js",
1919
"baseFile": "packages/rn-tester/js/components/RNTesterExampleFilter.js",
20-
"baseHash": "142194524dd3dfc8d28f2b77fb26cd819ce0236c"
20+
"baseHash": "6766d57ee45d36991c8c2ec6ef20f6602bc924f9"
2121
},
2222
{
2323
"type": "platform",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"validate-overrides": "react-native-platform-override validate"
1212
},
1313
"dependencies": {
14-
"@react-native/tester": "0.85.0-nightly-20260114-f15985f4f",
14+
"@react-native/tester": "0.85.0-nightly-20260128-36f07a1b2",
1515
"@typescript-eslint/eslint-plugin": "^8.36.0",
1616
"@typescript-eslint/parser": "^8.36.0",
1717
"flow-enums-runtime": "^0.0.6"
1818
},
1919
"peerDependencies": {
2020
"@office-iss/react-native-win32": "^0.0.0-canary.311",
2121
"react": "19.2.3",
22-
"react-native": "0.85.0-nightly-20260114-f15985f4f"
22+
"react-native": "0.85.0-nightly-20260128-36f07a1b2"
2323
},
2424
"devDependencies": {
2525
"@office-iss/react-native-win32": "^0.0.0-canary.311",
@@ -32,7 +32,7 @@
3232
"just-scripts": "^1.3.3",
3333
"prettier": "^3.6.2",
3434
"react": "19.2.3",
35-
"react-native": "0.85.0-nightly-20260114-f15985f4f",
35+
"react-native": "0.85.0-nightly-20260128-36f07a1b2",
3636
"react-native-platform-override": "0.0.0-canary.1022",
3737
"typescript": "5.0.4"
3838
},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ type Props<T> = {
3030
testID?: string,
3131
hideFilterPills?: boolean,
3232
page: 'examples_page' | 'components_page' | 'bookmarks_page',
33-
sections: $ReadOnlyArray<SectionData<T>>,
33+
sections: ReadonlyArray<SectionData<T>>,
3434
...
3535
};
3636

@@ -81,7 +81,7 @@ class RNTesterExampleFilter<T> extends React.Component<Props<T>, State> {
8181
}
8282

8383
_renderFilteredSections(
84-
filteredSections: $ReadOnlyArray<{
84+
filteredSections: ReadonlyArray<{
8585
data: Array<T>,
8686
key: string,
8787
title: string,

0 commit comments

Comments
 (0)