From 110eb37ec3ef57bb3ecfd9f9340a4ee6c6ad8b50 Mon Sep 17 00:00:00 2001 From: TatianaKapos Date: Tue, 16 Jul 2024 11:34:45 -0700 Subject: [PATCH 1/4] integrate RN 0.75.0-rc.5 --- .../react-native-win32-tester/overrides.json | 2 +- .../react-native-win32-tester/package.json | 6 +- .../react-native-win32/overrides.json | 8 +- .../react-native-win32/package.json | 22 +-- .../Utilities/Platform.flow.win32.js | 4 +- .../Libraries/Utilities/Platform.win32.js | 2 +- .../modules/NativePlatformConstantsWin.js | 2 +- .../automation-channel/package.json | 2 +- .../tester/overrides.json | 2 +- .../@react-native-windows/tester/package.json | 6 +- .../@react-native/monorepo/overrides.json | 4 +- packages/@react-native/monorepo/package.json | 7 +- packages/@react-native/tester/overrides.json | 4 +- packages/@react-native/tester/package.json | 4 +- .../babel-react-native-config/package.json | 4 +- .../@rnw-scripts/eslint-config/package.json | 2 +- .../@rnw-scripts/integrate-rn/package.json | 2 +- .../metro-dev-config/package.json | 2 +- packages/e2e-test-app-fabric/package.json | 4 +- packages/e2e-test-app/package.json | 4 +- packages/integration-test-app/package.json | 4 +- packages/playground/package.json | 4 +- packages/sample-app-fabric/package.json | 4 +- packages/sample-apps/package.json | 4 +- .../NativePlatformConstantsAndroidSpec.g.h | 2 +- .../NativePlatformConstantsIOSSpec.g.h | 2 +- vnext/codegen/rnwcoreJSI.h | 2 +- vnext/overrides.json | 8 +- vnext/package.json | 22 +-- .../Utilities/Platform.flow.windows.js | 4 +- yarn.lock | 186 +++++++++--------- 31 files changed, 168 insertions(+), 167 deletions(-) diff --git a/packages/@office-iss/react-native-win32-tester/overrides.json b/packages/@office-iss/react-native-win32-tester/overrides.json index 97660909f30..ea578a00c29 100644 --- a/packages/@office-iss/react-native-win32-tester/overrides.json +++ b/packages/@office-iss/react-native-win32-tester/overrides.json @@ -5,7 +5,7 @@ "excludePatterns": [ "src/js/examples-win32/**" ], - "baseVersion": "0.75.0-rc.3", + "baseVersion": "0.75.0-rc.5", "overrides": [ { "type": "patch", diff --git a/packages/@office-iss/react-native-win32-tester/package.json b/packages/@office-iss/react-native-win32-tester/package.json index 59d1def3288..713abeb33e4 100644 --- a/packages/@office-iss/react-native-win32-tester/package.json +++ b/packages/@office-iss/react-native-win32-tester/package.json @@ -11,7 +11,7 @@ "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" @@ -19,7 +19,7 @@ "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", @@ -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" }, diff --git a/packages/@office-iss/react-native-win32/overrides.json b/packages/@office-iss/react-native-win32/overrides.json index e871fd216a9..9537cf8838f 100644 --- a/packages/@office-iss/react-native-win32/overrides.json +++ b/packages/@office-iss/react-native-win32/overrides.json @@ -7,7 +7,7 @@ "**/__snapshots__/**", "src-win/rntypes/**" ], - "baseVersion": "0.75.0-rc.3", + "baseVersion": "0.75.0-rc.5", "overrides": [ { "type": "derived", @@ -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", @@ -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" } ] } \ No newline at end of file diff --git a/packages/@office-iss/react-native-win32/package.json b/packages/@office-iss/react-native-win32/package.json index 54841ec5a8d..0a7e6a6c1a2 100644 --- a/packages/@office-iss/react-native-win32/package.json +++ b/packages/@office-iss/react-native-win32/package.json @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.flow.win32.js b/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.flow.win32.js index d3f10e1ca62..bc0e307b310 100644 --- a/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.flow.win32.js +++ b/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.flow.win32.js @@ -34,7 +34,7 @@ type IOSPlatform = { major: number, minor: number, patch: number, - prerelease: ?string | number, + prerelease: ?string, |}, isMacCatalyst?: boolean, |}, @@ -66,7 +66,7 @@ type AndroidPlatform = { major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}, Version: number, Release: string, diff --git a/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.win32.js b/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.win32.js index ac9dbb0803a..76b9b9747fc 100644 --- a/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.win32.js +++ b/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.win32.js @@ -32,7 +32,7 @@ const Platform: PlatformType = { major: number, minor: number, patch: number, - prerelease: ?string | number, + prerelease: ?string, |}, systemName: string, isMacCatalyst?: boolean, diff --git a/packages/@office-iss/react-native-win32/src-win/src/private/specs/modules/NativePlatformConstantsWin.js b/packages/@office-iss/react-native-win32/src-win/src/private/specs/modules/NativePlatformConstantsWin.js index 59b8a170cea..04c382a4b79 100644 --- a/packages/@office-iss/react-native-win32/src-win/src/private/specs/modules/NativePlatformConstantsWin.js +++ b/packages/@office-iss/react-native-win32/src-win/src/private/specs/modules/NativePlatformConstantsWin.js @@ -19,7 +19,7 @@ export type PlatformConstantsWin32 = {| major: number, minor: number, patch: number, - prerelease: ?string | number, + prerelease: ?string, |}, forceTouchAvailable: boolean, osVersion: number, diff --git a/packages/@react-native-windows/automation-channel/package.json b/packages/@react-native-windows/automation-channel/package.json index 83d6e4e09e7..0ec12370302 100644 --- a/packages/@react-native-windows/automation-channel/package.json +++ b/packages/@react-native-windows/automation-channel/package.json @@ -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.1", "typescript": "5.0.4" }, diff --git a/packages/@react-native-windows/tester/overrides.json b/packages/@react-native-windows/tester/overrides.json index f2d3d4a0f3f..429e0fc6c49 100644 --- a/packages/@react-native-windows/tester/overrides.json +++ b/packages/@react-native-windows/tester/overrides.json @@ -5,7 +5,7 @@ "excludePatterns": [ "src/js/examples-win/**" ], - "baseVersion": "0.75.0-rc.3", + "baseVersion": "0.75.0-rc.5", "overrides": [ { "type": "derived", diff --git a/packages/@react-native-windows/tester/package.json b/packages/@react-native-windows/tester/package.json index 4f2e9fb3e67..75d860f2f51 100644 --- a/packages/@react-native-windows/tester/package.json +++ b/packages/@react-native-windows/tester/package.json @@ -18,12 +18,12 @@ "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.1", "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", @@ -31,7 +31,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", "react-native-windows": "0.75.0-preview.1", "typescript": "5.0.4" diff --git a/packages/@react-native/monorepo/overrides.json b/packages/@react-native/monorepo/overrides.json index 0b1be785c44..42ca13750e1 100644 --- a/packages/@react-native/monorepo/overrides.json +++ b/packages/@react-native/monorepo/overrides.json @@ -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" } ] } \ No newline at end of file diff --git a/packages/@react-native/monorepo/package.json b/packages/@react-native/monorepo/package.json index 967030b449a..13826d6399a 100644 --- a/packages/@react-native/monorepo/package.json +++ b/packages/@react-native/monorepo/package.json @@ -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", @@ -100,5 +100,6 @@ }, "resolutions": { "react-is": "19.0.0-rc-fb9a90fa48-20240614" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/packages/@react-native/tester/overrides.json b/packages/@react-native/tester/overrides.json index d60af7e9c90..e5ca78553f8 100644 --- a/packages/@react-native/tester/overrides.json +++ b/packages/@react-native/tester/overrides.json @@ -1,5 +1,5 @@ { - "baseVersion": "0.75.0-rc.3", + "baseVersion": "0.75.0-rc.5", "overrides": [ { "type": "copy", @@ -572,7 +572,7 @@ "type": "patch", "file": "package.json", "baseFile": "packages/rn-tester/package.json", - "baseHash": "2ff340625de81649310ec397ad98355f30b11a1f", + "baseHash": "c9fdf87157b76f0c70bc98761b44433df19e4e43", "issue": 13228 } ] diff --git a/packages/@react-native/tester/package.json b/packages/@react-native/tester/package.json index 6fa4b9c27a8..080be93b1c2 100644 --- a/packages/@react-native/tester/package.json +++ b/packages/@react-native/tester/package.json @@ -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", @@ -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" diff --git a/packages/@rnw-scripts/babel-react-native-config/package.json b/packages/@rnw-scripts/babel-react-native-config/package.json index 8affad8ba5b..5e6ee55d2e9 100644 --- a/packages/@rnw-scripts/babel-react-native-config/package.json +++ b/packages/@rnw-scripts/babel-react-native-config/package.json @@ -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" }, diff --git a/packages/@rnw-scripts/eslint-config/package.json b/packages/@rnw-scripts/eslint-config/package.json index 6b68730eb52..23e0bb912a2 100644 --- a/packages/@rnw-scripts/eslint-config/package.json +++ b/packages/@rnw-scripts/eslint-config/package.json @@ -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" }, diff --git a/packages/@rnw-scripts/integrate-rn/package.json b/packages/@rnw-scripts/integrate-rn/package.json index 773d3346bc6..6414bc153d2 100644 --- a/packages/@rnw-scripts/integrate-rn/package.json +++ b/packages/@rnw-scripts/integrate-rn/package.json @@ -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", diff --git a/packages/@rnw-scripts/metro-dev-config/package.json b/packages/@rnw-scripts/metro-dev-config/package.json index 23161047e47..01dfdc7c8d3 100644 --- a/packages/@rnw-scripts/metro-dev-config/package.json +++ b/packages/@rnw-scripts/metro-dev-config/package.json @@ -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", diff --git a/packages/e2e-test-app-fabric/package.json b/packages/e2e-test-app-fabric/package.json index b7d2eb76103..72d484ba72f 100644 --- a/packages/e2e-test-app-fabric/package.json +++ b/packages/e2e-test-app-fabric/package.json @@ -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.1" }, "devDependencies": { @@ -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", diff --git a/packages/e2e-test-app/package.json b/packages/e2e-test-app/package.json index 5cfb1041797..eefa185390d 100644 --- a/packages/e2e-test-app/package.json +++ b/packages/e2e-test-app/package.json @@ -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.1", "react-native-xaml": "^0.0.78" }, @@ -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", diff --git a/packages/integration-test-app/package.json b/packages/integration-test-app/package.json index ab8be3b2362..bc72b60a428 100644 --- a/packages/integration-test-app/package.json +++ b/packages/integration-test-app/package.json @@ -17,7 +17,7 @@ "@typescript-eslint/parser": "^5.21.0", "chai": "^4.2.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.1" }, "devDependencies": { @@ -27,7 +27,7 @@ "@babel/preset-typescript": "^7.11.5", "@babel/traverse": "^7.11.5", "@babel/types": "^7.11.5", - "@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/eslint-config": "^1.2.23", "@rnw-scripts/just-task": "^2.3.40", diff --git a/packages/playground/package.json b/packages/playground/package.json index 0fd78517806..611b3e3648d 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -16,13 +16,13 @@ "@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.1" }, "devDependencies": { "@babel/core": "^7.20.0", "@babel/runtime": "^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/just-task": "2.3.40", diff --git a/packages/sample-app-fabric/package.json b/packages/sample-app-fabric/package.json index 1a0e6c35513..d88d8ef4a25 100644 --- a/packages/sample-app-fabric/package.json +++ b/packages/sample-app-fabric/package.json @@ -16,7 +16,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.1" }, "devDependencies": { @@ -26,7 +26,7 @@ "@babel/preset-typescript": "^7.8.3", "@babel/runtime": "^7.20.0", "@jest/globals": "^29.7.0", - "@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", diff --git a/packages/sample-apps/package.json b/packages/sample-apps/package.json index f43d78af23a..bc105b5c820 100644 --- a/packages/sample-apps/package.json +++ b/packages/sample-apps/package.json @@ -16,7 +16,7 @@ "@typescript-eslint/eslint-plugin": "^5.30.5", "@typescript-eslint/parser": "^5.57.1", "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.1" }, "devDependencies": { @@ -25,7 +25,7 @@ "@babel/runtime": "^7.20.0", "@react-native-windows/cli": "0.75.0-preview.1", "@react-native-windows/codegen": "0.75.0-preview.1", - "@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/just-task": "2.3.40", diff --git a/vnext/codegen/NativePlatformConstantsAndroidSpec.g.h b/vnext/codegen/NativePlatformConstantsAndroidSpec.g.h index 5e221fa6267..d024444cba4 100644 --- a/vnext/codegen/NativePlatformConstantsAndroidSpec.g.h +++ b/vnext/codegen/NativePlatformConstantsAndroidSpec.g.h @@ -17,7 +17,7 @@ struct PlatformConstantsAndroidSpec_ReactNativeVersionAndroid { double major; double minor; double patch; - std::optional prerelease; + std::optional prerelease; }; struct PlatformConstantsAndroidSpec_PlatformConstantsAndroid { diff --git a/vnext/codegen/NativePlatformConstantsIOSSpec.g.h b/vnext/codegen/NativePlatformConstantsIOSSpec.g.h index c5b35498cdb..2c2338926f6 100644 --- a/vnext/codegen/NativePlatformConstantsIOSSpec.g.h +++ b/vnext/codegen/NativePlatformConstantsIOSSpec.g.h @@ -17,7 +17,7 @@ struct PlatformConstantsIOSSpec_PlatformConstantsIOS_reactNativeVersion { double major; double minor; double patch; - std::optional prerelease; + std::optional prerelease; }; struct PlatformConstantsIOSSpec_PlatformConstantsIOS { diff --git a/vnext/codegen/rnwcoreJSI.h b/vnext/codegen/rnwcoreJSI.h index 452dd389d92..804d625d324 100644 --- a/vnext/codegen/rnwcoreJSI.h +++ b/vnext/codegen/rnwcoreJSI.h @@ -5602,7 +5602,7 @@ struct NativePlatformConstantsAndroidReactNativeVersionAndroidBridging { return bridging::toJs(rt, value); } - static std::optional prereleaseToJs(jsi::Runtime &rt, decltype(types.prerelease) value) { + static std::optional prereleaseToJs(jsi::Runtime &rt, decltype(types.prerelease) value) { return bridging::toJs(rt, value); } #endif diff --git a/vnext/overrides.json b/vnext/overrides.json index 7bf25e56ad1..1ea71a9b524 100644 --- a/vnext/overrides.json +++ b/vnext/overrides.json @@ -8,7 +8,7 @@ "**/__snapshots__/**", "src-win/rntypes/**" ], - "baseVersion": "0.75.0-rc.3", + "baseVersion": "0.75.0-rc.5", "overrides": [ { "type": "derived", @@ -595,13 +595,13 @@ "type": "derived", "file": "src-win/Libraries/Utilities/Platform.flow.windows.js", "baseFile": "packages/react-native/Libraries/Utilities/Platform.flow.js", - "baseHash": "d07d4656dc872e92e873bcce248262132085bd99" + "baseHash": "f38efa527b9426ae0178bb2336be2e93af0392ba" }, { "type": "derived", "file": "src-win/Libraries/Utilities/Platform.windows.js", "baseFile": "packages/react-native/Libraries/Utilities/Platform.android.js", - "baseHash": "ddd8013d71adc13b3ef3016631012efd096a9518" + "baseHash": "33f07d6fddb5290d05c8d4cc490312e3af88c70b" }, { "type": "platform", @@ -617,7 +617,7 @@ "type": "derived", "file": "src-win/src/private/specs/modules/NativePlatformConstantsWindows.js", "baseFile": "packages/react-native/src/private/specs/modules/NativePlatformConstantsAndroid.js", - "baseHash": "b4a125d9134f33aeaba9e06988e18cbb0b4e9e9c" + "baseHash": "fa0f34a2de33b641bd63863629087644796d8b59" } ] } \ No newline at end of file diff --git a/vnext/package.json b/vnext/package.json index d1caec921ee..4f7241c91cf 100644 --- a/vnext/package.json +++ b/vnext/package.json @@ -28,13 +28,13 @@ "@react-native-community/cli-platform-ios": "14.0.0-alpha.11", "@react-native-windows/cli": "0.75.0-preview.1", "@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", @@ -53,7 +53,7 @@ "nullthrows": "^1.1.1", "pretty-format": "^26.5.2", "promise": "^8.3.0", - "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", @@ -67,7 +67,7 @@ }, "devDependencies": { "@react-native-windows/codegen": "0.75.0-preview.1", - "@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", @@ -83,7 +83,7 @@ "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", "react-refresh": "^0.14.0", "typescript": "5.0.4" @@ -91,7 +91,7 @@ "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", diff --git a/vnext/src-win/Libraries/Utilities/Platform.flow.windows.js b/vnext/src-win/Libraries/Utilities/Platform.flow.windows.js index a81ff0991e6..54ec7d69d24 100644 --- a/vnext/src-win/Libraries/Utilities/Platform.flow.windows.js +++ b/vnext/src-win/Libraries/Utilities/Platform.flow.windows.js @@ -33,7 +33,7 @@ type IOSPlatform = { major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}, systemName: string, |}, @@ -63,7 +63,7 @@ type AndroidPlatform = { major: number, minor: number, patch: number, - prerelease: ?number, + prerelease: ?string, |}, Version: number, Release: string, diff --git a/yarn.lock b/yarn.lock index 647ca42121d..b487c37e962 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2346,37 +2346,37 @@ prompts "^2.4.2" semver "^7.5.2" -"@react-native-community/template@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native-community/template/-/template-0.75.0-rc.3.tgz#60b036efa321fe0a0f58d911b8082b07b3c0d5a5" - integrity sha512-qv/4bcLG+QIYgw8xEpCOf50uEdXFkidu5UpDd1IKug2xwNObBQ5X7e+kSi+uRKwxTw+YziH9YbjM8i0cF/VXIg== +"@react-native-community/template@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native-community/template/-/template-0.75.0-rc.5.tgz#44e3b3373cd2426ed8cf29e941ed882f32d7746c" + integrity sha512-DHHi3NmzXiXvRZ9ipe0aSkDdCc10TaiYhYrUYvpN6OBzPy+LAt5X35V4xdhoxqkoy8hHZivFr8dztuP7p6Hbpg== "@react-native-picker/picker@^2.5.1": version "2.7.7" resolved "https://registry.yarnpkg.com/@react-native-picker/picker/-/picker-2.7.7.tgz#6e19c3a72a482be015f5194794e6c14efe8762e8" integrity sha512-CTHthVmx8ujlH/u5AnxLQfsheh/DoEbo+Kbx0HGTlbKVLC1eZ4Kr9jXIIUcwB7JEgOXifdZIPQCsoTc/7GQ0ag== -"@react-native/assets-registry@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.75.0-rc.3.tgz#9d33a07ee307fbfe503b7d5ff8e36024da01bae7" - integrity sha512-stemeAgtRjxTdrlSjDhYK57SD6PoSGK2tL45M8IomDA1tVB/goDrm45VDpzVsIJFwCY8uc+XYfdsUJNA62Vhpg== +"@react-native/assets-registry@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.75.0-rc.5.tgz#738a524747a4a833365bd7920e71b2a8efd30d30" + integrity sha512-2nbPA2x1EbnEBj9kt3lMTS43lztjHEUWDqv8kiXoWeoOeqO6q4JZRMk6XMhjTmBwdC0Dx8r372npvD/qb8ZBnQ== "@react-native/assets@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@react-native/assets/-/assets-1.0.0.tgz#c6f9bf63d274bafc8e970628de24986b30a55c8e" integrity sha512-KrwSpS1tKI70wuKl68DwJZYEvXktDHdZMG0k2AXD/rJVSlB23/X2CB2cutVR0HwNMJIal9HOUOBB2rVfa6UGtQ== -"@react-native/babel-plugin-codegen@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.75.0-rc.3.tgz#ae5fec61577f145965a905feed0fb05d7b6d1f1b" - integrity sha512-huWcCzwq+Pw4et0W2jqrVDoa03ZvFl0vSnGKqirAXP+UpM/9W5Wk20kQVQdr+vsouu3zUip2wsYwZdYkdAbxVg== +"@react-native/babel-plugin-codegen@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.75.0-rc.5.tgz#3212a11fa68370d20095c4ffde57aad921d44d36" + integrity sha512-menDCxTfAf3sW011AJY7baggXsQ58nH8qB+SeJGRdNc6LykpPN1G74zdd7jw3SdG/6xe9kKiixD8r5hwtPW8xw== dependencies: - "@react-native/codegen" "0.75.0-rc.3" + "@react-native/codegen" "0.75.0-rc.5" -"@react-native/babel-preset@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/babel-preset/-/babel-preset-0.75.0-rc.3.tgz#391ebd1fab24bc9896ae7eb2fb503cbf896dccc8" - integrity sha512-XTct1KfsD88RHam5MEnkKIi6Kc/Se22JKdZZEwZgfEIfRFWaUlxq3CpVfMOfQNHz91DnWzuJc8beqmfhKhZrLA== +"@react-native/babel-preset@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/babel-preset/-/babel-preset-0.75.0-rc.5.tgz#5c6f63ad2673cbfc0a4838bff6da122ce0e38c22" + integrity sha512-ZlseSyNQkxnzefNasjldtV9mlpnZprnp7luHsyxtfV8FqGxBM4pMJTMl1Oryrwoo7gcXUGnwXncaHMLHtfkn5w== dependencies: "@babel/core" "^7.20.0" "@babel/plugin-proposal-export-default-from" "^7.0.0" @@ -2420,14 +2420,14 @@ "@babel/plugin-transform-typescript" "^7.5.0" "@babel/plugin-transform-unicode-regex" "^7.0.0" "@babel/template" "^7.0.0" - "@react-native/babel-plugin-codegen" "0.75.0-rc.3" + "@react-native/babel-plugin-codegen" "0.75.0-rc.5" babel-plugin-transform-flow-enums "^0.0.2" react-refresh "^0.14.0" -"@react-native/codegen@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.75.0-rc.3.tgz#fe3c2cb665c88e009e8c0c1ba78acc1b6bb8cbba" - integrity sha512-v9evpz502dNYeWB6lmKzTcV7xULxqmQa3Wy8YeCB8pI6cR3nyP1KOtRfcYDKcpdXtmAyifBFZx6iGNMQV6iUlw== +"@react-native/codegen@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.75.0-rc.5.tgz#51192698c9994afd7ff7204161c2a6d77aa3a9fd" + integrity sha512-s442iu2etAKZVTPKw+qj1hQhkzAEwhiHi4SdoIlJxn2ZqBCRXJb9JkrdwYMtl64Y2aZeM2fgt1OMgWc5jXrHPA== dependencies: "@babel/parser" "^7.20.0" glob "^7.1.1" @@ -2437,15 +2437,15 @@ mkdirp "^0.5.1" nullthrows "^1.1.1" -"@react-native/community-cli-plugin@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.75.0-rc.3.tgz#b15d4f77938fcbd717878c82a3f77b61b17512ef" - integrity sha512-A3C/sXJLpIg8LLAhxfNe5mmlTb6XLNKx6ElO6lCC7mMmnuTx/91k9pRs5GO2JJ4yBWavYqdbTB0AI6C0lxdORQ== +"@react-native/community-cli-plugin@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.75.0-rc.5.tgz#c367e8b12ca0b679c32f572fe18454a2e553f14a" + integrity sha512-NGVi7RsdCTa1lnmS0GY8mn6+epa+SrDAkaar0/nYRbKAHhA6O8MyjC7t5p3vx2F1UUDNjrfW7NPSH/tii5gr9Q== dependencies: "@react-native-community/cli-server-api" "14.0.0-alpha.11" "@react-native-community/cli-tools" "14.0.0-alpha.11" - "@react-native/dev-middleware" "0.75.0-rc.3" - "@react-native/metro-babel-transformer" "0.75.0-rc.3" + "@react-native/dev-middleware" "0.75.0-rc.5" + "@react-native/metro-babel-transformer" "0.75.0-rc.5" chalk "^4.0.0" execa "^5.1.1" metro "^0.80.3" @@ -2455,18 +2455,18 @@ querystring "^0.2.1" readline "^1.3.0" -"@react-native/debugger-frontend@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.75.0-rc.3.tgz#73c0993eebb75fdfffee274e2f736eb7654c96af" - integrity sha512-muSh3x/Fd8bGQCclbxWkJNRm/QlXpR6hZK9N6ePLXs92JRqhBUxgExfkAvkPUh0nvmtifJayjaRDEZK9MVscIQ== +"@react-native/debugger-frontend@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.75.0-rc.5.tgz#2201a6beda17e0dc7a9fb32b9053ce11a5eb4ce9" + integrity sha512-m+e3/+V06bNG6P8e+3hu4DcNP1GH3FflPLMtEY1SD4T7PyPJXlFWu8ApOm1FCuQA8ObY8nx6C3vzMlyjoYQFUA== -"@react-native/dev-middleware@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.75.0-rc.3.tgz#ab9a8ee2ac3ed4a45255151f15bce7f850557771" - integrity sha512-/wV5NI9qmOjugta+ckYI7T3WvddB+7QDSXwD3iem6A5/z0IZ9qewvdrHFuBhej+jHvB36WcHPYel66EevFaVKQ== +"@react-native/dev-middleware@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.75.0-rc.5.tgz#60a50aa41be8907455d86d301328a7e72e1008eb" + integrity sha512-NbMISFfV2XzBsxzbn/QGS6wqAxLPUKoKwFASRWKRpqo23q62H5xWRuvvvMPFpemb/MoFEGpTxc5ce5niNds/aQ== dependencies: "@isaacs/ttlcache" "^1.4.1" - "@react-native/debugger-frontend" "0.75.0-rc.3" + "@react-native/debugger-frontend" "0.75.0-rc.5" chrome-launcher "^0.15.2" chromium-edge-launcher "^0.2.0" connect "^3.6.5" @@ -2478,14 +2478,14 @@ serve-static "^1.13.1" ws "^6.2.2" -"@react-native/eslint-config@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/eslint-config/-/eslint-config-0.75.0-rc.3.tgz#ead2d6963a256e4cfb266bd6ee5af275f720e8ce" - integrity sha512-dyYfz4wEQw3gmCBhxdhaZOS8cXnAuc91UIPRAJu6KDXzM2VgQPAf+22MjW25c2PphUTWcYvWq/2y6cghWCItTg== +"@react-native/eslint-config@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/eslint-config/-/eslint-config-0.75.0-rc.5.tgz#9ae039466cd88797ef48fe63c6e3e9ba23f2e6ba" + integrity sha512-FGR0LEyhyhjBnA4SDEo6Vk6En/00dVgcCc+3aynZr1pOadg9mg25dVCz6Y5tQENQZntKDRijUb1Yt1yVeuyKXA== dependencies: "@babel/core" "^7.20.0" "@babel/eslint-parser" "^7.20.0" - "@react-native/eslint-plugin" "0.75.0-rc.3" + "@react-native/eslint-plugin" "0.75.0-rc.5" "@typescript-eslint/eslint-plugin" "^7.1.1" "@typescript-eslint/parser" "^7.1.1" eslint-config-prettier "^8.5.0" @@ -2496,57 +2496,57 @@ eslint-plugin-react-hooks "^4.6.0" eslint-plugin-react-native "^4.0.0" -"@react-native/eslint-plugin@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/eslint-plugin/-/eslint-plugin-0.75.0-rc.3.tgz#d25eb8cdbe3df3a0d46411ff4c8b025b3ed41cda" - integrity sha512-1Ck0GJUjJDdcTx0GthuTLHtVLYM9IeI5cR2kRATgRyTRVzl4SEzjvYSV9r3/fkAJVX6WnvWDdWPg44r/X2zmjQ== +"@react-native/eslint-plugin@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/eslint-plugin/-/eslint-plugin-0.75.0-rc.5.tgz#e831422062a6ff6d32f4fa6dfad0e57d54c1c483" + integrity sha512-w56HbJySehyIOtYCYWvDaJtsGt26YP99YmMcoa6YVSWacOKC9rokW0XTBTjSnaZHiXPoj09IgARi6w65ec9OKA== -"@react-native/gradle-plugin@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.75.0-rc.3.tgz#1e3121f1480f341048b8bb4436e15355adc3f569" - integrity sha512-lzQIxmpc1FNfuZl8CDI4bjX0w8C0vAuOBY1EBYfup5qVcqsN1p0ZFP0N3PEgtzrjUUzZgNSSBixqqjzXSV2hiA== +"@react-native/gradle-plugin@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.75.0-rc.5.tgz#e12c92a74dab6dc8e484aff555a0419a7612a6dc" + integrity sha512-Cvl1y+KcbO/bxWi67QgV3tJO/yaoCNNXMjrnlRPpBkhNNBoGSfgdmxVHV7vGQH+rUToSC28TeEARXkJ1Rig3Ng== -"@react-native/js-polyfills@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.75.0-rc.3.tgz#a3bacd378d7c9a26d58e9b202d217c10a5d79262" - integrity sha512-ZhP4pnqijyh37peJc9TwIVg75VkrHVv+qdPlxzg1/ecbD9gHLbsheoixo9zfRcmmvbkfJV0yc4PgsDaMbzPenA== +"@react-native/js-polyfills@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.75.0-rc.5.tgz#c0392451d8de607e61abf7ae4da6a270b1d8d4ea" + integrity sha512-CCkSco2YwgDqRltJ9XxU1474gMTTom4Cf28MeOdTZezn5jmuJ7naJNaD/UTvik1MyR3CShrS9GMQ61u6Rf57lw== -"@react-native/metro-babel-transformer@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.75.0-rc.3.tgz#08c15511b70151deaa8bc6779bca4f7076ab1e63" - integrity sha512-j8r4KEMQidcXVx2HCX7kkfrNQXxqQ7muXtnK2+iScW1O1acqiUTGUiDnlLKbf+b7tFpsQwLC0W/D/asxjsF43Q== +"@react-native/metro-babel-transformer@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.75.0-rc.5.tgz#51420a77f176985d71ff1b8d259e4fbfb4508298" + integrity sha512-XMCvT8oz11Vwa0PjE3xg5T6Qu1Q1ZwhkBn9RDXKnPMjULkELOyNWxHPfwoyjLEemS7ThK7SGQbPZF2YpyKzTPA== dependencies: "@babel/core" "^7.20.0" - "@react-native/babel-preset" "0.75.0-rc.3" + "@react-native/babel-preset" "0.75.0-rc.5" hermes-parser "0.22.0" nullthrows "^1.1.1" -"@react-native/metro-config@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/metro-config/-/metro-config-0.75.0-rc.3.tgz#3f7a59692325e7ae6d05b31a73867fd4263eebf9" - integrity sha512-LI9f1FPA3DOoohcUxXqVVW4O57KMP4TZREpBF0n8r3XzJA12OoeWkoUwaJ3Z5QK/XsvPYH0QjS36fvkkKpNyiA== +"@react-native/metro-config@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/metro-config/-/metro-config-0.75.0-rc.5.tgz#2723f9adea97acfda733eeba30d9325db5603798" + integrity sha512-41xBYcYXzwDOcaxeFp8gcuxblF1F7xBvkPNEQkYIijaoP+ePqGnvO3lnanx7ZnRyNJ2avH+GqujVtovh9Ayq+g== dependencies: - "@react-native/js-polyfills" "0.75.0-rc.3" - "@react-native/metro-babel-transformer" "0.75.0-rc.3" + "@react-native/js-polyfills" "0.75.0-rc.5" + "@react-native/metro-babel-transformer" "0.75.0-rc.5" metro-config "^0.80.3" metro-runtime "^0.80.3" -"@react-native/normalize-colors@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.75.0-rc.3.tgz#b1f8e91ae101014ba6d0767b3709e051b3cedeb6" - integrity sha512-QSVxOvBCUqv6Lq9nJf7M0/9XB1O6EpNKmqRdDKnJaZst1S7xrm0X6sHGqA3RI0YJA4OJpeEBufXheY3vQPrGsg== +"@react-native/normalize-colors@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.75.0-rc.5.tgz#edfa51fa3f11607128a44b42446acf762ce6af19" + integrity sha512-44PBsJXIhKB/2ahLK10HNt/YYHDQWPuqIy36FYPpKTbk3HJWeJaMgdEBq3qmuRQhaS7dIIrNU5cWT6sHpa83dA== -"@react-native/popup-menu-android@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/popup-menu-android/-/popup-menu-android-0.75.0-rc.3.tgz#4e2d4015f5e77f188d5deba6e3105cd20b51780e" - integrity sha512-qelJw824awufk+qAlYDkwzE80p5t2wRM/x+KWymK1PMmTO22O4vhbLxJ5GYzOjIH+uUY6OyC+rwEh9QxcALgqw== +"@react-native/popup-menu-android@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/popup-menu-android/-/popup-menu-android-0.75.0-rc.5.tgz#51e5983b9038557f8ff59c46b1e3f008378f4f30" + integrity sha512-HNv8rd66a5w8jH4RYX0MpHoZxBB9Lf4F9zCd1kYFfQ+LtRdxzLyGtS6JRVE56HJO1NTRDmL7kMmUsmjyOO6rNg== dependencies: nullthrows "^1.1.1" -"@react-native/virtualized-lists@0.75.0-rc.3": - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.75.0-rc.3.tgz#34a2b2d0582a47a3a65ae1fbcd93afb5b2eb261b" - integrity sha512-1Ubim0cHu2aaOAm2CvilkrjoxgzuYlVfw9GMBhUZrF+fS3Gx1cbzoBo5a7+m5zJx6dWHvgBw3AvHKPCRWqqkXw== +"@react-native/virtualized-lists@0.75.0-rc.5": + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.75.0-rc.5.tgz#3ceec57aa398c3dd68d5402916ba24b4494bea1c" + integrity sha512-TkZsh0+aMaeI95Up1uFypTvjHbRT9rLo+ZseSctW02U5RgGwIjtSbBtjvj+V6xP4qU3uTLSC4EguiOgJrMEiqA== dependencies: invariant "^2.2.4" nullthrows "^1.1.1" @@ -10297,10 +10297,10 @@ react-clone-referenced-element@^1.0.1: resolved "https://registry.yarnpkg.com/react-clone-referenced-element/-/react-clone-referenced-element-1.1.1.tgz#8d76727dc0459788e461741e804a512d20757381" integrity sha512-LZBPvQV8W0B5dFzXFu+D3Tpil8YHS8tO00iFsfXcTLdtpuH7XyvaHqHcoz4hd4uNPQCZ30fceh+s7mLznzMXvg== -react-devtools-core@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-5.1.0.tgz#3396494ac94b21602cac4fd657d600e0b52f4a0b" - integrity sha512-NRtLBqYVLrIY+lOa2oTpFiAhI7Hru0AUXI0tP9neCyaPPAzlZyeH0i+VZ0shIyRTJbpvyqbD/uCsewA2hpfZHw== +react-devtools-core@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-5.3.1.tgz#d57f5b8f74f16e622bd6a7bc270161e4ba162666" + integrity sha512-7FSb9meX0btdBQLwdFOwt6bGqvRPabmVMMslv8fgoSPqXyuGpgQe36kx8gR86XPw7aV1yVouTp6fyZ0EH+NfUw== dependencies: shell-quote "^1.6.1" ws "^7" @@ -10332,22 +10332,22 @@ react-native-xaml@^0.0.78: dependencies: "@types/react" "*" -react-native@0.75.0-rc.3: - version "0.75.0-rc.3" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.75.0-rc.3.tgz#3db0237cf8ab0833a56356aafaf1f938d2d878e8" - integrity sha512-+JkX2Lk4fjZPBpbd1JCPS3znedUHbXJR2NfM5EuJISmS42skU6CyTmM2WuttSOQFznAa17sXjQ3knW4zT2tgaQ== +react-native@0.75.0-rc.5: + version "0.75.0-rc.5" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.75.0-rc.5.tgz#8dd53b602d2adf0a233f68642ca272cbd72945b6" + integrity sha512-MqkKVr/jSvMhGKGRubVs61sHyybiZk50dc6saLsUgYeTQBSLQPqileKvIfNvvrrkdMgPw3FgROE1DJIxHj8nRw== dependencies: "@jest/create-cache-key-function" "^29.6.3" "@react-native-community/cli" "14.0.0-alpha.11" "@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-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" @@ -10366,7 +10366,7 @@ react-native@0.75.0-rc.3: nullthrows "^1.1.1" pretty-format "^26.5.2" promise "^8.3.0" - react-devtools-core "5.1.0" + react-devtools-core "^5.3.1" react-refresh "^0.14.0" regenerator-runtime "^0.13.2" scheduler "0.25.0-rc-fb9a90fa48-20240614" From 1d17c3848a75df45c7d2fb480525106a4fd4bfb1 Mon Sep 17 00:00:00 2001 From: TatianaKapos Date: Tue, 16 Jul 2024 11:35:00 -0700 Subject: [PATCH 2/4] Change files --- ...-native-win32-b747dd02-0455-43a3-b8f0-38d036692a81.json | 7 +++++++ ...ative-windows-670fe787-9e36-49b3-8611-7172b07ad3dd.json | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 change/@office-iss-react-native-win32-b747dd02-0455-43a3-b8f0-38d036692a81.json create mode 100644 change/react-native-windows-670fe787-9e36-49b3-8611-7172b07ad3dd.json diff --git a/change/@office-iss-react-native-win32-b747dd02-0455-43a3-b8f0-38d036692a81.json b/change/@office-iss-react-native-win32-b747dd02-0455-43a3-b8f0-38d036692a81.json new file mode 100644 index 00000000000..f37336dc920 --- /dev/null +++ b/change/@office-iss-react-native-win32-b747dd02-0455-43a3-b8f0-38d036692a81.json @@ -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" +} diff --git a/change/react-native-windows-670fe787-9e36-49b3-8611-7172b07ad3dd.json b/change/react-native-windows-670fe787-9e36-49b3-8611-7172b07ad3dd.json new file mode 100644 index 00000000000..ce1da795351 --- /dev/null +++ b/change/react-native-windows-670fe787-9e36-49b3-8611-7172b07ad3dd.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "integrate RN 0.75.0-rc.5", + "packageName": "react-native-windows", + "email": "tatianakapos@microsoft.com", + "dependentChangeType": "patch" +} From 37e2259ae48737625299e3d19bea8a7d4da18570 Mon Sep 17 00:00:00 2001 From: TatianaKapos Date: Tue, 16 Jul 2024 13:36:07 -0700 Subject: [PATCH 3/4] fix lint and match main text.win32.js --- .../Libraries/Utilities/Platform.flow.win32.js | 2 +- vnext/src-win/Libraries/Text/Text.windows.js | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.flow.win32.js b/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.flow.win32.js index bc0e307b310..5d7ec238f2b 100644 --- a/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.flow.win32.js +++ b/packages/@office-iss/react-native-win32/src-win/Libraries/Utilities/Platform.flow.win32.js @@ -105,7 +105,7 @@ type Win32Platform = { major: number, minor: number, patch: number, - prerelease: ?string | number, + prerelease: ?string, |}, systemName: string, isMacCatalyst?: boolean, diff --git a/vnext/src-win/Libraries/Text/Text.windows.js b/vnext/src-win/Libraries/Text/Text.windows.js index d6a4bfc268e..0f612fc3ace 100644 --- a/vnext/src-win/Libraries/Text/Text.windows.js +++ b/vnext/src-win/Libraries/Text/Text.windows.js @@ -109,11 +109,6 @@ const Text: React.AbstractComponent< const _accessibilityStateDisabled = _accessibilityState?.disabled; const _disabled = disabled ?? _accessibilityStateDisabled; - const nativeTextAccessibilityState = - _disabled !== _accessibilityState?.disabled - ? {..._accessibilityState, disabled: _disabled} - : _accessibilityState; - const isPressable = (onPress != null || onLongPress != null || @@ -375,12 +370,12 @@ const Text: React.AbstractComponent< disabled={_disabled} ellipsizeMode={ellipsizeMode ?? 'tail'} isHighlighted={isHighlighted} - nativeID={id ?? nativeID} - numberOfLines={numberOfLines} + nativeID={_nativeID} + numberOfLines={_numberOfLines} ref={forwardedRef} selectable={_selectable} selectionColor={_selectionColor} - style={((rest: any): TextStyleProp)} + style={processedStyle} /> @@ -402,7 +397,7 @@ const Text: React.AbstractComponent< ellipsizeMode={ellipsizeMode ?? 'tail'} isHighlighted={isHighlighted} nativeID={_nativeID} - numberOfLines={numberOfLines} + numberOfLines={_numberOfLines} ref={forwardedRef} selectable={_selectable} selectionColor={_selectionColor} From c599bf6d99a0c0c6b3c6b42faab42e001411fdbf Mon Sep 17 00:00:00 2001 From: TatianaKapos Date: Tue, 16 Jul 2024 15:15:32 -0700 Subject: [PATCH 4/4] update snapshots --- .../__snapshots__/TextComponentTest.test.ts.snap | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/e2e-test-app/test/__snapshots__/TextComponentTest.test.ts.snap b/packages/e2e-test-app/test/__snapshots__/TextComponentTest.test.ts.snap index c8ba72b7a39..8a6d7594846 100644 --- a/packages/e2e-test-app/test/__snapshots__/TextComponentTest.test.ts.snap +++ b/packages/e2e-test-app/test/__snapshots__/TextComponentTest.test.ts.snap @@ -239,7 +239,7 @@ exports[`TextTest Text border 1`] = ` "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Height": 395, + "Height": 727, "HorizontalAlignment": "Stretch", "Left": 0, "Margin": "0,0,0,0", @@ -293,7 +293,7 @@ exports[`TextTest Text border 1`] = ` "Clip": null, "CornerRadius": "0,0,0,0", "FlowDirection": "LeftToRight", - "Height": 144, + "Height": 476, "HorizontalAlignment": "Stretch", "Left": 100, "Margin": "0,0,0,0", @@ -308,18 +308,18 @@ exports[`TextTest Text border 1`] = ` "Clip": null, "FlowDirection": "LeftToRight", "Foreground": "#FF000000", - "Height": 78, + "Height": 210, "HorizontalAlignment": "Stretch", - "Left": 33, + "Left": 133, "Margin": "0,0,0,0", - "Padding": "0,0,0,0", + "Padding": "30,30,30,30", "Text": "Some more bordered text + a tad of CSS. 1st nested - border specifcied but ignored. 2nd Inside text!", - "Top": 33, + "Top": 133, "VerticalAlignment": "Stretch", "Visibility": "Visible", - "Width": 452, + "Width": 252, "XamlType": "Windows.UI.Xaml.Controls.TextBlock", }, ], @@ -334,7 +334,7 @@ exports[`TextTest Text border 1`] = ` "Margin": "0,0,0,0", "Padding": "0,0,0,0", "Text": "This text is outlined and laid out within the normal text run, so will wrap etc as normal text.", - "Top": 376, + "Top": 708, "VerticalAlignment": "Stretch", "Visibility": "Visible", "Width": 718,