Skip to content

Commit 054949a

Browse files
Integrate nightly 0.81.0-nightly-20250521-3cb70bb6a (#14991)
* solved merge conflicts and resolved unresolved overrides * yarn change , format , lint:fix * fix * Change files * fix build issues , creates override * update e2e package-lock.json * update yarn.lock * added override of paragraphState.h * yarn format * fix package.json * update vcxproj and commented conversions.h depends in WindowsTextInputState.h file * revert GenerateWindowsMetadata * removed getMapBuffer from windowsTextInputState.cpp * update NativeDOM .h/.cpp removing backticks * udpated yarn.lock * fix yarn:test * fix yarn validate-overrides * supress 5028 warning WindowsTextInputState.cpp * fix C4715 in \AccessibilityPrimitives.h for windows * comment testcases to suppress JSI failures * Update createrwnapp.cmd to fix @react-native/new-app-screen * Update createrwnlib.cmd to fix @react-native/new-app-screen * fix JSExecutor.cpp stubeed implem according to previous new app screen api signatures * revert stubbed implementation * lint fix * update base cpp standard lib cpp20 * add nightly build name in change file 0.81.0-nightly-20250521-3cb70bb6a * fix change file * ignore .js file for flow check * add cpp20 standard to PlaygroundNativeModules.vcxproj * fix pipeline errors w.r.t cppstandard and flow ignore * udpate cpp20 standard for SampleAppFabric.vcxproj * update cpp standarad for SampleLib paper * update cpp 20 standard for playground paper * update SampleAppCpp.vcxproj cpp standard to 20 * packages\playground\windows\ directory use the C++20 standard * update snapshots * revert new app screen deprecation and update lock file * PropertySheet.props import path updated to point to node_modules * updated stubbed implementation collectSamplingProfile * update for reactCommon vcxproj * added header for RuntimeSamplingProfile * update office-iss flow to 0.271 * update collectSamplingProfile stubbed implentatation * jJSExecutor fix * revert JSexecutor changes , added cpp standard to playground property sheet * update property sheets for playground paper * update root directory build props with cpp20 standard * updated version of new-app-screen * Forked jsinspector-modern/tracing/RuntimeSamplingProfile.h to match contrusctor RuntimeSamplingProfile with upstream * ignore Libraries/Renderer/shims/* @office-iss * update Renderer/Shims dependencies to be ignored * revert ignore /Libraries/Renderer/shims/ * Revert "Forked jsinspector-modern/tracing/RuntimeSamplingProfile.h to match contrusctor RuntimeSamplingProfile with upstream" This reverts commit c8191a3. * ignore shims/ReactNativeTypes.js in react native win32 * lint fix * Ffix yarn install * jsitooling decouplewd as folder and added as seperate files and added ShowIncludes for ReactCommon to debug the .h files included * lint fix * revert flowfix me ReactNativeTypes.js * revert ReactnativeTypes.js * match JSExecutor .h/.cpp files to upstream * NativeToJsBridge fix returns RuntimeTargetDelegate * commented HermesJSRuntime stubbed implementaion collectSamplingProfile * revert commenting collectSamplingProfile * base cpp standard 20 for vnext\Microsoft.ReactNative.Cxx * include top level ReactCommon not nested in some pacckage/ * show includes to check header files in shared project * Revert regression in creaternwapp.cmd * Fix formatting in package.json for new-app-screen * Centralize LanguageStandard * update dependencies to 0.81-0-nightly * fixes lint and removes unnecessary language standard in preprocessor * fixed view prop reduceDefaultPropsInView path and lint fixes * fix windows comment * lint fix * lint fix * fix integration app TouchableWithoutFeedback missing ref forwarding * fix e2etest[paper] added ref to processedProps ( path -> reduceDefaultPropsInView ) * remove legacy consumerHasTextAncestor * use TextSharedExamples instead of TextInlineViewsExample * TextInlineViewsExample ontains Views nested in Text made it platform specific * revert TextSharedExamples.js * fix TextInlineViewsExamples for Paper * update snapshots for paper * disable assert causing e2e testapp fabric failure of no window selection * ReactCommon override fix * fixed vector assertion and crarshes in windowtextLayoutmanager * lock file * update snapshots rntester fabric * update overrides * uncomment JSI 20 tests and lint:fix * comment JSI related tests , take it as separate issue --------- Co-authored-by: Jon Thysell <[email protected]> Co-authored-by: Jon Thysell <[email protected]>
1 parent c2a26e9 commit 054949a

File tree

228 files changed

+5085
-3679
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+5085
-3679
lines changed
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 nightly 0.81.0-nightly-20250521-3cb70bb6a",
4+
"packageName": "@office-iss/react-native-win32",
5+
"email": "[email protected]",
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": "patch",
3+
"comment": "fix",
4+
"packageName": "@react-native-windows/automation-channel",
5+
"email": "[email protected]",
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": "patch",
3+
"comment": "fix",
4+
"packageName": "react-native-platform-override",
5+
"email": "[email protected]",
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": "fix",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"excludePatterns": [
66
"src/js/examples-win32/**"
77
],
8-
"baseVersion": "0.80.0-nightly-20250506-3ac16dd6a",
8+
"baseVersion": "0.81.0-nightly-20250521-3cb70bb6a",
99
"overrides": [
1010
{
1111
"type": "patch",
1212
"file": "src/js/components/ListExampleShared.win32.js",
1313
"baseFile": "packages/rn-tester/js/components/ListExampleShared.js",
14-
"baseHash": "d39ad505e22d525b00b8f63165ce2c2bbcc86152"
14+
"baseHash": "eb604f3c06468e8aaa2671985a772b26f666e5de"
1515
},
1616
{
1717
"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
@@ -19,7 +19,7 @@
1919
"peerDependencies": {
2020
"@office-iss/react-native-win32": "^0.0.0-canary.296",
2121
"react": "19.1.0",
22-
"react-native": "0.80.0-nightly-20250506-3ac16dd6a"
22+
"react-native": "0.81.0-nightly-20250521-3cb70bb6a"
2323
},
2424
"devDependencies": {
2525
"@office-iss/react-native-win32": "^0.0.0-canary.296",
@@ -30,11 +30,11 @@
3030
"@types/node": "^22.14.0",
3131
"eslint": "^8.19.0",
3232
"just-scripts": "^1.3.3",
33-
"react-native": "0.80.0-nightly-20250506-3ac16dd6a",
33+
"react-native": "0.81.0-nightly-20250521-3cb70bb6a",
3434
"react-native-platform-override": "^1.9.57",
3535
"typescript": "5.0.4"
3636
},
3737
"engines": {
3838
"node": ">= 22"
3939
}
40-
}
40+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import RNTesterText from './RNTesterText';
1414
import React from 'react';
15+
import {memo} from 'react';
1516
import {
1617
ActivityIndicator,
1718
Animated,
@@ -164,7 +165,7 @@ class SeparatorComponent extends React.PureComponent<{...}> {
164165
}
165166
}
166167

167-
const LoadingComponent: React.ComponentType<{}> = React.memo(() => (
168+
const LoadingComponent: React.ComponentType<{}> = memo(() => (
168169
<View style={styles.loadingContainer}>
169170
<ActivityIndicator />
170171
</View>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<PROJECT_ROOT>/Libraries/Network/RCTNetworking.js
3232
<PROJECT_ROOT>/Libraries/Pressability/Pressability.js
3333
<PROJECT_ROOT>/Libraries/Pressability/HoverState.js
34+
<PROJECT_ROOT>/Libraries/Renderer/shims/ReactNativeTypes.js
3435
<PROJECT_ROOT>/Libraries/StyleSheet/PlatformColorValueTypes.js
3536
<PROJECT_ROOT>/Libraries/Text/TextProps.js
3637
<PROJECT_ROOT>/Libraries/Types/CoreEventTypes.js
@@ -49,6 +50,7 @@
4950
; Ignore react-native files in node_modules since they are copied into project root
5051
.*/node_modules/react-native/.*
5152

53+
5254
; Ignore react-native-windows' build output. Flow is not compiled with long path support and after running unittests these folders have long paths
5355
.*/node_modules/react-native-windows/build/.*
5456
.*/node_modules/react-native-windows/target/.*
@@ -174,4 +176,4 @@ untyped-import
174176
untyped-type-import
175177

176178
[version]
177-
^0.269.1
179+
^0.271.0

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

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
"**/__snapshots__/**",
88
"src-win/rntypes/**"
99
],
10-
"baseVersion": "0.80.0-nightly-20250506-3ac16dd6a",
10+
"baseVersion": "0.81.0-nightly-20250521-3cb70bb6a",
1111
"overrides": [
1212
{
1313
"type": "derived",
1414
"file": ".flowconfig",
1515
"baseFile": ".flowconfig",
16-
"baseHash": "70ed729d5f52c241530e8459cc40263d4e9fa9c0"
16+
"baseHash": "dbea35126905a8314fa0a64ed2912896bc6d307b"
1717
},
1818
{
1919
"type": "derived",
2020
"file": "src-win/index.win32.js",
2121
"baseFile": "packages/react-native/index.js",
22-
"baseHash": "96361b83bfc122f1d78cc7d87ea0d7c3bfac138f"
22+
"baseHash": "b447e699186ab3e95da9dc4520b9c2517776e723"
2323
},
2424
{
2525
"type": "platform",
@@ -60,7 +60,7 @@
6060
"type": "derived",
6161
"file": "src-win/Libraries/Components/Button.win32.js",
6262
"baseFile": "packages/react-native/Libraries/Components/Button.js",
63-
"baseHash": "4e77e13aa5774e813fbd874a13a920ea12e3ed91"
63+
"baseHash": "6063d726e6255d1c55e07587f9ce09f1b7284301"
6464
},
6565
{
6666
"type": "platform",
@@ -85,14 +85,14 @@
8585
"type": "patch",
8686
"file": "src-win/Libraries/Components/Pressable/Pressable.win32.js",
8787
"baseFile": "packages/react-native/Libraries/Components/Pressable/Pressable.js",
88-
"baseHash": "96bdd4aebf4133fd2fe6d1b448f9d7b4cd3e8982",
88+
"baseHash": "eff51d201199c68c6f7ca268e315e538dcc01ab9",
8989
"issue": 6240
9090
},
9191
{
9292
"type": "patch",
9393
"file": "src-win/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
9494
"baseFile": "packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
95-
"baseHash": "c96925930d9664306a8aef8b4102c43055ea03be"
95+
"baseHash": "d1cc663442d184b62799b748c475a5a2c5c558c7"
9696
},
9797
{
9898
"type": "copy",
@@ -108,13 +108,13 @@
108108
"type": "derived",
109109
"file": "src-win/Libraries/Components/TextInput/TextInput.flow.win32.js",
110110
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.flow.js",
111-
"baseHash": "f407548782cade71af32a52ecb440f72a403f06e"
111+
"baseHash": "b611f4e98e9c7818dfac087e4f14384d3cc16b6a"
112112
},
113113
{
114114
"type": "derived",
115115
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
116116
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
117-
"baseHash": "9965c0079652083ab549bc2799eb9528b56a1b2d"
117+
"baseHash": "2a5835c5cbdb36bd110e26f9be737aaaeb1fd97c"
118118
},
119119
{
120120
"type": "patch",
@@ -153,7 +153,7 @@
153153
"type": "derived",
154154
"file": "src-win/Libraries/Components/Touchable/TouchableNativeFeedback.win32.js",
155155
"baseFile": "packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js",
156-
"baseHash": "8706705c1f8d3dd5390ea631ce5ae60e300ae50d"
156+
"baseHash": "1cad0522ba348d657e7857bf84628d88e776170b"
157157
},
158158
{
159159
"type": "platform",
@@ -177,7 +177,7 @@
177177
"type": "patch",
178178
"file": "src-win/Libraries/Components/View/View.win32.js",
179179
"baseFile": "packages/react-native/Libraries/Components/View/View.js",
180-
"baseHash": "2dd3e58cf6c4bc0882550eedd8150435972365eb"
180+
"baseHash": "121c2126d26c94c8e508e3fb19ffe33f7be814b1"
181181
},
182182
{
183183
"type": "derived",
@@ -218,7 +218,7 @@
218218
"type": "patch",
219219
"file": "src-win/Libraries/Core/Devtools/loadBundleFromServer.win32.js",
220220
"baseFile": "packages/react-native/Libraries/Core/Devtools/loadBundleFromServer.js",
221-
"baseHash": "e0158fd16d4a787e5a94d69e2b7a721e81b7c3da",
221+
"baseHash": "ac08c96a4bebd677597a40ea1525a2d5d1ee8742",
222222
"issue": 12704
223223
},
224224
{
@@ -236,7 +236,7 @@
236236
"type": "derived",
237237
"file": "src-win/Libraries/Image/Image.win32.js",
238238
"baseFile": "packages/react-native/Libraries/Image/Image.ios.js",
239-
"baseHash": "c0bc913aa95b6d1309ba44ef7968ba58fc488427",
239+
"baseHash": "5d62f4a6c4edfe3007eb3b80704a1dfb68e5ff8a",
240240
"issue": 4320
241241
},
242242
{
@@ -303,13 +303,13 @@
303303
"type": "derived",
304304
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorReactFrames.win32.js",
305305
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js",
306-
"baseHash": "3a3d7da499937cce35c9bd17a11f10b2eeac04cc"
306+
"baseHash": "cdf958aebabbe9067d34a2df3e6f2fe7ce09f51e"
307307
},
308308
{
309309
"type": "derived",
310310
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.win32.js",
311311
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js",
312-
"baseHash": "b355418205aa52cf33fb7e4d521b26083eada49d"
312+
"baseHash": "987653809d7838bb80d3a975abc9f0fd3bc13d93"
313313
},
314314
{
315315
"type": "derived",
@@ -390,6 +390,13 @@
390390
"baseFile": "packages/react-native/Libraries/ReactNative/PaperUIManager.js",
391391
"baseHash": "7a14c3d42ba7442848bd90329f6d31bda323c6d4"
392392
},
393+
{
394+
"type": "patch",
395+
"file": "src-win/Libraries/Renderer/shims/ReactNativeTypes.win32.js",
396+
"baseFile": "packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js",
397+
"baseHash": "4e0c2fba71006410b3effa3979aea91e0f711144",
398+
"issue": 0
399+
},
393400
{
394401
"type": "derived",
395402
"file": "src-win/Libraries/Settings/Settings.win32.js",
@@ -412,13 +419,13 @@
412419
"type": "derived",
413420
"file": "src-win/Libraries/Text/Text.d.ts",
414421
"baseFile": "packages/react-native/Libraries/Text/Text.d.ts",
415-
"baseHash": "b5f44957bc61497fcb7203934bdbc6ca9725cf42"
422+
"baseHash": "d3807571f477ef8ba4bb20c1ee899b1a5814941d"
416423
},
417424
{
418425
"type": "derived",
419426
"file": "src-win/Libraries/Text/Text.win32.js",
420427
"baseFile": "packages/react-native/Libraries/Text/Text.js",
421-
"baseHash": "1f802db19830e468b84640fc5c7740a11e154250"
428+
"baseHash": "108e59816ed3b3c8183d0687a66088755580c00d"
422429
},
423430
{
424431
"type": "derived",
@@ -431,7 +438,7 @@
431438
"type": "derived",
432439
"file": "src-win/Libraries/Text/TextProps.win32.js",
433440
"baseFile": "packages/react-native/Libraries/Text/TextProps.js",
434-
"baseHash": "d31f973c14140792d9d28d208fca15d092a8a4e2"
441+
"baseHash": "6ee62a1b3a4384c2b5bd1dd10a13664c72e5dc88"
435442
},
436443
{
437444
"type": "patch",
@@ -477,7 +484,7 @@
477484
"type": "patch",
478485
"file": "src-win/Libraries/Utilities/PlatformTypes.js",
479486
"baseFile": "packages/react-native/Libraries/Utilities/PlatformTypes.js",
480-
"baseHash": "0bd36210528f74f9081d858c9ab64ead92c54950",
487+
"baseHash": "8beb4d8d786f33f9eeb6edcff939c38765e19055",
481488
"issue": 14686
482489
},
483490
{
@@ -490,14 +497,14 @@
490497
"type": "patch",
491498
"file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
492499
"baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
493-
"baseHash": "3247a8e436a7beeda45ce7d77343229b5204cbfc",
500+
"baseHash": "e897f1bd33ed982044b97a01d9f606b9ebcd4505",
494501
"issue": 11041
495502
},
496503
{
497504
"type": "copy",
498505
"file": "src-win/src/private/devsupport/rndevtools/ReactDevToolsSettingsManager.win32.js",
499506
"baseFile": "packages/react-native/src/private/devsupport/rndevtools/ReactDevToolsSettingsManager.android.js",
500-
"baseHash": "2d33789b0c7a45996dc23f26c4b09fb2026a9285"
507+
"baseHash": "f2cc01b07b779b75002daec9c2761616ad01f4ca"
501508
},
502509
{
503510
"type": "derived",

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
"@react-native-community/cli-platform-android": "17.0.0",
3131
"@react-native-community/cli-platform-ios": "17.0.0",
3232
"@react-native/assets": "1.0.0",
33-
"@react-native/assets-registry": "0.80.0-nightly-20250506-3ac16dd6a",
34-
"@react-native/codegen": "0.80.0-nightly-20250506-3ac16dd6a",
35-
"@react-native/community-cli-plugin": "0.80.0-nightly-20250506-3ac16dd6a",
36-
"@react-native/gradle-plugin": "0.80.0-nightly-20250506-3ac16dd6a",
37-
"@react-native/js-polyfills": "0.80.0-nightly-20250506-3ac16dd6a",
38-
"@react-native/normalize-colors": "0.80.0-nightly-20250506-3ac16dd6a",
39-
"@react-native/virtualized-lists": "0.80.0-nightly-20250506-3ac16dd6a",
33+
"@react-native/assets-registry": "0.81.0-nightly-20250521-3cb70bb6a",
34+
"@react-native/codegen": "0.81.0-nightly-20250521-3cb70bb6a",
35+
"@react-native/community-cli-plugin": "0.81.0-nightly-20250521-3cb70bb6a",
36+
"@react-native/gradle-plugin": "0.81.0-nightly-20250521-3cb70bb6a",
37+
"@react-native/js-polyfills": "0.81.0-nightly-20250521-3cb70bb6a",
38+
"@react-native/normalize-colors": "0.81.0-nightly-20250521-3cb70bb6a",
39+
"@react-native/virtualized-lists": "0.81.0-nightly-20250521-3cb70bb6a",
4040
"abort-controller": "^3.0.0",
4141
"anser": "^1.4.9",
4242
"ansi-regex": "^5.0.0",
@@ -72,7 +72,7 @@
7272
"devDependencies": {
7373
"@babel/core": "^7.25.2",
7474
"@babel/eslint-parser": "^7.25.1",
75-
"@react-native/metro-config": "0.80.0-nightly-20250506-3ac16dd6a",
75+
"@react-native/metro-config": "0.81.0-nightly-20250521-3cb70bb6a",
7676
"@rnw-scripts/babel-react-native-config": "0.0.0",
7777
"@rnw-scripts/eslint-config": "1.2.37",
7878
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.41",
@@ -83,19 +83,19 @@
8383
"@types/prop-types": "15.7.1",
8484
"@types/react": "^19.0.0",
8585
"eslint": "^8.19.0",
86-
"flow-bin": "^0.269.0",
86+
"flow-bin": "^0.271.0",
8787
"jscodeshift": "^0.14.0",
8888
"just-scripts": "^1.3.3",
8989
"prettier": "2.8.8",
9090
"react": "19.1.0",
91-
"react-native": "0.80.0-nightly-20250506-3ac16dd6a",
91+
"react-native": "0.81.0-nightly-20250521-3cb70bb6a",
9292
"react-native-platform-override": "^1.9.57",
9393
"typescript": "5.0.4"
9494
},
9595
"peerDependencies": {
9696
"@types/react": "^19.1.0",
9797
"react": "^19.1.0",
98-
"react-native": "0.80.0-nightly-20250506-3ac16dd6a"
98+
"react-native": "0.81.0-nightly-20250521-3cb70bb6a"
9999
},
100100
"beachball": {
101101
"defaultNpmTag": "canary",
@@ -112,4 +112,4 @@
112112
"engines": {
113113
"node": ">= 22"
114114
}
115-
}
115+
}

0 commit comments

Comments
 (0)