Skip to content

Integrate RN Nightly 7/19 #13554

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.

Sign up for GitHub

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
TatianaKapos merged 35 commits into from
Aug 21, 2024
Merged

Integrate RN Nightly 7/19 #13554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ef0fc97
integrate 0.76.0-nightly-20240709-12b64b782
TatianaKapos Aug 8, 2024
1d9f4bc
Change files
TatianaKapos Aug 8, 2024
2733162
remove yoga file overrides
TatianaKapos Aug 8, 2024
28c7502
add new rntester pages and assets
TatianaKapos Aug 8, 2024
fdc3688
add back win32 text accesiblity
TatianaKapos Aug 8, 2024
7b1d828
add back Text Borders
TatianaKapos Aug 9, 2024
140af7f
revert border fix
TatianaKapos Aug 9, 2024
dfbb52b
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Aug 13, 2024
f3c5943
fix border pt2
TatianaKapos Aug 13, 2024
34d6646
see if text is breaking fabric
TatianaKapos Aug 13, 2024
eb4c8e3
Merge branch 'main' into tk-integrate-7-12
TatianaKapos Aug 13, 2024
947162d
update hermes snapshots
TatianaKapos Aug 13, 2024
0d936dc
Merge branch 'tk-integrate-7-12' of https://github.com/TatianaKapos/r…
TatianaKapos Aug 13, 2024
134f190
integrate 0.76.0-nightly-20240710-9a1ae97c2
TatianaKapos Aug 13, 2024
2206a19
integrate 0.76.0-nightly-20240715-2eb7bcb8d
TatianaKapos Aug 14, 2024
3671115
add jsinspector-modern/NetworkIOAgent.cpp
TatianaKapos Aug 14, 2024
6d041fb
integrate 0.76.0-nightly-20240719-6d56cea28
TatianaKapos Aug 14, 2024
005a27b
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Aug 14, 2024
7439ab7
fix build
TatianaKapos Aug 14, 2024
aaaf596
fix fabric build and add new rntester pages
TatianaKapos Aug 15, 2024
87883fd
fix win32
TatianaKapos Aug 15, 2024
10ed316
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Aug 15, 2024
154350d
fix lint and snapshots
TatianaKapos Aug 16, 2024
fb9c091
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Aug 16, 2024
c80df92
clean up code and add issue numbers
TatianaKapos Aug 16, 2024
67dc14b
more issue numbers
TatianaKapos Aug 16, 2024
66a01b4
fix lint and overrides
TatianaKapos Aug 16, 2024
ba9fc27
fix lint and snapshots
TatianaKapos Aug 16, 2024
95eae2a
fix lint merge
TatianaKapos Aug 20, 2024
b544077
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Aug 20, 2024
1f1c2b1
fix overrides
TatianaKapos Aug 20, 2024
45c1e78
snapshots
TatianaKapos Aug 20, 2024
8135d90
Merge branch 'main' of https://github.com/TatianaKapos/react-native-w…
TatianaKapos Aug 21, 2024
58e6f74
Merge branch 'main' into tk-integrate-7-12
TatianaKapos Aug 21, 2024
77b20ec
feedback
TatianaKapos Aug 21, 2024
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
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@
"xmemory": "cpp",
"xtr1common": "cpp",
"xtree": "cpp",
"xutility": "cpp"
"xutility": "cpp",
"xstddef": "cpp"
},
"search.exclude": {
"**/dist/**/*.js": true,
Expand Down
7 changes: 7 additions & 0 deletions change/@office-iss-react-native-win32-6b5a3f54-49cc-46ec-9e8a-a1960cf04bf5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate react native nightly 7-19",
"packageName": "@office-iss/react-native-win32",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@react-native-windows-automation-channel-9b183b6a-0435-4f5b-879b-625aea529a82.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate react native nightly 7-19",
"packageName": "@react-native-windows/automation-channel",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/react-native-windows-f8604ead-cf1e-4156-a47a-5c36478e9f1b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate react native nightly 7-19",
"packageName": "react-native-windows",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32-tester/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.76.0-nightly-20240701-9f6cb21ed",
"baseVersion": "0.76.0-nightly-20240719-6d56cea28",
"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": "31470c217dc6b4b68de65fc0be1c072c0790cd56"
"baseHash": "587e2db8c14caac51f04005c129479d606e896a7"
}
]
}
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32-tester/package.json
View file
Open in desktop
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.258",
"react": "18.0.0",
"react-native": "0.76.0-nightly-20240701-9f6cb21ed"
"react-native": "0.76.0-nightly-20240719-6d56cea28"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.258",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.76.0-nightly-20240701-9f6cb21ed",
"react-native": "0.76.0-nightly-20240719-6d56cea28",
"react-native-platform-override": "^1.9.45",
"typescript": "5.0.4"
},
Expand Down
5 changes: 5 additions & 0 deletions packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,11 @@ const APIs: Array<RNTesterModuleInfo> = ([
module: require('../examples/Filter/FilterExample'),
},
/*
{
key: 'MixBlendModeExample',
category: 'UI',
module: require('../examples/MixBlendMode/MixBlendModeExample'),
},
{
key: 'VibrationExample',
category: 'Basic',
Expand Down
6 changes: 2 additions & 4 deletions packages/@office-iss/react-native-win32/.flowconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,7 @@ module.name_mapper='^@office-iss/react-native-win32$' -> '<PROJECT_ROOT>/index.w
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/\1'
module.name_mapper='^@office-iss/react-native-win32/\(.*\)$' -> '<PROJECT_ROOT>\/1'
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\)$' -> '<PROJECT_ROOT>/Libraries/Image/RelativeImageStub'

one_sided_type_guards=true
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'

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
Expand Down Expand Up @@ -161,4 +159,4 @@ untyped-import
untyped-type-import

[version]
^0.238.3
^0.241.0
18 changes: 9 additions & 9 deletions packages/@office-iss/react-native-win32/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.76.0-nightly-20240701-9f6cb21ed",
"baseVersion": "0.76.0-nightly-20240719-6d56cea28",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "2b0a3c4f44b686f254516c51469500bf26c5b113"
"baseHash": "83d25eb077cc8d865039ec211f3fedeac9e57d39"
},
{
"type": "derived",
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": "897569d77df852480332b7ce7ec1b594cf40aa28"
"baseHash": "173b99e6ae120f14176cf3425877728787d3feed"
},
{
"type": "derived",
Expand Down Expand Up @@ -116,7 +116,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "dad569fd3dd81f212afd7b35ffe75108e926eb5e"
"baseHash": "2cc1ee09c4a71e79656db18576b4983cfca153ed"
},
{
"type": "patch",
Expand Down Expand Up @@ -344,7 +344,7 @@
"type": "derived",
"file": "src-win/Libraries/NativeComponent/BaseViewConfig.win32.js",
"baseFile": "packages/react-native/Libraries/NativeComponent/BaseViewConfig.ios.js",
"baseHash": "d7b9540d5e637cb86b29d119838a4024bfc2b7d6"
"baseHash": "86178b8f2e04b5df9e4c8dc8ca412c22231e6673"
},
{
"type": "copy",
Expand Down Expand Up @@ -439,7 +439,7 @@
"type": "derived",
"file": "src-win/Libraries/Text/Text.win32.js",
"baseFile": "packages/react-native/Libraries/Text/Text.js",
"baseHash": "3b40ec7def4177ef81ad2eb84a0f95bc00cec041"
"baseHash": "fa9abb0db816a992824228c520fc0381bf2a1f63"
},
{
"type": "derived",
Expand Down Expand Up @@ -498,13 +498,13 @@
"type": "derived",
"file": "src-win/Libraries/Utilities/Platform.flow.win32.js",
"baseFile": "packages/react-native/Libraries/Utilities/Platform.flow.js",
"baseHash": "d07d4656dc872e92e873bcce248262132085bd99"
"baseHash": "f38efa527b9426ae0178bb2336be2e93af0392ba"
},
{
"type": "derived",
"file": "src-win/Libraries/Utilities/Platform.win32.js",
"baseFile": "packages/react-native/Libraries/Utilities/Platform.android.js",
"baseHash": "ddd8013d71adc13b3ef3016631012efd096a9518"
"baseHash": "33f07d6fddb5290d05c8d4cc490312e3af88c70b"
},
{
"type": "copy",
Expand All @@ -528,7 +528,7 @@
"type": "derived",
"file": "src-win/src/private/specs/modules/NativePlatformConstantsWin.js",
"baseFile": "packages/react-native/src/private/specs/modules/NativePlatformConstantsAndroid.js",
"baseHash": "b4a125d9134f33aeaba9e06988e18cbb0b4e9e9c"
"baseHash": "fa0f34a2de33b641bd63863629087644796d8b59"
}
]
}
22 changes: 11 additions & 11 deletions packages/@office-iss/react-native-win32/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
"@react-native-community/cli-platform-android": "14.0.0-alpha.11",
"@react-native-community/cli-platform-ios": "14.0.0-alpha.11",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.76.0-nightly-20240701-9f6cb21ed",
"@react-native/codegen": "0.76.0-nightly-20240701-9f6cb21ed",
"@react-native/community-cli-plugin": "0.76.0-nightly-20240701-9f6cb21ed",
"@react-native/gradle-plugin": "0.76.0-nightly-20240701-9f6cb21ed",
"@react-native/js-polyfills": "0.76.0-nightly-20240701-9f6cb21ed",
"@react-native/normalize-colors": "0.76.0-nightly-20240701-9f6cb21ed",
"@react-native/virtualized-lists": "0.76.0-nightly-20240701-9f6cb21ed",
"@react-native/assets-registry": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/codegen": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/community-cli-plugin": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/gradle-plugin": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/js-polyfills": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/normalize-colors": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/virtualized-lists": "0.76.0-nightly-20240719-6d56cea28",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand All @@ -57,7 +57,7 @@
"pretty-format": "^26.5.2",
"promise": "^8.3.0",
"react-clone-referenced-element": "^1.0.1",
"react-devtools-core": "^5.3.0",
"react-devtools-core": "^5.3.1",
"react-refresh": "^0.14.0",
"react-shallow-renderer": "^16.15.0",
"regenerator-runtime": "^0.13.2",
Expand All @@ -82,19 +82,19 @@
"@types/prop-types": "15.7.1",
"@types/react": "^18.2.6",
"eslint": "^8.19.0",
"flow-bin": "^0.217.2",
"flow-bin": "^0.241.0",
"jscodeshift": "^0.14.0",
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.76.0-nightly-20240701-9f6cb21ed",
"react-native": "0.76.0-nightly-20240719-6d56cea28",
"react-native-platform-override": "^1.9.45",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "^19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.76.0-nightly-20240701-9f6cb21ed"
"react-native": "0.76.0-nightly-20240719-6d56cea28"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Loading