Skip to content

Integrate RN Nightly Build 0.80.0-nightly-20250317-fc7385c1e #14724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
293993f
:Solved override issues for Integration 0.80.0-nightly-20250317-fc738…
Jun 2, 2025
d0590b7
Change files
Jun 2, 2025
9cb1acb
Merge branch 'main' into rn-integrate-march-harinimalothu17
HariniMalothu17 Jun 2, 2025
93e41b1
Fixed version in tester/package.json
Jun 2, 2025
479f829
Merge branch 'rn-integrate-march-harinimalothu17' of https://github.c…
Jun 2, 2025
e1d3947
Fixed version of community CLI template
Jun 2, 2025
6b916eb
updated tester/package.json
Jun 2, 2025
f0d579f
updated versions
Jun 3, 2025
6316526
updated versions
Jun 3, 2025
9b577cd
Updated windows.js file
Jun 3, 2025
a349926
Merge branch 'main' into rn-integrate-march-harinimalothu17
HariniMalothu17 Jun 3, 2025
418fff6
updates txtinput.js file
Jun 3, 2025
735f37f
Merge branch 'rn-integrate-march-harinimalothu17' into rn-integrate-m…
Jun 3, 2025
c7de3a5
updated vcxproj file
Jun 3, 2025
ba24ca5
Fixed build errors
Jun 3, 2025
5dfcbbb
Fixed build errors
Jun 3, 2025
9f75948
Merge branch 'main' into rn-integrate-march-harinimalothu17
HariniMalothu17 Jun 4, 2025
eba5b39
updated yarn.lock
Jun 4, 2025
99978fb
Removed external file reference
Jun 4, 2025
4a9228e
Reverted CSS Tokenizer.h file
Jun 4, 2025
89e0442
Merge branch 'main' into rn-integrate-march-harinimalothu17
HariniMalothu17 Jun 4, 2025
6bd9caa
Save State: Fix FastFloat Import
chiaramooney Jun 4, 2025
e918f12
Remove Unneeded
chiaramooney Jun 4, 2025
29c4800
Merge
chiaramooney Jun 4, 2025
6cbeb68
Package.json Updates
chiaramooney Jun 4, 2025
46e6e7e
Change files
chiaramooney Jun 5, 2025
b7cdcce
fixed linting issues
Jun 5, 2025
dba20d0
fixed lint errors
Jun 5, 2025
fe6c9b2
Fix Linting Errors
chiaramooney Jun 5, 2025
324e867
Merge
chiaramooney Jun 5, 2025
6f4619f
Fix Lint
chiaramooney Jun 5, 2025
53c4b21
Fix Lint
chiaramooney Jun 5, 2025
783b48c
Fix Lint
chiaramooney Jun 5, 2025
d9f9427
Fix Lint + Fix Desktop Tests + Remove StyleSheet.win32
chiaramooney Jun 6, 2025
73b6eb4
Add Support for ReportFullyDrawn
chiaramooney Jun 6, 2025
ced7bf3
Add StyleSheet Copy
chiaramooney Jun 6, 2025
8e33fcc
Add UrlExample.js
chiaramooney Jun 6, 2025
bc5b6c4
Override getNativeComponentAttributes.js
chiaramooney Jun 6, 2025
7d7b253
Update Snapshots + Fix Flow
chiaramooney Jun 6, 2025
96755a7
Merge
chiaramooney Jun 6, 2025
e1edd1a
Fix Lint
chiaramooney Jun 9, 2025
fe00d4f
Update Snapshots
chiaramooney Jun 9, 2025
ea33e5a
Merge branch 'main' into rn-integrate-march-harinimalothu17
HariniMalothu17 Jun 10, 2025
6c02e24
Re-add TestID
chiaramooney Jun 10, 2025
228b40a
Merge branch 'main' into rn-integrate-march-harinimalothu17
HariniMalothu17 Jun 10, 2025
34b9044
Test Culprit: E2E Paper
chiaramooney Jun 10, 2025
75e0f45
Merge branch 'rn-integrate-march-harinimalothu17' of https://github.c…
chiaramooney Jun 10, 2025
44b02bc
updated snapshot
Jun 10, 2025
2669229
Remove Nested Image Example; Not Supported
chiaramooney Jun 10, 2025
96c636f
Merge branch 'rn-integrate-march-harinimalothu17' of https://github.c…
chiaramooney Jun 10, 2025
376ef7e
Remove Issue: 0 Tags
chiaramooney Jun 10, 2025
a302390
fixing build errors
Jun 11, 2025
9a2b350
Fixed syntax error
Jun 11, 2025
39dda1e
Test Fix: Paper E2E Tests
chiaramooney Jun 11, 2025
65dcf7d
Merge
chiaramooney Jun 11, 2025
8d0bc89
Refine Fix
chiaramooney Jun 11, 2025
e3eb8e8
Fixing tester app build
Jun 11, 2025
cbb1893
Fix CLI tests
chiaramooney Jun 11, 2025
9424792
Disable Chakra Tests
chiaramooney Jun 11, 2025
bdcf4b7
Code Cleanup
chiaramooney Jun 11, 2025
a1f52b4
Delete change/react-native-platform-override-ca75f755-a485-4c5d-ab06-…
jonthysell Jun 12, 2025
9fedf45
Fix changefiles
jonthysell Jun 12, 2025
391747a
Merge branch 'main' into rn-integrate-march-harinimalothu17
HariniMalothu17 Jun 12, 2025
484fea5
Merge branch 'main' into rn-integrate-march-harinimalothu17
chiaramooney Jun 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ado/jobs/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ jobs:

