Skip to content

Commit cb12a85

Browse files
HariniMalothu17Harini Malothu
HariniMalothu17
and
Harini Malothu
authored
Integrate 0.85.0 nightly 20260114 f15985f4f (microsoft#15987)
* Integrate RN 0.85.0-nightly-20260114-f15985f4f * Update remaining package.json references to 0.85.0-nightly-20260114-f15985f4f * Clean node_modules and reinstall dependencies for RN 0.85.0-nightly-20260114-f15985f4f * Integrate RN 0.85.0-nightly-20260114-f15985f4f * Update failing overrides from upstream commit f15985f4f * Resolve merge conflicts for RN 0.85.0-nightly-20260114-f15985f4f integration * Apply build fixes for RN 0.85.0-nightly-20260114-f15985f4f integration * Change files * fix lint --------- Co-authored-by: Harini Malothu <hmalothu@microsoft.com>
1 parent 9e41529 commit cb12a85

162 files changed

Lines changed: 787 additions & 833 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.

‎change/@office-iss-react-native-win32-4fcd2187-3a89-4669-bab3-147be4c9ff1e.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Apply build fixes for RN 0.85.0-nightly-20260114-f15985f4f integration",
4+
"packageName": "@office-iss/react-native-win32",
5+
"email": "hmalothu@microsoft.com",
6+
"dependentChangeType": "none"
7+
}

‎change/@react-native-windows-automation-channel-d085bc3e-56eb-4291-af3a-733115c2553c.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Integrate RN 0.85.0-nightly-20260114-f15985f4f",
4+
"packageName": "@react-native-windows/automation-channel",
5+
"email": "hmalothu@microsoft.com",
6+
"dependentChangeType": "none"
7+
}

‎change/@react-native-windows-cli-0703d6d5-d299-46fc-8f59-b988f4b07f3f.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Integrate RN 0.85.0-nightly-20260114-f15985f4f",
4+
"packageName": "@react-native-windows/cli",
5+
"email": "hmalothu@microsoft.com",
6+
"dependentChangeType": "none"
7+
}

‎change/@react-native-windows-perf-testing-6a111923-e2cd-48ee-9c62-5a406da44981.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Integrate RN 0.85.0-nightly-20260114-f15985f4f",
4+
"packageName": "@react-native-windows/perf-testing",
5+
"email": "hmalothu@microsoft.com",
6+
"dependentChangeType": "none"
7+
}

‎change/react-native-windows-50159fa2-219d-4ce2-bd90-8234b04e566b.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Integrate RN 0.85.0-nightly-20260114-f15985f4f",
4+
"packageName": "react-native-windows",
5+
"email": "hmalothu@microsoft.com",
6+
"dependentChangeType": "none"
7+
}

‎change/react-native-windows-init-84435d52-4728-45c0-93c1-25808ab2b420.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Integrate RN 0.85.0-nightly-20260114-f15985f4f",
4+
"packageName": "react-native-windows-init",
5+
"email": "hmalothu@microsoft.com",
6+
"dependentChangeType": "none"
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.84.0-nightly-20260107-58bc6c3e3",
56+
"react-native": "0.85.0-nightly-20260114-f15985f4f",
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"excludePatterns": [
66
"src/js/examples-win32/**"
77
],
8-
"baseVersion": "0.84.0-nightly-20260107-58bc6c3e3",
8+
"baseVersion": "0.85.0-nightly-20260114-f15985f4f",
99
"overrides": [
1010
{
1111
"type": "patch",

‎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.84.0-nightly-20260107-58bc6c3e3",
14+
"@react-native/tester": "0.85.0-nightly-20260114-f15985f4f",
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.84.0-nightly-20260107-58bc6c3e3"
22+
"react-native": "0.85.0-nightly-20260114-f15985f4f"
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.84.0-nightly-20260107-58bc6c3e3",
35+
"react-native": "0.85.0-nightly-20260114-f15985f4f",
3636
"react-native-platform-override": "0.0.0-canary.1022",
3737
"typescript": "5.0.4"
3838
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,4 +175,4 @@ untyped-import
175175
untyped-type-import
176176

177177
[version]
178-
^0.295.0
178+
^0.296.1

0 commit comments

Comments
 (0)