Skip to content
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

Jump to bottom

[0.75] Integrate RC5 #13453

Merged
merged 7 commits into from
Jul 23, 2024
Merged

[0.75] Integrate RC5 #13453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
110eb37
integrate RN 0.75.0-rc.5
TatianaKapos Jul 16, 2024
1d17c38
Change files
TatianaKapos Jul 16, 2024
37e2259
fix lint and match main text.win32.js
TatianaKapos Jul 16, 2024
c599bf6
update snapshots
TatianaKapos Jul 16, 2024
2ffc140
Merge branch '0.75-stable' into tk-rc5
TatianaKapos Jul 19, 2024
caddb4c
Merge branch '0.75-stable' of https://github.com/microsoft/react-nati…
TatianaKapos Jul 23, 2024
e88b117
Merge branch 'tk-rc5' of https://github.com/TatianaKapos/react-native…
TatianaKapos Jul 23, 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
7 changes: 7 additions & 0 deletions change/@office-iss-react-native-win32-b747dd02-0455-43a3-b8f0-38d036692a81.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate RN 0.75.0-rc.5",
"packageName": "@office-iss/react-native-win32",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/react-native-windows-670fe787-9e36-49b3-8611-7172b07ad3dd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate RN 0.75.0-rc.5",
"packageName": "react-native-windows",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion 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.75.0-rc.3",
"baseVersion": "0.75.0-rc.5",
"overrides": [
{
"type": "patch",
Expand Down
6 changes: 3 additions & 3 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 @@ -11,15 +11,15 @@
"validate-overrides": "react-native-platform-override validate"
},
"dependencies": {
"@react-native/tester": "0.75.0-rc.3",
"@react-native/tester": "0.75.0-rc.5",
"@typescript-eslint/eslint-plugin": "^5.30.5",
"@typescript-eslint/parser": "^5.57.1",
"flow-enums-runtime": "^0.0.5"
},
"peerDependencies": {
"@office-iss/react-native-win32": "0.75.0-preview.1",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.75.0-rc.3"
"react-native": "0.75.0-rc.5"
},
"devDependencies": {
"@office-iss/react-native-win32": "0.75.0-preview.1",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.75.0-rc.3",
"react-native": "0.75.0-rc.5",
"react-native-platform-override": "^1.9.42",
"typescript": "5.0.4"
},
Expand Down
8 changes: 4 additions & 4 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,7 +7,7 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.75.0-rc.3",
"baseVersion": "0.75.0-rc.5",
"overrides": [
{
"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.75.0-rc.3",
"@react-native/codegen": "0.75.0-rc.3",
"@react-native/community-cli-plugin": "0.75.0-rc.3",
"@react-native/gradle-plugin": "0.75.0-rc.3",
"@react-native/js-polyfills": "0.75.0-rc.3",
"@react-native/normalize-colors": "0.75.0-rc.3",
"@react-native/virtualized-lists": "0.75.0-rc.3",
"@react-native/assets-registry": "0.75.0-rc.5",
"@react-native/codegen": "0.75.0-rc.5",
"@react-native/community-cli-plugin": "0.75.0-rc.5",
"@react-native/gradle-plugin": "0.75.0-rc.5",
"@react-native/js-polyfills": "0.75.0-rc.5",
"@react-native/normalize-colors": "0.75.0-rc.5",
"@react-native/virtualized-lists": "0.75.0-rc.5",
"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.1.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 @@ -71,7 +71,7 @@
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/eslint-parser": "^7.20.0",
"@react-native/metro-config": "0.75.0-rc.3",
"@react-native/metro-config": "0.75.0-rc.5",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.23",
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.27",
Expand All @@ -87,14 +87,14 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.75.0-rc.3",
"react-native": "0.75.0-rc.5",
"react-native-platform-override": "^1.9.42",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "^19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.75.0-rc.3"
"react-native": "0.75.0-rc.5"
},
"beachball": {
"defaultNpmTag": "preview",
Expand Down
6 changes: 3 additions & 3 deletions packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.flow.win32.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type IOSPlatform = {
major: number,
minor: number,
patch: number,
prerelease: ?string | number,
prerelease: ?string,
|},
isMacCatalyst?: boolean,
|},
Expand Down Expand Up @@ -66,7 +66,7 @@ type AndroidPlatform = {
major: number,
minor: number,
patch: number,
prerelease: ?number,
prerelease: ?string,
|},
Version: number,
Release: string,
Expand Down Expand Up @@ -105,7 +105,7 @@ type Win32Platform = {
major: number,
minor: number,
patch: number,
prerelease: ?string | number,
prerelease: ?string,
|},
systemName: string,
isMacCatalyst?: boolean,
Expand Down
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.win32.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const Platform: PlatformType = {
major: number,
minor: number,
patch: number,
prerelease: ?string | number,
prerelease: ?string,
|},
systemName: string,
isMacCatalyst?: boolean,
Expand Down
2 changes: 1 addition & 1 deletion ...ce-iss/react-native-win32/src-win/src/private/specs/modules/NativePlatformConstantsWin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export type PlatformConstantsWin32 = {|
major: number,
minor: number,
patch: number,
prerelease: ?string | number,
prerelease: ?string,
|},
forceTouchAvailable: boolean,
osVersion: number,
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-native-windows/automation-channel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"just-scripts": "^1.3.2",
"prettier": "2.8.8",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.75.0-rc.3",
"react-native": "0.75.0-rc.5",
"react-native-windows": "0.75.0-preview.2",
"typescript": "5.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-native-windows/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-win/**"
],
"baseVersion": "0.75.0-rc.3",
"baseVersion": "0.75.0-rc.5",
"overrides": [
{
"type": "derived",
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-native-windows/tester/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
"peerDependencies": {
"@react-native-picker/picker": "2.4.10",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.75.0-rc.3",
"react-native": "0.75.0-rc.5",
"react-native-windows": "0.75.0-preview.2",
"react-native-xaml": "^0.0.78"
},
"devDependencies": {
"@react-native/tester": "0.75.0-rc.3",
"@react-native/tester": "0.75.0-rc.5",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.23",
"@rnw-scripts/just-task": "2.3.40",
"@rnw-scripts/ts-config": "2.0.5",
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.75.0-rc.3",
"react-native": "0.75.0-rc.5",
"react-native-platform-override": "^1.9.42",
"react-native-windows": "0.75.0-preview.2",
"typescript": "5.0.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native/monorepo/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"baseVersion": "0.75.0-rc.3",
"baseVersion": "0.75.0-rc.5",
"overrides": [
{
"type": "patch",
"file": "package.json",
"baseFile": "package.json",
"baseHash": "b20015c69de24d9c35b7e0592df9ea5e94b2582d"
"baseHash": "590fe25de8df488fc5ce43af2a139a66d4dddd1b"
}
]
}
7 changes: 4 additions & 3 deletions packages/@react-native/monorepo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"@definitelytyped/dtslint": "^0.0.127",
"@jest/create-cache-key-function": "^29.6.3",
"@pkgjs/parseargs": "^0.11.0",
"@react-native/metro-babel-transformer": "0.75.0-rc.3",
"@react-native/metro-config": "0.75.0-rc.3",
"@react-native/metro-babel-transformer": "0.75.0-rc.5",
"@react-native/metro-config": "0.75.0-rc.5",
"@tsconfig/node18": "1.0.1",
"@types/react": "^18.2.6",
"@typescript-eslint/parser": "^7.1.1",
Expand Down Expand Up @@ -100,5 +100,6 @@
},
"resolutions": {
"react-is": "19.0.0-rc-fb9a90fa48-20240614"
}
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
4 changes: 2 additions & 2 deletions packages/@react-native/tester/overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"baseVersion": "0.75.0-rc.3",
"baseVersion": "0.75.0-rc.5",
"overrides": [
{
"type": "copy",
Expand Down Expand Up @@ -572,7 +572,7 @@
"type": "patch",
"file": "package.json",
"baseFile": "packages/rn-tester/package.json",
"baseHash": "2ff340625de81649310ec397ad98355f30b11a1f",
"baseHash": "c9fdf87157b76f0c70bc98761b44433df19e4e43",
"issue": 13228
}
]
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native/tester/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-native/tester",
"version": "0.75.0-rc.3",
"version": "0.75.0-rc.5",
"private": true,
"description": "React Native tester app.",
"license": "MIT",
Expand All @@ -23,7 +23,7 @@
"clean-ios": "rm -rf build/generated/ios Pods Podfile.lock"
},
"dependencies": {
"@react-native/popup-menu-android": "0.75.0-rc.3",
"@react-native/popup-menu-android": "0.75.0-rc.5",
"flow-enums-runtime": "^0.0.6",
"invariant": "^2.2.4",
"nullthrows": "^1.1.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/@rnw-scripts/babel-react-native-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
},
"dependencies": {
"@babel/core": "^7.20.0",
"@react-native/babel-preset": "0.75.0-rc.3",
"@react-native/babel-preset": "0.75.0-rc.5",
"babel-plugin-transform-flow-enums": "^0.0.2"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@react-native/babel-preset": "0.75.0-rc.3",
"@react-native/babel-preset": "0.75.0-rc.5",
"eslint": "^8.19.0",
"prettier": "2.8.8"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@rnw-scripts/eslint-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@babel/core": "^7.20.0",
"@babel/eslint-parser": "^7.20.0",
"@microsoft/eslint-plugin-sdl": "^0.2.0",
"@react-native/eslint-config": "0.75.0-rc.3",
"@react-native/eslint-config": "0.75.0-rc.5",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ft-flow": "^2.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@rnw-scripts/integrate-rn/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"integrate-rn": "./bin.js"
},
"dependencies": {
"@react-native-community/template": "0.75.0-rc.3",
"@react-native-community/template": "0.75.0-rc.5",
"@react-native-windows/find-repo-root": "0.75.0-preview.1",
"@react-native-windows/fs": "0.75.0-preview.1",
"@react-native-windows/package-utils": "0.75.0-preview.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@rnw-scripts/metro-dev-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"lint:fix": "rnw-scripts lint:fix"
},
"dependencies": {
"@react-native/metro-config": "0.75.0-rc.3",
"@react-native/metro-config": "0.75.0-rc.5",
"@rnx-kit/metro-config": "^1.3.5",
"@rnx-kit/metro-plugin-duplicates-checker": "^2.1.0",
"@rnx-kit/metro-serializer": "^1.0.11",
Expand Down
4 changes: 2 additions & 2 deletions packages/e2e-test-app-fabric/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@typescript-eslint/eslint-plugin": "^5.21.0",
"@typescript-eslint/parser": "^5.21.0",
"react": "^19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.75.0-rc.3",
"react-native": "0.75.0-rc.5",
"react-native-windows": "0.75.0-preview.2"
},
"devDependencies": {
Expand All @@ -31,7 +31,7 @@
"@babel/runtime": "^7.20.0",
"@react-native-windows/automation": "^0.3.256",
"@react-native-windows/automation-commands": "^0.1.277",
"@react-native/metro-config": "0.75.0-rc.3",
"@react-native/metro-config": "0.75.0-rc.5",
"@rnw-scripts/babel-node-config": "2.3.2",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.23",
Expand Down
4 changes: 2 additions & 2 deletions packages/e2e-test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@typescript-eslint/eslint-plugin": "^5.21.0",
"@typescript-eslint/parser": "^5.21.0",
"react": "^19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.75.0-rc.3",
"react-native": "0.75.0-rc.5",
"react-native-windows": "0.75.0-preview.2",
"react-native-xaml": "^0.0.78"
},
Expand All @@ -32,7 +32,7 @@
"@babel/runtime": "^7.20.0",
"@react-native-windows/automation": "^0.3.256",
"@react-native-windows/automation-commands": "^0.1.277",
"@react-native/metro-config": "0.75.0-rc.3",
"@react-native/metro-config": "0.75.0-rc.5",
"@rnw-scripts/babel-node-config": "2.3.2",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.23",
Expand Down
Loading