# Bundler
Invoke-WebRequest -UseBasicParsing -Uri "http://localhost:8081/IntegrationTests/IntegrationTestsApp.bundle?platform=windows&dev=true"
continueOnError: true

- task: VSTest@2
displayName: Run Desktop Integration Tests
Expand Down
18 changes: 9 additions & 9 deletions .ado/jobs/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@ parameters:
default:
- BuildEnvironment: PullRequest
Matrix:
- Name: X64Chakra
BuildPlatform: x64
UseChakra: true
#- Name: X64Chakra
# BuildPlatform: x64
# UseChakra: true
- Name: X64Hermes
BuildPlatform: x64
UseChakra: false
- BuildEnvironment: Continuous
Matrix:
- Name: X64Chakra
BuildPlatform: x64
UseChakra: true
#- Name: X64Chakra
# BuildPlatform: x64
# UseChakra: true
- Name: X64Hermes
BuildPlatform: x64
UseChakra: false
- Name: X86Chakra
BuildPlatform: x86
UseChakra: true
#- Name: X86Chakra
# BuildPlatform: x86
# UseChakra: true
- Name: X86Hermes
BuildPlatform: x86
UseChakra: false
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate RN Nightly Build 0.80.0-nightly-20250317-fc7385c1e",
"packageName": "@office-iss/react-native-win32",
"email": "hmalothu@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Integrate RN Nightly Build 0.80.0-nightly-20250317-fc7385c1e",
"packageName": "@react-native-windows/automation-channel",
"email": "hmalothu@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate RN Nightly Build 0.80.0-nightly-20250317-fc7385c1e",
"packageName": "@react-native-windows/cli",
"email": "34109996+chiaramooney@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Integrate RN Nightly Build 0.80.0-nightly-20250317-fc7385c1e",
"packageName": "@rnw-scripts/integrate-rn",
"email": "hmalothu@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate RN Nightly Build 0.80.0-nightly-20250317-fc7385c1e",
"packageName": "react-native-windows",
"email": "hmalothu@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* 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 strict-local
* @format
*/

import {View} from 'react-native';

export default View;
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* 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 strict-local
* @format
*/

import type {HostComponent} from 'react-native';
import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';

import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';

type NativeProps = $ReadOnly<{
...ViewProps,
}>;

export type ReportFullyDrawnViewType = HostComponent<ViewProps>;

export default (codegenNativeComponent<NativeProps>(
'RNTReportFullyDrawnView',
): ReportFullyDrawnViewType);
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.79.0-nightly-20250303-cee63397b",
"baseVersion": "0.80.0-nightly-20250317-fc7385c1e",
"overrides": [
{
"type": "patch",
Expand Down Expand Up @@ -42,7 +42,7 @@
"type": "derived",
"file": "src/js/utils/RNTesterList.win32.js",
"baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
"baseHash": "3cf41a5b5fe9269145523937f8cc190ad154e615"
"baseHash": "39dc13e5f5a3b5fb58b807788ee5021ff6b7889c"
}
]
}
6 changes: 3 additions & 3 deletions packages/@office-iss/react-native-win32-tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"validate-overrides": "react-native-platform-override validate"
},
"dependencies": {
"@react-native/tester": "0.79.0-main",
"@react-native/tester": "0.80.0-main",
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"flow-enums-runtime": "^0.0.6"
},
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.288",
"react": "19.0.0",
"react-native": "0.79.0-nightly-20250303-cee63397b"
"react-native": "0.80.0-nightly-20250317-fc7385c1e"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.288",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.79.0-nightly-20250303-cee63397b",
"react-native": "0.80.0-nightly-20250317-fc7385c1e",
"react-native-platform-override": "^1.9.55",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@ const APIs: Array<RNTesterModuleInfo> = ([
category: 'Basic',
module: require('../examples/AppState/AppStateExample'),
},
{
key: 'URLExample',
category: 'Basic',
module: require('../examples/Urls/UrlExample'),
},
{
key: 'BorderExample',
category: 'UI',
Expand Down
5 changes: 3 additions & 2 deletions packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<PROJECT_ROOT>/Libraries/Network/RCTNetworking.js
<PROJECT_ROOT>/Libraries/Pressability/Pressability.js
<PROJECT_ROOT>/Libraries/Pressability/HoverState.js
<PROJECT_ROOT>/Libraries/StyleSheet/StyleSheet.js
<PROJECT_ROOT>/Libraries/StyleSheet/PlatformColorValueTypes.js
<PROJECT_ROOT>/Libraries/Text/TextProps.js
<PROJECT_ROOT>/Libraries/Types/CoreEventTypes.js
Expand Down Expand Up @@ -136,6 +135,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'

react.runtime=automatic

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FlowFixMeProps
Expand Down Expand Up @@ -167,4 +168,4 @@ untyped-import
untyped-type-import

[version]
^0.262.0
^0.265.2
24 changes: 8 additions & 16 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.79.0-nightly-20250303-cee63397b",
"baseVersion": "0.80.0-nightly-20250317-fc7385c1e",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "23e4ec639f146691148b6736f4e84478ae2a5416"
"baseHash": "b8b53bf5315c0b91d0f69c3fe9274797a55b993f"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "62b4752ea0e271645cc0fff8b54f2c1167284d43"
"baseHash": "7a10369d15e8b09ef772d8f229cbfc712d074cbf"
},
{
"type": "platform",
Expand All @@ -29,7 +29,7 @@
"type": "patch",
"file": "src-win/Libraries/Alert/Alert.win32.js",
"baseFile": "packages/react-native/Libraries/Alert/Alert.js",
"baseHash": "95ce9fad7e029b50ff6f1598e38aa420660913dc"
"baseHash": "bd8f474e454f2b703ca7fb55cb022f24046bc0f8"
},
{
"type": "derived",
Expand Down Expand Up @@ -92,8 +92,7 @@
"type": "patch",
"file": "src-win/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
"baseFile": "packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js",
"baseHash": "454f8b04bd6203c70b48aa6ec26e1c05dee42124",
"issue": 0
"baseHash": "454f8b04bd6203c70b48aa6ec26e1c05dee42124"
},
{
"type": "copy",
Expand All @@ -109,7 +108,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "eb047724db45395fe5d6487e269a00a198807eb8"
"baseHash": "f762096a46203b6bae385806087b7b7cb5744f16"
},
{
"type": "patch",
Expand All @@ -136,8 +135,7 @@
"type": "patch",
"file": "src-win/Libraries/Components/Touchable/Touchable.win32.js",
"baseFile": "packages/react-native/Libraries/Components/Touchable/Touchable.js",
"baseHash": "5e13ce3ef1cfeb38a1a9695c3013617527c21175",
"issue": 0
"baseHash": "5e13ce3ef1cfeb38a1a9695c3013617527c21175"
},
{
"type": "derived",
Expand Down Expand Up @@ -398,12 +396,6 @@
"type": "platform",
"file": "src-win/Libraries/StyleSheet/PlatformColorValueTypesWin32.js"
},
{
"type": "patch",
"file": "src-win/Libraries/StyleSheet/StyleSheet.win32.js",
"baseFile": "packages/react-native/Libraries/StyleSheet/StyleSheet.js",
"baseHash": "6c83ae0478119480b693eeab590fa4ba5af98084"
},
{
"type": "derived",
"file": "src-win/Libraries/Text/Text.d.ts",
Expand Down Expand Up @@ -492,7 +484,7 @@
"type": "patch",
"file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
"baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
"baseHash": "8c67d57575cccb7281b15ca2591e4edf5c5c36dd",
"baseHash": "c511868b72abd4e0e7d0b07e0453ea56687ffddb",
"issue": 11041
},
{
Expand Down
28 changes: 14 additions & 14 deletions packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
"dependencies": {
"@babel/runtime": "^7.0.0",
"@jest/create-cache-key-function": "^29.7.0",
"@react-native-community/cli": "15.0.0-alpha.2",
"@react-native-community/cli-platform-android": "15.0.0-alpha.2",
"@react-native-community/cli-platform-ios": "15.0.0-alpha.2",
"@react-native-community/cli": "17.0.0",
"@react-native-community/cli-platform-android": "17.0.0",
"@react-native-community/cli-platform-ios": "17.0.0",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.79.0-nightly-20250303-cee63397b",
"@react-native/codegen": "0.79.0-nightly-20250303-cee63397b",
"@react-native/community-cli-plugin": "0.79.0-nightly-20250303-cee63397b",
"@react-native/gradle-plugin": "0.79.0-nightly-20250303-cee63397b",
"@react-native/js-polyfills": "0.79.0-nightly-20250303-cee63397b",
"@react-native/normalize-colors": "0.79.0-nightly-20250303-cee63397b",
"@react-native/virtualized-lists": "0.79.0-nightly-20250303-cee63397b",
"@react-native/assets-registry": "0.80.0-nightly-20250317-fc7385c1e",
"@react-native/codegen": "0.80.0-nightly-20250317-fc7385c1e",
"@react-native/community-cli-plugin": "0.80.0-nightly-20250317-fc7385c1e",
"@react-native/gradle-plugin": "0.80.0-nightly-20250317-fc7385c1e",
"@react-native/js-polyfills": "0.80.0-nightly-20250317-fc7385c1e",
"@react-native/normalize-colors": "0.80.0-nightly-20250317-fc7385c1e",
"@react-native/virtualized-lists": "0.80.0-nightly-20250317-fc7385c1e",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand Down Expand Up @@ -72,7 +72,7 @@
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/eslint-parser": "^7.25.1",
"@react-native/metro-config": "0.79.0-nightly-20250303-cee63397b",
"@react-native/metro-config": "0.80.0-nightly-20250317-fc7385c1e",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.36",
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.40",
Expand All @@ -88,14 +88,14 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "19.0.0",
"react-native": "0.79.0-nightly-20250303-cee63397b",
"react-native": "0.80.0-nightly-20250317-fc7385c1e",
"react-native-platform-override": "^1.9.55",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^19.0.0",
"react": "^19.0.0",
"react-native": "0.79.0-nightly-20250303-cee63397b"
"react-native": "0.80.0-nightly-20250317-fc7385c1e"
},
"beachball": {
"defaultNpmTag": "canary",
Expand All @@ -112,4 +112,4 @@
"engines": {
"node": ">= 18"
}
}
}
Loading
Loading